diff --git a/.dependency-cruiser.cjs b/.dependency-cruiser.cjs index 25f7b64ce85..b7de80a70de 100644 --- a/.dependency-cruiser.cjs +++ b/.dependency-cruiser.cjs @@ -2,92 +2,86 @@ module.exports = { forbidden: [ { - name: 'no-circular-at-runtime', - severity: 'warn', + name: "no-circular-at-runtime", + severity: "warn", comment: - 'This dependency is part of a circular relationship. You might want to revise ' + - 'your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ', + "This dependency is part of a circular relationship. You might want to revise " + + "your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ", from: {}, to: { circular: true, viaOnly: { - dependencyTypesNot: [ - 'type-only' - ] - } - } + dependencyTypesNot: ["type-only"], + }, + }, }, { - name: 'no-orphans', + name: "no-orphans", comment: "This is an orphan module - it's likely not used (anymore?). Either use it or " + "remove it. If it's logical this module is an orphan (i.e. it's a config file), " + "add an exception for it in your dependency-cruiser configuration. By default " + "this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration " + "files (.d.ts), tsconfig.json and some of the babel and webpack configs.", - severity: 'warn', + severity: "warn", from: { orphan: true, pathNot: [ - '(^|/)[.][^/]+[.](?:js|cjs|mjs|ts|cts|mts|json)$', // dot files - '[.]d[.]ts$', // TypeScript declaration files - '(^|/)tsconfig[.]json$', // TypeScript config - '(^|/)(?:babel|webpack)[.]config[.](?:js|cjs|mjs|ts|cts|mts|json)$' // other configs - ] + "(^|/)[.][^/]+[.](?:js|cjs|mjs|ts|cts|mts|json)$", // dot files + "[.]d[.]ts$", // TypeScript declaration files + "(^|/)tsconfig[.]json$", // TypeScript config + "(^|/)(?:babel|webpack)[.]config[.](?:js|cjs|mjs|ts|cts|mts|json)$", // other configs + ], }, to: {}, }, { - name: 'no-deprecated-core', + name: "no-deprecated-core", comment: - 'A module depends on a node core module that has been deprecated. Find an alternative - these are ' + + "A module depends on a node core module that has been deprecated. Find an alternative - these are " + "bound to exist - node doesn't deprecate lightly.", - severity: 'warn', + severity: "warn", from: {}, to: { - dependencyTypes: [ - 'core' - ], + dependencyTypes: ["core"], path: [ - '^v8/tools/codemap$', - '^v8/tools/consarray$', - '^v8/tools/csvparser$', - '^v8/tools/logreader$', - '^v8/tools/profile_view$', - '^v8/tools/profile$', - '^v8/tools/SourceMap$', - '^v8/tools/splaytree$', - '^v8/tools/tickprocessor-driver$', - '^v8/tools/tickprocessor$', - '^node-inspect/lib/_inspect$', - '^node-inspect/lib/internal/inspect_client$', - '^node-inspect/lib/internal/inspect_repl$', - '^async_hooks$', - '^punycode$', - '^domain$', - '^constants$', - '^sys$', - '^_linklist$', - '^_stream_wrap$' + "^v8/tools/codemap$", + "^v8/tools/consarray$", + "^v8/tools/csvparser$", + "^v8/tools/logreader$", + "^v8/tools/profile_view$", + "^v8/tools/profile$", + "^v8/tools/SourceMap$", + "^v8/tools/splaytree$", + "^v8/tools/tickprocessor-driver$", + "^v8/tools/tickprocessor$", + "^node-inspect/lib/_inspect$", + "^node-inspect/lib/internal/inspect_client$", + "^node-inspect/lib/internal/inspect_repl$", + "^async_hooks$", + "^punycode$", + "^domain$", + "^constants$", + "^sys$", + "^_linklist$", + "^_stream_wrap$", ], - } + }, }, { - name: 'not-to-deprecated', + name: "not-to-deprecated", comment: - 'This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later ' + - 'version of that module, or find an alternative. Deprecated modules are a security risk.', - severity: 'warn', + "This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later " + + "version of that module, or find an alternative. Deprecated modules are a security risk.", + severity: "warn", from: {}, to: { - dependencyTypes: [ - 'deprecated' - ] - } + dependencyTypes: ["deprecated"], + }, }, { - name: 'no-non-package-json', - severity: 'error', + name: "no-non-package-json", + severity: "error", comment: "This module depends on an npm package that isn't in the 'dependencies' section of your package.json. " + "That's problematic as the package either (1) won't be available on live (2 - worse) will be " + @@ -95,87 +89,75 @@ module.exports = { "in your package.json.", from: {}, to: { - dependencyTypes: [ - 'npm-no-pkg', - 'npm-unknown' - ] - } + dependencyTypes: ["npm-no-pkg", "npm-unknown"], + }, }, { - name: 'not-to-unresolvable', + name: "not-to-unresolvable", comment: "This module depends on a module that cannot be found ('resolved to disk'). If it's an npm " + - 'module: add it to your package.json. In all other cases you likely already know what to do.', - severity: 'error', + "module: add it to your package.json. In all other cases you likely already know what to do.", + severity: "error", from: {}, to: { - couldNotResolve: true - } + couldNotResolve: true, + }, }, { - name: 'no-duplicate-dep-types', + name: "no-duplicate-dep-types", comment: "Likely this module depends on an external ('npm') package that occurs more than once " + "in your package.json i.e. bot as a devDependencies and in dependencies. This will cause " + "maintenance problems later on.", - severity: 'warn', + severity: "warn", from: {}, to: { moreThanOneDependencyType: true, - // as it's pretty common to have a type import be a type only import + // as it's pretty common to have a type import be a type only import // _and_ (e.g.) a devDependency - don't consider type-only dependency // types for this rule - dependencyTypesNot: ["type-only"] - } + dependencyTypesNot: ["type-only"], + }, }, /* rules you might want to tweak for your specific situation: */ { - name: 'not-to-spec', + name: "not-to-spec", comment: - 'This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. ' + + "This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. " + "If there's something in a spec that's of use to other modules, it doesn't have that single " + - 'responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.', - severity: 'error', + "responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.", + severity: "error", from: {}, to: { - path: '[.](?:spec|test)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$' - } + path: "[.](?:spec|test)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$", + }, }, { - name: 'not-to-dev-dep', - severity: 'error', + name: "not-to-dev-dep", + severity: "error", comment: "This module depends on an npm package from the 'devDependencies' section of your " + - 'package.json. It looks like something that ships to production, though. To prevent problems ' + + "package.json. It looks like something that ships to production, though. To prevent problems " + "with npm packages that aren't there on production declare it (only!) in the 'dependencies'" + - 'section of your package.json. If this module is development only - add it to the ' + - 'from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration', + "section of your package.json. If this module is development only - add it to the " + + "from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration", from: { - path: '^(src)', - pathNot: [ - '[.](?:spec|test|setup|script)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$', - 'src/test' - ] + path: "^(src)", + pathNot: ["[.](?:spec|test|setup|script)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$", "./test"], }, to: { - dependencyTypes: [ - 'npm-dev', - ], + dependencyTypes: ["npm-dev"], // type only dependencies are not a problem as they don't end up in the // production code or are ignored by the runtime. - dependencyTypesNot: [ - 'type-only' - ], - pathNot: [ - 'node_modules/@types/' - ] - } + dependencyTypesNot: ["type-only"], + pathNot: ["node_modules/@types/"], + }, }, { - name: 'optional-deps-used', - severity: 'info', + name: "optional-deps-used", + severity: "info", comment: "This module depends on an npm package that is declared as an optional dependency " + "in your package.json. As this makes sense in limited situations only, it's flagged here. " + @@ -183,33 +165,28 @@ module.exports = { "dependency-cruiser configuration.", from: {}, to: { - dependencyTypes: [ - 'npm-optional' - ] - } + dependencyTypes: ["npm-optional"], + }, }, { - name: 'peer-deps-used', + name: "peer-deps-used", comment: "This module depends on an npm package that is declared as a peer dependency " + "in your package.json. This makes sense if your package is e.g. a plugin, but in " + "other cases - maybe not so much. If the use of a peer dependency is intentional " + "add an exception to your dependency-cruiser configuration.", - severity: 'warn', + severity: "warn", from: {}, to: { - dependencyTypes: [ - 'npm-peer' - ] - } - } + dependencyTypes: ["npm-peer"], + }, + }, ], options: { - /* Which modules not to follow further when encountered */ doNotFollow: { /* path: an array of regular expressions in strings to match against */ - path: ['node_modules'] + path: ["node_modules"], }, /* Which modules to exclude */ @@ -271,7 +248,7 @@ module.exports = { defaults to './tsconfig.json'. */ tsConfig: { - fileName: 'tsconfig.json' + fileName: "tsconfig.json", }, /* Webpack configuration to use to get resolve options from. @@ -345,7 +322,7 @@ module.exports = { collapses everything in node_modules to one folder deep so you see the external modules, but their innards. */ - collapsePattern: 'node_modules/(?:@[^/]+/[^/]+|[^/]+)', + collapsePattern: "node_modules/(?:@[^/]+/[^/]+|[^/]+)", /* Options to tweak the appearance of your graph.See https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#reporteroptions @@ -367,7 +344,8 @@ module.exports = { dependency graph reporter (`archi`) you probably want to tweak this collapsePattern to your situation. */ - collapsePattern: '^(?:packages|src|lib(s?)|app(s?)|bin|test(s?)|spec(s?))/[^/]+|node_modules/(?:@[^/]+/[^/]+|[^/]+)', + collapsePattern: + "^(?:packages|src|lib(s?)|app(s?)|bin|test(s?)|spec(s?))/[^/]+|node_modules/(?:@[^/]+/[^/]+|[^/]+)", /* Options to tweak the appearance of your graph. If you don't specify a theme for 'archi' dependency-cruiser will use the one specified in the @@ -375,10 +353,10 @@ module.exports = { */ // theme: { }, }, - "text": { - "highlightFocused": true + text: { + highlightFocused: true, }, - } - } + }, + }, }; // generated: dependency-cruiser@16.3.3 on 2024-06-13T23:26:36.169Z diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8e7606f0a48..79ab1bdc38a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,4 +4,19 @@ * @pagefaultgames/junior-dev-team # github actions/templates etc. - Dev Leads -/.github @pagefaultgames/dev-leads +/.github @pagefaultgames/senior-dev-team + +# Art Team +/public/**/*.png @pagefaultgames/art-team +/public/**/*.json @pagefaultgames/art-team +/public/images @pagefaultgames/art-team +/public/battle-anims @pagefaultgames/art-team + +# Audio files +*.mp3 @pagefaultgames/composer-team +*.wav @pagefaultgames/composer-team +*.ogg @pagefaultgames/composer-team +/public/audio @pagefaultgames/composer-team + +# Balance Files; contain actual code logic and must also be owned by dev team +/src/data/balance @pagefaultgames/balance-team @pagefaultgames/junior-dev-team \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index eb270dc8f80..81d8427b5db 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,6 +1,7 @@ name: Bug Report description: Create a report to help us improve title: "[Bug] " +type: bug labels: ["Bug", "Triage"] body: - type: markdown diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 29a79b38158..08d720aea7b 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,6 +1,7 @@ name: Feature Request description: Suggest an idea for this project title: "[Feature] " +type: 'feature' labels: ["Enhancement", "Triage"] body: - type: markdown diff --git a/.github/workflows/eslint.yml b/.github/workflows/quality.yml similarity index 88% rename from .github/workflows/eslint.yml rename to .github/workflows/quality.yml index d863c96a643..7e33a77a73a 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/quality.yml @@ -1,4 +1,4 @@ -name: ESLint +name: Biome Code Quality on: # Trigger the workflow on push or pull request, @@ -28,10 +28,13 @@ jobs: - 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 + node-version-file: '.nvmrc' - name: Install Node.js dependencies # Step to install Node.js dependencies run: npm ci # Use 'npm ci' to install dependencies - + - name: eslint # Step to run linters run: npm run eslint-ci + + - name: Lint with Biome # Step to run linters + run: npm run biome-ci \ No newline at end of file diff --git a/.gitignore b/.gitignore index c22d0b2ce4c..9d96ed04a15 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,7 @@ coverage /dependency-graph.svg /.vs + + +# Script outputs +./*.csv \ No newline at end of file diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000000..9bcccb9439d --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v20.13.1 diff --git a/CREDITS.md b/CREDITS.md index fd9a3d7bde3..6d884c8fd60 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -343,34 +343,41 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki. # 💻 Development -## Server Owner/Administrator +## Server Developers - pancakes aka patapancakes -## Senior Developers -- Walker -- NightKev -- Moka -- Temp aka Tempo-anon -- Madmadness65 - -## Developers +## Current and former Development Team members +- bennybroseph +- Brain Frog - CodeTappert +- Dakurei - flx-sta -- innerthunder - frutescens +- Greenlamp +- ImperialSympathizer +- innerthunder +- KimJeongSun +- Madmadness65 +- Moka +- Navori +- NightKev - Opaquer +- OrangeRed +- Sam aka Flashfyre (initial developer, started PokéRogue) +- SirzBenjie +- sirzento - SN34KZ - Swain aka torranx - -## Junior Developers -- KimJeongSun -- ImperialSympathizer +- Temp aka Tempo-anon +- Walker +- Wlowscha (aka Curbio) +- Xavion ## Bug/Issue Managers -- Snailman - Daleks - Lily - PigeonBar +- Snailman ## Other Code Contributors - Admiral-Billy @@ -378,10 +385,7 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki. - arColm - Arxalc - AsdarDevelops -- bennybroseph -- Brain Frog - Corrade -- Dakurei - DustinLin - ElizaAlex - EmberCM @@ -391,7 +395,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki. - francktrouillez - FredeX - geeilhan -- Greenlamp - happinyz - hayuna - InfernoVulpix @@ -411,7 +414,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki. - Neverblade - NxKarim - okimin -- OrangeRed - PigeonBar - PrabbyDD - prateau @@ -421,10 +423,8 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki. - RedstonewolfX - ReneGV - rnicar245 -- Sam aka Flashfyre (initial developer, started PokéRogue) - schmidtc1 - shayebeadling -- sirzento - snoozbuster - sodaMelon - td76099 diff --git a/README.md b/README.md index 607a42e5125..5bb3ecfd26f 100644 --- a/README.md +++ b/README.md @@ -3,23 +3,30 @@ PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, fighting trainers, bosses, and more! # Contributing + ## 🛠️ Development + If you have the motivation and experience with Typescript/Javascript (or are willing to learn) please feel free to fork the repository and make pull requests with contributions. If you don't know what to work on but want to help, reference the below **To-Do** section or the **#feature-vote** channel in the discord. ### 💻 Environment Setup + #### Prerequisites + - node: 20.13.1 - npm: [how to install](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) #### Running Locally + 1. Clone the repo and in the root directory run `npm install` - *if you run into any errors, reach out in the **#dev-corner** channel in discord* 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. To view the complete rules, check out the [eslint.config.js](./eslint.config.js) file. + +We're using Biome 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 biome` script. To view the complete rules, check out the [biome.jsonc](./biome.jsonc) 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. @@ -27,16 +34,20 @@ For detailed guidelines on documenting your code, refer to the [comments.md](./d ### ❔ 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! # 📝 Credits +> > If this project contains assets you have produced and you do not see your name, **please** reach out, either [here on GitHub](https://github.com/pagefaultgames/pokerogue/issues/new) or via [Discord](https://discord.gg/pokerogue). Thank you to all the wonderful people that have contributed to the PokéRogue project! You can find the credits [here](./CREDITS.md). diff --git a/biome.jsonc b/biome.jsonc new file mode 100644 index 00000000000..3ec4552d359 --- /dev/null +++ b/biome.jsonc @@ -0,0 +1,106 @@ +{ + "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json", + "vcs": { + "enabled": false, + "clientKind": "git", + "useIgnoreFile": true, + "defaultBranch": "beta" + }, + "formatter": { + "enabled": true, + "useEditorconfig": true, + "indentStyle": "space", + "ignore": ["src/enums/*", "src/data/balance/*"], + "lineWidth": 120 + }, + "files": { + "ignoreUnknown": true, + // Adding folders to the ignore list is GREAT for performance because it prevents biome from descending into them + // and having to verify whether each individual file is ignored + "ignore": [ + "**/*.d.ts", + "dist/*", + "build/*", + "coverage/*", + "public/*", + ".github/*", + "node_modules/*", + ".vscode/*", + "*.css", // TODO? + "*.html", // TODO? + "src/overrides.ts", + // TODO: these files are too big and complex, ignore them until their respective refactors + "src/data/moves/move.ts", + "src/data/ability.ts", + "src/field/pokemon.ts", + + // this file is just too big: + "src/data/balance/tms.ts" + ] + }, + "organizeImports": { "enabled": false }, + "linter": { + "ignore": [ + "src/phases/move-effect-phase.ts" // TODO: unignore after move-effect-phase refactor + ], + "enabled": true, + "rules": { + "recommended": true, + "correctness": { + "noUndeclaredVariables": "off", + "noUnusedVariables": "error", + "noSwitchDeclarations": "warn", // TODO: refactor and make this an error + "noVoidTypeReturn": "warn" // TODO: Refactor and make this an error + }, + "style": { + "noVar": "error", + "useEnumInitializers": "off", + "useBlockStatements": "error", + "useConst": "error", + "useImportType": "error", + "noNonNullAssertion": "off", // TODO: Turn this on ASAP and fix all non-null assertions + "noParameterAssign": "off", + "useExponentiationOperator": "off", + "useDefaultParameterLast": "off", // TODO: Fix spots in the codebase where this flag would be triggered, and then enable + "useSingleVarDeclarator": "off", + "useNodejsImportProtocol": "off", + "useTemplate": "off" // string concatenation is faster: https://stackoverflow.com/questions/29055518/are-es6-template-literals-faster-than-string-concatenation + }, + "suspicious": { + "noDoubleEquals": "error", + "noExplicitAny": "off", + "noAssignInExpressions": "off", + "noPrototypeBuiltins": "off", + "noFallthroughSwitchClause": "off", + "noImplicitAnyLet": "info", // TODO: Refactor and make this an error + "noRedeclare": "off", // TODO: Refactor and make this an error + "noGlobalIsNan": "off", + "noAsyncPromiseExecutor": "warn" // TODO: Refactor and make this an error + }, + "complexity": { + "noExcessiveCognitiveComplexity": "warn", + "useLiteralKeys": "off", + "noForEach": "off", // Foreach vs for of is not that simple. + "noUselessSwitchCase": "off", // Explicit > Implicit + "noUselessConstructor": "warn", // TODO: Refactor and make this an error + "noBannedTypes": "warn" // TODO: Refactor and make this an error + } + } + }, + "javascript": { + "formatter": { "quoteStyle": "double", "arrowParentheses": "asNeeded" } + }, + "overrides": [ + { + "include": ["test/**/*.test.ts"], + "javascript": { "globals": [] }, + "linter": { + "rules": { + "performance": { + "noDelete": "off" + } + } + } + } + ] +} diff --git a/create-test-boilerplate.js b/create-test-boilerplate.js index a365999c623..d47b7c4afeb 100644 --- a/create-test-boilerplate.js +++ b/create-test-boilerplate.js @@ -1,5 +1,5 @@ /** - * This script creates a test boilerplate file in the appropriate + * This script creates a test boilerplate file in the appropriate * directory based on the type selected. * @example npm run create-test */ @@ -31,7 +31,8 @@ async function promptTestType() { if (typeAnswer.selectedOption === "EXIT") { console.log("Exiting..."); return process.exit(); - } else if (!typeChoices.includes(typeAnswer.selectedOption)) { + } + if (!typeChoices.includes(typeAnswer.selectedOption)) { console.error(`Please provide a valid type (${typeChoices.join(", ")})!`); return await promptTestType(); } @@ -74,29 +75,29 @@ async function runInteractive() { 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 + .replace(/\s+/g, "_") // Replace spaces with underscores .toLowerCase(); // Ensure all lowercase // Format the description for the test case - const formattedName = fileName.replace(/_/g, " ").replace(/\b\w/g, (char) => char.toUpperCase()); + const formattedName = fileName.replace(/_/g, " ").replace(/\b\w/g, char => char.toUpperCase()); // Determine the directory based on the type let dir; let description; switch (type) { case "move": - dir = path.join(__dirname, "src", "test", "moves"); + dir = path.join(__dirname, "test", "moves"); description = `Moves - ${formattedName}`; break; case "ability": - dir = path.join(__dirname, "src", "test", "abilities"); + dir = path.join(__dirname, "test", "abilities"); description = `Abilities - ${formattedName}`; break; case "item": - dir = path.join(__dirname, "src", "test", "items"); + dir = path.join(__dirname, "test", "items"); description = `Items - ${formattedName}`; break; case "mystery encounter": - dir = path.join(__dirname, "src", "test", "mystery-encounter", "encounters"); + dir = path.join(__dirname, "test", "mystery-encounter", "encounters"); description = `Mystery Encounter - ${formattedName}`; break; default: @@ -108,7 +109,7 @@ async function runInteractive() { const content = `import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/dependency-graph.js b/dependency-graph.js index 627aa3dcf13..dff960d8781 100644 --- a/dependency-graph.js +++ b/dependency-graph.js @@ -10,4 +10,4 @@ for await (const chunk of process.stdin) { const file = Buffer.concat(inputFile).toString("utf-8"); const svg = graphviz.dot(file, "svg"); -process.stdout.write(svg); \ No newline at end of file +process.stdout.write(svg); diff --git a/docs/enemy-ai.md b/docs/enemy-ai.md index 46482f56a90..8edf5a3f10e 100644 --- a/docs/enemy-ai.md +++ b/docs/enemy-ai.md @@ -80,8 +80,8 @@ As part of the move selection process, the enemy Pokémon must compute a **targe A move's UBS and TBS are computed with the respective functions in the `Move` class: ```ts -getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer; -getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer; +getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number; +getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number; ``` Logically, these functions are very similar – they add up their respective benefit scores from each of the move's attributes (as determined by `attr.getUserBenefitScore`, and `attr.getTargetBenefitScore`, respectively) and return the total benefit score. However, there are two key functional differences in how the UBS and TBS of a move are handled: diff --git a/eslint.config.js b/eslint.config.js index 1cea5563a78..a97e3902411 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,52 +1,43 @@ -import tseslint from '@typescript-eslint/eslint-plugin'; -import stylisticTs from '@stylistic/eslint-plugin-ts'; -import parser from '@typescript-eslint/parser'; -import importX from 'eslint-plugin-import-x'; +import tseslint from "@typescript-eslint/eslint-plugin"; +import stylisticTs from "@stylistic/eslint-plugin-ts"; +import parser from "@typescript-eslint/parser"; +import importX from "eslint-plugin-import-x"; -export default [ - { - files: ["src/**/*.{ts,tsx,js,jsx}"], - ignores: ["dist/*", "build/*", "coverage/*", "public/*", ".github/*", "node_modules/*", ".vscode/*"], - languageOptions: { - parser: parser - }, - plugins: { - "import-x": importX, - '@stylistic/ts': stylisticTs, - '@typescript-eslint': tseslint - }, - rules: { - "eqeqeq": ["error", "always"], // Enforces the use of `===` and `!==` instead of `==` and `!=` - "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 - "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 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 - "semi": "off", // Disables the general semi rule for TypeScript files - "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"], // 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 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 - "@typescript-eslint/consistent-type-imports": "error", // Enforces type-only imports wherever possible - } - } -] +export default [ + { + name: "eslint-config", + files: ["src/**/*.{ts,tsx,js,jsx}", "test/**/*.{ts,tsx,js,jsx}"], + ignores: ["dist/*", "build/*", "coverage/*", "public/*", ".github/*", "node_modules/*", ".vscode/*"], + languageOptions: { + parser: parser, + }, + plugins: { + "import-x": importX, + "@stylistic/ts": stylisticTs, + "@typescript-eslint": tseslint, + }, + rules: { + "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) + "no-extra-semi": ["error"], // Disallows unnecessary semicolons for TypeScript-specific syntax + "import-x/extensions": ["error", "never", { json: "always" }], // Enforces no extension for imports unless json + }, + }, + { + name: "eslint-tests", + files: ["test/**/**.test.ts"], + languageOptions: { + parser: parser, + parserOptions: { + project: ["./tsconfig.json"], + }, + }, + plugins: { + "@typescript-eslint": tseslint, + }, + rules: { + "@typescript-eslint/no-floating-promises": "error", // Require Promise-like statements to be handled appropriately. - https://typescript-eslint.io/rules/no-floating-promises/ + "@typescript-eslint/no-misused-promises": "error", // Disallow Promises in places not designed to handle them. - https://typescript-eslint.io/rules/no-misused-promises/ + }, + }, +]; diff --git a/index.css b/index.css index 2ec106516d2..49e570bdccc 100644 --- a/index.css +++ b/index.css @@ -11,7 +11,7 @@ html { body { margin: 0; - display:flex; + display: flex; flex-direction: column; align-items: center; background: #484050; @@ -49,16 +49,17 @@ body { @media (pointer: coarse) { /* hasTouchscreen() && !isTouchControlsEnabled */ - body:has(> #touchControls[class=visible]) #app { + body:has(> #touchControls[class="visible"]) #app { align-items: start; } - body:has(> #touchControls[class=visible]) #app > div:first-child { + body:has(> #touchControls[class="visible"]) #app > div:first-child { transform-origin: top !important; } } -#layout:fullscreen #dpad, #layout:fullscreen { +#layout:fullscreen #dpad, +#layout:fullscreen { bottom: 6rem; } @@ -76,7 +77,6 @@ input { display: none !important; } - input:-internal-autofill-selected { -webkit-background-clip: text; background-clip: text; @@ -91,18 +91,33 @@ input:-internal-autofill-selected { --controls-padding: 1rem; - --controls-size-with-padding: calc(var(--controls-size) + var(--controls-padding)); - --controls-size-with-wide-padding: calc(var(--controls-size) *1.2 + var(--controls-padding)); + --controls-size-with-padding: calc( + var(--controls-size) + + var(--controls-padding) + ); + --controls-size-with-wide-padding: calc( + var(--controls-size) * + 1.2 + + var(--controls-padding) + ); --control-group-extra-size: calc(var(--controls-size) * 0.8); --control-group-extra-wide-size: calc(var(--controls-size) * 1.2); - --control-group-extra-2-offset: calc(var(--controls-size-with-padding) + (var(--controls-size) - var(--control-group-extra-size)) / 2); - --control-group-extra-1-offset: calc(var(--controls-padding) + (var(--controls-size) - var(--control-group-extra-size)) / 2); + --control-group-extra-2-offset: calc( + var(--controls-size-with-padding) + + (var(--controls-size) - var(--control-group-extra-size)) / + 2 + ); + --control-group-extra-1-offset: calc( + var(--controls-padding) + + (var(--controls-size) - var(--control-group-extra-size)) / + 2 + ); --small-control-size: calc(var(--controls-size) / 3); --rect-control-size: calc(var(--controls-size) * 0.74); - font-family: 'emerald'; + font-family: "emerald"; font-size: var(--controls-size); text-shadow: var(--color-dark) var(--text-shadow-size) var(--text-shadow-size); color: var(--color-light); @@ -146,32 +161,69 @@ input:-internal-autofill-selected { /* Hide buttons on specific UIs */ /* Show #apadPreviousTab and #apadNextTab only in settings, except in touch configuration panel */ -#touchControls:not([data-ui-mode^='SETTINGS']) #apadPreviousTab, -#touchControls:not([data-ui-mode^='SETTINGS']) #apadNextTab, +#touchControls:not([data-ui-mode^="SETTINGS"]) #apadPreviousTab, +#touchControls:not([data-ui-mode^="SETTINGS"]) #apadNextTab, #touchControls:is(.config-mode) #apadPreviousTab, #touchControls:is(.config-mode) #apadNextTab { display: none; } /* Show #apadInfo only in battle */ -#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']) #apadInfo { +#touchControls:not([data-ui-mode="COMMAND"]):not([data-ui-mode="FIGHT"]):not( + [data-ui-mode="BALL"] + ):not([data-ui-mode="TARGET_SELECT"]) + #apadInfo { display: none; } /* Show #apadStats only in battle and shop */ -#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']):not([data-ui-mode='MODIFIER_SELECT']) #apadStats { +#touchControls:not([data-ui-mode="COMMAND"]):not([data-ui-mode="FIGHT"]):not( + [data-ui-mode="BALL"] + ):not([data-ui-mode="TARGET_SELECT"]):not([data-ui-mode="MODIFIER_SELECT"]) + #apadStats { display: none; } /* Show cycle buttons only on STARTER_SELECT and on touch configuration panel */ -#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadOpenFilters, -#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT'], [data-ui-mode='RUN_INFO']) #apadCycleForm, -#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT'], [data-ui-mode='RUN_INFO']) #apadCycleShiny, -#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleNature, -#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT'], [data-ui-mode='RUN_INFO']) #apadCycleAbility, -#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleGender, -#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleVariant { - display: none; +#touchControls:not(.config-mode):not( + [data-ui-mode="STARTER_SELECT"], + [data-ui-mode="POKEDEX"], + [data-ui-mode="POKEDEX_PAGE"] + ) + #apadOpenFilters, +#touchControls:not(.config-mode):not( + [data-ui-mode="STARTER_SELECT"], + [data-ui-mode="POKEDEX"], + [data-ui-mode="POKEDEX_PAGE"], + [data-ui-mode="RUN_INFO"] + ) + #apadCycleForm, +#touchControls:not(.config-mode):not( + [data-ui-mode="STARTER_SELECT"], + [data-ui-mode="POKEDEX"], + [data-ui-mode="POKEDEX_PAGE"], + [data-ui-mode="RUN_INFO"] + ) + #apadCycleShiny, +#touchControls:not(.config-mode):not([data-ui-mode="STARTER_SELECT"]) + #apadCycleNature, +#touchControls:not(.config-mode):not( + [data-ui-mode="STARTER_SELECT"], + [data-ui-mode="POKEDEX_PAGE"], + [data-ui-mode="RUN_INFO"] + ) + #apadCycleAbility, +#touchControls:not(.config-mode):not( + [data-ui-mode="STARTER_SELECT"], + [data-ui-mode="POKEDEX_PAGE"] + ) + #apadCycleGender, +#touchControls:not(.config-mode):not( + [data-ui-mode="STARTER_SELECT"], + [data-ui-mode="POKEDEX"] + ) + #apadCycleTera { + display: none; } /* Configuration toolbar */ @@ -217,16 +269,18 @@ input:-internal-autofill-selected { font-size: var(--small-control-size); border-radius: 8px; padding: 2px 8px; - text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) calc(var(--text-shadow-size) / 3); + text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) + calc(var(--text-shadow-size) / 3); } #configToolbar .button:active { - opacity: var(--touch-control-opacity) + opacity: var(--touch-control-opacity); } #configToolbar .orientation-label { font-size: var(--small-control-size); - text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) calc(var(--text-shadow-size) / 3); + text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) + calc(var(--text-shadow-size) / 3); } /* dpad */ @@ -270,7 +324,8 @@ input:-internal-autofill-selected { .apad-small > .apad-label { font-size: var(--small-control-size); - text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) calc(var(--text-shadow-size) / 3); + text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) + calc(var(--text-shadow-size) / 3); } .apad-rectangle { @@ -320,7 +375,8 @@ input:-internal-autofill-selected { /* Layout */ -#layout:fullscreen #dpad, #layout:fullscreen #apad { +#layout:fullscreen #dpad, +#layout:fullscreen #apad { bottom: 6rem; } @@ -353,55 +409,55 @@ a { /* Firefox old*/ @-moz-keyframes blink { - 0% { - opacity:1; - } - 50% { - opacity:0; - } - 100% { - opacity:1; - } + 0% { + opacity: 1; + } + 50% { + opacity: 0; + } + 100% { + opacity: 1; + } } @-webkit-keyframes blink { - 0% { - opacity:1; - } - 50% { - opacity:0; - } - 100% { - opacity:1; - } + 0% { + opacity: 1; + } + 50% { + opacity: 0; + } + 100% { + opacity: 1; + } } /* IE */ @-ms-keyframes blink { - 0% { - opacity:1; - } - 50% { - opacity:0; - } - 100% { - opacity:1; - } + 0% { + opacity: 1; + } + 50% { + opacity: 0; + } + 100% { + opacity: 1; + } } /* Opera and prob css3 final iteration */ @keyframes blink { - 0% { - opacity:1; - } - 50% { - opacity:0; - } - 100% { - opacity:1; - } + 0% { + opacity: 1; + } + 50% { + opacity: 0; + } + 100% { + opacity: 1; + } } .blink-image { - -moz-animation: blink normal 4s infinite ease-in-out; /* Firefox */ - -webkit-animation: blink normal 4s infinite ease-in-out; /* Webkit */ - -ms-animation: blink normal 4s infinite ease-in-out; /* IE */ - animation: blink normal 4s infinite ease-in-out; /* Opera and prob css3 final iteration */ + -moz-animation: blink normal 4s infinite ease-in-out; /* Firefox */ + -webkit-animation: blink normal 4s infinite ease-in-out; /* Webkit */ + -ms-animation: blink normal 4s infinite ease-in-out; /* IE */ + animation: blink normal 4s infinite ease-in-out; /* Opera and prob css3 final iteration */ } diff --git a/index.html b/index.html index 390a29fb365..111464b5e5c 100644 --- a/index.html +++ b/index.html @@ -129,11 +129,11 @@
N
-
+
V
-
+
V
diff --git a/lefthook.yml b/lefthook.yml index 06eb0446ee5..4eff2ad1f8e 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -1,9 +1,9 @@ pre-commit: parallel: true commands: - eslint: + biome-lint: glob: "*.{js,jsx,ts,tsx}" - run: npx eslint --fix {staged_files} + run: npx @biomejs/biome check --write --reporter=summary {staged_files} --no-errors-on-unmatched stage_fixed: true skip: - merge @@ -11,9 +11,9 @@ pre-commit: pre-push: commands: - eslint: + biome-lint: glob: "*.{js,ts,jsx,tsx}" - run: npx eslint --fix {push_files} + run: npx @biomejs/biome check --write --reporter=summary {push_files} --no-errors-on-unmatched post-merge: commands: diff --git a/package-lock.json b/package-lock.json index 676539af79e..87e2e150c65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,7121 +1,7179 @@ { - "name": "pokemon-rogue-battle", - "version": "1.5.2", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "pokemon-rogue-battle", - "version": "1.5.2", - "hasInstallScript": true, - "dependencies": { - "@material/material-color-utilities": "^0.2.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", - "jszip": "^3.10.1", - "phaser": "^3.70.0", - "phaser3-rex-plugins": "^1.1.84" - }, - "devDependencies": { - "@eslint/js": "^9.3.0", - "@hpcc-js/wasm": "^2.18.0", - "@stylistic/eslint-plugin-ts": "^2.6.0-beta.0", - "@types/jsdom": "^21.1.7", - "@types/node": "^20.12.13", - "@typescript-eslint/eslint-plugin": "^8.0.0-alpha.54", - "@typescript-eslint/parser": "^8.0.0-alpha.54", - "@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.4.8", - "vite-tsconfig-paths": "^4.3.2", - "vitest": "^2.0.4", - "vitest-canvas-mock": "^0.3.3" - }, - "engines": { - "node": ">=20.0.0" - } - }, - "node_modules/@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/highlight": "^7.24.7", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz", - "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz", - "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.9", - "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-module-transforms": "^7.24.9", - "@babel/helpers": "^7.24.8", - "@babel/parser": "^7.24.8", - "@babel/template": "^7.24.7", - "@babel/traverse": "^7.24.8", - "@babel/types": "^7.24.9", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/generator": { - "version": "7.24.10", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz", - "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.24.9", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz", - "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/compat-data": "^7.24.8", - "@babel/helper-validator-option": "^7.24.8", - "browserslist": "^4.23.1", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", - "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", - "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", - "dev": true, - "dependencies": { - "@babel/template": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", - "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", - "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz", - "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", - "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", - "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", - "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", - "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz", - "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/template": "^7.24.7", - "@babel/types": "^7.24.8" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/parser": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.0.tgz", - "integrity": "sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA==", - "dev": true, - "license": "MIT", - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/runtime": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz", - "integrity": "sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==", - "dependencies": { - "regenerator-runtime": "^0.14.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/template": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz", - "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz", - "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.8", - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-function-name": "^7.24.7", - "@babel/helper-hoist-variables": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/parser": "^7.24.8", - "@babel/types": "^7.24.8", - "debug": "^4.3.1", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse/node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/types": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.0.tgz", - "integrity": "sha512-LcnxQSsd9aXOIgmmSpvZ/1yo46ra2ESYyqLcryaBZOghxy5qqOBjvCWP5JfkI8yl9rlxRgdLTTMCQQRcN2hdCg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@bundled-es-modules/cookie": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@bundled-es-modules/cookie/-/cookie-2.0.0.tgz", - "integrity": "sha512-Or6YHg/kamKHpxULAdSqhGqnWFneIXu1NKvvfBBzKGwpVsYuFIQ5aBPHDnnoR3ghW1nvSkALd+EF9iMtY7Vjxw==", - "dev": true, - "license": "ISC", - "dependencies": { - "cookie": "^0.5.0" - } - }, - "node_modules/@bundled-es-modules/statuses": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@bundled-es-modules/statuses/-/statuses-1.0.1.tgz", - "integrity": "sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==", - "dev": true, - "license": "ISC", - "dependencies": { - "statuses": "^2.0.1" - } - }, - "node_modules/@bundled-es-modules/tough-cookie": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@bundled-es-modules/tough-cookie/-/tough-cookie-0.1.6.tgz", - "integrity": "sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==", - "dev": true, - "license": "ISC", - "dependencies": { - "@types/tough-cookie": "^4.0.5", - "tough-cookie": "^4.1.4" - } - }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", - "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", - "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", - "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", - "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", - "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", - "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", - "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", - "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", - "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", - "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", - "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", - "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", - "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", - "cpu": [ - "mips64el" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", - "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", - "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", - "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", - "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", - "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", - "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", - "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", - "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", - "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", - "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", - "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/@eslint/config-array": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz", - "integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@eslint/object-schema": "^2.1.4", - "debug": "^4.3.1", - "minimatch": "^3.1.2" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@eslint/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", - "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^10.0.1", - "globals": "^14.0.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/eslintrc/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@eslint/js": { - "version": "9.7.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.7.0.tgz", - "integrity": "sha512-ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/object-schema": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", - "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@hpcc-js/wasm": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.18.0.tgz", - "integrity": "sha512-M9XVIvAXGH4Xcyb5UoiohWcn6fil89pcos/gClNdBZG2v+W48xSf2bjcA8BW131X/AFHUerVY28n1P1Jw81/9A==", - "dev": true, - "dependencies": { - "yargs": "17.7.2" - }, - "bin": { - "dot-wasm": "bin/dot-wasm.js" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/retry": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", - "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@inquirer/checkbox": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-3.0.1.tgz", - "integrity": "sha512-0hm2nrToWUdD6/UHnel/UKGdk1//ke5zGUpHIvk5ZWmaKezlGxZkOJXNSWsdxO/rEqTkbB3lNC2J6nBElV2aAQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/figures": "^1.0.6", - "@inquirer/type": "^2.0.0", - "ansi-escapes": "^4.3.2", - "yoctocolors-cjs": "^2.1.2" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/confirm": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-4.0.1.tgz", - "integrity": "sha512-46yL28o2NJ9doViqOy0VDcoTzng7rAb6yPQKU7VDLqkmbCaH4JqK4yk4XqlzNWy9PVC5pG1ZUXPBQv+VqnYs2w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/type": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/core": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz", - "integrity": "sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/figures": "^1.0.6", - "@inquirer/type": "^2.0.0", - "@types/mute-stream": "^0.0.4", - "@types/node": "^22.5.5", - "@types/wrap-ansi": "^3.0.0", - "ansi-escapes": "^4.3.2", - "cli-width": "^4.1.0", - "mute-stream": "^1.0.0", - "signal-exit": "^4.1.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^6.2.0", - "yoctocolors-cjs": "^2.1.2" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/core/node_modules/@types/node": { - "version": "22.5.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz", - "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.19.2" - } - }, - "node_modules/@inquirer/core/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/@inquirer/core/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@inquirer/core/node_modules/undici-types": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", - "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@inquirer/core/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@inquirer/editor": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-3.0.1.tgz", - "integrity": "sha512-VA96GPFaSOVudjKFraokEEmUQg/Lub6OXvbIEZU1SDCmBzRkHGhxoFAVaF30nyiB4m5cEbDgiI2QRacXZ2hw9Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/type": "^2.0.0", - "external-editor": "^3.1.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/expand": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-3.0.1.tgz", - "integrity": "sha512-ToG8d6RIbnVpbdPdiN7BCxZGiHOTomOX94C2FaT5KOHupV40tKEDozp12res6cMIfRKrXLJyexAZhWVHgbALSQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/type": "^2.0.0", - "yoctocolors-cjs": "^2.1.2" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/figures": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.6.tgz", - "integrity": "sha512-yfZzps3Cso2UbM7WlxKwZQh2Hs6plrbjs1QnzQDZhK2DgyCo6D8AaHps9olkNcUFlcYERMqU3uJSp1gmy3s/qQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/input": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-3.0.1.tgz", - "integrity": "sha512-BDuPBmpvi8eMCxqC5iacloWqv+5tQSJlUafYWUe31ow1BVXjW2a5qe3dh4X/Z25Wp22RwvcaLCc2siHobEOfzg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/type": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/number": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-2.0.1.tgz", - "integrity": "sha512-QpR8jPhRjSmlr/mD2cw3IR8HRO7lSVOnqUvQa8scv1Lsr3xoAMMworcYW3J13z3ppjBFBD2ef1Ci6AE5Qn8goQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/type": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/password": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-3.0.1.tgz", - "integrity": "sha512-haoeEPUisD1NeE2IanLOiFr4wcTXGWrBOyAyPZi1FfLJuXOzNmxCJPgUrGYKVh+Y8hfGJenIfz5Wb/DkE9KkMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/type": "^2.0.0", - "ansi-escapes": "^4.3.2" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/prompts": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-6.0.1.tgz", - "integrity": "sha512-yl43JD/86CIj3Mz5mvvLJqAOfIup7ncxfJ0Btnl0/v5TouVUyeEdcpknfgc+yMevS/48oH9WAkkw93m7otLb/A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/checkbox": "^3.0.1", - "@inquirer/confirm": "^4.0.1", - "@inquirer/editor": "^3.0.1", - "@inquirer/expand": "^3.0.1", - "@inquirer/input": "^3.0.1", - "@inquirer/number": "^2.0.1", - "@inquirer/password": "^3.0.1", - "@inquirer/rawlist": "^3.0.1", - "@inquirer/search": "^2.0.1", - "@inquirer/select": "^3.0.1" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/rawlist": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-3.0.1.tgz", - "integrity": "sha512-VgRtFIwZInUzTiPLSfDXK5jLrnpkuSOh1ctfaoygKAdPqjcjKYmGh6sCY1pb0aGnCGsmhUxoqLDUAU0ud+lGXQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/type": "^2.0.0", - "yoctocolors-cjs": "^2.1.2" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/search": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-2.0.1.tgz", - "integrity": "sha512-r5hBKZk3g5MkIzLVoSgE4evypGqtOannnB3PKTG9NRZxyFRKcfzrdxXXPcoJQsxJPzvdSU2Rn7pB7lw0GCmGAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/figures": "^1.0.6", - "@inquirer/type": "^2.0.0", - "yoctocolors-cjs": "^2.1.2" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/select": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-3.0.1.tgz", - "integrity": "sha512-lUDGUxPhdWMkN/fHy1Lk7pF3nK1fh/gqeyWXmctefhxLYxlDsc7vsPBEpxrfVGDsVdyYJsiJoD4bJ1b623cV1Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/figures": "^1.0.6", - "@inquirer/type": "^2.0.0", - "ansi-escapes": "^4.3.2", - "yoctocolors-cjs": "^2.1.2" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz", - "integrity": "sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==", - "dev": true, - "license": "MIT", - "dependencies": { - "mute-stream": "^1.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@material/material-color-utilities": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/@material/material-color-utilities/-/material-color-utilities-0.2.7.tgz", - "integrity": "sha512-0FCeqG6WvK4/Cc06F/xXMd/pv4FeisI0c1tUpBbfhA2n9Y8eZEv4Karjbmf2ZqQCPUWMrGp8A571tCjizxoTiQ==", - "license": "Apache-2.0" - }, - "node_modules/@mswjs/interceptors": { - "version": "0.35.8", - "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.35.8.tgz", - "integrity": "sha512-PFfqpHplKa7KMdoQdj5td03uG05VK2Ng1dG0sP4pT9h0dGSX2v9txYt/AnrzPb/vAmfyBBC0NQV7VaBEX+efgQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@open-draft/deferred-promise": "^2.2.0", - "@open-draft/logger": "^0.3.0", - "@open-draft/until": "^2.0.0", - "is-node-process": "^1.2.0", - "outvariant": "^1.4.3", - "strict-event-emitter": "^0.5.1" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@open-draft/deferred-promise": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz", - "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@open-draft/logger": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz", - "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-node-process": "^1.2.0", - "outvariant": "^1.4.0" - } - }, - "node_modules/@open-draft/until": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz", - "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz", - "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz", - "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz", - "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz", - "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz", - "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz", - "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz", - "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz", - "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz", - "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz", - "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz", - "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz", - "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz", - "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz", - "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz", - "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz", - "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@shikijs/core": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.12.0.tgz", - "integrity": "sha512-mc1cLbm6UQ8RxLc0dZES7v5rkH+99LxQp/ZvTqV3NLyYsO/fD6JhEflP1H5b2SDq9gI0+0G36AVZWxvounfR9w==", - "dev": true, - "dependencies": { - "@types/hast": "^3.0.4" - } - }, - "node_modules/@stylistic/eslint-plugin-js": { - "version": "2.6.0-beta.0", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-2.6.0-beta.0.tgz", - "integrity": "sha512-KQiNvzNzvl9AmMs1MiIBszLIy/Xy1bTExnyaVy5dSzOF9c+yT64JQfH0p0jP6XpGwoCnZsrPUNflwP30G42QBQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/eslint": "^8.56.10", - "acorn": "^8.12.0", - "eslint-visitor-keys": "^4.0.0", - "espree": "^10.1.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "peerDependencies": { - "eslint": ">=8.40.0" - } - }, - "node_modules/@stylistic/eslint-plugin-js/node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@stylistic/eslint-plugin-ts": { - "version": "2.6.0-beta.0", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-2.6.0-beta.0.tgz", - "integrity": "sha512-WMz1zgmMC3bvg1L/tiYt5ygvDbTDKlbezoHoX2lV9MnUCAEQZUP4xJ9Wj3jmIKxb4mUuK5+vFZJVcOygvbbqow==", - "dev": true, - "license": "MIT", - "dependencies": { - "@stylistic/eslint-plugin-js": "2.6.0-beta.0", - "@types/eslint": "^8.56.10", - "@typescript-eslint/utils": "^8.0.0-alpha.34" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "peerDependencies": { - "eslint": ">=8.40.0" - } - }, - "node_modules/@types/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/eslint": { - "version": "8.56.11", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.11.tgz", - "integrity": "sha512-sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/hast": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz", - "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==", - "dev": true, - "dependencies": { - "@types/unist": "*" - } - }, - "node_modules/@types/jsdom": { - "version": "21.1.7", - "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.7.tgz", - "integrity": "sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "@types/tough-cookie": "*", - "parse5": "^7.0.0" - } - }, - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/mute-stream": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz", - "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/node": { - "version": "20.14.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz", - "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==", - "dev": true, - "dependencies": { - "undici-types": "~5.26.4" - } - }, - "node_modules/@types/statuses": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/statuses/-/statuses-2.0.5.tgz", - "integrity": "sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/tough-cookie": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", - "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true - }, - "node_modules/@types/wrap-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz", - "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==", - "dev": true, - "license": "MIT" - }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.0.0-alpha.58", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.0.0-alpha.58.tgz", - "integrity": "sha512-5G9oIj8jvosj8RTa0VDFXvRmUg1U6FxXJu7ZEfyJYMvFkdMJoY5YnzFvgAvHbYsXOj+YgXZu81fNOTRWQzwk5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.0.0-alpha.58", - "@typescript-eslint/type-utils": "8.0.0-alpha.58", - "@typescript-eslint/utils": "8.0.0-alpha.58", - "@typescript-eslint/visitor-keys": "8.0.0-alpha.58", - "graphemer": "^1.4.0", - "ignore": "^5.3.1", - "natural-compare": "^1.4.0", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/parser": { - "version": "8.0.0-alpha.58", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.0.0-alpha.58.tgz", - "integrity": "sha512-/RpgxIejBui6WXJgV9ukwzxmvbZt5TlfHUGGLB/BsNLj+NRZEbXVtWT9rKuxVOqsGb1Dn9c5gxvBI/XzyuIsMQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/scope-manager": "8.0.0-alpha.58", - "@typescript-eslint/types": "8.0.0-alpha.58", - "@typescript-eslint/typescript-estree": "8.0.0-alpha.58", - "@typescript-eslint/visitor-keys": "8.0.0-alpha.58", - "debug": "^4.3.4" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "8.0.0-alpha.58", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.0-alpha.58.tgz", - "integrity": "sha512-bGgJXn8B3Pf3mzEOUQTPxEqhux54MOJSqw4HcgBReuP7dudz/hsN4TH9GqHbMXkFv8N4Ed1iqVRfgGeC8b1mGw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.0.0-alpha.58", - "@typescript-eslint/visitor-keys": "8.0.0-alpha.58" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils": { - "version": "8.0.0-alpha.58", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.0.0-alpha.58.tgz", - "integrity": "sha512-spW/I/UAY6HM0lKj+/333Zb9arOvUoi8+H0cVNYHELPhOti9re9NjyyJFhck84PNiwi8WmpkEf3GXe7/h+Cquw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/typescript-estree": "8.0.0-alpha.58", - "@typescript-eslint/utils": "8.0.0-alpha.58", - "debug": "^4.3.4", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/types": { - "version": "8.0.0-alpha.58", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.0-alpha.58.tgz", - "integrity": "sha512-6+jM4y31a6pwKeV3MVQuVXPZl6d3I1ySMvP5WjZdZ+n57uovMvasZ3ZJstXngoRpa7JtkjVZ7NrMhQ1J8dxKCQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.0.0-alpha.58", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.0-alpha.58.tgz", - "integrity": "sha512-hm4nsoJnQcA7axMopUJrH7CD0MJhAMtE2zQt65uMFCy+U2YDdKPwE0g6qEAUBoKn6UBLQJWthJgUmwDbWrnwZg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/types": "8.0.0-alpha.58", - "@typescript-eslint/visitor-keys": "8.0.0-alpha.58", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "8.0.0-alpha.58", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.0.0-alpha.58.tgz", - "integrity": "sha512-lZuGnpK23jr3huebgY4/qqrOKsWJ8dX0Q1Fo4oVYcyAy+sK6p+6nObK4VEPJG098gUmrriiavRiDKIhPDFm4Ig==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.0.0-alpha.58", - "@typescript-eslint/types": "8.0.0-alpha.58", - "@typescript-eslint/typescript-estree": "8.0.0-alpha.58" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.0.0-alpha.58", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.0-alpha.58.tgz", - "integrity": "sha512-V//E9PRY2216kh9fN/ihRvTtjpobAXEtmrsr3utlVUwHa2iklcofq1J12yl3KOjx9QBRfBrtfQnYaeruF7L0Fw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.0.0-alpha.58", - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@vitest/coverage-istanbul": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-2.0.4.tgz", - "integrity": "sha512-6VibYMkXh8cJm5Bg8JYeOoR4oURlPf4YKP9kuVRE/NKasfYrXPnzSwuxrpgMbgOfPj13KUJXgMB3VAGukECtlQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@istanbuljs/schema": "^0.1.3", - "debug": "^4.3.5", - "istanbul-lib-coverage": "^3.2.2", - "istanbul-lib-instrument": "^6.0.3", - "istanbul-lib-report": "^3.0.1", - "istanbul-lib-source-maps": "^5.0.6", - "istanbul-reports": "^3.1.7", - "magicast": "^0.3.4", - "test-exclude": "^7.0.1", - "tinyrainbow": "^1.2.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - }, - "peerDependencies": { - "vitest": "2.0.4" - } - }, - "node_modules/@vitest/expect": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.0.4.tgz", - "integrity": "sha512-39jr5EguIoanChvBqe34I8m1hJFI4+jxvdOpD7gslZrVQBKhh8H9eD7J/LJX4zakrw23W+dITQTDqdt43xVcJw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@vitest/spy": "2.0.4", - "@vitest/utils": "2.0.4", - "chai": "^5.1.1", - "tinyrainbow": "^1.2.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/pretty-format": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.4.tgz", - "integrity": "sha512-RYZl31STbNGqf4l2eQM1nvKPXE0NhC6Eq0suTTePc4mtMQ1Fn8qZmjV4emZdEdG2NOWGKSCrHZjmTqDCDoeFBw==", - "dev": true, - "license": "MIT", - "dependencies": { - "tinyrainbow": "^1.2.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/runner": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.0.4.tgz", - "integrity": "sha512-Gk+9Su/2H2zNfNdeJR124gZckd5st4YoSuhF1Rebi37qTXKnqYyFCd9KP4vl2cQHbtuVKjfEKrNJxHHCW8thbQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@vitest/utils": "2.0.4", - "pathe": "^1.1.2" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/snapshot": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.4.tgz", - "integrity": "sha512-or6Mzoz/pD7xTvuJMFYEtso1vJo1S5u6zBTinfl+7smGUhqybn6VjzCDMhmTyVOFWwkCMuNjmNNxnyXPgKDoPw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@vitest/pretty-format": "2.0.4", - "magic-string": "^0.30.10", - "pathe": "^1.1.2" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/spy": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.4.tgz", - "integrity": "sha512-uTXU56TNoYrTohb+6CseP8IqNwlNdtPwEO0AWl+5j7NelS6x0xZZtP0bDWaLvOfUbaYwhhWp1guzXUxkC7mW7Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "tinyspy": "^3.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.0.4.tgz", - "integrity": "sha512-Zc75QuuoJhOBnlo99ZVUkJIuq4Oj0zAkrQ2VzCqNCx6wAwViHEh5Fnp4fiJTE9rA+sAoXRf00Z9xGgfEzV6fzQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@vitest/pretty-format": "2.0.4", - "estree-walker": "^3.0.3", - "loupe": "^3.1.1", - "tinyrainbow": "^1.2.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/acorn": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/acorn-jsx-walk": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/acorn-jsx-walk/-/acorn-jsx-walk-2.0.0.tgz", - "integrity": "sha512-uuo6iJj4D4ygkdzd6jPtcxs8vZgDX9YFIkqczGImoypX2fQ4dVImmu3UzA4ynixCIMTrEOWW+95M2HuBaCEOVA==", - "dev": true, - "license": "MIT" - }, - "node_modules/acorn-loose": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/acorn-loose/-/acorn-loose-8.4.0.tgz", - "integrity": "sha512-M0EUka6rb+QC4l9Z3T0nJEzNOO7JcoJlYMrBlyBCiFSXRyxjLKayd4TbQs2FDRWQU1h9FR7QVNHt+PEaoNL5rQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "acorn": "^8.11.0" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-walk": { - "version": "8.3.3", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", - "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", - "dev": true, - "dependencies": { - "acorn": "^8.11.0" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/agent-base": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", - "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.21.3" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "license": "Python-2.0" - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/assertion-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", - "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, - "dependencies": { - "possible-typed-array-names": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browserslist": { - "version": "4.23.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz", - "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "caniuse-lite": "^1.0.30001640", - "electron-to-chromium": "^1.4.820", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.1.0" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/cac": { - "version": "6.7.14", - "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", - "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", - "license": "MIT", - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001642", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz", - "integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "CC-BY-4.0" - }, - "node_modules/chai": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz", - "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==", - "dev": true, - "license": "MIT", - "dependencies": { - "assertion-error": "^2.0.1", - "check-error": "^2.1.1", - "deep-eql": "^5.0.1", - "loupe": "^3.1.0", - "pathval": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true, - "license": "MIT" - }, - "node_modules/check-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", - "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" - } - }, - "node_modules/cli-width": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", - "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">= 12" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/cliui/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/cliui/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commander": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", - "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, - "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT" - }, - "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" - }, - "node_modules/cross-fetch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", - "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", - "license": "MIT", - "dependencies": { - "node-fetch": "^2.6.12" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/crypto-js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", - "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==", - "license": "MIT" - }, - "node_modules/cssfontparser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/cssfontparser/-/cssfontparser-1.2.1.tgz", - "integrity": "sha512-6tun4LoZnj7VN6YeegOVb67KBX/7JJsqvj+pv3ZA7F878/eN33AbGa5b/S/wXxS/tcp8nc40xRUrsPlxIyNUPg==", - "dev": true, - "license": "MIT" - }, - "node_modules/cssstyle": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz", - "integrity": "sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "rrweb-cssom": "^0.6.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/cssstyle/node_modules/rrweb-cssom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", - "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==", - "dev": true - }, - "node_modules/data-urls": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", - "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decimal.js": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", - "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", - "dev": true, - "license": "MIT" - }, - "node_modules/deep-eql": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", - "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "license": "MIT", - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/dependency-cruiser": { - "version": "16.3.10", - "resolved": "https://registry.npmjs.org/dependency-cruiser/-/dependency-cruiser-16.3.10.tgz", - "integrity": "sha512-WkCnibHBfvaiaQ+S46LZ6h4AR6oj42Vsf5/0Vgtrwdwn7ZekMJdZ/ALoTwNp/RaGlKW+MbV/fhSZOvmhAWVWzQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "acorn": "8.12.1", - "acorn-jsx": "5.3.2", - "acorn-jsx-walk": "2.0.0", - "acorn-loose": "8.4.0", - "acorn-walk": "8.3.3", - "ajv": "8.17.1", - "commander": "12.1.0", - "enhanced-resolve": "5.17.1", - "ignore": "5.3.1", - "interpret": "^3.1.1", - "is-installed-globally": "1.0.0", - "json5": "2.2.3", - "memoize": "10.0.0", - "picocolors": "1.0.1", - "picomatch": "4.0.2", - "prompts": "2.4.2", - "rechoir": "^0.8.0", - "safe-regex": "2.1.1", - "semver": "^7.6.3", - "teamcity-service-messages": "0.1.14", - "tsconfig-paths-webpack-plugin": "4.1.0", - "watskeburt": "4.1.0" - }, - "bin": { - "depcruise": "bin/dependency-cruise.mjs", - "depcruise-baseline": "bin/depcruise-baseline.mjs", - "depcruise-fmt": "bin/depcruise-fmt.mjs", - "depcruise-wrap-stream-in-html": "bin/wrap-stream-in-html.mjs", - "dependency-cruise": "bin/dependency-cruise.mjs", - "dependency-cruiser": "bin/dependency-cruise.mjs" - }, - "engines": { - "node": "^18.17||>=20" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true, - "license": "MIT" - }, - "node_modules/electron-to-chromium": { - "version": "1.4.830", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.830.tgz", - "integrity": "sha512-TrPKKH20HeN0J1LHzsYLs2qwXrp8TF4nHdu4sq61ozGbzMpWhI7iIOPYPPkxeq1azMT9PZ8enPFcftbs/Npcjg==", - "dev": true - }, - "node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" - }, - "node_modules/enhanced-resolve": { - "version": "5.17.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", - "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "license": "MIT", - "dependencies": { - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/esbuild": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", - "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.21.5", - "@esbuild/android-arm": "0.21.5", - "@esbuild/android-arm64": "0.21.5", - "@esbuild/android-x64": "0.21.5", - "@esbuild/darwin-arm64": "0.21.5", - "@esbuild/darwin-x64": "0.21.5", - "@esbuild/freebsd-arm64": "0.21.5", - "@esbuild/freebsd-x64": "0.21.5", - "@esbuild/linux-arm": "0.21.5", - "@esbuild/linux-arm64": "0.21.5", - "@esbuild/linux-ia32": "0.21.5", - "@esbuild/linux-loong64": "0.21.5", - "@esbuild/linux-mips64el": "0.21.5", - "@esbuild/linux-ppc64": "0.21.5", - "@esbuild/linux-riscv64": "0.21.5", - "@esbuild/linux-s390x": "0.21.5", - "@esbuild/linux-x64": "0.21.5", - "@esbuild/netbsd-x64": "0.21.5", - "@esbuild/openbsd-x64": "0.21.5", - "@esbuild/sunos-x64": "0.21.5", - "@esbuild/win32-arm64": "0.21.5", - "@esbuild/win32-ia32": "0.21.5", - "@esbuild/win32-x64": "0.21.5" - } - }, - "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint": { - "version": "9.7.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz", - "integrity": "sha512-FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.11.0", - "@eslint/config-array": "^0.17.0", - "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.7.0", - "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.3.0", - "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.0.2", - "eslint-visitor-keys": "^4.0.0", - "espree": "^10.1.0", - "esquery": "^1.5.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^8.0.0", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-import-resolver-node": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", - "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^3.2.7", - "is-core-module": "^2.13.0", - "resolve": "^1.22.4" - } - }, - "node_modules/eslint-import-resolver-node/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-import-x": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.2.1.tgz", - "integrity": "sha512-WWi2GedccIJa0zXxx3WDnTgouGQTtdYK1nhXMwywbqqAgB0Ov+p1pYBsWh3VaB0bvBOwLse6OfVII7jZD9xo5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/utils": "^8.1.0", - "debug": "^4.3.4", - "doctrine": "^3.0.0", - "eslint-import-resolver-node": "^0.3.9", - "get-tsconfig": "^4.7.3", - "is-glob": "^4.0.3", - "minimatch": "^9.0.3", - "semver": "^7.6.3", - "stable-hash": "^0.0.4", - "tslib": "^2.6.3" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - } - }, - "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/scope-manager": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz", - "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.5.0", - "@typescript-eslint/visitor-keys": "8.5.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/types": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz", - "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz", - "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/types": "8.5.0", - "@typescript-eslint/visitor-keys": "8.5.0", - "debug": "^4.3.4", - "fast-glob": "^3.3.2", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/utils": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz", - "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.5.0", - "@typescript-eslint/types": "8.5.0", - "@typescript-eslint/typescript-estree": "8.5.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - } - }, - "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz", - "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.5.0", - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-scope": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", - "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/eslint/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/espree": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", - "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "acorn": "^8.12.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.0.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estree-walker": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", - "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/estree": "^1.0.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eventemitter3": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", - "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", - "license": "MIT" - }, - "node_modules/execa": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", - "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", - "dev": true, - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^8.0.1", - "human-signals": "^5.0.0", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^4.1.0", - "strip-final-newline": "^3.0.0" - }, - "engines": { - "node": ">=16.17" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "license": "MIT", - "dependencies": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-uri": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", - "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", - "dev": true - }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dev": true, - "license": "ISC", - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/file-entry-cache": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "flat-cache": "^4.0.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", - "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", - "dev": true, - "license": "MIT", - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.4" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true, - "license": "ISC" - }, - "node_modules/foreground-child": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", - "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", - "dev": true, - "license": "ISC", - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-func-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", - "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-stream": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", - "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-tsconfig": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz", - "integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "resolve-pkg-maps": "^1.0.0" - }, - "funding": { - "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" - } - }, - "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/global-directory": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz", - "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ini": "4.1.1" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globals": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globrex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", - "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", - "dev": true, - "license": "MIT" - }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "license": "MIT", - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true, - "license": "MIT" - }, - "node_modules/graphql": { - "version": "16.9.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz", - "integrity": "sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "license": "MIT", - "dependencies": { - "es-define-property": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/headers-polyfill": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-4.0.3.tgz", - "integrity": "sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/html-encoding-sniffer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", - "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "whatwg-encoding": "^3.1.1" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true, - "license": "MIT" - }, - "node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/https-proxy-agent": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", - "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^7.0.2", - "debug": "4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/human-signals": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", - "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=16.17.0" - } - }, - "node_modules/i18next": { - "version": "23.12.2", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.2.tgz", - "integrity": "sha512-XIeh5V+bi8SJSWGL3jqbTEBW5oD6rbP5L+E7dVQh1MNTxxYef0x15rhJVcRb7oiuq4jLtgy2SD8eFlf6P2cmqg==", - "funding": [ - { - "type": "individual", - "url": "https://locize.com" - }, - { - "type": "individual", - "url": "https://locize.com/i18next.html" - }, - { - "type": "individual", - "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" - } - ], - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.2" - } - }, - "node_modules/i18next-browser-languagedetector": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-7.2.1.tgz", - "integrity": "sha512-h/pM34bcH6tbz8WgGXcmWauNpQupCGr25XPp9cZwZInR9XHSjIFDYp1SIok7zSPsTOMxdvuLyu86V+g2Kycnfw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.2" - } - }, - "node_modules/i18next-http-backend": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.6.1.tgz", - "integrity": "sha512-rCilMAnlEQNeKOZY1+x8wLM5IpYOj10guGvEpeC59tNjj6MMreLIjIW8D1RclhD3ifLwn6d/Y9HEM1RUE6DSog==", - "license": "MIT", - "dependencies": { - "cross-fetch": "4.0.0" - } - }, - "node_modules/i18next-korean-postposition-processor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/i18next-korean-postposition-processor/-/i18next-korean-postposition-processor-1.0.0.tgz", - "integrity": "sha512-ruNXjI9awsFK6Ie+F9gYaMW8ciLMuCkeRjH9QkSv2Wb8xI0mnm773v3M9eua8dtvAXudIUk4p6Ho7hNkEASXDg==", - "license": "MIT", - "peerDependencies": { - "i18next": ">=8.4.0" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/immediate": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/ini": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", - "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/inquirer": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-11.0.2.tgz", - "integrity": "sha512-pnbn3nL+JFrTw/pLhzyE/IQ3+gA3n5JxTAZQDjB6qu4gbjOaiTnpZbxT6HY2DDCT7bzDjTTsd3snRP+B6N//Pg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.2.1", - "@inquirer/prompts": "^6.0.1", - "@inquirer/type": "^2.0.0", - "@types/mute-stream": "^0.0.4", - "ansi-escapes": "^4.3.2", - "mute-stream": "^1.0.0", - "run-async": "^3.0.0", - "rxjs": "^7.8.1" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/interpret": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", - "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/is-core-module": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", - "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", - "dev": true, - "dependencies": { - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-installed-globally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-1.0.0.tgz", - "integrity": "sha512-K55T22lfpQ63N4KEN57jZUAaAYqYHEe8veb/TycJRk9DdSCLLcovXz/mL6mOnhQaZsQGwPhuFopdQIlqGSEjiQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "global-directory": "^4.0.1", - "is-path-inside": "^4.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-installed-globally/node_modules/is-path-inside": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz", - "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-node-process": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz", - "integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-potential-custom-element-name": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "license": "MIT" - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" - }, - "node_modules/istanbul-lib-coverage": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", - "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", - "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/core": "^7.23.9", - "@babel/parser": "^7.23.9", - "@istanbuljs/schema": "^0.1.3", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^7.5.4" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-lib-report": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", - "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^4.0.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-lib-source-maps": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz", - "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.23", - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-reports": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", - "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/jest-canvas-mock": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.5.2.tgz", - "integrity": "sha512-vgnpPupjOL6+L5oJXzxTxFrlGEIbHdZqFU+LFNdtLxZ3lRDCl17FlTMM7IatoRQkrcyOTMlDinjUguqmQ6bR2A==", - "dev": true, - "license": "MIT", - "dependencies": { - "cssfontparser": "^1.2.1", - "moo-color": "^1.0.2" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsdom": { - "version": "24.1.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.0.tgz", - "integrity": "sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==", - "dev": true, - "license": "MIT", - "dependencies": { - "cssstyle": "^4.0.1", - "data-urls": "^5.0.0", - "decimal.js": "^10.4.3", - "form-data": "^4.0.0", - "html-encoding-sniffer": "^4.0.0", - "http-proxy-agent": "^7.0.2", - "https-proxy-agent": "^7.0.4", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.10", - "parse5": "^7.1.2", - "rrweb-cssom": "^0.7.0", - "saxes": "^6.0.0", - "symbol-tree": "^3.2.4", - "tough-cookie": "^4.1.4", - "w3c-xmlserializer": "^5.0.0", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^3.1.1", - "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.0.0", - "ws": "^8.17.0", - "xml-name-validator": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "canvas": "^2.11.2" - }, - "peerDependenciesMeta": { - "canvas": { - "optional": true - } - } - }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, - "license": "MIT", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/json-stable-stringify": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz", - "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==", - "license": "MIT", - "dependencies": { - "call-bind": "^1.0.5", - "isarray": "^2.0.5", - "jsonify": "^0.0.1", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "license": "MIT", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsonify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", - "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", - "license": "Public Domain", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/jszip": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", - "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", - "dependencies": { - "lie": "~3.3.0", - "pako": "~1.0.2", - "readable-stream": "~2.3.6", - "setimmediate": "^1.0.5" - } - }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "license": "MIT", - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/lefthook": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/lefthook/-/lefthook-1.7.4.tgz", - "integrity": "sha512-lVv3nKH9l3KMDS3bySROvWJSw1+AsBHUO7xaA0rg1IEBZrj3+ePmM+a8elX+GU3Go1OzsZEYjo5AOOeLoZ7FQg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "bin": { - "lefthook": "bin/index.js" - }, - "optionalDependencies": { - "lefthook-darwin-arm64": "1.7.4", - "lefthook-darwin-x64": "1.7.4", - "lefthook-freebsd-arm64": "1.7.4", - "lefthook-freebsd-x64": "1.7.4", - "lefthook-linux-arm64": "1.7.4", - "lefthook-linux-x64": "1.7.4", - "lefthook-windows-arm64": "1.7.4", - "lefthook-windows-x64": "1.7.4" - } - }, - "node_modules/lefthook-darwin-arm64": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.7.4.tgz", - "integrity": "sha512-6XpenaP0W7ZYA3lhHey/C1U+KmYz6eCq2cGswQsrTX+xdtHdWW3NbbOKngxATRTF8+CtF6m9UB2afP7qqkCghQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/lefthook-darwin-x64": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/lefthook-darwin-x64/-/lefthook-darwin-x64-1.7.4.tgz", - "integrity": "sha512-lpQXbPMHiaWE7+9fV+spjuMKiZ3J/+oI6hY1/l48MO3LmSpIv6DNy0VHho1fZVQnHdBU4bDh5c1G0r1f5T0irg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/lefthook-freebsd-arm64": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.7.4.tgz", - "integrity": "sha512-wv+JZgkD1/wi4X5aKKNodvxNcFcYmvL7uyzKkbtd/LgX5ssh9r5pO9J/71ULGtEuTXH4kqORRtez7u/ygqMEew==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/lefthook-freebsd-x64": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.7.4.tgz", - "integrity": "sha512-xoYR0Ay8pbyY9W9mI+iI9VDkkCVYSXhMf9XyOChSlu2XmjKiqi23hjCXvSOpvHQ7jphGvAVpE3Byijr6Xjuihw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/lefthook-linux-arm64": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/lefthook-linux-arm64/-/lefthook-linux-arm64-1.7.4.tgz", - "integrity": "sha512-WvXWzSM/e08n2f5lcC8j+pUMS0RzZftJK4zuBQ36TstSYXfBjWiw+FMnKCVZk6Q8Zc0icyF8sTmKQAyKCgX+UA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/lefthook-linux-x64": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/lefthook-linux-x64/-/lefthook-linux-x64-1.7.4.tgz", - "integrity": "sha512-eR5NxGzqPJm3wDTm4HStwGxOZ8Omb0ooodyuQdEOxtYidLrd4U18N14huwCEFd3BAOrjIWYV8plH+ReTZE56eg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/lefthook-windows-arm64": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/lefthook-windows-arm64/-/lefthook-windows-arm64-1.7.4.tgz", - "integrity": "sha512-C+MdHH+0ylermetMHwfHsYYNI5HI6QEOx7N4Iw4Ea6c3Yuj3eG3LsAzrhsup7KLSSBmDgIHOCJUx/Mfh2z+ATw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/lefthook-windows-x64": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/lefthook-windows-x64/-/lefthook-windows-x64-1.7.4.tgz", - "integrity": "sha512-BDQhiRzmMYPFQFtVtkRfUfeZuSlemG1oJfGKYXlCGFskvK9Jm1nGFnG0Ig63FAQaFdW33DFoLdr9ZKFTUQeSwQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/lie": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", - "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", - "dependencies": { - "immediate": "~3.0.5" - } - }, - "node_modules/linkify-it": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", - "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", - "dev": true, - "dependencies": { - "uc.micro": "^2.0.0" - } - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/loupe": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz", - "integrity": "sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==", - "dev": true, - "license": "MIT", - "dependencies": { - "get-func-name": "^2.0.1" - } - }, - "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/lunr": { - "version": "2.3.9", - "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", - "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", - "dev": true, - "license": "MIT" - }, - "node_modules/magic-string": { - "version": "0.30.11", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", - "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0" - } - }, - "node_modules/magicast": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.4.tgz", - "integrity": "sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.24.4", - "@babel/types": "^7.24.0", - "source-map-js": "^1.2.0" - } - }, - "node_modules/make-dir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", - "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.5.3" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/markdown-it": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", - "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1", - "entities": "^4.4.0", - "linkify-it": "^5.0.0", - "mdurl": "^2.0.0", - "punycode.js": "^2.3.1", - "uc.micro": "^2.1.0" - }, - "bin": { - "markdown-it": "bin/markdown-it.mjs" - } - }, - "node_modules/mdurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", - "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", - "dev": true - }, - "node_modules/memoize": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/memoize/-/memoize-10.0.0.tgz", - "integrity": "sha512-H6cBLgsi6vMWOcCpvVCdFFnl3kerEXbrYh9q+lY6VXvQSmM6CkmV08VOwT+WE2tzIEqRPFfAq3fm4v/UIW6mSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-function": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sindresorhus/memoize?sponsor=1" - } - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "license": "MIT" - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/micromatch/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/mimic-function": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", - "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/moo-color": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/moo-color/-/moo-color-1.0.3.tgz", - "integrity": "sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "^1.1.4" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/msw": { - "version": "2.4.9", - "resolved": "https://registry.npmjs.org/msw/-/msw-2.4.9.tgz", - "integrity": "sha512-1m8xccT6ipN4PTqLinPwmzhxQREuxaEJYdx4nIbggxP8aM7r1e71vE7RtOUSQoAm1LydjGfZKy7370XD/tsuYg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "@bundled-es-modules/cookie": "^2.0.0", - "@bundled-es-modules/statuses": "^1.0.1", - "@bundled-es-modules/tough-cookie": "^0.1.6", - "@inquirer/confirm": "^3.0.0", - "@mswjs/interceptors": "^0.35.8", - "@open-draft/until": "^2.1.0", - "@types/cookie": "^0.6.0", - "@types/statuses": "^2.0.4", - "chalk": "^4.1.2", - "graphql": "^16.8.1", - "headers-polyfill": "^4.0.2", - "is-node-process": "^1.2.0", - "outvariant": "^1.4.2", - "path-to-regexp": "^6.3.0", - "strict-event-emitter": "^0.5.1", - "type-fest": "^4.9.0", - "yargs": "^17.7.2" - }, - "bin": { - "msw": "cli/index.js" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/mswjs" - }, - "peerDependencies": { - "typescript": ">= 4.8.x" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/msw/node_modules/@inquirer/confirm": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.2.0.tgz", - "integrity": "sha512-oOIwPs0Dvq5220Z8lGL/6LHRTEr9TgLHmiI99Rj1PJ1p1czTys+olrgBqZk4E2qC0YTzeHprxSQmoHioVdJ7Lw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/msw/node_modules/@inquirer/type": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz", - "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==", - "dev": true, - "license": "MIT", - "dependencies": { - "mute-stream": "^1.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/msw/node_modules/type-fest": { - "version": "4.26.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz", - "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/mustache": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", - "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", - "license": "MIT", - "bin": { - "mustache": "bin/mustache" - } - }, - "node_modules/mute-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", - "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true, - "license": "MIT" - }, - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/node-fetch/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/node-fetch/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/node-fetch/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/node-releases": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.17.tgz", - "integrity": "sha512-Ww6ZlOiEQfPfXM45v17oabk77Z7mg5bOt7AjDyzy7RjK9OrLrLC8dyZQoAPEOtFX9SaNf1Tdvr5gRJWdTJj7GA==", - "dev": true - }, - "node_modules/npm-run-path": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", - "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-run-path/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/nwsapi": { - "version": "2.2.12", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz", - "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==", - "dev": true - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "dev": true, - "license": "MIT", - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/outvariant": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz", - "integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==", - "dev": true, - "license": "MIT" - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/package-json-from-dist": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", - "dev": true, - "license": "BlueOak-1.0.0" - }, - "node_modules/pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" - }, - "node_modules/papaparse": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.4.1.tgz", - "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw==", - "license": "MIT" - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "license": "MIT", - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse5": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", - "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", - "dev": true, - "license": "MIT", - "dependencies": { - "entities": "^4.4.0" - }, - "funding": { - "url": "https://github.com/inikulin/parse5?sponsor=1" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, - "license": "MIT" - }, - "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/path-to-regexp": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/pathe": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", - "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/pathval": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", - "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14.16" - } - }, - "node_modules/phaser": { - "version": "3.80.1", - "resolved": "https://registry.npmjs.org/phaser/-/phaser-3.80.1.tgz", - "integrity": "sha512-VQGAWoDOkEpAWYkI+PUADv5Ql+SM0xpLuAMBJHz9tBcOLqjJ2wd8bUhxJgOqclQlLTg97NmMd9MhS75w16x1Cw==", - "license": "MIT", - "dependencies": { - "eventemitter3": "^5.0.1" - } - }, - "node_modules/phaser3-rex-plugins": { - "version": "1.80.5", - "resolved": "https://registry.npmjs.org/phaser3-rex-plugins/-/phaser3-rex-plugins-1.80.5.tgz", - "integrity": "sha512-hdL3Cm6dK72w6phQdGnEiqqntlwT8SvjU0yit7DkdqiPy/Io1g3KnsRFqndtY+Hu69zaMEuckpIVeQK6yVwx4A==", - "dependencies": { - "eventemitter3": "^3.1.2", - "i18next": "^22.5.1", - "i18next-http-backend": "^2.5.2", - "js-yaml": "^4.1.0", - "mustache": "^4.2.0", - "papaparse": "^5.4.1", - "webfontloader": "^1.6.28" - } - }, - "node_modules/phaser3-rex-plugins/node_modules/eventemitter3": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==", - "license": "MIT" - }, - "node_modules/phaser3-rex-plugins/node_modules/i18next": { - "version": "22.5.1", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-22.5.1.tgz", - "integrity": "sha512-8TGPgM3pAD+VRsMtUMNknRz3kzqwp/gPALrWMsDnmC1mKqJwpWyooQRLMcbTwq8z8YwSmuj+ZYvc+xCuEpkssA==", - "funding": [ - { - "type": "individual", - "url": "https://locize.com" - }, - { - "type": "individual", - "url": "https://locize.com/i18next.html" - }, - { - "type": "individual", - "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" - } - ], - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.6" - } - }, - "node_modules/phaser3spectorjs": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/phaser3spectorjs/-/phaser3spectorjs-0.0.8.tgz", - "integrity": "sha512-0dSO7/aMjEUPrp5EcjRvRRsEf+jXDbmzalPeJ6VtTB2Pn1PeaKc+qlL/DmO3l1Dvc5lkzc+Sil1Ta+Hkyi5cbA==", - "dev": true, - "license": "MIT" - }, - "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", - "dev": true - }, - "node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/possible-typed-array-names": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", - "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/postcss": { - "version": "8.4.47", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", - "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.1.0", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/postcss/node_modules/picocolors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", - "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", - "dev": true - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, - "node_modules/prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true, - "license": "MIT" - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/punycode.js": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", - "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/readable-stream/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" - }, - "node_modules/rechoir": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", - "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "resolve": "^1.20.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/regenerator-runtime": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", - "license": "MIT" - }, - "node_modules/regexp-tree": { - "version": "0.1.27", - "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz", - "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==", - "dev": true, - "license": "MIT", - "bin": { - "regexp-tree": "bin/regexp-tree" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/resolve-pkg-maps": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", - "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "license": "MIT", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rollup": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz", - "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==", - "dev": true, - "dependencies": { - "@types/estree": "1.0.5" - }, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" - }, - "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.22.4", - "@rollup/rollup-android-arm64": "4.22.4", - "@rollup/rollup-darwin-arm64": "4.22.4", - "@rollup/rollup-darwin-x64": "4.22.4", - "@rollup/rollup-linux-arm-gnueabihf": "4.22.4", - "@rollup/rollup-linux-arm-musleabihf": "4.22.4", - "@rollup/rollup-linux-arm64-gnu": "4.22.4", - "@rollup/rollup-linux-arm64-musl": "4.22.4", - "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4", - "@rollup/rollup-linux-riscv64-gnu": "4.22.4", - "@rollup/rollup-linux-s390x-gnu": "4.22.4", - "@rollup/rollup-linux-x64-gnu": "4.22.4", - "@rollup/rollup-linux-x64-musl": "4.22.4", - "@rollup/rollup-win32-arm64-msvc": "4.22.4", - "@rollup/rollup-win32-ia32-msvc": "4.22.4", - "@rollup/rollup-win32-x64-msvc": "4.22.4", - "fsevents": "~2.3.2" - } - }, - "node_modules/rrweb-cssom": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz", - "integrity": "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==", - "dev": true - }, - "node_modules/run-async": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz", - "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "node_modules/safe-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz", - "integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==", - "dev": true, - "license": "MIT", - "dependencies": { - "regexp-tree": "~0.1.1" - } - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "license": "MIT" - }, - "node_modules/saxes": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", - "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", - "dev": true, - "license": "ISC", - "dependencies": { - "xmlchars": "^2.2.0" - }, - "engines": { - "node": ">=v12.22.7" - } - }, - "node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/set-function-length": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", - "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "license": "MIT", - "dependencies": { - "define-data-property": "^1.1.4", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/shiki": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.12.0.tgz", - "integrity": "sha512-BuAxWOm5JhRcbSOl7XCei8wGjgJJonnV0oipUupPY58iULxUGyHhW5CF+9FRMuM1pcJ5cGEJGll1LusX6FwpPA==", - "dev": true, - "dependencies": { - "@shikijs/core": "1.12.0", - "@types/hast": "^3.0.4" - } - }, - "node_modules/siginfo": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", - "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", - "dev": true, - "license": "ISC" - }, - "node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true, - "license": "MIT" - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/stable-hash": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.4.tgz", - "integrity": "sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==", - "dev": true, - "license": "MIT" - }, - "node_modules/stackback": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", - "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", - "dev": true, - "license": "MIT" - }, - "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/std-env": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz", - "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==", - "dev": true, - "license": "MIT" - }, - "node_modules/strict-event-emitter": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz", - "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "dev": true, - "license": "MIT" - }, - "node_modules/tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/teamcity-service-messages": { - "version": "0.1.14", - "resolved": "https://registry.npmjs.org/teamcity-service-messages/-/teamcity-service-messages-0.1.14.tgz", - "integrity": "sha512-29aQwaHqm8RMX74u2o/h1KbMLP89FjNiMxD9wbF2BbWOnbM+q+d1sCEC+MqCc4QW3NJykn77OMpTFw/xTHIc0w==", - "dev": true, - "license": "MIT" - }, - "node_modules/test-exclude": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz", - "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==", - "dev": true, - "license": "ISC", - "dependencies": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^10.4.1", - "minimatch": "^9.0.4" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/test-exclude/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true, - "license": "MIT" - }, - "node_modules/tinybench": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.8.0.tgz", - "integrity": "sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==", - "dev": true, - "license": "MIT" - }, - "node_modules/tinypool": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.0.tgz", - "integrity": "sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.0.0 || >=20.0.0" - } - }, - "node_modules/tinyrainbow": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz", - "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/tinyspy": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.0.tgz", - "integrity": "sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "license": "MIT", - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/tough-cookie": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", - "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tr46": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz", - "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==", - "dev": true, - "dependencies": { - "punycode": "^2.3.1" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/ts-api-utils": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", - "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16" - }, - "peerDependencies": { - "typescript": ">=4.2.0" - } - }, - "node_modules/tsconfck": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.1.tgz", - "integrity": "sha512-00eoI6WY57SvZEVjm13stEVE90VkEdJAFGgpFLTsZbJyW/LwFQ7uQxJHWpZ2hzSWgCPKc9AnBnNP+0X7o3hAmQ==", - "dev": true, - "license": "MIT", - "bin": { - "tsconfck": "bin/tsconfck.js" - }, - "engines": { - "node": "^18 || >=20" - }, - "peerDependencies": { - "typescript": "^5.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/tsconfig-paths-webpack-plugin": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz", - "integrity": "sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.1.0", - "enhanced-resolve": "^5.7.0", - "tsconfig-paths": "^4.1.2" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/tsconfig-paths-webpack-plugin/node_modules/tsconfig-paths": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", - "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "json5": "^2.2.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tslib": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", - "dev": true, - "license": "0BSD" - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typedoc": { - "version": "0.26.5", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.26.5.tgz", - "integrity": "sha512-Vn9YKdjKtDZqSk+by7beZ+xzkkr8T8CYoiasqyt4TTRFy5+UHzL/mF/o4wGBjRF+rlWQHDb0t6xCpA3JNL5phg==", - "dev": true, - "dependencies": { - "lunr": "^2.3.9", - "markdown-it": "^14.1.0", - "minimatch": "^9.0.5", - "shiki": "^1.9.1", - "yaml": "^2.4.5" - }, - "bin": { - "typedoc": "bin/typedoc" - }, - "engines": { - "node": ">= 18" - }, - "peerDependencies": { - "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x" - } - }, - "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/typescript-eslint": { - "version": "8.0.0-alpha.58", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.0.0-alpha.58.tgz", - "integrity": "sha512-0mvrodNhExpkWns+5RaZP8YqsAfPyjmPVVM1p+kaJkvApMH58/VFcQ0iSQuun0bFRNCMvW0ZUdulS9AsHqVXkg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/eslint-plugin": "8.0.0-alpha.58", - "@typescript-eslint/parser": "8.0.0-alpha.58", - "@typescript-eslint/utils": "8.0.0-alpha.58" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/uc.micro": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", - "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", - "dev": true - }, - "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true, - "license": "MIT" - }, - "node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/update-browserslist-db": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", - "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" - }, - "node_modules/vite": { - "version": "5.4.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz", - "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==", - "dev": true, - "dependencies": { - "esbuild": "^0.21.3", - "postcss": "^8.4.43", - "rollup": "^4.20.0" - }, - "bin": { - "vite": "bin/vite.js" - }, - "engines": { - "node": "^18.0.0 || >=20.0.0" - }, - "funding": { - "url": "https://github.com/vitejs/vite?sponsor=1" - }, - "optionalDependencies": { - "fsevents": "~2.3.3" - }, - "peerDependencies": { - "@types/node": "^18.0.0 || >=20.0.0", - "less": "*", - "lightningcss": "^1.21.0", - "sass": "*", - "sass-embedded": "*", - "stylus": "*", - "sugarss": "*", - "terser": "^5.4.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-embedded": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - } - } - }, - "node_modules/vite-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.0.4.tgz", - "integrity": "sha512-ZpJVkxcakYtig5iakNeL7N3trufe3M6vGuzYAr4GsbCTwobDeyPJpE4cjDhhPluv8OvQCFzu2LWp6GkoKRITXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "cac": "^6.7.14", - "debug": "^4.3.5", - "pathe": "^1.1.2", - "tinyrainbow": "^1.2.0", - "vite": "^5.0.0" - }, - "bin": { - "vite-node": "vite-node.mjs" - }, - "engines": { - "node": "^18.0.0 || >=20.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/vite-tsconfig-paths": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz", - "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "globrex": "^0.1.2", - "tsconfck": "^3.0.3" - }, - "peerDependencies": { - "vite": "*" - }, - "peerDependenciesMeta": { - "vite": { - "optional": true - } - } - }, - "node_modules/vitest": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.0.4.tgz", - "integrity": "sha512-luNLDpfsnxw5QSW4bISPe6tkxVvv5wn2BBs/PuDRkhXZ319doZyLOBr1sjfB5yCEpTiU7xCAdViM8TNVGPwoog==", - "dev": true, - "license": "MIT", - "dependencies": { - "@ampproject/remapping": "^2.3.0", - "@vitest/expect": "2.0.4", - "@vitest/pretty-format": "^2.0.4", - "@vitest/runner": "2.0.4", - "@vitest/snapshot": "2.0.4", - "@vitest/spy": "2.0.4", - "@vitest/utils": "2.0.4", - "chai": "^5.1.1", - "debug": "^4.3.5", - "execa": "^8.0.1", - "magic-string": "^0.30.10", - "pathe": "^1.1.2", - "std-env": "^3.7.0", - "tinybench": "^2.8.0", - "tinypool": "^1.0.0", - "tinyrainbow": "^1.2.0", - "vite": "^5.0.0", - "vite-node": "2.0.4", - "why-is-node-running": "^2.3.0" - }, - "bin": { - "vitest": "vitest.mjs" - }, - "engines": { - "node": "^18.0.0 || >=20.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - }, - "peerDependencies": { - "@edge-runtime/vm": "*", - "@types/node": "^18.0.0 || >=20.0.0", - "@vitest/browser": "2.0.4", - "@vitest/ui": "2.0.4", - "happy-dom": "*", - "jsdom": "*" - }, - "peerDependenciesMeta": { - "@edge-runtime/vm": { - "optional": true - }, - "@types/node": { - "optional": true - }, - "@vitest/browser": { - "optional": true - }, - "@vitest/ui": { - "optional": true - }, - "happy-dom": { - "optional": true - }, - "jsdom": { - "optional": true - } - } - }, - "node_modules/vitest-canvas-mock": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/vitest-canvas-mock/-/vitest-canvas-mock-0.3.3.tgz", - "integrity": "sha512-3P968tYBpqYyzzOaVtqnmYjqbe13576/fkjbDEJSfQAkHtC5/UjuRHOhFEN/ZV5HVZIkaROBUWgazDKJ+Ibw+Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "jest-canvas-mock": "~2.5.2" - }, - "peerDependencies": { - "vitest": "*" - } - }, - "node_modules/w3c-xmlserializer": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", - "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "xml-name-validator": "^5.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/watskeburt": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/watskeburt/-/watskeburt-4.1.0.tgz", - "integrity": "sha512-KkY5H51ajqy9HYYI+u9SIURcWnqeVVhdH0I+ab6aXPGHfZYxgRCwnR6Lm3+TYB6jJVt5jFqw4GAKmwf1zHmGQw==", - "dev": true, - "bin": { - "watskeburt": "dist/run-cli.js" - }, - "engines": { - "node": "^18||>=20" - } - }, - "node_modules/webfontloader": { - "version": "1.6.28", - "resolved": "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.28.tgz", - "integrity": "sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ==", - "license": "Apache-2.0" - }, - "node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/whatwg-encoding": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", - "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "iconv-lite": "0.6.3" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/whatwg-encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/whatwg-mimetype": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", - "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - } - }, - "node_modules/whatwg-url": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz", - "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==", - "dev": true, - "dependencies": { - "tr46": "^5.0.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/why-is-node-running": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", - "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", - "dev": true, - "license": "MIT", - "dependencies": { - "siginfo": "^2.0.0", - "stackback": "0.0.2" - }, - "bin": { - "why-is-node-running": "cli.js" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/wrap-ansi-cjs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/ws": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", - "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xml-name-validator": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", - "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18" - } - }, - "node_modules/xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "dev": true, - "license": "MIT" - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true, - "license": "ISC" - }, - "node_modules/yaml": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", - "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", - "dev": true, - "bin": { - "yaml": "bin.mjs" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/yargs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/yoctocolors-cjs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz", - "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - } + "name": "pokemon-rogue-battle", + "version": "1.7.7", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "pokemon-rogue-battle", + "version": "1.7.7", + "hasInstallScript": true, + "dependencies": { + "@material/material-color-utilities": "^0.2.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", + "jszip": "^3.10.1", + "phaser": "^3.70.0", + "phaser3-rex-plugins": "^1.1.84" + }, + "devDependencies": { + "@biomejs/biome": "1.9.4", + "@eslint/js": "^9.3.0", + "@hpcc-js/wasm": "^2.18.0", + "@stylistic/eslint-plugin-ts": "^2.6.0-beta.0", + "@types/jsdom": "^21.1.7", + "@types/node": "^20.12.13", + "@typescript-eslint/eslint-plugin": "^8.0.0-alpha.54", + "@typescript-eslint/parser": "^8.0.0-alpha.54", + "@vitest/coverage-istanbul": "^2.1.9", + "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.4.14", + "vite-tsconfig-paths": "^4.3.2", + "vitest": "^2.1.9", + "vitest-canvas-mock": "^0.3.3" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.24.9", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz", + "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.24.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz", + "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.9", + "@babel/helper-compilation-targets": "^7.24.8", + "@babel/helper-module-transforms": "^7.24.9", + "@babel/helpers": "^7.24.8", + "@babel/parser": "^7.24.8", + "@babel/template": "^7.24.7", + "@babel/traverse": "^7.24.8", + "@babel/types": "^7.24.9", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/generator": { + "version": "7.24.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz", + "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.24.9", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz", + "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.24.8", + "@babel/helper-validator-option": "^7.24.8", + "browserslist": "^4.23.1", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", + "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", + "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", + "dev": true, + "dependencies": { + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", + "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.24.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz", + "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", + "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", + "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz", + "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.8" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.24.7", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/parser": { + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.8.tgz", + "integrity": "sha512-TZIQ25pkSoaKEYYaHbbxkfL36GNsQ6iFiBbeuzAkLnXayKR1yP1zFe+NxuZWWsUyvt8icPU9CCq0sgWGXR1GEw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.26.8" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/runtime": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz", + "integrity": "sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz", + "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz", + "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.8", + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-function-name": "^7.24.7", + "@babel/helper-hoist-variables": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/parser": "^7.24.8", + "@babel/types": "^7.24.8", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/types": { + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.8.tgz", + "integrity": "sha512-eUuWapzEGWFEpHFxgEaBG8e3n6S8L3MSu0oda755rOfabWPnh0Our1AozNFVUxGFIhbKgd1ksprsoDGMinTOTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@biomejs/biome": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.9.4.tgz", + "integrity": "sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog==", + "dev": true, + "hasInstallScript": true, + "license": "MIT OR Apache-2.0", + "bin": { + "biome": "bin/biome" + }, + "engines": { + "node": ">=14.21.3" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/biome" + }, + "optionalDependencies": { + "@biomejs/cli-darwin-arm64": "1.9.4", + "@biomejs/cli-darwin-x64": "1.9.4", + "@biomejs/cli-linux-arm64": "1.9.4", + "@biomejs/cli-linux-arm64-musl": "1.9.4", + "@biomejs/cli-linux-x64": "1.9.4", + "@biomejs/cli-linux-x64-musl": "1.9.4", + "@biomejs/cli-win32-arm64": "1.9.4", + "@biomejs/cli-win32-x64": "1.9.4" + } + }, + "node_modules/@biomejs/cli-darwin-arm64": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.9.4.tgz", + "integrity": "sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-darwin-x64": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.9.4.tgz", + "integrity": "sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-linux-arm64": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.9.4.tgz", + "integrity": "sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-linux-arm64-musl": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.9.4.tgz", + "integrity": "sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-linux-x64": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.9.4.tgz", + "integrity": "sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-linux-x64-musl": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.9.4.tgz", + "integrity": "sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-win32-arm64": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.9.4.tgz", + "integrity": "sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-win32-x64": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.9.4.tgz", + "integrity": "sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@bundled-es-modules/cookie": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@bundled-es-modules/cookie/-/cookie-2.0.0.tgz", + "integrity": "sha512-Or6YHg/kamKHpxULAdSqhGqnWFneIXu1NKvvfBBzKGwpVsYuFIQ5aBPHDnnoR3ghW1nvSkALd+EF9iMtY7Vjxw==", + "dev": true, + "license": "ISC", + "dependencies": { + "cookie": "^0.5.0" + } + }, + "node_modules/@bundled-es-modules/statuses": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@bundled-es-modules/statuses/-/statuses-1.0.1.tgz", + "integrity": "sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==", + "dev": true, + "license": "ISC", + "dependencies": { + "statuses": "^2.0.1" + } + }, + "node_modules/@bundled-es-modules/tough-cookie": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@bundled-es-modules/tough-cookie/-/tough-cookie-0.1.6.tgz", + "integrity": "sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@types/tough-cookie": "^4.0.5", + "tough-cookie": "^4.1.4" + } + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", + "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", + "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", + "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", + "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", + "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", + "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", + "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", + "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", + "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", + "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", + "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", + "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", + "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", + "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", + "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", + "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", + "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", + "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", + "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", + "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", + "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", + "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", + "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", + "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/config-array": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz", + "integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.4", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", + "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^10.0.1", + "globals": "^14.0.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/js": { + "version": "9.7.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.7.0.tgz", + "integrity": "sha512-ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", + "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@hpcc-js/wasm": { + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.18.0.tgz", + "integrity": "sha512-M9XVIvAXGH4Xcyb5UoiohWcn6fil89pcos/gClNdBZG2v+W48xSf2bjcA8BW131X/AFHUerVY28n1P1Jw81/9A==", + "dev": true, + "dependencies": { + "yargs": "17.7.2" + }, + "bin": { + "dot-wasm": "bin/dot-wasm.js" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/retry": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", + "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@inquirer/checkbox": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-3.0.1.tgz", + "integrity": "sha512-0hm2nrToWUdD6/UHnel/UKGdk1//ke5zGUpHIvk5ZWmaKezlGxZkOJXNSWsdxO/rEqTkbB3lNC2J6nBElV2aAQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/figures": "^1.0.6", + "@inquirer/type": "^2.0.0", + "ansi-escapes": "^4.3.2", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/confirm": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-4.0.1.tgz", + "integrity": "sha512-46yL28o2NJ9doViqOy0VDcoTzng7rAb6yPQKU7VDLqkmbCaH4JqK4yk4XqlzNWy9PVC5pG1ZUXPBQv+VqnYs2w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/core": { + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz", + "integrity": "sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/figures": "^1.0.6", + "@inquirer/type": "^2.0.0", + "@types/mute-stream": "^0.0.4", + "@types/node": "^22.5.5", + "@types/wrap-ansi": "^3.0.0", + "ansi-escapes": "^4.3.2", + "cli-width": "^4.1.0", + "mute-stream": "^1.0.0", + "signal-exit": "^4.1.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^6.2.0", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/core/node_modules/@types/node": { + "version": "22.5.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz", + "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } + }, + "node_modules/@inquirer/core/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/@inquirer/core/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@inquirer/core/node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@inquirer/core/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@inquirer/editor": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-3.0.1.tgz", + "integrity": "sha512-VA96GPFaSOVudjKFraokEEmUQg/Lub6OXvbIEZU1SDCmBzRkHGhxoFAVaF30nyiB4m5cEbDgiI2QRacXZ2hw9Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0", + "external-editor": "^3.1.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/expand": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-3.0.1.tgz", + "integrity": "sha512-ToG8d6RIbnVpbdPdiN7BCxZGiHOTomOX94C2FaT5KOHupV40tKEDozp12res6cMIfRKrXLJyexAZhWVHgbALSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/figures": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.6.tgz", + "integrity": "sha512-yfZzps3Cso2UbM7WlxKwZQh2Hs6plrbjs1QnzQDZhK2DgyCo6D8AaHps9olkNcUFlcYERMqU3uJSp1gmy3s/qQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/input": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-3.0.1.tgz", + "integrity": "sha512-BDuPBmpvi8eMCxqC5iacloWqv+5tQSJlUafYWUe31ow1BVXjW2a5qe3dh4X/Z25Wp22RwvcaLCc2siHobEOfzg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/number": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-2.0.1.tgz", + "integrity": "sha512-QpR8jPhRjSmlr/mD2cw3IR8HRO7lSVOnqUvQa8scv1Lsr3xoAMMworcYW3J13z3ppjBFBD2ef1Ci6AE5Qn8goQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/password": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-3.0.1.tgz", + "integrity": "sha512-haoeEPUisD1NeE2IanLOiFr4wcTXGWrBOyAyPZi1FfLJuXOzNmxCJPgUrGYKVh+Y8hfGJenIfz5Wb/DkE9KkMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0", + "ansi-escapes": "^4.3.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/prompts": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-6.0.1.tgz", + "integrity": "sha512-yl43JD/86CIj3Mz5mvvLJqAOfIup7ncxfJ0Btnl0/v5TouVUyeEdcpknfgc+yMevS/48oH9WAkkw93m7otLb/A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/checkbox": "^3.0.1", + "@inquirer/confirm": "^4.0.1", + "@inquirer/editor": "^3.0.1", + "@inquirer/expand": "^3.0.1", + "@inquirer/input": "^3.0.1", + "@inquirer/number": "^2.0.1", + "@inquirer/password": "^3.0.1", + "@inquirer/rawlist": "^3.0.1", + "@inquirer/search": "^2.0.1", + "@inquirer/select": "^3.0.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/rawlist": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-3.0.1.tgz", + "integrity": "sha512-VgRtFIwZInUzTiPLSfDXK5jLrnpkuSOh1ctfaoygKAdPqjcjKYmGh6sCY1pb0aGnCGsmhUxoqLDUAU0ud+lGXQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/search": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-2.0.1.tgz", + "integrity": "sha512-r5hBKZk3g5MkIzLVoSgE4evypGqtOannnB3PKTG9NRZxyFRKcfzrdxXXPcoJQsxJPzvdSU2Rn7pB7lw0GCmGAg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/figures": "^1.0.6", + "@inquirer/type": "^2.0.0", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/select": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-3.0.1.tgz", + "integrity": "sha512-lUDGUxPhdWMkN/fHy1Lk7pF3nK1fh/gqeyWXmctefhxLYxlDsc7vsPBEpxrfVGDsVdyYJsiJoD4bJ1b623cV1Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/figures": "^1.0.6", + "@inquirer/type": "^2.0.0", + "ansi-escapes": "^4.3.2", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz", + "integrity": "sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==", + "dev": true, + "license": "MIT", + "dependencies": { + "mute-stream": "^1.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@material/material-color-utilities": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@material/material-color-utilities/-/material-color-utilities-0.2.7.tgz", + "integrity": "sha512-0FCeqG6WvK4/Cc06F/xXMd/pv4FeisI0c1tUpBbfhA2n9Y8eZEv4Karjbmf2ZqQCPUWMrGp8A571tCjizxoTiQ==", + "license": "Apache-2.0" + }, + "node_modules/@mswjs/interceptors": { + "version": "0.35.8", + "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.35.8.tgz", + "integrity": "sha512-PFfqpHplKa7KMdoQdj5td03uG05VK2Ng1dG0sP4pT9h0dGSX2v9txYt/AnrzPb/vAmfyBBC0NQV7VaBEX+efgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@open-draft/deferred-promise": "^2.2.0", + "@open-draft/logger": "^0.3.0", + "@open-draft/until": "^2.0.0", + "is-node-process": "^1.2.0", + "outvariant": "^1.4.3", + "strict-event-emitter": "^0.5.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@open-draft/deferred-promise": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz", + "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@open-draft/logger": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz", + "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-node-process": "^1.2.0", + "outvariant": "^1.4.0" + } + }, + "node_modules/@open-draft/until": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz", + "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz", + "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz", + "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz", + "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz", + "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz", + "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz", + "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz", + "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz", + "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz", + "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz", + "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz", + "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz", + "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz", + "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz", + "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz", + "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz", + "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@shikijs/core": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.12.0.tgz", + "integrity": "sha512-mc1cLbm6UQ8RxLc0dZES7v5rkH+99LxQp/ZvTqV3NLyYsO/fD6JhEflP1H5b2SDq9gI0+0G36AVZWxvounfR9w==", + "dev": true, + "dependencies": { + "@types/hast": "^3.0.4" + } + }, + "node_modules/@stylistic/eslint-plugin-js": { + "version": "2.6.0-beta.0", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-2.6.0-beta.0.tgz", + "integrity": "sha512-KQiNvzNzvl9AmMs1MiIBszLIy/Xy1bTExnyaVy5dSzOF9c+yT64JQfH0p0jP6XpGwoCnZsrPUNflwP30G42QBQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint": "^8.56.10", + "acorn": "^8.12.0", + "eslint-visitor-keys": "^4.0.0", + "espree": "^10.1.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "peerDependencies": { + "eslint": ">=8.40.0" + } + }, + "node_modules/@stylistic/eslint-plugin-js/node_modules/eslint-visitor-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@stylistic/eslint-plugin-ts": { + "version": "2.6.0-beta.0", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-2.6.0-beta.0.tgz", + "integrity": "sha512-WMz1zgmMC3bvg1L/tiYt5ygvDbTDKlbezoHoX2lV9MnUCAEQZUP4xJ9Wj3jmIKxb4mUuK5+vFZJVcOygvbbqow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@stylistic/eslint-plugin-js": "2.6.0-beta.0", + "@types/eslint": "^8.56.10", + "@typescript-eslint/utils": "^8.0.0-alpha.34" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "peerDependencies": { + "eslint": ">=8.40.0" + } + }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/eslint": { + "version": "8.56.11", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.11.tgz", + "integrity": "sha512-sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/hast": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz", + "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==", + "dev": true, + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/@types/jsdom": { + "version": "21.1.7", + "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.7.tgz", + "integrity": "sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@types/tough-cookie": "*", + "parse5": "^7.0.0" + } + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/mute-stream": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz", + "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/node": { + "version": "20.14.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz", + "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } + }, + "node_modules/@types/statuses": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/statuses/-/statuses-2.0.5.tgz", + "integrity": "sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/tough-cookie": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", + "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/unist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", + "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", + "dev": true + }, + "node_modules/@types/wrap-ansi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz", + "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "8.0.0-alpha.58", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.0.0-alpha.58.tgz", + "integrity": "sha512-5G9oIj8jvosj8RTa0VDFXvRmUg1U6FxXJu7ZEfyJYMvFkdMJoY5YnzFvgAvHbYsXOj+YgXZu81fNOTRWQzwk5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "8.0.0-alpha.58", + "@typescript-eslint/type-utils": "8.0.0-alpha.58", + "@typescript-eslint/utils": "8.0.0-alpha.58", + "@typescript-eslint/visitor-keys": "8.0.0-alpha.58", + "graphemer": "^1.4.0", + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "8.0.0-alpha.58", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.0.0-alpha.58.tgz", + "integrity": "sha512-/RpgxIejBui6WXJgV9ukwzxmvbZt5TlfHUGGLB/BsNLj+NRZEbXVtWT9rKuxVOqsGb1Dn9c5gxvBI/XzyuIsMQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/scope-manager": "8.0.0-alpha.58", + "@typescript-eslint/types": "8.0.0-alpha.58", + "@typescript-eslint/typescript-estree": "8.0.0-alpha.58", + "@typescript-eslint/visitor-keys": "8.0.0-alpha.58", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.0.0-alpha.58", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.0-alpha.58.tgz", + "integrity": "sha512-bGgJXn8B3Pf3mzEOUQTPxEqhux54MOJSqw4HcgBReuP7dudz/hsN4TH9GqHbMXkFv8N4Ed1iqVRfgGeC8b1mGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.0.0-alpha.58", + "@typescript-eslint/visitor-keys": "8.0.0-alpha.58" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "8.0.0-alpha.58", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.0.0-alpha.58.tgz", + "integrity": "sha512-spW/I/UAY6HM0lKj+/333Zb9arOvUoi8+H0cVNYHELPhOti9re9NjyyJFhck84PNiwi8WmpkEf3GXe7/h+Cquw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "8.0.0-alpha.58", + "@typescript-eslint/utils": "8.0.0-alpha.58", + "debug": "^4.3.4", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "8.0.0-alpha.58", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.0-alpha.58.tgz", + "integrity": "sha512-6+jM4y31a6pwKeV3MVQuVXPZl6d3I1ySMvP5WjZdZ+n57uovMvasZ3ZJstXngoRpa7JtkjVZ7NrMhQ1J8dxKCQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "8.0.0-alpha.58", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.0-alpha.58.tgz", + "integrity": "sha512-hm4nsoJnQcA7axMopUJrH7CD0MJhAMtE2zQt65uMFCy+U2YDdKPwE0g6qEAUBoKn6UBLQJWthJgUmwDbWrnwZg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "8.0.0-alpha.58", + "@typescript-eslint/visitor-keys": "8.0.0-alpha.58", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "8.0.0-alpha.58", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.0.0-alpha.58.tgz", + "integrity": "sha512-lZuGnpK23jr3huebgY4/qqrOKsWJ8dX0Q1Fo4oVYcyAy+sK6p+6nObK4VEPJG098gUmrriiavRiDKIhPDFm4Ig==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.0.0-alpha.58", + "@typescript-eslint/types": "8.0.0-alpha.58", + "@typescript-eslint/typescript-estree": "8.0.0-alpha.58" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "8.0.0-alpha.58", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.0-alpha.58.tgz", + "integrity": "sha512-V//E9PRY2216kh9fN/ihRvTtjpobAXEtmrsr3utlVUwHa2iklcofq1J12yl3KOjx9QBRfBrtfQnYaeruF7L0Fw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.0.0-alpha.58", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@vitest/coverage-istanbul": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-2.1.9.tgz", + "integrity": "sha512-vdYE4FkC/y2lxcN3Dcj54Bw+ericmDwiex0B8LV5F/YNYEYP1mgVwhPnHwWGAXu38qizkjOuyczKbFTALfzFKw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@istanbuljs/schema": "^0.1.3", + "debug": "^4.3.7", + "istanbul-lib-coverage": "^3.2.2", + "istanbul-lib-instrument": "^6.0.3", + "istanbul-lib-report": "^3.0.1", + "istanbul-lib-source-maps": "^5.0.6", + "istanbul-reports": "^3.1.7", + "magicast": "^0.3.5", + "test-exclude": "^7.0.1", + "tinyrainbow": "^1.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "vitest": "2.1.9" + } + }, + "node_modules/@vitest/expect": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.9.tgz", + "integrity": "sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/spy": "2.1.9", + "@vitest/utils": "2.1.9", + "chai": "^5.1.2", + "tinyrainbow": "^1.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/mocker": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.9.tgz", + "integrity": "sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/spy": "2.1.9", + "estree-walker": "^3.0.3", + "magic-string": "^0.30.12" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "msw": "^2.4.9", + "vite": "^5.0.0" + }, + "peerDependenciesMeta": { + "msw": { + "optional": true + }, + "vite": { + "optional": true + } + } + }, + "node_modules/@vitest/pretty-format": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.9.tgz", + "integrity": "sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "tinyrainbow": "^1.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/runner": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.9.tgz", + "integrity": "sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/utils": "2.1.9", + "pathe": "^1.1.2" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/snapshot": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.9.tgz", + "integrity": "sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/pretty-format": "2.1.9", + "magic-string": "^0.30.12", + "pathe": "^1.1.2" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/spy": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.9.tgz", + "integrity": "sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "tinyspy": "^3.0.2" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/utils": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.9.tgz", + "integrity": "sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/pretty-format": "2.1.9", + "loupe": "^3.1.2", + "tinyrainbow": "^1.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/acorn": { + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-jsx-walk": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/acorn-jsx-walk/-/acorn-jsx-walk-2.0.0.tgz", + "integrity": "sha512-uuo6iJj4D4ygkdzd6jPtcxs8vZgDX9YFIkqczGImoypX2fQ4dVImmu3UzA4ynixCIMTrEOWW+95M2HuBaCEOVA==", + "dev": true, + "license": "MIT" + }, + "node_modules/acorn-loose": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/acorn-loose/-/acorn-loose-8.4.0.tgz", + "integrity": "sha512-M0EUka6rb+QC4l9Z3T0nJEzNOO7JcoJlYMrBlyBCiFSXRyxjLKayd4TbQs2FDRWQU1h9FR7QVNHt+PEaoNL5rQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", + "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", + "dev": true, + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/assertion-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.23.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz", + "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001640", + "electron-to-chromium": "^1.4.820", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.1.0" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/cac": { + "version": "6.7.14", + "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", + "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001642", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz", + "integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/chai": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.2.tgz", + "integrity": "sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==", + "dev": true, + "license": "MIT", + "dependencies": { + "assertion-error": "^2.0.1", + "check-error": "^2.1.1", + "deep-eql": "^5.0.1", + "loupe": "^3.1.0", + "pathval": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true, + "license": "MIT" + }, + "node_modules/check-error": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 16" + } + }, + "node_modules/cli-width": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", + "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 12" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", + "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + }, + "node_modules/cross-fetch": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", + "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", + "license": "MIT", + "dependencies": { + "node-fetch": "^2.6.12" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/crypto-js": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==", + "license": "MIT" + }, + "node_modules/cssfontparser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/cssfontparser/-/cssfontparser-1.2.1.tgz", + "integrity": "sha512-6tun4LoZnj7VN6YeegOVb67KBX/7JJsqvj+pv3ZA7F878/eN33AbGa5b/S/wXxS/tcp8nc40xRUrsPlxIyNUPg==", + "dev": true, + "license": "MIT" + }, + "node_modules/cssstyle": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz", + "integrity": "sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "rrweb-cssom": "^0.6.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/cssstyle/node_modules/rrweb-cssom": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", + "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==", + "dev": true + }, + "node_modules/data-urls": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", + "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decimal.js": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", + "dev": true, + "license": "MIT" + }, + "node_modules/deep-eql": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", + "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/dependency-cruiser": { + "version": "16.3.10", + "resolved": "https://registry.npmjs.org/dependency-cruiser/-/dependency-cruiser-16.3.10.tgz", + "integrity": "sha512-WkCnibHBfvaiaQ+S46LZ6h4AR6oj42Vsf5/0Vgtrwdwn7ZekMJdZ/ALoTwNp/RaGlKW+MbV/fhSZOvmhAWVWzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "8.12.1", + "acorn-jsx": "5.3.2", + "acorn-jsx-walk": "2.0.0", + "acorn-loose": "8.4.0", + "acorn-walk": "8.3.3", + "ajv": "8.17.1", + "commander": "12.1.0", + "enhanced-resolve": "5.17.1", + "ignore": "5.3.1", + "interpret": "^3.1.1", + "is-installed-globally": "1.0.0", + "json5": "2.2.3", + "memoize": "10.0.0", + "picocolors": "1.0.1", + "picomatch": "4.0.2", + "prompts": "2.4.2", + "rechoir": "^0.8.0", + "safe-regex": "2.1.1", + "semver": "^7.6.3", + "teamcity-service-messages": "0.1.14", + "tsconfig-paths-webpack-plugin": "4.1.0", + "watskeburt": "4.1.0" + }, + "bin": { + "depcruise": "bin/dependency-cruise.mjs", + "depcruise-baseline": "bin/depcruise-baseline.mjs", + "depcruise-fmt": "bin/depcruise-fmt.mjs", + "depcruise-wrap-stream-in-html": "bin/wrap-stream-in-html.mjs", + "dependency-cruise": "bin/dependency-cruise.mjs", + "dependency-cruiser": "bin/dependency-cruise.mjs" + }, + "engines": { + "node": "^18.17||>=20" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT" + }, + "node_modules/electron-to-chromium": { + "version": "1.4.830", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.830.tgz", + "integrity": "sha512-TrPKKH20HeN0J1LHzsYLs2qwXrp8TF4nHdu4sq61ozGbzMpWhI7iIOPYPPkxeq1azMT9PZ8enPFcftbs/Npcjg==", + "dev": true + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/enhanced-resolve": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-module-lexer": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz", + "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/esbuild": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", + "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.21.5", + "@esbuild/android-arm": "0.21.5", + "@esbuild/android-arm64": "0.21.5", + "@esbuild/android-x64": "0.21.5", + "@esbuild/darwin-arm64": "0.21.5", + "@esbuild/darwin-x64": "0.21.5", + "@esbuild/freebsd-arm64": "0.21.5", + "@esbuild/freebsd-x64": "0.21.5", + "@esbuild/linux-arm": "0.21.5", + "@esbuild/linux-arm64": "0.21.5", + "@esbuild/linux-ia32": "0.21.5", + "@esbuild/linux-loong64": "0.21.5", + "@esbuild/linux-mips64el": "0.21.5", + "@esbuild/linux-ppc64": "0.21.5", + "@esbuild/linux-riscv64": "0.21.5", + "@esbuild/linux-s390x": "0.21.5", + "@esbuild/linux-x64": "0.21.5", + "@esbuild/netbsd-x64": "0.21.5", + "@esbuild/openbsd-x64": "0.21.5", + "@esbuild/sunos-x64": "0.21.5", + "@esbuild/win32-arm64": "0.21.5", + "@esbuild/win32-ia32": "0.21.5", + "@esbuild/win32-x64": "0.21.5" + } + }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "9.7.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz", + "integrity": "sha512-FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.11.0", + "@eslint/config-array": "^0.17.0", + "@eslint/eslintrc": "^3.1.0", + "@eslint/js": "9.7.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.3.0", + "@nodelib/fs.walk": "^1.2.8", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^8.0.2", + "eslint-visitor-keys": "^4.0.0", + "espree": "^10.1.0", + "esquery": "^1.5.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^8.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import-x": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.2.1.tgz", + "integrity": "sha512-WWi2GedccIJa0zXxx3WDnTgouGQTtdYK1nhXMwywbqqAgB0Ov+p1pYBsWh3VaB0bvBOwLse6OfVII7jZD9xo5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/utils": "^8.1.0", + "debug": "^4.3.4", + "doctrine": "^3.0.0", + "eslint-import-resolver-node": "^0.3.9", + "get-tsconfig": "^4.7.3", + "is-glob": "^4.0.3", + "minimatch": "^9.0.3", + "semver": "^7.6.3", + "stable-hash": "^0.0.4", + "tslib": "^2.6.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/scope-manager": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz", + "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/types": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz", + "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/typescript-estree": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz", + "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/utils": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz", + "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/typescript-estree": "8.5.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/visitor-keys": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz", + "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.5.0", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-scope": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", + "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/eslint/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/espree": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", + "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.12.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.0.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "license": "MIT" + }, + "node_modules/expect-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.1.0.tgz", + "integrity": "sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "license": "MIT", + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-uri": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "dev": true + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true, + "license": "ISC" + }, + "node_modules/foreground-child": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-tsconfig": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz", + "integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/global-directory": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz", + "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ini": "4.1.1" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globrex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", + "dev": true, + "license": "MIT" + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/graphql": { + "version": "16.9.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz", + "integrity": "sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/headers-polyfill": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-4.0.3.tgz", + "integrity": "sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/html-encoding-sniffer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", + "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-encoding": "^3.1.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true, + "license": "MIT" + }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/https-proxy-agent": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/i18next": { + "version": "23.12.2", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.2.tgz", + "integrity": "sha512-XIeh5V+bi8SJSWGL3jqbTEBW5oD6rbP5L+E7dVQh1MNTxxYef0x15rhJVcRb7oiuq4jLtgy2SD8eFlf6P2cmqg==", + "funding": [ + { + "type": "individual", + "url": "https://locize.com" + }, + { + "type": "individual", + "url": "https://locize.com/i18next.html" + }, + { + "type": "individual", + "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" + } + ], + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.2" + } + }, + "node_modules/i18next-browser-languagedetector": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-7.2.1.tgz", + "integrity": "sha512-h/pM34bcH6tbz8WgGXcmWauNpQupCGr25XPp9cZwZInR9XHSjIFDYp1SIok7zSPsTOMxdvuLyu86V+g2Kycnfw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.2" + } + }, + "node_modules/i18next-http-backend": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.6.1.tgz", + "integrity": "sha512-rCilMAnlEQNeKOZY1+x8wLM5IpYOj10guGvEpeC59tNjj6MMreLIjIW8D1RclhD3ifLwn6d/Y9HEM1RUE6DSog==", + "license": "MIT", + "dependencies": { + "cross-fetch": "4.0.0" + } + }, + "node_modules/i18next-korean-postposition-processor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/i18next-korean-postposition-processor/-/i18next-korean-postposition-processor-1.0.0.tgz", + "integrity": "sha512-ruNXjI9awsFK6Ie+F9gYaMW8ciLMuCkeRjH9QkSv2Wb8xI0mnm773v3M9eua8dtvAXudIUk4p6Ho7hNkEASXDg==", + "license": "MIT", + "peerDependencies": { + "i18next": ">=8.4.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ignore": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/ini": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", + "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/inquirer": { + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-11.0.2.tgz", + "integrity": "sha512-pnbn3nL+JFrTw/pLhzyE/IQ3+gA3n5JxTAZQDjB6qu4gbjOaiTnpZbxT6HY2DDCT7bzDjTTsd3snRP+B6N//Pg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.2.1", + "@inquirer/prompts": "^6.0.1", + "@inquirer/type": "^2.0.0", + "@types/mute-stream": "^0.0.4", + "ansi-escapes": "^4.3.2", + "mute-stream": "^1.0.0", + "run-async": "^3.0.0", + "rxjs": "^7.8.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/interpret": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", + "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/is-core-module": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", + "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", + "dev": true, + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-installed-globally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-1.0.0.tgz", + "integrity": "sha512-K55T22lfpQ63N4KEN57jZUAaAYqYHEe8veb/TycJRk9DdSCLLcovXz/mL6mOnhQaZsQGwPhuFopdQIlqGSEjiQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "global-directory": "^4.0.1", + "is-path-inside": "^4.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-installed-globally/node_modules/is-path-inside": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz", + "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-node-process": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz", + "integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz", + "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.23", + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jest-canvas-mock": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.5.2.tgz", + "integrity": "sha512-vgnpPupjOL6+L5oJXzxTxFrlGEIbHdZqFU+LFNdtLxZ3lRDCl17FlTMM7IatoRQkrcyOTMlDinjUguqmQ6bR2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "cssfontparser": "^1.2.1", + "moo-color": "^1.0.2" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsdom": { + "version": "24.1.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.0.tgz", + "integrity": "sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==", + "dev": true, + "license": "MIT", + "dependencies": { + "cssstyle": "^4.0.1", + "data-urls": "^5.0.0", + "decimal.js": "^10.4.3", + "form-data": "^4.0.0", + "html-encoding-sniffer": "^4.0.0", + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.4", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.10", + "parse5": "^7.1.2", + "rrweb-cssom": "^0.7.0", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.1.4", + "w3c-xmlserializer": "^5.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^3.1.1", + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0", + "ws": "^8.17.0", + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "canvas": "^2.11.2" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "node_modules/json-stable-stringify": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz", + "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.5", + "isarray": "^2.0.5", + "jsonify": "^0.0.1", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", + "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", + "license": "Public Domain", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/lefthook": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/lefthook/-/lefthook-1.7.4.tgz", + "integrity": "sha512-lVv3nKH9l3KMDS3bySROvWJSw1+AsBHUO7xaA0rg1IEBZrj3+ePmM+a8elX+GU3Go1OzsZEYjo5AOOeLoZ7FQg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "lefthook": "bin/index.js" + }, + "optionalDependencies": { + "lefthook-darwin-arm64": "1.7.4", + "lefthook-darwin-x64": "1.7.4", + "lefthook-freebsd-arm64": "1.7.4", + "lefthook-freebsd-x64": "1.7.4", + "lefthook-linux-arm64": "1.7.4", + "lefthook-linux-x64": "1.7.4", + "lefthook-windows-arm64": "1.7.4", + "lefthook-windows-x64": "1.7.4" + } + }, + "node_modules/lefthook-darwin-arm64": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.7.4.tgz", + "integrity": "sha512-6XpenaP0W7ZYA3lhHey/C1U+KmYz6eCq2cGswQsrTX+xdtHdWW3NbbOKngxATRTF8+CtF6m9UB2afP7qqkCghQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/lefthook-darwin-x64": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/lefthook-darwin-x64/-/lefthook-darwin-x64-1.7.4.tgz", + "integrity": "sha512-lpQXbPMHiaWE7+9fV+spjuMKiZ3J/+oI6hY1/l48MO3LmSpIv6DNy0VHho1fZVQnHdBU4bDh5c1G0r1f5T0irg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/lefthook-freebsd-arm64": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.7.4.tgz", + "integrity": "sha512-wv+JZgkD1/wi4X5aKKNodvxNcFcYmvL7uyzKkbtd/LgX5ssh9r5pO9J/71ULGtEuTXH4kqORRtez7u/ygqMEew==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/lefthook-freebsd-x64": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.7.4.tgz", + "integrity": "sha512-xoYR0Ay8pbyY9W9mI+iI9VDkkCVYSXhMf9XyOChSlu2XmjKiqi23hjCXvSOpvHQ7jphGvAVpE3Byijr6Xjuihw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/lefthook-linux-arm64": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/lefthook-linux-arm64/-/lefthook-linux-arm64-1.7.4.tgz", + "integrity": "sha512-WvXWzSM/e08n2f5lcC8j+pUMS0RzZftJK4zuBQ36TstSYXfBjWiw+FMnKCVZk6Q8Zc0icyF8sTmKQAyKCgX+UA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/lefthook-linux-x64": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/lefthook-linux-x64/-/lefthook-linux-x64-1.7.4.tgz", + "integrity": "sha512-eR5NxGzqPJm3wDTm4HStwGxOZ8Omb0ooodyuQdEOxtYidLrd4U18N14huwCEFd3BAOrjIWYV8plH+ReTZE56eg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/lefthook-windows-arm64": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/lefthook-windows-arm64/-/lefthook-windows-arm64-1.7.4.tgz", + "integrity": "sha512-C+MdHH+0ylermetMHwfHsYYNI5HI6QEOx7N4Iw4Ea6c3Yuj3eG3LsAzrhsup7KLSSBmDgIHOCJUx/Mfh2z+ATw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/lefthook-windows-x64": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/lefthook-windows-x64/-/lefthook-windows-x64-1.7.4.tgz", + "integrity": "sha512-BDQhiRzmMYPFQFtVtkRfUfeZuSlemG1oJfGKYXlCGFskvK9Jm1nGFnG0Ig63FAQaFdW33DFoLdr9ZKFTUQeSwQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dependencies": { + "immediate": "~3.0.5" + } + }, + "node_modules/linkify-it": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", + "dev": true, + "dependencies": { + "uc.micro": "^2.0.0" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/loupe": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", + "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==", + "dev": true, + "license": "MIT" + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/lunr": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", + "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", + "dev": true, + "license": "MIT" + }, + "node_modules/magic-string": { + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, + "node_modules/magicast": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz", + "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.25.4", + "@babel/types": "^7.25.4", + "source-map-js": "^1.2.0" + } + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/markdown-it": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", + "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1", + "entities": "^4.4.0", + "linkify-it": "^5.0.0", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.1.0" + }, + "bin": { + "markdown-it": "bin/markdown-it.mjs" + } + }, + "node_modules/mdurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", + "dev": true + }, + "node_modules/memoize": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/memoize/-/memoize-10.0.0.tgz", + "integrity": "sha512-H6cBLgsi6vMWOcCpvVCdFFnl3kerEXbrYh9q+lY6VXvQSmM6CkmV08VOwT+WE2tzIEqRPFfAq3fm4v/UIW6mSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-function": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sindresorhus/memoize?sponsor=1" + } + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-function": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", + "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/moo-color": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/moo-color/-/moo-color-1.0.3.tgz", + "integrity": "sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "^1.1.4" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/msw": { + "version": "2.4.9", + "resolved": "https://registry.npmjs.org/msw/-/msw-2.4.9.tgz", + "integrity": "sha512-1m8xccT6ipN4PTqLinPwmzhxQREuxaEJYdx4nIbggxP8aM7r1e71vE7RtOUSQoAm1LydjGfZKy7370XD/tsuYg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@bundled-es-modules/cookie": "^2.0.0", + "@bundled-es-modules/statuses": "^1.0.1", + "@bundled-es-modules/tough-cookie": "^0.1.6", + "@inquirer/confirm": "^3.0.0", + "@mswjs/interceptors": "^0.35.8", + "@open-draft/until": "^2.1.0", + "@types/cookie": "^0.6.0", + "@types/statuses": "^2.0.4", + "chalk": "^4.1.2", + "graphql": "^16.8.1", + "headers-polyfill": "^4.0.2", + "is-node-process": "^1.2.0", + "outvariant": "^1.4.2", + "path-to-regexp": "^6.3.0", + "strict-event-emitter": "^0.5.1", + "type-fest": "^4.9.0", + "yargs": "^17.7.2" + }, + "bin": { + "msw": "cli/index.js" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/mswjs" + }, + "peerDependencies": { + "typescript": ">= 4.8.x" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/msw/node_modules/@inquirer/confirm": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.2.0.tgz", + "integrity": "sha512-oOIwPs0Dvq5220Z8lGL/6LHRTEr9TgLHmiI99Rj1PJ1p1czTys+olrgBqZk4E2qC0YTzeHprxSQmoHioVdJ7Lw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/msw/node_modules/@inquirer/type": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz", + "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==", + "dev": true, + "license": "MIT", + "dependencies": { + "mute-stream": "^1.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/msw/node_modules/type-fest": { + "version": "4.26.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz", + "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mustache": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", + "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", + "license": "MIT", + "bin": { + "mustache": "bin/mustache" + } + }, + "node_modules/mute-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", + "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/nanoid": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/node-releases": { + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.17.tgz", + "integrity": "sha512-Ww6ZlOiEQfPfXM45v17oabk77Z7mg5bOt7AjDyzy7RjK9OrLrLC8dyZQoAPEOtFX9SaNf1Tdvr5gRJWdTJj7GA==", + "dev": true + }, + "node_modules/nwsapi": { + "version": "2.2.12", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz", + "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==", + "dev": true + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/outvariant": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz", + "integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==", + "dev": true, + "license": "MIT" + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" + }, + "node_modules/papaparse": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.4.1.tgz", + "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw==", + "license": "MIT" + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse5": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "entities": "^4.4.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/path-to-regexp": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/pathe": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/pathval": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", + "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14.16" + } + }, + "node_modules/phaser": { + "version": "3.80.1", + "resolved": "https://registry.npmjs.org/phaser/-/phaser-3.80.1.tgz", + "integrity": "sha512-VQGAWoDOkEpAWYkI+PUADv5Ql+SM0xpLuAMBJHz9tBcOLqjJ2wd8bUhxJgOqclQlLTg97NmMd9MhS75w16x1Cw==", + "license": "MIT", + "dependencies": { + "eventemitter3": "^5.0.1" + } + }, + "node_modules/phaser3-rex-plugins": { + "version": "1.80.5", + "resolved": "https://registry.npmjs.org/phaser3-rex-plugins/-/phaser3-rex-plugins-1.80.5.tgz", + "integrity": "sha512-hdL3Cm6dK72w6phQdGnEiqqntlwT8SvjU0yit7DkdqiPy/Io1g3KnsRFqndtY+Hu69zaMEuckpIVeQK6yVwx4A==", + "dependencies": { + "eventemitter3": "^3.1.2", + "i18next": "^22.5.1", + "i18next-http-backend": "^2.5.2", + "js-yaml": "^4.1.0", + "mustache": "^4.2.0", + "papaparse": "^5.4.1", + "webfontloader": "^1.6.28" + } + }, + "node_modules/phaser3-rex-plugins/node_modules/eventemitter3": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", + "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==", + "license": "MIT" + }, + "node_modules/phaser3-rex-plugins/node_modules/i18next": { + "version": "22.5.1", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-22.5.1.tgz", + "integrity": "sha512-8TGPgM3pAD+VRsMtUMNknRz3kzqwp/gPALrWMsDnmC1mKqJwpWyooQRLMcbTwq8z8YwSmuj+ZYvc+xCuEpkssA==", + "funding": [ + { + "type": "individual", + "url": "https://locize.com" + }, + { + "type": "individual", + "url": "https://locize.com/i18next.html" + }, + { + "type": "individual", + "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" + } + ], + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.20.6" + } + }, + "node_modules/phaser3spectorjs": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/phaser3spectorjs/-/phaser3spectorjs-0.0.8.tgz", + "integrity": "sha512-0dSO7/aMjEUPrp5EcjRvRRsEf+jXDbmzalPeJ6VtTB2Pn1PeaKc+qlL/DmO3l1Dvc5lkzc+Sil1Ta+Hkyi5cbA==", + "dev": true, + "license": "MIT" + }, + "node_modules/picocolors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "dev": true + }, + "node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/postcss": { + "version": "8.4.47", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", + "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "nanoid": "^3.3.7", + "picocolors": "^1.1.0", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/postcss/node_modules/picocolors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "dev": true + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "dev": true, + "license": "MIT" + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/punycode.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", + "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/readable-stream/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + }, + "node_modules/rechoir": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", + "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", + "license": "MIT" + }, + "node_modules/regexp-tree": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz", + "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==", + "dev": true, + "license": "MIT", + "bin": { + "regexp-tree": "bin/regexp-tree" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rollup": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz", + "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==", + "dev": true, + "dependencies": { + "@types/estree": "1.0.5" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.22.4", + "@rollup/rollup-android-arm64": "4.22.4", + "@rollup/rollup-darwin-arm64": "4.22.4", + "@rollup/rollup-darwin-x64": "4.22.4", + "@rollup/rollup-linux-arm-gnueabihf": "4.22.4", + "@rollup/rollup-linux-arm-musleabihf": "4.22.4", + "@rollup/rollup-linux-arm64-gnu": "4.22.4", + "@rollup/rollup-linux-arm64-musl": "4.22.4", + "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4", + "@rollup/rollup-linux-riscv64-gnu": "4.22.4", + "@rollup/rollup-linux-s390x-gnu": "4.22.4", + "@rollup/rollup-linux-x64-gnu": "4.22.4", + "@rollup/rollup-linux-x64-musl": "4.22.4", + "@rollup/rollup-win32-arm64-msvc": "4.22.4", + "@rollup/rollup-win32-ia32-msvc": "4.22.4", + "@rollup/rollup-win32-x64-msvc": "4.22.4", + "fsevents": "~2.3.2" + } + }, + "node_modules/rrweb-cssom": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz", + "integrity": "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==", + "dev": true + }, + "node_modules/run-async": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz", + "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "node_modules/safe-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz", + "integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==", + "dev": true, + "license": "MIT", + "dependencies": { + "regexp-tree": "~0.1.1" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true, + "license": "MIT" + }, + "node_modules/saxes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", + "dev": true, + "license": "ISC", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=v12.22.7" + } + }, + "node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/shiki": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.12.0.tgz", + "integrity": "sha512-BuAxWOm5JhRcbSOl7XCei8wGjgJJonnV0oipUupPY58iULxUGyHhW5CF+9FRMuM1pcJ5cGEJGll1LusX6FwpPA==", + "dev": true, + "dependencies": { + "@shikijs/core": "1.12.0", + "@types/hast": "^3.0.4" + } + }, + "node_modules/siginfo": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", + "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", + "dev": true, + "license": "ISC" + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true, + "license": "MIT" + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stable-hash": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.4.tgz", + "integrity": "sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==", + "dev": true, + "license": "MIT" + }, + "node_modules/stackback": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", + "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", + "dev": true, + "license": "MIT" + }, + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/std-env": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.0.tgz", + "integrity": "sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==", + "dev": true, + "license": "MIT" + }, + "node_modules/strict-event-emitter": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz", + "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/string-width/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/string-width/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true, + "license": "MIT" + }, + "node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/teamcity-service-messages": { + "version": "0.1.14", + "resolved": "https://registry.npmjs.org/teamcity-service-messages/-/teamcity-service-messages-0.1.14.tgz", + "integrity": "sha512-29aQwaHqm8RMX74u2o/h1KbMLP89FjNiMxD9wbF2BbWOnbM+q+d1sCEC+MqCc4QW3NJykn77OMpTFw/xTHIc0w==", + "dev": true, + "license": "MIT" + }, + "node_modules/test-exclude": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz", + "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^10.4.1", + "minimatch": "^9.0.4" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/test-exclude/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/tinybench": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", + "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/tinyexec": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", + "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/tinypool": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz", + "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.0.0 || >=20.0.0" + } + }, + "node_modules/tinyrainbow": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz", + "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/tinyspy": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz", + "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tough-cookie": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", + "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz", + "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==", + "dev": true, + "dependencies": { + "punycode": "^2.3.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/ts-api-utils": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", + "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, + "node_modules/tsconfck": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.1.tgz", + "integrity": "sha512-00eoI6WY57SvZEVjm13stEVE90VkEdJAFGgpFLTsZbJyW/LwFQ7uQxJHWpZ2hzSWgCPKc9AnBnNP+0X7o3hAmQ==", + "dev": true, + "license": "MIT", + "bin": { + "tsconfck": "bin/tsconfck.js" + }, + "engines": { + "node": "^18 || >=20" + }, + "peerDependencies": { + "typescript": "^5.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/tsconfig-paths-webpack-plugin": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz", + "integrity": "sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.7.0", + "tsconfig-paths": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tslib": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "dev": true, + "license": "0BSD" + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typedoc": { + "version": "0.26.5", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.26.5.tgz", + "integrity": "sha512-Vn9YKdjKtDZqSk+by7beZ+xzkkr8T8CYoiasqyt4TTRFy5+UHzL/mF/o4wGBjRF+rlWQHDb0t6xCpA3JNL5phg==", + "dev": true, + "dependencies": { + "lunr": "^2.3.9", + "markdown-it": "^14.1.0", + "minimatch": "^9.0.5", + "shiki": "^1.9.1", + "yaml": "^2.4.5" + }, + "bin": { + "typedoc": "bin/typedoc" + }, + "engines": { + "node": ">= 18" + }, + "peerDependencies": { + "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x" + } + }, + "node_modules/typescript": { + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/typescript-eslint": { + "version": "8.0.0-alpha.58", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.0.0-alpha.58.tgz", + "integrity": "sha512-0mvrodNhExpkWns+5RaZP8YqsAfPyjmPVVM1p+kaJkvApMH58/VFcQ0iSQuun0bFRNCMvW0ZUdulS9AsHqVXkg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/eslint-plugin": "8.0.0-alpha.58", + "@typescript-eslint/parser": "8.0.0-alpha.58", + "@typescript-eslint/utils": "8.0.0-alpha.58" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/uc.micro": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", + "dev": true + }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true, + "license": "MIT" + }, + "node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.1.2", + "picocolors": "^1.0.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, + "node_modules/vite": { + "version": "5.4.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", + "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.21.3", + "postcss": "^8.4.43", + "rollup": "^4.20.0" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^18.0.0 || >=20.0.0", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "sass-embedded": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } + } + }, + "node_modules/vite-node": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.9.tgz", + "integrity": "sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==", + "dev": true, + "license": "MIT", + "dependencies": { + "cac": "^6.7.14", + "debug": "^4.3.7", + "es-module-lexer": "^1.5.4", + "pathe": "^1.1.2", + "vite": "^5.0.0" + }, + "bin": { + "vite-node": "vite-node.mjs" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/vite-tsconfig-paths": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz", + "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.1.1", + "globrex": "^0.1.2", + "tsconfck": "^3.0.3" + }, + "peerDependencies": { + "vite": "*" + }, + "peerDependenciesMeta": { + "vite": { + "optional": true + } + } + }, + "node_modules/vitest": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.9.tgz", + "integrity": "sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/expect": "2.1.9", + "@vitest/mocker": "2.1.9", + "@vitest/pretty-format": "^2.1.9", + "@vitest/runner": "2.1.9", + "@vitest/snapshot": "2.1.9", + "@vitest/spy": "2.1.9", + "@vitest/utils": "2.1.9", + "chai": "^5.1.2", + "debug": "^4.3.7", + "expect-type": "^1.1.0", + "magic-string": "^0.30.12", + "pathe": "^1.1.2", + "std-env": "^3.8.0", + "tinybench": "^2.9.0", + "tinyexec": "^0.3.1", + "tinypool": "^1.0.1", + "tinyrainbow": "^1.2.0", + "vite": "^5.0.0", + "vite-node": "2.1.9", + "why-is-node-running": "^2.3.0" + }, + "bin": { + "vitest": "vitest.mjs" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "@edge-runtime/vm": "*", + "@types/node": "^18.0.0 || >=20.0.0", + "@vitest/browser": "2.1.9", + "@vitest/ui": "2.1.9", + "happy-dom": "*", + "jsdom": "*" + }, + "peerDependenciesMeta": { + "@edge-runtime/vm": { + "optional": true + }, + "@types/node": { + "optional": true + }, + "@vitest/browser": { + "optional": true + }, + "@vitest/ui": { + "optional": true + }, + "happy-dom": { + "optional": true + }, + "jsdom": { + "optional": true + } + } + }, + "node_modules/vitest-canvas-mock": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/vitest-canvas-mock/-/vitest-canvas-mock-0.3.3.tgz", + "integrity": "sha512-3P968tYBpqYyzzOaVtqnmYjqbe13576/fkjbDEJSfQAkHtC5/UjuRHOhFEN/ZV5HVZIkaROBUWgazDKJ+Ibw+Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "jest-canvas-mock": "~2.5.2" + }, + "peerDependencies": { + "vitest": "*" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", + "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/watskeburt": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/watskeburt/-/watskeburt-4.1.0.tgz", + "integrity": "sha512-KkY5H51ajqy9HYYI+u9SIURcWnqeVVhdH0I+ab6aXPGHfZYxgRCwnR6Lm3+TYB6jJVt5jFqw4GAKmwf1zHmGQw==", + "dev": true, + "bin": { + "watskeburt": "dist/run-cli.js" + }, + "engines": { + "node": "^18||>=20" + } + }, + "node_modules/webfontloader": { + "version": "1.6.28", + "resolved": "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.28.tgz", + "integrity": "sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ==", + "license": "Apache-2.0" + }, + "node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/whatwg-encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, + "node_modules/whatwg-url": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz", + "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==", + "dev": true, + "dependencies": { + "tr46": "^5.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/why-is-node-running": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", + "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", + "dev": true, + "license": "MIT", + "dependencies": { + "siginfo": "^2.0.0", + "stackback": "0.0.2" + }, + "bin": { + "why-is-node-running": "cli.js" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/ws": { + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xml-name-validator": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", + "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true, + "license": "MIT" + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "license": "ISC" + }, + "node_modules/yaml": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", + "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", + "dev": true, + "bin": { + "yaml": "bin.mjs" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yoctocolors-cjs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz", + "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } } diff --git a/package.json b/package.json index da5bc393c52..ce9e8b4a07b 100644 --- a/package.json +++ b/package.json @@ -1,74 +1,71 @@ { - "name": "pokemon-rogue-battle", - "private": true, - "version": "1.5.2", - "type": "module", - "scripts": { - "start": "vite", - "start:dev": "vite --mode development", - "build": "vite build", - "build:beta": "vite build --mode beta", - "preview": "vite preview", - "test": "vitest run --project pre && vitest run --project main", - "test:cov": "vitest run --project pre && vitest run --project main --coverage", - "test:watch": "vitest run --project pre && vitest watch --project main --coverage", - "test:silent": "vitest run --project pre && vitest run --project main --silent", - "typecheck": "tsc --noEmit", - "eslint": "eslint --fix .", - "eslint-ci": "eslint .", - "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", - "postinstall": "npx lefthook install && npx lefthook run post-merge", - "update-version:patch": "npm version patch --force --no-git-tag-version", - "update-version:minor": "npm version minor --force --no-git-tag-version", - "update-locales:remote": "git submodule update --progress --init --recursive --force --remote" - }, - "devDependencies": { - "@eslint/js": "^9.3.0", - "@hpcc-js/wasm": "^2.18.0", - "@stylistic/eslint-plugin-ts": "^2.6.0-beta.0", - "@types/jsdom": "^21.1.7", - "@types/node": "^20.12.13", - "@typescript-eslint/eslint-plugin": "^8.0.0-alpha.54", - "@typescript-eslint/parser": "^8.0.0-alpha.54", - "@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.4.8", - "vite-tsconfig-paths": "^4.3.2", - "vitest": "^2.0.4", - "vitest-canvas-mock": "^0.3.3" - }, - "dependencies": { - "@material/material-color-utilities": "^0.2.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", - "jszip": "^3.10.1", - "phaser": "^3.70.0", - "phaser3-rex-plugins": "^1.1.84" - }, - "engines": { - "node": ">=20.0.0" - }, - "imports": { - "#enums/*": "./enums/*", - "#app": "./src/main.js", - "#app/*": "./src/*", - "#test/*": "./src/test/*" - } + "name": "pokemon-rogue-battle", + "private": true, + "version": "1.7.7", + "type": "module", + "scripts": { + "start": "vite", + "start:dev": "vite --mode development", + "build": "vite build", + "build:beta": "vite build --mode beta", + "preview": "vite preview", + "test": "vitest run --project pre && vitest run --project main", + "test:cov": "vitest run --project pre && vitest run --project main --coverage", + "test:watch": "vitest run --project pre && vitest watch --project main --coverage", + "test:silent": "vitest run --project pre && vitest run --project main --silent", + "typecheck": "tsc --noEmit", + "eslint": "eslint --fix .", + "eslint-ci": "eslint .", + "biome": "biome check --write --changed --no-errors-on-unmatched", + "biome-ci": "biome ci --diagnostic-level=error --reporter=github --changed --no-errors-on-unmatched", + "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", + "postinstall": "npx lefthook install && npx lefthook run post-merge", + "update-version:patch": "npm version patch --force --no-git-tag-version", + "update-version:minor": "npm version minor --force --no-git-tag-version", + "update-locales:remote": "git submodule update --progress --init --recursive --force --remote" + }, + "devDependencies": { + "@biomejs/biome": "1.9.4", + "@eslint/js": "^9.3.0", + "@hpcc-js/wasm": "^2.18.0", + "@stylistic/eslint-plugin-ts": "^2.6.0-beta.0", + "@types/jsdom": "^21.1.7", + "@types/node": "^20.12.13", + "@typescript-eslint/eslint-plugin": "^8.0.0-alpha.54", + "@typescript-eslint/parser": "^8.0.0-alpha.54", + "@vitest/coverage-istanbul": "^2.1.9", + "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.4.14", + "vite-tsconfig-paths": "^4.3.2", + "vitest": "^2.1.9", + "vitest-canvas-mock": "^0.3.3" + }, + "dependencies": { + "@material/material-color-utilities": "^0.2.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", + "jszip": "^3.10.1", + "phaser": "^3.70.0", + "phaser3-rex-plugins": "^1.1.84" + }, + "engines": { + "node": ">=20.0.0" + } } diff --git a/public/audio/bgm/end.mp3 b/public/audio/bgm/end.mp3 index c37973fd9cc..fa33f890dc3 100644 Binary files a/public/audio/bgm/end.mp3 and b/public/audio/bgm/end.mp3 differ diff --git a/public/battle-anims/common-terastallize.json b/public/battle-anims/common-terastallize.json new file mode 100644 index 00000000000..3843464dbde --- /dev/null +++ b/public/battle-anims/common-terastallize.json @@ -0,0 +1,774 @@ +{ + "graphic": "terastallize", + "frames": [ + [ + { + "x": 0, + "y": 0, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 0, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 2 + }, + { + "x": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 0, + "opacity": 150, + "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": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 0, + "opacity": 225, + "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": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 70, + "zoomY": 70, + "visible": true, + "target": 2, + "graphicFrame": 1, + "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": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 70, + "zoomY": 70, + "visible": true, + "target": 2, + "graphicFrame": 1, + "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": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 90, + "zoomY": 90, + "visible": true, + "target": 2, + "graphicFrame": 1, + "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": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 90, + "zoomY": 90, + "visible": true, + "target": 2, + "graphicFrame": 1, + "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": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 1, + "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": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 1, + "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": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 1, + "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": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 1, + "opacity": 200, + "priority": 1, + "focus": 2 + } + ], + [ + { + "x": 0, + "y": 0, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 0, + "graphicFrame": 0, + "opacity": 255, + "tone": [ + 100, + 100, + 100, + 0 + ], + "locked": true, + "priority": 1, + "focus": 2 + }, + { + "x": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 1, + "opacity": 100, + "priority": 1, + "focus": 2 + } + ], + [ + { + "x": 0, + "y": 0, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 0, + "graphicFrame": 0, + "opacity": 255, + "tone": [ + 100, + 100, + 100, + 0 + ], + "locked": true, + "priority": 1, + "focus": 2 + }, + { + "x": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 1, + "opacity": 100, + "priority": 1, + "focus": 2 + } + ], + [ + { + "x": 0, + "y": 0, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 0, + "graphicFrame": 0, + "opacity": 255, + "tone": [ + 100, + 100, + 100, + 0 + ], + "locked": true, + "priority": 1, + "focus": 2 + }, + { + "x": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 1, + "opacity": 60, + "priority": 1, + "focus": 2 + } + ], + [ + { + "x": 0, + "y": 0, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 0, + "graphicFrame": 0, + "opacity": 255, + "tone": [ + 100, + 100, + 100, + 0 + ], + "locked": true, + "priority": 1, + "focus": 2 + }, + { + "x": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 1, + "opacity": 60, + "priority": 1, + "focus": 2 + } + ], + [ + { + "x": 0, + "y": 0, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 0, + "graphicFrame": 0, + "opacity": 255, + "tone": [ + 100, + 100, + 100, + 0 + ], + "locked": true, + "priority": 1, + "focus": 2 + }, + { + "x": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + }, + { + "x": 0, + "y": -20, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 2, + "graphicFrame": 1, + "opacity": 60, + "priority": 1, + "focus": 2 + } + ], + [ + { + "x": 0, + "y": 0, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 0, + "graphicFrame": 0, + "opacity": 255, + "tone": [ + 100, + 100, + 100, + 0 + ], + "locked": true, + "priority": 1, + "focus": 2 + }, + { + "x": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + } + ], + [ + { + "x": 0, + "y": 0, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 0, + "graphicFrame": 0, + "opacity": 255, + "tone": [ + 255, + 255, + 255, + 255 + ], + "locked": true, + "priority": 1, + "focus": 2 + }, + { + "x": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + } + ], + [ + { + "x": 0, + "y": 0, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 0, + "graphicFrame": 0, + "opacity": 255, + "tone": [ + 255, + 255, + 255, + 0 + ], + "locked": true, + "priority": 1, + "focus": 2 + }, + { + "x": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + } + ], + [ + { + "x": 0, + "y": 0, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 0, + "graphicFrame": 0, + "opacity": 255, + "tone": [ + 255, + 255, + 255, + 255 + ], + "locked": true, + "priority": 1, + "focus": 2 + }, + { + "x": 128, + "y": -64, + "zoomX": 100, + "zoomY": 100, + "visible": true, + "target": 1, + "graphicFrame": 0, + "opacity": 255, + "locked": true, + "priority": 1, + "focus": 1 + } + ] + ], + "frameTimedEvents": {}, + "position": 4, + "hue": 0 +} \ No newline at end of file diff --git a/public/exp-sprites.json b/public/exp-sprites.json index 947bffd399d..50e10a8822d 100644 --- a/public/exp-sprites.json +++ b/public/exp-sprites.json @@ -183,6 +183,8 @@ "487-origin", "531-mega", "531-mega", + "569-gigantamax", + "569-gigantamax", "6-mega", "6-mega", "6-mega-x", @@ -201,6 +203,8 @@ "6211", "6215", "6215", + "6215f", + "6215f", "65-mega", "65-mega", "650", @@ -259,10 +263,10 @@ "666-fancy", "666-garden", "666-garden", - "666-high", - "666-high", - "666-icy", - "666-icy", + "666-high-plains", + "666-high-plains", + "666-icy-snow", + "666-icy-snow", "666-jungle", "666-jungle", "666-marine", @@ -275,8 +279,8 @@ "666-monsoon", "666-ocean", "666-ocean", - "666-poke", - "666-poke", + "666-poke-ball", + "666-poke-ball", "666-polar", "666-polar", "666-river", @@ -291,8 +295,8 @@ "666-tundra", "667", "667", - "668-female", - "668-female", + "668f", + "668f", "668", "668", "669-blue", @@ -337,8 +341,6 @@ "6724", "673", "673", - "674", - "674", "675", "675", "676", @@ -381,16 +383,12 @@ "692", "693", "693", - "694", - "694", "695", "695", "696", "696", "697", "697", - "698", - "698", "699", "699", "700", @@ -399,18 +397,12 @@ "701", "702", "702", - "703", - "703", "704", "704", "705", "705", "706", "706", - "707", - "707", - "708", - "708", "709", "709", "710", @@ -421,8 +413,6 @@ "712", "713", "713", - "714", - "714", "715", "715", "716-active", @@ -431,16 +421,10 @@ "716-neutral", "717", "717", - "718-10", - "718-10", "718-complete", "718-complete", - "718", - "718", "719-mega", "719-mega", - "719", - "719", "720-unbound", "720-unbound", "720", @@ -711,6 +695,8 @@ "814", "815", "815", + "815-gigantamax", + "815-gigantamax", "816", "816", "817", @@ -761,6 +747,8 @@ "838", "839", "839", + "839-gigantamax", + "839-gigantamax", "840", "840", "841", @@ -1085,8 +1073,6 @@ "978-droopy", "978-stretchy", "978-stretchy", - "979", - "979", "980", "980", "981", @@ -1315,6 +1301,8 @@ "487b-origin", "531b-mega", "531b-mega", + "569b-gigantamax", + "569b-gigantamax", "6b-mega", "6b-mega", "6b-mega-x", @@ -1333,6 +1321,8 @@ "6211b", "6215b", "6215b", + "6215bf", + "6215bf", "65b-mega", "65b-mega", "650b", @@ -1391,10 +1381,10 @@ "666b-fancy", "666b-garden", "666b-garden", - "666b-high", - "666b-high", - "666b-icy", - "666b-icy", + "666b-high-plains", + "666b-high-plains", + "666b-icy-snow", + "666b-icy-snow", "666b-jungle", "666b-jungle", "666b-marine", @@ -1407,8 +1397,8 @@ "666b-monsoon", "666b-ocean", "666b-ocean", - "666b-poke", - "666b-poke", + "666b-poke-ball", + "666b-poke-ball", "666b-polar", "666b-polar", "666b-river", @@ -1423,8 +1413,8 @@ "666b-tundra", "667b", "667b", - "668b-female", - "668b-female", + "668bf", + "668bf", "668b", "668b", "669b-blue", @@ -1469,8 +1459,6 @@ "6724b", "673b", "673b", - "674b", - "674b", "675b", "675b", "676b", @@ -1513,16 +1501,12 @@ "692b", "693b", "693b", - "694b", - "694b", "695b", "695b", "696b", "696b", "697b", "697b", - "698b", - "698b", "699b", "699b", "700b", @@ -1531,18 +1515,12 @@ "701b", "702b", "702b", - "703b", - "703b", "704b", "704b", "705b", "705b", "706b", "706b", - "707b", - "707b", - "708b", - "708b", "709b", "709b", "710b", @@ -1553,8 +1531,6 @@ "712b", "713b", "713b", - "714b", - "714b", "715b", "715b", "716b-active", @@ -1563,16 +1539,10 @@ "716b-neutral", "717b", "717b", - "718b-10", - "718b-10", "718b-complete", "718b-complete", - "718b", - "718b", "719b-mega", "719b-mega", - "719b", - "719b", "720b-unbound", "720b-unbound", "720b", @@ -1843,6 +1813,8 @@ "814b", "815b", "815b", + "815b-gigantamax", + "815b-gigantamax", "816b", "816b", "817b", @@ -1893,6 +1865,8 @@ "838b", "839b", "839b", + "839b-gigantamax", + "839b-gigantamax", "840b", "840b", "841b", @@ -2219,8 +2193,6 @@ "978b-droopy", "978b-stretchy", "978b-stretchy", - "979b", - "979b", "980b", "980b", "981b", @@ -2449,6 +2421,8 @@ "487sb-origin", "531sb-mega", "531sb-mega", + "569sb-gigantamax", + "569sb-gigantamax", "6sb-mega", "6sb-mega", "6sb-mega-x", @@ -2467,6 +2441,8 @@ "6211sb", "6215sb", "6215sb", + "6215sbf", + "6215sbf", "65sb-mega", "65sb-mega", "650sb", @@ -2525,10 +2501,10 @@ "666sb-fancy", "666sb-garden", "666sb-garden", - "666sb-high", - "666sb-high", - "666sb-icy", - "666sb-icy", + "666sb-high-plains", + "666sb-high-plains", + "666sb-icy-snow", + "666sb-icy-snow", "666sb-jungle", "666sb-jungle", "666sb-marine", @@ -2541,8 +2517,8 @@ "666sb-monsoon", "666sb-ocean", "666sb-ocean", - "666sb-poke", - "666sb-poke", + "666sb-poke-ball", + "666sb-poke-ball", "666sb-polar", "666sb-polar", "666sb-river", @@ -2559,6 +2535,8 @@ "667sb", "668sb", "668sb", + "668sbf", + "668sbf", "669sb-blue", "669sb-blue", "669sb-orange", @@ -2601,8 +2579,6 @@ "6724sb", "673sb", "673sb", - "674sb", - "674sb", "675sb", "675sb", "676sb", @@ -2645,16 +2621,12 @@ "692sb", "693sb", "693sb", - "694sb", - "694sb", "695sb", "695sb", "696sb", "696sb", "697sb", "697sb", - "698sb", - "698sb", "699sb", "699sb", "700sb", @@ -2663,18 +2635,12 @@ "701sb", "702sb", "702sb", - "703sb", - "703sb", "704sb", "704sb", "705sb", "705sb", "706sb", "706sb", - "707sb", - "707sb", - "708sb", - "708sb", "709sb", "709sb", "710sb", @@ -2685,8 +2651,6 @@ "712sb", "713sb", "713sb", - "714sb", - "714sb", "715sb", "715sb", "716sb-active", @@ -2695,16 +2659,10 @@ "716sb-neutral", "717sb", "717sb", - "718sb-10", - "718sb-10", "718sb-complete", "718sb-complete", - "718sb", - "718sb", "719sb-mega", "719sb-mega", - "719sb", - "719sb", "720sb-unbound", "720sb-unbound", "720sb", @@ -2975,6 +2933,8 @@ "814sb", "815sb", "815sb", + "815sb-gigantamax", + "815sb-gigantamax", "816sb", "816sb", "817sb", @@ -3025,6 +2985,8 @@ "838sb", "839sb", "839sb", + "839sb-gigantamax", + "839sb-gigantamax", "840sb", "840sb", "841sb", @@ -3351,8 +3313,6 @@ "978sb-droopy", "978sb-stretchy", "978sb-stretchy", - "979sb", - "979sb", "980sb", "980sb", "981sb", @@ -3586,6 +3546,8 @@ "487s-origin", "531s-mega", "531s-mega", + "569s-gigantamax", + "569s-gigantamax", "6s-mega", "6s-mega", "6s-mega-x", @@ -3604,6 +3566,8 @@ "6211s", "6215s", "6215s", + "6215sf", + "6215sf", "65s-mega", "65s-mega", "650s", @@ -3662,10 +3626,10 @@ "666s-fancy", "666s-garden", "666s-garden", - "666s-high", - "666s-high", - "666s-icy", - "666s-icy", + "666s-high-plains", + "666s-high-plains", + "666s-icy-snow", + "666s-icy-snow", "666s-jungle", "666s-jungle", "666s-marine", @@ -3678,8 +3642,8 @@ "666s-monsoon", "666s-ocean", "666s-ocean", - "666s-poke", - "666s-poke", + "666s-poke-ball", + "666s-poke-ball", "666s-polar", "666s-polar", "666s-river", @@ -3694,8 +3658,8 @@ "666s-tundra", "667s", "667s", - "668s-female", - "668s-female", + "668sf", + "668sf", "668s", "668s", "669s-blue", @@ -3740,8 +3704,6 @@ "6724s", "673s", "673s", - "674s", - "674s", "675s", "675s", "676s", @@ -3784,16 +3746,12 @@ "692s", "693s", "693s", - "694s", - "694s", "695s", "695s", "696s", "696s", "697s", "697s", - "698s", - "698s", "699s", "699s", "700s", @@ -3802,18 +3760,12 @@ "701s", "702s", "702s", - "703s", - "703s", "704s", "704s", "705s", "705s", "706s", "706s", - "707s", - "707s", - "708s", - "708s", "709s", "709s", "710s", @@ -3824,8 +3776,6 @@ "712s", "713s", "713s", - "714s", - "714s", "715s", "715s", "716s-active", @@ -3834,16 +3784,10 @@ "716s-neutral", "717s", "717s", - "718s-10", - "718s-10", "718s-complete", "718s-complete", - "718s", - "718s", "719s-mega", "719s-mega", - "719s", - "719s", "720s-unbound", "720s-unbound", "720s", @@ -4114,6 +4058,8 @@ "814s", "815s", "815s", + "815s-gigantamax", + "815s-gigantamax", "816s", "816s", "817s", @@ -4164,6 +4110,8 @@ "838s", "839s", "839s", + "839s-gigantamax", + "839s-gigantamax", "840s", "840s", "841s", @@ -4490,8 +4438,6 @@ "978s-droopy", "978s-stretchy", "978s-stretchy", - "979s", - "979s", "980s", "980s", "981s", @@ -4587,6 +4533,7 @@ "475-mega_3", "475-mega_3", "6215", + "6215f", "653", "654", "6549", @@ -4598,19 +4545,15 @@ "666-archipelago", "666-continental", "666-elegant", - "666-fancy_2", - "666-fancy_2", - "666-fancy_3", - "666-fancy_3", + "666-fancy", + "666-fancy", "666-garden", "666-high", - "666-icy", + "666-icy-snow", "666-jungle", "666-marine", - "666-meadow_2", - "666-meadow_2", - "666-meadow_3", - "666-meadow_3", + "666-meadow", + "666-meadow", "666-modern", "666-monsoon", "666-ocean", @@ -4619,8 +4562,6 @@ "666-poke", "666-polar", "666-river", - "666-river_2", - "666-river_2", "666-sandstorm", "666-savanna", "666-sun", @@ -4641,7 +4582,6 @@ "705_3", "705_3", "706", - "708", "709", "710", "711", @@ -4826,6 +4766,10 @@ "150b-mega", "181b-mega", "212b-mega", + "248b-mega", + "248b-mega", + "257b-mega", + "257b-mega", "282b-mega", "3b-mega_2", "3b-mega_2", @@ -4856,6 +4800,7 @@ "475b-mega_3", "475b-mega_3", "6215b", + "6215bf", "653b", "654b", "6549b", @@ -4866,86 +4811,46 @@ "665b", "665_2b", "665_2b", - "666b-archipelago_2", - "666b-archipelago_2", - "666b-archipelago_3", - "666b-archipelago_3", - "666b-continental_2", - "666b-continental_2", - "666b-continental_3", - "666b-continental_3", - "666b-elegant_2", - "666b-elegant_2", - "666b-elegant_3", - "666b-elegant_3", - "666b-fancy_2", - "666b-fancy_2", - "666b-fancy_3", - "666b-fancy_3", - "666b-garden_2", - "666b-garden_2", - "666b-garden_3", - "666b-garden_3", - "666b-high", - "666b-high", - "666b-high", - "666b-high", - "666b-icy", - "666b-icy", - "666b-icy", - "666b-icy", - "666b-jungle_2", - "666b-jungle_2", - "666b-jungle_3", - "666b-jungle_3", - "666b-marine_2", - "666b-marine_2", - "666b-marine_3", - "666b-marine_3", - "666b-meadow_2", - "666b-meadow_2", - "666b-meadow_3", - "666b-meadow_3", - "666b-modern_2", - "666b-modern_2", - "666b-modern_3", - "666b-modern_3", - "666b-monsoon_2", - "666b-monsoon_2", - "666b-monsoon_3", - "666b-monsoon_3", - "666b-ocean_2", - "666b-ocean_2", - "666b-ocean_3", - "666b-ocean_3", - "666b-poke", - "666b-poke", - "666b-poke", - "666b-poke", - "666b-polar_2", - "666b-polar_2", - "666b-polar_3", - "666b-polar_3", - "666b-river_2", - "666b-river_2", - "666b-river_3", - "666b-river_3", - "666b-sandstorm_2", - "666b-sandstorm_2", - "666b-sandstorm_3", - "666b-sandstorm_3", - "666b-savanna_2", - "666b-savanna_2", - "666b-savanna_3", - "666b-savanna_3", - "666b-sun_2", - "666b-sun_2", - "666b-sun_3", - "666b-sun_3", - "666b-tundra_2", - "666b-tundra_2", - "666b-tundra_3", - "666b-tundra_3", + "666b-archipelago", + "666b-archipelago", + "666b-continental", + "666b-continental", + "666b-elegant", + "666b-elegant", + "666b-fancy", + "666b-fancy", + "666b-garden", + "666b-garden", + "666b-high-plains", + "666b-high-plains", + "666b-icy-snow", + "666b-icy-snow", + "666b-jungle", + "666b-jungle", + "666b-marine", + "666b-marine", + "666b-meadow", + "666b-meadow", + "666b-modern", + "666b-modern", + "666b-monsoon", + "666b-monsoon", + "666b-ocean", + "666b-ocean", + "666b-poke-ball", + "666b-poke-ball", + "666b-polar", + "666b-polar", + "666b-river", + "666b-river", + "666b-sandstorm", + "666b-sandstorm", + "666b-savanna", + "666b-savanna", + "666b-sun", + "666b-sun", + "666b-tundra", + "666b-tundra", "6705b", "6706_2b", "6706_2b", @@ -4957,7 +4862,6 @@ "704b", "705b", "706b", - "708b", "709b", "710b", "711b", diff --git a/public/fonts/pokemon-emerald-pro.ttf b/public/fonts/pokemon-emerald-pro.ttf index 758130172c7..d63ff2d6470 100644 Binary files a/public/fonts/pokemon-emerald-pro.ttf and b/public/fonts/pokemon-emerald-pro.ttf differ diff --git a/public/images/battle_anims/terastallize.png b/public/images/battle_anims/terastallize.png new file mode 100644 index 00000000000..78fbb7ec335 Binary files /dev/null and b/public/images/battle_anims/terastallize.png differ diff --git a/public/images/events/pkmnday2025event-de.png b/public/images/events/pkmnday2025event-de.png new file mode 100644 index 00000000000..4cc53546752 Binary files /dev/null and b/public/images/events/pkmnday2025event-de.png differ diff --git a/public/images/events/pkmnday2025event-en.png b/public/images/events/pkmnday2025event-en.png new file mode 100644 index 00000000000..e9caa9e19d6 Binary files /dev/null and b/public/images/events/pkmnday2025event-en.png differ diff --git a/public/images/events/pkmnday2025event-es-ES.png b/public/images/events/pkmnday2025event-es-ES.png new file mode 100644 index 00000000000..e1ab096dffc Binary files /dev/null and b/public/images/events/pkmnday2025event-es-ES.png differ diff --git a/public/images/events/pkmnday2025event-fr.png b/public/images/events/pkmnday2025event-fr.png new file mode 100644 index 00000000000..037d1e06e61 Binary files /dev/null and b/public/images/events/pkmnday2025event-fr.png differ diff --git a/public/images/events/pkmnday2025event-it.png b/public/images/events/pkmnday2025event-it.png new file mode 100644 index 00000000000..f38a60330fa Binary files /dev/null and b/public/images/events/pkmnday2025event-it.png differ diff --git a/public/images/events/pkmnday2025event-ja.png b/public/images/events/pkmnday2025event-ja.png new file mode 100644 index 00000000000..94b02ad93a0 Binary files /dev/null and b/public/images/events/pkmnday2025event-ja.png differ diff --git a/public/images/events/pkmnday2025event-ko.png b/public/images/events/pkmnday2025event-ko.png new file mode 100644 index 00000000000..aed9ee3fb28 Binary files /dev/null and b/public/images/events/pkmnday2025event-ko.png differ diff --git a/public/images/events/pkmnday2025event-pt-BR.png b/public/images/events/pkmnday2025event-pt-BR.png new file mode 100644 index 00000000000..2190bbac535 Binary files /dev/null and b/public/images/events/pkmnday2025event-pt-BR.png differ diff --git a/public/images/events/pkmnday2025event-zh-CN.png b/public/images/events/pkmnday2025event-zh-CN.png new file mode 100644 index 00000000000..a3430482dd0 Binary files /dev/null and b/public/images/events/pkmnday2025event-zh-CN.png differ diff --git a/public/images/events/valentines2025event-de.png b/public/images/events/valentines2025event-de.png new file mode 100644 index 00000000000..8dd41924a77 Binary files /dev/null and b/public/images/events/valentines2025event-de.png differ diff --git a/public/images/events/valentines2025event-en.png b/public/images/events/valentines2025event-en.png new file mode 100644 index 00000000000..dc36dad3394 Binary files /dev/null and b/public/images/events/valentines2025event-en.png differ diff --git a/public/images/events/valentines2025event-es-ES.png b/public/images/events/valentines2025event-es-ES.png new file mode 100644 index 00000000000..0915299b7bd Binary files /dev/null and b/public/images/events/valentines2025event-es-ES.png differ diff --git a/public/images/events/valentines2025event-fr.png b/public/images/events/valentines2025event-fr.png new file mode 100644 index 00000000000..dbaf23101ed Binary files /dev/null and b/public/images/events/valentines2025event-fr.png differ diff --git a/public/images/events/valentines2025event-it.png b/public/images/events/valentines2025event-it.png new file mode 100644 index 00000000000..b10eb8083be Binary files /dev/null and b/public/images/events/valentines2025event-it.png differ diff --git a/public/images/events/valentines2025event-ja.png b/public/images/events/valentines2025event-ja.png new file mode 100644 index 00000000000..7e9fe5ad3d4 Binary files /dev/null and b/public/images/events/valentines2025event-ja.png differ diff --git a/public/images/events/valentines2025event-ko.png b/public/images/events/valentines2025event-ko.png new file mode 100644 index 00000000000..558a402fc77 Binary files /dev/null and b/public/images/events/valentines2025event-ko.png differ diff --git a/public/images/events/valentines2025event-pt-BR.png b/public/images/events/valentines2025event-pt-BR.png new file mode 100644 index 00000000000..45fa40f30fc Binary files /dev/null and b/public/images/events/valentines2025event-pt-BR.png differ diff --git a/public/images/events/valentines2025event-zh-CN.png b/public/images/events/valentines2025event-zh-CN.png new file mode 100644 index 00000000000..13256da720c Binary files /dev/null and b/public/images/events/valentines2025event-zh-CN.png differ diff --git a/public/images/pokemon/261.png b/public/images/pokemon/261.png index 9e47128a545..da22d88806f 100644 Binary files a/public/images/pokemon/261.png and b/public/images/pokemon/261.png differ diff --git a/public/images/pokemon/335.json b/public/images/pokemon/335.json index 0279e0fba5a..a9313fcec5d 100644 --- a/public/images/pokemon/335.json +++ b/public/images/pokemon/335.json @@ -1,1910 +1,547 @@ -{ - "textures": [ - { - "image": "335.png", - "format": "RGBA8888", - "size": { - "w": 366, - "h": 366 - }, - "scale": 1, - "frames": [ - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 68, - "h": 63 - }, - "frame": { - "x": 0, - "y": 0, - "w": 68, - "h": 63 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 68, - "h": 63 - }, - "frame": { - "x": 0, - "y": 0, - "w": 68, - "h": 63 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 68, - "h": 63 - }, - "frame": { - "x": 0, - "y": 0, - "w": 68, - "h": 63 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 68, - "h": 63 - }, - "frame": { - "x": 0, - "y": 0, - "w": 68, - "h": 63 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 65, - "h": 66 - }, - "frame": { - "x": 0, - "y": 63, - "w": 65, - "h": 66 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 67, - "h": 63 - }, - "frame": { - "x": 68, - "y": 0, - "w": 67, - "h": 63 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 67, - "h": 63 - }, - "frame": { - "x": 68, - "y": 0, - "w": 67, - "h": 63 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 68, - "h": 61 - }, - "frame": { - "x": 65, - "y": 63, - "w": 68, - "h": 61 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 68, - "h": 61 - }, - "frame": { - "x": 65, - "y": 63, - "w": 68, - "h": 61 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 68, - "h": 61 - }, - "frame": { - "x": 65, - "y": 63, - "w": 68, - "h": 61 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 68, - "h": 61 - }, - "frame": { - "x": 65, - "y": 63, - "w": 68, - "h": 61 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 64, - "h": 63 - }, - "frame": { - "x": 0, - "y": 129, - "w": 64, - "h": 63 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 64, - "h": 63 - }, - "frame": { - "x": 0, - "y": 129, - "w": 64, - "h": 63 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 64, - "h": 63 - }, - "frame": { - "x": 0, - "y": 129, - "w": 64, - "h": 63 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 64, - "h": 63 - }, - "frame": { - "x": 0, - "y": 129, - "w": 64, - "h": 63 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 61, - "h": 66 - }, - "frame": { - "x": 0, - "y": 192, - "w": 61, - "h": 66 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 61, - "h": 66 - }, - "frame": { - "x": 0, - "y": 258, - "w": 61, - "h": 66 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 61, - "h": 66 - }, - "frame": { - "x": 0, - "y": 258, - "w": 61, - "h": 66 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 64, - "h": 62 - }, - "frame": { - "x": 135, - "y": 0, - "w": 64, - "h": 62 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 64, - "h": 62 - }, - "frame": { - "x": 135, - "y": 0, - "w": 64, - "h": 62 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 65, - "h": 61 - }, - "frame": { - "x": 199, - "y": 0, - "w": 65, - "h": 61 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 67, - "h": 58 - }, - "frame": { - "x": 264, - "y": 0, - "w": 67, - "h": 58 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 67, - "h": 58 - }, - "frame": { - "x": 264, - "y": 0, - "w": 67, - "h": 58 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 67, - "h": 58 - }, - "frame": { - "x": 264, - "y": 0, - "w": 67, - "h": 58 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 67, - "h": 58 - }, - "frame": { - "x": 264, - "y": 0, - "w": 67, - "h": 58 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 64, - "h": 59 - }, - "frame": { - "x": 65, - "y": 124, - "w": 64, - "h": 59 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 64, - "h": 59 - }, - "frame": { - "x": 65, - "y": 124, - "w": 64, - "h": 59 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 64, - "h": 59 - }, - "frame": { - "x": 65, - "y": 124, - "w": 64, - "h": 59 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 64, - "h": 59 - }, - "frame": { - "x": 65, - "y": 124, - "w": 64, - "h": 59 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 64, - "h": 61 - }, - "frame": { - "x": 64, - "y": 183, - "w": 64, - "h": 61 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 62, - "h": 65 - }, - "frame": { - "x": 61, - "y": 244, - "w": 62, - "h": 65 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 6, - "y": 9, - "w": 63, - "h": 57 - }, - "frame": { - "x": 61, - "y": 309, - "w": 63, - "h": 57 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 61, - "h": 64 - }, - "frame": { - "x": 123, - "y": 244, - "w": 61, - "h": 64 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 63, - "h": 58 - }, - "frame": { - "x": 124, - "y": 308, - "w": 63, - "h": 58 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 61, - "h": 61 - }, - "frame": { - "x": 128, - "y": 183, - "w": 61, - "h": 61 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 61, - "h": 61 - }, - "frame": { - "x": 128, - "y": 183, - "w": 61, - "h": 61 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 61, - "h": 61 - }, - "frame": { - "x": 128, - "y": 183, - "w": 61, - "h": 61 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 61, - "h": 61 - }, - "frame": { - "x": 128, - "y": 183, - "w": 61, - "h": 61 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 9, - "w": 62, - "h": 57 - }, - "frame": { - "x": 187, - "y": 307, - "w": 62, - "h": 57 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 9, - "w": 62, - "h": 57 - }, - "frame": { - "x": 187, - "y": 307, - "w": 62, - "h": 57 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 62, - "h": 63 - }, - "frame": { - "x": 264, - "y": 58, - "w": 62, - "h": 63 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 55, - "h": 63 - }, - "frame": { - "x": 133, - "y": 63, - "w": 55, - "h": 63 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 55, - "h": 63 - }, - "frame": { - "x": 133, - "y": 63, - "w": 55, - "h": 63 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 55, - "h": 63 - }, - "frame": { - "x": 133, - "y": 63, - "w": 55, - "h": 63 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 55, - "h": 63 - }, - "frame": { - "x": 133, - "y": 63, - "w": 55, - "h": 63 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 55, - "h": 66 - }, - "frame": { - "x": 188, - "y": 62, - "w": 55, - "h": 66 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 55, - "h": 66 - }, - "frame": { - "x": 188, - "y": 62, - "w": 55, - "h": 66 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 58, - "h": 66 - }, - "frame": { - "x": 189, - "y": 128, - "w": 58, - "h": 66 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 60, - "h": 66 - }, - "frame": { - "x": 247, - "y": 121, - "w": 60, - "h": 66 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 59, - "h": 63 - }, - "frame": { - "x": 307, - "y": 121, - "w": 59, - "h": 63 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 59, - "h": 63 - }, - "frame": { - "x": 307, - "y": 121, - "w": 59, - "h": 63 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 59, - "h": 63 - }, - "frame": { - "x": 307, - "y": 121, - "w": 59, - "h": 63 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 59, - "h": 63 - }, - "frame": { - "x": 307, - "y": 121, - "w": 59, - "h": 63 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 247, - "y": 187, - "w": 60, - "h": 63 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 247, - "y": 187, - "w": 60, - "h": 63 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 247, - "y": 187, - "w": 60, - "h": 63 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 247, - "y": 187, - "w": 60, - "h": 63 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 58, - "h": 63 - }, - "frame": { - "x": 307, - "y": 184, - "w": 58, - "h": 63 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 58, - "h": 63 - }, - "frame": { - "x": 307, - "y": 184, - "w": 58, - "h": 63 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 58, - "h": 63 - }, - "frame": { - "x": 307, - "y": 184, - "w": 58, - "h": 63 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 58, - "h": 63 - }, - "frame": { - "x": 307, - "y": 184, - "w": 58, - "h": 63 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 249, - "y": 250, - "w": 60, - "h": 63 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9c4e9647cd30b406386dcfa45795951c:b817a280fcd689ce74ea32e378a31e74:40bb9f4809624b12bf79bbfe664bea73$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0002.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0003.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0004.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0005.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 185, "w": 59, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0007.png", + "frame": { "x": 119, "y": 182, "w": 62, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0008.png", + "frame": { "x": 119, "y": 125, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0009.png", + "frame": { "x": 195, "y": 0, "w": 66, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0010.png", + "frame": { "x": 129, "y": 0, "w": 66, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0011.png", + "frame": { "x": 320, "y": 0, "w": 62, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0012.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 244, "w": 53, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0014.png", + "frame": { "x": 59, "y": 188, "w": 56, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0015.png", + "frame": { "x": 306, "y": 187, "w": 57, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0016.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0017.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0018.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0019.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0020.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 185, "w": 59, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0022.png", + "frame": { "x": 119, "y": 182, "w": 62, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0023.png", + "frame": { "x": 119, "y": 125, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0024.png", + "frame": { "x": 195, "y": 0, "w": 66, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0025.png", + "frame": { "x": 129, "y": 0, "w": 66, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0026.png", + "frame": { "x": 320, "y": 0, "w": 62, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0027.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 244, "w": 53, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0029.png", + "frame": { "x": 59, "y": 188, "w": 56, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0030.png", + "frame": { "x": 306, "y": 187, "w": 57, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0031.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0032.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0033.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0034.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0035.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 185, "w": 59, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0037.png", + "frame": { "x": 119, "y": 182, "w": 62, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0038.png", + "frame": { "x": 119, "y": 125, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0039.png", + "frame": { "x": 195, "y": 0, "w": 66, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0040.png", + "frame": { "x": 129, "y": 0, "w": 66, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0041.png", + "frame": { "x": 320, "y": 0, "w": 62, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0042.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 244, "w": 53, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0044.png", + "frame": { "x": 59, "y": 188, "w": 56, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0045.png", + "frame": { "x": 306, "y": 187, "w": 57, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0046.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0047.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0048.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0049.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0050.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0051.png", + "frame": { "x": 248, "y": 129, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0052.png", + "frame": { "x": 188, "y": 123, "w": 60, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 60, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 125, "w": 61, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 61, "h": 60 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 66, "w": 63, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 63, "h": 59 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0055.png", + "frame": { "x": 234, "y": 190, "w": 61, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 61, "h": 56 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0056.png", + "frame": { "x": 234, "y": 246, "w": 60, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 11, "w": 60, "h": 55 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0057.png", + "frame": { "x": 115, "y": 239, "w": 61, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 11, "w": 61, "h": 56 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0058.png", + "frame": { "x": 63, "y": 62, "w": 62, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 62, "h": 60 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0059.png", + "frame": { "x": 63, "y": 0, "w": 66, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 4, "w": 66, "h": 62 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 0, "w": 63, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 63, "h": 66 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0061.png", + "frame": { "x": 261, "y": 0, "w": 59, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 59, "h": 66 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0062.png", + "frame": { "x": 181, "y": 184, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 53, "h": 66 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0063.png", + "frame": { "x": 63, "y": 122, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 56, "h": 66 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0064.png", + "frame": { "x": 320, "y": 61, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 58, "h": 65 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0065.png", + "frame": { "x": 129, "y": 61, "w": 59, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 59, "h": 64 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0066.png", + "frame": { "x": 195, "y": 60, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 60, "h": 63 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0067.png", + "frame": { "x": 255, "y": 66, "w": 59, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 59, "h": 63 }, + "sourceSize": { "w": 74, "h": 67 } + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.9.2-x64", + "image": "335.png", + "format": "I8", + "size": { "w": 382, "h": 305 }, + "scale": "1" + } } diff --git a/public/images/pokemon/335.png b/public/images/pokemon/335.png index e5d051dd850..65b56582339 100644 Binary files a/public/images/pokemon/335.png and b/public/images/pokemon/335.png differ diff --git a/public/images/pokemon/477.png b/public/images/pokemon/477.png index de140bf6ba9..1013ca3d0dd 100644 Binary files a/public/images/pokemon/477.png and b/public/images/pokemon/477.png differ diff --git a/public/images/pokemon/656.json b/public/images/pokemon/656.json index 9f2483c56b9..3776b4ed7e5 100644 --- a/public/images/pokemon/656.json +++ b/public/images/pokemon/656.json @@ -1,41 +1,20 @@ -{ - "textures": [ - { - "image": "656.png", - "format": "RGBA8888", - "size": { - "w": 35, - "h": 35 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:25355f0b039f39b6231cb75c6f8a0200:2e119e5dd64fab6d996ea751c24a38e0:9c4d208e6c2f857bfb0b23b8eea3326c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 35 }, + "sourceSize": { "w": 32, "h": 35 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "656.png", + "format": "I8", + "size": { "w": 34, "h": 37 }, + "scale": "1" + } } diff --git a/public/images/pokemon/656.png b/public/images/pokemon/656.png index b653616955d..06a9cd58268 100644 Binary files a/public/images/pokemon/656.png and b/public/images/pokemon/656.png differ diff --git a/public/images/pokemon/666-continental.png b/public/images/pokemon/666-continental.png index 1bd15dbb70d..b45f5c4e76d 100644 Binary files a/public/images/pokemon/666-continental.png and b/public/images/pokemon/666-continental.png differ diff --git a/public/images/pokemon/666-fancy.png b/public/images/pokemon/666-fancy.png index ec5e8a5f6e8..9e40deb3568 100644 Binary files a/public/images/pokemon/666-fancy.png and b/public/images/pokemon/666-fancy.png differ diff --git a/public/images/pokemon/666-high-plains.png b/public/images/pokemon/666-high-plains.png index c294984e469..45cb22fc592 100644 Binary files a/public/images/pokemon/666-high-plains.png and b/public/images/pokemon/666-high-plains.png differ diff --git a/public/images/pokemon/666-river.png b/public/images/pokemon/666-river.png index eeabeecb069..ca93fd612b7 100644 Binary files a/public/images/pokemon/666-river.png and b/public/images/pokemon/666-river.png differ diff --git a/public/images/pokemon/668-female.json b/public/images/pokemon/668-female.json deleted file mode 100644 index 13d67c90194..00000000000 --- a/public/images/pokemon/668-female.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "668-female.png", - "format": "RGBA8888", - "size": { - "w": 72, - "h": 72 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 63, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 63, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 72 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3f88e039152d4a967a218cb721938610:e6991ce9c3bad348cbc05ebf9b440302:d99ed0e84a0695b54e479aa98271aba1$" - } -} diff --git a/public/images/pokemon/668-female.png b/public/images/pokemon/668-female.png deleted file mode 100644 index c8f4e205491..00000000000 Binary files a/public/images/pokemon/668-female.png and /dev/null differ diff --git a/public/images/pokemon/674.json b/public/images/pokemon/674.json index 9534a585c64..9954c30188d 100644 --- a/public/images/pokemon/674.json +++ b/public/images/pokemon/674.json @@ -1,41 +1,506 @@ -{ - "textures": [ - { - "image": "674.png", - "format": "RGBA8888", - "size": { - "w": 42, - "h": 42 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 28, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 28, - "h": 42 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:17675dc9d79a224d5cfe26d4ea11594d:afc8db52143597fb62ac44c9a1600a80:b823d10f1c9b4d501296982088ba63d6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0002.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0003.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0004.png", + "frame": { "x": 87, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0005.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0006.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0008.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0009.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0010.png", + "frame": { "x": 87, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0011.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0012.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0014.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0015.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0016.png", + "frame": { "x": 87, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0017.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0018.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0020.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0021.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0022.png", + "frame": { "x": 87, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0023.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0024.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0026.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0027.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0028.png", + "frame": { "x": 87, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0029.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0030.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 42, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0032.png", + "frame": { "x": 29, "y": 42, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0033.png", + "frame": { "x": 58, "y": 42, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0034.png", + "frame": { "x": 87, "y": 42, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0035.png", + "frame": { "x": 58, "y": 42, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0037.png", + "frame": { "x": 29, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0038.png", + "frame": { "x": 58, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0039.png", + "frame": { "x": 87, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 126, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0041.png", + "frame": { "x": 87, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0042.png", + "frame": { "x": 58, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0043.png", + "frame": { "x": 29, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0044.png", + "frame": { "x": 58, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0045.png", + "frame": { "x": 87, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 126, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0047.png", + "frame": { "x": 87, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0048.png", + "frame": { "x": 58, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0049.png", + "frame": { "x": 29, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0050.png", + "frame": { "x": 0, "y": 84, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0051.png", + "frame": { "x": 58, "y": 42, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0052.png", + "frame": { "x": 87, "y": 42, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0053.png", + "frame": { "x": 29, "y": 126, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0054.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0055.png", + "frame": { "x": 58, "y": 126, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "674.png", + "format": "I8", + "size": { "w": 116, "h": 168 }, + "scale": "1" + } } diff --git a/public/images/pokemon/674.png b/public/images/pokemon/674.png index 3161096bb29..85b2fafb91b 100644 Binary files a/public/images/pokemon/674.png and b/public/images/pokemon/674.png differ diff --git a/public/images/pokemon/694.json b/public/images/pokemon/694.json index c770e137915..48e9623d7f4 100644 --- a/public/images/pokemon/694.json +++ b/public/images/pokemon/694.json @@ -1,41 +1,767 @@ -{ - "textures": [ - { - "image": "694.png", - "format": "RGBA8888", - "size": { - "w": 41, - "h": 41 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 38 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 38 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 38 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a121458917a5069ac5fcf0438e46af2b:afcd331d4ef231f539d602827ea66e55:b0990f9650cfe63b836cbed33f0b44d8$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 41, "y": 176, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 158, "y": 137, "w": 42, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 133, "w": 43, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 114, "y": 132, "w": 44, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 95, "w": 45, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 227, "y": 131, "w": 46, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 273, "y": 136, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 82, "y": 208, "w": 41, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 246, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 207, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 285, "y": 211, "w": 38, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 123, "y": 213, "w": 39, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 209, "w": 40, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 167, "y": 206, "w": 40, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 200, "y": 168, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 41, "y": 176, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 158, "y": 137, "w": 42, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 133, "w": 43, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 114, "y": 132, "w": 44, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 95, "w": 45, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 227, "y": 131, "w": 46, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 273, "y": 136, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 82, "y": 208, "w": 41, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 246, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 207, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 285, "y": 211, "w": 38, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 123, "y": 213, "w": 39, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 209, "w": 40, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 167, "y": 206, "w": 40, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 200, "y": 168, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 41, "y": 176, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 158, "y": 137, "w": 42, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 133, "w": 43, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 114, "y": 132, "w": 44, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 95, "w": 45, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 227, "y": 131, "w": 46, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 273, "y": 136, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 82, "y": 208, "w": 41, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 246, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 207, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 285, "y": 211, "w": 38, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 123, "y": 213, "w": 39, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 209, "w": 40, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 167, "y": 206, "w": 40, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 200, "y": 168, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 41, "y": 176, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 158, "y": 137, "w": 42, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 133, "w": 43, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 114, "y": 132, "w": 44, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 0, "y": 95, "w": 45, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 227, "y": 131, "w": 46, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 273, "y": 136, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 82, "y": 208, "w": 41, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 246, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 207, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 285, "y": 211, "w": 38, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 123, "y": 213, "w": 39, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 209, "w": 40, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 167, "y": 206, "w": 40, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 200, "y": 168, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 41, "y": 176, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 282, "y": 173, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 241, "y": 173, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 0, "y": 171, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 85, "y": 170, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 227, "y": 93, "w": 52, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 12, "w": 52, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 57, "y": 50, "w": 55, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 55, "h": 39 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 56, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 50 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 112, "y": 0, "w": 56, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 56, "h": 49 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 56, "h": 50 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 224, "y": 47, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 281, "y": 46, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 168, "y": 0, "w": 56, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 56, "h": 48 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 281, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 170, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 224, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 50, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 281, "y": 92, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 57, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 112, "y": 49, "w": 58, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 58, "h": 45 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 114, "y": 94, "w": 56, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 56, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 170, "y": 48, "w": 53, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 53, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 126, "y": 175, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 43, "y": 138, "w": 42, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "694.png", + "format": "I8", + "size": { "w": 338, "h": 249 }, + "scale": "1" + } } diff --git a/public/images/pokemon/694.png b/public/images/pokemon/694.png index 2659476db8a..fbd210e7d89 100644 Binary files a/public/images/pokemon/694.png and b/public/images/pokemon/694.png differ diff --git a/public/images/pokemon/698.json b/public/images/pokemon/698.json index 34938139984..6baf41b0ce7 100644 --- a/public/images/pokemon/698.json +++ b/public/images/pokemon/698.json @@ -1,41 +1,1415 @@ -{ - "textures": [ - { - "image": "698.png", - "format": "RGBA8888", - "size": { - "w": 57, - "h": 57 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 57 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 57 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 57 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:563dc7193ff897a6bf95dc8334febb0f:0dc4e9f203f0efed6323a93621a24f2c:198087d69fed44d4a642fa3ba5c077d6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0105.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0106.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0107.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0108.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0109.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0110.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0111.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0112.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0113.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0114.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0115.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0116.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0117.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0118.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0119.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0120.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0121.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0122.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0123.png", + "frame": { "x": 61, "y": 115, "w": 30, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0124.png", + "frame": { "x": 61, "y": 115, "w": 30, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0125.png", + "frame": { "x": 93, "y": 113, "w": 30, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0126.png", + "frame": { "x": 93, "y": 113, "w": 30, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0127.png", + "frame": { "x": 0, "y": 113, "w": 30, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 30, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0128.png", + "frame": { "x": 0, "y": 113, "w": 30, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 30, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0129.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0130.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0131.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0132.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0133.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0134.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0135.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0136.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0137.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0138.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0139.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0140.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0141.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0142.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0143.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0144.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0145.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0146.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0147.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0148.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0149.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0150.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0151.png", + "frame": { "x": 93, "y": 113, "w": 30, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0152.png", + "frame": { "x": 93, "y": 113, "w": 30, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0153.png", + "frame": { "x": 61, "y": 115, "w": 30, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0154.png", + "frame": { "x": 61, "y": 115, "w": 30, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0155.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0156.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "698.png", + "format": "I8", + "size": { "w": 152, "h": 224 }, + "scale": "1" + } } diff --git a/public/images/pokemon/698.png b/public/images/pokemon/698.png index 2e00f5693a6..d9e638561d1 100644 Binary files a/public/images/pokemon/698.png and b/public/images/pokemon/698.png differ diff --git a/public/images/pokemon/703.json b/public/images/pokemon/703.json index e160dd32d25..5c0a6230108 100644 --- a/public/images/pokemon/703.json +++ b/public/images/pokemon/703.json @@ -1,41 +1,569 @@ -{ - "textures": [ - { - "image": "703.png", - "format": "RGBA8888", - "size": { - "w": 38, - "h": 38 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 37, - "h": 38 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 38 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 38 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:5da3bf1b2b82712da609c628fc886d69:7a2dc2f1f3b5fa2ee6b04cdf4c952277:721af8c322ff60159262e9b3017c784d$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 37, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 35, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 107, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 148, "y": 0, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 38, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 143, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 143, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 35, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 71, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 37, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 35, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 71, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 107, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 148, "y": 0, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 38, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 143, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 143, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 35, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 71, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 37, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 35, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 71, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 107, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 148, "y": 0, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 38, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 143, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 143, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 35, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 71, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 37, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 35, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 71, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 107, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 148, "y": 0, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 38, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 143, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 143, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 35, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 71, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0050.png", + "frame": { "x": 74, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0051.png", + "frame": { "x": 35, "y": 114, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0052.png", + "frame": { "x": 70, "y": 114, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0053.png", + "frame": { "x": 105, "y": 114, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 117, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0055.png", + "frame": { "x": 140, "y": 117, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 117, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 117, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 117, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0059.png", + "frame": { "x": 35, "y": 153, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0060.png", + "frame": { "x": 111, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0061.png", + "frame": { "x": 107, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0062.png", + "frame": { "x": 107, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "703.png", + "format": "I8", + "size": { "w": 183, "h": 192 }, + "scale": "1" + } } diff --git a/public/images/pokemon/703.png b/public/images/pokemon/703.png index 3f3767fbc6c..ea231fc6c09 100644 Binary files a/public/images/pokemon/703.png and b/public/images/pokemon/703.png differ diff --git a/public/images/pokemon/707.json b/public/images/pokemon/707.json index b37a090ddb5..ee5036fb541 100644 --- a/public/images/pokemon/707.json +++ b/public/images/pokemon/707.json @@ -1,41 +1,1559 @@ -{ - "textures": [ - { - "image": "707.png", - "format": "RGBA8888", - "size": { - "w": 77, - "h": 77 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 77 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 77 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 77 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:56a3742632a462544b501f22a2cb2e57:5315127216c0bad2620a5352c4e424ba:8e96b9056ea81e44ced99c97f472a528$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 335, "y": 370, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 88, "y": 429, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 532, "y": 448, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 490, "y": 432, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 566, "y": 373, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 652, "y": 426, "w": 44, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 289, "y": 330, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 49, "y": 354, "w": 47, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 195, "y": 280, "w": 49, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 629, "y": 153, "w": 53, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 692, "y": 151, "w": 54, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 195, "y": 209, "w": 52, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 247, "y": 215, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 522, "y": 219, "w": 50, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 618, "y": 224, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 352, "y": 296, "w": 47, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 96, "y": 354, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 378, "y": 372, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 276, "y": 404, "w": 43, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 361, "y": 447, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 233, "y": 365, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 618, "y": 297, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 144, "y": 282, "w": 45, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 378, "y": 218, "w": 47, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 100, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 474, "y": 141, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 422, "y": 69, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 707, "y": 2, "w": 54, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 651, "y": 2, "w": 56, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 2, "y": 65, "w": 54, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 273, "y": 69, "w": 53, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 586, "y": 71, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 2, "y": 142, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 52, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 98, "y": 277, "w": 46, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 712, "y": 296, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 335, "y": 370, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 88, "y": 429, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 532, "y": 448, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 490, "y": 432, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 566, "y": 373, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 652, "y": 426, "w": 44, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 289, "y": 330, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 49, "y": 354, "w": 47, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 195, "y": 280, "w": 49, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 629, "y": 153, "w": 53, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 692, "y": 151, "w": 54, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 195, "y": 209, "w": 52, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 247, "y": 215, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 522, "y": 219, "w": 50, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 618, "y": 224, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 352, "y": 296, "w": 47, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 96, "y": 354, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 378, "y": 372, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 276, "y": 404, "w": 43, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 361, "y": 447, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 233, "y": 365, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 618, "y": 297, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 144, "y": 282, "w": 45, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 378, "y": 218, "w": 47, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 100, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 474, "y": 141, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 422, "y": 69, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 707, "y": 2, "w": 54, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 651, "y": 2, "w": 56, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 2, "y": 65, "w": 54, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 273, "y": 69, "w": 53, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 586, "y": 71, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 2, "y": 142, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 52, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 98, "y": 277, "w": 46, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 712, "y": 296, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 335, "y": 370, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 88, "y": 429, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 532, "y": 448, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 490, "y": 432, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 566, "y": 373, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 652, "y": 426, "w": 44, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 289, "y": 330, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 49, "y": 354, "w": 47, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 195, "y": 280, "w": 49, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 629, "y": 153, "w": 53, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 692, "y": 151, "w": 54, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 195, "y": 209, "w": 52, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 247, "y": 215, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 522, "y": 219, "w": 50, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 618, "y": 224, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 352, "y": 296, "w": 47, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 96, "y": 354, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 378, "y": 372, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 276, "y": 404, "w": 43, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 361, "y": 447, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 233, "y": 365, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 618, "y": 297, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 144, "y": 282, "w": 45, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 378, "y": 218, "w": 47, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 100, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 474, "y": 141, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 422, "y": 69, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 707, "y": 2, "w": 54, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 651, "y": 2, "w": 56, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 2, "y": 65, "w": 54, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 273, "y": 69, "w": 53, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 586, "y": 71, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 2, "y": 142, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 52, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 98, "y": 277, "w": 46, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 712, "y": 296, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 335, "y": 370, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 578, "y": 149, "w": 51, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 17, "w": 51, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 95, "y": 62, "w": 59, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 27, "y": 14, "w": 59, "h": 73 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 519, "y": 2, "w": 67, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 67, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 280, "y": 2, "w": 82, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 82, "h": 67 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 2, "y": 2, "w": 93, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 93, "h": 63 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 95, "y": 2, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 95, "h": 60 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 190, "y": 2, "w": 90, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 90, "h": 62 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 362, "y": 2, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 445, "y": 2, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 1, "w": 74, "h": 67 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 586, "y": 2, "w": 65, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 2, "w": 65, "h": 69 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 2, "y": 220, "w": 50, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 27, "y": 4, "w": 50, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0121.png", + "frame": { "x": 319, "y": 447, "w": 42, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 5, "w": 42, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0122.png", + "frame": { "x": 447, "y": 489, "w": 41, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 7, "w": 41, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0123.png", + "frame": { "x": 614, "y": 500, "w": 41, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 10, "w": 41, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0124.png", + "frame": { "x": 573, "y": 453, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 11, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0125.png", + "frame": { "x": 267, "y": 480, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 14, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0126.png", + "frame": { "x": 184, "y": 429, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 14, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0127.png", + "frame": { "x": 2, "y": 443, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 16, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0128.png", + "frame": { "x": 226, "y": 442, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 17, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0129.png", + "frame": { "x": 130, "y": 438, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0130.png", + "frame": { "x": 2, "y": 366, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0131.png", + "frame": { "x": 52, "y": 277, "w": 46, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 46, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0132.png", + "frame": { "x": 682, "y": 221, "w": 48, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 18, "w": 48, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0133.png", + "frame": { "x": 519, "y": 361, "w": 47, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 19, "w": 47, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0134.png", + "frame": { "x": 43, "y": 502, "w": 44, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 20, "w": 44, "h": 66 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0135.png", + "frame": { "x": 714, "y": 505, "w": 41, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 29, "y": 20, "w": 41, "h": 67 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0136.png", + "frame": { "x": 402, "y": 489, "w": 45, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 20, "w": 45, "h": 69 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0137.png", + "frame": { "x": 471, "y": 219, "w": 51, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 19, "w": 51, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0138.png", + "frame": { "x": 692, "y": 80, "w": 56, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 56, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0139.png", + "frame": { "x": 389, "y": 147, "w": 54, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 18, "w": 54, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0140.png", + "frame": { "x": 399, "y": 297, "w": 46, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 18, "w": 46, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0141.png", + "frame": { "x": 610, "y": 375, "w": 42, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 18, "w": 42, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0142.png", + "frame": { "x": 141, "y": 360, "w": 43, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 18, "w": 43, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0143.png", + "frame": { "x": 638, "y": 79, "w": 54, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 19, "w": 54, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0144.png", + "frame": { "x": 362, "y": 67, "w": 60, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 19, "w": 60, "h": 69 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0145.png", + "frame": { "x": 474, "y": 73, "w": 59, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 19, "w": 59, "h": 68 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0146.png", + "frame": { "x": 264, "y": 147, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 18, "w": 57, "h": 68 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0147.png", + "frame": { "x": 298, "y": 264, "w": 54, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 18, "w": 54, "h": 66 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0148.png", + "frame": { "x": 524, "y": 148, "w": 54, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 54, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0149.png", + "frame": { "x": 211, "y": 135, "w": 53, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 18, "w": 53, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0150.png", + "frame": { "x": 471, "y": 290, "w": 48, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 19, "w": 48, "h": 73 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0151.png", + "frame": { "x": 569, "y": 302, "w": 48, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 19, "w": 48, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0152.png", + "frame": { "x": 154, "y": 134, "w": 57, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 20, "w": 57, "h": 69 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0153.png", + "frame": { "x": 154, "y": 64, "w": 60, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 20, "w": 60, "h": 70 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0154.png", + "frame": { "x": 214, "y": 64, "w": 59, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 19, "w": 59, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0155.png", + "frame": { "x": 2, "y": 292, "w": 47, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 29, "y": 18, "w": 47, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0156.png", + "frame": { "x": 696, "y": 426, "w": 41, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 18, "w": 41, "h": 79 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0157.png", + "frame": { "x": 533, "y": 73, "w": 53, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 19, "w": 53, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0158.png", + "frame": { "x": 56, "y": 135, "w": 62, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 21, "w": 62, "h": 64 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0159.png", + "frame": { "x": 662, "y": 373, "w": 62, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 22, "w": 62, "h": 53 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0160.png", + "frame": { "x": 655, "y": 505, "w": 59, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 44, "y": 22, "w": 59, "h": 47 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0161.png", + "frame": { "x": 422, "y": 437, "w": 61, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 22, "w": 61, "h": 52 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0162.png", + "frame": { "x": 326, "y": 136, "w": 63, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 21, "w": 63, "h": 62 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0163.png", + "frame": { "x": 321, "y": 198, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 21, "w": 57, "h": 66 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0164.png", + "frame": { "x": 519, "y": 291, "w": 50, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 44, "y": 20, "w": 50, "h": 70 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0165.png", + "frame": { "x": 445, "y": 363, "w": 45, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 20, "w": 45, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0166.png", + "frame": { "x": 45, "y": 426, "w": 43, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 19, "w": 43, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0167.png", + "frame": { "x": 189, "y": 352, "w": 44, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 19, "w": 44, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0168.png", + "frame": { "x": 667, "y": 296, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 19, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0169.png", + "frame": { "x": 425, "y": 218, "w": 46, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 40, "y": 18, "w": 46, "h": 79 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0170.png", + "frame": { "x": 148, "y": 203, "w": 47, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 18, "w": 47, "h": 79 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0171.png", + "frame": { "x": 572, "y": 224, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 18, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0172.png", + "frame": { "x": 244, "y": 287, "w": 45, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 18, "w": 45, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "707.png", + "format": "I8", + "size": { "w": 763, "h": 577 }, + "scale": "1" + } } diff --git a/public/images/pokemon/707.png b/public/images/pokemon/707.png index e96c81bb953..899ab995926 100644 Binary files a/public/images/pokemon/707.png and b/public/images/pokemon/707.png differ diff --git a/public/images/pokemon/708.json b/public/images/pokemon/708.json index 99aa2cffcb4..abc8d24db2b 100644 --- a/public/images/pokemon/708.json +++ b/public/images/pokemon/708.json @@ -1,41 +1,1091 @@ -{ - "textures": [ - { - "image": "708.png", - "format": "RGBA8888", - "size": { - "w": 44, - "h": 44 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c7204472319329328505da257ec6edec:b1ef9ba3c80855e31831f718036043ff:796c82c5076b122f2663381836c65843$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 270, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 45, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 207, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 45, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 180, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 226, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 90, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 135, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 180, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 225, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 45, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 90, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 135, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 90, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 272, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 180, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 225, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 270, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 135, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 45, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 270, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 45, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 207, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 0, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 45, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 180, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 226, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 90, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 135, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 180, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 225, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 45, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 90, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 135, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 90, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 272, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 180, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 225, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 270, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 135, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 45, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 270, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 45, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 207, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 45, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 180, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 226, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 90, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 135, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 180, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 225, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 45, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 90, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 135, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 90, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 272, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 180, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 225, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 270, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 0, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 135, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 45, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 270, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 45, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 207, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 45, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 180, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 226, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 90, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 135, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 180, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 225, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 45, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 90, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 135, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 90, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 272, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 180, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 225, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 270, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 0, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 135, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 45, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 270, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 90, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 135, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 90, "y": 207, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 10, "w": 43, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 134, "y": 207, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 12, "w": 43, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 180, "y": 165, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 14, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 225, "y": 165, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 15, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 270, "y": 165, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 17, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 0, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 19, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 270, "y": 206, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 21, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 90, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 23, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 135, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 21, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 180, "y": 206, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 20, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 225, "y": 206, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 18, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 268, "y": 247, "w": 44, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 44, "h": 39 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 178, "y": 247, "w": 44, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 15, "w": 44, "h": 39 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 223, "y": 247, "w": 44, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 44, "h": 39 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 226, "y": 83, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 10, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 45, "y": 207, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 180, "y": 83, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "708.png", + "format": "I8", + "size": { "w": 315, "h": 286 }, + "scale": "1" + } } diff --git a/public/images/pokemon/708.png b/public/images/pokemon/708.png index a51533e592b..0b612280028 100644 Binary files a/public/images/pokemon/708.png and b/public/images/pokemon/708.png differ diff --git a/public/images/pokemon/714.json b/public/images/pokemon/714.json index 84c1183e47b..b43aebd68a1 100644 --- a/public/images/pokemon/714.json +++ b/public/images/pokemon/714.json @@ -1,41 +1,263 @@ -{ - "textures": [ - { - "image": "714.png", - "format": "RGBA8888", - "size": { - "w": 64, - "h": 64 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 64, - "h": 57 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 57 - }, - "frame": { - "x": 0, - "y": 0, - "w": 64, - "h": 57 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:acf096b1d2c6d9730a18ff797fb5ae47:ea434d000e9983cb42ecd03220d247c4:1a07d46e710b0568ec824f54fbc4fe6a$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 133, "y": 1, "w": 64, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 64, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 1, "y": 60, "w": 61, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 61, "h": 55 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 184, "y": 117, "w": 32, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 32, "h": 67 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 50, "y": 119, "w": 33, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 33, "h": 63 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 199, "y": 1, "w": 47, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 64, "y": 60, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 1, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 133, "y": 1, "w": 64, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 64, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 1, "y": 60, "w": 61, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 61, "h": 55 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 184, "y": 117, "w": 32, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 3, "w": 32, "h": 67 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 50, "y": 119, "w": 33, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 3, "w": 33, "h": 63 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 199, "y": 1, "w": 47, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 64, "y": 60, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 1, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 133, "y": 1, "w": 64, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 64, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 133, "y": 59, "w": 61, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 61, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 113, "y": 117, "w": 33, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 33, "h": 68 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 148, "y": 117, "w": 34, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 34, "h": 64 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 1, "y": 117, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 64, "y": 60, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 1, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 67, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 64, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 196, "y": 59, "w": 61, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 61, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 113, "y": 117, "w": 33, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 2, "w": 33, "h": 68 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 218, "y": 117, "w": 33, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 33, "h": 64 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 199, "y": 1, "w": 47, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 64, "y": 60, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "714.png", + "format": "I8", + "size": { "w": 258, "h": 186 }, + "scale": "1" + } } diff --git a/public/images/pokemon/714.png b/public/images/pokemon/714.png index c79f9b83b82..4572eada3f3 100644 Binary files a/public/images/pokemon/714.png and b/public/images/pokemon/714.png differ diff --git a/public/images/pokemon/715.png b/public/images/pokemon/715.png index e173bfe25ff..08d9c985776 100644 Binary files a/public/images/pokemon/715.png and b/public/images/pokemon/715.png differ diff --git a/public/images/pokemon/718-10.json b/public/images/pokemon/718-10.json index 479c069fe0a..ad273c9ea79 100644 --- a/public/images/pokemon/718-10.json +++ b/public/images/pokemon/718-10.json @@ -1,41 +1,686 @@ -{ - "textures": [ - { - "image": "718-10.png", - "format": "RGBA8888", - "size": { - "w": 66, - "h": 66 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 56, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 66 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a1845dc28b51b657957628d4b4d7af94:87a4c3e6fcac562963f6331abb3d962c:82195cf2a6db620c5643b8162d6e8c5c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 173, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 230, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 57, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 115, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 171, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 229, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 287, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 171, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 229, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 67, "w": 57, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 287, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 57, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 114, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 173, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 230, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 57, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 115, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 171, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 229, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 287, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 171, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 229, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 67, "w": 57, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 287, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 57, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 114, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 173, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 230, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 57, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 115, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 171, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 229, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 287, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 171, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 229, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 67, "w": 57, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 287, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 57, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 114, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 173, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 230, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 57, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 115, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 171, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 229, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 287, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 171, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 229, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 67, "w": 57, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 287, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 57, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 114, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 287, "y": 130, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 57, "y": 131, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 164, "y": 261, "w": 56, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 56, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 327, "w": 56, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 56, "y": 327, "w": 56, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 63 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 169, "y": 329, "w": 57, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 57, "h": 62 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 112, "y": 326, "w": 57, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 63 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 54, "y": 265, "w": 58, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 58, "h": 62 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 226, "y": 332, "w": 56, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 63 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 220, "y": 261, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 273, "y": 264, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 279, "y": 196, "w": 54, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 56, "y": 197, "w": 54, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 110, "y": 197, "w": 54, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 198, "w": 54, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 169, "y": 194, "w": 55, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 55, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 224, "y": 194, "w": 55, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 55, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 132, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 113, "y": 131, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "718-10.png", + "format": "I8", + "size": { "w": 345, "h": 395 }, + "scale": "1" + } } diff --git a/public/images/pokemon/718-10.png b/public/images/pokemon/718-10.png index a2acc542c68..4d15f78dd83 100644 Binary files a/public/images/pokemon/718-10.png and b/public/images/pokemon/718-10.png differ diff --git a/public/images/pokemon/718.json b/public/images/pokemon/718.json index b86c5362079..98053a226cb 100644 --- a/public/images/pokemon/718.json +++ b/public/images/pokemon/718.json @@ -1,41 +1,803 @@ -{ - "textures": [ - { - "image": "718.png", - "format": "RGBA8888", - "size": { - "w": 88, - "h": 88 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 72, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 72, - "h": 88 - }, - "frame": { - "x": 0, - "y": 0, - "w": 72, - "h": 88 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c521b0d088429d6fd0d1d291823b7881:a063fa0268f5006b3587b06e3245db2a:7b4a06b06cbac24b3f39727b0238661b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 294, "y": 438, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 442, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 437, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 145, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 366, "y": 440, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 223, "y": 267, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 296, "y": 350, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 384, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 459, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 452, "y": 265, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 76, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 233, "y": 90, "w": 75, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 151, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 0, "y": 179, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 75, "y": 266, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 369, "y": 352, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 294, "y": 438, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 442, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 437, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 145, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 366, "y": 440, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 223, "y": 267, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 296, "y": 350, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 384, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 459, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 452, "y": 265, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 76, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 233, "y": 90, "w": 75, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 151, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 179, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 75, "y": 266, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 369, "y": 352, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 294, "y": 438, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 442, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 437, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 145, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 366, "y": 440, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 223, "y": 267, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 296, "y": 350, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 384, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 459, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 452, "y": 265, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 76, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 233, "y": 90, "w": 75, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 151, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 179, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 75, "y": 266, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 369, "y": 352, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 294, "y": 438, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 0, "y": 442, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 437, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 145, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 366, "y": 440, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 223, "y": 267, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 296, "y": 350, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 384, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 459, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 452, "y": 265, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 76, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 233, "y": 90, "w": 75, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 151, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 179, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 75, "y": 266, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 369, "y": 352, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 222, "y": 355, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 73, "y": 354, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 149, "y": 353, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 442, "y": 353, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 149, "y": 266, "w": 74, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 74, "h": 87 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 377, "y": 265, "w": 75, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 87 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 308, "y": 177, "w": 76, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 76, "h": 87 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 76, "y": 91, "w": 76, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 76, "h": 87 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 301, "y": 264, "w": 76, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 76, "h": 86 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 267, "w": 74, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 74, "h": 87 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 0, "y": 90, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 391, "y": 88, "w": 77, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 77, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 79, "y": 0, "w": 78, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 0, "w": 78, "h": 91 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 468, "y": 88, "w": 77, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 77, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 157, "y": 0, "w": 78, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 78, "h": 90 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 313, "y": 0, "w": 78, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 78, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 0, "y": 0, "w": 79, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 79, "h": 90 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 391, "y": 0, "w": 78, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 78, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 235, "y": 0, "w": 78, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 1, "w": 78, "h": 90 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 469, "y": 0, "w": 78, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 313, "y": 89, "w": 77, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 77, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 157, "y": 90, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 76, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 226, "y": 179, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 354, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "718.png", + "format": "I8", + "size": { "w": 547, "h": 530 }, + "scale": "1" + } } diff --git a/public/images/pokemon/718.png b/public/images/pokemon/718.png index 0c65ebefb31..07319fd6de0 100644 Binary files a/public/images/pokemon/718.png and b/public/images/pokemon/718.png differ diff --git a/public/images/pokemon/719.json b/public/images/pokemon/719.json index 4503b576777..29716341ffd 100644 --- a/public/images/pokemon/719.json +++ b/public/images/pokemon/719.json @@ -1,41 +1,875 @@ -{ - "textures": [ - { - "image": "719.png", - "format": "RGBA8888", - "size": { - "w": 70, - "h": 70 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 70 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 70 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2444999ec5c861d795baf2a948bfbf12:226dba2be6e002f00cb5559f02986b41:17a705bb924916761be2495822a53735$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 86, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 129, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 172, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 42, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 40, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 83, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 124, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 86, "y": 72, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 215, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 86, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 129, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 172, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 42, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 40, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 83, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 124, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 86, "y": 72, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 215, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 86, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 129, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 172, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 42, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 40, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 83, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 124, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 86, "y": 72, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 215, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 86, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 129, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 172, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 42, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 40, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 83, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 124, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 86, "y": 72, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 215, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 128, "y": 72, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 170, "y": 72, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 80, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 120, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 237, "y": 288, "w": 37, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 37, "h": 69 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 198, "y": 288, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 237, "y": 359, "w": 35, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 35, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 120, "y": 288, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 160, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 165, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 8, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 212, "y": 72, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 10, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 206, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 8, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 200, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 240, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 5, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 288, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 159, "y": 288, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 40, "y": 288, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 80, "y": 288, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 7, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 248, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 9, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 43, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 128, "y": 72, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 170, "y": 72, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 80, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 120, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 237, "y": 288, "w": 37, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 37, "h": 69 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 198, "y": 288, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 237, "y": 359, "w": 35, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 35, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 120, "y": 288, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 160, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 165, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 8, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 212, "y": 72, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 10, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 0, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 0, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 206, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 8, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 200, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 240, "y": 216, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 5, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 0, "y": 288, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 159, "y": 288, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 40, "y": 288, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 80, "y": 288, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 7, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 248, "y": 144, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 9, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 43, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "719.png", + "format": "I8", + "size": { "w": 287, "h": 429 }, + "scale": "1" + } } diff --git a/public/images/pokemon/719.png b/public/images/pokemon/719.png index 287bfb9fd27..536e999a3d6 100644 Binary files a/public/images/pokemon/719.png and b/public/images/pokemon/719.png differ diff --git a/public/images/pokemon/back/477.png b/public/images/pokemon/back/477.png index 40142d042b9..02b662fbd74 100644 Binary files a/public/images/pokemon/back/477.png and b/public/images/pokemon/back/477.png differ diff --git a/public/images/pokemon/back/658.json b/public/images/pokemon/back/658.json index 050b63e3592..1d8893e2d5d 100644 --- a/public/images/pokemon/back/658.json +++ b/public/images/pokemon/back/658.json @@ -1,19 +1,19 @@ { "frames": [ { "filename": "0001.png", - "frame": { "x": 0, "y": 0, "w": 77, "h": 77 }, + "frame": { "x": 0, "y": 0, "w": 77, "h": 65 }, "rotated": false, "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 }, - "sourceSize": { "w": 77, "h": 77 }, + "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 65 }, + "sourceSize": { "w": 77, "h": 65 }, "duration": 100 } ], "meta": { "app": "https://www.aseprite.org/", - "version": "1.3.7-x64", + "version": "1.3.9.2-x64", "format": "I8", - "size": { "w": 77, "h": 77 }, + "size": { "w": 77, "h": 65 }, "scale": "1" } } diff --git a/public/images/pokemon/back/658.png b/public/images/pokemon/back/658.png index ea24d9a6336..be286b88666 100644 Binary files a/public/images/pokemon/back/658.png and b/public/images/pokemon/back/658.png differ diff --git a/public/images/pokemon/back/666-fancy.png b/public/images/pokemon/back/666-fancy.png index 35ed4317d8e..b56daf08a52 100644 Binary files a/public/images/pokemon/back/666-fancy.png and b/public/images/pokemon/back/666-fancy.png differ diff --git a/public/images/pokemon/back/666-high-plains.png b/public/images/pokemon/back/666-high-plains.png index 22f676d8f49..d6cca9c2413 100644 Binary files a/public/images/pokemon/back/666-high-plains.png and b/public/images/pokemon/back/666-high-plains.png differ diff --git a/public/images/pokemon/back/666-river.png b/public/images/pokemon/back/666-river.png index 0d7d7a65d1e..effabe7fa2d 100644 Binary files a/public/images/pokemon/back/666-river.png and b/public/images/pokemon/back/666-river.png differ diff --git a/public/images/pokemon/back/668-female.json b/public/images/pokemon/back/668-female.json deleted file mode 100644 index dc3fc99ba58..00000000000 --- a/public/images/pokemon/back/668-female.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "668-female.png", - "format": "RGBA8888", - "size": { - "w": 74, - "h": 74 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 74, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 74, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 72 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3b22b1fc8fabd22888048f909287acba:10bec1e42fb1d39868a624d00345818d:d99ed0e84a0695b54e479aa98271aba1$" - } -} diff --git a/public/images/pokemon/back/668-female.png b/public/images/pokemon/back/668-female.png deleted file mode 100644 index 6f28278630a..00000000000 Binary files a/public/images/pokemon/back/668-female.png and /dev/null differ diff --git a/public/images/pokemon/back/674.json b/public/images/pokemon/back/674.json index e280c324a0a..cc0ead50962 100644 --- a/public/images/pokemon/back/674.json +++ b/public/images/pokemon/back/674.json @@ -1,41 +1,506 @@ -{ - "textures": [ - { - "image": "674.png", - "format": "RGBA8888", - "size": { - "w": 42, - "h": 42 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 27, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 27, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 27, - "h": 42 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1fb0fb4f4e63f6114c7490a9d4d536dc:9830bfa81d721fc889ca0580935f03e3:b823d10f1c9b4d501296982088ba63d6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0002.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0003.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0004.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0005.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0006.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0007.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0008.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0009.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0010.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0011.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0012.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0013.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0014.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0015.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0016.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0017.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0018.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0019.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0020.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0021.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0022.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0023.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0024.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0025.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0026.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0027.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0028.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0029.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0030.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0031.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 42, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0033.png", + "frame": { "x": 54, "y": 82, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 83, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0035.png", + "frame": { "x": 54, "y": 82, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0036.png", + "frame": { "x": 87, "y": 0, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0038.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0039.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0040.png", + "frame": { "x": 29, "y": 41, "w": 29, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0041.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0042.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0044.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0045.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0046.png", + "frame": { "x": 29, "y": 41, "w": 29, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0047.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0048.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0050.png", + "frame": { "x": 87, "y": 0, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0051.png", + "frame": { "x": 54, "y": 82, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0052.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0053.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0054.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0055.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "674.png", + "format": "I8", + "size": { "w": 115, "h": 122 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/674.png b/public/images/pokemon/back/674.png index be77e6e1598..9a9d0ec59dd 100644 Binary files a/public/images/pokemon/back/674.png and b/public/images/pokemon/back/674.png differ diff --git a/public/images/pokemon/back/694.json b/public/images/pokemon/back/694.json index afdb992784d..76c88067e7e 100644 --- a/public/images/pokemon/back/694.json +++ b/public/images/pokemon/back/694.json @@ -1,41 +1,767 @@ -{ - "textures": [ - { - "image": "694.png", - "format": "RGBA8888", - "size": { - "w": 44, - "h": 44 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 37 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 37 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b35211eb8a79aa76e67039dd27e0e5a6:1905f4c2a0828a1c7c274f51d78b7e21:b0990f9650cfe63b836cbed33f0b44d8$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 102, "y": 163, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 57, "y": 129, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 162, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 114, "y": 126, "w": 48, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 283, "y": 90, "w": 49, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 227, "y": 126, "w": 49, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 276, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 132, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 132, "y": 201, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 234, "y": 201, "w": 42, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 206, "w": 42, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 44, "y": 203, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 276, "y": 201, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 89, "y": 200, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 146, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 102, "y": 163, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 57, "y": 129, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 162, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 114, "y": 126, "w": 48, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 283, "y": 90, "w": 49, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 227, "y": 126, "w": 49, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 276, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 132, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 132, "y": 201, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 234, "y": 201, "w": 42, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 206, "w": 42, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 44, "y": 203, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 276, "y": 201, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 89, "y": 200, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 146, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 102, "y": 163, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 57, "y": 129, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 162, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 114, "y": 126, "w": 48, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 283, "y": 90, "w": 49, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 227, "y": 126, "w": 49, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 276, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 132, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 132, "y": 201, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 234, "y": 201, "w": 42, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 206, "w": 42, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 44, "y": 203, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 276, "y": 201, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 89, "y": 200, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 146, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 102, "y": 163, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 57, "y": 129, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 162, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 114, "y": 126, "w": 48, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 283, "y": 90, "w": 49, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 227, "y": 126, "w": 49, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 276, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 132, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 132, "y": 201, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 234, "y": 201, "w": 42, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 206, "w": 42, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 44, "y": 203, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 276, "y": 201, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 89, "y": 200, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 146, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 102, "y": 163, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 253, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 297, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 45, "y": 166, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 209, "y": 162, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 172, "y": 90, "w": 55, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 55, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 57, "y": 90, "w": 57, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 57, "h": 39 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 117, "y": 0, "w": 58, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 47 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 59, "y": 0, "w": 58, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 48 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 0, "w": 59, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 59, "h": 48 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 232, "y": 0, "w": 58, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 58, "h": 45 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 232, "y": 45, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 175, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 289, "y": 45, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 117, "y": 47, "w": 57, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 43 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 290, "y": 0, "w": 58, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 45 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 174, "y": 47, "w": 57, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 43 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 58, "y": 48, "w": 57, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 42 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 90, "w": 57, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 42 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 0, "y": 48, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 114, "y": 90, "w": 58, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 12, "w": 58, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 227, "y": 90, "w": 56, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 56, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 169, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 190, "y": 199, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "694.png", + "format": "I8", + "size": { "w": 348, "h": 242 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/694.png b/public/images/pokemon/back/694.png index 5c5b107960c..d5f2f5f9563 100644 Binary files a/public/images/pokemon/back/694.png and b/public/images/pokemon/back/694.png differ diff --git a/public/images/pokemon/back/698.json b/public/images/pokemon/back/698.json index 5cfdd360d26..0da697e1f4e 100644 --- a/public/images/pokemon/back/698.json +++ b/public/images/pokemon/back/698.json @@ -1,41 +1,1415 @@ -{ - "textures": [ - { - "image": "698.png", - "format": "RGBA8888", - "size": { - "w": 55, - "h": 55 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 37, - "h": 55 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 55 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 55 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:18b6430a6c7f4e62e682eee0f5b03c01:4297c6c0129460df1d8cf73dd3393a43:198087d69fed44d4a642fa3ba5c077d6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0105.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0106.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0107.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0108.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0109.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0110.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0111.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0112.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0113.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0114.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0115.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0116.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0117.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0118.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0119.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0120.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0121.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0122.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0123.png", + "frame": { "x": 139, "y": 55, "w": 35, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0124.png", + "frame": { "x": 139, "y": 55, "w": 35, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0125.png", + "frame": { "x": 35, "y": 111, "w": 33, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0126.png", + "frame": { "x": 35, "y": 111, "w": 33, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0127.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0128.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0129.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0130.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0131.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0132.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0133.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0134.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0135.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0136.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0137.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0138.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0139.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0140.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0141.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0142.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0143.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0144.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0145.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0146.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0147.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0148.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0149.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0150.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0151.png", + "frame": { "x": 35, "y": 111, "w": 33, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0152.png", + "frame": { "x": 35, "y": 111, "w": 33, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0153.png", + "frame": { "x": 139, "y": 55, "w": 35, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0154.png", + "frame": { "x": 139, "y": 55, "w": 35, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0155.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0156.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "698.png", + "format": "I8", + "size": { "w": 174, "h": 169 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/698.png b/public/images/pokemon/back/698.png index 7326005d6f1..cd49968a7cd 100644 Binary files a/public/images/pokemon/back/698.png and b/public/images/pokemon/back/698.png differ diff --git a/public/images/pokemon/back/703.json b/public/images/pokemon/back/703.json index 4afe5c3a14d..d6752e6f7ff 100644 --- a/public/images/pokemon/back/703.json +++ b/public/images/pokemon/back/703.json @@ -1,41 +1,569 @@ -{ - "textures": [ - { - "image": "703.png", - "format": "RGBA8888", - "size": { - "w": 38, - "h": 38 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 37, - "h": 38 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 38 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 38 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:32e6c2d8721f80aa2afd20f97c5e4cf1:2c61f7a426cd2d739241c87d6ab5ea99:721af8c322ff60159262e9b3017c784d$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 36, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 73, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 73, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 72, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 36, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 73, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 73, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 72, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 36, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 73, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 73, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 72, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 36, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 73, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 73, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 72, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0049.png", + "frame": { "x": 36, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0050.png", + "frame": { "x": 36, "y": 38, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0060.png", + "frame": { "x": 36, "y": 38, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0061.png", + "frame": { "x": 73, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0062.png", + "frame": { "x": 72, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "703.png", + "format": "I8", + "size": { "w": 110, "h": 117 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/703.png b/public/images/pokemon/back/703.png index 1f52ddd3afe..b5b35e07027 100644 Binary files a/public/images/pokemon/back/703.png and b/public/images/pokemon/back/703.png differ diff --git a/public/images/pokemon/back/707.json b/public/images/pokemon/back/707.json index cf372e6a60f..b92e1983efc 100644 --- a/public/images/pokemon/back/707.json +++ b/public/images/pokemon/back/707.json @@ -1,41 +1,1559 @@ -{ - "textures": [ - { - "image": "707.png", - "format": "RGBA8888", - "size": { - "w": 77, - "h": 77 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 77 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 77 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 77 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8e9f9a53c8e85bade8027fc978f717a4:3280efd867363be1c2e5a01411ad5bd5:8e96b9056ea81e44ced99c97f472a528$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 358, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 190, "y": 373, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 391, "y": 440, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 443, "y": 377, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 715, "y": 359, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 45, "y": 363, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 520, "y": 352, "w": 45, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 306, "y": 291, "w": 48, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 527, "y": 213, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 372, "y": 139, "w": 56, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 404, "y": 69, "w": 59, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 658, "y": 73, "w": 57, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 570, "y": 141, "w": 55, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 161, "y": 145, "w": 53, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 2, "y": 208, "w": 51, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 475, "y": 229, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 623, "y": 300, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 475, "y": 302, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 232, "y": 414, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 607, "y": 374, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 147, "y": 351, "w": 43, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 206, "y": 295, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 326, "y": 213, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 479, "y": 151, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 112, "y": 145, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 321, "y": 135, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 269, "y": 134, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 214, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 463, "y": 69, "w": 55, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 159, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 715, "y": 73, "w": 53, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 518, "y": 74, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 61, "y": 136, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 625, "y": 144, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 625, "y": 222, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 430, "y": 287, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 2, "y": 358, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 190, "y": 373, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 391, "y": 440, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 443, "y": 377, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 715, "y": 359, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 45, "y": 363, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 520, "y": 352, "w": 45, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 306, "y": 291, "w": 48, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 527, "y": 213, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 372, "y": 139, "w": 56, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 404, "y": 69, "w": 59, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 658, "y": 73, "w": 57, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 570, "y": 141, "w": 55, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 161, "y": 145, "w": 53, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 2, "y": 208, "w": 51, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 475, "y": 229, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 623, "y": 300, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 475, "y": 302, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 232, "y": 414, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 607, "y": 374, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 147, "y": 351, "w": 43, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 206, "y": 295, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 326, "y": 213, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 479, "y": 151, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 112, "y": 145, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 321, "y": 135, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 269, "y": 134, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 214, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 463, "y": 69, "w": 55, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 159, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 715, "y": 73, "w": 53, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 518, "y": 74, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 61, "y": 136, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 625, "y": 144, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 625, "y": 222, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 430, "y": 287, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 2, "y": 358, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 190, "y": 373, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 391, "y": 440, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 443, "y": 377, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 715, "y": 359, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 45, "y": 363, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 520, "y": 352, "w": 45, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 306, "y": 291, "w": 48, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 527, "y": 213, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 372, "y": 139, "w": 56, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 404, "y": 69, "w": 59, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 658, "y": 73, "w": 57, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 570, "y": 141, "w": 55, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 161, "y": 145, "w": 53, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 2, "y": 208, "w": 51, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 475, "y": 229, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 623, "y": 300, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 475, "y": 302, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 232, "y": 414, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 607, "y": 374, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 147, "y": 351, "w": 43, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 206, "y": 295, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 326, "y": 213, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 479, "y": 151, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 112, "y": 145, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 321, "y": 135, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 269, "y": 134, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 214, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 463, "y": 69, "w": 55, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 159, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 715, "y": 73, "w": 53, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 518, "y": 74, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 61, "y": 136, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 625, "y": 144, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 625, "y": 222, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 430, "y": 287, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 2, "y": 358, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 428, "y": 143, "w": 51, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 17, "w": 51, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 98, "y": 62, "w": 61, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 14, "w": 61, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 530, "y": 2, "w": 70, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 11, "w": 70, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 194, "y": 2, "w": 85, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 6, "w": 85, "h": 67 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 2, "y": 2, "w": 96, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 96, "h": 63 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 98, "y": 2, "w": 96, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 1, "w": 96, "h": 60 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 279, "y": 2, "w": 91, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 0, "w": 91, "h": 62 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 370, "y": 2, "w": 84, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 84, "h": 64 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 454, "y": 2, "w": 76, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 67 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 600, "y": 2, "w": 67, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 67, "h": 69 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 372, "y": 210, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 4, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0121.png", + "frame": { "x": 172, "y": 450, "w": 41, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 5, "w": 41, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0122.png", + "frame": { "x": 526, "y": 443, "w": 41, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 7, "w": 41, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0123.png", + "frame": { "x": 432, "y": 453, "w": 41, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 10, "w": 41, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0124.png", + "frame": { "x": 43, "y": 438, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 11, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0125.png", + "frame": { "x": 2, "y": 435, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 13, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0126.png", + "frame": { "x": 565, "y": 366, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 14, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0127.png", + "frame": { "x": 131, "y": 429, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 16, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0128.png", + "frame": { "x": 485, "y": 426, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 17, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0129.png", + "frame": { "x": 649, "y": 421, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 18, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0130.png", + "frame": { "x": 2, "y": 358, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0131.png", + "frame": { "x": 2, "y": 281, "w": 46, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 18, "w": 46, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0132.png", + "frame": { "x": 53, "y": 214, "w": 48, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 18, "w": 48, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0133.png", + "frame": { "x": 354, "y": 348, "w": 46, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 19, "w": 46, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0134.png", + "frame": { "x": 345, "y": 421, "w": 46, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 20, "w": 46, "h": 69 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0135.png", + "frame": { "x": 567, "y": 451, "w": 45, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 20, "w": 45, "h": 68 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0136.png", + "frame": { "x": 423, "y": 218, "w": 52, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 20, "w": 52, "h": 69 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0137.png", + "frame": { "x": 2, "y": 137, "w": 56, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 19, "w": 56, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0138.png", + "frame": { "x": 2, "y": 65, "w": 59, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 19, "w": 59, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0139.png", + "frame": { "x": 600, "y": 71, "w": 58, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 19, "w": 58, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0140.png", + "frame": { "x": 577, "y": 291, "w": 46, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 18, "w": 46, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0141.png", + "frame": { "x": 303, "y": 363, "w": 42, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 42, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0142.png", + "frame": { "x": 400, "y": 364, "w": 43, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 18, "w": 43, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0143.png", + "frame": { "x": 524, "y": 285, "w": 53, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 19, "w": 53, "h": 67 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0144.png", + "frame": { "x": 266, "y": 213, "w": 60, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 19, "w": 60, "h": 62 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0145.png", + "frame": { "x": 674, "y": 219, "w": 58, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 58, "h": 62 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0146.png", + "frame": { "x": 150, "y": 288, "w": 56, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 18, "w": 56, "h": 63 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0147.png", + "frame": { "x": 250, "y": 351, "w": 53, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 18, "w": 53, "h": 63 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0148.png", + "frame": { "x": 674, "y": 149, "w": 54, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 18, "w": 54, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0149.png", + "frame": { "x": 214, "y": 145, "w": 52, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 19, "w": 52, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0150.png", + "frame": { "x": 48, "y": 290, "w": 48, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 27, "y": 19, "w": 48, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0151.png", + "frame": { "x": 161, "y": 217, "w": 51, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 19, "w": 51, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0152.png", + "frame": { "x": 343, "y": 66, "w": 61, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 20, "w": 61, "h": 69 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0153.png", + "frame": { "x": 279, "y": 64, "w": 64, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 20, "w": 64, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0154.png", + "frame": { "x": 667, "y": 2, "w": 64, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 19, "w": 64, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0155.png", + "frame": { "x": 101, "y": 223, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 18, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0156.png", + "frame": { "x": 89, "y": 363, "w": 42, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 27, "y": 18, "w": 42, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0157.png", + "frame": { "x": 671, "y": 281, "w": 53, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 19, "w": 53, "h": 67 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0158.png", + "frame": { "x": 274, "y": 441, "w": 62, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 21, "w": 62, "h": 50 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0159.png", + "frame": { "x": 275, "y": 491, "w": 62, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 22, "w": 62, "h": 43 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0160.png", + "frame": { "x": 674, "y": 505, "w": 59, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 23, "w": 59, "h": 42 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0161.png", + "frame": { "x": 612, "y": 498, "w": 62, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 22, "w": 62, "h": 43 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0162.png", + "frame": { "x": 213, "y": 491, "w": 62, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 22, "w": 62, "h": 49 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0163.png", + "frame": { "x": 372, "y": 287, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 21, "w": 58, "h": 61 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0164.png", + "frame": { "x": 96, "y": 296, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 20, "w": 51, "h": 67 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0165.png", + "frame": { "x": 84, "y": 441, "w": 45, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 20, "w": 45, "h": 69 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0166.png", + "frame": { "x": 728, "y": 149, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 19, "w": 42, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0167.png", + "frame": { "x": 690, "y": 434, "w": 44, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 19, "w": 44, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0168.png", + "frame": { "x": 669, "y": 348, "w": 46, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 19, "w": 46, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0169.png", + "frame": { "x": 259, "y": 275, "w": 47, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 18, "w": 47, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0170.png", + "frame": { "x": 212, "y": 218, "w": 47, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 18, "w": 47, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0171.png", + "frame": { "x": 578, "y": 213, "w": 47, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 18, "w": 47, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0172.png", + "frame": { "x": 724, "y": 281, "w": 45, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 18, "w": 45, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "707.png", + "format": "I8", + "size": { "w": 772, "h": 549 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/707.png b/public/images/pokemon/back/707.png index 78aa7077f90..83ca7298f45 100644 Binary files a/public/images/pokemon/back/707.png and b/public/images/pokemon/back/707.png differ diff --git a/public/images/pokemon/back/708.json b/public/images/pokemon/back/708.json index 33edc5748bd..22aa1885edb 100644 --- a/public/images/pokemon/back/708.json +++ b/public/images/pokemon/back/708.json @@ -1,41 +1,1091 @@ -{ - "textures": [ - { - "image": "708.png", - "format": "RGBA8888", - "size": { - "w": 43, - "h": 43 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:baaaa3a73da00bbc954269f5f5228420:171d77a039e525f9a3a332d9e2d5d82c:796c82c5076b122f2663381836c65843$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 132, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 132, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 176, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 218, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 262, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 44, "y": 207, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 131, "y": 247, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 208, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 85, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 130, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 86, "y": 84, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 174, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 218, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 88, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 132, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 43, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 132, "y": 206, "w": 42, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 44, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 264, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 88, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 176, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 220, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 44, "y": 125, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 132, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 132, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 176, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 218, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 262, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 44, "y": 207, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 131, "y": 247, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 208, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 85, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 130, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 86, "y": 84, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 174, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 218, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 88, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 132, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 43, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 132, "y": 206, "w": 42, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 44, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 264, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 88, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 176, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 220, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 44, "y": 125, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 132, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 132, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 176, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 218, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 262, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 44, "y": 207, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 131, "y": 247, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 208, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 85, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 130, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 86, "y": 84, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 174, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 218, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 88, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 132, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 43, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 132, "y": 206, "w": 42, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 44, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 264, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 88, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 176, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 220, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 44, "y": 125, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 132, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 132, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 176, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 218, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 262, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 44, "y": 207, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 131, "y": 247, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 208, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 0, "y": 85, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 130, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 86, "y": 84, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 174, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 218, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 88, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 132, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 0, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 43, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 132, "y": 206, "w": 42, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 44, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 264, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 88, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 176, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 220, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 44, "y": 125, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 132, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 0, "y": 126, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 88, "y": 165, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 8, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 175, "y": 206, "w": 42, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 10, "w": 42, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 88, "y": 247, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 13, "w": 42, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 132, "y": 165, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 14, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 176, "y": 165, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 15, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 220, "y": 165, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 17, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 264, "y": 165, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 19, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 262, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 21, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 44, "y": 166, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 23, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 0, "y": 167, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 21, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 88, "y": 206, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 20, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 220, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 44, "y": 247, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 16, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 218, "y": 246, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 15, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 262, "y": 246, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 177, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 10, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 264, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 8, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 222, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "708.png", + "format": "I8", + "size": { "w": 307, "h": 286 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/708.png b/public/images/pokemon/back/708.png index d6ba8dd838c..9e094aa7122 100644 Binary files a/public/images/pokemon/back/708.png and b/public/images/pokemon/back/708.png differ diff --git a/public/images/pokemon/back/714.json b/public/images/pokemon/back/714.json index e4e3740603e..abcb8902edd 100644 --- a/public/images/pokemon/back/714.json +++ b/public/images/pokemon/back/714.json @@ -1,41 +1,263 @@ -{ - "textures": [ - { - "image": "714.png", - "format": "RGBA8888", - "size": { - "w": 63, - "h": 63 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 63, - "h": 57 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 63, - "h": 57 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 57 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8ffbc9c4153869b318391be0e5f3743c:6e53f3ebf638d13b0d9b325c9e1c6198:1a07d46e710b0568ec824f54fbc4fe6a$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 66, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 6, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 198, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 64, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 124, "y": 120, "w": 34, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 34, "h": 65 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 1, "y": 178, "w": 34, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 3, "w": 34, "h": 60 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 264, "y": 61, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 196, "y": 119, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 1, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 131, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 198, "y": 60, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 64, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 160, "y": 120, "w": 34, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 3, "w": 34, "h": 65 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 196, "y": 178, "w": 34, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 3, "w": 34, "h": 60 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 1, "y": 120, "w": 47, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 196, "y": 119, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 1, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 66, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 6, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 1, "y": 1, "w": 64, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 64, "h": 58 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 50, "y": 120, "w": 35, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 2, "w": 35, "h": 66 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 245, "y": 120, "w": 35, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 2, "w": 35, "h": 61 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 264, "y": 1, "w": 47, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 0, "w": 47, "h": 58 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 196, "y": 119, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 1, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 133, "y": 1, "w": 63, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 63, "h": 58 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 67, "y": 1, "w": 64, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 64, "h": 58 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 87, "y": 120, "w": 35, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 35, "h": 66 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 282, "y": 120, "w": 34, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 34, "h": 61 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 1, "y": 120, "w": 47, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 196, "y": 119, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "714.png", + "format": "I8", + "size": { "w": 317, "h": 239 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/714.png b/public/images/pokemon/back/714.png index b9724fe6a63..afe2bce45a4 100644 Binary files a/public/images/pokemon/back/714.png and b/public/images/pokemon/back/714.png differ diff --git a/public/images/pokemon/back/715.png b/public/images/pokemon/back/715.png index edcb84dbd2a..624780ff0c6 100644 Binary files a/public/images/pokemon/back/715.png and b/public/images/pokemon/back/715.png differ diff --git a/public/images/pokemon/back/718-10.json b/public/images/pokemon/back/718-10.json index 74c29a2514f..75053d61900 100644 --- a/public/images/pokemon/back/718-10.json +++ b/public/images/pokemon/back/718-10.json @@ -1,41 +1,686 @@ -{ - "textures": [ - { - "image": "718-10.png", - "format": "RGBA8888", - "size": { - "w": 65, - "h": 65 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 59, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 59, - "h": 65 - }, - "frame": { - "x": 0, - "y": 0, - "w": 59, - "h": 65 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e9f4b2c69d996349a8e35598e7ddec9c:06067c7cf2cde81fd4d1f42fe319185e:82195cf2a6db620c5643b8162d6e8c5c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 120, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 179, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 293, "y": 128, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 131, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 120, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 181, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 242, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 303, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 232, "y": 190, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 292, "y": 191, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 60, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 238, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 297, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 120, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 179, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 293, "y": 128, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 131, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 120, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 181, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 242, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 303, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 232, "y": 190, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 292, "y": 191, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 60, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 238, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 297, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 120, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 179, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 293, "y": 128, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 131, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 120, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 181, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 242, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 303, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 232, "y": 190, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 292, "y": 191, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 60, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 238, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 297, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 120, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 179, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 0, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 293, "y": 128, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 131, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 120, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 181, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 242, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 303, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 232, "y": 190, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 292, "y": 191, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 60, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 238, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 297, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 120, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 194, "w": 59, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 59, "y": 194, "w": 59, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 56, "y": 319, "w": 59, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 59, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 117, "y": 259, "w": 60, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 60, "h": 62 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 177, "y": 320, "w": 60, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 61 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 232, "y": 128, "w": 61, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 61, "h": 62 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 56, "y": 258, "w": 61, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 61, "h": 61 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 118, "y": 195, "w": 59, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 115, "y": 321, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 55, "h": 66 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 237, "y": 321, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 55, "h": 66 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 234, "y": 253, "w": 56, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 290, "y": 254, "w": 56, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 258, "w": 56, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 175, "y": 128, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 57, "h": 67 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 177, "y": 253, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 57, "h": 66 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 59, "y": 65, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 66 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 117, "y": 128, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 66 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 0, "y": 65, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "718-10.png", + "format": "I8", + "size": { "w": 364, "h": 387 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/718-10.png b/public/images/pokemon/back/718-10.png index 351da7fa3b3..2f3b211e9a6 100644 Binary files a/public/images/pokemon/back/718-10.png and b/public/images/pokemon/back/718-10.png differ diff --git a/public/images/pokemon/back/718.json b/public/images/pokemon/back/718.json index ef727edcb5c..1a835e26b08 100644 --- a/public/images/pokemon/back/718.json +++ b/public/images/pokemon/back/718.json @@ -1,41 +1,803 @@ -{ - "textures": [ - { - "image": "718.png", - "format": "RGBA8888", - "size": { - "w": 88, - "h": 88 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 72, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 72, - "h": 88 - }, - "frame": { - "x": 0, - "y": 0, - "w": 72, - "h": 88 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3aa5b45708c79b806af72f343f73edbc:0b68b84d5671a020b28cd5a19650bf44:7b4a06b06cbac24b3f39727b0238661b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 224, "y": 443, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 148, "y": 445, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 445, "y": 445, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 72, "y": 446, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 373, "y": 360, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 226, "y": 355, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 184, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 150, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 304, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 459, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 308, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 462, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 386, "y": 91, "w": 76, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 75, "y": 270, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 150, "y": 357, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 75, "y": 358, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 224, "y": 443, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 148, "y": 445, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 445, "y": 445, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 72, "y": 446, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 373, "y": 360, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 226, "y": 355, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 184, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 150, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 304, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 459, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 308, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 462, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 386, "y": 91, "w": 76, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 75, "y": 270, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 150, "y": 357, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 75, "y": 358, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 224, "y": 443, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 148, "y": 445, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 445, "y": 445, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 72, "y": 446, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 373, "y": 360, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 226, "y": 355, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 184, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 150, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 304, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 459, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 308, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 462, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 386, "y": 91, "w": 76, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 75, "y": 270, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 150, "y": 357, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 75, "y": 358, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 224, "y": 443, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 148, "y": 445, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 445, "y": 445, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 72, "y": 446, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 373, "y": 360, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 226, "y": 355, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 184, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 150, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 304, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 459, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 308, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 462, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 386, "y": 91, "w": 76, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 75, "y": 270, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 150, "y": 357, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 75, "y": 358, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 224, "y": 443, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 359, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 300, "y": 357, "w": 73, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 380, "y": 271, "w": 74, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 74, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 384, "y": 181, "w": 75, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 75, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 155, "y": 92, "w": 76, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 309, "y": 91, "w": 77, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 227, "y": 268, "w": 77, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 87 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 150, "y": 182, "w": 77, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 87 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 272, "w": 75, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 75, "h": 87 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 310, "y": 0, "w": 77, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 77, "h": 91 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 387, "y": 0, "w": 77, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 77, "h": 91 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 155, "y": 0, "w": 77, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 77, "h": 92 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 77, "y": 0, "w": 78, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 78, "h": 91 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 0, "w": 77, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 77, "h": 93 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 231, "y": 180, "w": 77, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 77, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 232, "y": 0, "w": 78, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 77, "y": 91, "w": 78, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 78, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 464, "y": 0, "w": 77, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 232, "y": 90, "w": 77, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 77, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 464, "y": 90, "w": 77, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 77, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 0, "y": 93, "w": 75, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 91 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 75, "y": 179, "w": 75, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 75, "h": 91 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 454, "y": 357, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 73, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "718.png", + "format": "I8", + "size": { "w": 541, "h": 534 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/718.png b/public/images/pokemon/back/718.png index 8e3966b1f79..ce48ca205b4 100644 Binary files a/public/images/pokemon/back/718.png and b/public/images/pokemon/back/718.png differ diff --git a/public/images/pokemon/back/719.json b/public/images/pokemon/back/719.json index ea7fd0f3213..440e23718de 100644 --- a/public/images/pokemon/back/719.json +++ b/public/images/pokemon/back/719.json @@ -1,41 +1,875 @@ -{ - "textures": [ - { - "image": "719.png", - "format": "RGBA8888", - "size": { - "w": 70, - "h": 70 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 42, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 70 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:fd235f556d7919416a78362d72f6badd:d250eac977fb7684257a27d4f4c11bea:17a705bb924916761be2495822a53735$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 44, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 88, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 132, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 176, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 42, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 83, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 42, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 84, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 131, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 220, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 44, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 88, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 132, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 176, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 42, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 83, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 42, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 84, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 131, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 220, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 44, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 88, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 132, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 176, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 42, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 83, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 42, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 84, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 131, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 220, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 44, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 88, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 132, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 176, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 42, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 83, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 42, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 84, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 131, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 220, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 0, "y": 72, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 8, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 126, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 168, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 124, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 206, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 162, "y": 359, "w": 37, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 0, "w": 37, "h": 69 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 202, "y": 288, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 1, "w": 37, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 82, "y": 288, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 165, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 210, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 217, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 9, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 44, "y": 72, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 8, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 88, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 252, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 247, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 288, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 162, "y": 288, "w": 38, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 38, "h": 69 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 241, "y": 288, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 122, "y": 288, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 41, "y": 288, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 216, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 174, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 72, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 8, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 126, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 168, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 124, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 206, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 162, "y": 359, "w": 37, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 0, "w": 37, "h": 69 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 202, "y": 288, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 1, "w": 37, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 82, "y": 288, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 165, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 210, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 217, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 9, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 44, "y": 72, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 8, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 88, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 252, "y": 144, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 247, "y": 216, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 288, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 162, "y": 288, "w": 38, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 38, "h": 69 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 241, "y": 288, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 122, "y": 288, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 41, "y": 288, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 0, "y": 216, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 174, "y": 72, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "719.png", + "format": "I8", + "size": { "w": 292, "h": 428 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/719.png b/public/images/pokemon/back/719.png index 14ff62742f7..1c275f3241d 100644 Binary files a/public/images/pokemon/back/719.png and b/public/images/pokemon/back/719.png differ diff --git a/public/images/pokemon/back/881.png b/public/images/pokemon/back/881.png index 2f77327cfd0..60ab60a9aa1 100644 Binary files a/public/images/pokemon/back/881.png and b/public/images/pokemon/back/881.png differ diff --git a/public/images/pokemon/back/shiny/477.png b/public/images/pokemon/back/shiny/477.png index 45879a61d11..e7630e58e07 100644 Binary files a/public/images/pokemon/back/shiny/477.png and b/public/images/pokemon/back/shiny/477.png differ diff --git a/public/images/pokemon/back/shiny/658.json b/public/images/pokemon/back/shiny/658.json index 050b63e3592..867e1d2d3d2 100644 --- a/public/images/pokemon/back/shiny/658.json +++ b/public/images/pokemon/back/shiny/658.json @@ -1,11 +1,11 @@ { "frames": [ { "filename": "0001.png", - "frame": { "x": 0, "y": 0, "w": 77, "h": 77 }, + "frame": { "x": 0, "y": 0, "w": 77, "h": 65 }, "rotated": false, "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 }, - "sourceSize": { "w": 77, "h": 77 }, + "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 65 }, + "sourceSize": { "w": 77, "h": 65 }, "duration": 100 } ], @@ -13,7 +13,7 @@ "app": "https://www.aseprite.org/", "version": "1.3.7-x64", "format": "I8", - "size": { "w": 77, "h": 77 }, + "size": { "w": 77, "h": 65 }, "scale": "1" } } diff --git a/public/images/pokemon/back/shiny/658.png b/public/images/pokemon/back/shiny/658.png index 21519b6a145..239aaafb6ce 100644 Binary files a/public/images/pokemon/back/shiny/658.png and b/public/images/pokemon/back/shiny/658.png differ diff --git a/public/images/pokemon/back/shiny/668-female.json b/public/images/pokemon/back/shiny/668-female.json deleted file mode 100644 index 7b4adc1a94d..00000000000 --- a/public/images/pokemon/back/shiny/668-female.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "668-female.png", - "format": "RGBA8888", - "size": { - "w": 74, - "h": 74 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 74, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 74, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 72 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a3f814ea1f5b062df0ecc4e7c343d89b:769178f31dc2505ae0e67b72b1319828:d99ed0e84a0695b54e479aa98271aba1$" - } -} diff --git a/public/images/pokemon/back/shiny/668-female.png b/public/images/pokemon/back/shiny/668-female.png deleted file mode 100644 index caf8bed99ac..00000000000 Binary files a/public/images/pokemon/back/shiny/668-female.png and /dev/null differ diff --git a/public/images/pokemon/back/shiny/674.json b/public/images/pokemon/back/shiny/674.json index eac9372c5d4..cc0ead50962 100644 --- a/public/images/pokemon/back/shiny/674.json +++ b/public/images/pokemon/back/shiny/674.json @@ -1,41 +1,506 @@ -{ - "textures": [ - { - "image": "674.png", - "format": "RGBA8888", - "size": { - "w": 42, - "h": 42 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 27, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 27, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 27, - "h": 42 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:efc4d9ff714ef5249d5ea29e541766f9:c21489bea9a10b1521844e4efb4735d5:b823d10f1c9b4d501296982088ba63d6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0002.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0003.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0004.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0005.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0006.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0007.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0008.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0009.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0010.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0011.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0012.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0013.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0014.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0015.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0016.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0017.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0018.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0019.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0020.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0021.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0022.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0023.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0024.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0025.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0026.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0027.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0028.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0029.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0030.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0031.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 42, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0033.png", + "frame": { "x": 54, "y": 82, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 83, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0035.png", + "frame": { "x": 54, "y": 82, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0036.png", + "frame": { "x": 87, "y": 0, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0038.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0039.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0040.png", + "frame": { "x": 29, "y": 41, "w": 29, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0041.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0042.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0044.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0045.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0046.png", + "frame": { "x": 29, "y": 41, "w": 29, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0047.png", + "frame": { "x": 58, "y": 0, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0048.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0050.png", + "frame": { "x": 87, "y": 0, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0051.png", + "frame": { "x": 54, "y": 82, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0052.png", + "frame": { "x": 81, "y": 82, "w": 27, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0053.png", + "frame": { "x": 27, "y": 80, "w": 27, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0054.png", + "frame": { "x": 85, "y": 41, "w": 27, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0055.png", + "frame": { "x": 58, "y": 40, "w": 27, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "674.png", + "format": "I8", + "size": { "w": 115, "h": 122 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/674.png b/public/images/pokemon/back/shiny/674.png index 96734feb3f7..4617b03c6eb 100644 Binary files a/public/images/pokemon/back/shiny/674.png and b/public/images/pokemon/back/shiny/674.png differ diff --git a/public/images/pokemon/back/shiny/694.json b/public/images/pokemon/back/shiny/694.json index ae617f4876f..76c88067e7e 100644 --- a/public/images/pokemon/back/shiny/694.json +++ b/public/images/pokemon/back/shiny/694.json @@ -1,41 +1,767 @@ -{ - "textures": [ - { - "image": "694.png", - "format": "RGBA8888", - "size": { - "w": 44, - "h": 44 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 37 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 37 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:136b476d55eb513322e6355dbd903c97:982afbb162c554e6193d6fe06bccb61d:b0990f9650cfe63b836cbed33f0b44d8$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 102, "y": 163, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 57, "y": 129, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 162, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 114, "y": 126, "w": 48, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 283, "y": 90, "w": 49, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 227, "y": 126, "w": 49, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 276, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 132, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 132, "y": 201, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 234, "y": 201, "w": 42, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 206, "w": 42, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 44, "y": 203, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 276, "y": 201, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 89, "y": 200, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 146, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 102, "y": 163, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 57, "y": 129, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 162, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 114, "y": 126, "w": 48, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 283, "y": 90, "w": 49, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 227, "y": 126, "w": 49, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 276, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 132, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 132, "y": 201, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 234, "y": 201, "w": 42, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 206, "w": 42, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 44, "y": 203, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 276, "y": 201, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 89, "y": 200, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 146, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 102, "y": 163, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 57, "y": 129, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 162, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 114, "y": 126, "w": 48, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 283, "y": 90, "w": 49, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 227, "y": 126, "w": 49, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 276, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 132, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 132, "y": 201, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 234, "y": 201, "w": 42, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 206, "w": 42, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 44, "y": 203, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 276, "y": 201, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 89, "y": 200, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 146, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 102, "y": 163, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 57, "y": 129, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 162, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 114, "y": 126, "w": 48, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 283, "y": 90, "w": 49, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 227, "y": 126, "w": 49, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 276, "y": 127, "w": 47, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 132, "w": 45, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 132, "y": 201, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 234, "y": 201, "w": 42, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 206, "w": 42, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 44, "y": 203, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 276, "y": 201, "w": 43, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 89, "y": 200, "w": 43, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 146, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 102, "y": 163, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 253, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 297, "y": 164, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 45, "y": 166, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 209, "y": 162, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 172, "y": 90, "w": 55, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 55, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 57, "y": 90, "w": 57, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 57, "h": 39 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 117, "y": 0, "w": 58, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 47 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 59, "y": 0, "w": 58, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 48 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 0, "w": 59, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 59, "h": 48 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 232, "y": 0, "w": 58, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 58, "h": 45 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 232, "y": 45, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 175, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 289, "y": 45, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 117, "y": 47, "w": 57, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 43 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 290, "y": 0, "w": 58, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 45 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 174, "y": 47, "w": 57, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 43 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 58, "y": 48, "w": 57, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 42 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 90, "w": 57, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 42 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 0, "y": 48, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 114, "y": 90, "w": 58, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 12, "w": 58, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 227, "y": 90, "w": 56, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 56, "h": 36 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 169, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 190, "y": 199, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 }, + "sourceSize": { "w": 61, "h": 48 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "694.png", + "format": "I8", + "size": { "w": 348, "h": 242 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/694.png b/public/images/pokemon/back/shiny/694.png index 1c6444e450a..b4d451678ef 100644 Binary files a/public/images/pokemon/back/shiny/694.png and b/public/images/pokemon/back/shiny/694.png differ diff --git a/public/images/pokemon/back/shiny/698.json b/public/images/pokemon/back/shiny/698.json index fba1db6d11d..0da697e1f4e 100644 --- a/public/images/pokemon/back/shiny/698.json +++ b/public/images/pokemon/back/shiny/698.json @@ -1,41 +1,1415 @@ -{ - "textures": [ - { - "image": "698.png", - "format": "RGBA8888", - "size": { - "w": 55, - "h": 55 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 37, - "h": 55 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 55 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 55 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2d3467f0abbe6bec820c8196bd88983a:3a8331cf2af48202898ef3b9681f4110:198087d69fed44d4a642fa3ba5c077d6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 99, "y": 113, "w": 31, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 68, "y": 112, "w": 31, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 139, "y": 111, "w": 33, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 0, "y": 107, "w": 35, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0105.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0106.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0107.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0108.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0109.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0110.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0111.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0112.png", + "frame": { "x": 0, "y": 0, "w": 45, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0113.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0114.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0115.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0116.png", + "frame": { "x": 89, "y": 0, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0117.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0118.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0119.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0120.png", + "frame": { "x": 130, "y": 0, "w": 39, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0121.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0122.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0123.png", + "frame": { "x": 139, "y": 55, "w": 35, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0124.png", + "frame": { "x": 139, "y": 55, "w": 35, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0125.png", + "frame": { "x": 35, "y": 111, "w": 33, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0126.png", + "frame": { "x": 35, "y": 111, "w": 33, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0127.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0128.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0129.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0130.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0131.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0132.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0133.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0134.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0135.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0136.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0137.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0138.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0139.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0140.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0141.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0142.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0143.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0144.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0145.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0146.png", + "frame": { "x": 37, "y": 53, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0147.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0148.png", + "frame": { "x": 71, "y": 54, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0149.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0150.png", + "frame": { "x": 105, "y": 55, "w": 34, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0151.png", + "frame": { "x": 35, "y": 111, "w": 33, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0152.png", + "frame": { "x": 35, "y": 111, "w": 33, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0153.png", + "frame": { "x": 139, "y": 55, "w": 35, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0154.png", + "frame": { "x": 139, "y": 55, "w": 35, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0155.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + }, + { + "filename": "0156.png", + "frame": { "x": 0, "y": 52, "w": 37, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 }, + "sourceSize": { "w": 45, "h": 58 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "698.png", + "format": "I8", + "size": { "w": 174, "h": 169 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/698.png b/public/images/pokemon/back/shiny/698.png index 3daad1fd4ab..bc96912bd46 100644 Binary files a/public/images/pokemon/back/shiny/698.png and b/public/images/pokemon/back/shiny/698.png differ diff --git a/public/images/pokemon/back/shiny/703.json b/public/images/pokemon/back/shiny/703.json index ee6074b20ca..d6752e6f7ff 100644 --- a/public/images/pokemon/back/shiny/703.json +++ b/public/images/pokemon/back/shiny/703.json @@ -1,41 +1,569 @@ -{ - "textures": [ - { - "image": "703.png", - "format": "RGBA8888", - "size": { - "w": 38, - "h": 38 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 37, - "h": 38 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 38 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 38 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d9d865fef42b5a28e45d32fccd741f98:96057dceb7fdf650f54901c6be0f386f:721af8c322ff60159262e9b3017c784d$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 36, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 73, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 73, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 72, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 36, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 73, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 73, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 72, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 36, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 73, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 73, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 72, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 36, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 73, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 73, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 36, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 72, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0049.png", + "frame": { "x": 36, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0050.png", + "frame": { "x": 36, "y": 38, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0060.png", + "frame": { "x": 36, "y": 38, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0061.png", + "frame": { "x": 73, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0062.png", + "frame": { "x": 72, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "703.png", + "format": "I8", + "size": { "w": 110, "h": 117 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/703.png b/public/images/pokemon/back/shiny/703.png index ea22e4ad5d4..635d930e674 100644 Binary files a/public/images/pokemon/back/shiny/703.png and b/public/images/pokemon/back/shiny/703.png differ diff --git a/public/images/pokemon/back/shiny/707.json b/public/images/pokemon/back/shiny/707.json index 8151fd60f08..b92e1983efc 100644 --- a/public/images/pokemon/back/shiny/707.json +++ b/public/images/pokemon/back/shiny/707.json @@ -1,41 +1,1559 @@ -{ - "textures": [ - { - "image": "707.png", - "format": "RGBA8888", - "size": { - "w": 77, - "h": 77 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 77 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 77 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 77 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c2d2cb3b868498a2b93c8233ad35af4a:09ee133b9c655c6135da1abf1c9b6ddf:8e96b9056ea81e44ced99c97f472a528$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 358, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 190, "y": 373, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 391, "y": 440, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 443, "y": 377, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 715, "y": 359, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 45, "y": 363, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 520, "y": 352, "w": 45, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 306, "y": 291, "w": 48, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 527, "y": 213, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 372, "y": 139, "w": 56, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 404, "y": 69, "w": 59, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 658, "y": 73, "w": 57, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 570, "y": 141, "w": 55, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 161, "y": 145, "w": 53, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 2, "y": 208, "w": 51, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 475, "y": 229, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 623, "y": 300, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 475, "y": 302, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 232, "y": 414, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 607, "y": 374, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 147, "y": 351, "w": 43, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 206, "y": 295, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 326, "y": 213, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 479, "y": 151, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 112, "y": 145, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 321, "y": 135, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 269, "y": 134, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 214, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 463, "y": 69, "w": 55, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 159, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 715, "y": 73, "w": 53, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 518, "y": 74, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 61, "y": 136, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 625, "y": 144, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 625, "y": 222, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 430, "y": 287, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 2, "y": 358, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 190, "y": 373, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 391, "y": 440, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 443, "y": 377, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 715, "y": 359, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 45, "y": 363, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 520, "y": 352, "w": 45, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 306, "y": 291, "w": 48, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 527, "y": 213, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 372, "y": 139, "w": 56, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 404, "y": 69, "w": 59, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 658, "y": 73, "w": 57, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 570, "y": 141, "w": 55, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 161, "y": 145, "w": 53, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 2, "y": 208, "w": 51, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 475, "y": 229, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 623, "y": 300, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 475, "y": 302, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 232, "y": 414, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 607, "y": 374, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 147, "y": 351, "w": 43, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 206, "y": 295, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 326, "y": 213, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 479, "y": 151, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 112, "y": 145, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 321, "y": 135, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 269, "y": 134, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 214, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 463, "y": 69, "w": 55, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 159, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 715, "y": 73, "w": 53, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 518, "y": 74, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 61, "y": 136, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 625, "y": 144, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 625, "y": 222, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 430, "y": 287, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 2, "y": 358, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 190, "y": 373, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 391, "y": 440, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 443, "y": 377, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 715, "y": 359, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 45, "y": 363, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 520, "y": 352, "w": 45, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 306, "y": 291, "w": 48, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 527, "y": 213, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 372, "y": 139, "w": 56, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 404, "y": 69, "w": 59, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 658, "y": 73, "w": 57, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 570, "y": 141, "w": 55, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 161, "y": 145, "w": 53, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 2, "y": 208, "w": 51, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 475, "y": 229, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 623, "y": 300, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 475, "y": 302, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 232, "y": 414, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 607, "y": 374, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 147, "y": 351, "w": 43, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 206, "y": 295, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 326, "y": 213, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 479, "y": 151, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 112, "y": 145, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 321, "y": 135, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 269, "y": 134, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 214, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 463, "y": 69, "w": 55, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 159, "y": 69, "w": 55, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 715, "y": 73, "w": 53, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 518, "y": 74, "w": 52, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 61, "y": 136, "w": 51, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 625, "y": 144, "w": 49, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 625, "y": 222, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 430, "y": 287, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 2, "y": 358, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 428, "y": 143, "w": 51, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 17, "w": 51, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 98, "y": 62, "w": 61, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 14, "w": 61, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 530, "y": 2, "w": 70, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 11, "w": 70, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 194, "y": 2, "w": 85, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 6, "w": 85, "h": 67 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 2, "y": 2, "w": 96, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 96, "h": 63 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 98, "y": 2, "w": 96, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 1, "w": 96, "h": 60 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 279, "y": 2, "w": 91, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 0, "w": 91, "h": 62 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 370, "y": 2, "w": 84, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 84, "h": 64 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 454, "y": 2, "w": 76, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 67 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 600, "y": 2, "w": 67, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 67, "h": 69 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 372, "y": 210, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 4, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0121.png", + "frame": { "x": 172, "y": 450, "w": 41, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 5, "w": 41, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0122.png", + "frame": { "x": 526, "y": 443, "w": 41, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 7, "w": 41, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0123.png", + "frame": { "x": 432, "y": 453, "w": 41, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 10, "w": 41, "h": 74 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0124.png", + "frame": { "x": 43, "y": 438, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 11, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0125.png", + "frame": { "x": 2, "y": 435, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 13, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0126.png", + "frame": { "x": 565, "y": 366, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 14, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0127.png", + "frame": { "x": 131, "y": 429, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 16, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0128.png", + "frame": { "x": 485, "y": 426, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 17, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0129.png", + "frame": { "x": 649, "y": 421, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 18, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0130.png", + "frame": { "x": 2, "y": 358, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0131.png", + "frame": { "x": 2, "y": 281, "w": 46, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 18, "w": 46, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0132.png", + "frame": { "x": 53, "y": 214, "w": 48, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 18, "w": 48, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0133.png", + "frame": { "x": 354, "y": 348, "w": 46, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 19, "w": 46, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0134.png", + "frame": { "x": 345, "y": 421, "w": 46, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 20, "w": 46, "h": 69 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0135.png", + "frame": { "x": 567, "y": 451, "w": 45, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 20, "w": 45, "h": 68 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0136.png", + "frame": { "x": 423, "y": 218, "w": 52, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 20, "w": 52, "h": 69 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0137.png", + "frame": { "x": 2, "y": 137, "w": 56, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 19, "w": 56, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0138.png", + "frame": { "x": 2, "y": 65, "w": 59, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 19, "w": 59, "h": 72 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0139.png", + "frame": { "x": 600, "y": 71, "w": 58, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 19, "w": 58, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0140.png", + "frame": { "x": 577, "y": 291, "w": 46, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 18, "w": 46, "h": 75 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0141.png", + "frame": { "x": 303, "y": 363, "w": 42, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 18, "w": 42, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0142.png", + "frame": { "x": 400, "y": 364, "w": 43, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 18, "w": 43, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0143.png", + "frame": { "x": 524, "y": 285, "w": 53, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 19, "w": 53, "h": 67 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0144.png", + "frame": { "x": 266, "y": 213, "w": 60, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 19, "w": 60, "h": 62 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0145.png", + "frame": { "x": 674, "y": 219, "w": 58, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 58, "h": 62 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0146.png", + "frame": { "x": 150, "y": 288, "w": 56, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 18, "w": 56, "h": 63 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0147.png", + "frame": { "x": 250, "y": 351, "w": 53, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 18, "w": 53, "h": 63 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0148.png", + "frame": { "x": 674, "y": 149, "w": 54, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 18, "w": 54, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0149.png", + "frame": { "x": 214, "y": 145, "w": 52, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 19, "w": 52, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0150.png", + "frame": { "x": 48, "y": 290, "w": 48, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 27, "y": 19, "w": 48, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0151.png", + "frame": { "x": 161, "y": 217, "w": 51, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 19, "w": 51, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0152.png", + "frame": { "x": 343, "y": 66, "w": 61, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 20, "w": 61, "h": 69 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0153.png", + "frame": { "x": 279, "y": 64, "w": 64, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 20, "w": 64, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0154.png", + "frame": { "x": 667, "y": 2, "w": 64, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 19, "w": 64, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0155.png", + "frame": { "x": 101, "y": 223, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 18, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0156.png", + "frame": { "x": 89, "y": 363, "w": 42, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 27, "y": 18, "w": 42, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0157.png", + "frame": { "x": 671, "y": 281, "w": 53, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 19, "w": 53, "h": 67 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0158.png", + "frame": { "x": 274, "y": 441, "w": 62, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 21, "w": 62, "h": 50 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0159.png", + "frame": { "x": 275, "y": 491, "w": 62, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 22, "w": 62, "h": 43 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0160.png", + "frame": { "x": 674, "y": 505, "w": 59, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 23, "w": 59, "h": 42 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0161.png", + "frame": { "x": 612, "y": 498, "w": 62, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 22, "w": 62, "h": 43 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0162.png", + "frame": { "x": 213, "y": 491, "w": 62, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 22, "w": 62, "h": 49 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0163.png", + "frame": { "x": 372, "y": 287, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 21, "w": 58, "h": 61 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0164.png", + "frame": { "x": 96, "y": 296, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 20, "w": 51, "h": 67 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0165.png", + "frame": { "x": 84, "y": 441, "w": 45, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 20, "w": 45, "h": 69 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0166.png", + "frame": { "x": 728, "y": 149, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 19, "w": 42, "h": 70 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0167.png", + "frame": { "x": 690, "y": 434, "w": 44, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 19, "w": 44, "h": 71 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0168.png", + "frame": { "x": 669, "y": 348, "w": 46, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 19, "w": 46, "h": 73 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0169.png", + "frame": { "x": 259, "y": 275, "w": 47, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 18, "w": 47, "h": 76 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0170.png", + "frame": { "x": 212, "y": 218, "w": 47, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 18, "w": 47, "h": 77 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0171.png", + "frame": { "x": 578, "y": 213, "w": 47, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 18, "w": 47, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + }, + { + "filename": "0172.png", + "frame": { "x": 724, "y": 281, "w": 45, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 18, "w": 45, "h": 78 }, + "sourceSize": { "w": 108, "h": 96 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "707.png", + "format": "I8", + "size": { "w": 772, "h": 549 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/707.png b/public/images/pokemon/back/shiny/707.png index da84624a35c..8d7e5922091 100644 Binary files a/public/images/pokemon/back/shiny/707.png and b/public/images/pokemon/back/shiny/707.png differ diff --git a/public/images/pokemon/back/shiny/708.json b/public/images/pokemon/back/shiny/708.json index 1433d1f3954..22aa1885edb 100644 --- a/public/images/pokemon/back/shiny/708.json +++ b/public/images/pokemon/back/shiny/708.json @@ -1,41 +1,1091 @@ -{ - "textures": [ - { - "image": "708.png", - "format": "RGBA8888", - "size": { - "w": 43, - "h": 43 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:ab46d1202eb640c4a791f5c8d9bd36ec:04314281a1a95837e11d92d38c448507:796c82c5076b122f2663381836c65843$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 132, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 132, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 176, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 218, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 262, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 44, "y": 207, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 131, "y": 247, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 208, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 85, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 130, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 86, "y": 84, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 174, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 218, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 88, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 132, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 43, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 132, "y": 206, "w": 42, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 44, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 264, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 88, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 176, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 220, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 44, "y": 125, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 132, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 132, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 176, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 218, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 262, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 44, "y": 207, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 131, "y": 247, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 208, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 85, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 130, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 86, "y": 84, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 174, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 218, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 88, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 132, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 43, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 132, "y": 206, "w": 42, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 44, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 264, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 88, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 176, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 220, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 44, "y": 125, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 132, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 132, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 176, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 218, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 262, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 44, "y": 207, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 131, "y": 247, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 208, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 85, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 130, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 86, "y": 84, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 174, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 218, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 88, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 132, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 43, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 132, "y": 206, "w": 42, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 44, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 264, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 88, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 176, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 220, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 44, "y": 125, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 132, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 132, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 176, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 218, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 262, "y": 206, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 44, "y": 207, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 131, "y": 247, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 208, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 0, "y": 85, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 130, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 86, "y": 84, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 174, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 218, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 88, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 132, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 0, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 43, "y": 43, "w": 42, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 132, "y": 206, "w": 42, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 44, "y": 0, "w": 43, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 264, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 88, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 176, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 220, "y": 0, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 44, "y": 125, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 132, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 0, "y": 126, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 88, "y": 165, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 8, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 175, "y": 206, "w": 42, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 10, "w": 42, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 88, "y": 247, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 13, "w": 42, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 132, "y": 165, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 14, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 176, "y": 165, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 15, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 220, "y": 165, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 17, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 264, "y": 165, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 19, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 262, "y": 124, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 21, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 44, "y": 166, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 23, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 0, "y": 167, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 21, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 88, "y": 206, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 20, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 220, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 44, "y": 247, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 16, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 218, "y": 246, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 15, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 262, "y": 246, "w": 43, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 43, "h": 39 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 177, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 10, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 264, "y": 83, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 8, "w": 43, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 222, "y": 42, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 67, "h": 63 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "708.png", + "format": "I8", + "size": { "w": 307, "h": 286 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/708.png b/public/images/pokemon/back/shiny/708.png index 51462cccc15..8a9ff2cb9ee 100644 Binary files a/public/images/pokemon/back/shiny/708.png and b/public/images/pokemon/back/shiny/708.png differ diff --git a/public/images/pokemon/back/shiny/714.json b/public/images/pokemon/back/shiny/714.json index 135bc02dbd5..abcb8902edd 100644 --- a/public/images/pokemon/back/shiny/714.json +++ b/public/images/pokemon/back/shiny/714.json @@ -1,41 +1,263 @@ -{ - "textures": [ - { - "image": "714.png", - "format": "RGBA8888", - "size": { - "w": 63, - "h": 63 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 63, - "h": 57 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 63, - "h": 57 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 57 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:11292bc220f23110a419628bee722abd:b42c1c416a6792bd1666ba41005a2f4d:1a07d46e710b0568ec824f54fbc4fe6a$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 66, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 6, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 198, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 64, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 124, "y": 120, "w": 34, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 34, "h": 65 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 1, "y": 178, "w": 34, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 3, "w": 34, "h": 60 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 264, "y": 61, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 196, "y": 119, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 1, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 131, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 198, "y": 60, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 64, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 160, "y": 120, "w": 34, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 3, "w": 34, "h": 65 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 196, "y": 178, "w": 34, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 3, "w": 34, "h": 60 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 1, "y": 120, "w": 47, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 196, "y": 119, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 1, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 66, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 6, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 1, "y": 1, "w": 64, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 64, "h": 58 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 50, "y": 120, "w": 35, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 2, "w": 35, "h": 66 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 245, "y": 120, "w": 35, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 2, "w": 35, "h": 61 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 264, "y": 1, "w": 47, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 0, "w": 47, "h": 58 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 196, "y": 119, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 1, "y": 61, "w": 63, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 133, "y": 1, "w": 63, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 63, "h": 58 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 67, "y": 1, "w": 64, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 64, "h": 58 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 87, "y": 120, "w": 35, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 35, "h": 66 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 282, "y": 120, "w": 34, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 34, "h": 61 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 1, "y": 120, "w": 47, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 196, "y": 119, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 68, "h": 68 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "714.png", + "format": "I8", + "size": { "w": 317, "h": 239 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/714.png b/public/images/pokemon/back/shiny/714.png index 65433cec665..e1e5d5dbec7 100644 Binary files a/public/images/pokemon/back/shiny/714.png and b/public/images/pokemon/back/shiny/714.png differ diff --git a/public/images/pokemon/back/shiny/718-10.json b/public/images/pokemon/back/shiny/718-10.json index 032783b5555..75053d61900 100644 --- a/public/images/pokemon/back/shiny/718-10.json +++ b/public/images/pokemon/back/shiny/718-10.json @@ -1,41 +1,686 @@ -{ - "textures": [ - { - "image": "718-10.png", - "format": "RGBA8888", - "size": { - "w": 65, - "h": 65 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 59, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 59, - "h": 65 - }, - "frame": { - "x": 0, - "y": 0, - "w": 59, - "h": 65 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c99dd53bf67561425f9faac1002806d0:277725239a09766c1d58b4a0f8c45775:82195cf2a6db620c5643b8162d6e8c5c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 120, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 179, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 293, "y": 128, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 131, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 120, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 181, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 242, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 303, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 232, "y": 190, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 292, "y": 191, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 60, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 238, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 297, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 120, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 179, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 293, "y": 128, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 131, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 120, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 181, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 242, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 303, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 232, "y": 190, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 292, "y": 191, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 60, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 238, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 297, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 120, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 179, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 293, "y": 128, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 131, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 120, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 181, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 242, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 303, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 232, "y": 190, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 292, "y": 191, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 60, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 238, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 297, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 120, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 179, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 0, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 293, "y": 128, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 131, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 120, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 181, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 242, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 303, "y": 0, "w": 61, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 232, "y": 190, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 292, "y": 191, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 60, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 238, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 297, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 120, "y": 63, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 194, "w": 59, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 59, "y": 194, "w": 59, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 56, "y": 319, "w": 59, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 59, "h": 63 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 117, "y": 259, "w": 60, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 60, "h": 62 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 177, "y": 320, "w": 60, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 61 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 232, "y": 128, "w": 61, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 61, "h": 62 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 56, "y": 258, "w": 61, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 61, "h": 61 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 118, "y": 195, "w": 59, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 115, "y": 321, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 55, "h": 66 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 237, "y": 321, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 55, "h": 66 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 234, "y": 253, "w": 56, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 290, "y": 254, "w": 56, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 258, "w": 56, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 175, "y": 128, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 57, "h": 67 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 177, "y": 253, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 57, "h": 66 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 59, "y": 65, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 66 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 117, "y": 128, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 66 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 0, "y": 65, "w": 59, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 }, + "sourceSize": { "w": 64, "h": 67 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "718-10.png", + "format": "I8", + "size": { "w": 364, "h": 387 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/718-10.png b/public/images/pokemon/back/shiny/718-10.png index 0479543fc7a..7998912c001 100644 Binary files a/public/images/pokemon/back/shiny/718-10.png and b/public/images/pokemon/back/shiny/718-10.png differ diff --git a/public/images/pokemon/back/shiny/718.json b/public/images/pokemon/back/shiny/718.json index 4badc82d015..1a835e26b08 100644 --- a/public/images/pokemon/back/shiny/718.json +++ b/public/images/pokemon/back/shiny/718.json @@ -1,41 +1,803 @@ -{ - "textures": [ - { - "image": "718.png", - "format": "RGBA8888", - "size": { - "w": 88, - "h": 88 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 72, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 72, - "h": 88 - }, - "frame": { - "x": 0, - "y": 0, - "w": 72, - "h": 88 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f2bba9e481cf6dfcc460f398fd1af964:386098c871ad5fe384af5f85559e7551:7b4a06b06cbac24b3f39727b0238661b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 224, "y": 443, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 148, "y": 445, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 445, "y": 445, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 72, "y": 446, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 373, "y": 360, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 226, "y": 355, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 184, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 150, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 304, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 459, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 308, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 462, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 386, "y": 91, "w": 76, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 75, "y": 270, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 150, "y": 357, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 75, "y": 358, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 224, "y": 443, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 148, "y": 445, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 445, "y": 445, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 72, "y": 446, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 373, "y": 360, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 226, "y": 355, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 184, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 150, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 304, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 459, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 308, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 462, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 386, "y": 91, "w": 76, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 75, "y": 270, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 150, "y": 357, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 75, "y": 358, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 224, "y": 443, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 148, "y": 445, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 445, "y": 445, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 72, "y": 446, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 373, "y": 360, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 226, "y": 355, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 184, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 150, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 304, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 459, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 308, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 462, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 386, "y": 91, "w": 76, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 75, "y": 270, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 150, "y": 357, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 75, "y": 358, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 224, "y": 443, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 148, "y": 445, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 445, "y": 445, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 72, "y": 446, "w": 70, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 373, "y": 360, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 226, "y": 355, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 184, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 150, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 304, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 459, "y": 269, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 308, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 462, "y": 180, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 386, "y": 91, "w": 76, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 75, "y": 270, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 150, "y": 357, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 75, "y": 358, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 224, "y": 443, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 359, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 300, "y": 357, "w": 73, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 380, "y": 271, "w": 74, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 74, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 384, "y": 181, "w": 75, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 75, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 155, "y": 92, "w": 76, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 309, "y": 91, "w": 77, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 89 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 227, "y": 268, "w": 77, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 87 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 150, "y": 182, "w": 77, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 87 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 272, "w": 75, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 75, "h": 87 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 310, "y": 0, "w": 77, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 77, "h": 91 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 387, "y": 0, "w": 77, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 77, "h": 91 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 155, "y": 0, "w": 77, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 77, "h": 92 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 77, "y": 0, "w": 78, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 78, "h": 91 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 0, "w": 77, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 77, "h": 93 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 231, "y": 180, "w": 77, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 77, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 232, "y": 0, "w": 78, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 77, "y": 91, "w": 78, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 78, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 464, "y": 0, "w": 77, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 232, "y": 90, "w": 77, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 77, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 464, "y": 90, "w": 77, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 77, "h": 90 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 0, "y": 93, "w": 75, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 91 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 75, "y": 179, "w": 75, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 75, "h": 91 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 454, "y": 357, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 73, "h": 88 }, + "sourceSize": { "w": 87, "h": 93 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "718.png", + "format": "I8", + "size": { "w": 541, "h": 534 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/718.png b/public/images/pokemon/back/shiny/718.png index 4492fbd3b22..bb8d4179347 100644 Binary files a/public/images/pokemon/back/shiny/718.png and b/public/images/pokemon/back/shiny/718.png differ diff --git a/public/images/pokemon/back/shiny/719.json b/public/images/pokemon/back/shiny/719.json index 8cb7bee25c3..f7fa0ccb512 100644 --- a/public/images/pokemon/back/shiny/719.json +++ b/public/images/pokemon/back/shiny/719.json @@ -1,41 +1,875 @@ -{ - "textures": [ - { - "image": "719.png", - "format": "RGBA8888", - "size": { - "w": 65, - "h": 65 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 65 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 65 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0340084a126284b9d4aa16b7bbdc9616:f699a390d9b5db64f5f03e684cf77f66:17a705bb924916761be2495822a53735$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 42, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 84, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 126, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 168, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 80, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 119, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 40, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 80, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 125, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 210, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 42, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 84, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 126, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 168, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 80, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 119, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 40, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 80, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 125, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 210, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 42, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 84, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 126, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 168, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 80, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 119, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 40, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 80, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 125, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 210, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 42, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 84, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 126, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 168, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 80, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 119, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 40, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 80, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 125, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 210, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 0, "y": 70, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 8, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 120, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 160, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 158, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 280, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 112, "y": 350, "w": 37, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 0, "w": 37, "h": 69 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 38, "y": 350, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 1, "w": 37, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 156, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 197, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 200, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 207, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 9, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 42, "y": 70, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 8, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 84, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 0, "y": 210, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 39, "y": 280, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 78, "y": 280, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 350, "w": 38, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 38, "h": 69 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 75, "y": 350, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 194, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 117, "y": 280, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 40, "y": 210, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 166, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 70, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 8, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 120, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 160, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 158, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 280, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 112, "y": 350, "w": 37, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 0, "w": 37, "h": 69 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 38, "y": 350, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 1, "w": 37, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 156, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 197, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 200, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 207, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 9, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 42, "y": 70, "w": 42, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 8, "w": 42, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 84, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 210, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 39, "y": 280, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 78, "y": 280, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 0, "y": 350, "w": 38, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 38, "h": 69 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 75, "y": 350, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 194, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 117, "y": 280, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 40, "y": 210, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 40, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 166, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 41, "h": 70 }, + "sourceSize": { "w": 61, "h": 80 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "719.png", + "format": "I8", + "size": { "w": 252, "h": 420 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/719.png b/public/images/pokemon/back/shiny/719.png index a0b34f5bcca..6e76d35bc93 100644 Binary files a/public/images/pokemon/back/shiny/719.png and b/public/images/pokemon/back/shiny/719.png differ diff --git a/public/images/pokemon/back/shiny/881.png b/public/images/pokemon/back/shiny/881.png index 3686b34dd99..4dc11742548 100644 Binary files a/public/images/pokemon/back/shiny/881.png and b/public/images/pokemon/back/shiny/881.png differ diff --git a/public/images/pokemon/exp/248-mega.json b/public/images/pokemon/exp/248-mega.json index 42e7e9f7d6d..2c9370cbeee 100644 --- a/public/images/pokemon/exp/248-mega.json +++ b/public/images/pokemon/exp/248-mega.json @@ -1,272 +1,929 @@ -{ - "textures": [ - { - "image": "248-mega.png", - "format": "RGBA8888", - "size": { - "w": 271, - "h": 271 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 85 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 85 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 85, - "w": 91, - "h": 85 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 85, - "w": 91, - "h": 85 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 170, - "w": 91, - "h": 85 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 170, - "w": 91, - "h": 85 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 90, - "h": 85 - }, - "frame": { - "x": 91, - "y": 85, - "w": 90, - "h": 85 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 90, - "h": 85 - }, - "frame": { - "x": 91, - "y": 85, - "w": 90, - "h": 85 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 90, - "h": 85 - }, - "frame": { - "x": 181, - "y": 85, - "w": 90, - "h": 85 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 90, - "h": 84 - }, - "frame": { - "x": 91, - "y": 170, - "w": 90, - "h": 84 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:cde8b160e19f5e22098d0c8712fe3e26:5bade20a2d91d5c0e3de833bedccd3cb:90df97eb431b7162252516cb937a0b9e$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 467, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 559, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 184, "y": 176, "w": 91, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 184, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 374, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 182, "y": 430, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 549, "y": 430, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 89, "y": 513, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 182, "y": 512, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 273, "y": 513, "w": 87, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 456, "y": 433, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 547, "y": 512, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 274, "y": 431, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 91, "y": 430, "w": 89, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 275, "y": 348, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 91, "y": 347, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 369, "y": 345, "w": 90, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 561, "y": 261, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 262, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 467, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 559, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 184, "y": 176, "w": 91, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 184, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 374, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 182, "y": 430, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 549, "y": 430, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 89, "y": 513, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 182, "y": 512, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 273, "y": 513, "w": 87, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 456, "y": 433, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 547, "y": 512, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 274, "y": 431, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 91, "y": 430, "w": 89, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 275, "y": 348, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 91, "y": 347, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 369, "y": 345, "w": 90, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 561, "y": 261, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 262, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 467, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 559, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 184, "y": 176, "w": 91, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 184, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 374, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 182, "y": 430, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 549, "y": 430, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 89, "y": 513, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 182, "y": 512, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 273, "y": 513, "w": 87, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 456, "y": 433, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 547, "y": 512, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 274, "y": 431, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 91, "y": 430, "w": 89, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 275, "y": 348, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 91, "y": 347, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 369, "y": 345, "w": 90, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 561, "y": 261, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 262, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 467, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 559, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 184, "y": 176, "w": 91, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 184, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 374, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 182, "y": 430, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 549, "y": 430, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 89, "y": 513, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 182, "y": 512, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 273, "y": 513, "w": 87, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 456, "y": 433, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 547, "y": 512, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 274, "y": 431, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 91, "y": 430, "w": 89, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 275, "y": 348, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 91, "y": 347, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 369, "y": 345, "w": 90, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 561, "y": 261, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 262, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 467, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 176, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 92, "y": 176, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 92, "y": 262, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 184, "y": 345, "w": 89, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 89, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 278, "y": 263, "w": 89, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 89, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 468, "y": 261, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 549, "y": 346, "w": 89, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 89, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 347, "w": 89, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 89, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 0, "y": 431, "w": 87, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 87, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 367, "y": 429, "w": 87, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 87, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 461, "y": 346, "w": 86, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 86, "h": 85 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 283, "y": 175, "w": 89, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 89, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 189, "y": 88, "w": 92, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 0, "y": 0, "w": 93, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 93, "h": 87 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 380, "y": 0, "w": 92, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 95, "y": 88, "w": 92, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 474, "y": 0, "w": 92, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 190, "y": 0, "w": 93, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 95, "y": 0, "w": 93, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 285, "y": 0, "w": 93, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 378, "y": 88, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 283, "y": 88, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 473, "y": 88, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 0, "y": 89, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 374, "y": 175, "w": 91, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "248-mega.png", + "format": "I8", + "size": { "w": 651, "h": 593 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/248-mega.png b/public/images/pokemon/exp/248-mega.png index b7563738d3d..167b88b09e5 100644 Binary files a/public/images/pokemon/exp/248-mega.png and b/public/images/pokemon/exp/248-mega.png differ diff --git a/public/images/pokemon/exp/362-mega.json b/public/images/pokemon/exp/362-mega.json index 05497f4ce7e..c69ecfb1903 100644 --- a/public/images/pokemon/exp/362-mega.json +++ b/public/images/pokemon/exp/362-mega.json @@ -1,272 +1,551 @@ -{ - "textures": [ - { - "image": "362-mega.png", - "format": "RGBA8888", - "size": { - "w": 174, - "h": 174 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 72 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 72 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 72 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 72 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 71 - }, - "frame": { - "x": 0, - "y": 72, - "w": 58, - "h": 71 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 71 - }, - "frame": { - "x": 0, - "y": 72, - "w": 58, - "h": 71 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 71 - }, - "frame": { - "x": 0, - "y": 72, - "w": 58, - "h": 71 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 58, - "h": 71 - }, - "frame": { - "x": 58, - "y": 0, - "w": 58, - "h": 71 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 58, - "h": 71 - }, - "frame": { - "x": 58, - "y": 0, - "w": 58, - "h": 71 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 71 - }, - "frame": { - "x": 116, - "y": 0, - "w": 58, - "h": 71 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 70 - }, - "frame": { - "x": 58, - "y": 71, - "w": 58, - "h": 70 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 70 - }, - "frame": { - "x": 58, - "y": 71, - "w": 58, - "h": 70 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:06afd89cf806f88f8f27098b432ad2cd:96be21e5293fd792149dc4962c63b26d:8a7271a5423838c97ddeb1e6dc343255$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "362-mega.png", + "format": "I8", + "size": { "w": 122, "h": 134 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/362-mega.png b/public/images/pokemon/exp/362-mega.png index 76464e38a4c..be87d172e8e 100644 Binary files a/public/images/pokemon/exp/362-mega.png and b/public/images/pokemon/exp/362-mega.png differ diff --git a/public/images/pokemon/exp/484-origin.json b/public/images/pokemon/exp/484-origin.json index f52359c264a..2b63fdd6785 100644 --- a/public/images/pokemon/exp/484-origin.json +++ b/public/images/pokemon/exp/484-origin.json @@ -4,8 +4,8 @@ "image": "484-origin.png", "format": "RGBA8888", "size": { - "w": 426, - "h": 426 + "w": 274, + "h": 274 }, "scale": 1, "frames": [ @@ -14,20 +14,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 }, "frame": { "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 } }, { @@ -35,20 +35,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 }, "frame": { "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 } }, { @@ -56,20 +56,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 }, "frame": { "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 } }, { @@ -77,20 +77,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 }, "frame": { "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 } }, { @@ -98,20 +98,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 }, "frame": { "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 } }, { @@ -119,146 +119,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, "w": 91, - "h": 97 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 97 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 + "h": 95 }, "spriteSourceSize": { "x": 0, - "y": 5, - "w": 92, - "h": 96 - }, - "frame": { - "x": 91, - "y": 0, - "w": 92, - "h": 96 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 92, - "h": 96 - }, - "frame": { - "x": 91, - "y": 0, - "w": 92, - "h": 96 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, "y": 0, "w": 90, - "h": 97 + "h": 95 }, "frame": { "x": 0, - "y": 97, - "w": 90, - "h": 97 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, "y": 0, "w": 90, - "h": 97 - }, - "frame": { - "x": 0, - "y": 97, - "w": 90, - "h": 97 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 96, - "h": 90 - }, - "frame": { - "x": 183, - "y": 0, - "w": 96, - "h": 90 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 96, - "h": 90 - }, - "frame": { - "x": 183, - "y": 0, - "w": 96, - "h": 90 + "h": 95 } }, { @@ -266,20 +140,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -287,20 +161,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -308,20 +182,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -329,20 +203,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -350,20 +224,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -371,20 +245,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -392,20 +266,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -413,20 +287,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -434,20 +308,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -455,20 +329,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -476,20 +350,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -497,272 +371,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 90, + "w": 91, "h": 95 }, - "frame": { + "spriteSourceSize": { "x": 0, - "y": 194, - "w": 90, - "h": 95 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 90, - "h": 95 - }, - "frame": { - "x": 0, - "y": 194, - "w": 90, - "h": 95 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 7, "y": 1, - "w": 89, - "h": 95 + "w": 90, + "h": 94 }, "frame": { "x": 0, - "y": 289, - "w": 89, - "h": 95 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 89, - "h": 95 - }, - "frame": { - "x": 0, - "y": 289, - "w": 89, - "h": 95 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 92, - "h": 92 - }, - "frame": { - "x": 279, - "y": 0, - "w": 92, - "h": 92 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 92, - "h": 92 - }, - "frame": { - "x": 279, - "y": 0, - "w": 92, - "h": 92 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 24, - "y": 16, - "w": 50, - "h": 54 - }, - "frame": { - "x": 371, - "y": 0, - "w": 50, - "h": 54 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 24, - "y": 16, - "w": 50, - "h": 54 - }, - "frame": { - "x": 371, - "y": 0, - "w": 50, - "h": 54 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 24, - "y": 16, - "w": 50, - "h": 54 - }, - "frame": { - "x": 371, - "y": 0, - "w": 50, - "h": 54 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 24, - "y": 16, - "w": 50, - "h": 54 - }, - "frame": { - "x": 371, - "y": 0, - "w": 50, - "h": 54 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 92, - "h": 92 - }, - "frame": { - "x": 183, - "y": 90, - "w": 92, - "h": 92 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 92, - "h": 92 - }, - "frame": { - "x": 183, - "y": 90, - "w": 92, - "h": 92 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 92, - "h": 92 - }, - "frame": { - "x": 183, - "y": 90, - "w": 92, - "h": 92 + "y": 95, + "w": 90, + "h": 94 } }, { @@ -770,20 +392,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -791,20 +413,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -812,20 +434,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -833,20 +455,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -854,20 +476,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -875,20 +497,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -896,20 +518,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -917,20 +539,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -938,20 +560,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -959,20 +581,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -980,20 +602,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -1001,272 +623,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, "w": 91, - "h": 92 + "h": 95 }, - "frame": { - "x": 275, - "y": 92, + "spriteSourceSize": { + "x": 0, + "y": 4, "w": 91, - "h": 92 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 + "h": 91 }, "frame": { "x": 90, - "y": 97, - "w": 89, - "h": 93 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 90, - "y": 97, - "w": 89, - "h": 93 + "y": 0, + "w": 91, + "h": 91 } }, { @@ -1274,20 +644,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1295,20 +665,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1316,20 +686,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1337,20 +707,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1358,20 +728,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1379,20 +749,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1400,20 +770,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1421,20 +791,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1442,20 +812,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1463,20 +833,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1484,20 +854,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1505,19 +875,229 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, + "h": 91 + }, + "frame": { + "x": 181, + "y": 0, + "w": 90, + "h": 91 + } + }, + { + "filename": "0011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, "h": 92 }, "frame": { "x": 90, - "y": 190, - "w": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0012.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0035.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0036.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0039.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0040.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0059.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0060.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0063.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0064.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, "h": 92 } }, @@ -1526,20 +1106,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1547,20 +1127,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1568,20 +1148,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1589,20 +1169,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1610,20 +1190,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1631,20 +1211,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1652,20 +1232,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1673,20 +1253,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1694,20 +1274,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1715,20 +1295,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1736,20 +1316,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1757,62 +1337,62 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, + "w": 89, + "h": 91 + }, + "frame": { + "x": 90, + "y": 183, + "w": 89, + "h": 91 + } + }, + { + "filename": "0015.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, "w": 89, "h": 92 }, "frame": { - "x": 180, - "y": 182, + "x": 179, + "y": 91, "w": 89, "h": 92 } }, { - "filename": "0077.png", + "filename": "0016.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 90, - "h": 90 + "x": 2, + "y": 3, + "w": 89, + "h": 92 }, "frame": { - "x": 269, - "y": 184, - "w": 90, - "h": 90 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 90, - "h": 90 - }, - "frame": { - "x": 269, - "y": 184, - "w": 90, - "h": 90 + "x": 179, + "y": 91, + "w": 89, + "h": 92 } }, { @@ -1820,20 +1400,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } }, { @@ -1841,20 +1421,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } }, { @@ -1862,20 +1442,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } }, { @@ -1883,20 +1463,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } }, { @@ -1904,20 +1484,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } }, { @@ -1925,608 +1505,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 15, - "y": 7, - "w": 79, - "h": 86 - }, - "frame": { - "x": 268, - "y": 274, - "w": 79, - "h": 86 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 15, - "y": 7, - "w": 79, - "h": 86 - }, - "frame": { - "x": 268, - "y": 274, - "w": 79, - "h": 86 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 79, - "h": 83 - }, - "frame": { - "x": 347, - "y": 274, - "w": 79, - "h": 83 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 20, - "y": 11, - "w": 71, - "h": 69 - }, - "frame": { - "x": 347, - "y": 357, - "w": 71, - "h": 69 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 20, - "y": 11, - "w": 71, - "h": 69 - }, - "frame": { - "x": 347, - "y": 357, - "w": 71, - "h": 69 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 20, - "y": 11, - "w": 71, - "h": 69 - }, - "frame": { - "x": 347, - "y": 357, - "w": 71, - "h": 69 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 20, - "y": 12, - "w": 59, - "h": 70 - }, - "frame": { - "x": 359, - "y": 184, - "w": 59, - "h": 70 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 20, - "y": 12, - "w": 59, - "h": 70 - }, - "frame": { - "x": 359, - "y": 184, - "w": 59, - "h": 70 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 35, - "y": 23, - "w": 27, - "h": 33 - }, - "frame": { - "x": 0, - "y": 384, - "w": 27, - "h": 33 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 35, - "y": 23, - "w": 27, - "h": 33 - }, - "frame": { - "x": 371, - "y": 54, - "w": 27, - "h": 33 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 42, - "y": 26, - "w": 19, - "h": 23 - }, - "frame": { - "x": 27, - "y": 384, - "w": 19, - "h": 23 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 42, - "y": 26, - "w": 19, - "h": 23 - }, - "frame": { - "x": 27, - "y": 384, - "w": 19, - "h": 23 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 42, - "y": 35, - "w": 14, - "h": 10 - }, - "frame": { - "x": 359, - "y": 254, - "w": 14, - "h": 10 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 42, - "y": 35, - "w": 14, - "h": 10 - }, - "frame": { - "x": 359, - "y": 254, - "w": 14, - "h": 10 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } } ] @@ -2535,6 +1527,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:52f94c22e7d6d2608638048866c1910a:045ab453153e084bad1f17ca61076c30:5ea3e660bc9c2624f846675d5196db82$" + "smartupdate": "$TexturePacker:SmartUpdate:4eec21f441df8c5ce7313596a1672a9e:bec666304c4bb8072e19fa13a830a7c8:5ea3e660bc9c2624f846675d5196db82$" } } diff --git a/public/images/pokemon/exp/484-origin.png b/public/images/pokemon/exp/484-origin.png index dbd6db55f78..2d8d0fde472 100644 Binary files a/public/images/pokemon/exp/484-origin.png and b/public/images/pokemon/exp/484-origin.png differ diff --git a/public/images/pokemon/exp/569-gigantamax.json b/public/images/pokemon/exp/569-gigantamax.json new file mode 100644 index 00000000000..6cda2b0d79a --- /dev/null +++ b/public/images/pokemon/exp/569-gigantamax.json @@ -0,0 +1,1478 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0008.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0009.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0010.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0011.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0012.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0013.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0014.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0015.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0027.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0028.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0029.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0030.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0031.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0032.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0033.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0034.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0043.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0044.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0045.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0046.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0047.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0048.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0049.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0050.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0051.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0061.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0062.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0063.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0064.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0065.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0066.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0067.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0068.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0069.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0072.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0073.png", + "frame": { "x": 305, "y": 173, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0074.png", + "frame": { "x": 305, "y": 173, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0075.png", + "frame": { "x": 305, "y": 173, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0076.png", + "frame": { "x": 206, "y": 88, "w": 99, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0077.png", + "frame": { "x": 206, "y": 88, "w": 99, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0078.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0079.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0080.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0081.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0082.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0083.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0084.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0085.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0086.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0087.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0088.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0089.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0090.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0091.png", + "frame": { "x": 206, "y": 88, "w": 99, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0092.png", + "frame": { "x": 206, "y": 88, "w": 99, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0093.png", + "frame": { "x": 206, "y": 88, "w": 99, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0094.png", + "frame": { "x": 305, "y": 173, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0095.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0096.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0097.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0098.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0100.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0101.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0102.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0103.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0104.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0105.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0106.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0107.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0108.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0109.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0110.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0111.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0112.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0113.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0114.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0115.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0116.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0117.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0118.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0119.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0120.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0121.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0122.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0123.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0124.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0125.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0126.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0127.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0128.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0129.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0130.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0131.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0132.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0133.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0134.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0135.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0136.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0137.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0138.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0139.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0140.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0141.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0142.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0143.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0144.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0145.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0146.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0147.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0148.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0149.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0150.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0151.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0152.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0153.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0154.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0155.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0156.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0157.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0158.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0159.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0160.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0161.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0162.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0163.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "569-gigantamax.png", + "format": "I8", + "size": { "w": 419, "h": 261 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/569-gigantamax.png b/public/images/pokemon/exp/569-gigantamax.png new file mode 100644 index 00000000000..90decc0ad84 Binary files /dev/null and b/public/images/pokemon/exp/569-gigantamax.png differ diff --git a/public/images/pokemon/exp/651.json b/public/images/pokemon/exp/651.json index 5db25b75d8e..20bdccd5bd4 100644 --- a/public/images/pokemon/exp/651.json +++ b/public/images/pokemon/exp/651.json @@ -1,188 +1,713 @@ -{ - "textures": [ - { - "image": "651.png", - "format": "RGBA8888", - "size": { - "w": 116, - "h": 116 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 58, - "y": 0, - "w": 58, - "h": 53 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 58, - "y": 0, - "w": 58, - "h": 53 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 0, - "y": 53, - "w": 58, - "h": 53 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 52 - }, - "frame": { - "x": 58, - "y": 53, - "w": 58, - "h": 52 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 52 - }, - "frame": { - "x": 58, - "y": 53, - "w": 58, - "h": 52 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d110ead01ff70d3da8dfb432dfe00ac0:207046ea51a1627a342c2b30f969868e:a93e5fa02e10bf11e3ed8bf6571835ca$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 119, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 175, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 355, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 278, "y": 101, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 110, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 56, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 165, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 333, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 287, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 112, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 168, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 278, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 56, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 231, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 224, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 343, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 55, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 220, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 119, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 175, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 355, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 278, "y": 101, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 110, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 56, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 165, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 333, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 287, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 112, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 168, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 278, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 56, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 231, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 224, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 343, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 55, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 220, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 119, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 175, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 355, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 278, "y": 101, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 110, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 56, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 165, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 333, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 287, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 112, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 168, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 278, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 56, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 231, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 224, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 343, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 55, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 220, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 119, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 239, "y": 0, "w": 57, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 60, "y": 0, "w": 58, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 355, "y": 0, "w": 58, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 58, "h": 48 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 0, "w": 59, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 59, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 119, "y": 0, "w": 59, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 59, "h": 48 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 179, "y": 0, "w": 59, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 59, "h": 48 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 297, "y": 0, "w": 57, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 101, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 203, "w": 53, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 329, "y": 252, "w": 51, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 47 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 109, "y": 252, "w": 51, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 51, "h": 48 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 219, "y": 204, "w": 52, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 52, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 166, "y": 202, "w": 52, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 52, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 275, "y": 203, "w": 53, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 54, "y": 204, "w": 54, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 54, "h": 48 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 333, "y": 202, "w": 54, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 110, "y": 202, "w": 55, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 55, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "651.png", + "format": "I8", + "size": { "w": 413, "h": 300 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/651.png b/public/images/pokemon/exp/651.png index 42a1af8184d..633a3cc0c75 100644 Binary files a/public/images/pokemon/exp/651.png and b/public/images/pokemon/exp/651.png differ diff --git a/public/images/pokemon/exp/653.json b/public/images/pokemon/exp/653.json index 19654fbb3cb..a08242f32cf 100644 --- a/public/images/pokemon/exp/653.json +++ b/public/images/pokemon/exp/653.json @@ -1,1553 +1,947 @@ -{ - "textures": [ - { - "image": "653.png", - "format": "RGBA8888", - "size": { - "w": 180, - "h": 180 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 46, - "h": 44 - }, - "frame": { - "x": 42, - "y": 92, - "w": 46, - "h": 44 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 46, - "h": 44 - }, - "frame": { - "x": 42, - "y": 92, - "w": 46, - "h": 44 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 46, - "h": 44 - }, - "frame": { - "x": 42, - "y": 92, - "w": 46, - "h": 44 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 46, - "h": 44 - }, - "frame": { - "x": 42, - "y": 92, - "w": 46, - "h": 44 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 46, - "h": 44 - }, - "frame": { - "x": 42, - "y": 92, - "w": 46, - "h": 44 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 47, - "y": 136, - "w": 47, - "h": 42 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 133, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 133, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 43, - "h": 47 - }, - "frame": { - "x": 94, - "y": 98, - "w": 43, - "h": 47 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 43, - "h": 47 - }, - "frame": { - "x": 94, - "y": 98, - "w": 43, - "h": 47 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 43, - "h": 46 - }, - "frame": { - "x": 137, - "y": 98, - "w": 43, - "h": 46 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 43, - "h": 46 - }, - "frame": { - "x": 137, - "y": 98, - "w": 43, - "h": 46 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 43, - "h": 46 - }, - "frame": { - "x": 137, - "y": 98, - "w": 43, - "h": 46 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3f19f65b0cc7eac6c736e7e4bd91d830:87ecb6f1ef5612019ef73bbf8249079d:a7be961d0230f568aff23d95e7ff0036$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 120, "y": 88, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 120, "y": 88, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 0, "y": 45, "w": 40, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 45, "w": 40, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 42, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 42, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 42, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 42, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 42, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 84, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 84, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 83, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 83, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 84, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 124, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 124, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 126, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 126, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 0, "y": 45, "w": 40, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 0, "y": 45, "w": 40, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 120, "y": 88, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 120, "y": 88, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "653.png", + "format": "I8", + "size": { "w": 168, "h": 175 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/653.png b/public/images/pokemon/exp/653.png index cf42c8754bc..66e359173aa 100644 Binary files a/public/images/pokemon/exp/653.png and b/public/images/pokemon/exp/653.png differ diff --git a/public/images/pokemon/exp/654.json b/public/images/pokemon/exp/654.json index a7f07f56864..74019f665ec 100644 --- a/public/images/pokemon/exp/654.json +++ b/public/images/pokemon/exp/654.json @@ -1,818 +1,695 @@ -{ - "textures": [ - { - "image": "654.png", - "format": "RGBA8888", - "size": { - "w": 390, - "h": 390 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 81 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 81 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 81 - }, - "frame": { - "x": 0, - "y": 81, - "w": 47, - "h": 81 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 81 - }, - "frame": { - "x": 0, - "y": 162, - "w": 47, - "h": 81 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 47, - "h": 80 - }, - "frame": { - "x": 0, - "y": 243, - "w": 47, - "h": 80 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 81 - }, - "frame": { - "x": 47, - "y": 0, - "w": 46, - "h": 81 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 81 - }, - "frame": { - "x": 47, - "y": 81, - "w": 46, - "h": 81 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 81 - }, - "frame": { - "x": 47, - "y": 162, - "w": 46, - "h": 81 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 46, - "h": 80 - }, - "frame": { - "x": 47, - "y": 243, - "w": 46, - "h": 80 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 46, - "h": 79 - }, - "frame": { - "x": 93, - "y": 0, - "w": 46, - "h": 79 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 46, - "h": 79 - }, - "frame": { - "x": 93, - "y": 79, - "w": 46, - "h": 79 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 46, - "h": 79 - }, - "frame": { - "x": 93, - "y": 158, - "w": 46, - "h": 79 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 46, - "h": 79 - }, - "frame": { - "x": 93, - "y": 237, - "w": 46, - "h": 79 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 46, - "h": 74 - }, - "frame": { - "x": 93, - "y": 316, - "w": 46, - "h": 74 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 46, - "h": 79 - }, - "frame": { - "x": 139, - "y": 0, - "w": 46, - "h": 79 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 45, - "h": 80 - }, - "frame": { - "x": 139, - "y": 79, - "w": 45, - "h": 80 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 45, - "h": 80 - }, - "frame": { - "x": 139, - "y": 159, - "w": 45, - "h": 80 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 46, - "h": 78 - }, - "frame": { - "x": 139, - "y": 239, - "w": 46, - "h": 78 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 46, - "h": 73 - }, - "frame": { - "x": 139, - "y": 317, - "w": 46, - "h": 73 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 184, - "y": 79, - "w": 45, - "h": 79 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 185, - "y": 0, - "w": 45, - "h": 79 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 184, - "y": 158, - "w": 45, - "h": 79 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 185, - "y": 237, - "w": 45, - "h": 79 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 46, - "h": 74 - }, - "frame": { - "x": 185, - "y": 316, - "w": 46, - "h": 74 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 229, - "y": 79, - "w": 45, - "h": 79 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 230, - "y": 0, - "w": 45, - "h": 79 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 229, - "y": 158, - "w": 45, - "h": 79 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 230, - "y": 237, - "w": 45, - "h": 79 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 46, - "h": 73 - }, - "frame": { - "x": 231, - "y": 316, - "w": 46, - "h": 73 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 46, - "h": 77 - }, - "frame": { - "x": 274, - "y": 79, - "w": 46, - "h": 77 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 47, - "h": 75 - }, - "frame": { - "x": 275, - "y": 0, - "w": 47, - "h": 75 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 45, - "h": 78 - }, - "frame": { - "x": 274, - "y": 156, - "w": 45, - "h": 78 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 45, - "h": 78 - }, - "frame": { - "x": 275, - "y": 234, - "w": 45, - "h": 78 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 46, - "h": 76 - }, - "frame": { - "x": 319, - "y": 156, - "w": 46, - "h": 76 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 45, - "h": 77 - }, - "frame": { - "x": 320, - "y": 75, - "w": 45, - "h": 77 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 46, - "h": 75 - }, - "frame": { - "x": 322, - "y": 0, - "w": 46, - "h": 75 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 46, - "h": 75 - }, - "frame": { - "x": 277, - "y": 312, - "w": 46, - "h": 75 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 45, - "h": 76 - }, - "frame": { - "x": 320, - "y": 232, - "w": 45, - "h": 76 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 45, - "h": 76 - }, - "frame": { - "x": 323, - "y": 308, - "w": 45, - "h": 76 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:6cb9cd08a225d9ce5a32640f2a1a4760:ab52583219972dae47f87bdaf152d0c0:1977f50e1ab8a3304ceeb59ee1aa2ba9$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 107, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 282, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 160, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 110, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 65, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 107, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 282, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 160, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 110, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 65, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 107, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 282, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 160, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 110, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 65, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 152, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 164, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 117, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 172, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 213, "y": 265, "w": 51, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 282, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 173, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 60, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 55, "y": 68, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 227, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 275, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 55, "y": 68, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 227, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 275, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 55, "y": 68, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 227, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 275, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 55, "y": 68, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 131, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 110, "y": 131, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 165, "y": 131, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 282, "y": 131, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 55, "y": 133, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 220, "y": 134, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 54, "y": 198, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 218, "y": 199, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 271, "y": 261, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 51, "y": 264, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "654.png", + "format": "I8", + "size": { "w": 337, "h": 393 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/654.png b/public/images/pokemon/exp/654.png index 31d16e68e48..b1101648416 100644 Binary files a/public/images/pokemon/exp/654.png and b/public/images/pokemon/exp/654.png differ diff --git a/public/images/pokemon/exp/656.json b/public/images/pokemon/exp/656.json index 71ebaea1efb..3c2051bfe3a 100644 --- a/public/images/pokemon/exp/656.json +++ b/public/images/pokemon/exp/656.json @@ -1,671 +1,713 @@ -{ - "textures": [ - { - "image": "656.png", - "format": "RGBA8888", - "size": { - "w": 96, - "h": 96 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 34, - "w": 32, - "h": 34 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:5f39528f34681b7e85d5ea8d96776a2d:75313d84bbb64652e1825fbfbea72872:9c4d208e6c2f857bfb0b23b8eea3326c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 194, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 194, "y": 38, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 172, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 207, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 195, "y": 148, "w": 32, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 195, "y": 183, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 163, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 197, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 98, "y": 116, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 1, "y": 81, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 194, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 194, "y": 38, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 172, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 207, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 195, "y": 148, "w": 32, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 195, "y": 183, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 163, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 197, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 1, "y": 118, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 1, "y": 81, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 194, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 194, "y": 38, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 172, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 207, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 195, "y": 148, "w": 32, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 195, "y": 183, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 163, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 197, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 1, "y": 118, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 1, "y": 81, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 194, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 194, "y": 38, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 172, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 207, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 195, "y": 148, "w": 32, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 195, "y": 183, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 163, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 197, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 1, "y": 118, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 1, "y": 81, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 194, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 194, "y": 38, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 172, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 207, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 195, "y": 148, "w": 32, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 195, "y": 183, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 163, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 197, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 1, "y": 118, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 1, "y": 81, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 200 + }, + { + "filename": "0057.png", + "frame": { "x": 129, "y": 1, "w": 31, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 31, "h": 38 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 1, "y": 1, "w": 30, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 30, "h": 41 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 33, "y": 1, "w": 30, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 30, "h": 41 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 65, "y": 1, "w": 30, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 30, "h": 41 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 97, "y": 1, "w": 30, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 30, "h": 40 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 162, "y": 1, "w": 30, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 30, "h": 39 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 67, "y": 81, "w": 29, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 29, "h": 38 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 164, "y": 148, "w": 29, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 29, "h": 37 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 35, "y": 81, "w": 30, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 30, "h": 37 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 69, "y": 152, "w": 33, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 14, "w": 33, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 104, "y": 185, "w": 34, "h": 30 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 16, "w": 34, "h": 30 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 68, "y": 186, "w": 34, "h": 29 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 17, "w": 34, "h": 29 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 1, "y": 157, "w": 33, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 14, "w": 33, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 137, "y": 112, "w": 33, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 13, "w": 33, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 750 + }, + { + "filename": "0071.png", + "frame": { "x": 1, "y": 44, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 132, "y": 147, "w": 30, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 30, "h": 36 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 36, "y": 157, "w": 30, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 30, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 35, "y": 121, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 35, "y": 44, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 69, "y": 44, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 103, "y": 79, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "656.png", + "format": "I8", + "size": { "w": 240, "h": 216 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/656.png b/public/images/pokemon/exp/656.png index 7afec8b08ee..cc85a92ecbb 100644 Binary files a/public/images/pokemon/exp/656.png and b/public/images/pokemon/exp/656.png differ diff --git a/public/images/pokemon/exp/661.json b/public/images/pokemon/exp/661.json index f01755ccdc0..74bcbcb06a0 100644 --- a/public/images/pokemon/exp/661.json +++ b/public/images/pokemon/exp/661.json @@ -1,356 +1,397 @@ -{ - "textures": [ - { - "image": "661.png", - "format": "RGBA8888", - "size": { - "w": 70, - "h": 70 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 35, - "w": 32, - "h": 35 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:7dcd93b1058cdbc2640b9885ceb2e854:a2e65850e27a715b371214cfcc8954f8:186d621a544ea0e0e2e0bd57975a29b1$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 38, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0002.png", + "frame": { "x": 32, "y": 113, "w": 31, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0003.png", + "frame": { "x": 34, "y": 36, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 0, "w": 34, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0005.png", + "frame": { "x": 32, "y": 75, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 38, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 114, "w": 31, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 76, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0009.png", + "frame": { "x": 69, "y": 0, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0010.png", + "frame": { "x": 64, "y": 76, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 38, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0012.png", + "frame": { "x": 32, "y": 113, "w": 31, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0013.png", + "frame": { "x": 34, "y": 36, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0014.png", + "frame": { "x": 0, "y": 0, "w": 34, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0015.png", + "frame": { "x": 32, "y": 75, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 38, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 114, "w": 31, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 76, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0019.png", + "frame": { "x": 69, "y": 0, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0020.png", + "frame": { "x": 64, "y": 76, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 38, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0022.png", + "frame": { "x": 32, "y": 113, "w": 31, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0023.png", + "frame": { "x": 34, "y": 36, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 0, "w": 34, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0025.png", + "frame": { "x": 32, "y": 75, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 38, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 114, "w": 31, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 76, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0029.png", + "frame": { "x": 69, "y": 0, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0030.png", + "frame": { "x": 64, "y": 76, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 38, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0032.png", + "frame": { "x": 66, "y": 37, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0033.png", + "frame": { "x": 66, "y": 37, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0034.png", + "frame": { "x": 96, "y": 76, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0035.png", + "frame": { "x": 103, "y": 0, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0036.png", + "frame": { "x": 34, "y": 0, "w": 35, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0037.png", + "frame": { "x": 103, "y": 0, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0038.png", + "frame": { "x": 34, "y": 0, "w": 35, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0039.png", + "frame": { "x": 103, "y": 0, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0040.png", + "frame": { "x": 34, "y": 0, "w": 35, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0041.png", + "frame": { "x": 103, "y": 0, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0042.png", + "frame": { "x": 98, "y": 37, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0043.png", + "frame": { "x": 66, "y": 37, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "format": "I8", + "size": { "w": 137, "h": 152 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/661.png b/public/images/pokemon/exp/661.png index 52e31c9ec73..ebc25efa895 100644 Binary files a/public/images/pokemon/exp/661.png and b/public/images/pokemon/exp/661.png differ diff --git a/public/images/pokemon/exp/662.json b/public/images/pokemon/exp/662.json index a5fb9d1a87c..3600bbcd38d 100644 --- a/public/images/pokemon/exp/662.json +++ b/public/images/pokemon/exp/662.json @@ -1,776 +1,254 @@ -{ - "textures": [ - { - "image": "662.png", - "format": "RGBA8888", - "size": { - "w": 167, - "h": 167 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 56, - "h": 52 - }, - "frame": { - "x": 56, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 56, - "h": 52 - }, - "frame": { - "x": 56, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 56, - "h": 52 - }, - "frame": { - "x": 56, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 56, - "h": 52 - }, - "frame": { - "x": 56, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 1, - "y": 16, - "w": 55, - "h": 37 - }, - "frame": { - "x": 112, - "y": 0, - "w": 55, - "h": 37 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 1, - "y": 16, - "w": 55, - "h": 37 - }, - "frame": { - "x": 112, - "y": 0, - "w": 55, - "h": 37 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 1, - "y": 16, - "w": 55, - "h": 37 - }, - "frame": { - "x": 112, - "y": 0, - "w": 55, - "h": 37 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 1, - "y": 16, - "w": 55, - "h": 37 - }, - "frame": { - "x": 112, - "y": 0, - "w": 55, - "h": 37 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 51 - }, - "frame": { - "x": 0, - "y": 52, - "w": 56, - "h": 51 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 51 - }, - "frame": { - "x": 0, - "y": 52, - "w": 56, - "h": 51 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 51 - }, - "frame": { - "x": 0, - "y": 52, - "w": 56, - "h": 51 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 51 - }, - "frame": { - "x": 0, - "y": 52, - "w": 56, - "h": 51 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 50 - }, - "frame": { - "x": 0, - "y": 103, - "w": 56, - "h": 50 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 50 - }, - "frame": { - "x": 0, - "y": 103, - "w": 56, - "h": 50 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 50 - }, - "frame": { - "x": 0, - "y": 103, - "w": 56, - "h": 50 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 50 - }, - "frame": { - "x": 0, - "y": 103, - "w": 56, - "h": 50 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 17, - "w": 56, - "h": 44 - }, - "frame": { - "x": 56, - "y": 52, - "w": 56, - "h": 44 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 17, - "w": 56, - "h": 44 - }, - "frame": { - "x": 56, - "y": 52, - "w": 56, - "h": 44 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 17, - "w": 56, - "h": 44 - }, - "frame": { - "x": 56, - "y": 96, - "w": 56, - "h": 44 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 17, - "w": 56, - "h": 44 - }, - "frame": { - "x": 56, - "y": 96, - "w": 56, - "h": 44 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:fdd7a1bbdeb9b06a84c6e230eaa36b6e:73c8c872230bd4fc874bce8a02ada9b0:e3da2dd0277c18bcc713dc6dd2460c87$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 221, "y": 131, "w": 57, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 17, "w": 57, "h": 61 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 113, "y": 70, "w": 56, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 19, "w": 56, "h": 63 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 335, "y": 136, "w": 49, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 36, "w": 49, "h": 50 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 105, "y": 197, "w": 63, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 33, "w": 63, "h": 51 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 1, "y": 1, "w": 59, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 16, "w": 59, "h": 66 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 119, "y": 1, "w": 56, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 56, "h": 68 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 233, "y": 1, "w": 54, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 7, "w": 54, "h": 70 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 176, "y": 1, "w": 56, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 13, "w": 56, "h": 68 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 288, "y": 1, "w": 59, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 20, "w": 59, "h": 64 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 338, "y": 187, "w": 47, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 30, "w": 47, "h": 48 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 66, "y": 249, "w": 62, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 26, "w": 62, "h": 49 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 1, "y": 68, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 6, "w": 58, "h": 64 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 169, "y": 141, "w": 47, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 17, "w": 47, "h": 49 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 275, "y": 198, "w": 62, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 12, "w": 62, "h": 50 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 61, "y": 1, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 57, "h": 67 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 288, "y": 66, "w": 54, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 54, "h": 69 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 60, "y": 69, "w": 52, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 5, "w": 52, "h": 71 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 170, "y": 70, "w": 50, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 70 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 1, "y": 133, "w": 49, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 13, "w": 49, "h": 70 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 275, "y": 249, "w": 56, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 30, "w": 56, "h": 49 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 1, "y": 205, "w": 64, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 27, "w": 64, "h": 48 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 221, "y": 72, "w": 60, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 13, "w": 60, "h": 58 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 113, "y": 134, "w": 55, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 7, "w": 55, "h": 62 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 223, "y": 193, "w": 51, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 3, "w": 51, "h": 64 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 51, "y": 141, "w": 53, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 53, "h": 63 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 169, "y": 193, "w": 53, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 10, "w": 53, "h": 63 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 279, "y": 136, "w": 55, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 14, "w": 55, "h": 61 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "662.png", + "format": "I8", + "size": { "w": 386, "h": 299 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/662.png b/public/images/pokemon/exp/662.png index e47863f724b..be3e0170e73 100644 Binary files a/public/images/pokemon/exp/662.png and b/public/images/pokemon/exp/662.png differ diff --git a/public/images/pokemon/exp/663.json b/public/images/pokemon/exp/663.json index 7d61c15fd97..8c4ef182132 100644 --- a/public/images/pokemon/exp/663.json +++ b/public/images/pokemon/exp/663.json @@ -1,1700 +1,731 @@ -{ - "textures": [ - { - "image": "663.png", - "format": "RGBA8888", - "size": { - "w": 295, - "h": 295 - }, - "scale": 1, - "frames": [ - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:df66b59e88a0e2316e65cc2931e2d45a:38fe3e789df33d7d1b51b40128b5adaa:3790d8d72a704a789cc594688d98802e$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0002.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0003.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0004.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0006.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0007.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0009.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0010.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0012.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0013.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0014.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0016.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0017.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0019.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0020.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0022.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0023.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0024.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0026.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0027.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0029.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0030.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0032.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0033.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0034.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0036.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0037.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0039.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0040.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0042.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0043.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0044.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0045.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0046.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0047.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0049.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0050.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0052.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0053.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0054.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0056.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0057.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0059.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0060.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0062.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0064.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0065.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0066.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0067.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0069.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0070.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0071.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0072.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0074.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0075.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0076.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0077.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0079.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0080.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "663.png", + "format": "I8", + "size": { "w": 480, "h": 152 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/663.png b/public/images/pokemon/exp/663.png index e3f83f2594b..394cec2e0ee 100644 Binary files a/public/images/pokemon/exp/663.png and b/public/images/pokemon/exp/663.png differ diff --git a/public/images/pokemon/exp/664.json b/public/images/pokemon/exp/664.json index b44e028830f..5036fe74b0b 100644 --- a/public/images/pokemon/exp/664.json +++ b/public/images/pokemon/exp/664.json @@ -1,188 +1,110 @@ -{ - "textures": [ - { - "image": "664.png", - "format": "RGBA8888", - "size": { - "w": 84, - "h": 84 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 25, - "h": 41 - }, - "frame": { - "x": 0, - "y": 43, - "w": 25, - "h": 41 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 25, - "h": 41 - }, - "frame": { - "x": 0, - "y": 43, - "w": 25, - "h": 41 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 25, - "y": 0, - "w": 25, - "h": 43 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 25, - "y": 0, - "w": 25, - "h": 43 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 50, - "y": 0, - "w": 25, - "h": 43 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:463885b13604daf56d9395607b6a199b:02b6779c8edc4d65f396242ab67065d7:596e7d5b15b1bf041c4d7f6707c8ff49$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 46, "w": 26, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 26, "h": 46 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 83, "y": 46, "w": 26, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 26, "y": 90, "w": 26, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 52, "y": 91, "w": 26, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 26, "y": 46, "w": 27, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 27, "h": 44 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 78, "y": 91, "w": 26, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 44 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 56, "y": 0, "w": 28, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 45 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 0, "w": 28, "h": 46 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 46 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 28, "y": 0, "w": 28, "h": 46 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 46 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 84, "y": 0, "w": 27, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 46 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 56, "y": 45, "w": 27, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 46 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "664.png", + "format": "I8", + "size": { "w": 111, "h": 136 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/664.png b/public/images/pokemon/exp/664.png index 5f7ee7f426e..d626085b5a1 100644 Binary files a/public/images/pokemon/exp/664.png and b/public/images/pokemon/exp/664.png differ diff --git a/public/images/pokemon/exp/665.json b/public/images/pokemon/exp/665.json index 69d1dfa05e2..a06b1d10ad0 100644 --- a/public/images/pokemon/exp/665.json +++ b/public/images/pokemon/exp/665.json @@ -1,188 +1,596 @@ -{ - "textures": [ - { - "image": "665.png", - "format": "RGBA8888", - "size": { - "w": 76, - "h": 76 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 36, - "h": 36 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 36, - "h": 36 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 35 - }, - "frame": { - "x": 36, - "y": 36, - "w": 38, - "h": 35 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 35 - }, - "frame": { - "x": 36, - "y": 36, - "w": 38, - "h": 35 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:359a2e5553846e1cd19ec4ff9a207cd7:96f598328847d5f090f229788215db91:a72e6c94514c750d7462eab6b08ee591$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 151, "y": 103, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 151, "y": 103, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 151, "y": 103, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 159, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 193, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 159, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 40, "y": 41, "w": 39, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 3, "w": 39, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 80, "y": 38, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 3, "w": 45, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 227, "y": 34, "w": 63, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 63, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 80, "y": 0, "w": 74, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 74, "h": 38 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 154, "y": 0, "w": 81, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 81, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 235, "y": 0, "w": 81, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 81, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 0, "w": 80, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 80, "h": 41 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 154, "y": 34, "w": 73, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 316, "y": 0, "w": 73, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 37 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 290, "y": 37, "w": 53, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 4, "w": 53, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 343, "y": 37, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 46, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 41, "w": 40, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 40, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 227, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 261, "y": 71, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 295, "y": 71, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 329, "y": 72, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 363, "y": 72, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "665.png", + "format": "I8", + "size": { "w": 397, "h": 135 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/665.png b/public/images/pokemon/exp/665.png index 05b0370d0c6..88dc208300f 100644 Binary files a/public/images/pokemon/exp/665.png and b/public/images/pokemon/exp/665.png differ diff --git a/public/images/pokemon/exp/666-fancy.png b/public/images/pokemon/exp/666-fancy.png index 6c23274c5e0..92da507a61f 100644 Binary files a/public/images/pokemon/exp/666-fancy.png and b/public/images/pokemon/exp/666-fancy.png differ diff --git a/public/images/pokemon/exp/666-high-plains.png b/public/images/pokemon/exp/666-high-plains.png index 9d6527bf091..a34b2fd8254 100644 Binary files a/public/images/pokemon/exp/666-high-plains.png and b/public/images/pokemon/exp/666-high-plains.png differ diff --git a/public/images/pokemon/exp/666-meadow.json b/public/images/pokemon/exp/666-meadow.json index ee4f6d31bc0..77158992e59 100644 --- a/public/images/pokemon/exp/666-meadow.json +++ b/public/images/pokemon/exp/666-meadow.json @@ -1,314 +1,551 @@ -{ - "textures": [ - { - "image": "666-meadow.png", - "format": "RGBA8888", - "size": { - "w": 243, - "h": 243 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 84, - "h": 88 - }, - "frame": { - "x": 0, - "y": 0, - "w": 84, - "h": 88 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 77, - "h": 89 - }, - "frame": { - "x": 0, - "y": 88, - "w": 77, - "h": 89 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 77, - "h": 89 - }, - "frame": { - "x": 0, - "y": 88, - "w": 77, - "h": 89 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 69, - "h": 89 - }, - "frame": { - "x": 77, - "y": 88, - "w": 69, - "h": 89 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 69, - "h": 89 - }, - "frame": { - "x": 77, - "y": 88, - "w": 69, - "h": 89 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 62, - "h": 87 - }, - "frame": { - "x": 84, - "y": 0, - "w": 62, - "h": 87 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 62, - "h": 87 - }, - "frame": { - "x": 84, - "y": 0, - "w": 62, - "h": 87 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 13, - "y": 2, - "w": 56, - "h": 86 - }, - "frame": { - "x": 146, - "y": 0, - "w": 56, - "h": 86 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 13, - "y": 2, - "w": 56, - "h": 86 - }, - "frame": { - "x": 146, - "y": 0, - "w": 56, - "h": 86 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 41, - "h": 85 - }, - "frame": { - "x": 202, - "y": 0, - "w": 41, - "h": 85 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 51, - "h": 86 - }, - "frame": { - "x": 146, - "y": 86, - "w": 51, - "h": 86 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 51, - "h": 86 - }, - "frame": { - "x": 146, - "y": 86, - "w": 51, - "h": 86 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 46, - "h": 86 - }, - "frame": { - "x": 197, - "y": 86, - "w": 46, - "h": 86 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 46, - "h": 86 - }, - "frame": { - "x": 197, - "y": 86, - "w": 46, - "h": 86 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:223ce33721ef8da9ff40286099c20de4:b82acd304c2a8b8cebeda2043a3e1f96:f8ac4807b4d6eef2256fa1b93e0f89ba$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 14, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 347, "y": 2, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 347, "y": 71, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 347, "y": 140, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 209, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 21, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 347, "y": 140, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 347, "y": 71, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 347, "y": 2, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 14, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 347, "y": 2, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 347, "y": 71, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 347, "y": 140, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 209, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 21, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 347, "y": 140, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 347, "y": 71, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 347, "y": 2, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 14, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 347, "y": 2, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 347, "y": 71, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 347, "y": 140, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 209, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 21, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 347, "y": 140, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 347, "y": 71, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 347, "y": 2, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 14, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 2, "y": 209, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 278, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 53, "y": 209, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 104, "y": 209, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 19, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 71, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 20, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 155, "y": 209, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 19, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 140, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 206, "y": 209, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 209, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 257, "y": 209, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0049.png", + "frame": { "x": 278, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 14, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0050.png", + "frame": { "x": 308, "y": 209, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0051.png", + "frame": { "x": 2, "y": 140, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0052.png", + "frame": { "x": 53, "y": 209, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0053.png", + "frame": { "x": 71, "y": 140, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0054.png", + "frame": { "x": 104, "y": 209, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 19, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0055.png", + "frame": { "x": 140, "y": 140, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 20, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0056.png", + "frame": { "x": 2, "y": 278, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 19, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0057.png", + "frame": { "x": 209, "y": 140, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0058.png", + "frame": { "x": 53, "y": 278, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0059.png", + "frame": { "x": 278, "y": 140, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + }, + { + "filename": "0060.png", + "frame": { "x": 104, "y": 278, "w": 49, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 }, + "sourceSize": { "w": 96, "h": 96 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-meadow.png", + "format": "I8", + "size": { "w": 398, "h": 347 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/666-meadow.png b/public/images/pokemon/exp/666-meadow.png index 3f9f758ad1f..6912a8d8174 100644 Binary files a/public/images/pokemon/exp/666-meadow.png and b/public/images/pokemon/exp/666-meadow.png differ diff --git a/public/images/pokemon/exp/666-poke-ball.png b/public/images/pokemon/exp/666-poke-ball.png index e33fe6e8c5a..58cae8e2aaa 100644 Binary files a/public/images/pokemon/exp/666-poke-ball.png and b/public/images/pokemon/exp/666-poke-ball.png differ diff --git a/public/images/pokemon/exp/666-river.png b/public/images/pokemon/exp/666-river.png index 1e908ff89b6..433b2c39254 100644 Binary files a/public/images/pokemon/exp/666-river.png and b/public/images/pokemon/exp/666-river.png differ diff --git a/public/images/pokemon/exp/667.json b/public/images/pokemon/exp/667.json index 3667bc80aa0..3fba95afcf9 100644 --- a/public/images/pokemon/exp/667.json +++ b/public/images/pokemon/exp/667.json @@ -1,272 +1,659 @@ -{ - "textures": [ - { - "image": "667.png", - "format": "RGBA8888", - "size": { - "w": 160, - "h": 160 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 40, - "h": 46 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 0, - "y": 92, - "w": 40, - "h": 46 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 40, - "y": 0, - "w": 40, - "h": 46 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 80, - "y": 0, - "w": 40, - "h": 46 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 45 - }, - "frame": { - "x": 120, - "y": 0, - "w": 40, - "h": 45 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 45 - }, - "frame": { - "x": 120, - "y": 0, - "w": 40, - "h": 45 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 45 - }, - "frame": { - "x": 120, - "y": 45, - "w": 40, - "h": 45 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 45 - }, - "frame": { - "x": 40, - "y": 90, - "w": 40, - "h": 45 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 40, - "h": 44 - }, - "frame": { - "x": 40, - "y": 46, - "w": 40, - "h": 44 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 40, - "h": 44 - }, - "frame": { - "x": 80, - "y": 46, - "w": 40, - "h": 44 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0c78c1973ebb266716d5a3a4557bca98:3ab4a906b1847f4048e828e5410eae40:02171d511e760c8a3e1b623ad6bf93f5$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0049.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0050.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0051.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0052.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0053.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0054.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0055.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0056.png", + "frame": { "x": 85, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 48 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0058.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0060.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0062.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0064.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0066.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0068.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0070.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0071.png", + "frame": { "x": 85, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 48 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0072.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "667.png", + "format": "I8", + "size": { "w": 167, "h": 141 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/667.png b/public/images/pokemon/exp/667.png index 21bbfcc0d68..3ae931300c5 100644 Binary files a/public/images/pokemon/exp/667.png and b/public/images/pokemon/exp/667.png differ diff --git a/public/images/pokemon/exp/668.json b/public/images/pokemon/exp/668.json index 083fdcfb598..63671a548a2 100644 --- a/public/images/pokemon/exp/668.json +++ b/public/images/pokemon/exp/668.json @@ -1,272 +1,821 @@ -{ - "textures": [ - { - "image": "668.png", - "format": "RGBA8888", - "size": { - "w": 205, - "h": 205 - }, - "scale": 1, - "frames": [ - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 70, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 70, - "h": 68 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 70, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 70, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 70, - "h": 69 - }, - "frame": { - "x": 70, - "y": 0, - "w": 70, - "h": 69 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 70, - "h": 69 - }, - "frame": { - "x": 70, - "y": 0, - "w": 70, - "h": 69 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 70, - "h": 69 - }, - "frame": { - "x": 70, - "y": 0, - "w": 70, - "h": 69 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 70, - "h": 69 - }, - "frame": { - "x": 70, - "y": 0, - "w": 70, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 70 - }, - "frame": { - "x": 0, - "y": 68, - "w": 67, - "h": 70 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 70 - }, - "frame": { - "x": 0, - "y": 68, - "w": 67, - "h": 70 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 69, - "h": 70 - }, - "frame": { - "x": 67, - "y": 69, - "w": 69, - "h": 70 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 69, - "h": 70 - }, - "frame": { - "x": 67, - "y": 69, - "w": 69, - "h": 70 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 69, - "h": 70 - }, - "frame": { - "x": 67, - "y": 69, - "w": 69, - "h": 70 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 69, - "h": 70 - }, - "frame": { - "x": 136, - "y": 69, - "w": 69, - "h": 70 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a0374d38386b4719d8b0a8fcc11d003d:7a4ba7ff9050ba3dee8c8340200f12c2:947bf84d1af493c62e2cef45bb6c19ad$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 67, "y": 222, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 295, "w": 68, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 414, "y": 297, "w": 67, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 196, "y": 367, "w": 65, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 414, "y": 369, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 320, "y": 372, "w": 60, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 380, "y": 441, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 196, "y": 438, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 61, "y": 370, "w": 60, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 350, "y": 296, "w": 64, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 151, "w": 67, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 283, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 434, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 214, "y": 149, "w": 69, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 282, "y": 225, "w": 68, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 67, "y": 222, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 295, "w": 68, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 414, "y": 297, "w": 67, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 196, "y": 367, "w": 65, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 414, "y": 369, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 320, "y": 372, "w": 60, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 380, "y": 441, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 196, "y": 438, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 61, "y": 370, "w": 60, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 350, "y": 296, "w": 64, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 151, "w": 67, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 283, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 434, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 214, "y": 149, "w": 69, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 282, "y": 225, "w": 68, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 67, "y": 222, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 295, "w": 68, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 414, "y": 297, "w": 67, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 196, "y": 367, "w": 65, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 414, "y": 369, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 320, "y": 372, "w": 60, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 380, "y": 441, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 196, "y": 438, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 61, "y": 370, "w": 60, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 350, "y": 296, "w": 64, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 151, "w": 67, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 283, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 434, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 214, "y": 149, "w": 69, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 282, "y": 225, "w": 68, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 67, "y": 222, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 295, "w": 68, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 414, "y": 297, "w": 67, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 196, "y": 367, "w": 65, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 414, "y": 369, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 320, "y": 372, "w": 60, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 380, "y": 441, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 196, "y": 438, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 61, "y": 370, "w": 60, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 350, "y": 296, "w": 64, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 151, "w": 67, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 283, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 434, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 214, "y": 149, "w": 69, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 282, "y": 225, "w": 68, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 351, "y": 151, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 142, "y": 221, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 351, "y": 224, "w": 70, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 70, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 421, "y": 225, "w": 69, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 69, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 205, "y": 296, "w": 69, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 69, "h": 71 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 212, "y": 224, "w": 70, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 70, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 137, "y": 294, "w": 68, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 68, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 274, "y": 299, "w": 64, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 368, "w": 61, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 61, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 442, "w": 55, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 55, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 438, "y": 441, "w": 55, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 55, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 261, "y": 372, "w": 59, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 134, "y": 367, "w": 62, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 62, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 68, "y": 295, "w": 66, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 66, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 365, "y": 75, "w": 69, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 69, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 75, "w": 71, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 442, "y": 74, "w": 72, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 72, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 221, "y": 74, "w": 72, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 72, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 369, "y": 0, "w": 73, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 296, "y": 0, "w": 73, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 74, "y": 0, "w": 74, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 0, "w": 74, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 148, "y": 0, "w": 74, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 74, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 148, "y": 74, "w": 73, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 73, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 222, "y": 0, "w": 74, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 74, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 442, "y": 0, "w": 73, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 73, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 293, "y": 75, "w": 72, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 72, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 71, "y": 75, "w": 72, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 72, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 71, "y": 149, "w": 71, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 71, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 143, "y": 148, "w": 71, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 71, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "668.png", + "format": "I8", + "size": { "w": 515, "h": 516 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/668.png b/public/images/pokemon/exp/668.png index 36acb70a20f..85be1a55032 100644 Binary files a/public/images/pokemon/exp/668.png and b/public/images/pokemon/exp/668.png differ diff --git a/public/images/pokemon/exp/672.json b/public/images/pokemon/exp/672.json index 7062ea01ab3..f337bef7d29 100644 --- a/public/images/pokemon/exp/672.json +++ b/public/images/pokemon/exp/672.json @@ -1,965 +1,479 @@ -{ - "textures": [ - { - "image": "672.png", - "format": "RGBA8888", - "size": { - "w": 250, - "h": 250 - }, - "scale": 1, - "frames": [ - { - "filename": "0033.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 190, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 0, - "y": 42, - "w": 38, - "h": 42 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 42, - "w": 38, - "h": 42 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 76, - "y": 42, - "w": 38, - "h": 42 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 42 - }, - "frame": { - "x": 114, - "y": 42, - "w": 37, - "h": 42 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 42 - }, - "frame": { - "x": 151, - "y": 42, - "w": 37, - "h": 42 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 42 - }, - "frame": { - "x": 188, - "y": 42, - "w": 37, - "h": 42 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 42 - }, - "frame": { - "x": 0, - "y": 84, - "w": 37, - "h": 42 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 73, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 73, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 73, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 109, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 109, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 145, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 181, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 0, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 36, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 72, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 108, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 144, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 180, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 0, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 0, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 36, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 72, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 108, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 108, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 144, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 35, - "h": 42 - }, - "frame": { - "x": 180, - "y": 168, - "w": 35, - "h": 42 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 35, - "h": 42 - }, - "frame": { - "x": 180, - "y": 168, - "w": 35, - "h": 42 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 35, - "h": 42 - }, - "frame": { - "x": 215, - "y": 168, - "w": 35, - "h": 42 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 0, - "y": 209, - "w": 36, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 36, - "y": 209, - "w": 36, - "h": 41 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:38e639fec858918eeed4df6a97e5793c:1f05d1f362d84566f20c17270128fcef:2e4767b7cd134fc0ab1bb6e9eee82bc7$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 127, "y": 50, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 43, "y": 53, "w": 43, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 124, "y": 148, "w": 43, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 102, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 127, "y": 99, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 128, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 127, "y": 50, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 43, "y": 53, "w": 43, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 124, "y": 148, "w": 43, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 102, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 127, "y": 99, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 128, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 127, "y": 50, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 43, "y": 53, "w": 43, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 124, "y": 148, "w": 43, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 102, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 127, "y": 99, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 128, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 127, "y": 50, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 43, "y": 53, "w": 43, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 124, "y": 148, "w": 43, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 102, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 127, "y": 99, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 128, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 43, "y": 0, "w": 43, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 43, "h": 53 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 43, "h": 54 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 42, "y": 100, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 86, "y": 50, "w": 41, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 51 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 43, "y": 0, "w": 43, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 43, "h": 53 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 43, "h": 54 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 83, "y": 101, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 86, "y": 50, "w": 41, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 51 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "672.png", + "format": "I8", + "size": { "w": 170, "h": 193 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/672.png b/public/images/pokemon/exp/672.png index 1af5c35d308..1c261d8d51a 100644 Binary files a/public/images/pokemon/exp/672.png and b/public/images/pokemon/exp/672.png differ diff --git a/public/images/pokemon/exp/674.json b/public/images/pokemon/exp/674.json deleted file mode 100644 index ab275feb366..00000000000 --- a/public/images/pokemon/exp/674.json +++ /dev/null @@ -1,524 +0,0 @@ -{ - "textures": [ - { - "image": "674.png", - "format": "RGBA8888", - "size": { - "w": 90, - "h": 90 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 30, - "y": 0, - "w": 30, - "h": 39 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 30, - "y": 0, - "w": 30, - "h": 39 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 0, - "w": 30, - "h": 37 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 0, - "w": 30, - "h": 37 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 0, - "w": 30, - "h": 37 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 0, - "w": 30, - "h": 37 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 37, - "w": 30, - "h": 37 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 37, - "w": 30, - "h": 37 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8a56731ba1ddcc58654c5fd4c09d4b6c:7feee6e8d94135fbc956d541853811cb:b823d10f1c9b4d501296982088ba63d6$" - } -} diff --git a/public/images/pokemon/exp/674.png b/public/images/pokemon/exp/674.png deleted file mode 100644 index 68fd635ed4f..00000000000 Binary files a/public/images/pokemon/exp/674.png and /dev/null differ diff --git a/public/images/pokemon/exp/692.json b/public/images/pokemon/exp/692.json index 935f67c3daa..86b535260ae 100644 --- a/public/images/pokemon/exp/692.json +++ b/public/images/pokemon/exp/692.json @@ -1,356 +1,794 @@ -{ - "textures": [ - { - "image": "692.png", - "format": "RGBA8888", - "size": { - "w": 162, - "h": 162 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 60, - "y": 0, - "w": 60, - "h": 41 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 60, - "y": 0, - "w": 60, - "h": 41 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 41, - "w": 60, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 41, - "w": 60, - "h": 41 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 82, - "w": 60, - "h": 41 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 82, - "w": 60, - "h": 41 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 0, - "y": 123, - "w": 60, - "h": 39 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 0, - "y": 123, - "w": 60, - "h": 39 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 60, - "y": 41, - "w": 60, - "h": 39 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 60, - "y": 41, - "w": 60, - "h": 39 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 60, - "y": 41, - "w": 60, - "h": 39 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 60, - "y": 41, - "w": 60, - "h": 39 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 59, - "h": 41 - }, - "frame": { - "x": 60, - "y": 80, - "w": 59, - "h": 41 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 59, - "h": 41 - }, - "frame": { - "x": 60, - "y": 121, - "w": 59, - "h": 41 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:770fa5fad1cc8a443ce0a20fecd29c87:eb7f111f1bbee8cd3438d375d4fb00f7:2880def858c84cd859bedf13b0b49a33$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 178, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 178, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 1, "y": 71, "w": 57, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 57, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 1, "y": 71, "w": 57, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 57, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 117, "y": 72, "w": 59, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 178, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 178, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "692.png", + "format": "I8", + "size": { "w": 239, "h": 106 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/692.png b/public/images/pokemon/exp/692.png index 976faaf76a4..1e42cbf47fa 100644 Binary files a/public/images/pokemon/exp/692.png and b/public/images/pokemon/exp/692.png differ diff --git a/public/images/pokemon/exp/693.json b/public/images/pokemon/exp/693.json index b5b81735f10..c8f7763de1d 100644 --- a/public/images/pokemon/exp/693.json +++ b/public/images/pokemon/exp/693.json @@ -1,272 +1,902 @@ -{ - "textures": [ - { - "image": "693.png", - "format": "RGBA8888", - "size": { - "w": 259, - "h": 259 - }, - "scale": 1, - "frames": [ - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 86, - "h": 89 - }, - "frame": { - "x": 0, - "y": 0, - "w": 86, - "h": 89 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 86, - "h": 89 - }, - "frame": { - "x": 0, - "y": 0, - "w": 86, - "h": 89 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 85, - "h": 89 - }, - "frame": { - "x": 0, - "y": 89, - "w": 85, - "h": 89 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 85, - "h": 89 - }, - "frame": { - "x": 0, - "y": 89, - "w": 85, - "h": 89 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 85, - "h": 89 - }, - "frame": { - "x": 86, - "y": 0, - "w": 85, - "h": 89 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 85, - "h": 89 - }, - "frame": { - "x": 86, - "y": 0, - "w": 85, - "h": 89 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 85, - "h": 89 - }, - "frame": { - "x": 85, - "y": 89, - "w": 85, - "h": 89 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 85, - "h": 88 - }, - "frame": { - "x": 171, - "y": 0, - "w": 85, - "h": 88 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 85, - "h": 88 - }, - "frame": { - "x": 171, - "y": 0, - "w": 85, - "h": 88 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 91, - "h": 80 - }, - "frame": { - "x": 0, - "y": 178, - "w": 91, - "h": 80 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 89, - "h": 83 - }, - "frame": { - "x": 170, - "y": 89, - "w": 89, - "h": 83 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 89, - "h": 83 - }, - "frame": { - "x": 170, - "y": 89, - "w": 89, - "h": 83 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8606ef5d207ca2100dda49cb1d79599e:d3c4f159e863b497f7925b3a24df9e4b:9c1f9147e693c05eb4655590e9099679$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 416, "y": 214, "w": 91, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 405, "y": 145, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 207, "y": 344, "w": 105, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 507, "y": 285, "w": 105, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 412, "y": 1, "w": 104, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 1, "y": 145, "w": 99, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 1, "y": 76, "w": 105, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 507, "y": 219, "w": 104, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 1, "y": 283, "w": 102, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 207, "y": 1, "w": 99, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 517, "y": 74, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 106, "y": 78, "w": 102, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 421, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 312, "y": 354, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 416, "y": 214, "w": 91, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 405, "y": 145, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 207, "y": 344, "w": 105, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 507, "y": 285, "w": 105, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 412, "y": 1, "w": 104, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 1, "y": 145, "w": 99, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 1, "y": 76, "w": 105, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 507, "y": 219, "w": 104, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 1, "y": 283, "w": 102, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 207, "y": 1, "w": 99, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 517, "y": 74, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 106, "y": 78, "w": 102, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 421, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 312, "y": 354, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 416, "y": 214, "w": 91, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 405, "y": 145, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 207, "y": 344, "w": 105, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 507, "y": 285, "w": 105, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 412, "y": 1, "w": 104, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 1, "y": 145, "w": 99, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 1, "y": 76, "w": 105, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 507, "y": 219, "w": 104, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 1, "y": 283, "w": 102, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 207, "y": 1, "w": 99, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 517, "y": 74, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 106, "y": 78, "w": 102, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 421, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 312, "y": 354, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 416, "y": 214, "w": 91, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 405, "y": 145, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 207, "y": 344, "w": 105, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 507, "y": 285, "w": 105, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 412, "y": 1, "w": 104, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 1, "y": 145, "w": 99, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 1, "y": 76, "w": 105, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 507, "y": 219, "w": 104, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 1, "y": 283, "w": 102, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 207, "y": 1, "w": 99, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 517, "y": 74, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 106, "y": 78, "w": 102, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 421, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 312, "y": 354, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 416, "y": 214, "w": 91, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 405, "y": 145, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 207, "y": 344, "w": 105, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 507, "y": 285, "w": 105, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 412, "y": 1, "w": 104, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 1, "y": 145, "w": 99, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 1, "y": 76, "w": 105, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 507, "y": 219, "w": 104, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 1, "y": 283, "w": 102, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 207, "y": 1, "w": 99, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 517, "y": 74, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 106, "y": 78, "w": 102, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 421, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 312, "y": 354, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 303, "y": 140, "w": 102, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 5, "w": 102, "h": 70 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 523, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 11, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 318, "y": 290, "w": 103, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 7, "w": 103, "h": 64 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 105, "y": 1, "w": 102, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 0, "w": 102, "h": 75 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 306, "y": 72, "w": 108, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 108, "h": 68 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 108, "y": 276, "w": 105, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 14, "w": 105, "h": 65 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 1, "y": 1, "w": 104, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 104, "h": 74 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 203, "y": 210, "w": 106, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 13, "w": 106, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 508, "y": 152, "w": 106, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 106, "h": 67 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 414, "y": 74, "w": 103, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 8, "w": 103, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 306, "y": 72, "w": 108, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 108, "h": 68 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 108, "y": 276, "w": 105, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 14, "w": 105, "h": 65 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 1, "y": 1, "w": 104, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 104, "h": 74 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 203, "y": 210, "w": 106, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 13, "w": 106, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 309, "y": 214, "w": 107, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 14, "w": 107, "h": 65 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 306, "y": 1, "w": 106, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 9, "w": 106, "h": 70 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 1, "y": 218, "w": 107, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 14, "w": 107, "h": 65 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 213, "y": 279, "w": 105, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 14, "w": 105, "h": 65 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 103, "y": 341, "w": 104, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 15, "w": 104, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 516, "y": 1, "w": 101, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 101, "h": 73 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 100, "y": 149, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 1, "y": 349, "w": 102, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 16, "w": 102, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 103, "y": 404, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 16, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "693.png", + "format": "I8", + "size": { "w": 626, "h": 466 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/693.png b/public/images/pokemon/exp/693.png index 538f2f11f73..2e8f1ccd05c 100644 Binary files a/public/images/pokemon/exp/693.png and b/public/images/pokemon/exp/693.png differ diff --git a/public/images/pokemon/exp/694.json b/public/images/pokemon/exp/694.json deleted file mode 100644 index 12cc0369cc2..00000000000 --- a/public/images/pokemon/exp/694.json +++ /dev/null @@ -1,272 +0,0 @@ -{ - "textures": [ - { - "image": "694.png", - "format": "RGBA8888", - "size": { - "w": 140, - "h": 140 - }, - "scale": 1, - "frames": [ - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 44, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 34 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 43, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 43, - "h": 34 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 43, - "h": 34 - }, - "frame": { - "x": 44, - "y": 0, - "w": 43, - "h": 34 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 41, - "h": 35 - }, - "frame": { - "x": 0, - "y": 68, - "w": 41, - "h": 35 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 36, - "h": 37 - }, - "frame": { - "x": 0, - "y": 103, - "w": 36, - "h": 37 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 36, - "h": 37 - }, - "frame": { - "x": 0, - "y": 103, - "w": 36, - "h": 37 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 34, - "h": 37 - }, - "frame": { - "x": 36, - "y": 103, - "w": 34, - "h": 37 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 41, - "h": 35 - }, - "frame": { - "x": 87, - "y": 0, - "w": 41, - "h": 35 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 39, - "h": 36 - }, - "frame": { - "x": 43, - "y": 34, - "w": 39, - "h": 36 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 39, - "h": 36 - }, - "frame": { - "x": 82, - "y": 35, - "w": 39, - "h": 36 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 33, - "h": 37 - }, - "frame": { - "x": 70, - "y": 71, - "w": 33, - "h": 37 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 31, - "h": 37 - }, - "frame": { - "x": 103, - "y": 71, - "w": 31, - "h": 37 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c6f790c1c7c7e284eb98dfeaad75e635:7e95f5e91c561cc43d0e8ef8188f18b3:b0990f9650cfe63b836cbed33f0b44d8$" - } -} diff --git a/public/images/pokemon/exp/694.png b/public/images/pokemon/exp/694.png deleted file mode 100644 index 671d9517e4c..00000000000 Binary files a/public/images/pokemon/exp/694.png and /dev/null differ diff --git a/public/images/pokemon/exp/696.json b/public/images/pokemon/exp/696.json index 3bc9dae1999..f95124e3f31 100644 --- a/public/images/pokemon/exp/696.json +++ b/public/images/pokemon/exp/696.json @@ -1,692 +1,1054 @@ -{ - "textures": [ - { - "image": "696.png", - "format": "RGBA8888", - "size": { - "w": 135, - "h": 135 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 53, - "h": 46 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 53, - "h": 46 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 53, - "h": 43 - }, - "frame": { - "x": 0, - "y": 92, - "w": 53, - "h": 43 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 53, - "h": 43 - }, - "frame": { - "x": 0, - "y": 92, - "w": 53, - "h": 43 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 53, - "h": 44 - }, - "frame": { - "x": 53, - "y": 91, - "w": 53, - "h": 44 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 53, - "h": 44 - }, - "frame": { - "x": 53, - "y": 91, - "w": 53, - "h": 44 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 53, - "h": 44 - }, - "frame": { - "x": 53, - "y": 91, - "w": 53, - "h": 44 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 53, - "h": 44 - }, - "frame": { - "x": 53, - "y": 91, - "w": 53, - "h": 44 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f6c90e8287d3ce2aa68c9fef98f6e12f:24cf84ba4764bd88b4e751ca1911a8d5:58b7763fb9abdd043e9bfa400cfafdef$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 227, "y": 92, "w": 55, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 227, "y": 92, "w": 55, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 228, "y": 46, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 228, "y": 46, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 114, "y": 47, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 114, "y": 47, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 171, "y": 0, "w": 58, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 171, "y": 0, "w": 58, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 171, "y": 46, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 57, "y": 48, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 57, "y": 48, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 0, "y": 50, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 50, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 227, "y": 92, "w": 55, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 227, "y": 92, "w": 55, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 228, "y": 46, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0105.png", + "frame": { "x": 228, "y": 46, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0106.png", + "frame": { "x": 114, "y": 47, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0107.png", + "frame": { "x": 114, "y": 47, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0108.png", + "frame": { "x": 171, "y": 0, "w": 58, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0109.png", + "frame": { "x": 171, "y": 0, "w": 58, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0110.png", + "frame": { "x": 171, "y": 46, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0111.png", + "frame": { "x": 57, "y": 48, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0112.png", + "frame": { "x": 57, "y": 48, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0113.png", + "frame": { "x": 0, "y": 50, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0114.png", + "frame": { "x": 0, "y": 50, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0115.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0116.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "format": "I8", + "size": { "w": 286, "h": 179 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/696.png b/public/images/pokemon/exp/696.png index 8dd6b2cf6c7..7892c40e52b 100644 Binary files a/public/images/pokemon/exp/696.png and b/public/images/pokemon/exp/696.png differ diff --git a/public/images/pokemon/exp/697.json b/public/images/pokemon/exp/697.json index 9120976bb53..c56de41946c 100644 --- a/public/images/pokemon/exp/697.json +++ b/public/images/pokemon/exp/697.json @@ -1,1175 +1,983 @@ -{ - "textures": [ - { - "image": "697.png", - "format": "RGBA8888", - "size": { - "w": 378, - "h": 378 - }, - "scale": 1, - "frames": [ - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 0, - "w": 76, - "h": 76 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 0, - "w": 76, - "h": 76 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 0, - "w": 76, - "h": 76 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 0, - "w": 76, - "h": 76 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 76, - "h": 75 - }, - "frame": { - "x": 76, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 76, - "h": 75 - }, - "frame": { - "x": 76, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 76, - "h": 75 - }, - "frame": { - "x": 76, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 76, - "h": 75 - }, - "frame": { - "x": 76, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 75, - "h": 75 - }, - "frame": { - "x": 0, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 75, - "h": 75 - }, - "frame": { - "x": 0, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 75, - "h": 75 - }, - "frame": { - "x": 0, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 75, - "h": 75 - }, - "frame": { - "x": 0, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 76, - "h": 74 - }, - "frame": { - "x": 76, - "y": 75, - "w": 76, - "h": 74 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 75, - "h": 75 - }, - "frame": { - "x": 152, - "y": 0, - "w": 75, - "h": 75 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 76, - "h": 74 - }, - "frame": { - "x": 227, - "y": 0, - "w": 76, - "h": 74 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 0, - "y": 227, - "w": 74, - "h": 75 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 0, - "y": 227, - "w": 74, - "h": 75 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 0, - "y": 227, - "w": 74, - "h": 75 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 0, - "y": 227, - "w": 74, - "h": 75 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 69, - "h": 76 - }, - "frame": { - "x": 0, - "y": 302, - "w": 69, - "h": 76 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 69, - "h": 76 - }, - "frame": { - "x": 0, - "y": 302, - "w": 69, - "h": 76 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 152, - "y": 75, - "w": 74, - "h": 74 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 152, - "y": 75, - "w": 74, - "h": 74 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 152, - "y": 75, - "w": 74, - "h": 74 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 152, - "y": 75, - "w": 74, - "h": 74 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 303, - "y": 0, - "w": 74, - "h": 74 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 303, - "y": 0, - "w": 74, - "h": 74 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 72, - "h": 75 - }, - "frame": { - "x": 69, - "y": 302, - "w": 72, - "h": 75 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 72, - "h": 75 - }, - "frame": { - "x": 69, - "y": 302, - "w": 72, - "h": 75 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 72, - "h": 75 - }, - "frame": { - "x": 69, - "y": 302, - "w": 72, - "h": 75 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 72, - "h": 75 - }, - "frame": { - "x": 69, - "y": 302, - "w": 72, - "h": 75 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 71, - "h": 75 - }, - "frame": { - "x": 74, - "y": 227, - "w": 71, - "h": 75 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 71, - "h": 75 - }, - "frame": { - "x": 74, - "y": 227, - "w": 71, - "h": 75 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 71, - "h": 75 - }, - "frame": { - "x": 74, - "y": 227, - "w": 71, - "h": 75 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 71, - "h": 75 - }, - "frame": { - "x": 74, - "y": 227, - "w": 71, - "h": 75 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 73, - "h": 75 - }, - "frame": { - "x": 75, - "y": 152, - "w": 73, - "h": 75 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 73, - "h": 75 - }, - "frame": { - "x": 75, - "y": 152, - "w": 73, - "h": 75 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 73, - "h": 75 - }, - "frame": { - "x": 75, - "y": 152, - "w": 73, - "h": 75 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 73, - "h": 75 - }, - "frame": { - "x": 75, - "y": 152, - "w": 73, - "h": 75 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 148, - "y": 149, - "w": 74, - "h": 75 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 148, - "y": 149, - "w": 74, - "h": 75 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 67, - "h": 77 - }, - "frame": { - "x": 222, - "y": 149, - "w": 67, - "h": 77 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 72, - "h": 75 - }, - "frame": { - "x": 227, - "y": 74, - "w": 72, - "h": 75 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 67, - "h": 77 - }, - "frame": { - "x": 299, - "y": 74, - "w": 67, - "h": 77 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 65, - "h": 78 - }, - "frame": { - "x": 289, - "y": 151, - "w": 65, - "h": 78 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 65, - "h": 78 - }, - "frame": { - "x": 289, - "y": 151, - "w": 65, - "h": 78 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 63, - "h": 79 - }, - "frame": { - "x": 145, - "y": 227, - "w": 63, - "h": 79 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 63, - "h": 79 - }, - "frame": { - "x": 145, - "y": 227, - "w": 63, - "h": 79 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 61, - "h": 79 - }, - "frame": { - "x": 208, - "y": 226, - "w": 61, - "h": 79 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 61, - "h": 79 - }, - "frame": { - "x": 208, - "y": 226, - "w": 61, - "h": 79 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 60, - "h": 79 - }, - "frame": { - "x": 269, - "y": 229, - "w": 60, - "h": 79 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:768a260ef504838ad6b945525f4ed05f:3b115b0ef560b516c93f6aa5f1423cd9:f4fdd87d2fc1483d8e0a185c2654e3d9$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 384, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 476, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 661, "y": 232, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 281, "y": 312, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 556, "y": 462, "w": 91, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 181, "y": 462, "w": 90, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 88, "y": 464, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 540, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 90, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 179, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 647, "y": 468, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 271, "y": 470, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 536, "y": 539, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 90, "y": 386, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 366, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 275, "y": 233, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 384, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 476, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 661, "y": 232, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 281, "y": 312, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 556, "y": 462, "w": 91, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 181, "y": 462, "w": 90, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 88, "y": 464, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 540, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 90, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 179, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 647, "y": 468, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 271, "y": 470, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 536, "y": 539, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 90, "y": 386, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 366, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 275, "y": 233, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 384, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 476, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 661, "y": 232, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 281, "y": 312, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 556, "y": 462, "w": 91, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 181, "y": 462, "w": 90, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 88, "y": 464, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 540, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 90, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 179, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 647, "y": 468, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 271, "y": 470, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 536, "y": 539, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 90, "y": 386, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 366, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 275, "y": 233, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 384, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 476, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 661, "y": 232, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 281, "y": 312, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 556, "y": 462, "w": 91, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 181, "y": 462, "w": 90, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 88, "y": 464, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 540, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 90, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 179, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 647, "y": 468, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 271, "y": 470, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 536, "y": 539, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 90, "y": 386, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 366, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 275, "y": 233, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 78, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 184, "y": 231, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 94, "y": 157, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 90, "h": 80 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 391, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 88, "h": 80 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 275, "y": 390, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 88, "h": 80 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 363, "y": 463, "w": 86, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 1, "w": 86, "h": 81 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 649, "y": 386, "w": 86, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 86, "h": 82 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 449, "y": 463, "w": 87, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 87, "h": 80 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 312, "w": 90, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 90, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 372, "y": 386, "w": 92, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 5, "w": 92, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 566, "y": 233, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 566, "y": 233, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 92, "y": 78, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 473, "y": 156, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 556, "y": 386, "w": 93, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 181, "y": 387, "w": 94, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 94, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 648, "y": 311, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 186, "y": 312, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 661, "y": 157, "w": 96, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 96, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 458, "y": 311, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 669, "y": 0, "w": 93, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 93, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 464, "y": 386, "w": 92, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 5, "w": 92, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 0, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 384, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 568, "y": 79, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 93, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 661, "y": 79, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 93, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 289, "y": 0, "w": 95, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 95, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 0, "y": 0, "w": 96, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 96, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 96, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 192, "y": 0, "w": 97, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 97, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 480, "y": 0, "w": 96, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 96, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 384, "y": 0, "w": 96, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 96, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 192, "y": 77, "w": 96, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 96, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 566, "y": 157, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 95, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 553, "y": 311, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 277, "y": 157, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 95, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 92, "y": 310, "w": 94, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 94, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 0, "y": 157, "w": 94, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 94, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 458, "y": 234, "w": 93, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 93, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 184, "y": 153, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 93, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 380, "y": 156, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 93, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 576, "y": 0, "w": 93, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 288, "y": 78, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "697.png", + "format": "I8", + "size": { "w": 762, "h": 616 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/697.png b/public/images/pokemon/exp/697.png index 136007c2892..808dd14eabd 100644 Binary files a/public/images/pokemon/exp/697.png and b/public/images/pokemon/exp/697.png differ diff --git a/public/images/pokemon/exp/698.json b/public/images/pokemon/exp/698.json deleted file mode 100644 index e0096ec0ecf..00000000000 --- a/public/images/pokemon/exp/698.json +++ /dev/null @@ -1,3296 +0,0 @@ -{ - "textures": [ - { - "image": "698.png", - "format": "RGBA8888", - "size": { - "w": 175, - "h": 175 - }, - "scale": 1, - "frames": [ - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0151.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0152.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0135.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0136.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0141.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0142.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0147.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0148.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0131.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0132.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0137.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0138.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0143.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0144.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0149.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0150.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0133.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0134.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0139.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0140.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0145.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0146.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 59 - }, - "frame": { - "x": 64, - "y": 60, - "w": 32, - "h": 59 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 59 - }, - "frame": { - "x": 64, - "y": 60, - "w": 32, - "h": 59 - } - }, - { - "filename": "0153.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 59 - }, - "frame": { - "x": 64, - "y": 60, - "w": 32, - "h": 59 - } - }, - { - "filename": "0154.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 59 - }, - "frame": { - "x": 64, - "y": 60, - "w": 32, - "h": 59 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0155.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0156.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2dce35b74cbe50cf08e71af3768cef4c:e4d5ff1dbd47865af99315586fe42981:198087d69fed44d4a642fa3ba5c077d6$" - } -} diff --git a/public/images/pokemon/exp/698.png b/public/images/pokemon/exp/698.png deleted file mode 100644 index 6d8ca555881..00000000000 Binary files a/public/images/pokemon/exp/698.png and /dev/null differ diff --git a/public/images/pokemon/exp/700.json b/public/images/pokemon/exp/700.json index fbcefcf3561..2ed26d79228 100644 --- a/public/images/pokemon/exp/700.json +++ b/public/images/pokemon/exp/700.json @@ -1,1070 +1,587 @@ -{ - "textures": [ - { - "image": "700.png", - "format": "RGBA8888", - "size": { - "w": 233, - "h": 233 - }, - "scale": 1, - "frames": [ - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 58 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 58 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 58 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 52, - "h": 58 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 52, - "h": 58 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 52, - "h": 58 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 52, - "h": 58 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 53, - "y": 0, - "w": 52, - "h": 58 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 53, - "y": 0, - "w": 52, - "h": 58 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 53, - "y": 0, - "w": 52, - "h": 58 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 53, - "y": 0, - "w": 52, - "h": 58 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 51, - "h": 59 - }, - "frame": { - "x": 0, - "y": 116, - "w": 51, - "h": 59 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 51, - "h": 59 - }, - "frame": { - "x": 0, - "y": 116, - "w": 51, - "h": 59 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 51, - "h": 59 - }, - "frame": { - "x": 0, - "y": 116, - "w": 51, - "h": 59 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 51, - "h": 59 - }, - "frame": { - "x": 0, - "y": 116, - "w": 51, - "h": 59 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 45, - "h": 58 - }, - "frame": { - "x": 0, - "y": 175, - "w": 45, - "h": 58 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 45, - "h": 58 - }, - "frame": { - "x": 0, - "y": 175, - "w": 45, - "h": 58 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 105, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 105, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 105, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 105, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 155, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 155, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 155, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 155, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 51, - "y": 117, - "w": 50, - "h": 59 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 51, - "y": 117, - "w": 50, - "h": 59 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 51, - "y": 117, - "w": 50, - "h": 59 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 51, - "y": 117, - "w": 50, - "h": 59 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 42, - "h": 57 - }, - "frame": { - "x": 45, - "y": 176, - "w": 42, - "h": 57 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 102, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 102, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 102, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 102, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 152, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 152, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 152, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 152, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 101, - "y": 118, - "w": 50, - "h": 59 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 49, - "h": 59 - }, - "frame": { - "x": 151, - "y": 118, - "w": 49, - "h": 59 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 49, - "h": 59 - }, - "frame": { - "x": 151, - "y": 118, - "w": 49, - "h": 59 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 49, - "h": 59 - }, - "frame": { - "x": 151, - "y": 118, - "w": 49, - "h": 59 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 49, - "h": 59 - }, - "frame": { - "x": 151, - "y": 118, - "w": 49, - "h": 59 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8ebe248133b590a1727583e2ee69cc50:c2481ba04831dcd949e63454034488e2:2e4bf5ef1f19e475073f7da10c60b540$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 93, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 99, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 139, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 0, "y": 120, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 146, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 46, "y": 122, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 93, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 99, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 139, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 120, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 146, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 46, "y": 122, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 93, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 99, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 139, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 120, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 146, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 46, "y": 122, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 239, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 193, "y": 60, "w": 43, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 43, "h": 62 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 99, "y": 0, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 47, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 147, "y": 0, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 47, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 0, "w": 51, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 51, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 60, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 46, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 92, "y": 178, "w": 43, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 43, "h": 60 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 195, "y": 0, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 47, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 52, "y": 0, "w": 46, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 46, "h": 61 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 136, "y": 178, "w": 43, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 43, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 195, "y": 0, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 47, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 52, "y": 0, "w": 46, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 46, "h": 61 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 179, "w": 43, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 43, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 185, "y": 123, "w": 44, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 44, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 47, "y": 62, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 45, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 44, "y": 239, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "700.png", + "format": "I8", + "size": { "w": 242, "h": 298 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/700.png b/public/images/pokemon/exp/700.png index 997328d323d..4d3e64fab03 100644 Binary files a/public/images/pokemon/exp/700.png and b/public/images/pokemon/exp/700.png differ diff --git a/public/images/pokemon/exp/702.json b/public/images/pokemon/exp/702.json index bf5cfbccec0..0ab95b58c7a 100644 --- a/public/images/pokemon/exp/702.json +++ b/public/images/pokemon/exp/702.json @@ -1,671 +1,443 @@ -{ - "textures": [ - { - "image": "702.png", - "format": "RGBA8888", - "size": { - "w": 138, - "h": 138 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 48, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 48, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 45, - "h": 36 - }, - "frame": { - "x": 0, - "y": 72, - "w": 45, - "h": 36 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 45, - "h": 36 - }, - "frame": { - "x": 0, - "y": 72, - "w": 45, - "h": 36 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 47, - "y": 36, - "w": 44, - "h": 35 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 47, - "y": 36, - "w": 44, - "h": 35 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 47, - "y": 36, - "w": 44, - "h": 35 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 47, - "h": 33 - }, - "frame": { - "x": 91, - "y": 36, - "w": 47, - "h": 33 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 47, - "h": 33 - }, - "frame": { - "x": 91, - "y": 36, - "w": 47, - "h": 33 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 47, - "h": 33 - }, - "frame": { - "x": 91, - "y": 36, - "w": 47, - "h": 33 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 93, - "y": 69, - "w": 44, - "h": 35 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 93, - "y": 69, - "w": 44, - "h": 35 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 93, - "y": 69, - "w": 44, - "h": 35 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:be64539a559c97720b84c9b5cd8151b7:e7db40381441319d37a93d8698db35c7:ba8fdab405d5efab99c4aa1084328e6b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 47, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 47, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 94, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 141, "y": 74, "w": 45, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 47, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 47, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 94, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 141, "y": 74, "w": 45, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 47, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 47, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 94, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 141, "y": 74, "w": 45, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 47, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 47, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 94, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 141, "y": 74, "w": 45, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 94, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 141, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 141, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 188, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 48, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 74, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 188, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 145, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 96, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 47, "y": 74, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 94, "y": 74, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 187, "y": 74, "w": 45, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "702.png", + "format": "I8", + "size": { "w": 234, "h": 178 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/702.png b/public/images/pokemon/exp/702.png index 9d042fd8293..1f1bd6b524f 100644 Binary files a/public/images/pokemon/exp/702.png and b/public/images/pokemon/exp/702.png differ diff --git a/public/images/pokemon/exp/703.json b/public/images/pokemon/exp/703.json deleted file mode 100644 index 75e52fdc904..00000000000 --- a/public/images/pokemon/exp/703.json +++ /dev/null @@ -1,356 +0,0 @@ -{ - "textures": [ - { - "image": "703.png", - "format": "RGBA8888", - "size": { - "w": 120, - "h": 120 - }, - "scale": 1, - "frames": [ - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 41, - "w": 37, - "h": 41 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 41, - "w": 37, - "h": 41 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 37, - "h": 40 - }, - "frame": { - "x": 74, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 41 - }, - "frame": { - "x": 37, - "y": 40, - "w": 35, - "h": 41 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 35, - "h": 41 - }, - "frame": { - "x": 37, - "y": 40, - "w": 35, - "h": 41 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 1, - "y": 12, - "w": 35, - "h": 39 - }, - "frame": { - "x": 37, - "y": 81, - "w": 35, - "h": 39 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 40 - }, - "frame": { - "x": 72, - "y": 40, - "w": 37, - "h": 40 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 35, - "h": 40 - }, - "frame": { - "x": 72, - "y": 80, - "w": 35, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:01a847d167639aeeb160ddd9a360a558:5e33077f4810fe91d17064ff7dd6bf4d:721af8c322ff60159262e9b3017c784d$" - } -} diff --git a/public/images/pokemon/exp/703.png b/public/images/pokemon/exp/703.png deleted file mode 100644 index 5a0c63154ef..00000000000 Binary files a/public/images/pokemon/exp/703.png and /dev/null differ diff --git a/public/images/pokemon/exp/704.json b/public/images/pokemon/exp/704.json index 440a41ebbc5..8b429c0639e 100644 --- a/public/images/pokemon/exp/704.json +++ b/public/images/pokemon/exp/704.json @@ -1,1784 +1,371 @@ -{ - "textures": [ - { - "image": "704.png", - "format": "RGBA8888", - "size": { - "w": 288, - "h": 288 - }, - "scale": 1, - "frames": [ - { - "filename": "0040.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 48, - "w": 43, - "h": 48 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 48, - "w": 43, - "h": 48 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 96, - "w": 43, - "h": 48 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 96, - "w": 43, - "h": 48 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 43, - "h": 47 - }, - "frame": { - "x": 0, - "y": 144, - "w": 43, - "h": 47 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 43, - "h": 47 - }, - "frame": { - "x": 0, - "y": 144, - "w": 43, - "h": 47 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 46 - }, - "frame": { - "x": 0, - "y": 191, - "w": 41, - "h": 46 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 46 - }, - "frame": { - "x": 0, - "y": 191, - "w": 41, - "h": 46 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 39, - "h": 45 - }, - "frame": { - "x": 0, - "y": 237, - "w": 39, - "h": 45 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 39, - "h": 45 - }, - "frame": { - "x": 0, - "y": 237, - "w": 39, - "h": 45 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 39, - "y": 237, - "w": 41, - "h": 44 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 39, - "y": 237, - "w": 41, - "h": 44 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 39, - "y": 237, - "w": 41, - "h": 44 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 39, - "y": 237, - "w": 41, - "h": 44 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 41, - "y": 191, - "w": 41, - "h": 44 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 41, - "y": 191, - "w": 41, - "h": 44 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 80, - "y": 235, - "w": 41, - "h": 44 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 121, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 121, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 82, - "y": 0, - "w": 39, - "h": 44 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 82, - "y": 0, - "w": 39, - "h": 44 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 82, - "y": 0, - "w": 39, - "h": 44 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 43, - "y": 0, - "w": 39, - "h": 44 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 163, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 163, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 163, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 163, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 163, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 205, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 247, - "y": 0, - "w": 41, - "h": 44 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 82, - "y": 44, - "w": 39, - "h": 44 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 82, - "y": 44, - "w": 39, - "h": 44 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 43, - "y": 44, - "w": 39, - "h": 44 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 43, - "y": 44, - "w": 39, - "h": 44 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 163, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 247, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 42, - "h": 40 - }, - "frame": { - "x": 205, - "y": 84, - "w": 42, - "h": 40 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 42, - "h": 40 - }, - "frame": { - "x": 205, - "y": 84, - "w": 42, - "h": 40 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 42, - "h": 40 - }, - "frame": { - "x": 205, - "y": 84, - "w": 42, - "h": 40 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 247, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 247, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 43, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 43, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 43, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 44 - }, - "frame": { - "x": 81, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 44 - }, - "frame": { - "x": 81, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 44 - }, - "frame": { - "x": 81, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 44 - }, - "frame": { - "x": 81, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 82, - "y": 176, - "w": 36, - "h": 44 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 82, - "y": 176, - "w": 36, - "h": 44 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 42, - "h": 40 - }, - "frame": { - "x": 121, - "y": 85, - "w": 42, - "h": 40 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 163, - "y": 85, - "w": 36, - "h": 44 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 121, - "y": 125, - "w": 36, - "h": 44 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 199, - "y": 124, - "w": 36, - "h": 44 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 199, - "y": 124, - "w": 36, - "h": 44 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 157, - "y": 129, - "w": 36, - "h": 44 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 121, - "y": 169, - "w": 36, - "h": 44 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 235, - "y": 132, - "w": 36, - "h": 43 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 235, - "y": 132, - "w": 36, - "h": 43 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 193, - "y": 168, - "w": 36, - "h": 43 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 157, - "y": 173, - "w": 36, - "h": 43 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 121, - "y": 213, - "w": 36, - "h": 43 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 229, - "y": 175, - "w": 36, - "h": 43 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 193, - "y": 211, - "w": 36, - "h": 43 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 157, - "y": 216, - "w": 36, - "h": 43 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 229, - "y": 218, - "w": 36, - "h": 43 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 229, - "y": 218, - "w": 36, - "h": 43 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:695bd0c4059d0b12112a2e7a99e1d237:1f0a27b4d1a84460990b54c833ed8007:45bb13be23ae6e2a6654a2a00c450d62$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0003.png", + "frame": { "x": 78, "y": 0, "w": 28, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0007.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0008.png", + "frame": { "x": 52, "y": 94, "w": 28, "h": 29 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0009.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0013.png", + "frame": { "x": 78, "y": 0, "w": 28, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0014.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0017.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0018.png", + "frame": { "x": 52, "y": 94, "w": 28, "h": 29 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0019.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0023.png", + "frame": { "x": 78, "y": 0, "w": 28, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0026.png", + "frame": { "x": 26, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 67, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0028.png", + "frame": { "x": 80, "y": 94, "w": 28, "h": 29 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0029.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0032.png", + "frame": { "x": 26, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0033.png", + "frame": { "x": 78, "y": 31, "w": 28, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0034.png", + "frame": { "x": 52, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0035.png", + "frame": { "x": 52, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0036.png", + "frame": { "x": 52, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0037.png", + "frame": { "x": 26, "y": 67, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 99, "w": 28, "h": 29 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0039.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "704.png", + "format": "I8", + "size": { "w": 108, "h": 128 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/704.png b/public/images/pokemon/exp/704.png index 2490591adf2..b85d8dfc3c0 100644 Binary files a/public/images/pokemon/exp/704.png and b/public/images/pokemon/exp/704.png differ diff --git a/public/images/pokemon/exp/705.json b/public/images/pokemon/exp/705.json index d710ef9e5eb..eecb83af45a 100644 --- a/public/images/pokemon/exp/705.json +++ b/public/images/pokemon/exp/705.json @@ -1,272 +1,596 @@ -{ - "textures": [ - { - "image": "705.png", - "format": "RGBA8888", - "size": { - "w": 154, - "h": 154 - }, - "scale": 1, - "frames": [ - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 46, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 58 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 46, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 45, - "h": 58 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 58 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 45, - "h": 58 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 58 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 45, - "h": 58 - }, - "frame": { - "x": 91, - "y": 0, - "w": 45, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 42, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 42, - "h": 58 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 42, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 42, - "h": 58 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 58 - }, - "frame": { - "x": 42, - "y": 58, - "w": 41, - "h": 58 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 58 - }, - "frame": { - "x": 42, - "y": 58, - "w": 41, - "h": 58 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 58 - }, - "frame": { - "x": 83, - "y": 58, - "w": 36, - "h": 58 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 58 - }, - "frame": { - "x": 83, - "y": 58, - "w": 36, - "h": 58 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 119, - "y": 58, - "w": 35, - "h": 58 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4bf155254b23c88780e7eee282256589:82bb727988054c3064e203b6908ff464:6b57e983626c7fc9144ab67f30c66814$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 38, "y": 186, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 78, "y": 189, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 77, "y": 304, "w": 39, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 197, "y": 246, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 158, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 155, "y": 246, "w": 42, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 199, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 77, "y": 248, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 118, "y": 301, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 38, "y": 246, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 253, "w": 37, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 191, "w": 38, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 118, "y": 189, "w": 37, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 0, "y": 64, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 194, "y": 184, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 156, "y": 120, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 38, "y": 186, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 78, "y": 189, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 77, "y": 304, "w": 39, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 197, "y": 246, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 158, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 155, "y": 246, "w": 42, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 199, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 77, "y": 248, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 118, "y": 301, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 38, "y": 246, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 253, "w": 37, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 191, "w": 38, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 118, "y": 189, "w": 37, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 64, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 194, "y": 184, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 156, "y": 120, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 38, "y": 186, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 78, "y": 189, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 77, "y": 304, "w": 39, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 197, "y": 246, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 158, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 155, "y": 246, "w": 42, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 199, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 77, "y": 248, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 118, "y": 301, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 38, "y": 246, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 253, "w": 37, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 191, "w": 38, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 118, "y": 189, "w": 37, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 64, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 194, "y": 184, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 156, "y": 120, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 159, "y": 0, "w": 41, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 39, "y": 125, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 200, "y": 60, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 39, "y": 62, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 79, "y": 125, "w": 38, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 117, "y": 125, "w": 38, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 127, "w": 38, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 0, "w": 39, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 39, "h": 64 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 78, "y": 62, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 117, "y": 62, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 155, "y": 181, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 119, "y": 0, "w": 40, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 79, "y": 0, "w": 40, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 39, "y": 0, "w": 40, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 196, "y": 123, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 200, "y": 0, "w": 41, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 159, "y": 60, "w": 41, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "705.png", + "format": "RGBA8888", + "size": { "w": 241, "h": 361 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/705.png b/public/images/pokemon/exp/705.png index 670e8be5d51..0bd8323bcb4 100644 Binary files a/public/images/pokemon/exp/705.png and b/public/images/pokemon/exp/705.png differ diff --git a/public/images/pokemon/exp/707.json b/public/images/pokemon/exp/707.json deleted file mode 100644 index 253d37ed70a..00000000000 --- a/public/images/pokemon/exp/707.json +++ /dev/null @@ -1,1931 +0,0 @@ -{ - "textures": [ - { - "image": "707.png", - "format": "RGBA8888", - "size": { - "w": 283, - "h": 283 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 69 - }, - "frame": { - "x": 41, - "y": 0, - "w": 39, - "h": 69 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 69 - }, - "frame": { - "x": 41, - "y": 0, - "w": 39, - "h": 69 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 69 - }, - "frame": { - "x": 41, - "y": 0, - "w": 39, - "h": 69 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 69 - }, - "frame": { - "x": 80, - "y": 0, - "w": 37, - "h": 69 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 69 - }, - "frame": { - "x": 80, - "y": 0, - "w": 37, - "h": 69 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 69 - }, - "frame": { - "x": 80, - "y": 0, - "w": 37, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 117, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 117, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 117, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 117, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 159, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 159, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 159, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 159, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 44, - "h": 70 - }, - "frame": { - "x": 201, - "y": 0, - "w": 44, - "h": 70 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 44, - "h": 70 - }, - "frame": { - "x": 201, - "y": 0, - "w": 44, - "h": 70 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 44, - "h": 70 - }, - "frame": { - "x": 201, - "y": 0, - "w": 44, - "h": 70 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 44, - "h": 70 - }, - "frame": { - "x": 0, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 44, - "h": 70 - }, - "frame": { - "x": 0, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 44, - "h": 70 - }, - "frame": { - "x": 0, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 70 - }, - "frame": { - "x": 44, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 70 - }, - "frame": { - "x": 44, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 70 - }, - "frame": { - "x": 44, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 126, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 126, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 126, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 164, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 164, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 164, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 202, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 202, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 202, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 240, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 240, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 240, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 0, - "y": 139, - "w": 38, - "h": 70 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 0, - "y": 139, - "w": 38, - "h": 70 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 0, - "y": 139, - "w": 38, - "h": 70 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 38, - "y": 139, - "w": 40, - "h": 70 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 38, - "y": 139, - "w": 40, - "h": 70 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 38, - "y": 139, - "w": 40, - "h": 70 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 45, - "h": 70 - }, - "frame": { - "x": 120, - "y": 140, - "w": 45, - "h": 70 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 43, - "h": 70 - }, - "frame": { - "x": 165, - "y": 140, - "w": 43, - "h": 70 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 43, - "h": 70 - }, - "frame": { - "x": 165, - "y": 140, - "w": 43, - "h": 70 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 45, - "h": 71 - }, - "frame": { - "x": 208, - "y": 140, - "w": 45, - "h": 71 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 45, - "h": 71 - }, - "frame": { - "x": 208, - "y": 140, - "w": 45, - "h": 71 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 45, - "h": 71 - }, - "frame": { - "x": 208, - "y": 140, - "w": 45, - "h": 71 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 71 - }, - "frame": { - "x": 0, - "y": 209, - "w": 37, - "h": 71 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 71 - }, - "frame": { - "x": 0, - "y": 209, - "w": 37, - "h": 71 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 71 - }, - "frame": { - "x": 0, - "y": 209, - "w": 37, - "h": 71 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 37, - "y": 209, - "w": 38, - "h": 71 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 37, - "y": 209, - "w": 38, - "h": 71 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 37, - "y": 209, - "w": 38, - "h": 71 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 45, - "h": 71 - }, - "frame": { - "x": 151, - "y": 210, - "w": 45, - "h": 71 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 39, - "h": 71 - }, - "frame": { - "x": 196, - "y": 211, - "w": 39, - "h": 71 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 39, - "h": 71 - }, - "frame": { - "x": 196, - "y": 211, - "w": 39, - "h": 71 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 44, - "h": 71 - }, - "frame": { - "x": 235, - "y": 211, - "w": 44, - "h": 71 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a13ec2d124f7e95263b088a395e9d780:8c9f0ed432d15fda1ebbfa6ff4063d39:8e96b9056ea81e44ced99c97f472a528$" - } -} diff --git a/public/images/pokemon/exp/707.png b/public/images/pokemon/exp/707.png deleted file mode 100644 index 294d6e35e70..00000000000 Binary files a/public/images/pokemon/exp/707.png and /dev/null differ diff --git a/public/images/pokemon/exp/708.png b/public/images/pokemon/exp/708.png deleted file mode 100644 index f71cbaa535d..00000000000 Binary files a/public/images/pokemon/exp/708.png and /dev/null differ diff --git a/public/images/pokemon/exp/712.json b/public/images/pokemon/exp/712.json index 0e49da4d806..859fa54fc5c 100644 --- a/public/images/pokemon/exp/712.json +++ b/public/images/pokemon/exp/712.json @@ -1,2771 +1,1433 @@ -{ - "textures": [ - { - "image": "712.png", - "format": "RGBA8888", - "size": { - "w": 209, - "h": 209 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 43, - "w": 38, - "h": 43 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 43, - "w": 38, - "h": 43 - } - }, - { - "filename": "0131.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 43, - "w": 38, - "h": 43 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 114, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 114, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 114, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 114, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 152, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 152, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 114, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 114, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 114, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 152, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 152, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 152, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 168, - "w": 38, - "h": 41 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 168, - "w": 38, - "h": 41 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 168, - "w": 38, - "h": 41 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 168, - "w": 38, - "h": 41 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 114, - "y": 126, - "w": 38, - "h": 41 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 114, - "y": 126, - "w": 38, - "h": 41 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 114, - "y": 167, - "w": 37, - "h": 41 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 114, - "y": 167, - "w": 37, - "h": 41 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 151, - "y": 167, - "w": 37, - "h": 41 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 151, - "y": 167, - "w": 37, - "h": 41 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:144801e89f73b8a2d351aa5854b03ced:c8bd981e9dc030e1f41d7d7d0b7df029:3a1cc69824960d920ca43f8c9376d136$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 108, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 108, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 109, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 109, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 145, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 145, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 72, "y": 84, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 72, "y": 84, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 144, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 144, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 36, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 36, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 108, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 108, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 109, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 109, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 145, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 145, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 72, "y": 84, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 72, "y": 84, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 144, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 144, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 36, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 36, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 108, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 108, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 109, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 109, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 145, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 145, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 72, "y": 84, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 72, "y": 84, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 144, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 144, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 36, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 36, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 108, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 108, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 109, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 109, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 145, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 145, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 72, "y": 84, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 72, "y": 84, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 144, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 144, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 36, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 36, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 108, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 108, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 109, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 109, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 145, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 145, "y": 43, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 0, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 72, "y": 84, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 72, "y": 84, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 144, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 144, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0105.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0106.png", + "frame": { "x": 36, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0107.png", + "frame": { "x": 36, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0108.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0109.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0110.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0111.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0112.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0113.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0114.png", + "frame": { "x": 36, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0115.png", + "frame": { "x": 36, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0116.png", + "frame": { "x": 108, "y": 85, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0117.png", + "frame": { "x": 108, "y": 85, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0118.png", + "frame": { "x": 144, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0119.png", + "frame": { "x": 144, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0120.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0121.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0122.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0123.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0124.png", + "frame": { "x": 36, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0125.png", + "frame": { "x": 36, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0126.png", + "frame": { "x": 72, "y": 125, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0127.png", + "frame": { "x": 72, "y": 125, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0128.png", + "frame": { "x": 144, "y": 125, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0129.png", + "frame": { "x": 144, "y": 125, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0130.png", + "frame": { "x": 0, "y": 126, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0131.png", + "frame": { "x": 0, "y": 126, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0132.png", + "frame": { "x": 144, "y": 125, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0133.png", + "frame": { "x": 144, "y": 125, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0134.png", + "frame": { "x": 72, "y": 125, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0135.png", + "frame": { "x": 72, "y": 125, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0136.png", + "frame": { "x": 36, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0137.png", + "frame": { "x": 36, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0138.png", + "frame": { "x": 36, "y": 126, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0139.png", + "frame": { "x": 36, "y": 126, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0140.png", + "frame": { "x": 108, "y": 126, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0141.png", + "frame": { "x": 108, "y": 126, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0142.png", + "frame": { "x": 72, "y": 165, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0143.png", + "frame": { "x": 72, "y": 165, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0144.png", + "frame": { "x": 144, "y": 165, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0145.png", + "frame": { "x": 144, "y": 165, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0146.png", + "frame": { "x": 0, "y": 166, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0147.png", + "frame": { "x": 0, "y": 166, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0148.png", + "frame": { "x": 72, "y": 43, "w": 37, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 37, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0149.png", + "frame": { "x": 72, "y": 43, "w": 37, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 37, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0150.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0151.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0152.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0153.png", + "frame": { "x": 144, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0154.png", + "frame": { "x": 144, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0155.png", + "frame": { "x": 108, "y": 85, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0156.png", + "frame": { "x": 108, "y": 85, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0157.png", + "frame": { "x": 36, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0158.png", + "frame": { "x": 36, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "712.png", + "format": "I8", + "size": { "w": 181, "h": 206 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/712.png b/public/images/pokemon/exp/712.png index cd40c2e5c9b..1726f22f7b8 100644 Binary files a/public/images/pokemon/exp/712.png and b/public/images/pokemon/exp/712.png differ diff --git a/public/images/pokemon/exp/713.json b/public/images/pokemon/exp/713.json index 7c5c6b565e4..f4fcfa1ff85 100644 --- a/public/images/pokemon/exp/713.json +++ b/public/images/pokemon/exp/713.json @@ -1,146 +1,1100 @@ -{ - "textures": [ - { - "image": "713.png", - "format": "RGBA8888", - "size": { - "w": 174, - "h": 174 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 87, - "h": 71 - }, - "frame": { - "x": 0, - "y": 0, - "w": 87, - "h": 71 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 87, - "h": 72 - }, - "frame": { - "x": 87, - "y": 0, - "w": 87, - "h": 72 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 87, - "h": 72 - }, - "frame": { - "x": 87, - "y": 0, - "w": 87, - "h": 72 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 73 - }, - "frame": { - "x": 0, - "y": 71, - "w": 87, - "h": 73 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 73 - }, - "frame": { - "x": 0, - "y": 71, - "w": 87, - "h": 73 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 73 - }, - "frame": { - "x": 87, - "y": 72, - "w": 87, - "h": 73 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:11a7176e3fe76c2e9fc09061688f4db6:8fdb4357b8a1808fc8dcdc5a29bec720:625f70bcfe9c7f2437cb9cad6d2b863c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 83, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 83, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 332, "y": 0, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 332, "y": 0, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 332, "y": 63, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 332, "y": 63, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 332, "y": 63, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 332, "y": 63, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 332, "y": 0, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 249, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 249, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 332, "y": 188, "w": 83, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 332, "y": 188, "w": 83, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 0, "y": 189, "w": 83, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 0, "y": 189, "w": 83, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 0, "y": 189, "w": 83, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 0, "y": 189, "w": 83, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 332, "y": 188, "w": 83, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0121.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "713.png", + "format": "I8", + "size": { "w": 416, "h": 247 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/713.png b/public/images/pokemon/exp/713.png index 0452b1989a1..2d0b8477262 100644 Binary files a/public/images/pokemon/exp/713.png and b/public/images/pokemon/exp/713.png differ diff --git a/public/images/pokemon/exp/714.json b/public/images/pokemon/exp/714.json deleted file mode 100644 index 7deaf1909af..00000000000 --- a/public/images/pokemon/exp/714.json +++ /dev/null @@ -1,314 +0,0 @@ -{ - "textures": [ - { - "image": "714.png", - "format": "RGBA8888", - "size": { - "w": 179, - "h": 179 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 63, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 60 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 63, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 60 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 59 - }, - "frame": { - "x": 0, - "y": 60, - "w": 64, - "h": 59 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 59 - }, - "frame": { - "x": 0, - "y": 60, - "w": 64, - "h": 59 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 58 - }, - "frame": { - "x": 63, - "y": 0, - "w": 64, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 60, - "h": 61 - }, - "frame": { - "x": 64, - "y": 58, - "w": 60, - "h": 61 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 60, - "h": 61 - }, - "frame": { - "x": 64, - "y": 58, - "w": 60, - "h": 61 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 54, - "h": 58 - }, - "frame": { - "x": 124, - "y": 58, - "w": 54, - "h": 58 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 54, - "h": 58 - }, - "frame": { - "x": 124, - "y": 58, - "w": 54, - "h": 58 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 54, - "h": 58 - }, - "frame": { - "x": 124, - "y": 116, - "w": 54, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 60, - "h": 60 - }, - "frame": { - "x": 0, - "y": 119, - "w": 60, - "h": 60 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 60, - "h": 60 - }, - "frame": { - "x": 0, - "y": 119, - "w": 60, - "h": 60 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 56, - "h": 60 - }, - "frame": { - "x": 60, - "y": 119, - "w": 56, - "h": 60 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 56, - "h": 60 - }, - "frame": { - "x": 60, - "y": 119, - "w": 56, - "h": 60 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:585d7099ac8249026b274a63ac9c25f0:8d770fdec6c3922ce9cc2e04a6453388:1a07d46e710b0568ec824f54fbc4fe6a$" - } -} diff --git a/public/images/pokemon/exp/714.png b/public/images/pokemon/exp/714.png deleted file mode 100644 index 21c184bf476..00000000000 Binary files a/public/images/pokemon/exp/714.png and /dev/null differ diff --git a/public/images/pokemon/exp/715.png b/public/images/pokemon/exp/715.png index 58f093d089a..3967da0f1b9 100644 Binary files a/public/images/pokemon/exp/715.png and b/public/images/pokemon/exp/715.png differ diff --git a/public/images/pokemon/exp/718-10.json b/public/images/pokemon/exp/718-10.json deleted file mode 100644 index f387823bf4c..00000000000 --- a/public/images/pokemon/exp/718-10.json +++ /dev/null @@ -1,692 +0,0 @@ -{ - "textures": [ - { - "image": "718-10.png", - "format": "RGBA8888", - "size": { - "w": 239, - "h": 239 - }, - "scale": 1, - "frames": [ - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 61, - "h": 65 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 65 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 59, - "h": 67 - }, - "frame": { - "x": 0, - "y": 65, - "w": 59, - "h": 67 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 59, - "h": 67 - }, - "frame": { - "x": 0, - "y": 65, - "w": 59, - "h": 67 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 59, - "h": 67 - }, - "frame": { - "x": 0, - "y": 65, - "w": 59, - "h": 67 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 64, - "h": 61 - }, - "frame": { - "x": 0, - "y": 132, - "w": 64, - "h": 61 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 65, - "h": 60 - }, - "frame": { - "x": 59, - "y": 65, - "w": 65, - "h": 60 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 61, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 61, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 61, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 120, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 120, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 120, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 59, - "h": 66 - }, - "frame": { - "x": 179, - "y": 0, - "w": 59, - "h": 66 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 58, - "h": 67 - }, - "frame": { - "x": 124, - "y": 66, - "w": 58, - "h": 67 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 58, - "h": 67 - }, - "frame": { - "x": 124, - "y": 66, - "w": 58, - "h": 67 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 58, - "h": 67 - }, - "frame": { - "x": 124, - "y": 66, - "w": 58, - "h": 67 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 64, - "y": 125, - "w": 59, - "h": 65 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 58, - "h": 66 - }, - "frame": { - "x": 123, - "y": 133, - "w": 58, - "h": 66 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 58, - "h": 66 - }, - "frame": { - "x": 123, - "y": 133, - "w": 58, - "h": 66 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 58, - "h": 66 - }, - "frame": { - "x": 123, - "y": 133, - "w": 58, - "h": 66 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 181, - "y": 133, - "w": 57, - "h": 67 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 181, - "y": 133, - "w": 57, - "h": 67 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 181, - "y": 133, - "w": 57, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4a92d566ab5398ac1329b7a8bd47bf23:05925b513eba9d64f38ee84fe4b031b9:82195cf2a6db620c5643b8162d6e8c5c$" - } -} diff --git a/public/images/pokemon/exp/718-10.png b/public/images/pokemon/exp/718-10.png deleted file mode 100644 index faf98182653..00000000000 Binary files a/public/images/pokemon/exp/718-10.png and /dev/null differ diff --git a/public/images/pokemon/exp/718.json b/public/images/pokemon/exp/718.json deleted file mode 100644 index 7e32292a1be..00000000000 --- a/public/images/pokemon/exp/718.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "textures": [ - { - "image": "718.png", - "format": "RGBA8888", - "size": { - "w": 219, - "h": 219 - }, - "scale": 1, - "frames": [ - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 71, - "h": 88 - }, - "frame": { - "x": 0, - "y": 0, - "w": 71, - "h": 88 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 71, - "y": 0, - "w": 73, - "h": 89 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 144, - "y": 0, - "w": 74, - "h": 89 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 144, - "y": 0, - "w": 74, - "h": 89 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 0, - "y": 89, - "w": 74, - "h": 89 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 0, - "y": 89, - "w": 74, - "h": 89 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 74, - "y": 89, - "w": 73, - "h": 89 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 74, - "y": 89, - "w": 73, - "h": 89 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 72, - "h": 89 - }, - "frame": { - "x": 147, - "y": 89, - "w": 72, - "h": 89 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 72, - "h": 89 - }, - "frame": { - "x": 147, - "y": 89, - "w": 72, - "h": 89 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:ca886cfe27a80d5575319fa107b1227d:f6e306f8382a9caca9560b144b026413:7b4a06b06cbac24b3f39727b0238661b$" - } -} diff --git a/public/images/pokemon/exp/718.png b/public/images/pokemon/exp/718.png deleted file mode 100644 index 01595585059..00000000000 Binary files a/public/images/pokemon/exp/718.png and /dev/null differ diff --git a/public/images/pokemon/exp/719.json b/public/images/pokemon/exp/719.json deleted file mode 100644 index 289b518f437..00000000000 --- a/public/images/pokemon/exp/719.json +++ /dev/null @@ -1,1091 +0,0 @@ -{ - "textures": [ - { - "image": "719.png", - "format": "RGBA8888", - "size": { - "w": 210, - "h": 210 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 10, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 6, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 10, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 6, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 10, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 6, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 34, - "y": 9, - "w": 48, - "h": 67 - }, - "frame": { - "x": 49, - "y": 0, - "w": 48, - "h": 67 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 48, - "h": 67 - }, - "frame": { - "x": 49, - "y": 0, - "w": 48, - "h": 67 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 48, - "h": 67 - }, - "frame": { - "x": 49, - "y": 0, - "w": 48, - "h": 67 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 48, - "h": 67 - }, - "frame": { - "x": 49, - "y": 0, - "w": 48, - "h": 67 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 46, - "h": 67 - }, - "frame": { - "x": 144, - "y": 0, - "w": 46, - "h": 67 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 48, - "h": 66 - }, - "frame": { - "x": 0, - "y": 67, - "w": 48, - "h": 66 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 48, - "y": 12, - "w": 46, - "h": 66 - }, - "frame": { - "x": 48, - "y": 67, - "w": 46, - "h": 66 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 45, - "y": 1, - "w": 45, - "h": 67 - }, - "frame": { - "x": 94, - "y": 67, - "w": 45, - "h": 67 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 45, - "h": 67 - }, - "frame": { - "x": 94, - "y": 67, - "w": 45, - "h": 67 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 19, - "y": 5, - "w": 45, - "h": 67 - }, - "frame": { - "x": 94, - "y": 67, - "w": 45, - "h": 67 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 2, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 2, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 2, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 27, - "y": 4, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 36, - "y": 2, - "w": 42, - "h": 67 - }, - "frame": { - "x": 44, - "y": 133, - "w": 42, - "h": 67 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 54, - "y": 3, - "w": 42, - "h": 67 - }, - "frame": { - "x": 139, - "y": 67, - "w": 42, - "h": 67 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 23, - "y": 6, - "w": 42, - "h": 67 - }, - "frame": { - "x": 139, - "y": 67, - "w": 42, - "h": 67 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 12, - "w": 42, - "h": 66 - }, - "frame": { - "x": 86, - "y": 134, - "w": 42, - "h": 66 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 55, - "y": 6, - "w": 41, - "h": 67 - }, - "frame": { - "x": 128, - "y": 134, - "w": 41, - "h": 67 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 41, - "h": 67 - }, - "frame": { - "x": 169, - "y": 134, - "w": 41, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:eb63d565533cc4db6abe2324f72ce7a0:5cfab760df87a56d5ca4db54a28b4a46:17a705bb924916761be2495822a53735$" - } -} diff --git a/public/images/pokemon/exp/719.png b/public/images/pokemon/exp/719.png deleted file mode 100644 index f9059000661..00000000000 Binary files a/public/images/pokemon/exp/719.png and /dev/null differ diff --git a/public/images/pokemon/exp/815-gigantamax.json b/public/images/pokemon/exp/815-gigantamax.json new file mode 100644 index 00000000000..d8fb9d62e57 --- /dev/null +++ b/public/images/pokemon/exp/815-gigantamax.json @@ -0,0 +1,659 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 343, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 357, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 85, "y": 292, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 252, "y": 482, "w": 81, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 258, "y": 290, "w": 83, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 416, "y": 484, "w": 79, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 426, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 445, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 179, "y": 97, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 1, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 523, "y": 195, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 509, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 89, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 531, "y": 98, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 343, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 357, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 85, "y": 292, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 252, "y": 482, "w": 81, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 258, "y": 290, "w": 83, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 416, "y": 484, "w": 79, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 426, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 445, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 179, "y": 97, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 1, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 523, "y": 195, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 509, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 89, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 531, "y": 98, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 343, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 357, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 85, "y": 292, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 252, "y": 482, "w": 81, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 258, "y": 290, "w": 83, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 416, "y": 484, "w": 79, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 426, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 445, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 179, "y": 97, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 1, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 523, "y": 195, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 509, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 89, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 531, "y": 98, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 258, "y": 385, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 267, "y": 97, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 1, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 268, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 426, "y": 389, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 82, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 1, "y": 484, "w": 81, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 81, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 341, "y": 389, "w": 83, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 7, "w": 83, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 84, "y": 485, "w": 79, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 9, "w": 79, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 167, "y": 484, "w": 81, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 81, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 1, "y": 195, "w": 86, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 86, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 265, "y": 194, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 89, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 1, "y": 290, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 1, "y": 387, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 353, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 510, "y": 389, "w": 80, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 1, "w": 80, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 169, "y": 387, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 1, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 355, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 443, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 90, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 174, "y": 290, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 84, "y": 388, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 4, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 438, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 335, "y": 483, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "815-gigantamax.png", + "format": "I8", + "size": { "w": 611, "h": 579 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/815-gigantamax.png b/public/images/pokemon/exp/815-gigantamax.png new file mode 100644 index 00000000000..4720e564c09 Binary files /dev/null and b/public/images/pokemon/exp/815-gigantamax.png differ diff --git a/public/images/pokemon/exp/839-gigantamax.json b/public/images/pokemon/exp/839-gigantamax.json new file mode 100644 index 00000000000..15a7c122f5d --- /dev/null +++ b/public/images/pokemon/exp/839-gigantamax.json @@ -0,0 +1,821 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 525, "y": 567, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 441, "y": 566, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 609, "y": 567, "w": 83, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 255, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 171, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 569, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 339, "y": 569, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 474, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 464, "y": 375, "w": 89, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 580, "y": 190, "w": 92, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 95, "y": 96, "w": 94, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 198, "y": 95, "w": 95, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 491, "y": 0, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 297, "y": 0, "w": 98, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 0, "w": 100, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 198, "y": 0, "w": 99, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 100, "y": 0, "w": 98, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 395, "y": 0, "w": 96, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 189, "y": 190, "w": 92, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 89, "y": 379, "w": 88, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 525, "y": 567, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 441, "y": 566, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 609, "y": 567, "w": 83, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 255, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 171, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 569, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 339, "y": 569, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 474, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 464, "y": 375, "w": 89, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 580, "y": 190, "w": 92, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 95, "y": 96, "w": 94, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 198, "y": 95, "w": 95, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 491, "y": 0, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 297, "y": 0, "w": 98, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 0, "w": 100, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 198, "y": 0, "w": 99, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 100, "y": 0, "w": 98, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 395, "y": 0, "w": 96, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 189, "y": 190, "w": 92, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 89, "y": 379, "w": 88, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 525, "y": 567, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 441, "y": 566, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 609, "y": 567, "w": 83, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 255, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 171, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 569, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 339, "y": 569, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 474, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 464, "y": 375, "w": 89, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 580, "y": 190, "w": 92, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 95, "y": 96, "w": 94, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 198, "y": 95, "w": 95, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 491, "y": 0, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 297, "y": 0, "w": 98, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 100, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 198, "y": 0, "w": 99, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 100, "y": 0, "w": 98, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 395, "y": 0, "w": 96, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 189, "y": 190, "w": 92, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 89, "y": 379, "w": 88, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 525, "y": 567, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 454, "y": 470, "w": 86, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 86, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 379, "w": 89, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 1, "w": 89, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 573, "y": 285, "w": 91, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 1, "w": 91, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 93, "y": 191, "w": 92, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 1, "w": 92, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 390, "y": 96, "w": 94, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 1, "w": 94, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 585, "y": 96, "w": 94, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 2, "w": 94, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 293, "y": 95, "w": 97, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 3, "w": 97, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 484, "y": 190, "w": 96, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 96, "h": 92 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 92, "y": 286, "w": 92, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 92, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 177, "y": 471, "w": 89, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 89, "h": 92 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 177, "y": 379, "w": 91, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 91, "h": 92 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 184, "y": 286, "w": 91, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 91, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 480, "y": 282, "w": 93, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 93, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 281, "y": 281, "w": 93, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 93, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 293, "y": 188, "w": 95, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 587, "y": 0, "w": 95, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 95, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 95, "w": 95, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 95, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 491, "y": 95, "w": 94, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 94, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 0, "y": 190, "w": 93, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 93, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 388, "y": 191, "w": 92, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 92, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 285, "w": 92, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 92, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 275, "y": 374, "w": 90, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 90, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 374, "y": 286, "w": 90, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 90, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 365, "y": 380, "w": 89, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 89, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 553, "y": 380, "w": 89, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 89, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 540, "y": 473, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 87, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 268, "y": 468, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 87, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 355, "y": 474, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 86, "y": 475, "w": 85, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 85, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "839-gigantamax.png", + "format": "I8", + "size": { "w": 692, "h": 664 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/839-gigantamax.png b/public/images/pokemon/exp/839-gigantamax.png new file mode 100644 index 00000000000..5a614b0c895 Binary files /dev/null and b/public/images/pokemon/exp/839-gigantamax.png differ diff --git a/public/images/pokemon/exp/back/248-mega.json b/public/images/pokemon/exp/back/248-mega.json index 25bc42548ab..ddd3987db90 100644 --- a/public/images/pokemon/exp/back/248-mega.json +++ b/public/images/pokemon/exp/back/248-mega.json @@ -1,272 +1,929 @@ -{ - "textures": [ - { - "image": "248-mega.png", - "format": "RGBA8888", - "size": { - "w": 292, - "h": 292 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 80, - "h": 74 - }, - "frame": { - "x": 0, - "y": 0, - "w": 80, - "h": 74 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 80, - "h": 74 - }, - "frame": { - "x": 0, - "y": 74, - "w": 80, - "h": 74 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 79, - "h": 74 - }, - "frame": { - "x": 0, - "y": 148, - "w": 79, - "h": 74 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 79, - "h": 74 - }, - "frame": { - "x": 79, - "y": 148, - "w": 79, - "h": 74 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 79, - "h": 73 - }, - "frame": { - "x": 80, - "y": 0, - "w": 79, - "h": 73 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 79, - "h": 73 - }, - "frame": { - "x": 80, - "y": 73, - "w": 79, - "h": 73 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 146, - "w": 75, - "h": 73 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 146, - "w": 75, - "h": 73 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 219, - "w": 75, - "h": 73 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 219, - "w": 75, - "h": 73 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 73, - "h": 73 - }, - "frame": { - "x": 159, - "y": 0, - "w": 73, - "h": 73 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 73, - "h": 73 - }, - "frame": { - "x": 159, - "y": 73, - "w": 73, - "h": 73 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:625e35ec9f8e731e89fa37587ffb4738:07d356e18baf0312a4e8a36adb76fdd5:90df97eb431b7162252516cb937a0b9e$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 101, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 430, "y": 101, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 195, "w": 84, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 173, "y": 287, "w": 85, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 373, "w": 85, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 84, "y": 456, "w": 85, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 511, "y": 534, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 512, "y": 612, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 427, "y": 612, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 255, "y": 536, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 169, "y": 535, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 431, "y": 455, "w": 84, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 340, "y": 456, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 171, "y": 456, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 171, "y": 374, "w": 83, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 516, "y": 287, "w": 83, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 347, "y": 287, "w": 83, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 256, "y": 196, "w": 83, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 342, "y": 192, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 101, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 430, "y": 101, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 195, "w": 84, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 173, "y": 287, "w": 85, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 260, "y": 373, "w": 85, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 84, "y": 456, "w": 85, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 511, "y": 534, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 85, "y": 613, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 427, "y": 612, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 255, "y": 536, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 169, "y": 535, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 431, "y": 455, "w": 84, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 340, "y": 456, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 171, "y": 456, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 171, "y": 374, "w": 83, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 516, "y": 287, "w": 83, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 347, "y": 287, "w": 83, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 256, "y": 196, "w": 83, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 342, "y": 192, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 101, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 430, "y": 101, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 195, "w": 84, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 173, "y": 287, "w": 85, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 260, "y": 373, "w": 85, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 84, "y": 456, "w": 85, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 341, "y": 612, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 613, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 427, "y": 612, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 255, "y": 536, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 169, "y": 535, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 518, "y": 455, "w": 84, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 84, "y": 534, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 171, "y": 456, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 171, "y": 374, "w": 83, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 516, "y": 287, "w": 83, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 347, "y": 287, "w": 83, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 256, "y": 196, "w": 83, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 342, "y": 192, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 101, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 430, "y": 101, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 195, "w": 84, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 173, "y": 287, "w": 85, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 260, "y": 373, "w": 85, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 84, "y": 456, "w": 85, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 425, "y": 534, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 613, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 427, "y": 612, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 255, "y": 536, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 169, "y": 535, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 518, "y": 455, "w": 84, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 84, "y": 534, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 171, "y": 456, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 171, "y": 374, "w": 83, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 516, "y": 287, "w": 83, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 347, "y": 287, "w": 83, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 256, "y": 196, "w": 83, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 342, "y": 192, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 101, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 426, "y": 194, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 510, "y": 196, "w": 83, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 83, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 0, "y": 285, "w": 83, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 83, "h": 86 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 432, "y": 287, "w": 82, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 85, "y": 288, "w": 82, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 83 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 87, "y": 373, "w": 82, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 81 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 431, "y": 374, "w": 82, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 455, "w": 82, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 256, "y": 455, "w": 82, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 347, "y": 374, "w": 82, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 516, "y": 372, "w": 84, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 84, "h": 81 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 260, "y": 287, "w": 85, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 85, "h": 84 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 86, "y": 200, "w": 85, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 85, "h": 86 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 342, "y": 101, "w": 86, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 256, "y": 100, "w": 84, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 84, "h": 94 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 86, "y": 100, "w": 83, "h": 98 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 83, "h": 98 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 514, "y": 0, "w": 83, "h": 98 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 83, "h": 98 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 344, "y": 0, "w": 83, "h": 99 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 83, "h": 99 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 429, "y": 0, "w": 83, "h": 99 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 83, "h": 99 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 0, "y": 0, "w": 84, "h": 99 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 84, "h": 99 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 86, "y": 0, "w": 84, "h": 98 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 84, "h": 98 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 172, "y": 0, "w": 84, "h": 98 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 84, "h": 98 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 258, "y": 0, "w": 84, "h": 98 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 84, "h": 98 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 171, "y": 100, "w": 83, "h": 97 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 83, "h": 97 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 514, "y": 100, "w": 83, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 83, "h": 94 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "248-mega.png", + "format": "I8", + "size": { "w": 602, "h": 689 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/248-mega.png b/public/images/pokemon/exp/back/248-mega.png index 4b2a4021721..1e4918e5ca7 100644 Binary files a/public/images/pokemon/exp/back/248-mega.png and b/public/images/pokemon/exp/back/248-mega.png differ diff --git a/public/images/pokemon/exp/back/362-mega.json b/public/images/pokemon/exp/back/362-mega.json index 6f5b4ea32bb..02354ddad93 100644 --- a/public/images/pokemon/exp/back/362-mega.json +++ b/public/images/pokemon/exp/back/362-mega.json @@ -1,272 +1,551 @@ -{ - "textures": [ - { - "image": "362-mega.png", - "format": "RGBA8888", - "size": { - "w": 140, - "h": 140 - }, - "scale": 1, - "frames": [ - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 61, - "h": 71 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 71 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 61, - "h": 71 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 71 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 61, - "h": 71 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 71 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 61, - "h": 71 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 71 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 70 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 70 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 70 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 70 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 70, - "w": 61, - "h": 70 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 70, - "w": 61, - "h": 70 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 69 - }, - "frame": { - "x": 0, - "y": 71, - "w": 61, - "h": 69 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 69 - }, - "frame": { - "x": 0, - "y": 71, - "w": 61, - "h": 69 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b710cac988ef0d2bf31cf4b83951fd3a:aaedfd5f04a5c93bc13787cb0b73c4e3:8a7271a5423838c97ddeb1e6dc343255$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "362-mega.png", + "format": "I8", + "size": { "w": 128, "h": 132 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/362-mega.png b/public/images/pokemon/exp/back/362-mega.png index 81f9bb5cdcd..5bbfd932d33 100644 Binary files a/public/images/pokemon/exp/back/362-mega.png and b/public/images/pokemon/exp/back/362-mega.png differ diff --git a/public/images/pokemon/exp/back/569-gigantamax.json b/public/images/pokemon/exp/back/569-gigantamax.json new file mode 100644 index 00000000000..b266f5eb799 --- /dev/null +++ b/public/images/pokemon/exp/back/569-gigantamax.json @@ -0,0 +1,1478 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0002.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0003.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0004.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0005.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0006.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0007.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0008.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0009.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0010.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0011.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0012.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0013.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0014.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0015.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0016.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0017.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0018.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0019.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0023.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0024.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0025.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0026.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0027.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0028.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0029.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0030.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0031.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0032.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0033.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0034.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0035.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0036.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0037.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0038.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0039.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0040.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0041.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0042.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0043.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0044.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0045.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0046.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0047.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0048.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0049.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0050.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0051.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0052.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0053.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0054.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0058.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0059.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0060.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0061.png", + "frame": { "x": 311, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0062.png", + "frame": { "x": 311, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0063.png", + "frame": { "x": 311, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0064.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0065.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0066.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0067.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0068.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0069.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0070.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0071.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0072.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0075.png", + "frame": { "x": 0, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0076.png", + "frame": { "x": 96, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0077.png", + "frame": { "x": 96, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0080.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0081.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0082.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0083.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0084.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0085.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0086.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0087.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0089.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0091.png", + "frame": { "x": 96, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0092.png", + "frame": { "x": 96, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0093.png", + "frame": { "x": 96, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0094.png", + "frame": { "x": 0, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0095.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0096.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0097.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0098.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0099.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0100.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0101.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0102.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0103.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0104.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0105.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0106.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0107.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0108.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0109.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0110.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0111.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0112.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0113.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0114.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0115.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0116.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0117.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0118.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0119.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0120.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0121.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0122.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0123.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0124.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0125.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0126.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0127.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0128.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0129.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0130.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0131.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0132.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0133.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0134.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0135.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0136.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0137.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0138.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0139.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0140.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0141.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0142.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0143.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0144.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0145.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0146.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0147.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0148.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0149.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0150.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0151.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0152.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0153.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0154.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0155.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0156.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0157.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0158.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0159.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0160.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0161.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0162.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0163.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "569-gigantamax.png", + "format": "I8", + "size": { "w": 413, "h": 281 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/569-gigantamax.png b/public/images/pokemon/exp/back/569-gigantamax.png new file mode 100644 index 00000000000..13bbe97bee4 Binary files /dev/null and b/public/images/pokemon/exp/back/569-gigantamax.png differ diff --git a/public/images/pokemon/exp/back/651.json b/public/images/pokemon/exp/back/651.json index 2dfe8c0091a..d000767029c 100644 --- a/public/images/pokemon/exp/back/651.json +++ b/public/images/pokemon/exp/back/651.json @@ -1,104 +1,713 @@ -{ - "textures": [ - { - "image": "651.png", - "format": "RGBA8888", - "size": { - "w": 106, - "h": 106 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 50 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 50 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 50 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 50 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 50 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 50 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 50 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 50 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 50 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 50 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 49 - }, - "frame": { - "x": 0, - "y": 50, - "w": 53, - "h": 49 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:04a3a807a85b2fbb34c6e0e609d7bcd9:4422017bd667a14a570c0aab29c8a613:a93e5fa02e10bf11e3ed8bf6571835ca$" - } -} \ No newline at end of file +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 167, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 222, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 277, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 56, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 277, "y": 150, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 329, "y": 200, "w": 52, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 330, "y": 150, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 198, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 110, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 164, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 218, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 55, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 110, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 55, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 165, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 220, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 111, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 275, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 330, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 167, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 222, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 277, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 56, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 277, "y": 150, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 329, "y": 200, "w": 52, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 330, "y": 150, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 198, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 110, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 164, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 218, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 55, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 110, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 55, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 165, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 220, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 111, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 275, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 330, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 167, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 222, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 277, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 56, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 277, "y": 150, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 329, "y": 200, "w": 52, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 330, "y": 150, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 198, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 110, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 164, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 218, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 55, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 110, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 55, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 165, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 220, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 111, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 275, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 330, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 272, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 100, "w": 56, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 56, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 51, "w": 55, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 165, "y": 150, "w": 56, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 48 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 160, "y": 247, "w": 55, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 55, "h": 47 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 221, "y": 150, "w": 56, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 56, "h": 48 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 273, "y": 200, "w": 56, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 56, "h": 47 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 149, "w": 55, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 332, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 165, "y": 198, "w": 54, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 215, "y": 247, "w": 53, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 48 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 107, "y": 247, "w": 53, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 53, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 219, "y": 198, "w": 54, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 54, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 326, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 53, "y": 199, "w": 54, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 54, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 107, "y": 199, "w": 55, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 55, "h": 48 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 55, "y": 150, "w": 55, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 110, "y": 150, "w": 55, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "651.png", + "format": "I8", + "size": { "w": 387, "h": 296 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/651.png b/public/images/pokemon/exp/back/651.png index dd8d2b22d61..b16c8d5d67b 100644 Binary files a/public/images/pokemon/exp/back/651.png and b/public/images/pokemon/exp/back/651.png differ diff --git a/public/images/pokemon/exp/back/653.json b/public/images/pokemon/exp/back/653.json index 48c09e77b1b..c5fb4a5db61 100644 --- a/public/images/pokemon/exp/back/653.json +++ b/public/images/pokemon/exp/back/653.json @@ -1,2036 +1,947 @@ -{ - "textures": [ - { - "image": "653.png", - "format": "RGBA8888", - "size": { - "w": 173, - "h": 173 - }, - "scale": 1, - "frames": [ - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 90, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 90, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 90, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 90, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 45, - "h": 44 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 45, - "h": 44 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 45, - "h": 44 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 45, - "h": 44 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 44 - }, - "frame": { - "x": 45, - "y": 44, - "w": 44, - "h": 44 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 44 - }, - "frame": { - "x": 45, - "y": 44, - "w": 44, - "h": 44 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 44 - }, - "frame": { - "x": 45, - "y": 44, - "w": 44, - "h": 44 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 44 - }, - "frame": { - "x": 45, - "y": 44, - "w": 44, - "h": 44 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 43, - "h": 44 - }, - "frame": { - "x": 45, - "y": 88, - "w": 43, - "h": 44 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 43, - "h": 44 - }, - "frame": { - "x": 45, - "y": 88, - "w": 43, - "h": 44 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 43, - "h": 44 - }, - "frame": { - "x": 45, - "y": 88, - "w": 43, - "h": 44 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 130, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 130, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 87, - "w": 40, - "h": 43 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 87, - "w": 40, - "h": 43 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 87, - "w": 40, - "h": 43 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 87, - "w": 40, - "h": 43 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2657d933ba34a7364529c17b46d25589:b79a47cc022bd83470144fdf9b951be2:a7be961d0230f568aff23d95e7ff0036$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 123, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 123, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 123, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 123, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 130, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 130, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 130, "y": 43, "w": 41, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 130, "y": 43, "w": 41, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 88, "y": 43, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 88, "y": 43, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 88, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 88, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 88, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 88, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 132, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 132, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 44, "y": 43, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 44, "y": 43, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 88, "y": 43, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 88, "y": 43, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 130, "y": 43, "w": 41, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 130, "y": 43, "w": 41, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "653.png", + "format": "I8", + "size": { "w": 176, "h": 170 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/653.png b/public/images/pokemon/exp/back/653.png index 1f9cb2fe168..58682e90e58 100644 Binary files a/public/images/pokemon/exp/back/653.png and b/public/images/pokemon/exp/back/653.png differ diff --git a/public/images/pokemon/exp/back/654.json b/public/images/pokemon/exp/back/654.json index e62078dc236..a5bd681b6cb 100644 --- a/public/images/pokemon/exp/back/654.json +++ b/public/images/pokemon/exp/back/654.json @@ -1,188 +1,677 @@ -{ - "textures": [ - { - "image": "654.png", - "format": "RGBA8888", - "size": { - "w": 120, - "h": 120 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 40, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 40, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 65 - }, - "frame": { - "x": 80, - "y": 0, - "w": 40, - "h": 65 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 65 - }, - "frame": { - "x": 80, - "y": 0, - "w": 40, - "h": 65 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d0b30f6e084cc1428328b2f8b9fbe624:bf595af9905e0e91443856bfefa85a3a:1977f50e1ab8a3304ceeb59ee1aa2ba9$" - } -} \ No newline at end of file +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 215, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 163, "y": 0, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 108, "y": 137, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 50, "y": 263, "w": 50, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 50, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 131, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 218, "y": 0, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 161, "y": 195, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 154, "y": 261, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 54, "y": 131, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 163, "y": 65, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 154, "y": 261, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 54, "y": 131, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 163, "y": 65, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 154, "y": 261, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 54, "y": 131, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 163, "y": 65, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 154, "y": 261, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 54, "y": 131, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 218, "y": 65, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 55, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 108, "y": 137, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 196, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 51, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 51, "y": 196, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 51, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "654.png", + "format": "I8", + "size": { "w": 273, "h": 330 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/654.png b/public/images/pokemon/exp/back/654.png index 1f8fdd06967..f5d317f8a2e 100644 Binary files a/public/images/pokemon/exp/back/654.png and b/public/images/pokemon/exp/back/654.png differ diff --git a/public/images/pokemon/exp/back/656.json b/public/images/pokemon/exp/back/656.json index 45c9ae75c29..78a3ae89852 100644 --- a/public/images/pokemon/exp/back/656.json +++ b/public/images/pokemon/exp/back/656.json @@ -1,1007 +1,713 @@ -{ - "textures": [ - { - "image": "656.png", - "format": "RGBA8888", - "size": { - "w": 70, - "h": 70 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 34 - }, - "frame": { - "x": 35, - "y": 0, - "w": 35, - "h": 34 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 0, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 0, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 0, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 0, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 0, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 0, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 0, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 0, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 35, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 35, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 35, - "y": 34, - "w": 35, - "h": 33 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 35, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 35, - "h": 33 - }, - "frame": { - "x": 35, - "y": 34, - "w": 35, - "h": 33 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a0be6653f39ddbef185db62f993cae42:d1b80f97b079891e5ee3e04a05cb932f:9c4d208e6c2f857bfb0b23b8eea3326c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 131, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 37, "y": 83, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 109, "y": 117, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 35, "y": 119, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 35, "y": 154, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 71, "y": 156, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 167, "y": 43, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 71, "y": 121, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 141, "y": 158, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 73, "y": 85, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 131, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 37, "y": 83, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 109, "y": 117, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 35, "y": 119, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 35, "y": 154, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 71, "y": 156, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 167, "y": 43, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 71, "y": 121, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 141, "y": 158, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 73, "y": 85, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 131, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 37, "y": 83, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 109, "y": 117, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 35, "y": 119, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 35, "y": 154, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 71, "y": 156, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 167, "y": 43, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 71, "y": 121, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 141, "y": 158, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 73, "y": 85, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 131, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 37, "y": 83, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 109, "y": 117, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 35, "y": 119, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 35, "y": 154, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 71, "y": 156, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 167, "y": 43, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 71, "y": 121, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 141, "y": 158, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 73, "y": 85, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 131, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 37, "y": 83, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 109, "y": 117, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 35, "y": 119, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 35, "y": 154, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 71, "y": 156, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 167, "y": 43, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 71, "y": 121, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 141, "y": 158, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 73, "y": 85, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 200 + }, + { + "filename": "0057.png", + "frame": { "x": 67, "y": 1, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 33, "h": 38 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 1, "y": 1, "w": 31, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 31, "h": 41 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 34, "y": 1, "w": 31, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 31, "h": 41 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 102, "y": 1, "w": 31, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 31, "h": 40 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 167, "y": 1, "w": 30, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 30, "h": 40 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 167, "y": 80, "w": 30, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 39 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 67, "y": 41, "w": 30, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 40 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 135, "y": 1, "w": 30, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 30, "h": 41 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 99, "y": 43, "w": 30, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 30, "h": 40 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 1, "y": 155, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 107, "y": 189, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 32, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 1, "y": 191, "w": 31, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 16, "w": 31, "h": 31 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 69, "y": 190, "w": 31, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 31, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 35, "y": 188, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 750 + }, + { + "filename": "0071.png", + "frame": { "x": 145, "y": 121, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 1, "y": 117, "w": 32, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 36 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 107, "y": 152, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 1, "y": 44, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 131, "y": 44, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "656.png", + "format": "I8", + "size": { "w": 202, "h": 224 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/656.png b/public/images/pokemon/exp/back/656.png index 99119d2e96e..9e98534aab2 100644 Binary files a/public/images/pokemon/exp/back/656.png and b/public/images/pokemon/exp/back/656.png differ diff --git a/public/images/pokemon/exp/back/661.json b/public/images/pokemon/exp/back/661.json index 5ccc4bdde31..be82a4ce425 100644 --- a/public/images/pokemon/exp/back/661.json +++ b/public/images/pokemon/exp/back/661.json @@ -1,356 +1,398 @@ -{ - "textures": [ - { - "image": "661.png", - "format": "RGBA8888", - "size": { - "w": 68, - "h": 68 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 34, - "w": 32, - "h": 34 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:64046aa714277f415100be681fde9148:1306649eb47cc5be6e5f0b266b6c13ae:186d621a544ea0e0e2e0bd57975a29b1$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 117, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 39, "w": 34, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0004.png", + "frame": { "x": 105, "y": 36, "w": 35, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0005.png", + "frame": { "x": 33, "y": 118, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0006.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0007.png", + "frame": { "x": 68, "y": 75, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0008.png", + "frame": { "x": 35, "y": 0, "w": 34, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 78, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0011.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 117, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0013.png", + "frame": { "x": 34, "y": 40, "w": 34, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0014.png", + "frame": { "x": 69, "y": 37, "w": 35, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0015.png", + "frame": { "x": 33, "y": 118, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0016.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0017.png", + "frame": { "x": 68, "y": 75, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0018.png", + "frame": { "x": 35, "y": 0, "w": 34, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 78, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0021.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 117, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0023.png", + "frame": { "x": 34, "y": 40, "w": 34, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0024.png", + "frame": { "x": 69, "y": 37, "w": 35, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0025.png", + "frame": { "x": 33, "y": 118, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0026.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0027.png", + "frame": { "x": 68, "y": 75, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0028.png", + "frame": { "x": 35, "y": 0, "w": 34, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0029.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 78, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0031.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0032.png", + "frame": { "x": 33, "y": 79, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0033.png", + "frame": { "x": 33, "y": 79, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0034.png", + "frame": { "x": 101, "y": 112, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 34, "h": 37 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0035.png", + "frame": { "x": 69, "y": 0, "w": 36, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0036.png", + "frame": { "x": 105, "y": 0, "w": 37, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0037.png", + "frame": { "x": 69, "y": 0, "w": 36, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0038.png", + "frame": { "x": 105, "y": 0, "w": 37, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0039.png", + "frame": { "x": 69, "y": 0, "w": 36, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0040.png", + "frame": { "x": 105, "y": 0, "w": 37, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0041.png", + "frame": { "x": 69, "y": 0, "w": 36, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0042.png", + "frame": { "x": 104, "y": 74, "w": 34, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 34, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0043.png", + "frame": { "x": 33, "y": 79, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "661.png", + "format": "I8", + "size": { "w": 142, "h": 156 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/661.png b/public/images/pokemon/exp/back/661.png index 8ab845902d1..67d9bb04293 100644 Binary files a/public/images/pokemon/exp/back/661.png and b/public/images/pokemon/exp/back/661.png differ diff --git a/public/images/pokemon/exp/back/662.json b/public/images/pokemon/exp/back/662.json index e854c2b896c..52cc70bbe5d 100644 --- a/public/images/pokemon/exp/back/662.json +++ b/public/images/pokemon/exp/back/662.json @@ -1,671 +1,254 @@ -{ - "textures": [ - { - "image": "662.png", - "format": "RGBA8888", - "size": { - "w": 154, - "h": 154 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 2, - "y": 16, - "w": 56, - "h": 37 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 37 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 2, - "y": 16, - "w": 56, - "h": 37 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 37 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 2, - "y": 16, - "w": 56, - "h": 37 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 37 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 2, - "y": 16, - "w": 56, - "h": 37 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 37 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 8, - "y": 17, - "w": 49, - "h": 48 - }, - "frame": { - "x": 56, - "y": 0, - "w": 49, - "h": 48 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 8, - "y": 17, - "w": 49, - "h": 48 - }, - "frame": { - "x": 56, - "y": 0, - "w": 49, - "h": 48 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 8, - "y": 17, - "w": 49, - "h": 48 - }, - "frame": { - "x": 105, - "y": 0, - "w": 49, - "h": 48 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 8, - "y": 17, - "w": 49, - "h": 48 - }, - "frame": { - "x": 105, - "y": 0, - "w": 49, - "h": 48 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 50 - }, - "frame": { - "x": 0, - "y": 48, - "w": 57, - "h": 50 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 50 - }, - "frame": { - "x": 0, - "y": 48, - "w": 57, - "h": 50 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 50 - }, - "frame": { - "x": 0, - "y": 48, - "w": 57, - "h": 50 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 50 - }, - "frame": { - "x": 0, - "y": 48, - "w": 57, - "h": 50 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 51 - }, - "frame": { - "x": 57, - "y": 48, - "w": 57, - "h": 51 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 51 - }, - "frame": { - "x": 57, - "y": 48, - "w": 57, - "h": 51 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 51 - }, - "frame": { - "x": 57, - "y": 48, - "w": 57, - "h": 51 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 51 - }, - "frame": { - "x": 57, - "y": 48, - "w": 57, - "h": 51 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 57, - "h": 52 - }, - "frame": { - "x": 57, - "y": 99, - "w": 57, - "h": 52 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 57, - "h": 52 - }, - "frame": { - "x": 57, - "y": 99, - "w": 57, - "h": 52 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 57, - "h": 52 - }, - "frame": { - "x": 57, - "y": 99, - "w": 57, - "h": 52 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 57, - "h": 52 - }, - "frame": { - "x": 57, - "y": 99, - "w": 57, - "h": 52 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:66c0226d9868b335d6f9adbc58ca011b:9d85ba89536227407c6480dea06dad13:e3da2dd0277c18bcc713dc6dd2460c87$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 70, "w": 53, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 16, "w": 53, "h": 62 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 212, "y": 70, "w": 52, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 18, "w": 52, "h": 63 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 247, "y": 204, "w": 46, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 36, "w": 46, "h": 51 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 1, "y": 196, "w": 49, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 33, "w": 49, "h": 49 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 56, "y": 1, "w": 56, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 56, "h": 65 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 224, "y": 1, "w": 52, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 52, "h": 68 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 107, "y": 68, "w": 48, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 48, "h": 69 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 277, "y": 1, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 51, "h": 68 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 113, "y": 1, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 18, "w": 55, "h": 66 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 48, "y": 249, "w": 44, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 31, "w": 44, "h": 50 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 191, "y": 248, "w": 47, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 27, "w": 47, "h": 49 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 169, "y": 1, "w": 54, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 54, "h": 67 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 101, "y": 208, "w": 45, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 18, "w": 45, "h": 51 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 1, "y": 246, "w": 46, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 13, "w": 46, "h": 51 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 1, "y": 1, "w": 54, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 54, "h": 68 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 56, "y": 67, "w": 50, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 50, "h": 69 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 265, "y": 70, "w": 47, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 47, "h": 69 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 102, "y": 138, "w": 44, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 11, "w": 44, "h": 69 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 147, "y": 193, "w": 43, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 14, "w": 43, "h": 69 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 191, "y": 199, "w": 55, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 31, "w": 55, "h": 48 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 51, "y": 200, "w": 49, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 27, "w": 49, "h": 48 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 156, "y": 69, "w": 55, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 55, "h": 60 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 1, "y": 133, "w": 50, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 6, "w": 50, "h": 62 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 208, "y": 134, "w": 48, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 48, "h": 64 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 257, "y": 140, "w": 48, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 48, "h": 63 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 52, "y": 137, "w": 49, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 49, "h": 62 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 156, "y": 130, "w": 51, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 13, "w": 51, "h": 62 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "662.png", + "format": "I8", + "size": { "w": 329, "h": 300 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/662.png b/public/images/pokemon/exp/back/662.png index 4e6a3c88277..39a9e8e53ad 100644 Binary files a/public/images/pokemon/exp/back/662.png and b/public/images/pokemon/exp/back/662.png differ diff --git a/public/images/pokemon/exp/back/663.json b/public/images/pokemon/exp/back/663.json index 83f5b7ddc42..48526624362 100644 --- a/public/images/pokemon/exp/back/663.json +++ b/public/images/pokemon/exp/back/663.json @@ -1,587 +1,731 @@ -{ - "textures": [ - { - "image": "663.png", - "format": "RGBA8888", - "size": { - "w": 226, - "h": 226 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 93 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 93, - "w": 90, - "h": 93 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 93, - "w": 90, - "h": 93 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 93, - "w": 90, - "h": 93 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 90, - "h": 93 - }, - "frame": { - "x": 0, - "y": 93, - "w": 90, - "h": 93 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 92 - }, - "frame": { - "x": 90, - "y": 0, - "w": 90, - "h": 92 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 92 - }, - "frame": { - "x": 90, - "y": 0, - "w": 90, - "h": 92 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 92 - }, - "frame": { - "x": 90, - "y": 0, - "w": 90, - "h": 92 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 92 - }, - "frame": { - "x": 90, - "y": 0, - "w": 90, - "h": 92 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 6, - "y": 19, - "w": 84, - "h": 62 - }, - "frame": { - "x": 90, - "y": 92, - "w": 84, - "h": 62 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 6, - "y": 19, - "w": 84, - "h": 62 - }, - "frame": { - "x": 90, - "y": 92, - "w": 84, - "h": 62 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 6, - "y": 19, - "w": 84, - "h": 62 - }, - "frame": { - "x": 90, - "y": 92, - "w": 84, - "h": 62 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 6, - "y": 19, - "w": 84, - "h": 62 - }, - "frame": { - "x": 90, - "y": 92, - "w": 84, - "h": 62 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 10, - "y": 24, - "w": 80, - "h": 72 - }, - "frame": { - "x": 90, - "y": 154, - "w": 80, - "h": 72 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 10, - "y": 24, - "w": 80, - "h": 72 - }, - "frame": { - "x": 90, - "y": 154, - "w": 80, - "h": 72 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 10, - "y": 24, - "w": 80, - "h": 72 - }, - "frame": { - "x": 90, - "y": 154, - "w": 80, - "h": 72 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 96 - }, - "spriteSourceSize": { - "x": 10, - "y": 24, - "w": 80, - "h": 72 - }, - "frame": { - "x": 90, - "y": 154, - "w": 80, - "h": 72 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e8559a9780e93da88e5a990643c22bc0:3bdf9c50c7e3aa9ed9acc8477ddf312d:3790d8d72a704a789cc594688d98802e$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0003.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0004.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0006.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0008.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0009.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0010.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0013.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0014.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0016.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0018.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0019.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0020.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0023.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0024.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0026.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0028.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0029.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0030.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0033.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0034.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0036.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0038.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0039.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0040.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0043.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0044.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0045.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0046.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0048.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0049.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0050.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0053.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0054.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0056.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0058.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0059.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0060.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0062.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0064.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0065.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0067.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0070.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0072.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0075.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0077.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0080.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "663.png", + "format": "I8", + "size": { "w": 388, "h": 212 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/663.png b/public/images/pokemon/exp/back/663.png index d241c8be871..6b49fc0a803 100644 Binary files a/public/images/pokemon/exp/back/663.png and b/public/images/pokemon/exp/back/663.png differ diff --git a/public/images/pokemon/exp/back/664.json b/public/images/pokemon/exp/back/664.json index 10da9db36bd..61c85d30239 100644 --- a/public/images/pokemon/exp/back/664.json +++ b/public/images/pokemon/exp/back/664.json @@ -1,104 +1,110 @@ -{ - "textures": [ - { - "image": "664.png", - "format": "RGBA8888", - "size": { - "w": 72, - "h": 72 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 24, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 24, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 24, - "h": 44 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 24, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 24, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 24, - "h": 44 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 24, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 24, - "h": 44 - }, - "frame": { - "x": 24, - "y": 0, - "w": 24, - "h": 44 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 24, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 24, - "h": 42 - }, - "frame": { - "x": 48, - "y": 0, - "w": 24, - "h": 42 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:7fc62d03764cbb44c78d222a8281c03b:59a11cbddf36944dc23f528022e71fc9:596e7d5b15b1bf041c4d7f6707c8ff49$" - } -} \ No newline at end of file +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 54, "y": 49, "w": 26, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 26, "h": 49 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 80, "y": 96, "w": 26, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 26, "h": 48 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 97, "w": 26, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 26, "h": 48 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 49, "w": 27, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 27, "h": 48 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 26, "y": 97, "w": 26, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 47 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 80, "y": 49, "w": 27, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 27, "h": 47 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 27, "y": 49, "w": 27, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 27, "h": 48 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 28, "y": 0, "w": 27, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 49 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 55, "y": 0, "w": 27, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 49 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 28, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 49 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 82, "y": 0, "w": 27, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 27, "h": 49 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "664.png", + "format": "I8", + "size": { "w": 109, "h": 145 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/664.png b/public/images/pokemon/exp/back/664.png index 30664a6aaf1..a8f0906c60d 100644 Binary files a/public/images/pokemon/exp/back/664.png and b/public/images/pokemon/exp/back/664.png differ diff --git a/public/images/pokemon/exp/back/665.json b/public/images/pokemon/exp/back/665.json index 320219545d9..6e713a69311 100644 --- a/public/images/pokemon/exp/back/665.json +++ b/public/images/pokemon/exp/back/665.json @@ -1,104 +1,596 @@ -{ - "textures": [ - { - "image": "665.png", - "format": "RGBA8888", - "size": { - "w": 75, - "h": 75 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 36 - }, - "frame": { - "x": 38, - "y": 0, - "w": 37, - "h": 36 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 35 - }, - "frame": { - "x": 0, - "y": 36, - "w": 38, - "h": 35 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9899654837114efa492ec85d06cd415a:0050d8b3ae2b780795145dd4beb4e6bb:a72e6c94514c750d7462eab6b08ee591$" - } -} \ No newline at end of file +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 262, "y": 102, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 262, "y": 102, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 262, "y": 102, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 160, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 290, "y": 67, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 160, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 47, "y": 40, "w": 39, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 5, "w": 39, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 343, "y": 34, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 5, "w": 45, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 227, "y": 33, "w": 63, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 63, "h": 36 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 80, "y": 0, "w": 74, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 74, "h": 40 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 154, "y": 0, "w": 81, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 81, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 235, "y": 0, "w": 81, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 81, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 0, "w": 80, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 38 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 154, "y": 33, "w": 73, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 73, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 316, "y": 0, "w": 73, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 73, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 290, "y": 34, "w": 53, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 7, "w": 53, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 38, "w": 47, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 7, "w": 47, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 86, "y": 40, "w": 40, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 40, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 156, "y": 101, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 7, "w": 34, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 36, "y": 75, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 194, "y": 69, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 228, "y": 69, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 324, "y": 69, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "665.png", + "format": "I8", + "size": { "w": 394, "h": 134 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/665.png b/public/images/pokemon/exp/back/665.png index 1cb4789e140..c989771bc5f 100644 Binary files a/public/images/pokemon/exp/back/665.png and b/public/images/pokemon/exp/back/665.png differ diff --git a/public/images/pokemon/exp/back/666-archipelago.json b/public/images/pokemon/exp/back/666-archipelago.json index bc4abf95a6d..817696f70a1 100644 --- a/public/images/pokemon/exp/back/666-archipelago.json +++ b/public/images/pokemon/exp/back/666-archipelago.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-archipelago.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:223e2a75aa192f3fb67e18f7f0d6c4c7:ba854fe0d08f005e9aa52e55cdc7eb4e:80cdb6dd219378a41ccf5c2acc7e7786$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-archipelago.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-archipelago.png b/public/images/pokemon/exp/back/666-archipelago.png index 83622bd976f..f83b645e0fe 100644 Binary files a/public/images/pokemon/exp/back/666-archipelago.png and b/public/images/pokemon/exp/back/666-archipelago.png differ diff --git a/public/images/pokemon/exp/back/666-continental.json b/public/images/pokemon/exp/back/666-continental.json index d0cd7359c88..fc21deb6978 100644 --- a/public/images/pokemon/exp/back/666-continental.json +++ b/public/images/pokemon/exp/back/666-continental.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-continental.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:89725e18f2e4d97217076ac82b40230b:c83c3d03ad1200fc71d95ecafb54bc03:23aaac2256d564b9d8a58d7de70397c3$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-continental.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-continental.png b/public/images/pokemon/exp/back/666-continental.png index 21447191338..f1a4cf5a2a4 100644 Binary files a/public/images/pokemon/exp/back/666-continental.png and b/public/images/pokemon/exp/back/666-continental.png differ diff --git a/public/images/pokemon/exp/back/666-elegant.json b/public/images/pokemon/exp/back/666-elegant.json index c44ea10f7dd..35c20315153 100644 --- a/public/images/pokemon/exp/back/666-elegant.json +++ b/public/images/pokemon/exp/back/666-elegant.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-elegant.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 44, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 44, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:bbba66d69955866664e782205a4af88d:66e99814147be780756a4d4ccd8b31dc:d6b035048c66474f6236a3bc923faa7b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-elegant.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-elegant.png b/public/images/pokemon/exp/back/666-elegant.png index 3187d681140..2a75c09b505 100644 Binary files a/public/images/pokemon/exp/back/666-elegant.png and b/public/images/pokemon/exp/back/666-elegant.png differ diff --git a/public/images/pokemon/exp/back/666-fancy.json b/public/images/pokemon/exp/back/666-fancy.json index 657c29e99ee..54113df4b51 100644 --- a/public/images/pokemon/exp/back/666-fancy.json +++ b/public/images/pokemon/exp/back/666-fancy.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-fancy.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:570d1bf9b987c1bf5ebfe39e485464dd:a3c8bebd39c1c84b1bf0fdf600026ea5:6d5edff9a806f43feff031c9919c9aca$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-fancy.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-fancy.png b/public/images/pokemon/exp/back/666-fancy.png index 9f9f9c42e80..f7da62d0637 100644 Binary files a/public/images/pokemon/exp/back/666-fancy.png and b/public/images/pokemon/exp/back/666-fancy.png differ diff --git a/public/images/pokemon/exp/back/666-garden.json b/public/images/pokemon/exp/back/666-garden.json index 763dd125a5c..4fcc5ab0ad1 100644 --- a/public/images/pokemon/exp/back/666-garden.json +++ b/public/images/pokemon/exp/back/666-garden.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-garden.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4b2ac69ef7a99f6cef35d3fd38c74d01:8a4c29615f3bf20e9c5d0bb372a5b210:f13a1a8fa0a411aa91fccb833ac8719c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-garden.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-garden.png b/public/images/pokemon/exp/back/666-garden.png index 47a9a27e790..35e0dd02087 100644 Binary files a/public/images/pokemon/exp/back/666-garden.png and b/public/images/pokemon/exp/back/666-garden.png differ diff --git a/public/images/pokemon/exp/back/666-high-plains.json b/public/images/pokemon/exp/back/666-high-plains.json index 90101dd98ba..56a90a01899 100644 --- a/public/images/pokemon/exp/back/666-high-plains.json +++ b/public/images/pokemon/exp/back/666-high-plains.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-high-plains.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:410c759185f779797422e8f2ce55db4f:6afd0d04b6138fdd57d12681e967b48c:2abdb5d19b2754e3daa24b6ff3ed2c2c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-high-plains.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-high-plains.png b/public/images/pokemon/exp/back/666-high-plains.png index 7b06fcc8040..7b84c4ebac3 100644 Binary files a/public/images/pokemon/exp/back/666-high-plains.png and b/public/images/pokemon/exp/back/666-high-plains.png differ diff --git a/public/images/pokemon/exp/back/666-icy-snow.json b/public/images/pokemon/exp/back/666-icy-snow.json index 17e6e3be8ef..b44f33bb07f 100644 --- a/public/images/pokemon/exp/back/666-icy-snow.json +++ b/public/images/pokemon/exp/back/666-icy-snow.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-icy-snow.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9f47e6de00b727163c2ffb6870af9c6b:16bfd68007c3798294c7d690e075f679:fb1e8b97806dc5c60ac6adf0ae48199b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-icy-snow.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-icy-snow.png b/public/images/pokemon/exp/back/666-icy-snow.png index b34659ded51..332e96a6d61 100644 Binary files a/public/images/pokemon/exp/back/666-icy-snow.png and b/public/images/pokemon/exp/back/666-icy-snow.png differ diff --git a/public/images/pokemon/exp/back/666-jungle.json b/public/images/pokemon/exp/back/666-jungle.json index b2ffdb768e6..51876d649da 100644 --- a/public/images/pokemon/exp/back/666-jungle.json +++ b/public/images/pokemon/exp/back/666-jungle.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-jungle.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4d8913bd65ce0b63c5354717532a7d60:39392afb8d9fb30f37b8d68b6cd368ad:c8686bcc5493911384853d54c85bfea1$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-jungle.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-jungle.png b/public/images/pokemon/exp/back/666-jungle.png index 8e72fdd3af6..291c6bce18c 100644 Binary files a/public/images/pokemon/exp/back/666-jungle.png and b/public/images/pokemon/exp/back/666-jungle.png differ diff --git a/public/images/pokemon/exp/back/666-marine.json b/public/images/pokemon/exp/back/666-marine.json index 6f4be700dfc..18edbc78ec0 100644 --- a/public/images/pokemon/exp/back/666-marine.json +++ b/public/images/pokemon/exp/back/666-marine.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-marine.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b061fec5d665439da49159647e0a7d71:7cac8aa51d4531fbcf0f9ea9bf644452:dc240f0acbf3d56fe8729dd1f703009f$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-marine.png", + "format": "RGBA8888", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-marine.png b/public/images/pokemon/exp/back/666-marine.png index 91c5b1be983..9e644f0cdaa 100644 Binary files a/public/images/pokemon/exp/back/666-marine.png and b/public/images/pokemon/exp/back/666-marine.png differ diff --git a/public/images/pokemon/exp/back/666-meadow.json b/public/images/pokemon/exp/back/666-meadow.json index 737ccd7c848..0f24040bd0d 100644 --- a/public/images/pokemon/exp/back/666-meadow.json +++ b/public/images/pokemon/exp/back/666-meadow.json @@ -1,524 +1,118 @@ -{ - "textures": [ - { - "image": "666-meadow.png", - "format": "RGBA8888", - "size": { - "w": 234, - "h": 234 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 84, - "h": 86 - }, - "frame": { - "x": 135, - "y": 0, - "w": 84, - "h": 86 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 84, - "h": 86 - }, - "frame": { - "x": 135, - "y": 0, - "w": 84, - "h": 86 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 20, - "y": 0, - "w": 47, - "h": 85 - }, - "frame": { - "x": 187, - "y": 86, - "w": 47, - "h": 85 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 20, - "y": 0, - "w": 47, - "h": 85 - }, - "frame": { - "x": 187, - "y": 86, - "w": 47, - "h": 85 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:49698fe6f96ff24d2fe1c7a365f79f1b:f15ccef05dfd7ebb03ac6c66ae05dcef:f8ac4807b4d6eef2256fa1b93e0f89ba$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-meadow.png b/public/images/pokemon/exp/back/666-meadow.png index d7d63b3098f..fabeb9730db 100644 Binary files a/public/images/pokemon/exp/back/666-meadow.png and b/public/images/pokemon/exp/back/666-meadow.png differ diff --git a/public/images/pokemon/exp/back/666-modern.json b/public/images/pokemon/exp/back/666-modern.json index a57b695d10b..e0a00da6d81 100644 --- a/public/images/pokemon/exp/back/666-modern.json +++ b/public/images/pokemon/exp/back/666-modern.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-modern.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:deb5b8b4295c15b4c8718bf2ed9791d1:bbe309a34a59a4e2f74eeba5769476f4:5fc0e8f9a0750c2f3cfb5d6e7eca0d45$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-modern.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-modern.png b/public/images/pokemon/exp/back/666-modern.png index 689876c3d6d..01a3981dd97 100644 Binary files a/public/images/pokemon/exp/back/666-modern.png and b/public/images/pokemon/exp/back/666-modern.png differ diff --git a/public/images/pokemon/exp/back/666-monsoon.json b/public/images/pokemon/exp/back/666-monsoon.json index 3afda85f798..117fad03b83 100644 --- a/public/images/pokemon/exp/back/666-monsoon.json +++ b/public/images/pokemon/exp/back/666-monsoon.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-monsoon.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 42, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:71a24b11bc54be921b67b4376d798e05:f5358aac113e1f7af7eddf984d9692b3:637bea52b465abfb8e5a576310b4dacc$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-monsoon.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-monsoon.png b/public/images/pokemon/exp/back/666-monsoon.png index e3cb4d2dca7..32cf2331411 100644 Binary files a/public/images/pokemon/exp/back/666-monsoon.png and b/public/images/pokemon/exp/back/666-monsoon.png differ diff --git a/public/images/pokemon/exp/back/666-ocean.json b/public/images/pokemon/exp/back/666-ocean.json index f0785703906..8d23d70cd31 100644 --- a/public/images/pokemon/exp/back/666-ocean.json +++ b/public/images/pokemon/exp/back/666-ocean.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-ocean.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a1a0079c64e9d91336d227b1380cd9d2:cf159e4653ad9208c0f4633a498a6cd1:e7a0e68eab89c2013a3eb7f3b6fc0b33$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-ocean.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-ocean.png b/public/images/pokemon/exp/back/666-ocean.png index f60844a9b87..65665ea56c3 100644 Binary files a/public/images/pokemon/exp/back/666-ocean.png and b/public/images/pokemon/exp/back/666-ocean.png differ diff --git a/public/images/pokemon/exp/back/666-poke-ball.json b/public/images/pokemon/exp/back/666-poke-ball.json index ed04a06e7ab..45564e59a32 100644 --- a/public/images/pokemon/exp/back/666-poke-ball.json +++ b/public/images/pokemon/exp/back/666-poke-ball.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-poke-ball.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e744396a3b647429d050d678017c05ce:ec812f719dffcd362f0481d7d83c3476:8ec14f129d1691b8da504a13b661abed$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-poke-ball.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-poke-ball.png b/public/images/pokemon/exp/back/666-poke-ball.png index eb3053e9434..895a2bf680f 100644 Binary files a/public/images/pokemon/exp/back/666-poke-ball.png and b/public/images/pokemon/exp/back/666-poke-ball.png differ diff --git a/public/images/pokemon/exp/back/666-polar.json b/public/images/pokemon/exp/back/666-polar.json index 4618d891d3f..abb6d0286f4 100644 --- a/public/images/pokemon/exp/back/666-polar.json +++ b/public/images/pokemon/exp/back/666-polar.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-polar.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 45, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 45, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 45, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 45, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a3b0453f2d03b9c62472f57a438298a4:81a5a3455ae0c378bdb1dbe3c3323463:eb7086e98f867c6592e4b161835da18b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-polar.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-polar.png b/public/images/pokemon/exp/back/666-polar.png index 5d09b57833c..c7ec3ec550a 100644 Binary files a/public/images/pokemon/exp/back/666-polar.png and b/public/images/pokemon/exp/back/666-polar.png differ diff --git a/public/images/pokemon/exp/back/666-river.json b/public/images/pokemon/exp/back/666-river.json index c4e5274ab6d..28912532d76 100644 --- a/public/images/pokemon/exp/back/666-river.json +++ b/public/images/pokemon/exp/back/666-river.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-river.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2bb6d375761e6690eba12cf4d2bc99c9:9db30ec1cf68fe8c1026c243086573f3:fa23dc87fc53ba2cfa532cf440553cf5$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-river.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-river.png b/public/images/pokemon/exp/back/666-river.png index 2910340b676..4e0493b8de5 100644 Binary files a/public/images/pokemon/exp/back/666-river.png and b/public/images/pokemon/exp/back/666-river.png differ diff --git a/public/images/pokemon/exp/back/666-sandstorm.json b/public/images/pokemon/exp/back/666-sandstorm.json index cc96c2a2805..99df25242ff 100644 --- a/public/images/pokemon/exp/back/666-sandstorm.json +++ b/public/images/pokemon/exp/back/666-sandstorm.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-sandstorm.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 68, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 17, - "y": 2, - "w": 40, - "h": 68 - }, - "frame": { - "x": 67, - "y": 0, - "w": 40, - "h": 68 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 17, - "y": 2, - "w": 40, - "h": 68 - }, - "frame": { - "x": 67, - "y": 68, - "w": 40, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e35abed8cd9d0bbf1556fa684995d930:8d765a06a769bbf3d1639f361548cd6f:12f47e779927411662912d6094a9782d$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-sandstorm.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-sandstorm.png b/public/images/pokemon/exp/back/666-sandstorm.png index 96d7084eb30..d95ab4413a5 100644 Binary files a/public/images/pokemon/exp/back/666-sandstorm.png and b/public/images/pokemon/exp/back/666-sandstorm.png differ diff --git a/public/images/pokemon/exp/back/666-savanna.json b/public/images/pokemon/exp/back/666-savanna.json index 8f85dfdeb13..8fa326da1b4 100644 --- a/public/images/pokemon/exp/back/666-savanna.json +++ b/public/images/pokemon/exp/back/666-savanna.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-savanna.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1ad0c7c841409c3fd4cb50b399d6e13c:b9406b41d37bc72c57260f9a01a352c8:625a4f0dc001069326a75c6a381f93e6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-savanna.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-savanna.png b/public/images/pokemon/exp/back/666-savanna.png index 7254d0f1f61..4169b1325a6 100644 Binary files a/public/images/pokemon/exp/back/666-savanna.png and b/public/images/pokemon/exp/back/666-savanna.png differ diff --git a/public/images/pokemon/exp/back/666-sun.json b/public/images/pokemon/exp/back/666-sun.json index df795f0ef0c..d41f22f541c 100644 --- a/public/images/pokemon/exp/back/666-sun.json +++ b/public/images/pokemon/exp/back/666-sun.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-sun.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1d3a140bac5951725915aa0b64d1fdc6:e322510cf8386dcc7834a05d57e5368e:8f5fdd0a698701f5391c5a3f67e303d6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-sun.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-sun.png b/public/images/pokemon/exp/back/666-sun.png index 84b9d76ef88..5cc814e82d7 100644 Binary files a/public/images/pokemon/exp/back/666-sun.png and b/public/images/pokemon/exp/back/666-sun.png differ diff --git a/public/images/pokemon/exp/back/666-tundra.json b/public/images/pokemon/exp/back/666-tundra.json index 92e5cf92e07..afa574f9e07 100644 --- a/public/images/pokemon/exp/back/666-tundra.json +++ b/public/images/pokemon/exp/back/666-tundra.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-tundra.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:40f74f8757cb0f5a2ab7b5f68ea979a0:d062f67571674668b47f6fab68361105:9779ed3adebc298af537dd64dc25fe00$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-tundra.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/666-tundra.png b/public/images/pokemon/exp/back/666-tundra.png index 393ea113766..01657b339fd 100644 Binary files a/public/images/pokemon/exp/back/666-tundra.png and b/public/images/pokemon/exp/back/666-tundra.png differ diff --git a/public/images/pokemon/exp/back/667.json b/public/images/pokemon/exp/back/667.json index cfe6b109d70..db9918ea230 100644 --- a/public/images/pokemon/exp/back/667.json +++ b/public/images/pokemon/exp/back/667.json @@ -1,125 +1,659 @@ -{ - "textures": [ - { - "image": "667.png", - "format": "RGBA8888", - "size": { - "w": 115, - "h": 115 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 39, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 39, - "h": 42 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 39, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 42 - }, - "frame": { - "x": 0, - "y": 42, - "w": 39, - "h": 42 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 39, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 39, - "h": 41 - }, - "frame": { - "x": 39, - "y": 0, - "w": 39, - "h": 41 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 39, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 39, - "y": 41, - "w": 38, - "h": 42 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 39, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 77, - "y": 41, - "w": 38, - "h": 42 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0515d906bdf1ec3ad533ac13c4e701ec:195a93073ecc7446c747c2e79ae07d54:02171d511e760c8a3e1b623ad6bf93f5$" - } -} \ No newline at end of file +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0049.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0050.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0051.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0052.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0054.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0055.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0056.png", + "frame": { "x": 85, "y": 0, "w": 41, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 41, "h": 47 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0058.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0060.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0062.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0064.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0066.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0068.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0070.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0071.png", + "frame": { "x": 85, "y": 0, "w": 41, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 41, "h": 47 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0072.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "667.png", + "format": "I8", + "size": { "w": 167, "h": 138 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/667.png b/public/images/pokemon/exp/back/667.png index ef7ea964737..f1209cf8e20 100644 Binary files a/public/images/pokemon/exp/back/667.png and b/public/images/pokemon/exp/back/667.png differ diff --git a/public/images/pokemon/exp/back/668.json b/public/images/pokemon/exp/back/668.json index 1e37573828e..594e69189dc 100644 --- a/public/images/pokemon/exp/back/668.json +++ b/public/images/pokemon/exp/back/668.json @@ -1,146 +1,821 @@ -{ - "textures": [ - { - "image": "668.png", - "format": "RGBA8888", - "size": { - "w": 146, - "h": 146 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 61 - }, - "frame": { - "x": 0, - "y": 0, - "w": 73, - "h": 61 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 61 - }, - "frame": { - "x": 73, - "y": 0, - "w": 73, - "h": 61 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 61 - }, - "frame": { - "x": 73, - "y": 0, - "w": 73, - "h": 61 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 73, - "h": 60 - }, - "frame": { - "x": 0, - "y": 61, - "w": 73, - "h": 60 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 73, - "h": 60 - }, - "frame": { - "x": 0, - "y": 61, - "w": 73, - "h": 60 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 72, - "h": 59 - }, - "frame": { - "x": 73, - "y": 61, - "w": 72, - "h": 59 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:bc67ee0b37e5c8a13762178a52fad862:1ee199920770bc5797feb94424ff9f9a:947bf84d1af493c62e2cef45bb6c19ad$" - } -} \ No newline at end of file +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 152, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 303, "y": 221, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 383, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 233, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 459, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 315, "y": 0, "w": 76, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 387, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 392, "y": 0, "w": 75, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 237, "y": 0, "w": 77, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 79, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 158, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 75, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 458, "y": 220, "w": 75, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 150, "y": 364, "w": 73, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 152, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 303, "y": 221, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 383, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 233, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 459, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 315, "y": 0, "w": 76, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 387, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 392, "y": 0, "w": 75, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 237, "y": 0, "w": 77, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 79, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 158, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 75, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 458, "y": 220, "w": 75, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 150, "y": 364, "w": 73, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 152, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 303, "y": 221, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 383, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 233, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 459, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 315, "y": 0, "w": 76, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 387, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 392, "y": 0, "w": 75, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 237, "y": 0, "w": 77, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 79, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 158, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 75, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 458, "y": 220, "w": 75, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 150, "y": 364, "w": 73, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 152, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 303, "y": 221, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 383, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 233, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 459, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 315, "y": 0, "w": 76, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 387, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 392, "y": 0, "w": 75, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 237, "y": 0, "w": 77, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 79, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 158, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 75, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 458, "y": 220, "w": 75, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 150, "y": 364, "w": 73, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 152, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 458, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 303, "y": 364, "w": 74, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 74, "h": 70 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 227, "y": 294, "w": 75, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 70 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 378, "y": 364, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 75, "h": 69 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 303, "y": 293, "w": 75, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 70 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 379, "y": 293, "w": 75, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 75, "h": 70 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 454, "y": 364, "w": 72, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 72, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 70, "y": 365, "w": 68, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 68, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 291, "y": 435, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 2, "w": 62, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 378, "y": 434, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 224, "y": 365, "w": 66, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 66, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 365, "w": 69, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 69, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 229, "y": 220, "w": 73, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 73, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 468, "y": 0, "w": 75, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 308, "y": 147, "w": 74, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 74, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 148, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 383, "y": 220, "w": 74, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 74, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 231, "y": 147, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 79, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 156, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 310, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 464, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 77, "y": 147, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 154, "y": 147, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 76, "y": 220, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 152, "y": 220, "w": 76, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 76, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 221, "w": 75, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 75, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 0, "y": 293, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 75, "y": 293, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "668.png", + "format": "I8", + "size": { "w": 543, "h": 507 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/668.png b/public/images/pokemon/exp/back/668.png index a8384e5cf3c..e600e3e40e1 100644 Binary files a/public/images/pokemon/exp/back/668.png and b/public/images/pokemon/exp/back/668.png differ diff --git a/public/images/pokemon/exp/back/672.json b/public/images/pokemon/exp/back/672.json index e323b585879..f877b9abc2e 100644 --- a/public/images/pokemon/exp/back/672.json +++ b/public/images/pokemon/exp/back/672.json @@ -1,965 +1,479 @@ -{ - "textures": [ - { - "image": "672.png", - "format": "RGBA8888", - "size": { - "w": 282, - "h": 282 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 42, - "w": 41, - "h": 42 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 42, - "w": 41, - "h": 42 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 84, - "w": 41, - "h": 42 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 126, - "w": 41, - "h": 42 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 168, - "w": 41, - "h": 42 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 210, - "w": 41, - "h": 42 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 41, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 82, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 123, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 164, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 205, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 41, - "y": 42, - "w": 41, - "h": 42 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 41, - "y": 84, - "w": 41, - "h": 42 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 41, - "y": 126, - "w": 41, - "h": 42 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 41, - "y": 168, - "w": 41, - "h": 41 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 41, - "y": 209, - "w": 41, - "h": 41 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 82, - "y": 42, - "w": 41, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 123, - "y": 42, - "w": 41, - "h": 41 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 164, - "y": 42, - "w": 41, - "h": 41 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 205, - "y": 42, - "w": 41, - "h": 41 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 82, - "y": 83, - "w": 41, - "h": 41 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 82, - "y": 124, - "w": 41, - "h": 41 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 40, - "h": 42 - }, - "frame": { - "x": 82, - "y": 165, - "w": 40, - "h": 42 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 40, - "h": 42 - }, - "frame": { - "x": 82, - "y": 207, - "w": 40, - "h": 42 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 122, - "y": 165, - "w": 40, - "h": 41 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 122, - "y": 206, - "w": 40, - "h": 41 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 123, - "y": 83, - "w": 40, - "h": 41 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 123, - "y": 124, - "w": 40, - "h": 41 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 162, - "y": 165, - "w": 40, - "h": 41 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 162, - "y": 206, - "w": 40, - "h": 41 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 163, - "y": 83, - "w": 40, - "h": 41 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 41, - "h": 40 - }, - "frame": { - "x": 163, - "y": 124, - "w": 41, - "h": 40 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 41, - "h": 40 - }, - "frame": { - "x": 203, - "y": 83, - "w": 41, - "h": 40 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 40, - "h": 40 - }, - "frame": { - "x": 202, - "y": 164, - "w": 40, - "h": 40 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 40, - "h": 40 - }, - "frame": { - "x": 204, - "y": 123, - "w": 40, - "h": 40 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 40, - "h": 40 - }, - "frame": { - "x": 242, - "y": 163, - "w": 40, - "h": 40 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 40, - "h": 40 - }, - "frame": { - "x": 242, - "y": 203, - "w": 40, - "h": 40 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 40, - "h": 40 - }, - "frame": { - "x": 202, - "y": 204, - "w": 40, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b36f1de558a8fa8ac8b56a9ba43a0dfd:5fe84a3f522e543bfbbfe0837355266b:2e4767b7cd134fc0ab1bb6e9eee82bc7$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 118, "y": 97, "w": 40, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 41, "y": 98, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 78, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 118, "y": 50, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 56, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 104, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 40, "y": 146, "w": 39, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 78, "y": 48, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 118, "y": 97, "w": 40, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 41, "y": 98, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 78, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 118, "y": 50, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 56, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 104, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 40, "y": 146, "w": 39, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 78, "y": 48, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 118, "y": 97, "w": 40, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 41, "y": 98, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 78, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 118, "y": 50, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 56, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 104, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 40, "y": 146, "w": 39, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 78, "y": 48, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 118, "y": 97, "w": 40, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 41, "y": 98, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 78, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 118, "y": 50, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 56, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 104, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 40, "y": 146, "w": 39, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 78, "y": 48, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 39, "y": 0, "w": 39, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 53 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 39, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 56 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 79, "y": 146, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 119, "y": 146, "w": 38, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 38, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 39, "y": 0, "w": 39, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 53 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 39, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 56 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 79, "y": 146, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 119, "y": 146, "w": 38, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 38, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "672.png", + "format": "I8", + "size": { "w": 160, "h": 195 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/672.png b/public/images/pokemon/exp/back/672.png index 5281168ec2e..ef5cf63938e 100644 Binary files a/public/images/pokemon/exp/back/672.png and b/public/images/pokemon/exp/back/672.png differ diff --git a/public/images/pokemon/exp/back/674.json b/public/images/pokemon/exp/back/674.json deleted file mode 100644 index 9ace3fec70f..00000000000 --- a/public/images/pokemon/exp/back/674.json +++ /dev/null @@ -1,1175 +0,0 @@ -{ - "textures": [ - { - "image": "674.png", - "format": "RGBA8888", - "size": { - "w": 124, - "h": 124 - }, - "scale": 1, - "frames": [ - { - "filename": "0036.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 29, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 29, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 29, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 58, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 58, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 58, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 58, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 29, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 29, - "h": 41 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 29, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 29, - "h": 41 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 29, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 29, - "h": 41 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 29, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 29, - "h": 41 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 29, - "h": 40 - }, - "frame": { - "x": 29, - "y": 42, - "w": 29, - "h": 40 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 29, - "h": 40 - }, - "frame": { - "x": 29, - "y": 42, - "w": 29, - "h": 40 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 29, - "y": 82, - "w": 28, - "h": 42 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 85, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 86, - "y": 42, - "w": 28, - "h": 41 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 86, - "y": 42, - "w": 28, - "h": 41 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 86, - "y": 42, - "w": 28, - "h": 41 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:25c10f058ffdfacdf8263d7198233227:17e793a518166b0f2a1f8af6ec7b8dd7:b823d10f1c9b4d501296982088ba63d6$" - } -} diff --git a/public/images/pokemon/exp/back/674.png b/public/images/pokemon/exp/back/674.png deleted file mode 100644 index 69d9e886150..00000000000 Binary files a/public/images/pokemon/exp/back/674.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/692.json b/public/images/pokemon/exp/back/692.json index 41e845ef9ed..801710c4861 100644 --- a/public/images/pokemon/exp/back/692.json +++ b/public/images/pokemon/exp/back/692.json @@ -1,356 +1,794 @@ -{ - "textures": [ - { - "image": "692.png", - "format": "RGBA8888", - "size": { - "w": 152, - "h": 152 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 51, - "y": 0, - "w": 51, - "h": 39 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 51, - "y": 0, - "w": 51, - "h": 39 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 51, - "y": 0, - "w": 51, - "h": 39 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 51, - "y": 0, - "w": 51, - "h": 39 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 0, - "y": 39, - "w": 51, - "h": 39 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 0, - "y": 39, - "w": 51, - "h": 39 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 0, - "y": 39, - "w": 51, - "h": 39 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 0, - "y": 39, - "w": 51, - "h": 39 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 0, - "y": 78, - "w": 51, - "h": 39 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 0, - "y": 78, - "w": 51, - "h": 39 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 51, - "y": 39, - "w": 51, - "h": 39 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 39 - }, - "frame": { - "x": 51, - "y": 39, - "w": 51, - "h": 39 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 51, - "h": 37 - }, - "frame": { - "x": 51, - "y": 78, - "w": 51, - "h": 37 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 51, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 51, - "h": 37 - }, - "frame": { - "x": 51, - "y": 115, - "w": 51, - "h": 37 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4116bfb3ff62a8dd3ed77070dfb17bc8:e9bdb93a4ed57d3e08db360998da889f:2880def858c84cd859bedf13b0b49a33$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 59, "y": 37, "w": 57, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 59, "y": 37, "w": 57, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 60, "y": 72, "w": 58, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 31 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 119, "y": 72, "w": 56, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 31 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 60, "y": 72, "w": 58, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 31 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 59, "y": 37, "w": 57, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 59, "y": 37, "w": 57, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "692.png", + "format": "I8", + "size": { "w": 181, "h": 106 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/692.png b/public/images/pokemon/exp/back/692.png index 0b3462fe06d..e3eb957a624 100644 Binary files a/public/images/pokemon/exp/back/692.png and b/public/images/pokemon/exp/back/692.png differ diff --git a/public/images/pokemon/exp/back/693.json b/public/images/pokemon/exp/back/693.json index fb29d014658..6358a8908f6 100644 --- a/public/images/pokemon/exp/back/693.json +++ b/public/images/pokemon/exp/back/693.json @@ -1,230 +1,902 @@ -{ - "textures": [ - { - "image": "693.png", - "format": "RGBA8888", - "size": { - "w": 223, - "h": 223 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 90, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 72 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 90, - "h": 72 - }, - "frame": { - "x": 90, - "y": 0, - "w": 90, - "h": 72 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 90, - "h": 72 - }, - "frame": { - "x": 90, - "y": 0, - "w": 90, - "h": 72 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 90, - "h": 73 - }, - "frame": { - "x": 0, - "y": 72, - "w": 90, - "h": 73 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 90, - "h": 73 - }, - "frame": { - "x": 0, - "y": 72, - "w": 90, - "h": 73 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 75 - }, - "frame": { - "x": 90, - "y": 72, - "w": 90, - "h": 75 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 75 - }, - "frame": { - "x": 90, - "y": 72, - "w": 90, - "h": 75 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 76 - }, - "frame": { - "x": 0, - "y": 145, - "w": 90, - "h": 76 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 76 - }, - "frame": { - "x": 0, - "y": 145, - "w": 90, - "h": 76 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 76 - }, - "frame": { - "x": 90, - "y": 147, - "w": 90, - "h": 76 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f3b26f7df2eeda76e504b3f1294ac699:a2e5c9fc75e286a40f09ab013ac5cb32:9c1f9147e693c05eb4655590e9099679$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 472, "y": 70, "w": 88, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 378, "y": 138, "w": 91, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 187, "y": 260, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 379, "y": 257, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 572, "y": 1, "w": 98, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 478, "y": 1, "w": 94, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 560, "y": 132, "w": 93, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 474, "y": 257, "w": 90, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 95, "y": 197, "w": 94, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 99, "y": 1, "w": 94, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 291, "y": 1, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 288, "y": 74, "w": 90, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 368, "y": 317, "w": 88, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 96, "y": 259, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 472, "y": 70, "w": 88, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 378, "y": 138, "w": 91, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 187, "y": 260, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 379, "y": 257, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 572, "y": 1, "w": 98, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 478, "y": 1, "w": 94, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 560, "y": 132, "w": 93, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 474, "y": 257, "w": 90, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 95, "y": 197, "w": 94, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 99, "y": 1, "w": 94, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 291, "y": 1, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 288, "y": 74, "w": 90, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 368, "y": 317, "w": 88, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 96, "y": 259, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 472, "y": 70, "w": 88, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 378, "y": 138, "w": 91, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 187, "y": 260, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 379, "y": 257, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 572, "y": 1, "w": 98, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 478, "y": 1, "w": 94, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 560, "y": 132, "w": 93, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 474, "y": 257, "w": 90, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 95, "y": 197, "w": 94, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 99, "y": 1, "w": 94, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 291, "y": 1, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 288, "y": 74, "w": 90, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 368, "y": 317, "w": 88, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 96, "y": 259, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 472, "y": 70, "w": 88, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 378, "y": 138, "w": 91, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 187, "y": 260, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 379, "y": 257, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 572, "y": 1, "w": 98, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 478, "y": 1, "w": 94, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 560, "y": 132, "w": 93, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 474, "y": 257, "w": 90, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 95, "y": 197, "w": 94, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 99, "y": 1, "w": 94, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 291, "y": 1, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 288, "y": 74, "w": 90, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 368, "y": 317, "w": 88, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 96, "y": 259, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 472, "y": 70, "w": 88, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 378, "y": 138, "w": 91, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 187, "y": 260, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 379, "y": 257, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 572, "y": 1, "w": 98, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 478, "y": 1, "w": 94, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 560, "y": 132, "w": 93, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 474, "y": 257, "w": 90, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 95, "y": 197, "w": 94, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 99, "y": 1, "w": 94, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 291, "y": 1, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 288, "y": 74, "w": 90, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 368, "y": 317, "w": 88, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 96, "y": 259, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 565, "y": 196, "w": 90, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 6, "w": 90, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 278, "y": 266, "w": 90, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 10, "w": 90, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 189, "y": 199, "w": 95, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 95, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 193, "y": 1, "w": 98, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 98, "h": 68 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 1, "y": 71, "w": 94, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 469, "y": 196, "w": 96, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 96, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 1, "y": 1, "w": 98, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 5, "w": 98, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 1, "y": 136, "w": 94, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 10, "w": 94, "h": 63 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 95, "y": 72, "w": 96, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 12, "w": 96, "h": 63 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 381, "y": 1, "w": 97, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 6, "w": 97, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 1, "y": 71, "w": 94, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 469, "y": 196, "w": 96, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 96, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 1, "y": 1, "w": 98, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 5, "w": 98, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 191, "y": 136, "w": 94, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 10, "w": 94, "h": 63 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 95, "y": 135, "w": 96, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 11, "w": 96, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 572, "y": 67, "w": 99, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 99, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 284, "y": 205, "w": 95, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 11, "w": 95, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 1, "y": 199, "w": 91, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 12, "w": 91, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 1, "y": 259, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 12, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 193, "y": 69, "w": 95, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 5, "w": 95, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 285, "y": 141, "w": 92, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 8, "w": 92, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 96, "y": 318, "w": 89, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 14, "w": 89, "h": 58 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 564, "y": 261, "w": 92, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 14, "w": 92, "h": 58 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "693.png", + "format": "I8", + "size": { "w": 672, "h": 377 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/693.png b/public/images/pokemon/exp/back/693.png index a4b89137043..4772c64f8d0 100644 Binary files a/public/images/pokemon/exp/back/693.png and b/public/images/pokemon/exp/back/693.png differ diff --git a/public/images/pokemon/exp/back/694.json b/public/images/pokemon/exp/back/694.json deleted file mode 100644 index d77a3db07e3..00000000000 --- a/public/images/pokemon/exp/back/694.json +++ /dev/null @@ -1,272 +0,0 @@ -{ - "textures": [ - { - "image": "694.png", - "format": "RGBA8888", - "size": { - "w": 130, - "h": 130 - }, - "scale": 1, - "frames": [ - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 35 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 47, - "h": 35 - }, - "frame": { - "x": 48, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 36 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 36 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 47, - "h": 37 - }, - "frame": { - "x": 47, - "y": 35, - "w": 47, - "h": 37 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 47, - "h": 37 - }, - "frame": { - "x": 47, - "y": 35, - "w": 47, - "h": 37 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 46, - "h": 38 - }, - "frame": { - "x": 0, - "y": 71, - "w": 46, - "h": 38 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 46, - "h": 38 - }, - "frame": { - "x": 0, - "y": 71, - "w": 46, - "h": 38 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 39 - }, - "frame": { - "x": 46, - "y": 72, - "w": 44, - "h": 39 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 39 - }, - "frame": { - "x": 46, - "y": 72, - "w": 44, - "h": 39 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 40, - "h": 39 - }, - "frame": { - "x": 90, - "y": 72, - "w": 40, - "h": 39 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8940ca5f146f0b24d2aa10692e8e18b0:e6a9f01d7ca698d2b3d7fdf6d9244c8c:b0990f9650cfe63b836cbed33f0b44d8$" - } -} diff --git a/public/images/pokemon/exp/back/694.png b/public/images/pokemon/exp/back/694.png deleted file mode 100644 index d3675e0a9d7..00000000000 Binary files a/public/images/pokemon/exp/back/694.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/697.json b/public/images/pokemon/exp/back/697.json index 9707f931b14..6963da289ab 100644 --- a/public/images/pokemon/exp/back/697.json +++ b/public/images/pokemon/exp/back/697.json @@ -1,1196 +1,992 @@ -{ - "textures": [ - { - "image": "697.png", - "format": "RGBA8888", - "size": { - "w": 374, - "h": 374 - }, - "scale": 1, - "frames": [ - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 63, - "h": 78 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 78 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 63, - "h": 78 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 78 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 60, - "h": 78 - }, - "frame": { - "x": 0, - "y": 78, - "w": 60, - "h": 78 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 66, - "h": 77 - }, - "frame": { - "x": 0, - "y": 156, - "w": 66, - "h": 77 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 66, - "h": 77 - }, - "frame": { - "x": 0, - "y": 156, - "w": 66, - "h": 77 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 60, - "y": 78, - "w": 77, - "h": 76 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 60, - "y": 78, - "w": 77, - "h": 76 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 60, - "y": 78, - "w": 77, - "h": 76 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 60, - "y": 78, - "w": 77, - "h": 76 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 63, - "y": 0, - "w": 77, - "h": 76 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 63, - "y": 0, - "w": 77, - "h": 76 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 63, - "y": 0, - "w": 77, - "h": 76 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 63, - "y": 0, - "w": 77, - "h": 76 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 0, - "y": 233, - "w": 77, - "h": 76 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 0, - "y": 233, - "w": 77, - "h": 76 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 0, - "y": 233, - "w": 77, - "h": 76 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 0, - "y": 233, - "w": 77, - "h": 76 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 66, - "y": 154, - "w": 77, - "h": 76 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 66, - "y": 154, - "w": 77, - "h": 76 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 66, - "y": 154, - "w": 77, - "h": 76 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 66, - "y": 154, - "w": 77, - "h": 76 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 76, - "h": 76 - }, - "frame": { - "x": 137, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 76, - "h": 76 - }, - "frame": { - "x": 137, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 76, - "h": 76 - }, - "frame": { - "x": 137, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 76, - "h": 76 - }, - "frame": { - "x": 137, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 69, - "h": 76 - }, - "frame": { - "x": 140, - "y": 0, - "w": 69, - "h": 76 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 69, - "h": 76 - }, - "frame": { - "x": 140, - "y": 0, - "w": 69, - "h": 76 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 75 - }, - "frame": { - "x": 209, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 75 - }, - "frame": { - "x": 209, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 75 - }, - "frame": { - "x": 209, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 77, - "h": 73 - }, - "frame": { - "x": 285, - "y": 0, - "w": 77, - "h": 73 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 75 - }, - "frame": { - "x": 285, - "y": 73, - "w": 76, - "h": 75 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 72, - "h": 75 - }, - "frame": { - "x": 213, - "y": 75, - "w": 72, - "h": 75 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 72, - "h": 75 - }, - "frame": { - "x": 213, - "y": 75, - "w": 72, - "h": 75 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 74 - }, - "frame": { - "x": 285, - "y": 148, - "w": 76, - "h": 74 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 74 - }, - "frame": { - "x": 285, - "y": 148, - "w": 76, - "h": 74 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 75, - "h": 75 - }, - "frame": { - "x": 143, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 75, - "h": 75 - }, - "frame": { - "x": 143, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 75, - "h": 75 - }, - "frame": { - "x": 143, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 75, - "h": 75 - }, - "frame": { - "x": 143, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 77, - "y": 230, - "w": 74, - "h": 74 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 77, - "y": 230, - "w": 74, - "h": 74 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 77, - "y": 230, - "w": 74, - "h": 74 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 77, - "y": 230, - "w": 74, - "h": 74 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 77, - "y": 230, - "w": 74, - "h": 74 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 151, - "y": 227, - "w": 74, - "h": 74 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 151, - "y": 227, - "w": 74, - "h": 74 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 151, - "y": 227, - "w": 74, - "h": 74 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 75, - "h": 73 - }, - "frame": { - "x": 151, - "y": 301, - "w": 75, - "h": 73 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 75, - "h": 73 - }, - "frame": { - "x": 151, - "y": 301, - "w": 75, - "h": 73 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 225, - "y": 222, - "w": 74, - "h": 74 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 299, - "y": 222, - "w": 74, - "h": 74 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 73, - "h": 74 - }, - "frame": { - "x": 226, - "y": 296, - "w": 73, - "h": 74 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 73, - "h": 74 - }, - "frame": { - "x": 226, - "y": 296, - "w": 73, - "h": 74 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 73, - "h": 74 - }, - "frame": { - "x": 226, - "y": 296, - "w": 73, - "h": 74 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 73, - "h": 74 - }, - "frame": { - "x": 299, - "y": 296, - "w": 73, - "h": 74 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:5c15a6488ad8d9c5cd58a9490e3f8fe1:9f98e28712fdc6eb5949c7f74cafffeb:f4fdd87d2fc1483d8e0a185c2654e3d9$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 286, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 185, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 93, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 301, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 182, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 273, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 182, "y": 378, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 273, "y": 449, "w": 89, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 177, "y": 452, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 452, "y": 450, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 461, "y": 376, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 649, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 558, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 649, "y": 300, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 373, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 286, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 185, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 93, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 301, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 182, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 273, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 182, "y": 378, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 273, "y": 449, "w": 89, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 177, "y": 452, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 452, "y": 450, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 461, "y": 376, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 649, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 558, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 649, "y": 300, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 373, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 286, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 185, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 93, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 301, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 182, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 273, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 182, "y": 378, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 273, "y": 449, "w": 89, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 177, "y": 452, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 452, "y": 450, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 461, "y": 376, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 649, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 558, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 649, "y": 300, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 373, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 286, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 185, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 93, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 301, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 182, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 273, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 182, "y": 378, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 273, "y": 449, "w": 89, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 177, "y": 452, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 452, "y": 450, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 461, "y": 376, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 649, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 558, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 649, "y": 300, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 373, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 370, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 558, "y": 227, "w": 90, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 90, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 376, "w": 88, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 88, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 89, "y": 379, "w": 87, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 87, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 365, "y": 378, "w": 86, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 86, "h": 76 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 640, "y": 449, "w": 84, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 84, "h": 77 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 552, "y": 378, "w": 87, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 87, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 92, "y": 303, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 465, "y": 302, "w": 92, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 465, "y": 227, "w": 92, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 465, "y": 227, "w": 92, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 186, "y": 151, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 225, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 670, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 93, "y": 151, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 472, "y": 151, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 565, "y": 151, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 670, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 277, "y": 301, "w": 92, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 465, "y": 227, "w": 92, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 465, "y": 227, "w": 92, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 388, "y": 75, "w": 93, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 97, "y": 75, "w": 93, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 292, "y": 0, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 196, "y": 0, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 582, "y": 0, "w": 96, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 96, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 98, "y": 0, "w": 97, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 97, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 0, "y": 0, "w": 97, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 97, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 485, "y": 0, "w": 96, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 96, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 388, "y": 0, "w": 96, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 96, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 75, "w": 96, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 96, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 286, "y": 76, "w": 95, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 95, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 670, "y": 76, "w": 95, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 95, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 658, "y": 226, "w": 94, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 94, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 191, "y": 76, "w": 94, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 94, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 279, "y": 226, "w": 93, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 93, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 679, "y": 0, "w": 94, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 94, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 482, "y": 75, "w": 93, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 93, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 576, "y": 75, "w": 93, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 379, "y": 151, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 465, "y": 227, "w": 92, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "697.png", + "format": "I8", + "size": { "w": 773, "h": 526 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/697.png b/public/images/pokemon/exp/back/697.png index 44a73042829..f0ae22f2bb0 100644 Binary files a/public/images/pokemon/exp/back/697.png and b/public/images/pokemon/exp/back/697.png differ diff --git a/public/images/pokemon/exp/back/698.json b/public/images/pokemon/exp/back/698.json deleted file mode 100644 index 01e3235cc36..00000000000 --- a/public/images/pokemon/exp/back/698.json +++ /dev/null @@ -1,3296 +0,0 @@ -{ - "textures": [ - { - "image": "698.png", - "format": "RGBA8888", - "size": { - "w": 181, - "h": 181 - }, - "scale": 1, - "frames": [ - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0155.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0156.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 57 - }, - "frame": { - "x": 76, - "y": 56, - "w": 37, - "h": 57 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 57 - }, - "frame": { - "x": 76, - "y": 56, - "w": 37, - "h": 57 - } - }, - { - "filename": "0153.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 57 - }, - "frame": { - "x": 76, - "y": 56, - "w": 37, - "h": 57 - } - }, - { - "filename": "0154.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 57 - }, - "frame": { - "x": 76, - "y": 56, - "w": 37, - "h": 57 - } - }, - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 113, - "y": 56, - "w": 35, - "h": 58 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 113, - "y": 56, - "w": 35, - "h": 58 - } - }, - { - "filename": "0151.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 113, - "y": 56, - "w": 35, - "h": 58 - } - }, - { - "filename": "0152.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 113, - "y": 56, - "w": 35, - "h": 58 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0133.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0134.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0139.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0140.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0145.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0146.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0135.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0136.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0141.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0142.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0147.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0148.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0131.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0132.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0137.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0138.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0143.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0144.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0149.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0150.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:47af8de4c4888204d35a4e17ac074ed2:4f5193840bb62c79e8f9d414f094a882:198087d69fed44d4a642fa3ba5c077d6$" - } -} diff --git a/public/images/pokemon/exp/back/698.png b/public/images/pokemon/exp/back/698.png deleted file mode 100644 index 43738b78928..00000000000 Binary files a/public/images/pokemon/exp/back/698.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/700.json b/public/images/pokemon/exp/back/700.json index 8919ba29366..70083de61c9 100644 --- a/public/images/pokemon/exp/back/700.json +++ b/public/images/pokemon/exp/back/700.json @@ -1,209 +1,587 @@ -{ - "textures": [ - { - "image": "700.png", - "format": "RGBA8888", - "size": { - "w": 173, - "h": 173 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 58 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 44, - "h": 58 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 44, - "h": 57 - }, - "frame": { - "x": 0, - "y": 116, - "w": 44, - "h": 57 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 58 - }, - "frame": { - "x": 44, - "y": 0, - "w": 44, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 58 - }, - "frame": { - "x": 88, - "y": 0, - "w": 44, - "h": 58 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 58 - }, - "frame": { - "x": 88, - "y": 0, - "w": 44, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 58 - }, - "frame": { - "x": 44, - "y": 58, - "w": 44, - "h": 58 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 44, - "h": 56 - }, - "frame": { - "x": 44, - "y": 116, - "w": 44, - "h": 56 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 58 - }, - "frame": { - "x": 88, - "y": 58, - "w": 44, - "h": 58 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e0cdfdc055c08cdcb7b31d0da301c709:2affc6f4613ab8f1ba13cd35d9106bb3:2e4bf5ef1f19e475073f7da10c60b540$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 142, "y": 124, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 101, "y": 0, "w": 48, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 48, "h": 63 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 195, "y": 0, "w": 49, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 49, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 60, "w": 49, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 49, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 0, "w": 53, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 148, "y": 64, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 120, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 195, "y": 60, "w": 47, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 47, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 194, "y": 120, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 96, "y": 122, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 195, "y": 60, "w": 47, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 47, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 194, "y": 120, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 96, "y": 122, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 149, "y": 0, "w": 46, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 46, "h": 64 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 53, "y": 0, "w": 48, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 48, "h": 64 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 142, "y": 124, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "700.png", + "format": "I8", + "size": { "w": 244, "h": 241 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/700.png b/public/images/pokemon/exp/back/700.png index 6684e845a39..a3675cc15d8 100644 Binary files a/public/images/pokemon/exp/back/700.png and b/public/images/pokemon/exp/back/700.png differ diff --git a/public/images/pokemon/exp/back/702.json b/public/images/pokemon/exp/back/702.json index 7fa99d3eb04..9680e17e397 100644 --- a/public/images/pokemon/exp/back/702.json +++ b/public/images/pokemon/exp/back/702.json @@ -1,1028 +1,443 @@ -{ - "textures": [ - { - "image": "702.png", - "format": "RGBA8888", - "size": { - "w": 141, - "h": 141 - }, - "scale": 1, - "frames": [ - { - "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": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 47, - "h": 35 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 47, - "h": 35 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 47, - "h": 35 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 47, - "h": 35 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 47, - "h": 35 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 105, - "w": 47, - "h": 35 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 47, - "y": 70, - "w": 47, - "h": 34 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 47, - "y": 70, - "w": 47, - "h": 34 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 47, - "y": 70, - "w": 47, - "h": 34 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 47, - "y": 70, - "w": 47, - "h": 34 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 47, - "y": 70, - "w": 47, - "h": 34 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 94, - "y": 0, - "w": 47, - "h": 34 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 101, - "w": 47, - "h": 32 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 101, - "w": 47, - "h": 32 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 101, - "w": 47, - "h": 32 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 101, - "w": 47, - "h": 32 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 101, - "w": 47, - "h": 32 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 47, - "y": 104, - "w": 47, - "h": 32 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4052cb31e311daed50c3ad98d6d07226:990695ce3fc0717eec42d716a52de75e:ba8fdab405d5efab99c4aa1084328e6b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 48, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 93, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 139, "y": 70, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 95, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 48, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 93, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 139, "y": 70, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 95, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 48, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 93, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 139, "y": 70, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 95, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 48, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 93, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 139, "y": 70, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 95, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 48, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 93, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 139, "y": 70, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 95, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 142, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 140, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 0, "y": 72, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 36, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "702.png", + "format": "I8", + "size": { "w": 188, "h": 103 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/702.png b/public/images/pokemon/exp/back/702.png index e90d2e5200b..2305dd44628 100644 Binary files a/public/images/pokemon/exp/back/702.png and b/public/images/pokemon/exp/back/702.png differ diff --git a/public/images/pokemon/exp/back/703.json b/public/images/pokemon/exp/back/703.json deleted file mode 100644 index dc39d04326d..00000000000 --- a/public/images/pokemon/exp/back/703.json +++ /dev/null @@ -1,314 +0,0 @@ -{ - "textures": [ - { - "image": "703.png", - "format": "RGBA8888", - "size": { - "w": 110, - "h": 110 - }, - "scale": 1, - "frames": [ - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 36, - "h": 39 - }, - "frame": { - "x": 0, - "y": 0, - "w": 36, - "h": 39 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 39 - }, - "frame": { - "x": 36, - "y": 0, - "w": 37, - "h": 39 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 37, - "h": 40 - }, - "frame": { - "x": 73, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 37, - "h": 40 - }, - "frame": { - "x": 73, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 37, - "h": 40 - }, - "frame": { - "x": 73, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 37, - "h": 40 - }, - "frame": { - "x": 73, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 37, - "h": 40 - }, - "frame": { - "x": 73, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 37, - "h": 40 - }, - "frame": { - "x": 73, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 40 - }, - "frame": { - "x": 73, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 9, - "w": 37, - "h": 40 - }, - "frame": { - "x": 0, - "y": 39, - "w": 37, - "h": 40 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 36, - "h": 40 - }, - "frame": { - "x": 37, - "y": 39, - "w": 36, - "h": 40 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 36, - "h": 40 - }, - "frame": { - "x": 37, - "y": 39, - "w": 36, - "h": 40 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 40 - }, - "frame": { - "x": 37, - "y": 39, - "w": 36, - "h": 40 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 40 - }, - "frame": { - "x": 73, - "y": 40, - "w": 37, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9e937b9120a4e2d30cb17c3057bdb25e:2992340ca21fbb2052a947040742ff82:721af8c322ff60159262e9b3017c784d$" - } -} diff --git a/public/images/pokemon/exp/back/703.png b/public/images/pokemon/exp/back/703.png deleted file mode 100644 index 2af4ac363ea..00000000000 Binary files a/public/images/pokemon/exp/back/703.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/704.json b/public/images/pokemon/exp/back/704.json index cfee176924b..ff94c52a2a8 100644 --- a/public/images/pokemon/exp/back/704.json +++ b/public/images/pokemon/exp/back/704.json @@ -1,1742 +1,101 @@ -{ - "textures": [ - { - "image": "704.png", - "format": "RGBA8888", - "size": { - "w": 233, - "h": 233 - }, - "scale": 1, - "frames": [ - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 66, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 66, - "h": 72 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 24, - "w": 41, - "h": 48 - }, - "frame": { - "x": 0, - "y": 72, - "w": 41, - "h": 48 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 25, - "w": 41, - "h": 47 - }, - "frame": { - "x": 66, - "y": 0, - "w": 41, - "h": 47 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 25, - "w": 41, - "h": 47 - }, - "frame": { - "x": 66, - "y": 0, - "w": 41, - "h": 47 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 27, - "y": 25, - "w": 40, - "h": 47 - }, - "frame": { - "x": 0, - "y": 120, - "w": 40, - "h": 47 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 27, - "y": 25, - "w": 40, - "h": 47 - }, - "frame": { - "x": 0, - "y": 120, - "w": 40, - "h": 47 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 26, - "w": 39, - "h": 46 - }, - "frame": { - "x": 107, - "y": 0, - "w": 39, - "h": 46 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 26, - "w": 39, - "h": 46 - }, - "frame": { - "x": 0, - "y": 167, - "w": 39, - "h": 46 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 29, - "w": 41, - "h": 43 - }, - "frame": { - "x": 146, - "y": 0, - "w": 41, - "h": 43 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 29, - "w": 41, - "h": 43 - }, - "frame": { - "x": 146, - "y": 0, - "w": 41, - "h": 43 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 29, - "w": 41, - "h": 43 - }, - "frame": { - "x": 146, - "y": 0, - "w": 41, - "h": 43 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 29, - "w": 41, - "h": 43 - }, - "frame": { - "x": 146, - "y": 0, - "w": 41, - "h": 43 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 29, - "w": 41, - "h": 43 - }, - "frame": { - "x": 146, - "y": 0, - "w": 41, - "h": 43 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 29, - "w": 41, - "h": 43 - }, - "frame": { - "x": 146, - "y": 0, - "w": 41, - "h": 43 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 29, - "w": 41, - "h": 43 - }, - "frame": { - "x": 146, - "y": 0, - "w": 41, - "h": 43 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 29, - "w": 41, - "h": 43 - }, - "frame": { - "x": 146, - "y": 0, - "w": 41, - "h": 43 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 30, - "w": 41, - "h": 42 - }, - "frame": { - "x": 187, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 30, - "w": 41, - "h": 42 - }, - "frame": { - "x": 187, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 30, - "w": 41, - "h": 42 - }, - "frame": { - "x": 187, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 30, - "w": 41, - "h": 42 - }, - "frame": { - "x": 187, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 41, - "y": 72, - "w": 37, - "h": 46 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 41, - "y": 72, - "w": 37, - "h": 46 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 41, - "y": 72, - "w": 37, - "h": 46 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 41, - "y": 72, - "w": 37, - "h": 46 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 41, - "y": 72, - "w": 37, - "h": 46 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 78, - "y": 47, - "w": 37, - "h": 46 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 78, - "y": 47, - "w": 37, - "h": 46 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 78, - "y": 47, - "w": 37, - "h": 46 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 78, - "y": 47, - "w": 37, - "h": 46 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 78, - "y": 47, - "w": 37, - "h": 46 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 115, - "y": 46, - "w": 37, - "h": 46 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 115, - "y": 46, - "w": 37, - "h": 46 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 115, - "y": 46, - "w": 37, - "h": 46 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 152, - "y": 43, - "w": 37, - "h": 46 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 152, - "y": 43, - "w": 37, - "h": 46 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 152, - "y": 43, - "w": 37, - "h": 46 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 29, - "y": 26, - "w": 37, - "h": 46 - }, - "frame": { - "x": 152, - "y": 43, - "w": 37, - "h": 46 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 26, - "w": 38, - "h": 46 - }, - "frame": { - "x": 189, - "y": 42, - "w": 38, - "h": 46 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 26, - "w": 38, - "h": 46 - }, - "frame": { - "x": 189, - "y": 42, - "w": 38, - "h": 46 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 27, - "w": 38, - "h": 45 - }, - "frame": { - "x": 78, - "y": 93, - "w": 38, - "h": 45 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 27, - "w": 38, - "h": 45 - }, - "frame": { - "x": 78, - "y": 93, - "w": 38, - "h": 45 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 27, - "w": 38, - "h": 45 - }, - "frame": { - "x": 78, - "y": 93, - "w": 38, - "h": 45 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 27, - "w": 38, - "h": 45 - }, - "frame": { - "x": 78, - "y": 93, - "w": 38, - "h": 45 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 27, - "w": 38, - "h": 45 - }, - "frame": { - "x": 78, - "y": 93, - "w": 38, - "h": 45 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 27, - "w": 38, - "h": 45 - }, - "frame": { - "x": 78, - "y": 93, - "w": 38, - "h": 45 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 27, - "w": 38, - "h": 45 - }, - "frame": { - "x": 78, - "y": 93, - "w": 38, - "h": 45 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 27, - "w": 38, - "h": 45 - }, - "frame": { - "x": 78, - "y": 93, - "w": 38, - "h": 45 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 27, - "w": 38, - "h": 45 - }, - "frame": { - "x": 116, - "y": 92, - "w": 38, - "h": 45 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 27, - "w": 38, - "h": 45 - }, - "frame": { - "x": 154, - "y": 89, - "w": 38, - "h": 45 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 30, - "w": 41, - "h": 42 - }, - "frame": { - "x": 192, - "y": 88, - "w": 41, - "h": 42 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 30, - "w": 41, - "h": 42 - }, - "frame": { - "x": 192, - "y": 88, - "w": 41, - "h": 42 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 30, - "w": 41, - "h": 42 - }, - "frame": { - "x": 192, - "y": 88, - "w": 41, - "h": 42 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 26, - "y": 30, - "w": 41, - "h": 42 - }, - "frame": { - "x": 192, - "y": 130, - "w": 41, - "h": 42 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 28, - "w": 38, - "h": 44 - }, - "frame": { - "x": 154, - "y": 134, - "w": 38, - "h": 44 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 28, - "w": 38, - "h": 44 - }, - "frame": { - "x": 154, - "y": 134, - "w": 38, - "h": 44 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 28, - "w": 38, - "h": 44 - }, - "frame": { - "x": 154, - "y": 134, - "w": 38, - "h": 44 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 28, - "w": 38, - "h": 44 - }, - "frame": { - "x": 154, - "y": 134, - "w": 38, - "h": 44 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 28, - "w": 38, - "h": 44 - }, - "frame": { - "x": 116, - "y": 137, - "w": 38, - "h": 44 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 28, - "w": 38, - "h": 44 - }, - "frame": { - "x": 40, - "y": 120, - "w": 38, - "h": 44 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 28, - "w": 38, - "h": 44 - }, - "frame": { - "x": 40, - "y": 120, - "w": 38, - "h": 44 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 28, - "w": 38, - "h": 44 - }, - "frame": { - "x": 40, - "y": 120, - "w": 38, - "h": 44 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 28, - "y": 28, - "w": 38, - "h": 44 - }, - "frame": { - "x": 78, - "y": 138, - "w": 38, - "h": 44 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 27, - "y": 28, - "w": 39, - "h": 44 - }, - "frame": { - "x": 39, - "y": 167, - "w": 39, - "h": 44 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 27, - "y": 28, - "w": 39, - "h": 44 - }, - "frame": { - "x": 39, - "y": 167, - "w": 39, - "h": 44 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 27, - "y": 28, - "w": 39, - "h": 44 - }, - "frame": { - "x": 39, - "y": 167, - "w": 39, - "h": 44 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 31, - "w": 42, - "h": 41 - }, - "frame": { - "x": 78, - "y": 182, - "w": 42, - "h": 41 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 31, - "w": 42, - "h": 41 - }, - "frame": { - "x": 78, - "y": 182, - "w": 42, - "h": 41 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 31, - "w": 42, - "h": 41 - }, - "frame": { - "x": 78, - "y": 182, - "w": 42, - "h": 41 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 31, - "w": 42, - "h": 41 - }, - "frame": { - "x": 78, - "y": 182, - "w": 42, - "h": 41 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 31, - "w": 42, - "h": 41 - }, - "frame": { - "x": 78, - "y": 182, - "w": 42, - "h": 41 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 31, - "w": 42, - "h": 41 - }, - "frame": { - "x": 78, - "y": 182, - "w": 42, - "h": 41 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 31, - "w": 42, - "h": 41 - }, - "frame": { - "x": 78, - "y": 182, - "w": 42, - "h": 41 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 31, - "w": 42, - "h": 41 - }, - "frame": { - "x": 78, - "y": 182, - "w": 42, - "h": 41 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 27, - "y": 28, - "w": 39, - "h": 44 - }, - "frame": { - "x": 120, - "y": 181, - "w": 39, - "h": 44 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 27, - "y": 28, - "w": 39, - "h": 44 - }, - "frame": { - "x": 120, - "y": 181, - "w": 39, - "h": 44 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 27, - "y": 28, - "w": 39, - "h": 44 - }, - "frame": { - "x": 120, - "y": 181, - "w": 39, - "h": 44 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 27, - "y": 28, - "w": 39, - "h": 44 - }, - "frame": { - "x": 120, - "y": 181, - "w": 39, - "h": 44 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 27, - "y": 28, - "w": 39, - "h": 44 - }, - "frame": { - "x": 120, - "y": 181, - "w": 39, - "h": 44 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 32, - "w": 42, - "h": 40 - }, - "frame": { - "x": 159, - "y": 178, - "w": 42, - "h": 40 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 32, - "w": 42, - "h": 40 - }, - "frame": { - "x": 159, - "y": 178, - "w": 42, - "h": 40 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 32, - "w": 42, - "h": 40 - }, - "frame": { - "x": 159, - "y": 178, - "w": 42, - "h": 40 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 72 - }, - "spriteSourceSize": { - "x": 25, - "y": 32, - "w": 42, - "h": 40 - }, - "frame": { - "x": 159, - "y": 178, - "w": 42, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1af9bc6c970e4ca611c23ce1e26ff660:ab013a92210cb1b0ae94301a2c9b4c2a:45bb13be23ae6e2a6654a2a00c450d62$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0002.png", + "frame": { "x": 53, "y": 0, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0003.png", + "frame": { "x": 26, "y": 0, "w": 27, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 27, "h": 31 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0004.png", + "frame": { "x": 53, "y": 0, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0007.png", + "frame": { "x": 26, "y": 31, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0008.png", + "frame": { "x": 52, "y": 32, "w": 27, "h": 30 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 27, "h": 30 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0009.png", + "frame": { "x": 26, "y": 31, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "704.png", + "format": "I8", + "size": { "w": 79, "h": 63 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/704.png b/public/images/pokemon/exp/back/704.png index e08171177fd..a67b79b0ee9 100644 Binary files a/public/images/pokemon/exp/back/704.png and b/public/images/pokemon/exp/back/704.png differ diff --git a/public/images/pokemon/exp/back/705.json b/public/images/pokemon/exp/back/705.json index be407b80180..2fc8cb18e99 100644 --- a/public/images/pokemon/exp/back/705.json +++ b/public/images/pokemon/exp/back/705.json @@ -1,230 +1,596 @@ -{ - "textures": [ - { - "image": "705.png", - "format": "RGBA8888", - "size": { - "w": 118, - "h": 118 - }, - "scale": 1, - "frames": [ - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 39, - "h": 59 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 39, - "h": 59 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 59 - }, - "frame": { - "x": 0, - "y": 59, - "w": 37, - "h": 59 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 59 - }, - "frame": { - "x": 0, - "y": 59, - "w": 37, - "h": 59 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 59 - }, - "frame": { - "x": 37, - "y": 59, - "w": 35, - "h": 59 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 59 - }, - "frame": { - "x": 39, - "y": 0, - "w": 35, - "h": 59 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 59 - }, - "frame": { - "x": 39, - "y": 0, - "w": 35, - "h": 59 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 58 - }, - "frame": { - "x": 72, - "y": 59, - "w": 41, - "h": 58 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 58 - }, - "frame": { - "x": 72, - "y": 59, - "w": 41, - "h": 58 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 42, - "h": 57 - }, - "frame": { - "x": 74, - "y": 0, - "w": 42, - "h": 57 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:25dc113e55116f41d58d372b4ed9b10a:95a84e44ff027f7c648e68bbd8ace4bc:6b57e983626c7fc9144ab67f30c66814$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 116, "y": 124, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 40, "y": 185, "w": 40, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 77, "y": 298, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 162, "y": 299, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 202, "y": 299, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 117, "y": 300, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 121, "y": 245, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 80, "y": 242, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 244, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 194, "y": 240, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 125, "w": 37, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 156, "y": 184, "w": 38, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 40, "y": 243, "w": 37, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 158, "y": 0, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 156, "y": 62, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 197, "y": 0, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 116, "y": 124, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 40, "y": 185, "w": 40, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 77, "y": 298, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 162, "y": 299, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 202, "y": 299, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 117, "y": 300, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 121, "y": 245, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 80, "y": 242, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 244, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 194, "y": 240, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 125, "w": 37, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 156, "y": 184, "w": 38, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 40, "y": 243, "w": 37, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 158, "y": 0, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 156, "y": 62, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 197, "y": 0, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 116, "y": 124, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 40, "y": 185, "w": 40, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 77, "y": 298, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 162, "y": 299, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 202, "y": 299, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 117, "y": 300, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 121, "y": 245, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 80, "y": 242, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 244, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 194, "y": 240, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 125, "w": 37, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 156, "y": 184, "w": 38, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 40, "y": 243, "w": 37, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 158, "y": 0, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 156, "y": 62, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 197, "y": 0, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 116, "y": 124, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 195, "y": 181, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 118, "y": 0, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 40, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 0, "w": 40, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 40, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 118, "y": 61, "w": 38, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 38, "h": 63 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 62, "w": 38, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 38, "h": 63 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 40, "y": 0, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 39, "h": 63 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 79, "y": 0, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 39, "h": 63 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 38, "y": 63, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 77, "y": 63, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 195, "y": 120, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 156, "y": 123, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 38, "y": 124, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 77, "y": 124, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 197, "y": 60, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 116, "y": 183, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 185, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "705.png", + "format": "I8", + "size": { "w": 243, "h": 355 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/705.png b/public/images/pokemon/exp/back/705.png index a4f62a21004..18c942605d6 100644 Binary files a/public/images/pokemon/exp/back/705.png and b/public/images/pokemon/exp/back/705.png differ diff --git a/public/images/pokemon/exp/back/707.png b/public/images/pokemon/exp/back/707.png deleted file mode 100644 index 6ce681a5651..00000000000 Binary files a/public/images/pokemon/exp/back/707.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/708.json b/public/images/pokemon/exp/back/708.json deleted file mode 100644 index f0b2e21b5c1..00000000000 --- a/public/images/pokemon/exp/back/708.json +++ /dev/null @@ -1,503 +0,0 @@ -{ - "textures": [ - { - "image": "708.png", - "format": "RGBA8888", - "size": { - "w": 135, - "h": 135 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 46, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 46 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 46, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 46 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 46, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 46 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 45, - "h": 46 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 45, - "h": 46 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 45, - "h": 46 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 2, - "y": 8, - "w": 45, - "h": 43 - }, - "frame": { - "x": 0, - "y": 92, - "w": 45, - "h": 43 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 2, - "y": 8, - "w": 45, - "h": 43 - }, - "frame": { - "x": 0, - "y": 92, - "w": 45, - "h": 43 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 44, - "h": 46 - }, - "frame": { - "x": 45, - "y": 46, - "w": 44, - "h": 46 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 44, - "h": 46 - }, - "frame": { - "x": 45, - "y": 46, - "w": 44, - "h": 46 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 44, - "h": 46 - }, - "frame": { - "x": 45, - "y": 46, - "w": 44, - "h": 46 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 45, - "h": 45 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 45 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 45, - "h": 45 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 45 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 45, - "h": 45 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 45 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 45, - "h": 45 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 45 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 44, - "h": 41 - }, - "frame": { - "x": 91, - "y": 0, - "w": 44, - "h": 41 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 44, - "h": 41 - }, - "frame": { - "x": 91, - "y": 0, - "w": 44, - "h": 41 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 45 - }, - "frame": { - "x": 89, - "y": 45, - "w": 45, - "h": 45 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 45 - }, - "frame": { - "x": 89, - "y": 45, - "w": 45, - "h": 45 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 45 - }, - "frame": { - "x": 89, - "y": 45, - "w": 45, - "h": 45 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 45, - "h": 44 - }, - "frame": { - "x": 89, - "y": 90, - "w": 45, - "h": 44 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 45, - "h": 44 - }, - "frame": { - "x": 89, - "y": 90, - "w": 45, - "h": 44 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 45, - "h": 44 - }, - "frame": { - "x": 89, - "y": 90, - "w": 45, - "h": 44 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:bcbffc2559c06539de3a8e783aa9b810:1a73d753b783ff36005e333d5e1a213a:796c82c5076b122f2663381836c65843$" - } -} diff --git a/public/images/pokemon/exp/back/708.png b/public/images/pokemon/exp/back/708.png deleted file mode 100644 index a531ec27f9f..00000000000 Binary files a/public/images/pokemon/exp/back/708.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/712.json b/public/images/pokemon/exp/back/712.json index 46b8cdaad44..fe53f52369e 100644 --- a/public/images/pokemon/exp/back/712.json +++ b/public/images/pokemon/exp/back/712.json @@ -1,2729 +1,1433 @@ -{ - "textures": [ - { - "image": "712.png", - "format": "RGBA8888", - "size": { - "w": 208, - "h": 208 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 37, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 37, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 75, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 75, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 113, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 113, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 84, - "w": 37, - "h": 43 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 84, - "w": 37, - "h": 43 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 84, - "w": 37, - "h": 43 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 37, - "h": 42 - }, - "frame": { - "x": 74, - "y": 84, - "w": 37, - "h": 42 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 37, - "h": 42 - }, - "frame": { - "x": 74, - "y": 84, - "w": 37, - "h": 42 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 37, - "h": 42 - }, - "frame": { - "x": 74, - "y": 84, - "w": 37, - "h": 42 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 37, - "h": 42 - }, - "frame": { - "x": 74, - "y": 84, - "w": 37, - "h": 42 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 148, - "y": 87, - "w": 37, - "h": 41 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 148, - "y": 87, - "w": 37, - "h": 41 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 125, - "w": 37, - "h": 41 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 125, - "w": 37, - "h": 41 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 125, - "w": 37, - "h": 41 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 125, - "w": 37, - "h": 41 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 126, - "w": 37, - "h": 41 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 126, - "w": 37, - "h": 41 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 126, - "w": 37, - "h": 41 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 126, - "w": 37, - "h": 41 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 37, - "y": 127, - "w": 37, - "h": 41 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 37, - "y": 127, - "w": 37, - "h": 41 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 167, - "w": 37, - "h": 41 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 167, - "w": 37, - "h": 41 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 168, - "w": 37, - "h": 40 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 168, - "w": 37, - "h": 40 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 166, - "w": 37, - "h": 41 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 166, - "w": 37, - "h": 41 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 36, - "h": 41 - }, - "frame": { - "x": 148, - "y": 128, - "w": 36, - "h": 41 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 36, - "h": 41 - }, - "frame": { - "x": 148, - "y": 128, - "w": 36, - "h": 41 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:600bb71c0995d9554966ee794b89312a:22158bf1d17659480b23ef6d5ed6dbcb:3a1cc69824960d920ca43f8c9376d136$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 141, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 141, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 105, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 105, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 140, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 70, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 70, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 70, "y": 42, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 70, "y": 42, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 35, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 35, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 141, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 141, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 105, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 105, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 140, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 140, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 70, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 70, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 70, "y": 42, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 70, "y": 42, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 35, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 35, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 141, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 141, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 105, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 105, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 140, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 140, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 70, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 70, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 70, "y": 42, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 70, "y": 42, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 35, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 35, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 141, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 141, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 105, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 105, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 140, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 140, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 70, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 70, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 70, "y": 42, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 70, "y": 42, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 35, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 35, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 141, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 141, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 105, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 105, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 140, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 140, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 0, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 70, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 70, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 70, "y": 42, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 70, "y": 42, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0105.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0106.png", + "frame": { "x": 35, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0107.png", + "frame": { "x": 35, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0108.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0109.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0110.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0111.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0112.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0113.png", + "frame": { "x": 106, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0114.png", + "frame": { "x": 35, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0115.png", + "frame": { "x": 35, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0116.png", + "frame": { "x": 72, "y": 125, "w": 35, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0117.png", + "frame": { "x": 72, "y": 125, "w": 35, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0118.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0119.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0120.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0121.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0122.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0123.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0124.png", + "frame": { "x": 142, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0125.png", + "frame": { "x": 142, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0126.png", + "frame": { "x": 0, "y": 126, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0127.png", + "frame": { "x": 0, "y": 126, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0128.png", + "frame": { "x": 70, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0129.png", + "frame": { "x": 70, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0130.png", + "frame": { "x": 106, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0131.png", + "frame": { "x": 106, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0132.png", + "frame": { "x": 70, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0133.png", + "frame": { "x": 70, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0134.png", + "frame": { "x": 0, "y": 126, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0135.png", + "frame": { "x": 0, "y": 126, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0136.png", + "frame": { "x": 35, "y": 165, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0137.png", + "frame": { "x": 35, "y": 165, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0138.png", + "frame": { "x": 142, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0139.png", + "frame": { "x": 142, "y": 85, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0140.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0141.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0142.png", + "frame": { "x": 107, "y": 165, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0143.png", + "frame": { "x": 107, "y": 165, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0144.png", + "frame": { "x": 36, "y": 125, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0145.png", + "frame": { "x": 36, "y": 125, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0146.png", + "frame": { "x": 142, "y": 165, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0147.png", + "frame": { "x": 142, "y": 165, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0148.png", + "frame": { "x": 0, "y": 166, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0149.png", + "frame": { "x": 0, "y": 166, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0150.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0151.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0152.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0153.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0154.png", + "frame": { "x": 107, "y": 125, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0155.png", + "frame": { "x": 72, "y": 125, "w": 35, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0156.png", + "frame": { "x": 72, "y": 125, "w": 35, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0157.png", + "frame": { "x": 35, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0158.png", + "frame": { "x": 35, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "712.png", + "format": "I8", + "size": { "w": 178, "h": 205 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/712.png b/public/images/pokemon/exp/back/712.png index 81f77412357..a5b57fc9f1b 100644 Binary files a/public/images/pokemon/exp/back/712.png and b/public/images/pokemon/exp/back/712.png differ diff --git a/public/images/pokemon/exp/back/713.json b/public/images/pokemon/exp/back/713.json index c2e09d4783e..0ff72eef867 100644 --- a/public/images/pokemon/exp/back/713.json +++ b/public/images/pokemon/exp/back/713.json @@ -1,188 +1,1100 @@ -{ - "textures": [ - { - "image": "713.png", - "format": "RGBA8888", - "size": { - "w": 199, - "h": 199 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - }, - "frame": { - "x": 87, - "y": 0, - "w": 87, - "h": 69 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - }, - "frame": { - "x": 87, - "y": 0, - "w": 87, - "h": 69 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 87, - "h": 69 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 87, - "h": 66 - }, - "frame": { - "x": 87, - "y": 69, - "w": 87, - "h": 66 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 87, - "h": 66 - }, - "frame": { - "x": 87, - "y": 69, - "w": 87, - "h": 66 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 87, - "h": 64 - }, - "frame": { - "x": 87, - "y": 135, - "w": 87, - "h": 64 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:6f396042cb759179580f2aeb1af94e22:59471aca6db39209b1e31d5894938bcb:625f70bcfe9c7f2437cb9cad6d2b863c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 174, "y": 65, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 174, "y": 65, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 92, "y": 0, "w": 91, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 91, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 92, "y": 0, "w": 91, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 91, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 0, "y": 0, "w": 92, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 0, "y": 0, "w": 92, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 0, "y": 0, "w": 92, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 0, "y": 0, "w": 92, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 0, "y": 0, "w": 92, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0121.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "713.png", + "format": "I8", + "size": { "w": 357, "h": 248 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/713.png b/public/images/pokemon/exp/back/713.png index 6692bc5c65a..d6782ee4357 100644 Binary files a/public/images/pokemon/exp/back/713.png and b/public/images/pokemon/exp/back/713.png differ diff --git a/public/images/pokemon/exp/back/714.json b/public/images/pokemon/exp/back/714.json deleted file mode 100644 index ecdf5b1b813..00000000000 --- a/public/images/pokemon/exp/back/714.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "textures": [ - { - "image": "714.png", - "format": "RGBA8888", - "size": { - "w": 147, - "h": 147 - }, - "scale": 1, - "frames": [ - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 13, - "y": 0, - "w": 34, - "h": 57 - }, - "frame": { - "x": 0, - "y": 0, - "w": 34, - "h": 57 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 60, - "h": 58 - }, - "frame": { - "x": 34, - "y": 0, - "w": 60, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 46, - "h": 58 - }, - "frame": { - "x": 94, - "y": 0, - "w": 46, - "h": 58 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 46, - "h": 58 - }, - "frame": { - "x": 94, - "y": 0, - "w": 46, - "h": 58 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 1, - "y": 10, - "w": 58, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 58, - "h": 58 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 1, - "y": 10, - "w": 58, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 58, - "h": 58 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 54, - "h": 58 - }, - "frame": { - "x": 58, - "y": 58, - "w": 54, - "h": 58 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 54, - "h": 58 - }, - "frame": { - "x": 58, - "y": 58, - "w": 54, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 12, - "y": 1, - "w": 35, - "h": 58 - }, - "frame": { - "x": 112, - "y": 58, - "w": 35, - "h": 58 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 12, - "y": 1, - "w": 35, - "h": 58 - }, - "frame": { - "x": 112, - "y": 58, - "w": 35, - "h": 58 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:5c3a62d7014eae3eb4c5e67ef6a405f3:1456f6425f3a65e77dc4017298499d80:1a07d46e710b0568ec824f54fbc4fe6a$" - } -} diff --git a/public/images/pokemon/exp/back/714.png b/public/images/pokemon/exp/back/714.png deleted file mode 100644 index 0d81f19fcd4..00000000000 Binary files a/public/images/pokemon/exp/back/714.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/718-10.json b/public/images/pokemon/exp/back/718-10.json deleted file mode 100644 index 03fc4c60ed9..00000000000 --- a/public/images/pokemon/exp/back/718-10.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "textures": [ - { - "image": "718-10.png", - "format": "RGBA8888", - "size": { - "w": 197, - "h": 197 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 66, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 66, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 66, - "h": 67 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 66, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 66, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 66, - "h": 67 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 66, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 66, - "h": 67 - }, - "frame": { - "x": 0, - "y": 67, - "w": 66, - "h": 67 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 66, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 66, - "h": 67 - }, - "frame": { - "x": 0, - "y": 67, - "w": 66, - "h": 67 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 66, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 66, - "h": 67 - }, - "frame": { - "x": 66, - "y": 0, - "w": 66, - "h": 67 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 66, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 65, - "h": 67 - }, - "frame": { - "x": 132, - "y": 0, - "w": 65, - "h": 67 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 66, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 65, - "h": 67 - }, - "frame": { - "x": 132, - "y": 0, - "w": 65, - "h": 67 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 66, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 66, - "h": 65 - }, - "frame": { - "x": 66, - "y": 67, - "w": 66, - "h": 65 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:bd85fbac35b53b12b06187b29756853b:2478226f2126bdc982b17f3a3acb49c4:82195cf2a6db620c5643b8162d6e8c5c$" - } -} diff --git a/public/images/pokemon/exp/back/718-10.png b/public/images/pokemon/exp/back/718-10.png deleted file mode 100644 index 709dc3bea8a..00000000000 Binary files a/public/images/pokemon/exp/back/718-10.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/718.json b/public/images/pokemon/exp/back/718.json deleted file mode 100644 index 698179b1453..00000000000 --- a/public/images/pokemon/exp/back/718.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "textures": [ - { - "image": "718.png", - "format": "RGBA8888", - "size": { - "w": 216, - "h": 216 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 0, - "y": 89, - "w": 73, - "h": 89 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 73, - "y": 89, - "w": 73, - "h": 89 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 73, - "y": 89, - "w": 73, - "h": 89 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 72, - "h": 89 - }, - "frame": { - "x": 74, - "y": 0, - "w": 72, - "h": 89 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 72, - "h": 89 - }, - "frame": { - "x": 74, - "y": 0, - "w": 72, - "h": 89 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 70, - "h": 88 - }, - "frame": { - "x": 146, - "y": 0, - "w": 70, - "h": 88 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 70, - "h": 88 - }, - "frame": { - "x": 146, - "y": 0, - "w": 70, - "h": 88 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 69, - "h": 87 - }, - "frame": { - "x": 146, - "y": 88, - "w": 69, - "h": 87 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:82c29d609c52a3a1aa4b9af042ef9ce8:8d05611f8189d493fef8906e0f11f3de:7b4a06b06cbac24b3f39727b0238661b$" - } -} diff --git a/public/images/pokemon/exp/back/718.png b/public/images/pokemon/exp/back/718.png deleted file mode 100644 index f2f380e339a..00000000000 Binary files a/public/images/pokemon/exp/back/718.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/719.json b/public/images/pokemon/exp/back/719.json deleted file mode 100644 index 4cd0e34f113..00000000000 --- a/public/images/pokemon/exp/back/719.json +++ /dev/null @@ -1,272 +0,0 @@ -{ - "textures": [ - { - "image": "719.png", - "format": "RGBA8888", - "size": { - "w": 158, - "h": 158 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 39, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 39, - "h": 66 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 39, - "h": 67 - }, - "frame": { - "x": 39, - "y": 0, - "w": 39, - "h": 67 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 39, - "h": 67 - }, - "frame": { - "x": 39, - "y": 0, - "w": 39, - "h": 67 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 40, - "h": 67 - }, - "frame": { - "x": 78, - "y": 0, - "w": 40, - "h": 67 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 40, - "h": 67 - }, - "frame": { - "x": 78, - "y": 0, - "w": 40, - "h": 67 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 40, - "h": 67 - }, - "frame": { - "x": 118, - "y": 0, - "w": 40, - "h": 67 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 40, - "h": 67 - }, - "frame": { - "x": 118, - "y": 0, - "w": 40, - "h": 67 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 41, - "h": 67 - }, - "frame": { - "x": 0, - "y": 67, - "w": 41, - "h": 67 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 68 - }, - "frame": { - "x": 41, - "y": 67, - "w": 41, - "h": 68 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 68 - }, - "frame": { - "x": 41, - "y": 67, - "w": 41, - "h": 68 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 68 - }, - "frame": { - "x": 82, - "y": 67, - "w": 42, - "h": 68 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 68 - }, - "frame": { - "x": 82, - "y": 67, - "w": 42, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0db095e3b451ffc873bea6b5e23ba65d:f7ad8a345854a119edb545cc03dcde8e:17a705bb924916761be2495822a53735$" - } -} diff --git a/public/images/pokemon/exp/back/719.png b/public/images/pokemon/exp/back/719.png deleted file mode 100644 index cb0c84041f9..00000000000 Binary files a/public/images/pokemon/exp/back/719.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/815-gigantamax.json b/public/images/pokemon/exp/back/815-gigantamax.json new file mode 100644 index 00000000000..952ea16b6b8 --- /dev/null +++ b/public/images/pokemon/exp/back/815-gigantamax.json @@ -0,0 +1,659 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 525, "y": 384, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 356, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 444, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 267, "y": 98, "w": 87, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 528, "y": 194, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 250, "y": 484, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 333, "y": 388, "w": 83, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 82, "y": 485, "w": 79, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 167, "y": 483, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 440, "y": 194, "w": 86, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 267, "y": 193, "w": 85, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 1, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 86, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 333, "y": 482, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 525, "y": 384, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 356, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 444, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 267, "y": 98, "w": 87, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 528, "y": 194, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 250, "y": 484, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 333, "y": 388, "w": 83, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 82, "y": 485, "w": 79, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 167, "y": 483, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 440, "y": 194, "w": 86, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 267, "y": 193, "w": 85, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 1, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 86, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 333, "y": 482, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 525, "y": 384, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 356, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 444, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 267, "y": 98, "w": 87, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 528, "y": 194, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 250, "y": 484, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 333, "y": 388, "w": 83, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 82, "y": 485, "w": 79, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 167, "y": 483, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 440, "y": 194, "w": 86, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 267, "y": 193, "w": 85, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 1, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 86, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 333, "y": 482, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 84, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 179, "y": 97, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 444, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 1, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 171, "y": 289, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 1, "y": 389, "w": 81, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 4, "w": 81, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 525, "y": 288, "w": 83, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 83, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 1, "y": 485, "w": 79, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 7, "w": 79, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 84, "y": 389, "w": 81, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 81, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 356, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 4, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 268, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 354, "y": 194, "w": 84, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 84, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 255, "y": 290, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 1, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 423, "y": 385, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 1, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 1, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 506, "y": 481, "w": 80, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 80, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 250, "y": 387, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 1, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 89, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 90, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 339, "y": 291, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 5, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 167, "y": 386, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 4, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 440, "y": 288, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 414, "y": 482, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "815-gigantamax.png", + "format": "I8", + "size": { "w": 611, "h": 579 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/815-gigantamax.png b/public/images/pokemon/exp/back/815-gigantamax.png new file mode 100644 index 00000000000..0036d75cbfc Binary files /dev/null and b/public/images/pokemon/exp/back/815-gigantamax.png differ diff --git a/public/images/pokemon/exp/back/839-gigantamax.json b/public/images/pokemon/exp/back/839-gigantamax.json new file mode 100644 index 00000000000..35d98910c9f --- /dev/null +++ b/public/images/pokemon/exp/back/839-gigantamax.json @@ -0,0 +1,821 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 238, "y": 282, "w": 77, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 470, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 546, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 469, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 544, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 154, "y": 472, "w": 76, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 566, "w": 75, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 393, "y": 376, "w": 77, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 414, "y": 190, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 492, "y": 191, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 159, "y": 283, "w": 78, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 158, "y": 189, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 255, "y": 188, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 173, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 90, "y": 93, "w": 83, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 350, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 524, "y": 0, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 268, "y": 92, "w": 82, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 513, "y": 95, "w": 80, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 185, "w": 79, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 238, "y": 282, "w": 77, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 470, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 546, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 469, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 544, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 154, "y": 472, "w": 76, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 566, "w": 75, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 393, "y": 376, "w": 77, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 414, "y": 190, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 492, "y": 191, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 159, "y": 283, "w": 78, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 158, "y": 189, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 255, "y": 188, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 173, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 90, "y": 93, "w": 83, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 350, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 524, "y": 0, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 268, "y": 92, "w": 82, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 513, "y": 95, "w": 80, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 185, "w": 79, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 238, "y": 282, "w": 77, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 470, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 546, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 469, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 544, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 154, "y": 472, "w": 76, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 566, "w": 75, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 393, "y": 376, "w": 77, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 414, "y": 190, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 492, "y": 191, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 159, "y": 283, "w": 78, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 158, "y": 189, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 255, "y": 188, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 173, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 90, "y": 93, "w": 83, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 350, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 524, "y": 0, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 268, "y": 92, "w": 82, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 513, "y": 95, "w": 80, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 185, "w": 79, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 238, "y": 282, "w": 77, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 79, "y": 187, "w": 79, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 79, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 432, "y": 95, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 1, "w": 81, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 441, "y": 0, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 356, "y": 0, "w": 85, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 85, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 180, "y": 0, "w": 88, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 88, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 0, "w": 90, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 90, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 90, "y": 0, "w": 90, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 90, "h": 93 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 268, "y": 0, "w": 88, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 88, "h": 92 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 94, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 5, "w": 85, "h": 91 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 77, "y": 283, "w": 82, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 6, "w": 82, "h": 90 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 397, "y": 285, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 5, "w": 81, "h": 91 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 232, "y": 378, "w": 81, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 81, "h": 90 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 315, "y": 283, "w": 82, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 6, "w": 82, "h": 90 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 478, "y": 286, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 5, "w": 81, "h": 91 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 313, "y": 467, "w": 79, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 79, "h": 92 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 335, "y": 189, "w": 79, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 79, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 315, "y": 373, "w": 78, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 78, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 77, "y": 373, "w": 78, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 78, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 77, "y": 467, "w": 77, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 232, "y": 468, "w": 77, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 392, "y": 471, "w": 77, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 309, "y": 559, "w": 77, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 386, "y": 565, "w": 77, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 77, "y": 561, "w": 77, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 230, "y": 562, "w": 77, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 0, "y": 472, "w": 77, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 77, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 377, "w": 77, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 1, "w": 77, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 155, "y": 377, "w": 77, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 1, "w": 77, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 281, "w": 77, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "839-gigantamax.png", + "format": "I8", + "size": { "w": 622, "h": 661 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/839-gigantamax.png b/public/images/pokemon/exp/back/839-gigantamax.png new file mode 100644 index 00000000000..6b7622b05d8 Binary files /dev/null and b/public/images/pokemon/exp/back/839-gigantamax.png differ diff --git a/public/images/pokemon/exp/shiny/708.json b/public/images/pokemon/exp/back/female/6215.json similarity index 62% rename from public/images/pokemon/exp/shiny/708.json rename to public/images/pokemon/exp/back/female/6215.json index 188cebad63c..4f58734d55e 100644 --- a/public/images/pokemon/exp/shiny/708.json +++ b/public/images/pokemon/exp/back/female/6215.json @@ -1,432 +1,33 @@ { "textures": [ { - "image": "708.png", + "image": "6215.png", "format": "RGBA8888", "size": { - "w": 206, - "h": 206 + "w": 155, + "h": 155 }, "scale": 1, "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 51, - "h": 43 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 51, - "h": 43 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 51, - "h": 43 - } - }, { "filename": "0007.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 51, - "h": 43 - }, - "frame": { "x": 0, - "y": 43, - "w": 51, - "h": 43 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 43, - "w": 51, - "h": 43 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 43, - "w": 51, - "h": 43 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, "y": 1, - "w": 51, - "h": 43 + "w": 54, + "h": 49 }, "frame": { "x": 0, - "y": 86, - "w": 51, - "h": 43 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 86, - "w": 51, - "h": 43 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 86, - "w": 51, - "h": 43 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 51, - "h": 42 - }, - "frame": { - "x": 0, - "y": 129, - "w": 51, - "h": 42 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 51, - "h": 42 - }, - "frame": { - "x": 0, - "y": 129, - "w": 51, - "h": 42 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 51, - "h": 42 - }, - "frame": { - "x": 0, - "y": 129, - "w": 51, - "h": 42 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 51, - "h": 42 - }, - "frame": { - "x": 0, - "y": 129, - "w": 51, - "h": 42 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 51, - "h": 42 - }, - "frame": { - "x": 0, - "y": 129, - "w": 51, - "h": 42 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 42, - "w": 51, - "h": 42 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 42, - "w": 51, - "h": 42 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 42, - "w": 51, - "h": 42 + "w": 54, + "h": 49 } }, { @@ -434,20 +35,41 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 51, - "h": 42 + "x": 0, + "y": 1, + "w": 54, + "h": 49 }, "frame": { - "x": 51, - "y": 84, - "w": 51, - "h": 42 + "x": 0, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0019.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 54, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 54, + "h": 49 } }, { @@ -455,20 +77,41 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 51, - "h": 42 + "x": 0, + "y": 1, + "w": 54, + "h": 49 }, "frame": { - "x": 51, - "y": 84, - "w": 51, - "h": 42 + "x": 0, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0031.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 54, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 54, + "h": 49 } }, { @@ -476,461 +119,41 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 84, - "w": 51, - "h": 42 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 126, - "w": 51, - "h": 42 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 126, - "w": 51, - "h": 42 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 126, - "w": 51, - "h": 42 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 42, - "w": 51, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 42, - "w": 51, - "h": 42 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 42, - "w": 51, - "h": 42 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 84, - "w": 51, - "h": 41 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 84, - "w": 51, - "h": 41 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 84, - "w": 51, - "h": 41 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 125, - "w": 51, - "h": 41 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 125, - "w": 51, - "h": 41 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 125, - "w": 51, - "h": 41 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 50, - "h": 40 - }, - "frame": { - "x": 102, - "y": 166, - "w": 50, - "h": 40 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { "x": 0, - "y": 6, - "w": 50, - "h": 40 - }, - "frame": { - "x": 152, - "y": 166, - "w": 50, - "h": 40 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, "y": 1, - "w": 51, - "h": 41 + "w": 54, + "h": 49 }, "frame": { - "x": 153, + "x": 0, "y": 0, - "w": 51, - "h": 41 + "w": 54, + "h": 49 } }, { - "filename": "0042.png", + "filename": "0043.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 6, + "x": 0, "y": 1, - "w": 51, - "h": 41 + "w": 54, + "h": 49 }, "frame": { - "x": 153, + "x": 0, "y": 0, - "w": 51, - "h": 41 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 51, - "h": 41 - }, - "frame": { - "x": 153, - "y": 41, - "w": 51, - "h": 41 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 51, - "h": 41 - }, - "frame": { - "x": 153, - "y": 41, - "w": 51, - "h": 41 + "w": 54, + "h": 49 } }, { @@ -938,41 +161,146 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 51, - "h": 41 + "x": 0, + "y": 1, + "w": 54, + "h": 49 }, "frame": { - "x": 153, - "y": 82, - "w": 51, - "h": 41 + "x": 0, + "y": 0, + "w": 54, + "h": 49 } }, { - "filename": "0048.png", + "filename": "0005.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 2, + "x": 0, "y": 3, - "w": 51, - "h": 41 + "w": 54, + "h": 47 }, "frame": { - "x": 153, - "y": 82, - "w": 51, - "h": 41 + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0021.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0022.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0029.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0030.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 } }, { @@ -980,20 +308,167 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, "h": 47 }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0046.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, "spriteSourceSize": { "x": 0, "y": 4, - "w": 51, - "h": 41 + "w": 54, + "h": 46 }, "frame": { - "x": 153, - "y": 123, - "w": 51, - "h": 41 + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0023.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0024.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0027.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0028.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 } }, { @@ -1001,20 +476,545 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { "x": 0, "y": 4, - "w": 51, - "h": 41 + "w": 54, + "h": 46 }, "frame": { - "x": 153, - "y": 123, + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0048.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 6, + "w": 54, + "h": 44 + }, + "frame": { + "x": 0, + "y": 49, + "w": 54, + "h": 44 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 6, + "w": 54, + "h": 44 + }, + "frame": { + "x": 0, + "y": 49, + "w": 54, + "h": 44 + } + }, + { + "filename": "0025.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 6, + "w": 54, + "h": 44 + }, + "frame": { + "x": 0, + "y": 49, + "w": 54, + "h": 44 + } + }, + { + "filename": "0026.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 6, + "w": 54, + "h": 44 + }, + "frame": { + "x": 0, + "y": 49, + "w": 54, + "h": 44 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0017.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0018.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0033.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0034.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0035.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0042.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0012.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0015.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0016.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0036.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0037.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0040.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0041.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0013.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, "w": 51, - "h": 41 + "h": 50 + }, + "frame": { + "x": 104, + "y": 93, + "w": 51, + "h": 50 + } + }, + { + "filename": "0014.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 51, + "h": 50 + }, + "frame": { + "x": 104, + "y": 93, + "w": 51, + "h": 50 + } + }, + { + "filename": "0038.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 51, + "h": 50 + }, + "frame": { + "x": 104, + "y": 93, + "w": 51, + "h": 50 + } + }, + { + "filename": "0039.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 51, + "h": 50 + }, + "frame": { + "x": 104, + "y": 93, + "w": 51, + "h": 50 } } ] @@ -1023,6 +1023,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:02aeb20d3dedab69cd63430f383bb8a9:140bc3262838e3b187b88498bce06706:796c82c5076b122f2663381836c65843$" + "smartupdate": "$TexturePacker:SmartUpdate:29aeff74e785c73ae2261d8bb0459111:5709d3d72351f1424de632ebf8347c01:736cd88647e79ba7896fc74f9406c2fe$" } } diff --git a/public/images/pokemon/exp/back/female/6215.png b/public/images/pokemon/exp/back/female/6215.png new file mode 100644 index 00000000000..7dbdab7eb85 Binary files /dev/null and b/public/images/pokemon/exp/back/female/6215.png differ diff --git a/public/images/pokemon/exp/back/female/668.json b/public/images/pokemon/exp/back/female/668.json new file mode 100644 index 00000000000..4c493f84959 --- /dev/null +++ b/public/images/pokemon/exp/back/female/668.json @@ -0,0 +1,821 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 475, "y": 144, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 76, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 152, "y": 283, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 73, "y": 284, "w": 74, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 460, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 227, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 385, "y": 284, "w": 75, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 472, "y": 283, "w": 77, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 233, "y": 282, "w": 77, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 396, "y": 215, "w": 76, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 399, "y": 144, "w": 76, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 431, "y": 73, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 242, "y": 142, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 156, "y": 213, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 475, "y": 144, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 76, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 152, "y": 283, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 73, "y": 284, "w": 74, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 460, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 227, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 385, "y": 284, "w": 75, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 472, "y": 283, "w": 77, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 233, "y": 282, "w": 77, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 396, "y": 215, "w": 76, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 399, "y": 144, "w": 76, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 431, "y": 73, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 242, "y": 142, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 156, "y": 213, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 475, "y": 144, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 76, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 152, "y": 283, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 73, "y": 284, "w": 74, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 460, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 227, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 385, "y": 284, "w": 75, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 472, "y": 283, "w": 77, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 233, "y": 282, "w": 77, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 396, "y": 215, "w": 76, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 399, "y": 144, "w": 76, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 431, "y": 73, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 242, "y": 142, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 156, "y": 213, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 475, "y": 144, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 76, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 152, "y": 283, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 73, "y": 284, "w": 74, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 460, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 227, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 385, "y": 284, "w": 75, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 472, "y": 283, "w": 77, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 233, "y": 282, "w": 77, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 396, "y": 215, "w": 76, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 399, "y": 144, "w": 76, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 431, "y": 73, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 242, "y": 142, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 156, "y": 213, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 475, "y": 144, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 144, "w": 78, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 233, "y": 213, "w": 78, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 156, "y": 144, "w": 79, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 4, "w": 79, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 319, "y": 144, "w": 80, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 80, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 242, "y": 73, "w": 80, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 80, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 310, "y": 282, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 534, "y": 350, "w": 71, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 4, "w": 71, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 301, "y": 351, "w": 67, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 3, "w": 67, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 353, "w": 63, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 3, "w": 63, "h": 75 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 204, "y": 417, "w": 63, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 2, "w": 63, "h": 75 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 139, "y": 352, "w": 65, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 65, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 73, "y": 352, "w": 66, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 3, "w": 66, "h": 72 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 368, "y": 351, "w": 69, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 69, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 0, "y": 284, "w": 73, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 4, "w": 73, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 475, "y": 214, "w": 76, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 319, "y": 212, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 82, "y": 73, "w": 80, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 80, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 519, "y": 72, "w": 83, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 83, "h": 72 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 434, "y": 0, "w": 85, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 85, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 261, "y": 0, "w": 86, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 86, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 174, "y": 0, "w": 87, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 87, "y": 0, "w": 87, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 87, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 0, "y": 0, "w": 87, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 87, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 347, "y": 0, "w": 87, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 87, "h": 72 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 519, "y": 0, "w": 85, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 85, "h": 72 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 347, "y": 72, "w": 84, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 84, "h": 72 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 73, "w": 82, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 162, "y": 73, "w": 80, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 80, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 78, "y": 144, "w": 78, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "668-female.png", + "format": "I8", + "size": { "w": 605, "h": 492 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/female/668.png b/public/images/pokemon/exp/back/female/668.png new file mode 100644 index 00000000000..e5b5ed2494e Binary files /dev/null and b/public/images/pokemon/exp/back/female/668.png differ diff --git a/public/images/pokemon/exp/back/shiny/248-mega.json b/public/images/pokemon/exp/back/shiny/248-mega.json index e6874d48784..67e88b6014f 100644 --- a/public/images/pokemon/exp/back/shiny/248-mega.json +++ b/public/images/pokemon/exp/back/shiny/248-mega.json @@ -1,272 +1,929 @@ -{ - "textures": [ - { - "image": "248-mega.png", - "format": "RGBA8888", - "size": { - "w": 292, - "h": 292 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 80, - "h": 74 - }, - "frame": { - "x": 0, - "y": 0, - "w": 80, - "h": 74 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 80, - "h": 74 - }, - "frame": { - "x": 0, - "y": 74, - "w": 80, - "h": 74 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 79, - "h": 74 - }, - "frame": { - "x": 0, - "y": 148, - "w": 79, - "h": 74 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 79, - "h": 74 - }, - "frame": { - "x": 79, - "y": 148, - "w": 79, - "h": 74 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 79, - "h": 73 - }, - "frame": { - "x": 80, - "y": 0, - "w": 79, - "h": 73 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 79, - "h": 73 - }, - "frame": { - "x": 80, - "y": 73, - "w": 79, - "h": 73 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 146, - "w": 75, - "h": 73 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 146, - "w": 75, - "h": 73 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 219, - "w": 75, - "h": 73 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 219, - "w": 75, - "h": 73 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 73, - "h": 73 - }, - "frame": { - "x": 159, - "y": 0, - "w": 73, - "h": 73 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 73, - "h": 73 - }, - "frame": { - "x": 159, - "y": 73, - "w": 73, - "h": 73 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3dba844e4799c099eae9413ec740d703:7a7dc95ebe53fcea6738011b92bff44e:90df97eb431b7162252516cb937a0b9e$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 101, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 430, "y": 101, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 195, "w": 84, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 173, "y": 287, "w": 85, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 373, "w": 85, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 341, "y": 455, "w": 85, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 84, "y": 534, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 170, "y": 534, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 170, "y": 456, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 341, "y": 533, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 84, "y": 456, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 255, "y": 455, "w": 84, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 513, "y": 455, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 428, "y": 455, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 260, "y": 373, "w": 83, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 516, "y": 287, "w": 83, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 347, "y": 287, "w": 83, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 256, "y": 196, "w": 83, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 342, "y": 192, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 101, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 430, "y": 101, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 195, "w": 84, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 173, "y": 287, "w": 85, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 373, "w": 85, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 341, "y": 455, "w": 85, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 84, "y": 534, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 170, "y": 534, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 170, "y": 456, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 341, "y": 533, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 84, "y": 456, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 255, "y": 455, "w": 84, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 513, "y": 455, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 428, "y": 455, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 260, "y": 373, "w": 83, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 516, "y": 287, "w": 83, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 347, "y": 287, "w": 83, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 256, "y": 196, "w": 83, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 342, "y": 192, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 101, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 430, "y": 101, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 195, "w": 84, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 173, "y": 287, "w": 85, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 373, "w": 85, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 341, "y": 455, "w": 85, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 84, "y": 534, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 170, "y": 534, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 170, "y": 456, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 341, "y": 533, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 84, "y": 456, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 255, "y": 455, "w": 84, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 513, "y": 455, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 428, "y": 455, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 260, "y": 373, "w": 83, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 516, "y": 287, "w": 83, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 347, "y": 287, "w": 83, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 256, "y": 196, "w": 83, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 342, "y": 192, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 101, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 430, "y": 101, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 195, "w": 84, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 173, "y": 287, "w": 85, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 373, "w": 85, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 341, "y": 455, "w": 85, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 84, "y": 534, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 170, "y": 534, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 170, "y": 456, "w": 83, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 341, "y": 533, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 84, "y": 456, "w": 84, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 255, "y": 455, "w": 84, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 513, "y": 455, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 428, "y": 455, "w": 83, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 260, "y": 373, "w": 83, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 516, "y": 287, "w": 83, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 347, "y": 287, "w": 83, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 256, "y": 196, "w": 83, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 342, "y": 192, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 101, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 426, "y": 194, "w": 82, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 510, "y": 196, "w": 83, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 83, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 0, "y": 285, "w": 83, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 83, "h": 86 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 432, "y": 287, "w": 82, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 85 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 85, "y": 288, "w": 82, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 83 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 87, "y": 373, "w": 82, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 81 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 345, "y": 374, "w": 82, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 429, "y": 374, "w": 82, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 0, "y": 455, "w": 82, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 171, "y": 374, "w": 82, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 80 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 516, "y": 372, "w": 84, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 84, "h": 81 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 260, "y": 287, "w": 85, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 85, "h": 84 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 86, "y": 200, "w": 85, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 85, "h": 86 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 342, "y": 101, "w": 86, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 89 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 256, "y": 100, "w": 84, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 84, "h": 94 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 86, "y": 100, "w": 83, "h": 98 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 83, "h": 98 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 514, "y": 0, "w": 83, "h": 98 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 83, "h": 98 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 429, "y": 0, "w": 83, "h": 99 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 83, "h": 99 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 344, "y": 0, "w": 83, "h": 99 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 83, "h": 99 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 0, "y": 0, "w": 84, "h": 99 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 84, "h": 99 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 258, "y": 0, "w": 84, "h": 98 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 84, "h": 98 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 172, "y": 0, "w": 84, "h": 98 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 84, "h": 98 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 86, "y": 0, "w": 84, "h": 98 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 84, "h": 98 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 171, "y": 100, "w": 83, "h": 97 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 83, "h": 97 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 514, "y": 100, "w": 83, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 83, "h": 94 }, + "sourceSize": { "w": 88, "h": 101 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "248-mega.png", + "format": "I8", + "size": { "w": 600, "h": 610 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/248-mega.png b/public/images/pokemon/exp/back/shiny/248-mega.png index 10b8bfb05f3..bb4a62d441f 100644 Binary files a/public/images/pokemon/exp/back/shiny/248-mega.png and b/public/images/pokemon/exp/back/shiny/248-mega.png differ diff --git a/public/images/pokemon/exp/back/shiny/362-mega.json b/public/images/pokemon/exp/back/shiny/362-mega.json index 2c42a6db6f1..02354ddad93 100644 --- a/public/images/pokemon/exp/back/shiny/362-mega.json +++ b/public/images/pokemon/exp/back/shiny/362-mega.json @@ -1,272 +1,551 @@ -{ - "textures": [ - { - "image": "362-mega.png", - "format": "RGBA8888", - "size": { - "w": 140, - "h": 140 - }, - "scale": 1, - "frames": [ - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 61, - "h": 71 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 71 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 61, - "h": 71 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 71 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 61, - "h": 71 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 71 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 61, - "h": 71 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 71 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 70 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 70 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 70 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 70 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 70, - "w": 61, - "h": 70 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 61, - "h": 70 - }, - "frame": { - "x": 61, - "y": 70, - "w": 61, - "h": 70 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 69 - }, - "frame": { - "x": 0, - "y": 71, - "w": 61, - "h": 69 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 61, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 61, - "h": 69 - }, - "frame": { - "x": 0, - "y": 71, - "w": 61, - "h": 69 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:25f7f8085d78ddcdd4aadd2f3591c111:e79d613f15426593f8c7367b1afc6c04:8a7271a5423838c97ddeb1e6dc343255$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 65, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 67, "y": 66, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 67, "y": 0, "w": 61, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 }, + "sourceSize": { "w": 65, "h": 82 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "362-mega.png", + "format": "I8", + "size": { "w": 128, "h": 132 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/362-mega.png b/public/images/pokemon/exp/back/shiny/362-mega.png index 32f3e5658a3..75d5b5075b9 100644 Binary files a/public/images/pokemon/exp/back/shiny/362-mega.png and b/public/images/pokemon/exp/back/shiny/362-mega.png differ diff --git a/public/images/pokemon/exp/back/shiny/569-gigantamax.json b/public/images/pokemon/exp/back/shiny/569-gigantamax.json new file mode 100644 index 00000000000..b266f5eb799 --- /dev/null +++ b/public/images/pokemon/exp/back/shiny/569-gigantamax.json @@ -0,0 +1,1478 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0002.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0003.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0004.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0005.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0006.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0007.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0008.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0009.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0010.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0011.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0012.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0013.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0014.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0015.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0016.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0017.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0018.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0019.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0023.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0024.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0025.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0026.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0027.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0028.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0029.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0030.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0031.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0032.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0033.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0034.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0035.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0036.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0037.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0038.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0039.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0040.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0041.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0042.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0043.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0044.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0045.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0046.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0047.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0048.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0049.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0050.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0051.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0052.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0053.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0054.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0058.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0059.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0060.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0061.png", + "frame": { "x": 311, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0062.png", + "frame": { "x": 311, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0063.png", + "frame": { "x": 311, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0064.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0065.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0066.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0067.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0068.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0069.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0070.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0071.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0072.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0075.png", + "frame": { "x": 0, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0076.png", + "frame": { "x": 96, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0077.png", + "frame": { "x": 96, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0080.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0081.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0082.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0083.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0084.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0085.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0086.png", + "frame": { "x": 97, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0087.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0089.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 91, "w": 97, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0091.png", + "frame": { "x": 96, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0092.png", + "frame": { "x": 96, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0093.png", + "frame": { "x": 96, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0094.png", + "frame": { "x": 0, "y": 186, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0095.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0096.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0097.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0098.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0099.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0100.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0101.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0102.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0103.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0104.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0105.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0106.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0107.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0108.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0109.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0110.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0111.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0112.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0113.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0114.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0115.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0116.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0117.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0118.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0119.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0120.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0121.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0122.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0123.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0124.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0125.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0126.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0127.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0128.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0129.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0130.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0131.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0132.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0133.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0134.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0135.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0136.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0137.png", + "frame": { "x": 194, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0138.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0139.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0140.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0141.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0142.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0143.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0144.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0145.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0146.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0147.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0148.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0149.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0150.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0151.png", + "frame": { "x": 0, "y": 0, "w": 105, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0152.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0153.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0154.png", + "frame": { "x": 105, "y": 0, "w": 104, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0155.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0156.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0157.png", + "frame": { "x": 209, "y": 0, "w": 102, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0158.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0159.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0160.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0161.png", + "frame": { "x": 192, "y": 187, "w": 97, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0162.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + }, + { + "filename": "0163.png", + "frame": { "x": 290, "y": 92, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 }, + "sourceSize": { "w": 105, "h": 95 }, + "duration": 60 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "569-gigantamax.png", + "format": "I8", + "size": { "w": 413, "h": 281 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/shiny/569-gigantamax.png b/public/images/pokemon/exp/back/shiny/569-gigantamax.png new file mode 100644 index 00000000000..2322fc2321e Binary files /dev/null and b/public/images/pokemon/exp/back/shiny/569-gigantamax.png differ diff --git a/public/images/pokemon/exp/back/shiny/651.json b/public/images/pokemon/exp/back/shiny/651.json index 4e96154d67b..04a791f539f 100644 --- a/public/images/pokemon/exp/back/shiny/651.json +++ b/public/images/pokemon/exp/back/shiny/651.json @@ -1,104 +1,713 @@ -{ - "textures": [ - { - "image": "651.png", - "format": "RGBA8888", - "size": { - "w": 106, - "h": 106 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 50 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 50 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 50 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 50 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 50 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 50 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 50 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 50 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 50 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 50 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 49 - }, - "frame": { - "x": 0, - "y": 50, - "w": 53, - "h": 49 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3f6a8875e3bdc40a01569005eeaa99a4:fe6f34e605d5c3077475cfd03942ff77:a93e5fa02e10bf11e3ed8bf6571835ca$" - } -} \ No newline at end of file +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 167, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 222, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 277, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 56, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 331, "y": 150, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 162, "y": 247, "w": 52, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 219, "y": 198, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 272, "y": 198, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 110, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 164, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 218, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 55, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 110, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 55, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 165, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 220, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 111, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 275, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 330, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 167, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 222, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 277, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 56, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 331, "y": 150, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 162, "y": 247, "w": 52, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 219, "y": 198, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 272, "y": 198, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 326, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 164, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 218, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 55, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 110, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 55, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 165, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 220, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 111, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 275, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 330, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 167, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 222, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 277, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 56, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 331, "y": 150, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 162, "y": 247, "w": 52, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 219, "y": 198, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 272, "y": 198, "w": 53, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 110, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 164, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 218, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 55, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 110, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 55, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 165, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 220, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 111, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 275, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 330, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 272, "y": 100, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 100, "w": 56, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 56, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 51, "w": 55, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 219, "y": 150, "w": 56, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 48 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 248, "w": 55, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 55, "h": 47 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 275, "y": 150, "w": 56, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 56, "h": 48 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 325, "y": 200, "w": 56, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 56, "h": 47 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 54, "y": 150, "w": 55, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 332, "y": 0, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 199, "w": 54, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 55, "y": 248, "w": 53, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 48 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 325, "y": 247, "w": 53, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 53, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 54, "y": 199, "w": 54, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 54, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 149, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 108, "y": 199, "w": 54, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 54, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 162, "y": 199, "w": 55, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 55, "h": 48 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 109, "y": 150, "w": 55, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 164, "y": 150, "w": 55, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 49 }, + "sourceSize": { "w": 59, "h": 54 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "651.png", + "format": "I8", + "size": { "w": 387, "h": 297 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/shiny/651.png b/public/images/pokemon/exp/back/shiny/651.png index 99fa14d5df9..b607fa69a15 100644 Binary files a/public/images/pokemon/exp/back/shiny/651.png and b/public/images/pokemon/exp/back/shiny/651.png differ diff --git a/public/images/pokemon/exp/back/shiny/653.json b/public/images/pokemon/exp/back/shiny/653.json index a5d273cff64..c5fb4a5db61 100644 --- a/public/images/pokemon/exp/back/shiny/653.json +++ b/public/images/pokemon/exp/back/shiny/653.json @@ -1,2204 +1,947 @@ -{ - "textures": [ - { - "image": "653.png", - "format": "RGBA8888", - "size": { - "w": 173, - "h": 173 - }, - "scale": 1, - "frames": [ - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 90, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 90, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 90, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 90, - "y": 0, - "w": 45, - "h": 44 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 45, - "h": 44 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 45, - "h": 44 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 45, - "h": 44 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 45, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 45, - "h": 44 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 41 - }, - "frame": { - "x": 0, - "y": 132, - "w": 43, - "h": 41 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 43, - "h": 40 - }, - "frame": { - "x": 43, - "y": 132, - "w": 43, - "h": 40 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 44 - }, - "frame": { - "x": 45, - "y": 44, - "w": 44, - "h": 44 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 44 - }, - "frame": { - "x": 45, - "y": 44, - "w": 44, - "h": 44 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 44 - }, - "frame": { - "x": 45, - "y": 44, - "w": 44, - "h": 44 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 44 - }, - "frame": { - "x": 45, - "y": 44, - "w": 44, - "h": 44 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 43, - "h": 44 - }, - "frame": { - "x": 45, - "y": 88, - "w": 43, - "h": 44 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 43, - "h": 44 - }, - "frame": { - "x": 45, - "y": 88, - "w": 43, - "h": 44 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 43, - "h": 44 - }, - "frame": { - "x": 45, - "y": 88, - "w": 43, - "h": 44 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 43, - "h": 44 - }, - "frame": { - "x": 45, - "y": 88, - "w": 43, - "h": 44 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 40, - "h": 44 - }, - "frame": { - "x": 88, - "y": 88, - "w": 40, - "h": 44 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 89, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 130, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 41, - "h": 43 - }, - "frame": { - "x": 130, - "y": 44, - "w": 41, - "h": 43 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 87, - "w": 40, - "h": 43 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 87, - "w": 40, - "h": 43 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 87, - "w": 40, - "h": 43 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 87, - "w": 40, - "h": 43 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 46, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 40, - "h": 43 - }, - "frame": { - "x": 128, - "y": 130, - "w": 40, - "h": 43 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d04be8782bc4dd7044942acce05841d1:0e29431888e23f35da7ce4bf9b48965f:a7be961d0230f568aff23d95e7ff0036$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 123, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 123, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 123, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 123, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 130, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 130, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 84, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 44, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 38, "y": 128, "w": 38, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 42, "y": 86, "w": 39, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 81, "y": 87, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 130, "y": 43, "w": 41, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 130, "y": 43, "w": 41, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 88, "y": 43, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 88, "y": 43, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 88, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 88, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 88, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 88, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 44, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 132, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 132, "y": 0, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 44, "y": 43, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 44, "y": 43, "w": 44, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 88, "y": 43, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 88, "y": 43, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 130, "y": 43, "w": 41, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 130, "y": 43, "w": 41, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 }, + "sourceSize": { "w": 46, "h": 44 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "653.png", + "format": "I8", + "size": { "w": 176, "h": 170 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/653.png b/public/images/pokemon/exp/back/shiny/653.png index efd98f5ee42..08b2420ad11 100644 Binary files a/public/images/pokemon/exp/back/shiny/653.png and b/public/images/pokemon/exp/back/shiny/653.png differ diff --git a/public/images/pokemon/exp/back/shiny/654.json b/public/images/pokemon/exp/back/shiny/654.json index 990436ec243..a5bd681b6cb 100644 --- a/public/images/pokemon/exp/back/shiny/654.json +++ b/public/images/pokemon/exp/back/shiny/654.json @@ -1,188 +1,677 @@ -{ - "textures": [ - { - "image": "654.png", - "format": "RGBA8888", - "size": { - "w": 120, - "h": 120 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 40, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 66 - }, - "frame": { - "x": 40, - "y": 0, - "w": 40, - "h": 66 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 65 - }, - "frame": { - "x": 80, - "y": 0, - "w": 40, - "h": 65 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 65 - }, - "frame": { - "x": 80, - "y": 0, - "w": 40, - "h": 65 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:6f47a7be287accef984c271dc9a4c0a3:dfd096ac65957c3db229b035490b4fbb:1977f50e1ab8a3304ceeb59ee1aa2ba9$" - } -} \ No newline at end of file +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 102, "y": 203, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 161, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 55, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 110, "y": 0, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 110, "y": 68, "w": 51, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 214, "y": 195, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 263, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 215, "y": 130, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 163, "y": 0, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 108, "y": 137, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 50, "y": 263, "w": 50, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 50, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 131, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 218, "y": 0, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 161, "y": 195, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 154, "y": 261, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 54, "y": 131, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 163, "y": 65, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 154, "y": 261, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 54, "y": 131, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 163, "y": 65, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 154, "y": 261, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 54, "y": 131, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 163, "y": 65, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 154, "y": 261, "w": 52, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 54, "y": 131, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 218, "y": 65, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 55, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 108, "y": 137, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 196, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 51, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 51, "y": 196, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 51, "h": 67 }, + "sourceSize": { "w": 55, "h": 69 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "654.png", + "format": "I8", + "size": { "w": 273, "h": 330 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/shiny/654.png b/public/images/pokemon/exp/back/shiny/654.png index 0dfad6834cc..747aa61bd58 100644 Binary files a/public/images/pokemon/exp/back/shiny/654.png and b/public/images/pokemon/exp/back/shiny/654.png differ diff --git a/public/images/pokemon/exp/back/shiny/656.json b/public/images/pokemon/exp/back/shiny/656.json index 0a023d7bee6..78a3ae89852 100644 --- a/public/images/pokemon/exp/back/shiny/656.json +++ b/public/images/pokemon/exp/back/shiny/656.json @@ -1,1658 +1,713 @@ -{ - "textures": [ - { - "image": "656.png", - "format": "RGBA8888", - "size": { - "w": 201, - "h": 201 - }, - "scale": 1, - "frames": [ - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 15, - "w": 32, - "h": 32 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 32 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 34, - "h": 33 - }, - "frame": { - "x": 32, - "y": 0, - "w": 34, - "h": 33 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 34, - "h": 33 - }, - "frame": { - "x": 32, - "y": 0, - "w": 34, - "h": 33 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 34, - "h": 33 - }, - "frame": { - "x": 32, - "y": 0, - "w": 34, - "h": 33 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 34, - "h": 33 - }, - "frame": { - "x": 32, - "y": 0, - "w": 34, - "h": 33 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 34, - "h": 33 - }, - "frame": { - "x": 32, - "y": 0, - "w": 34, - "h": 33 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 34, - "h": 33 - }, - "frame": { - "x": 66, - "y": 0, - "w": 34, - "h": 33 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 34, - "h": 33 - }, - "frame": { - "x": 66, - "y": 0, - "w": 34, - "h": 33 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 34, - "h": 33 - }, - "frame": { - "x": 66, - "y": 0, - "w": 34, - "h": 33 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 34, - "h": 33 - }, - "frame": { - "x": 66, - "y": 0, - "w": 34, - "h": 33 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 34, - "h": 33 - }, - "frame": { - "x": 66, - "y": 0, - "w": 34, - "h": 33 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 33, - "h": 33 - }, - "frame": { - "x": 100, - "y": 0, - "w": 33, - "h": 33 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 34, - "h": 34 - }, - "frame": { - "x": 133, - "y": 0, - "w": 34, - "h": 34 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 34, - "h": 34 - }, - "frame": { - "x": 133, - "y": 0, - "w": 34, - "h": 34 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 34, - "h": 34 - }, - "frame": { - "x": 133, - "y": 0, - "w": 34, - "h": 34 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 34, - "h": 34 - }, - "frame": { - "x": 133, - "y": 0, - "w": 34, - "h": 34 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 34, - "h": 34 - }, - "frame": { - "x": 133, - "y": 0, - "w": 34, - "h": 34 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 34, - "h": 34 - }, - "frame": { - "x": 167, - "y": 0, - "w": 34, - "h": 34 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 34, - "h": 34 - }, - "frame": { - "x": 167, - "y": 0, - "w": 34, - "h": 34 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 34, - "h": 34 - }, - "frame": { - "x": 167, - "y": 0, - "w": 34, - "h": 34 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 34, - "h": 34 - }, - "frame": { - "x": 167, - "y": 0, - "w": 34, - "h": 34 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 34, - "h": 34 - }, - "frame": { - "x": 167, - "y": 0, - "w": 34, - "h": 34 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 32, - "w": 32, - "h": 34 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 34 - }, - "frame": { - "x": 32, - "y": 33, - "w": 34, - "h": 34 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 34 - }, - "frame": { - "x": 32, - "y": 33, - "w": 34, - "h": 34 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 34 - }, - "frame": { - "x": 32, - "y": 33, - "w": 34, - "h": 34 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 34 - }, - "frame": { - "x": 32, - "y": 33, - "w": 34, - "h": 34 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 34 - }, - "frame": { - "x": 32, - "y": 33, - "w": 34, - "h": 34 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 66, - "y": 33, - "w": 34, - "h": 35 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 66, - "y": 33, - "w": 34, - "h": 35 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 66, - "y": 33, - "w": 34, - "h": 35 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 66, - "y": 33, - "w": 34, - "h": 35 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 66, - "y": 33, - "w": 34, - "h": 35 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 66, - "y": 33, - "w": 34, - "h": 35 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 66, - "y": 33, - "w": 34, - "h": 35 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 66, - "y": 33, - "w": 34, - "h": 35 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 66, - "y": 33, - "w": 34, - "h": 35 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 33, - "h": 35 - }, - "frame": { - "x": 100, - "y": 33, - "w": 33, - "h": 35 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 133, - "y": 34, - "w": 34, - "h": 35 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 133, - "y": 34, - "w": 34, - "h": 35 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 133, - "y": 34, - "w": 34, - "h": 35 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 133, - "y": 34, - "w": 34, - "h": 35 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 133, - "y": 34, - "w": 34, - "h": 35 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 167, - "y": 34, - "w": 34, - "h": 35 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 167, - "y": 34, - "w": 34, - "h": 35 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 167, - "y": 34, - "w": 34, - "h": 35 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 167, - "y": 34, - "w": 34, - "h": 35 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 167, - "y": 34, - "w": 34, - "h": 35 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 35 - }, - "frame": { - "x": 0, - "y": 67, - "w": 34, - "h": 35 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 35 - }, - "frame": { - "x": 0, - "y": 67, - "w": 34, - "h": 35 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 35 - }, - "frame": { - "x": 0, - "y": 67, - "w": 34, - "h": 35 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 35 - }, - "frame": { - "x": 0, - "y": 67, - "w": 34, - "h": 35 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 35 - }, - "frame": { - "x": 0, - "y": 67, - "w": 34, - "h": 35 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 34, - "y": 68, - "w": 34, - "h": 35 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 34, - "y": 68, - "w": 34, - "h": 35 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 34, - "y": 68, - "w": 34, - "h": 35 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 34, - "y": 68, - "w": 34, - "h": 35 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 34, - "h": 35 - }, - "frame": { - "x": 34, - "y": 68, - "w": 34, - "h": 35 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 33, - "h": 35 - }, - "frame": { - "x": 68, - "y": 68, - "w": 33, - "h": 35 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 36 - }, - "frame": { - "x": 101, - "y": 69, - "w": 34, - "h": 36 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 36 - }, - "frame": { - "x": 101, - "y": 69, - "w": 34, - "h": 36 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 36 - }, - "frame": { - "x": 101, - "y": 69, - "w": 34, - "h": 36 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 36 - }, - "frame": { - "x": 101, - "y": 69, - "w": 34, - "h": 36 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 36 - }, - "frame": { - "x": 101, - "y": 69, - "w": 34, - "h": 36 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 33, - "h": 36 - }, - "frame": { - "x": 135, - "y": 69, - "w": 33, - "h": 36 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 33, - "h": 36 - }, - "frame": { - "x": 168, - "y": 69, - "w": 33, - "h": 36 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 36 - }, - "frame": { - "x": 0, - "y": 102, - "w": 34, - "h": 36 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 34, - "h": 36 - }, - "frame": { - "x": 34, - "y": 103, - "w": 34, - "h": 36 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 33, - "h": 37 - }, - "frame": { - "x": 68, - "y": 103, - "w": 33, - "h": 37 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 34, - "h": 39 - }, - "frame": { - "x": 101, - "y": 105, - "w": 34, - "h": 39 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 31, - "h": 40 - }, - "frame": { - "x": 135, - "y": 105, - "w": 31, - "h": 40 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 31, - "h": 41 - }, - "frame": { - "x": 166, - "y": 105, - "w": 31, - "h": 41 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 32, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 32, - "h": 42 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 32, - "h": 42 - }, - "frame": { - "x": 32, - "y": 139, - "w": 32, - "h": 42 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 31, - "h": 42 - }, - "frame": { - "x": 64, - "y": 140, - "w": 31, - "h": 42 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 31, - "h": 42 - }, - "frame": { - "x": 95, - "y": 144, - "w": 31, - "h": 42 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 32, - "h": 43 - }, - "frame": { - "x": 126, - "y": 145, - "w": 32, - "h": 43 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 34, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 31, - "h": 43 - }, - "frame": { - "x": 158, - "y": 146, - "w": 31, - "h": 43 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:5076cf3500c6d9392a3e656db2bcf661:8a870f3a4f8085495687c4af91e0de7e:9c4d208e6c2f857bfb0b23b8eea3326c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 131, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 37, "y": 83, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 109, "y": 117, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 35, "y": 119, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 35, "y": 154, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 71, "y": 156, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 167, "y": 43, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 71, "y": 121, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 141, "y": 158, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 73, "y": 85, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 131, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 37, "y": 83, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 109, "y": 117, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 35, "y": 119, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 35, "y": 154, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 71, "y": 156, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 167, "y": 43, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 71, "y": 121, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 141, "y": 158, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 73, "y": 85, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 131, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 37, "y": 83, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 109, "y": 117, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 35, "y": 119, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 35, "y": 154, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 71, "y": 156, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 167, "y": 43, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 71, "y": 121, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 141, "y": 158, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 73, "y": 85, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 131, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 37, "y": 83, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 109, "y": 117, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 35, "y": 119, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 35, "y": 154, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 71, "y": 156, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 167, "y": 43, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 71, "y": 121, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 141, "y": 158, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 73, "y": 85, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 131, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 37, "y": 83, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 109, "y": 117, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 35, "y": 119, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 35, "y": 154, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 71, "y": 156, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 167, "y": 43, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 71, "y": 121, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 141, "y": 158, "w": 34, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 73, "y": 85, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 200 + }, + { + "filename": "0057.png", + "frame": { "x": 67, "y": 1, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 33, "h": 38 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 1, "y": 1, "w": 31, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 31, "h": 41 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 34, "y": 1, "w": 31, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 31, "h": 41 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 102, "y": 1, "w": 31, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 31, "h": 40 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 167, "y": 1, "w": 30, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 30, "h": 40 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 167, "y": 80, "w": 30, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 39 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 67, "y": 41, "w": 30, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 40 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 135, "y": 1, "w": 30, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 30, "h": 41 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 99, "y": 43, "w": 30, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 30, "h": 40 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 1, "y": 155, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 107, "y": 189, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 32, "h": 32 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 1, "y": 191, "w": 31, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 16, "w": 31, "h": 31 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 69, "y": 190, "w": 31, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 31, "h": 33 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 35, "y": 188, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 750 + }, + { + "filename": "0071.png", + "frame": { "x": 145, "y": 121, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 1, "y": 117, "w": 32, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 36 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 107, "y": 152, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 1, "y": 44, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 131, "y": 44, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 1, "y": 81, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 }, + "sourceSize": { "w": 34, "h": 47 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "656.png", + "format": "I8", + "size": { "w": 202, "h": 224 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/656.png b/public/images/pokemon/exp/back/shiny/656.png index 47b18020ffe..0c974e52a98 100644 Binary files a/public/images/pokemon/exp/back/shiny/656.png and b/public/images/pokemon/exp/back/shiny/656.png differ diff --git a/public/images/pokemon/exp/back/shiny/661.json b/public/images/pokemon/exp/back/shiny/661.json index 1199eaead4b..be82a4ce425 100644 --- a/public/images/pokemon/exp/back/shiny/661.json +++ b/public/images/pokemon/exp/back/shiny/661.json @@ -1,356 +1,398 @@ -{ - "textures": [ - { - "image": "661.png", - "format": "RGBA8888", - "size": { - "w": 68, - "h": 68 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 34 - }, - "frame": { - "x": 32, - "y": 34, - "w": 32, - "h": 34 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:622c17fd3933b7d7d1eddb422fc24fc5:684446320bdfd8fa492ed28395182fcc:186d621a544ea0e0e2e0bd57975a29b1$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 117, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 39, "w": 34, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0004.png", + "frame": { "x": 105, "y": 36, "w": 35, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0005.png", + "frame": { "x": 33, "y": 118, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0006.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0007.png", + "frame": { "x": 68, "y": 75, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0008.png", + "frame": { "x": 35, "y": 0, "w": 34, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 78, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0011.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 117, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0013.png", + "frame": { "x": 34, "y": 40, "w": 34, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0014.png", + "frame": { "x": 69, "y": 37, "w": 35, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0015.png", + "frame": { "x": 33, "y": 118, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0016.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0017.png", + "frame": { "x": 68, "y": 75, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0018.png", + "frame": { "x": 35, "y": 0, "w": 34, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 78, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0021.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 117, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0023.png", + "frame": { "x": 34, "y": 40, "w": 34, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0024.png", + "frame": { "x": 69, "y": 37, "w": 35, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0025.png", + "frame": { "x": 33, "y": 118, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0026.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0027.png", + "frame": { "x": 68, "y": 75, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0028.png", + "frame": { "x": 35, "y": 0, "w": 34, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0029.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 78, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0031.png", + "frame": { "x": 66, "y": 114, "w": 33, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0032.png", + "frame": { "x": 33, "y": 79, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0033.png", + "frame": { "x": 33, "y": 79, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0034.png", + "frame": { "x": 101, "y": 112, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 34, "h": 37 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0035.png", + "frame": { "x": 69, "y": 0, "w": 36, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0036.png", + "frame": { "x": 105, "y": 0, "w": 37, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0037.png", + "frame": { "x": 69, "y": 0, "w": 36, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0038.png", + "frame": { "x": 105, "y": 0, "w": 37, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0039.png", + "frame": { "x": 69, "y": 0, "w": 36, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0040.png", + "frame": { "x": 105, "y": 0, "w": 37, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0041.png", + "frame": { "x": 69, "y": 0, "w": 36, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0042.png", + "frame": { "x": 104, "y": 74, "w": 34, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 34, "h": 38 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + }, + { + "filename": "0043.png", + "frame": { "x": 33, "y": 79, "w": 33, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 }, + "sourceSize": { "w": 38, "h": 40 }, + "duration": 120 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "661.png", + "format": "I8", + "size": { "w": 142, "h": 156 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/661.png b/public/images/pokemon/exp/back/shiny/661.png index a76bde31ab3..a38de0cabe4 100644 Binary files a/public/images/pokemon/exp/back/shiny/661.png and b/public/images/pokemon/exp/back/shiny/661.png differ diff --git a/public/images/pokemon/exp/back/shiny/662.json b/public/images/pokemon/exp/back/shiny/662.json index f2154fb0de0..52cc70bbe5d 100644 --- a/public/images/pokemon/exp/back/shiny/662.json +++ b/public/images/pokemon/exp/back/shiny/662.json @@ -1,671 +1,254 @@ -{ - "textures": [ - { - "image": "662.png", - "format": "RGBA8888", - "size": { - "w": 154, - "h": 154 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 2, - "y": 16, - "w": 56, - "h": 37 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 37 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 2, - "y": 16, - "w": 56, - "h": 37 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 37 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 2, - "y": 16, - "w": 56, - "h": 37 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 37 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 2, - "y": 16, - "w": 56, - "h": 37 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 37 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 8, - "y": 17, - "w": 49, - "h": 48 - }, - "frame": { - "x": 56, - "y": 0, - "w": 49, - "h": 48 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 8, - "y": 17, - "w": 49, - "h": 48 - }, - "frame": { - "x": 56, - "y": 0, - "w": 49, - "h": 48 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 8, - "y": 17, - "w": 49, - "h": 48 - }, - "frame": { - "x": 105, - "y": 0, - "w": 49, - "h": 48 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 8, - "y": 17, - "w": 49, - "h": 48 - }, - "frame": { - "x": 105, - "y": 0, - "w": 49, - "h": 48 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 50 - }, - "frame": { - "x": 0, - "y": 48, - "w": 57, - "h": 50 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 50 - }, - "frame": { - "x": 0, - "y": 48, - "w": 57, - "h": 50 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 50 - }, - "frame": { - "x": 0, - "y": 48, - "w": 57, - "h": 50 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 50 - }, - "frame": { - "x": 0, - "y": 48, - "w": 57, - "h": 50 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 51 - }, - "frame": { - "x": 57, - "y": 48, - "w": 57, - "h": 51 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 51 - }, - "frame": { - "x": 57, - "y": 48, - "w": 57, - "h": 51 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 51 - }, - "frame": { - "x": 57, - "y": 48, - "w": 57, - "h": 51 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 51 - }, - "frame": { - "x": 57, - "y": 48, - "w": 57, - "h": 51 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 57, - "h": 52 - }, - "frame": { - "x": 0, - "y": 98, - "w": 57, - "h": 52 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 57, - "h": 52 - }, - "frame": { - "x": 57, - "y": 99, - "w": 57, - "h": 52 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 57, - "h": 52 - }, - "frame": { - "x": 57, - "y": 99, - "w": 57, - "h": 52 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 57, - "h": 52 - }, - "frame": { - "x": 57, - "y": 99, - "w": 57, - "h": 52 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 57, - "h": 52 - }, - "frame": { - "x": 57, - "y": 99, - "w": 57, - "h": 52 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:14a51ba69bd1aad179c85e117e323d5e:a3d65c092dec9149a9e5c39aed3a7dc3:e3da2dd0277c18bcc713dc6dd2460c87$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 70, "w": 53, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 16, "w": 53, "h": 62 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 212, "y": 70, "w": 52, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 18, "w": 52, "h": 63 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 247, "y": 204, "w": 46, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 36, "w": 46, "h": 51 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 1, "y": 196, "w": 49, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 33, "w": 49, "h": 49 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 56, "y": 1, "w": 56, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 56, "h": 65 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 224, "y": 1, "w": 52, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 52, "h": 68 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 107, "y": 68, "w": 48, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 48, "h": 69 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 277, "y": 1, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 12, "w": 51, "h": 68 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 113, "y": 1, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 18, "w": 55, "h": 66 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 48, "y": 249, "w": 44, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 31, "w": 44, "h": 50 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 191, "y": 248, "w": 47, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 27, "w": 47, "h": 49 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 169, "y": 1, "w": 54, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 54, "h": 67 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 101, "y": 208, "w": 45, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 18, "w": 45, "h": 51 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 1, "y": 246, "w": 46, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 13, "w": 46, "h": 51 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 1, "y": 1, "w": 54, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 54, "h": 68 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 56, "y": 67, "w": 50, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 50, "h": 69 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 265, "y": 70, "w": 47, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 47, "h": 69 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 102, "y": 138, "w": 44, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 11, "w": 44, "h": 69 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 147, "y": 193, "w": 43, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 14, "w": 43, "h": 69 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 191, "y": 199, "w": 55, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 31, "w": 55, "h": 48 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 51, "y": 200, "w": 49, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 27, "w": 49, "h": 48 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 156, "y": 69, "w": 55, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 55, "h": 60 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 1, "y": 133, "w": 50, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 6, "w": 50, "h": 62 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 208, "y": 134, "w": 48, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 48, "h": 64 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 257, "y": 140, "w": 48, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 48, "h": 63 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 52, "y": 137, "w": 49, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 49, "h": 62 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 156, "y": 130, "w": 51, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 13, "w": 51, "h": 62 }, + "sourceSize": { "w": 70, "h": 87 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "662.png", + "format": "I8", + "size": { "w": 329, "h": 300 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/662.png b/public/images/pokemon/exp/back/shiny/662.png index e662b3198a6..b914dac31b1 100644 Binary files a/public/images/pokemon/exp/back/shiny/662.png and b/public/images/pokemon/exp/back/shiny/662.png differ diff --git a/public/images/pokemon/exp/back/shiny/663.json b/public/images/pokemon/exp/back/shiny/663.json index d464b333f20..48526624362 100644 --- a/public/images/pokemon/exp/back/shiny/663.json +++ b/public/images/pokemon/exp/back/shiny/663.json @@ -1,1700 +1,731 @@ -{ - "textures": [ - { - "image": "663.png", - "format": "RGBA8888", - "size": { - "w": 302, - "h": 302 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 33, - "w": 103, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 103, - "h": 59 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 33, - "w": 103, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 103, - "h": 59 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 33, - "w": 103, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 103, - "h": 59 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 33, - "w": 103, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 103, - "h": 59 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 33, - "w": 103, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 103, - "h": 59 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 33, - "w": 103, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 103, - "h": 59 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 33, - "w": 103, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 103, - "h": 59 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 33, - "w": 103, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 103, - "h": 59 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 33, - "w": 103, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 103, - "h": 59 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 33, - "w": 103, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 103, - "h": 59 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 29, - "w": 112, - "h": 60 - }, - "frame": { - "x": 103, - "y": 0, - "w": 112, - "h": 60 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 29, - "w": 112, - "h": 60 - }, - "frame": { - "x": 103, - "y": 0, - "w": 112, - "h": 60 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 29, - "w": 112, - "h": 60 - }, - "frame": { - "x": 103, - "y": 0, - "w": 112, - "h": 60 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 29, - "w": 112, - "h": 60 - }, - "frame": { - "x": 103, - "y": 0, - "w": 112, - "h": 60 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 29, - "w": 112, - "h": 60 - }, - "frame": { - "x": 103, - "y": 0, - "w": 112, - "h": 60 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 29, - "w": 112, - "h": 60 - }, - "frame": { - "x": 103, - "y": 0, - "w": 112, - "h": 60 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 84, - "h": 93 - }, - "frame": { - "x": 215, - "y": 0, - "w": 84, - "h": 93 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 84, - "h": 93 - }, - "frame": { - "x": 215, - "y": 0, - "w": 84, - "h": 93 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 84, - "h": 93 - }, - "frame": { - "x": 215, - "y": 0, - "w": 84, - "h": 93 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 84, - "h": 93 - }, - "frame": { - "x": 215, - "y": 0, - "w": 84, - "h": 93 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 84, - "h": 93 - }, - "frame": { - "x": 215, - "y": 0, - "w": 84, - "h": 93 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 84, - "h": 93 - }, - "frame": { - "x": 215, - "y": 0, - "w": 84, - "h": 93 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 84, - "h": 93 - }, - "frame": { - "x": 215, - "y": 0, - "w": 84, - "h": 93 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 84, - "h": 93 - }, - "frame": { - "x": 215, - "y": 0, - "w": 84, - "h": 93 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 84, - "h": 93 - }, - "frame": { - "x": 215, - "y": 0, - "w": 84, - "h": 93 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 84, - "h": 93 - }, - "frame": { - "x": 215, - "y": 0, - "w": 84, - "h": 93 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 29, - "w": 112, - "h": 62 - }, - "frame": { - "x": 0, - "y": 60, - "w": 112, - "h": 62 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 29, - "w": 112, - "h": 62 - }, - "frame": { - "x": 0, - "y": 60, - "w": 112, - "h": 62 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 29, - "w": 112, - "h": 62 - }, - "frame": { - "x": 0, - "y": 60, - "w": 112, - "h": 62 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 29, - "w": 112, - "h": 62 - }, - "frame": { - "x": 0, - "y": 60, - "w": 112, - "h": 62 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 29, - "w": 112, - "h": 62 - }, - "frame": { - "x": 0, - "y": 60, - "w": 112, - "h": 62 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 29, - "w": 112, - "h": 62 - }, - "frame": { - "x": 0, - "y": 60, - "w": 112, - "h": 62 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 98, - "h": 90 - }, - "frame": { - "x": 112, - "y": 60, - "w": 98, - "h": 90 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 98, - "h": 90 - }, - "frame": { - "x": 112, - "y": 60, - "w": 98, - "h": 90 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 98, - "h": 90 - }, - "frame": { - "x": 112, - "y": 60, - "w": 98, - "h": 90 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 98, - "h": 90 - }, - "frame": { - "x": 112, - "y": 60, - "w": 98, - "h": 90 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 98, - "h": 90 - }, - "frame": { - "x": 112, - "y": 60, - "w": 98, - "h": 90 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 98, - "h": 90 - }, - "frame": { - "x": 112, - "y": 60, - "w": 98, - "h": 90 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 92, - "h": 93 - }, - "frame": { - "x": 210, - "y": 93, - "w": 92, - "h": 93 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 28, - "w": 109, - "h": 65 - }, - "frame": { - "x": 0, - "y": 122, - "w": 109, - "h": 65 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 28, - "w": 109, - "h": 65 - }, - "frame": { - "x": 0, - "y": 122, - "w": 109, - "h": 65 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 28, - "w": 109, - "h": 65 - }, - "frame": { - "x": 0, - "y": 122, - "w": 109, - "h": 65 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 28, - "w": 109, - "h": 65 - }, - "frame": { - "x": 0, - "y": 122, - "w": 109, - "h": 65 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 28, - "w": 109, - "h": 65 - }, - "frame": { - "x": 0, - "y": 122, - "w": 109, - "h": 65 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 28, - "w": 109, - "h": 65 - }, - "frame": { - "x": 0, - "y": 122, - "w": 109, - "h": 65 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 28, - "w": 109, - "h": 65 - }, - "frame": { - "x": 0, - "y": 122, - "w": 109, - "h": 65 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 28, - "w": 109, - "h": 65 - }, - "frame": { - "x": 0, - "y": 122, - "w": 109, - "h": 65 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 28, - "w": 109, - "h": 65 - }, - "frame": { - "x": 0, - "y": 122, - "w": 109, - "h": 65 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 1, - "y": 28, - "w": 109, - "h": 65 - }, - "frame": { - "x": 0, - "y": 122, - "w": 109, - "h": 65 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 97, - "h": 91 - }, - "frame": { - "x": 109, - "y": 150, - "w": 97, - "h": 91 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 97, - "h": 91 - }, - "frame": { - "x": 109, - "y": 150, - "w": 97, - "h": 91 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 97, - "h": 91 - }, - "frame": { - "x": 109, - "y": 150, - "w": 97, - "h": 91 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 97, - "h": 91 - }, - "frame": { - "x": 109, - "y": 150, - "w": 97, - "h": 91 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 97, - "h": 91 - }, - "frame": { - "x": 109, - "y": 150, - "w": 97, - "h": 91 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 97, - "h": 91 - }, - "frame": { - "x": 109, - "y": 150, - "w": 97, - "h": 91 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 97, - "h": 91 - }, - "frame": { - "x": 109, - "y": 150, - "w": 97, - "h": 91 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 97, - "h": 91 - }, - "frame": { - "x": 109, - "y": 150, - "w": 97, - "h": 91 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 97, - "h": 91 - }, - "frame": { - "x": 109, - "y": 150, - "w": 97, - "h": 91 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 97, - "h": 91 - }, - "frame": { - "x": 109, - "y": 150, - "w": 97, - "h": 91 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 105, - "h": 83 - }, - "frame": { - "x": 0, - "y": 187, - "w": 105, - "h": 83 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 105, - "h": 83 - }, - "frame": { - "x": 0, - "y": 187, - "w": 105, - "h": 83 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 105, - "h": 83 - }, - "frame": { - "x": 0, - "y": 187, - "w": 105, - "h": 83 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 105, - "h": 83 - }, - "frame": { - "x": 0, - "y": 187, - "w": 105, - "h": 83 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 105, - "h": 83 - }, - "frame": { - "x": 0, - "y": 187, - "w": 105, - "h": 83 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 105, - "h": 83 - }, - "frame": { - "x": 0, - "y": 187, - "w": 105, - "h": 83 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 105, - "h": 83 - }, - "frame": { - "x": 0, - "y": 187, - "w": 105, - "h": 83 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 105, - "h": 83 - }, - "frame": { - "x": 0, - "y": 187, - "w": 105, - "h": 83 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 105, - "h": 83 - }, - "frame": { - "x": 0, - "y": 187, - "w": 105, - "h": 83 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 116, - "h": 93 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 105, - "h": 83 - }, - "frame": { - "x": 0, - "y": 187, - "w": 105, - "h": 83 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:cee80289834c8acf0ea6d754131cf471:08d47f0b9be8c73bf8d3f74f4dc0a00d:3790d8d72a704a789cc594688d98802e$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0003.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0004.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0006.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0008.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0009.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0010.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0013.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0014.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0016.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0018.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0019.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0020.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0023.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0024.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0026.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0028.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0029.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0030.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0033.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0034.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0036.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0038.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0039.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0040.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0043.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0044.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0045.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0046.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0048.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0049.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0050.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0053.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0054.png", + "frame": { "x": 276, "y": 92, "w": 111, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0056.png", + "frame": { "x": 276, "y": 153, "w": 110, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0058.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0059.png", + "frame": { "x": 298, "y": 0, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0060.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0062.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0064.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0065.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0067.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0070.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0072.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0075.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 0, "w": 95, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0077.png", + "frame": { "x": 193, "y": 0, "w": 104, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 90, "w": 107, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 155, "w": 101, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0080.png", + "frame": { "x": 193, "y": 82, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "663.png", + "format": "I8", + "size": { "w": 388, "h": 212 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/663.png b/public/images/pokemon/exp/back/shiny/663.png index bb8a7a63b47..ddb4658f34f 100644 Binary files a/public/images/pokemon/exp/back/shiny/663.png and b/public/images/pokemon/exp/back/shiny/663.png differ diff --git a/public/images/pokemon/exp/back/shiny/664.json b/public/images/pokemon/exp/back/shiny/664.json index 737a874aeef..61c85d30239 100644 --- a/public/images/pokemon/exp/back/shiny/664.json +++ b/public/images/pokemon/exp/back/shiny/664.json @@ -1,104 +1,110 @@ -{ - "textures": [ - { - "image": "664.png", - "format": "RGBA8888", - "size": { - "w": 72, - "h": 72 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 24, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 24, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 24, - "h": 44 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 24, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 24, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 24, - "h": 44 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 24, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 24, - "h": 44 - }, - "frame": { - "x": 24, - "y": 0, - "w": 24, - "h": 44 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 24, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 24, - "h": 42 - }, - "frame": { - "x": 48, - "y": 0, - "w": 24, - "h": 42 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:601a4fb542614963fb9749e3339712b0:f6208a116912601a698682c3723dc18c:596e7d5b15b1bf041c4d7f6707c8ff49$" - } -} \ No newline at end of file +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 54, "y": 49, "w": 26, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 26, "h": 49 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 80, "y": 96, "w": 26, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 26, "h": 48 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 97, "w": 26, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 26, "h": 48 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 49, "w": 27, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 27, "h": 48 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 26, "y": 97, "w": 26, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 47 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 80, "y": 49, "w": 27, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 27, "h": 47 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 27, "y": 49, "w": 27, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 27, "h": 48 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 28, "y": 0, "w": 27, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 49 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 55, "y": 0, "w": 27, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 49 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 28, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 49 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 82, "y": 0, "w": 27, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 27, "h": 49 }, + "sourceSize": { "w": 28, "h": 49 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "664.png", + "format": "I8", + "size": { "w": 109, "h": 145 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/shiny/664.png b/public/images/pokemon/exp/back/shiny/664.png index 84657407fb6..ad6b46a574e 100644 Binary files a/public/images/pokemon/exp/back/shiny/664.png and b/public/images/pokemon/exp/back/shiny/664.png differ diff --git a/public/images/pokemon/exp/back/shiny/665.json b/public/images/pokemon/exp/back/shiny/665.json index 74db8ba58cd..fe2659dbf6d 100644 --- a/public/images/pokemon/exp/back/shiny/665.json +++ b/public/images/pokemon/exp/back/shiny/665.json @@ -1,188 +1,596 @@ -{ - "textures": [ - { - "image": "665.png", - "format": "RGBA8888", - "size": { - "w": 107, - "h": 107 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 38, - "h": 36 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 38, - "h": 36 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 38, - "h": 36 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 35 - }, - "frame": { - "x": 0, - "y": 72, - "w": 38, - "h": 35 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 36 - }, - "frame": { - "x": 38, - "y": 0, - "w": 37, - "h": 36 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 36 - }, - "frame": { - "x": 38, - "y": 36, - "w": 37, - "h": 36 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 35 - }, - "frame": { - "x": 38, - "y": 72, - "w": 38, - "h": 35 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:33adc9cf726011c23993f48b34d8072e:5df22173a3e399c0e4fd7f67a42a829c:a72e6c94514c750d7462eab6b08ee591$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 262, "y": 102, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 262, "y": 102, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 262, "y": 102, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 120, "y": 101, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 71, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 358, "y": 69, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 86, "y": 73, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 160, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 290, "y": 67, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 160, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 47, "y": 40, "w": 39, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 5, "w": 39, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 343, "y": 34, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 5, "w": 45, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 227, "y": 33, "w": 63, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 63, "h": 36 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 80, "y": 0, "w": 74, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 74, "h": 40 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 154, "y": 0, "w": 81, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 81, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 235, "y": 0, "w": 81, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 81, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 0, "w": 80, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 38 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 154, "y": 33, "w": 73, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 73, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 316, "y": 0, "w": 73, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 73, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 290, "y": 34, "w": 53, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 7, "w": 53, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 38, "w": 47, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 7, "w": 47, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 86, "y": 40, "w": 40, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 40, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 156, "y": 101, "w": 34, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 7, "w": 34, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 36, "y": 75, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 194, "y": 69, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 228, "y": 69, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 324, "y": 69, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 126, "y": 66, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "665.png", + "format": "I8", + "size": { "w": 394, "h": 134 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/665.png b/public/images/pokemon/exp/back/shiny/665.png index 098b20d3d82..6b8ae18d7a0 100644 Binary files a/public/images/pokemon/exp/back/shiny/665.png and b/public/images/pokemon/exp/back/shiny/665.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-archipelago.json b/public/images/pokemon/exp/back/shiny/666-archipelago.json index 5207ba45af5..817696f70a1 100644 --- a/public/images/pokemon/exp/back/shiny/666-archipelago.json +++ b/public/images/pokemon/exp/back/shiny/666-archipelago.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-archipelago.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 42, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d3b3934e858033f670ae2a24ec4d347a:f014942f9212da6fadbc8a0c94f2dc11:80cdb6dd219378a41ccf5c2acc7e7786$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-archipelago.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-archipelago.png b/public/images/pokemon/exp/back/shiny/666-archipelago.png index cfc3f0012b6..ada5bd02bdb 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-archipelago.png and b/public/images/pokemon/exp/back/shiny/666-archipelago.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-continental.json b/public/images/pokemon/exp/back/shiny/666-continental.json index a20a1baa32b..fc21deb6978 100644 --- a/public/images/pokemon/exp/back/shiny/666-continental.json +++ b/public/images/pokemon/exp/back/shiny/666-continental.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-continental.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 46, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:06c65586a6c76ae16868407b3530cc3e:c9740628cc5f7aa0301821f74d9d2e17:23aaac2256d564b9d8a58d7de70397c3$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-continental.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-continental.png b/public/images/pokemon/exp/back/shiny/666-continental.png index 80fdfbd42fe..a70b86e6f4e 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-continental.png and b/public/images/pokemon/exp/back/shiny/666-continental.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-elegant.json b/public/images/pokemon/exp/back/shiny/666-elegant.json index e4372fe6e79..35c20315153 100644 --- a/public/images/pokemon/exp/back/shiny/666-elegant.json +++ b/public/images/pokemon/exp/back/shiny/666-elegant.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-elegant.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 44, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 44, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 44, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2f5780697c633c5f2db2d90012b0bfaa:3df5d06e71f1f48664b1d3f70b589ce5:d6b035048c66474f6236a3bc923faa7b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-elegant.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-elegant.png b/public/images/pokemon/exp/back/shiny/666-elegant.png index a63ccd8a4fd..f1493354831 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-elegant.png and b/public/images/pokemon/exp/back/shiny/666-elegant.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-fancy.json b/public/images/pokemon/exp/back/shiny/666-fancy.json index da0238946be..54113df4b51 100644 --- a/public/images/pokemon/exp/back/shiny/666-fancy.json +++ b/public/images/pokemon/exp/back/shiny/666-fancy.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-fancy.png", - "format": "RGBA8888", - "size": { - "w": 133, - "h": 133 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 65, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 65, - "h": 66 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 69 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 41, - "h": 67 - }, - "frame": { - "x": 65, - "y": 0, - "w": 41, - "h": 67 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 69 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 41, - "h": 67 - }, - "frame": { - "x": 0, - "y": 66, - "w": 41, - "h": 67 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 65, - "h": 66 - }, - "frame": { - "x": 41, - "y": 67, - "w": 65, - "h": 66 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f6d28d4fec94007c70d1812b69e8c9a4:cff02079419826e1cb2148e331588d89:6d5edff9a806f43feff031c9919c9aca$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-fancy.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-fancy.png b/public/images/pokemon/exp/back/shiny/666-fancy.png index c84443bbe4e..6a50c5817a8 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-fancy.png and b/public/images/pokemon/exp/back/shiny/666-fancy.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-garden.json b/public/images/pokemon/exp/back/shiny/666-garden.json index 1a44f773e4f..4fcc5ab0ad1 100644 --- a/public/images/pokemon/exp/back/shiny/666-garden.json +++ b/public/images/pokemon/exp/back/shiny/666-garden.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-garden.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 42, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b8e1d103e0e6ac306d2c8f447067ec3c:8483540406726b13fa42ad566b4f6991:f13a1a8fa0a411aa91fccb833ac8719c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-garden.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-garden.png b/public/images/pokemon/exp/back/shiny/666-garden.png index b37c6f8c84e..92214cc4d75 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-garden.png and b/public/images/pokemon/exp/back/shiny/666-garden.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-high-plains.json b/public/images/pokemon/exp/back/shiny/666-high-plains.json index 898cbf94515..56a90a01899 100644 --- a/public/images/pokemon/exp/back/shiny/666-high-plains.json +++ b/public/images/pokemon/exp/back/shiny/666-high-plains.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-high-plains.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:6a10c59dc5b4abef78a2379364bae874:239b86e13316e6d8fc74b42cc7f657d9:2abdb5d19b2754e3daa24b6ff3ed2c2c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-high-plains.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-high-plains.png b/public/images/pokemon/exp/back/shiny/666-high-plains.png index e23f879af0c..80e02eede13 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-high-plains.png and b/public/images/pokemon/exp/back/shiny/666-high-plains.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-icy-snow.json b/public/images/pokemon/exp/back/shiny/666-icy-snow.json index 4922c7c1fb6..b44f33bb07f 100644 --- a/public/images/pokemon/exp/back/shiny/666-icy-snow.json +++ b/public/images/pokemon/exp/back/shiny/666-icy-snow.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-icy-snow.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a19b20c8ff121729b5b9dfb470e1e166:abf786c03cda88b39336d9172fd788ec:fb1e8b97806dc5c60ac6adf0ae48199b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-icy-snow.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-icy-snow.png b/public/images/pokemon/exp/back/shiny/666-icy-snow.png index 2ba96cc9ac3..1fe8305f068 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-icy-snow.png and b/public/images/pokemon/exp/back/shiny/666-icy-snow.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-jungle.json b/public/images/pokemon/exp/back/shiny/666-jungle.json index 17254038662..51876d649da 100644 --- a/public/images/pokemon/exp/back/shiny/666-jungle.json +++ b/public/images/pokemon/exp/back/shiny/666-jungle.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-jungle.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4318d523b7ff0df47aa749ed39d81402:f7d5cbe7029fecd1e518aa0501a8c8ba:c8686bcc5493911384853d54c85bfea1$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-jungle.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-jungle.png b/public/images/pokemon/exp/back/shiny/666-jungle.png index 3f1127f0265..1dbe65c02f2 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-jungle.png and b/public/images/pokemon/exp/back/shiny/666-jungle.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-marine.json b/public/images/pokemon/exp/back/shiny/666-marine.json index 5e89662d52f..a77fd76f1dd 100644 --- a/public/images/pokemon/exp/back/shiny/666-marine.json +++ b/public/images/pokemon/exp/back/shiny/666-marine.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-marine.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 42, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:df888a902e99f6aa55c8d9a1696f30ef:5e5db402df59c188bf1aaf4cc0b516d5:dc240f0acbf3d56fe8729dd1f703009f$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-marine.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-marine.png b/public/images/pokemon/exp/back/shiny/666-marine.png index 7e1a47124b9..1a69d6587da 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-marine.png and b/public/images/pokemon/exp/back/shiny/666-marine.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-meadow.json b/public/images/pokemon/exp/back/shiny/666-meadow.json index 54e872aee05..2c4a73b80cf 100644 --- a/public/images/pokemon/exp/back/shiny/666-meadow.json +++ b/public/images/pokemon/exp/back/shiny/666-meadow.json @@ -1,524 +1,119 @@ -{ - "textures": [ - { - "image": "666-meadow.png", - "format": "RGBA8888", - "size": { - "w": 234, - "h": 234 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 84, - "h": 86 - }, - "frame": { - "x": 135, - "y": 0, - "w": 84, - "h": 86 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 84, - "h": 86 - }, - "frame": { - "x": 135, - "y": 0, - "w": 84, - "h": 86 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 20, - "y": 0, - "w": 47, - "h": 85 - }, - "frame": { - "x": 187, - "y": 86, - "w": 47, - "h": 85 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 20, - "y": 0, - "w": 47, - "h": 85 - }, - "frame": { - "x": 187, - "y": 86, - "w": 47, - "h": 85 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:217e1d90eca71c8b95407de1c156a5e6:e2b23be3d14960d78059a46f5b83304a:f8ac4807b4d6eef2256fa1b93e0f89ba$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-meadow.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-meadow.png b/public/images/pokemon/exp/back/shiny/666-meadow.png index 2e8a64be5d4..1148fa5a620 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-meadow.png and b/public/images/pokemon/exp/back/shiny/666-meadow.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-modern.json b/public/images/pokemon/exp/back/shiny/666-modern.json index c60078bd8ce..e0a00da6d81 100644 --- a/public/images/pokemon/exp/back/shiny/666-modern.json +++ b/public/images/pokemon/exp/back/shiny/666-modern.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-modern.png", - "format": "RGBA8888", - "size": { - "w": 132, - "h": 132 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 69 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 40, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 67 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 69 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 40, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 67 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 65, - "h": 66 - }, - "frame": { - "x": 40, - "y": 0, - "w": 65, - "h": 66 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 65, - "h": 66 - }, - "frame": { - "x": 40, - "y": 66, - "w": 65, - "h": 66 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:854759536c0175b34e9ed7b2513e55dd:9fbbae33832e3b62152c5bae85714a7a:5fc0e8f9a0750c2f3cfb5d6e7eca0d45$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-modern.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-modern.png b/public/images/pokemon/exp/back/shiny/666-modern.png index f9654fbeb02..d9f109c8ef9 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-modern.png and b/public/images/pokemon/exp/back/shiny/666-modern.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-monsoon.json b/public/images/pokemon/exp/back/shiny/666-monsoon.json index 78130a47159..117fad03b83 100644 --- a/public/images/pokemon/exp/back/shiny/666-monsoon.json +++ b/public/images/pokemon/exp/back/shiny/666-monsoon.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-monsoon.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 42, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:dcde8c849851ea64b2ceed92a82153e1:5a97106b9193dc2cda01b0448d9f2637:637bea52b465abfb8e5a576310b4dacc$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-monsoon.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-monsoon.png b/public/images/pokemon/exp/back/shiny/666-monsoon.png index 5d87fc101a8..cc5279545d5 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-monsoon.png and b/public/images/pokemon/exp/back/shiny/666-monsoon.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-ocean.json b/public/images/pokemon/exp/back/shiny/666-ocean.json index 1bf44996eef..8d23d70cd31 100644 --- a/public/images/pokemon/exp/back/shiny/666-ocean.json +++ b/public/images/pokemon/exp/back/shiny/666-ocean.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-ocean.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:dc3f54a39a4afa0ea28913252050d7c1:d856dfe44678a2ee4dc3d367a6658ad3:e7a0e68eab89c2013a3eb7f3b6fc0b33$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-ocean.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-ocean.png b/public/images/pokemon/exp/back/shiny/666-ocean.png index 8c6aeca189a..caabd9302ea 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-ocean.png and b/public/images/pokemon/exp/back/shiny/666-ocean.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-poke-ball.json b/public/images/pokemon/exp/back/shiny/666-poke-ball.json index 5c8715a8a1e..45564e59a32 100644 --- a/public/images/pokemon/exp/back/shiny/666-poke-ball.json +++ b/public/images/pokemon/exp/back/shiny/666-poke-ball.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-poke-ball.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9df25dba5036e3cd48218e8de3a98074:4357b8b161f5f87776f4d39fcb3723f5:8ec14f129d1691b8da504a13b661abed$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-poke-ball.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-poke-ball.png b/public/images/pokemon/exp/back/shiny/666-poke-ball.png index 24907a5ef9f..30e2cbf8615 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-poke-ball.png and b/public/images/pokemon/exp/back/shiny/666-poke-ball.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-polar.json b/public/images/pokemon/exp/back/shiny/666-polar.json index ef69f49e390..abb6d0286f4 100644 --- a/public/images/pokemon/exp/back/shiny/666-polar.json +++ b/public/images/pokemon/exp/back/shiny/666-polar.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-polar.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 45, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 45, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 45, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 45, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 45, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:aab22d39518ad2f1b1621a5954e95674:958cacbba11b25f5b1e7fe9a9a40465d:eb7086e98f867c6592e4b161835da18b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-polar.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-polar.png b/public/images/pokemon/exp/back/shiny/666-polar.png index b2f00a2a6df..c9f4fe642ee 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-polar.png and b/public/images/pokemon/exp/back/shiny/666-polar.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-savanna.json b/public/images/pokemon/exp/back/shiny/666-savanna.json index 24638119724..8fa326da1b4 100644 --- a/public/images/pokemon/exp/back/shiny/666-savanna.json +++ b/public/images/pokemon/exp/back/shiny/666-savanna.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-savanna.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0c7fd4a8c1137a2566fabe2f53dac4c4:295a7bdde494b6106f9c73b649be6098:625a4f0dc001069326a75c6a381f93e6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-savanna.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-savanna.png b/public/images/pokemon/exp/back/shiny/666-savanna.png index 5fcf8bc6d28..a69c0c18ae1 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-savanna.png and b/public/images/pokemon/exp/back/shiny/666-savanna.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-sun.json b/public/images/pokemon/exp/back/shiny/666-sun.json index a2ccb3c82d8..d41f22f541c 100644 --- a/public/images/pokemon/exp/back/shiny/666-sun.json +++ b/public/images/pokemon/exp/back/shiny/666-sun.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-sun.png", - "format": "RGBA8888", - "size": { - "w": 135, - "h": 135 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 65, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 65, - "h": 67 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 70 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 41, - "h": 68 - }, - "frame": { - "x": 65, - "y": 0, - "w": 41, - "h": 68 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 70 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 41, - "h": 68 - }, - "frame": { - "x": 0, - "y": 67, - "w": 41, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 65, - "h": 67 - }, - "frame": { - "x": 41, - "y": 68, - "w": 65, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d1400564456ce432aab0ca4f263c336a:fba76efed9d6341c0b46301efd8cd8f5:8f5fdd0a698701f5391c5a3f67e303d6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-sun.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-sun.png b/public/images/pokemon/exp/back/shiny/666-sun.png index 28918f2b59a..3914a0fe350 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-sun.png and b/public/images/pokemon/exp/back/shiny/666-sun.png differ diff --git a/public/images/pokemon/exp/back/shiny/666-tundra.json b/public/images/pokemon/exp/back/shiny/666-tundra.json index 8361b7ca139..afa574f9e07 100644 --- a/public/images/pokemon/exp/back/shiny/666-tundra.json +++ b/public/images/pokemon/exp/back/shiny/666-tundra.json @@ -1,104 +1,119 @@ -{ - "textures": [ - { - "image": "666-tundra.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 46, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b87511ba7b272729aecbf5eb18fe65cc:383836b7b2902a470e150b17bdd9bcfc:9779ed3adebc298af537dd64dc25fe00$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 2, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 2, "y": 71, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 124, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 140, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 71, "y": 71, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 71, "y": 2, "w": 67, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 209, "y": 2, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 }, + "sourceSize": { "w": 67, "h": 73 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "666-tundra.png", + "format": "I8", + "size": { "w": 262, "h": 140 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/666-tundra.png b/public/images/pokemon/exp/back/shiny/666-tundra.png index c33fbf1fc65..78316df8a8f 100644 Binary files a/public/images/pokemon/exp/back/shiny/666-tundra.png and b/public/images/pokemon/exp/back/shiny/666-tundra.png differ diff --git a/public/images/pokemon/exp/back/shiny/667.json b/public/images/pokemon/exp/back/shiny/667.json index cf561f26e4f..db9918ea230 100644 --- a/public/images/pokemon/exp/back/shiny/667.json +++ b/public/images/pokemon/exp/back/shiny/667.json @@ -1,1532 +1,659 @@ -{ - "textures": [ - { - "image": "667.png", - "format": "RGBA8888", - "size": { - "w": 160, - "h": 160 - }, - "scale": 1, - "frames": [ - { - "filename": "0056.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 43, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 43, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 43, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 43, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 43, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 43, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 43, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 86, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 86, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 86, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 86, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 86, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 86, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 86, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 41, - "h": 47 - }, - "frame": { - "x": 0, - "y": 48, - "w": 41, - "h": 47 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 40, - "h": 47 - }, - "frame": { - "x": 41, - "y": 48, - "w": 40, - "h": 47 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 40, - "h": 47 - }, - "frame": { - "x": 41, - "y": 48, - "w": 40, - "h": 47 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 40, - "h": 47 - }, - "frame": { - "x": 41, - "y": 48, - "w": 40, - "h": 47 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 40, - "h": 47 - }, - "frame": { - "x": 41, - "y": 48, - "w": 40, - "h": 47 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 40, - "h": 47 - }, - "frame": { - "x": 41, - "y": 48, - "w": 40, - "h": 47 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 40, - "h": 47 - }, - "frame": { - "x": 41, - "y": 48, - "w": 40, - "h": 47 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 48, - "w": 40, - "h": 46 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 48, - "w": 40, - "h": 46 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 48, - "w": 40, - "h": 46 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 48, - "w": 40, - "h": 46 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 48, - "w": 40, - "h": 46 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 48, - "w": 40, - "h": 46 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 94, - "w": 40, - "h": 46 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 94, - "w": 40, - "h": 46 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 94, - "w": 40, - "h": 46 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 94, - "w": 40, - "h": 46 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 94, - "w": 40, - "h": 46 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 40, - "h": 46 - }, - "frame": { - "x": 81, - "y": 94, - "w": 40, - "h": 46 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 40, - "h": 45 - }, - "frame": { - "x": 0, - "y": 95, - "w": 40, - "h": 45 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 40, - "h": 45 - }, - "frame": { - "x": 0, - "y": 95, - "w": 40, - "h": 45 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 40, - "h": 45 - }, - "frame": { - "x": 0, - "y": 95, - "w": 40, - "h": 45 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 40, - "h": 45 - }, - "frame": { - "x": 0, - "y": 95, - "w": 40, - "h": 45 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 40, - "h": 45 - }, - "frame": { - "x": 0, - "y": 95, - "w": 40, - "h": 45 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 40, - "h": 45 - }, - "frame": { - "x": 0, - "y": 95, - "w": 40, - "h": 45 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 39, - "h": 45 - }, - "frame": { - "x": 40, - "y": 95, - "w": 39, - "h": 45 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 39, - "h": 45 - }, - "frame": { - "x": 40, - "y": 95, - "w": 39, - "h": 45 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 39, - "h": 45 - }, - "frame": { - "x": 40, - "y": 95, - "w": 39, - "h": 45 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 39, - "h": 45 - }, - "frame": { - "x": 40, - "y": 95, - "w": 39, - "h": 45 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 39, - "h": 45 - }, - "frame": { - "x": 40, - "y": 95, - "w": 39, - "h": 45 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 39, - "h": 45 - }, - "frame": { - "x": 40, - "y": 95, - "w": 39, - "h": 45 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 48, - "w": 39, - "h": 44 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 48, - "w": 39, - "h": 44 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 48, - "w": 39, - "h": 44 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 48, - "w": 39, - "h": 44 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 48, - "w": 39, - "h": 44 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 48, - "w": 39, - "h": 44 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 92, - "w": 39, - "h": 44 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 92, - "w": 39, - "h": 44 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 92, - "w": 39, - "h": 44 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 92, - "w": 39, - "h": 44 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 92, - "w": 39, - "h": 44 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 121, - "y": 92, - "w": 39, - "h": 44 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4fbaee798794f5f6bc216941c6d420d9:a27205da0cc7ce20d4a4422df81b9109:02171d511e760c8a3e1b623ad6bf93f5$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 127, "y": 47, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 85, "y": 48, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0049.png", + "frame": { "x": 40, "y": 94, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0050.png", + "frame": { "x": 79, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0051.png", + "frame": { "x": 118, "y": 94, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0052.png", + "frame": { "x": 40, "y": 49, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 49, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0054.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0055.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0056.png", + "frame": { "x": 85, "y": 0, "w": 41, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 41, "h": 47 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0058.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0060.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0062.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0064.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0066.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0068.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0070.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0071.png", + "frame": { "x": 85, "y": 0, "w": 41, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 41, "h": 47 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + }, + { + "filename": "0072.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 }, + "sourceSize": { "w": 43, "h": 48 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "667.png", + "format": "I8", + "size": { "w": 167, "h": 138 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/667.png b/public/images/pokemon/exp/back/shiny/667.png index eb8b7eb756f..d44bed5ee65 100644 Binary files a/public/images/pokemon/exp/back/shiny/667.png and b/public/images/pokemon/exp/back/shiny/667.png differ diff --git a/public/images/pokemon/exp/back/shiny/668.json b/public/images/pokemon/exp/back/shiny/668.json index cd1665c7fe7..594e69189dc 100644 --- a/public/images/pokemon/exp/back/shiny/668.json +++ b/public/images/pokemon/exp/back/shiny/668.json @@ -1,146 +1,821 @@ -{ - "textures": [ - { - "image": "668.png", - "format": "RGBA8888", - "size": { - "w": 146, - "h": 146 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 61 - }, - "frame": { - "x": 0, - "y": 0, - "w": 73, - "h": 61 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 61 - }, - "frame": { - "x": 73, - "y": 0, - "w": 73, - "h": 61 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 61 - }, - "frame": { - "x": 73, - "y": 0, - "w": 73, - "h": 61 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 73, - "h": 60 - }, - "frame": { - "x": 0, - "y": 61, - "w": 73, - "h": 60 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 73, - "h": 60 - }, - "frame": { - "x": 0, - "y": 61, - "w": 73, - "h": 60 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 73, - "h": 61 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 72, - "h": 59 - }, - "frame": { - "x": 73, - "y": 61, - "w": 72, - "h": 59 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0e20693ecfc704a58db8c8592fcdc9cc:659468d84f3cc98068a3454a7c68f1e4:947bf84d1af493c62e2cef45bb6c19ad$" - } -} \ No newline at end of file +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 152, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 303, "y": 221, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 383, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 233, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 459, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 315, "y": 0, "w": 76, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 387, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 392, "y": 0, "w": 75, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 237, "y": 0, "w": 77, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 79, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 158, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 75, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 458, "y": 220, "w": 75, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 150, "y": 364, "w": 73, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 152, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 303, "y": 221, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 383, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 233, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 459, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 315, "y": 0, "w": 76, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 387, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 392, "y": 0, "w": 75, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 237, "y": 0, "w": 77, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 79, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 158, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 75, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 458, "y": 220, "w": 75, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 150, "y": 364, "w": 73, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 152, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 303, "y": 221, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 383, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 233, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 459, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 315, "y": 0, "w": 76, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 387, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 392, "y": 0, "w": 75, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 237, "y": 0, "w": 77, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 79, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 158, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 75, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 458, "y": 220, "w": 75, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 150, "y": 364, "w": 73, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 152, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 303, "y": 221, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 383, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 233, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 459, "y": 147, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 315, "y": 0, "w": 76, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 387, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 392, "y": 0, "w": 75, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 237, "y": 0, "w": 77, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 79, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 158, "y": 0, "w": 78, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 75, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 458, "y": 220, "w": 75, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 150, "y": 364, "w": 73, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 152, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 458, "y": 292, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 303, "y": 364, "w": 74, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 74, "h": 70 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 227, "y": 294, "w": 75, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 70 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 378, "y": 364, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 75, "h": 69 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 303, "y": 293, "w": 75, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 70 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 379, "y": 293, "w": 75, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 75, "h": 70 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 454, "y": 364, "w": 72, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 72, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 70, "y": 365, "w": 68, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 68, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 291, "y": 435, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 2, "w": 62, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 378, "y": 434, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 224, "y": 365, "w": 66, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 66, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 365, "w": 69, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 69, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 229, "y": 220, "w": 73, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 73, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 468, "y": 0, "w": 75, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 308, "y": 147, "w": 74, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 74, "h": 73 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 148, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 383, "y": 220, "w": 74, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 74, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 231, "y": 147, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 79, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 156, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 310, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 464, "y": 74, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 77, "y": 147, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 154, "y": 147, "w": 76, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 76, "y": 220, "w": 75, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 152, "y": 220, "w": 76, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 76, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 221, "w": 75, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 75, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 0, "y": 293, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 75, "y": 293, "w": 74, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 }, + "sourceSize": { "w": 80, "h": 74 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "668.png", + "format": "I8", + "size": { "w": 543, "h": 507 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/shiny/668.png b/public/images/pokemon/exp/back/shiny/668.png index e2fa147e7fd..0ece333f235 100644 Binary files a/public/images/pokemon/exp/back/shiny/668.png and b/public/images/pokemon/exp/back/shiny/668.png differ diff --git a/public/images/pokemon/exp/back/shiny/672.json b/public/images/pokemon/exp/back/shiny/672.json index a8bb0336e34..f877b9abc2e 100644 --- a/public/images/pokemon/exp/back/shiny/672.json +++ b/public/images/pokemon/exp/back/shiny/672.json @@ -1,965 +1,479 @@ -{ - "textures": [ - { - "image": "672.png", - "format": "RGBA8888", - "size": { - "w": 282, - "h": 282 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 42, - "w": 41, - "h": 42 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 42, - "w": 41, - "h": 42 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 84, - "w": 41, - "h": 42 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 126, - "w": 41, - "h": 42 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 168, - "w": 41, - "h": 42 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 0, - "y": 210, - "w": 41, - "h": 42 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 41, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 82, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 123, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 164, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 205, - "y": 0, - "w": 41, - "h": 42 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 41, - "y": 42, - "w": 41, - "h": 42 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 41, - "y": 84, - "w": 41, - "h": 42 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 42 - }, - "frame": { - "x": 41, - "y": 126, - "w": 41, - "h": 42 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 41, - "y": 168, - "w": 41, - "h": 41 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 41, - "y": 209, - "w": 41, - "h": 41 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 82, - "y": 42, - "w": 41, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 123, - "y": 42, - "w": 41, - "h": 41 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 164, - "y": 42, - "w": 41, - "h": 41 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 205, - "y": 42, - "w": 41, - "h": 41 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 82, - "y": 83, - "w": 41, - "h": 41 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 41 - }, - "frame": { - "x": 82, - "y": 124, - "w": 41, - "h": 41 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 40, - "h": 42 - }, - "frame": { - "x": 82, - "y": 165, - "w": 40, - "h": 42 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 40, - "h": 42 - }, - "frame": { - "x": 82, - "y": 207, - "w": 40, - "h": 42 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 122, - "y": 165, - "w": 40, - "h": 41 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 122, - "y": 206, - "w": 40, - "h": 41 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 123, - "y": 83, - "w": 40, - "h": 41 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 123, - "y": 124, - "w": 40, - "h": 41 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 162, - "y": 165, - "w": 40, - "h": 41 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 162, - "y": 206, - "w": 40, - "h": 41 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 40, - "h": 41 - }, - "frame": { - "x": 163, - "y": 83, - "w": 40, - "h": 41 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 41, - "h": 40 - }, - "frame": { - "x": 163, - "y": 124, - "w": 41, - "h": 40 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 41, - "h": 40 - }, - "frame": { - "x": 203, - "y": 83, - "w": 41, - "h": 40 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 40, - "h": 40 - }, - "frame": { - "x": 202, - "y": 164, - "w": 40, - "h": 40 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 40, - "h": 40 - }, - "frame": { - "x": 204, - "y": 123, - "w": 40, - "h": 40 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 40, - "h": 40 - }, - "frame": { - "x": 242, - "y": 163, - "w": 40, - "h": 40 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 40, - "h": 40 - }, - "frame": { - "x": 242, - "y": 203, - "w": 40, - "h": 40 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 41, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 40, - "h": 40 - }, - "frame": { - "x": 202, - "y": 204, - "w": 40, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e27a409eb13547a4ef97935b726389b3:05b6a88e37fb9d64101b9f9071f3afb5:2e4767b7cd134fc0ab1bb6e9eee82bc7$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 118, "y": 97, "w": 40, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 41, "y": 98, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 78, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 118, "y": 50, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 56, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 104, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 40, "y": 146, "w": 39, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 78, "y": 48, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 118, "y": 97, "w": 40, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 41, "y": 98, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 78, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 118, "y": 50, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 56, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 104, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 40, "y": 146, "w": 39, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 78, "y": 48, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 118, "y": 97, "w": 40, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 41, "y": 98, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 78, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 118, "y": 50, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 56, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 104, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 40, "y": 146, "w": 39, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 78, "y": 48, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 118, "y": 97, "w": 40, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 41, "y": 98, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 78, "y": 0, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 118, "y": 50, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 56, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 104, "w": 40, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 40, "y": 146, "w": 39, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 78, "y": 48, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 39, "y": 0, "w": 39, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 53 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 39, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 56 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 79, "y": 146, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 119, "y": 146, "w": 38, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 38, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 39, "y": 0, "w": 39, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 53 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 39, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 56 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 79, "y": 146, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 119, "y": 146, "w": 38, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 38, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 120, "y": 0, "w": 40, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "672.png", + "format": "I8", + "size": { "w": 160, "h": 195 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/672.png b/public/images/pokemon/exp/back/shiny/672.png index 2fab39d2aee..848b2e35962 100644 Binary files a/public/images/pokemon/exp/back/shiny/672.png and b/public/images/pokemon/exp/back/shiny/672.png differ diff --git a/public/images/pokemon/exp/back/shiny/674.json b/public/images/pokemon/exp/back/shiny/674.json deleted file mode 100644 index 52192847bdf..00000000000 --- a/public/images/pokemon/exp/back/shiny/674.json +++ /dev/null @@ -1,1175 +0,0 @@ -{ - "textures": [ - { - "image": "674.png", - "format": "RGBA8888", - "size": { - "w": 124, - "h": 124 - }, - "scale": 1, - "frames": [ - { - "filename": "0036.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 29, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 29, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 29, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 58, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 58, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 58, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 29, - "h": 42 - }, - "frame": { - "x": 58, - "y": 0, - "w": 29, - "h": 42 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 87, - "y": 0, - "w": 28, - "h": 42 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 29, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 29, - "h": 41 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 29, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 29, - "h": 41 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 29, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 29, - "h": 41 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 29, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 29, - "h": 41 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 29, - "h": 40 - }, - "frame": { - "x": 29, - "y": 42, - "w": 29, - "h": 40 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 29, - "h": 40 - }, - "frame": { - "x": 29, - "y": 42, - "w": 29, - "h": 40 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 58, - "y": 42, - "w": 28, - "h": 42 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 29, - "y": 82, - "w": 28, - "h": 42 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 28, - "h": 41 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 57, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 28, - "h": 40 - }, - "frame": { - "x": 85, - "y": 84, - "w": 28, - "h": 40 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 86, - "y": 42, - "w": 28, - "h": 41 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 86, - "y": 42, - "w": 28, - "h": 41 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 29, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 28, - "h": 41 - }, - "frame": { - "x": 86, - "y": 42, - "w": 28, - "h": 41 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:76841431bc0f022caab94cff146aa974:cfb5f5b4c165e509044ceea57b0d5b30:b823d10f1c9b4d501296982088ba63d6$" - } -} diff --git a/public/images/pokemon/exp/back/shiny/674.png b/public/images/pokemon/exp/back/shiny/674.png deleted file mode 100644 index 75e7b228137..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/674.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/692.json b/public/images/pokemon/exp/back/shiny/692.json index 9e90079e613..801710c4861 100644 --- a/public/images/pokemon/exp/back/shiny/692.json +++ b/public/images/pokemon/exp/back/shiny/692.json @@ -1,1847 +1,794 @@ -{ - "textures": [ - { - "image": "692.png", - "format": "RGBA8888", - "size": { - "w": 168, - "h": 168 - }, - "scale": 1, - "frames": [ - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 61, - "h": 35 - }, - "frame": { - "x": 61, - "y": 0, - "w": 61, - "h": 35 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 60, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 60, - "h": 35 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 60, - "h": 34 - }, - "frame": { - "x": 60, - "y": 35, - "w": 60, - "h": 34 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 60, - "h": 32 - }, - "frame": { - "x": 60, - "y": 69, - "w": 60, - "h": 32 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 60, - "h": 32 - }, - "frame": { - "x": 60, - "y": 69, - "w": 60, - "h": 32 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 59, - "h": 35 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 59, - "h": 35 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 59, - "h": 35 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 59, - "h": 35 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 59, - "h": 35 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 59, - "h": 35 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 59, - "h": 35 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 59, - "h": 35 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 105, - "w": 59, - "h": 35 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 105, - "w": 59, - "h": 35 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 105, - "w": 59, - "h": 35 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 59, - "h": 35 - }, - "frame": { - "x": 0, - "y": 105, - "w": 59, - "h": 35 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 58, - "h": 35 - }, - "frame": { - "x": 59, - "y": 101, - "w": 58, - "h": 35 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 57, - "h": 32 - }, - "frame": { - "x": 59, - "y": 136, - "w": 57, - "h": 32 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8f5831496e68316e4cb3449a0eaf2bb1:e0a74859ab21c488d9f8cbabc8355b5a:2880def858c84cd859bedf13b0b49a33$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 1, "y": 36, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 59, "y": 37, "w": 57, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 59, "y": 37, "w": 57, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 60, "y": 72, "w": 58, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 31 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 119, "y": 72, "w": 56, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 31 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 60, "y": 72, "w": 58, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 31 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 1, "y": 72, "w": 58, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 59, "y": 37, "w": 57, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 59, "y": 37, "w": 57, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "692.png", + "format": "I8", + "size": { "w": 181, "h": 106 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/692.png b/public/images/pokemon/exp/back/shiny/692.png index a08f22af600..c1bb353a739 100644 Binary files a/public/images/pokemon/exp/back/shiny/692.png and b/public/images/pokemon/exp/back/shiny/692.png differ diff --git a/public/images/pokemon/exp/back/shiny/693.json b/public/images/pokemon/exp/back/shiny/693.json index b0fcec5a40b..6358a8908f6 100644 --- a/public/images/pokemon/exp/back/shiny/693.json +++ b/public/images/pokemon/exp/back/shiny/693.json @@ -1,230 +1,902 @@ -{ - "textures": [ - { - "image": "693.png", - "format": "RGBA8888", - "size": { - "w": 223, - "h": 223 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 90, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 72 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 90, - "h": 72 - }, - "frame": { - "x": 90, - "y": 0, - "w": 90, - "h": 72 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 90, - "h": 72 - }, - "frame": { - "x": 90, - "y": 0, - "w": 90, - "h": 72 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 90, - "h": 73 - }, - "frame": { - "x": 0, - "y": 72, - "w": 90, - "h": 73 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 90, - "h": 73 - }, - "frame": { - "x": 0, - "y": 72, - "w": 90, - "h": 73 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 75 - }, - "frame": { - "x": 90, - "y": 72, - "w": 90, - "h": 75 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 75 - }, - "frame": { - "x": 90, - "y": 72, - "w": 90, - "h": 75 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 76 - }, - "frame": { - "x": 0, - "y": 145, - "w": 90, - "h": 76 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 76 - }, - "frame": { - "x": 0, - "y": 145, - "w": 90, - "h": 76 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 90, - "h": 76 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 76 - }, - "frame": { - "x": 90, - "y": 147, - "w": 90, - "h": 76 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e2d977eceb50e18ece349b4545bbecdd:e9880823c470ec1cfcd9a8f06892f017:9c1f9147e693c05eb4655590e9099679$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 472, "y": 70, "w": 88, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 378, "y": 138, "w": 91, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 187, "y": 260, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 379, "y": 257, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 572, "y": 1, "w": 98, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 478, "y": 1, "w": 94, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 560, "y": 132, "w": 93, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 474, "y": 257, "w": 90, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 95, "y": 197, "w": 94, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 99, "y": 1, "w": 94, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 291, "y": 1, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 288, "y": 74, "w": 90, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 368, "y": 317, "w": 88, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 96, "y": 259, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 472, "y": 70, "w": 88, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 378, "y": 138, "w": 91, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 187, "y": 260, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 379, "y": 257, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 572, "y": 1, "w": 98, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 478, "y": 1, "w": 94, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 560, "y": 132, "w": 93, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 474, "y": 257, "w": 90, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 95, "y": 197, "w": 94, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 99, "y": 1, "w": 94, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 291, "y": 1, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 288, "y": 74, "w": 90, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 368, "y": 317, "w": 88, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 96, "y": 259, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 472, "y": 70, "w": 88, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 378, "y": 138, "w": 91, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 187, "y": 260, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 379, "y": 257, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 572, "y": 1, "w": 98, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 478, "y": 1, "w": 94, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 560, "y": 132, "w": 93, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 474, "y": 257, "w": 90, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 95, "y": 197, "w": 94, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 99, "y": 1, "w": 94, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 291, "y": 1, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 288, "y": 74, "w": 90, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 368, "y": 317, "w": 88, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 96, "y": 259, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 472, "y": 70, "w": 88, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 378, "y": 138, "w": 91, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 187, "y": 260, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 379, "y": 257, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 572, "y": 1, "w": 98, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 478, "y": 1, "w": 94, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 560, "y": 132, "w": 93, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 474, "y": 257, "w": 90, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 95, "y": 197, "w": 94, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 99, "y": 1, "w": 94, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 291, "y": 1, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 288, "y": 74, "w": 90, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 368, "y": 317, "w": 88, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 96, "y": 259, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 472, "y": 70, "w": 88, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 378, "y": 138, "w": 91, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 187, "y": 260, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 379, "y": 257, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 572, "y": 1, "w": 98, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 478, "y": 1, "w": 94, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 560, "y": 132, "w": 93, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 474, "y": 257, "w": 90, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 95, "y": 197, "w": 94, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 99, "y": 1, "w": 94, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 291, "y": 1, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 288, "y": 74, "w": 90, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 368, "y": 317, "w": 88, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 96, "y": 259, "w": 91, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 381, "y": 68, "w": 91, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 565, "y": 196, "w": 90, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 6, "w": 90, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 278, "y": 266, "w": 90, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 10, "w": 90, "h": 59 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 189, "y": 199, "w": 95, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 95, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 193, "y": 1, "w": 98, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 98, "h": 68 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 1, "y": 71, "w": 94, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 469, "y": 196, "w": 96, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 96, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 1, "y": 1, "w": 98, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 5, "w": 98, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 1, "y": 136, "w": 94, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 10, "w": 94, "h": 63 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 95, "y": 72, "w": 96, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 12, "w": 96, "h": 63 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 381, "y": 1, "w": 97, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 6, "w": 97, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 1, "y": 71, "w": 94, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 469, "y": 196, "w": 96, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 96, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 1, "y": 1, "w": 98, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 5, "w": 98, "h": 70 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 191, "y": 136, "w": 94, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 10, "w": 94, "h": 63 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 95, "y": 135, "w": 96, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 11, "w": 96, "h": 62 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 572, "y": 67, "w": 99, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 99, "h": 65 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 284, "y": 205, "w": 95, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 11, "w": 95, "h": 61 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 1, "y": 199, "w": 91, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 12, "w": 91, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 1, "y": 259, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 12, "w": 95, "h": 60 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 193, "y": 69, "w": 95, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 5, "w": 95, "h": 67 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 285, "y": 141, "w": 92, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 8, "w": 92, "h": 64 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 96, "y": 318, "w": 89, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 14, "w": 89, "h": 58 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 564, "y": 261, "w": 92, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 14, "w": 92, "h": 58 }, + "sourceSize": { "w": 111, "h": 83 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "693.png", + "format": "I8", + "size": { "w": 672, "h": 377 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/693.png b/public/images/pokemon/exp/back/shiny/693.png index 5eb7110fc3d..10b639004ae 100644 Binary files a/public/images/pokemon/exp/back/shiny/693.png and b/public/images/pokemon/exp/back/shiny/693.png differ diff --git a/public/images/pokemon/exp/back/shiny/694.json b/public/images/pokemon/exp/back/shiny/694.json deleted file mode 100644 index ec28fb40922..00000000000 --- a/public/images/pokemon/exp/back/shiny/694.json +++ /dev/null @@ -1,272 +0,0 @@ -{ - "textures": [ - { - "image": "694.png", - "format": "RGBA8888", - "size": { - "w": 130, - "h": 130 - }, - "scale": 1, - "frames": [ - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 35 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 47, - "h": 35 - }, - "frame": { - "x": 48, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 36 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 36 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 47, - "h": 37 - }, - "frame": { - "x": 47, - "y": 35, - "w": 47, - "h": 37 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 47, - "h": 37 - }, - "frame": { - "x": 47, - "y": 35, - "w": 47, - "h": 37 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 46, - "h": 38 - }, - "frame": { - "x": 0, - "y": 71, - "w": 46, - "h": 38 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 46, - "h": 38 - }, - "frame": { - "x": 0, - "y": 71, - "w": 46, - "h": 38 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 39 - }, - "frame": { - "x": 46, - "y": 72, - "w": 44, - "h": 39 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 39 - }, - "frame": { - "x": 46, - "y": 72, - "w": 44, - "h": 39 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 39 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 40, - "h": 39 - }, - "frame": { - "x": 90, - "y": 72, - "w": 40, - "h": 39 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d46bf508ccc2fa50cb3f373328d8e60a:7d537a54677423b5809fcbc4394d9538:b0990f9650cfe63b836cbed33f0b44d8$" - } -} diff --git a/public/images/pokemon/exp/back/shiny/694.png b/public/images/pokemon/exp/back/shiny/694.png deleted file mode 100644 index 2df2c82fdd7..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/694.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/697.json b/public/images/pokemon/exp/back/shiny/697.json index ade475cd439..6963da289ab 100644 --- a/public/images/pokemon/exp/back/shiny/697.json +++ b/public/images/pokemon/exp/back/shiny/697.json @@ -1,1196 +1,992 @@ -{ - "textures": [ - { - "image": "697.png", - "format": "RGBA8888", - "size": { - "w": 374, - "h": 374 - }, - "scale": 1, - "frames": [ - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 63, - "h": 78 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 78 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 63, - "h": 78 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 78 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 60, - "h": 78 - }, - "frame": { - "x": 0, - "y": 78, - "w": 60, - "h": 78 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 66, - "h": 77 - }, - "frame": { - "x": 0, - "y": 156, - "w": 66, - "h": 77 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 66, - "h": 77 - }, - "frame": { - "x": 0, - "y": 156, - "w": 66, - "h": 77 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 60, - "y": 78, - "w": 77, - "h": 76 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 60, - "y": 78, - "w": 77, - "h": 76 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 60, - "y": 78, - "w": 77, - "h": 76 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 60, - "y": 78, - "w": 77, - "h": 76 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 63, - "y": 0, - "w": 77, - "h": 76 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 63, - "y": 0, - "w": 77, - "h": 76 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 63, - "y": 0, - "w": 77, - "h": 76 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 63, - "y": 0, - "w": 77, - "h": 76 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 0, - "y": 233, - "w": 77, - "h": 76 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 0, - "y": 233, - "w": 77, - "h": 76 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 0, - "y": 233, - "w": 77, - "h": 76 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 0, - "y": 233, - "w": 77, - "h": 76 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 66, - "y": 154, - "w": 77, - "h": 76 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 66, - "y": 154, - "w": 77, - "h": 76 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 66, - "y": 154, - "w": 77, - "h": 76 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 76 - }, - "frame": { - "x": 66, - "y": 154, - "w": 77, - "h": 76 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 76, - "h": 76 - }, - "frame": { - "x": 137, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 76, - "h": 76 - }, - "frame": { - "x": 137, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 76, - "h": 76 - }, - "frame": { - "x": 137, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 76, - "h": 76 - }, - "frame": { - "x": 137, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 69, - "h": 76 - }, - "frame": { - "x": 140, - "y": 0, - "w": 69, - "h": 76 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 69, - "h": 76 - }, - "frame": { - "x": 140, - "y": 0, - "w": 69, - "h": 76 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 75 - }, - "frame": { - "x": 209, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 75 - }, - "frame": { - "x": 209, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 75 - }, - "frame": { - "x": 209, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 77, - "h": 73 - }, - "frame": { - "x": 285, - "y": 0, - "w": 77, - "h": 73 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 75 - }, - "frame": { - "x": 285, - "y": 73, - "w": 76, - "h": 75 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 72, - "h": 75 - }, - "frame": { - "x": 213, - "y": 75, - "w": 72, - "h": 75 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 72, - "h": 75 - }, - "frame": { - "x": 213, - "y": 75, - "w": 72, - "h": 75 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 74 - }, - "frame": { - "x": 285, - "y": 148, - "w": 76, - "h": 74 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 74 - }, - "frame": { - "x": 285, - "y": 148, - "w": 76, - "h": 74 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 75, - "h": 75 - }, - "frame": { - "x": 143, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 75, - "h": 75 - }, - "frame": { - "x": 143, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 75, - "h": 75 - }, - "frame": { - "x": 143, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 75, - "h": 75 - }, - "frame": { - "x": 143, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 77, - "y": 230, - "w": 74, - "h": 74 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 77, - "y": 230, - "w": 74, - "h": 74 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 77, - "y": 230, - "w": 74, - "h": 74 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 77, - "y": 230, - "w": 74, - "h": 74 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 77, - "y": 230, - "w": 74, - "h": 74 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 151, - "y": 227, - "w": 74, - "h": 74 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 151, - "y": 227, - "w": 74, - "h": 74 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 151, - "y": 227, - "w": 74, - "h": 74 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 75, - "h": 73 - }, - "frame": { - "x": 151, - "y": 301, - "w": 75, - "h": 73 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 75, - "h": 73 - }, - "frame": { - "x": 151, - "y": 301, - "w": 75, - "h": 73 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 225, - "y": 222, - "w": 74, - "h": 74 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 74 - }, - "frame": { - "x": 299, - "y": 222, - "w": 74, - "h": 74 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 73, - "h": 74 - }, - "frame": { - "x": 226, - "y": 296, - "w": 73, - "h": 74 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 73, - "h": 74 - }, - "frame": { - "x": 226, - "y": 296, - "w": 73, - "h": 74 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 73, - "h": 74 - }, - "frame": { - "x": 226, - "y": 296, - "w": 73, - "h": 74 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 78 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 73, - "h": 74 - }, - "frame": { - "x": 299, - "y": 296, - "w": 73, - "h": 74 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:dc19d18c6fcbcf52992f8e0181b428f3:44bc6e229ce96fd68619c97288aeb670:f4fdd87d2fc1483d8e0a185c2654e3d9$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 286, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 185, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 93, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 301, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 182, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 273, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 182, "y": 378, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 273, "y": 449, "w": 89, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 177, "y": 452, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 452, "y": 450, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 461, "y": 376, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 649, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 558, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 649, "y": 300, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 373, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 286, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 185, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 93, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 301, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 182, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 273, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 182, "y": 378, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 273, "y": 449, "w": 89, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 177, "y": 452, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 452, "y": 450, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 461, "y": 376, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 649, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 558, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 649, "y": 300, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 373, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 286, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 185, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 93, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 301, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 182, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 273, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 182, "y": 378, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 273, "y": 449, "w": 89, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 177, "y": 452, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 452, "y": 450, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 461, "y": 376, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 649, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 558, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 649, "y": 300, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 373, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 286, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 185, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 93, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 301, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 182, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 273, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 182, "y": 378, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 273, "y": 449, "w": 89, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 177, "y": 452, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 452, "y": 450, "w": 89, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 461, "y": 376, "w": 90, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 649, "y": 375, "w": 91, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 558, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 649, "y": 300, "w": 91, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 373, "y": 227, "w": 91, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 370, "y": 303, "w": 90, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 90, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 558, "y": 227, "w": 90, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 90, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 376, "w": 88, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 88, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 89, "y": 379, "w": 87, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 87, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 365, "y": 378, "w": 86, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 86, "h": 76 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 640, "y": 449, "w": 84, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 84, "h": 77 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 552, "y": 378, "w": 87, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 87, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 92, "y": 303, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 465, "y": 302, "w": 92, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 465, "y": 227, "w": 92, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 465, "y": 227, "w": 92, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 186, "y": 151, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 225, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 670, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 93, "y": 151, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 472, "y": 151, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 565, "y": 151, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 670, "y": 150, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 277, "y": 301, "w": 92, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 465, "y": 227, "w": 92, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 465, "y": 227, "w": 92, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 0, "y": 149, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 388, "y": 75, "w": 93, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 97, "y": 75, "w": 93, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 292, "y": 0, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 196, "y": 0, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 582, "y": 0, "w": 96, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 96, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 98, "y": 0, "w": 97, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 97, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 0, "y": 0, "w": 97, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 97, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 485, "y": 0, "w": 96, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 96, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 388, "y": 0, "w": 96, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 96, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 75, "w": 96, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 96, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 286, "y": 76, "w": 95, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 95, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 670, "y": 76, "w": 95, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 95, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 658, "y": 226, "w": 94, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 94, "h": 73 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 191, "y": 76, "w": 94, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 94, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 279, "y": 226, "w": 93, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 93, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 679, "y": 0, "w": 94, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 94, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 482, "y": 75, "w": 93, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 93, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 576, "y": 75, "w": 93, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 379, "y": 151, "w": 92, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 465, "y": 227, "w": 92, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 }, + "sourceSize": { "w": 100, "h": 78 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "697.png", + "format": "I8", + "size": { "w": 773, "h": 526 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/697.png b/public/images/pokemon/exp/back/shiny/697.png index cc3a5b344c3..fabed852462 100644 Binary files a/public/images/pokemon/exp/back/shiny/697.png and b/public/images/pokemon/exp/back/shiny/697.png differ diff --git a/public/images/pokemon/exp/back/shiny/698.json b/public/images/pokemon/exp/back/shiny/698.json deleted file mode 100644 index 197e3b844b3..00000000000 --- a/public/images/pokemon/exp/back/shiny/698.json +++ /dev/null @@ -1,3296 +0,0 @@ -{ - "textures": [ - { - "image": "698.png", - "format": "RGBA8888", - "size": { - "w": 181, - "h": 181 - }, - "scale": 1, - "frames": [ - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 45, - "h": 54 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 54 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 43, - "h": 55 - }, - "frame": { - "x": 0, - "y": 54, - "w": 43, - "h": 55 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 45, - "h": 53 - }, - "frame": { - "x": 45, - "y": 0, - "w": 45, - "h": 53 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 56 - }, - "frame": { - "x": 0, - "y": 109, - "w": 41, - "h": 56 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0155.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0156.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 56 - }, - "frame": { - "x": 90, - "y": 0, - "w": 39, - "h": 56 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 56 - }, - "frame": { - "x": 129, - "y": 0, - "w": 37, - "h": 56 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 56 - }, - "frame": { - "x": 41, - "y": 109, - "w": 35, - "h": 56 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 33, - "h": 55 - }, - "frame": { - "x": 43, - "y": 54, - "w": 33, - "h": 55 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 57 - }, - "frame": { - "x": 76, - "y": 56, - "w": 37, - "h": 57 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 57 - }, - "frame": { - "x": 76, - "y": 56, - "w": 37, - "h": 57 - } - }, - { - "filename": "0153.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 57 - }, - "frame": { - "x": 76, - "y": 56, - "w": 37, - "h": 57 - } - }, - { - "filename": "0154.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 57 - }, - "frame": { - "x": 76, - "y": 56, - "w": 37, - "h": 57 - } - }, - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 113, - "y": 56, - "w": 35, - "h": 58 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 113, - "y": 56, - "w": 35, - "h": 58 - } - }, - { - "filename": "0151.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 113, - "y": 56, - "w": 35, - "h": 58 - } - }, - { - "filename": "0152.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 113, - "y": 56, - "w": 35, - "h": 58 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 33, - "h": 54 - }, - "frame": { - "x": 148, - "y": 56, - "w": 33, - "h": 54 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0133.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0134.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0139.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0140.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0145.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0146.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 76, - "y": 113, - "w": 35, - "h": 58 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0135.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0136.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0141.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0142.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0147.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0148.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 111, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0131.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0132.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0137.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0138.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0143.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0144.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0149.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - }, - { - "filename": "0150.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 45, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 146, - "y": 114, - "w": 35, - "h": 58 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:7926d4052a1ca822dcfc49423c76e3a1:6930576af3683498fb06f805ffdf25f2:198087d69fed44d4a642fa3ba5c077d6$" - } -} diff --git a/public/images/pokemon/exp/back/shiny/698.png b/public/images/pokemon/exp/back/shiny/698.png deleted file mode 100644 index dbd5cefcbf0..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/698.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/700.json b/public/images/pokemon/exp/back/shiny/700.json index fd3cf94bb73..70083de61c9 100644 --- a/public/images/pokemon/exp/back/shiny/700.json +++ b/public/images/pokemon/exp/back/shiny/700.json @@ -1,1364 +1,587 @@ -{ - "textures": [ - { - "image": "700.png", - "format": "RGBA8888", - "size": { - "w": 248, - "h": 248 - }, - "scale": 1, - "frames": [ - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 54, - "h": 61 - }, - "frame": { - "x": 0, - "y": 0, - "w": 54, - "h": 61 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 50, - "h": 64 - }, - "frame": { - "x": 54, - "y": 0, - "w": 50, - "h": 64 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 50, - "h": 64 - }, - "frame": { - "x": 0, - "y": 61, - "w": 50, - "h": 64 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 51, - "h": 61 - }, - "frame": { - "x": 50, - "y": 64, - "w": 51, - "h": 61 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 48, - "h": 64 - }, - "frame": { - "x": 101, - "y": 64, - "w": 48, - "h": 64 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 51, - "h": 61 - }, - "frame": { - "x": 0, - "y": 125, - "w": 51, - "h": 61 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 49, - "h": 61 - }, - "frame": { - "x": 51, - "y": 125, - "w": 49, - "h": 61 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 49, - "h": 61 - }, - "frame": { - "x": 51, - "y": 125, - "w": 49, - "h": 61 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 49, - "h": 60 - }, - "frame": { - "x": 104, - "y": 0, - "w": 49, - "h": 60 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 49, - "h": 60 - }, - "frame": { - "x": 104, - "y": 0, - "w": 49, - "h": 60 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 49, - "h": 60 - }, - "frame": { - "x": 104, - "y": 0, - "w": 49, - "h": 60 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 49, - "h": 60 - }, - "frame": { - "x": 104, - "y": 0, - "w": 49, - "h": 60 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 49, - "h": 60 - }, - "frame": { - "x": 104, - "y": 0, - "w": 49, - "h": 60 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 49, - "h": 60 - }, - "frame": { - "x": 104, - "y": 0, - "w": 49, - "h": 60 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 48, - "h": 61 - }, - "frame": { - "x": 100, - "y": 128, - "w": 48, - "h": 61 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 48, - "h": 61 - }, - "frame": { - "x": 0, - "y": 186, - "w": 48, - "h": 61 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 48, - "h": 61 - }, - "frame": { - "x": 48, - "y": 186, - "w": 48, - "h": 61 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 48, - "h": 61 - }, - "frame": { - "x": 48, - "y": 186, - "w": 48, - "h": 61 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 48, - "h": 61 - }, - "frame": { - "x": 148, - "y": 128, - "w": 48, - "h": 61 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 48, - "h": 61 - }, - "frame": { - "x": 148, - "y": 128, - "w": 48, - "h": 61 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 149, - "y": 60, - "w": 48, - "h": 60 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 149, - "y": 60, - "w": 48, - "h": 60 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 149, - "y": 60, - "w": 48, - "h": 60 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 149, - "y": 60, - "w": 48, - "h": 60 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 149, - "y": 60, - "w": 48, - "h": 60 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 149, - "y": 60, - "w": 48, - "h": 60 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 153, - "y": 0, - "w": 48, - "h": 60 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 153, - "y": 0, - "w": 48, - "h": 60 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 153, - "y": 0, - "w": 48, - "h": 60 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 153, - "y": 0, - "w": 48, - "h": 60 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 153, - "y": 0, - "w": 48, - "h": 60 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 153, - "y": 0, - "w": 48, - "h": 60 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 196, - "y": 120, - "w": 48, - "h": 60 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 48, - "h": 60 - }, - "frame": { - "x": 196, - "y": 120, - "w": 48, - "h": 60 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 48, - "h": 59 - }, - "frame": { - "x": 197, - "y": 60, - "w": 48, - "h": 59 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 48, - "h": 59 - }, - "frame": { - "x": 197, - "y": 60, - "w": 48, - "h": 59 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 48, - "h": 59 - }, - "frame": { - "x": 197, - "y": 60, - "w": 48, - "h": 59 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 48, - "h": 59 - }, - "frame": { - "x": 197, - "y": 60, - "w": 48, - "h": 59 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 48, - "h": 59 - }, - "frame": { - "x": 197, - "y": 60, - "w": 48, - "h": 59 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 48, - "h": 59 - }, - "frame": { - "x": 197, - "y": 60, - "w": 48, - "h": 59 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 201, - "y": 0, - "w": 47, - "h": 60 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 201, - "y": 0, - "w": 47, - "h": 60 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 201, - "y": 0, - "w": 47, - "h": 60 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 201, - "y": 0, - "w": 47, - "h": 60 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 201, - "y": 0, - "w": 47, - "h": 60 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 201, - "y": 0, - "w": 47, - "h": 60 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 196, - "y": 180, - "w": 47, - "h": 60 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 196, - "y": 180, - "w": 47, - "h": 60 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 196, - "y": 180, - "w": 47, - "h": 60 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 196, - "y": 180, - "w": 47, - "h": 60 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 196, - "y": 180, - "w": 47, - "h": 60 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 47, - "h": 60 - }, - "frame": { - "x": 196, - "y": 180, - "w": 47, - "h": 60 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 96, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 96, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 96, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 96, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 96, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 96, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 144, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 144, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 144, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 144, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 144, - "y": 189, - "w": 48, - "h": 58 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 55, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 48, - "h": 58 - }, - "frame": { - "x": 144, - "y": 189, - "w": 48, - "h": 58 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:cc4ca4dff49e9c03ffd4d0d75ae6e17b:1555e19065e6e4144c3cbb6020a0ae39:2e4bf5ef1f19e475073f7da10c60b540$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 46, "y": 123, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 101, "y": 63, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 180, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 91, "y": 182, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 137, "y": 183, "w": 46, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 188, "y": 180, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 46, "y": 182, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 49, "y": 64, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 142, "y": 124, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 101, "y": 0, "w": 48, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 48, "h": 63 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 195, "y": 0, "w": 49, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 49, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 60, "w": 49, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 49, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 0, "w": 53, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 148, "y": 64, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 120, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 195, "y": 60, "w": 47, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 47, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 194, "y": 120, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 96, "y": 122, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 195, "y": 60, "w": 47, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 47, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 194, "y": 120, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 96, "y": 122, "w": 46, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 149, "y": 0, "w": 46, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 46, "h": 64 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 53, "y": 0, "w": 48, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 48, "h": 64 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 142, "y": 124, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 46, "h": 59 }, + "sourceSize": { "w": 55, "h": 64 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "700.png", + "format": "I8", + "size": { "w": 244, "h": 241 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/700.png b/public/images/pokemon/exp/back/shiny/700.png index fe533ba5a88..dab66177e99 100644 Binary files a/public/images/pokemon/exp/back/shiny/700.png and b/public/images/pokemon/exp/back/shiny/700.png differ diff --git a/public/images/pokemon/exp/back/shiny/702.json b/public/images/pokemon/exp/back/shiny/702.json index 2e194f21033..9680e17e397 100644 --- a/public/images/pokemon/exp/back/shiny/702.json +++ b/public/images/pokemon/exp/back/shiny/702.json @@ -1,1028 +1,443 @@ -{ - "textures": [ - { - "image": "702.png", - "format": "RGBA8888", - "size": { - "w": 141, - "h": 141 - }, - "scale": 1, - "frames": [ - { - "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": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 47, - "h": 35 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 47, - "h": 35 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 47, - "h": 35 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 47, - "h": 35 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 47, - "h": 35 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 70, - "w": 47, - "h": 35 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 0, - "y": 105, - "w": 47, - "h": 35 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 35 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 35 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 35 - }, - "frame": { - "x": 47, - "y": 35, - "w": 46, - "h": 35 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 47, - "y": 70, - "w": 47, - "h": 34 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 47, - "y": 70, - "w": 47, - "h": 34 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 47, - "y": 70, - "w": 47, - "h": 34 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 47, - "y": 70, - "w": 47, - "h": 34 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 47, - "y": 70, - "w": 47, - "h": 34 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 93, - "y": 35, - "w": 47, - "h": 34 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 47, - "h": 34 - }, - "frame": { - "x": 94, - "y": 0, - "w": 47, - "h": 34 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 69, - "w": 47, - "h": 32 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 101, - "w": 47, - "h": 32 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 101, - "w": 47, - "h": 32 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 101, - "w": 47, - "h": 32 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 101, - "w": 47, - "h": 32 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 94, - "y": 101, - "w": 47, - "h": 32 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 47, - "h": 32 - }, - "frame": { - "x": 47, - "y": 104, - "w": 47, - "h": 32 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:72bba6c37c149abe81c9754a412876bd:fb5c4a7192ee7ba359b93fb9fea89158:ba8fdab405d5efab99c4aa1084328e6b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 48, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 93, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 139, "y": 70, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 95, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 48, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 93, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 139, "y": 70, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 95, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 48, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 93, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 139, "y": 70, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 95, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 48, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 93, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 139, "y": 70, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 95, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 48, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 93, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 139, "y": 70, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 95, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 142, "y": 0, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 140, "y": 36, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 47, "y": 72, "w": 45, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 0, "y": 72, "w": 46, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 93, "y": 70, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 36, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 47, "y": 36, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 }, + "sourceSize": { "w": 47, "h": 35 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "702.png", + "format": "I8", + "size": { "w": 188, "h": 103 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/702.png b/public/images/pokemon/exp/back/shiny/702.png index 12401f8950b..7a02b912cf0 100644 Binary files a/public/images/pokemon/exp/back/shiny/702.png and b/public/images/pokemon/exp/back/shiny/702.png differ diff --git a/public/images/pokemon/exp/back/shiny/703.json b/public/images/pokemon/exp/back/shiny/703.json deleted file mode 100644 index dee9aa2bb4e..00000000000 --- a/public/images/pokemon/exp/back/shiny/703.json +++ /dev/null @@ -1,1322 +0,0 @@ -{ - "textures": [ - { - "image": "703.png", - "format": "RGBA8888", - "size": { - "w": 152, - "h": 152 - }, - "scale": 1, - "frames": [ - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 38, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 38, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 38, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 38, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 38, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 38, - "h": 41 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 38, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 38, - "h": 41 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 38, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 38, - "h": 41 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 38, - "h": 41 - }, - "frame": { - "x": 0, - "y": 42, - "w": 38, - "h": 41 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 83, - "w": 37, - "h": 41 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 39, - "h": 40 - }, - "frame": { - "x": 37, - "y": 83, - "w": 39, - "h": 40 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 39, - "h": 40 - }, - "frame": { - "x": 37, - "y": 83, - "w": 39, - "h": 40 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 39, - "h": 39 - }, - "frame": { - "x": 76, - "y": 0, - "w": 39, - "h": 39 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 39, - "h": 39 - }, - "frame": { - "x": 76, - "y": 0, - "w": 39, - "h": 39 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 39, - "h": 39 - }, - "frame": { - "x": 76, - "y": 0, - "w": 39, - "h": 39 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 39, - "h": 39 - }, - "frame": { - "x": 76, - "y": 0, - "w": 39, - "h": 39 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 39, - "h": 39 - }, - "frame": { - "x": 76, - "y": 0, - "w": 39, - "h": 39 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 40 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 40 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 40 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 40 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 40 - }, - "frame": { - "x": 115, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 40 - }, - "frame": { - "x": 115, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 40 - }, - "frame": { - "x": 115, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 40 - }, - "frame": { - "x": 115, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 38, - "h": 40 - }, - "frame": { - "x": 76, - "y": 39, - "w": 38, - "h": 40 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 38, - "h": 40 - }, - "frame": { - "x": 76, - "y": 39, - "w": 38, - "h": 40 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 38, - "h": 40 - }, - "frame": { - "x": 76, - "y": 39, - "w": 38, - "h": 40 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 38, - "h": 40 - }, - "frame": { - "x": 76, - "y": 39, - "w": 38, - "h": 40 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 40 - }, - "frame": { - "x": 38, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 40 - }, - "frame": { - "x": 114, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 40 - }, - "frame": { - "x": 114, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 40 - }, - "frame": { - "x": 114, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 40 - }, - "frame": { - "x": 114, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 40 - }, - "frame": { - "x": 114, - "y": 40, - "w": 38, - "h": 40 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 40 - }, - "frame": { - "x": 76, - "y": 79, - "w": 38, - "h": 40 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 37, - "h": 40 - }, - "frame": { - "x": 114, - "y": 80, - "w": 37, - "h": 40 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 37, - "h": 40 - }, - "frame": { - "x": 114, - "y": 80, - "w": 37, - "h": 40 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 37, - "h": 40 - }, - "frame": { - "x": 114, - "y": 80, - "w": 37, - "h": 40 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 37, - "h": 40 - }, - "frame": { - "x": 114, - "y": 80, - "w": 37, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:910fb9af9ea6e167d162cc6f8ae5174e:9e48a450788ccb42705466148db9893d:721af8c322ff60159262e9b3017c784d$" - } -} diff --git a/public/images/pokemon/exp/back/shiny/703.png b/public/images/pokemon/exp/back/shiny/703.png deleted file mode 100644 index 2081d702118..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/703.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/704.json b/public/images/pokemon/exp/back/shiny/704.json index 32f8d89d5a8..ff94c52a2a8 100644 --- a/public/images/pokemon/exp/back/shiny/704.json +++ b/public/images/pokemon/exp/back/shiny/704.json @@ -1,230 +1,101 @@ -{ - "textures": [ - { - "image": "704.png", - "format": "RGBA8888", - "size": { - "w": 81, - "h": 81 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 27, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 27, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 27, - "h": 34 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 27, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 27, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 27, - "h": 34 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 27, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 27, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 27, - "h": 34 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 27, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 27, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 27, - "h": 34 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 27, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 27, - "h": 33 - }, - "frame": { - "x": 27, - "y": 0, - "w": 27, - "h": 33 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 27, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 27, - "h": 33 - }, - "frame": { - "x": 27, - "y": 0, - "w": 27, - "h": 33 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 27, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 27, - "h": 33 - }, - "frame": { - "x": 27, - "y": 33, - "w": 27, - "h": 33 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 27, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 27, - "h": 33 - }, - "frame": { - "x": 27, - "y": 33, - "w": 27, - "h": 33 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 27, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 27, - "h": 32 - }, - "frame": { - "x": 0, - "y": 34, - "w": 27, - "h": 32 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 27, - "h": 34 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 27, - "h": 31 - }, - "frame": { - "x": 54, - "y": 0, - "w": 27, - "h": 31 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:6de9f988e21fa1819baa4118b3f8d3c5:467738d3742ffa651ad1f101f3369860:45bb13be23ae6e2a6654a2a00c450d62$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0002.png", + "frame": { "x": 53, "y": 0, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0003.png", + "frame": { "x": 26, "y": 0, "w": 27, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 27, "h": 31 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0004.png", + "frame": { "x": 53, "y": 0, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0007.png", + "frame": { "x": 26, "y": 31, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0008.png", + "frame": { "x": 52, "y": 32, "w": 27, "h": 30 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 27, "h": 30 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0009.png", + "frame": { "x": 26, "y": 31, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 27, "h": 34 }, + "duration": 150 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "704.png", + "format": "I8", + "size": { "w": 79, "h": 63 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/704.png b/public/images/pokemon/exp/back/shiny/704.png index 5d3b5026ded..75a2898cd92 100644 Binary files a/public/images/pokemon/exp/back/shiny/704.png and b/public/images/pokemon/exp/back/shiny/704.png differ diff --git a/public/images/pokemon/exp/back/shiny/705.json b/public/images/pokemon/exp/back/shiny/705.json index ab139c247f5..2fc8cb18e99 100644 --- a/public/images/pokemon/exp/back/shiny/705.json +++ b/public/images/pokemon/exp/back/shiny/705.json @@ -1,230 +1,596 @@ -{ - "textures": [ - { - "image": "705.png", - "format": "RGBA8888", - "size": { - "w": 118, - "h": 118 - }, - "scale": 1, - "frames": [ - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 39, - "h": 59 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 59 - }, - "frame": { - "x": 0, - "y": 0, - "w": 39, - "h": 59 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 59 - }, - "frame": { - "x": 0, - "y": 59, - "w": 37, - "h": 59 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 59 - }, - "frame": { - "x": 0, - "y": 59, - "w": 37, - "h": 59 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 59 - }, - "frame": { - "x": 37, - "y": 59, - "w": 35, - "h": 59 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 59 - }, - "frame": { - "x": 39, - "y": 0, - "w": 35, - "h": 59 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 59 - }, - "frame": { - "x": 39, - "y": 0, - "w": 35, - "h": 59 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 58 - }, - "frame": { - "x": 72, - "y": 59, - "w": 41, - "h": 58 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 41, - "h": 58 - }, - "frame": { - "x": 72, - "y": 59, - "w": 41, - "h": 58 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 42, - "h": 57 - }, - "frame": { - "x": 74, - "y": 0, - "w": 42, - "h": 57 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:82a03fa5424412ce647108fd8dac55a8:b9edd38338e7033be81034e75b8ae8a8:6b57e983626c7fc9144ab67f30c66814$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 116, "y": 124, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 40, "y": 185, "w": 40, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 77, "y": 298, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 162, "y": 299, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 202, "y": 299, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 117, "y": 300, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 121, "y": 245, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 80, "y": 242, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 244, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 194, "y": 240, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 125, "w": 37, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 156, "y": 184, "w": 38, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 40, "y": 243, "w": 37, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 158, "y": 0, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 156, "y": 62, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 197, "y": 0, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 116, "y": 124, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 40, "y": 185, "w": 40, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 77, "y": 298, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 162, "y": 299, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 202, "y": 299, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 117, "y": 300, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 121, "y": 245, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 80, "y": 242, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 244, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 194, "y": 240, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 125, "w": 37, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 156, "y": 184, "w": 38, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 40, "y": 243, "w": 37, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 158, "y": 0, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 156, "y": 62, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 197, "y": 0, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 116, "y": 124, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 40, "y": 185, "w": 40, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 77, "y": 298, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 162, "y": 299, "w": 40, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 202, "y": 299, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 117, "y": 300, "w": 41, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 121, "y": 245, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 80, "y": 242, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 244, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 194, "y": 240, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 125, "w": 37, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 156, "y": 184, "w": 38, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 40, "y": 243, "w": 37, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 158, "y": 0, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 156, "y": 62, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 197, "y": 0, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 116, "y": 124, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 195, "y": 181, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 118, "y": 0, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 40, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 0, "w": 40, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 40, "h": 62 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 118, "y": 61, "w": 38, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 38, "h": 63 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 62, "w": 38, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 38, "h": 63 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 40, "y": 0, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 39, "h": 63 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 79, "y": 0, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 39, "h": 63 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 38, "y": 63, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 77, "y": 63, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 195, "y": 120, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 156, "y": 123, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 38, "y": 124, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 77, "y": 124, "w": 39, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 197, "y": 60, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 116, "y": 183, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 185, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 }, + "sourceSize": { "w": 43, "h": 63 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "705.png", + "format": "I8", + "size": { "w": 243, "h": 355 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/705.png b/public/images/pokemon/exp/back/shiny/705.png index 65c9933f415..4ee803dd570 100644 Binary files a/public/images/pokemon/exp/back/shiny/705.png and b/public/images/pokemon/exp/back/shiny/705.png differ diff --git a/public/images/pokemon/exp/back/shiny/707.png b/public/images/pokemon/exp/back/shiny/707.png deleted file mode 100644 index 538667f7252..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/707.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/708.json b/public/images/pokemon/exp/back/shiny/708.json deleted file mode 100644 index fe864e9f9ea..00000000000 --- a/public/images/pokemon/exp/back/shiny/708.json +++ /dev/null @@ -1,503 +0,0 @@ -{ - "textures": [ - { - "image": "708.png", - "format": "RGBA8888", - "size": { - "w": 135, - "h": 135 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 46, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 46 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 46, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 46 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 46, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 46 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 45, - "h": 46 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 45, - "h": 46 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 45, - "h": 46 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 2, - "y": 8, - "w": 45, - "h": 43 - }, - "frame": { - "x": 0, - "y": 92, - "w": 45, - "h": 43 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 2, - "y": 8, - "w": 45, - "h": 43 - }, - "frame": { - "x": 0, - "y": 92, - "w": 45, - "h": 43 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 44, - "h": 46 - }, - "frame": { - "x": 45, - "y": 46, - "w": 44, - "h": 46 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 44, - "h": 46 - }, - "frame": { - "x": 45, - "y": 46, - "w": 44, - "h": 46 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 44, - "h": 46 - }, - "frame": { - "x": 45, - "y": 46, - "w": 44, - "h": 46 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 45, - "h": 45 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 45 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 45, - "h": 45 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 45 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 45, - "h": 45 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 45 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 45, - "h": 45 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 45 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 44, - "h": 41 - }, - "frame": { - "x": 91, - "y": 0, - "w": 44, - "h": 41 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 44, - "h": 41 - }, - "frame": { - "x": 91, - "y": 0, - "w": 44, - "h": 41 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 45 - }, - "frame": { - "x": 89, - "y": 45, - "w": 45, - "h": 45 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 45 - }, - "frame": { - "x": 89, - "y": 45, - "w": 45, - "h": 45 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 45, - "h": 45 - }, - "frame": { - "x": 89, - "y": 45, - "w": 45, - "h": 45 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 45, - "h": 44 - }, - "frame": { - "x": 89, - "y": 90, - "w": 45, - "h": 44 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 45, - "h": 44 - }, - "frame": { - "x": 89, - "y": 90, - "w": 45, - "h": 44 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 51 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 45, - "h": 44 - }, - "frame": { - "x": 89, - "y": 90, - "w": 45, - "h": 44 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:ae43a2361518d114c34efceaee18a46b:85de733a19b6cdd71d9518299acef7f4:796c82c5076b122f2663381836c65843$" - } -} diff --git a/public/images/pokemon/exp/back/shiny/708.png b/public/images/pokemon/exp/back/shiny/708.png deleted file mode 100644 index 35e2594241a..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/708.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/712.json b/public/images/pokemon/exp/back/shiny/712.json index 1fc96cf19a4..869a92fd6ea 100644 --- a/public/images/pokemon/exp/back/shiny/712.json +++ b/public/images/pokemon/exp/back/shiny/712.json @@ -1,3338 +1,1433 @@ -{ - "textures": [ - { - "image": "712.png", - "format": "RGBA8888", - "size": { - "w": 208, - "h": 208 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 37, - "h": 44 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0138.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 37, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0139.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 37, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0140.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 75, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0141.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 75, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0144.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 113, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0145.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 113, - "y": 0, - "w": 38, - "h": 41 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 44 - }, - "frame": { - "x": 151, - "y": 0, - "w": 37, - "h": 44 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 74, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 111, - "y": 41, - "w": 37, - "h": 43 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 148, - "y": 44, - "w": 37, - "h": 43 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 84, - "w": 37, - "h": 43 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 84, - "w": 37, - "h": 43 - } - }, - { - "filename": "0157.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 84, - "w": 37, - "h": 43 - } - }, - { - "filename": "0158.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 37, - "h": 43 - }, - "frame": { - "x": 37, - "y": 84, - "w": 37, - "h": 43 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 37, - "h": 42 - }, - "frame": { - "x": 74, - "y": 84, - "w": 37, - "h": 42 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 37, - "h": 42 - }, - "frame": { - "x": 74, - "y": 84, - "w": 37, - "h": 42 - } - }, - { - "filename": "0155.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 37, - "h": 42 - }, - "frame": { - "x": 74, - "y": 84, - "w": 37, - "h": 42 - } - }, - { - "filename": "0156.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 37, - "h": 42 - }, - "frame": { - "x": 74, - "y": 84, - "w": 37, - "h": 42 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0150.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0151.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0152.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0153.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0154.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 84, - "w": 37, - "h": 41 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 148, - "y": 87, - "w": 37, - "h": 41 - } - }, - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 148, - "y": 87, - "w": 37, - "h": 41 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 125, - "w": 37, - "h": 41 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 125, - "w": 37, - "h": 41 - } - }, - { - "filename": "0134.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 125, - "w": 37, - "h": 41 - } - }, - { - "filename": "0135.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 125, - "w": 37, - "h": 41 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 126, - "w": 37, - "h": 41 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 126, - "w": 37, - "h": 41 - } - }, - { - "filename": "0132.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 126, - "w": 37, - "h": 41 - } - }, - { - "filename": "0133.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 126, - "w": 37, - "h": 41 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 37, - "y": 127, - "w": 37, - "h": 41 - } - }, - { - "filename": "0131.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 37, - "y": 127, - "w": 37, - "h": 41 - } - }, - { - "filename": "0136.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 167, - "w": 37, - "h": 41 - } - }, - { - "filename": "0137.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 74, - "y": 167, - "w": 37, - "h": 41 - } - }, - { - "filename": "0148.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 168, - "w": 37, - "h": 40 - } - }, - { - "filename": "0149.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 168, - "w": 37, - "h": 40 - } - }, - { - "filename": "0142.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 166, - "w": 37, - "h": 41 - } - }, - { - "filename": "0143.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 111, - "y": 166, - "w": 37, - "h": 41 - } - }, - { - "filename": "0146.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 36, - "h": 41 - }, - "frame": { - "x": 148, - "y": 128, - "w": 36, - "h": 41 - } - }, - { - "filename": "0147.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 36, - "h": 41 - }, - "frame": { - "x": 148, - "y": 128, - "w": 36, - "h": 41 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:6fc0455d6f0af01f72622b0f21f8ee70:352443e5019cc9719abfbd45c1015afa:3a1cc69824960d920ca43f8c9376d136$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 145, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 145, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 72, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 72, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 108, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 108, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 144, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 144, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 181, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 181, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 36, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 36, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 145, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 145, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 72, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 72, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 108, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 108, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 144, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 144, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 181, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 181, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 36, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 36, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 145, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 145, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 72, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 72, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 108, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 108, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 144, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 144, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 181, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 181, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 36, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 36, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 145, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 145, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 72, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 72, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 108, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 108, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 144, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 144, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 181, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 181, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 36, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 36, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 145, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 145, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 72, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 72, "y": 43, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 108, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 108, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 144, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 144, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 72, "y": 0, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 181, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 181, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0105.png", + "frame": { "x": 0, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0106.png", + "frame": { "x": 36, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0107.png", + "frame": { "x": 36, "y": 0, "w": 35, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0108.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0109.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0110.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0111.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0112.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0113.png", + "frame": { "x": 109, "y": 0, "w": 35, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0114.png", + "frame": { "x": 180, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0115.png", + "frame": { "x": 180, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0116.png", + "frame": { "x": 148, "y": 87, "w": 35, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0117.png", + "frame": { "x": 148, "y": 87, "w": 35, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0118.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0119.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0120.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0121.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0122.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0123.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0124.png", + "frame": { "x": 36, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0125.png", + "frame": { "x": 36, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0126.png", + "frame": { "x": 72, "y": 128, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0127.png", + "frame": { "x": 72, "y": 128, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0128.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0129.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0130.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0131.png", + "frame": { "x": 0, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0132.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0133.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0134.png", + "frame": { "x": 72, "y": 128, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0135.png", + "frame": { "x": 72, "y": 128, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0136.png", + "frame": { "x": 108, "y": 128, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0137.png", + "frame": { "x": 108, "y": 128, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0138.png", + "frame": { "x": 37, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0139.png", + "frame": { "x": 37, "y": 86, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0140.png", + "frame": { "x": 74, "y": 87, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0141.png", + "frame": { "x": 74, "y": 87, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0142.png", + "frame": { "x": 144, "y": 129, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0143.png", + "frame": { "x": 144, "y": 129, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0144.png", + "frame": { "x": 111, "y": 87, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0145.png", + "frame": { "x": 111, "y": 87, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0146.png", + "frame": { "x": 180, "y": 129, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0147.png", + "frame": { "x": 180, "y": 129, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0148.png", + "frame": { "x": 0, "y": 168, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0149.png", + "frame": { "x": 0, "y": 168, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0150.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0151.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0152.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0153.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0154.png", + "frame": { "x": 0, "y": 127, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0155.png", + "frame": { "x": 148, "y": 87, "w": 35, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0156.png", + "frame": { "x": 148, "y": 87, "w": 35, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0157.png", + "frame": { "x": 180, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + }, + { + "filename": "0158.png", + "frame": { "x": 180, "y": 44, "w": 35, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 }, + "sourceSize": { "w": 40, "h": 44 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "712.png", + "format": "I8", + "size": { "w": 216, "h": 207 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/712.png b/public/images/pokemon/exp/back/shiny/712.png index 709718daf83..989ed14b08e 100644 Binary files a/public/images/pokemon/exp/back/shiny/712.png and b/public/images/pokemon/exp/back/shiny/712.png differ diff --git a/public/images/pokemon/exp/back/shiny/713.json b/public/images/pokemon/exp/back/shiny/713.json index 8f1736a5256..0ff72eef867 100644 --- a/public/images/pokemon/exp/back/shiny/713.json +++ b/public/images/pokemon/exp/back/shiny/713.json @@ -1,188 +1,1100 @@ -{ - "textures": [ - { - "image": "713.png", - "format": "RGBA8888", - "size": { - "w": 199, - "h": 199 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - }, - "frame": { - "x": 87, - "y": 0, - "w": 87, - "h": 69 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - }, - "frame": { - "x": 87, - "y": 0, - "w": 87, - "h": 69 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 87, - "h": 69 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 87, - "h": 66 - }, - "frame": { - "x": 87, - "y": 69, - "w": 87, - "h": 66 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 87, - "h": 66 - }, - "frame": { - "x": 87, - "y": 69, - "w": 87, - "h": 66 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 87, - "h": 64 - }, - "frame": { - "x": 87, - "y": 135, - "w": 87, - "h": 64 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0af8023555592952fe28b217e91b3a50:e8f7bce9a0476374152ae2437bd2d84b:625f70bcfe9c7f2437cb9cad6d2b863c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 87, "y": 188, "w": 87, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 174, "y": 128, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 261, "y": 127, "w": 87, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 0, "y": 127, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 87, "y": 126, "w": 87, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 183, "y": 0, "w": 87, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 63, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 270, "y": 0, "w": 87, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 270, "y": 64, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 174, "y": 65, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 174, "y": 65, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 92, "y": 0, "w": 91, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 91, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 92, "y": 0, "w": 91, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 91, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 0, "y": 0, "w": 92, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 0, "y": 0, "w": 92, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 0, "y": 0, "w": 92, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 0, "y": 0, "w": 92, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 0, "y": 0, "w": 92, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + }, + { + "filename": "0121.png", + "frame": { "x": 87, "y": 63, "w": 87, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 }, + "sourceSize": { "w": 92, "h": 66 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "713.png", + "format": "I8", + "size": { "w": 357, "h": 248 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/back/shiny/713.png b/public/images/pokemon/exp/back/shiny/713.png index 87011e1bbb9..b4417f8386b 100644 Binary files a/public/images/pokemon/exp/back/shiny/713.png and b/public/images/pokemon/exp/back/shiny/713.png differ diff --git a/public/images/pokemon/exp/back/shiny/714.json b/public/images/pokemon/exp/back/shiny/714.json deleted file mode 100644 index 1d8e87ffa8c..00000000000 --- a/public/images/pokemon/exp/back/shiny/714.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "textures": [ - { - "image": "714.png", - "format": "RGBA8888", - "size": { - "w": 147, - "h": 147 - }, - "scale": 1, - "frames": [ - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 13, - "y": 0, - "w": 34, - "h": 57 - }, - "frame": { - "x": 0, - "y": 0, - "w": 34, - "h": 57 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 60, - "h": 58 - }, - "frame": { - "x": 34, - "y": 0, - "w": 60, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 46, - "h": 58 - }, - "frame": { - "x": 94, - "y": 0, - "w": 46, - "h": 58 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 46, - "h": 58 - }, - "frame": { - "x": 94, - "y": 0, - "w": 46, - "h": 58 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 1, - "y": 10, - "w": 58, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 58, - "h": 58 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 1, - "y": 10, - "w": 58, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 58, - "h": 58 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 54, - "h": 58 - }, - "frame": { - "x": 58, - "y": 58, - "w": 54, - "h": 58 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 54, - "h": 58 - }, - "frame": { - "x": 58, - "y": 58, - "w": 54, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 12, - "y": 1, - "w": 35, - "h": 58 - }, - "frame": { - "x": 112, - "y": 58, - "w": 35, - "h": 58 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 69 - }, - "spriteSourceSize": { - "x": 12, - "y": 1, - "w": 35, - "h": 58 - }, - "frame": { - "x": 112, - "y": 58, - "w": 35, - "h": 58 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b5f2c2112a42d04cd66e9ed8b57be94f:1af3c375153c5a8b4950e81283c602fa:1a07d46e710b0568ec824f54fbc4fe6a$" - } -} diff --git a/public/images/pokemon/exp/back/shiny/714.png b/public/images/pokemon/exp/back/shiny/714.png deleted file mode 100644 index fa2c001e7cc..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/714.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/718-10.json b/public/images/pokemon/exp/back/shiny/718-10.json deleted file mode 100644 index 147d661bd6b..00000000000 --- a/public/images/pokemon/exp/back/shiny/718-10.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "textures": [ - { - "image": "718-10.png", - "format": "RGBA8888", - "size": { - "w": 194, - "h": 194 - }, - "scale": 1, - "frames": [ - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 62, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 62, - "h": 66 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 66 - }, - "frame": { - "x": 0, - "y": 66, - "w": 60, - "h": 66 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 66 - }, - "frame": { - "x": 0, - "y": 66, - "w": 60, - "h": 66 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 63, - "h": 65 - }, - "frame": { - "x": 60, - "y": 66, - "w": 63, - "h": 65 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 63, - "h": 65 - }, - "frame": { - "x": 62, - "y": 0, - "w": 63, - "h": 65 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 63, - "h": 64 - }, - "frame": { - "x": 125, - "y": 0, - "w": 63, - "h": 64 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 62, - "h": 65 - }, - "frame": { - "x": 125, - "y": 64, - "w": 62, - "h": 65 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 63, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 59, - "h": 65 - }, - "frame": { - "x": 123, - "y": 129, - "w": 59, - "h": 65 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9b4423fced8dd8763a4e886055e4ab1f:d04b9095317ace207a8d36f1e501da19:82195cf2a6db620c5643b8162d6e8c5c$" - } -} diff --git a/public/images/pokemon/exp/back/shiny/718-10.png b/public/images/pokemon/exp/back/shiny/718-10.png deleted file mode 100644 index 63d73684da4..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/718-10.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/718.json b/public/images/pokemon/exp/back/shiny/718.json deleted file mode 100644 index b5cde64bbad..00000000000 --- a/public/images/pokemon/exp/back/shiny/718.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "textures": [ - { - "image": "718.png", - "format": "RGBA8888", - "size": { - "w": 216, - "h": 216 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 0, - "y": 89, - "w": 73, - "h": 89 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 73, - "y": 89, - "w": 73, - "h": 89 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 73, - "y": 89, - "w": 73, - "h": 89 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 72, - "h": 89 - }, - "frame": { - "x": 74, - "y": 0, - "w": 72, - "h": 89 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 72, - "h": 89 - }, - "frame": { - "x": 74, - "y": 0, - "w": 72, - "h": 89 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 70, - "h": 88 - }, - "frame": { - "x": 146, - "y": 0, - "w": 70, - "h": 88 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 70, - "h": 88 - }, - "frame": { - "x": 146, - "y": 0, - "w": 70, - "h": 88 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 69, - "h": 87 - }, - "frame": { - "x": 146, - "y": 88, - "w": 69, - "h": 87 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b8c991edb02cd8fac15ae3bfa6518a6b:1cf351059eb3257fa98dfd55b07708c4:7b4a06b06cbac24b3f39727b0238661b$" - } -} diff --git a/public/images/pokemon/exp/back/shiny/718.png b/public/images/pokemon/exp/back/shiny/718.png deleted file mode 100644 index 5e981224596..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/718.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/719.json b/public/images/pokemon/exp/back/shiny/719.json deleted file mode 100644 index d39dc5b1c99..00000000000 --- a/public/images/pokemon/exp/back/shiny/719.json +++ /dev/null @@ -1,272 +0,0 @@ -{ - "textures": [ - { - "image": "719.png", - "format": "RGBA8888", - "size": { - "w": 158, - "h": 158 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 39, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 39, - "h": 66 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 39, - "h": 67 - }, - "frame": { - "x": 39, - "y": 0, - "w": 39, - "h": 67 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 39, - "h": 67 - }, - "frame": { - "x": 39, - "y": 0, - "w": 39, - "h": 67 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 40, - "h": 67 - }, - "frame": { - "x": 78, - "y": 0, - "w": 40, - "h": 67 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 40, - "h": 67 - }, - "frame": { - "x": 78, - "y": 0, - "w": 40, - "h": 67 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 40, - "h": 67 - }, - "frame": { - "x": 118, - "y": 0, - "w": 40, - "h": 67 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 40, - "h": 67 - }, - "frame": { - "x": 118, - "y": 0, - "w": 40, - "h": 67 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 41, - "h": 67 - }, - "frame": { - "x": 0, - "y": 67, - "w": 41, - "h": 67 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 68 - }, - "frame": { - "x": 41, - "y": 67, - "w": 41, - "h": 68 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 68 - }, - "frame": { - "x": 41, - "y": 67, - "w": 41, - "h": 68 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 68 - }, - "frame": { - "x": 82, - "y": 67, - "w": 42, - "h": 68 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 80 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 68 - }, - "frame": { - "x": 82, - "y": 67, - "w": 42, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4664ffe6d92453555d7befbaf3a06e34:ee4f7a42565694ad44dfdf274a36ffbb:17a705bb924916761be2495822a53735$" - } -} diff --git a/public/images/pokemon/exp/back/shiny/719.png b/public/images/pokemon/exp/back/shiny/719.png deleted file mode 100644 index d1640abb4a0..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/719.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/815-gigantamax.json b/public/images/pokemon/exp/back/shiny/815-gigantamax.json new file mode 100644 index 00000000000..952ea16b6b8 --- /dev/null +++ b/public/images/pokemon/exp/back/shiny/815-gigantamax.json @@ -0,0 +1,659 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 525, "y": 384, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 356, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 444, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 267, "y": 98, "w": 87, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 528, "y": 194, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 250, "y": 484, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 333, "y": 388, "w": 83, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 82, "y": 485, "w": 79, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 167, "y": 483, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 440, "y": 194, "w": 86, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 267, "y": 193, "w": 85, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 1, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 86, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 333, "y": 482, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 525, "y": 384, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 356, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 444, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 267, "y": 98, "w": 87, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 528, "y": 194, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 250, "y": 484, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 333, "y": 388, "w": 83, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 82, "y": 485, "w": 79, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 167, "y": 483, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 440, "y": 194, "w": 86, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 267, "y": 193, "w": 85, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 1, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 86, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 333, "y": 482, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 525, "y": 384, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 356, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 444, "y": 98, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 267, "y": 98, "w": 87, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 528, "y": 194, "w": 82, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 250, "y": 484, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 333, "y": 388, "w": 83, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 82, "y": 485, "w": 79, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 167, "y": 483, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 440, "y": 194, "w": 86, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 267, "y": 193, "w": 85, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 1, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 86, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 333, "y": 482, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 84, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 179, "y": 97, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 444, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 1, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 171, "y": 289, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 1, "y": 389, "w": 81, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 4, "w": 81, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 525, "y": 288, "w": 83, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 83, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 1, "y": 485, "w": 79, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 7, "w": 79, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 84, "y": 389, "w": 81, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 81, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 356, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 4, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 268, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 354, "y": 194, "w": 84, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 84, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 255, "y": 290, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 1, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 423, "y": 385, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 1, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 1, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 506, "y": 481, "w": 80, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 80, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 250, "y": 387, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 1, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 89, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 90, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 339, "y": 291, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 5, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 167, "y": 386, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 4, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 440, "y": 288, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 414, "y": 482, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "815-gigantamax.png", + "format": "I8", + "size": { "w": 611, "h": 579 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/shiny/815-gigantamax.png b/public/images/pokemon/exp/back/shiny/815-gigantamax.png new file mode 100644 index 00000000000..0668fd3b065 Binary files /dev/null and b/public/images/pokemon/exp/back/shiny/815-gigantamax.png differ diff --git a/public/images/pokemon/exp/back/shiny/839-gigantamax.json b/public/images/pokemon/exp/back/shiny/839-gigantamax.json new file mode 100644 index 00000000000..35d98910c9f --- /dev/null +++ b/public/images/pokemon/exp/back/shiny/839-gigantamax.json @@ -0,0 +1,821 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 238, "y": 282, "w": 77, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 470, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 546, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 469, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 544, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 154, "y": 472, "w": 76, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 566, "w": 75, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 393, "y": 376, "w": 77, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 414, "y": 190, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 492, "y": 191, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 159, "y": 283, "w": 78, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 158, "y": 189, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 255, "y": 188, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 173, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 90, "y": 93, "w": 83, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 350, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 524, "y": 0, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 268, "y": 92, "w": 82, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 513, "y": 95, "w": 80, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 185, "w": 79, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 238, "y": 282, "w": 77, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 470, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 546, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 469, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 544, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 154, "y": 472, "w": 76, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 566, "w": 75, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 393, "y": 376, "w": 77, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 414, "y": 190, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 492, "y": 191, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 159, "y": 283, "w": 78, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 158, "y": 189, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 255, "y": 188, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 173, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 90, "y": 93, "w": 83, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 350, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 524, "y": 0, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 268, "y": 92, "w": 82, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 513, "y": 95, "w": 80, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 185, "w": 79, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 238, "y": 282, "w": 77, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 470, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 546, "y": 377, "w": 76, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 469, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 544, "y": 473, "w": 75, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 154, "y": 472, "w": 76, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 566, "w": 75, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 393, "y": 376, "w": 77, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 414, "y": 190, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 492, "y": 191, "w": 78, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 159, "y": 283, "w": 78, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 158, "y": 189, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 255, "y": 188, "w": 80, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 173, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 90, "y": 93, "w": 83, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 350, "y": 95, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 524, "y": 0, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 268, "y": 92, "w": 82, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 513, "y": 95, "w": 80, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 185, "w": 79, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 238, "y": 282, "w": 77, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 79, "y": 187, "w": 79, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 79, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 432, "y": 95, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 1, "w": 81, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 441, "y": 0, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 356, "y": 0, "w": 85, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 85, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 180, "y": 0, "w": 88, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 88, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 0, "w": 90, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 90, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 90, "y": 0, "w": 90, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 90, "h": 93 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 268, "y": 0, "w": 88, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 88, "h": 92 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 94, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 5, "w": 85, "h": 91 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 77, "y": 283, "w": 82, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 6, "w": 82, "h": 90 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 397, "y": 285, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 5, "w": 81, "h": 91 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 232, "y": 378, "w": 81, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 81, "h": 90 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 315, "y": 283, "w": 82, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 6, "w": 82, "h": 90 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 478, "y": 286, "w": 81, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 5, "w": 81, "h": 91 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 313, "y": 467, "w": 79, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 79, "h": 92 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 335, "y": 189, "w": 79, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 2, "w": 79, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 315, "y": 373, "w": 78, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 78, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 77, "y": 373, "w": 78, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 78, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 77, "y": 467, "w": 77, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 232, "y": 468, "w": 77, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 392, "y": 471, "w": 77, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 309, "y": 559, "w": 77, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 386, "y": 565, "w": 77, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 77, "y": 561, "w": 77, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 230, "y": 562, "w": 77, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 0, "y": 472, "w": 77, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 77, "h": 94 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 377, "w": 77, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 1, "w": 77, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 155, "y": 377, "w": 77, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 1, "w": 77, "h": 95 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 281, "w": 77, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 }, + "sourceSize": { "w": 106, "h": 96 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "839-gigantamax.png", + "format": "I8", + "size": { "w": 622, "h": 661 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/shiny/839-gigantamax.png b/public/images/pokemon/exp/back/shiny/839-gigantamax.png new file mode 100644 index 00000000000..ce96d8134a6 Binary files /dev/null and b/public/images/pokemon/exp/back/shiny/839-gigantamax.png differ diff --git a/public/images/pokemon/exp/708.json b/public/images/pokemon/exp/back/shiny/female/6215.json similarity index 62% rename from public/images/pokemon/exp/708.json rename to public/images/pokemon/exp/back/shiny/female/6215.json index f03fc408ded..07510ceaa55 100644 --- a/public/images/pokemon/exp/708.json +++ b/public/images/pokemon/exp/back/shiny/female/6215.json @@ -1,432 +1,33 @@ { "textures": [ { - "image": "708.png", + "image": "6215.png", "format": "RGBA8888", "size": { - "w": 206, - "h": 206 + "w": 155, + "h": 155 }, "scale": 1, "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 51, - "h": 43 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 51, - "h": 43 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 51, - "h": 43 - } - }, { "filename": "0007.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 51, - "h": 43 - }, - "frame": { "x": 0, - "y": 43, - "w": 51, - "h": 43 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 43, - "w": 51, - "h": 43 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 43, - "w": 51, - "h": 43 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, "y": 1, - "w": 51, - "h": 43 + "w": 54, + "h": 49 }, "frame": { "x": 0, - "y": 86, - "w": 51, - "h": 43 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 86, - "w": 51, - "h": 43 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 51, - "h": 43 - }, - "frame": { - "x": 0, - "y": 86, - "w": 51, - "h": 43 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 51, - "h": 42 - }, - "frame": { - "x": 0, - "y": 129, - "w": 51, - "h": 42 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 51, - "h": 42 - }, - "frame": { - "x": 0, - "y": 129, - "w": 51, - "h": 42 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 51, - "h": 42 - }, - "frame": { - "x": 0, - "y": 129, - "w": 51, - "h": 42 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 51, - "h": 42 - }, - "frame": { - "x": 0, - "y": 129, - "w": 51, - "h": 42 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 51, - "h": 42 - }, - "frame": { - "x": 0, - "y": 129, - "w": 51, - "h": 42 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 42, - "w": 51, - "h": 42 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 42, - "w": 51, - "h": 42 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 42, - "w": 51, - "h": 42 + "w": 54, + "h": 49 } }, { @@ -434,20 +35,41 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 51, - "h": 42 + "x": 0, + "y": 1, + "w": 54, + "h": 49 }, "frame": { - "x": 51, - "y": 84, - "w": 51, - "h": 42 + "x": 0, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0019.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 54, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 54, + "h": 49 } }, { @@ -455,20 +77,41 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 51, - "h": 42 + "x": 0, + "y": 1, + "w": 54, + "h": 49 }, "frame": { - "x": 51, - "y": 84, - "w": 51, - "h": 42 + "x": 0, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0031.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 54, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 54, + "h": 49 } }, { @@ -476,461 +119,41 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 84, - "w": 51, - "h": 42 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 126, - "w": 51, - "h": 42 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 126, - "w": 51, - "h": 42 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 51, - "h": 42 - }, - "frame": { - "x": 51, - "y": 126, - "w": 51, - "h": 42 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 0, - "w": 51, - "h": 42 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 42, - "w": 51, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 42, - "w": 51, - "h": 42 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 51, - "h": 42 - }, - "frame": { - "x": 102, - "y": 42, - "w": 51, - "h": 42 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 84, - "w": 51, - "h": 41 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 84, - "w": 51, - "h": 41 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 84, - "w": 51, - "h": 41 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 125, - "w": 51, - "h": 41 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 125, - "w": 51, - "h": 41 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 51, - "h": 41 - }, - "frame": { - "x": 102, - "y": 125, - "w": 51, - "h": 41 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 50, - "h": 40 - }, - "frame": { - "x": 102, - "y": 166, - "w": 50, - "h": 40 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { "x": 0, - "y": 6, - "w": 50, - "h": 40 - }, - "frame": { - "x": 152, - "y": 166, - "w": 50, - "h": 40 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 6, "y": 1, - "w": 51, - "h": 41 + "w": 54, + "h": 49 }, "frame": { - "x": 153, + "x": 0, "y": 0, - "w": 51, - "h": 41 + "w": 54, + "h": 49 } }, { - "filename": "0042.png", + "filename": "0043.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 6, + "x": 0, "y": 1, - "w": 51, - "h": 41 + "w": 54, + "h": 49 }, "frame": { - "x": 153, + "x": 0, "y": 0, - "w": 51, - "h": 41 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 51, - "h": 41 - }, - "frame": { - "x": 153, - "y": 41, - "w": 51, - "h": 41 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 47 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 51, - "h": 41 - }, - "frame": { - "x": 153, - "y": 41, - "w": 51, - "h": 41 + "w": 54, + "h": 49 } }, { @@ -938,41 +161,146 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 51, - "h": 41 + "x": 0, + "y": 1, + "w": 54, + "h": 49 }, "frame": { - "x": 153, - "y": 82, - "w": 51, - "h": 41 + "x": 0, + "y": 0, + "w": 54, + "h": 49 } }, { - "filename": "0048.png", + "filename": "0005.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { - "x": 2, + "x": 0, "y": 3, - "w": 51, - "h": 41 + "w": 54, + "h": 47 }, "frame": { - "x": 153, - "y": 82, - "w": 51, - "h": 41 + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0021.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0022.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0029.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0030.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 } }, { @@ -980,20 +308,167 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, "h": 47 }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0046.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 54, + "h": 47 + }, + "frame": { + "x": 54, + "y": 0, + "w": 54, + "h": 47 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, "spriteSourceSize": { "x": 0, "y": 4, - "w": 51, - "h": 41 + "w": 54, + "h": 46 }, "frame": { - "x": 153, - "y": 123, - "w": 51, - "h": 41 + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0023.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0024.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0027.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0028.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 } }, { @@ -1001,20 +476,545 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 58, - "h": 47 + "w": 54, + "h": 50 }, "spriteSourceSize": { "x": 0, "y": 4, - "w": 51, - "h": 41 + "w": 54, + "h": 46 }, "frame": { - "x": 153, - "y": 123, + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0048.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 54, + "h": 46 + }, + "frame": { + "x": 54, + "y": 47, + "w": 54, + "h": 46 + } + }, + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 6, + "w": 54, + "h": 44 + }, + "frame": { + "x": 0, + "y": 49, + "w": 54, + "h": 44 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 6, + "w": 54, + "h": 44 + }, + "frame": { + "x": 0, + "y": 49, + "w": 54, + "h": 44 + } + }, + { + "filename": "0025.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 6, + "w": 54, + "h": 44 + }, + "frame": { + "x": 0, + "y": 49, + "w": 54, + "h": 44 + } + }, + { + "filename": "0026.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 0, + "y": 6, + "w": 54, + "h": 44 + }, + "frame": { + "x": 0, + "y": 49, + "w": 54, + "h": 44 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0017.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0018.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0033.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0034.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0035.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0042.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 0, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0012.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0015.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0016.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0036.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0037.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0040.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0041.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 50 + }, + "frame": { + "x": 52, + "y": 93, + "w": 52, + "h": 50 + } + }, + { + "filename": "0013.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, "w": 51, - "h": 41 + "h": 50 + }, + "frame": { + "x": 104, + "y": 93, + "w": 51, + "h": 50 + } + }, + { + "filename": "0014.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 51, + "h": 50 + }, + "frame": { + "x": 104, + "y": 93, + "w": 51, + "h": 50 + } + }, + { + "filename": "0038.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 51, + "h": 50 + }, + "frame": { + "x": 104, + "y": 93, + "w": 51, + "h": 50 + } + }, + { + "filename": "0039.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 54, + "h": 50 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 51, + "h": 50 + }, + "frame": { + "x": 104, + "y": 93, + "w": 51, + "h": 50 } } ] @@ -1023,6 +1023,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:db6408a4e96a3c4552035ce768316e02:28f26069e5c44ed9f6fa66442864f895:796c82c5076b122f2663381836c65843$" + "smartupdate": "$TexturePacker:SmartUpdate:7decf4c336c92bdacc5d43bc8590718f:30606c7130f3577df61a85f98b567a88:736cd88647e79ba7896fc74f9406c2fe$" } } diff --git a/public/images/pokemon/exp/back/shiny/female/6215.png b/public/images/pokemon/exp/back/shiny/female/6215.png new file mode 100644 index 00000000000..3af5e81148c Binary files /dev/null and b/public/images/pokemon/exp/back/shiny/female/6215.png differ diff --git a/public/images/pokemon/exp/back/shiny/female/668.json b/public/images/pokemon/exp/back/shiny/female/668.json new file mode 100644 index 00000000000..8e55af5a4de --- /dev/null +++ b/public/images/pokemon/exp/back/shiny/female/668.json @@ -0,0 +1,820 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 475, "y": 144, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 76, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 152, "y": 283, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 73, "y": 284, "w": 74, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 460, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 227, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 385, "y": 284, "w": 75, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 472, "y": 283, "w": 77, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 233, "y": 282, "w": 77, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 396, "y": 215, "w": 76, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 399, "y": 144, "w": 76, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 431, "y": 73, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 242, "y": 142, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 156, "y": 213, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 475, "y": 144, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 76, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 152, "y": 283, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 73, "y": 284, "w": 74, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 460, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 227, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 385, "y": 284, "w": 75, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 472, "y": 283, "w": 77, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 233, "y": 282, "w": 77, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 396, "y": 215, "w": 76, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 399, "y": 144, "w": 76, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 431, "y": 73, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 242, "y": 142, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 156, "y": 213, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 475, "y": 144, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 76, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 152, "y": 283, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 73, "y": 284, "w": 74, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 460, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 227, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 385, "y": 284, "w": 75, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 472, "y": 283, "w": 77, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 233, "y": 282, "w": 77, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 396, "y": 215, "w": 76, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 399, "y": 144, "w": 76, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 431, "y": 73, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 242, "y": 142, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 156, "y": 213, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 475, "y": 144, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 76, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 152, "y": 283, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 73, "y": 284, "w": 74, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 460, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 227, "y": 350, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 385, "y": 284, "w": 75, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 472, "y": 283, "w": 77, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 233, "y": 282, "w": 77, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 396, "y": 215, "w": 76, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 214, "w": 76, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 399, "y": 144, "w": 76, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 431, "y": 73, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 242, "y": 142, "w": 77, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 156, "y": 213, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 475, "y": 144, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 144, "w": 78, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 233, "y": 213, "w": 78, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 156, "y": 144, "w": 79, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 4, "w": 79, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 319, "y": 144, "w": 80, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 80, "h": 68 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 242, "y": 73, "w": 80, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 80, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 310, "y": 282, "w": 75, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 534, "y": 350, "w": 71, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 4, "w": 71, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 301, "y": 351, "w": 67, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 3, "w": 67, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 353, "w": 63, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 3, "w": 63, "h": 75 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 204, "y": 417, "w": 63, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 2, "w": 63, "h": 75 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 139, "y": 352, "w": 65, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 65, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 73, "y": 352, "w": 66, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 3, "w": 66, "h": 72 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 368, "y": 351, "w": 69, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 4, "w": 69, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 0, "y": 284, "w": 73, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 4, "w": 73, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 475, "y": 214, "w": 76, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 319, "y": 212, "w": 77, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 77, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 82, "y": 73, "w": 80, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 80, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 519, "y": 72, "w": 83, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 83, "h": 72 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 434, "y": 0, "w": 85, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 85, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 261, "y": 0, "w": 86, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 86, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 174, "y": 0, "w": 87, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 87, "y": 0, "w": 87, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 87, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 0, "y": 0, "w": 87, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 87, "h": 73 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 347, "y": 0, "w": 87, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 87, "h": 72 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 519, "y": 0, "w": 85, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 85, "h": 72 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 347, "y": 72, "w": 84, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 84, "h": 72 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 73, "w": 82, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 162, "y": 73, "w": 80, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 80, "h": 71 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 78, "y": 144, "w": 78, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 70 }, + "sourceSize": { "w": 89, "h": 78 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "format": "I8", + "size": { "w": 605, "h": 492 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/back/shiny/female/668.png b/public/images/pokemon/exp/back/shiny/female/668.png new file mode 100644 index 00000000000..cec15d8fcb7 Binary files /dev/null and b/public/images/pokemon/exp/back/shiny/female/668.png differ diff --git a/public/images/pokemon/exp/back/shiny/707.json b/public/images/pokemon/exp/female/6215.json similarity index 62% rename from public/images/pokemon/exp/back/shiny/707.json rename to public/images/pokemon/exp/female/6215.json index 384c57d4102..8e010a77bb6 100644 --- a/public/images/pokemon/exp/back/shiny/707.json +++ b/public/images/pokemon/exp/female/6215.json @@ -1,2007 +1,33 @@ { "textures": [ { - "image": "707.png", + "image": "6215.png", "format": "RGBA8888", "size": { - "w": 286, - "h": 286 + "w": 230, + "h": 230 }, "scale": 1, "frames": [ - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 72 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 72 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 72 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 72, - "w": 38, - "h": 72 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 72, - "w": 38, - "h": 72 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 72, - "w": 38, - "h": 72 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 72 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 72 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 72 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 72 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 37, - "h": 72 - }, - "frame": { - "x": 38, - "y": 72, - "w": 37, - "h": 72 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 37, - "h": 72 - }, - "frame": { - "x": 38, - "y": 72, - "w": 37, - "h": 72 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 37, - "h": 72 - }, - "frame": { - "x": 38, - "y": 72, - "w": 37, - "h": 72 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 71 - }, - "frame": { - "x": 38, - "y": 144, - "w": 39, - "h": 71 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 71 - }, - "frame": { - "x": 38, - "y": 144, - "w": 39, - "h": 71 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 71 - }, - "frame": { - "x": 38, - "y": 144, - "w": 39, - "h": 71 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 77, - "y": 143, - "w": 38, - "h": 71 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 77, - "y": 143, - "w": 38, - "h": 71 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 77, - "y": 143, - "w": 38, - "h": 71 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 71 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 71 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 71 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 71, - "w": 38, - "h": 71 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 71, - "w": 38, - "h": 71 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 71, - "w": 38, - "h": 71 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 114, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 114, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 114, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 115, - "y": 142, - "w": 42, - "h": 70 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 41, - "h": 70 - }, - "frame": { - "x": 151, - "y": 70, - "w": 41, - "h": 70 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 41, - "h": 70 - }, - "frame": { - "x": 151, - "y": 70, - "w": 41, - "h": 70 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 41, - "h": 70 - }, - "frame": { - "x": 151, - "y": 70, - "w": 41, - "h": 70 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 156, - "y": 0, - "w": 40, - "h": 70 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 156, - "y": 0, - "w": 40, - "h": 70 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 156, - "y": 0, - "w": 40, - "h": 70 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 118, - "y": 212, - "w": 38, - "h": 70 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 118, - "y": 212, - "w": 38, - "h": 70 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 118, - "y": 212, - "w": 38, - "h": 70 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 156, - "y": 212, - "w": 44, - "h": 69 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 156, - "y": 212, - "w": 44, - "h": 69 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 156, - "y": 212, - "w": 44, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 69 - }, - "frame": { - "x": 157, - "y": 140, - "w": 43, - "h": 69 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 69 - }, - "frame": { - "x": 157, - "y": 140, - "w": 43, - "h": 69 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 69 - }, - "frame": { - "x": 157, - "y": 140, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 196, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 196, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 196, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 43, - "h": 69 - }, - "frame": { - "x": 239, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 43, - "h": 69 - }, - "frame": { - "x": 239, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 235, - "y": 69, - "w": 43, - "h": 69 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 235, - "y": 69, - "w": 43, - "h": 69 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 42, - "h": 69 - }, - "frame": { - "x": 235, - "y": 138, - "w": 42, - "h": 69 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 42, - "h": 69 - }, - "frame": { - "x": 235, - "y": 138, - "w": 42, - "h": 69 - } - }, { "filename": "0007.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 48, - "h": 74 + "w": 56, + "h": 54 }, "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 41, - "h": 69 + "x": 1, + "y": 1, + "w": 55, + "h": 50 }, "frame": { - "x": 200, - "y": 207, - "w": 41, - "h": 69 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, + "x": 0, "y": 0, - "w": 41, - "h": 69 - }, - "frame": { - "x": 200, - "y": 207, - "w": 41, - "h": 69 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 41, - "h": 69 - }, - "frame": { - "x": 200, - "y": 207, - "w": 41, - "h": 69 + "w": 55, + "h": 50 } }, { @@ -2009,20 +35,1175 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 48, - "h": 74 + "w": 56, + "h": 54 }, "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 40, - "h": 69 + "x": 1, + "y": 1, + "w": 55, + "h": 50 }, "frame": { - "x": 241, - "y": 207, - "w": 40, - "h": 69 + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0019.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0020.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0031.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0032.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0043.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0044.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0055.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0056.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0067.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0068.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0079.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 50, + "w": 55, + "h": 50 + } + }, + { + "filename": "0080.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 50, + "w": 55, + "h": 50 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0023.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0024.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0027.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0028.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0047.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0048.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0051.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0052.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0071.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0072.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0075.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0076.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0005.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0021.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0022.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0029.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0030.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0045.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0046.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0069.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0070.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0077.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0078.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0017.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0018.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0033.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0034.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0041.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0042.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0057.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0058.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0065.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0066.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0012.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0015.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0016.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0035.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 } }, { @@ -2030,20 +1211,125 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 48, - "h": 74 + "w": 56, + "h": 54 }, "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 40, - "h": 69 + "x": 2, + "y": 2, + "w": 54, + "h": 49 }, "frame": { - "x": 241, - "y": 207, - "w": 40, - "h": 69 + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0039.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0040.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0059.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0060.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0063.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 } }, { @@ -2051,20 +1337,734 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 48, - "h": 74 + "w": 56, + "h": 54 }, "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 40, - "h": 69 + "x": 2, + "y": 2, + "w": 54, + "h": 49 }, "frame": { - "x": 241, - "y": 207, - "w": 40, - "h": 69 + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0053.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 150, + "w": 53, + "h": 50 + } + }, + { + "filename": "0054.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 150, + "w": 53, + "h": 50 + } + }, + { + "filename": "0081.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 55, + "y": 51, + "w": 53, + "h": 50 + } + }, + { + "filename": "0082.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 55, + "y": 51, + "w": 53, + "h": 50 + } + }, + { + "filename": "0013.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0014.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0037.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0038.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0061.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0062.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0025.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0026.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0049.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0050.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0073.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0074.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0083.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 47, + "h": 47 + }, + "frame": { + "x": 108, + "y": 49, + "w": 47, + "h": 47 + } + }, + { + "filename": "0084.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 47, + "h": 47 + }, + "frame": { + "x": 108, + "y": 49, + "w": 47, + "h": 47 + } + }, + { + "filename": "0097.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 47, + "h": 47 + }, + "frame": { + "x": 155, + "y": 49, + "w": 47, + "h": 47 + } + }, + { + "filename": "0098.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 47, + "h": 47 + }, + "frame": { + "x": 155, + "y": 49, + "w": 47, + "h": 47 + } + }, + { + "filename": "0087.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 0, + "y": 7, + "w": 47, + "h": 44 + }, + "frame": { + "x": 108, + "y": 96, + "w": 47, + "h": 44 + } + }, + { + "filename": "0088.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 0, + "y": 7, + "w": 47, + "h": 44 + }, + "frame": { + "x": 108, + "y": 96, + "w": 47, + "h": 44 + } + }, + { + "filename": "0085.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 45, + "h": 46 + }, + "frame": { + "x": 155, + "y": 96, + "w": 45, + "h": 46 + } + }, + { + "filename": "0086.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 45, + "h": 46 + }, + "frame": { + "x": 155, + "y": 96, + "w": 45, + "h": 46 + } + }, + { + "filename": "0089.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 8, + "w": 45, + "h": 44 + }, + "frame": { + "x": 107, + "y": 140, + "w": 45, + "h": 44 + } + }, + { + "filename": "0090.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 8, + "w": 45, + "h": 44 + }, + "frame": { + "x": 107, + "y": 140, + "w": 45, + "h": 44 + } + }, + { + "filename": "0091.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 39, + "h": 46 + }, + "frame": { + "x": 103, + "y": 184, + "w": 39, + "h": 46 + } + }, + { + "filename": "0092.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 39, + "h": 46 + }, + "frame": { + "x": 103, + "y": 184, + "w": 39, + "h": 46 + } + }, + { + "filename": "0093.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 38, + "h": 46 + }, + "frame": { + "x": 142, + "y": 184, + "w": 38, + "h": 46 + } + }, + { + "filename": "0094.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 38, + "h": 46 + }, + "frame": { + "x": 142, + "y": 184, + "w": 38, + "h": 46 + } + }, + { + "filename": "0095.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 41, + "h": 44 + }, + "frame": { + "x": 180, + "y": 142, + "w": 41, + "h": 44 + } + }, + { + "filename": "0096.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 41, + "h": 44 + }, + "frame": { + "x": 180, + "y": 142, + "w": 41, + "h": 44 } } ] @@ -2073,6 +2073,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:cdbd19c7dad9a1ff1df2740c2ec77705:390b1dd326d02ff6f47617dbaa2be2bb:8e96b9056ea81e44ced99c97f472a528$" + "smartupdate": "$TexturePacker:SmartUpdate:a8930baf3a1083758adeeca87b28c6c7:3138fb5696691a4322b6805a44d3caa0:736cd88647e79ba7896fc74f9406c2fe$" } } diff --git a/public/images/pokemon/exp/female/6215.png b/public/images/pokemon/exp/female/6215.png new file mode 100644 index 00000000000..2d132090ae8 Binary files /dev/null and b/public/images/pokemon/exp/female/6215.png differ diff --git a/public/images/pokemon/exp/female/668.json b/public/images/pokemon/exp/female/668.json new file mode 100644 index 00000000000..443f13c0b54 --- /dev/null +++ b/public/images/pokemon/exp/female/668.json @@ -0,0 +1,820 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 219, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 291, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 453, "y": 289, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 441, "y": 360, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 309, "y": 359, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 380, "y": 358, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 317, "y": 289, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 390, "y": 288, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 254, "y": 220, "w": 63, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 63, "y": 220, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 399, "y": 216, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 64, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 138, "y": 74, "w": 63, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 201, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 264, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 219, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 291, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 453, "y": 289, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 441, "y": 360, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 309, "y": 359, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 380, "y": 358, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 317, "y": 289, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 390, "y": 288, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 254, "y": 220, "w": 63, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 63, "y": 220, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 399, "y": 216, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 64, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 138, "y": 74, "w": 63, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 201, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 264, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 219, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 291, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 453, "y": 289, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 441, "y": 360, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 309, "y": 359, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 380, "y": 358, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 317, "y": 289, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 390, "y": 288, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 254, "y": 220, "w": 63, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 63, "y": 220, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 399, "y": 216, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 64, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 138, "y": 74, "w": 63, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 201, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 264, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 219, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 291, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 453, "y": 289, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 441, "y": 360, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 309, "y": 359, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 380, "y": 358, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 317, "y": 289, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 390, "y": 288, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 254, "y": 220, "w": 63, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 63, "y": 220, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 399, "y": 216, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 64, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 138, "y": 74, "w": 63, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 201, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 264, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 219, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 147, "w": 64, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 64, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 127, "y": 152, "w": 64, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 64, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 465, "y": 146, "w": 65, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 65, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 399, "y": 146, "w": 66, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 66, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 334, "y": 74, "w": 66, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 66, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 191, "y": 220, "w": 63, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 63, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 126, "y": 223, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 62, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 462, "y": 217, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 188, "y": 291, "w": 61, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 61, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 249, "y": 291, "w": 60, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 60, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 62, "y": 292, "w": 60, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 122, "y": 295, "w": 60, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 182, "y": 363, "w": 59, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 6, "w": 59, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 60, "y": 364, "w": 59, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 59, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 362, "w": 60, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 60, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 327, "y": 217, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 268, "y": 74, "w": 66, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 74, "w": 69, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 69, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 376, "y": 0, "w": 73, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 227, "y": 0, "w": 75, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 76, "y": 0, "w": 76, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 76, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 0, "w": 76, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 76, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 152, "y": 0, "w": 75, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 302, "y": 0, "w": 74, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 74, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 449, "y": 0, "w": 72, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 72, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 449, "y": 73, "w": 71, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 71, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 69, "y": 74, "w": 69, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 69, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 201, "y": 74, "w": 67, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 67, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 334, "y": 145, "w": 65, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 65, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "format": "I8", + "size": { "w": 530, "h": 436 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/female/668.png b/public/images/pokemon/exp/female/668.png new file mode 100644 index 00000000000..fa0582a61f1 Binary files /dev/null and b/public/images/pokemon/exp/female/668.png differ diff --git a/public/images/pokemon/exp/shiny/248-mega.json b/public/images/pokemon/exp/shiny/248-mega.json index 6dc54a8aeb2..15243cf5a2d 100644 --- a/public/images/pokemon/exp/shiny/248-mega.json +++ b/public/images/pokemon/exp/shiny/248-mega.json @@ -1,272 +1,929 @@ -{ - "textures": [ - { - "image": "248-mega.png", - "format": "RGBA8888", - "size": { - "w": 271, - "h": 271 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 85 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 85 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 85, - "w": 91, - "h": 85 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 85, - "w": 91, - "h": 85 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 170, - "w": 91, - "h": 85 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 91, - "h": 85 - }, - "frame": { - "x": 0, - "y": 170, - "w": 91, - "h": 85 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 90, - "h": 85 - }, - "frame": { - "x": 91, - "y": 85, - "w": 90, - "h": 85 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 90, - "h": 85 - }, - "frame": { - "x": 91, - "y": 85, - "w": 90, - "h": 85 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 90, - "h": 85 - }, - "frame": { - "x": 181, - "y": 85, - "w": 90, - "h": 85 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 85 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 90, - "h": 84 - }, - "frame": { - "x": 91, - "y": 170, - "w": 90, - "h": 84 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e303fed6273448420d3b88ba11175e8d:629c5a6630efddb6c94efdcd98c81d33:90df97eb431b7162252516cb937a0b9e$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 467, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 559, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 374, "y": 261, "w": 91, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 467, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 262, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 91, "y": 431, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 183, "y": 431, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 514, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 182, "y": 513, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 273, "y": 515, "w": 87, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 91, "y": 513, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 364, "y": 513, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 546, "y": 433, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 0, "y": 431, "w": 89, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 365, "y": 430, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 273, "y": 348, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 370, "y": 346, "w": 90, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 186, "y": 262, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 278, "y": 263, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 184, "y": 176, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 559, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 374, "y": 261, "w": 91, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 467, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 262, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 91, "y": 431, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 183, "y": 431, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 514, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 182, "y": 513, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 273, "y": 515, "w": 87, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 91, "y": 513, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 364, "y": 513, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 546, "y": 433, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 431, "w": 89, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 365, "y": 430, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 273, "y": 348, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 370, "y": 346, "w": 90, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 186, "y": 262, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 278, "y": 263, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 184, "y": 176, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 559, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 374, "y": 261, "w": 91, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 467, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 262, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 91, "y": 431, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 183, "y": 431, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 514, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 182, "y": 513, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 273, "y": 515, "w": 87, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 91, "y": 513, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 364, "y": 513, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 546, "y": 433, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 431, "w": 89, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 365, "y": 430, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 273, "y": 348, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 370, "y": 346, "w": 90, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 186, "y": 262, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 278, "y": 263, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 184, "y": 176, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 559, "y": 175, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 374, "y": 261, "w": 91, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 467, "y": 261, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 262, "w": 92, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 91, "y": 431, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 183, "y": 431, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 514, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 182, "y": 513, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 273, "y": 515, "w": 87, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 91, "y": 513, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 364, "y": 513, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 546, "y": 433, "w": 89, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 431, "w": 89, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 365, "y": 430, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 273, "y": 348, "w": 90, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 370, "y": 346, "w": 90, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 186, "y": 262, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 278, "y": 263, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 184, "y": 176, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 176, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 92, "y": 176, "w": 90, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 561, "y": 261, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 0, "y": 346, "w": 89, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 89, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 467, "y": 345, "w": 89, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 89, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 94, "y": 262, "w": 90, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 90, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 91, "y": 347, "w": 89, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 89, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 182, "y": 347, "w": 89, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 89, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 275, "y": 431, "w": 87, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 87, "h": 82 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 457, "y": 430, "w": 87, "h": 83 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 87, "h": 83 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 558, "y": 346, "w": 86, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 86, "h": 85 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 283, "y": 175, "w": 89, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 89, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 189, "y": 88, "w": 92, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 0, "y": 0, "w": 93, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 93, "h": 87 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 380, "y": 0, "w": 92, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 95, "y": 88, "w": 92, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 474, "y": 0, "w": 92, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 190, "y": 0, "w": 93, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 95, "y": 0, "w": 93, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 285, "y": 0, "w": 93, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 473, "y": 88, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 378, "y": 88, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 283, "y": 88, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 0, "y": 89, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 374, "y": 175, "w": 91, "h": 84 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 84 }, + "sourceSize": { "w": 94, "h": 87 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "248-mega.png", + "format": "I8", + "size": { "w": 651, "h": 595 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/248-mega.png b/public/images/pokemon/exp/shiny/248-mega.png index eebfa35bbd4..8d9d5fc316c 100644 Binary files a/public/images/pokemon/exp/shiny/248-mega.png and b/public/images/pokemon/exp/shiny/248-mega.png differ diff --git a/public/images/pokemon/exp/shiny/362-mega.json b/public/images/pokemon/exp/shiny/362-mega.json index fe381106be4..c69ecfb1903 100644 --- a/public/images/pokemon/exp/shiny/362-mega.json +++ b/public/images/pokemon/exp/shiny/362-mega.json @@ -1,272 +1,551 @@ -{ - "textures": [ - { - "image": "362-mega.png", - "format": "RGBA8888", - "size": { - "w": 174, - "h": 174 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 72 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 72 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 72 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 72 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 71 - }, - "frame": { - "x": 0, - "y": 72, - "w": 58, - "h": 71 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 71 - }, - "frame": { - "x": 0, - "y": 72, - "w": 58, - "h": 71 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 71 - }, - "frame": { - "x": 0, - "y": 72, - "w": 58, - "h": 71 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 58, - "h": 71 - }, - "frame": { - "x": 58, - "y": 0, - "w": 58, - "h": 71 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 58, - "h": 71 - }, - "frame": { - "x": 58, - "y": 0, - "w": 58, - "h": 71 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 71 - }, - "frame": { - "x": 116, - "y": 0, - "w": 58, - "h": 71 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 70 - }, - "frame": { - "x": 58, - "y": 71, - "w": 58, - "h": 70 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 70 - }, - "frame": { - "x": 58, - "y": 71, - "w": 58, - "h": 70 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2d52abc4de24282165212b778dfccd62:be0a830bc1f35d437700a203d1fea184:8a7271a5423838c97ddeb1e6dc343255$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 62, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 64, "y": 0, "w": 58, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 }, + "sourceSize": { "w": 62, "h": 84 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "362-mega.png", + "format": "I8", + "size": { "w": 122, "h": 134 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/362-mega.png b/public/images/pokemon/exp/shiny/362-mega.png index 9d2b9adc7f4..6645ab66cab 100644 Binary files a/public/images/pokemon/exp/shiny/362-mega.png and b/public/images/pokemon/exp/shiny/362-mega.png differ diff --git a/public/images/pokemon/exp/shiny/484-origin.json b/public/images/pokemon/exp/shiny/484-origin.json index 97d6a0b5f49..e77754c3b3f 100644 --- a/public/images/pokemon/exp/shiny/484-origin.json +++ b/public/images/pokemon/exp/shiny/484-origin.json @@ -4,8 +4,8 @@ "image": "484-origin.png", "format": "RGBA8888", "size": { - "w": 426, - "h": 426 + "w": 274, + "h": 274 }, "scale": 1, "frames": [ @@ -14,20 +14,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 }, "frame": { "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 } }, { @@ -35,20 +35,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 }, "frame": { "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 } }, { @@ -56,20 +56,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 }, "frame": { "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 } }, { @@ -77,20 +77,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 }, "frame": { "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 } }, { @@ -98,20 +98,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, + "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 }, "frame": { "x": 0, "y": 0, - "w": 91, - "h": 97 + "w": 90, + "h": 95 } }, { @@ -119,146 +119,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, "w": 91, - "h": 97 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 97 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 + "h": 95 }, "spriteSourceSize": { "x": 0, - "y": 5, - "w": 92, - "h": 96 - }, - "frame": { - "x": 91, - "y": 0, - "w": 92, - "h": 96 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 92, - "h": 96 - }, - "frame": { - "x": 91, - "y": 0, - "w": 92, - "h": 96 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, "y": 0, "w": 90, - "h": 97 + "h": 95 }, "frame": { "x": 0, - "y": 97, - "w": 90, - "h": 97 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, "y": 0, "w": 90, - "h": 97 - }, - "frame": { - "x": 0, - "y": 97, - "w": 90, - "h": 97 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 96, - "h": 90 - }, - "frame": { - "x": 183, - "y": 0, - "w": 96, - "h": 90 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 96, - "h": 90 - }, - "frame": { - "x": 183, - "y": 0, - "w": 96, - "h": 90 + "h": 95 } }, { @@ -266,20 +140,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -287,20 +161,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -308,20 +182,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -329,20 +203,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -350,20 +224,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -371,20 +245,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -392,20 +266,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -413,20 +287,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -434,20 +308,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -455,20 +329,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -476,20 +350,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 2, + "x": 0, + "y": 1, "w": 90, - "h": 95 + "h": 94 }, "frame": { "x": 0, - "y": 194, + "y": 95, "w": 90, - "h": 95 + "h": 94 } }, { @@ -497,272 +371,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 90, + "w": 91, "h": 95 }, - "frame": { + "spriteSourceSize": { "x": 0, - "y": 194, - "w": 90, - "h": 95 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 90, - "h": 95 - }, - "frame": { - "x": 0, - "y": 194, - "w": 90, - "h": 95 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 7, "y": 1, - "w": 89, - "h": 95 + "w": 90, + "h": 94 }, "frame": { "x": 0, - "y": 289, - "w": 89, - "h": 95 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 89, - "h": 95 - }, - "frame": { - "x": 0, - "y": 289, - "w": 89, - "h": 95 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 92, - "h": 92 - }, - "frame": { - "x": 279, - "y": 0, - "w": 92, - "h": 92 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 92, - "h": 92 - }, - "frame": { - "x": 279, - "y": 0, - "w": 92, - "h": 92 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 24, - "y": 16, - "w": 50, - "h": 54 - }, - "frame": { - "x": 371, - "y": 0, - "w": 50, - "h": 54 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 24, - "y": 16, - "w": 50, - "h": 54 - }, - "frame": { - "x": 371, - "y": 0, - "w": 50, - "h": 54 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 24, - "y": 16, - "w": 50, - "h": 54 - }, - "frame": { - "x": 371, - "y": 0, - "w": 50, - "h": 54 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 24, - "y": 16, - "w": 50, - "h": 54 - }, - "frame": { - "x": 371, - "y": 0, - "w": 50, - "h": 54 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 92, - "h": 92 - }, - "frame": { - "x": 183, - "y": 90, - "w": 92, - "h": 92 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 92, - "h": 92 - }, - "frame": { - "x": 183, - "y": 90, - "w": 92, - "h": 92 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 92, - "h": 92 - }, - "frame": { - "x": 183, - "y": 90, - "w": 92, - "h": 92 + "y": 95, + "w": 90, + "h": 94 } }, { @@ -770,20 +392,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -791,20 +413,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -812,20 +434,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -833,20 +455,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -854,20 +476,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -875,20 +497,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -896,20 +518,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -917,20 +539,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -938,20 +560,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -959,20 +581,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -980,20 +602,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 91, - "h": 92 + "h": 91 }, "frame": { - "x": 275, - "y": 92, + "x": 90, + "y": 0, "w": 91, - "h": 92 + "h": 91 } }, { @@ -1001,272 +623,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, "w": 91, - "h": 92 + "h": 95 }, - "frame": { - "x": 275, - "y": 92, + "spriteSourceSize": { + "x": 0, + "y": 4, "w": 91, - "h": 92 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 89, - "y": 289, - "w": 89, - "h": 93 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 + "h": 91 }, "frame": { "x": 90, - "y": 97, - "w": 89, - "h": 93 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 89, - "h": 93 - }, - "frame": { - "x": 90, - "y": 97, - "w": 89, - "h": 93 + "y": 0, + "w": 91, + "h": 91 } }, { @@ -1274,20 +644,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1295,20 +665,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1316,20 +686,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1337,20 +707,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1358,20 +728,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1379,20 +749,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1400,20 +770,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1421,20 +791,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1442,20 +812,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1463,20 +833,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1484,20 +854,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, - "h": 92 + "h": 91 }, "frame": { - "x": 90, - "y": 190, + "x": 181, + "y": 0, "w": 90, - "h": 92 + "h": 91 } }, { @@ -1505,19 +875,229 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 6, - "y": 5, + "x": 0, + "y": 4, "w": 90, + "h": 91 + }, + "frame": { + "x": 181, + "y": 0, + "w": 90, + "h": 91 + } + }, + { + "filename": "0011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, "h": 92 }, "frame": { "x": 90, - "y": 190, - "w": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0012.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0035.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0036.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0039.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0040.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0059.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0060.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0063.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, + "h": 92 + } + }, + { + "filename": "0064.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 89, + "h": 92 + }, + "frame": { + "x": 90, + "y": 91, + "w": 89, "h": 92 } }, @@ -1526,20 +1106,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1547,20 +1127,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1568,20 +1148,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1589,20 +1169,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1610,20 +1190,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1631,20 +1211,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1652,20 +1232,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1673,20 +1253,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1694,20 +1274,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1715,20 +1295,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1736,20 +1316,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, "w": 89, - "h": 92 + "h": 91 }, "frame": { - "x": 180, - "y": 182, + "x": 90, + "y": 183, "w": 89, - "h": 92 + "h": 91 } }, { @@ -1757,62 +1337,62 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 7, - "y": 5, + "x": 1, + "y": 4, + "w": 89, + "h": 91 + }, + "frame": { + "x": 90, + "y": 183, + "w": 89, + "h": 91 + } + }, + { + "filename": "0015.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 91, + "h": 95 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, "w": 89, "h": 92 }, "frame": { - "x": 180, - "y": 182, + "x": 179, + "y": 91, "w": 89, "h": 92 } }, { - "filename": "0077.png", + "filename": "0016.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 90, - "h": 90 + "x": 2, + "y": 3, + "w": 89, + "h": 92 }, "frame": { - "x": 269, - "y": 184, - "w": 90, - "h": 90 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 90, - "h": 90 - }, - "frame": { - "x": 269, - "y": 184, - "w": 90, - "h": 90 + "x": 179, + "y": 91, + "w": 89, + "h": 92 } }, { @@ -1820,20 +1400,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } }, { @@ -1841,20 +1421,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } }, { @@ -1862,20 +1442,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } }, { @@ -1883,20 +1463,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } }, { @@ -1904,20 +1484,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } }, { @@ -1925,608 +1505,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 110, - "h": 110 + "w": 91, + "h": 95 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 88, - "h": 92 + "x": 4, + "y": 4, + "w": 87, + "h": 91 }, "frame": { - "x": 180, - "y": 274, - "w": 88, - "h": 92 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 15, - "y": 7, - "w": 79, - "h": 86 - }, - "frame": { - "x": 268, - "y": 274, - "w": 79, - "h": 86 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 15, - "y": 7, - "w": 79, - "h": 86 - }, - "frame": { - "x": 268, - "y": 274, - "w": 79, - "h": 86 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 79, - "h": 83 - }, - "frame": { - "x": 347, - "y": 274, - "w": 79, - "h": 83 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 20, - "y": 11, - "w": 71, - "h": 69 - }, - "frame": { - "x": 347, - "y": 357, - "w": 71, - "h": 69 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 20, - "y": 11, - "w": 71, - "h": 69 - }, - "frame": { - "x": 347, - "y": 357, - "w": 71, - "h": 69 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 20, - "y": 11, - "w": 71, - "h": 69 - }, - "frame": { - "x": 347, - "y": 357, - "w": 71, - "h": 69 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 20, - "y": 12, - "w": 59, - "h": 70 - }, - "frame": { - "x": 359, - "y": 184, - "w": 59, - "h": 70 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 20, - "y": 12, - "w": 59, - "h": 70 - }, - "frame": { - "x": 359, - "y": 184, - "w": 59, - "h": 70 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 35, - "y": 23, - "w": 27, - "h": 33 - }, - "frame": { - "x": 0, - "y": 384, - "w": 27, - "h": 33 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 35, - "y": 23, - "w": 27, - "h": 33 - }, - "frame": { - "x": 371, - "y": 54, - "w": 27, - "h": 33 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 42, - "y": 26, - "w": 19, - "h": 23 - }, - "frame": { - "x": 27, - "y": 384, - "w": 19, - "h": 23 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 42, - "y": 26, - "w": 19, - "h": 23 - }, - "frame": { - "x": 27, - "y": 384, - "w": 19, - "h": 23 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 42, - "y": 35, - "w": 14, - "h": 10 - }, - "frame": { - "x": 359, - "y": 254, - "w": 14, - "h": 10 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 42, - "y": 35, - "w": 14, - "h": 10 - }, - "frame": { - "x": 359, - "y": 254, - "w": 14, - "h": 10 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 110, - "h": 110 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 3, - "h": 3 - }, - "frame": { - "x": 90, - "y": 282, - "w": 3, - "h": 3 + "x": 179, + "y": 183, + "w": 87, + "h": 91 } } ] @@ -2535,6 +1527,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:5fbe4aec02bf780bf0fca7dc7138bf7a:5d077386c518cf06786203ad5e3a3aba:5ea3e660bc9c2624f846675d5196db82$" + "smartupdate": "$TexturePacker:SmartUpdate:71a487dde0de6f6a7eb1b6e04018892f:49ee3dfe044ad986679a7ce34c28280d:5ea3e660bc9c2624f846675d5196db82$" } } diff --git a/public/images/pokemon/exp/shiny/484-origin.png b/public/images/pokemon/exp/shiny/484-origin.png index 69e95afe580..bea804ed677 100644 Binary files a/public/images/pokemon/exp/shiny/484-origin.png and b/public/images/pokemon/exp/shiny/484-origin.png differ diff --git a/public/images/pokemon/exp/shiny/569-gigantamax.json b/public/images/pokemon/exp/shiny/569-gigantamax.json new file mode 100644 index 00000000000..6cda2b0d79a --- /dev/null +++ b/public/images/pokemon/exp/shiny/569-gigantamax.json @@ -0,0 +1,1478 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0008.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0009.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0010.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0011.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0012.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0013.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0014.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0015.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0027.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0028.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0029.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0030.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0031.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0032.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0033.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0034.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0043.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0044.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0045.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0046.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0047.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0048.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0049.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0050.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0051.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0061.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0062.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0063.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0064.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0065.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0066.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0067.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0068.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0069.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0072.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0073.png", + "frame": { "x": 305, "y": 173, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0074.png", + "frame": { "x": 305, "y": 173, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0075.png", + "frame": { "x": 305, "y": 173, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0076.png", + "frame": { "x": 206, "y": 88, "w": 99, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0077.png", + "frame": { "x": 206, "y": 88, "w": 99, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0078.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0079.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0080.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0081.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0082.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0083.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0084.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0085.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0086.png", + "frame": { "x": 211, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0087.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0088.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0089.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0090.png", + "frame": { "x": 108, "y": 0, "w": 103, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0091.png", + "frame": { "x": 206, "y": 88, "w": 99, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0092.png", + "frame": { "x": 206, "y": 88, "w": 99, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0093.png", + "frame": { "x": 206, "y": 88, "w": 99, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0094.png", + "frame": { "x": 305, "y": 173, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0095.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0096.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0097.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0098.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0100.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0101.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0102.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0103.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0104.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0105.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0106.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0107.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0108.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0109.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0110.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0111.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0112.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0113.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0114.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0115.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0116.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0117.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0118.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0119.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0120.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0121.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0122.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0123.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0124.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0125.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0126.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0127.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0128.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0129.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0130.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0131.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0132.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0133.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0134.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0135.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0136.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0137.png", + "frame": { "x": 0, "y": 170, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0138.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0139.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0140.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0141.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0142.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0143.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0144.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0145.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0146.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0147.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0148.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0149.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0150.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0151.png", + "frame": { "x": 0, "y": 0, "w": 108, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0152.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0153.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0154.png", + "frame": { "x": 0, "y": 85, "w": 106, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0155.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0156.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0157.png", + "frame": { "x": 314, "y": 0, "w": 105, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0158.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0159.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0160.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0161.png", + "frame": { "x": 314, "y": 86, "w": 103, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0162.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + }, + { + "filename": "0163.png", + "frame": { "x": 106, "y": 88, "w": 100, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 }, + "sourceSize": { "w": 108, "h": 88 }, + "duration": 60 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "569-gigantamax.png", + "format": "I8", + "size": { "w": 419, "h": 261 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/shiny/569-gigantamax.png b/public/images/pokemon/exp/shiny/569-gigantamax.png new file mode 100644 index 00000000000..fc15ecd4585 Binary files /dev/null and b/public/images/pokemon/exp/shiny/569-gigantamax.png differ diff --git a/public/images/pokemon/exp/shiny/651.json b/public/images/pokemon/exp/shiny/651.json index 4289441de3d..20bdccd5bd4 100644 --- a/public/images/pokemon/exp/shiny/651.json +++ b/public/images/pokemon/exp/shiny/651.json @@ -1,188 +1,713 @@ -{ - "textures": [ - { - "image": "651.png", - "format": "RGBA8888", - "size": { - "w": 116, - "h": 116 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 58, - "y": 0, - "w": 58, - "h": 53 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 58, - "y": 0, - "w": 58, - "h": 53 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 58, - "h": 53 - }, - "frame": { - "x": 0, - "y": 53, - "w": 58, - "h": 53 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 52 - }, - "frame": { - "x": 58, - "y": 53, - "w": 58, - "h": 52 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 58, - "h": 53 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 58, - "h": 52 - }, - "frame": { - "x": 58, - "y": 53, - "w": 58, - "h": 52 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:53a767b5d08c0b868b90b8a06972f1db:ac5b599a09e8592218deeebb976d4e5c:a93e5fa02e10bf11e3ed8bf6571835ca$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 119, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 175, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 355, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 278, "y": 101, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 110, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 56, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 165, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 333, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 287, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 112, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 168, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 278, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 56, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 231, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 224, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 343, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 55, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 220, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 119, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 175, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 355, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 278, "y": 101, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 110, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 56, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 165, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 333, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 287, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 112, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 168, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 278, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 56, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 231, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 224, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 343, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 55, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 220, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 119, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 175, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 355, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 278, "y": 101, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 110, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 56, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 165, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 333, "y": 151, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 287, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 112, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 168, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 278, "y": 152, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 56, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 231, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 224, "y": 101, "w": 53, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 343, "y": 100, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 50, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 55, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 220, "y": 153, "w": 54, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 119, "y": 49, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 239, "y": 0, "w": 57, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 60, "y": 0, "w": 58, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 355, "y": 0, "w": 58, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 58, "h": 48 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 0, "w": 59, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 59, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 119, "y": 0, "w": 59, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 59, "h": 48 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 179, "y": 0, "w": 59, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 59, "h": 48 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 297, "y": 0, "w": 57, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 101, "w": 55, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 203, "w": 53, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 329, "y": 252, "w": 51, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 47 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 109, "y": 252, "w": 51, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 51, "h": 48 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 219, "y": 204, "w": 52, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 52, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 166, "y": 202, "w": 52, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 52, "h": 50 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 275, "y": 203, "w": 53, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 54, "y": 204, "w": 54, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 54, "h": 48 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 333, "y": 202, "w": 54, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 110, "y": 202, "w": 55, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 55, "h": 49 }, + "sourceSize": { "w": 60, "h": 53 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "651.png", + "format": "I8", + "size": { "w": 413, "h": 300 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/651.png b/public/images/pokemon/exp/shiny/651.png index dcd70d11100..1e59bc97587 100644 Binary files a/public/images/pokemon/exp/shiny/651.png and b/public/images/pokemon/exp/shiny/651.png differ diff --git a/public/images/pokemon/exp/shiny/653.json b/public/images/pokemon/exp/shiny/653.json index 738762f18c6..a08242f32cf 100644 --- a/public/images/pokemon/exp/shiny/653.json +++ b/public/images/pokemon/exp/shiny/653.json @@ -1,1553 +1,947 @@ -{ - "textures": [ - { - "image": "653.png", - "format": "RGBA8888", - "size": { - "w": 180, - "h": 180 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 47, - "h": 45 - }, - "frame": { - "x": 47, - "y": 0, - "w": 47, - "h": 45 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 43, - "h": 49 - }, - "frame": { - "x": 94, - "y": 0, - "w": 43, - "h": 49 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 137, - "y": 0, - "w": 42, - "h": 49 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 47, - "h": 44 - }, - "frame": { - "x": 0, - "y": 45, - "w": 47, - "h": 44 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 44, - "h": 47 - }, - "frame": { - "x": 47, - "y": 45, - "w": 44, - "h": 47 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 0, - "y": 89, - "w": 42, - "h": 49 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 0, - "y": 138, - "w": 47, - "h": 42 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 46, - "h": 44 - }, - "frame": { - "x": 42, - "y": 92, - "w": 46, - "h": 44 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 46, - "h": 44 - }, - "frame": { - "x": 42, - "y": 92, - "w": 46, - "h": 44 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 46, - "h": 44 - }, - "frame": { - "x": 42, - "y": 92, - "w": 46, - "h": 44 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 46, - "h": 44 - }, - "frame": { - "x": 42, - "y": 92, - "w": 46, - "h": 44 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 46, - "h": 44 - }, - "frame": { - "x": 42, - "y": 92, - "w": 46, - "h": 44 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 47, - "h": 42 - }, - "frame": { - "x": 47, - "y": 136, - "w": 47, - "h": 42 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 91, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 133, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 42, - "h": 49 - }, - "frame": { - "x": 133, - "y": 49, - "w": 42, - "h": 49 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 43, - "h": 47 - }, - "frame": { - "x": 94, - "y": 98, - "w": 43, - "h": 47 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 43, - "h": 47 - }, - "frame": { - "x": 94, - "y": 98, - "w": 43, - "h": 47 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 43, - "h": 46 - }, - "frame": { - "x": 137, - "y": 98, - "w": 43, - "h": 46 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 43, - "h": 46 - }, - "frame": { - "x": 137, - "y": 98, - "w": 43, - "h": 46 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 47, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 43, - "h": 46 - }, - "frame": { - "x": 137, - "y": 98, - "w": 43, - "h": 46 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:ee78bfcc0ba0e0b5534e843718784ee6:a0e7315742d6fef56aa3fa3581440131:a7be961d0230f568aff23d95e7ff0036$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 41, "y": 130, "w": 42, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 130, "w": 41, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 40, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 80, "y": 88, "w": 40, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 83, "y": 132, "w": 38, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 120, "y": 88, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 120, "y": 88, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 0, "y": 45, "w": 40, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 45, "w": 40, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 42, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 42, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 42, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 42, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 42, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 84, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 84, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 83, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 83, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 84, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 124, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 124, "y": 44, "w": 41, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 126, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 126, "y": 0, "w": 42, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 0, "y": 45, "w": 40, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 0, "y": 45, "w": 40, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 120, "y": 88, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 120, "y": 88, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 }, + "sourceSize": { "w": 44, "h": 45 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "653.png", + "format": "I8", + "size": { "w": 168, "h": 175 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/653.png b/public/images/pokemon/exp/shiny/653.png index 053624e5b7f..b1afebbd6a1 100644 Binary files a/public/images/pokemon/exp/shiny/653.png and b/public/images/pokemon/exp/shiny/653.png differ diff --git a/public/images/pokemon/exp/shiny/654.json b/public/images/pokemon/exp/shiny/654.json index 08655169f2a..74019f665ec 100644 --- a/public/images/pokemon/exp/shiny/654.json +++ b/public/images/pokemon/exp/shiny/654.json @@ -1,818 +1,695 @@ -{ - "textures": [ - { - "image": "654.png", - "format": "RGBA8888", - "size": { - "w": 390, - "h": 390 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 81 - }, - "frame": { - "x": 0, - "y": 0, - "w": 47, - "h": 81 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 81 - }, - "frame": { - "x": 0, - "y": 81, - "w": 47, - "h": 81 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 81 - }, - "frame": { - "x": 0, - "y": 162, - "w": 47, - "h": 81 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 47, - "h": 80 - }, - "frame": { - "x": 0, - "y": 243, - "w": 47, - "h": 80 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 81 - }, - "frame": { - "x": 47, - "y": 0, - "w": 46, - "h": 81 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 81 - }, - "frame": { - "x": 47, - "y": 81, - "w": 46, - "h": 81 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 46, - "h": 81 - }, - "frame": { - "x": 47, - "y": 162, - "w": 46, - "h": 81 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 46, - "h": 80 - }, - "frame": { - "x": 47, - "y": 243, - "w": 46, - "h": 80 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 46, - "h": 79 - }, - "frame": { - "x": 93, - "y": 0, - "w": 46, - "h": 79 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 46, - "h": 79 - }, - "frame": { - "x": 93, - "y": 79, - "w": 46, - "h": 79 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 46, - "h": 79 - }, - "frame": { - "x": 93, - "y": 158, - "w": 46, - "h": 79 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 46, - "h": 79 - }, - "frame": { - "x": 93, - "y": 237, - "w": 46, - "h": 79 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 46, - "h": 74 - }, - "frame": { - "x": 93, - "y": 316, - "w": 46, - "h": 74 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 46, - "h": 79 - }, - "frame": { - "x": 139, - "y": 0, - "w": 46, - "h": 79 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 45, - "h": 80 - }, - "frame": { - "x": 139, - "y": 79, - "w": 45, - "h": 80 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 45, - "h": 80 - }, - "frame": { - "x": 139, - "y": 159, - "w": 45, - "h": 80 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 46, - "h": 78 - }, - "frame": { - "x": 139, - "y": 239, - "w": 46, - "h": 78 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 46, - "h": 73 - }, - "frame": { - "x": 139, - "y": 317, - "w": 46, - "h": 73 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 184, - "y": 79, - "w": 45, - "h": 79 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 185, - "y": 0, - "w": 45, - "h": 79 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 184, - "y": 158, - "w": 45, - "h": 79 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 185, - "y": 237, - "w": 45, - "h": 79 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 46, - "h": 74 - }, - "frame": { - "x": 185, - "y": 316, - "w": 46, - "h": 74 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 229, - "y": 79, - "w": 45, - "h": 79 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 230, - "y": 0, - "w": 45, - "h": 79 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 229, - "y": 158, - "w": 45, - "h": 79 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 45, - "h": 79 - }, - "frame": { - "x": 230, - "y": 237, - "w": 45, - "h": 79 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 46, - "h": 73 - }, - "frame": { - "x": 231, - "y": 316, - "w": 46, - "h": 73 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 46, - "h": 77 - }, - "frame": { - "x": 274, - "y": 79, - "w": 46, - "h": 77 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 47, - "h": 75 - }, - "frame": { - "x": 275, - "y": 0, - "w": 47, - "h": 75 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 45, - "h": 78 - }, - "frame": { - "x": 274, - "y": 156, - "w": 45, - "h": 78 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 45, - "h": 78 - }, - "frame": { - "x": 275, - "y": 234, - "w": 45, - "h": 78 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 46, - "h": 76 - }, - "frame": { - "x": 319, - "y": 156, - "w": 46, - "h": 76 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 45, - "h": 77 - }, - "frame": { - "x": 320, - "y": 75, - "w": 45, - "h": 77 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 46, - "h": 75 - }, - "frame": { - "x": 322, - "y": 0, - "w": 46, - "h": 75 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 46, - "h": 75 - }, - "frame": { - "x": 277, - "y": 312, - "w": 46, - "h": 75 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 45, - "h": 76 - }, - "frame": { - "x": 320, - "y": 232, - "w": 45, - "h": 76 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 54, - "h": 81 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 45, - "h": 76 - }, - "frame": { - "x": 323, - "y": 308, - "w": 45, - "h": 76 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3bc1d6050e2efe57cc85a4e2787f5287:383941fac594bced71237ecb57b89444:1977f50e1ab8a3304ceeb59ee1aa2ba9$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 107, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 282, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 160, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 110, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 65, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 107, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 282, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 160, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 110, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 65, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 107, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 282, "y": 0, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 102, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 160, "y": 261, "w": 53, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 110, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 65, "w": 55, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 117, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 60, "y": 0, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 229, "y": 0, "w": 53, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 261, "w": 51, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 152, "y": 326, "w": 50, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 164, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 117, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 172, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 213, "y": 265, "w": 51, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 282, "y": 66, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 173, "y": 0, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 0, "w": 60, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 60, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 55, "y": 68, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 227, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 275, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 55, "y": 68, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 227, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 275, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 55, "y": 68, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 227, "y": 69, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 275, "y": 196, "w": 54, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 55, "y": 68, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 131, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 110, "y": 131, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 165, "y": 131, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 282, "y": 131, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 55, "y": 133, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 220, "y": 134, "w": 55, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 54, "y": 198, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 218, "y": 199, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 66 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 271, "y": 261, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 51, "y": 264, "w": 51, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 67 }, + "sourceSize": { "w": 63, "h": 69 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "654.png", + "format": "I8", + "size": { "w": 337, "h": 393 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/654.png b/public/images/pokemon/exp/shiny/654.png index f619614c362..bc9177ec918 100644 Binary files a/public/images/pokemon/exp/shiny/654.png and b/public/images/pokemon/exp/shiny/654.png differ diff --git a/public/images/pokemon/exp/shiny/656.json b/public/images/pokemon/exp/shiny/656.json index ac9979ad913..3c2051bfe3a 100644 --- a/public/images/pokemon/exp/shiny/656.json +++ b/public/images/pokemon/exp/shiny/656.json @@ -1,671 +1,713 @@ -{ - "textures": [ - { - "image": "656.png", - "format": "RGBA8888", - "size": { - "w": 96, - "h": 96 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 34 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 34, - "w": 32, - "h": 34 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 32, - "h": 34 - }, - "frame": { - "x": 64, - "y": 34, - "w": 32, - "h": 34 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:5864efc3a72b67d8dab83f02efd39074:ff0362b6a3d22e42702e1a31a4aec233:9c4d208e6c2f857bfb0b23b8eea3326c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 194, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 194, "y": 38, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 172, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 207, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 195, "y": 148, "w": 32, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 195, "y": 183, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 163, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 197, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 98, "y": 116, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 1, "y": 81, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 194, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 194, "y": 38, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 172, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 207, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 195, "y": 148, "w": 32, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 195, "y": 183, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 163, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 197, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 1, "y": 118, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 1, "y": 81, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 194, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 194, "y": 38, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 172, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 207, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 195, "y": 148, "w": 32, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 195, "y": 183, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 163, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 197, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 1, "y": 118, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 1, "y": 81, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 194, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 194, "y": 38, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 172, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 207, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 195, "y": 148, "w": 32, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 195, "y": 183, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 163, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 197, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 1, "y": 118, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 1, "y": 81, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 194, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 194, "y": 38, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 172, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 207, "y": 112, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 195, "y": 148, "w": 32, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 195, "y": 183, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 163, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 197, "y": 75, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 1, "y": 118, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 1, "y": 81, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 200 + }, + { + "filename": "0057.png", + "frame": { "x": 129, "y": 1, "w": 31, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 31, "h": 38 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 1, "y": 1, "w": 30, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 30, "h": 41 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 33, "y": 1, "w": 30, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 30, "h": 41 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 65, "y": 1, "w": 30, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 30, "h": 41 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 97, "y": 1, "w": 30, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 30, "h": 40 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 162, "y": 1, "w": 30, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 30, "h": 39 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 67, "y": 81, "w": 29, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 29, "h": 38 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 164, "y": 148, "w": 29, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 29, "h": 37 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 35, "y": 81, "w": 30, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 30, "h": 37 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 69, "y": 152, "w": 33, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 14, "w": 33, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 104, "y": 185, "w": 34, "h": 30 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 16, "w": 34, "h": 30 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 68, "y": 186, "w": 34, "h": 29 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 17, "w": 34, "h": 29 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 1, "y": 157, "w": 33, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 14, "w": 33, "h": 32 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 137, "y": 112, "w": 33, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 13, "w": 33, "h": 33 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 750 + }, + { + "filename": "0071.png", + "frame": { "x": 1, "y": 44, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 132, "y": 147, "w": 30, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 30, "h": 36 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 36, "y": 157, "w": 30, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 30, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 35, "y": 121, "w": 32, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 34 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 35, "y": 44, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 69, "y": 44, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 103, "y": 79, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 129, "y": 42, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 }, + "sourceSize": { "w": 36, "h": 47 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "656.png", + "format": "I8", + "size": { "w": 240, "h": 216 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/656.png b/public/images/pokemon/exp/shiny/656.png index ffbbc8258d1..c0a97924ca7 100644 Binary files a/public/images/pokemon/exp/shiny/656.png and b/public/images/pokemon/exp/shiny/656.png differ diff --git a/public/images/pokemon/exp/shiny/661.json b/public/images/pokemon/exp/shiny/661.json index 6dba8b616b3..ba6523f22b1 100644 --- a/public/images/pokemon/exp/shiny/661.json +++ b/public/images/pokemon/exp/shiny/661.json @@ -1,356 +1,398 @@ -{ - "textures": [ - { - "image": "661.png", - "format": "RGBA8888", - "size": { - "w": 70, - "h": 70 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 35 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 35, - "w": 32, - "h": 35 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 32, - "y": 35, - "w": 32, - "h": 35 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f9a4d305d58fcbff383e0da1712abf6a:1bc270d999d234ddb64b1c01d568ad86:186d621a544ea0e0e2e0bd57975a29b1$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 40, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0002.png", + "frame": { "x": 34, "y": 117, "w": 31, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0003.png", + "frame": { "x": 36, "y": 38, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0004.png", + "frame": { "x": 1, "y": 1, "w": 34, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0005.png", + "frame": { "x": 34, "y": 78, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0006.png", + "frame": { "x": 1, "y": 40, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0007.png", + "frame": { "x": 1, "y": 118, "w": 31, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0008.png", + "frame": { "x": 1, "y": 79, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0009.png", + "frame": { "x": 72, "y": 1, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0010.png", + "frame": { "x": 67, "y": 79, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0011.png", + "frame": { "x": 1, "y": 40, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0012.png", + "frame": { "x": 34, "y": 117, "w": 31, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0013.png", + "frame": { "x": 36, "y": 38, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0014.png", + "frame": { "x": 1, "y": 1, "w": 34, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0015.png", + "frame": { "x": 34, "y": 78, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0016.png", + "frame": { "x": 1, "y": 40, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0017.png", + "frame": { "x": 1, "y": 118, "w": 31, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0018.png", + "frame": { "x": 1, "y": 79, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0019.png", + "frame": { "x": 72, "y": 1, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0020.png", + "frame": { "x": 67, "y": 79, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0021.png", + "frame": { "x": 1, "y": 40, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0022.png", + "frame": { "x": 34, "y": 117, "w": 31, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0023.png", + "frame": { "x": 36, "y": 38, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0024.png", + "frame": { "x": 1, "y": 1, "w": 34, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0025.png", + "frame": { "x": 34, "y": 78, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0026.png", + "frame": { "x": 1, "y": 40, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0027.png", + "frame": { "x": 1, "y": 118, "w": 31, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0028.png", + "frame": { "x": 1, "y": 79, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0029.png", + "frame": { "x": 72, "y": 1, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0030.png", + "frame": { "x": 67, "y": 79, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0031.png", + "frame": { "x": 1, "y": 40, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0032.png", + "frame": { "x": 69, "y": 39, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0033.png", + "frame": { "x": 69, "y": 39, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0034.png", + "frame": { "x": 100, "y": 79, "w": 32, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 32, "h": 38 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0035.png", + "frame": { "x": 107, "y": 1, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0036.png", + "frame": { "x": 36, "y": 1, "w": 35, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0037.png", + "frame": { "x": 107, "y": 1, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0038.png", + "frame": { "x": 36, "y": 1, "w": 35, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0039.png", + "frame": { "x": 107, "y": 1, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0040.png", + "frame": { "x": 36, "y": 1, "w": 35, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0041.png", + "frame": { "x": 107, "y": 1, "w": 34, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0042.png", + "frame": { "x": 102, "y": 39, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + }, + { + "filename": "0043.png", + "frame": { "x": 69, "y": 39, "w": 32, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 }, + "sourceSize": { "w": 37, "h": 39 }, + "duration": 120 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "661.png", + "format": "I8", + "size": { "w": 142, "h": 157 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/661.png b/public/images/pokemon/exp/shiny/661.png index 2b73fb85c54..0e2d5996bc2 100644 Binary files a/public/images/pokemon/exp/shiny/661.png and b/public/images/pokemon/exp/shiny/661.png differ diff --git a/public/images/pokemon/exp/shiny/662.json b/public/images/pokemon/exp/shiny/662.json index 9aa396fbae1..3600bbcd38d 100644 --- a/public/images/pokemon/exp/shiny/662.json +++ b/public/images/pokemon/exp/shiny/662.json @@ -1,776 +1,254 @@ -{ - "textures": [ - { - "image": "662.png", - "format": "RGBA8888", - "size": { - "w": 167, - "h": 167 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 56, - "h": 52 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 56, - "h": 52 - }, - "frame": { - "x": 56, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 56, - "h": 52 - }, - "frame": { - "x": 56, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 56, - "h": 52 - }, - "frame": { - "x": 56, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 56, - "h": 52 - }, - "frame": { - "x": 56, - "y": 0, - "w": 56, - "h": 52 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 1, - "y": 16, - "w": 55, - "h": 37 - }, - "frame": { - "x": 112, - "y": 0, - "w": 55, - "h": 37 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 1, - "y": 16, - "w": 55, - "h": 37 - }, - "frame": { - "x": 112, - "y": 0, - "w": 55, - "h": 37 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 1, - "y": 16, - "w": 55, - "h": 37 - }, - "frame": { - "x": 112, - "y": 0, - "w": 55, - "h": 37 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 1, - "y": 16, - "w": 55, - "h": 37 - }, - "frame": { - "x": 112, - "y": 0, - "w": 55, - "h": 37 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 51 - }, - "frame": { - "x": 0, - "y": 52, - "w": 56, - "h": 51 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 51 - }, - "frame": { - "x": 0, - "y": 52, - "w": 56, - "h": 51 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 51 - }, - "frame": { - "x": 0, - "y": 52, - "w": 56, - "h": 51 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 51 - }, - "frame": { - "x": 0, - "y": 52, - "w": 56, - "h": 51 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 50 - }, - "frame": { - "x": 0, - "y": 103, - "w": 56, - "h": 50 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 50 - }, - "frame": { - "x": 0, - "y": 103, - "w": 56, - "h": 50 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 50 - }, - "frame": { - "x": 0, - "y": 103, - "w": 56, - "h": 50 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 50 - }, - "frame": { - "x": 0, - "y": 103, - "w": 56, - "h": 50 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 17, - "w": 56, - "h": 44 - }, - "frame": { - "x": 56, - "y": 52, - "w": 56, - "h": 44 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 17, - "w": 56, - "h": 44 - }, - "frame": { - "x": 56, - "y": 52, - "w": 56, - "h": 44 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 17, - "w": 56, - "h": 44 - }, - "frame": { - "x": 56, - "y": 96, - "w": 56, - "h": 44 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 61 - }, - "spriteSourceSize": { - "x": 0, - "y": 17, - "w": 56, - "h": 44 - }, - "frame": { - "x": 56, - "y": 96, - "w": 56, - "h": 44 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3ab37b59d2c6d2f3d8b7379738b89720:769cd0fc38f80c712966ce15da281c1f:e3da2dd0277c18bcc713dc6dd2460c87$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 221, "y": 131, "w": 57, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 17, "w": 57, "h": 61 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 113, "y": 70, "w": 56, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 19, "w": 56, "h": 63 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 335, "y": 136, "w": 49, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 36, "w": 49, "h": 50 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 105, "y": 197, "w": 63, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 33, "w": 63, "h": 51 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 1, "y": 1, "w": 59, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 16, "w": 59, "h": 66 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 119, "y": 1, "w": 56, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 11, "w": 56, "h": 68 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 233, "y": 1, "w": 54, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 7, "w": 54, "h": 70 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 176, "y": 1, "w": 56, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 13, "w": 56, "h": 68 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 288, "y": 1, "w": 59, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 20, "w": 59, "h": 64 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 338, "y": 187, "w": 47, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 30, "w": 47, "h": 48 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 66, "y": 249, "w": 62, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 26, "w": 62, "h": 49 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 1, "y": 68, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 6, "w": 58, "h": 64 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 169, "y": 141, "w": 47, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 17, "w": 47, "h": 49 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 275, "y": 198, "w": 62, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 12, "w": 62, "h": 50 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 61, "y": 1, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 57, "h": 67 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 288, "y": 66, "w": 54, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 54, "h": 69 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 60, "y": 69, "w": 52, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 5, "w": 52, "h": 71 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 170, "y": 70, "w": 50, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 70 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 1, "y": 133, "w": 49, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 13, "w": 49, "h": 70 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 275, "y": 249, "w": 56, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 30, "w": 56, "h": 49 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 1, "y": 205, "w": 64, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 27, "w": 64, "h": 48 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 221, "y": 72, "w": 60, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 13, "w": 60, "h": 58 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 113, "y": 134, "w": 55, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 7, "w": 55, "h": 62 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 223, "y": 193, "w": 51, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 3, "w": 51, "h": 64 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 51, "y": 141, "w": 53, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 7, "w": 53, "h": 63 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 169, "y": 193, "w": 53, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 10, "w": 53, "h": 63 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 279, "y": 136, "w": 55, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 14, "w": 55, "h": 61 }, + "sourceSize": { "w": 75, "h": 86 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "662.png", + "format": "I8", + "size": { "w": 386, "h": 299 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/662.png b/public/images/pokemon/exp/shiny/662.png index e45e79556c5..4eae91c7855 100644 Binary files a/public/images/pokemon/exp/shiny/662.png and b/public/images/pokemon/exp/shiny/662.png differ diff --git a/public/images/pokemon/exp/shiny/663.json b/public/images/pokemon/exp/shiny/663.json index 3af6f5c5875..8c4ef182132 100644 --- a/public/images/pokemon/exp/shiny/663.json +++ b/public/images/pokemon/exp/shiny/663.json @@ -1,1700 +1,731 @@ -{ - "textures": [ - { - "image": "663.png", - "format": "RGBA8888", - "size": { - "w": 295, - "h": 295 - }, - "scale": 1, - "frames": [ - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 0, - "y": 27, - "w": 121, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 121, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 2, - "y": 27, - "w": 116, - "h": 64 - }, - "frame": { - "x": 121, - "y": 0, - "w": 116, - "h": 64 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 108, - "h": 88 - }, - "frame": { - "x": 0, - "y": 58, - "w": 108, - "h": 88 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 19, - "y": 0, - "w": 87, - "h": 92 - }, - "frame": { - "x": 0, - "y": 146, - "w": 87, - "h": 92 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 92, - "h": 91 - }, - "frame": { - "x": 87, - "y": 146, - "w": 92, - "h": 91 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 9, - "y": 33, - "w": 99, - "h": 58 - }, - "frame": { - "x": 87, - "y": 237, - "w": 99, - "h": 58 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 104, - "h": 76 - }, - "frame": { - "x": 186, - "y": 64, - "w": 104, - "h": 76 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 7, - "y": 29, - "w": 103, - "h": 64 - }, - "frame": { - "x": 186, - "y": 140, - "w": 103, - "h": 64 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 121, - "h": 93 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 95, - "h": 87 - }, - "frame": { - "x": 186, - "y": 204, - "w": 95, - "h": 87 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8bf443d425b4203c8adbc0ffad215956:cf5b810e03b096373e0bdd0a7220fc2c:3790d8d72a704a789cc594688d98802e$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0002.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0003.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0004.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0006.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0007.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0009.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0010.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0012.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0013.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0014.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0016.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0017.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0019.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0020.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0022.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0023.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0024.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0026.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0027.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0029.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0030.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0032.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0033.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0034.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0036.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0037.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0039.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0040.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0042.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0043.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0044.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0045.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0046.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0047.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0049.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0050.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0052.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0053.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0054.png", + "frame": { "x": 115, "y": 90, "w": 121, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0056.png", + "frame": { "x": 378, "y": 75, "w": 101, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0057.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 0, "w": 106, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0059.png", + "frame": { "x": 107, "y": 0, "w": 90, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0060.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0062.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0064.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0065.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0066.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0067.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0069.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0070.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0071.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0072.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0074.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0075.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0076.png", + "frame": { "x": 198, "y": 0, "w": 93, "h": 85 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0077.png", + "frame": { "x": 378, "y": 0, "w": 102, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 90, "w": 114, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0079.png", + "frame": { "x": 237, "y": 92, "w": 97, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + }, + { + "filename": "0080.png", + "frame": { "x": 292, "y": 0, "w": 85, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 }, + "sourceSize": { "w": 128, "h": 96 }, + "duration": 80 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "663.png", + "format": "I8", + "size": { "w": 480, "h": 152 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/663.png b/public/images/pokemon/exp/shiny/663.png index 21c1e740e8d..a4e9dad1596 100644 Binary files a/public/images/pokemon/exp/shiny/663.png and b/public/images/pokemon/exp/shiny/663.png differ diff --git a/public/images/pokemon/exp/shiny/664.json b/public/images/pokemon/exp/shiny/664.json index 07a901e0d44..5036fe74b0b 100644 --- a/public/images/pokemon/exp/shiny/664.json +++ b/public/images/pokemon/exp/shiny/664.json @@ -1,188 +1,110 @@ -{ - "textures": [ - { - "image": "664.png", - "format": "RGBA8888", - "size": { - "w": 84, - "h": 84 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 25, - "h": 41 - }, - "frame": { - "x": 0, - "y": 43, - "w": 25, - "h": 41 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 25, - "h": 41 - }, - "frame": { - "x": 0, - "y": 43, - "w": 25, - "h": 41 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 25, - "y": 0, - "w": 25, - "h": 43 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 25, - "y": 0, - "w": 25, - "h": 43 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 25, - "h": 43 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 25, - "h": 43 - }, - "frame": { - "x": 50, - "y": 0, - "w": 25, - "h": 43 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:abc9e31ee93d2f27a131cb957fe7fc3c:57e5ff2b24c643697831bc41f9168d6d:596e7d5b15b1bf041c4d7f6707c8ff49$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 46, "w": 26, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 26, "h": 46 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 83, "y": 46, "w": 26, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 26, "y": 90, "w": 26, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 52, "y": 91, "w": 26, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 26, "y": 46, "w": 27, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 27, "h": 44 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 78, "y": 91, "w": 26, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 44 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 56, "y": 0, "w": 28, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 45 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 0, "w": 28, "h": 46 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 46 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 28, "y": 0, "w": 28, "h": 46 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 46 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 84, "y": 0, "w": 27, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 46 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 56, "y": 45, "w": 27, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 46 }, + "sourceSize": { "w": 28, "h": 46 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "664.png", + "format": "I8", + "size": { "w": 111, "h": 136 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/664.png b/public/images/pokemon/exp/shiny/664.png index 2c10d379388..bfb8bd76371 100644 Binary files a/public/images/pokemon/exp/shiny/664.png and b/public/images/pokemon/exp/shiny/664.png differ diff --git a/public/images/pokemon/exp/shiny/665.json b/public/images/pokemon/exp/shiny/665.json index d419d4e9f03..a06b1d10ad0 100644 --- a/public/images/pokemon/exp/shiny/665.json +++ b/public/images/pokemon/exp/shiny/665.json @@ -1,188 +1,596 @@ -{ - "textures": [ - { - "image": "665.png", - "format": "RGBA8888", - "size": { - "w": 76, - "h": 76 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 36 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 36 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 36, - "h": 36 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 36, - "h": 36 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 35 - }, - "frame": { - "x": 36, - "y": 36, - "w": 38, - "h": 35 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 35 - }, - "frame": { - "x": 36, - "y": 36, - "w": 38, - "h": 35 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:af761b040cc08a74363c20cbe1eaf31a:5814711e03aeb472bfa3250552523d75:a72e6c94514c750d7462eab6b08ee591$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 151, "y": 103, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 151, "y": 103, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 151, "y": 103, "w": 36, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 115, "y": 103, "w": 36, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 76, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 79, "y": 73, "w": 36, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 36, "y": 76, "w": 34, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 159, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 193, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 159, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 40, "y": 41, "w": 39, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 3, "w": 39, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 80, "y": 38, "w": 45, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 3, "w": 45, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 227, "y": 34, "w": 63, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 63, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 80, "y": 0, "w": 74, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 74, "h": 38 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 154, "y": 0, "w": 81, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 81, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 235, "y": 0, "w": 81, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 81, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 0, "w": 80, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 80, "h": 41 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 154, "y": 34, "w": 73, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 316, "y": 0, "w": 73, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 37 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 290, "y": 37, "w": 53, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 4, "w": 53, "h": 34 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 343, "y": 37, "w": 46, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 3, "w": 46, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 41, "w": 40, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 3, "w": 40, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 227, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 261, "y": 71, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 295, "y": 71, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 329, "y": 72, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 363, "y": 72, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 125, "y": 68, "w": 34, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 }, + "sourceSize": { "w": 81, "h": 45 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "665.png", + "format": "I8", + "size": { "w": 397, "h": 135 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/665.png b/public/images/pokemon/exp/shiny/665.png index 316ad902306..7046825ae59 100644 Binary files a/public/images/pokemon/exp/shiny/665.png and b/public/images/pokemon/exp/shiny/665.png differ diff --git a/public/images/pokemon/exp/shiny/667.json b/public/images/pokemon/exp/shiny/667.json index db076b1f465..3fba95afcf9 100644 --- a/public/images/pokemon/exp/shiny/667.json +++ b/public/images/pokemon/exp/shiny/667.json @@ -1,272 +1,659 @@ -{ - "textures": [ - { - "image": "667.png", - "format": "RGBA8888", - "size": { - "w": 160, - "h": 160 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 40, - "h": 46 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 0, - "y": 92, - "w": 40, - "h": 46 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 40, - "y": 0, - "w": 40, - "h": 46 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 46 - }, - "frame": { - "x": 80, - "y": 0, - "w": 40, - "h": 46 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 45 - }, - "frame": { - "x": 120, - "y": 0, - "w": 40, - "h": 45 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 45 - }, - "frame": { - "x": 120, - "y": 0, - "w": 40, - "h": 45 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 45 - }, - "frame": { - "x": 120, - "y": 45, - "w": 40, - "h": 45 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 45 - }, - "frame": { - "x": 40, - "y": 90, - "w": 40, - "h": 45 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 40, - "h": 44 - }, - "frame": { - "x": 40, - "y": 46, - "w": 40, - "h": 44 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 40, - "h": 44 - }, - "frame": { - "x": 80, - "y": 46, - "w": 40, - "h": 44 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:fb79c9185dd67d4776808c312f36f7a4:a6c3c7cc2402b26f23f5ac4e23929ba7:02171d511e760c8a3e1b623ad6bf93f5$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 127, "y": 48, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 50, "w": 39, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0049.png", + "frame": { "x": 40, "y": 50, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0050.png", + "frame": { "x": 120, "y": 96, "w": 38, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0051.png", + "frame": { "x": 80, "y": 96, "w": 39, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0052.png", + "frame": { "x": 40, "y": 96, "w": 39, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0053.png", + "frame": { "x": 85, "y": 49, "w": 40, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0054.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0055.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0056.png", + "frame": { "x": 85, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 48 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0058.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0059.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0060.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0062.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0064.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0066.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0068.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0070.png", + "frame": { "x": 43, "y": 0, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0071.png", + "frame": { "x": 85, "y": 0, "w": 41, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 48 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + }, + { + "filename": "0072.png", + "frame": { "x": 127, "y": 0, "w": 40, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 }, + "sourceSize": { "w": 42, "h": 49 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "667.png", + "format": "I8", + "size": { "w": 167, "h": 141 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/667.png b/public/images/pokemon/exp/shiny/667.png index a0704b502c9..589f219c472 100644 Binary files a/public/images/pokemon/exp/shiny/667.png and b/public/images/pokemon/exp/shiny/667.png differ diff --git a/public/images/pokemon/exp/shiny/668.json b/public/images/pokemon/exp/shiny/668.json index 7e3f88c2276..63671a548a2 100644 --- a/public/images/pokemon/exp/shiny/668.json +++ b/public/images/pokemon/exp/shiny/668.json @@ -1,272 +1,821 @@ -{ - "textures": [ - { - "image": "668.png", - "format": "RGBA8888", - "size": { - "w": 205, - "h": 205 - }, - "scale": 1, - "frames": [ - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 70, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 70, - "h": 68 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 70, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 70, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 70, - "h": 69 - }, - "frame": { - "x": 70, - "y": 0, - "w": 70, - "h": 69 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 70, - "h": 69 - }, - "frame": { - "x": 70, - "y": 0, - "w": 70, - "h": 69 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 70, - "h": 69 - }, - "frame": { - "x": 70, - "y": 0, - "w": 70, - "h": 69 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 70, - "h": 69 - }, - "frame": { - "x": 70, - "y": 0, - "w": 70, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 70 - }, - "frame": { - "x": 0, - "y": 68, - "w": 67, - "h": 70 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 70 - }, - "frame": { - "x": 0, - "y": 68, - "w": 67, - "h": 70 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 69, - "h": 70 - }, - "frame": { - "x": 67, - "y": 69, - "w": 69, - "h": 70 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 69, - "h": 70 - }, - "frame": { - "x": 67, - "y": 69, - "w": 69, - "h": 70 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 69, - "h": 70 - }, - "frame": { - "x": 67, - "y": 69, - "w": 69, - "h": 70 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 70, - "h": 70 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 69, - "h": 70 - }, - "frame": { - "x": 136, - "y": 69, - "w": 69, - "h": 70 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:fe9d35bc9a00c019cb84acf0c89b22a5:7d23425606ae8471a81a61d8fdec2fc9:947bf84d1af493c62e2cef45bb6c19ad$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 67, "y": 222, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 295, "w": 68, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 414, "y": 297, "w": 67, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 196, "y": 367, "w": 65, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 414, "y": 369, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 320, "y": 372, "w": 60, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 380, "y": 441, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 196, "y": 438, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 61, "y": 370, "w": 60, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 350, "y": 296, "w": 64, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 151, "w": 67, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 283, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 434, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 214, "y": 149, "w": 69, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 282, "y": 225, "w": 68, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 67, "y": 222, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 295, "w": 68, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 414, "y": 297, "w": 67, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 196, "y": 367, "w": 65, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 414, "y": 369, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 320, "y": 372, "w": 60, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 380, "y": 441, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 196, "y": 438, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 61, "y": 370, "w": 60, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 350, "y": 296, "w": 64, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 151, "w": 67, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 283, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 434, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 214, "y": 149, "w": 69, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 282, "y": 225, "w": 68, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 67, "y": 222, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 295, "w": 68, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 414, "y": 297, "w": 67, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 196, "y": 367, "w": 65, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 414, "y": 369, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 320, "y": 372, "w": 60, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 380, "y": 441, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 196, "y": 438, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 61, "y": 370, "w": 60, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 350, "y": 296, "w": 64, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 0, "y": 151, "w": 67, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 283, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 434, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 214, "y": 149, "w": 69, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 282, "y": 225, "w": 68, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 67, "y": 222, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 295, "w": 68, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 414, "y": 297, "w": 67, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 196, "y": 367, "w": 65, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 414, "y": 369, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 320, "y": 372, "w": 60, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 380, "y": 441, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 196, "y": 438, "w": 58, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 61, "y": 370, "w": 60, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 350, "y": 296, "w": 64, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 151, "w": 67, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 283, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 434, "y": 149, "w": 68, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 214, "y": 149, "w": 69, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 282, "y": 225, "w": 68, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 351, "y": 151, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 142, "y": 221, "w": 70, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 351, "y": 224, "w": 70, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 70, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 421, "y": 225, "w": 69, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 69, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 205, "y": 296, "w": 69, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 69, "h": 71 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 212, "y": 224, "w": 70, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 70, "h": 72 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 137, "y": 294, "w": 68, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 68, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 274, "y": 299, "w": 64, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 368, "w": 61, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 61, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 442, "w": 55, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 55, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 438, "y": 441, "w": 55, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 55, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 261, "y": 372, "w": 59, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 134, "y": 367, "w": 62, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 62, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 68, "y": 295, "w": 66, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 66, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 365, "y": 75, "w": 69, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 69, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 75, "w": 71, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 76 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 442, "y": 74, "w": 72, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 2, "w": 72, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 221, "y": 74, "w": 72, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 72, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 369, "y": 0, "w": 73, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 296, "y": 0, "w": 73, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 74, "y": 0, "w": 74, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 0, "w": 74, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 75 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 148, "y": 0, "w": 74, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 74, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 148, "y": 74, "w": 73, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 73, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 222, "y": 0, "w": 74, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 74, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 442, "y": 0, "w": 73, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 73, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 293, "y": 75, "w": 72, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 72, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 71, "y": 75, "w": 72, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 72, "h": 74 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 71, "y": 149, "w": 71, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 71, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 143, "y": 148, "w": 71, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 71, "h": 73 }, + "sourceSize": { "w": 79, "h": 77 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "668.png", + "format": "I8", + "size": { "w": 515, "h": 516 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/668.png b/public/images/pokemon/exp/shiny/668.png index eaf8428625f..4cac3d1d582 100644 Binary files a/public/images/pokemon/exp/shiny/668.png and b/public/images/pokemon/exp/shiny/668.png differ diff --git a/public/images/pokemon/exp/shiny/672.json b/public/images/pokemon/exp/shiny/672.json index 67914bce1a9..f337bef7d29 100644 --- a/public/images/pokemon/exp/shiny/672.json +++ b/public/images/pokemon/exp/shiny/672.json @@ -1,965 +1,479 @@ -{ - "textures": [ - { - "image": "672.png", - "format": "RGBA8888", - "size": { - "w": 250, - "h": 250 - }, - "scale": 1, - "frames": [ - { - "filename": "0033.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 190, - "y": 0, - "w": 38, - "h": 42 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 0, - "y": 42, - "w": 38, - "h": 42 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 42, - "w": 38, - "h": 42 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 42 - }, - "frame": { - "x": 76, - "y": 42, - "w": 38, - "h": 42 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 42 - }, - "frame": { - "x": 114, - "y": 42, - "w": 37, - "h": 42 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 42 - }, - "frame": { - "x": 151, - "y": 42, - "w": 37, - "h": 42 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 42 - }, - "frame": { - "x": 188, - "y": 42, - "w": 37, - "h": 42 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 37, - "h": 42 - }, - "frame": { - "x": 0, - "y": 84, - "w": 37, - "h": 42 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 37, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 73, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 73, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 73, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 109, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 109, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 145, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 181, - "y": 84, - "w": 36, - "h": 42 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 0, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 36, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 72, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 108, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 144, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 36, - "h": 42 - }, - "frame": { - "x": 180, - "y": 126, - "w": 36, - "h": 42 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 0, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 0, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 36, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 72, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 108, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 108, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 144, - "y": 168, - "w": 36, - "h": 41 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 35, - "h": 42 - }, - "frame": { - "x": 180, - "y": 168, - "w": 35, - "h": 42 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 35, - "h": 42 - }, - "frame": { - "x": 180, - "y": 168, - "w": 35, - "h": 42 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 35, - "h": 42 - }, - "frame": { - "x": 215, - "y": 168, - "w": 35, - "h": 42 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 0, - "y": 209, - "w": 36, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 36, - "h": 41 - }, - "frame": { - "x": 36, - "y": 209, - "w": 36, - "h": 41 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:6fbd68ddc96f5b89a1e22b8dd6bbb4a7:2f673cdac5630b38377caf1ee3b82a60:2e4767b7cd134fc0ab1bb6e9eee82bc7$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 127, "y": 50, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 43, "y": 53, "w": 43, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 124, "y": 148, "w": 43, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 102, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 127, "y": 99, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 128, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 127, "y": 50, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 43, "y": 53, "w": 43, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 124, "y": 148, "w": 43, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 102, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 127, "y": 99, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 128, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 127, "y": 50, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 43, "y": 53, "w": 43, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 124, "y": 148, "w": 43, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 102, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 127, "y": 99, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 128, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 127, "y": 50, "w": 42, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 43, "y": 53, "w": 43, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 124, "y": 148, "w": 43, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 102, "w": 42, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 54, "w": 42, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 127, "y": 99, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 128, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 43, "y": 0, "w": 43, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 43, "h": 53 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 43, "h": 54 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 42, "y": 100, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 86, "y": 50, "w": 41, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 51 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 43, "y": 0, "w": 43, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 43, "h": 53 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 43, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 43, "h": 54 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 83, "y": 101, "w": 41, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 49 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 86, "y": 50, "w": 41, "h": 51 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 51 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 86, "y": 0, "w": 42, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 }, + "sourceSize": { "w": 44, "h": 58 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "672.png", + "format": "I8", + "size": { "w": 170, "h": 193 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/672.png b/public/images/pokemon/exp/shiny/672.png index 51c0e68da6c..605e79f1889 100644 Binary files a/public/images/pokemon/exp/shiny/672.png and b/public/images/pokemon/exp/shiny/672.png differ diff --git a/public/images/pokemon/exp/shiny/674.json b/public/images/pokemon/exp/shiny/674.json deleted file mode 100644 index 26013ad137f..00000000000 --- a/public/images/pokemon/exp/shiny/674.json +++ /dev/null @@ -1,524 +0,0 @@ -{ - "textures": [ - { - "image": "674.png", - "format": "RGBA8888", - "size": { - "w": 90, - "h": 90 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 30, - "h": 40 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 0, - "y": 40, - "w": 30, - "h": 39 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 30, - "y": 0, - "w": 30, - "h": 39 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 30, - "h": 39 - }, - "frame": { - "x": 30, - "y": 0, - "w": 30, - "h": 39 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 0, - "w": 30, - "h": 37 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 0, - "w": 30, - "h": 37 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 0, - "w": 30, - "h": 37 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 0, - "w": 30, - "h": 37 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 37, - "w": 30, - "h": 37 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 30, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 30, - "h": 37 - }, - "frame": { - "x": 60, - "y": 37, - "w": 30, - "h": 37 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a2f25cc68caea7219a96b563bb024d37:e8428456d1d23ad84ab9684dafd116b9:b823d10f1c9b4d501296982088ba63d6$" - } -} diff --git a/public/images/pokemon/exp/shiny/674.png b/public/images/pokemon/exp/shiny/674.png deleted file mode 100644 index b32b56ecd8d..00000000000 Binary files a/public/images/pokemon/exp/shiny/674.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/692.json b/public/images/pokemon/exp/shiny/692.json index 6d64cba2430..86b535260ae 100644 --- a/public/images/pokemon/exp/shiny/692.json +++ b/public/images/pokemon/exp/shiny/692.json @@ -1,356 +1,794 @@ -{ - "textures": [ - { - "image": "692.png", - "format": "RGBA8888", - "size": { - "w": 162, - "h": 162 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 60, - "y": 0, - "w": 60, - "h": 41 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 60, - "y": 0, - "w": 60, - "h": 41 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 41, - "w": 60, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 41, - "w": 60, - "h": 41 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 82, - "w": 60, - "h": 41 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 41 - }, - "frame": { - "x": 0, - "y": 82, - "w": 60, - "h": 41 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 0, - "y": 123, - "w": 60, - "h": 39 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 0, - "y": 123, - "w": 60, - "h": 39 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 60, - "y": 41, - "w": 60, - "h": 39 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 60, - "y": 41, - "w": 60, - "h": 39 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 60, - "y": 41, - "w": 60, - "h": 39 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 60, - "h": 39 - }, - "frame": { - "x": 60, - "y": 41, - "w": 60, - "h": 39 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 59, - "h": 41 - }, - "frame": { - "x": 60, - "y": 80, - "w": 59, - "h": 41 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 60, - "h": 41 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 59, - "h": 41 - }, - "frame": { - "x": 60, - "y": 121, - "w": 59, - "h": 41 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:fc9e6abcf70d6b35f1c403837c5312e8:2e67d61083a20d6c59dae4299718afc0:2880def858c84cd859bedf13b0b49a33$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 121, "y": 1, "w": 59, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 1, "y": 36, "w": 58, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 181, "y": 1, "w": 57, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 60, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 121, "y": 36, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 178, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 178, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 1, "y": 71, "w": 57, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 57, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 1, "y": 71, "w": 57, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 57, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 117, "y": 72, "w": 59, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 33 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 1, "y": 1, "w": 60, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 62, "y": 1, "w": 58, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 178, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 178, "y": 37, "w": 56, "h": 35 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 }, + "sourceSize": { "w": 63, "h": 35 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "692.png", + "format": "I8", + "size": { "w": 239, "h": 106 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/692.png b/public/images/pokemon/exp/shiny/692.png index 46cb7ca0f35..3d938d6e64a 100644 Binary files a/public/images/pokemon/exp/shiny/692.png and b/public/images/pokemon/exp/shiny/692.png differ diff --git a/public/images/pokemon/exp/shiny/693.json b/public/images/pokemon/exp/shiny/693.json index 991a16f1e53..c8f7763de1d 100644 --- a/public/images/pokemon/exp/shiny/693.json +++ b/public/images/pokemon/exp/shiny/693.json @@ -1,272 +1,902 @@ -{ - "textures": [ - { - "image": "693.png", - "format": "RGBA8888", - "size": { - "w": 259, - "h": 259 - }, - "scale": 1, - "frames": [ - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 86, - "h": 89 - }, - "frame": { - "x": 0, - "y": 0, - "w": 86, - "h": 89 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 86, - "h": 89 - }, - "frame": { - "x": 0, - "y": 0, - "w": 86, - "h": 89 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 85, - "h": 89 - }, - "frame": { - "x": 0, - "y": 89, - "w": 85, - "h": 89 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 85, - "h": 89 - }, - "frame": { - "x": 0, - "y": 89, - "w": 85, - "h": 89 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 85, - "h": 89 - }, - "frame": { - "x": 86, - "y": 0, - "w": 85, - "h": 89 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 85, - "h": 89 - }, - "frame": { - "x": 86, - "y": 0, - "w": 85, - "h": 89 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 85, - "h": 89 - }, - "frame": { - "x": 85, - "y": 89, - "w": 85, - "h": 89 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 85, - "h": 88 - }, - "frame": { - "x": 171, - "y": 0, - "w": 85, - "h": 88 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 85, - "h": 88 - }, - "frame": { - "x": 171, - "y": 0, - "w": 85, - "h": 88 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 91, - "h": 80 - }, - "frame": { - "x": 0, - "y": 178, - "w": 91, - "h": 80 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 89, - "h": 83 - }, - "frame": { - "x": 170, - "y": 89, - "w": 89, - "h": 83 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 89, - "h": 83 - }, - "frame": { - "x": 170, - "y": 89, - "w": 89, - "h": 83 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:ab498798f30c4ef93c4c30affa037f2e:aef6fdb8988ea3ebf127e38fb4875bad:9c1f9147e693c05eb4655590e9099679$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 416, "y": 214, "w": 91, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 405, "y": 145, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 207, "y": 344, "w": 105, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 507, "y": 285, "w": 105, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 412, "y": 1, "w": 104, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 1, "y": 145, "w": 99, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 1, "y": 76, "w": 105, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 507, "y": 219, "w": 104, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 1, "y": 283, "w": 102, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 207, "y": 1, "w": 99, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 517, "y": 74, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 106, "y": 78, "w": 102, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 421, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 312, "y": 354, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 416, "y": 214, "w": 91, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 405, "y": 145, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 207, "y": 344, "w": 105, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 507, "y": 285, "w": 105, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 412, "y": 1, "w": 104, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 1, "y": 145, "w": 99, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 1, "y": 76, "w": 105, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 507, "y": 219, "w": 104, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 1, "y": 283, "w": 102, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 207, "y": 1, "w": 99, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 517, "y": 74, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 106, "y": 78, "w": 102, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 421, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 312, "y": 354, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 416, "y": 214, "w": 91, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 405, "y": 145, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 207, "y": 344, "w": 105, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 507, "y": 285, "w": 105, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 412, "y": 1, "w": 104, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 1, "y": 145, "w": 99, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 1, "y": 76, "w": 105, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 507, "y": 219, "w": 104, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 1, "y": 283, "w": 102, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 207, "y": 1, "w": 99, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 517, "y": 74, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 106, "y": 78, "w": 102, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 421, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 312, "y": 354, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 416, "y": 214, "w": 91, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 405, "y": 145, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 207, "y": 344, "w": 105, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 507, "y": 285, "w": 105, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 412, "y": 1, "w": 104, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 1, "y": 145, "w": 99, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 1, "y": 76, "w": 105, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 507, "y": 219, "w": 104, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 1, "y": 283, "w": 102, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 207, "y": 1, "w": 99, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 517, "y": 74, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 106, "y": 78, "w": 102, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 421, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 312, "y": 354, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 416, "y": 214, "w": 91, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 405, "y": 145, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 207, "y": 344, "w": 105, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 507, "y": 285, "w": 105, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 412, "y": 1, "w": 104, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 1, "y": 145, "w": 99, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 1, "y": 76, "w": 105, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 507, "y": 219, "w": 104, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 1, "y": 283, "w": 102, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 207, "y": 1, "w": 99, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 517, "y": 74, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 106, "y": 78, "w": 102, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 421, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 312, "y": 354, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 208, "y": 78, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 303, "y": 140, "w": 102, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 5, "w": 102, "h": 70 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 523, "y": 348, "w": 102, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 11, "w": 102, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 318, "y": 290, "w": 103, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 7, "w": 103, "h": 64 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 105, "y": 1, "w": 102, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 0, "w": 102, "h": 75 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 306, "y": 72, "w": 108, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 108, "h": 68 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 108, "y": 276, "w": 105, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 14, "w": 105, "h": 65 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 1, "y": 1, "w": 104, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 104, "h": 74 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 203, "y": 210, "w": 106, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 13, "w": 106, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 508, "y": 152, "w": 106, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 15, "w": 106, "h": 67 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 414, "y": 74, "w": 103, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 8, "w": 103, "h": 71 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 306, "y": 72, "w": 108, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 14, "w": 108, "h": 68 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 108, "y": 276, "w": 105, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 14, "w": 105, "h": 65 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 1, "y": 1, "w": 104, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 104, "h": 74 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 203, "y": 210, "w": 106, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 13, "w": 106, "h": 66 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 309, "y": 214, "w": 107, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 14, "w": 107, "h": 65 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 306, "y": 1, "w": 106, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 9, "w": 106, "h": 70 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 1, "y": 218, "w": 107, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 14, "w": 107, "h": 65 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 213, "y": 279, "w": 105, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 14, "w": 105, "h": 65 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 103, "y": 341, "w": 104, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 15, "w": 104, "h": 63 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 516, "y": 1, "w": 101, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 101, "h": 73 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 100, "y": 149, "w": 103, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 1, "y": 349, "w": 102, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 16, "w": 102, "h": 62 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 103, "y": 404, "w": 100, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 16, "w": 100, "h": 61 }, + "sourceSize": { "w": 118, "h": 90 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "693.png", + "format": "I8", + "size": { "w": 626, "h": 466 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/693.png b/public/images/pokemon/exp/shiny/693.png index 328c909b196..60f40ad0c40 100644 Binary files a/public/images/pokemon/exp/shiny/693.png and b/public/images/pokemon/exp/shiny/693.png differ diff --git a/public/images/pokemon/exp/shiny/694.json b/public/images/pokemon/exp/shiny/694.json deleted file mode 100644 index 2352bb65a43..00000000000 --- a/public/images/pokemon/exp/shiny/694.json +++ /dev/null @@ -1,272 +0,0 @@ -{ - "textures": [ - { - "image": "694.png", - "format": "RGBA8888", - "size": { - "w": 140, - "h": 140 - }, - "scale": 1, - "frames": [ - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 44, - "h": 34 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 34 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 43, - "h": 34 - }, - "frame": { - "x": 0, - "y": 34, - "w": 43, - "h": 34 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 43, - "h": 34 - }, - "frame": { - "x": 44, - "y": 0, - "w": 43, - "h": 34 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 41, - "h": 35 - }, - "frame": { - "x": 0, - "y": 68, - "w": 41, - "h": 35 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 36, - "h": 37 - }, - "frame": { - "x": 0, - "y": 103, - "w": 36, - "h": 37 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 36, - "h": 37 - }, - "frame": { - "x": 0, - "y": 103, - "w": 36, - "h": 37 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 34, - "h": 37 - }, - "frame": { - "x": 36, - "y": 103, - "w": 34, - "h": 37 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 41, - "h": 35 - }, - "frame": { - "x": 87, - "y": 0, - "w": 41, - "h": 35 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 39, - "h": 36 - }, - "frame": { - "x": 43, - "y": 34, - "w": 39, - "h": 36 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 39, - "h": 36 - }, - "frame": { - "x": 82, - "y": 35, - "w": 39, - "h": 36 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 33, - "h": 37 - }, - "frame": { - "x": 70, - "y": 71, - "w": 33, - "h": 37 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 44, - "h": 37 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 31, - "h": 37 - }, - "frame": { - "x": 103, - "y": 71, - "w": 31, - "h": 37 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8a9916d2af3a40f04636cd5b11758f77:333ac780963a12589518f0acf1d61fde:b0990f9650cfe63b836cbed33f0b44d8$" - } -} diff --git a/public/images/pokemon/exp/shiny/694.png b/public/images/pokemon/exp/shiny/694.png deleted file mode 100644 index fe927c06742..00000000000 Binary files a/public/images/pokemon/exp/shiny/694.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/696.json b/public/images/pokemon/exp/shiny/696.json index 0d54e1282c5..7ea3165c669 100644 --- a/public/images/pokemon/exp/shiny/696.json +++ b/public/images/pokemon/exp/shiny/696.json @@ -1,692 +1,1055 @@ -{ - "textures": [ - { - "image": "696.png", - "format": "RGBA8888", - "size": { - "w": 135, - "h": 135 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 53, - "y": 0, - "w": 53, - "h": 46 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 53, - "h": 46 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 53, - "h": 46 - }, - "frame": { - "x": 0, - "y": 46, - "w": 53, - "h": 46 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 53, - "h": 43 - }, - "frame": { - "x": 0, - "y": 92, - "w": 53, - "h": 43 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 53, - "h": 43 - }, - "frame": { - "x": 0, - "y": 92, - "w": 53, - "h": 43 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 45 - }, - "frame": { - "x": 53, - "y": 46, - "w": 53, - "h": 45 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 53, - "h": 44 - }, - "frame": { - "x": 53, - "y": 91, - "w": 53, - "h": 44 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 53, - "h": 44 - }, - "frame": { - "x": 53, - "y": 91, - "w": 53, - "h": 44 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 53, - "h": 44 - }, - "frame": { - "x": 53, - "y": 91, - "w": 53, - "h": 44 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 53, - "h": 44 - }, - "frame": { - "x": 53, - "y": 91, - "w": 53, - "h": 44 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:83a7f65d0ef4a30ff24cb813c97b1fe2:69043b7539e99a45979999a29408221b:58b7763fb9abdd043e9bfa400cfafdef$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 57, "y": 0, "w": 57, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 114, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 113, "y": 137, "w": 58, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 138, "w": 58, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 56, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 113, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 170, "y": 92, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 227, "y": 92, "w": 55, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 227, "y": 92, "w": 55, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 228, "y": 46, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 228, "y": 46, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 114, "y": 47, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 114, "y": 47, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 171, "y": 0, "w": 58, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 171, "y": 0, "w": 58, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 171, "y": 46, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 57, "y": 48, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 57, "y": 48, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 0, "y": 50, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 50, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 227, "y": 92, "w": 55, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 227, "y": 92, "w": 55, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 228, "y": 46, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0105.png", + "frame": { "x": 228, "y": 46, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0106.png", + "frame": { "x": 114, "y": 47, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0107.png", + "frame": { "x": 114, "y": 47, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0108.png", + "frame": { "x": 171, "y": 0, "w": 58, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0109.png", + "frame": { "x": 171, "y": 0, "w": 58, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0110.png", + "frame": { "x": 171, "y": 46, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0111.png", + "frame": { "x": 57, "y": 48, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0112.png", + "frame": { "x": 57, "y": 48, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0113.png", + "frame": { "x": 0, "y": 50, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0114.png", + "frame": { "x": 0, "y": 50, "w": 56, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0115.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + }, + { + "filename": "0116.png", + "frame": { "x": 229, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 61, "h": 50 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "696.png", + "format": "I8", + "size": { "w": 286, "h": 179 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/696.png b/public/images/pokemon/exp/shiny/696.png index 0a11f7b7ec7..86ecac0d371 100644 Binary files a/public/images/pokemon/exp/shiny/696.png and b/public/images/pokemon/exp/shiny/696.png differ diff --git a/public/images/pokemon/exp/shiny/697.json b/public/images/pokemon/exp/shiny/697.json index 7d68fbf764e..c56de41946c 100644 --- a/public/images/pokemon/exp/shiny/697.json +++ b/public/images/pokemon/exp/shiny/697.json @@ -1,1175 +1,983 @@ -{ - "textures": [ - { - "image": "697.png", - "format": "RGBA8888", - "size": { - "w": 378, - "h": 378 - }, - "scale": 1, - "frames": [ - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 0, - "w": 76, - "h": 76 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 0, - "w": 76, - "h": 76 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 0, - "w": 76, - "h": 76 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 0, - "w": 76, - "h": 76 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 76, - "h": 76 - }, - "frame": { - "x": 0, - "y": 76, - "w": 76, - "h": 76 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 76, - "h": 75 - }, - "frame": { - "x": 76, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 76, - "h": 75 - }, - "frame": { - "x": 76, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 76, - "h": 75 - }, - "frame": { - "x": 76, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 76, - "h": 75 - }, - "frame": { - "x": 76, - "y": 0, - "w": 76, - "h": 75 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 75, - "h": 75 - }, - "frame": { - "x": 0, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 75, - "h": 75 - }, - "frame": { - "x": 0, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 75, - "h": 75 - }, - "frame": { - "x": 0, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 75, - "h": 75 - }, - "frame": { - "x": 0, - "y": 152, - "w": 75, - "h": 75 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 76, - "h": 74 - }, - "frame": { - "x": 76, - "y": 75, - "w": 76, - "h": 74 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 75, - "h": 75 - }, - "frame": { - "x": 152, - "y": 0, - "w": 75, - "h": 75 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 76, - "h": 74 - }, - "frame": { - "x": 227, - "y": 0, - "w": 76, - "h": 74 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 0, - "y": 227, - "w": 74, - "h": 75 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 0, - "y": 227, - "w": 74, - "h": 75 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 0, - "y": 227, - "w": 74, - "h": 75 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 0, - "y": 227, - "w": 74, - "h": 75 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 69, - "h": 76 - }, - "frame": { - "x": 0, - "y": 302, - "w": 69, - "h": 76 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 69, - "h": 76 - }, - "frame": { - "x": 0, - "y": 302, - "w": 69, - "h": 76 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 152, - "y": 75, - "w": 74, - "h": 74 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 152, - "y": 75, - "w": 74, - "h": 74 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 152, - "y": 75, - "w": 74, - "h": 74 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 152, - "y": 75, - "w": 74, - "h": 74 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 303, - "y": 0, - "w": 74, - "h": 74 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 74, - "h": 74 - }, - "frame": { - "x": 303, - "y": 0, - "w": 74, - "h": 74 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 72, - "h": 75 - }, - "frame": { - "x": 69, - "y": 302, - "w": 72, - "h": 75 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 72, - "h": 75 - }, - "frame": { - "x": 69, - "y": 302, - "w": 72, - "h": 75 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 72, - "h": 75 - }, - "frame": { - "x": 69, - "y": 302, - "w": 72, - "h": 75 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 72, - "h": 75 - }, - "frame": { - "x": 69, - "y": 302, - "w": 72, - "h": 75 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 71, - "h": 75 - }, - "frame": { - "x": 74, - "y": 227, - "w": 71, - "h": 75 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 71, - "h": 75 - }, - "frame": { - "x": 74, - "y": 227, - "w": 71, - "h": 75 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 71, - "h": 75 - }, - "frame": { - "x": 74, - "y": 227, - "w": 71, - "h": 75 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 71, - "h": 75 - }, - "frame": { - "x": 74, - "y": 227, - "w": 71, - "h": 75 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 73, - "h": 75 - }, - "frame": { - "x": 75, - "y": 152, - "w": 73, - "h": 75 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 73, - "h": 75 - }, - "frame": { - "x": 75, - "y": 152, - "w": 73, - "h": 75 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 73, - "h": 75 - }, - "frame": { - "x": 75, - "y": 152, - "w": 73, - "h": 75 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 73, - "h": 75 - }, - "frame": { - "x": 75, - "y": 152, - "w": 73, - "h": 75 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 148, - "y": 149, - "w": 74, - "h": 75 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 74, - "h": 75 - }, - "frame": { - "x": 148, - "y": 149, - "w": 74, - "h": 75 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 67, - "h": 77 - }, - "frame": { - "x": 222, - "y": 149, - "w": 67, - "h": 77 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 72, - "h": 75 - }, - "frame": { - "x": 227, - "y": 74, - "w": 72, - "h": 75 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 67, - "h": 77 - }, - "frame": { - "x": 299, - "y": 74, - "w": 67, - "h": 77 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 65, - "h": 78 - }, - "frame": { - "x": 289, - "y": 151, - "w": 65, - "h": 78 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 65, - "h": 78 - }, - "frame": { - "x": 289, - "y": 151, - "w": 65, - "h": 78 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 63, - "h": 79 - }, - "frame": { - "x": 145, - "y": 227, - "w": 63, - "h": 79 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 63, - "h": 79 - }, - "frame": { - "x": 145, - "y": 227, - "w": 63, - "h": 79 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 61, - "h": 79 - }, - "frame": { - "x": 208, - "y": 226, - "w": 61, - "h": 79 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 61, - "h": 79 - }, - "frame": { - "x": 208, - "y": 226, - "w": 61, - "h": 79 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 76, - "h": 79 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 60, - "h": 79 - }, - "frame": { - "x": 269, - "y": 229, - "w": 60, - "h": 79 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f5b6396fc735fbaf3881fa6c1e4cdad7:20237f200f066bd1e2f7b8926f0361f1:f4fdd87d2fc1483d8e0a185c2654e3d9$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 384, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 476, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 661, "y": 232, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 281, "y": 312, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 556, "y": 462, "w": 91, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 181, "y": 462, "w": 90, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 88, "y": 464, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 540, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 90, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 179, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 647, "y": 468, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 271, "y": 470, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 536, "y": 539, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 90, "y": 386, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 366, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 275, "y": 233, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 384, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 476, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 661, "y": 232, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 281, "y": 312, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 556, "y": 462, "w": 91, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 181, "y": 462, "w": 90, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 88, "y": 464, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 540, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 90, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 179, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 647, "y": 468, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 271, "y": 470, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 536, "y": 539, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 90, "y": 386, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 366, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 275, "y": 233, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 384, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 476, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 661, "y": 232, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 281, "y": 312, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 556, "y": 462, "w": 91, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 181, "y": 462, "w": 90, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 88, "y": 464, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 540, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 90, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 179, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 647, "y": 468, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 271, "y": 470, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 536, "y": 539, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 90, "y": 386, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 366, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 275, "y": 233, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 384, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 476, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 661, "y": 232, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 281, "y": 312, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 556, "y": 462, "w": 91, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 181, "y": 462, "w": 90, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 88, "y": 464, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 540, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 90, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 179, "y": 540, "w": 89, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 647, "y": 468, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 271, "y": 470, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 536, "y": 539, "w": 90, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 90, "y": 386, "w": 91, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 366, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 275, "y": 233, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 78, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 184, "y": 231, "w": 91, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 91, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 94, "y": 157, "w": 90, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 90, "h": 80 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 391, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 88, "h": 80 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 275, "y": 390, "w": 88, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 88, "h": 80 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 363, "y": 463, "w": 86, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 1, "w": 86, "h": 81 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 649, "y": 386, "w": 86, "h": 82 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 86, "h": 82 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 449, "y": 463, "w": 87, "h": 80 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 87, "h": 80 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 312, "w": 90, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 90, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 372, "y": 386, "w": 92, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 5, "w": 92, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 566, "y": 233, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 566, "y": 233, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 92, "y": 78, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 473, "y": 156, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 556, "y": 386, "w": 93, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 181, "y": 387, "w": 94, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 94, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 648, "y": 311, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 186, "y": 312, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 661, "y": 157, "w": 96, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 96, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 458, "y": 311, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 669, "y": 0, "w": 93, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 93, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 464, "y": 386, "w": 92, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 5, "w": 92, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 0, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 234, "w": 92, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 384, "y": 77, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 568, "y": 79, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 93, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 661, "y": 79, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 93, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 289, "y": 0, "w": 95, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 95, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 0, "y": 0, "w": 96, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 96, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 96, "y": 0, "w": 96, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 96, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 192, "y": 0, "w": 97, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 97, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 480, "y": 0, "w": 96, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 96, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 384, "y": 0, "w": 96, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 96, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 192, "y": 77, "w": 96, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 96, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 566, "y": 157, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 95, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 553, "y": 311, "w": 95, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 95, "h": 75 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 277, "y": 157, "w": 95, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 95, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 92, "y": 310, "w": 94, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 94, "h": 76 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 0, "y": 157, "w": 94, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 94, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 458, "y": 234, "w": 93, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 93, "h": 77 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 184, "y": 153, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 93, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 380, "y": 156, "w": 93, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 93, "h": 78 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 576, "y": 0, "w": 93, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 288, "y": 78, "w": 92, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 }, + "sourceSize": { "w": 100, "h": 82 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "697.png", + "format": "I8", + "size": { "w": 762, "h": 616 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/697.png b/public/images/pokemon/exp/shiny/697.png index b89902a748f..7f4a0c09327 100644 Binary files a/public/images/pokemon/exp/shiny/697.png and b/public/images/pokemon/exp/shiny/697.png differ diff --git a/public/images/pokemon/exp/shiny/698.json b/public/images/pokemon/exp/shiny/698.json deleted file mode 100644 index de4bc49fb04..00000000000 --- a/public/images/pokemon/exp/shiny/698.json +++ /dev/null @@ -1,3296 +0,0 @@ -{ - "textures": [ - { - "image": "698.png", - "format": "RGBA8888", - "size": { - "w": 175, - "h": 175 - }, - "scale": 1, - "frames": [ - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0151.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0152.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 0, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 38, - "h": 55 - }, - "frame": { - "x": 0, - "y": 120, - "w": 38, - "h": 55 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0135.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0136.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0141.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0142.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0147.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0148.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0131.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0132.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0137.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0138.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0143.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0144.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0149.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0150.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 60 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 29, - "h": 55 - }, - "frame": { - "x": 38, - "y": 120, - "w": 29, - "h": 55 - } - }, - { - "filename": "0133.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0134.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0139.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0140.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0145.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0146.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 32, - "h": 60 - }, - "frame": { - "x": 64, - "y": 0, - "w": 32, - "h": 60 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 59 - }, - "frame": { - "x": 64, - "y": 60, - "w": 32, - "h": 59 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 59 - }, - "frame": { - "x": 64, - "y": 60, - "w": 32, - "h": 59 - } - }, - { - "filename": "0153.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 59 - }, - "frame": { - "x": 64, - "y": 60, - "w": 32, - "h": 59 - } - }, - { - "filename": "0154.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 59 - }, - "frame": { - "x": 64, - "y": 60, - "w": 32, - "h": 59 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 37, - "h": 56 - }, - "frame": { - "x": 67, - "y": 119, - "w": 37, - "h": 56 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 38, - "h": 54 - }, - "frame": { - "x": 104, - "y": 0, - "w": 38, - "h": 54 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 33, - "h": 58 - }, - "frame": { - "x": 142, - "y": 0, - "w": 33, - "h": 58 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 36, - "h": 57 - }, - "frame": { - "x": 104, - "y": 54, - "w": 36, - "h": 57 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0155.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0156.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 34, - "h": 58 - }, - "frame": { - "x": 140, - "y": 58, - "w": 34, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 31, - "h": 57 - }, - "frame": { - "x": 104, - "y": 116, - "w": 31, - "h": 57 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 38, - "h": 60 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 56 - }, - "frame": { - "x": 135, - "y": 116, - "w": 30, - "h": 56 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0ae9a601cdaeb2fdd017428d743bace6:a3c21f877838702a0481b1e5447757cd:198087d69fed44d4a642fa3ba5c077d6$" - } -} diff --git a/public/images/pokemon/exp/shiny/698.png b/public/images/pokemon/exp/shiny/698.png deleted file mode 100644 index 84d8ba3dac5..00000000000 Binary files a/public/images/pokemon/exp/shiny/698.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/700.json b/public/images/pokemon/exp/shiny/700.json index 4b7158b6eb9..fd6ef9b1bed 100644 --- a/public/images/pokemon/exp/shiny/700.json +++ b/public/images/pokemon/exp/shiny/700.json @@ -1,1070 +1,523 @@ -{ - "textures": [ - { - "image": "700.png", - "format": "RGBA8888", - "size": { - "w": 233, - "h": 233 - }, - "scale": 1, - "frames": [ - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 58 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 58 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 58 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 53, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 53, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 52, - "h": 58 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 52, - "h": 58 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 52, - "h": 58 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 52, - "h": 58 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 53, - "y": 0, - "w": 52, - "h": 58 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 53, - "y": 0, - "w": 52, - "h": 58 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 53, - "y": 0, - "w": 52, - "h": 58 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 52, - "h": 58 - }, - "frame": { - "x": 53, - "y": 0, - "w": 52, - "h": 58 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 51, - "h": 59 - }, - "frame": { - "x": 0, - "y": 116, - "w": 51, - "h": 59 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 51, - "h": 59 - }, - "frame": { - "x": 0, - "y": 116, - "w": 51, - "h": 59 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 51, - "h": 59 - }, - "frame": { - "x": 0, - "y": 116, - "w": 51, - "h": 59 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 51, - "h": 59 - }, - "frame": { - "x": 0, - "y": 116, - "w": 51, - "h": 59 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 45, - "h": 58 - }, - "frame": { - "x": 0, - "y": 175, - "w": 45, - "h": 58 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 45, - "h": 58 - }, - "frame": { - "x": 0, - "y": 175, - "w": 45, - "h": 58 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 52, - "y": 58, - "w": 50, - "h": 59 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 105, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 105, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 105, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 105, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 155, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 155, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 155, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 155, - "y": 0, - "w": 50, - "h": 59 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 51, - "y": 117, - "w": 50, - "h": 59 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 51, - "y": 117, - "w": 50, - "h": 59 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 51, - "y": 117, - "w": 50, - "h": 59 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 51, - "y": 117, - "w": 50, - "h": 59 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 42, - "h": 57 - }, - "frame": { - "x": 45, - "y": 176, - "w": 42, - "h": 57 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 102, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 102, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 102, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 102, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 152, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 152, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 152, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 152, - "y": 59, - "w": 50, - "h": 59 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 50, - "h": 59 - }, - "frame": { - "x": 101, - "y": 118, - "w": 50, - "h": 59 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 49, - "h": 59 - }, - "frame": { - "x": 151, - "y": 118, - "w": 49, - "h": 59 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 49, - "h": 59 - }, - "frame": { - "x": 151, - "y": 118, - "w": 49, - "h": 59 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 49, - "h": 59 - }, - "frame": { - "x": 151, - "y": 118, - "w": 49, - "h": 59 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 53, - "h": 59 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 49, - "h": 59 - }, - "frame": { - "x": 151, - "y": 118, - "w": 49, - "h": 59 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b88614ce72ee950ea29dcf939b8dfd56:5daab4ddd86f67a34aaa4b7377e3b534:2e4bf5ef1f19e475073f7da10c60b540$" - } +{ "frames": { + "0001.png": { + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0002.png": { + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0003.png": { + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0004.png": { + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0005.png": { + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0006.png": { + "frame": { "x": 93, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0007.png": { + "frame": { "x": 99, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0008.png": { + "frame": { "x": 139, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0009.png": { + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0010.png": { + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0011.png": { + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0012.png": { + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0013.png": { + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0014.png": { + "frame": { "x": 0, "y": 120, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0015.png": { + "frame": { "x": 146, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0016.png": { + "frame": { "x": 46, "y": 122, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0017.png": { + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0018.png": { + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0019.png": { + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0020.png": { + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0021.png": { + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0022.png": { + "frame": { "x": 93, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0023.png": { + "frame": { "x": 99, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0024.png": { + "frame": { "x": 139, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0025.png": { + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0026.png": { + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0027.png": { + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0028.png": { + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0029.png": { + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0030.png": { + "frame": { "x": 0, "y": 120, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0031.png": { + "frame": { "x": 146, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0032.png": { + "frame": { "x": 46, "y": 122, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0033.png": { + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0034.png": { + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0035.png": { + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0036.png": { + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0037.png": { + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0038.png": { + "frame": { "x": 93, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0039.png": { + "frame": { "x": 99, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0040.png": { + "frame": { "x": 139, "y": 119, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0041.png": { + "frame": { "x": 180, "y": 183, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0042.png": { + "frame": { "x": 136, "y": 238, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0043.png": { + "frame": { "x": 44, "y": 181, "w": 44, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0044.png": { + "frame": { "x": 88, "y": 239, "w": 44, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0045.png": { + "frame": { "x": 180, "y": 242, "w": 43, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0046.png": { + "frame": { "x": 0, "y": 120, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0047.png": { + "frame": { "x": 146, "y": 60, "w": 46, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0048.png": { + "frame": { "x": 46, "y": 122, "w": 45, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0049.png": { + "frame": { "x": 0, "y": 239, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0050.png": { + "frame": { "x": 193, "y": 60, "w": 43, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 43, "h": 62 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0051.png": { + "frame": { "x": 99, "y": 0, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 47, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0052.png": { + "frame": { "x": 147, "y": 0, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 47, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0053.png": { + "frame": { "x": 0, "y": 0, "w": 51, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 51, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0054.png": { + "frame": { "x": 0, "y": 60, "w": 46, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 46, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0055.png": { + "frame": { "x": 92, "y": 178, "w": 43, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 43, "h": 60 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0056.png": { + "frame": { "x": 195, "y": 0, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 47, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0057.png": { + "frame": { "x": 52, "y": 0, "w": 46, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 46, "h": 61 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0058.png": { + "frame": { "x": 136, "y": 178, "w": 43, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 43, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0059.png": { + "frame": { "x": 195, "y": 0, "w": 47, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 47, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0060.png": { + "frame": { "x": 52, "y": 0, "w": 46, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 46, "h": 61 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0061.png": { + "frame": { "x": 0, "y": 179, "w": 43, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 43, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0062.png": { + "frame": { "x": 185, "y": 123, "w": 44, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 44, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0063.png": { + "frame": { "x": 47, "y": 62, "w": 45, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 45, "h": 59 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + }, + "0064.png": { + "frame": { "x": 44, "y": 239, "w": 43, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 43, "h": 58 }, + "sourceSize": { "w": 51, "h": 62 }, + "duration": 100 + } + }, + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "700.png", + "format": "I8", + "size": { "w": 242, "h": 298 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/700.png b/public/images/pokemon/exp/shiny/700.png index 5c809e628f5..f7addc720bf 100644 Binary files a/public/images/pokemon/exp/shiny/700.png and b/public/images/pokemon/exp/shiny/700.png differ diff --git a/public/images/pokemon/exp/shiny/702.json b/public/images/pokemon/exp/shiny/702.json index fc28cb19512..0ab95b58c7a 100644 --- a/public/images/pokemon/exp/shiny/702.json +++ b/public/images/pokemon/exp/shiny/702.json @@ -1,671 +1,443 @@ -{ - "textures": [ - { - "image": "702.png", - "format": "RGBA8888", - "size": { - "w": 138, - "h": 138 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 48, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 36 - }, - "frame": { - "x": 48, - "y": 0, - "w": 48, - "h": 36 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 36 - }, - "frame": { - "x": 0, - "y": 36, - "w": 47, - "h": 36 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 45, - "h": 36 - }, - "frame": { - "x": 0, - "y": 72, - "w": 45, - "h": 36 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 45, - "h": 36 - }, - "frame": { - "x": 0, - "y": 72, - "w": 45, - "h": 36 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 48, - "h": 35 - }, - "frame": { - "x": 45, - "y": 72, - "w": 48, - "h": 35 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 47, - "y": 36, - "w": 44, - "h": 35 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 47, - "y": 36, - "w": 44, - "h": 35 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 47, - "y": 36, - "w": 44, - "h": 35 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 47, - "h": 33 - }, - "frame": { - "x": 91, - "y": 36, - "w": 47, - "h": 33 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 47, - "h": 33 - }, - "frame": { - "x": 91, - "y": 36, - "w": 47, - "h": 33 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 47, - "h": 33 - }, - "frame": { - "x": 91, - "y": 36, - "w": 47, - "h": 33 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 93, - "y": 69, - "w": 44, - "h": 35 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 93, - "y": 69, - "w": 44, - "h": 35 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 36 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 44, - "h": 35 - }, - "frame": { - "x": 93, - "y": 69, - "w": 44, - "h": 35 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2fc3a964a6785b059da0b8d24f80fbd1:ec3deecdcac6775e64f154a58c36eef3:ba8fdab405d5efab99c4aa1084328e6b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 47, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 47, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 94, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 141, "y": 74, "w": 45, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 47, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 47, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 94, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 141, "y": 74, "w": 45, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 0, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 47, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 47, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 94, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 141, "y": 74, "w": 45, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 47, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 47, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 94, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 141, "y": 74, "w": 45, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 94, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 141, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 141, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 188, "y": 37, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 144, "y": 0, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 48, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 74, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 188, "y": 111, "w": 46, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 145, "w": 45, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 45, "h": 33 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 96, "y": 0, "w": 47, "h": 36 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 47, "y": 74, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 94, "y": 74, "w": 46, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 187, "y": 74, "w": 45, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 }, + "sourceSize": { "w": 47, "h": 36 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "702.png", + "format": "I8", + "size": { "w": 234, "h": 178 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/702.png b/public/images/pokemon/exp/shiny/702.png index b7e117c9473..2f7b735a1dc 100644 Binary files a/public/images/pokemon/exp/shiny/702.png and b/public/images/pokemon/exp/shiny/702.png differ diff --git a/public/images/pokemon/exp/shiny/703.json b/public/images/pokemon/exp/shiny/703.json deleted file mode 100644 index 4762fa91a2c..00000000000 --- a/public/images/pokemon/exp/shiny/703.json +++ /dev/null @@ -1,356 +0,0 @@ -{ - "textures": [ - { - "image": "703.png", - "format": "RGBA8888", - "size": { - "w": 120, - "h": 120 - }, - "scale": 1, - "frames": [ - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 41, - "w": 37, - "h": 41 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 37, - "h": 41 - }, - "frame": { - "x": 0, - "y": 41, - "w": 37, - "h": 41 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 37, - "h": 40 - }, - "frame": { - "x": 37, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 37, - "h": 40 - }, - "frame": { - "x": 74, - "y": 0, - "w": 37, - "h": 40 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 35, - "h": 41 - }, - "frame": { - "x": 37, - "y": 40, - "w": 35, - "h": 41 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 35, - "h": 41 - }, - "frame": { - "x": 37, - "y": 40, - "w": 35, - "h": 41 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 1, - "y": 12, - "w": 35, - "h": 39 - }, - "frame": { - "x": 37, - "y": 81, - "w": 35, - "h": 39 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 40 - }, - "frame": { - "x": 72, - "y": 40, - "w": 37, - "h": 40 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 37, - "h": 51 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 35, - "h": 40 - }, - "frame": { - "x": 72, - "y": 80, - "w": 35, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:253ca4296d88ee81990e3297ca0f62aa:8f78420201adcea5fb7920c60446c81d:721af8c322ff60159262e9b3017c784d$" - } -} diff --git a/public/images/pokemon/exp/shiny/703.png b/public/images/pokemon/exp/shiny/703.png deleted file mode 100644 index 4e4064509ae..00000000000 Binary files a/public/images/pokemon/exp/shiny/703.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/704.json b/public/images/pokemon/exp/shiny/704.json index d14609ad74c..4241b2d2a8d 100644 --- a/public/images/pokemon/exp/shiny/704.json +++ b/public/images/pokemon/exp/shiny/704.json @@ -1,1784 +1,371 @@ -{ - "textures": [ - { - "image": "704.png", - "format": "RGBA8888", - "size": { - "w": 288, - "h": 288 - }, - "scale": 1, - "frames": [ - { - "filename": "0040.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 48, - "w": 43, - "h": 48 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 48, - "w": 43, - "h": 48 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 96, - "w": 43, - "h": 48 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 48 - }, - "frame": { - "x": 0, - "y": 96, - "w": 43, - "h": 48 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 43, - "h": 47 - }, - "frame": { - "x": 0, - "y": 144, - "w": 43, - "h": 47 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 43, - "h": 47 - }, - "frame": { - "x": 0, - "y": 144, - "w": 43, - "h": 47 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 46 - }, - "frame": { - "x": 0, - "y": 191, - "w": 41, - "h": 46 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 41, - "h": 46 - }, - "frame": { - "x": 0, - "y": 191, - "w": 41, - "h": 46 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 39, - "h": 45 - }, - "frame": { - "x": 0, - "y": 237, - "w": 39, - "h": 45 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 39, - "h": 45 - }, - "frame": { - "x": 0, - "y": 237, - "w": 39, - "h": 45 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 39, - "y": 237, - "w": 41, - "h": 44 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 39, - "y": 237, - "w": 41, - "h": 44 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 39, - "y": 237, - "w": 41, - "h": 44 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 39, - "y": 237, - "w": 41, - "h": 44 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 41, - "y": 191, - "w": 41, - "h": 44 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 41, - "y": 191, - "w": 41, - "h": 44 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 80, - "y": 235, - "w": 41, - "h": 44 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 121, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 121, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 82, - "y": 0, - "w": 39, - "h": 44 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 82, - "y": 0, - "w": 39, - "h": 44 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 82, - "y": 0, - "w": 39, - "h": 44 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 43, - "y": 0, - "w": 39, - "h": 44 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 163, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 163, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 163, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 163, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 163, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 42, - "h": 43 - }, - "frame": { - "x": 205, - "y": 0, - "w": 42, - "h": 43 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 41, - "h": 44 - }, - "frame": { - "x": 247, - "y": 0, - "w": 41, - "h": 44 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 121, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 82, - "y": 44, - "w": 39, - "h": 44 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 82, - "y": 44, - "w": 39, - "h": 44 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 43, - "y": 44, - "w": 39, - "h": 44 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 39, - "h": 44 - }, - "frame": { - "x": 43, - "y": 44, - "w": 39, - "h": 44 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 42, - "h": 42 - }, - "frame": { - "x": 163, - "y": 43, - "w": 42, - "h": 42 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 42, - "h": 41 - }, - "frame": { - "x": 205, - "y": 43, - "w": 42, - "h": 41 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 247, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 42, - "h": 40 - }, - "frame": { - "x": 205, - "y": 84, - "w": 42, - "h": 40 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 42, - "h": 40 - }, - "frame": { - "x": 205, - "y": 84, - "w": 42, - "h": 40 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 42, - "h": 40 - }, - "frame": { - "x": 205, - "y": 84, - "w": 42, - "h": 40 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 247, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 247, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 43, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 43, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 38, - "h": 44 - }, - "frame": { - "x": 43, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 44 - }, - "frame": { - "x": 81, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 44 - }, - "frame": { - "x": 81, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 44 - }, - "frame": { - "x": 81, - "y": 132, - "w": 37, - "h": 44 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 37, - "h": 44 - }, - "frame": { - "x": 81, - "y": 88, - "w": 37, - "h": 44 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 82, - "y": 176, - "w": 36, - "h": 44 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 82, - "y": 176, - "w": 36, - "h": 44 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 42, - "h": 40 - }, - "frame": { - "x": 121, - "y": 85, - "w": 42, - "h": 40 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 163, - "y": 85, - "w": 36, - "h": 44 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 121, - "y": 125, - "w": 36, - "h": 44 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 199, - "y": 124, - "w": 36, - "h": 44 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 199, - "y": 124, - "w": 36, - "h": 44 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 157, - "y": 129, - "w": 36, - "h": 44 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 36, - "h": 44 - }, - "frame": { - "x": 121, - "y": 169, - "w": 36, - "h": 44 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 235, - "y": 132, - "w": 36, - "h": 43 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 235, - "y": 132, - "w": 36, - "h": 43 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 193, - "y": 168, - "w": 36, - "h": 43 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 157, - "y": 173, - "w": 36, - "h": 43 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 121, - "y": 213, - "w": 36, - "h": 43 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 229, - "y": 175, - "w": 36, - "h": 43 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 193, - "y": 211, - "w": 36, - "h": 43 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 157, - "y": 216, - "w": 36, - "h": 43 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 229, - "y": 218, - "w": 36, - "h": 43 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 43, - "h": 48 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 36, - "h": 43 - }, - "frame": { - "x": 229, - "y": 218, - "w": 36, - "h": 43 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c2301c17b022e36ed40b13f27d705543:87a73272ea48477e6b25b210421da5ec:45bb13be23ae6e2a6654a2a00c450d62$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0003.png", + "frame": { "x": 78, "y": 0, "w": 28, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0007.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0008.png", + "frame": { "x": 52, "y": 94, "w": 28, "h": 29 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0009.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0013.png", + "frame": { "x": 78, "y": 0, "w": 28, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0014.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0017.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0018.png", + "frame": { "x": 52, "y": 94, "w": 28, "h": 29 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0019.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0023.png", + "frame": { "x": 78, "y": 0, "w": 28, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0026.png", + "frame": { "x": 26, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 67, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0028.png", + "frame": { "x": 80, "y": 94, "w": 28, "h": 29 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0029.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0032.png", + "frame": { "x": 26, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0033.png", + "frame": { "x": 78, "y": 31, "w": 28, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0034.png", + "frame": { "x": 52, "y": 34, "w": 26, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0035.png", + "frame": { "x": 52, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0036.png", + "frame": { "x": 52, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0037.png", + "frame": { "x": 26, "y": 67, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 99, "w": 28, "h": 29 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0039.png", + "frame": { "x": 78, "y": 62, "w": 26, "h": 32 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 0, "w": 26, "h": 34 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 }, + "sourceSize": { "w": 28, "h": 34 }, + "duration": 150 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "704.png", + "format": "RGBA8888", + "size": { "w": 108, "h": 128 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/704.png b/public/images/pokemon/exp/shiny/704.png index ac31e9da30c..d630d161de1 100644 Binary files a/public/images/pokemon/exp/shiny/704.png and b/public/images/pokemon/exp/shiny/704.png differ diff --git a/public/images/pokemon/exp/shiny/705.json b/public/images/pokemon/exp/shiny/705.json index 1d18b10d3a0..bc7b5ff15d3 100644 --- a/public/images/pokemon/exp/shiny/705.json +++ b/public/images/pokemon/exp/shiny/705.json @@ -1,272 +1,596 @@ -{ - "textures": [ - { - "image": "705.png", - "format": "RGBA8888", - "size": { - "w": 154, - "h": 154 - }, - "scale": 1, - "frames": [ - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 46, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 58 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 46, - "h": 58 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 45, - "h": 58 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 58 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 45, - "h": 58 - }, - "frame": { - "x": 46, - "y": 0, - "w": 45, - "h": 58 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 45, - "h": 58 - }, - "frame": { - "x": 91, - "y": 0, - "w": 45, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 42, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 42, - "h": 58 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 42, - "h": 58 - }, - "frame": { - "x": 0, - "y": 58, - "w": 42, - "h": 58 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 58 - }, - "frame": { - "x": 42, - "y": 58, - "w": 41, - "h": 58 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 58 - }, - "frame": { - "x": 42, - "y": 58, - "w": 41, - "h": 58 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 58 - }, - "frame": { - "x": 83, - "y": 58, - "w": 36, - "h": 58 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 36, - "h": 58 - }, - "frame": { - "x": 83, - "y": 58, - "w": 36, - "h": 58 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 49, - "h": 58 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 35, - "h": 58 - }, - "frame": { - "x": 119, - "y": 58, - "w": 35, - "h": 58 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:eb2c6abdfceb0458f6389a25d31f9dab:0ef587160e8636cec6566f480554985e:6b57e983626c7fc9144ab67f30c66814$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 38, "y": 186, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 78, "y": 189, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 77, "y": 304, "w": 39, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 197, "y": 246, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 158, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 155, "y": 246, "w": 42, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 199, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 77, "y": 248, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 118, "y": 301, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 38, "y": 246, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 253, "w": 37, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 191, "w": 38, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 118, "y": 189, "w": 37, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 0, "y": 64, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 194, "y": 184, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 156, "y": 120, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 38, "y": 186, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 78, "y": 189, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 77, "y": 304, "w": 39, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 197, "y": 246, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 158, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 155, "y": 246, "w": 42, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 199, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 77, "y": 248, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 118, "y": 301, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 38, "y": 246, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 253, "w": 37, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 191, "w": 38, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 118, "y": 189, "w": 37, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 64, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 194, "y": 184, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 156, "y": 120, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 38, "y": 186, "w": 40, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 78, "y": 189, "w": 40, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 77, "y": 304, "w": 39, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 197, "y": 246, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 158, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 155, "y": 246, "w": 42, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 199, "y": 302, "w": 41, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 77, "y": 248, "w": 41, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 118, "y": 301, "w": 40, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 38, "y": 246, "w": 39, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 253, "w": 37, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 191, "w": 38, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 118, "y": 189, "w": 37, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 64, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 194, "y": 184, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 156, "y": 120, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 159, "y": 0, "w": 41, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 39, "y": 125, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 200, "y": 60, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 39, "y": 62, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 79, "y": 125, "w": 38, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 117, "y": 125, "w": 38, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 127, "w": 38, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 0, "w": 39, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 39, "h": 64 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 78, "y": 62, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 117, "y": 62, "w": 39, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 155, "y": 181, "w": 39, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 119, "y": 0, "w": 40, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 79, "y": 0, "w": 40, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 39, "y": 0, "w": 40, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 196, "y": 123, "w": 40, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 200, "y": 0, "w": 41, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 159, "y": 60, "w": 41, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 }, + "sourceSize": { "w": 44, "h": 64 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "705.png", + "format": "I8", + "size": { "w": 241, "h": 361 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/705.png b/public/images/pokemon/exp/shiny/705.png index 8653de923ec..7fed21b3583 100644 Binary files a/public/images/pokemon/exp/shiny/705.png and b/public/images/pokemon/exp/shiny/705.png differ diff --git a/public/images/pokemon/exp/shiny/707.json b/public/images/pokemon/exp/shiny/707.json deleted file mode 100644 index cdc3064d8aa..00000000000 --- a/public/images/pokemon/exp/shiny/707.json +++ /dev/null @@ -1,1931 +0,0 @@ -{ - "textures": [ - { - "image": "707.png", - "format": "RGBA8888", - "size": { - "w": 283, - "h": 283 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 69 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 69 - }, - "frame": { - "x": 41, - "y": 0, - "w": 39, - "h": 69 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 69 - }, - "frame": { - "x": 41, - "y": 0, - "w": 39, - "h": 69 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 69 - }, - "frame": { - "x": 41, - "y": 0, - "w": 39, - "h": 69 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 69 - }, - "frame": { - "x": 80, - "y": 0, - "w": 37, - "h": 69 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 69 - }, - "frame": { - "x": 80, - "y": 0, - "w": 37, - "h": 69 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 69 - }, - "frame": { - "x": 80, - "y": 0, - "w": 37, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 117, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 117, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 117, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 117, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 159, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 159, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 159, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 159, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 44, - "h": 70 - }, - "frame": { - "x": 201, - "y": 0, - "w": 44, - "h": 70 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 44, - "h": 70 - }, - "frame": { - "x": 201, - "y": 0, - "w": 44, - "h": 70 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 44, - "h": 70 - }, - "frame": { - "x": 201, - "y": 0, - "w": 44, - "h": 70 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 245, - "y": 0, - "w": 38, - "h": 70 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 44, - "h": 70 - }, - "frame": { - "x": 0, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 44, - "h": 70 - }, - "frame": { - "x": 0, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 44, - "h": 70 - }, - "frame": { - "x": 0, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 70 - }, - "frame": { - "x": 44, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 70 - }, - "frame": { - "x": 44, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 70 - }, - "frame": { - "x": 44, - "y": 69, - "w": 44, - "h": 70 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 88, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 126, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 126, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 70 - }, - "frame": { - "x": 126, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 164, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 164, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 164, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 202, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 202, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 202, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 240, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 240, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 240, - "y": 70, - "w": 38, - "h": 70 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 0, - "y": 139, - "w": 38, - "h": 70 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 0, - "y": 139, - "w": 38, - "h": 70 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 0, - "y": 139, - "w": 38, - "h": 70 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 38, - "y": 139, - "w": 40, - "h": 70 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 38, - "y": 139, - "w": 40, - "h": 70 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 38, - "y": 139, - "w": 40, - "h": 70 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 42, - "h": 70 - }, - "frame": { - "x": 78, - "y": 140, - "w": 42, - "h": 70 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 45, - "h": 70 - }, - "frame": { - "x": 120, - "y": 140, - "w": 45, - "h": 70 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 43, - "h": 70 - }, - "frame": { - "x": 165, - "y": 140, - "w": 43, - "h": 70 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 43, - "h": 70 - }, - "frame": { - "x": 165, - "y": 140, - "w": 43, - "h": 70 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 45, - "h": 71 - }, - "frame": { - "x": 208, - "y": 140, - "w": 45, - "h": 71 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 45, - "h": 71 - }, - "frame": { - "x": 208, - "y": 140, - "w": 45, - "h": 71 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 45, - "h": 71 - }, - "frame": { - "x": 208, - "y": 140, - "w": 45, - "h": 71 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 71 - }, - "frame": { - "x": 0, - "y": 209, - "w": 37, - "h": 71 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 71 - }, - "frame": { - "x": 0, - "y": 209, - "w": 37, - "h": 71 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 71 - }, - "frame": { - "x": 0, - "y": 209, - "w": 37, - "h": 71 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 37, - "y": 209, - "w": 38, - "h": 71 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 37, - "y": 209, - "w": 38, - "h": 71 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 37, - "y": 209, - "w": 38, - "h": 71 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 210, - "w": 38, - "h": 71 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 45, - "h": 71 - }, - "frame": { - "x": 151, - "y": 210, - "w": 45, - "h": 71 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 39, - "h": 71 - }, - "frame": { - "x": 196, - "y": 211, - "w": 39, - "h": 71 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 39, - "h": 71 - }, - "frame": { - "x": 196, - "y": 211, - "w": 39, - "h": 71 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 50, - "h": 73 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 44, - "h": 71 - }, - "frame": { - "x": 235, - "y": 211, - "w": 44, - "h": 71 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:26c493d70c41c4104147194dfbbab5b9:b12f3eb3fdd1a69bbf055a44f9557395:8e96b9056ea81e44ced99c97f472a528$" - } -} diff --git a/public/images/pokemon/exp/shiny/707.png b/public/images/pokemon/exp/shiny/707.png deleted file mode 100644 index ee0fec17e8c..00000000000 Binary files a/public/images/pokemon/exp/shiny/707.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/708.png b/public/images/pokemon/exp/shiny/708.png deleted file mode 100644 index bb896a0214c..00000000000 Binary files a/public/images/pokemon/exp/shiny/708.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/712.json b/public/images/pokemon/exp/shiny/712.json index 80e4e6a13b9..88a49637b7c 100644 --- a/public/images/pokemon/exp/shiny/712.json +++ b/public/images/pokemon/exp/shiny/712.json @@ -1,2771 +1,1433 @@ -{ - "textures": [ - { - "image": "712.png", - "format": "RGBA8888", - "size": { - "w": 209, - "h": 209 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 44, - "w": 38, - "h": 44 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 88, - "w": 38, - "h": 44 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 0, - "y": 132, - "w": 38, - "h": 44 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 44 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 44 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 114, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 152, - "y": 0, - "w": 38, - "h": 43 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 43, - "w": 38, - "h": 43 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 43, - "w": 38, - "h": 43 - } - }, - { - "filename": "0131.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 43 - }, - "frame": { - "x": 76, - "y": 43, - "w": 38, - "h": 43 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 38, - "y": 44, - "w": 38, - "h": 42 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 114, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 114, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 114, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 114, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 152, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 38, - "h": 42 - }, - "frame": { - "x": 152, - "y": 43, - "w": 38, - "h": 42 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 114, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 114, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 114, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 152, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 152, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 152, - "y": 85, - "w": 38, - "h": 41 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 86, - "w": 38, - "h": 41 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 168, - "w": 38, - "h": 41 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 38, - "y": 168, - "w": 38, - "h": 41 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 127, - "w": 38, - "h": 41 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 168, - "w": 38, - "h": 41 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 76, - "y": 168, - "w": 38, - "h": 41 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 114, - "y": 126, - "w": 38, - "h": 41 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 41 - }, - "frame": { - "x": 114, - "y": 126, - "w": 38, - "h": 41 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 114, - "y": 167, - "w": 37, - "h": 41 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 114, - "y": 167, - "w": 37, - "h": 41 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 151, - "y": 167, - "w": 37, - "h": 41 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 42, - "h": 44 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 37, - "h": 41 - }, - "frame": { - "x": 151, - "y": 167, - "w": 37, - "h": 41 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:90506cc63998ae2867a3e57df229bc50:f8b5635f0ab8bc294bdbf4d4b4782548:3a1cc69824960d920ca43f8c9376d136$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 111, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 111, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 112, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 112, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 149, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 149, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 74, "y": 86, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 74, "y": 86, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 148, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 148, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 37, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 37, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 111, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 111, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 112, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 112, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 149, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 149, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 74, "y": 86, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 74, "y": 86, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 148, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 148, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 37, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 37, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 111, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 111, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 112, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 112, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 149, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 149, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 74, "y": 86, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 74, "y": 86, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 148, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 148, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 37, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 37, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 111, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 111, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 112, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 112, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 149, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 149, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 74, "y": 86, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 74, "y": 86, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 148, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 148, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 37, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 37, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 111, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 111, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 112, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 112, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 149, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 149, "y": 44, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 74, "y": 86, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 74, "y": 86, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 148, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 148, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0105.png", + "frame": { "x": 0, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0106.png", + "frame": { "x": 37, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0107.png", + "frame": { "x": 37, "y": 0, "w": 36, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0108.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0109.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0110.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0111.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0112.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0113.png", + "frame": { "x": 74, "y": 0, "w": 36, "h": 43 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0114.png", + "frame": { "x": 37, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0115.png", + "frame": { "x": 37, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0116.png", + "frame": { "x": 111, "y": 87, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0117.png", + "frame": { "x": 111, "y": 87, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0118.png", + "frame": { "x": 148, "y": 87, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0119.png", + "frame": { "x": 148, "y": 87, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0120.png", + "frame": { "x": 0, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0121.png", + "frame": { "x": 0, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0122.png", + "frame": { "x": 0, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0123.png", + "frame": { "x": 0, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0124.png", + "frame": { "x": 37, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0125.png", + "frame": { "x": 37, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0126.png", + "frame": { "x": 74, "y": 128, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0127.png", + "frame": { "x": 74, "y": 128, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0128.png", + "frame": { "x": 148, "y": 128, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0129.png", + "frame": { "x": 148, "y": 128, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0130.png", + "frame": { "x": 0, "y": 129, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0131.png", + "frame": { "x": 0, "y": 129, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0132.png", + "frame": { "x": 148, "y": 128, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0133.png", + "frame": { "x": 148, "y": 128, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0134.png", + "frame": { "x": 74, "y": 128, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0135.png", + "frame": { "x": 74, "y": 128, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0136.png", + "frame": { "x": 37, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0137.png", + "frame": { "x": 37, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0138.png", + "frame": { "x": 37, "y": 129, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0139.png", + "frame": { "x": 37, "y": 129, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0140.png", + "frame": { "x": 111, "y": 129, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0141.png", + "frame": { "x": 111, "y": 129, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0142.png", + "frame": { "x": 74, "y": 169, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0143.png", + "frame": { "x": 74, "y": 169, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0144.png", + "frame": { "x": 148, "y": 169, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0145.png", + "frame": { "x": 148, "y": 169, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0146.png", + "frame": { "x": 0, "y": 170, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0147.png", + "frame": { "x": 0, "y": 170, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0148.png", + "frame": { "x": 74, "y": 44, "w": 37, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 37, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0149.png", + "frame": { "x": 74, "y": 44, "w": 37, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 37, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0150.png", + "frame": { "x": 0, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0151.png", + "frame": { "x": 0, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0152.png", + "frame": { "x": 0, "y": 88, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0153.png", + "frame": { "x": 148, "y": 87, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0154.png", + "frame": { "x": 148, "y": 87, "w": 36, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0155.png", + "frame": { "x": 111, "y": 87, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0156.png", + "frame": { "x": 111, "y": 87, "w": 36, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0157.png", + "frame": { "x": 37, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + }, + { + "filename": "0158.png", + "frame": { "x": 37, "y": 45, "w": 36, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 }, + "sourceSize": { "w": 42, "h": 44 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "712.png", + "format": "I8", + "size": { "w": 185, "h": 210 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/712.png b/public/images/pokemon/exp/shiny/712.png index 66e28efacd9..2ba0434ad7a 100644 Binary files a/public/images/pokemon/exp/shiny/712.png and b/public/images/pokemon/exp/shiny/712.png differ diff --git a/public/images/pokemon/exp/shiny/713.json b/public/images/pokemon/exp/shiny/713.json index c2aab871871..f4fcfa1ff85 100644 --- a/public/images/pokemon/exp/shiny/713.json +++ b/public/images/pokemon/exp/shiny/713.json @@ -1,146 +1,1100 @@ -{ - "textures": [ - { - "image": "713.png", - "format": "RGBA8888", - "size": { - "w": 174, - "h": 174 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 87, - "h": 71 - }, - "frame": { - "x": 0, - "y": 0, - "w": 87, - "h": 71 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 87, - "h": 72 - }, - "frame": { - "x": 87, - "y": 0, - "w": 87, - "h": 72 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 87, - "h": 72 - }, - "frame": { - "x": 87, - "y": 0, - "w": 87, - "h": 72 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 73 - }, - "frame": { - "x": 0, - "y": 71, - "w": 87, - "h": 73 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 73 - }, - "frame": { - "x": 0, - "y": 71, - "w": 87, - "h": 73 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 87, - "h": 73 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 87, - "h": 73 - }, - "frame": { - "x": 87, - "y": 72, - "w": 87, - "h": 73 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:ce42146f2549b65131ae1e38620ec02e:c360691d0dff3de5f5058a576fd05ded:625f70bcfe9c7f2437cb9cad6d2b863c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 83, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 128, "w": 83, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 166, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 332, "y": 126, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 249, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 166, "y": 64, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 83, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 0, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 249, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 166, "y": 0, "w": 83, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 83, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 83, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 332, "y": 0, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 332, "y": 0, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 332, "y": 63, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 332, "y": 63, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 332, "y": 63, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 332, "y": 63, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 332, "y": 0, "w": 84, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 249, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 249, "y": 127, "w": 83, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 62 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 332, "y": 188, "w": 83, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 332, "y": 188, "w": 83, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 0, "y": 189, "w": 83, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 0, "y": 189, "w": 83, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 0, "y": 189, "w": 83, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 0, "y": 189, "w": 83, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 332, "y": 188, "w": 83, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + }, + { + "filename": "0121.png", + "frame": { "x": 0, "y": 65, "w": 83, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 }, + "sourceSize": { "w": 84, "h": 66 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "713.png", + "format": "I8", + "size": { "w": 416, "h": 247 }, + "scale": "1" + } } diff --git a/public/images/pokemon/exp/shiny/713.png b/public/images/pokemon/exp/shiny/713.png index ded180bdefc..72c06f1d750 100644 Binary files a/public/images/pokemon/exp/shiny/713.png and b/public/images/pokemon/exp/shiny/713.png differ diff --git a/public/images/pokemon/exp/shiny/714.json b/public/images/pokemon/exp/shiny/714.json deleted file mode 100644 index dc8d580d33b..00000000000 --- a/public/images/pokemon/exp/shiny/714.json +++ /dev/null @@ -1,314 +0,0 @@ -{ - "textures": [ - { - "image": "714.png", - "format": "RGBA8888", - "size": { - "w": 179, - "h": 179 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 63, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 60 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 63, - "h": 60 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 60 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 59 - }, - "frame": { - "x": 0, - "y": 60, - "w": 64, - "h": 59 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 59 - }, - "frame": { - "x": 0, - "y": 60, - "w": 64, - "h": 59 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 58 - }, - "frame": { - "x": 63, - "y": 0, - "w": 64, - "h": 58 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 60, - "h": 61 - }, - "frame": { - "x": 64, - "y": 58, - "w": 60, - "h": 61 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 60, - "h": 61 - }, - "frame": { - "x": 64, - "y": 58, - "w": 60, - "h": 61 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 54, - "h": 58 - }, - "frame": { - "x": 124, - "y": 58, - "w": 54, - "h": 58 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 54, - "h": 58 - }, - "frame": { - "x": 124, - "y": 58, - "w": 54, - "h": 58 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 54, - "h": 58 - }, - "frame": { - "x": 124, - "y": 116, - "w": 54, - "h": 58 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 60, - "h": 60 - }, - "frame": { - "x": 0, - "y": 119, - "w": 60, - "h": 60 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 60, - "h": 60 - }, - "frame": { - "x": 0, - "y": 119, - "w": 60, - "h": 60 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 56, - "h": 60 - }, - "frame": { - "x": 60, - "y": 119, - "w": 56, - "h": 60 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 63 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 56, - "h": 60 - }, - "frame": { - "x": 60, - "y": 119, - "w": 56, - "h": 60 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f10fb65b088005bbceee81a7323b3d04:cc45de39527285e86e95e3dc2425b833:1a07d46e710b0568ec824f54fbc4fe6a$" - } -} diff --git a/public/images/pokemon/exp/shiny/714.png b/public/images/pokemon/exp/shiny/714.png deleted file mode 100644 index 53e4a6348be..00000000000 Binary files a/public/images/pokemon/exp/shiny/714.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/718-10.json b/public/images/pokemon/exp/shiny/718-10.json deleted file mode 100644 index 98f6bbb0f01..00000000000 --- a/public/images/pokemon/exp/shiny/718-10.json +++ /dev/null @@ -1,692 +0,0 @@ -{ - "textures": [ - { - "image": "718-10.png", - "format": "RGBA8888", - "size": { - "w": 239, - "h": 239 - }, - "scale": 1, - "frames": [ - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 61, - "h": 65 - }, - "frame": { - "x": 0, - "y": 0, - "w": 61, - "h": 65 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 59, - "h": 67 - }, - "frame": { - "x": 0, - "y": 65, - "w": 59, - "h": 67 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 59, - "h": 67 - }, - "frame": { - "x": 0, - "y": 65, - "w": 59, - "h": 67 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 59, - "h": 67 - }, - "frame": { - "x": 0, - "y": 65, - "w": 59, - "h": 67 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 64, - "h": 61 - }, - "frame": { - "x": 0, - "y": 132, - "w": 64, - "h": 61 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 65, - "h": 60 - }, - "frame": { - "x": 59, - "y": 65, - "w": 65, - "h": 60 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 61, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 61, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 61, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 120, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 120, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 120, - "y": 0, - "w": 59, - "h": 65 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 59, - "h": 66 - }, - "frame": { - "x": 179, - "y": 0, - "w": 59, - "h": 66 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 58, - "h": 67 - }, - "frame": { - "x": 124, - "y": 66, - "w": 58, - "h": 67 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 58, - "h": 67 - }, - "frame": { - "x": 124, - "y": 66, - "w": 58, - "h": 67 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 58, - "h": 67 - }, - "frame": { - "x": 124, - "y": 66, - "w": 58, - "h": 67 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 59, - "h": 65 - }, - "frame": { - "x": 64, - "y": 125, - "w": 59, - "h": 65 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 182, - "y": 66, - "w": 57, - "h": 67 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 58, - "h": 66 - }, - "frame": { - "x": 123, - "y": 133, - "w": 58, - "h": 66 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 58, - "h": 66 - }, - "frame": { - "x": 123, - "y": 133, - "w": 58, - "h": 66 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 58, - "h": 66 - }, - "frame": { - "x": 123, - "y": 133, - "w": 58, - "h": 66 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 181, - "y": 133, - "w": 57, - "h": 67 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 181, - "y": 133, - "w": 57, - "h": 67 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 65, - "h": 67 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 57, - "h": 67 - }, - "frame": { - "x": 181, - "y": 133, - "w": 57, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f59f7684ea1f2b8bb14e98d16b18e3e0:a1fa21d4b2b42982b0f0546116b38791:82195cf2a6db620c5643b8162d6e8c5c$" - } -} diff --git a/public/images/pokemon/exp/shiny/718-10.png b/public/images/pokemon/exp/shiny/718-10.png deleted file mode 100644 index 26bc2cdc580..00000000000 Binary files a/public/images/pokemon/exp/shiny/718-10.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/718.json b/public/images/pokemon/exp/shiny/718.json deleted file mode 100644 index 29211eba621..00000000000 --- a/public/images/pokemon/exp/shiny/718.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "textures": [ - { - "image": "718.png", - "format": "RGBA8888", - "size": { - "w": 219, - "h": 219 - }, - "scale": 1, - "frames": [ - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 71, - "h": 88 - }, - "frame": { - "x": 0, - "y": 0, - "w": 71, - "h": 88 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 71, - "y": 0, - "w": 73, - "h": 89 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 144, - "y": 0, - "w": 74, - "h": 89 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 144, - "y": 0, - "w": 74, - "h": 89 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 0, - "y": 89, - "w": 74, - "h": 89 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 74, - "h": 89 - }, - "frame": { - "x": 0, - "y": 89, - "w": 74, - "h": 89 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 74, - "y": 89, - "w": 73, - "h": 89 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 73, - "h": 89 - }, - "frame": { - "x": 74, - "y": 89, - "w": 73, - "h": 89 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 72, - "h": 89 - }, - "frame": { - "x": 147, - "y": 89, - "w": 72, - "h": 89 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 75, - "h": 89 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 72, - "h": 89 - }, - "frame": { - "x": 147, - "y": 89, - "w": 72, - "h": 89 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:5e3b138302e8798c9cc3072d564e3004:76aca0c13999f6d287f1b28f7f386fed:7b4a06b06cbac24b3f39727b0238661b$" - } -} diff --git a/public/images/pokemon/exp/shiny/718.png b/public/images/pokemon/exp/shiny/718.png deleted file mode 100644 index 59dde9d4c05..00000000000 Binary files a/public/images/pokemon/exp/shiny/718.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/719.json b/public/images/pokemon/exp/shiny/719.json deleted file mode 100644 index 9bf72888c33..00000000000 --- a/public/images/pokemon/exp/shiny/719.json +++ /dev/null @@ -1,1091 +0,0 @@ -{ - "textures": [ - { - "image": "719.png", - "format": "RGBA8888", - "size": { - "w": 210, - "h": 210 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 10, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 6, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 10, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 6, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 10, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 24, - "y": 6, - "w": 49, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 49, - "h": 67 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 34, - "y": 9, - "w": 48, - "h": 67 - }, - "frame": { - "x": 49, - "y": 0, - "w": 48, - "h": 67 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 48, - "h": 67 - }, - "frame": { - "x": 49, - "y": 0, - "w": 48, - "h": 67 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 16, - "y": 3, - "w": 48, - "h": 67 - }, - "frame": { - "x": 49, - "y": 0, - "w": 48, - "h": 67 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 48, - "h": 67 - }, - "frame": { - "x": 49, - "y": 0, - "w": 48, - "h": 67 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 8, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 47, - "h": 67 - }, - "frame": { - "x": 97, - "y": 0, - "w": 47, - "h": 67 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 46, - "h": 67 - }, - "frame": { - "x": 144, - "y": 0, - "w": 46, - "h": 67 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 48, - "h": 66 - }, - "frame": { - "x": 0, - "y": 67, - "w": 48, - "h": 66 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 48, - "y": 12, - "w": 46, - "h": 66 - }, - "frame": { - "x": 48, - "y": 67, - "w": 46, - "h": 66 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 45, - "y": 1, - "w": 45, - "h": 67 - }, - "frame": { - "x": 94, - "y": 67, - "w": 45, - "h": 67 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 45, - "h": 67 - }, - "frame": { - "x": 94, - "y": 67, - "w": 45, - "h": 67 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 19, - "y": 5, - "w": 45, - "h": 67 - }, - "frame": { - "x": 94, - "y": 67, - "w": 45, - "h": 67 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 2, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 2, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 2, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 27, - "y": 4, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 25, - "y": 6, - "w": 44, - "h": 67 - }, - "frame": { - "x": 0, - "y": 133, - "w": 44, - "h": 67 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 36, - "y": 2, - "w": 42, - "h": 67 - }, - "frame": { - "x": 44, - "y": 133, - "w": 42, - "h": 67 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 54, - "y": 3, - "w": 42, - "h": 67 - }, - "frame": { - "x": 139, - "y": 67, - "w": 42, - "h": 67 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 23, - "y": 6, - "w": 42, - "h": 67 - }, - "frame": { - "x": 139, - "y": 67, - "w": 42, - "h": 67 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 1, - "y": 12, - "w": 42, - "h": 66 - }, - "frame": { - "x": 86, - "y": 134, - "w": 42, - "h": 66 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 55, - "y": 6, - "w": 41, - "h": 67 - }, - "frame": { - "x": 128, - "y": 134, - "w": 41, - "h": 67 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 96, - "h": 78 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 41, - "h": 67 - }, - "frame": { - "x": 169, - "y": 134, - "w": 41, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a418188ec41514bd9ae14eb24912795a:ee144292ee551fc92c6c10944cfe21d9:17a705bb924916761be2495822a53735$" - } -} diff --git a/public/images/pokemon/exp/shiny/719.png b/public/images/pokemon/exp/shiny/719.png deleted file mode 100644 index a733b44e4b3..00000000000 Binary files a/public/images/pokemon/exp/shiny/719.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/815-gigantamax.json b/public/images/pokemon/exp/shiny/815-gigantamax.json new file mode 100644 index 00000000000..d8fb9d62e57 --- /dev/null +++ b/public/images/pokemon/exp/shiny/815-gigantamax.json @@ -0,0 +1,659 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 343, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 357, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 85, "y": 292, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 252, "y": 482, "w": 81, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 258, "y": 290, "w": 83, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 416, "y": 484, "w": 79, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 426, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 445, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 179, "y": 97, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 1, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 523, "y": 195, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 509, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 89, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 531, "y": 98, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 343, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 357, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 85, "y": 292, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 252, "y": 482, "w": 81, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 258, "y": 290, "w": 83, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 416, "y": 484, "w": 79, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 426, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 445, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 179, "y": 97, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 1, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 523, "y": 195, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 509, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 89, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 531, "y": 98, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 343, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 357, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 177, "y": 194, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 179, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 85, "y": 292, "w": 82, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 252, "y": 482, "w": 81, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 258, "y": 290, "w": 83, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 416, "y": 484, "w": 79, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 426, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 445, "y": 1, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 179, "y": 97, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 1, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 523, "y": 195, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 509, "y": 292, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 89, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 531, "y": 98, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 258, "y": 385, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 267, "y": 97, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 1, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 268, "y": 1, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 87, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 426, "y": 389, "w": 82, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 82, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 1, "y": 484, "w": 81, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 6, "w": 81, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 341, "y": 389, "w": 83, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 7, "w": 83, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 84, "y": 485, "w": 79, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 9, "w": 79, "h": 91 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 167, "y": 484, "w": 81, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 81, "h": 92 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 1, "y": 195, "w": 86, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 86, "h": 93 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 265, "y": 194, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 86, "h": 94 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 89, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 1, "y": 290, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 1, "y": 387, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 353, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 510, "y": 389, "w": 80, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 1, "w": 80, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 169, "y": 387, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 1, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 355, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 443, "y": 98, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 86, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 90, "y": 1, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 87, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 174, "y": 290, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 82, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 84, "y": 388, "w": 81, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 4, "w": 81, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 438, "y": 195, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 83, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 335, "y": 483, "w": 79, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 79, "h": 95 }, + "sourceSize": { "w": 100, "h": 100 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "815-gigantamax.png", + "format": "I8", + "size": { "w": 611, "h": 579 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/shiny/815-gigantamax.png b/public/images/pokemon/exp/shiny/815-gigantamax.png new file mode 100644 index 00000000000..a299119e06f Binary files /dev/null and b/public/images/pokemon/exp/shiny/815-gigantamax.png differ diff --git a/public/images/pokemon/exp/shiny/839-gigantamax.json b/public/images/pokemon/exp/shiny/839-gigantamax.json new file mode 100644 index 00000000000..15a7c122f5d --- /dev/null +++ b/public/images/pokemon/exp/shiny/839-gigantamax.json @@ -0,0 +1,821 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 525, "y": 567, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 441, "y": 566, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 609, "y": 567, "w": 83, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 255, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 171, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 569, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 339, "y": 569, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 474, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 464, "y": 375, "w": 89, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 580, "y": 190, "w": 92, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 95, "y": 96, "w": 94, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 198, "y": 95, "w": 95, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 491, "y": 0, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 297, "y": 0, "w": 98, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 0, "w": 100, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 198, "y": 0, "w": 99, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 100, "y": 0, "w": 98, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 395, "y": 0, "w": 96, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 189, "y": 190, "w": 92, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 89, "y": 379, "w": 88, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 525, "y": 567, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 441, "y": 566, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 609, "y": 567, "w": 83, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 255, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 171, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 569, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 339, "y": 569, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 474, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 464, "y": 375, "w": 89, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 580, "y": 190, "w": 92, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 95, "y": 96, "w": 94, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 198, "y": 95, "w": 95, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 491, "y": 0, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 297, "y": 0, "w": 98, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 0, "w": 100, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 198, "y": 0, "w": 99, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 100, "y": 0, "w": 98, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 395, "y": 0, "w": 96, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 189, "y": 190, "w": 92, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 89, "y": 379, "w": 88, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 525, "y": 567, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 441, "y": 566, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 609, "y": 567, "w": 83, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 255, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 171, "y": 563, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 569, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 339, "y": 569, "w": 82, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 474, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 464, "y": 375, "w": 89, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 580, "y": 190, "w": 92, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 95, "y": 96, "w": 94, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 198, "y": 95, "w": 95, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 491, "y": 0, "w": 96, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 297, "y": 0, "w": 98, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 0, "y": 0, "w": 100, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 198, "y": 0, "w": 99, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 100, "y": 0, "w": 98, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 395, "y": 0, "w": 96, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 189, "y": 190, "w": 92, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 89, "y": 379, "w": 88, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 525, "y": 567, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 454, "y": 470, "w": 86, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 86, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 379, "w": 89, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 1, "w": 89, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 573, "y": 285, "w": 91, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 1, "w": 91, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 93, "y": 191, "w": 92, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 1, "w": 92, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 390, "y": 96, "w": 94, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 1, "w": 94, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 585, "y": 96, "w": 94, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 2, "w": 94, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 293, "y": 95, "w": 97, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 3, "w": 97, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 484, "y": 190, "w": 96, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 4, "w": 96, "h": 92 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 92, "y": 286, "w": 92, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 92, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 177, "y": 471, "w": 89, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 89, "h": 92 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 177, "y": 379, "w": 91, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 91, "h": 92 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 184, "y": 286, "w": 91, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 91, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 480, "y": 282, "w": 93, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 93, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 281, "y": 281, "w": 93, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 93, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 293, "y": 188, "w": 95, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 587, "y": 0, "w": 95, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 95, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 95, "w": 95, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 95, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 491, "y": 95, "w": 94, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 94, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 0, "y": 190, "w": 93, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 93, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 388, "y": 191, "w": 92, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 92, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 0, "y": 285, "w": 92, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 92, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 275, "y": 374, "w": 90, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 90, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 374, "y": 286, "w": 90, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 90, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 365, "y": 380, "w": 89, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 89, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 553, "y": 380, "w": 89, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 89, "h": 93 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 540, "y": 473, "w": 87, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 87, "h": 94 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 268, "y": 468, "w": 87, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 87, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 355, "y": 474, "w": 86, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 1, "w": 86, "h": 95 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 86, "y": 475, "w": 85, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 85, "h": 96 }, + "sourceSize": { "w": 111, "h": 96 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.13-x64", + "image": "839-gigantamax.png", + "format": "I8", + "size": { "w": 692, "h": 664 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/shiny/839-gigantamax.png b/public/images/pokemon/exp/shiny/839-gigantamax.png new file mode 100644 index 00000000000..f52de9357b1 Binary files /dev/null and b/public/images/pokemon/exp/shiny/839-gigantamax.png differ diff --git a/public/images/pokemon/exp/back/707.json b/public/images/pokemon/exp/shiny/female/6215.json similarity index 62% rename from public/images/pokemon/exp/back/707.json rename to public/images/pokemon/exp/shiny/female/6215.json index b8db4ac17f3..8c8b4e0cf73 100644 --- a/public/images/pokemon/exp/back/707.json +++ b/public/images/pokemon/exp/shiny/female/6215.json @@ -1,2007 +1,33 @@ { "textures": [ { - "image": "707.png", + "image": "6215.png", "format": "RGBA8888", "size": { - "w": 286, - "h": 286 + "w": 230, + "h": 230 }, "scale": 1, "frames": [ - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 72 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 72 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 38, - "h": 72 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 72, - "w": 38, - "h": 72 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 72, - "w": 38, - "h": 72 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 72, - "w": 38, - "h": 72 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 72 - }, - "frame": { - "x": 0, - "y": 144, - "w": 38, - "h": 72 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 0, - "y": 216, - "w": 42, - "h": 70 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 72 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 72 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 38, - "h": 72 - }, - "frame": { - "x": 38, - "y": 0, - "w": 38, - "h": 72 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 37, - "h": 72 - }, - "frame": { - "x": 38, - "y": 72, - "w": 37, - "h": 72 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 37, - "h": 72 - }, - "frame": { - "x": 38, - "y": 72, - "w": 37, - "h": 72 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 37, - "h": 72 - }, - "frame": { - "x": 38, - "y": 72, - "w": 37, - "h": 72 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 71 - }, - "frame": { - "x": 38, - "y": 144, - "w": 39, - "h": 71 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 71 - }, - "frame": { - "x": 38, - "y": 144, - "w": 39, - "h": 71 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 71 - }, - "frame": { - "x": 38, - "y": 144, - "w": 39, - "h": 71 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 42, - "y": 215, - "w": 38, - "h": 71 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 75, - "y": 72, - "w": 38, - "h": 71 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 77, - "y": 143, - "w": 38, - "h": 71 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 77, - "y": 143, - "w": 38, - "h": 71 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 38, - "h": 71 - }, - "frame": { - "x": 77, - "y": 143, - "w": 38, - "h": 71 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 80, - "y": 214, - "w": 38, - "h": 71 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 71 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 71 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 76, - "y": 0, - "w": 38, - "h": 71 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 71, - "w": 38, - "h": 71 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 71, - "w": 38, - "h": 71 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 38, - "h": 71 - }, - "frame": { - "x": 113, - "y": 71, - "w": 38, - "h": 71 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 114, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 114, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 114, - "y": 0, - "w": 42, - "h": 70 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 42, - "h": 70 - }, - "frame": { - "x": 115, - "y": 142, - "w": 42, - "h": 70 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 41, - "h": 70 - }, - "frame": { - "x": 151, - "y": 70, - "w": 41, - "h": 70 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 41, - "h": 70 - }, - "frame": { - "x": 151, - "y": 70, - "w": 41, - "h": 70 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 41, - "h": 70 - }, - "frame": { - "x": 151, - "y": 70, - "w": 41, - "h": 70 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 156, - "y": 0, - "w": 40, - "h": 70 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 156, - "y": 0, - "w": 40, - "h": 70 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 70 - }, - "frame": { - "x": 156, - "y": 0, - "w": 40, - "h": 70 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 118, - "y": 212, - "w": 38, - "h": 70 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 118, - "y": 212, - "w": 38, - "h": 70 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 38, - "h": 70 - }, - "frame": { - "x": 118, - "y": 212, - "w": 38, - "h": 70 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 156, - "y": 212, - "w": 44, - "h": 69 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 156, - "y": 212, - "w": 44, - "h": 69 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 156, - "y": 212, - "w": 44, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 69 - }, - "frame": { - "x": 157, - "y": 140, - "w": 43, - "h": 69 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 69 - }, - "frame": { - "x": 157, - "y": 140, - "w": 43, - "h": 69 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 43, - "h": 69 - }, - "frame": { - "x": 157, - "y": 140, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 192, - "y": 70, - "w": 43, - "h": 69 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 196, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 196, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 196, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 43, - "h": 69 - }, - "frame": { - "x": 239, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 43, - "h": 69 - }, - "frame": { - "x": 239, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 235, - "y": 69, - "w": 43, - "h": 69 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 43, - "h": 69 - }, - "frame": { - "x": 235, - "y": 69, - "w": 43, - "h": 69 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 42, - "h": 69 - }, - "frame": { - "x": 235, - "y": 138, - "w": 42, - "h": 69 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 42, - "h": 69 - }, - "frame": { - "x": 235, - "y": 138, - "w": 42, - "h": 69 - } - }, { "filename": "0007.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 48, - "h": 74 + "w": 56, + "h": 54 }, "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 41, - "h": 69 + "x": 1, + "y": 1, + "w": 55, + "h": 50 }, "frame": { - "x": 200, - "y": 207, - "w": 41, - "h": 69 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, + "x": 0, "y": 0, - "w": 41, - "h": 69 - }, - "frame": { - "x": 200, - "y": 207, - "w": 41, - "h": 69 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 41, - "h": 69 - }, - "frame": { - "x": 200, - "y": 207, - "w": 41, - "h": 69 + "w": 55, + "h": 50 } }, { @@ -2009,20 +35,1175 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 48, - "h": 74 + "w": 56, + "h": 54 }, "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 40, - "h": 69 + "x": 1, + "y": 1, + "w": 55, + "h": 50 }, "frame": { - "x": 241, - "y": 207, - "w": 40, - "h": 69 + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0019.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0020.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0031.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0032.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0043.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0044.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0055.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0056.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0067.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0068.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 0, + "w": 55, + "h": 50 + } + }, + { + "filename": "0079.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 50, + "w": 55, + "h": 50 + } + }, + { + "filename": "0080.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 55, + "h": 50 + }, + "frame": { + "x": 0, + "y": 50, + "w": 55, + "h": 50 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0023.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0024.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0027.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0028.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0047.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0048.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0051.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0052.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0071.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0072.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0075.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0076.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 52, + "h": 51 + }, + "frame": { + "x": 55, + "y": 0, + "w": 52, + "h": 51 + } + }, + { + "filename": "0005.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0021.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0022.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0029.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0030.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0045.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0046.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0069.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0070.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0077.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0078.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 100, + "w": 53, + "h": 50 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0017.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0018.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0033.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0034.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0041.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0042.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0057.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0058.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0065.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0066.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 107, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0012.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0015.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0016.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0035.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 } }, { @@ -2030,20 +1211,125 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 48, - "h": 74 + "w": 56, + "h": 54 }, "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 40, - "h": 69 + "x": 2, + "y": 2, + "w": 54, + "h": 49 }, "frame": { - "x": 241, - "y": 207, - "w": 40, - "h": 69 + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0039.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0040.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0059.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0060.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0063.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 54, + "h": 49 + }, + "frame": { + "x": 161, + "y": 0, + "w": 54, + "h": 49 } }, { @@ -2051,20 +1337,734 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 48, - "h": 74 + "w": 56, + "h": 54 }, "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 40, - "h": 69 + "x": 2, + "y": 2, + "w": 54, + "h": 49 }, "frame": { - "x": 241, - "y": 207, - "w": 40, - "h": 69 + "x": 161, + "y": 0, + "w": 54, + "h": 49 + } + }, + { + "filename": "0053.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 150, + "w": 53, + "h": 50 + } + }, + { + "filename": "0054.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 0, + "y": 150, + "w": 53, + "h": 50 + } + }, + { + "filename": "0081.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 55, + "y": 51, + "w": 53, + "h": 50 + } + }, + { + "filename": "0082.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 53, + "h": 50 + }, + "frame": { + "x": 55, + "y": 51, + "w": 53, + "h": 50 + } + }, + { + "filename": "0013.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0014.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0037.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0038.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0061.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0062.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 54, + "h": 48 + }, + "frame": { + "x": 53, + "y": 101, + "w": 54, + "h": 48 + } + }, + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0025.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0026.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0049.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0050.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0073.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0074.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 50, + "h": 51 + }, + "frame": { + "x": 53, + "y": 149, + "w": 50, + "h": 51 + } + }, + { + "filename": "0083.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 47, + "h": 47 + }, + "frame": { + "x": 108, + "y": 49, + "w": 47, + "h": 47 + } + }, + { + "filename": "0084.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 47, + "h": 47 + }, + "frame": { + "x": 108, + "y": 49, + "w": 47, + "h": 47 + } + }, + { + "filename": "0097.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 47, + "h": 47 + }, + "frame": { + "x": 155, + "y": 49, + "w": 47, + "h": 47 + } + }, + { + "filename": "0098.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 47, + "h": 47 + }, + "frame": { + "x": 155, + "y": 49, + "w": 47, + "h": 47 + } + }, + { + "filename": "0087.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 0, + "y": 7, + "w": 47, + "h": 44 + }, + "frame": { + "x": 108, + "y": 96, + "w": 47, + "h": 44 + } + }, + { + "filename": "0088.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 0, + "y": 7, + "w": 47, + "h": 44 + }, + "frame": { + "x": 108, + "y": 96, + "w": 47, + "h": 44 + } + }, + { + "filename": "0085.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 45, + "h": 46 + }, + "frame": { + "x": 155, + "y": 96, + "w": 45, + "h": 46 + } + }, + { + "filename": "0086.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 45, + "h": 46 + }, + "frame": { + "x": 155, + "y": 96, + "w": 45, + "h": 46 + } + }, + { + "filename": "0089.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 8, + "w": 45, + "h": 44 + }, + "frame": { + "x": 107, + "y": 140, + "w": 45, + "h": 44 + } + }, + { + "filename": "0090.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 1, + "y": 8, + "w": 45, + "h": 44 + }, + "frame": { + "x": 107, + "y": 140, + "w": 45, + "h": 44 + } + }, + { + "filename": "0091.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 39, + "h": 46 + }, + "frame": { + "x": 103, + "y": 184, + "w": 39, + "h": 46 + } + }, + { + "filename": "0092.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 39, + "h": 46 + }, + "frame": { + "x": 103, + "y": 184, + "w": 39, + "h": 46 + } + }, + { + "filename": "0093.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 38, + "h": 46 + }, + "frame": { + "x": 142, + "y": 184, + "w": 38, + "h": 46 + } + }, + { + "filename": "0094.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 38, + "h": 46 + }, + "frame": { + "x": 142, + "y": 184, + "w": 38, + "h": 46 + } + }, + { + "filename": "0095.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 41, + "h": 44 + }, + "frame": { + "x": 180, + "y": 142, + "w": 41, + "h": 44 + } + }, + { + "filename": "0096.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 56, + "h": 54 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 41, + "h": 44 + }, + "frame": { + "x": 180, + "y": 142, + "w": 41, + "h": 44 } } ] @@ -2073,6 +2073,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:923b4bcae7da04f16b46037df8433fd0:1631bc30b61a1b4a910dd4510c8733ca:8e96b9056ea81e44ced99c97f472a528$" + "smartupdate": "$TexturePacker:SmartUpdate:edaed3da1123a782356b1ac83d1afd7c:cb0e0681f4dbf68283437f5581a20bb3:736cd88647e79ba7896fc74f9406c2fe$" } } diff --git a/public/images/pokemon/exp/shiny/female/6215.png b/public/images/pokemon/exp/shiny/female/6215.png new file mode 100644 index 00000000000..4e7ea06c60a Binary files /dev/null and b/public/images/pokemon/exp/shiny/female/6215.png differ diff --git a/public/images/pokemon/exp/shiny/female/668.json b/public/images/pokemon/exp/shiny/female/668.json new file mode 100644 index 00000000000..443f13c0b54 --- /dev/null +++ b/public/images/pokemon/exp/shiny/female/668.json @@ -0,0 +1,820 @@ +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 219, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 291, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 453, "y": 289, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 441, "y": 360, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 309, "y": 359, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 380, "y": 358, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 317, "y": 289, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 390, "y": 288, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 254, "y": 220, "w": 63, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 63, "y": 220, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 399, "y": 216, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 64, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 138, "y": 74, "w": 63, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 201, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 264, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 0, "y": 219, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 291, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 453, "y": 289, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 441, "y": 360, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 309, "y": 359, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 380, "y": 358, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 317, "y": 289, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 390, "y": 288, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 254, "y": 220, "w": 63, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 63, "y": 220, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 399, "y": 216, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 64, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 138, "y": 74, "w": 63, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 201, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 264, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 219, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 291, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 453, "y": 289, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 441, "y": 360, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 309, "y": 359, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 380, "y": 358, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 317, "y": 289, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 390, "y": 288, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 254, "y": 220, "w": 63, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 63, "y": 220, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 399, "y": 216, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 64, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 138, "y": 74, "w": 63, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 201, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 264, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 219, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 291, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 453, "y": 289, "w": 62, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 441, "y": 360, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 309, "y": 359, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 380, "y": 358, "w": 61, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 317, "y": 289, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 390, "y": 288, "w": 63, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 254, "y": 220, "w": 63, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 63, "y": 220, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 399, "y": 216, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 64, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 138, "y": 74, "w": 63, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 201, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 264, "y": 147, "w": 63, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 219, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 147, "w": 64, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 64, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 127, "y": 152, "w": 64, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 64, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 465, "y": 146, "w": 65, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 65, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 399, "y": 146, "w": 66, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 66, "h": 70 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 334, "y": 74, "w": 66, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 66, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 191, "y": 220, "w": 63, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 63, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 126, "y": 223, "w": 62, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 62, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 462, "y": 217, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 188, "y": 291, "w": 61, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 61, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 249, "y": 291, "w": 60, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 60, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 62, "y": 292, "w": 60, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 122, "y": 295, "w": 60, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 182, "y": 363, "w": 59, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 6, "w": 59, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 60, "y": 364, "w": 59, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 59, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 0, "y": 362, "w": 60, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 60, "h": 71 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 327, "y": 217, "w": 63, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 63, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 268, "y": 74, "w": 66, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 74, "w": 69, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 69, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 376, "y": 0, "w": 73, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 227, "y": 0, "w": 75, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 76, "y": 0, "w": 76, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 76, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 0, "y": 0, "w": 76, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 76, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 152, "y": 0, "w": 75, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 302, "y": 0, "w": 74, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 74, "h": 74 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 449, "y": 0, "w": 72, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 72, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 449, "y": 73, "w": 71, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 71, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 69, "y": 74, "w": 69, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 69, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 201, "y": 74, "w": 67, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 67, "h": 73 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 334, "y": 145, "w": 65, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 65, "h": 72 }, + "sourceSize": { "w": 80, "h": 78 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "format": "I8", + "size": { "w": 530, "h": 436 }, + "scale": "1" + } +} diff --git a/public/images/pokemon/exp/shiny/female/668.png b/public/images/pokemon/exp/shiny/female/668.png new file mode 100644 index 00000000000..ad84dc50460 Binary files /dev/null and b/public/images/pokemon/exp/shiny/female/668.png differ diff --git a/public/images/pokemon/icons/7/802-zenith.png b/public/images/pokemon/icons/7/802-zenith.png new file mode 100644 index 00000000000..7e0fee2d609 Binary files /dev/null and b/public/images/pokemon/icons/7/802-zenith.png differ diff --git a/public/images/pokemon/icons/7/802s-zenith.png b/public/images/pokemon/icons/7/802s-zenith.png new file mode 100644 index 00000000000..7e0fee2d609 Binary files /dev/null and b/public/images/pokemon/icons/7/802s-zenith.png differ diff --git a/public/images/pokemon/shiny/261.png b/public/images/pokemon/shiny/261.png index 6ae6e5838ce..6976a0747e1 100644 Binary files a/public/images/pokemon/shiny/261.png and b/public/images/pokemon/shiny/261.png differ diff --git a/public/images/pokemon/shiny/335.json b/public/images/pokemon/shiny/335.json index ca797f1d7a4..80c43b41c12 100644 --- a/public/images/pokemon/shiny/335.json +++ b/public/images/pokemon/shiny/335.json @@ -1,1910 +1,523 @@ -{ - "textures": [ - { - "image": "335.png", - "format": "RGBA8888", - "size": { - "w": 366, - "h": 366 - }, - "scale": 1, - "frames": [ - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 68, - "h": 63 - }, - "frame": { - "x": 0, - "y": 0, - "w": 68, - "h": 63 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 68, - "h": 63 - }, - "frame": { - "x": 0, - "y": 0, - "w": 68, - "h": 63 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 68, - "h": 63 - }, - "frame": { - "x": 0, - "y": 0, - "w": 68, - "h": 63 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 68, - "h": 63 - }, - "frame": { - "x": 0, - "y": 0, - "w": 68, - "h": 63 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 65, - "h": 66 - }, - "frame": { - "x": 0, - "y": 63, - "w": 65, - "h": 66 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 67, - "h": 63 - }, - "frame": { - "x": 68, - "y": 0, - "w": 67, - "h": 63 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 67, - "h": 63 - }, - "frame": { - "x": 68, - "y": 0, - "w": 67, - "h": 63 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 68, - "h": 61 - }, - "frame": { - "x": 65, - "y": 63, - "w": 68, - "h": 61 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 68, - "h": 61 - }, - "frame": { - "x": 65, - "y": 63, - "w": 68, - "h": 61 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 68, - "h": 61 - }, - "frame": { - "x": 65, - "y": 63, - "w": 68, - "h": 61 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 68, - "h": 61 - }, - "frame": { - "x": 65, - "y": 63, - "w": 68, - "h": 61 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 64, - "h": 63 - }, - "frame": { - "x": 0, - "y": 129, - "w": 64, - "h": 63 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 64, - "h": 63 - }, - "frame": { - "x": 0, - "y": 129, - "w": 64, - "h": 63 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 64, - "h": 63 - }, - "frame": { - "x": 0, - "y": 129, - "w": 64, - "h": 63 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 64, - "h": 63 - }, - "frame": { - "x": 0, - "y": 129, - "w": 64, - "h": 63 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 61, - "h": 66 - }, - "frame": { - "x": 0, - "y": 192, - "w": 61, - "h": 66 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 61, - "h": 66 - }, - "frame": { - "x": 0, - "y": 258, - "w": 61, - "h": 66 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 61, - "h": 66 - }, - "frame": { - "x": 0, - "y": 258, - "w": 61, - "h": 66 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 64, - "h": 62 - }, - "frame": { - "x": 135, - "y": 0, - "w": 64, - "h": 62 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 4, - "w": 64, - "h": 62 - }, - "frame": { - "x": 135, - "y": 0, - "w": 64, - "h": 62 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 65, - "h": 61 - }, - "frame": { - "x": 199, - "y": 0, - "w": 65, - "h": 61 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 67, - "h": 58 - }, - "frame": { - "x": 264, - "y": 0, - "w": 67, - "h": 58 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 67, - "h": 58 - }, - "frame": { - "x": 264, - "y": 0, - "w": 67, - "h": 58 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 67, - "h": 58 - }, - "frame": { - "x": 264, - "y": 0, - "w": 67, - "h": 58 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 67, - "h": 58 - }, - "frame": { - "x": 264, - "y": 0, - "w": 67, - "h": 58 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 64, - "h": 59 - }, - "frame": { - "x": 65, - "y": 124, - "w": 64, - "h": 59 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 64, - "h": 59 - }, - "frame": { - "x": 65, - "y": 124, - "w": 64, - "h": 59 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 64, - "h": 59 - }, - "frame": { - "x": 65, - "y": 124, - "w": 64, - "h": 59 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 64, - "h": 59 - }, - "frame": { - "x": 65, - "y": 124, - "w": 64, - "h": 59 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 64, - "h": 61 - }, - "frame": { - "x": 64, - "y": 183, - "w": 64, - "h": 61 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 62, - "h": 65 - }, - "frame": { - "x": 61, - "y": 244, - "w": 62, - "h": 65 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 6, - "y": 9, - "w": 63, - "h": 57 - }, - "frame": { - "x": 61, - "y": 309, - "w": 63, - "h": 57 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 61, - "h": 64 - }, - "frame": { - "x": 123, - "y": 244, - "w": 61, - "h": 64 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 1, - "y": 8, - "w": 63, - "h": 58 - }, - "frame": { - "x": 124, - "y": 308, - "w": 63, - "h": 58 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 61, - "h": 61 - }, - "frame": { - "x": 128, - "y": 183, - "w": 61, - "h": 61 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 61, - "h": 61 - }, - "frame": { - "x": 128, - "y": 183, - "w": 61, - "h": 61 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 61, - "h": 61 - }, - "frame": { - "x": 128, - "y": 183, - "w": 61, - "h": 61 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 3, - "y": 5, - "w": 61, - "h": 61 - }, - "frame": { - "x": 128, - "y": 183, - "w": 61, - "h": 61 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 184, - "y": 244, - "w": 60, - "h": 63 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 9, - "w": 62, - "h": 57 - }, - "frame": { - "x": 187, - "y": 307, - "w": 62, - "h": 57 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 9, - "w": 62, - "h": 57 - }, - "frame": { - "x": 187, - "y": 307, - "w": 62, - "h": 57 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 62, - "h": 63 - }, - "frame": { - "x": 264, - "y": 58, - "w": 62, - "h": 63 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 55, - "h": 63 - }, - "frame": { - "x": 133, - "y": 63, - "w": 55, - "h": 63 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 55, - "h": 63 - }, - "frame": { - "x": 133, - "y": 63, - "w": 55, - "h": 63 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 55, - "h": 63 - }, - "frame": { - "x": 133, - "y": 63, - "w": 55, - "h": 63 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 55, - "h": 63 - }, - "frame": { - "x": 133, - "y": 63, - "w": 55, - "h": 63 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 55, - "h": 66 - }, - "frame": { - "x": 188, - "y": 62, - "w": 55, - "h": 66 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 55, - "h": 66 - }, - "frame": { - "x": 188, - "y": 62, - "w": 55, - "h": 66 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 58, - "h": 66 - }, - "frame": { - "x": 189, - "y": 128, - "w": 58, - "h": 66 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 60, - "h": 66 - }, - "frame": { - "x": 247, - "y": 121, - "w": 60, - "h": 66 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 59, - "h": 63 - }, - "frame": { - "x": 307, - "y": 121, - "w": 59, - "h": 63 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 59, - "h": 63 - }, - "frame": { - "x": 307, - "y": 121, - "w": 59, - "h": 63 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 59, - "h": 63 - }, - "frame": { - "x": 307, - "y": 121, - "w": 59, - "h": 63 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 59, - "h": 63 - }, - "frame": { - "x": 307, - "y": 121, - "w": 59, - "h": 63 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 247, - "y": 187, - "w": 60, - "h": 63 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 247, - "y": 187, - "w": 60, - "h": 63 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 247, - "y": 187, - "w": 60, - "h": 63 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 247, - "y": 187, - "w": 60, - "h": 63 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 58, - "h": 63 - }, - "frame": { - "x": 307, - "y": 184, - "w": 58, - "h": 63 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 58, - "h": 63 - }, - "frame": { - "x": 307, - "y": 184, - "w": 58, - "h": 63 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 58, - "h": 63 - }, - "frame": { - "x": 307, - "y": 184, - "w": 58, - "h": 63 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 58, - "h": 63 - }, - "frame": { - "x": 307, - "y": 184, - "w": 58, - "h": 63 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 74, - "h": 66 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 60, - "h": 63 - }, - "frame": { - "x": 249, - "y": 250, - "w": 60, - "h": 63 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0df67af080306e793f3e63687a642a63:bd66cef8682173381b002070c3411214:40bb9f4809624b12bf79bbfe664bea73$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0002.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0003.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0004.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0005.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 185, "w": 59, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0007.png", + "frame": { "x": 119, "y": 182, "w": 62, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0008.png", + "frame": { "x": 119, "y": 125, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0009.png", + "frame": { "x": 195, "y": 0, "w": 66, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0010.png", + "frame": { "x": 129, "y": 0, "w": 66, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0011.png", + "frame": { "x": 320, "y": 0, "w": 62, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0012.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 244, "w": 53, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0014.png", + "frame": { "x": 59, "y": 188, "w": 56, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0015.png", + "frame": { "x": 306, "y": 187, "w": 57, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0016.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0017.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0018.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0019.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0020.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 185, "w": 59, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0022.png", + "frame": { "x": 119, "y": 182, "w": 62, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0023.png", + "frame": { "x": 119, "y": 125, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0024.png", + "frame": { "x": 195, "y": 0, "w": 66, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0025.png", + "frame": { "x": 129, "y": 0, "w": 66, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0026.png", + "frame": { "x": 320, "y": 0, "w": 62, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0027.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 244, "w": 53, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0029.png", + "frame": { "x": 59, "y": 188, "w": 56, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0030.png", + "frame": { "x": 306, "y": 187, "w": 57, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0031.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0032.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0033.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0034.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0035.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0036.png", + "frame": { "x": 0, "y": 185, "w": 59, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0037.png", + "frame": { "x": 119, "y": 182, "w": 62, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0038.png", + "frame": { "x": 119, "y": 125, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0039.png", + "frame": { "x": 195, "y": 0, "w": 66, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0040.png", + "frame": { "x": 129, "y": 0, "w": 66, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0041.png", + "frame": { "x": 320, "y": 0, "w": 62, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0042.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 244, "w": 53, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0044.png", + "frame": { "x": 59, "y": 188, "w": 56, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0045.png", + "frame": { "x": 306, "y": 187, "w": 57, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0046.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0047.png", + "frame": { "x": 314, "y": 126, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0048.png", + "frame": { "x": 248, "y": 129, "w": 58, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0049.png", + "frame": { "x": 188, "y": 123, "w": 60, "h": 61 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 60, "h": 61 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0050.png", + "frame": { "x": 0, "y": 125, "w": 61, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 61, "h": 60 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0051.png", + "frame": { "x": 0, "y": 66, "w": 63, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 63, "h": 59 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0052.png", + "frame": { "x": 234, "y": 190, "w": 61, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 10, "w": 61, "h": 56 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0053.png", + "frame": { "x": 234, "y": 246, "w": 60, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 11, "w": 60, "h": 55 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0054.png", + "frame": { "x": 115, "y": 239, "w": 61, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 11, "w": 61, "h": 56 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0055.png", + "frame": { "x": 63, "y": 62, "w": 62, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 62, "h": 60 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0056.png", + "frame": { "x": 63, "y": 0, "w": 66, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 4, "w": 66, "h": 62 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 0, "w": 63, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 63, "h": 66 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0058.png", + "frame": { "x": 261, "y": 0, "w": 59, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 0, "w": 59, "h": 66 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0059.png", + "frame": { "x": 181, "y": 184, "w": 53, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 53, "h": 66 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0060.png", + "frame": { "x": 63, "y": 122, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 0, "w": 56, "h": 66 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0061.png", + "frame": { "x": 320, "y": 61, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 58, "h": 65 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0062.png", + "frame": { "x": 129, "y": 61, "w": 59, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 59, "h": 64 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0063.png", + "frame": { "x": 195, "y": 60, "w": 60, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 60, "h": 63 }, + "sourceSize": { "w": 74, "h": 67 } + }, + { + "filename": "0064.png", + "frame": { "x": 255, "y": 66, "w": 59, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 59, "h": 63 }, + "sourceSize": { "w": 74, "h": 67 } + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.9.2-x64", + "image": "335.png", + "format": "I8", + "size": { "w": 382, "h": 305 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/335.png b/public/images/pokemon/shiny/335.png index 765344af6fd..fc7c325a469 100644 Binary files a/public/images/pokemon/shiny/335.png and b/public/images/pokemon/shiny/335.png differ diff --git a/public/images/pokemon/shiny/656.json b/public/images/pokemon/shiny/656.json index be71c2199a3..3776b4ed7e5 100644 --- a/public/images/pokemon/shiny/656.json +++ b/public/images/pokemon/shiny/656.json @@ -1,41 +1,20 @@ -{ - "textures": [ - { - "image": "656.png", - "format": "RGBA8888", - "size": { - "w": 35, - "h": 35 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 35 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 35 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:272c02df78d2de4eac23552f4c031224:82f806bb336ca1c034951e96a72caaf5:9c4d208e6c2f857bfb0b23b8eea3326c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 1, "w": 32, "h": 35 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 35 }, + "sourceSize": { "w": 32, "h": 35 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "656.png", + "format": "I8", + "size": { "w": 34, "h": 37 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/656.png b/public/images/pokemon/shiny/656.png index 7779f40d332..d65d9ab857d 100644 Binary files a/public/images/pokemon/shiny/656.png and b/public/images/pokemon/shiny/656.png differ diff --git a/public/images/pokemon/shiny/668-female.json b/public/images/pokemon/shiny/668-female.json deleted file mode 100644 index ce08b281a62..00000000000 --- a/public/images/pokemon/shiny/668-female.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "668-female.png", - "format": "RGBA8888", - "size": { - "w": 72, - "h": 72 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 63, - "h": 72 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 63, - "h": 72 - }, - "frame": { - "x": 0, - "y": 0, - "w": 63, - "h": 72 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:bf61792d4b290b767953cfbbc5b6234f:c16e73a6866720618f3b4f8e3e0a0877:d99ed0e84a0695b54e479aa98271aba1$" - } -} diff --git a/public/images/pokemon/shiny/668-female.png b/public/images/pokemon/shiny/668-female.png deleted file mode 100644 index 1f56d13bc4c..00000000000 Binary files a/public/images/pokemon/shiny/668-female.png and /dev/null differ diff --git a/public/images/pokemon/shiny/668.png b/public/images/pokemon/shiny/668.png index c8ec7c9caf9..73c11b9a7c7 100644 Binary files a/public/images/pokemon/shiny/668.png and b/public/images/pokemon/shiny/668.png differ diff --git a/public/images/pokemon/shiny/674.json b/public/images/pokemon/shiny/674.json index 0ce6a2d9018..86d6cba1b01 100644 --- a/public/images/pokemon/shiny/674.json +++ b/public/images/pokemon/shiny/674.json @@ -1,41 +1,506 @@ -{ - "textures": [ - { - "image": "674.png", - "format": "RGBA8888", - "size": { - "w": 42, - "h": 42 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 28, - "h": 42 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 28, - "h": 42 - }, - "frame": { - "x": 0, - "y": 0, - "w": 28, - "h": 42 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3a00525649c00ed79ef7fff441994eb0:17d95f774222b5d9946bcc63782468e3:b823d10f1c9b4d501296982088ba63d6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 58, "y": 0, "w": 28, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0004.png", + "frame": { "x": 28, "y": 120, "w": 28, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0007.png", + "frame": { "x": 58, "y": 0, "w": 28, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0009.png", + "frame": { "x": 0, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0010.png", + "frame": { "x": 28, "y": 120, "w": 28, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0012.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0013.png", + "frame": { "x": 58, "y": 0, "w": 28, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0014.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0016.png", + "frame": { "x": 28, "y": 120, "w": 28, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0017.png", + "frame": { "x": 0, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0019.png", + "frame": { "x": 58, "y": 0, "w": 28, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0021.png", + "frame": { "x": 0, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0022.png", + "frame": { "x": 28, "y": 120, "w": 28, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0023.png", + "frame": { "x": 0, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0025.png", + "frame": { "x": 58, "y": 0, "w": 28, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0026.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0027.png", + "frame": { "x": 0, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0028.png", + "frame": { "x": 28, "y": 120, "w": 28, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0029.png", + "frame": { "x": 0, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0031.png", + "frame": { "x": 58, "y": 0, "w": 28, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0032.png", + "frame": { "x": 58, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0033.png", + "frame": { "x": 57, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 123, "w": 28, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0035.png", + "frame": { "x": 57, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0036.png", + "frame": { "x": 86, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0038.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0039.png", + "frame": { "x": 29, "y": 41, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0040.png", + "frame": { "x": 28, "y": 81, "w": 29, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0041.png", + "frame": { "x": 29, "y": 41, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0042.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0044.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0045.png", + "frame": { "x": 29, "y": 41, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0046.png", + "frame": { "x": 28, "y": 81, "w": 29, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0047.png", + "frame": { "x": 29, "y": 41, "w": 29, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0048.png", + "frame": { "x": 29, "y": 0, "w": 29, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0050.png", + "frame": { "x": 86, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0051.png", + "frame": { "x": 57, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 123, "w": 28, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 210 + }, + { + "filename": "0053.png", + "frame": { "x": 85, "y": 83, "w": 28, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 42, "w": 28, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 140 + }, + { + "filename": "0055.png", + "frame": { "x": 86, "y": 0, "w": 28, "h": 42 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 }, + "sourceSize": { "w": 29, "h": 42 }, + "duration": 70 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "674.png", + "format": "I8", + "size": { "w": 114, "h": 162 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/674.png b/public/images/pokemon/shiny/674.png index 097368405fc..7c8e71d5988 100644 Binary files a/public/images/pokemon/shiny/674.png and b/public/images/pokemon/shiny/674.png differ diff --git a/public/images/pokemon/shiny/694.json b/public/images/pokemon/shiny/694.json index 0893d62dc10..48e9623d7f4 100644 --- a/public/images/pokemon/shiny/694.json +++ b/public/images/pokemon/shiny/694.json @@ -1,41 +1,767 @@ -{ - "textures": [ - { - "image": "694.png", - "format": "RGBA8888", - "size": { - "w": 41, - "h": 41 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 41, - "h": 38 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 41, - "h": 38 - }, - "frame": { - "x": 0, - "y": 0, - "w": 41, - "h": 38 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:bc6e45d13f38b4219ae03e14bb0999b9:7eab0806a2282a4facdb9684c54189e5:b0990f9650cfe63b836cbed33f0b44d8$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 41, "y": 176, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 158, "y": 137, "w": 42, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 133, "w": 43, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 114, "y": 132, "w": 44, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 0, "y": 95, "w": 45, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 227, "y": 131, "w": 46, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 273, "y": 136, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 82, "y": 208, "w": 41, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 246, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 207, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 285, "y": 211, "w": 38, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 123, "y": 213, "w": 39, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 209, "w": 40, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 167, "y": 206, "w": 40, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 200, "y": 168, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 41, "y": 176, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 158, "y": 137, "w": 42, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 133, "w": 43, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 114, "y": 132, "w": 44, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 95, "w": 45, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 227, "y": 131, "w": 46, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 273, "y": 136, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 82, "y": 208, "w": 41, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 246, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 207, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 285, "y": 211, "w": 38, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 123, "y": 213, "w": 39, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 209, "w": 40, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 167, "y": 206, "w": 40, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 200, "y": 168, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 41, "y": 176, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 158, "y": 137, "w": 42, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 0, "y": 133, "w": 43, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 114, "y": 132, "w": 44, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 0, "y": 95, "w": 45, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 227, "y": 131, "w": 46, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 273, "y": 136, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 82, "y": 208, "w": 41, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 246, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 207, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 285, "y": 211, "w": 38, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 123, "y": 213, "w": 39, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 209, "w": 40, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 167, "y": 206, "w": 40, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 200, "y": 168, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 41, "y": 176, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 158, "y": 137, "w": 42, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 0, "y": 133, "w": 43, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 114, "y": 132, "w": 44, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 0, "y": 95, "w": 45, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 227, "y": 131, "w": 46, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 273, "y": 136, "w": 44, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 82, "y": 208, "w": 41, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 246, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 207, "y": 211, "w": 39, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 285, "y": 211, "w": 38, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 123, "y": 213, "w": 39, "h": 36 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 209, "w": 40, "h": 37 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 167, "y": 206, "w": 40, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 200, "y": 168, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 41, "y": 176, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 282, "y": 173, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 241, "y": 173, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 0, "y": 171, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 85, "y": 170, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 227, "y": 93, "w": 52, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 12, "w": 52, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 57, "y": 50, "w": 55, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 11, "w": 55, "h": 39 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 56, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 50 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 112, "y": 0, "w": 56, "h": 49 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 56, "h": 49 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 0, "w": 56, "h": 50 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 56, "h": 50 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 224, "y": 47, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 281, "y": 46, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 168, "y": 0, "w": 56, "h": 48 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 2, "w": 56, "h": 48 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 281, "y": 0, "w": 57, "h": 46 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 46 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 170, "y": 93, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 224, "y": 0, "w": 57, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 57, "h": 47 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 0, "y": 50, "w": 57, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 45 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 281, "y": 92, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 57, "y": 94, "w": 57, "h": 44 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 44 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 112, "y": 49, "w": 58, "h": 45 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 58, "h": 45 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 114, "y": 94, "w": 56, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 12, "w": 56, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 170, "y": 48, "w": 53, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 12, "w": 53, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 126, "y": 175, "w": 41, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 41, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 43, "y": 138, "w": 42, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 }, + "sourceSize": { "w": 62, "h": 50 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "694.png", + "format": "I8", + "size": { "w": 338, "h": 249 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/694.png b/public/images/pokemon/shiny/694.png index a6c87937252..5f65aa5d4ff 100644 Binary files a/public/images/pokemon/shiny/694.png and b/public/images/pokemon/shiny/694.png differ diff --git a/public/images/pokemon/shiny/698.json b/public/images/pokemon/shiny/698.json index 707a84c8ca1..6baf41b0ce7 100644 --- a/public/images/pokemon/shiny/698.json +++ b/public/images/pokemon/shiny/698.json @@ -1,41 +1,1415 @@ -{ - "textures": [ - { - "image": "698.png", - "format": "RGBA8888", - "size": { - "w": 57, - "h": 57 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 32, - "h": 57 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 32, - "h": 57 - }, - "frame": { - "x": 0, - "y": 0, - "w": 32, - "h": 57 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:46f728cad32ec7681d76168817f7001a:a044b85c8682cf2b3ce52dd5cb859583:198087d69fed44d4a642fa3ba5c077d6$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0029.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0031.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0032.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0033.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0034.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0035.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0036.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0037.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0038.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0039.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0040.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0041.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0042.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0043.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0044.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0045.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0046.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0047.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0048.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0049.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0050.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0053.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0054.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0055.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0056.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0057.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0058.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0059.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0060.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0063.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0064.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0065.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0066.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0067.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0068.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0070.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0073.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0074.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0075.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0076.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0077.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0078.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0079.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0080.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0081.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0082.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0083.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0084.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0085.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0086.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0087.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0088.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0089.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0090.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0091.png", + "frame": { "x": 125, "y": 56, "w": 27, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0092.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0093.png", + "frame": { "x": 123, "y": 169, "w": 28, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0094.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0095.png", + "frame": { "x": 123, "y": 113, "w": 29, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0096.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0097.png", + "frame": { "x": 30, "y": 114, "w": 31, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0098.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0099.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0100.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0101.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0102.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0103.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0104.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0105.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0106.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0107.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0108.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0109.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0110.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0111.png", + "frame": { "x": 0, "y": 0, "w": 38, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0112.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0113.png", + "frame": { "x": 38, "y": 0, "w": 37, "h": 54 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0114.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0115.png", + "frame": { "x": 75, "y": 0, "w": 36, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0116.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0117.png", + "frame": { "x": 111, "y": 0, "w": 34, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0118.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0119.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0120.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0121.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0122.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0123.png", + "frame": { "x": 61, "y": 115, "w": 30, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0124.png", + "frame": { "x": 61, "y": 115, "w": 30, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0125.png", + "frame": { "x": 93, "y": 113, "w": 30, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0126.png", + "frame": { "x": 93, "y": 113, "w": 30, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0127.png", + "frame": { "x": 0, "y": 113, "w": 30, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 30, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0128.png", + "frame": { "x": 0, "y": 113, "w": 30, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 30, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0129.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0130.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0131.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0132.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0133.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0134.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0135.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0136.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0137.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0138.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0139.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0140.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0141.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0142.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0143.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0144.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0145.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0146.png", + "frame": { "x": 62, "y": 55, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0147.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0148.png", + "frame": { "x": 0, "y": 53, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0149.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0150.png", + "frame": { "x": 31, "y": 54, "w": 31, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0151.png", + "frame": { "x": 93, "y": 113, "w": 30, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0152.png", + "frame": { "x": 93, "y": 113, "w": 30, "h": 59 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0153.png", + "frame": { "x": 61, "y": 115, "w": 30, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0154.png", + "frame": { "x": 61, "y": 115, "w": 30, "h": 58 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0155.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + }, + { + "filename": "0156.png", + "frame": { "x": 93, "y": 56, "w": 32, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 }, + "sourceSize": { "w": 38, "h": 60 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "698.png", + "format": "I8", + "size": { "w": 152, "h": 224 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/698.png b/public/images/pokemon/shiny/698.png index c04cc11875d..a861e0c14d5 100644 Binary files a/public/images/pokemon/shiny/698.png and b/public/images/pokemon/shiny/698.png differ diff --git a/public/images/pokemon/shiny/703.json b/public/images/pokemon/shiny/703.json index bc3c40dd555..5c0a6230108 100644 --- a/public/images/pokemon/shiny/703.json +++ b/public/images/pokemon/shiny/703.json @@ -1,41 +1,569 @@ -{ - "textures": [ - { - "image": "703.png", - "format": "RGBA8888", - "size": { - "w": 38, - "h": 38 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 37, - "h": 38 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 38 - }, - "frame": { - "x": 0, - "y": 0, - "w": 37, - "h": 38 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3b9620097a6f8beec26187d7454b0493:5bb102b3070894423e8dff3d1f98cd21:721af8c322ff60159262e9b3017c784d$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0002.png", + "frame": { "x": 37, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0003.png", + "frame": { "x": 35, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0004.png", + "frame": { "x": 71, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0005.png", + "frame": { "x": 107, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0006.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0007.png", + "frame": { "x": 148, "y": 0, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0008.png", + "frame": { "x": 0, "y": 38, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0009.png", + "frame": { "x": 143, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0010.png", + "frame": { "x": 143, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0011.png", + "frame": { "x": 35, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0012.png", + "frame": { "x": 71, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0014.png", + "frame": { "x": 37, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0015.png", + "frame": { "x": 35, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0016.png", + "frame": { "x": 71, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0017.png", + "frame": { "x": 107, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0019.png", + "frame": { "x": 148, "y": 0, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0020.png", + "frame": { "x": 0, "y": 38, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0021.png", + "frame": { "x": 143, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0022.png", + "frame": { "x": 143, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0023.png", + "frame": { "x": 35, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0024.png", + "frame": { "x": 71, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0026.png", + "frame": { "x": 37, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0027.png", + "frame": { "x": 35, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0028.png", + "frame": { "x": 71, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0029.png", + "frame": { "x": 107, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0031.png", + "frame": { "x": 148, "y": 0, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0032.png", + "frame": { "x": 0, "y": 38, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0033.png", + "frame": { "x": 143, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0034.png", + "frame": { "x": 143, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0035.png", + "frame": { "x": 35, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0036.png", + "frame": { "x": 71, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0038.png", + "frame": { "x": 37, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0039.png", + "frame": { "x": 35, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0040.png", + "frame": { "x": 71, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0041.png", + "frame": { "x": 107, "y": 38, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0042.png", + "frame": { "x": 0, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0043.png", + "frame": { "x": 148, "y": 0, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0044.png", + "frame": { "x": 0, "y": 38, "w": 35, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0045.png", + "frame": { "x": 143, "y": 78, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0046.png", + "frame": { "x": 143, "y": 40, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0047.png", + "frame": { "x": 35, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0048.png", + "frame": { "x": 71, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0050.png", + "frame": { "x": 74, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 3, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0051.png", + "frame": { "x": 35, "y": 114, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0052.png", + "frame": { "x": 70, "y": 114, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0053.png", + "frame": { "x": 105, "y": 114, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 117, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0055.png", + "frame": { "x": 140, "y": 117, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0056.png", + "frame": { "x": 0, "y": 117, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 117, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0058.png", + "frame": { "x": 0, "y": 117, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0059.png", + "frame": { "x": 35, "y": 153, "w": 35, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0060.png", + "frame": { "x": 111, "y": 0, "w": 37, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0061.png", + "frame": { "x": 107, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + }, + { + "filename": "0062.png", + "frame": { "x": 107, "y": 76, "w": 36, "h": 38 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 36, "h": 38 }, + "sourceSize": { "w": 40, "h": 49 }, + "duration": 110 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.11-x64", + "image": "703.png", + "format": "I8", + "size": { "w": 183, "h": 192 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/703.png b/public/images/pokemon/shiny/703.png index 7d0d7999166..44ac529283c 100644 Binary files a/public/images/pokemon/shiny/703.png and b/public/images/pokemon/shiny/703.png differ diff --git a/public/images/pokemon/shiny/707.json b/public/images/pokemon/shiny/707.json index f0e0b2053ac..ee5036fb541 100644 --- a/public/images/pokemon/shiny/707.json +++ b/public/images/pokemon/shiny/707.json @@ -1,41 +1,1559 @@ -{ - "textures": [ - { - "image": "707.png", - "format": "RGBA8888", - "size": { - "w": 77, - "h": 77 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 77 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 77 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 77 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f2be0784fdc424d853cf61d4ff5ef128:c0a67b3382e00d7635b97e14ca444b8e:8e96b9056ea81e44ced99c97f472a528$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 335, "y": 370, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 88, "y": 429, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 532, "y": 448, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 490, "y": 432, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 566, "y": 373, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 652, "y": 426, "w": 44, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 289, "y": 330, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 49, "y": 354, "w": 47, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 195, "y": 280, "w": 49, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 629, "y": 153, "w": 53, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 692, "y": 151, "w": 54, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 195, "y": 209, "w": 52, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 247, "y": 215, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 522, "y": 219, "w": 50, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 618, "y": 224, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 352, "y": 296, "w": 47, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 96, "y": 354, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 378, "y": 372, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 276, "y": 404, "w": 43, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 361, "y": 447, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 233, "y": 365, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 618, "y": 297, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 144, "y": 282, "w": 45, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 378, "y": 218, "w": 47, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 100, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 474, "y": 141, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 422, "y": 69, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 707, "y": 2, "w": 54, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 651, "y": 2, "w": 56, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 2, "y": 65, "w": 54, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 273, "y": 69, "w": 53, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 586, "y": 71, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 2, "y": 142, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 52, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 98, "y": 277, "w": 46, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 712, "y": 296, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 335, "y": 370, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 88, "y": 429, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 532, "y": 448, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 490, "y": 432, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 566, "y": 373, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 652, "y": 426, "w": 44, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 289, "y": 330, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 49, "y": 354, "w": 47, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 195, "y": 280, "w": 49, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 629, "y": 153, "w": 53, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 692, "y": 151, "w": 54, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 195, "y": 209, "w": 52, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 247, "y": 215, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 522, "y": 219, "w": 50, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 618, "y": 224, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 352, "y": 296, "w": 47, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 96, "y": 354, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 378, "y": 372, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 276, "y": 404, "w": 43, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 361, "y": 447, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 233, "y": 365, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 618, "y": 297, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 144, "y": 282, "w": 45, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 378, "y": 218, "w": 47, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 100, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 474, "y": 141, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 422, "y": 69, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 707, "y": 2, "w": 54, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 651, "y": 2, "w": 56, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 2, "y": 65, "w": 54, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 273, "y": 69, "w": 53, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 586, "y": 71, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 2, "y": 142, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 52, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 98, "y": 277, "w": 46, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 712, "y": 296, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 335, "y": 370, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 88, "y": 429, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 532, "y": 448, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 490, "y": 432, "w": 42, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 566, "y": 373, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 652, "y": 426, "w": 44, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 289, "y": 330, "w": 46, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 49, "y": 354, "w": 47, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 195, "y": 280, "w": 49, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 629, "y": 153, "w": 53, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 692, "y": 151, "w": 54, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 195, "y": 209, "w": 52, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 247, "y": 215, "w": 51, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 522, "y": 219, "w": 50, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 618, "y": 224, "w": 49, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 352, "y": 296, "w": 47, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 96, "y": 354, "w": 45, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 378, "y": 372, "w": 44, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 276, "y": 404, "w": 43, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 361, "y": 447, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 233, "y": 365, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 618, "y": 297, "w": 44, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 144, "y": 282, "w": 45, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 378, "y": 218, "w": 47, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 100, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 474, "y": 141, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 422, "y": 69, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 707, "y": 2, "w": 54, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 651, "y": 2, "w": 56, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 2, "y": 65, "w": 54, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 273, "y": 69, "w": 53, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 586, "y": 71, "w": 52, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 2, "y": 142, "w": 50, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 52, "y": 199, "w": 48, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 98, "y": 277, "w": 46, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 712, "y": 296, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 335, "y": 370, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 578, "y": 149, "w": 51, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 17, "w": 51, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 95, "y": 62, "w": 59, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 27, "y": 14, "w": 59, "h": 73 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 519, "y": 2, "w": 67, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 67, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 280, "y": 2, "w": 82, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 6, "w": 82, "h": 67 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 2, "y": 2, "w": 93, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 93, "h": 63 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 95, "y": 2, "w": 95, "h": 60 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 1, "w": 95, "h": 60 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 190, "y": 2, "w": 90, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 90, "h": 62 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 362, "y": 2, "w": 83, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 83, "h": 65 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 445, "y": 2, "w": 74, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 1, "w": 74, "h": 67 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 586, "y": 2, "w": 65, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 19, "y": 2, "w": 65, "h": 69 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 2, "y": 220, "w": 50, "h": 72 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 27, "y": 4, "w": 50, "h": 72 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0121.png", + "frame": { "x": 319, "y": 447, "w": 42, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 5, "w": 42, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0122.png", + "frame": { "x": 447, "y": 489, "w": 41, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 7, "w": 41, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0123.png", + "frame": { "x": 614, "y": 500, "w": 41, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 10, "w": 41, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0124.png", + "frame": { "x": 573, "y": 453, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 11, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0125.png", + "frame": { "x": 267, "y": 480, "w": 41, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 14, "w": 41, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0126.png", + "frame": { "x": 184, "y": 429, "w": 42, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 14, "w": 42, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0127.png", + "frame": { "x": 2, "y": 443, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 16, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0128.png", + "frame": { "x": 226, "y": 442, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 17, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0129.png", + "frame": { "x": 130, "y": 438, "w": 41, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 41, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0130.png", + "frame": { "x": 2, "y": 366, "w": 43, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0131.png", + "frame": { "x": 52, "y": 277, "w": 46, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 46, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0132.png", + "frame": { "x": 682, "y": 221, "w": 48, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 35, "y": 18, "w": 48, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0133.png", + "frame": { "x": 519, "y": 361, "w": 47, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 19, "w": 47, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0134.png", + "frame": { "x": 43, "y": 502, "w": 44, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 20, "w": 44, "h": 66 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0135.png", + "frame": { "x": 714, "y": 505, "w": 41, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 29, "y": 20, "w": 41, "h": 67 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0136.png", + "frame": { "x": 402, "y": 489, "w": 45, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 20, "w": 45, "h": 69 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0137.png", + "frame": { "x": 471, "y": 219, "w": 51, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 19, "w": 51, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0138.png", + "frame": { "x": 692, "y": 80, "w": 56, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 19, "w": 56, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0139.png", + "frame": { "x": 389, "y": 147, "w": 54, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 18, "w": 54, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0140.png", + "frame": { "x": 399, "y": 297, "w": 46, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 18, "w": 46, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0141.png", + "frame": { "x": 610, "y": 375, "w": 42, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 18, "w": 42, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0142.png", + "frame": { "x": 141, "y": 360, "w": 43, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 18, "w": 43, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0143.png", + "frame": { "x": 638, "y": 79, "w": 54, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 19, "w": 54, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0144.png", + "frame": { "x": 362, "y": 67, "w": 60, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 19, "w": 60, "h": 69 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0145.png", + "frame": { "x": 474, "y": 73, "w": 59, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 19, "w": 59, "h": 68 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0146.png", + "frame": { "x": 264, "y": 147, "w": 57, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 18, "w": 57, "h": 68 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0147.png", + "frame": { "x": 298, "y": 264, "w": 54, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 18, "w": 54, "h": 66 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0148.png", + "frame": { "x": 524, "y": 148, "w": 54, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 36, "y": 18, "w": 54, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0149.png", + "frame": { "x": 211, "y": 135, "w": 53, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 34, "y": 18, "w": 53, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0150.png", + "frame": { "x": 471, "y": 290, "w": 48, "h": 73 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 32, "y": 19, "w": 48, "h": 73 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0151.png", + "frame": { "x": 569, "y": 302, "w": 48, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 19, "w": 48, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0152.png", + "frame": { "x": 154, "y": 134, "w": 57, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 20, "w": 57, "h": 69 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0153.png", + "frame": { "x": 154, "y": 64, "w": 60, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 20, "w": 60, "h": 70 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0154.png", + "frame": { "x": 214, "y": 64, "w": 59, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 19, "w": 59, "h": 71 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0155.png", + "frame": { "x": 2, "y": 292, "w": 47, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 29, "y": 18, "w": 47, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0156.png", + "frame": { "x": 696, "y": 426, "w": 41, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 18, "w": 41, "h": 79 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0157.png", + "frame": { "x": 533, "y": 73, "w": 53, "h": 75 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 19, "w": 53, "h": 75 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0158.png", + "frame": { "x": 56, "y": 135, "w": 62, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 21, "w": 62, "h": 64 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0159.png", + "frame": { "x": 662, "y": 373, "w": 62, "h": 53 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 22, "w": 62, "h": 53 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0160.png", + "frame": { "x": 655, "y": 505, "w": 59, "h": 47 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 44, "y": 22, "w": 59, "h": 47 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0161.png", + "frame": { "x": 422, "y": 437, "w": 61, "h": 52 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 22, "w": 61, "h": 52 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0162.png", + "frame": { "x": 326, "y": 136, "w": 63, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 21, "w": 63, "h": 62 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0163.png", + "frame": { "x": 321, "y": 198, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 45, "y": 21, "w": 57, "h": 66 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0164.png", + "frame": { "x": 519, "y": 291, "w": 50, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 44, "y": 20, "w": 50, "h": 70 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0165.png", + "frame": { "x": 445, "y": 363, "w": 45, "h": 74 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 43, "y": 20, "w": 45, "h": 74 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0166.png", + "frame": { "x": 45, "y": 426, "w": 43, "h": 76 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 42, "y": 19, "w": 43, "h": 76 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0167.png", + "frame": { "x": 189, "y": 352, "w": 44, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 19, "w": 44, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0168.png", + "frame": { "x": 667, "y": 296, "w": 45, "h": 77 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 41, "y": 19, "w": 45, "h": 77 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0169.png", + "frame": { "x": 425, "y": 218, "w": 46, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 40, "y": 18, "w": 46, "h": 79 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0170.png", + "frame": { "x": 148, "y": 203, "w": 47, "h": 79 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 39, "y": 18, "w": 47, "h": 79 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0171.png", + "frame": { "x": 572, "y": 224, "w": 46, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 38, "y": 18, "w": 46, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + }, + { + "filename": "0172.png", + "frame": { "x": 244, "y": 287, "w": 45, "h": 78 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 37, "y": 18, "w": 45, "h": 78 }, + "sourceSize": { "w": 108, "h": 97 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "707.png", + "format": "I8", + "size": { "w": 763, "h": 577 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/707.png b/public/images/pokemon/shiny/707.png index 2f4efb3e8cb..7aed21b7873 100644 Binary files a/public/images/pokemon/shiny/707.png and b/public/images/pokemon/shiny/707.png differ diff --git a/public/images/pokemon/shiny/708.json b/public/images/pokemon/shiny/708.json index 06631af7cb8..abc8d24db2b 100644 --- a/public/images/pokemon/shiny/708.json +++ b/public/images/pokemon/shiny/708.json @@ -1,41 +1,1091 @@ -{ - "textures": [ - { - "image": "708.png", - "format": "RGBA8888", - "size": { - "w": 44, - "h": 44 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 44, - "h": 40 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 44, - "h": 40 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 40 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:5ae7df27c9e36b2c06c09056297b74ab:efbc3a2251be2a5a300a0c333bce242b:796c82c5076b122f2663381836c65843$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 270, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 45, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 0, "y": 207, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 0, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 45, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 180, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 226, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 90, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 135, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 180, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 225, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 45, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 90, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 135, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 90, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 272, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 180, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 225, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 270, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 135, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 0, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 45, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 270, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 45, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 0, "y": 207, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 0, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 45, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 180, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 226, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 90, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 135, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 180, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 225, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 45, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 90, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 135, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 90, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 272, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 180, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 225, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 270, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 135, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 45, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 270, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 45, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 207, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 0, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 45, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 180, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 226, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 90, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 135, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 180, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 225, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 45, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 90, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 135, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 90, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 272, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 180, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 225, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 270, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 0, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 135, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 45, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 270, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 45, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 0, "y": 207, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 0, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 45, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 180, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 226, "y": 42, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 90, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 135, "y": 84, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 180, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 225, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 45, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 90, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 135, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 0, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 45, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 90, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 272, "y": 42, "w": 43, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 180, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 225, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 270, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0097.png", + "frame": { "x": 0, "y": 42, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0098.png", + "frame": { "x": 135, "y": 0, "w": 44, "h": 41 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0099.png", + "frame": { "x": 0, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0100.png", + "frame": { "x": 45, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0101.png", + "frame": { "x": 270, "y": 124, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0102.png", + "frame": { "x": 90, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0103.png", + "frame": { "x": 135, "y": 125, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0104.png", + "frame": { "x": 90, "y": 207, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 10, "w": 43, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0105.png", + "frame": { "x": 134, "y": 207, "w": 43, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 12, "w": 43, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0106.png", + "frame": { "x": 180, "y": 165, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 14, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0107.png", + "frame": { "x": 225, "y": 165, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 15, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0108.png", + "frame": { "x": 270, "y": 165, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 17, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0109.png", + "frame": { "x": 0, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 12, "y": 19, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0110.png", + "frame": { "x": 270, "y": 206, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 21, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0111.png", + "frame": { "x": 90, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 23, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0112.png", + "frame": { "x": 135, "y": 166, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 21, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0113.png", + "frame": { "x": 180, "y": 206, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 20, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0114.png", + "frame": { "x": 225, "y": 206, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 18, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0115.png", + "frame": { "x": 268, "y": 247, "w": 44, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 16, "w": 44, "h": 39 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0116.png", + "frame": { "x": 178, "y": 247, "w": 44, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 15, "w": 44, "h": 39 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0117.png", + "frame": { "x": 223, "y": 247, "w": 44, "h": 39 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 15, "y": 13, "w": 44, "h": 39 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0118.png", + "frame": { "x": 226, "y": 83, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 10, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0119.png", + "frame": { "x": 45, "y": 207, "w": 44, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 8, "w": 44, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + }, + { + "filename": "0120.png", + "frame": { "x": 180, "y": 83, "w": 45, "h": 40 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 6, "w": 45, "h": 40 }, + "sourceSize": { "w": 70, "h": 63 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "708.png", + "format": "I8", + "size": { "w": 315, "h": 286 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/708.png b/public/images/pokemon/shiny/708.png index 1da0441109b..d94b1286590 100644 Binary files a/public/images/pokemon/shiny/708.png and b/public/images/pokemon/shiny/708.png differ diff --git a/public/images/pokemon/shiny/714.json b/public/images/pokemon/shiny/714.json index 992ff63a393..b43aebd68a1 100644 --- a/public/images/pokemon/shiny/714.json +++ b/public/images/pokemon/shiny/714.json @@ -1,41 +1,263 @@ -{ - "textures": [ - { - "image": "714.png", - "format": "RGBA8888", - "size": { - "w": 64, - "h": 64 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 64, - "h": 57 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 57 - }, - "frame": { - "x": 0, - "y": 0, - "w": 64, - "h": 57 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0faf41a70733397a2e765b77d2cf3124:ed661ea37221a00e42647a088e380efd:1a07d46e710b0568ec824f54fbc4fe6a$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 1, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0002.png", + "frame": { "x": 133, "y": 1, "w": 64, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 64, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0003.png", + "frame": { "x": 1, "y": 60, "w": 61, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 8, "w": 61, "h": 55 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0004.png", + "frame": { "x": 184, "y": 117, "w": 32, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 32, "h": 67 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0005.png", + "frame": { "x": 50, "y": 119, "w": 33, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 33, "h": 63 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0006.png", + "frame": { "x": 199, "y": 1, "w": 47, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0007.png", + "frame": { "x": 64, "y": 60, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0008.png", + "frame": { "x": 1, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0009.png", + "frame": { "x": 133, "y": 1, "w": 64, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 6, "w": 64, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0010.png", + "frame": { "x": 1, "y": 60, "w": 61, "h": 55 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 8, "w": 61, "h": 55 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0011.png", + "frame": { "x": 184, "y": 117, "w": 32, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 3, "w": 32, "h": 67 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0012.png", + "frame": { "x": 50, "y": 119, "w": 33, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 3, "w": 33, "h": 63 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0013.png", + "frame": { "x": 199, "y": 1, "w": 47, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0014.png", + "frame": { "x": 64, "y": 60, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0015.png", + "frame": { "x": 1, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0016.png", + "frame": { "x": 133, "y": 1, "w": 64, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 6, "w": 64, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0017.png", + "frame": { "x": 133, "y": 59, "w": 61, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 7, "w": 61, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0018.png", + "frame": { "x": 113, "y": 117, "w": 33, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 33, "h": 68 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0019.png", + "frame": { "x": 148, "y": 117, "w": 34, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 2, "w": 34, "h": 64 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0020.png", + "frame": { "x": 1, "y": 117, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0021.png", + "frame": { "x": 64, "y": 60, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0022.png", + "frame": { "x": 1, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0023.png", + "frame": { "x": 67, "y": 1, "w": 64, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 5, "w": 64, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0024.png", + "frame": { "x": 196, "y": 59, "w": 61, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 7, "w": 61, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0025.png", + "frame": { "x": 113, "y": 117, "w": 33, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 2, "w": 33, "h": 68 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0026.png", + "frame": { "x": 218, "y": 117, "w": 33, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 2, "w": 33, "h": 64 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0027.png", + "frame": { "x": 199, "y": 1, "w": 47, "h": 56 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 56 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + }, + { + "filename": "0028.png", + "frame": { "x": 64, "y": 60, "w": 47, "h": 57 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 }, + "sourceSize": { "w": 66, "h": 70 }, + "duration": 50 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "714.png", + "format": "I8", + "size": { "w": 258, "h": 186 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/714.png b/public/images/pokemon/shiny/714.png index 2cde838873a..924c67d3c85 100644 Binary files a/public/images/pokemon/shiny/714.png and b/public/images/pokemon/shiny/714.png differ diff --git a/public/images/pokemon/shiny/718-10.json b/public/images/pokemon/shiny/718-10.json index 05c86055ce7..ad273c9ea79 100644 --- a/public/images/pokemon/shiny/718-10.json +++ b/public/images/pokemon/shiny/718-10.json @@ -1,41 +1,686 @@ -{ - "textures": [ - { - "image": "718-10.png", - "format": "RGBA8888", - "size": { - "w": 66, - "h": 66 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 56, - "h": 66 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 56, - "h": 66 - }, - "frame": { - "x": 0, - "y": 0, - "w": 56, - "h": 66 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:ddb567f3553fb8f8477733fc8b91dfb8:21520f234fc9684cd172bbced8ed083b:82195cf2a6db620c5643b8162d6e8c5c$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 173, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 230, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 57, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 115, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 171, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 229, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 287, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 171, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 229, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 0, "y": 67, "w": 57, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 287, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 57, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 114, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 173, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 230, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 57, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 115, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 171, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 229, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 287, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 171, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 229, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 67, "w": 57, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 287, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 57, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 114, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 173, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 230, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 57, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 115, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 171, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 229, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 287, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 171, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 229, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 0, "y": 67, "w": 57, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 287, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 57, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 114, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 0, "y": 0, "w": 57, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 173, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 230, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 57, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 115, "y": 0, "w": 58, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 171, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 229, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 287, "y": 66, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 171, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 229, "y": 130, "w": 58, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 0, "y": 67, "w": 57, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 287, "y": 0, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 57, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 114, "y": 65, "w": 57, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 287, "y": 130, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 57, "y": 131, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 56, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 164, "y": 261, "w": 56, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 56, "h": 65 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 0, "y": 327, "w": 56, "h": 64 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 64 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 56, "y": 327, "w": 56, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 63 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 169, "y": 329, "w": 57, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 5, "w": 57, "h": 62 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 112, "y": 326, "w": 57, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 63 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 54, "y": 265, "w": 58, "h": 62 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 5, "w": 58, "h": 62 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 226, "y": 332, "w": 56, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 63 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 220, "y": 261, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 273, "y": 264, "w": 53, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 279, "y": 196, "w": 54, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 56, "y": 197, "w": 54, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 110, "y": 197, "w": 54, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 198, "w": 54, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 169, "y": 194, "w": 55, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 1, "w": 55, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 224, "y": 194, "w": 55, "h": 67 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 1, "w": 55, "h": 67 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 132, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 113, "y": 131, "w": 56, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 }, + "sourceSize": { "w": 61, "h": 69 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "718-10.png", + "format": "I8", + "size": { "w": 345, "h": 395 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/718-10.png b/public/images/pokemon/shiny/718-10.png index bee16c7ec63..f976d91b4f6 100644 Binary files a/public/images/pokemon/shiny/718-10.png and b/public/images/pokemon/shiny/718-10.png differ diff --git a/public/images/pokemon/shiny/718.json b/public/images/pokemon/shiny/718.json index 00e4c68ba00..98053a226cb 100644 --- a/public/images/pokemon/shiny/718.json +++ b/public/images/pokemon/shiny/718.json @@ -1,41 +1,803 @@ -{ - "textures": [ - { - "image": "718.png", - "format": "RGBA8888", - "size": { - "w": 88, - "h": 88 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 72, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 72, - "h": 88 - }, - "frame": { - "x": 0, - "y": 0, - "w": 72, - "h": 88 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:6daa10e13b8729f3ebc27b1a8eb1c6cb:65f7940d781324b41eba39e9e5565cb7:7b4a06b06cbac24b3f39727b0238661b$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 294, "y": 438, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 0, "y": 442, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 437, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 145, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 366, "y": 440, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 223, "y": 267, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 296, "y": 350, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 384, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 459, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 452, "y": 265, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 76, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 233, "y": 90, "w": 75, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 151, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 0, "y": 179, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 75, "y": 266, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 369, "y": 352, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 294, "y": 438, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 0, "y": 442, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 437, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 145, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 366, "y": 440, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 223, "y": 267, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 296, "y": 350, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 384, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 459, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 452, "y": 265, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 76, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 233, "y": 90, "w": 75, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 151, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 0, "y": 179, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 75, "y": 266, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 369, "y": 352, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 294, "y": 438, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 0, "y": 442, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 437, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 145, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 366, "y": 440, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 223, "y": 267, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 296, "y": 350, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 384, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 459, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 452, "y": 265, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 76, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 233, "y": 90, "w": 75, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 151, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 0, "y": 179, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 75, "y": 266, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 369, "y": 352, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 294, "y": 438, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 0, "y": 442, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 437, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 145, "y": 441, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 366, "y": 440, "w": 71, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 223, "y": 267, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 296, "y": 350, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 384, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 459, "y": 177, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 452, "y": 265, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 76, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 233, "y": 90, "w": 75, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 151, "y": 178, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 179, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 75, "y": 266, "w": 74, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 369, "y": 352, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 222, "y": 355, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 73, "y": 354, "w": 72, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 149, "y": 353, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 442, "y": 353, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 149, "y": 266, "w": 74, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 4, "w": 74, "h": 87 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 377, "y": 265, "w": 75, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 87 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 308, "y": 177, "w": 76, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 76, "h": 87 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 76, "y": 91, "w": 76, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 76, "h": 87 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 301, "y": 264, "w": 76, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 5, "w": 76, "h": 86 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 0, "y": 267, "w": 74, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 6, "y": 4, "w": 74, "h": 87 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 0, "y": 90, "w": 76, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 2, "w": 76, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 391, "y": 88, "w": 77, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 2, "w": 77, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 79, "y": 0, "w": 78, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 0, "w": 78, "h": 91 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 468, "y": 88, "w": 77, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 77, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 157, "y": 0, "w": 78, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 78, "h": 90 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 313, "y": 0, "w": 78, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 2, "w": 78, "h": 89 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 0, "y": 0, "w": 79, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 1, "w": 79, "h": 90 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 391, "y": 0, "w": 78, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 78, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 235, "y": 0, "w": 78, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 1, "w": 78, "h": 90 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 469, "y": 0, "w": 78, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 313, "y": 89, "w": 77, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 77, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 157, "y": 90, "w": 76, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 76, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 226, "y": 179, "w": 75, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 75, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 0, "y": 354, "w": 73, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 3, "w": 73, "h": 88 }, + "sourceSize": { "w": 88, "h": 92 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "718.png", + "format": "I8", + "size": { "w": 547, "h": 530 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/718.png b/public/images/pokemon/shiny/718.png index cdfa42ccec7..778ae8bff07 100644 Binary files a/public/images/pokemon/shiny/718.png and b/public/images/pokemon/shiny/718.png differ diff --git a/public/images/pokemon/shiny/719.json b/public/images/pokemon/shiny/719.json index 29e48d3b3be..12a679f029f 100644 --- a/public/images/pokemon/shiny/719.json +++ b/public/images/pokemon/shiny/719.json @@ -1,41 +1,875 @@ -{ - "textures": [ - { - "image": "719.png", - "format": "RGBA8888", - "size": { - "w": 65, - "h": 65 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 42, - "h": 65 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 42, - "h": 65 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 65 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f62b9cce190b10d691ae00fdc87df448:371601e6d1aa56d47c80c70305627ce1:17a705bb924916761be2495822a53735$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 41, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 82, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 123, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 164, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 40, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 39, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 77, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 79, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 118, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 82, "y": 70, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 205, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 41, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 82, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 123, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 164, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 40, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 39, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 77, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 79, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 118, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 82, "y": 70, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 205, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 41, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 82, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 123, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 164, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 40, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 39, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 77, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 79, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 118, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 82, "y": 70, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 205, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 41, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 82, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 123, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 164, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 40, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 39, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 77, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 79, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 118, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0047.png", + "frame": { "x": 82, "y": 70, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0048.png", + "frame": { "x": 205, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0049.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0050.png", + "frame": { "x": 122, "y": 70, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0051.png", + "frame": { "x": 162, "y": 70, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0052.png", + "frame": { "x": 115, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0053.png", + "frame": { "x": 153, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0054.png", + "frame": { "x": 74, "y": 350, "w": 37, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 37, "h": 69 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0055.png", + "frame": { "x": 37, "y": 350, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0056.png", + "frame": { "x": 111, "y": 350, "w": 35, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 35, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0057.png", + "frame": { "x": 190, "y": 280, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0058.png", + "frame": { "x": 191, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0059.png", + "frame": { "x": 157, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 8, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0060.png", + "frame": { "x": 202, "y": 70, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 10, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0061.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0062.png", + "frame": { "x": 0, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0063.png", + "frame": { "x": 0, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0064.png", + "frame": { "x": 196, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 8, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0065.png", + "frame": { "x": 0, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0066.png", + "frame": { "x": 38, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 5, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0067.png", + "frame": { "x": 76, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0068.png", + "frame": { "x": 0, "y": 350, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0069.png", + "frame": { "x": 114, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0070.png", + "frame": { "x": 152, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 7, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0071.png", + "frame": { "x": 0, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 9, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0072.png", + "frame": { "x": 41, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0073.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0074.png", + "frame": { "x": 122, "y": 70, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0075.png", + "frame": { "x": 162, "y": 70, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 7, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0076.png", + "frame": { "x": 115, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0077.png", + "frame": { "x": 153, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0078.png", + "frame": { "x": 74, "y": 350, "w": 37, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 2, "w": 37, "h": 69 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0079.png", + "frame": { "x": 37, "y": 350, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 0, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0080.png", + "frame": { "x": 111, "y": 350, "w": 35, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 1, "w": 35, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0081.png", + "frame": { "x": 190, "y": 280, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0082.png", + "frame": { "x": 191, "y": 210, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 4, "y": 5, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0083.png", + "frame": { "x": 157, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 8, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0084.png", + "frame": { "x": 202, "y": 70, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 10, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0085.png", + "frame": { "x": 0, "y": 0, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0086.png", + "frame": { "x": 0, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 10, "y": 10, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0087.png", + "frame": { "x": 0, "y": 140, "w": 40, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 14, "y": 9, "w": 40, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0088.png", + "frame": { "x": 196, "y": 140, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 16, "y": 8, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0089.png", + "frame": { "x": 0, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 20, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0090.png", + "frame": { "x": 38, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 5, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0091.png", + "frame": { "x": 76, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 4, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0092.png", + "frame": { "x": 0, "y": 350, "w": 37, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 37, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0093.png", + "frame": { "x": 114, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 6, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0094.png", + "frame": { "x": 152, "y": 280, "w": 38, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 7, "w": 38, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0095.png", + "frame": { "x": 0, "y": 210, "w": 39, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 13, "y": 9, "w": 39, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + }, + { + "filename": "0096.png", + "frame": { "x": 41, "y": 70, "w": 41, "h": 70 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 9, "y": 11, "w": 41, "h": 70 }, + "sourceSize": { "w": 63, "h": 81 }, + "duration": 100 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.12-x64", + "image": "719.png", + "format": "I8", + "size": { "w": 246, "h": 420 }, + "scale": "1" + } } diff --git a/public/images/pokemon/shiny/719.png b/public/images/pokemon/shiny/719.png index f17e9b23ca8..c466201632a 100644 Binary files a/public/images/pokemon/shiny/719.png and b/public/images/pokemon/shiny/719.png differ diff --git a/public/images/pokemon/shiny/female/668.png b/public/images/pokemon/shiny/female/668.png index 1f56d13bc4c..ec0d2338fac 100644 Binary files a/public/images/pokemon/shiny/female/668.png and b/public/images/pokemon/shiny/female/668.png differ diff --git a/public/images/pokemon/variant/248-mega.json b/public/images/pokemon/variant/248-mega.json index f515868233f..589b3616079 100644 --- a/public/images/pokemon/variant/248-mega.json +++ b/public/images/pokemon/variant/248-mega.json @@ -1,17 +1,34 @@ { + "1": { +"4a5a39": "533334", +"821610": "004194", +"942900": "004194", +"d0243b": "006fb3", +"d55200": "0098fc", +"ff3e40": "0098fc", +"f24159": "088a72", +"f55e72": "18b8a0", +"ff6668": "1cd9ff", +"739c62": "915957", +"ff8385": "00e0fc", +"ffa3a4": "00ffc8", +"accd9c": "c78482", +"dee6cd": "dbb1b5" + }, "2": { - "4a5a39": "06092f", - "101010": "101010", - "dee6cd": "7068b2", - "accd9c": "625695", - "739c62": "2c3071", - "942900": "ee7b06", - "fefefe": "fefefe", - "c5c5c5": "c5c5c5", - "d55200": "ffa904", - "d0243b": "ffa904", - "ff3e40": "ffef76", - "821610": "ee7b06", - "737373": "737373" +"4a5a39": "06092f", +"821610": "ee7b06", +"942900": "ee7b06", +"d0243b": "ffa904", +"d55200": "ffa904", +"ff3e40": "ffef76", +"f24159": "ff9224", +"f55e72": "ffba36", +"ff6668": "fff28f", +"739c62": "2c3071", +"ff8385": "fff49a", +"ffa3a4": "fff9ce", +"accd9c": "625695", +"dee6cd": "7068b2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/248-mega_2.json b/public/images/pokemon/variant/248-mega_2.json deleted file mode 100644 index 9ef7d417209..00000000000 --- a/public/images/pokemon/variant/248-mega_2.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "248-mega_2.png", - "format": "RGBA8888", - "size": { - "w": 90, - "h": 90 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 90, - "h": 84 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 84 - }, - "frame": { - "x": 0, - "y": 0, - "w": 90, - "h": 84 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e4a1fe4fbac618754df7eb3fcf91b617:0e98725eab652ee45ee2526551c77350:90df97eb431b7162252516cb937a0b9e$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/248-mega_2.png b/public/images/pokemon/variant/248-mega_2.png deleted file mode 100644 index 1aade727abf..00000000000 Binary files a/public/images/pokemon/variant/248-mega_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/656.json b/public/images/pokemon/variant/656.json index 68743a4c9f1..5037f86f22a 100644 --- a/public/images/pokemon/variant/656.json +++ b/public/images/pokemon/variant/656.json @@ -3,12 +3,12 @@ "838394": "4d7dc5", "62ace6": "8363af", "7bcdff": "9c75c2", - "ffec8c": "ddfff9", + "fdea88": "ddfff9", "a1a1c4": "7ab7ec", "c9b241": "97d6e2", - "dfcf77": "bae7e8", + "ccbd70": "bae7e8", "174592": "37408c", - "fdfdfd": "b1e5ff", + "f8f8f8": "b1e5ff", "9c9cc5": "5385c7", "cdcde6": "7eb7e8", "396a83": "362864", @@ -18,12 +18,12 @@ "838394": "cc6845", "62ace6": "c44848", "7bcdff": "dd6155", - "ffec8c": "ddfff9", + "fdea88": "ddfff9", "a1a1c4": "f7c685", "c9b241": "97d6e2", - "dfcf77": "bae7e8", + "ccbd70": "bae7e8", "174592": "198158", - "fdfdfd": "fff4bd", + "f8f8f8": "fff4bd", "9c9cc5": "c96a48", "cdcde6": "f7b785", "396a83": "5c0d33", diff --git a/public/images/pokemon/variant/666-continental.json b/public/images/pokemon/variant/666-continental.json index 67e25fc79b4..92614fb346c 100644 --- a/public/images/pokemon/variant/666-continental.json +++ b/public/images/pokemon/variant/666-continental.json @@ -2,6 +2,7 @@ "1": { "101010": "101010", "595959": "724b7a", + "555353": "724b7a", "d18257": "d18257", "f9bd55": "f9bd55", "303030": "402746", @@ -15,5 +16,23 @@ "c3c3c3": "ffeaff", "811c1c": "811c1c", "e08528": "e08528" + }, + "2": { + "101010": "101010", + "595959": "8f551e", + "555353": "e99b44", + "d18257": "d18257", + "f9bd55": "f9bd55", + "303030": "6d2d0d", + "f8f05e": "f8f05e", + "d24c3e": "d24c3e", + "675220": "9c5c19", + "ceab62": "e99b44", + "707068": "e99b44", + "504a4a": "9c5c19", + "aa5844": "aa5844", + "c3c3c3": "f8f27f", + "811c1c": "811c1c", + "308528": "308528" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-continental_3.json b/public/images/pokemon/variant/666-continental_3.json deleted file mode 100644 index ed0fee105bb..00000000000 --- a/public/images/pokemon/variant/666-continental_3.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "666-continental_3.png", - "format": "RGBA8888", - "size": { - "w": 67, - "h": 67 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 67, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:70eae64f87d7226958d0443e262bab16:5ea86607863e872365dc956f4d819752:23aaac2256d564b9d8a58d7de70397c3$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/666-continental_3.png b/public/images/pokemon/variant/666-continental_3.png deleted file mode 100644 index 24e4c9ab37c..00000000000 Binary files a/public/images/pokemon/variant/666-continental_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/666-fancy.json b/public/images/pokemon/variant/666-fancy.json new file mode 100644 index 00000000000..1f31ac6983d --- /dev/null +++ b/public/images/pokemon/variant/666-fancy.json @@ -0,0 +1,38 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "811c1c": "811c1c", + "de4040": "de4040", + "5faa3e": "5faa3e", + "ceab62": "d9edd4", + "b6d26d": "b6d26d", + "e9e052": "e9e052", + "cf7ef3": "cf7ef3", + "c3c3c3": "ffeaff", + "f2d4e3": "f2d4e3", + "ead2e3": "ffeaff" + }, + "2": { + "101010": "101010", + "303030": "00771b", + "675220": "b9c05a", + "504a4a": "b9c05a", + "595959": "6f9f42", + "707068": "e3e982", + "811c1c": "811c1c", + "de4040": "de4040", + "5faa3e": "5faa3e", + "ceab62": "e3e982", + "b6d26d": "b6d26d", + "e9e052": "e9e052", + "cf7ef3": "cf7ef3", + "c3c3c3": "fcf1ff", + "f2d4e3": "f2d4e3", + "ead2e3": "fcf1ff" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/666-fancy_2.json b/public/images/pokemon/variant/666-fancy_2.json deleted file mode 100644 index d2dd365d3ed..00000000000 --- a/public/images/pokemon/variant/666-fancy_2.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "666-fancy_2.png", - "format": "RGBA8888", - "size": { - "w": 67, - "h": 67 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 67, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2d5276d8c199bae070dbaa73293fd554:a099f55391d8e4bbae565d4a170574c9:6d5edff9a806f43feff031c9919c9aca$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/666-fancy_2.png b/public/images/pokemon/variant/666-fancy_2.png deleted file mode 100644 index 100ba90d7e4..00000000000 Binary files a/public/images/pokemon/variant/666-fancy_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/666-fancy_3.json b/public/images/pokemon/variant/666-fancy_3.json deleted file mode 100644 index be0625b1360..00000000000 --- a/public/images/pokemon/variant/666-fancy_3.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "666-fancy_3.png", - "format": "RGBA8888", - "size": { - "w": 67, - "h": 67 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 67, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2d5276d8c199bae070dbaa73293fd554:a099f55391d8e4bbae565d4a170574c9:6d5edff9a806f43feff031c9919c9aca$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/666-fancy_3.png b/public/images/pokemon/variant/666-fancy_3.png deleted file mode 100644 index a8453d6cbce..00000000000 Binary files a/public/images/pokemon/variant/666-fancy_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/666-high-plains.json b/public/images/pokemon/variant/666-high-plains.json index fd26a077f34..85a5eb24cc3 100644 --- a/public/images/pokemon/variant/666-high-plains.json +++ b/public/images/pokemon/variant/666-high-plains.json @@ -14,7 +14,8 @@ "c3c3c3": "ffeaff", "811c1c": "811c1c", "337543": "337543", - "e8c815": "e8c815" + "e8c815": "e8c815", + "773d21": "773d21" }, "2": { "101010": "101010", @@ -31,6 +32,7 @@ "c3c3c3": "edc67c", "811c1c": "811c1c", "337543": "337543", - "e8c815": "e8c815" + "e8c815": "e8c815", + "773d21": "773d21" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-monsoon.json b/public/images/pokemon/variant/666-monsoon.json index 8aaedab67ca..915d471b2b1 100644 --- a/public/images/pokemon/variant/666-monsoon.json +++ b/public/images/pokemon/variant/666-monsoon.json @@ -1,36 +1,33 @@ { - "1": { - "101010": "101010", - "595959": "724b7a", - "f0f0f8": "f0f0f8", - "303030": "402746", - "675220": "958c8a", - "ceab62": "d9edd4", + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", "807676": "807676", - "92f4f4": "92f4f4", - "989898": "989898", - "707068": "a97cbc", - "504a4a": "7f6991", - "4eccd6": "4eccd6", + "ceab62": "d9edd4", "5676de": "5676de", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" - }, - "2": { - "101010": "101010", - "595959": "656565", - "f0f0f8": "f0f0f8", - "303030": "4f4645", - "675220": "2c3593", - "ceab62": "5857bc", - "807676": "807676", - "92f4f4": "92f4f4", - "989898": "989898", - "707068": "5857bc", - "504a4a": "2c3593", - "4eccd6": "4eccd6", - "5676de": "5676de", - "c3c3c3": "b8f9f9", - "811c1c": "811c1c" - } + "4eccd6": "4eccd6", + "989898": "989898", + "c3c3c3": "c3c3c3", + "f0f0f8": "f0f0f8" + }, + "2": { + "101010": "101010", + "303030": "3d3231", + "675220": "2c3593", + "504a4a": "2c3593", + "595959": "4f4645", + "707068": "5857bc", + "807676": "807676", + "ceab62": "5857bc", + "5676de": "5676de", + "4eccd6": "4eccd6", + "989898": "989898", + "92f4f4": "92f4f4", + "c3c3c3": "b8f9f9", + "f0f0f8": "f0f0f8" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-ocean.json b/public/images/pokemon/variant/666-ocean.json index 975602c6f9e..23f8d48c681 100644 --- a/public/images/pokemon/variant/666-ocean.json +++ b/public/images/pokemon/variant/666-ocean.json @@ -22,7 +22,7 @@ "e1384d": "e1384d", "f4ad61": "f4ad61", "f8ef6a": "f8ef6a", - "303030": "b56208", + "303030": "b54908", "675220": "bc601c", "ceab62": "ea8742", "707068": "ea8742", diff --git a/public/images/pokemon/variant/666-poke-ball.json b/public/images/pokemon/variant/666-poke-ball.json index e83072c51a5..fe6b42f6ef3 100644 --- a/public/images/pokemon/variant/666-poke-ball.json +++ b/public/images/pokemon/variant/666-poke-ball.json @@ -14,6 +14,25 @@ "504a4a": "7f6991", "c3c3c3": "ffeaff", "811c1c": "811c1c", - "a9a99e": "a9a99e" + "a9a99e": "a9a99e", + "2c2b2b": "402746" + }, + "2": { + "101010": "101010", + "f8f8f8": "00006d", + "303030": "ae001a", + "2c2b2b": "660000", + "504a4a": "a70038", + "595959": "df0036", + "c3c3c3": "f0a6bf", + "707068": "d5375a", + "a9a99e": "000050", + "811c1c": "811c1c", + "971d1d": "040046", + "b72c2c": "00005e", + "dc4b4b": "19007d", + "e97e7e": "2e2095", + "675220": "a70038", + "ceab62": "d5375a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-poke-ball_3.json b/public/images/pokemon/variant/666-poke-ball_3.json deleted file mode 100644 index d506cef780e..00000000000 --- a/public/images/pokemon/variant/666-poke-ball_3.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "666-poke-ball_3.png", - "format": "RGBA8888", - "size": { - "w": 67, - "h": 67 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 67, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:7ff5b539e59b71fa67f66f26bb0f2e9d:45bec6d118350401c25850e5f12a25af:8ec14f129d1691b8da504a13b661abed$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/666-poke-ball_3.png b/public/images/pokemon/variant/666-poke-ball_3.png deleted file mode 100644 index e6056246fce..00000000000 Binary files a/public/images/pokemon/variant/666-poke-ball_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/666-river.json b/public/images/pokemon/variant/666-river.json index 818e1ee3989..c7e5e288d05 100644 --- a/public/images/pokemon/variant/666-river.json +++ b/public/images/pokemon/variant/666-river.json @@ -1,19 +1,40 @@ { - "2": { - "101010": "101010", - "595959": "8a5702", - "ceab62": "d9a666", - "303030": "7b2800", - "625841": "625841", - "bc813f": "bc813f", - "9c9143": "9c9143", - "675220": "ae7f41", - "707068": "d9a666", - "504a4a": "ae7f41", - "c3c3c3": "e3c384", - "811c1c": "811c1c", - "279ec2": "279ec2", - "59c9d3": "59c9d3", - "1d726a": "1d726a" - } + "1": { + "101010": "101010", + "303030": "402746", + "4a412c": "4a412c", + "675220": "958c8a", + "634d20": "634d20", + "1d726a": "1d726a", + "504a4a": "7f6991", + "595959": "724b7a", + "625841": "625841", + "707068": "a97cbc", + "bc813f": "bc813f", + "9c9143": "9c9143", + "ceab62": "ceab62", + "279ec2": "279ec2", + "59c9d3": "59c9d3", + "c3c3c3": "c3c3c3", + "d2a862": "d9edd4" + }, + "2": { + "101010": "101010", + "303030": "7b2800", + "4a412c": "4a412c", + "675220": "ae7f41", + "634d20": "634d20", + "1d726a": "1d726a", + "504a4a": "ae7f41", + "595959": "8a5702", + "625841": "625841", + "707068": "d9a666", + "bc813f": "bc813f", + "9c9143": "9c9143", + "ceab62": "ceab62", + "279ec2": "279ec2", + "59c9d3": "59c9d3", + "c3c3c3": "e3c384", + "d2a862": "d2a862" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-river_2.json b/public/images/pokemon/variant/666-river_2.json deleted file mode 100644 index 0da0f00b0be..00000000000 --- a/public/images/pokemon/variant/666-river_2.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "666-river_2.png", - "format": "RGBA8888", - "size": { - "w": 67, - "h": 67 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 67, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:39f778a45b20cfcfded5a350ee1a02e9:5d7e7e891b7da588a2ebd23733da6c2d:fa23dc87fc53ba2cfa532cf440553cf5$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/666-river_2.png b/public/images/pokemon/variant/666-river_2.png deleted file mode 100644 index a5a65f4933b..00000000000 Binary files a/public/images/pokemon/variant/666-river_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/669-red.json b/public/images/pokemon/variant/669-red.json index 627fdbeb44f..145228a41c2 100644 --- a/public/images/pokemon/variant/669-red.json +++ b/public/images/pokemon/variant/669-red.json @@ -1,4 +1,22 @@ { + "1": { + "101010": "101010", + "3d6629": "094740", + "665a1f": "3e0547", + "595959": "595959", + "686868": "686868", + "802d2d": "55061c", + "d94c4c": "aa263c", + "e15455": "dc6295", + "ff7373": "cd4a4a", + "65a943": "e493a1", + "6bb347": "1d8057", + "ccb43d": "6a094f", + "ffe14c": "9c235f", + "bfbfbf": "bfbfbf", + "f8f8f8": "f8f8f8", + "fffbfb": "fffbfb" + }, "2": { "665a1f": "393833", "ffe14c": "fdfffb", diff --git a/public/images/pokemon/variant/669-red_2.json b/public/images/pokemon/variant/669-red_2.json deleted file mode 100644 index 33816135db6..00000000000 --- a/public/images/pokemon/variant/669-red_2.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "669-red_2.png", - "format": "RGBA8888", - "size": { - "w": 46, - "h": 46 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 43, - "h": 46 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 43, - "h": 46 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 46 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:30be9438b4a7afb54dfbdae88661c2ed:ba8475f09ea3d2213c2462b54bc4a3e0:9f8ada9cf46c4e29f954b2eb815bc4e5$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/669-red_2.png b/public/images/pokemon/variant/669-red_2.png deleted file mode 100644 index 5d30b38b1d4..00000000000 Binary files a/public/images/pokemon/variant/669-red_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/715.json b/public/images/pokemon/variant/715.json new file mode 100644 index 00000000000..e43af20a0de --- /dev/null +++ b/public/images/pokemon/variant/715.json @@ -0,0 +1,42 @@ +{ + "1": { + "101010": "101010", + "2b2b2b": "43167f", + "343333": "563d8f", + "3b3b3b": "5f32b1", + "6a3f73": "0f103c", + "287366": "731338", + "575757": "7a5ccc", + "555454": "9166c8", + "801a1a": "5d173d", + "e52e2e": "903b78", + "ffe14c": "ff8a58", + "8e5499": "202558", + "bd70cc": "2f386b", + "3aa694": "a42c54", + "4cd9c1": "d04b6c", + "bfbfbf": "bb9adc", + "f8f8f8": "f8f8f8", + "f7f3f3": "d6c8f1" + }, + "2": { + "101010": "101010", + "2b2b2b": "5e3932", + "343333": "1d060c", + "3b3b3b": "c29484", + "6a3f73": "3b0c18", + "287366": "832714", + "575757": "ecd3c3", + "555454": "2f0d13", + "801a1a": "7c0907", + "e52e2e": "ad3419", + "ffe14c": "49ffcd", + "8e5499": "5b1922", + "bd70cc": "7c2928", + "3aa694": "b8552c", + "4cd9c1": "dd834c", + "bfbfbf": "43191e", + "f8f8f8": "f8f8f8", + "f7f3f3": "5a2a2b" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/859.json b/public/images/pokemon/variant/859.json new file mode 100644 index 00000000000..703d5d67218 --- /dev/null +++ b/public/images/pokemon/variant/859.json @@ -0,0 +1,30 @@ +{ + "1": { + "e65984": "619544", + "8d3856": "376b2d", + "ffbff5": "dbe797", + "f589c2": "9aba6d", + "45366d": "5b1d15", + "735aac": "a4332d", + "947cd8": "cd643d", + "f42252": "f55c14", + "101010": "101010", + "fdfdfd": "fdfdfd", + "c9c9c9": "c9c9c9", + "8b73d5": "cc5836" + }, + "2": { + "e65984": "4b1736", + "8d3856": "30082d", + "ffbff5": "904f55", + "f589c2": "6b2b3e", + "45366d": "794935", + "735aac": "f0c475", + "947cd8": "d9975b", + "f42252": "fc645a", + "101010": "101010", + "fdfdfd": "fdfdfd", + "c9c9c9": "dad6bf", + "8b73d5": "f9e9a4" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/859_2.json b/public/images/pokemon/variant/859_2.json deleted file mode 100644 index 1494c4909f7..00000000000 --- a/public/images/pokemon/variant/859_2.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "859_2.png", - "format": "RGBA8888", - "size": { - "w": 51, - "h": 51 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 47 - }, - "frame": { - "x": 0, - "y": 0, - "w": 51, - "h": 47 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:214cad7b549c6f4fdfaf238d82156c4e:50dda7cd3a060b6b559148b2a281e2fe:40139ec0718e207e11a4ee81c686e004$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/859_2.png b/public/images/pokemon/variant/859_2.png deleted file mode 100644 index 82e8be45c39..00000000000 Binary files a/public/images/pokemon/variant/859_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/859_3.json b/public/images/pokemon/variant/859_3.json deleted file mode 100644 index e0d6c3779a8..00000000000 --- a/public/images/pokemon/variant/859_3.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "859_3.png", - "format": "RGBA8888", - "size": { - "w": 51, - "h": 51 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 51, - "h": 47 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 51, - "h": 47 - }, - "frame": { - "x": 0, - "y": 0, - "w": 51, - "h": 47 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:214cad7b549c6f4fdfaf238d82156c4e:50dda7cd3a060b6b559148b2a281e2fe:40139ec0718e207e11a4ee81c686e004$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/859_3.png b/public/images/pokemon/variant/859_3.png deleted file mode 100644 index 800063f08aa..00000000000 Binary files a/public/images/pokemon/variant/859_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json index 87c9816b8cb..6d2da0ed0ee 100644 --- a/public/images/pokemon/variant/_masterlist.json +++ b/public/images/pokemon/variant/_masterlist.json @@ -221,7 +221,7 @@ "246": [0, 1, 1], "247": [0, 1, 1], "248": [0, 1, 1], - "248-mega": [0, 2, 1], + "248-mega": [0, 1, 1], "249": [0, 2, 2], "250": [0, 2, 2], "251": [0, 1, 1], @@ -526,9 +526,9 @@ "664": [0, 1, 1], "665": [0, 1, 1], "666-archipelago": [0, 1, 1], - "666-continental": [0, 1, 2], + "666-continental": [0, 1, 1], "666-elegant": [0, 1, 1], - "666-fancy": [0, 2, 2], + "666-fancy": [0, 1, 1], "666-garden": [0, 1, 1], "666-high-plains": [0, 1, 1], "666-icy-snow": [0, 1, 1], @@ -538,14 +538,14 @@ "666-modern": [0, 1, 1], "666-monsoon": [0, 1, 1], "666-ocean": [0, 1, 1], - "666-poke-ball": [0, 1, 2], + "666-poke-ball": [0, 1, 1], "666-polar": [0, 1, 1], - "666-river": [0, 2, 1], + "666-river": [0, 1, 1], "666-sandstorm": [0, 1, 1], "666-savanna": [0, 1, 1], "666-sun": [0, 1, 1], "666-tundra": [0, 1, 1], - "669-red": [0, 2, 1], + "669-red": [0, 1, 1], "669-blue": [0, 2, 2], "669-white": [0, 1, 1], "669-yellow": [0, 2, 1], @@ -600,7 +600,7 @@ "712": [0, 1, 1], "713": [0, 1, 1], "714": [0, 1, 1], - "715": [0, 2, 2], + "715": [0, 1, 1], "716-active": [0, 1, 1], "716-neutral": [0, 1, 1], "717": [0, 1, 1], @@ -692,7 +692,7 @@ "857": [0, 2, 2], "858-gigantamax": [0, 1, 1], "858": [0, 1, 1], - "859": [0, 2, 2], + "859": [0, 1, 1], "860": [0, 1, 1], "861-gigantamax": [0, 1, 1], "861": [0, 1, 1], @@ -1397,7 +1397,7 @@ "612": [0, 1, 1], "616": [0, 1, 1], "617": [0, 1, 1], - "618": [0, 2, 2], + "618": [0, 1, 1], "619": [0, 1, 1], "620": [0, 1, 1], "621": [0, 1, 1], @@ -1438,7 +1438,7 @@ "666-archipelago": [0, 1, 1], "666-continental": [0, 1, 1], "666-elegant": [0, 1, 1], - "666-fancy": [0, 2, 2], + "666-fancy": [0, 1, 1], "666-garden": [0, 1, 1], "666-high-plains": [0, 1, 1], "666-icy-snow": [0, 1, 1], @@ -1450,7 +1450,7 @@ "666-ocean": [0, 1, 1], "666-poke-ball": [0, 1, 1], "666-polar": [0, 1, 1], - "666-river": [0, 2, 1], + "666-river": [0, 1, 1], "666-sandstorm": [0, 1, 1], "666-savanna": [0, 1, 1], "666-sun": [0, 1, 1], @@ -1510,7 +1510,7 @@ "712": [0, 1, 1], "713": [0, 1, 1], "714": [0, 1, 1], - "715": [0, 2, 2], + "715": [0, 1, 1], "716-active": [0, 1, 1], "716-neutral": [0, 1, 1], "717": [0, 1, 1], @@ -1617,7 +1617,7 @@ "877-hangry": [1, 1, 1], "877": [1, 1, 1], "880": [0, 1, 1], - "881": [0, 2, 2], + "881": [0, 1, 1], "882": [0, 1, 1], "883": [0, 1, 1], "884-gigantamax": [0, 1, 1], @@ -1864,19 +1864,19 @@ "666-archipelago": [0, 1, 1], "666-continental": [0, 1, 1], "666-elegant": [0, 1, 1], - "666-fancy": [0, 2, 2], + "666-fancy": [0, 1, 1], "666-garden": [0, 1, 1], "666-high-plains": [0, 1, 1], "666-icy-snow": [0, 1, 1], "666-jungle": [0, 1, 1], "666-marine": [0, 1, 1], - "666-meadow": [0, 2, 2], + "666-meadow": [0, 1, 1], "666-modern": [0, 1, 1], "666-monsoon": [0, 1, 1], "666-ocean": [0, 1, 1], - "666-poke-ball": [0, 1, 2], + "666-poke-ball": [0, 1, 1], "666-polar": [0, 1, 1], - "666-river": [0, 2, 1], + "666-river": [0, 1, 1], "666-sandstorm": [0, 1, 1], "666-savanna": [0, 1, 1], "666-sun": [0, 1, 1], @@ -1927,7 +1927,7 @@ "712": [0, 1, 1], "713": [0, 1, 1], "714": [0, 1, 1], - "715": [0, 2, 1], + "715": [0, 1, 1], "716-active": [0, 1, 1], "716-neutral": [0, 1, 1], "717": [0, 2, 2], @@ -2143,7 +2143,9 @@ "6705": [0, 1, 1], "6706": [0, 1, 1], "6713": [0, 1, 1], - "female": {}, + "female": { + "6215": [0, 1, 1] + }, "back": { "3-mega": [0, 2, 2], "6-mega-x": [0, 2, 2], @@ -2158,7 +2160,7 @@ "181-mega": [0, 1, 2], "212-mega": [1, 2, 2], "229-mega": [0, 1, 1], - "248-mega": [0, 2, 1], + "248-mega": [0, 1, 1], "257-mega": [0, 1, 1], "282-mega": [0, 1, 1], "302-mega": [0, 1, 1], @@ -2190,27 +2192,27 @@ "658": [0, 1, 1], "658-ash": [0, 1, 1], "664": [0, 1, 1], - "665": [0, 2, 1], - "666-archipelago": [0, 2, 2], - "666-continental": [0, 2, 2], - "666-elegant": [0, 2, 2], - "666-fancy": [0, 2, 2], - "666-garden": [0, 2, 2], - "666-high-plains": [0, 2, 2], - "666-icy-snow": [0, 2, 2], - "666-jungle": [0, 2, 2], - "666-marine": [0, 2, 2], - "666-meadow": [0, 2, 2], - "666-modern": [0, 2, 2], - "666-monsoon": [0, 2, 2], - "666-ocean": [0, 2, 2], - "666-poke-ball": [0, 2, 2], - "666-polar": [0, 2, 2], - "666-river": [0, 2, 2], - "666-sandstorm": [0, 2, 2], - "666-savanna": [0, 2, 2], - "666-sun": [0, 2, 2], - "666-tundra": [0, 2, 2], + "665": [0, 1, 1], + "666-archipelago": [0, 1, 1], + "666-continental": [0, 1, 1], + "666-elegant": [0, 1, 1], + "666-fancy": [0, 1, 1], + "666-garden": [0, 1, 1], + "666-high-plains": [0, 1, 1], + "666-icy-snow": [0, 1, 1], + "666-jungle": [0, 1, 1], + "666-marine": [0, 1, 1], + "666-meadow": [0, 1, 1], + "666-modern": [0, 1, 1], + "666-monsoon": [0, 1, 1], + "666-ocean": [0, 1, 1], + "666-poke-ball": [0, 1, 1], + "666-polar": [0, 1, 1], + "666-river": [0, 1, 1], + "666-sandstorm": [0, 1, 1], + "666-savanna": [0, 1, 1], + "666-sun": [0, 1, 1], + "666-tundra": [0, 1, 1], "669-red": [0, 2, 2], "669-blue": [0, 2, 2], "669-white": [0, 2, 2], @@ -2470,7 +2472,10 @@ "6571": [0, 1, 1], "6705": [0, 1, 1], "6706": [0, 1, 1], - "6713": [0, 1, 1] + "6713": [0, 1, 1], + "female": { + "6215": [0, 1, 1] + } } } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/248-mega.json b/public/images/pokemon/variant/back/248-mega.json index 5def1f5a316..c63b19d7c29 100644 --- a/public/images/pokemon/variant/back/248-mega.json +++ b/public/images/pokemon/variant/back/248-mega.json @@ -1,28 +1,28 @@ { "1": { - "101010": "101010", - "4a5a39": "533334", - "accd9c": "c78482", - "739c62": "915957", - "c5c5c5": "c5c5c5", - "942900": "006fbe", - "fefefe": "fefefe", - "d55200": "0098fc", - "737373": "737373", - "821610": "004194", - "d0243b": "006fbe" + "171717": "101010", + "4a5a39": "533334", + "4b5a3b": "533334", + "727272": "727272", + "801c17": "533334", + "922d00": "004194", + "ce283d": "006fb3", + "d35200": "0098fc", + "729a62": "915957", + "739c62": "915957", + "aacb9a": "c78482" }, "2": { - "101010": "101010", - "4a5a39": "06092f", - "accd9c": "625695", - "739c62": "2c3071", - "c5c5c5": "c5c5c5", - "942900": "ee7b06", - "fefefe": "fefefe", - "d55200": "ffa904", - "737373": "737373", - "821610": "ee7b06", - "d0243b": "ffa904" + "171717": "101010", + "4a5a39": "06092f", + "4b5a3b": "06092f", + "727272": "727272", + "801c17": "ee7b06", + "922d00": "ee7b06", + "ce283d": "ffa904", + "d35200": "ffa904", + "729a62": "59417c", + "739c62": "59417c", + "aacb9a": "625695" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/618.json b/public/images/pokemon/variant/back/618.json new file mode 100644 index 00000000000..d4db4967946 --- /dev/null +++ b/public/images/pokemon/variant/back/618.json @@ -0,0 +1,40 @@ +{ + "1": { + "cebd00": "bdac99", + "ffff00": "f3e6dd", + "6b6319": "987b6d", + "081019": "081019", + "52423a": "312118", + "6b524a": "4a342a", + "bd846b": "8c3841", + "846b63": "6b3838", + "d69c84": "ad4c4c", + "efce42": "eac2bd", + "d6cec5": "d6cec5", + "ffffff": "ffffff", + "081018": "081018", + "735a52": "564038", + "735a53": "564038", + "9c8473": "a08773", + "bda59c": "e6dbd6" + }, + "2": { + "cebd00": "58536b", + "ffff00": "707488", + "6b6319": "39314a", + "081019": "081019", + "52423a": "5a2e2e", + "6b524a": "804e48", + "bd846b": "cec9b1", + "846b63": "9c7765", + "d69c84": "f0ead6", + "efce42": "9fadb9", + "d6cec5": "4c8c4c", + "ffffff": "79a962", + "081018": "204a29", + "735a52": "885011", + "735a53": "735555", + "9c8473": "c18a2c", + "bda59c": "efc44b" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/618_2.json b/public/images/pokemon/variant/back/618_2.json deleted file mode 100644 index d82c52e26e2..00000000000 --- a/public/images/pokemon/variant/back/618_2.json +++ /dev/null @@ -1,2750 +0,0 @@ -{ - "textures": [ - { - "image": "618_2.png", - "format": "RGBA8888", - "size": { - "w": 221, - "h": 221 - }, - "scale": 1, - "frames": [ - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 27 - }, - "frame": { - "x": 0, - "y": 61, - "w": 76, - "h": 27 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 27 - }, - "frame": { - "x": 0, - "y": 61, - "w": 76, - "h": 27 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 27 - }, - "frame": { - "x": 0, - "y": 61, - "w": 76, - "h": 27 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 27 - }, - "frame": { - "x": 0, - "y": 61, - "w": 76, - "h": 27 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 76, - "h": 26 - }, - "frame": { - "x": 76, - "y": 87, - "w": 76, - "h": 26 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 76, - "h": 26 - }, - "frame": { - "x": 76, - "y": 87, - "w": 76, - "h": 26 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 76, - "h": 26 - }, - "frame": { - "x": 76, - "y": 87, - "w": 76, - "h": 26 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 76, - "h": 26 - }, - "frame": { - "x": 76, - "y": 87, - "w": 76, - "h": 26 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:7ed241f9d4e0679b62ab26da17057d65:739de537da7171a9caf5769b4458f68f:22e585907b89e90c4fc3ab2512d175fd$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/618_2.png b/public/images/pokemon/variant/back/618_2.png deleted file mode 100644 index a0077a1f023..00000000000 Binary files a/public/images/pokemon/variant/back/618_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/back/618_3.json b/public/images/pokemon/variant/back/618_3.json deleted file mode 100644 index 17c49c5e59b..00000000000 --- a/public/images/pokemon/variant/back/618_3.json +++ /dev/null @@ -1,2750 +0,0 @@ -{ - "textures": [ - { - "image": "618_3.png", - "format": "RGBA8888", - "size": { - "w": 221, - "h": 221 - }, - "scale": 1, - "frames": [ - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 77, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 77, - "h": 30 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 77, - "h": 26 - }, - "frame": { - "x": 77, - "y": 0, - "w": 77, - "h": 26 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 76, - "h": 32 - }, - "frame": { - "x": 77, - "y": 26, - "w": 76, - "h": 32 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 76, - "h": 31 - }, - "frame": { - "x": 0, - "y": 30, - "w": 76, - "h": 31 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 76, - "h": 29 - }, - "frame": { - "x": 76, - "y": 58, - "w": 76, - "h": 29 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 27 - }, - "frame": { - "x": 0, - "y": 61, - "w": 76, - "h": 27 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 27 - }, - "frame": { - "x": 0, - "y": 61, - "w": 76, - "h": 27 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 27 - }, - "frame": { - "x": 0, - "y": 61, - "w": 76, - "h": 27 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 76, - "h": 27 - }, - "frame": { - "x": 0, - "y": 61, - "w": 76, - "h": 27 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 76, - "h": 26 - }, - "frame": { - "x": 76, - "y": 87, - "w": 76, - "h": 26 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 76, - "h": 26 - }, - "frame": { - "x": 76, - "y": 87, - "w": 76, - "h": 26 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 76, - "h": 26 - }, - "frame": { - "x": 76, - "y": 87, - "w": 76, - "h": 26 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 76, - "h": 26 - }, - "frame": { - "x": 76, - "y": 87, - "w": 76, - "h": 26 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 88, - "w": 75, - "h": 32 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 75, - "h": 32 - }, - "frame": { - "x": 0, - "y": 120, - "w": 75, - "h": 32 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 73, - "h": 32 - }, - "frame": { - "x": 0, - "y": 152, - "w": 73, - "h": 32 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 73, - "h": 31 - }, - "frame": { - "x": 0, - "y": 184, - "w": 73, - "h": 31 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 73, - "h": 30 - }, - "frame": { - "x": 73, - "y": 152, - "w": 73, - "h": 30 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 75, - "h": 27 - }, - "frame": { - "x": 146, - "y": 113, - "w": 75, - "h": 27 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 74, - "h": 28 - }, - "frame": { - "x": 146, - "y": 140, - "w": 74, - "h": 28 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 29 - }, - "frame": { - "x": 146, - "y": 168, - "w": 73, - "h": 29 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 77, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 73, - "h": 28 - }, - "frame": { - "x": 73, - "y": 182, - "w": 73, - "h": 28 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:7ed241f9d4e0679b62ab26da17057d65:739de537da7171a9caf5769b4458f68f:22e585907b89e90c4fc3ab2512d175fd$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/618_3.png b/public/images/pokemon/variant/back/618_3.png deleted file mode 100644 index aaba24cfc58..00000000000 Binary files a/public/images/pokemon/variant/back/618_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/back/656.json b/public/images/pokemon/variant/back/656.json index 34b11bfab78..f41398f3154 100644 --- a/public/images/pokemon/variant/back/656.json +++ b/public/images/pokemon/variant/back/656.json @@ -1,17 +1,17 @@ { "1": { - "838394": "4d7dc5", + "848496": "4d7dc5", "7bcdff": "9c75c2", "62ace6": "8363af", "ffffff": "b1e5ff", "396a83": "362864", "9c9cc5": "5385c7", "cdcde6": "7eb7e8", - "174592": "198158", + "174592": "37408c", "5a94cd": "7054a4" }, "2": { - "838394": "cc6845", + "848496": "cc6845", "7bcdff": "dd6155", "62ace6": "c44848", "ffffff": "fff4bd", diff --git a/public/images/pokemon/variant/back/666-fancy.json b/public/images/pokemon/variant/back/666-fancy.json new file mode 100644 index 00000000000..5d368667ae3 --- /dev/null +++ b/public/images/pokemon/variant/back/666-fancy.json @@ -0,0 +1,36 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "de4040": "de4040", + "5faa3e": "5faa3e", + "ceab62": "d9edd4", + "b6d26d": "b6d26d", + "e9e052": "e9e052", + "cf7ef3": "cf7ef3", + "c3c3c3": "ffeaff", + "f2d4e3": "f2d4e3", + "ead2e3": "ffeaff" + }, + "2": { + "101010": "101010", + "303030": "00771b", + "675220": "b9c05a", + "504a4a": "b9c05a", + "595959": "6f9f42", + "707068": "6f9f42", + "de4040": "de4040", + "5faa3e": "5faa3e", + "ceab62": "e3e982", + "b6d26d": "b6d26d", + "e9e052": "e9e052", + "cf7ef3": "cf7ef3", + "c3c3c3": "fcf1ff", + "f2d4e3": "f2d4e3", + "ead2e3": "fcf1ff" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-fancy_2.json b/public/images/pokemon/variant/back/666-fancy_2.json deleted file mode 100644 index 49478186fd7..00000000000 --- a/public/images/pokemon/variant/back/666-fancy_2.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "666-fancy_2.png", - "format": "RGBA8888", - "size": { - "w": 67, - "h": 67 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 67, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c0935d72f3dd919dfad1f00ce1550c3c:4c9a4c435b13a6c8dbd3fa6eacd260d8:6d5edff9a806f43feff031c9919c9aca$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-fancy_2.png b/public/images/pokemon/variant/back/666-fancy_2.png deleted file mode 100644 index a1e23edd659..00000000000 Binary files a/public/images/pokemon/variant/back/666-fancy_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/back/666-fancy_3.json b/public/images/pokemon/variant/back/666-fancy_3.json deleted file mode 100644 index f060b4b02c6..00000000000 --- a/public/images/pokemon/variant/back/666-fancy_3.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "666-fancy_3.png", - "format": "RGBA8888", - "size": { - "w": 67, - "h": 67 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 67, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c0935d72f3dd919dfad1f00ce1550c3c:4c9a4c435b13a6c8dbd3fa6eacd260d8:6d5edff9a806f43feff031c9919c9aca$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-fancy_3.png b/public/images/pokemon/variant/back/666-fancy_3.png deleted file mode 100644 index 6d15bc3f680..00000000000 Binary files a/public/images/pokemon/variant/back/666-fancy_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/back/666-high-plains.json b/public/images/pokemon/variant/back/666-high-plains.json index acd62e863c1..6ee5c78e6ca 100644 --- a/public/images/pokemon/variant/back/666-high-plains.json +++ b/public/images/pokemon/variant/back/666-high-plains.json @@ -13,7 +13,8 @@ "504a4a": "7f6991", "c3c3c3": "c3c3c3", "337543": "337543", - "e8c815": "e8c815" + "e8c815": "e8c815", + "773d21": "773d21" }, "2": { "101010": "101010", @@ -29,6 +30,7 @@ "504a4a": "c97034", "c3c3c3": "edc67c", "337543": "337543", - "e8c815": "e8c815" + "e8c815": "e8c815", + "773d21": "773d21" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-monsoon.json b/public/images/pokemon/variant/back/666-monsoon.json index afb60e0f5ae..915d471b2b1 100644 --- a/public/images/pokemon/variant/back/666-monsoon.json +++ b/public/images/pokemon/variant/back/666-monsoon.json @@ -1,34 +1,33 @@ { - "1": { - "101010": "101010", - "595959": "724b7a", - "f0f0f8": "f0f0f8", - "303030": "402746", - "ceab62": "d9edd4", - "675220": "958c8a", + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", "807676": "807676", - "92f4f4": "92f4f4", - "989898": "989898", - "707068": "a97cbc", + "ceab62": "d9edd4", "5676de": "5676de", - "4eccd6": "4eccd6", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3" - }, - "2": { - "101010": "101010", - "595959": "656565", - "f0f0f8": "f0f0f8", - "303030": "4f4645", - "ceab62": "5857bc", - "675220": "2c3593", - "807676": "807676", - "92f4f4": "92f4f4", - "989898": "989898", - "707068": "5857bc", - "5676de": "5676de", - "4eccd6": "4eccd6", - "504a4a": "2c3593", - "c3c3c3": "b8f9f9" - } + "4eccd6": "4eccd6", + "989898": "989898", + "c3c3c3": "c3c3c3", + "f0f0f8": "f0f0f8" + }, + "2": { + "101010": "101010", + "303030": "3d3231", + "675220": "2c3593", + "504a4a": "2c3593", + "595959": "4f4645", + "707068": "5857bc", + "807676": "807676", + "ceab62": "5857bc", + "5676de": "5676de", + "4eccd6": "4eccd6", + "989898": "989898", + "92f4f4": "92f4f4", + "c3c3c3": "b8f9f9", + "f0f0f8": "f0f0f8" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-ocean.json b/public/images/pokemon/variant/back/666-ocean.json index 51a99de1ea8..8b62b4a8072 100644 --- a/public/images/pokemon/variant/back/666-ocean.json +++ b/public/images/pokemon/variant/back/666-ocean.json @@ -21,7 +21,7 @@ "e1384d": "e1384d", "f4ad61": "f4ad61", "f8ef6a": "f8ef6a", - "303030": "b56208", + "303030": "b54908", "ceb362": "ea8742", "675220": "bc601c", "ebcf3f": "ebcf3f", diff --git a/public/images/pokemon/variant/back/666-river.json b/public/images/pokemon/variant/back/666-river.json index b3b9671ee75..c7e5e288d05 100644 --- a/public/images/pokemon/variant/back/666-river.json +++ b/public/images/pokemon/variant/back/666-river.json @@ -1,18 +1,40 @@ { - "2": { - "101010": "101010", - "595959": "8a5702", - "ceab62": "d9a666", - "625841": "625841", - "303030": "7b2800", - "bc813f": "bc813f", - "9c9143": "9c9143", - "675220": "ae7f41", - "707068": "d9a666", - "504a4a": "ae7f41", - "c3c3c3": "e3c384", - "279ec2": "279ec2", - "59c9d3": "59c9d3", - "1d726a": "1d726a" - } + "1": { + "101010": "101010", + "303030": "402746", + "4a412c": "4a412c", + "675220": "958c8a", + "634d20": "634d20", + "1d726a": "1d726a", + "504a4a": "7f6991", + "595959": "724b7a", + "625841": "625841", + "707068": "a97cbc", + "bc813f": "bc813f", + "9c9143": "9c9143", + "ceab62": "ceab62", + "279ec2": "279ec2", + "59c9d3": "59c9d3", + "c3c3c3": "c3c3c3", + "d2a862": "d9edd4" + }, + "2": { + "101010": "101010", + "303030": "7b2800", + "4a412c": "4a412c", + "675220": "ae7f41", + "634d20": "634d20", + "1d726a": "1d726a", + "504a4a": "ae7f41", + "595959": "8a5702", + "625841": "625841", + "707068": "d9a666", + "bc813f": "bc813f", + "9c9143": "9c9143", + "ceab62": "ceab62", + "279ec2": "279ec2", + "59c9d3": "59c9d3", + "c3c3c3": "e3c384", + "d2a862": "d2a862" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-river_2.json b/public/images/pokemon/variant/back/666-river_2.json deleted file mode 100644 index 710513e4626..00000000000 --- a/public/images/pokemon/variant/back/666-river_2.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "666-river_2.png", - "format": "RGBA8888", - "size": { - "w": 67, - "h": 67 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 67, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 67 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c5c96b8025cde94330c424121707d6d1:0eb4b25134091aa2435bee846468e099:fa23dc87fc53ba2cfa532cf440553cf5$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-river_2.png b/public/images/pokemon/variant/back/666-river_2.png deleted file mode 100644 index 8d829e974f4..00000000000 Binary files a/public/images/pokemon/variant/back/666-river_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/back/715.json b/public/images/pokemon/variant/back/715.json new file mode 100644 index 00000000000..7ca4d81e5dc --- /dev/null +++ b/public/images/pokemon/variant/back/715.json @@ -0,0 +1,38 @@ +{ + "1": { + "101010": "101010", + "287366": "731338", + "3aa694": "a42c54", + "404040": "542f98", + "343434": "3e107b", + "252525": "260447", + "4cd9c1": "d04b6c", + "595959": "7a5ccc", + "6a3f73": "0f103c", + "737373": "563d8f", + "801a1a": "801a1a", + "8e5499": "202558", + "bd70cc": "2f386b", + "bfbfbf": "ab83dd", + "e52e2e": "e52e2e", + "f8f8f8": "d5bdec" + }, + "2": { + "101010": "101010", + "287366": "832714", + "3aa694": "b8552c", + "404040": "b18373", + "343434": "906152", + "252525": "6c3f39", + "4cd9c1": "dd834c", + "595959": "e2c7b5", + "6a3f73": "3b0c18", + "737373": "280911", + "801a1a": "801a1a", + "8e5499": "5b1922", + "bd70cc": "7c2928", + "bfbfbf": "43191e", + "e52e2e": "e52e2e", + "f8f8f8": "5a2a2b" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/881.json b/public/images/pokemon/variant/back/881.json new file mode 100644 index 00000000000..3efad4efe60 --- /dev/null +++ b/public/images/pokemon/variant/back/881.json @@ -0,0 +1,42 @@ +{ + "1": { + "e39e1e": "9c1430", + "975e17": "5b0610", + "ffff84": "ee8563", + "ead900": "c6362b", + "101010": "101010", + "2abbfc": "ceb16f", + "09354d": "271014", + "9ab8ba": "cea5b9", + "edf3f2": "faebc8", + "5c7996": "a57185", + "07305f": "4d254a", + "085d94": "714363", + "0981ae": "45242e", + "27aed6": "6e4145", + "072241": "301636", + "097da8": "43222c", + "0a3463": "492146", + "23abd3": "b59795" + }, + "2": { + "e39e1e": "35365e", + "975e17": "211b3d", + "ffff84": "dceeeb", + "ead900": "636287", + "101010": "101010", + "2abbfc": "26c248", + "09354d": "09354d", + "9ab8ba": "a3c465", + "edf3f2": "fcffe4", + "5c7996": "50a751", + "07305f": "7b1a5e", + "085d94": "ad3b6c", + "0981ae": "205e5d", + "27aed6": "2d7b65", + "072241": "5d0e54", + "097da8": "185453", + "0a3463": "721957", + "23abd3": "d49da9" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/881_2.json b/public/images/pokemon/variant/back/881_2.json deleted file mode 100644 index 568946ee9f9..00000000000 --- a/public/images/pokemon/variant/back/881_2.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "881_2.png", - "format": "RGBA8888", - "size": { - "w": 80, - "h": 80 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 66, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 66, - "h": 80 - }, - "frame": { - "x": 0, - "y": 0, - "w": 66, - "h": 80 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:08f9e60b28adb0f1c25487a3423af005:e78d63b8a44825ae516935d669e48f61:1f7350865753535cbb572c579820f817$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/881_2.png b/public/images/pokemon/variant/back/881_2.png deleted file mode 100644 index 2060481d855..00000000000 Binary files a/public/images/pokemon/variant/back/881_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/back/881_3.json b/public/images/pokemon/variant/back/881_3.json deleted file mode 100644 index b9101d9b13f..00000000000 --- a/public/images/pokemon/variant/back/881_3.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "textures": [ - { - "image": "881_3.png", - "format": "RGBA8888", - "size": { - "w": 80, - "h": 80 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 66, - "h": 80 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 66, - "h": 80 - }, - "frame": { - "x": 0, - "y": 0, - "w": 66, - "h": 80 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:08f9e60b28adb0f1c25487a3423af005:e78d63b8a44825ae516935d669e48f61:1f7350865753535cbb572c579820f817$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/881_3.png b/public/images/pokemon/variant/back/881_3.png deleted file mode 100644 index 6ed3c2495ba..00000000000 Binary files a/public/images/pokemon/variant/back/881_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/248-mega.json b/public/images/pokemon/variant/exp/248-mega.json index f6a6d5bf7ed..0a46ac40a4a 100644 --- a/public/images/pokemon/variant/exp/248-mega.json +++ b/public/images/pokemon/variant/exp/248-mega.json @@ -1,32 +1,34 @@ { "1": { - "4a5a39": "533334", - "dee6cd": "dbb1b5", - "101010": "101010", - "accd9c": "c78482", - "ffffff": "ffffff", - "c5c5c5": "c5c5c5", - "739c62": "915957", - "d55200": "006fbe", - "942900": "004194", - "ee5229": "0098fc", - "bd3920": "006fbe", - "737373": "737373", - "6a2000": "004194" +"4a5a39": "533334", +"821610": "004194", +"942900": "004194", +"d0243b": "006fb3", +"d55200": "0098fc", +"ff3e40": "0098fc", +"f24159": "088a72", +"f55e72": "18b8a0", +"ff6668": "1cd9ff", +"739c62": "915957", +"ff8385": "00e0fc", +"ffa3a4": "00ffc8", +"accd9c": "c78482", +"dee6cd": "dbb1b5" }, "2": { - "4a5a39": "06092f", - "dee6cd": "7068b2", - "101010": "101010", - "accd9c": "625695", - "ffffff": "ffffff", - "c5c5c5": "c5c5c5", - "739c62": "2c3071", - "d55200": "ffa904", - "942900": "ee7b06", - "ee5229": "ffef76", - "bd3920": "ffa904", - "737373": "737373", - "6a2000": "ee7b06" +"4a5a39": "06092f", +"821610": "ee7b06", +"942900": "ee7b06", +"d0243b": "ffa904", +"d55200": "ffa904", +"ff3e40": "ffef76", +"f24159": "ffbf44", +"f55e72": "ffd380", +"ff6668": "fef3a1", +"739c62": "2c3071", +"ff8385": "fff8c1", +"ffa3a4": "fffbdd", +"accd9c": "625695", +"dee6cd": "7068b2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/362-mega.json b/public/images/pokemon/variant/exp/362-mega.json index 27f5d6f5afc..3b6e39436e6 100644 --- a/public/images/pokemon/variant/exp/362-mega.json +++ b/public/images/pokemon/variant/exp/362-mega.json @@ -1,38 +1,35 @@ -{ - "1": { - "000000": "000000", +{"1": { + "010101": "000000", "2b74a8": "84073c", - "a4deff": "ffd287", - "7b7b83": "151a57", - "62bdee": "fd9b44", - "58585f": "0d1146", - "faf9fb": "ff937b", + "bbeeff": "f9383e", "393941": "0d1146", + "7dbbee": "b7113a", + "fefefe": "ff937b", "e6e6f6": "a2b7e5", "7b7b94": "151a57", "c5cde6": "6076c6", "acaccd": "2f3c84", - "52526a": "0d1146", + "2983bd": "d54f14", + "62bdee": "fd9b44", "a82f37": "f9ff3d", - "324c67": "460025", - "ffffff": "ff937b" + "afe3f8": "ffd287", + "20315e": "460025" }, "2": { - "000000": "010101", + "010101": "010101", "2b74a8": "0c4b3a", - "a4deff": "f2ff87", - "7b7b83": "4a282a", - "62bdee": "c0ee46", - "58585f": "221315", - "faf9fb": "c8ff9c", + "bbeeff": "5ce11a", "393941": "221315", + "7dbbee": "009325", + "fefefe": "c8ff9c", "e6e6f6": "9b6146", "7b7b94": "4a282a", "c5cde6": "7e4a3f", "acaccd": "613735", - "52526a": "221315", + "2983bd": "6bb61a", + "62bdee": "c0ee46", "a82f37": "ff36b3", - "324c67": "0a2a2e", - "ffffff": "c8ff9c" + "afe3f8": "f2ff87", + "20315e": "0a2a2e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/653.json b/public/images/pokemon/variant/exp/653.json index aa8c032d4e3..be967d6c9c2 100644 --- a/public/images/pokemon/variant/exp/653.json +++ b/public/images/pokemon/variant/exp/653.json @@ -1,28 +1,28 @@ { "1": { - "796934": "9f398a", - "fee772": "e190c3", "101010": "101010", - "cfb458": "c35ba3", - "7f2d1b": "3c195c", - "ec5631": "794cb7", - "b64126": "502c81", - "736a65": "68326b", - "ffffff": "fbecff", - "c5c5ce": "c093c3", - "524e4e": "404040" + "736028": "9f398a", + "ffd659": "e190c3", + "ccab47": "c35ba3", + "732e17": "3c195c", + "f26130": "794cb7", + "b34724": "502c81", + "737373": "68326b", + "f8f8f8": "fbecff", + "bfbfbf": "c093c3", + "404040": "404040" }, "2": { - "796934": "172547", - "fee772": "3a6a93", "101010": "101010", - "cfb458": "264166", - "7f2d1b": "005646", - "ec5631": "21d170", - "b64126": "0aaa77", - "736a65": "75553c", - "ffffff": "fff8ec", - "c5c5ce": "d4b996", - "524e4e": "404040" + "736028": "172547", + "ffd659": "3a6a93", + "ccab47": "264166", + "732e17": "005646", + "f26130": "21d170", + "b34724": "0aaa77", + "737373": "75553c", + "f8f8f8": "fff8ec", + "bfbfbf": "d4b996", + "404040": "404040" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/654.json b/public/images/pokemon/variant/exp/654.json index a413295bc6c..0f3b2bf3d4e 100644 --- a/public/images/pokemon/variant/exp/654.json +++ b/public/images/pokemon/variant/exp/654.json @@ -1,38 +1,38 @@ { "1": { - "983a29": "6231a5", - "f07944": "ab6ce0", "101010": "101010", - "bf5633": "6231a5", - "987028": "061530", - "f7e77a": "b55390", - "e8b848": "872b59", - "56301f": "471b70", - "af7045": "6231a5", - "8d452e": "c5b3ca", - "969696": "262424", - "414141": "404040", + "736028": "061530", + "ffd659": "b55390", + "ccab47": "872b59", + "732e17": "471b70", + "f26130": "ab6ce0", + "b34724": "6231a5", "f8f8f8": "f7e4fc", - "d8d8c8": "c093c3", - "5c5c5c": "262424", - "000000": "101010" + "737373": "5c255f", + "bfbfbf": "c093c3", + "804913": "c5b3ca", + "262626": "262626", + "404040": "404040", + "f8cf52": "80f37b", + "ffc000": "4fcb61", + "ff8700": "207d4e" }, "2": { - "983a29": "0aaa77", - "f07944": "21d170", "101010": "101010", - "bf5633": "0aaa77", - "987028": "061530", - "f7e77a": "2b5f8a", - "e8b848": "173864", - "56301f": "005646", - "af7045": "0aaa77", - "8d452e": "098794", - "969696": "1a1a22", - "414141": "404040", + "736028": "061530", + "ffd659": "2b5f8a", + "ccab47": "173864", + "732e17": "005646", + "f26130": "21d170", + "b34724": "0aaa77", "f8f8f8": "fff2dd", - "d8d8c8": "d4b996", - "5c5c5c": "1a1a22", - "000000": "101010" + "737373": "75553c", + "bfbfbf": "d4b996", + "804913": "098794", + "262626": "262626", + "404040": "404040", + "f8cf52": "c858a4", + "ffc000": "75308e", + "ff8700": "521364" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/656.json b/public/images/pokemon/variant/exp/656.json index 68743a4c9f1..1d1003f739c 100644 --- a/public/images/pokemon/variant/exp/656.json +++ b/public/images/pokemon/variant/exp/656.json @@ -3,12 +3,12 @@ "838394": "4d7dc5", "62ace6": "8363af", "7bcdff": "9c75c2", - "ffec8c": "ddfff9", + "fdea88": "ddfff9", "a1a1c4": "7ab7ec", "c9b241": "97d6e2", "dfcf77": "bae7e8", "174592": "37408c", - "fdfdfd": "b1e5ff", + "ffffff": "b1e5ff", "9c9cc5": "5385c7", "cdcde6": "7eb7e8", "396a83": "362864", @@ -18,12 +18,12 @@ "838394": "cc6845", "62ace6": "c44848", "7bcdff": "dd6155", - "ffec8c": "ddfff9", + "fdea88": "ddfff9", "a1a1c4": "f7c685", "c9b241": "97d6e2", "dfcf77": "bae7e8", "174592": "198158", - "fdfdfd": "fff4bd", + "ffffff": "fff4bd", "9c9cc5": "c96a48", "cdcde6": "f7b785", "396a83": "5c0d33", diff --git a/public/images/pokemon/variant/exp/664.json b/public/images/pokemon/variant/exp/664.json index 02633098521..bd4164ca7db 100644 --- a/public/images/pokemon/variant/exp/664.json +++ b/public/images/pokemon/variant/exp/664.json @@ -1,30 +1,30 @@ { "1": { - "797987": "9d6260", - "f9f8fa": "ffffff", - "000000": "000000", - "cdcdcd": "e9c7c4", - "54544e": "895a9f", - "383830": "4c2855", - "727272": "a97dbb", - "8e5136": "838b53", - "f0d5b9": "a0c896", - "d8a465": "838b53", - "653925": "626649", - "383834": "383834" + "4d4d4d": "9d6260", + "f8f8f8": "ffffff", + "101010": "101010", + "b3b3b3": "e9c7c4", + "363636": "4c2855", + "747474": "a97dbb", + "4e4e4e": "895a9f", + "9d7247": "838b53", + "d1bf6b": "a0c896", + "b2b2b2": "b2b2b2", + "f7f7f7": "f7f7f7", + "855d31": "626649" }, "2": { - "797987": "590015", - "f9f8fa": "c83e4c", - "000000": "000000", - "cdcdcd": "a70d37", - "54544e": "377772", - "383830": "05312f", - "727272": "73bdae", - "8e5136": "bf8961", - "f0d5b9": "ffe0ba", - "d8a465": "dda476", - "653925": "05312f", - "383834": "383834" + "4d4d4d": "590015", + "f8f8f8": "c83e4c", + "101010": "101010", + "b3b3b3": "a70d37", + "363636": "05312f", + "747474": "73bdae", + "4e4e4e": "377772", + "9d7247": "dda476", + "d1bf6b": "ffe0ba", + "b2b2b2": "b2b2b2", + "f7f7f7": "f7f7f7", + "855d31": "bf8961" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/665.json b/public/images/pokemon/variant/exp/665.json index 02e88015c15..6d828dadb5d 100644 --- a/public/images/pokemon/variant/exp/665.json +++ b/public/images/pokemon/variant/exp/665.json @@ -1,36 +1,36 @@ { "1": { - "8e5136": "838b53", - "653925": "626649", - "52524b": "4c2855", - "f0d5b9": "a0c896", - "d8a465": "838b53", - "838392": "9c615f", - "8b8b8b": "a97dbb", - "000000": "000000", - "cdcdcd": "e9c7c4", - "6a6a6a": "895a9f", - "ffffff": "ffffff", - "f9f8fa": "f9f8fa", - "94416a": "005361", - "ff94b4": "008aac", - "ee5a62": "00aacd" + "363636": "4c2855", + "d1bf6b": "a0c896", + "9d7247": "838b53", + "4e4e4e": "895a9f", + "747474": "a97dbb", + "bfbfbf": "b294be", + "101010": "101010", + "fdfdfd": "fdfdfd", + "8c8c8c": "895a9f", + "4d4d4d": "9c615f", + "f8f8f8": "ffffff", + "b3b3b3": "e9c7c4", + "802626": "005361", + "ff4c4c": "00aacd", + "eed83e": "cae2c3" }, "2": { - "8e5136": "bf8961", - "653925": "bf8961", - "52524b": "05312f", - "f0d5b9": "ffe0ba", - "d8a465": "dda476", - "838392": "590015", - "8b8b8b": "73bdae", - "000000": "000000", - "cdcdcd": "a70d37", - "6a6a6a": "377772", - "ffffff": "c83e4c", - "f9f8fa": "c83e4c", - "94416a": "004270", - "ff94b4": "0092dd", - "ee5a62": "0092dd" + "363636": "05312f", + "d1bf6b": "ffe0ba", + "9d7247": "dda476", + "4e4e4e": "377772", + "747474": "73bdae", + "bfbfbf": "a70d37", + "101010": "101010", + "fdfdfd": "fdfdfd", + "8c8c8c": "590015", + "4d4d4d": "590015", + "f8f8f8": "c83e4c", + "b3b3b3": "a70d37", + "802626": "004270", + "ff4c4c": "0092dd", + "eed83e": "ffe0ba" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-fancy.json b/public/images/pokemon/variant/exp/666-fancy.json new file mode 100644 index 00000000000..1f31ac6983d --- /dev/null +++ b/public/images/pokemon/variant/exp/666-fancy.json @@ -0,0 +1,38 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "811c1c": "811c1c", + "de4040": "de4040", + "5faa3e": "5faa3e", + "ceab62": "d9edd4", + "b6d26d": "b6d26d", + "e9e052": "e9e052", + "cf7ef3": "cf7ef3", + "c3c3c3": "ffeaff", + "f2d4e3": "f2d4e3", + "ead2e3": "ffeaff" + }, + "2": { + "101010": "101010", + "303030": "00771b", + "675220": "b9c05a", + "504a4a": "b9c05a", + "595959": "6f9f42", + "707068": "e3e982", + "811c1c": "811c1c", + "de4040": "de4040", + "5faa3e": "5faa3e", + "ceab62": "e3e982", + "b6d26d": "b6d26d", + "e9e052": "e9e052", + "cf7ef3": "cf7ef3", + "c3c3c3": "fcf1ff", + "f2d4e3": "f2d4e3", + "ead2e3": "fcf1ff" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-fancy_2.json b/public/images/pokemon/variant/exp/666-fancy_2.json deleted file mode 100644 index bcfde0b3dd4..00000000000 --- a/public/images/pokemon/variant/exp/666-fancy_2.json +++ /dev/null @@ -1,1280 +0,0 @@ -{ - "textures": [ - { - "image": "666-fancy_2.png", - "format": "RGBA8888", - "size": { - "w": 346, - "h": 346 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 276, - "w": 67, - "h": 69 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 134, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 201, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 268, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 201, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 276, - "w": 53, - "h": 69 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 276, - "w": 53, - "h": 69 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:370e4a87d9d988b8133d25e0b97db22c:d173344c5e41aaa90de937ec3e1b167f:6d5edff9a806f43feff031c9919c9aca$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-fancy_2.png b/public/images/pokemon/variant/exp/666-fancy_2.png deleted file mode 100644 index 68af4d0a07a..00000000000 Binary files a/public/images/pokemon/variant/exp/666-fancy_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/666-fancy_3.json b/public/images/pokemon/variant/exp/666-fancy_3.json deleted file mode 100644 index 60fd0634e79..00000000000 --- a/public/images/pokemon/variant/exp/666-fancy_3.json +++ /dev/null @@ -1,1280 +0,0 @@ -{ - "textures": [ - { - "image": "666-fancy_3.png", - "format": "RGBA8888", - "size": { - "w": 346, - "h": 346 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 276, - "w": 67, - "h": 69 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 134, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 201, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 268, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 201, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 276, - "w": 53, - "h": 69 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 276, - "w": 53, - "h": 69 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:370e4a87d9d988b8133d25e0b97db22c:d173344c5e41aaa90de937ec3e1b167f:6d5edff9a806f43feff031c9919c9aca$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-fancy_3.png b/public/images/pokemon/variant/exp/666-fancy_3.png deleted file mode 100644 index a8e39976f2a..00000000000 Binary files a/public/images/pokemon/variant/exp/666-fancy_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/666-high-plains.json b/public/images/pokemon/variant/exp/666-high-plains.json index 330d1c39772..f63bb4f81f3 100644 --- a/public/images/pokemon/variant/exp/666-high-plains.json +++ b/public/images/pokemon/variant/exp/666-high-plains.json @@ -14,7 +14,8 @@ "c3c3c3": "ffeaff", "811c1c": "811c1c", "337543": "337543", - "e8c815": "e8c815" + "e8c815": "e8c815", + "773d21": "773d21" }, "2": { "101010": "101010", @@ -31,6 +32,7 @@ "c3c3c3": "edc67c", "811c1c": "811c1c", "337543": "337543", - "e8c815": "e8c815" + "e8c815": "e8c815", + "773d21": "773d21" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-icy-snow.json b/public/images/pokemon/variant/exp/666-icy-snow.json index 9cae71418ce..d69d48d89e9 100644 --- a/public/images/pokemon/variant/exp/666-icy-snow.json +++ b/public/images/pokemon/variant/exp/666-icy-snow.json @@ -6,12 +6,13 @@ "303030": "402746", "cfd9cf": "cfd9cf", "c5c5da": "c5c5da", - "ceab62": "d9edd4", "675220": "958c8a", - "504a4a": "7f6991", + "ceab62": "d9edd4", "707068": "a97cbc", + "504a4a": "7f6991", "c3c3c3": "ffeaff", "acacc2": "acacc2", + "95a1a1": "95a1a1", "811c1c": "811c1c" }, "2": { @@ -21,12 +22,13 @@ "303030": "364051", "cfd9cf": "cfd9cf", "c5c5da": "c5c5da", - "ceab62": "8c91a4", "675220": "666b7d", - "504a4a": "666b7d", + "ceab62": "8c91a4", "707068": "8c91a4", + "504a4a": "666b7d", "c3c3c3": "fefeff", "acacc2": "acacc2", + "95a1a1": "95a1a1", "811c1c": "811c1c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-meadow.json b/public/images/pokemon/variant/exp/666-meadow.json new file mode 100644 index 00000000000..c766325427b --- /dev/null +++ b/public/images/pokemon/variant/exp/666-meadow.json @@ -0,0 +1,36 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "811c1c": "811c1c", + "b4295a": "b4295a", + "da6b7e": "da6b7e", + "ceab62": "d9edd4", + "e66fad": "e66fad", + "2d9b9b": "2d9b9b", + "f3a0ca": "f3a0ca", + "c3c3c3": "ffeaff", + "f2f2f2": "f2f2f2" + }, + "2": { + "101010": "101010", + "303030": "770921", + "675220": "a2275e", + "504a4a": "a2275e", + "595959": "9e3941", + "707068": "ce5283", + "811c1c": "811c1c", + "b4295a": "b4295a", + "da6b7e": "da6b7e", + "ceab62": "ce5283", + "e66fad": "e66fad", + "2d9b9b": "2d9b9b", + "f3a0ca": "f3a0ca", + "c3c3c3": "f4c2ec", + "f2f2f2": "f2f2f2" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-meadow_2.json b/public/images/pokemon/variant/exp/666-meadow_2.json deleted file mode 100644 index 4d4d4d16147..00000000000 --- a/public/images/pokemon/variant/exp/666-meadow_2.json +++ /dev/null @@ -1,1280 +0,0 @@ -{ - "textures": [ - { - "image": "666-meadow_2.png", - "format": "RGBA8888", - "size": { - "w": 346, - "h": 346 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 276, - "w": 67, - "h": 69 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 134, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 201, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 268, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 201, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 276, - "w": 53, - "h": 69 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 276, - "w": 53, - "h": 69 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:223ce33721ef8da9ff40286099c20de4:b82acd304c2a8b8cebeda2043a3e1f96:f8ac4807b4d6eef2256fa1b93e0f89ba$" - } -} diff --git a/public/images/pokemon/variant/exp/666-meadow_2.png b/public/images/pokemon/variant/exp/666-meadow_2.png deleted file mode 100644 index 8aada72636f..00000000000 Binary files a/public/images/pokemon/variant/exp/666-meadow_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/666-meadow_3.json b/public/images/pokemon/variant/exp/666-meadow_3.json deleted file mode 100644 index 8af56626a35..00000000000 --- a/public/images/pokemon/variant/exp/666-meadow_3.json +++ /dev/null @@ -1,1280 +0,0 @@ -{ - "textures": [ - { - "image": "666-meadow_3.png", - "format": "RGBA8888", - "size": { - "w": 346, - "h": 346 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 276, - "w": 67, - "h": 69 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 134, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 201, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 268, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 201, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 276, - "w": 53, - "h": 69 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 276, - "w": 53, - "h": 69 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:223ce33721ef8da9ff40286099c20de4:b82acd304c2a8b8cebeda2043a3e1f96:f8ac4807b4d6eef2256fa1b93e0f89ba$" - } -} diff --git a/public/images/pokemon/variant/exp/666-meadow_3.png b/public/images/pokemon/variant/exp/666-meadow_3.png deleted file mode 100644 index 146ea5e2ba9..00000000000 Binary files a/public/images/pokemon/variant/exp/666-meadow_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/666-monsoon.json b/public/images/pokemon/variant/exp/666-monsoon.json index edc2e86427e..915d471b2b1 100644 --- a/public/images/pokemon/variant/exp/666-monsoon.json +++ b/public/images/pokemon/variant/exp/666-monsoon.json @@ -1,36 +1,33 @@ { - "1": { - "101010": "101010", - "595959": "724b7a", - "f0f0f8": "f0f0f8", - "303030": "402746", - "ceab62": "d9edd4", - "675220": "958c8a", + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", "807676": "807676", - "92f4f4": "92f4f4", - "989898": "989898", - "504a4a": "7f6991", - "707068": "a97cbc", - "4eccd6": "4eccd6", + "ceab62": "d9edd4", "5676de": "5676de", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" - }, - "2": { - "101010": "101010", - "595959": "656565", - "f0f0f8": "f0f0f8", - "303030": "4f4645", - "ceab62": "5857bc", - "675220": "2c3593", - "807676": "807676", - "92f4f4": "92f4f4", - "989898": "989898", - "504a4a": "2c3593", - "707068": "5857bc", - "4eccd6": "4eccd6", - "5676de": "5676de", - "c3c3c3": "b8f9f9", - "811c1c": "811c1c" - } + "4eccd6": "4eccd6", + "989898": "989898", + "c3c3c3": "c3c3c3", + "f0f0f8": "f0f0f8" + }, + "2": { + "101010": "101010", + "303030": "3d3231", + "675220": "2c3593", + "504a4a": "2c3593", + "595959": "4f4645", + "707068": "5857bc", + "807676": "807676", + "ceab62": "5857bc", + "5676de": "5676de", + "4eccd6": "4eccd6", + "989898": "989898", + "92f4f4": "92f4f4", + "c3c3c3": "b8f9f9", + "f0f0f8": "f0f0f8" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-ocean.json b/public/images/pokemon/variant/exp/666-ocean.json index 26a38bad7a8..c468bbcbf1e 100644 --- a/public/images/pokemon/variant/exp/666-ocean.json +++ b/public/images/pokemon/variant/exp/666-ocean.json @@ -22,7 +22,7 @@ "e1384d": "e1384d", "f3a861": "f3a861", "fcf372": "fcf372", - "303030": "b56208", + "303030": "b54908", "ceab62": "ea8742", "675220": "bc601c", "504a4a": "bc601c", diff --git a/public/images/pokemon/variant/exp/666-poke-ball.json b/public/images/pokemon/variant/exp/666-poke-ball.json index 36cd38b95f0..fe6b42f6ef3 100644 --- a/public/images/pokemon/variant/exp/666-poke-ball.json +++ b/public/images/pokemon/variant/exp/666-poke-ball.json @@ -3,17 +3,36 @@ "101010": "101010", "595959": "724b7a", "b72c2c": "b72c2c", - "303030": "402746", "dc4b4b": "dc4b4b", - "ceab62": "d9edd4", + "303030": "402746", "675220": "958c8a", + "ceab62": "d9edd4", "e97e7e": "e97e7e", "971d1d": "971d1d", "f8f8f8": "f8f8f8", - "504a4a": "7f6991", "707068": "a97cbc", + "504a4a": "7f6991", "c3c3c3": "ffeaff", "811c1c": "811c1c", - "a9a99e": "a9a99e" + "a9a99e": "a9a99e", + "2c2b2b": "402746" + }, + "2": { + "101010": "101010", + "f8f8f8": "00006d", + "303030": "ae001a", + "2c2b2b": "660000", + "504a4a": "a70038", + "595959": "df0036", + "c3c3c3": "f0a6bf", + "707068": "d5375a", + "a9a99e": "000050", + "811c1c": "811c1c", + "971d1d": "040046", + "b72c2c": "00005e", + "dc4b4b": "19007d", + "e97e7e": "2e2095", + "675220": "a70038", + "ceab62": "d5375a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-poke-ball_3.json b/public/images/pokemon/variant/exp/666-poke-ball_3.json deleted file mode 100644 index 3d133124358..00000000000 --- a/public/images/pokemon/variant/exp/666-poke-ball_3.json +++ /dev/null @@ -1,1280 +0,0 @@ -{ - "textures": [ - { - "image": "666-poke-ball_3.png", - "format": "RGBA8888", - "size": { - "w": 346, - "h": 346 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 276, - "w": 67, - "h": 69 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 134, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 201, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 268, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 201, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 276, - "w": 53, - "h": 69 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 276, - "w": 53, - "h": 69 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9b0791af9130022168ad784a59e299ce:b180b141bed2ea965d6f07d9e2cd7ecc:8ec14f129d1691b8da504a13b661abed$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-poke-ball_3.png b/public/images/pokemon/variant/exp/666-poke-ball_3.png deleted file mode 100644 index 767a55ab849..00000000000 Binary files a/public/images/pokemon/variant/exp/666-poke-ball_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/666-river.json b/public/images/pokemon/variant/exp/666-river.json index df10a73d783..c7e5e288d05 100644 --- a/public/images/pokemon/variant/exp/666-river.json +++ b/public/images/pokemon/variant/exp/666-river.json @@ -1,19 +1,40 @@ { - "2": { - "101010": "101010", - "595959": "8a5702", - "ceab62": "d9a666", - "303030": "7b2800", - "625843": "625843", - "bc813f": "bc813f", - "9c9143": "9c9143", - "675220": "ae7f41", - "504a4a": "ae7f41", - "707068": "d9a666", - "c3c3c3": "e3c384", - "811c1c": "811c1c", - "59c9d3": "59c9d3", - "279ec2": "279ec2", - "1d726a": "1d726a" - } + "1": { + "101010": "101010", + "303030": "402746", + "4a412c": "4a412c", + "675220": "958c8a", + "634d20": "634d20", + "1d726a": "1d726a", + "504a4a": "7f6991", + "595959": "724b7a", + "625841": "625841", + "707068": "a97cbc", + "bc813f": "bc813f", + "9c9143": "9c9143", + "ceab62": "ceab62", + "279ec2": "279ec2", + "59c9d3": "59c9d3", + "c3c3c3": "c3c3c3", + "d2a862": "d9edd4" + }, + "2": { + "101010": "101010", + "303030": "7b2800", + "4a412c": "4a412c", + "675220": "ae7f41", + "634d20": "634d20", + "1d726a": "1d726a", + "504a4a": "ae7f41", + "595959": "8a5702", + "625841": "625841", + "707068": "d9a666", + "bc813f": "bc813f", + "9c9143": "9c9143", + "ceab62": "ceab62", + "279ec2": "279ec2", + "59c9d3": "59c9d3", + "c3c3c3": "e3c384", + "d2a862": "d2a862" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-river_2.json b/public/images/pokemon/variant/exp/666-river_2.json deleted file mode 100644 index f840b39ccfd..00000000000 --- a/public/images/pokemon/variant/exp/666-river_2.json +++ /dev/null @@ -1,1280 +0,0 @@ -{ - "textures": [ - { - "image": "666-river_2.png", - "format": "RGBA8888", - "size": { - "w": 346, - "h": 346 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 0, - "y": 276, - "w": 67, - "h": 69 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 134, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 201, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 268, - "y": 0, - "w": 67, - "h": 69 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 69, - "w": 67, - "h": 69 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 138, - "w": 67, - "h": 69 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 67, - "h": 69 - }, - "frame": { - "x": 67, - "y": 207, - "w": 67, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 67, - "y": 276, - "w": 67, - "h": 68 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 67, - "h": 68 - }, - "frame": { - "x": 134, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 201, - "y": 69, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 268, - "y": 69, - "w": 53, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 137, - "w": 53, - "h": 69 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 138, - "w": 53, - "h": 69 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 206, - "w": 53, - "h": 69 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 134, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 187, - "y": 275, - "w": 53, - "h": 69 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 53, - "h": 69 - }, - "frame": { - "x": 240, - "y": 276, - "w": 53, - "h": 69 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 207, - "w": 53, - "h": 69 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 53, - "h": 69 - }, - "frame": { - "x": 293, - "y": 276, - "w": 53, - "h": 69 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:3ecaf6e3ae563f3da9598e7b18b87b05:e4ece90a3e9880c6499c363b000de8dd:fa23dc87fc53ba2cfa532cf440553cf5$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-river_2.png b/public/images/pokemon/variant/exp/666-river_2.png deleted file mode 100644 index 863acbbdc76..00000000000 Binary files a/public/images/pokemon/variant/exp/666-river_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/696.json b/public/images/pokemon/variant/exp/696.json index 3a4b4480673..677f5d98578 100644 --- a/public/images/pokemon/variant/exp/696.json +++ b/public/images/pokemon/variant/exp/696.json @@ -1,40 +1,38 @@ { "1": { - "774411":"5e0b0b", - "101010":"101010", - "ff8f1f":"a50d0d", - "4f2e1d":"023425", - "5f4f4f":"0b4c29", - "af8f7f":"478136", - "3f3f44":"4c3216", - "8f6f5f":"1b6430", - "f8f7f9":"dfdea7", - "bfbfcc":"cbbe8c", - "121212":"121212", - "8f8f99":"ad8c63", - "c2c2cf":"c9bc87", - "fbfafc":"dddca1", - "772d34":"77452d", - "ff9bd5":"c98c68" - }, - "2": { - "774411":"395cb7", - "101010":"101010", - "ff8f1f":"d2e9ff", - "4f2e1d":"3e1f18", - "5f4f4f":"644943", - "af8f7f":"a59e9a", - "3f3f44":"250860", - "8f6f5f":"83726e", - "f8f7f9":"6e46a7", - "bfbfcc":"593097", - "121212":"decaff", - "8f8f99":"411684", - "c2c2cf":"7ccad5", - "fbfafc":"fbfafc", - "772d34":"375ab3", - "ff9bd5":"79c8d3" - } +"734517": "5e0b0b", +"ffa64c": "a50d0d", +"4a322c": "023425", +"404040": "4c3216", +"101010": "101010", +"65483a": "0b4c29", +"966858": "1b6430", +"f8f8f8": "dfdea7", +"8c8c8c": "ad8c63", +"bfbfbf": "cbbe8c", +"000000": "000000", +"b73b6b": "4c3216", +"ff949e": "c98c68", +"b3b9b9": "cbbe8c", +"3f3d3d": "4c3216" +}, +"2": { +"734517": "395cb7", +"ffa64c": "d2e9ff", +"4a322c": "3e1f18", +"404040": "250860", +"101010": "101010", +"65483a": "644943", +"966858": "83726e", +"f8f8f8": "6e46a7", +"8c8c8c": "411684", +"bfbfbf": "593097", +"000000": "decaff", +"b73b6b": "395cb7", +"ff949e": "79c8d3", +"b3b9b9": "79c8d3", +"3f3d3d": "395cb7" +} } diff --git a/public/images/pokemon/variant/exp/697.json b/public/images/pokemon/variant/exp/697.json index dae4554a1b7..b8d305022f5 100644 --- a/public/images/pokemon/variant/exp/697.json +++ b/public/images/pokemon/variant/exp/697.json @@ -1,42 +1,42 @@ { - "1": { - "1f0a0a":"1f0a0a", - "471515":"0a1b17", - "621e1d":"0b241e", - "902e2c":"153626", - "b45250":"285234", - "d16c6b":"416a45", - "653510":"5e0b0b", - "b56726":"971c1c", - "e39f33":"b52424", - "756b66":"ad8c63", - "b1b0b5":"cbbe8c", - "f0f0f2":"dfdea7", - "573b43":"4c3216", - "736964":"ab885f", - "ac628a":"9d5d18", - "aeadb3":"a88860", - "ededf0":"dbdaa4" - }, - "2": { - "1f0a0a":"1f0a0a", - "471515":"191124", - "621e1d":"52352f", - "902e2c":"83726e", - "b45250":"ab9b97", - "d16c6b":"c7bcb9", - "653510":"9d5390", - "b56726":"ce7ecc", - "e39f33":"f4dbf6", - "756b66":"26173b", - "b1b0b5":"33214f", - "f0f0f2":"4b2e64", - "573b43":"cc7cc9", - "736964":"f6dcf7", - "ac628a":"eed5f0", - "aeadb3":"c779c4", - "ededf0":"f8defa" - } +"1": { +"080808": "080808", +"32252c": "3e1e17", +"50131e": "0b241e", +"722533": "153626", +"54434c": "4c3216", +"964b1c": "5e0b0b", +"963e4e": "285234", +"bf7545": "971c1c", +"f19d5a": "b52424", +"9f9d98": "ad8c63", +"cccccc": "cbbe8c", +"fafafa": "dfdea7", +"cac2c2": "cbbe8c", +"f7eeee": "dfdea7", +"53414b": "4c3216", +"30222a": "3e1e17", +"53454d": "4c3216" +}, +"2": { +"080808": "080808", +"32252c": "0d0124", +"50131e": "573b36", +"722533": "83726e", +"54434c": "170c25", +"964b1c": "9d5390", +"963e4e": "ab9b97", +"bf7545": "ce7ecc", +"f19d5a": "f4dbf6", +"9f9d98": "26173b", +"cccccc": "33214f", +"fafafa": "4b2e64", +"cac2c2": "ce7ecc", +"f7eeee": "f4dbf6", +"53414b": "dea5dd", +"30222a": "ce7ecc", +"53454d": "f4dbf6" +} } diff --git a/public/images/pokemon/variant/exp/700.json b/public/images/pokemon/variant/exp/700.json index 0b6071ad765..1189d463f2b 100644 --- a/public/images/pokemon/variant/exp/700.json +++ b/public/images/pokemon/variant/exp/700.json @@ -1,34 +1,32 @@ { - "1": { - "9a4557": "452f89", - "19657b": "a63071", - "fb9cc3": "c7a6ee", - "52cbee": "e974db", - "000000": "000000", - "cb628d": "996cd2", - "f7bbd4": "e1cff3", - "0d146e": "0d146e", - "3744e5": "d648b7", - "584f4f": "5c6889", - "ffffff": "f7f5ff", - "1f337b": "a63071", - "cbc0c0": "c3c5d9", - "2999b9": "d648b7" - }, - "2": { - "9a4557": "197d46", - "19657b": "c72537", - "fb9cc3": "7dec9d", - "52cbee": "ff9a68", - "000000": "000000", - "cb628d": "5dae7d", - "f7bbd4": "f7bbd4", - "0d146e": "0d146e", - "3744e5": "eb5244", - "584f4f": "7f5c89", - "ffffff": "fff5fc", - "1f337b": "c72537", - "cbc0c0": "d9c3d6", - "2999b9": "eb5244" - } +"1": { +"101010": "101010", +"8a2843": "452f89", +"235a99": "a63071", +"895c72": "5c6889", +"d85a7a": "996cd2", +"528fcc": "d648b7", +"a88d8c": "8c8fa8", +"f18a78": "b52d27", +"fa8caa": "c7a6ee", +"64c8f3": "e974db", +"d9c3c3": "c3c5d9", +"fff5f5": "f7f5ff", +"65798c": "65798c" +}, +"2": { +"101010": "101010", +"8a2843": "0e6134", +"235a99": "900d1b", +"895c72": "7f5c89", +"d85a7a": "5dae7d", +"528fcc": "dd3d4f", +"a88d8c": "7f5c89", +"f18a78": "d14ea4", +"fa8caa": "7dec9d", +"64c8f3": "ff9a68", +"d9c3c3": "d9c3d6", +"fff5f5": "fff5fc", +"65798c": "65798c" +} } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/702.json b/public/images/pokemon/variant/exp/702.json index 1edd126264e..12feb29a0fd 100644 --- a/public/images/pokemon/variant/exp/702.json +++ b/public/images/pokemon/variant/exp/702.json @@ -3,30 +3,30 @@ "101010": "101010", "262626": "2a3b5e", "4d4d4d": "6789b3", - "ccbb99": "a3d1cc", - "efefcf": "ddfff5", - "704030": "a53c42", - "906030": "c9685f", - "efbf5f": "ffd3b6", - "cf8f4f": "e49f84", + "bfbf86": "a3d1cc", + "f2f2aa": "ddfff5", + "735c2e": "a53c42", + "997a3d": "c9685f", + "f2c261": "ffd3b6", + "bf994c": "e49f84", "1d1d1d": "1a1c45", - "fefefe": "fefefe", + "f8f8f8": "f8f8f8", "464646": "424b8f", - "df7f5f": "7cd6a1" + "d97d21": "7cd6a1" }, "2": { "101010": "101010", "262626": "072d38", "4d4d4d": "197870", - "ccbb99": "aaa8d6", - "efefcf": "ece5ff", - "704030": "1e0e27", - "906030": "2d1533", - "efbf5f": "5f3662", - "cf8f4f": "432249", + "bfbf86": "aaa8d6", + "f2f2aa": "ece5ff", + "735c2e": "1e0e27", + "997a3d": "2d1533", + "f2c261": "5f3662", + "bf994c": "432249", "1d1d1d": "02172d", - "fefefe": "fefefe", + "f8f8f8": "f8f8f8", "464646": "17646c", - "df7f5f": "d2fff1" + "d97d21": "d2fff1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/704.json b/public/images/pokemon/variant/exp/704.json index 38e5cdaf70d..e292d6fb41f 100644 --- a/public/images/pokemon/variant/exp/704.json +++ b/public/images/pokemon/variant/exp/704.json @@ -1,30 +1,30 @@ { "1": { - "6f5e80": "4e4094", - "e0d3e0": "fbb3d2", - "010202": "101010", - "bbafc4": "c7a1e5", - "2f6b38": "4e4094", - "74d457": "3aa8c4", - "3da84d": "197497", - "3f3d5e": "4e4094", - "a497c2": "c7a1e5", - "766fa6": "8b69c3", - "4c3143": "4e4094", - "cc93ab": "c7a1e5" + "807380": "b93f84", + "f2daf2": "fbb3d2", + "bfacbf": "e56ca6", + "4d454d": "8a2166", + "101010": "101010", + "4d993d": "197497", + "66cc52": "3aa8c4", + "b8a1e5": "c7a1e5", + "8f7db3": "8b69c3", + "665980": "4e4094", + "c25054": "c68260", + "de817e": "e5e1a1" }, "2": { - "6f5e80": "274159", - "e0d3e0": "92d8c8", - "010202": "101010", - "bbafc4": "63a99e", - "2f6b38": "134557", - "74d457": "d27e26", - "3da84d": "a34205", - "3f3d5e": "134557", - "a497c2": "63a99e", - "766fa6": "2f667c", - "4c3143": "134557", - "cc93ab": "63a99e" + "807380": "237e7f", + "f2daf2": "92d8c8", + "bfacbf": "63a99e", + "4d454d": "134557", + "101010": "101010", + "4d993d": "a34205", + "66cc52": "d27e26", + "b8a1e5": "4a9699", + "8f7db3": "2f667c", + "665980": "274159", + "c25054": "9268a4", + "de817e": "f2daf2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/705.json b/public/images/pokemon/variant/exp/705.json index a29b8f124dc..bf9aa91eb4b 100644 --- a/public/images/pokemon/variant/exp/705.json +++ b/public/images/pokemon/variant/exp/705.json @@ -1,33 +1,34 @@ { "1": { - "101010":"101010", - "4d454d":"8a2166", - "807380":"b93f84", - "bfacbf":"e56ca6", - "f2daf2":"fbb3d2", - "665980":"4e4094", - "8f7db3":"8b69c3", - "b8a1e5":"c7a1e5", - "4d993d":"aa6a00", - "66cc52":"ffd047", - "4e9c3e":"0c5474", - "67cf53":"3aa8c4", - "b6f2aa":"63cee1" + "807380": "b93f84", + "bfacbf": "e56ca6", + "f2daf2": "fbb3d2", + "4d454d": "8a2166", + "307922": "aa6a00", + "46b030": "ffd047", + "101010": "101010", + "98bd51": "197497", + "d2e79e": "3aa8c4", + "647543": "0c5474", + "b8a1e5": "c7a1e5", + "665980": "4e4094", + "8f7db3": "8b69c3", + "ef6f8f": "b93f84" }, "2": { - "101010":"101010", - "4d454d":"194f51", - "807380":"2b736f", - "bfacbf":"5db6a9", - "f2daf2":"9cead8", - "665980":"274159", - "8f7db3":"2f667c", - "b8a1e5":"4a9699", - "4d993d":"007d61", - "66cc52":"49ffbf", - "4e9c3e":"842401", - "67cf53":"a34205", - "b6f2aa":"d27e26" + "807380": "2b736f", + "bfacbf": "5db6a9", + "f2daf2": "9cead8", + "4d454d": "194f51", + "307922": "007d61", + "46b030": "49ffbf", + "101010": "101010", + "98bd51": "a34205", + "d2e79e": "d27e26", + "647543": "842401", + "b8a1e5": "4a9699", + "665980": "274159", + "8f7db3": "2f667c", + "3f6f8f": "9268a4" } -} - +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/713.json b/public/images/pokemon/variant/exp/713.json index d18009819f4..ca45360ecea 100644 --- a/public/images/pokemon/variant/exp/713.json +++ b/public/images/pokemon/variant/exp/713.json @@ -1,26 +1,32 @@ { "1": { - "42575f": "994255", - "bbeef9": "ffbfda", - "ffffff": "ffebf2", - "473552": "4c131f", - "9e7ac1": "994255", - "6a4e7a": "732334", - "8db7c7": "d97389", - "000000": "000000", - "698e9c": "bf566d", - "e6c81e": "9dcc3e" + "608cba": "bf566d", + "bff4ff": "ffbfda", + "85d7f2": "f29eb3", + "967acc": "732334", + "77b8d9": "d97389", + "335980": "994255", + "f2ffff": "ffebf2", + "101010": "101010", + "737373": "737373", + "bfbfbf": "bfbfbf", + "efab34": "9dcc3e", + "ffe46a": "cbe696", + "f8f8f8": "f8f8f8" }, "2": { - "42575f": "42575f", - "bbeef9": "fcc95c", - "ffffff": "fff2ad", - "473552": "473552", - "9e7ac1": "6cb3ae", - "6a4e7a": "006761", - "8db7c7": "cc7b1e", - "000000": "000000", - "698e9c": "a8632a", - "e6c81e": "8dd9d4" + "608cba": "a8632a", + "bff4ff": "fcc95c", + "85d7f2": "e69e2b", + "967acc": "2c7a75", + "77b8d9": "cc7b1e", + "335980": "824628", + "f2ffff": "fff2ad", + "101010": "101010", + "737373": "737373", + "bfbfbf": "6cb3ae", + "efab34": "6cb3ae", + "ffe46a": "b9f2ee", + "f8f8f8": "b9f2ee" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/715.json b/public/images/pokemon/variant/exp/715.json index 4ca2bcad56a..0e97862f10b 100644 --- a/public/images/pokemon/variant/exp/715.json +++ b/public/images/pokemon/variant/exp/715.json @@ -1,20 +1,38 @@ { + "1": { + "101010": "101010", + "404040": "5f32b1", + "6a3f73": "0f103c", + "287366": "731338", + "3aa694": "a42c54", + "8e5499": "202558", + "bfbfbf": "bb9adc", + "595959": "7a5ccc", + "801a1a": "5d173d", + "4cd9c1": "d04b6c", + "bd70cc": "2f386b", + "737373": "563d8f", + "f8f8f8": "d6c8f1", + "e52e2e": "903b78", + "000000": "000000", + "ffe14c": "ff8a58" + }, "2": { - "404040": "c29484", - "595959": "ecd3c3", "101010": "101010", - "287366": "832714", - "4cd9c1": "dd834c", - "3aa694": "b8552c", - "801a1a": "7c0907", - "e52e2e": "ad3419", - "bd70cc": "5b1922", - "6a3f73": "3b0c18", - "737373": "1d060c", - "8e5499": "7c2928", - "bfbfbf": "43191e", - "f8f8f8": "5a2a2b", - "ffe14c": "49ffcd", - "000000": "000000" + "404040": "c29484", + "6a3f73": "3b0c18", + "287366": "832714", + "3aa694": "b8552c", + "8e5499": "7c2928", + "bfbfbf": "43191e", + "595959": "ecd3c3", + "801a1a": "7c0907", + "4cd9c1": "dd834c", + "bd70cc": "5b1922", + "737373": "1d060c", + "f8f8f8": "5a2a2b", + "e52e2e": "ad3419", + "000000": "000000", + "ffe14c": "49ffcd" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/248-mega.json b/public/images/pokemon/variant/exp/back/248-mega.json index f1770cfc32f..f5b58bf5f10 100644 --- a/public/images/pokemon/variant/exp/back/248-mega.json +++ b/public/images/pokemon/variant/exp/back/248-mega.json @@ -1,13 +1,28 @@ { + "1": { + "171717": "101010", + "4a5a39": "533334", + "4b5a3b": "533334", + "727272": "727272", + "801c17": "004194", + "922d00": "004194", + "ce283d": "006fb3", + "d35200": "0098fc", + "729a62": "915957", + "739c62": "915957", + "aacb9a": "c78482" + }, "2": { - "4a5a39": "06092f", - "101010": "101010", - "accd9c": "625695", - "739c62": "2c3071", - "ffffff": "ffffff", - "6a2000": "ee7b06", - "bd3920": "ffa904", - "737373": "737373", - "000000": "000000" + "171717": "101010", + "4a5a39": "06092f", + "4b5a3b": "06092f", + "727272": "727272", + "801c17": "ee7b06", + "922d00": "ee7b06", + "ce283d": "ffa904", + "d35200": "ffa904", + "729a62": "2c3071", + "739c62": "2c3071", + "aacb9a": "625695" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/248-mega_2.json b/public/images/pokemon/variant/exp/back/248-mega_2.json deleted file mode 100644 index 7f236a6bb87..00000000000 --- a/public/images/pokemon/variant/exp/back/248-mega_2.json +++ /dev/null @@ -1,272 +0,0 @@ -{ - "textures": [ - { - "image": "248-mega_2.png", - "format": "RGBA8888", - "size": { - "w": 292, - "h": 292 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 80, - "h": 74 - }, - "frame": { - "x": 0, - "y": 0, - "w": 80, - "h": 74 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 80, - "h": 74 - }, - "frame": { - "x": 0, - "y": 74, - "w": 80, - "h": 74 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 79, - "h": 74 - }, - "frame": { - "x": 0, - "y": 148, - "w": 79, - "h": 74 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 79, - "h": 74 - }, - "frame": { - "x": 79, - "y": 148, - "w": 79, - "h": 74 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 79, - "h": 73 - }, - "frame": { - "x": 80, - "y": 0, - "w": 79, - "h": 73 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 79, - "h": 73 - }, - "frame": { - "x": 80, - "y": 73, - "w": 79, - "h": 73 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 146, - "w": 75, - "h": 73 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 146, - "w": 75, - "h": 73 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 219, - "w": 75, - "h": 73 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 75, - "h": 73 - }, - "frame": { - "x": 158, - "y": 219, - "w": 75, - "h": 73 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 73, - "h": 73 - }, - "frame": { - "x": 159, - "y": 0, - "w": 73, - "h": 73 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 80, - "h": 74 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 73, - "h": 73 - }, - "frame": { - "x": 159, - "y": 73, - "w": 73, - "h": 73 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:625e35ec9f8e731e89fa37587ffb4738:07d356e18baf0312a4e8a36adb76fdd5:90df97eb431b7162252516cb937a0b9e$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/248-mega_2.png b/public/images/pokemon/variant/exp/back/248-mega_2.png deleted file mode 100644 index 7971c22d8fe..00000000000 Binary files a/public/images/pokemon/variant/exp/back/248-mega_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/362-mega.json b/public/images/pokemon/variant/exp/back/362-mega.json index 3eddfcb3ef0..2f3d13a6944 100644 --- a/public/images/pokemon/variant/exp/back/362-mega.json +++ b/public/images/pokemon/variant/exp/back/362-mega.json @@ -1,28 +1,26 @@ { "1": { - "000000": "010101", "393941": "050832", + "010101": "010101", "2b74a8": "84073c", - "7b7b83": "1b205d", - "ffffff": "ff937b", - "a4deff": "f9383e", - "62bdee": "b7113a", - "e6e6f6": "a2b7e5", - "c5cde6": "6076c6", + "bbeeff": "f9383e", + "7dbbee": "b7113a", + "fefefe": "ff937b", "7b7b94": "1b205d", - "acaccd": "2f3c84" + "e6e6f6": "a2b7e5", + "acaccd": "2f3c84", + "c5cde6": "6076c6" }, "2": { - "000000": "010101", "393941": "221315", + "010101": "010101", "2b74a8": "0c4b3a", - "7b7b83": "4a282a", - "ffffff": "c8ff9c", - "a4deff": "5ce11a", - "62bdee": "009325", - "e6e6f6": "a76344", - "c5cde6": "7e4a3f", + "bbeeff": "5ce11a", + "7dbbee": "009325", + "fefefe": "c8ff9c", "7b7b94": "4a282a", - "acaccd": "613735" + "e6e6f6": "a76344", + "acaccd": "613735", + "c5cde6": "7e4a3f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/654.json b/public/images/pokemon/variant/exp/back/654.json index c7524e01b9a..0f3b2bf3d4e 100644 --- a/public/images/pokemon/variant/exp/back/654.json +++ b/public/images/pokemon/variant/exp/back/654.json @@ -1,34 +1,38 @@ { "1": { - "907020": "481332", - "ffe060": "a85789", - "e0ad10": "682546", - "040404": "101010", - "803020": "471b70", - "f06030": "ab6ce0", - "bf4020": "6231a5", - "202020": "262626", - "cccccc": "c093c3", - "3c3c3c": "404040", - "fdfdfd": "e7caef", - "a4583e": "6231a5", - "414141": "404040", - "606060": "5c255f" + "101010": "101010", + "736028": "061530", + "ffd659": "b55390", + "ccab47": "872b59", + "732e17": "471b70", + "f26130": "ab6ce0", + "b34724": "6231a5", + "f8f8f8": "f7e4fc", + "737373": "5c255f", + "bfbfbf": "c093c3", + "804913": "c5b3ca", + "262626": "262626", + "404040": "404040", + "f8cf52": "80f37b", + "ffc000": "4fcb61", + "ff8700": "207d4e" }, "2": { - "907020": "061530", - "ffe060": "2b5f8a", - "e0ad10": "173864", - "040404": "101010", - "803020": "005646", - "f06030": "21d170", - "bf4020": "0aaa77", - "202020": "262626", - "cccccc": "d4b996", - "3c3c3c": "404040", - "fdfdfd": "fff2dd", - "a4583e": "0aaa77", - "414141": "404040", - "606060": "75553c" + "101010": "101010", + "736028": "061530", + "ffd659": "2b5f8a", + "ccab47": "173864", + "732e17": "005646", + "f26130": "21d170", + "b34724": "0aaa77", + "f8f8f8": "fff2dd", + "737373": "75553c", + "bfbfbf": "d4b996", + "804913": "098794", + "262626": "262626", + "404040": "404040", + "f8cf52": "c858a4", + "ffc000": "75308e", + "ff8700": "521364" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/656.json b/public/images/pokemon/variant/exp/back/656.json index 34b11bfab78..f41398f3154 100644 --- a/public/images/pokemon/variant/exp/back/656.json +++ b/public/images/pokemon/variant/exp/back/656.json @@ -1,17 +1,17 @@ { "1": { - "838394": "4d7dc5", + "848496": "4d7dc5", "7bcdff": "9c75c2", "62ace6": "8363af", "ffffff": "b1e5ff", "396a83": "362864", "9c9cc5": "5385c7", "cdcde6": "7eb7e8", - "174592": "198158", + "174592": "37408c", "5a94cd": "7054a4" }, "2": { - "838394": "cc6845", + "848496": "cc6845", "7bcdff": "dd6155", "62ace6": "c44848", "ffffff": "fff4bd", diff --git a/public/images/pokemon/variant/exp/back/664.json b/public/images/pokemon/variant/exp/back/664.json index 65474e240f3..ae0ec9fc792 100644 --- a/public/images/pokemon/variant/exp/back/664.json +++ b/public/images/pokemon/variant/exp/back/664.json @@ -1,28 +1,26 @@ { "1": { - "797987": "9c615f", - "f9f8fa": "f9f8fa", - "000000": "000000", - "ffffff": "ffffff", - "cdcdcd": "e9c7c4", - "383830": "4c2855", - "54544e": "895a9f", - "727272": "a97dbb", - "d8a465": "838b53", - "f0d5b9": "a0c896", - "653925": "626649" + "101010": "101010", + "363636": "4c2855", + "4d4d4d": "9d6260", + "4e4e4e": "895a9f", + "747474": "a97dbb", + "855d31": "626649", + "9d7247": "838b53", + "d1bf6b": "a0c896", + "b3b3b3": "e9c7c4", + "f8f8f8": "ffffff" }, "2": { - "797987": "590015", - "f9f8fa": "c83e4c", - "000000": "000000", - "ffffff": "c83e4c", - "cdcdcd": "a70d37", - "383830": "05312f", - "54544e": "377772", - "727272": "73bdae", - "d8a465": "dda476", - "f0d5b9": "ffe0ba", - "653925": "bf8961" + "101010": "101010", + "363636": "05312f", + "4d4d4d": "590015", + "4e4e4e": "377772", + "747474": "73bdae", + "855d31": "bf8961", + "9d7247": "dda476", + "d1bf6b": "ffe0ba", + "b3b3b3": "a70d37", + "f8f8f8": "c83e4c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/665.json b/public/images/pokemon/variant/exp/back/665.json index 876adeed0ea..c5defbab5b7 100644 --- a/public/images/pokemon/variant/exp/back/665.json +++ b/public/images/pokemon/variant/exp/back/665.json @@ -1,16 +1,30 @@ { + "1": { + "363636": "363636", + "d1bf6b": "a0c896", + "8c8c8c": "895a9f", + "bfbfbf": "a97dbb", + "9d7247": "838b53", + "101010": "101010", + "4d4d4d": "9c615f", + "b3b3b3": "e9c7c4", + "f8f8f8": "ffffff", + "802626": "005361", + "ff4c4c": "00aacd", + "eed83e": "cae2c3" + }, "2": { - "8e5136": "bf8961", - "838392": "590015", - "d8a465": "dda476", - "f0d5b9": "ffe0ba", - "cdcdcd": "a70d37", - "52524b": "360000", - "653925": "bf8961", - "000000": "000000", - "f9f8fa": "c83e4c", - "94416a": "004270", - "ee5a62": "0092dd", - "6a6a6a": "590015" + "363636": "360000", + "d1bf6b": "ffe0ba", + "8c8c8c": "590015", + "bfbfbf": "a70d37", + "9d7247": "dda476", + "101010": "101010", + "4d4d4d": "590015", + "b3b3b3": "a70d37", + "f8f8f8": "c83e4c", + "802626": "004270", + "ff4c4c": "0092dd", + "eed83e": "ffe0ba" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-archipelago.json b/public/images/pokemon/variant/exp/back/666-archipelago.json new file mode 100644 index 00000000000..6386464b74e --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-archipelago.json @@ -0,0 +1,35 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "c8373c": "c8373c", + "a2523b": "a2523b", + "c27351": "c27351", + "30c171": "30c171", + "b28e67": "b28e67", + "ceab62": "d9edd4", + "d2bf96": "d2bf96", + "c3c3c3": "c3c3c3" + }, + "2": { + "101010": "101010", + "303030": "642703", + "675220": "741300", + "504a4a": "741300", + "595959": "824719", + "707068": "a22414", + "c8373c": "c8373c", + "a2523b": "a2523b", + "c27351": "c27351", + "30c171": "30c171", + "b28e67": "b28e67", + "ceab62": "a22414", + "d2bf96": "d2bf96", + "c3c3c3": "e7caa5" + + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-archipelago_2.json b/public/images/pokemon/variant/exp/back/666-archipelago_2.json deleted file mode 100644 index 8c6fd7bcb91..00000000000 --- a/public/images/pokemon/variant/exp/back/666-archipelago_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-archipelago_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:223e2a75aa192f3fb67e18f7f0d6c4c7:ba854fe0d08f005e9aa52e55cdc7eb4e:80cdb6dd219378a41ccf5c2acc7e7786$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-archipelago_2.png b/public/images/pokemon/variant/exp/back/666-archipelago_2.png deleted file mode 100644 index 86e17e33f11..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-archipelago_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-archipelago_3.json b/public/images/pokemon/variant/exp/back/666-archipelago_3.json deleted file mode 100644 index 3f9c86ecd75..00000000000 --- a/public/images/pokemon/variant/exp/back/666-archipelago_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-archipelago_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:223e2a75aa192f3fb67e18f7f0d6c4c7:ba854fe0d08f005e9aa52e55cdc7eb4e:80cdb6dd219378a41ccf5c2acc7e7786$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-archipelago_3.png b/public/images/pokemon/variant/exp/back/666-archipelago_3.png deleted file mode 100644 index 7028f550d45..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-archipelago_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-continental.json b/public/images/pokemon/variant/exp/back/666-continental.json new file mode 100644 index 00000000000..92614fb346c --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-continental.json @@ -0,0 +1,38 @@ +{ + "1": { + "101010": "101010", + "595959": "724b7a", + "555353": "724b7a", + "d18257": "d18257", + "f9bd55": "f9bd55", + "303030": "402746", + "f8f05e": "f8f05e", + "d24c3e": "d24c3e", + "675220": "958c8a", + "ceab62": "d9edd4", + "707068": "a97cbc", + "504a4a": "7f6991", + "aa5844": "aa5844", + "c3c3c3": "ffeaff", + "811c1c": "811c1c", + "e08528": "e08528" + }, + "2": { + "101010": "101010", + "595959": "8f551e", + "555353": "e99b44", + "d18257": "d18257", + "f9bd55": "f9bd55", + "303030": "6d2d0d", + "f8f05e": "f8f05e", + "d24c3e": "d24c3e", + "675220": "9c5c19", + "ceab62": "e99b44", + "707068": "e99b44", + "504a4a": "9c5c19", + "aa5844": "aa5844", + "c3c3c3": "f8f27f", + "811c1c": "811c1c", + "308528": "308528" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-continental_2.json b/public/images/pokemon/variant/exp/back/666-continental_2.json deleted file mode 100644 index 371e157ff8a..00000000000 --- a/public/images/pokemon/variant/exp/back/666-continental_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-continental_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:89725e18f2e4d97217076ac82b40230b:c83c3d03ad1200fc71d95ecafb54bc03:23aaac2256d564b9d8a58d7de70397c3$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-continental_2.png b/public/images/pokemon/variant/exp/back/666-continental_2.png deleted file mode 100644 index 3b9a31469af..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-continental_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-continental_3.json b/public/images/pokemon/variant/exp/back/666-continental_3.json deleted file mode 100644 index ec9c98e6312..00000000000 --- a/public/images/pokemon/variant/exp/back/666-continental_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-continental_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:89725e18f2e4d97217076ac82b40230b:c83c3d03ad1200fc71d95ecafb54bc03:23aaac2256d564b9d8a58d7de70397c3$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-continental_3.png b/public/images/pokemon/variant/exp/back/666-continental_3.png deleted file mode 100644 index b61b16538eb..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-continental_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-elegant.json b/public/images/pokemon/variant/exp/back/666-elegant.json new file mode 100644 index 00000000000..1b7b9838005 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-elegant.json @@ -0,0 +1,34 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "de4040": "de4040", + "f8de3f": "f8de3f", + "ceab62": "d9edd4", + "56479d": "56479d", + "875fb5": "875fb5", + "cf7ef3": "cf7ef3", + "c3c3c3": "c3c3c3", + "e6ddf8": "e6ddf8" + }, + "2": { + "101010": "101010", + "303030": "351262", + "675220": "7d1083", + "504a4a": "7d1083", + "595959": "612776", + "707068": "a73fab", + "de4040": "de4040", + "f8de3f": "f8de3f", + "ceab62": "a73fab", + "56479d": "56479d", + "875fb5": "875fb5", + "cf7ef3": "cf7ef3", + "c3c3c3": "f0ecff", + "e6ddf8": "e6ddf8" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-elegant_2.json b/public/images/pokemon/variant/exp/back/666-elegant_2.json deleted file mode 100644 index 0894ba3672b..00000000000 --- a/public/images/pokemon/variant/exp/back/666-elegant_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-elegant_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 44, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 44, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:bbba66d69955866664e782205a4af88d:66e99814147be780756a4d4ccd8b31dc:d6b035048c66474f6236a3bc923faa7b$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-elegant_2.png b/public/images/pokemon/variant/exp/back/666-elegant_2.png deleted file mode 100644 index 315b2fe859d..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-elegant_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-elegant_3.json b/public/images/pokemon/variant/exp/back/666-elegant_3.json deleted file mode 100644 index 20501609416..00000000000 --- a/public/images/pokemon/variant/exp/back/666-elegant_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-elegant_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 44, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 44, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 44, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 44, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:bbba66d69955866664e782205a4af88d:66e99814147be780756a4d4ccd8b31dc:d6b035048c66474f6236a3bc923faa7b$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-elegant_3.png b/public/images/pokemon/variant/exp/back/666-elegant_3.png deleted file mode 100644 index 490bbb5951c..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-elegant_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-fancy.json b/public/images/pokemon/variant/exp/back/666-fancy.json new file mode 100644 index 00000000000..5d368667ae3 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-fancy.json @@ -0,0 +1,36 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "de4040": "de4040", + "5faa3e": "5faa3e", + "ceab62": "d9edd4", + "b6d26d": "b6d26d", + "e9e052": "e9e052", + "cf7ef3": "cf7ef3", + "c3c3c3": "ffeaff", + "f2d4e3": "f2d4e3", + "ead2e3": "ffeaff" + }, + "2": { + "101010": "101010", + "303030": "00771b", + "675220": "b9c05a", + "504a4a": "b9c05a", + "595959": "6f9f42", + "707068": "6f9f42", + "de4040": "de4040", + "5faa3e": "5faa3e", + "ceab62": "e3e982", + "b6d26d": "b6d26d", + "e9e052": "e9e052", + "cf7ef3": "cf7ef3", + "c3c3c3": "fcf1ff", + "f2d4e3": "f2d4e3", + "ead2e3": "fcf1ff" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-fancy_2.json b/public/images/pokemon/variant/exp/back/666-fancy_2.json deleted file mode 100644 index 5f8f29308d3..00000000000 --- a/public/images/pokemon/variant/exp/back/666-fancy_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-fancy_2.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:570d1bf9b987c1bf5ebfe39e485464dd:a3c8bebd39c1c84b1bf0fdf600026ea5:6d5edff9a806f43feff031c9919c9aca$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-fancy_2.png b/public/images/pokemon/variant/exp/back/666-fancy_2.png deleted file mode 100644 index a92f1e7eecf..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-fancy_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-fancy_3.json b/public/images/pokemon/variant/exp/back/666-fancy_3.json deleted file mode 100644 index c1c35bf083a..00000000000 --- a/public/images/pokemon/variant/exp/back/666-fancy_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-fancy_3.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:570d1bf9b987c1bf5ebfe39e485464dd:a3c8bebd39c1c84b1bf0fdf600026ea5:6d5edff9a806f43feff031c9919c9aca$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-fancy_3.png b/public/images/pokemon/variant/exp/back/666-fancy_3.png deleted file mode 100644 index 7a54e9bb6cd..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-fancy_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-garden.json b/public/images/pokemon/variant/exp/back/666-garden.json new file mode 100644 index 00000000000..16fec8bc537 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-garden.json @@ -0,0 +1,32 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "de4040": "de4040", + "398351": "398351", + "ceab62": "d9edd4", + "88d254": "88d254", + "3f919a": "3f919a", + "3dba96": "3dba96", + "c3c3c3": "c3c3c3" + }, + "2": { + "101010": "101010", + "303030": "044553", + "675220": "055160", + "504a4a": "055160", + "595959": "006b55", + "707068": "227687", + "de4040": "de4040", + "398351": "398351", + "ceab62": "227687", + "88d254": "88d254", + "3f919a": "3f919a", + "3dba96": "3dba96", + "c3c3c3": "72d0a3" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-garden_2.json b/public/images/pokemon/variant/exp/back/666-garden_2.json deleted file mode 100644 index 1c3840b900c..00000000000 --- a/public/images/pokemon/variant/exp/back/666-garden_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-garden_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4b2ac69ef7a99f6cef35d3fd38c74d01:8a4c29615f3bf20e9c5d0bb372a5b210:f13a1a8fa0a411aa91fccb833ac8719c$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-garden_2.png b/public/images/pokemon/variant/exp/back/666-garden_2.png deleted file mode 100644 index c56ff652c7d..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-garden_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-garden_3.json b/public/images/pokemon/variant/exp/back/666-garden_3.json deleted file mode 100644 index 5fbdd2097fd..00000000000 --- a/public/images/pokemon/variant/exp/back/666-garden_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-garden_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4b2ac69ef7a99f6cef35d3fd38c74d01:8a4c29615f3bf20e9c5d0bb372a5b210:f13a1a8fa0a411aa91fccb833ac8719c$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-garden_3.png b/public/images/pokemon/variant/exp/back/666-garden_3.png deleted file mode 100644 index 60c7f5b7d01..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-garden_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-high-plains.json b/public/images/pokemon/variant/exp/back/666-high-plains.json new file mode 100644 index 00000000000..984055b6a24 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-high-plains.json @@ -0,0 +1,38 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "337543": "337543", + "504a4a": "7f6991", + "595959": "724b7a", + "7d4428": "7d4428", + "707068": "a97cbc", + "9a5a3b": "9a5a3b", + "aa4343": "aa4343", + "e1764e": "e1764e", + "e8c815": "e8c815", + "ceab62": "d9edd4", + "f3a861": "f3a861", + "c3c3c3": "c3c3c3", + "773d21": "773d21" + }, + "2": { + "101010": "101010", + "303030": "8f1d19", + "675220": "c97034", + "337543": "337543", + "504a4a": "c97034", + "595959": "a55422", + "7d4428": "7d4428", + "707068": "f2975a", + "9a5a3b": "9a5a3b", + "aa4343": "aa4343", + "e1764e": "e1764e", + "e8c815": "e8c815", + "ceab62": "f2975a", + "f3a861": "f3a861", + "c3c3c3": "edc67c", + "773d21": "773d21" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-high-plains_2.json b/public/images/pokemon/variant/exp/back/666-high-plains_2.json deleted file mode 100644 index 405f2657c8a..00000000000 --- a/public/images/pokemon/variant/exp/back/666-high-plains_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-high-plains_2.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:410c759185f779797422e8f2ce55db4f:6afd0d04b6138fdd57d12681e967b48c:2abdb5d19b2754e3daa24b6ff3ed2c2c$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-high-plains_2.png b/public/images/pokemon/variant/exp/back/666-high-plains_2.png deleted file mode 100644 index d53634ed092..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-high-plains_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-high-plains_3.json b/public/images/pokemon/variant/exp/back/666-high-plains_3.json deleted file mode 100644 index 4c91b8fb5a0..00000000000 --- a/public/images/pokemon/variant/exp/back/666-high-plains_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-high-plains_3.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:410c759185f779797422e8f2ce55db4f:6afd0d04b6138fdd57d12681e967b48c:2abdb5d19b2754e3daa24b6ff3ed2c2c$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-high-plains_3.png b/public/images/pokemon/variant/exp/back/666-high-plains_3.png deleted file mode 100644 index d6c577be131..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-high-plains_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow.json b/public/images/pokemon/variant/exp/back/666-icy-snow.json new file mode 100644 index 00000000000..ec52af1302a --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-icy-snow.json @@ -0,0 +1,32 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4", + "95a1a1": "95a1a1", + "acacc2": "acacc2", + "c3c3c3": "c3c3c3", + "cfd9cf": "cfd9cf", + "c5c5da": "c5c5da", + "ffffff": "ffffff" + }, + "2": { + "101010": "101010", + "303030": "364051", + "675220": "666b7d", + "504a4a": "666b7d", + "595959": "60646a", + "707068": "8c91a4", + "ceab62": "8c91a4", + "95a1a1": "95a1a1", + "acacc2": "acacc2", + "c3c3c3": "c3c3c3", + "cfd9cf": "cfd9cf", + "c5c5da": "c5c5da", + "ffffff": "ffffff" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow_2.json b/public/images/pokemon/variant/exp/back/666-icy-snow_2.json deleted file mode 100644 index a456b34be45..00000000000 --- a/public/images/pokemon/variant/exp/back/666-icy-snow_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-icy-snow_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9f47e6de00b727163c2ffb6870af9c6b:16bfd68007c3798294c7d690e075f679:fb1e8b97806dc5c60ac6adf0ae48199b$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow_2.png b/public/images/pokemon/variant/exp/back/666-icy-snow_2.png deleted file mode 100644 index 02e7e2e61af..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-icy-snow_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow_3.json b/public/images/pokemon/variant/exp/back/666-icy-snow_3.json deleted file mode 100644 index c1b2ff5791d..00000000000 --- a/public/images/pokemon/variant/exp/back/666-icy-snow_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-icy-snow_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9f47e6de00b727163c2ffb6870af9c6b:16bfd68007c3798294c7d690e075f679:fb1e8b97806dc5c60ac6adf0ae48199b$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow_3.png b/public/images/pokemon/variant/exp/back/666-icy-snow_3.png deleted file mode 100644 index 3c247e0d43a..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-icy-snow_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-jungle.json b/public/images/pokemon/variant/exp/back/666-jungle.json new file mode 100644 index 00000000000..63b998e284e --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-jungle.json @@ -0,0 +1,34 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "724e28": "724e28", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "567456": "567456", + "707068": "a97cbc", + "9a653e": "9a653e", + "638c63": "638c63", + "c29566": "c29566", + "ceab62": "d9edd4", + "7cc48b": "7cc48b", + "c3c3c3": "c3c3c3" + }, + "2": { + "101010": "101010", + "303030": "20452e", + "724e28": "724e28", + "675220": "153922", + "504a4a": "153922", + "595959": "285b3b", + "567456": "567456", + "707068": "385c43", + "9a653e": "9a653e", + "638c63": "638c63", + "c29566": "c29566", + "ceab62": "385c43", + "7cc48b": "7cc48b", + "c3c3c3": "a9d9a0" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-jungle_2.json b/public/images/pokemon/variant/exp/back/666-jungle_2.json deleted file mode 100644 index e941cffbb5e..00000000000 --- a/public/images/pokemon/variant/exp/back/666-jungle_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-jungle_2.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4d8913bd65ce0b63c5354717532a7d60:39392afb8d9fb30f37b8d68b6cd368ad:c8686bcc5493911384853d54c85bfea1$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-jungle_2.png b/public/images/pokemon/variant/exp/back/666-jungle_2.png deleted file mode 100644 index d6023a6500f..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-jungle_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-jungle_3.json b/public/images/pokemon/variant/exp/back/666-jungle_3.json deleted file mode 100644 index 8bbc5571373..00000000000 --- a/public/images/pokemon/variant/exp/back/666-jungle_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-jungle_3.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4d8913bd65ce0b63c5354717532a7d60:39392afb8d9fb30f37b8d68b6cd368ad:c8686bcc5493911384853d54c85bfea1$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-jungle_3.png b/public/images/pokemon/variant/exp/back/666-jungle_3.png deleted file mode 100644 index 0f4ca358601..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-jungle_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-marine.json b/public/images/pokemon/variant/exp/back/666-marine.json new file mode 100644 index 00000000000..0bae2c2067e --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-marine.json @@ -0,0 +1,32 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4", + "315382": "315382", + "367cb9": "367cb9", + "2f8dc9": "2f8dc9", + "5acdf1": "5acdf1", + "c3c3c3": "c3c3c3", + "f2f2f2": "f2f2f2" + }, + "2": { + "101010": "101010", + "303030": "16244f", + "675220": "264c85", + "504a4a": "264c85", + "595959": "2a5894", + "707068": "3070af", + "ceab62": "3070af", + "315382": "315382", + "367cb9": "367cb9", + "2f8dc9": "2f8dc9", + "5acdf1": "5acdf1", + "c3c3c3": "3070af", + "f2f2f2": "f2f2f2" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-marine_2.json b/public/images/pokemon/variant/exp/back/666-marine_2.json deleted file mode 100644 index 7f85f0176f9..00000000000 --- a/public/images/pokemon/variant/exp/back/666-marine_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-marine_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b061fec5d665439da49159647e0a7d71:7cac8aa51d4531fbcf0f9ea9bf644452:dc240f0acbf3d56fe8729dd1f703009f$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-marine_2.png b/public/images/pokemon/variant/exp/back/666-marine_2.png deleted file mode 100644 index ffa21823012..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-marine_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-marine_3.json b/public/images/pokemon/variant/exp/back/666-marine_3.json deleted file mode 100644 index f61b5ed14a9..00000000000 --- a/public/images/pokemon/variant/exp/back/666-marine_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-marine_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b061fec5d665439da49159647e0a7d71:7cac8aa51d4531fbcf0f9ea9bf644452:dc240f0acbf3d56fe8729dd1f703009f$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-marine_3.png b/public/images/pokemon/variant/exp/back/666-marine_3.png deleted file mode 100644 index ee4c51543ee..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-marine_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-meadow.json b/public/images/pokemon/variant/exp/back/666-meadow.json new file mode 100644 index 00000000000..4f567cb29ee --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-meadow.json @@ -0,0 +1,34 @@ +{ + "1": { + "101010": "101010", + "f2f2f2": "f2f2f2", + "303030": "402746", + "504a4a": "7f6991", + "595959": "724b7a", + "c3c3c3": "c3c3c3", + "707068": "a97cbc", + "675220": "958c8a", + "ceab62": "d9edd4", + "2d9b9b": "2d9b9b", + "e66fad": "e66fad", + "b4295a": "b4295a", + "f3a0ca": "f3a0ca", + "da6b7e": "da6b7e" + }, + "2": { + "101010": "101010", + "f2f2f2": "f2f2f2", + "303030": "770921", + "504a4a": "a2275e", + "595959": "9e3941", + "c3c3c3": "f4c2ec", + "707068": "ce5283", + "675220": "a2275e", + "ceab62": "ce5283", + "2d9b9b": "2d9b9b", + "e66fad": "e66fad", + "b4295a": "b4295a", + "f3a0ca": "f3a0ca", + "da6b7e": "da6b7e" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-meadow_2.json b/public/images/pokemon/variant/exp/back/666-meadow_2.json deleted file mode 100644 index 7c2cbd58134..00000000000 --- a/public/images/pokemon/variant/exp/back/666-meadow_2.json +++ /dev/null @@ -1,524 +0,0 @@ -{ - "textures": [ - { - "image": "666-meadow_2.png", - "format": "RGBA8888", - "size": { - "w": 234, - "h": 234 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 84, - "h": 86 - }, - "frame": { - "x": 135, - "y": 0, - "w": 84, - "h": 86 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 84, - "h": 86 - }, - "frame": { - "x": 135, - "y": 0, - "w": 84, - "h": 86 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 20, - "y": 0, - "w": 47, - "h": 85 - }, - "frame": { - "x": 187, - "y": 86, - "w": 47, - "h": 85 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 20, - "y": 0, - "w": 47, - "h": 85 - }, - "frame": { - "x": 187, - "y": 86, - "w": 47, - "h": 85 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:49698fe6f96ff24d2fe1c7a365f79f1b:f15ccef05dfd7ebb03ac6c66ae05dcef:f8ac4807b4d6eef2256fa1b93e0f89ba$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-meadow_2.png b/public/images/pokemon/variant/exp/back/666-meadow_2.png deleted file mode 100644 index bb54cac34cd..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-meadow_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-meadow_3.json b/public/images/pokemon/variant/exp/back/666-meadow_3.json deleted file mode 100644 index 6dcce66c44e..00000000000 --- a/public/images/pokemon/variant/exp/back/666-meadow_3.json +++ /dev/null @@ -1,524 +0,0 @@ -{ - "textures": [ - { - "image": "666-meadow_3.png", - "format": "RGBA8888", - "size": { - "w": 234, - "h": 234 - }, - "scale": 1, - "frames": [ - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 78, - "h": 87 - }, - "frame": { - "x": 0, - "y": 0, - "w": 78, - "h": 87 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 70, - "h": 87 - }, - "frame": { - "x": 0, - "y": 87, - "w": 70, - "h": 87 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 63, - "h": 87 - }, - "frame": { - "x": 70, - "y": 87, - "w": 63, - "h": 87 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 57, - "h": 87 - }, - "frame": { - "x": 78, - "y": 0, - "w": 57, - "h": 87 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 84, - "h": 86 - }, - "frame": { - "x": 135, - "y": 0, - "w": 84, - "h": 86 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 84, - "h": 86 - }, - "frame": { - "x": 135, - "y": 0, - "w": 84, - "h": 86 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 17, - "y": 0, - "w": 52, - "h": 87 - }, - "frame": { - "x": 135, - "y": 86, - "w": 52, - "h": 87 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 20, - "y": 0, - "w": 47, - "h": 85 - }, - "frame": { - "x": 187, - "y": 86, - "w": 47, - "h": 85 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 84, - "h": 91 - }, - "spriteSourceSize": { - "x": 20, - "y": 0, - "w": 47, - "h": 85 - }, - "frame": { - "x": 187, - "y": 86, - "w": 47, - "h": 85 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:49698fe6f96ff24d2fe1c7a365f79f1b:f15ccef05dfd7ebb03ac6c66ae05dcef:f8ac4807b4d6eef2256fa1b93e0f89ba$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-meadow_3.png b/public/images/pokemon/variant/exp/back/666-meadow_3.png deleted file mode 100644 index 865e404c1cd..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-meadow_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-modern.json b/public/images/pokemon/variant/exp/back/666-modern.json new file mode 100644 index 00000000000..5572a58bfa9 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-modern.json @@ -0,0 +1,32 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "b83c3c": "b83c3c", + "f44f4f": "f44f4f", + "ceab62": "d9edd4", + "3b6cbb": "3b6cbb", + "405793": "405793", + "c3c3c3": "c3c3c3", + "cfc5d9": "cfc5d9" + }, + "2":{ + "101010": "101010", + "303030": "4e0000", + "675220": "801521", + "504a4a": "801521", + "595959": "830012", + "707068": "ad2640", + "b83c3c": "b83c3c", + "f44f4f": "f44f4f", + "ceab62": "ad2640", + "3b6cbb": "3b6cbb", + "405793": "405793", + "c3c3c3": "ffeae8", + "cfc5d9": "cfc5d9" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-modern_2.json b/public/images/pokemon/variant/exp/back/666-modern_2.json deleted file mode 100644 index 4b0ef1a8a59..00000000000 --- a/public/images/pokemon/variant/exp/back/666-modern_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-modern_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:deb5b8b4295c15b4c8718bf2ed9791d1:bbe309a34a59a4e2f74eeba5769476f4:5fc0e8f9a0750c2f3cfb5d6e7eca0d45$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-modern_2.png b/public/images/pokemon/variant/exp/back/666-modern_2.png deleted file mode 100644 index 4cd5d770881..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-modern_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-modern_3.json b/public/images/pokemon/variant/exp/back/666-modern_3.json deleted file mode 100644 index 78c496fc208..00000000000 --- a/public/images/pokemon/variant/exp/back/666-modern_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-modern_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:deb5b8b4295c15b4c8718bf2ed9791d1:bbe309a34a59a4e2f74eeba5769476f4:5fc0e8f9a0750c2f3cfb5d6e7eca0d45$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-modern_3.png b/public/images/pokemon/variant/exp/back/666-modern_3.png deleted file mode 100644 index 5795174404f..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-modern_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-monsoon.json b/public/images/pokemon/variant/exp/back/666-monsoon.json new file mode 100644 index 00000000000..915d471b2b1 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-monsoon.json @@ -0,0 +1,33 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "807676": "807676", + "ceab62": "d9edd4", + "5676de": "5676de", + "4eccd6": "4eccd6", + "989898": "989898", + "c3c3c3": "c3c3c3", + "f0f0f8": "f0f0f8" + }, + "2": { + "101010": "101010", + "303030": "3d3231", + "675220": "2c3593", + "504a4a": "2c3593", + "595959": "4f4645", + "707068": "5857bc", + "807676": "807676", + "ceab62": "5857bc", + "5676de": "5676de", + "4eccd6": "4eccd6", + "989898": "989898", + "92f4f4": "92f4f4", + "c3c3c3": "b8f9f9", + "f0f0f8": "f0f0f8" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-monsoon_2.json b/public/images/pokemon/variant/exp/back/666-monsoon_2.json deleted file mode 100644 index 344344ec0b2..00000000000 --- a/public/images/pokemon/variant/exp/back/666-monsoon_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-monsoon_2.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 42, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:71a24b11bc54be921b67b4376d798e05:f5358aac113e1f7af7eddf984d9692b3:637bea52b465abfb8e5a576310b4dacc$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-monsoon_2.png b/public/images/pokemon/variant/exp/back/666-monsoon_2.png deleted file mode 100644 index 8f091f4d1de..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-monsoon_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-monsoon_3.json b/public/images/pokemon/variant/exp/back/666-monsoon_3.json deleted file mode 100644 index 4f7304f6c0c..00000000000 --- a/public/images/pokemon/variant/exp/back/666-monsoon_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-monsoon_3.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 42, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 42, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 42, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 42, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:71a24b11bc54be921b67b4376d798e05:f5358aac113e1f7af7eddf984d9692b3:637bea52b465abfb8e5a576310b4dacc$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-monsoon_3.png b/public/images/pokemon/variant/exp/back/666-monsoon_3.png deleted file mode 100644 index f216010ca99..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-monsoon_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-ocean.json b/public/images/pokemon/variant/exp/back/666-ocean.json new file mode 100644 index 00000000000..70e7a51c21f --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-ocean.json @@ -0,0 +1,34 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "e1384d": "e1384d", + "ebcf3f": "ebcf3f", + "ceab62": "d9edd4", + "f4ad61": "f4ad61", + "f8ef6a": "f8ef6a", + "4482c9": "4482c9", + "6bb2e9": "6bb2e9", + "c3c3c3": "c3c3c3" + }, + "2": { + "101010": "101010", + "303030": "b54908", + "675220": "bc601c", + "504a4a": "bc601c", + "595959": "e99a26", + "707068": "ea8742", + "e1384d": "e1384d", + "ebcf3f": "ebcf3f", + "ceab62": "ea8742", + "f4ad61": "f4ad61", + "f8ef6a": "f8ef6a", + "4482c9": "4482c9", + "6bb2e9": "6bb2e9", + "c3c3c3": "f3c86b" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-ocean_2.json b/public/images/pokemon/variant/exp/back/666-ocean_2.json deleted file mode 100644 index d5bb27bf592..00000000000 --- a/public/images/pokemon/variant/exp/back/666-ocean_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-ocean_2.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a1a0079c64e9d91336d227b1380cd9d2:cf159e4653ad9208c0f4633a498a6cd1:e7a0e68eab89c2013a3eb7f3b6fc0b33$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-ocean_2.png b/public/images/pokemon/variant/exp/back/666-ocean_2.png deleted file mode 100644 index 6f4fefc99f8..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-ocean_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-ocean_3.json b/public/images/pokemon/variant/exp/back/666-ocean_3.json deleted file mode 100644 index 4ca1832c359..00000000000 --- a/public/images/pokemon/variant/exp/back/666-ocean_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-ocean_3.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a1a0079c64e9d91336d227b1380cd9d2:cf159e4653ad9208c0f4633a498a6cd1:e7a0e68eab89c2013a3eb7f3b6fc0b33$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-ocean_3.png b/public/images/pokemon/variant/exp/back/666-ocean_3.png deleted file mode 100644 index 554fcb7b510..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-ocean_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball.json b/public/images/pokemon/variant/exp/back/666-poke-ball.json new file mode 100644 index 00000000000..e21ba03fc1e --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-poke-ball.json @@ -0,0 +1,34 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "971d1d": "971d1d", + "b72c2c": "b72c2c", + "dc4b4b": "dc4b4b", + "e97e7e": "e97e7e", + "ceab62": "d9edd4", + "a9a99e": "a9a99e", + "c3c3c3": "c3c3c3", + "f8f8f8": "f8f8f8" + }, + "2": { + "101010": "101010", + "303030": "ae001a", + "675220": "a70038", + "504a4a": "a70038", + "595959": "df0036", + "707068": "d5375a", + "971d1d": "040046", + "b72c2c": "00005e", + "dc4b4b": "19007d", + "e97e7e": "2e2095", + "ceab62": "d5375a", + "a9a99e": "000050", + "c3c3c3": "f0a6bf", + "f8f8f8": "00006d" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball_2.json b/public/images/pokemon/variant/exp/back/666-poke-ball_2.json deleted file mode 100644 index 99da9b9ac29..00000000000 --- a/public/images/pokemon/variant/exp/back/666-poke-ball_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-poke-ball_2.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e744396a3b647429d050d678017c05ce:ec812f719dffcd362f0481d7d83c3476:8ec14f129d1691b8da504a13b661abed$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball_2.png b/public/images/pokemon/variant/exp/back/666-poke-ball_2.png deleted file mode 100644 index a1bd953a1b3..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-poke-ball_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball_3.json b/public/images/pokemon/variant/exp/back/666-poke-ball_3.json deleted file mode 100644 index de222894738..00000000000 --- a/public/images/pokemon/variant/exp/back/666-poke-ball_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-poke-ball_3.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e744396a3b647429d050d678017c05ce:ec812f719dffcd362f0481d7d83c3476:8ec14f129d1691b8da504a13b661abed$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball_3.png b/public/images/pokemon/variant/exp/back/666-poke-ball_3.png deleted file mode 100644 index 9e7ff12912d..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-poke-ball_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-polar.json b/public/images/pokemon/variant/exp/back/666-polar.json new file mode 100644 index 00000000000..f86b4df3dcc --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-polar.json @@ -0,0 +1,34 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "2d2d61": "2d2d61", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4", + "3b4b8a": "3b4b8a", + "4d6cc1": "4d6cc1", + "6aa2dc": "6aa2dc", + "bfbfbf": "bfbfbf", + "c3c3c3": "c3c3c3", + "f0f0f8": "f0f0f8" + }, + "2": { + "101010": "101010", + "303030": "191b54", + "675220": "366098", + "2d2d61": "2d2d61", + "504a4a": "366098", + "595959": "2f3887", + "707068": "5f85c1", + "ceab62": "5f85c1", + "3b4b8a": "3b4b8a", + "4d6cc1": "4d6cc1", + "6aa2dc": "6aa2dc", + "bfbfbf": "bfbfbf", + "c3c3c3": "ffffff", + "f0f0f8": "f0f0f8" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-polar_2.json b/public/images/pokemon/variant/exp/back/666-polar_2.json deleted file mode 100644 index e30095c2299..00000000000 --- a/public/images/pokemon/variant/exp/back/666-polar_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-polar_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 45, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 45, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 45, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 45, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a3b0453f2d03b9c62472f57a438298a4:81a5a3455ae0c378bdb1dbe3c3323463:eb7086e98f867c6592e4b161835da18b$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-polar_2.png b/public/images/pokemon/variant/exp/back/666-polar_2.png deleted file mode 100644 index b66daac7d2c..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-polar_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-polar_3.json b/public/images/pokemon/variant/exp/back/666-polar_3.json deleted file mode 100644 index 76df03f7d08..00000000000 --- a/public/images/pokemon/variant/exp/back/666-polar_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-polar_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 45, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 14, - "y": 1, - "w": 45, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 45, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 45, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 45, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a3b0453f2d03b9c62472f57a438298a4:81a5a3455ae0c378bdb1dbe3c3323463:eb7086e98f867c6592e4b161835da18b$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-polar_3.png b/public/images/pokemon/variant/exp/back/666-polar_3.png deleted file mode 100644 index cab4822a306..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-polar_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-river.json b/public/images/pokemon/variant/exp/back/666-river.json new file mode 100644 index 00000000000..c7e5e288d05 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-river.json @@ -0,0 +1,40 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "4a412c": "4a412c", + "675220": "958c8a", + "634d20": "634d20", + "1d726a": "1d726a", + "504a4a": "7f6991", + "595959": "724b7a", + "625841": "625841", + "707068": "a97cbc", + "bc813f": "bc813f", + "9c9143": "9c9143", + "ceab62": "ceab62", + "279ec2": "279ec2", + "59c9d3": "59c9d3", + "c3c3c3": "c3c3c3", + "d2a862": "d9edd4" + }, + "2": { + "101010": "101010", + "303030": "7b2800", + "4a412c": "4a412c", + "675220": "ae7f41", + "634d20": "634d20", + "1d726a": "1d726a", + "504a4a": "ae7f41", + "595959": "8a5702", + "625841": "625841", + "707068": "d9a666", + "bc813f": "bc813f", + "9c9143": "9c9143", + "ceab62": "ceab62", + "279ec2": "279ec2", + "59c9d3": "59c9d3", + "c3c3c3": "e3c384", + "d2a862": "d2a862" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-river_2.json b/public/images/pokemon/variant/exp/back/666-river_2.json deleted file mode 100644 index 4edb4a188f8..00000000000 --- a/public/images/pokemon/variant/exp/back/666-river_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-river_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2bb6d375761e6690eba12cf4d2bc99c9:9db30ec1cf68fe8c1026c243086573f3:fa23dc87fc53ba2cfa532cf440553cf5$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-river_2.png b/public/images/pokemon/variant/exp/back/666-river_2.png deleted file mode 100644 index c689a6c7150..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-river_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-river_3.json b/public/images/pokemon/variant/exp/back/666-river_3.json deleted file mode 100644 index 69623e13034..00000000000 --- a/public/images/pokemon/variant/exp/back/666-river_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-river_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2bb6d375761e6690eba12cf4d2bc99c9:9db30ec1cf68fe8c1026c243086573f3:fa23dc87fc53ba2cfa532cf440553cf5$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-river_3.png b/public/images/pokemon/variant/exp/back/666-river_3.png deleted file mode 100644 index a163e179d0e..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-river_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm.json b/public/images/pokemon/variant/exp/back/666-sandstorm.json new file mode 100644 index 00000000000..6bc91afb34d --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-sandstorm.json @@ -0,0 +1,34 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "625843": "625843", + "72604d": "72604d", + "707068": "a97cbc", + "9b9148": "9b9148", + "ba8d68": "ba8d68", + "ceab62": "d9edd4", + "d9b674": "d9b674", + "f1d69e": "f1d69e", + "c3c3c3": "c3c3c3" + }, + "2": { + "101010": "101010", + "303030": "443123", + "675220": "9c703b", + "504a4a": "9c703b", + "595959": "88583e", + "625843": "625843", + "72604d": "72604d", + "707068": "c6975f", + "9b9148": "9b9148", + "ba8d68": "ba8d68", + "ceab62": "c6975f", + "d9b674": "d9b674", + "f1d69e": "f1d69e", + "c3c3c3": "ece1a9" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm_2.json b/public/images/pokemon/variant/exp/back/666-sandstorm_2.json deleted file mode 100644 index 5651485f6d0..00000000000 --- a/public/images/pokemon/variant/exp/back/666-sandstorm_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-sandstorm_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 68, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 17, - "y": 2, - "w": 40, - "h": 68 - }, - "frame": { - "x": 67, - "y": 0, - "w": 40, - "h": 68 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 17, - "y": 2, - "w": 40, - "h": 68 - }, - "frame": { - "x": 67, - "y": 68, - "w": 40, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e35abed8cd9d0bbf1556fa684995d930:8d765a06a769bbf3d1639f361548cd6f:12f47e779927411662912d6094a9782d$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm_2.png b/public/images/pokemon/variant/exp/back/666-sandstorm_2.png deleted file mode 100644 index 534e96bee13..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-sandstorm_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm_3.json b/public/images/pokemon/variant/exp/back/666-sandstorm_3.json deleted file mode 100644 index d43381578cb..00000000000 --- a/public/images/pokemon/variant/exp/back/666-sandstorm_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-sandstorm_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 68, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 17, - "y": 2, - "w": 40, - "h": 68 - }, - "frame": { - "x": 67, - "y": 0, - "w": 40, - "h": 68 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 17, - "y": 2, - "w": 40, - "h": 68 - }, - "frame": { - "x": 67, - "y": 68, - "w": 40, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e35abed8cd9d0bbf1556fa684995d930:8d765a06a769bbf3d1639f361548cd6f:12f47e779927411662912d6094a9782d$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm_3.png b/public/images/pokemon/variant/exp/back/666-sandstorm_3.png deleted file mode 100644 index 649fa83e025..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-sandstorm_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-savanna.json b/public/images/pokemon/variant/exp/back/666-savanna.json new file mode 100644 index 00000000000..c261f52dced --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-savanna.json @@ -0,0 +1,34 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "dcc433": "dcc433", + "ceab62": "d9edd4", + "3b67ac": "3b67ac", + "61a0f5": "61a0f5", + "55d3d9": "55d3d9", + "6cc6c6": "6cc6c6", + "fffd77": "fffd77", + "c3c3c3": "c3c3c3" + }, + "2": { + "101010": "101010", + "303030": "183576", + "675220": "1d828b", + "504a4a": "1d828b", + "595959": "4168bb", + "707068": "4faab3", + "dcc433": "dcc433", + "ceab62": "4faab3", + "fffd77": "fffd77", + "3b67ac": "3b67ac", + "61a0f5": "61a0f5", + "55d3d9": "55d3d9", + "6cc6c6": "6cc6c6", + "c3c3c3": "81e7e1" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-savanna_2.json b/public/images/pokemon/variant/exp/back/666-savanna_2.json deleted file mode 100644 index c1f73f6efc7..00000000000 --- a/public/images/pokemon/variant/exp/back/666-savanna_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-savanna_2.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1ad0c7c841409c3fd4cb50b399d6e13c:b9406b41d37bc72c57260f9a01a352c8:625a4f0dc001069326a75c6a381f93e6$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-savanna_2.png b/public/images/pokemon/variant/exp/back/666-savanna_2.png deleted file mode 100644 index b4b8ecedb9e..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-savanna_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-savanna_3.json b/public/images/pokemon/variant/exp/back/666-savanna_3.json deleted file mode 100644 index 49ab66f6855..00000000000 --- a/public/images/pokemon/variant/exp/back/666-savanna_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-savanna_3.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 16, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1ad0c7c841409c3fd4cb50b399d6e13c:b9406b41d37bc72c57260f9a01a352c8:625a4f0dc001069326a75c6a381f93e6$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-savanna_3.png b/public/images/pokemon/variant/exp/back/666-savanna_3.png deleted file mode 100644 index 6bc0a0b8363..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-savanna_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-sun.json b/public/images/pokemon/variant/exp/back/666-sun.json new file mode 100644 index 00000000000..21cf5787ba4 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-sun.json @@ -0,0 +1,34 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "c94971": "c94971", + "e18248": "e18248", + "ceab62": "d9edd4", + "f1a26a": "f1a26a", + "f0ce44": "f0ce44", + "fcf372": "fcf372", + "f47491": "f47491", + "c3c3c3": "c3c3c3" + }, + "2": { + "101010": "101010", + "303030": "640000", + "675220": "8c1850", + "504a4a": "8c1850", + "595959": "750500", + "707068": "b83b74", + "c94971": "c94971", + "e18248": "e18248", + "ceab62": "b83b74", + "f1a26a": "f1a26a", + "f0ce44": "f0ce44", + "fcf372": "fcf372", + "f47491": "f47491", + "c3c3c3": "fee3e7" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-sun_2.json b/public/images/pokemon/variant/exp/back/666-sun_2.json deleted file mode 100644 index d7c995a1bc0..00000000000 --- a/public/images/pokemon/variant/exp/back/666-sun_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-sun_2.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1d3a140bac5951725915aa0b64d1fdc6:e322510cf8386dcc7834a05d57e5368e:8f5fdd0a698701f5391c5a3f67e303d6$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-sun_2.png b/public/images/pokemon/variant/exp/back/666-sun_2.png deleted file mode 100644 index c9168d5a1c5..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-sun_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-sun_3.json b/public/images/pokemon/variant/exp/back/666-sun_3.json deleted file mode 100644 index a3f755a4e7c..00000000000 --- a/public/images/pokemon/variant/exp/back/666-sun_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-sun_3.png", - "format": "RGBA8888", - "size": { - "w": 137, - "h": 137 - }, - "scale": 1, - "frames": [ - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 67, - "y": 0, - "w": 43, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 15, - "y": 1, - "w": 43, - "h": 69 - }, - "frame": { - "x": 0, - "y": 68, - "w": 43, - "h": 69 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 43, - "y": 69, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1d3a140bac5951725915aa0b64d1fdc6:e322510cf8386dcc7834a05d57e5368e:8f5fdd0a698701f5391c5a3f67e303d6$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-sun_3.png b/public/images/pokemon/variant/exp/back/666-sun_3.png deleted file mode 100644 index 1a36299851e..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-sun_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-tundra.json b/public/images/pokemon/variant/exp/back/666-tundra.json new file mode 100644 index 00000000000..b098f776c00 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/666-tundra.json @@ -0,0 +1,32 @@ +{ + "1": { + "101010": "101010", + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4", + "539ad9": "539ad9", + "74bbe9": "74bbe9", + "a3def1": "a3def1", + "c3c3c3": "c3c3c3", + "d0d0d0": "d0d0d0", + "f0f0f8": "f0f0f8" + }, + "2": { + "101010": "101010", + "303030": "003d69", + "675220": "3a76a7", + "504a4a": "3a76a7", + "595959": "225b72", + "707068": "659dd0", + "ceab62": "659dd0", + "539ad9": "539ad9", + "74bbe9": "74bbe9", + "a3def1": "a3def1", + "c3c3c3": "cbfbfb", + "d0d0d0": "d0d0d0", + "f0f0f8": "f0f0f8" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-tundra_2.json b/public/images/pokemon/variant/exp/back/666-tundra_2.json deleted file mode 100644 index 3d8ae45a641..00000000000 --- a/public/images/pokemon/variant/exp/back/666-tundra_2.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-tundra_2.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:40f74f8757cb0f5a2ab7b5f68ea979a0:d062f67571674668b47f6fab68361105:9779ed3adebc298af537dd64dc25fe00$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-tundra_2.png b/public/images/pokemon/variant/exp/back/666-tundra_2.png deleted file mode 100644 index 49325397d8a..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-tundra_2.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/666-tundra_3.json b/public/images/pokemon/variant/exp/back/666-tundra_3.json deleted file mode 100644 index 65be2910a02..00000000000 --- a/public/images/pokemon/variant/exp/back/666-tundra_3.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "textures": [ - { - "image": "666-tundra_3.png", - "format": "RGBA8888", - "size": { - "w": 136, - "h": 136 - }, - "scale": 1, - "frames": [ - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 13, - "y": 1, - "w": 46, - "h": 69 - }, - "frame": { - "x": 0, - "y": 0, - "w": 46, - "h": 69 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 0, - "w": 67, - "h": 68 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 67, - "h": 71 - }, - "spriteSourceSize": { - "x": 0, - "y": 3, - "w": 67, - "h": 68 - }, - "frame": { - "x": 46, - "y": 68, - "w": 67, - "h": 68 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:40f74f8757cb0f5a2ab7b5f68ea979a0:d062f67571674668b47f6fab68361105:9779ed3adebc298af537dd64dc25fe00$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-tundra_3.png b/public/images/pokemon/variant/exp/back/666-tundra_3.png deleted file mode 100644 index 3284e1e637b..00000000000 Binary files a/public/images/pokemon/variant/exp/back/666-tundra_3.png and /dev/null differ diff --git a/public/images/pokemon/variant/exp/back/697.json b/public/images/pokemon/variant/exp/back/697.json index 61a5f16551b..5303995a117 100644 --- a/public/images/pokemon/variant/exp/back/697.json +++ b/public/images/pokemon/variant/exp/back/697.json @@ -1,37 +1,34 @@ { - "1": { - "080808":"080808", - "621e1d":"0b241e", - "902f2d":"153626", - "b45250":"285234", - "653510":"5e0b0b", - "b56827":"971c1c", - "e39f33":"b52424", - "46413f":"4c3216", - "766c67":"ad8c63", - "adaaae":"cbbe8c", - "f0f0f2":"dfdea7", - "3d3937":"ab8a61", - "786d68":"cfc28f", - "afacb0":"c9bd8b", - "ededf0":"e0dfa8" - }, - "2": { - "080808":"080808", - "621e1d":"52352f", - "902f2d":"83726e", - "b45250":"ab9b97", - "653510":"9d5390", - "b56827":"ce7ecc", - "e39f33":"f4dbf6", - "46413f":"170c25", - "766c67":"26173b", - "adaaae":"33214f", - "f0f0f2":"4b2e64", - "3d3937":"c97bc7", - "786d68":"e5a9ea", - "afacb0":"d180ce", - "ededf0":"ededf0" - } + +"1": { +"080808": "080808", +"32252c": "3e1e17", +"50131e": "0b241e", +"722533": "153626", +"54434c": "4c3216", +"964b1c": "5e0b0b", +"963e4e": "285234", +"bf7545": "971c1c", +"f19d5a": "b52424", +"9f9d98": "ad8c63", +"cccccc": "cbbe8c", +"fafafa": "dfdea7", +"53454d":"4c3216" +}, +"2": { +"080808": "080808", +"32252c": "0d0124", +"50131e": "573b36", +"722533": "83726e", +"54434c": "170c25", +"964b1c": "9d5390", +"963e4e": "ab9b97", +"bf7545": "ce7ecc", +"f19d5a": "f4dbf6", +"9f9d98": "26173b", +"cccccc": "33214f", +"fafafa": "4b2e64", +"53454d": "f4dbf6" +} } diff --git a/public/images/pokemon/variant/exp/back/700.json b/public/images/pokemon/variant/exp/back/700.json index 4b65fb00405..1189d463f2b 100644 --- a/public/images/pokemon/variant/exp/back/700.json +++ b/public/images/pokemon/variant/exp/back/700.json @@ -1,26 +1,32 @@ { - "1": { - "107090": "c72537", - "af4f6f": "452f89", - "7fcfdf": "ff9a68", - "ffaebb": "c7a6ee", - "101010": "101010", - "807070": "5c6889", - "ef6f8f": "996cd2", - "ffffff": "f7f5ff", - "ddcccc": "c3c5d9", - "6f8faf": "eb5244" - }, - "2": { - "107090": "c72537", - "af4f6f": "197d46", - "7fcfdf": "ff9a68", - "ffaebb": "7dec9d", - "101010": "101010", - "807070": "7f5c89", - "ef6f8f": "5dae7d", - "ffffff": "fff5fc", - "ddcccc": "d9c3d6", - "6f8faf": "eb5244" - } +"1": { +"101010": "101010", +"8a2843": "452f89", +"235a99": "a63071", +"895c72": "5c6889", +"d85a7a": "996cd2", +"528fcc": "d648b7", +"a88d8c": "8c8fa8", +"f18a78": "b52d27", +"fa8caa": "c7a6ee", +"64c8f3": "e974db", +"d9c3c3": "c3c5d9", +"fff5f5": "f7f5ff", +"65798c": "65798c" +}, +"2": { +"101010": "101010", +"8a2843": "0e6134", +"235a99": "900d1b", +"895c72": "7f5c89", +"d85a7a": "5dae7d", +"528fcc": "dd3d4f", +"a88d8c": "7f5c89", +"f18a78": "d14ea4", +"fa8caa": "7dec9d", +"64c8f3": "ff9a68", +"d9c3c3": "d9c3d6", +"fff5f5": "fff5fc", +"65798c": "65798c" +} } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/702.json b/public/images/pokemon/variant/exp/back/702.json index a5bb32bb790..12feb29a0fd 100644 --- a/public/images/pokemon/variant/exp/back/702.json +++ b/public/images/pokemon/variant/exp/back/702.json @@ -1,22 +1,32 @@ { "1": { "101010": "101010", - "4d4d4d": "6789b3", "262626": "2a3b5e", + "4d4d4d": "6789b3", + "bfbf86": "a3d1cc", + "f2f2aa": "ddfff5", "735c2e": "a53c42", + "997a3d": "c9685f", "f2c261": "ffd3b6", "bf994c": "e49f84", - "997a3d": "c9685f", - "000000": "000000" + "1d1d1d": "1a1c45", + "f8f8f8": "f8f8f8", + "464646": "424b8f", + "d97d21": "7cd6a1" }, "2": { "101010": "101010", - "4d4d4d": "197870", "262626": "072d38", + "4d4d4d": "197870", + "bfbf86": "aaa8d6", + "f2f2aa": "ece5ff", "735c2e": "1e0e27", + "997a3d": "2d1533", "f2c261": "5f3662", "bf994c": "432249", - "997a3d": "2d1533", - "000000": "000000" + "1d1d1d": "02172d", + "f8f8f8": "f8f8f8", + "464646": "17646c", + "d97d21": "d2fff1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/704.json b/public/images/pokemon/variant/exp/back/704.json index 179c06d54ac..1955f425b26 100644 --- a/public/images/pokemon/variant/exp/back/704.json +++ b/public/images/pokemon/variant/exp/back/704.json @@ -1,26 +1,30 @@ { "1": { - "766fa6": "7d699d", - "010202": "101010", - "6f5e80": "4e4094", - "e0d3e0": "fbb3d2", - "bbafc4": "da75a5", - "2f6b38": "033c55", - "a497c2": "da75a5", - "74d457": "348fa6", - "3da84d": "185d83", - "3f3d5e": "033c55" + "807380": "b93f84", + "f2daf2": "fbb3d2", + "bfacbf": "e56ca6", + "4d454d": "8a2166", + "101010": "101010", + "4d993d": "197497", + "66cc52": "3aa8c4", + "b8a1e5": "c7a1e5", + "8f7db3": "8b69c3", + "665980": "4e4094", + "de817e": "e5e1a1", + "c25054": "c68260" }, "2": { - "766fa6": "2f5d6f", - "010202": "101010", - "6f5e80": "274159", - "e0d3e0": "92d8c8", - "bbafc4": "5f8d86", - "2f6b38": "681b00", - "a497c2": "5f8d86", - "74d457": "bb7935", - "3da84d": "a34205", - "3f3d5e": "681b00" + "807380": "237e7f", + "f2daf2": "92d8c8", + "bfacbf": "63a99e", + "4d454d": "134557", + "101010": "101010", + "4d993d": "a34205", + "66cc52": "d27e26", + "b8a1e5": "4a9699", + "8f7db3": "2f667c", + "665980": "274159", + "de817e": "f2daf2", + "c25054": "9268a4" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/705.json b/public/images/pokemon/variant/exp/back/705.json index 93f270c6976..72dd07123ea 100644 --- a/public/images/pokemon/variant/exp/back/705.json +++ b/public/images/pokemon/variant/exp/back/705.json @@ -1,28 +1,26 @@ { "1": { - "807380": "b93f84", - "f2daf2": "fbb3d2", - "101010": "101010", - "4d454d": "8a2166", - "bfacbf": "ca719c", - "66cc52": "197497", - "b6f2aa": "197497", - "4d993d": "0c5474", - "665980": "4e4094", - "b8a1e5": "c7a1e5", - "8f7db3": "8b69c3" + "101010": "101010", + "4d454d": "8a2166", + "647543": "197497", + "98bd51": "3aa8c4", + "665980": "4e4094", + "807380": "b93f84", + "8f7db3": "8b69c3", + "bfacbf": "e56ca6", + "b8a1e5": "c7a1e5", + "f2daf2": "fbb3d2" }, "2": { - "807380": "20615e", - "f2daf2": "9cead8", - "101010": "101010", - "4d454d": "124143", - "bfacbf": "4e9b8f", - "66cc52": "a34205", - "b6f2aa": "a34205", - "4d993d": "842401", - "665980": "274159", - "b8a1e5": "4a9699", - "8f7db3": "2f667c" + "101010": "101010", + "4d454d": "194f51", + "647543": "a34205", + "98bd51": "d27e26", + "665980": "274159", + "807380": "2b736f", + "8f7db3": "2f667c", + "bfacbf": "5db6a9", + "b8a1e5": "4a9699", + "f2daf2": "9cead8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/713.json b/public/images/pokemon/variant/exp/back/713.json index 8c54b0ab776..61977f60470 100644 --- a/public/images/pokemon/variant/exp/back/713.json +++ b/public/images/pokemon/variant/exp/back/713.json @@ -1,22 +1,22 @@ { "1": { - "6994bf": "bf566d", - "f2ffff": "ffebf2", - "335980": "994255", + "608cba": "bf566d", "967acc": "732334", - "77b8d9": "d97389", "85d7f2": "f29eb3", "bff4ff": "ffbfda", + "335980": "994255", + "f2ffff": "ffebf2", + "77b8d9": "d97389", "101010": "101010" }, "2": { - "6994bf": "a8632a", - "f2ffff": "fff2ad", - "335980": "824628", + "608cba": "a8632a", "967acc": "2c7a75", - "77b8d9": "cc7b1e", "85d7f2": "e69e2b", "bff4ff": "fcc95c", + "335980": "824628", + "f2ffff": "fff2ad", + "77b8d9": "cc7b1e", "101010": "101010" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/female/6215.json b/public/images/pokemon/variant/exp/back/female/6215.json new file mode 100644 index 00000000000..a66e3780d12 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/female/6215.json @@ -0,0 +1,32 @@ +{ + "1": { + "724ca2": "12968b", + "9c9bce": "ae8976", + "503678": "0f5d6d", + "956cbe": "31dabb", + "514a80": "402010", + "dcdbf7": "d0b3a4", + "080808": "080808", + "28234b": "220d0a", + "7d6ca4": "672e26", + "584d80": "401914", + "f6f6ff": "f6f6ff", + "bdbdc5": "bdbdc5", + "c52973": "ea903f" + }, + "2": { + "724ca2": "982e33", + "9c9bce": "3c8775", + "503678": "601522", + "956cbe": "cc5427", + "514a80": "14273a", + "dcdbf7": "60ae7e", + "080808": "080808", + "28234b": "0a191e", + "7d6ca4": "395962", + "584d80": "1c3942", + "f6f6ff": "f6f6ff", + "bdbdc5": "bdbdc5", + "c52973": "f49633" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/female/6215.json b/public/images/pokemon/variant/exp/female/6215.json new file mode 100644 index 00000000000..3198424563b --- /dev/null +++ b/public/images/pokemon/variant/exp/female/6215.json @@ -0,0 +1,38 @@ +{ + "1": { + "503678": "0f5d6d", + "080808": "080808", + "514a80": "402010", + "956cbe": "31dabb", + "9c9bce": "ae8976", + "724ca2": "12968b", + "dcdbf7": "d0b3a4", + "7d6ca4": "853a36", + "c58b08": "6e6f6f", + "ffde7b": "a7a7a7", + "584d80": "562627", + "28234b": "220d0a", + "c52973": "ea903f", + "bdbdc5": "bdbdc5", + "f6f6ff": "f6f6ff", + "000000": "000000" + }, + "2": { + "503678": "601522", + "080808": "080808", + "514a80": "14273a", + "956cbe": "cc5427", + "9c9bce": "3c8775", + "724ca2": "982e33", + "dcdbf7": "60ae7e", + "7d6ca4": "395962", + "c58b08": "ffa341", + "ffde7b": "ffe07e", + "584d80": "1c3942", + "28234b": "0a191e", + "c52973": "f49633", + "bdbdc5": "bdbdc5", + "f6f6ff": "f6f6ff", + "000000": "000000" + } +} \ No newline at end of file diff --git a/public/images/pokemon_icons_7.json b/public/images/pokemon_icons_7.json index 0523a232d79..03eeba88a70 100644 --- a/public/images/pokemon_icons_7.json +++ b/public/images/pokemon_icons_7.json @@ -5,7 +5,7 @@ "format": "RGBA8888", "size": { "w": 502, - "h": 323 + "h": 325 }, "scale": 1, "frames": [ @@ -324,48 +324,6 @@ "h": 29 } }, - { - "filename": "795", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 293, - "w": 28, - "h": 30 - } - }, - { - "filename": "795s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 28, - "y": 293, - "w": 28, - "h": 30 - } - }, { "filename": "798s", "rotated": false, @@ -381,8 +339,8 @@ "h": 29 }, "frame": { - "x": 112, - "y": 0, + "x": 0, + "y": 293, "w": 31, "h": 29 } @@ -402,7 +360,7 @@ "h": 28 }, "frame": { - "x": 143, + "x": 112, "y": 0, "w": 30, "h": 28 @@ -423,8 +381,8 @@ "h": 28 }, "frame": { - "x": 173, - "y": 0, + "x": 108, + "y": 28, "w": 30, "h": 28 } @@ -444,7 +402,7 @@ "h": 28 }, "frame": { - "x": 203, + "x": 142, "y": 0, "w": 29, "h": 28 @@ -465,8 +423,8 @@ "h": 28 }, "frame": { - "x": 232, - "y": 0, + "x": 138, + "y": 28, "w": 29, "h": 28 } @@ -486,7 +444,7 @@ "h": 27 }, "frame": { - "x": 261, + "x": 171, "y": 0, "w": 29, "h": 27 @@ -507,7 +465,7 @@ "h": 27 }, "frame": { - "x": 290, + "x": 200, "y": 0, "w": 29, "h": 27 @@ -528,7 +486,7 @@ "h": 27 }, "frame": { - "x": 319, + "x": 229, "y": 0, "w": 28, "h": 27 @@ -549,7 +507,7 @@ "h": 27 }, "frame": { - "x": 347, + "x": 257, "y": 0, "w": 28, "h": 27 @@ -570,7 +528,7 @@ "h": 23 }, "frame": { - "x": 375, + "x": 285, "y": 0, "w": 32, "h": 23 @@ -591,14 +549,14 @@ "h": 23 }, "frame": { - "x": 407, + "x": 317, "y": 0, "w": 32, "h": 23 } }, { - "filename": "800", + "filename": "795", "rotated": false, "trimmed": true, "sourceSize": { @@ -619,7 +577,7 @@ } }, { - "filename": "800s", + "filename": "795s", "rotated": false, "trimmed": true, "sourceSize": { @@ -639,6 +597,48 @@ "h": 30 } }, + { + "filename": "800", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 28, + "h": 30 + }, + "frame": { + "x": 32, + "y": 145, + "w": 28, + "h": 30 + } + }, + { + "filename": "800s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 28, + "h": 30 + }, + "frame": { + "x": 32, + "y": 175, + "w": 28, + "h": 30 + } + }, { "filename": "805", "rotated": false, @@ -654,8 +654,8 @@ "h": 30 }, "frame": { - "x": 32, - "y": 145, + "x": 31, + "y": 205, "w": 28, "h": 30 } @@ -674,31 +674,10 @@ "w": 28, "h": 30 }, - "frame": { - "x": 32, - "y": 175, - "w": 28, - "h": 30 - } - }, - { - "filename": "773", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, "frame": { "x": 31, - "y": 205, - "w": 26, + "y": 235, + "w": 28, "h": 30 } }, @@ -718,32 +697,11 @@ }, "frame": { "x": 31, - "y": 235, + "y": 265, "w": 26, "h": 30 } }, - { - "filename": "792", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 28, - "h": 28 - }, - "frame": { - "x": 31, - "y": 265, - "w": 28, - "h": 28 - } - }, { "filename": "773-dark", "rotated": false, @@ -759,8 +717,8 @@ "h": 30 }, "frame": { - "x": 56, - "y": 293, + "x": 31, + "y": 295, "w": 26, "h": 30 } @@ -780,7 +738,7 @@ "h": 25 }, "frame": { - "x": 439, + "x": 349, "y": 0, "w": 30, "h": 25 @@ -801,12 +759,75 @@ "h": 25 }, "frame": { - "x": 469, + "x": 379, "y": 0, "w": 30, "h": 25 } }, + { + "filename": "785", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 28, + "h": 26 + }, + "frame": { + "x": 409, + "y": 0, + "w": 28, + "h": 26 + } + }, + { + "filename": "785s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 28, + "h": 26 + }, + "frame": { + "x": 437, + "y": 0, + "w": 28, + "h": 26 + } + }, + { + "filename": "792", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 28, + "h": 28 + }, + "frame": { + "x": 465, + "y": 0, + "w": 28, + "h": 28 + } + }, { "filename": "792s", "rotated": false, @@ -822,8 +843,8 @@ "h": 28 }, "frame": { - "x": 108, - "y": 29, + "x": 70, + "y": 57, "w": 28, "h": 28 } @@ -843,8 +864,8 @@ "h": 30 }, "frame": { - "x": 70, - "y": 57, + "x": 62, + "y": 85, "w": 26, "h": 30 } @@ -864,8 +885,8 @@ "h": 30 }, "frame": { - "x": 96, - "y": 57, + "x": 62, + "y": 115, "w": 26, "h": 30 } @@ -885,8 +906,8 @@ "h": 30 }, "frame": { - "x": 62, - "y": 87, + "x": 60, + "y": 145, "w": 26, "h": 30 } @@ -906,8 +927,8 @@ "h": 30 }, "frame": { - "x": 88, - "y": 87, + "x": 60, + "y": 175, "w": 26, "h": 30 } @@ -927,8 +948,8 @@ "h": 30 }, "frame": { - "x": 62, - "y": 117, + "x": 59, + "y": 205, "w": 26, "h": 30 } @@ -948,8 +969,8 @@ "h": 30 }, "frame": { - "x": 88, - "y": 117, + "x": 59, + "y": 235, "w": 26, "h": 30 } @@ -969,8 +990,8 @@ "h": 30 }, "frame": { - "x": 60, - "y": 147, + "x": 57, + "y": 265, "w": 26, "h": 30 } @@ -990,12 +1011,54 @@ "h": 30 }, "frame": { - "x": 86, - "y": 147, + "x": 57, + "y": 295, "w": 26, "h": 30 } }, + { + "filename": "764", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 88, + "y": 85, + "w": 25, + "h": 30 + } + }, + { + "filename": "764s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 88, + "y": 115, + "w": 25, + "h": 30 + } + }, { "filename": "773-ground", "rotated": false, @@ -1011,8 +1074,8 @@ "h": 30 }, "frame": { - "x": 60, - "y": 177, + "x": 86, + "y": 145, "w": 26, "h": 30 } @@ -1033,7 +1096,7 @@ }, "frame": { "x": 86, - "y": 177, + "y": 175, "w": 26, "h": 30 } @@ -1053,8 +1116,8 @@ "h": 30 }, "frame": { - "x": 57, - "y": 207, + "x": 85, + "y": 205, "w": 26, "h": 30 } @@ -1074,54 +1137,12 @@ "h": 30 }, "frame": { - "x": 83, - "y": 207, + "x": 85, + "y": 235, "w": 26, "h": 30 } }, - { - "filename": "2026", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 26, - "h": 28 - }, - "frame": { - "x": 57, - "y": 237, - "w": 26, - "h": 28 - } - }, - { - "filename": "772", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 25, - "h": 28 - }, - "frame": { - "x": 59, - "y": 265, - "w": 25, - "h": 28 - } - }, { "filename": "773-rock", "rotated": false, @@ -1136,53 +1157,11 @@ "w": 26, "h": 30 }, - "frame": { - "x": 82, - "y": 293, - "w": 26, - "h": 30 - } - }, - { - "filename": "2026s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 26, - "h": 28 - }, "frame": { "x": 83, - "y": 237, - "w": 26, - "h": 28 - } - }, - { - "filename": "772s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 25, - "h": 28 - }, - "frame": { - "x": 84, "y": 265, - "w": 25, - "h": 28 + "w": 26, + "h": 30 } }, { @@ -1200,14 +1179,14 @@ "h": 30 }, "frame": { - "x": 108, - "y": 293, + "x": 83, + "y": 295, "w": 26, "h": 30 } }, { - "filename": "764", + "filename": "772", "rotated": false, "trimmed": true, "sourceSize": { @@ -1215,16 +1194,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 0, + "x": 8, + "y": 2, "w": 25, - "h": 30 + "h": 28 }, "frame": { - "x": 122, + "x": 98, "y": 57, "w": 25, - "h": 30 + "h": 28 } }, { @@ -1242,14 +1221,14 @@ "h": 30 }, "frame": { - "x": 114, - "y": 87, + "x": 123, + "y": 56, "w": 26, "h": 30 } }, { - "filename": "773s", + "filename": "773", "rotated": false, "trimmed": true, "sourceSize": { @@ -1263,8 +1242,8 @@ "h": 30 }, "frame": { - "x": 114, - "y": 117, + "x": 149, + "y": 56, "w": 26, "h": 30 } @@ -1284,8 +1263,8 @@ "h": 30 }, "frame": { - "x": 112, - "y": 147, + "x": 113, + "y": 86, "w": 26, "h": 30 } @@ -1305,8 +1284,8 @@ "h": 30 }, "frame": { - "x": 112, - "y": 177, + "x": 139, + "y": 86, "w": 26, "h": 30 } @@ -1326,8 +1305,8 @@ "h": 30 }, "frame": { - "x": 109, - "y": 207, + "x": 113, + "y": 116, "w": 26, "h": 30 } @@ -1347,33 +1326,12 @@ "h": 30 }, "frame": { - "x": 109, - "y": 237, + "x": 139, + "y": 116, "w": 26, "h": 30 } }, - { - "filename": "785", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 109, - "y": 267, - "w": 28, - "h": 26 - } - }, { "filename": "773s-fairy", "rotated": false, @@ -1389,33 +1347,12 @@ "h": 30 }, "frame": { - "x": 134, - "y": 293, + "x": 112, + "y": 146, "w": 26, "h": 30 } }, - { - "filename": "801", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 136, - "y": 29, - "w": 20, - "h": 28 - } - }, { "filename": "773s-fighting", "rotated": false, @@ -1431,8 +1368,8 @@ "h": 30 }, "frame": { - "x": 156, - "y": 28, + "x": 138, + "y": 146, "w": 26, "h": 30 } @@ -1452,8 +1389,8 @@ "h": 30 }, "frame": { - "x": 182, - "y": 28, + "x": 112, + "y": 176, "w": 26, "h": 30 } @@ -1473,8 +1410,8 @@ "h": 30 }, "frame": { - "x": 208, - "y": 28, + "x": 138, + "y": 176, "w": 26, "h": 30 } @@ -1494,8 +1431,8 @@ "h": 30 }, "frame": { - "x": 234, - "y": 28, + "x": 111, + "y": 206, "w": 26, "h": 30 } @@ -1515,8 +1452,8 @@ "h": 30 }, "frame": { - "x": 147, - "y": 58, + "x": 137, + "y": 206, "w": 26, "h": 30 } @@ -1536,8 +1473,8 @@ "h": 30 }, "frame": { - "x": 173, - "y": 58, + "x": 111, + "y": 236, "w": 26, "h": 30 } @@ -1557,8 +1494,8 @@ "h": 30 }, "frame": { - "x": 199, - "y": 58, + "x": 137, + "y": 236, "w": 26, "h": 30 } @@ -1578,12 +1515,33 @@ "h": 30 }, "frame": { - "x": 225, - "y": 58, + "x": 109, + "y": 266, "w": 26, "h": 30 } }, + { + "filename": "794", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 29 + }, + "frame": { + "x": 109, + "y": 296, + "w": 25, + "h": 29 + } + }, { "filename": "773s-psychic", "rotated": false, @@ -1599,12 +1557,54 @@ "h": 30 }, "frame": { - "x": 140, - "y": 88, + "x": 135, + "y": 266, "w": 26, "h": 30 } }, + { + "filename": "794s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 29 + }, + "frame": { + "x": 134, + "y": 296, + "w": 25, + "h": 29 + } + }, + { + "filename": "796", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 18, + "h": 29 + }, + "frame": { + "x": 159, + "y": 296, + "w": 18, + "h": 29 + } + }, { "filename": "773s-rock", "rotated": false, @@ -1620,12 +1620,54 @@ "h": 30 }, "frame": { - "x": 166, - "y": 88, + "x": 161, + "y": 266, "w": 26, "h": 30 } }, + { + "filename": "796s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 18, + "h": 29 + }, + "frame": { + "x": 177, + "y": 296, + "w": 18, + "h": 29 + } + }, + { + "filename": "772s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 25, + "h": 28 + }, + "frame": { + "x": 167, + "y": 28, + "w": 25, + "h": 28 + } + }, { "filename": "773s-steel", "rotated": false, @@ -1642,7 +1684,7 @@ }, "frame": { "x": 192, - "y": 88, + "y": 27, "w": 26, "h": 30 } @@ -1663,13 +1705,13 @@ }, "frame": { "x": 218, - "y": 88, + "y": 27, "w": 26, "h": 30 } }, { - "filename": "764s", + "filename": "773s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1677,123 +1719,18 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 7, "y": 0, - "w": 25, + "w": 26, "h": 30 }, "frame": { - "x": 140, - "y": 118, - "w": 25, + "x": 244, + "y": 27, + "w": 26, "h": 30 } }, - { - "filename": "785s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 165, - "y": 118, - "w": 28, - "h": 26 - } - }, - { - "filename": "2075", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 29, - "h": 24 - }, - "frame": { - "x": 193, - "y": 118, - "w": 29, - "h": 24 - } - }, - { - "filename": "794", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 29 - }, - "frame": { - "x": 138, - "y": 148, - "w": 25, - "h": 29 - } - }, - { - "filename": "794s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 29 - }, - "frame": { - "x": 138, - "y": 177, - "w": 25, - "h": 29 - } - }, - { - "filename": "726", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 222, - "y": 118, - "w": 23, - "h": 24 - } - }, { "filename": "2103", "rotated": false, @@ -1809,12 +1746,75 @@ "h": 30 }, "frame": { - "x": 251, - "y": 58, + "x": 270, + "y": 27, "w": 21, "h": 30 } }, + { + "filename": "2026", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 26, + "h": 28 + }, + "frame": { + "x": 291, + "y": 23, + "w": 26, + "h": 28 + } + }, + { + "filename": "2026s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 26, + "h": 28 + }, + "frame": { + "x": 317, + "y": 23, + "w": 26, + "h": 28 + } + }, + { + "filename": "2075", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 29, + "h": 24 + }, + "frame": { + "x": 343, + "y": 25, + "w": 29, + "h": 24 + } + }, { "filename": "2075s", "rotated": false, @@ -1830,180 +1830,12 @@ "h": 24 }, "frame": { - "x": 244, - "y": 88, + "x": 372, + "y": 25, "w": 29, "h": 24 } }, - { - "filename": "748", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 26, - "h": 25 - }, - "frame": { - "x": 245, - "y": 112, - "w": 26, - "h": 25 - } - }, - { - "filename": "2103s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 21, - "h": 30 - }, - "frame": { - "x": 260, - "y": 28, - "w": 21, - "h": 30 - } - }, - { - "filename": "748s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 26, - "h": 25 - }, - "frame": { - "x": 281, - "y": 27, - "w": 26, - "h": 25 - } - }, - { - "filename": "2089", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 26, - "h": 25 - }, - "frame": { - "x": 307, - "y": 27, - "w": 26, - "h": 25 - } - }, - { - "filename": "2089s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 26, - "h": 25 - }, - "frame": { - "x": 333, - "y": 27, - "w": 26, - "h": 25 - } - }, - { - "filename": "724", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 19, - "h": 25 - }, - "frame": { - "x": 359, - "y": 27, - "w": 19, - "h": 25 - } - }, - { - "filename": "745-dusk", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 25 - }, - "frame": { - "x": 378, - "y": 23, - "w": 25, - "h": 25 - } - }, - { - "filename": "745s-dusk", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 25 - }, - "frame": { - "x": 403, - "y": 23, - "w": 25, - "h": 25 - } - }, { "filename": "746-school", "rotated": false, @@ -2019,8 +1851,8 @@ "h": 22 }, "frame": { - "x": 428, - "y": 25, + "x": 401, + "y": 26, "w": 28, "h": 22 } @@ -2040,14 +1872,14 @@ "h": 22 }, "frame": { - "x": 456, - "y": 25, + "x": 429, + "y": 26, "w": 28, "h": 22 } }, { - "filename": "796", + "filename": "760", "rotated": false, "trimmed": true, "sourceSize": { @@ -2055,20 +1887,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 18, - "h": 29 + "x": 13, + "y": 4, + "w": 17, + "h": 24 }, "frame": { - "x": 484, - "y": 25, - "w": 18, - "h": 29 + "x": 175, + "y": 56, + "w": 17, + "h": 24 } }, { - "filename": "796s", + "filename": "748", "rotated": false, "trimmed": true, "sourceSize": { @@ -2076,16 +1908,121 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 18, - "h": 29 + "x": 7, + "y": 5, + "w": 26, + "h": 25 }, "frame": { - "x": 272, - "y": 58, - "w": 18, - "h": 29 + "x": 192, + "y": 57, + "w": 26, + "h": 25 + } + }, + { + "filename": "748s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 26, + "h": 25 + }, + "frame": { + "x": 218, + "y": 57, + "w": 26, + "h": 25 + } + }, + { + "filename": "2089", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 26, + "h": 25 + }, + "frame": { + "x": 244, + "y": 57, + "w": 26, + "h": 25 + } + }, + { + "filename": "745-dusk", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 25 + }, + "frame": { + "x": 270, + "y": 57, + "w": 25, + "h": 25 + } + }, + { + "filename": "2089s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 26, + "h": 25 + }, + "frame": { + "x": 295, + "y": 51, + "w": 26, + "h": 25 + } + }, + { + "filename": "745s-dusk", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 25 + }, + "frame": { + "x": 321, + "y": 51, + "w": 25, + "h": 25 } }, { @@ -2103,8 +2040,8 @@ "h": 26 }, "frame": { - "x": 290, - "y": 52, + "x": 346, + "y": 49, "w": 24, "h": 26 } @@ -2124,159 +2061,12 @@ "h": 26 }, "frame": { - "x": 314, - "y": 52, + "x": 370, + "y": 49, "w": 24, "h": 26 } }, - { - "filename": "750", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 338, - "y": 52, - "w": 25, - "h": 24 - } - }, - { - "filename": "724s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 19, - "h": 25 - }, - "frame": { - "x": 273, - "y": 87, - "w": 19, - "h": 25 - } - }, - { - "filename": "776", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 26 - }, - "frame": { - "x": 271, - "y": 112, - "w": 23, - "h": 26 - } - }, - { - "filename": "750s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 292, - "y": 78, - "w": 25, - "h": 24 - } - }, - { - "filename": "726s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 317, - "y": 78, - "w": 23, - "h": 24 - } - }, - { - "filename": "776s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 26 - }, - "frame": { - "x": 340, - "y": 76, - "w": 23, - "h": 26 - } - }, - { - "filename": "801-original", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 363, - "y": 52, - "w": 20, - "h": 28 - } - }, { "filename": "765", "rotated": false, @@ -2292,14 +2082,56 @@ "h": 21 }, "frame": { - "x": 383, - "y": 48, + "x": 457, + "y": 28, "w": 28, "h": 21 } }, { - "filename": "727", + "filename": "760s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 4, + "w": 17, + "h": 24 + }, + "frame": { + "x": 485, + "y": 28, + "w": 17, + "h": 24 + } + }, + { + "filename": "2103s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 21, + "h": 30 + }, + "frame": { + "x": 165, + "y": 86, + "w": 21, + "h": 30 + } + }, + { + "filename": "783", "rotated": false, "trimmed": true, "sourceSize": { @@ -2308,14 +2140,56 @@ }, "spriteSourceSize": { "x": 9, + "y": 3, + "w": 21, + "h": 27 + }, + "frame": { + "x": 165, + "y": 116, + "w": 21, + "h": 27 + } + }, + { + "filename": "750", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, "y": 4, - "w": 23, + "w": 25, "h": 24 }, "frame": { - "x": 363, - "y": 80, - "w": 23, + "x": 186, + "y": 82, + "w": 25, + "h": 24 + } + }, + { + "filename": "750s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 211, + "y": 82, + "w": 25, "h": 24 } }, @@ -2334,159 +2208,12 @@ "h": 21 }, "frame": { - "x": 294, - "y": 102, + "x": 186, + "y": 106, "w": 28, "h": 21 } }, - { - "filename": "725", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 322, - "y": 102, - "w": 25, - "h": 21 - } - }, - { - "filename": "780", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 19 - }, - "frame": { - "x": 294, - "y": 123, - "w": 27, - "h": 19 - } - }, - { - "filename": "780s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 19 - }, - "frame": { - "x": 321, - "y": 123, - "w": 27, - "h": 19 - } - }, - { - "filename": "723", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 411, - "y": 48, - "w": 17, - "h": 22 - } - }, - { - "filename": "745", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 428, - "y": 47, - "w": 25, - "h": 23 - } - }, - { - "filename": "745s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 453, - "y": 47, - "w": 25, - "h": 23 - } - }, - { - "filename": "768", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 478, - "y": 54, - "w": 24, - "h": 23 - } - }, { "filename": "2028", "rotated": false, @@ -2502,8 +2229,8 @@ "h": 24 }, "frame": { - "x": 386, - "y": 69, + "x": 236, + "y": 82, "w": 25, "h": 24 } @@ -2523,56 +2250,14 @@ "h": 24 }, "frame": { - "x": 411, - "y": 70, + "x": 261, + "y": 82, "w": 25, "h": 24 } }, { - "filename": "727s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 436, - "y": 70, - "w": 23, - "h": 24 - } - }, - { - "filename": "781", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 19, - "h": 25 - }, - "frame": { - "x": 459, - "y": 70, - "w": 19, - "h": 25 - } - }, - { - "filename": "768s", + "filename": "725", "rotated": false, "trimmed": true, "sourceSize": { @@ -2581,15 +2266,15 @@ }, "spriteSourceSize": { "x": 8, - "y": 5, - "w": 24, - "h": 23 + "y": 7, + "w": 25, + "h": 21 }, "frame": { - "x": 478, - "y": 77, - "w": 24, - "h": 23 + "x": 214, + "y": 106, + "w": 25, + "h": 21 } }, { @@ -2607,14 +2292,14 @@ "h": 21 }, "frame": { - "x": 386, - "y": 93, + "x": 239, + "y": 106, "w": 25, "h": 21 } }, { - "filename": "2020", + "filename": "726", "rotated": false, "trimmed": true, "sourceSize": { @@ -2623,40 +2308,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 411, - "y": 94, - "w": 25, - "h": 22 - } - }, - { - "filename": "729", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, + "y": 4, "w": 23, "h": 24 }, "frame": { - "x": 436, - "y": 94, + "x": 264, + "y": 106, "w": 23, "h": 24 } }, { - "filename": "781s", + "filename": "780", "rotated": false, "trimmed": true, "sourceSize": { @@ -2664,62 +2328,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 19, - "h": 25 - }, - "frame": { - "x": 459, - "y": 95, - "w": 19, - "h": 25 - } - }, - { - "filename": "2105", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 478, - "y": 100, - "w": 24, - "h": 23 - } - }, - { - "filename": "761", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 16, + "x": 7, + "y": 7, + "w": 27, "h": 19 }, "frame": { - "x": 347, - "y": 102, - "w": 16, + "x": 186, + "y": 127, + "w": 27, "h": 19 } }, { - "filename": "729s", + "filename": "780s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2727,184 +2349,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 363, - "y": 104, - "w": 23, - "h": 24 - } - }, - { - "filename": "734", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 25, - "h": 16 - }, - "frame": { - "x": 386, - "y": 114, - "w": 25, - "h": 16 - } - }, - { - "filename": "734s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 25, - "h": 16 - }, - "frame": { - "x": 411, - "y": 116, - "w": 25, - "h": 16 - } - }, - { - "filename": "733", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, + "x": 7, "y": 7, - "w": 23, - "h": 21 + "w": 27, + "h": 19 }, "frame": { - "x": 436, - "y": 118, - "w": 23, - "h": 21 - } - }, - { - "filename": "732", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 459, - "y": 120, - "w": 19, - "h": 22 - } - }, - { - "filename": "2105s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 478, - "y": 123, - "w": 24, - "h": 23 - } - }, - { - "filename": "2050", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 348, - "y": 121, - "w": 15, - "h": 18 - } - }, - { - "filename": "733s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 363, - "y": 128, - "w": 23, - "h": 21 - } - }, - { - "filename": "2020s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 386, - "y": 130, - "w": 25, - "h": 22 + "x": 213, + "y": 127, + "w": 27, + "h": 19 } }, { @@ -2922,14 +2376,14 @@ "h": 22 }, "frame": { - "x": 411, - "y": 132, + "x": 240, + "y": 127, "w": 24, "h": 22 } }, { - "filename": "758s", + "filename": "726s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2937,104 +2391,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 24, - "h": 22 + "x": 8, + "y": 4, + "w": 23, + "h": 24 }, "frame": { - "x": 435, - "y": 139, - "w": 24, - "h": 22 + "x": 264, + "y": 130, + "w": 23, + "h": 24 } }, { - "filename": "732s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 459, - "y": 142, - "w": 19, - "h": 22 - } - }, - { - "filename": "2053", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 24, - "h": 22 - }, - "frame": { - "x": 478, - "y": 146, - "w": 24, - "h": 22 - } - }, - { - "filename": "801s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 135, - "y": 207, - "w": 20, - "h": 28 - } - }, - { - "filename": "801s-original", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 135, - "y": 235, - "w": 20, - "h": 28 - } - }, - { - "filename": "783", + "filename": "727", "rotated": false, "trimmed": true, "sourceSize": { @@ -3043,15 +2413,78 @@ }, "spriteSourceSize": { "x": 9, - "y": 3, - "w": 21, - "h": 27 + "y": 4, + "w": 23, + "h": 24 }, "frame": { - "x": 137, - "y": 263, - "w": 21, - "h": 27 + "x": 286, + "y": 82, + "w": 23, + "h": 24 + } + }, + { + "filename": "776", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 26 + }, + "frame": { + "x": 287, + "y": 106, + "w": 23, + "h": 26 + } + }, + { + "filename": "727s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 287, + "y": 132, + "w": 23, + "h": 24 + } + }, + { + "filename": "776s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 26 + }, + "frame": { + "x": 309, + "y": 76, + "w": 23, + "h": 26 } }, { @@ -3069,8 +2502,8 @@ "h": 27 }, "frame": { - "x": 155, - "y": 206, + "x": 310, + "y": 102, "w": 21, "h": 27 } @@ -3090,8 +2523,8 @@ "h": 26 }, "frame": { - "x": 155, - "y": 233, + "x": 310, + "y": 129, "w": 22, "h": 26 } @@ -3111,8 +2544,8 @@ "h": 26 }, "frame": { - "x": 158, - "y": 259, + "x": 332, + "y": 76, "w": 22, "h": 26 } @@ -3132,12 +2565,306 @@ "h": 26 }, "frame": { - "x": 160, - "y": 285, + "x": 331, + "y": 102, "w": 22, "h": 26 } }, + { + "filename": "745", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 23 + }, + "frame": { + "x": 354, + "y": 75, + "w": 25, + "h": 23 + } + }, + { + "filename": "788s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 26 + }, + "frame": { + "x": 332, + "y": 128, + "w": 22, + "h": 26 + } + }, + { + "filename": "724", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 19, + "h": 25 + }, + "frame": { + "x": 379, + "y": 75, + "w": 19, + "h": 25 + } + }, + { + "filename": "724s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 19, + "h": 25 + }, + "frame": { + "x": 394, + "y": 49, + "w": 19, + "h": 25 + } + }, + { + "filename": "745s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 23 + }, + "frame": { + "x": 413, + "y": 48, + "w": 25, + "h": 23 + } + }, + { + "filename": "781", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 19, + "h": 25 + }, + "frame": { + "x": 438, + "y": 48, + "w": 19, + "h": 25 + } + }, + { + "filename": "729", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 457, + "y": 49, + "w": 23, + "h": 24 + } + }, + { + "filename": "806", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 25 + }, + "frame": { + "x": 480, + "y": 52, + "w": 22, + "h": 25 + } + }, + { + "filename": "801-original", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 20, + "h": 28 + }, + "frame": { + "x": 398, + "y": 74, + "w": 20, + "h": 28 + } + }, + { + "filename": "801", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 20, + "h": 28 + }, + "frame": { + "x": 418, + "y": 71, + "w": 20, + "h": 28 + } + }, + { + "filename": "803", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 438, + "y": 73, + "w": 23, + "h": 25 + } + }, + { + "filename": "781s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 19, + "h": 25 + }, + "frame": { + "x": 461, + "y": 73, + "w": 19, + "h": 25 + } + }, + { + "filename": "806s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 25 + }, + "frame": { + "x": 480, + "y": 77, + "w": 22, + "h": 25 + } + }, + { + "filename": "734", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 25, + "h": 16 + }, + "frame": { + "x": 354, + "y": 98, + "w": 25, + "h": 16 + } + }, { "filename": "767", "rotated": false, @@ -3153,14 +2880,35 @@ "h": 14 }, "frame": { - "x": 245, - "y": 137, + "x": 353, + "y": 114, "w": 24, "h": 14 } }, { - "filename": "767s", + "filename": "803s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 354, + "y": 128, + "w": 23, + "h": 25 + } + }, + { + "filename": "732", "rotated": false, "trimmed": true, "sourceSize": { @@ -3169,15 +2917,603 @@ }, "spriteSourceSize": { "x": 10, - "y": 11, - "w": 24, - "h": 14 + "y": 6, + "w": 19, + "h": 22 }, "frame": { - "x": 269, - "y": 138, + "x": 379, + "y": 100, + "w": 19, + "h": 22 + } + }, + { + "filename": "801s-original", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 20, + "h": 28 + }, + "frame": { + "x": 377, + "y": 122, + "w": 20, + "h": 28 + } + }, + { + "filename": "729s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 398, + "y": 102, + "w": 23, + "h": 24 + } + }, + { + "filename": "768", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, "w": 24, - "h": 14 + "h": 23 + }, + "frame": { + "x": 397, + "y": 126, + "w": 24, + "h": 23 + } + }, + { + "filename": "801s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 20, + "h": 28 + }, + "frame": { + "x": 421, + "y": 99, + "w": 20, + "h": 28 + } + }, + { + "filename": "768s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 441, + "y": 98, + "w": 24, + "h": 23 + } + }, + { + "filename": "735", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 421, + "y": 127, + "w": 20, + "h": 24 + } + }, + { + "filename": "770", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 441, + "y": 121, + "w": 23, + "h": 24 + } + }, + { + "filename": "2050", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 465, + "y": 98, + "w": 15, + "h": 18 + } + }, + { + "filename": "756", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 24 + }, + "frame": { + "x": 480, + "y": 102, + "w": 22, + "h": 24 + } + }, + { + "filename": "2050s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 465, + "y": 116, + "w": 15, + "h": 18 + } + }, + { + "filename": "756s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 24 + }, + "frame": { + "x": 480, + "y": 126, + "w": 22, + "h": 24 + } + }, + { + "filename": "761", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 19 + }, + "frame": { + "x": 464, + "y": 134, + "w": 16, + "h": 19 + } + }, + { + "filename": "802-zenith", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 480, + "y": 150, + "w": 22, + "h": 24 + } + }, + { + "filename": "733", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 441, + "y": 145, + "w": 23, + "h": 21 + } + }, + { + "filename": "761s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 19 + }, + "frame": { + "x": 464, + "y": 153, + "w": 16, + "h": 19 + } + }, + { + "filename": "745-midnight", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 165, + "y": 143, + "w": 21, + "h": 24 + } + }, + { + "filename": "2020", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 186, + "y": 146, + "w": 25, + "h": 22 + } + }, + { + "filename": "2020s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 211, + "y": 146, + "w": 25, + "h": 22 + } + }, + { + "filename": "802", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 164, + "y": 167, + "w": 22, + "h": 24 + } + }, + { + "filename": "2105", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 186, + "y": 168, + "w": 24, + "h": 23 + } + }, + { + "filename": "2105s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 210, + "y": 168, + "w": 24, + "h": 23 + } + }, + { + "filename": "734s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 25, + "h": 16 + }, + "frame": { + "x": 164, + "y": 191, + "w": 25, + "h": 16 + } + }, + { + "filename": "770s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 163, + "y": 207, + "w": 23, + "h": 24 + } + }, + { + "filename": "2051", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 163, + "y": 231, + "w": 23, + "h": 24 + } + }, + { + "filename": "758s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 24, + "h": 22 + }, + "frame": { + "x": 189, + "y": 191, + "w": 24, + "h": 22 + } + }, + { + "filename": "2051s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 186, + "y": 213, + "w": 23, + "h": 24 + } + }, + { + "filename": "745s-midnight", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 213, + "y": 191, + "w": 21, + "h": 24 + } + }, + { + "filename": "2053", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 24, + "h": 22 + }, + "frame": { + "x": 209, + "y": 215, + "w": 24, + "h": 22 } }, { @@ -3195,8 +3531,8 @@ "h": 22 }, "frame": { - "x": 293, - "y": 142, + "x": 186, + "y": 237, "w": 24, "h": 22 } @@ -3216,14 +3552,14 @@ "h": 22 }, "frame": { - "x": 317, - "y": 142, + "x": 210, + "y": 237, "w": 23, "h": 22 } }, { - "filename": "769s", + "filename": "802s-zenith", "rotated": false, "trimmed": true, "sourceSize": { @@ -3231,125 +3567,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 340, - "y": 142, - "w": 23, - "h": 22 - } - }, - { - "filename": "752", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 23, - "h": 18 - }, - "frame": { - "x": 363, - "y": 149, - "w": 23, - "h": 18 - } - }, - { - "filename": "2074", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 24, - "h": 15 - }, - "frame": { - "x": 386, - "y": 152, - "w": 24, - "h": 15 - } - }, - { - "filename": "2074s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 24, - "h": 15 - }, - "frame": { - "x": 410, - "y": 154, - "w": 24, - "h": 15 - } - }, - { - "filename": "752s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 23, - "h": 18 - }, - "frame": { - "x": 434, - "y": 161, - "w": 23, - "h": 18 - } - }, - { - "filename": "745-midnight", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, + "x": 13, "y": 4, - "w": 21, + "w": 22, "h": 24 }, "frame": { - "x": 457, - "y": 164, - "w": 21, + "x": 187, + "y": 259, + "w": 22, "h": 24 } }, { - "filename": "770", + "filename": "802s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3357,20 +3588,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 13, "y": 4, - "w": 23, + "w": 22, "h": 24 }, "frame": { - "x": 478, - "y": 168, - "w": 23, + "x": 209, + "y": 259, + "w": 22, "h": 24 } }, { - "filename": "722", + "filename": "746", "rotated": false, "trimmed": true, "sourceSize": { @@ -3379,19 +3610,40 @@ }, "spriteSourceSize": { "x": 12, - "y": 8, - "w": 17, - "h": 18 + "y": 11, + "w": 18, + "h": 13 }, "frame": { - "x": 163, - "y": 188, - "w": 17, - "h": 18 + "x": 187, + "y": 283, + "w": 18, + "h": 13 } }, { - "filename": "735", + "filename": "733s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 236, + "y": 149, + "w": 23, + "h": 21 + } + }, + { + "filename": "807", "rotated": false, "trimmed": true, "sourceSize": { @@ -3401,308 +3653,14 @@ "spriteSourceSize": { "x": 11, "y": 4, - "w": 20, - "h": 24 - }, - "frame": { - "x": 163, - "y": 164, - "w": 20, - "h": 24 - } - }, - { - "filename": "789", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 20 - }, - "frame": { - "x": 165, - "y": 144, - "w": 23, - "h": 20 - } - }, - { - "filename": "788s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, "w": 22, - "h": 26 + "h": 24 }, "frame": { - "x": 176, - "y": 206, + "x": 234, + "y": 170, "w": 22, - "h": 26 - } - }, - { - "filename": "803", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 177, - "y": 232, - "w": 23, - "h": 25 - } - }, - { - "filename": "786", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 20, - "h": 25 - }, - "frame": { - "x": 180, - "y": 257, - "w": 20, - "h": 25 - } - }, - { - "filename": "786s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 20, - "h": 25 - }, - "frame": { - "x": 182, - "y": 282, - "w": 20, - "h": 25 - } - }, - { - "filename": "778-busted", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 12, - "w": 21, - "h": 16 - }, - "frame": { - "x": 182, - "y": 307, - "w": 21, - "h": 16 - } - }, - { - "filename": "757", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 19, - "h": 18 - }, - "frame": { - "x": 180, - "y": 188, - "w": 19, - "h": 18 - } - }, - { - "filename": "735s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 20, "h": 24 - }, - "frame": { - "x": 183, - "y": 164, - "w": 20, - "h": 24 - } - }, - { - "filename": "728", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 188, - "y": 144, - "w": 17, - "h": 20 - } - }, - { - "filename": "770s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 205, - "y": 142, - "w": 23, - "h": 24 - } - }, - { - "filename": "760", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 228, - "y": 142, - "w": 17, - "h": 24 - } - }, - { - "filename": "803s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 203, - "y": 166, - "w": 23, - "h": 25 - } - }, - { - "filename": "806", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 25 - }, - "frame": { - "x": 226, - "y": 166, - "w": 22, - "h": 25 - } - }, - { - "filename": "789s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 20 - }, - "frame": { - "x": 199, - "y": 191, - "w": 23, - "h": 20 } }, { @@ -3720,14 +3678,14 @@ "h": 21 }, "frame": { - "x": 198, - "y": 211, + "x": 234, + "y": 194, "w": 22, "h": 21 } }, { - "filename": "806s", + "filename": "807s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3735,125 +3693,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 25 - }, - "frame": { - "x": 200, - "y": 232, - "w": 22, - "h": 25 - } - }, - { - "filename": "756", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 24 - }, - "frame": { - "x": 200, - "y": 257, - "w": 22, - "h": 24 - } - }, - { - "filename": "745s-midnight", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, + "x": 11, "y": 4, - "w": 21, + "w": 22, "h": 24 }, "frame": { - "x": 202, - "y": 281, - "w": 21, - "h": 24 - } - }, - { - "filename": "2027", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 203, - "y": 305, - "w": 21, - "h": 18 - } - }, - { - "filename": "2051", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 222, - "y": 191, - "w": 23, - "h": 24 - } - }, - { - "filename": "778s-busted", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 12, - "w": 21, - "h": 16 - }, - "frame": { - "x": 220, + "x": 233, "y": 215, - "w": 21, - "h": 16 + "w": 22, + "h": 24 } }, { - "filename": "756s", + "filename": "738s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3862,19 +3715,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, + "y": 6, "w": 22, - "h": 24 + "h": 21 }, "frame": { - "x": 222, - "y": 231, + "x": 233, + "y": 239, "w": 22, - "h": 24 + "h": 21 } }, { - "filename": "802", + "filename": "769s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3882,16 +3735,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 4, - "w": 22, - "h": 24 + "x": 8, + "y": 6, + "w": 23, + "h": 22 }, "frame": { - "x": 222, - "y": 255, - "w": 22, - "h": 24 + "x": 231, + "y": 260, + "w": 23, + "h": 22 + } + }, + { + "filename": "767s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 24, + "h": 14 + }, + "frame": { + "x": 205, + "y": 283, + "w": 24, + "h": 14 } }, { @@ -3909,8 +3783,71 @@ "h": 24 }, "frame": { - "x": 223, - "y": 279, + "x": 195, + "y": 297, + "w": 21, + "h": 24 + } + }, + { + "filename": "735s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 216, + "y": 297, + "w": 20, + "h": 24 + } + }, + { + "filename": "752", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 23, + "h": 18 + }, + "frame": { + "x": 259, + "y": 154, + "w": 23, + "h": 18 + } + }, + { + "filename": "763s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 256, + "y": 172, "w": 21, "h": 24 } @@ -3930,134 +3867,8 @@ "h": 20 }, "frame": { - "x": 224, - "y": 303, - "w": 22, - "h": 20 - } - }, - { - "filename": "746", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 18, - "h": 13 - }, - "frame": { - "x": 245, - "y": 151, - "w": 18, - "h": 13 - } - }, - { - "filename": "760s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 248, - "y": 164, - "w": 17, - "h": 24 - } - }, - { - "filename": "2051s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 265, - "y": 152, - "w": 23, - "h": 24 - } - }, - { - "filename": "738s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 265, - "y": 176, - "w": 22, - "h": 21 - } - }, - { - "filename": "743", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 20, - "h": 22 - }, - "frame": { - "x": 245, - "y": 191, - "w": 20, - "h": 22 - } - }, - { - "filename": "747s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 20 - }, - "frame": { - "x": 265, - "y": 197, + "x": 256, + "y": 196, "w": 22, "h": 20 } @@ -4077,8 +3888,8 @@ "h": 23 }, "frame": { - "x": 288, - "y": 164, + "x": 255, + "y": 216, "w": 22, "h": 23 } @@ -4098,77 +3909,14 @@ "h": 23 }, "frame": { - "x": 310, - "y": 164, + "x": 255, + "y": 239, "w": 22, "h": 23 } }, { - "filename": "802s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 287, - "y": 187, - "w": 22, - "h": 24 - } - }, - { - "filename": "807", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 309, - "y": 187, - "w": 22, - "h": 24 - } - }, - { - "filename": "807s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 332, - "y": 164, - "w": 22, - "h": 24 - } - }, - { - "filename": "749", + "filename": "789", "rotated": false, "trimmed": true, "sourceSize": { @@ -4177,19 +3925,61 @@ }, "spriteSourceSize": { "x": 10, + "y": 6, + "w": 23, + "h": 20 + }, + "frame": { + "x": 254, + "y": 262, + "w": 23, + "h": 20 + } + }, + { + "filename": "752s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 23, + "h": 18 + }, + "frame": { + "x": 282, + "y": 156, + "w": 23, + "h": 18 + } + }, + { + "filename": "743", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, "y": 5, - "w": 21, - "h": 23 + "w": 20, + "h": 22 }, "frame": { - "x": 331, - "y": 188, - "w": 21, - "h": 23 + "x": 277, + "y": 174, + "w": 20, + "h": 22 } }, { - "filename": "2037", + "filename": "732s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4198,61 +3988,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 7, - "w": 22, - "h": 21 + "y": 6, + "w": 19, + "h": 22 }, "frame": { - "x": 354, - "y": 167, - "w": 22, - "h": 21 + "x": 278, + "y": 196, + "w": 19, + "h": 22 } }, { - "filename": "749s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 352, - "y": 188, - "w": 21, - "h": 23 - } - }, - { - "filename": "2037s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 21 - }, - "frame": { - "x": 376, - "y": 167, - "w": 22, - "h": 21 - } - }, - { - "filename": "763s", + "filename": "786", "rotated": false, "trimmed": true, "sourceSize": { @@ -4261,15 +4009,57 @@ }, "spriteSourceSize": { "x": 11, - "y": 4, - "w": 21, - "h": 24 + "y": 3, + "w": 20, + "h": 25 }, "frame": { - "x": 373, - "y": 188, - "w": 21, - "h": 24 + "x": 277, + "y": 218, + "w": 20, + "h": 25 + } + }, + { + "filename": "786s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 20, + "h": 25 + }, + "frame": { + "x": 277, + "y": 243, + "w": 20, + "h": 25 + } + }, + { + "filename": "739", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 20, + "h": 21 + }, + "frame": { + "x": 277, + "y": 268, + "w": 20, + "h": 21 } }, { @@ -4287,54 +4077,12 @@ "h": 24 }, "frame": { - "x": 394, - "y": 188, + "x": 297, + "y": 174, "w": 13, "h": 24 } }, - { - "filename": "790", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 19 - }, - "frame": { - "x": 398, - "y": 169, - "w": 21, - "h": 19 - } - }, - { - "filename": "2050s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 419, - "y": 169, - "w": 15, - "h": 18 - } - }, { "filename": "755s", "rotated": false, @@ -4350,8 +4098,8 @@ "h": 24 }, "frame": { - "x": 407, - "y": 188, + "x": 297, + "y": 198, "w": 13, "h": 24 } @@ -4371,180 +4119,12 @@ "h": 24 }, "frame": { - "x": 420, - "y": 187, + "x": 297, + "y": 222, "w": 21, "h": 24 } }, - { - "filename": "761s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 16, - "h": 19 - }, - "frame": { - "x": 441, - "y": 179, - "w": 16, - "h": 19 - } - }, - { - "filename": "775", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 21, - "h": 20 - }, - "frame": { - "x": 457, - "y": 188, - "w": 21, - "h": 20 - } - }, - { - "filename": "775s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 21, - "h": 20 - }, - "frame": { - "x": 478, - "y": 192, - "w": 21, - "h": 20 - } - }, - { - "filename": "751", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 441, - "y": 198, - "w": 14, - "h": 20 - } - }, - { - "filename": "779", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 20 - }, - "frame": { - "x": 420, - "y": 211, - "w": 21, - "h": 20 - } - }, - { - "filename": "779s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 20 - }, - "frame": { - "x": 455, - "y": 208, - "w": 21, - "h": 20 - } - }, - { - "filename": "751s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 441, - "y": 218, - "w": 14, - "h": 20 - } - }, - { - "filename": "790s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 19 - }, - "frame": { - "x": 476, - "y": 212, - "w": 21, - "h": 19 - } - }, { "filename": "793s", "rotated": false, @@ -4560,14 +4140,161 @@ "h": 24 }, "frame": { - "x": 455, - "y": 228, + "x": 297, + "y": 246, "w": 21, "h": 24 } }, { - "filename": "2019", + "filename": "747s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 20 + }, + "frame": { + "x": 297, + "y": 270, + "w": 22, + "h": 20 + } + }, + { + "filename": "2074", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 13, + "w": 24, + "h": 15 + }, + "frame": { + "x": 231, + "y": 282, + "w": 24, + "h": 15 + } + }, + { + "filename": "2037", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 255, + "y": 282, + "w": 22, + "h": 21 + } + }, + { + "filename": "744", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 236, + "y": 297, + "w": 19, + "h": 22 + } + }, + { + "filename": "743s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 20, + "h": 22 + }, + "frame": { + "x": 255, + "y": 303, + "w": 20, + "h": 22 + } + }, + { + "filename": "754", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 275, + "y": 303, + "w": 20, + "h": 22 + } + }, + { + "filename": "746s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 18, + "h": 13 + }, + "frame": { + "x": 277, + "y": 290, + "w": 18, + "h": 13 + } + }, + { + "filename": "749", "rotated": false, "trimmed": true, "sourceSize": { @@ -4578,17 +4305,101 @@ "x": 10, "y": 5, "w": 21, - "h": 21 + "h": 23 }, "frame": { - "x": 476, - "y": 231, + "x": 295, + "y": 290, "w": 21, - "h": 21 + "h": 23 } }, { - "filename": "2019s", + "filename": "722", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 305, + "y": 156, + "w": 17, + "h": 18 + } + }, + { + "filename": "741-sensu", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 310, + "y": 174, + "w": 17, + "h": 23 + } + }, + { + "filename": "741s-sensu", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 310, + "y": 197, + "w": 17, + "h": 23 + } + }, + { + "filename": "737", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 18, + "h": 19 + }, + "frame": { + "x": 322, + "y": 155, + "w": 18, + "h": 19 + } + }, + { + "filename": "749s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4599,55 +4410,13 @@ "x": 10, "y": 5, "w": 21, - "h": 21 + "h": 23 }, "frame": { - "x": 287, - "y": 211, + "x": 327, + "y": 174, "w": 21, - "h": 21 - } - }, - { - "filename": "2052", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 308, - "y": 211, - "w": 21, - "h": 21 - } - }, - { - "filename": "2052s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 329, - "y": 211, - "w": 21, - "h": 21 + "h": 23 } }, { @@ -4665,8 +4434,8 @@ "h": 23 }, "frame": { - "x": 350, - "y": 211, + "x": 327, + "y": 197, "w": 21, "h": 23 } @@ -4686,75 +4455,12 @@ "h": 23 }, "frame": { - "x": 371, - "y": 212, + "x": 318, + "y": 220, "w": 21, "h": 23 } }, - { - "filename": "743s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 20, - "h": 22 - }, - "frame": { - "x": 392, - "y": 212, - "w": 20, - "h": 22 - } - }, - { - "filename": "739", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 20, - "h": 21 - }, - "frame": { - "x": 245, - "y": 213, - "w": 20, - "h": 21 - } - }, - { - "filename": "754", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 22 - }, - "frame": { - "x": 244, - "y": 234, - "w": 20, - "h": 22 - } - }, { "filename": "754s", "rotated": false, @@ -4770,12 +4476,33 @@ "h": 22 }, "frame": { - "x": 244, - "y": 256, + "x": 318, + "y": 243, "w": 20, "h": 22 } }, + { + "filename": "728", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 340, + "y": 154, + "w": 17, + "h": 20 + } + }, { "filename": "739s", "rotated": false, @@ -4791,14 +4518,14 @@ "h": 21 }, "frame": { - "x": 244, - "y": 278, + "x": 357, + "y": 153, "w": 20, "h": 21 } }, { - "filename": "2027s", + "filename": "789s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4807,19 +4534,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 10, - "w": 21, - "h": 18 + "y": 6, + "w": 23, + "h": 20 }, "frame": { - "x": 265, - "y": 217, - "w": 21, - "h": 18 + "x": 348, + "y": 174, + "w": 23, + "h": 20 } }, { - "filename": "744", + "filename": "2037s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4827,16 +4554,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 19, - "h": 22 + "x": 10, + "y": 7, + "w": 22, + "h": 21 }, "frame": { - "x": 264, - "y": 235, - "w": 19, - "h": 22 + "x": 348, + "y": 194, + "w": 22, + "h": 21 } }, { @@ -4854,33 +4581,12 @@ "h": 22 }, "frame": { - "x": 264, - "y": 257, + "x": 377, + "y": 150, "w": 19, "h": 22 } }, - { - "filename": "741-pompom", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 20 - }, - "frame": { - "x": 264, - "y": 279, - "w": 20, - "h": 20 - } - }, { "filename": "762", "rotated": false, @@ -4896,8 +4602,8 @@ "h": 23 }, "frame": { - "x": 246, - "y": 299, + "x": 319, + "y": 265, "w": 18, "h": 23 } @@ -4917,54 +4623,12 @@ "h": 23 }, "frame": { - "x": 264, - "y": 299, + "x": 339, + "y": 220, "w": 18, "h": 23 } }, - { - "filename": "741-sensu", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 283, - "y": 235, - "w": 17, - "h": 23 - } - }, - { - "filename": "728s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 283, - "y": 258, - "w": 17, - "h": 20 - } - }, { "filename": "741-pau", "rotated": false, @@ -4980,8 +4644,8 @@ "h": 22 }, "frame": { - "x": 300, - "y": 232, + "x": 338, + "y": 243, "w": 18, "h": 22 } @@ -5001,35 +4665,14 @@ "h": 22 }, "frame": { - "x": 318, - "y": 232, + "x": 337, + "y": 265, "w": 18, "h": 22 } }, { - "filename": "741s-pompom", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 20 - }, - "frame": { - "x": 300, - "y": 254, - "w": 20, - "h": 20 - } - }, - { - "filename": "723s", + "filename": "723", "rotated": false, "trimmed": true, "sourceSize": { @@ -5043,14 +4686,14 @@ "h": 22 }, "frame": { - "x": 284, - "y": 278, + "x": 357, + "y": 215, "w": 17, "h": 22 } }, { - "filename": "741s-sensu", + "filename": "2074s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5058,20 +4701,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 5, - "w": 17, - "h": 23 + "x": 8, + "y": 13, + "w": 24, + "h": 15 }, "frame": { - "x": 282, - "y": 300, - "w": 17, - "h": 23 + "x": 397, + "y": 149, + "w": 24, + "h": 15 } }, { - "filename": "731", + "filename": "741-pompom", "rotated": false, "trimmed": true, "sourceSize": { @@ -5079,16 +4722,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 10, + "y": 7, + "w": 20, + "h": 20 + }, + "frame": { + "x": 421, + "y": 151, + "w": 20, + "h": 20 + } + }, + { + "filename": "775", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, "y": 6, - "w": 17, - "h": 22 + "w": 21, + "h": 20 }, "frame": { - "x": 320, - "y": 254, - "w": 17, - "h": 22 + "x": 396, + "y": 164, + "w": 21, + "h": 20 } }, { @@ -5106,14 +4770,119 @@ "h": 20 }, "frame": { - "x": 301, - "y": 274, + "x": 377, + "y": 172, "w": 19, "h": 20 } }, { - "filename": "722s", + "filename": "775s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 21, + "h": 20 + }, + "frame": { + "x": 417, + "y": 171, + "w": 21, + "h": 20 + } + }, + { + "filename": "778-busted", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 12, + "w": 21, + "h": 16 + }, + "frame": { + "x": 396, + "y": 184, + "w": 21, + "h": 16 + } + }, + { + "filename": "778s-busted", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 12, + "w": 21, + "h": 16 + }, + "frame": { + "x": 417, + "y": 191, + "w": 21, + "h": 16 + } + }, + { + "filename": "779", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, + "h": 20 + }, + "frame": { + "x": 441, + "y": 166, + "w": 21, + "h": 20 + } + }, + { + "filename": "2019", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 21 + }, + "frame": { + "x": 438, + "y": 186, + "w": 21, + "h": 21 + } + }, + { + "filename": "737s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5123,18 +4892,18 @@ "spriteSourceSize": { "x": 12, "y": 8, - "w": 17, - "h": 18 + "w": 18, + "h": 19 }, "frame": { - "x": 320, - "y": 276, - "w": 17, - "h": 18 + "x": 462, + "y": 172, + "w": 18, + "h": 19 } }, { - "filename": "753", + "filename": "779s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5142,20 +4911,125 @@ "h": 30 }, "spriteSourceSize": { - "x": 14, - "y": 8, - "w": 14, + "x": 10, + "y": 7, + "w": 21, + "h": 20 + }, + "frame": { + "x": 480, + "y": 174, + "w": 21, + "h": 20 + } + }, + { + "filename": "790", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, "h": 19 }, "frame": { - "x": 336, - "y": 232, - "w": 14, + "x": 459, + "y": 191, + "w": 21, "h": 19 } }, { - "filename": "2088", + "filename": "790s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, + "h": 19 + }, + "frame": { + "x": 480, + "y": 194, + "w": 21, + "h": 19 + } + }, + { + "filename": "2019s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 21 + }, + "frame": { + "x": 370, + "y": 194, + "w": 21, + "h": 21 + } + }, + { + "filename": "723s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 17, + "h": 22 + }, + "frame": { + "x": 374, + "y": 215, + "w": 17, + "h": 22 + } + }, + { + "filename": "2052", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 391, + "y": 200, + "w": 21, + "h": 21 + } + }, + { + "filename": "2027", "rotated": false, "trimmed": true, "sourceSize": { @@ -5169,14 +5043,56 @@ "h": 18 }, "frame": { - "x": 350, - "y": 234, + "x": 391, + "y": 221, "w": 21, "h": 18 } }, { - "filename": "2088s", + "filename": "2052s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 412, + "y": 207, + "w": 21, + "h": 21 + } + }, + { + "filename": "741s-pompom", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 20 + }, + "frame": { + "x": 433, + "y": 207, + "w": 20, + "h": 20 + } + }, + { + "filename": "2027s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5190,8 +5106,8 @@ "h": 18 }, "frame": { - "x": 371, - "y": 235, + "x": 412, + "y": 228, "w": 21, "h": 18 } @@ -5211,12 +5127,75 @@ "h": 20 }, "frame": { - "x": 392, - "y": 234, + "x": 433, + "y": 227, "w": 19, "h": 20 } }, + { + "filename": "2088", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 21, + "h": 18 + }, + "frame": { + "x": 453, + "y": 210, + "w": 21, + "h": 18 + } + }, + { + "filename": "2088s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 21, + "h": 18 + }, + "frame": { + "x": 452, + "y": 228, + "w": 21, + "h": 18 + } + }, + { + "filename": "757", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 18 + }, + "frame": { + "x": 474, + "y": 213, + "w": 19, + "h": 18 + } + }, { "filename": "757s", "rotated": false, @@ -5232,12 +5211,54 @@ "h": 18 }, "frame": { - "x": 301, - "y": 294, + "x": 473, + "y": 231, "w": 19, "h": 18 } }, + { + "filename": "731", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 316, + "y": 290, + "w": 17, + "h": 22 + } + }, + { + "filename": "771", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 11, + "w": 18, + "h": 13 + }, + "frame": { + "x": 316, + "y": 312, + "w": 18, + "h": 13 + } + }, { "filename": "731s", "rotated": false, @@ -5253,12 +5274,33 @@ "h": 22 }, "frame": { - "x": 320, - "y": 294, + "x": 333, + "y": 288, "w": 17, "h": 22 } }, + { + "filename": "736", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 17, + "h": 13 + }, + "frame": { + "x": 334, + "y": 310, + "w": 17, + "h": 13 + } + }, { "filename": "778-disguised", "rotated": false, @@ -5274,8 +5316,8 @@ "h": 22 }, "frame": { - "x": 337, - "y": 252, + "x": 350, + "y": 287, "w": 17, "h": 22 } @@ -5295,54 +5337,12 @@ "h": 22 }, "frame": { - "x": 354, - "y": 252, + "x": 355, + "y": 265, "w": 17, "h": 22 } }, - { - "filename": "737", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 18, - "h": 19 - }, - "frame": { - "x": 337, - "y": 274, - "w": 18, - "h": 19 - } - }, - { - "filename": "737s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 18, - "h": 19 - }, - "frame": { - "x": 371, - "y": 253, - "w": 18, - "h": 19 - } - }, { "filename": "741", "rotated": false, @@ -5358,12 +5358,96 @@ "h": 19 }, "frame": { - "x": 337, - "y": 293, + "x": 356, + "y": 246, "w": 17, "h": 19 } }, + { + "filename": "728s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 373, + "y": 237, + "w": 17, + "h": 20 + } + }, + { + "filename": "722s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 390, + "y": 239, + "w": 17, + "h": 18 + } + }, + { + "filename": "736s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 17, + "h": 13 + }, + "frame": { + "x": 351, + "y": 309, + "w": 17, + "h": 13 + } + }, + { + "filename": "771s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 11, + "w": 18, + "h": 13 + }, + "frame": { + "x": 373, + "y": 257, + "w": 18, + "h": 13 + } + }, { "filename": "741s", "rotated": false, @@ -5379,8 +5463,8 @@ "h": 19 }, "frame": { - "x": 355, - "y": 274, + "x": 372, + "y": 270, "w": 17, "h": 19 } @@ -5400,12 +5484,33 @@ "h": 19 }, "frame": { - "x": 354, - "y": 293, + "x": 367, + "y": 289, "w": 17, "h": 19 } }, + { + "filename": "808", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 17 + }, + "frame": { + "x": 368, + "y": 308, + "w": 17, + "h": 17 + } + }, { "filename": "759s", "rotated": false, @@ -5421,96 +5526,12 @@ "h": 19 }, "frame": { - "x": 372, - "y": 272, + "x": 391, + "y": 257, "w": 17, "h": 19 } }, - { - "filename": "777", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 17, - "h": 19 - }, - "frame": { - "x": 389, - "y": 254, - "w": 17, - "h": 19 - } - }, - { - "filename": "774", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 389, - "y": 273, - "w": 17, - "h": 18 - } - }, - { - "filename": "774s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 389, - "y": 273, - "w": 17, - "h": 18 - } - }, - { - "filename": "753s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 8, - "w": 14, - "h": 19 - }, - "frame": { - "x": 406, - "y": 254, - "w": 14, - "h": 19 - } - }, { "filename": "774-blue", "rotated": false, @@ -5526,35 +5547,14 @@ "h": 18 }, "frame": { - "x": 406, - "y": 273, + "x": 389, + "y": 276, "w": 17, "h": 18 } }, { - "filename": "746s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 18, - "h": 13 - }, - "frame": { - "x": 423, - "y": 231, - "w": 18, - "h": 13 - } - }, - { - "filename": "777s", + "filename": "777", "rotated": false, "trimmed": true, "sourceSize": { @@ -5568,54 +5568,12 @@ "h": 19 }, "frame": { - "x": 420, - "y": 244, + "x": 408, + "y": 246, "w": 17, "h": 19 } }, - { - "filename": "771", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 11, - "w": 18, - "h": 13 - }, - "frame": { - "x": 437, - "y": 244, - "w": 18, - "h": 13 - } - }, - { - "filename": "771s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 11, - "w": 18, - "h": 13 - }, - "frame": { - "x": 437, - "y": 257, - "w": 18, - "h": 13 - } - }, { "filename": "774-green", "rotated": false, @@ -5631,12 +5589,33 @@ "h": 18 }, "frame": { - "x": 455, - "y": 252, + "x": 408, + "y": 265, "w": 17, "h": 18 } }, + { + "filename": "777s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 17, + "h": 19 + }, + "frame": { + "x": 425, + "y": 247, + "w": 17, + "h": 19 + } + }, { "filename": "774-indigo", "rotated": false, @@ -5652,14 +5631,14 @@ "h": 18 }, "frame": { - "x": 472, - "y": 252, + "x": 425, + "y": 266, "w": 17, "h": 18 } }, { - "filename": "736", + "filename": "751", "rotated": false, "trimmed": true, "sourceSize": { @@ -5667,37 +5646,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 17, - "h": 13 + "x": 13, + "y": 8, + "w": 14, + "h": 20 }, "frame": { - "x": 372, - "y": 291, - "w": 17, - "h": 13 - } - }, - { - "filename": "736s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 17, - "h": 13 - }, - "frame": { - "x": 389, - "y": 291, - "w": 17, - "h": 13 + "x": 442, + "y": 247, + "w": 14, + "h": 20 } }, { @@ -5715,8 +5673,8 @@ "h": 18 }, "frame": { - "x": 406, - "y": 291, + "x": 456, + "y": 246, "w": 17, "h": 18 } @@ -5736,12 +5694,33 @@ "h": 18 }, "frame": { - "x": 371, - "y": 304, + "x": 473, + "y": 249, "w": 17, "h": 18 } }, + { + "filename": "751s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 14, + "h": 20 + }, + "frame": { + "x": 442, + "y": 267, + "w": 14, + "h": 20 + } + }, { "filename": "774-violet", "rotated": false, @@ -5757,8 +5736,8 @@ "h": 18 }, "frame": { - "x": 388, - "y": 304, + "x": 456, + "y": 264, "w": 17, "h": 18 } @@ -5778,8 +5757,29 @@ "h": 18 }, "frame": { - "x": 423, - "y": 270, + "x": 473, + "y": 267, + "w": 17, + "h": 18 + } + }, + { + "filename": "774", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 406, + "y": 283, "w": 17, "h": 18 } @@ -5800,32 +5800,11 @@ }, "frame": { "x": 423, - "y": 288, + "y": 284, "w": 17, "h": 18 } }, - { - "filename": "808", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 17 - }, - "frame": { - "x": 423, - "y": 306, - "w": 17, - "h": 17 - } - }, { "filename": "774s-green", "rotated": false, @@ -5842,11 +5821,32 @@ }, "frame": { "x": 440, - "y": 270, + "y": 287, "w": 17, "h": 18 } }, + { + "filename": "753", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 8, + "w": 14, + "h": 19 + }, + "frame": { + "x": 457, + "y": 282, + "w": 14, + "h": 19 + } + }, { "filename": "774s-indigo", "rotated": false, @@ -5862,14 +5862,14 @@ "h": 18 }, "frame": { - "x": 440, - "y": 288, + "x": 471, + "y": 285, "w": 17, "h": 18 } }, { - "filename": "808s", + "filename": "753s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5877,16 +5877,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 17 + "x": 14, + "y": 8, + "w": 14, + "h": 19 }, "frame": { - "x": 440, - "y": 306, - "w": 17, - "h": 17 + "x": 488, + "y": 285, + "w": 14, + "h": 19 } }, { @@ -5904,8 +5904,8 @@ "h": 18 }, "frame": { - "x": 457, - "y": 270, + "x": 385, + "y": 294, "w": 17, "h": 18 } @@ -5925,8 +5925,8 @@ "h": 18 }, "frame": { - "x": 457, - "y": 288, + "x": 402, + "y": 301, "w": 17, "h": 18 } @@ -5946,8 +5946,8 @@ "h": 18 }, "frame": { - "x": 474, - "y": 270, + "x": 419, + "y": 302, "w": 17, "h": 18 } @@ -5967,11 +5967,53 @@ "h": 18 }, "frame": { - "x": 474, - "y": 288, + "x": 436, + "y": 305, "w": 17, "h": 18 } + }, + { + "filename": "774s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 453, + "y": 305, + "w": 17, + "h": 18 + } + }, + { + "filename": "808s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 17 + }, + "frame": { + "x": 470, + "y": 303, + "w": 17, + "h": 17 + } } ] } @@ -5979,6 +6021,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a4de8d1c4f7d4f58c929b8b5479e03f1:3c8ac308e19a7f9420a4df8a78188490:2e7c5873ead8fd8fce82a0b3fcc86b42$" + "smartupdate": "$TexturePacker:SmartUpdate:5861cb99c3db0943f1ccef3b0e1b4683:26656a692718930d92be5b6aba391ced:2e7c5873ead8fd8fce82a0b3fcc86b42$" } } diff --git a/public/images/pokemon_icons_7.png b/public/images/pokemon_icons_7.png index c9a396ed5c6..5e6421360fd 100644 Binary files a/public/images/pokemon_icons_7.png and b/public/images/pokemon_icons_7.png differ diff --git a/public/images/statuses_es-ES.png b/public/images/statuses_es-ES.png index d372b989be9..dc845d6fb1f 100644 Binary files a/public/images/statuses_es-ES.png and b/public/images/statuses_es-ES.png differ diff --git a/public/images/types_de.png b/public/images/types_de.png old mode 100644 new mode 100755 index 62ad3a332bc..a033554029c Binary files a/public/images/types_de.png and b/public/images/types_de.png differ diff --git a/public/images/ui/button_tera.json b/public/images/ui/button_tera.json new file mode 100644 index 00000000000..7b64db66ae6 --- /dev/null +++ b/public/images/ui/button_tera.json @@ -0,0 +1,158 @@ +{ "frames": { + "unknown": { + "frame": { "x": 0, "y": 0, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "bug": { + "frame": { "x": 18, "y": 0, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "dark": { + "frame": { "x": 36, "y": 0, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "dragon": { + "frame": { "x": 54, "y": 0, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "electric": { + "frame": { "x": 72, "y": 0, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "fairy": { + "frame": { "x": 0, "y": 21, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "fighting": { + "frame": { "x": 18, "y": 21, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "fire": { + "frame": { "x": 36, "y": 21, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "flying": { + "frame": { "x": 54, "y": 21, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "ghost": { + "frame": { "x": 72, "y": 21, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "grass": { + "frame": { "x": 0, "y": 42, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "ground": { + "frame": { "x": 18, "y": 42, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "ice": { + "frame": { "x": 36, "y": 42, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "normal": { + "frame": { "x": 54, "y": 42, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "poison": { + "frame": { "x": 72, "y": 42, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "psychic": { + "frame": { "x": 0, "y": 63, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "rock": { + "frame": { "x": 18, "y": 63, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "steel": { + "frame": { "x": 36, "y": 63, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "water": { + "frame": { "x": 54, "y": 63, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "stellar": { + "frame": { "x": 72, "y": 63, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + } + }, + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.7-dev", + "image": "button_tera.png", + "format": "RGBA8888", + "size": { "w": 90, "h": 84 }, + "scale": "1", + "frameTags": [ + ], + "layers": [ + { "name": "Sprite Sheet", "opacity": 255, "blendMode": "normal" } + ], + "slices": [ + ] + } +} diff --git a/public/images/ui/button_tera.png b/public/images/ui/button_tera.png new file mode 100644 index 00000000000..c9672bafa39 Binary files /dev/null and b/public/images/ui/button_tera.png differ diff --git a/public/images/ui/cursor_tera.png b/public/images/ui/cursor_tera.png new file mode 100644 index 00000000000..34cbe095895 Binary files /dev/null and b/public/images/ui/cursor_tera.png differ diff --git a/public/images/ui/legacy/button_tera.json b/public/images/ui/legacy/button_tera.json new file mode 100644 index 00000000000..7b64db66ae6 --- /dev/null +++ b/public/images/ui/legacy/button_tera.json @@ -0,0 +1,158 @@ +{ "frames": { + "unknown": { + "frame": { "x": 0, "y": 0, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "bug": { + "frame": { "x": 18, "y": 0, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "dark": { + "frame": { "x": 36, "y": 0, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "dragon": { + "frame": { "x": 54, "y": 0, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "electric": { + "frame": { "x": 72, "y": 0, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "fairy": { + "frame": { "x": 0, "y": 21, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "fighting": { + "frame": { "x": 18, "y": 21, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "fire": { + "frame": { "x": 36, "y": 21, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "flying": { + "frame": { "x": 54, "y": 21, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "ghost": { + "frame": { "x": 72, "y": 21, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "grass": { + "frame": { "x": 0, "y": 42, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "ground": { + "frame": { "x": 18, "y": 42, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "ice": { + "frame": { "x": 36, "y": 42, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "normal": { + "frame": { "x": 54, "y": 42, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "poison": { + "frame": { "x": 72, "y": 42, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "psychic": { + "frame": { "x": 0, "y": 63, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "rock": { + "frame": { "x": 18, "y": 63, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "steel": { + "frame": { "x": 36, "y": 63, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "water": { + "frame": { "x": 54, "y": 63, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + }, + "stellar": { + "frame": { "x": 72, "y": 63, "w": 18, "h": 21 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 }, + "sourceSize": { "w": 20, "h": 23 } + } + }, + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.7-dev", + "image": "button_tera.png", + "format": "RGBA8888", + "size": { "w": 90, "h": 84 }, + "scale": "1", + "frameTags": [ + ], + "layers": [ + { "name": "Sprite Sheet", "opacity": 255, "blendMode": "normal" } + ], + "slices": [ + ] + } +} diff --git a/public/images/ui/legacy/button_tera.png b/public/images/ui/legacy/button_tera.png new file mode 100644 index 00000000000..c9672bafa39 Binary files /dev/null and b/public/images/ui/legacy/button_tera.png differ diff --git a/public/images/ui/legacy/cursor_tera.png b/public/images/ui/legacy/cursor_tera.png new file mode 100644 index 00000000000..f2e77046137 Binary files /dev/null and b/public/images/ui/legacy/cursor_tera.png differ diff --git a/public/images/ui/legacy/mystery_egg.png b/public/images/ui/legacy/mystery_egg.png new file mode 100644 index 00000000000..bb117a137b0 Binary files /dev/null and b/public/images/ui/legacy/mystery_egg.png differ diff --git a/public/images/ui/legacy/normal_memory.png b/public/images/ui/legacy/normal_memory.png new file mode 100644 index 00000000000..ddc22d1d4ab Binary files /dev/null and b/public/images/ui/legacy/normal_memory.png differ diff --git a/public/images/ui/legacy/pokedex_summary_bg.png b/public/images/ui/legacy/pokedex_summary_bg.png new file mode 100644 index 00000000000..690df1547c0 Binary files /dev/null and b/public/images/ui/legacy/pokedex_summary_bg.png differ diff --git a/public/images/ui/legacy/summary_bg.png b/public/images/ui/legacy/summary_bg.png index e4da2dd5da2..c482b5a1bf1 100644 Binary files a/public/images/ui/legacy/summary_bg.png and b/public/images/ui/legacy/summary_bg.png differ diff --git a/public/images/ui/legacy/summary_profile.png b/public/images/ui/legacy/summary_profile.png index 1d184023ca8..77d59dac177 100644 Binary files a/public/images/ui/legacy/summary_profile.png and b/public/images/ui/legacy/summary_profile.png differ diff --git a/public/images/ui/mystery_egg.png b/public/images/ui/mystery_egg.png new file mode 100644 index 00000000000..bb117a137b0 Binary files /dev/null and b/public/images/ui/mystery_egg.png differ diff --git a/public/images/ui/normal_memory.png b/public/images/ui/normal_memory.png new file mode 100644 index 00000000000..ddc22d1d4ab Binary files /dev/null and b/public/images/ui/normal_memory.png differ diff --git a/public/images/ui/pokedex_summary_bg.png b/public/images/ui/pokedex_summary_bg.png new file mode 100644 index 00000000000..92e70bbee27 Binary files /dev/null and b/public/images/ui/pokedex_summary_bg.png differ diff --git a/public/images/ui/summary_bg.png b/public/images/ui/summary_bg.png index b77cdadd2ac..a86a94dd56e 100644 Binary files a/public/images/ui/summary_bg.png and b/public/images/ui/summary_bg.png differ diff --git a/public/images/ui/summary_profile.png b/public/images/ui/summary_profile.png index 38bb5e84dfd..55cc70dc4d0 100644 Binary files a/public/images/ui/summary_profile.png and b/public/images/ui/summary_profile.png differ diff --git a/public/locales b/public/locales index 2d3765a4f03..6b3f37cb351 160000 --- a/public/locales +++ b/public/locales @@ -1 +1 @@ -Subproject commit 2d3765a4f035b4916523bf75b754e153e9d65134 +Subproject commit 6b3f37cb351552721232f4dabefa17bddb5b9004 diff --git a/scripts/find_sprite_variant_mismatches.py b/scripts/find_sprite_variant_mismatches.py new file mode 100644 index 00000000000..483695fdb66 --- /dev/null +++ b/scripts/find_sprite_variant_mismatches.py @@ -0,0 +1,98 @@ +""" +Validates the contents of the variant's masterlist file and identifies +any mismatched entries for the sprite of the same key between front, back, exp, exp back, and female. + +This will create a csv file that contains all of the entries with mismatches. + +An empty entry means that there was not a mismatch for that version of the sprite (meaning it matches front). +""" + +import sys + +if sys.version_info < (3, 7): + msg = "This script requires Python 3.7+" + raise RuntimeError(msg) + +import json +import os +import csv +from dataclasses import dataclass, field +from typing import Literal as L + +MASTERLIST_PATH = os.path.join( + os.path.dirname(os.path.dirname(__file__)), "public", "images", "pokemon", "variant", "_masterlist.json" +) +DEFAULT_OUTPUT_PATH = "sprite-mismatches.csv" + + +@dataclass(order=True) +class Sprite: + key: str = field(compare=False) + front: list[int] = field(default_factory=list, compare=False) + back: list[int] = field(default_factory=list, compare=False) + female: list[int] = field(default_factory=list, compare=False) + exp: list[int] = field(default_factory=list, compare=False) + expback: list[int] = field(default_factory=list, compare=False) + sortedKey: tuple[int] | tuple[int, str] = field(init=False, repr=False, compare=True) + + def as_row(self) -> tuple[str, list[int] | L[""], list[int] | L[""], list[int] | L[""], list[int] | L[""], list[int] | L[""]]: + """return sprite information as a tuple for csv writing""" + return (self.key, self.front or "", self.back or "", self.exp or "", self.expback or "", self.female or "") + + def is_mismatch(self) -> bool: + """return True if the female, back, or exp sprites do not match the front""" + for val in [self.back, self.exp, self.expback, self.female]: + if val != [] and val != self.front: + return True + return False + + def __post_init__(self): + split = self.key.split("-", maxsplit=1) + self.sortedKey = (int(split[0]), split[1]) if len(split) == 2 else (int(split[0]),) + + +def make_mismatch_sprite_list(path): + with open(path, "r") as f: + masterlist: dict = json.load(f) + + # Go through the keys in "front" and "back" and make sure they match the masterlist + back_data: dict[str, list[int]] = masterlist.pop("back", {}) + exp_data: dict[str, list[int]] = masterlist.pop("exp", {}) + exp_back_data: dict[str, list[int]] = exp_data.get("back", []) + female_data: dict[str, list[int]] = masterlist.pop("female", {}) + + sprites: list[Sprite] = [] + + for key, item in masterlist.items(): + sprite = Sprite( + key, front=item, back=back_data.get(key, []), exp=exp_data.get(key, []), expback=exp_back_data.get(key, []), female=female_data.get(key, []) + ) + if sprite.is_mismatch(): + sprites.append(sprite) + + return sprites + + +def write_mismatch_csv(filename: str, mismatches: list[Sprite]): + with open(filename, "w", newline="") as csvfile: + writer = csv.writer(csvfile) + writer.writerow(["key", "front", "back", "exp", "expback", "female"]) + for sprite in sorted(mismatches): + writer.writerow(sprite.as_row()) + + +if __name__ == "__main__": + import argparse + + p = argparse.ArgumentParser("find_sprite_variant_mismatches", description=__doc__) + + p.add_argument( + "-o", + "--output", + default=DEFAULT_OUTPUT_PATH, + help=f"The path to a file to save the output file. If not specified, will write to {DEFAULT_OUTPUT_PATH}.", + ) + p.add_argument("--masterlist", default=MASTERLIST_PATH, help=f"The path to the masterlist file to validate. Defaults to {MASTERLIST_PATH}.") + args = p.parse_args() + mismatches = make_mismatch_sprite_list(args.masterlist) + write_mismatch_csv(args.output, mismatches) diff --git a/src/account.ts b/src/account.ts index 316645b38ff..96ce32714bb 100644 --- a/src/account.ts +++ b/src/account.ts @@ -8,13 +8,25 @@ export let loggedInUser: UserInfo | null = null; export const clientSessionId = Utils.randomString(32); export function initLoggedInUser(): void { - loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false }; + loggedInUser = { + username: "Guest", + lastSessionSlot: -1, + discordId: "", + googleId: "", + hasAdminRole: false, + }; } -export function updateUserInfo(): Promise<[boolean, integer]> { - return new Promise<[boolean, integer]>(resolve => { +export function updateUserInfo(): Promise<[boolean, number]> { + return new Promise<[boolean, number]>(resolve => { if (bypassLogin) { - loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false }; + loggedInUser = { + username: "Guest", + lastSessionSlot: -1, + discordId: "", + googleId: "", + hasAdminRole: false, + }; let lastSessionSlot = -1; for (let s = 0; s < 5; s++) { if (localStorage.getItem(`sessionData${s ? s : ""}_${loggedInUser.username}`)) { @@ -24,7 +36,7 @@ export function updateUserInfo(): Promise<[boolean, integer]> { } loggedInUser.lastSessionSlot = lastSessionSlot; // Migrate old data from before the username was appended - [ "data", "sessionData", "sessionData1", "sessionData2", "sessionData3", "sessionData4" ].map(d => { + ["data", "sessionData", "sessionData1", "sessionData2", "sessionData3", "sessionData4"].map(d => { const lsItem = localStorage.getItem(d); if (lsItem && !!loggedInUser?.username) { const lsUserItem = localStorage.getItem(`${d}_${loggedInUser.username}`); @@ -35,16 +47,15 @@ export function updateUserInfo(): Promise<[boolean, integer]> { localStorage.removeItem(d); } }); - return resolve([ true, 200 ]); + return resolve([true, 200]); } - pokerogueApi.account.getInfo().then(([ accountInfo, status ]) => { + pokerogueApi.account.getInfo().then(([accountInfo, status]) => { if (!accountInfo) { - resolve([ false, status ]); + resolve([false, status]); return; - } else { - loggedInUser = accountInfo; - resolve([ true, 200 ]); } + loggedInUser = accountInfo; + resolve([true, 200]); }); }); } diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 2c67c4d2cde..a6c986d3d0f 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -9,19 +9,62 @@ import type { Constructor } from "#app/utils"; import { isNullOrUndefined, randSeedInt } from "#app/utils"; import * as Utils from "#app/utils"; import type { Modifier, ModifierPredicate, TurnHeldItemTransferModifier } from "./modifier/modifier"; -import { ConsumableModifier, ConsumablePokemonModifier, DoubleBattleChanceBoosterModifier, ExpBalanceModifier, ExpShareModifier, FusePokemonModifier, HealingBoosterModifier, ModifierBar, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonFormChangeItemModifier, PokemonHeldItemModifier, PokemonHpRestoreModifier, PokemonIncrementingStatModifier, RememberMoveModifier, TerastallizeModifier } from "./modifier/modifier"; +import { + ConsumableModifier, + ConsumablePokemonModifier, + DoubleBattleChanceBoosterModifier, + ExpBalanceModifier, + ExpShareModifier, + FusePokemonModifier, + HealingBoosterModifier, + ModifierBar, + MultipleParticipantExpBonusModifier, + PersistentModifier, + PokemonExpBoosterModifier, + PokemonFormChangeItemModifier, + PokemonHeldItemModifier, + PokemonHpRestoreModifier, + PokemonIncrementingStatModifier, + RememberMoveModifier, +} from "./modifier/modifier"; import { PokeballType } from "#enums/pokeball"; -import { initCommonAnims, initMoveAnim, loadCommonAnimAssets, loadMoveAnimAssets, populateAnims } from "#app/data/battle-anims"; +import { + initCommonAnims, + initMoveAnim, + loadCommonAnimAssets, + loadMoveAnimAssets, + populateAnims, +} from "#app/data/battle-anims"; import type { Phase } from "#app/phase"; import { initGameSpeed } from "#app/system/game-speed"; import { Arena, ArenaBase } from "#app/field/arena"; import { GameData } from "#app/system/game-data"; import { addTextObject, getTextColor, TextStyle } from "#app/ui/text"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { MusicPreference } from "#app/system/settings/settings"; -import { getDefaultModifierTypeForTier, getEnemyModifierTypesForWave, getLuckString, getLuckTextTint, getModifierPoolForType, getModifierType, getPartyLuckValue, ModifierPoolType, modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; +import { + getDefaultModifierTypeForTier, + getEnemyModifierTypesForWave, + getLuckString, + getLuckTextTint, + getModifierPoolForType, + getModifierType, + getPartyLuckValue, + ModifierPoolType, + modifierTypes, + PokemonHeldItemModifierType, +} from "#app/modifier/modifier-type"; import AbilityBar from "#app/ui/ability-bar"; -import { allAbilities, applyAbAttrs, applyPostBattleInitAbAttrs, applyPostItemLostAbAttrs, BlockItemTheftAbAttr, DoubleBattleChanceAbAttr, PostBattleInitAbAttr, PostItemLostAbAttr } from "#app/data/ability"; +import { + allAbilities, + applyAbAttrs, + applyPostBattleInitAbAttrs, + applyPostItemLostAbAttrs, + BlockItemTheftAbAttr, + DoubleBattleChanceAbAttr, + PostBattleInitAbAttr, + PostItemLostAbAttr, +} from "#app/data/ability"; import type { FixedBattleConfig } from "#app/battle"; import Battle, { BattleType } from "#app/battle"; import type { GameMode } from "#app/game-mode"; @@ -47,10 +90,15 @@ import { addUiThemeOverrides } from "#app/ui/ui-theme"; import type PokemonData from "#app/system/pokemon-data"; import { Nature } from "#enums/nature"; import type { SpeciesFormChange, SpeciesFormChangeTrigger } from "#app/data/pokemon-forms"; -import { FormChangeItem, pokemonFormChanges, SpeciesFormChangeManualTrigger, SpeciesFormChangeTimeOfDayTrigger } from "#app/data/pokemon-forms"; +import { + FormChangeItem, + pokemonFormChanges, + SpeciesFormChangeManualTrigger, + SpeciesFormChangeTimeOfDayTrigger, +} from "#app/data/pokemon-forms"; import { FormChangePhase } from "#app/phases/form-change-phase"; import { getTypeRgb } from "#app/data/type"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import PokemonSpriteSparkleHandler from "#app/field/pokemon-sprite-sparkle-handler"; import CharSprite from "#app/ui/char-sprite"; import DamageNumberHandler from "#app/field/damage-number-handler"; @@ -100,7 +148,14 @@ import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-ph import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { allMysteryEncounters, ANTI_VARIANCE_WEIGHT_MODIFIER, AVERAGE_ENCOUNTERS_PER_RUN_TARGET, BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT, MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT, mysteryEncountersByBiome } from "#app/data/mystery-encounters/mystery-encounters"; +import { + allMysteryEncounters, + ANTI_VARIANCE_WEIGHT_MODIFIER, + AVERAGE_ENCOUNTERS_PER_RUN_TARGET, + BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT, + MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT, + mysteryEncountersByBiome, +} from "#app/data/mystery-encounters/mystery-encounters"; import { MysteryEncounterSaveData } from "#app/data/mystery-encounters/mystery-encounter-save-data"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; @@ -113,16 +168,16 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters"; import { StatusEffect } from "#enums/status-effect"; import { initGlobalScene } from "#app/global-scene"; +import { ShowAbilityPhase } from "#app/phases/show-ability-phase"; +import { HideAbilityPhase } from "#app/phases/hide-ability-phase"; export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1"; const DEBUG_RNG = false; -const OPP_IVS_OVERRIDE_VALIDATED : integer[] = ( - Array.isArray(Overrides.OPP_IVS_OVERRIDE) ? - Overrides.OPP_IVS_OVERRIDE : - new Array(6).fill(Overrides.OPP_IVS_OVERRIDE) -).map(iv => isNaN(iv) || iv === null || iv > 31 ? -1 : iv); +const OPP_IVS_OVERRIDE_VALIDATED: number[] = ( + Array.isArray(Overrides.OPP_IVS_OVERRIDE) ? Overrides.OPP_IVS_OVERRIDE : new Array(6).fill(Overrides.OPP_IVS_OVERRIDE) +).map(iv => (Number.isNaN(iv) || iv === null || iv > 31 ? -1 : iv)); export const startingWave = Overrides.STARTING_WAVE_OVERRIDE || 1; @@ -130,18 +185,18 @@ const expSpriteKeys: string[] = []; export let starterColors: StarterColors; interface StarterColors { - [key: string]: [string, string] + [key: string]: [string, string]; } export interface PokeballCounts { - [pb: string]: integer; + [pb: string]: number; } export type AnySound = Phaser.Sound.WebAudioSound | Phaser.Sound.HTML5AudioSound | Phaser.Sound.NoAudioSound; export interface InfoToggle { - toggleInfo(force?: boolean): void; - isActive(): boolean; + toggleInfo(force?: boolean): void; + isActive(): boolean; } export default class BattleScene extends SceneBase { @@ -149,93 +204,94 @@ export default class BattleScene extends SceneBase { public inputController: InputsController; public uiInputs: UiInputs; - public sessionPlayTime: integer | null = null; - public lastSavePlayTime: integer | null = null; - public masterVolume: number = 0.5; - public bgmVolume: number = 1; - public fieldVolume: number = 1; - public seVolume: number = 1; - public uiVolume: number = 1; - public gameSpeed: integer = 1; - public damageNumbersMode: integer = 0; - public reroll: boolean = false; + public sessionPlayTime: number | null = null; + public lastSavePlayTime: number | null = null; + public masterVolume = 0.5; + public bgmVolume = 1; + public fieldVolume = 1; + public seVolume = 1; + public uiVolume = 1; + public gameSpeed = 1; + public damageNumbersMode = 0; + public reroll = false; public shopCursorTarget: number = ShopCursorTarget.REWARDS; - public commandCursorMemory: boolean = false; - public showMovesetFlyout: boolean = true; - public showArenaFlyout: boolean = true; - public showTimeOfDayWidget: boolean = true; + public commandCursorMemory = false; + public dexForDevs = false; + public showMovesetFlyout = true; + public showArenaFlyout = true; + public showTimeOfDayWidget = true; public timeOfDayAnimation: EaseType = EaseType.NONE; - public showLevelUpStats: boolean = true; + public showLevelUpStats = true; public enableTutorials: boolean = import.meta.env.VITE_BYPASS_TUTORIAL === "1"; - public enableMoveInfo: boolean = true; - public enableRetries: boolean = false; - public hideIvs: boolean = false; + public enableMoveInfo = true; + public enableRetries = false; + public hideIvs = false; /** * Determines the condition for a notification should be shown for Candy Upgrades * - 0 = 'Off' * - 1 = 'Passives Only' * - 2 = 'On' */ - public candyUpgradeNotification: integer = 0; + public candyUpgradeNotification = 0; /** * Determines what type of notification is used for Candy Upgrades * - 0 = 'Icon' * - 1 = 'Animation' */ - public candyUpgradeDisplay: integer = 0; + public candyUpgradeDisplay = 0; public moneyFormat: MoneyFormat = MoneyFormat.NORMAL; public uiTheme: UiTheme = UiTheme.DEFAULT; - public windowType: integer = 0; - public experimentalSprites: boolean = false; + public windowType = 0; + public experimentalSprites = false; public musicPreference: number = MusicPreference.ALLGENS; - public moveAnimations: boolean = true; + public moveAnimations = true; public expGainsSpeed: ExpGainsSpeed = ExpGainsSpeed.DEFAULT; - public skipSeenDialogues: boolean = false; + public skipSeenDialogues = false; /** * Determines if the egg hatching animation should be skipped * - 0 = Never (never skip animation) * - 1 = Ask (ask to skip animation when hatching 2 or more eggs) * - 2 = Always (automatically skip animation when hatching 2 or more eggs) */ - public eggSkipPreference: number = 0; + public eggSkipPreference = 0; /** - * Defines the experience gain display mode. - * - * @remarks - * The `expParty` can have several modes: - * - `0` - Default: The normal experience gain display, nothing changed. - * - `1` - Level Up Notification: Displays the level up in the small frame instead of a message. - * - `2` - Skip: No level up frame nor message. - * - * Modes `1` and `2` are still compatible with stats display, level up, new move, etc. - * @default 0 - Uses the default normal experience gain display. - */ + * Defines the experience gain display mode. + * + * @remarks + * The `expParty` can have several modes: + * - `0` - Default: The normal experience gain display, nothing changed. + * - `1` - Level Up Notification: Displays the level up in the small frame instead of a message. + * - `2` - Skip: No level up frame nor message. + * + * Modes `1` and `2` are still compatible with stats display, level up, new move, etc. + * @default 0 - Uses the default normal experience gain display. + */ public expParty: ExpNotification = 0; - public hpBarSpeed: integer = 0; - public fusionPaletteSwaps: boolean = true; - public enableTouchControls: boolean = false; - public enableVibration: boolean = false; - public showBgmBar: boolean = true; + public hpBarSpeed = 0; + public fusionPaletteSwaps = true; + public enableTouchControls = false; + public enableVibration = false; + public showBgmBar = true; /** * Determines the selected battle style. * - 0 = 'Switch' * - 1 = 'Set' - The option to switch the active pokemon at the start of a battle will not display. */ - public battleStyle: integer = BattleStyle.SWITCH; + public battleStyle: number = BattleStyle.SWITCH; /** - * Defines whether or not to show type effectiveness hints - * - true: No hints - * - false: Show hints for moves + * Defines whether or not to show type effectiveness hints + * - true: No hints + * - false: Show hints for moves */ - public typeHints: boolean = false; + public typeHints = false; - public disableMenu: boolean = false; + public disableMenu = false; public gameData: GameData; - public sessionSlotId: integer; + public sessionSlotId: number; /** PhaseQueue: dequeue/remove the first element to get the next phase */ public phaseQueue: Phase[]; @@ -244,7 +300,7 @@ export default class BattleScene extends SceneBase { private phaseQueuePrepend: Phase[]; /** overrides default of inserting phases to end of phaseQueuePrepend array, useful or inserting Phases "out of order" */ - private phaseQueuePrependSpliceIndex: integer; + private phaseQueuePrependSpliceIndex: number; private nextCommandPhaseQueue: Phase[]; private currentPhase: Phase | null; @@ -265,13 +321,13 @@ export default class BattleScene extends SceneBase { public arenaNextEnemy: ArenaBase; public arena: Arena; public gameMode: GameMode; - public score: integer; + public score: number; public lockModifierTiers: boolean; public trainer: Phaser.GameObjects.Sprite; public lastEnemyTrainer: Trainer | null; public currentBattle: Battle; public pokeballCounts: PokeballCounts; - public money: integer; + public money: number; public pokemonInfoContainer: PokemonInfoContainer; private party: PlayerPokemon[]; /** Session save data that pertains to Mystery Encounters */ @@ -290,8 +346,8 @@ export default class BattleScene extends SceneBase { private fieldOverlay: Phaser.GameObjects.Rectangle; private shopOverlay: Phaser.GameObjects.Rectangle; - private shopOverlayShown: boolean = false; - private shopOverlayOpacity: number = .8; + private shopOverlayShown = false; + private shopOverlayOpacity = 0.8; public modifiers: PersistentModifier[]; private enemyModifiers: PersistentModifier[]; @@ -300,7 +356,7 @@ export default class BattleScene extends SceneBase { public seed: string; public waveSeed: string; - public waveCycleOffset: integer; + public waveCycleOffset: number; public offsetGym: boolean; public damageNumberHandler: DamageNumberHandler; @@ -314,9 +370,9 @@ export default class BattleScene extends SceneBase { private bgmCache: Set = new Set(); private playTimeTimer: Phaser.Time.TimerEvent; - public rngCounter: integer = 0; - public rngSeedOverride: string = ""; - public rngOffset: integer = 0; + public rngCounter = 0; + public rngSeedOverride = ""; + public rngOffset = 0; public inputMethod: string; private infoToggles: InfoToggle[] = []; @@ -357,7 +413,11 @@ export default class BattleScene extends SceneBase { if (variant) { atlasPath = atlasPath.replace("variant/", ""); } - this.load.atlas(key, `images/pokemon/${variant ? "variant/" : ""}${experimental ? "exp/" : ""}${atlasPath}.png`, `images/pokemon/${variant ? "variant/" : ""}${experimental ? "exp/" : ""}${atlasPath}.json`); + this.load.atlas( + key, + `images/pokemon/${variant ? "variant/" : ""}${experimental ? "exp/" : ""}${atlasPath}.png`, + `images/pokemon/${variant ? "variant/" : ""}${experimental ? "exp/" : ""}${atlasPath}.json`, + ); } /** @@ -369,17 +429,17 @@ export default class BattleScene extends SceneBase { fileRoot = `exp/${fileRoot}`; } let variantConfig = variantData; - fileRoot.split("/").map((p) => (variantConfig ? (variantConfig = variantConfig[p]) : null)); + fileRoot.split("/").map(p => (variantConfig ? (variantConfig = variantConfig[p]) : null)); const variantSet = variantConfig as VariantSet; - return new Promise((resolve) => { + return new Promise(resolve => { if (variantSet && variant !== undefined && variantSet[variant] === 1) { if (variantColorCache.hasOwnProperty(spriteKey)) { return resolve(); } this.cachedFetch(`./images/pokemon/variant/${fileRoot}.json`) - .then((res) => res.json()) - .then((c) => { + .then(res => res.json()) + .then(c => { variantColorCache[spriteKey] = c; resolve(); }); @@ -393,8 +453,8 @@ export default class BattleScene extends SceneBase { if (DEBUG_RNG) { const originalRealInRange = Phaser.Math.RND.realInRange; Phaser.Math.RND.realInRange = function (min: number, max: number): number { - const ret = originalRealInRange.apply(this, [ min, max ]); - const args = [ "RNG", ++this.rngCounter, ret / (max - min), `min: ${min} / max: ${max}` ]; + const ret = originalRealInRange.apply(this, [min, max]); + const args = ["RNG", ++this.rngCounter, ret / (max - min), `min: ${min} / max: ${max}`]; args.push(`seed: ${this.rngSeedOverride || this.waveSeed || this.seed}`); if (this.rngOffset) { args.push(`offset: ${this.rngOffset}`); @@ -440,12 +500,12 @@ export default class BattleScene extends SceneBase { this.arenaBgTransition = this.add.sprite(0, 0, "plains_bg"); this.arenaBgTransition.setName("sprite-arena-bg-transition"); - [ this.arenaBgTransition, this.arenaBg ].forEach(a => { + for (const a of [this.arenaBgTransition, this.arenaBg]) { a.setPipeline(this.fieldSpritePipeline); a.setScale(6); a.setOrigin(0); a.setSize(320, 240); - }); + } const field = this.add.container(0, 0); field.setName("field"); @@ -460,13 +520,16 @@ export default class BattleScene extends SceneBase { this.fieldUI = fieldUI; - const transition = this.make.rexTransitionImagePack({ - x: 0, - y: 0, - scale: 6, - key: "loading_bg", - origin: { x: 0, y: 0 } - }, true); + const transition = this.make.rexTransitionImagePack( + { + x: 0, + y: 0, + scale: 6, + key: "loading_bg", + origin: { x: 0, y: 0 }, + }, + true, + ); //@ts-ignore (the defined types in the package are incromplete...) transition.transit({ @@ -488,7 +551,7 @@ export default class BattleScene extends SceneBase { this.uiContainer = uiContainer; const overlayWidth = this.game.canvas.width / 6; - const overlayHeight = (this.game.canvas.height / 6) - 48; + const overlayHeight = this.game.canvas.height / 6 - 48; this.fieldOverlay = this.add.rectangle(0, overlayHeight * -1 - 48, overlayWidth, overlayHeight, 0x424242); this.fieldOverlay.setName("rect-field-overlay"); this.fieldOverlay.setOrigin(0, 0); @@ -546,28 +609,39 @@ export default class BattleScene extends SceneBase { this.candyBar.setup(); this.fieldUI.add(this.candyBar); - this.biomeWaveText = addTextObject((this.game.canvas.width / 6) - 2, 0, startingWave.toString(), TextStyle.BATTLE_INFO); + this.biomeWaveText = addTextObject( + this.game.canvas.width / 6 - 2, + 0, + startingWave.toString(), + TextStyle.BATTLE_INFO, + ); this.biomeWaveText.setName("text-biome-wave"); this.biomeWaveText.setOrigin(1, 0.5); this.fieldUI.add(this.biomeWaveText); - this.moneyText = addTextObject((this.game.canvas.width / 6) - 2, 0, "", TextStyle.MONEY); + this.moneyText = addTextObject(this.game.canvas.width / 6 - 2, 0, "", TextStyle.MONEY); this.moneyText.setName("text-money"); this.moneyText.setOrigin(1, 0.5); this.fieldUI.add(this.moneyText); - this.scoreText = addTextObject((this.game.canvas.width / 6) - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" }); + this.scoreText = addTextObject(this.game.canvas.width / 6 - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" }); this.scoreText.setName("text-score"); this.scoreText.setOrigin(1, 0.5); this.fieldUI.add(this.scoreText); - this.luckText = addTextObject((this.game.canvas.width / 6) - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" }); + this.luckText = addTextObject(this.game.canvas.width / 6 - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" }); this.luckText.setName("text-luck"); this.luckText.setOrigin(1, 0.5); this.luckText.setVisible(false); this.fieldUI.add(this.luckText); - this.luckLabelText = addTextObject((this.game.canvas.width / 6) - 2, 0, i18next.t("common:luckIndicator"), TextStyle.PARTY, { fontSize: "54px" }); + this.luckLabelText = addTextObject( + this.game.canvas.width / 6 - 2, + 0, + i18next.t("common:luckIndicator"), + TextStyle.PARTY, + { fontSize: "54px" }, + ); this.luckLabelText.setName("text-luck-label"); this.luckLabelText.setOrigin(1, 0.5); this.luckLabelText.setVisible(false); @@ -584,7 +658,10 @@ export default class BattleScene extends SceneBase { this.spriteSparkleHandler = new PokemonSpriteSparkleHandler(); this.spriteSparkleHandler.setup(); - this.pokemonInfoContainer = new PokemonInfoContainer((this.game.canvas.width / 6) + 52, -(this.game.canvas.height / 6) + 66); + this.pokemonInfoContainer = new PokemonInfoContainer( + this.game.canvas.width / 6 + 52, + -(this.game.canvas.height / 6) + 66, + ); this.pokemonInfoContainer.setup(); this.fieldUI.add(this.pokemonInfoContainer); @@ -606,14 +683,18 @@ export default class BattleScene extends SceneBase { this.arenaPlayerTransition.setVisible(false); this.arenaNextEnemy.setVisible(false); - [ this.arenaPlayer, this.arenaPlayerTransition, this.arenaEnemy, this.arenaNextEnemy ].forEach(a => { + for (const a of [this.arenaPlayer, this.arenaPlayerTransition, this.arenaEnemy, this.arenaNextEnemy]) { if (a instanceof Phaser.GameObjects.Sprite) { a.setOrigin(0, 0); } field.add(a); - }); + } - const trainer = this.addFieldSprite(0, 0, `trainer_${this.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`); + const trainer = this.addFieldSprite( + 0, + 0, + `trainer_${this.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`, + ); trainer.setOrigin(0.5, 1); trainer.setName("sprite-trainer"); @@ -626,16 +707,19 @@ export default class BattleScene extends SceneBase { frames: this.anims.generateFrameNumbers("prompt", { start: 1, end: 4 }), frameRate: 6, repeat: -1, - showOnStart: true + showOnStart: true, }); this.anims.create({ key: "tera_sparkle", - frames: this.anims.generateFrameNumbers("tera_sparkle", { start: 0, end: 12 }), + frames: this.anims.generateFrameNumbers("tera_sparkle", { + start: 0, + end: 12, + }), frameRate: 18, repeat: 0, showOnStart: true, - hideOnComplete: true + hideOnComplete: true, }); this.reset(false, false, true); @@ -647,13 +731,15 @@ export default class BattleScene extends SceneBase { ui.setup(); - const defaultMoves = [ Moves.TACKLE, Moves.TAIL_WHIP, Moves.FOCUS_ENERGY, Moves.STRUGGLE ]; + const defaultMoves = [Moves.TACKLE, Moves.TAIL_WHIP, Moves.FOCUS_ENERGY, Moves.STRUGGLE]; Promise.all([ Promise.all(loadPokemonAssets), initCommonAnims().then(() => loadCommonAnimAssets(true)), - Promise.all([ Moves.TACKLE, Moves.TAIL_WHIP, Moves.FOCUS_ENERGY, Moves.STRUGGLE ].map(m => initMoveAnim(m))).then(() => loadMoveAnimAssets(defaultMoves, true)), - this.initStarterColors() + Promise.all([Moves.TACKLE, Moves.TAIL_WHIP, Moves.FOCUS_ENERGY, Moves.STRUGGLE].map(m => initMoveAnim(m))).then( + () => loadMoveAnimAssets(defaultMoves, true), + ), + this.initStarterColors(), ]).then(() => { this.pushPhase(new LoginPhase()); this.pushPhase(new TitlePhase()); @@ -687,7 +773,7 @@ export default class BattleScene extends SceneBase { if (this.lastSavePlayTime !== null) { this.lastSavePlayTime++; } - } + }, }); this.updateBiomeWaveText(); @@ -699,30 +785,37 @@ export default class BattleScene extends SceneBase { if (expSpriteKeys.length) { return; } - this.cachedFetch("./exp-sprites.json").then(res => res.json()).then(keys => { - if (Array.isArray(keys)) { - expSpriteKeys.push(...keys); - } - Promise.resolve(); - }); + this.cachedFetch("./exp-sprites.json") + .then(res => res.json()) + .then(keys => { + if (Array.isArray(keys)) { + expSpriteKeys.push(...keys); + } + Promise.resolve(); + }); } async initVariantData(): Promise { - Object.keys(variantData).forEach(key => delete variantData[key]); - await this.cachedFetch("./images/pokemon/variant/_masterlist.json").then(res => res.json()) + for (const key of Object.keys(variantData)) { + delete variantData[key]; + } + await this.cachedFetch("./images/pokemon/variant/_masterlist.json") + .then(res => res.json()) .then(v => { - Object.keys(v).forEach(k => variantData[k] = v[k]); + for (const k of Object.keys(v)) { + variantData[k] = v[k]; + } if (this.experimentalSprites) { const expVariantData = variantData["exp"]; const traverseVariantData = (keys: string[]) => { let variantTree = variantData; let expTree = expVariantData; - keys.map((k: string, i: integer) => { + keys.map((k: string, i: number) => { if (i < keys.length - 1) { variantTree = variantTree[k]; expTree = expTree[k]; } else if (variantTree.hasOwnProperty(k) && expTree.hasOwnProperty(k)) { - if ([ "back", "female" ].includes(k)) { + if (["back", "female"].includes(k)) { traverseVariantData(keys.concat(k)); } else { variantTree[k] = expTree[k]; @@ -730,7 +823,9 @@ export default class BattleScene extends SceneBase { } }); }; - Object.keys(expVariantData).forEach(ek => traverseVariantData([ ek ])); + for (const ek of Object.keys(expVariantData)) { + traverseVariantData([ek]); + } } Promise.resolve(); }); @@ -753,36 +848,16 @@ export default class BattleScene extends SceneBase { return resolve(); } - this.cachedFetch("./starter-colors.json").then(res => res.json()).then(sc => { - starterColors = {}; - Object.keys(sc).forEach(key => { - starterColors[key] = sc[key]; + this.cachedFetch("./starter-colors.json") + .then(res => res.json()) + .then(sc => { + starterColors = {}; + for (const key of Object.keys(sc)) { + starterColors[key] = sc[key]; + } + + resolve(); }); - - /*const loadPokemonAssets: Promise[] = []; - - for (let s of Object.keys(speciesStarters)) { - const species = getPokemonSpecies(parseInt(s)); - loadPokemonAssets.push(species.loadAssets(this, false, 0, false)); - } - - Promise.all(loadPokemonAssets).then(() => { - const starterCandyColors = {}; - const rgbaToHexFunc = (r, g, b) => [r, g, b].map(x => x.toString(16).padStart(2, '0')).join(''); - - for (let s of Object.keys(speciesStarters)) { - const species = getPokemonSpecies(parseInt(s)); - - starterCandyColors[species.speciesId] = species.generateCandyColors(this).map(c => rgbaToHexFunc(c[0], c[1], c[2])); - } - - console.log(JSON.stringify(starterCandyColors)); - - resolve(); - });*/ - - resolve(); - }); }); } @@ -830,7 +905,7 @@ export default class BattleScene extends SceneBase { * or `undefined` if there are no valid pokemon * @param includeSwitching Whether a pokemon that is currently switching out is valid, default `true` */ - public getPlayerPokemon(includeSwitching: boolean = true): PlayerPokemon | undefined { + public getPlayerPokemon(includeSwitching = true): PlayerPokemon | undefined { return this.getPlayerField().find(p => p.isActive() && (includeSwitching || p.switchOutStatus === false)); } @@ -855,7 +930,7 @@ export default class BattleScene extends SceneBase { * or `undefined` if there are no valid pokemon * @param includeSwitching Whether a pokemon that is currently switching out is valid, default `true` */ - public getEnemyPokemon(includeSwitching: boolean = true): EnemyPokemon | undefined { + public getEnemyPokemon(includeSwitching = true): EnemyPokemon | undefined { return this.getEnemyField().find(p => p.isActive() && (includeSwitching || p.switchOutStatus === false)); } @@ -875,15 +950,13 @@ export default class BattleScene extends SceneBase { * @param activeOnly Whether to consider only active pokemon * @returns array of {@linkcode Pokemon} */ - public getField(activeOnly: boolean = false): Pokemon[] { + public getField(activeOnly = false): Pokemon[] { const ret = new Array(4).fill(null); const playerField = this.getPlayerField(); const enemyField = this.getEnemyField(); ret.splice(0, playerField.length, ...playerField); ret.splice(2, enemyField.length, ...enemyField); - return activeOnly - ? ret.filter(p => p?.isActive()) - : ret; + return activeOnly ? ret.filter(p => p?.isActive()) : ret; } /** @@ -899,7 +972,13 @@ export default class BattleScene extends SceneBase { if (allyPokemon?.isActive(true)) { let targetingMovePhase: MovePhase; do { - targetingMovePhase = this.findPhase(mp => mp instanceof MovePhase && mp.targets.length === 1 && mp.targets[0] === removedPokemon.getBattlerIndex() && mp.pokemon.isPlayer() !== allyPokemon.isPlayer()) as MovePhase; + targetingMovePhase = this.findPhase( + mp => + mp instanceof MovePhase && + mp.targets.length === 1 && + mp.targets[0] === removedPokemon.getBattlerIndex() && + mp.pokemon.isPlayer() !== allyPokemon.isPlayer(), + ) as MovePhase; if (targetingMovePhase && targetingMovePhase.targets[0] !== allyPokemon.getBattlerIndex()) { targetingMovePhase.targets[0] = allyPokemon.getBattlerIndex(); } @@ -922,17 +1001,40 @@ export default class BattleScene extends SceneBase { } // return the stored info toggles; used by ui-inputs - getInfoToggles(activeOnly: boolean = false): InfoToggle[] { + getInfoToggles(activeOnly = false): InfoToggle[] { return activeOnly ? this.infoToggles.filter(t => t?.isActive()) : this.infoToggles; } - getPokemonById(pokemonId: integer): Pokemon | null { + getPokemonById(pokemonId: number): Pokemon | null { const findInParty = (party: Pokemon[]) => party.find(p => p.id === pokemonId); return (findInParty(this.getPlayerParty()) || findInParty(this.getEnemyParty())) ?? null; } - addPlayerPokemon(species: PokemonSpecies, level: integer, abilityIndex?: integer, formIndex?: integer, gender?: Gender, shiny?: boolean, variant?: Variant, ivs?: integer[], nature?: Nature, dataSource?: Pokemon | PokemonData, postProcess?: (playerPokemon: PlayerPokemon) => void): PlayerPokemon { - const pokemon = new PlayerPokemon(species, level, abilityIndex, formIndex, gender, shiny, variant, ivs, nature, dataSource); + addPlayerPokemon( + species: PokemonSpecies, + level: number, + abilityIndex?: number, + formIndex?: number, + gender?: Gender, + shiny?: boolean, + variant?: Variant, + ivs?: number[], + nature?: Nature, + dataSource?: Pokemon | PokemonData, + postProcess?: (playerPokemon: PlayerPokemon) => void, + ): PlayerPokemon { + const pokemon = new PlayerPokemon( + species, + level, + abilityIndex, + formIndex, + gender, + shiny, + variant, + ivs, + nature, + dataSource, + ); if (postProcess) { postProcess(pokemon); } @@ -940,7 +1042,15 @@ export default class BattleScene extends SceneBase { return pokemon; } - addEnemyPokemon(species: PokemonSpecies, level: integer, trainerSlot: TrainerSlot, boss: boolean = false, shinyLock: boolean = false, dataSource?: PokemonData, postProcess?: (enemyPokemon: EnemyPokemon) => void): EnemyPokemon { + addEnemyPokemon( + species: PokemonSpecies, + level: number, + trainerSlot: TrainerSlot, + boss = false, + shinyLock = false, + dataSource?: PokemonData, + postProcess?: (enemyPokemon: EnemyPokemon) => void, + ): EnemyPokemon { if (Overrides.OPP_LEVEL_OVERRIDE > 0) { level = Overrides.OPP_LEVEL_OVERRIDE; } @@ -959,7 +1069,13 @@ export default class BattleScene extends SceneBase { const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967296)); for (let s = 0; s < pokemon.ivs.length; s++) { - pokemon.ivs[s] = Math.round(Phaser.Math.Linear(Math.min(pokemon.ivs[s], secondaryIvs[s]), Math.max(pokemon.ivs[s], secondaryIvs[s]), 0.75)); + pokemon.ivs[s] = Math.round( + Phaser.Math.Linear( + Math.min(pokemon.ivs[s], secondaryIvs[s]), + Math.max(pokemon.ivs[s], secondaryIvs[s]), + 0.75, + ), + ); } } if (postProcess) { @@ -982,7 +1098,7 @@ export default class BattleScene extends SceneBase { * @param pokemon * @param destroy Default true. If true, will destroy the {@linkcode PlayerPokemon} after removing */ - removePokemonFromPlayerParty(pokemon: PlayerPokemon, destroy: boolean = true) { + removePokemonFromPlayerParty(pokemon: PlayerPokemon, destroy = true) { if (!pokemon) { return; } @@ -996,7 +1112,14 @@ export default class BattleScene extends SceneBase { this.updateModifiers(true); } - addPokemonIcon(pokemon: Pokemon, x: number, y: number, originX: number = 0.5, originY: number = 0.5, ignoreOverride: boolean = false): Phaser.GameObjects.Container { + addPokemonIcon( + pokemon: Pokemon, + x: number, + y: number, + originX = 0.5, + originY = 0.5, + ignoreOverride = false, + ): Phaser.GameObjects.Container { const container = this.add.container(x, y); container.setName(`${pokemon.name}-icon`); @@ -1026,13 +1149,22 @@ export default class BattleScene extends SceneBase { const originalHeight = icon.height; const originalFrame = icon.frame; - const iconHeight = (icon.frame.cutHeight <= fusionIcon.frame.cutHeight ? Math.ceil : Math.floor)((icon.frame.cutHeight + fusionIcon.frame.cutHeight) / 4); + const iconHeight = (icon.frame.cutHeight <= fusionIcon.frame.cutHeight ? Math.ceil : Math.floor)( + (icon.frame.cutHeight + fusionIcon.frame.cutHeight) / 4, + ); // Inefficient, but for some reason didn't work with only the unique properties as part of the name const iconFrameId = `${icon.frame.name}f${fusionIcon.frame.name}`; if (!icon.frame.texture.has(iconFrameId)) { - icon.frame.texture.add(iconFrameId, icon.frame.sourceIndex, icon.frame.cutX, icon.frame.cutY, icon.frame.cutWidth, iconHeight); + icon.frame.texture.add( + iconFrameId, + icon.frame.sourceIndex, + icon.frame.cutX, + icon.frame.cutY, + icon.frame.cutWidth, + iconHeight, + ); } icon.setFrame(iconFrameId); @@ -1048,7 +1180,14 @@ export default class BattleScene extends SceneBase { const fusionIconFrameId = `${fusionIcon.frame.name}f${icon.frame.name}`; if (!fusionIcon.frame.texture.has(fusionIconFrameId)) { - fusionIcon.frame.texture.add(fusionIconFrameId, fusionIcon.frame.sourceIndex, fusionIcon.frame.cutX, fusionIconY, fusionIcon.frame.cutWidth, fusionIconHeight); + fusionIcon.frame.texture.add( + fusionIconFrameId, + fusionIcon.frame.sourceIndex, + fusionIcon.frame.cutX, + fusionIconY, + fusionIcon.frame.cutWidth, + fusionIconHeight, + ); } fusionIcon.setFrame(fusionIconFrameId); @@ -1061,7 +1200,7 @@ export default class BattleScene extends SceneBase { container.x -= originalWidth * (originX - 0.5); } if (originY !== 0) { - container.y -= (originalHeight) * originY; + container.y -= originalHeight * originY; } } else { if (originX !== 0.5) { @@ -1092,11 +1231,11 @@ export default class BattleScene extends SceneBase { * @param min The minimum integer to pick, default `0` * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1) */ - randBattleSeedInt(range: integer, min: integer = 0): integer { + randBattleSeedInt(range: number, min = 0): number { return this.currentBattle?.randSeedInt(range, min); } - reset(clearScene: boolean = false, clearData: boolean = false, reloadI18n: boolean = false): void { + reset(clearScene = false, clearData = false, reloadI18n = false): void { if (clearData) { this.gameData = new GameData(); } @@ -1110,7 +1249,11 @@ export default class BattleScene extends SceneBase { this.lockModifierTiers = false; - this.pokeballCounts = Object.fromEntries(Utils.getEnumValues(PokeballType).filter(p => p <= PokeballType.MASTER_BALL).map(t => [ t, 0 ])); + this.pokeballCounts = Object.fromEntries( + Utils.getEnumValues(PokeballType) + .filter(p => p <= PokeballType.MASTER_BALL) + .map(t => [t, 0]), + ); this.pokeballCounts[PokeballType.POKEBALL] += 5; if (Overrides.POKEBALL_OVERRIDE.active) { this.pokeballCounts = Overrides.POKEBALL_OVERRIDE.pokeballs; @@ -1152,7 +1295,7 @@ export default class BattleScene extends SceneBase { this.updateScoreText(); this.scoreText.setVisible(false); - [ this.luckLabelText, this.luckText ].map(t => t.setVisible(false)); + [this.luckLabelText, this.luckText].map(t => t.setVisible(false)); this.newArena(Overrides.STARTING_BIOME_OVERRIDE || Biome.TOWN); @@ -1161,7 +1304,8 @@ export default class BattleScene extends SceneBase { this.arenaBgTransition.setPosition(0, 0); this.arenaPlayer.setPosition(300, 0); this.arenaPlayerTransition.setPosition(0, 0); - [ this.arenaEnemy, this.arenaNextEnemy ].forEach(a => a.setPosition(-280, 0)); + this.arenaEnemy.setPosition(-280, 0); + this.arenaNextEnemy.setPosition(-280, 0); this.arenaNextEnemy.setVisible(false); this.arena.init(); @@ -1179,7 +1323,15 @@ export default class BattleScene extends SceneBase { ...allSpecies, ...allMoves, ...allAbilities, - ...Utils.getEnumValues(ModifierPoolType).map(mpt => getModifierPoolForType(mpt)).map(mp => Object.values(mp).flat().map(mt => mt.modifierType).filter(mt => "localize" in mt).map(lpb => lpb as unknown as Localizable)).flat() + ...Utils.getEnumValues(ModifierPoolType) + .map(mpt => getModifierPoolForType(mpt)) + .flatMap(mp => + Object.values(mp) + .flat() + .map(mt => mt.modifierType) + .filter(mt => "localize" in mt) + .map(lpb => lpb as unknown as Localizable), + ), ]; for (const item of localizable) { item.localize(); @@ -1192,7 +1344,7 @@ export default class BattleScene extends SceneBase { this.fadeOutBgm(250, false); this.tweens.add({ - targets: [ this.uiContainer ], + targets: [this.uiContainer], alpha: 0, duration: 250, ease: "Sine.easeInOut", @@ -1205,21 +1357,29 @@ export default class BattleScene extends SceneBase { this.children.removeAll(true); this.game.domContainer.innerHTML = ""; this.launchBattle(); - } + }, }); } } getDoubleBattleChance(newWaveIndex: number, playerField: PlayerPokemon[]) { - const doubleChance = new Utils.IntegerHolder(newWaveIndex % 10 === 0 ? 32 : 8); + const doubleChance = new Utils.NumberHolder(newWaveIndex % 10 === 0 ? 32 : 8); this.applyModifiers(DoubleBattleChanceBoosterModifier, true, doubleChance); - playerField.forEach(p => applyAbAttrs(DoubleBattleChanceAbAttr, p, null, false, doubleChance)); + for (const p of playerField) { + applyAbAttrs(DoubleBattleChanceAbAttr, p, null, false, doubleChance); + } return Math.max(doubleChance.value, 1); } - newBattle(waveIndex?: integer, battleType?: BattleType, trainerData?: TrainerData, double?: boolean, mysteryEncounterType?: MysteryEncounterType): Battle | null { + newBattle( + waveIndex?: number, + battleType?: BattleType, + trainerData?: TrainerData, + double?: boolean, + mysteryEncounterType?: MysteryEncounterType, + ): Battle | null { const _startingWave = Overrides.STARTING_WAVE_OVERRIDE || startingWave; - const newWaveIndex = waveIndex || ((this.currentBattle?.waveIndex || (_startingWave - 1)) + 1); + const newWaveIndex = waveIndex || (this.currentBattle?.waveIndex || _startingWave - 1) + 1; let newDouble: boolean | undefined; let newBattleType: BattleType; let newTrainer: Trainer | undefined; @@ -1234,7 +1394,10 @@ export default class BattleScene extends SceneBase { battleConfig = this.gameMode.getFixedBattle(newWaveIndex); newDouble = battleConfig.double; newBattleType = battleConfig.battleType; - this.executeWithSeedOffset(() => newTrainer = battleConfig?.getTrainer(), (battleConfig.seedOffsetWaveIndex || newWaveIndex) << 8); + this.executeWithSeedOffset( + () => (newTrainer = battleConfig?.getTrainer()), + (battleConfig.seedOffsetWaveIndex || newWaveIndex) << 8, + ); if (newTrainer) { this.field.add(newTrainer); } @@ -1255,11 +1418,18 @@ export default class BattleScene extends SceneBase { } else if (trainerConfigs[trainerType].hasDouble) { doubleTrainer = !Utils.randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField)); // Add a check that special trainers can't be double except for tate and liza - they should use the normal double chance - if (trainerConfigs[trainerType].trainerTypeDouble && ![ TrainerType.TATE, TrainerType.LIZA ].includes(trainerType)) { + if ( + trainerConfigs[trainerType].trainerTypeDouble && + ![TrainerType.TATE, TrainerType.LIZA].includes(trainerType) + ) { doubleTrainer = false; } } - const variant = doubleTrainer ? TrainerVariant.DOUBLE : (Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT); + const variant = doubleTrainer + ? TrainerVariant.DOUBLE + : Utils.randSeedInt(2) + ? TrainerVariant.FEMALE + : TrainerVariant.DEFAULT; newTrainer = trainerData !== undefined ? trainerData.toTrainer() : new Trainer(trainerType, variant); this.field.add(newTrainer); } @@ -1299,10 +1469,10 @@ export default class BattleScene extends SceneBase { doubleOverrideForWave = "single"; break; case "even-doubles": - doubleOverrideForWave = (newWaveIndex % 2) ? "single" : "double"; + doubleOverrideForWave = newWaveIndex % 2 ? "single" : "double"; break; case "odd-doubles": - doubleOverrideForWave = (newWaveIndex % 2) ? "double" : "single"; + doubleOverrideForWave = newWaveIndex % 2 ? "double" : "single"; break; } @@ -1332,12 +1502,18 @@ export default class BattleScene extends SceneBase { if (lastBattle?.double && !newDouble) { this.tryRemovePhase(p => p instanceof SwitchPhase); - this.getPlayerField().forEach(p => p.lapseTag(BattlerTagType.COMMANDED)); + for (const p of this.getPlayerField()) { + p.lapseTag(BattlerTagType.COMMANDED); + } } - this.executeWithSeedOffset(() => { - this.currentBattle = new Battle(this.gameMode, newWaveIndex, newBattleType, newTrainer, newDouble); - }, newWaveIndex << 3, this.waveSeed); + this.executeWithSeedOffset( + () => { + this.currentBattle = new Battle(this.gameMode, newWaveIndex, newBattleType, newTrainer, newDouble); + }, + newWaveIndex << 3, + this.waveSeed, + ); this.currentBattle.incrementTurn(); if (newBattleType === BattleType.MYSTERY_ENCOUNTER) { @@ -1350,19 +1526,27 @@ export default class BattleScene extends SceneBase { if (!waveIndex && lastBattle) { const isWaveIndexMultipleOfTen = !(lastBattle.waveIndex % 10); const isEndlessOrDaily = this.gameMode.hasShortBiomes || this.gameMode.isDaily; - const isEndlessFifthWave = this.gameMode.hasShortBiomes && (lastBattle.waveIndex % 5) === 0; - const isWaveIndexMultipleOfFiftyMinusOne = (lastBattle.waveIndex % 50) === 49; - const isNewBiome = isWaveIndexMultipleOfTen || isEndlessFifthWave || (isEndlessOrDaily && isWaveIndexMultipleOfFiftyMinusOne); - const resetArenaState = isNewBiome || [ BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER ].includes(this.currentBattle.battleType) || this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS; - this.getEnemyParty().forEach(enemyPokemon => enemyPokemon.destroy()); + const isEndlessFifthWave = this.gameMode.hasShortBiomes && lastBattle.waveIndex % 5 === 0; + const isWaveIndexMultipleOfFiftyMinusOne = lastBattle.waveIndex % 50 === 49; + const isNewBiome = + isWaveIndexMultipleOfTen || isEndlessFifthWave || (isEndlessOrDaily && isWaveIndexMultipleOfFiftyMinusOne); + const resetArenaState = + isNewBiome || + [BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(this.currentBattle.battleType) || + this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS; + for (const enemyPokemon of this.getEnemyParty()) { + enemyPokemon.destroy(); + } this.trySpreadPokerus(); - if (!isNewBiome && (newWaveIndex % 10) === 5) { + if (!isNewBiome && newWaveIndex % 10 === 5) { this.arena.updatePoolsForTimeOfDay(); } if (resetArenaState) { this.arena.resetArenaEffects(); - playerField.forEach((pokemon) => pokemon.lapseTag(BattlerTagType.COMMANDED)); + for (const pokemon of playerField) { + pokemon.lapseTag(BattlerTagType.COMMANDED); + } playerField.forEach((pokemon, p) => { if (pokemon.isOnField()) { @@ -1372,7 +1556,14 @@ export default class BattleScene extends SceneBase { for (const pokemon of this.getPlayerParty()) { pokemon.resetBattleData(); + pokemon.resetTera(); applyPostBattleInitAbAttrs(PostBattleInitAbAttr, pokemon); + if ( + pokemon.hasSpecies(Species.TERAPAGOS) || + (this.gameMode.isClassic && this.currentBattle.waveIndex > 180 && this.currentBattle.waveIndex <= 190) + ) { + this.arena.playerTerasUsed = 0; + } } if (!this.trainer.visible) { @@ -1400,26 +1591,34 @@ export default class BattleScene extends SceneBase { return this.currentBattle; } - newArena(biome: Biome): Arena { - this.arena = new Arena(biome, Biome[biome].toLowerCase()); + newArena(biome: Biome, playerFaints?: number): Arena { + this.arena = new Arena(biome, Biome[biome].toLowerCase(), playerFaints); this.eventTarget.dispatchEvent(new NewArenaEvent()); - this.arenaBg.pipelineData = { terrainColorRatio: this.arena.getBgTerrainColorRatioForBiome() }; + this.arenaBg.pipelineData = { + terrainColorRatio: this.arena.getBgTerrainColorRatioForBiome(), + }; return this.arena; } updateFieldScale(): Promise { return new Promise(resolve => { - const fieldScale = Math.floor(Math.pow(1 / this.getField(true) - .map(p => p.getSpriteScale()) - .reduce((highestScale: number, scale: number) => highestScale = Math.max(scale, highestScale), 0), 0.7) * 40 - ) / 40; + const fieldScale = + Math.floor( + Math.pow( + 1 / + this.getField(true) + .map(p => p.getSpriteScale()) + .reduce((highestScale: number, scale: number) => (highestScale = Math.max(scale, highestScale)), 0), + 0.7, + ) * 40, + ) / 40; this.setFieldScale(fieldScale).then(() => resolve()); }); } - setFieldScale(scale: number, instant: boolean = false): Promise { + setFieldScale(scale: number, instant = false): Promise { return new Promise(resolve => { scale *= 6; if (this.field.scale === scale) { @@ -1438,17 +1637,78 @@ export default class BattleScene extends SceneBase { y: defaultHeight - scaledHeight, duration: !instant ? Utils.fixedInt(Math.abs(this.field.scale - scale) * 200) : 0, ease: "Sine.easeInOut", - onComplete: () => resolve() + onComplete: () => resolve(), }); }); } - getSpeciesFormIndex(species: PokemonSpecies, gender?: Gender, nature?: Nature, ignoreArena?: boolean): integer { + getSpeciesFormIndex(species: PokemonSpecies, gender?: Gender, nature?: Nature, ignoreArena?: boolean): number { if (!species.forms?.length) { return 0; } - const isEggPhase: boolean = [ "EggLapsePhase", "EggHatchPhase" ].includes(this.getCurrentPhase()?.constructor.name ?? ""); + const isEggPhase: boolean = ["EggLapsePhase", "EggHatchPhase"].includes( + this.getCurrentPhase()?.constructor.name ?? "", + ); + + if ( + // Give trainers with specialty types an appropriately-typed form for Wormadam, Rotom, Arceus, Oricorio, Silvally, or Paldean Tauros. + !isEggPhase && + this.currentBattle?.battleType === BattleType.TRAINER && + !isNullOrUndefined(this.currentBattle.trainer) && + this.currentBattle.trainer.config.hasSpecialtyType() + ) { + if (species.speciesId === Species.WORMADAM) { + switch (this.currentBattle.trainer.config.specialtyType) { + case PokemonType.GROUND: + return 1; // Sandy Cloak + case PokemonType.STEEL: + return 2; // Trash Cloak + case PokemonType.GRASS: + return 0; // Plant Cloak + } + } + if (species.speciesId === Species.ROTOM) { + switch (this.currentBattle.trainer.config.specialtyType) { + case PokemonType.FLYING: + return 4; // Fan Rotom + case PokemonType.GHOST: + return 0; // Lightbulb Rotom + case PokemonType.FIRE: + return 1; // Heat Rotom + case PokemonType.GRASS: + return 5; // Mow Rotom + case PokemonType.WATER: + return 2; // Wash Rotom + case PokemonType.ICE: + return 3; // Frost Rotom + } + } + if (species.speciesId === Species.ORICORIO) { + switch (this.currentBattle.trainer.config.specialtyType) { + case PokemonType.GHOST: + return 3; // Sensu Style + case PokemonType.FIRE: + return 0; // Baile Style + case PokemonType.ELECTRIC: + return 1; // Pom-Pom Style + case PokemonType.PSYCHIC: + return 2; // Pa'u Style + } + } + if (species.speciesId === Species.PALDEA_TAUROS) { + switch (this.currentBattle.trainer.config.specialtyType) { + case PokemonType.FIRE: + return 1; // Blaze Breed + case PokemonType.WATER: + return 2; // Aqua Breed + } + } + if (species.speciesId === Species.SILVALLY || species.speciesId === Species.ARCEUS) { + // Would probably never happen, but might as well + return this.currentBattle.trainer.config.specialtyType; + } + } switch (species.speciesId) { case Species.UNOWN: @@ -1457,8 +1717,6 @@ export default class BattleScene extends SceneBase { case Species.BASCULIN: case Species.DEERLING: case Species.SAWSBUCK: - case Species.FROAKIE: - case Species.FROGADIER: case Species.SCATTERBUG: case Species.SPEWPA: case Species.VIVILLON: @@ -1481,13 +1739,19 @@ export default class BattleScene extends SceneBase { } return Utils.randSeedInt(8); case Species.EEVEE: - if (this.currentBattle?.battleType === BattleType.TRAINER && this.currentBattle?.waveIndex < 30 && !isEggPhase) { + if ( + this.currentBattle?.battleType === BattleType.TRAINER && + this.currentBattle?.waveIndex < 30 && + !isEggPhase + ) { return 0; // No Partner Eevee for Wave 12 Preschoolers } return Utils.randSeedInt(2); + case Species.FROAKIE: + case Species.FROGADIER: case Species.GRENINJA: - if (this.currentBattle?.battleType === BattleType.TRAINER) { - return 0; // Don't give trainers Battle Bond Greninja + if (this.currentBattle?.battleType === BattleType.TRAINER && !isEggPhase) { + return 0; // Don't give trainers Battle Bond Greninja, Froakie or Frogadier } return Utils.randSeedInt(2); case Species.URSHIFU: @@ -1503,19 +1767,32 @@ export default class BattleScene extends SceneBase { case Species.BASCULEGION: case Species.OINKOLOGNE: return gender === Gender.FEMALE ? 1 : 0; - case Species.TOXTRICITY: - const lowkeyNatures = [ Nature.LONELY, Nature.BOLD, Nature.RELAXED, Nature.TIMID, Nature.SERIOUS, Nature.MODEST, Nature.MILD, Nature.QUIET, Nature.BASHFUL, Nature.CALM, Nature.GENTLE, Nature.CAREFUL ]; + case Species.TOXTRICITY: { + const lowkeyNatures = [ + Nature.LONELY, + Nature.BOLD, + Nature.RELAXED, + Nature.TIMID, + Nature.SERIOUS, + Nature.MODEST, + Nature.MILD, + Nature.QUIET, + Nature.BASHFUL, + Nature.CALM, + Nature.GENTLE, + Nature.CAREFUL, + ]; if (nature !== undefined && lowkeyNatures.indexOf(nature) > -1) { return 1; } return 0; + } case Species.GIMMIGHOUL: - // Chest form can only be found in Mysterious Chest Encounter, if this is a game mode with MEs + // Chest form can only be found in Mysterious Chest Encounter, if this is a game mode with MEs if (this.gameMode.hasMysteryEncounters && !isEggPhase) { return 1; // Wandering form - } else { - return Utils.randSeedInt(species.forms.length); } + return Utils.randSeedInt(species.forms.length); } if (ignoreArena) { @@ -1534,24 +1811,33 @@ export default class BattleScene extends SceneBase { private getGeneratedOffsetGym(): boolean { let ret = false; - this.executeWithSeedOffset(() => { - ret = !Utils.randSeedInt(2); - }, 0, this.seed.toString()); + this.executeWithSeedOffset( + () => { + ret = !Utils.randSeedInt(2); + }, + 0, + this.seed.toString(), + ); return ret; } - private getGeneratedWaveCycleOffset(): integer { + private getGeneratedWaveCycleOffset(): number { let ret = 0; - this.executeWithSeedOffset(() => { - ret = Utils.randSeedInt(8) * 5; - }, 0, this.seed.toString()); + this.executeWithSeedOffset( + () => { + ret = Utils.randSeedInt(8) * 5; + }, + 0, + this.seed.toString(), + ); return ret; } - getEncounterBossSegments(waveIndex: integer, level: integer, species?: PokemonSpecies, forceBoss: boolean = false): integer { + getEncounterBossSegments(waveIndex: number, level: number, species?: PokemonSpecies, forceBoss = false): number { if (Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE > 1) { return Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE; - } else if (Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE === 1) { + } + if (Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE === 1) { // The rest of the code expects to be returned 0 and not 1 if the enemy is not a boss return 0; } @@ -1565,14 +1851,17 @@ export default class BattleScene extends SceneBase { isBoss = true; } else { this.executeWithSeedOffset(() => { - isBoss = waveIndex % 10 === 0 || (this.gameMode.hasRandomBosses && Utils.randSeedInt(100) < Math.min(Math.max(Math.ceil((waveIndex - 250) / 50), 0) * 2, 30)); + isBoss = + waveIndex % 10 === 0 || + (this.gameMode.hasRandomBosses && + Utils.randSeedInt(100) < Math.min(Math.max(Math.ceil((waveIndex - 250) / 50), 0) * 2, 30)); }, waveIndex << 2); } if (!isBoss) { return 0; } - let ret: integer = 2; + let ret = 2; if (level >= 100) { ret++; @@ -1589,7 +1878,7 @@ export default class BattleScene extends SceneBase { trySpreadPokerus(): void { const party = this.getPlayerParty(); - const infectedIndexes: integer[] = []; + const infectedIndexes: number[] = []; const spread = (index: number, spreadTo: number) => { const partyMember = party[index + spreadTo]; if (!partyMember.pokerus && !Utils.randSeedInt(10)) { @@ -1602,26 +1891,34 @@ export default class BattleScene extends SceneBase { return; } - this.executeWithSeedOffset(() => { - if (p) { - spread(p, -1); - } - if (p < party.length - 1) { - spread(p, 1); - } - }, this.currentBattle.waveIndex + (p << 8)); + this.executeWithSeedOffset( + () => { + if (p) { + spread(p, -1); + } + if (p < party.length - 1) { + spread(p, 1); + } + }, + this.currentBattle.waveIndex + (p << 8), + ); }); } - resetSeed(waveIndex?: integer): void { + resetSeed(waveIndex?: number): void { const wave = waveIndex || this.currentBattle?.waveIndex || 0; this.waveSeed = Utils.shiftCharCodes(this.seed, wave); - Phaser.Math.RND.sow([ this.waveSeed ]); + Phaser.Math.RND.sow([this.waveSeed]); console.log("Wave Seed:", this.waveSeed, wave); this.rngCounter = 0; } - executeWithSeedOffset(func: Function, offset: integer, seedOverride?: string): void { + executeWithSeedOffset( + // biome-ignore lint/complexity/noBannedTypes: Refactor to not use Function + func: Function, + offset: number, + seedOverride?: string, + ): void { if (!func) { return; } @@ -1629,7 +1926,7 @@ export default class BattleScene extends SceneBase { const tempRngOffset = this.rngOffset; const tempRngSeedOverride = this.rngSeedOverride; const state = Phaser.Math.RND.state(); - Phaser.Math.RND.sow([ Utils.shiftCharCodes(seedOverride || this.seed, offset) ]); + Phaser.Math.RND.sow([Utils.shiftCharCodes(seedOverride || this.seed, offset)]); this.rngCounter = 0; this.rngOffset = offset; this.rngSeedOverride = seedOverride || ""; @@ -1640,7 +1937,13 @@ export default class BattleScene extends SceneBase { this.rngSeedOverride = tempRngSeedOverride; } - addFieldSprite(x: number, y: number, texture: string | Phaser.Textures.Texture, frame?: string | number, terrainColorRatio: number = 0): Phaser.GameObjects.Sprite { + addFieldSprite( + x: number, + y: number, + texture: string | Phaser.Textures.Texture, + frame?: string | number, + terrainColorRatio = 0, + ): Phaser.GameObjects.Sprite { const ret = this.add.sprite(x, y, texture, frame); ret.setPipeline(this.fieldSpritePipeline); if (terrainColorRatio) { @@ -1650,14 +1953,33 @@ export default class BattleScene extends SceneBase { return ret; } - addPokemonSprite(pokemon: Pokemon, x: number, y: number, texture: string | Phaser.Textures.Texture, frame?: string | number, hasShadow: boolean = false, ignoreOverride: boolean = false): Phaser.GameObjects.Sprite { + addPokemonSprite( + pokemon: Pokemon, + x: number, + y: number, + texture: string | Phaser.Textures.Texture, + frame?: string | number, + hasShadow = false, + ignoreOverride = false, + ): Phaser.GameObjects.Sprite { const ret = this.addFieldSprite(x, y, texture, frame); this.initPokemonSprite(ret, pokemon, hasShadow, ignoreOverride); return ret; } - initPokemonSprite(sprite: Phaser.GameObjects.Sprite, pokemon?: Pokemon, hasShadow: boolean = false, ignoreOverride: boolean = false): Phaser.GameObjects.Sprite { - sprite.setPipeline(this.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: hasShadow, ignoreOverride: ignoreOverride, teraColor: pokemon ? getTypeRgb(pokemon.getTeraType()) : undefined }); + initPokemonSprite( + sprite: Phaser.GameObjects.Sprite, + pokemon?: Pokemon, + hasShadow = false, + ignoreOverride = false, + ): Phaser.GameObjects.Sprite { + sprite.setPipeline(this.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + hasShadow: hasShadow, + ignoreOverride: ignoreOverride, + teraColor: pokemon ? getTypeRgb(pokemon.getTeraType()) : undefined, + isTerastallized: pokemon ? pokemon.isTerastallized : false, + }); this.spriteSparkleHandler.add(sprite); return sprite; } @@ -1669,26 +1991,26 @@ export default class BattleScene extends SceneBase { this.arenaFlyout.toggleFlyout(pressed); } - showFieldOverlay(duration: integer): Promise { + showFieldOverlay(duration: number): Promise { return new Promise(resolve => { this.tweens.add({ targets: this.fieldOverlay, alpha: 0.5, ease: "Sine.easeOut", duration: duration, - onComplete: () => resolve() + onComplete: () => resolve(), }); }); } - hideFieldOverlay(duration: integer): Promise { + hideFieldOverlay(duration: number): Promise { return new Promise(resolve => { this.tweens.add({ targets: this.fieldOverlay, alpha: 0, duration: duration, ease: "Cubic.easeIn", - onComplete: () => resolve() + onComplete: () => resolve(), }); }); } @@ -1701,7 +2023,7 @@ export default class BattleScene extends SceneBase { } } - showShopOverlay(duration: integer): Promise { + showShopOverlay(duration: number): Promise { this.shopOverlayShown = true; return new Promise(resolve => { this.tweens.add({ @@ -1709,12 +2031,12 @@ export default class BattleScene extends SceneBase { alpha: this.shopOverlayOpacity, ease: "Sine.easeOut", duration, - onComplete: () => resolve() + onComplete: () => resolve(), }); }); } - hideShopOverlay(duration: integer): Promise { + hideShopOverlay(duration: number): Promise { this.shopOverlayShown = false; return new Promise(resolve => { this.tweens.add({ @@ -1722,7 +2044,7 @@ export default class BattleScene extends SceneBase { alpha: 0, duration: duration, ease: "Cubic.easeIn", - onComplete: () => resolve() + onComplete: () => resolve(), }); }); } @@ -1739,13 +2061,13 @@ export default class BattleScene extends SceneBase { const isBoss = !(this.currentBattle.waveIndex % 10); const biomeString: string = getBiomeName(this.arena.biomeType); this.fieldUI.moveAbove(this.biomeWaveText, this.luckText); - this.biomeWaveText.setText( biomeString + " - " + this.currentBattle.waveIndex.toString()); + this.biomeWaveText.setText(biomeString + " - " + this.currentBattle.waveIndex.toString()); this.biomeWaveText.setColor(!isBoss ? "#ffffff" : "#f89890"); this.biomeWaveText.setShadowColor(!isBoss ? "#636363" : "#984038"); this.biomeWaveText.setVisible(true); } - updateMoneyText(forceVisible: boolean = true): void { + updateMoneyText(forceVisible = true): void { if (this.money === undefined) { return; } @@ -1769,7 +2091,7 @@ export default class BattleScene extends SceneBase { scale: this.moneyText.scale + deltaScale, loop: 0, yoyo: true, - onComplete: (_) => this.moneyText.setShadowColor(getTextColor(TextStyle.MONEY, true)), + onComplete: _ => this.moneyText.setShadowColor(getTextColor(TextStyle.MONEY, true)), }); } @@ -1783,8 +2105,10 @@ export default class BattleScene extends SceneBase { * @param duration The time for this label to fade in, if it is not already visible. */ updateAndShowText(duration: number): void { - const labels = [ this.luckLabelText, this.luckText ]; - labels.forEach(t => t.setAlpha(0)); + const labels = [this.luckLabelText, this.luckText]; + for (const label of labels) { + label.setAlpha(0); + } const luckValue = getPartyLuckValue(this.getPlayerParty()); this.luckText.setText(getLuckString(luckValue)); if (luckValue < 14) { @@ -1792,29 +2116,33 @@ export default class BattleScene extends SceneBase { } else { this.luckText.setTint(0xffef5c, 0x47ff69, 0x6b6bff, 0xff6969); } - this.luckLabelText.setX((this.game.canvas.width / 6) - 2 - (this.luckText.displayWidth + 2)); + this.luckLabelText.setX(this.game.canvas.width / 6 - 2 - (this.luckText.displayWidth + 2)); this.tweens.add({ targets: labels, duration: duration, alpha: 1, onComplete: () => { - labels.forEach(t => t.setVisible(true)); - } + for (const label of labels) { + label.setVisible(true); + } + }, }); } - hideLuckText(duration: integer): void { + hideLuckText(duration: number): void { if (this.reroll) { return; } - const labels = [ this.luckLabelText, this.luckText ]; + const labels = [this.luckLabelText, this.luckText]; this.tweens.add({ targets: labels, duration: duration, alpha: 0, onComplete: () => { - labels.forEach(l => l.setVisible(false)); - } + for (const label of labels) { + label.setVisible(false); + } + }, }); } @@ -1822,11 +2150,15 @@ export default class BattleScene extends SceneBase { const enemyModifierCount = this.enemyModifiers.filter(m => m.isIconVisible()).length; const biomeWaveTextHeight = this.biomeWaveText.getBottomLeft().y - this.biomeWaveText.getTopLeft().y; this.biomeWaveText.setY( - -(this.game.canvas.height / 6) + (enemyModifierCount ? enemyModifierCount <= 12 ? 15 : 24 : 0) + (biomeWaveTextHeight / 2) + -(this.game.canvas.height / 6) + + (enemyModifierCount ? (enemyModifierCount <= 12 ? 15 : 24) : 0) + + biomeWaveTextHeight / 2, ); this.moneyText.setY(this.biomeWaveText.y + 10); this.scoreText.setY(this.moneyText.y + 10); - [ this.luckLabelText, this.luckText ].map(l => l.setY((this.scoreText.visible ? this.scoreText : this.moneyText).y + 10)); + [this.luckLabelText, this.luckText].map(l => + l.setY((this.scoreText.visible ? this.scoreText : this.moneyText).y + 10), + ); const offsetY = (this.scoreText.visible ? this.scoreText : this.moneyText).y + 15; this.partyExpBar.setY(offsetY); this.candyBar.setY(offsetY + 15); @@ -1843,18 +2175,24 @@ export default class BattleScene extends SceneBase { } addFaintedEnemyScore(enemy: EnemyPokemon): void { - let scoreIncrease = enemy.getSpeciesForm().getBaseExp() * (enemy.level / this.getMaxExpLevel()) * ((enemy.ivs.reduce((iv: integer, total: integer) => total += iv, 0) / 93) * 0.2 + 0.8); - this.findModifiers(m => m instanceof PokemonHeldItemModifier && m.pokemonId === enemy.id, false).map(m => scoreIncrease *= (m as PokemonHeldItemModifier).getScoreMultiplier()); + let scoreIncrease = + enemy.getSpeciesForm().getBaseExp() * + (enemy.level / this.getMaxExpLevel()) * + ((enemy.ivs.reduce((iv: number, total: number) => (total += iv), 0) / 93) * 0.2 + 0.8); + this.findModifiers(m => m instanceof PokemonHeldItemModifier && m.pokemonId === enemy.id, false).map( + m => (scoreIncrease *= (m as PokemonHeldItemModifier).getScoreMultiplier()), + ); if (enemy.isBoss()) { scoreIncrease *= Math.sqrt(enemy.bossSegments); } this.currentBattle.battleScore += Math.ceil(scoreIncrease); } - getMaxExpLevel(ignoreLevelCap: boolean = false): integer { + getMaxExpLevel(ignoreLevelCap = false): number { if (Overrides.LEVEL_CAP_OVERRIDE > 0) { return Overrides.LEVEL_CAP_OVERRIDE; - } else if (ignoreLevelCap || Overrides.LEVEL_CAP_OVERRIDE < 0) { + } + if (ignoreLevelCap || Overrides.LEVEL_CAP_OVERRIDE < 0) { return Number.MAX_SAFE_INTEGER; } const waveIndex = Math.ceil((this.currentBattle?.waveIndex || 1) / 10) * 10; @@ -1863,28 +2201,44 @@ export default class BattleScene extends SceneBase { return Math.ceil(baseLevel / 2) * 2 + 2; } - randomSpecies(waveIndex: integer, level: integer, fromArenaPool?: boolean, speciesFilter?: PokemonSpeciesFilter, filterAllEvolutions?: boolean): PokemonSpecies { + randomSpecies( + waveIndex: number, + level: number, + fromArenaPool?: boolean, + speciesFilter?: PokemonSpeciesFilter, + filterAllEvolutions?: boolean, + ): PokemonSpecies { if (fromArenaPool) { return this.arena.randomSpecies(waveIndex, level, undefined, getPartyLuckValue(this.party)); } - const filteredSpecies = speciesFilter ? [ ...new Set(allSpecies.filter(s => s.isCatchable()).filter(speciesFilter).map(s => { - if (!filterAllEvolutions) { - while (pokemonPrevolutions.hasOwnProperty(s.speciesId)) { - s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]); - } - } - return s; - })) ] : allSpecies.filter(s => s.isCatchable()); + const filteredSpecies = speciesFilter + ? [ + ...new Set( + allSpecies + .filter(s => s.isCatchable()) + .filter(speciesFilter) + .map(s => { + if (!filterAllEvolutions) { + while (pokemonPrevolutions.hasOwnProperty(s.speciesId)) { + s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]); + } + } + return s; + }), + ), + ] + : allSpecies.filter(s => s.isCatchable()); return filteredSpecies[Utils.randSeedInt(filteredSpecies.length)]; } - generateRandomBiome(waveIndex: integer): Biome { + generateRandomBiome(waveIndex: number): Biome { const relWave = waveIndex % 250; const biomes = Utils.getEnumValues(Biome).filter(b => b !== Biome.TOWN && b !== Biome.END); const maxDepth = biomeDepths[Biome.END][0] - 2; - const depthWeights = new Array(maxDepth + 1).fill(null) - .map((_, i: integer) => ((1 - Math.min(Math.abs((i / (maxDepth - 1)) - (relWave / 250)) + 0.25, 1)) / 0.75) * 250); - const biomeThresholds: integer[] = []; + const depthWeights = new Array(maxDepth + 1) + .fill(null) + .map((_, i: number) => ((1 - Math.min(Math.abs(i / (maxDepth - 1) - relWave / 250) + 0.25, 1)) / 0.75) * 250); + const biomeThresholds: number[] = []; let totalWeight = 0; for (const biome of biomes) { totalWeight += Math.ceil(depthWeights[biomeDepths[biome][0] - 1] / biomeDepths[biome][1]); @@ -1903,7 +2257,7 @@ export default class BattleScene extends SceneBase { } isBgmPlaying(): boolean { - return this.bgm && this.bgm.isPlaying; + return this.bgm?.isPlaying ?? false; } playBgm(bgmName?: string, fadeOut?: boolean): void { @@ -1913,7 +2267,7 @@ export default class BattleScene extends SceneBase { if (this.bgm && bgmName === this.bgm.key) { if (!this.bgm.isPlaying) { this.bgm.play({ - volume: this.masterVolume * this.bgmVolume + volume: this.masterVolume * this.bgmVolume, }); } return; @@ -1924,15 +2278,13 @@ export default class BattleScene extends SceneBase { this.bgmCache.add(bgmName); this.loadBgm(bgmName); let loopPoint = 0; - loopPoint = bgmName === this.arena.bgm - ? this.arena.getBgmLoopPoint() - : this.getBgmLoopPoint(bgmName); + loopPoint = bgmName === this.arena.bgm ? this.arena.getBgmLoopPoint() : this.getBgmLoopPoint(bgmName); let loaded = false; const playNewBgm = () => { this.ui.bgmBar.setBgmToBgmBar(bgmName); if (bgmName === null && this.bgm && !this.bgm.pendingRemove) { this.bgm.play({ - volume: this.masterVolume * this.bgmVolume + volume: this.masterVolume * this.bgmVolume, }); return; } @@ -1941,7 +2293,7 @@ export default class BattleScene extends SceneBase { } this.bgm = this.sound.add(bgmName, { loop: true }); this.bgm.play({ - volume: this.masterVolume * this.bgmVolume + volume: this.masterVolume * this.bgmVolume, }); if (loopPoint) { this.bgm.on("looped", () => this.bgm.play({ seek: loopPoint })); @@ -1990,7 +2342,6 @@ export default class BattleScene extends SceneBase { } else { const soundDetails = sound.key.split("/"); switch (soundDetails[0]) { - case "battle_anims": case "cry": if (soundDetails[1].startsWith("PRSFX- ")) { @@ -2008,7 +2359,7 @@ export default class BattleScene extends SceneBase { } } - fadeOutBgm(duration: integer = 500, destroy: boolean = true): boolean { + fadeOutBgm(duration = 500, destroy = true): boolean { if (!this.bgm) { return false; } @@ -2027,7 +2378,7 @@ export default class BattleScene extends SceneBase { * @param destroy * @param delay */ - fadeAndSwitchBgm(newBgmKey: string, destroy: boolean = false, delay: number = 2000) { + fadeAndSwitchBgm(newBgmKey: string, destroy = false, delay = 2000) { this.fadeOutBgm(delay, destroy); this.time.delayedCall(delay, () => { this.playBgm(newBgmKey); @@ -2047,24 +2398,24 @@ export default class BattleScene extends SceneBase { case "heal": case "evolution": case "evolution_fanfare": - // These sounds are loaded in as BGM, but played as sound effects - // When these sounds are updated in updateVolume(), they are treated as BGM however because they are placed in the BGM Cache through being called by playSoundWithoutBGM() - config["volume"] *= (this.masterVolume * this.bgmVolume); + // These sounds are loaded in as BGM, but played as sound effects + // When these sounds are updated in updateVolume(), they are treated as BGM however because they are placed in the BGM Cache through being called by playSoundWithoutBGM() + config["volume"] *= this.masterVolume * this.bgmVolume; break; case "battle_anims": case "cry": - config["volume"] *= (this.masterVolume * this.fieldVolume); + config["volume"] *= this.masterVolume * this.fieldVolume; //PRSFX sound files are unusually loud if (keyDetails[1].startsWith("PRSFX- ")) { config["volume"] *= 0.5; } break; case "ui": - //As of, right now this applies to the "select", "menu_open", "error" sound effects - config["volume"] *= (this.masterVolume * this.uiVolume); + //As of, right now this applies to the "select", "menu_open", "error" sound effects + config["volume"] *= this.masterVolume * this.uiVolume; break; case "se": - config["volume"] *= (this.masterVolume * this.seVolume); + config["volume"] *= this.masterVolume * this.seVolume; break; } this.sound.play(key, config); @@ -2075,7 +2426,7 @@ export default class BattleScene extends SceneBase { } } - playSoundWithoutBgm(soundName: string, pauseDuration?: integer): AnySound { + playSoundWithoutBgm(soundName: string, pauseDuration?: number): AnySound { this.bgmCache.add(soundName); const resumeBgm = this.pauseBgm(); this.playSound(soundName); @@ -2084,7 +2435,7 @@ export default class BattleScene extends SceneBase { this.bgmResumeTimer.destroy(); } if (resumeBgm) { - this.bgmResumeTimer = this.time.delayedCall((pauseDuration || Utils.fixedInt(sound.totalDuration * 1000)), () => { + this.bgmResumeTimer = this.time.delayedCall(pauseDuration || Utils.fixedInt(sound.totalDuration * 1000), () => { this.resumeBgm(); this.bgmResumeTimer = null; }); @@ -2096,9 +2447,9 @@ export default class BattleScene extends SceneBase { getBgmLoopPoint(bgmName: string): number { switch (bgmName) { case "title": //Firel PokéRogue Title - return 46.500; + return 46.5; case "battle_kanto_champion": //B2W2 Kanto Champion Battle - return 13.950; + return 13.95; case "battle_johto_champion": //B2W2 Johto Champion Battle return 23.498; case "battle_hoenn_champion_g5": //B2W2 Hoenn Champion Battle @@ -2112,7 +2463,7 @@ export default class BattleScene extends SceneBase { case "battle_champion_iris": //B2W2 Unova Champion Battle return 10.145; case "battle_kalos_champion": //XY Kalos Champion Battle - return 10.380; + return 10.38; case "battle_champion_kukui": //SM Kukui Battle return 15.784; case "battle_alola_champion": //USUM Alola Champion Battle @@ -2128,17 +2479,17 @@ export default class BattleScene extends SceneBase { case "battle_champion_kieran": //SV Champion Kieran Battle return 7.206; case "battle_hoenn_elite": //ORAS Elite Four Battle - return 11.350; + return 11.35; case "battle_unova_elite": //BW Elite Four Battle - return 17.730; + return 17.73; case "battle_kalos_elite": //XY Elite Four Battle - return 12.340; + return 12.34; case "battle_alola_elite": //SM Elite Four Battle return 19.212; case "battle_galar_elite": //SWSH League Tournament Battle return 164.069; case "battle_paldea_elite": //SV Elite Four Battle - return 12.770; + return 12.77; case "battle_bb_elite": //SV BB League Elite Four Battle return 19.434; case "battle_final_encounter": //PMD RTDX Rayquaza's Domain @@ -2156,7 +2507,7 @@ export default class BattleScene extends SceneBase { case "battle_unova_gym": //BW Unova Gym Battle return 19.145; case "battle_kalos_gym": //XY Kalos Gym Battle - return 44.810; + return 44.81; case "battle_galar_gym": //SWSH Galar Gym Battle return 171.262; case "battle_paldea_gym": //SV Paldea Gym Battle @@ -2170,13 +2521,13 @@ export default class BattleScene extends SceneBase { case "battle_legendary_suicune": //HGSS Suicune Battle return 12.636; case "battle_legendary_lugia": //HGSS Lugia Battle - return 19.770; + return 19.77; case "battle_legendary_ho_oh": //HGSS Ho-oh Battle return 17.668; case "battle_legendary_regis_g5": //B2W2 Legendary Titan Battle - return 49.500; + return 49.5; case "battle_legendary_regis_g6": //ORAS Legendary Titan Battle - return 21.130; + return 21.13; case "battle_legendary_gro_kyo": //ORAS Groudon & Kyogre Battle return 10.547; case "battle_legendary_rayquaza": //ORAS Rayquaza Battle @@ -2186,7 +2537,7 @@ export default class BattleScene extends SceneBase { case "battle_legendary_lake_trio": //ORAS Lake Guardians Battle return 16.887; case "battle_legendary_sinnoh": //ORAS Sinnoh Legendary Battle - return 22.770; + return 22.77; case "battle_legendary_dia_pal": //ORAS Dialga & Palkia Battle return 16.009; case "battle_legendary_origin_forme": //LA Origin Dialga & Palkia Battle @@ -2204,7 +2555,7 @@ export default class BattleScene extends SceneBase { case "battle_legendary_xern_yvel": //XY Xerneas & Yveltal Battle return 26.468; case "battle_legendary_tapu": //SM Tapu Battle - return 0.000; + return 0.0; case "battle_legendary_sol_lun": //SM Solgaleo & Lunala Battle return 6.525; case "battle_legendary_ub": //SM Ultra Beast Battle @@ -2228,7 +2579,7 @@ export default class BattleScene extends SceneBase { case "battle_legendary_kor_mir": //SV Depths of Area Zero Battle return 6.442; case "battle_legendary_loyal_three": //SV Loyal Three Battle - return 6.500; + return 6.5; case "battle_legendary_ogerpon": //SV Ogerpon Battle return 14.335; case "battle_legendary_terapagos": //SV Terapagos Battle @@ -2236,7 +2587,7 @@ export default class BattleScene extends SceneBase { case "battle_legendary_pecharunt": //SV Pecharunt Battle return 6.508; case "battle_rival": //BW Rival Battle - return 14.110; + return 14.11; case "battle_rival_2": //BW N Battle return 17.714; case "battle_rival_3": //BW Final N Battle @@ -2246,7 +2597,7 @@ export default class BattleScene extends SceneBase { case "battle_wild": //BW Wild Battle return 12.703; case "battle_wild_strong": //BW Strong Wild Battle - return 13.940; + return 13.94; case "end_summit": //PMD RTDX Sky Tower Summit return 30.025; case "battle_rocket_grunt": //HGSS Team Rocket Battle @@ -2260,7 +2611,7 @@ export default class BattleScene extends SceneBase { case "battle_flare_grunt": //XY Team Flare Battle return 4.228; case "battle_aether_grunt": // SM Aether Foundation Battle - return 16.00; + return 16.0; case "battle_skull_grunt": // SM Team Skull Battle return 20.87; case "battle_macro_grunt": // SWSH Trainer Battle @@ -2274,7 +2625,7 @@ export default class BattleScene extends SceneBase { case "battle_skull_admin": //SM Team Skull Admin Battle return 15.463; case "battle_oleana": //SWSH Oleana Battle - return 14.110; + return 14.11; case "battle_star_admin": //SV Team Star Boss Battle return 9.493; case "battle_rocket_boss": //USUM Giovanni Battle @@ -2327,7 +2678,6 @@ export default class BattleScene extends SceneBase { return this.standbyPhase; } - /** * Adds a phase to the conditional queue and ensures it is executed only when the specified condition is met. * @@ -2339,7 +2689,7 @@ export default class BattleScene extends SceneBase { * */ pushConditionalPhase(phase: Phase, condition: () => boolean): void { - this.conditionalQueue.push([ condition, phase ]); + this.conditionalQueue.push([condition, phase]); } /** @@ -2347,19 +2697,19 @@ export default class BattleScene extends SceneBase { * @param phase {@linkcode Phase} the phase to add * @param defer boolean on which queue to add to, defaults to false, and adds to phaseQueue */ - pushPhase(phase: Phase, defer: boolean = false): void { + pushPhase(phase: Phase, defer = false): void { (!defer ? this.phaseQueue : this.nextCommandPhaseQueue).push(phase); } /** - * Adds Phase to the end of phaseQueuePrepend, or at phaseQueuePrependSpliceIndex - * @param phase {@linkcode Phase} the phase to add + * Adds Phase(s) to the end of phaseQueuePrepend, or at phaseQueuePrependSpliceIndex + * @param phases {@linkcode Phase} the phase(s) to add */ - unshiftPhase(phase: Phase): void { + unshiftPhase(...phases: Phase[]): void { if (this.phaseQueuePrependSpliceIndex === -1) { - this.phaseQueuePrepend.push(phase); + this.phaseQueuePrepend.push(...phases); } else { - this.phaseQueuePrepend.splice(this.phaseQueuePrependSpliceIndex, 0, phase); + this.phaseQueuePrepend.splice(this.phaseQueuePrependSpliceIndex, 0, ...phases); } } @@ -2497,34 +2847,38 @@ export default class BattleScene extends SceneBase { * @param targetPhase {@linkcode Phase} the type of phase to search for in phaseQueue * @returns boolean if a targetPhase was found and added */ - prependToPhase(phase: Phase, targetPhase: Constructor): boolean { + prependToPhase(phase: Phase | Phase[], targetPhase: Constructor): boolean { + if (!Array.isArray(phase)) { + phase = [phase]; + } const targetIndex = this.phaseQueue.findIndex(ph => ph instanceof targetPhase); if (targetIndex !== -1) { - this.phaseQueue.splice(targetIndex, 0, phase); + this.phaseQueue.splice(targetIndex, 0, ...phase); return true; - } else { - this.unshiftPhase(phase); - return false; } + this.unshiftPhase(...phase); + return false; } /** - * Tries to add the input phase to index after target phase in the {@linkcode phaseQueue}, else simply calls {@linkcode unshiftPhase()} - * @param phase {@linkcode Phase} the phase to be added + * Tries to add the input phase(s) to index after target phase in the {@linkcode phaseQueue}, else simply calls {@linkcode unshiftPhase()} + * @param phase {@linkcode Phase} the phase(s) to be added * @param targetPhase {@linkcode Phase} the type of phase to search for in {@linkcode phaseQueue} * @returns `true` if a `targetPhase` was found to append to */ - appendToPhase(phase: Phase, targetPhase: Constructor): boolean { + appendToPhase(phase: Phase | Phase[], targetPhase: Constructor): boolean { + if (!Array.isArray(phase)) { + phase = [phase]; + } const targetIndex = this.phaseQueue.findIndex(ph => ph instanceof targetPhase); if (targetIndex !== -1 && this.phaseQueue.length > targetIndex) { - this.phaseQueue.splice(targetIndex + 1, 0, phase); + this.phaseQueue.splice(targetIndex + 1, 0, ...phase); return true; - } else { - this.unshiftPhase(phase); - return false; } + this.unshiftPhase(...phase); + return false; } /** @@ -2535,7 +2889,13 @@ export default class BattleScene extends SceneBase { * @param promptDelay optional param for MessagePhase constructor * @param defer boolean for which queue to add it to, false -> add to PhaseQueuePrepend, true -> nextCommandPhaseQueue */ - queueMessage(message: string, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null, defer?: boolean | null) { + queueMessage( + message: string, + callbackDelay?: number | null, + prompt?: boolean | null, + promptDelay?: number | null, + defer?: boolean | null, + ) { const phase = new MessagePhase(message, callbackDelay, prompt, promptDelay); if (!defer) { // adds to the end of PhaseQueuePrepend @@ -2546,6 +2906,21 @@ export default class BattleScene extends SceneBase { } } + /** + * Queues an ability bar flyout phase + * @param pokemon The pokemon who has the ability + * @param passive Whether the ability is a passive + * @param show Whether to show or hide the bar + */ + public queueAbilityDisplay(pokemon: Pokemon, passive: boolean, show: boolean): void { + this.unshiftPhase( + show + ? new ShowAbilityPhase(pokemon.getBattlerIndex(), passive) + : new HideAbilityPhase(pokemon.getBattlerIndex(), passive), + ); + this.clearPhaseQueueSplice(); + } + /** * Moves everything from nextCommandPhaseQueue to phaseQueue (keeping order) */ @@ -2557,117 +2932,116 @@ export default class BattleScene extends SceneBase { this.phaseQueue.push(new TurnInitPhase()); } - addMoney(amount: integer): void { + addMoney(amount: number): void { this.money = Math.min(this.money + amount, Number.MAX_SAFE_INTEGER); this.updateMoneyText(); this.animateMoneyChanged(true); this.validateAchvs(MoneyAchv); } - getWaveMoneyAmount(moneyMultiplier: number): integer { + getWaveMoneyAmount(moneyMultiplier: number): number { const waveIndex = this.currentBattle.waveIndex; const waveSetIndex = Math.ceil(waveIndex / 10) - 1; - const moneyValue = Math.pow((waveSetIndex + 1 + (0.75 + (((waveIndex - 1) % 10) + 1) / 10)) * 100, 1 + 0.005 * waveSetIndex) * moneyMultiplier; + const moneyValue = + Math.pow((waveSetIndex + 1 + (0.75 + (((waveIndex - 1) % 10) + 1) / 10)) * 100, 1 + 0.005 * waveSetIndex) * + moneyMultiplier; return Math.floor(moneyValue / 10) * 10; } - addModifier(modifier: Modifier | null, ignoreUpdate?: boolean, playSound?: boolean, virtual?: boolean, instant?: boolean, cost?: number): Promise { + addModifier( + modifier: Modifier | null, + ignoreUpdate?: boolean, + playSound?: boolean, + virtual?: boolean, + instant?: boolean, + cost?: number, + ): boolean { if (!modifier) { - return Promise.resolve(false); + return false; } - return new Promise(resolve => { - let success = false; - const soundName = modifier.type.soundName; - this.validateAchvs(ModifierAchv, modifier); - const modifiersToRemove: PersistentModifier[] = []; - const modifierPromises: Promise[] = []; - if (modifier instanceof PersistentModifier) { - if (modifier instanceof TerastallizeModifier) { - modifiersToRemove.push(...(this.findModifiers(m => m instanceof TerastallizeModifier && m.pokemonId === modifier.pokemonId))); - } - if ((modifier as PersistentModifier).add(this.modifiers, !!virtual)) { - if (modifier instanceof PokemonFormChangeItemModifier || modifier instanceof TerastallizeModifier) { - const pokemon = this.getPokemonById(modifier.pokemonId); - if (pokemon) { - success = modifier.apply(pokemon, true); - } + let success = false; + const soundName = modifier.type.soundName; + this.validateAchvs(ModifierAchv, modifier); + const modifiersToRemove: PersistentModifier[] = []; + if (modifier instanceof PersistentModifier) { + if ((modifier as PersistentModifier).add(this.modifiers, !!virtual)) { + if (modifier instanceof PokemonFormChangeItemModifier) { + const pokemon = this.getPokemonById(modifier.pokemonId); + if (pokemon) { + success = modifier.apply(pokemon, true); } - if (playSound && !this.sound.get(soundName)) { - this.playSound(soundName); - } - } else if (!virtual) { - const defaultModifierType = getDefaultModifierTypeForTier(modifier.type.tier); - this.queueMessage(i18next.t("battle:itemStackFull", { fullItemName: modifier.type.name, itemName: defaultModifierType.name }), undefined, true); - return this.addModifier(defaultModifierType.newModifier(), ignoreUpdate, playSound, false, instant).then(success => resolve(success)); } - - for (const rm of modifiersToRemove) { - this.removeModifier(rm); - } - - if (!ignoreUpdate && !virtual) { - return this.updateModifiers(true, instant).then(() => resolve(success)); - } - } else if (modifier instanceof ConsumableModifier) { if (playSound && !this.sound.get(soundName)) { this.playSound(soundName); } - - if (modifier instanceof ConsumablePokemonModifier) { - for (const p in this.party) { - const pokemon = this.party[p]; - - const args: unknown[] = []; - if (modifier instanceof PokemonHpRestoreModifier) { - if (!(modifier as PokemonHpRestoreModifier).fainted) { - const hpRestoreMultiplier = new Utils.IntegerHolder(1); - this.applyModifiers(HealingBoosterModifier, true, hpRestoreMultiplier); - args.push(hpRestoreMultiplier.value); - } else { - args.push(1); - } - } else if (modifier instanceof FusePokemonModifier) { - args.push(this.getPokemonById(modifier.fusePokemonId) as PlayerPokemon); - } else if (modifier instanceof RememberMoveModifier && !Utils.isNullOrUndefined(cost)) { - args.push(cost); - } - - if (modifier.shouldApply(pokemon, ...args)) { - const result = modifier.apply(pokemon, ...args); - if (result instanceof Promise) { - modifierPromises.push(result.then(s => success ||= s)); - } else { - success ||= result; - } - } - } - - return Promise.allSettled([ this.party.map(p => p.updateInfo(instant)), ...modifierPromises ]).then(() => resolve(success)); - } else { - const args = [ this ]; - if (modifier.shouldApply(...args)) { - const result = modifier.apply(...args); - if (result instanceof Promise) { - return result.then(success => resolve(success)); - } else { - success ||= result; - } - } - } + } else if (!virtual) { + const defaultModifierType = getDefaultModifierTypeForTier(modifier.type.tier); + this.queueMessage( + i18next.t("battle:itemStackFull", { + fullItemName: modifier.type.name, + itemName: defaultModifierType.name, + }), + undefined, + false, + 3000, + ); + return this.addModifier(defaultModifierType.newModifier(), ignoreUpdate, playSound, false, instant); } - resolve(success); - }); + for (const rm of modifiersToRemove) { + this.removeModifier(rm); + } + + if (!ignoreUpdate && !virtual) { + this.updateModifiers(true, instant); + } + } else if (modifier instanceof ConsumableModifier) { + if (playSound && !this.sound.get(soundName)) { + this.playSound(soundName); + } + + if (modifier instanceof ConsumablePokemonModifier) { + for (const p in this.party) { + const pokemon = this.party[p]; + + const args: unknown[] = []; + if (modifier instanceof PokemonHpRestoreModifier) { + if (!(modifier as PokemonHpRestoreModifier).fainted) { + const hpRestoreMultiplier = new Utils.NumberHolder(1); + this.applyModifiers(HealingBoosterModifier, true, hpRestoreMultiplier); + args.push(hpRestoreMultiplier.value); + } else { + args.push(1); + } + } else if (modifier instanceof FusePokemonModifier) { + args.push(this.getPokemonById(modifier.fusePokemonId) as PlayerPokemon); + } else if (modifier instanceof RememberMoveModifier && !Utils.isNullOrUndefined(cost)) { + args.push(cost); + } + + if (modifier.shouldApply(pokemon, ...args)) { + const result = modifier.apply(pokemon, ...args); + success ||= result; + } + } + + this.party.map(p => p.updateInfo(instant)); + } else { + const args = [this]; + if (modifier.shouldApply(...args)) { + const result = modifier.apply(...args); + success ||= result; + } + } + } + return success; } addEnemyModifier(modifier: PersistentModifier, ignoreUpdate?: boolean, instant?: boolean): Promise { return new Promise(resolve => { const modifiersToRemove: PersistentModifier[] = []; - if (modifier instanceof TerastallizeModifier) { - modifiersToRemove.push(...(this.findModifiers(m => m instanceof TerastallizeModifier && m.pokemonId === modifier.pokemonId, false))); - } if ((modifier as PersistentModifier).add(this.enemyModifiers, false)) { - if (modifier instanceof PokemonFormChangeItemModifier || modifier instanceof TerastallizeModifier) { + if (modifier instanceof PokemonFormChangeItemModifier) { const pokemon = this.getPokemonById(modifier.pokemonId); if (pokemon) { modifier.apply(pokemon, true); @@ -2678,7 +3052,8 @@ export default class BattleScene extends SceneBase { } } if (!ignoreUpdate) { - this.updateModifiers(false, instant).then(() => resolve()); + this.updateModifiers(false, instant); + resolve(); } else { resolve(); } @@ -2699,76 +3074,128 @@ export default class BattleScene extends SceneBase { * @param itemLost If `true`, treat the item's current holder as losing the item (for now, this simply enables Unburden). Default is `true`. * @returns `true` if the transfer was successful */ - tryTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, playSound: boolean, transferQuantity: number = 1, instant?: boolean, ignoreUpdate?: boolean, itemLost: boolean = true): Promise { - return new Promise(resolve => { - const source = itemModifier.pokemonId ? itemModifier.getPokemon() : null; - const cancelled = new Utils.BooleanHolder(false); - Utils.executeIf(!!source && source.isPlayer() !== target.isPlayer(), () => applyAbAttrs(BlockItemTheftAbAttr, source! /* checked in condition*/, cancelled)).then(() => { - if (cancelled.value) { - return resolve(false); - } - const newItemModifier = itemModifier.clone() as PokemonHeldItemModifier; - newItemModifier.pokemonId = target.id; - const matchingModifier = this.findModifier(m => m instanceof PokemonHeldItemModifier - && (m as PokemonHeldItemModifier).matchType(itemModifier) && m.pokemonId === target.id, target.isPlayer()) as PokemonHeldItemModifier; - let removeOld = true; - if (matchingModifier) { - const maxStackCount = matchingModifier.getMaxStackCount(); - if (matchingModifier.stackCount >= maxStackCount) { - return resolve(false); - } - const countTaken = Math.min(transferQuantity, itemModifier.stackCount, maxStackCount - matchingModifier.stackCount); - itemModifier.stackCount -= countTaken; - newItemModifier.stackCount = matchingModifier.stackCount + countTaken; - removeOld = !itemModifier.stackCount; - } else { - const countTaken = Math.min(transferQuantity, itemModifier.stackCount); - itemModifier.stackCount -= countTaken; - newItemModifier.stackCount = countTaken; - } - removeOld = !itemModifier.stackCount; - if (!removeOld || !source || this.removeModifier(itemModifier, !source.isPlayer())) { - const addModifier = () => { - if (!matchingModifier || this.removeModifier(matchingModifier, !target.isPlayer())) { - if (target.isPlayer()) { - this.addModifier(newItemModifier, ignoreUpdate, playSound, false, instant).then(() => { - if (source && itemLost) { - applyPostItemLostAbAttrs(PostItemLostAbAttr, source, false); - } - resolve(true); - }); - } else { - this.addEnemyModifier(newItemModifier, ignoreUpdate, instant).then(() => { - if (source && itemLost) { - applyPostItemLostAbAttrs(PostItemLostAbAttr, source, false); - } - resolve(true); - }); - } - } else { - resolve(false); + tryTransferHeldItemModifier( + itemModifier: PokemonHeldItemModifier, + target: Pokemon, + playSound: boolean, + transferQuantity = 1, + instant?: boolean, + ignoreUpdate?: boolean, + itemLost = true, + ): boolean { + const source = itemModifier.pokemonId ? itemModifier.getPokemon() : null; + const cancelled = new Utils.BooleanHolder(false); + + if (source && source.isPlayer() !== target.isPlayer()) { + applyAbAttrs(BlockItemTheftAbAttr, source, cancelled); + } + + if (cancelled.value) { + return false; + } + + const newItemModifier = itemModifier.clone() as PokemonHeldItemModifier; + newItemModifier.pokemonId = target.id; + const matchingModifier = this.findModifier( + m => m instanceof PokemonHeldItemModifier && m.matchType(itemModifier) && m.pokemonId === target.id, + target.isPlayer(), + ) as PokemonHeldItemModifier; + + if (matchingModifier) { + const maxStackCount = matchingModifier.getMaxStackCount(); + if (matchingModifier.stackCount >= maxStackCount) { + return false; + } + const countTaken = Math.min( + transferQuantity, + itemModifier.stackCount, + maxStackCount - matchingModifier.stackCount, + ); + itemModifier.stackCount -= countTaken; + newItemModifier.stackCount = matchingModifier.stackCount + countTaken; + } else { + const countTaken = Math.min(transferQuantity, itemModifier.stackCount); + itemModifier.stackCount -= countTaken; + newItemModifier.stackCount = countTaken; + } + + const removeOld = itemModifier.stackCount === 0; + + if (!removeOld || !source || this.removeModifier(itemModifier, !source.isPlayer())) { + const addModifier = () => { + if (!matchingModifier || this.removeModifier(matchingModifier, !target.isPlayer())) { + if (target.isPlayer()) { + this.addModifier(newItemModifier, ignoreUpdate, playSound, false, instant); + if (source && itemLost) { + applyPostItemLostAbAttrs(PostItemLostAbAttr, source, false); } - }; - if (source && source.isPlayer() !== target.isPlayer() && !ignoreUpdate) { - this.updateModifiers(source.isPlayer(), instant).then(() => addModifier()); - } else { - addModifier(); + return true; } - return; + this.addEnemyModifier(newItemModifier, ignoreUpdate, instant); + if (source && itemLost) { + applyPostItemLostAbAttrs(PostItemLostAbAttr, source, false); + } + return true; } - resolve(false); - }); - }); + return false; + }; + if (source && source.isPlayer() !== target.isPlayer() && !ignoreUpdate) { + this.updateModifiers(source.isPlayer(), instant); + addModifier(); + } else { + addModifier(); + } + return true; + } + return false; } - removePartyMemberModifiers(partyMemberIndex: integer): Promise { + canTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, transferQuantity = 1): boolean { + const mod = itemModifier.clone() as PokemonHeldItemModifier; + const source = mod.pokemonId ? mod.getPokemon() : null; + const cancelled = new Utils.BooleanHolder(false); + + if (source && source.isPlayer() !== target.isPlayer()) { + applyAbAttrs(BlockItemTheftAbAttr, source, cancelled); + } + + if (cancelled.value) { + return false; + } + + const matchingModifier = this.findModifier( + m => m instanceof PokemonHeldItemModifier && m.matchType(mod) && m.pokemonId === target.id, + target.isPlayer(), + ) as PokemonHeldItemModifier; + + if (matchingModifier) { + const maxStackCount = matchingModifier.getMaxStackCount(); + if (matchingModifier.stackCount >= maxStackCount) { + return false; + } + const countTaken = Math.min(transferQuantity, mod.stackCount, maxStackCount - matchingModifier.stackCount); + mod.stackCount -= countTaken; + } else { + const countTaken = Math.min(transferQuantity, mod.stackCount); + mod.stackCount -= countTaken; + } + + const removeOld = mod.stackCount === 0; + + return !removeOld || !source || this.hasModifier(itemModifier, !source.isPlayer()); + } + + removePartyMemberModifiers(partyMemberIndex: number): Promise { return new Promise(resolve => { const pokemonId = this.getPlayerParty()[partyMemberIndex].id; - const modifiersToRemove = this.modifiers.filter(m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === pokemonId); + const modifiersToRemove = this.modifiers.filter( + m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === pokemonId, + ); for (const m of modifiersToRemove) { this.modifiers.splice(this.modifiers.indexOf(m), 1); } - this.updateModifiers().then(() => resolve()); + this.updateModifiers(); + resolve(); }); } @@ -2793,9 +3220,9 @@ export default class BattleScene extends SceneBase { } } - party.forEach((enemyPokemon: EnemyPokemon, i: integer) => { + party.forEach((enemyPokemon: EnemyPokemon, i: number) => { if (heldModifiersConfigs && i < heldModifiersConfigs.length && heldModifiersConfigs[i]) { - heldModifiersConfigs[i].forEach(mt => { + for (const mt of heldModifiersConfigs[i]) { let modifier: PokemonHeldItemModifier; if (mt.modifier instanceof PokemonHeldItemModifierType) { modifier = mt.modifier.newModifier(enemyPokemon); @@ -2806,9 +3233,11 @@ export default class BattleScene extends SceneBase { modifier.stackCount = mt.stackCount ?? 1; modifier.isTransferable = mt.isTransferable ?? modifier.isTransferable; this.addEnemyModifier(modifier, true); - }); + } } else { - const isBoss = enemyPokemon.isBoss() || (this.currentBattle.battleType === BattleType.TRAINER && !!this.currentBattle.trainer?.config.isBoss); + const isBoss = + enemyPokemon.isBoss() || + (this.currentBattle.battleType === BattleType.TRAINER && !!this.currentBattle.trainer?.config.isBoss); let upgradeChance = 32; if (isBoss) { upgradeChance /= 2; @@ -2816,99 +3245,108 @@ export default class BattleScene extends SceneBase { if (isFinalBoss) { upgradeChance /= 8; } - const modifierChance = this.gameMode.getEnemyModifierChance(isBoss); - let pokemonModifierChance = modifierChance; - if (this.currentBattle.battleType === BattleType.TRAINER && this.currentBattle.trainer) - pokemonModifierChance = Math.ceil(pokemonModifierChance * this.currentBattle.trainer.getPartyMemberModifierChanceMultiplier(i)); // eslint-disable-line let count = 0; for (let c = 0; c < chances; c++) { - if (!Utils.randSeedInt(modifierChance)) { + if (!Utils.randSeedInt(this.gameMode.getEnemyModifierChance(isBoss))) { count++; } } if (isBoss) { count = Math.max(count, Math.floor(chances / 2)); } - getEnemyModifierTypesForWave(difficultyWaveIndex, count, [ enemyPokemon ], this.currentBattle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD, upgradeChance) - .map(mt => mt.newModifier(enemyPokemon).add(this.enemyModifiers, false)); + getEnemyModifierTypesForWave( + difficultyWaveIndex, + count, + [enemyPokemon], + this.currentBattle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD, + upgradeChance, + ).map(mt => mt.newModifier(enemyPokemon).add(this.enemyModifiers, false)); } return true; }); - this.updateModifiers(false).then(() => resolve()); + this.updateModifiers(false); + resolve(); }); } /** - * Removes all modifiers from enemy pokemon of {@linkcode PersistentModifier} type - */ + * Removes all modifiers from enemy pokemon of {@linkcode PersistentModifier} type + */ clearEnemyModifiers(): void { const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PersistentModifier); for (const m of modifiersToRemove) { this.enemyModifiers.splice(this.enemyModifiers.indexOf(m), 1); } - this.updateModifiers(false).then(() => this.updateUIPositions()); + this.updateModifiers(false); + this.updateUIPositions(); } /** - * Removes all modifiers from enemy pokemon of {@linkcode PokemonHeldItemModifier} type - * @param pokemon - If specified, only removes held items from that {@linkcode Pokemon} - */ + * Removes all modifiers from enemy pokemon of {@linkcode PokemonHeldItemModifier} type + * @param pokemon - If specified, only removes held items from that {@linkcode Pokemon} + */ clearEnemyHeldItemModifiers(pokemon?: Pokemon): void { - const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier && (!pokemon || m.getPokemon() === pokemon)); + const modifiersToRemove = this.enemyModifiers.filter( + m => m instanceof PokemonHeldItemModifier && (!pokemon || m.getPokemon() === pokemon), + ); for (const m of modifiersToRemove) { this.enemyModifiers.splice(this.enemyModifiers.indexOf(m), 1); } - this.updateModifiers(false).then(() => this.updateUIPositions()); + this.updateModifiers(false); + this.updateUIPositions(); } setModifiersVisible(visible: boolean) { - [ this.modifierBar, this.enemyModifierBar ].map(m => m.setVisible(visible)); + [this.modifierBar, this.enemyModifierBar].map(m => m.setVisible(visible)); } - updateModifiers(player?: boolean, instant?: boolean): Promise { - if (player === undefined) { - player = true; + updateModifiers(player = true, instant?: boolean): void { + const modifiers = player ? this.modifiers : (this.enemyModifiers as PersistentModifier[]); + for (let m = 0; m < modifiers.length; m++) { + const modifier = modifiers[m]; + if ( + modifier instanceof PokemonHeldItemModifier && + !this.getPokemonById((modifier as PokemonHeldItemModifier).pokemonId) + ) { + modifiers.splice(m--, 1); + } } - return new Promise(resolve => { - const modifiers = player ? this.modifiers : this.enemyModifiers as PersistentModifier[]; - for (let m = 0; m < modifiers.length; m++) { - const modifier = modifiers[m]; - if (modifier instanceof PokemonHeldItemModifier && !this.getPokemonById((modifier as PokemonHeldItemModifier).pokemonId)) { - modifiers.splice(m--, 1); - } - } - for (const modifier of modifiers) { - if (modifier instanceof PersistentModifier) { - (modifier as PersistentModifier).virtualStackCount = 0; - } + for (const modifier of modifiers) { + if (modifier instanceof PersistentModifier) { + (modifier as PersistentModifier).virtualStackCount = 0; } + } - const modifiersClone = modifiers.slice(0); - for (const modifier of modifiersClone) { - if (!modifier.getStackCount()) { - modifiers.splice(modifiers.indexOf(modifier), 1); - } + const modifiersClone = modifiers.slice(0); + for (const modifier of modifiersClone) { + if (!modifier.getStackCount()) { + modifiers.splice(modifiers.indexOf(modifier), 1); } + } - this.updatePartyForModifiers(player ? this.getPlayerParty() : this.getEnemyParty(), instant).then(() => { - (player ? this.modifierBar : this.enemyModifierBar).updateModifiers(modifiers); - if (!player) { - this.updateUIPositions(); - } - resolve(); - }); - }); + this.updatePartyForModifiers(player ? this.getPlayerParty() : this.getEnemyParty(), instant); + (player ? this.modifierBar : this.enemyModifierBar).updateModifiers(modifiers); + if (!player) { + this.updateUIPositions(); + } } updatePartyForModifiers(party: Pokemon[], instant?: boolean): Promise { return new Promise(resolve => { - Promise.allSettled(party.map(p => { - p.calculateStats(); - return p.updateInfo(instant); - })).then(() => resolve()); + Promise.allSettled( + party.map(p => { + p.calculateStats(); + return p.updateInfo(instant); + }), + ).then(() => resolve()); }); } + hasModifier(modifier: PersistentModifier, enemy = false): boolean { + const modifiers = !enemy ? this.modifiers : this.enemyModifiers; + return modifiers.indexOf(modifier) > -1; + } + /** * Removes a currently owned item. If the item is stacked, the entire item stack * gets removed. This function does NOT apply in-battle effects, such as Unburden. @@ -2917,12 +3355,12 @@ export default class BattleScene extends SceneBase { * @param enemy If `true`, remove an item owned by the enemy. If `false`, remove an item owned by the player. Default is `false`. * @returns `true` if the item exists and was successfully removed, `false` otherwise. */ - removeModifier(modifier: PersistentModifier, enemy: boolean = false): boolean { + removeModifier(modifier: PersistentModifier, enemy = false): boolean { const modifiers = !enemy ? this.modifiers : this.enemyModifiers; const modifierIndex = modifiers.indexOf(modifier); if (modifierIndex > -1) { modifiers.splice(modifierIndex, 1); - if (modifier instanceof PokemonFormChangeItemModifier || modifier instanceof TerastallizeModifier) { + if (modifier instanceof PokemonFormChangeItemModifier) { const pokemon = this.getPokemonById(modifier.pokemonId); if (pokemon) { modifier.apply(pokemon, false); @@ -2940,7 +3378,7 @@ export default class BattleScene extends SceneBase { * @param player Whether to search the player (`true`) or the enemy (`false`); Defaults to `true` * @returns the list of all modifiers that matched `modifierType`. */ - getModifiers(modifierType: Constructor, player: boolean = true): T[] { + getModifiers(modifierType: Constructor, player = true): T[] { return (player ? this.modifiers : this.enemyModifiers).filter((m): m is T => m instanceof modifierType); } @@ -2950,7 +3388,7 @@ export default class BattleScene extends SceneBase { * @param isPlayer Whether to search the player (`true`) or the enemy (`false`); Defaults to `true` * @returns the list of all modifiers that passed the `modifierFilter` function */ - findModifiers(modifierFilter: ModifierPredicate, isPlayer: boolean = true): PersistentModifier[] { + findModifiers(modifierFilter: ModifierPredicate, isPlayer = true): PersistentModifier[] { return (isPlayer ? this.modifiers : this.enemyModifiers).filter(modifierFilter); } @@ -2960,7 +3398,7 @@ export default class BattleScene extends SceneBase { * @param player Whether to search the player (`true`) or the enemy (`false`); Defaults to `true` * @returns the first modifier that passed the `modifierFilter` function; `undefined` if none passed */ - findModifier(modifierFilter: ModifierPredicate, player: boolean = true): PersistentModifier | undefined { + findModifier(modifierFilter: ModifierPredicate, player = true): PersistentModifier | undefined { return (player ? this.modifiers : this.enemyModifiers).find(modifierFilter); } @@ -2971,18 +3409,28 @@ export default class BattleScene extends SceneBase { * @param ...args The list of arguments needed to invoke `modifierType.apply` * @returns the list of all modifiers that matched `modifierType` and were applied. */ - applyShuffledModifiers(modifierType: Constructor, player: boolean = true, ...args: Parameters): T[] { - let modifiers = (player ? this.modifiers : this.enemyModifiers).filter((m): m is T => m instanceof modifierType && m.shouldApply(...args)); - this.executeWithSeedOffset(() => { - const shuffleModifiers = mods => { - if (mods.length < 1) { - return mods; - } - const rand = Utils.randSeedInt(mods.length); - return [ mods[rand], ...shuffleModifiers(mods.filter((_, i) => i !== rand)) ]; - }; - modifiers = shuffleModifiers(modifiers); - }, this.currentBattle.turn << 4, this.waveSeed); + applyShuffledModifiers( + modifierType: Constructor, + player = true, + ...args: Parameters + ): T[] { + let modifiers = (player ? this.modifiers : this.enemyModifiers).filter( + (m): m is T => m instanceof modifierType && m.shouldApply(...args), + ); + this.executeWithSeedOffset( + () => { + const shuffleModifiers = mods => { + if (mods.length < 1) { + return mods; + } + const rand = Utils.randSeedInt(mods.length); + return [mods[rand], ...shuffleModifiers(mods.filter((_, i) => i !== rand))]; + }; + modifiers = shuffleModifiers(modifiers); + }, + this.currentBattle.turn << 4, + this.waveSeed, + ); return this.applyModifiersInternal(modifiers, player, args); } @@ -2993,13 +3441,23 @@ export default class BattleScene extends SceneBase { * @param ...args The list of arguments needed to invoke `modifierType.apply` * @returns the list of all modifiers that matched `modifierType` and were applied. */ - applyModifiers(modifierType: Constructor, player: boolean = true, ...args: Parameters): T[] { - const modifiers = (player ? this.modifiers : this.enemyModifiers).filter((m): m is T => m instanceof modifierType && m.shouldApply(...args)); + applyModifiers( + modifierType: Constructor, + player = true, + ...args: Parameters + ): T[] { + const modifiers = (player ? this.modifiers : this.enemyModifiers).filter( + (m): m is T => m instanceof modifierType && m.shouldApply(...args), + ); return this.applyModifiersInternal(modifiers, player, args); } /** Helper function to apply all passed modifiers */ - applyModifiersInternal(modifiers: T[], player: boolean, args: Parameters): T[] { + applyModifiersInternal( + modifiers: T[], + player: boolean, + args: Parameters, + ): T[] { const appliedModifiers: T[] = []; for (const modifier of modifiers) { if (modifier.apply(...args)) { @@ -3018,8 +3476,14 @@ export default class BattleScene extends SceneBase { * @param ...args The list of arguments needed to invoke `modifierType.apply` * @returns the first modifier that matches `modifierType` and was applied; return `null` if none matched */ - applyModifier(modifierType: Constructor, player: boolean = true, ...args: Parameters): T | null { - const modifiers = (player ? this.modifiers : this.enemyModifiers).filter((m): m is T => m instanceof modifierType && m.shouldApply(...args)); + applyModifier( + modifierType: Constructor, + player = true, + ...args: Parameters + ): T | null { + const modifiers = (player ? this.modifiers : this.enemyModifiers).filter( + (m): m is T => m instanceof modifierType && m.shouldApply(...args), + ); for (const modifier of modifiers) { if (modifier.apply(...args)) { console.log("Applied", modifier.type.name, !player ? "(enemy)" : ""); @@ -3030,22 +3494,33 @@ export default class BattleScene extends SceneBase { return null; } - triggerPokemonFormChange(pokemon: Pokemon, formChangeTriggerType: Constructor, delayed: boolean = false, modal: boolean = false): boolean { + triggerPokemonFormChange( + pokemon: Pokemon, + formChangeTriggerType: Constructor, + delayed = false, + modal = false, + ): boolean { if (pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId)) { - // in case this is NECROZMA, determine which forms this - const matchingFormChangeOpts = pokemonFormChanges[pokemon.species.speciesId].filter(fc => fc.findTrigger(formChangeTriggerType) && fc.canChange(pokemon)); + const matchingFormChangeOpts = pokemonFormChanges[pokemon.species.speciesId].filter( + fc => fc.findTrigger(formChangeTriggerType) && fc.canChange(pokemon), + ); let matchingFormChange: SpeciesFormChange | null; if (pokemon.species.speciesId === Species.NECROZMA && matchingFormChangeOpts.length > 1) { // Ultra Necrozma is changing its form back, so we need to figure out into which form it devolves. - const formChangeItemModifiers = (this.findModifiers(m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id) as PokemonFormChangeItemModifier[]).filter(m => m.active).map(m => m.formChangeItem); + const formChangeItemModifiers = ( + this.findModifiers( + m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id, + ) as PokemonFormChangeItemModifier[] + ) + .filter(m => m.active) + .map(m => m.formChangeItem); - - matchingFormChange = formChangeItemModifiers.includes(FormChangeItem.N_LUNARIZER) ? - matchingFormChangeOpts[0] : - formChangeItemModifiers.includes(FormChangeItem.N_SOLARIZER) ? - matchingFormChangeOpts[1] : - null; + matchingFormChange = formChangeItemModifiers.includes(FormChangeItem.N_LUNARIZER) + ? matchingFormChangeOpts[0] + : formChangeItemModifiers.includes(FormChangeItem.N_SOLARIZER) + ? matchingFormChangeOpts[1] + : null; } else { matchingFormChange = matchingFormChangeOpts[0]; } @@ -3070,7 +3545,12 @@ export default class BattleScene extends SceneBase { return false; } - triggerPokemonBattleAnim(pokemon: Pokemon, battleAnimType: PokemonAnimType, fieldAssets?: Phaser.GameObjects.Sprite[], delayed: boolean = false): boolean { + triggerPokemonBattleAnim( + pokemon: Pokemon, + battleAnimType: PokemonAnimType, + fieldAssets?: Phaser.GameObjects.Sprite[], + delayed = false, + ): boolean { const phase: Phase = new PokemonAnimPhase(battleAnimType, pokemon, fieldAssets); if (delayed) { this.pushPhase(phase); @@ -3088,8 +3568,10 @@ export default class BattleScene extends SceneBase { } validateAchv(achv: Achv, args?: unknown[]): boolean { - if ((!this.gameData.achvUnlocks.hasOwnProperty(achv.id) || Overrides.ACHIEVEMENTS_REUNLOCK_OVERRIDE) - && achv.validate(args)) { + if ( + (!this.gameData.achvUnlocks.hasOwnProperty(achv.id) || Overrides.ACHIEVEMENTS_REUNLOCK_OVERRIDE) && + achv.validate(args) + ) { this.gameData.achvUnlocks[achv.id] = new Date().getTime(); this.ui.achvBar.showAchv(achv); if (vouchers.hasOwnProperty(achv.id)) { @@ -3118,18 +3600,21 @@ export default class BattleScene extends SceneBase { gameMode: this.currentBattle ? this.gameMode.getName() : "Title", biome: this.currentBattle ? getBiomeName(this.arena.biomeType) : "", wave: this.currentBattle?.waveIndex ?? 0, - party: this.party ? this.party.map((p) => { - return { - name: p.name, - form: p.getFormKey(), - types: p.getTypes().map((type) => Type[type]), - teraType: p.getTeraType() !== Type.UNKNOWN ? Type[p.getTeraType()] : "", - level: p.level, - currentHP: p.hp, - maxHP: p.getMaxHp(), - status: p.status?.effect ? StatusEffect[p.status.effect] : "" - }; - }) : [], + party: this.party + ? this.party.map(p => { + return { + name: p.name, + form: p.getFormKey(), + types: p.getTypes().map(type => PokemonType[type]), + teraType: PokemonType[p.getTeraType()], + isTerastallized: p.isTerastallized, + level: p.level, + currentHP: p.hp, + maxHP: p.getMaxHp(), + status: p.status?.effect ? StatusEffect[p.status.effect] : "", + }; + }) + : [], modeChain: this.ui?.getModeChain() ?? [], }; (window as any).gameInfo = gameInfo; @@ -3145,7 +3630,7 @@ export default class BattleScene extends SceneBase { const keys: string[] = []; let activePokemon: (PlayerPokemon | EnemyPokemon)[] = this.getPlayerParty(); activePokemon = activePokemon.concat(this.getEnemyParty()); - activePokemon.forEach((p) => { + for (const p of activePokemon) { keys.push(p.getSpriteKey(true)); if (p instanceof PlayerPokemon) { keys.push(p.getBattleSpriteKey(true, true)); @@ -3154,7 +3639,7 @@ export default class BattleScene extends SceneBase { if (p.fusionSpecies) { keys.push(p.fusionSpecies.getCryKey(p.fusionFormIndex)); } - }); + } return keys; } @@ -3165,24 +3650,31 @@ export default class BattleScene extends SceneBase { initFinalBossPhaseTwo(pokemon: Pokemon): void { if (pokemon instanceof EnemyPokemon && pokemon.isBoss() && !pokemon.formIndex && pokemon.bossSegmentIndex < 1) { this.fadeOutBgm(Utils.fixedInt(2000), false); - this.ui.showDialogue(battleSpecDialogue[BattleSpec.FINAL_BOSS].firstStageWin, pokemon.species.name, undefined, () => { - const finalBossMBH = getModifierType(modifierTypes.MINI_BLACK_HOLE).newModifier(pokemon) as TurnHeldItemTransferModifier; - finalBossMBH.setTransferrableFalse(); - this.addEnemyModifier(finalBossMBH, false, true); - pokemon.generateAndPopulateMoveset(1); - this.setFieldScale(0.75); - this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false); - this.currentBattle.double = true; - const availablePartyMembers = this.getPlayerParty().filter((p) => p.isAllowedInBattle()); - if (availablePartyMembers.length > 1) { - this.pushPhase(new ToggleDoublePositionPhase(true)); - if (!availablePartyMembers[1].isOnField()) { - this.pushPhase(new SummonPhase(1)); + this.ui.showDialogue( + battleSpecDialogue[BattleSpec.FINAL_BOSS].firstStageWin, + pokemon.species.name, + undefined, + () => { + const finalBossMBH = getModifierType(modifierTypes.MINI_BLACK_HOLE).newModifier( + pokemon, + ) as TurnHeldItemTransferModifier; + finalBossMBH.setTransferrableFalse(); + this.addEnemyModifier(finalBossMBH, false, true); + pokemon.generateAndPopulateMoveset(1); + this.setFieldScale(0.75); + this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false); + this.currentBattle.double = true; + const availablePartyMembers = this.getPlayerParty().filter(p => p.isAllowedInBattle()); + if (availablePartyMembers.length > 1) { + this.pushPhase(new ToggleDoublePositionPhase(true)); + if (!availablePartyMembers[1].isOnField()) { + this.pushPhase(new SummonPhase(1)); + } } - } - this.shiftPhase(); - }); + this.shiftPhase(); + }, + ); return; } @@ -3196,22 +3688,32 @@ export default class BattleScene extends SceneBase { * @param useWaveIndexMultiplier Default false. If true, will multiply expValue by a scaling waveIndex multiplier. Not needed if expValue is already scaled by level/wave * @param pokemonParticipantIds Participants. If none are defined, no exp will be given. To spread evenly among the party, should pass all ids of party members. */ - applyPartyExp(expValue: number, pokemonDefeated: boolean, useWaveIndexMultiplier?: boolean, pokemonParticipantIds?: Set): void { + applyPartyExp( + expValue: number, + pokemonDefeated: boolean, + useWaveIndexMultiplier?: boolean, + pokemonParticipantIds?: Set, + ): void { const participantIds = pokemonParticipantIds ?? this.currentBattle.playerParticipantIds; const party = this.getPlayerParty(); const expShareModifier = this.findModifier(m => m instanceof ExpShareModifier) as ExpShareModifier; const expBalanceModifier = this.findModifier(m => m instanceof ExpBalanceModifier) as ExpBalanceModifier; - const multipleParticipantExpBonusModifier = this.findModifier(m => m instanceof MultipleParticipantExpBonusModifier) as MultipleParticipantExpBonusModifier; + const multipleParticipantExpBonusModifier = this.findModifier( + m => m instanceof MultipleParticipantExpBonusModifier, + ) as MultipleParticipantExpBonusModifier; const nonFaintedPartyMembers = party.filter(p => p.hp); const expPartyMembers = nonFaintedPartyMembers.filter(p => p.level < this.getMaxExpLevel()); const partyMemberExp: number[] = []; // EXP value calculation is based off Pokemon.getExpValue if (useWaveIndexMultiplier) { - expValue = Math.floor(expValue * this.currentBattle.waveIndex / 5 + 1); + expValue = Math.floor((expValue * this.currentBattle.waveIndex) / 5 + 1); } if (participantIds.size > 0) { - if (this.currentBattle.battleType === BattleType.TRAINER || this.currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) { + if ( + this.currentBattle.battleType === BattleType.TRAINER || + this.currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE + ) { expValue = Math.floor(expValue * 1.5); } else if (this.currentBattle.isBattleMysteryEncounter() && this.currentBattle.mysteryEncounter) { expValue = Math.floor(expValue * this.currentBattle.mysteryEncounter.expMultiplier); @@ -3237,7 +3739,7 @@ export default class BattleScene extends SceneBase { } let expMultiplier = 0; if (participated) { - expMultiplier += (1 / participantIds.size); + expMultiplier += 1 / participantIds.size; if (participantIds.size > 1 && multipleParticipantExpBonusModifier) { expMultiplier += multipleParticipantExpBonusModifier.getStackCount() * 0.2; } @@ -3275,7 +3777,11 @@ export default class BattleScene extends SceneBase { const splitExp = Math.floor(totalExp / recipientExpPartyMemberIndexes.length); expPartyMembers.forEach((_partyMember, pm) => { - partyMemberExp[pm] = Phaser.Math.Linear(partyMemberExp[pm], recipientExpPartyMemberIndexes.indexOf(pm) > -1 ? splitExp : 0, 0.2 * expBalanceModifier.getStackCount()); + partyMemberExp[pm] = Phaser.Math.Linear( + partyMemberExp[pm], + recipientExpPartyMemberIndexes.indexOf(pm) > -1 ? splitExp : 0, + 0.2 * expBalanceModifier.getStackCount(), + ); }); } @@ -3284,7 +3790,11 @@ export default class BattleScene extends SceneBase { if (exp) { const partyMemberIndex = party.indexOf(expPartyMembers[pm]); - this.unshiftPhase(expPartyMembers[pm].isOnField() ? new ExpPhase(partyMemberIndex, exp) : new ShowPartyExpBarPhase(partyMemberIndex, exp)); + this.unshiftPhase( + expPartyMembers[pm].isOnField() + ? new ExpPhase(partyMemberIndex, exp) + : new ShowPartyExpBarPhase(partyMemberIndex, exp), + ); } } } @@ -3296,8 +3806,14 @@ export default class BattleScene extends SceneBase { * That check is made in {@linkcode BattleScene.isWaveMysteryEncounter} instead. */ isMysteryEncounterValidForWave(battleType: BattleType, waveIndex: number): boolean { - const [ lowestMysteryEncounterWave, highestMysteryEncounterWave ] = this.gameMode.getMysteryEncounterLegalWaves(); - return this.gameMode.hasMysteryEncounters && battleType === BattleType.WILD && !this.gameMode.isBoss(waveIndex) && waveIndex < highestMysteryEncounterWave && waveIndex > lowestMysteryEncounterWave; + const [lowestMysteryEncounterWave, highestMysteryEncounterWave] = this.gameMode.getMysteryEncounterLegalWaves(); + return ( + this.gameMode.hasMysteryEncounters && + battleType === BattleType.WILD && + !this.gameMode.isBoss(waveIndex) && + waveIndex < highestMysteryEncounterWave && + waveIndex > lowestMysteryEncounterWave + ); } /** @@ -3308,7 +3824,7 @@ export default class BattleScene extends SceneBase { * @param waveIndex */ private isWaveMysteryEncounter(newBattleType: BattleType, waveIndex: number): boolean { - const [ lowestMysteryEncounterWave, highestMysteryEncounterWave ] = this.gameMode.getMysteryEncounterLegalWaves(); + const [lowestMysteryEncounterWave, highestMysteryEncounterWave] = this.gameMode.getMysteryEncounterLegalWaves(); if (this.isMysteryEncounterValidForWave(newBattleType, waveIndex)) { // Base spawn weight is BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT/256, and increases by WEIGHT_INCREMENT_ON_SPAWN_MISS/256 for each missed attempt at spawning an encounter on a valid floor const sessionEncounterRate = this.mysteryEncounterSaveData.encounterSpawnChance; @@ -3317,21 +3833,33 @@ export default class BattleScene extends SceneBase { // If total number of encounters is lower than expected for the run, slightly favor a new encounter spawn (reverse as well) // Reduces occurrence of runs with total encounters significantly different from AVERAGE_ENCOUNTERS_PER_RUN_TARGET // Favored rate changes can never exceed 50%. So if base rate is 15/256 and favored rate would add 200/256, result will be (15 + 128)/256 - const expectedEncountersByFloor = AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (highestMysteryEncounterWave - lowestMysteryEncounterWave) * (waveIndex - lowestMysteryEncounterWave); + const expectedEncountersByFloor = + (AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (highestMysteryEncounterWave - lowestMysteryEncounterWave)) * + (waveIndex - lowestMysteryEncounterWave); const currentRunDiffFromAvg = expectedEncountersByFloor - encounteredEvents.length; - const favoredEncounterRate = sessionEncounterRate + Math.min(currentRunDiffFromAvg * ANTI_VARIANCE_WEIGHT_MODIFIER, MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT / 2); + const favoredEncounterRate = + sessionEncounterRate + + Math.min(currentRunDiffFromAvg * ANTI_VARIANCE_WEIGHT_MODIFIER, MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT / 2); - const successRate = isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE) ? favoredEncounterRate : Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE!; + const successRate = isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE) + ? favoredEncounterRate + : Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE!; // If the most recent ME was 3 or fewer waves ago, can never spawn a ME - const canSpawn = encounteredEvents.length === 0 || (waveIndex - encounteredEvents[encounteredEvents.length - 1].waveIndex) > 3 || !isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE); + const canSpawn = + encounteredEvents.length === 0 || + waveIndex - encounteredEvents[encounteredEvents.length - 1].waveIndex > 3 || + !isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE); if (canSpawn) { let roll = MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT; // Always rolls the check on the same offset to ensure no RNG changes from reloading session - this.executeWithSeedOffset(() => { - roll = randSeedInt(MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT); - }, waveIndex * 3 * 1000); + this.executeWithSeedOffset( + () => { + roll = randSeedInt(MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT); + }, + waveIndex * 3 * 1000, + ); return roll < successRate; } } @@ -3348,7 +3876,10 @@ export default class BattleScene extends SceneBase { getMysteryEncounter(encounterType?: MysteryEncounterType, canBypass?: boolean): MysteryEncounter { // Loading override or session encounter let encounter: MysteryEncounter | null; - if (!isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_OVERRIDE) && allMysteryEncounters.hasOwnProperty(Overrides.MYSTERY_ENCOUNTER_OVERRIDE)) { + if ( + !isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_OVERRIDE) && + allMysteryEncounters.hasOwnProperty(Overrides.MYSTERY_ENCOUNTER_OVERRIDE) + ) { encounter = allMysteryEncounters[Overrides.MYSTERY_ENCOUNTER_OVERRIDE]; if (canBypass) { return encounter; @@ -3361,7 +3892,11 @@ export default class BattleScene extends SceneBase { } // Check for queued encounters first - if (!encounter && this.mysteryEncounterSaveData?.queuedEncounters && this.mysteryEncounterSaveData.queuedEncounters.length > 0) { + if ( + !encounter && + this.mysteryEncounterSaveData?.queuedEncounters && + this.mysteryEncounterSaveData.queuedEncounters.length > 0 + ) { let i = 0; while (i < this.mysteryEncounterSaveData.queuedEncounters.length && !!encounter) { const candidate = this.mysteryEncounterSaveData.queuedEncounters[i]; @@ -3381,53 +3916,78 @@ export default class BattleScene extends SceneBase { } // See Enum values for base tier weights - const tierWeights = [ MysteryEncounterTier.COMMON, MysteryEncounterTier.GREAT, MysteryEncounterTier.ULTRA, MysteryEncounterTier.ROGUE ]; + const tierWeights = [ + MysteryEncounterTier.COMMON, + MysteryEncounterTier.GREAT, + MysteryEncounterTier.ULTRA, + MysteryEncounterTier.ROGUE, + ]; // Adjust tier weights by previously encountered events to lower odds of only Common/Great in run - this.mysteryEncounterSaveData.encounteredEvents.forEach(seenEncounterData => { + // biome-ignore format: biome sucks at formatting this line + for (const seenEncounterData of this.mysteryEncounterSaveData.encounteredEvents) { if (seenEncounterData.tier === MysteryEncounterTier.COMMON) { tierWeights[0] = tierWeights[0] - 6; } else if (seenEncounterData.tier === MysteryEncounterTier.GREAT) { tierWeights[1] = tierWeights[1] - 4; } - }); + } const totalWeight = tierWeights.reduce((a, b) => a + b); const tierValue = Utils.randSeedInt(totalWeight); const commonThreshold = totalWeight - tierWeights[0]; const greatThreshold = totalWeight - tierWeights[0] - tierWeights[1]; const ultraThreshold = totalWeight - tierWeights[0] - tierWeights[1] - tierWeights[2]; - let tier: MysteryEncounterTier | null = tierValue > commonThreshold ? MysteryEncounterTier.COMMON : tierValue > greatThreshold ? MysteryEncounterTier.GREAT : tierValue > ultraThreshold ? MysteryEncounterTier.ULTRA : MysteryEncounterTier.ROGUE; + let tier: MysteryEncounterTier | null = + tierValue > commonThreshold + ? MysteryEncounterTier.COMMON + : tierValue > greatThreshold + ? MysteryEncounterTier.GREAT + : tierValue > ultraThreshold + ? MysteryEncounterTier.ULTRA + : MysteryEncounterTier.ROGUE; if (!isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_TIER_OVERRIDE)) { tier = Overrides.MYSTERY_ENCOUNTER_TIER_OVERRIDE; } let availableEncounters: MysteryEncounter[] = []; - const previousEncounter = this.mysteryEncounterSaveData.encounteredEvents.length > 0 ? - this.mysteryEncounterSaveData.encounteredEvents[this.mysteryEncounterSaveData.encounteredEvents.length - 1].type - : null; + const previousEncounter = + this.mysteryEncounterSaveData.encounteredEvents.length > 0 + ? this.mysteryEncounterSaveData.encounteredEvents[this.mysteryEncounterSaveData.encounteredEvents.length - 1] + .type + : null; const disabledEncounters = this.eventManager.getEventMysteryEncountersDisabled(); - const biomeMysteryEncounters = mysteryEncountersByBiome.get(this.arena.biomeType)?.filter(enc => !disabledEncounters.includes(enc)) ?? []; + const biomeMysteryEncounters = + mysteryEncountersByBiome.get(this.arena.biomeType)?.filter(enc => !disabledEncounters.includes(enc)) ?? []; // If no valid encounters exist at tier, checks next tier down, continuing until there are some encounters available while (availableEncounters.length === 0 && tier !== null) { availableEncounters = biomeMysteryEncounters - .filter((encounterType) => { + .filter(encounterType => { const encounterCandidate = allMysteryEncounters[encounterType]; if (!encounterCandidate) { return false; } - if (this.eventManager.getMysteryEncounterTierForEvent(encounterType, encounterCandidate.encounterTier) !== tier) { + if ( + this.eventManager.getMysteryEncounterTierForEvent(encounterType, encounterCandidate.encounterTier) !== tier + ) { return false; } const disallowedGameModes = encounterCandidate.disallowedGameModes; - if (disallowedGameModes && disallowedGameModes.length > 0 - && disallowedGameModes.includes(this.gameMode.modeId)) { + if ( + disallowedGameModes && + disallowedGameModes.length > 0 && + disallowedGameModes.includes(this.gameMode.modeId) + ) { return false; } if (this.gameMode.modeId === GameModes.CHALLENGE) { const disallowedChallenges = encounterCandidate.disallowedChallenges; - if (disallowedChallenges && disallowedChallenges.length > 0 && this.gameMode.challenges.some(challenge => disallowedChallenges.includes(challenge.id))) { + if ( + disallowedChallenges && + disallowedChallenges.length > 0 && + this.gameMode.challenges.some(challenge => disallowedChallenges.includes(challenge.id)) + ) { return false; } } @@ -3437,14 +3997,18 @@ export default class BattleScene extends SceneBase { if (previousEncounter !== null && encounterType === previousEncounter) { return false; } - if (this.mysteryEncounterSaveData.encounteredEvents.length > 0 && - (encounterCandidate.maxAllowedEncounters && encounterCandidate.maxAllowedEncounters > 0) - && this.mysteryEncounterSaveData.encounteredEvents.filter(e => e.type === encounterType).length >= encounterCandidate.maxAllowedEncounters) { + if ( + this.mysteryEncounterSaveData.encounteredEvents.length > 0 && + encounterCandidate.maxAllowedEncounters && + encounterCandidate.maxAllowedEncounters > 0 && + this.mysteryEncounterSaveData.encounteredEvents.filter(e => e.type === encounterType).length >= + encounterCandidate.maxAllowedEncounters + ) { return false; } return true; }) - .map((m) => (allMysteryEncounters[m])); + .map(m => allMysteryEncounters[m]); // Decrement tier if (tier === MysteryEncounterTier.ROGUE) { tier = MysteryEncounterTier.ULTRA; diff --git a/src/battle.ts b/src/battle.ts index fa333040c22..5ada921bf5a 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -50,7 +50,7 @@ export enum BattleType { WILD, TRAINER, CLEAR, - MYSTERY_ENCOUNTER + MYSTERY_ENCOUNTER, } export enum BattlerIndex { @@ -58,25 +58,25 @@ export enum BattlerIndex { PLAYER, PLAYER_2, ENEMY, - ENEMY_2 + ENEMY_2, } export interface TurnCommand { - command: Command; - cursor?: number; - move?: TurnMove; - targets?: BattlerIndex[]; - skip?: boolean; - args?: any[]; + command: Command; + cursor?: number; + move?: TurnMove; + targets?: BattlerIndex[]; + skip?: boolean; + args?: any[]; } export interface FaintLogEntry { - pokemon: Pokemon, - turn: number + pokemon: Pokemon; + turn: number; } interface TurnCommands { - [key: number]: TurnCommand | null + [key: number]: TurnCommand | null; } export default class Battle { @@ -89,23 +89,29 @@ export default class Battle { public enemyParty: EnemyPokemon[] = []; public seenEnemyPartyMemberIds: Set = new Set(); public double: boolean; - public started: boolean = false; - public enemySwitchCounter: number = 0; - public turn: number = 0; + public started = false; + public enemySwitchCounter = 0; + public turn = 0; + public preTurnCommands: TurnCommands; public turnCommands: TurnCommands; public playerParticipantIds: Set = new Set(); - public battleScore: number = 0; + public battleScore = 0; public postBattleLoot: PokemonHeldItemModifier[] = []; - public escapeAttempts: number = 0; + public escapeAttempts = 0; public lastMove: Moves; public battleSeed: string = Utils.randomString(16, true); private battleSeedState: string | null = null; - public moneyScattered: number = 0; + public moneyScattered = 0; + /** Primarily for double battles, keeps track of last enemy and player pokemon that triggered its ability or used a move */ + public lastEnemyInvolved: number; + public lastPlayerInvolved: number; public lastUsedPokeball: PokeballType | null = null; - /** The number of times a Pokemon on the player's side has fainted this battle */ - public playerFaints: number = 0; - /** The number of times a Pokemon on the enemy's side has fainted this battle */ - public enemyFaints: number = 0; + /** + * Saves the number of times a Pokemon on the enemy's side has fainted during this battle. + * This is saved here since we encounter a new enemy every wave. + * {@linkcode globalScene.arena.playerFaints} is the corresponding faint counter for the player and needs to be save across waves (reset every arena encounter). + */ + public enemyFaints = 0; public playerFaintsHistory: FaintLogEntry[] = []; public enemyFaintsHistory: FaintLogEntry[] = []; @@ -113,18 +119,19 @@ export default class Battle { /** If the current battle is a Mystery Encounter, this will always be defined */ public mysteryEncounter?: MysteryEncounter; - private rngCounter: number = 0; + private rngCounter = 0; - constructor(gameMode: GameMode, waveIndex: number, battleType: BattleType, trainer?: Trainer, double?: boolean) { + constructor(gameMode: GameMode, waveIndex: number, battleType: BattleType, trainer?: Trainer, double = false) { this.gameMode = gameMode; this.waveIndex = waveIndex; this.battleType = battleType; this.trainer = trainer ?? null; this.initBattleSpec(); - this.enemyLevels = battleType !== BattleType.TRAINER - ? new Array(double ? 2 : 1).fill(null).map(() => this.getLevelForWave()) - : trainer?.getPartyLevels(this.waveIndex); - this.double = double ?? false; + this.enemyLevels = + battleType !== BattleType.TRAINER + ? new Array(double ? 2 : 1).fill(null).map(() => this.getLevelForWave()) + : trainer?.getPartyLevels(this.waveIndex); + this.double = double; } private initBattleSpec(): void { @@ -174,7 +181,8 @@ export default class Battle { incrementTurn(): void { this.turn++; - this.turnCommands = Object.fromEntries(Utils.getEnumValues(BattlerIndex).map(bt => [ bt, null ])); + this.turnCommands = Object.fromEntries(Utils.getEnumValues(BattlerIndex).map(bt => [bt, null])); + this.preTurnCommands = Object.fromEntries(Utils.getEnumValues(BattlerIndex).map(bt => [bt, null])); this.battleSeedState = null; } @@ -187,16 +195,23 @@ export default class Battle { } addPostBattleLoot(enemyPokemon: EnemyPokemon): void { - this.postBattleLoot.push(...globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.pokemonId === enemyPokemon.id && m.isTransferable, false).map(i => { - const ret = i as PokemonHeldItemModifier; - //@ts-ignore - this is awful to fix/change - ret.pokemonId = null; - return ret; - })); + this.postBattleLoot.push( + ...globalScene + .findModifiers( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === enemyPokemon.id && m.isTransferable, + false, + ) + .map(i => { + const ret = i as PokemonHeldItemModifier; + //@ts-ignore - this is awful to fix/change + ret.pokemonId = null; + return ret; + }), + ); } pickUpScatteredMoney(): void { - const moneyAmount = new Utils.IntegerHolder(globalScene.currentBattle.moneyScattered); + const moneyAmount = new Utils.NumberHolder(globalScene.currentBattle.moneyScattered); globalScene.applyModifiers(MoneyMultiplierModifier, true, moneyAmount); if (globalScene.arena.getTag(ArenaTagType.HAPPY_HOUR)) { @@ -207,7 +222,9 @@ export default class Battle { const userLocale = navigator.language || "en-US"; const formattedMoneyAmount = moneyAmount.value.toLocaleString(userLocale); - const message = i18next.t("battle:moneyPickedUp", { moneyAmount: formattedMoneyAmount }); + const message = i18next.t("battle:moneyPickedUp", { + moneyAmount: formattedMoneyAmount, + }); globalScene.queueMessage(message, undefined, true); globalScene.currentBattle.moneyScattered = 0; @@ -220,13 +237,17 @@ export default class Battle { } for (const p of globalScene.getEnemyParty()) { if (p.isBoss()) { - partyMemberTurnMultiplier *= (p.bossSegments / 1.5) / globalScene.getEnemyParty().length; + partyMemberTurnMultiplier *= p.bossSegments / 1.5 / globalScene.getEnemyParty().length; } } - const turnMultiplier = Phaser.Tweens.Builders.GetEaseFunction("Sine.easeIn")(1 - Math.min(this.turn - 2, 10 * partyMemberTurnMultiplier) / (10 * partyMemberTurnMultiplier)); + const turnMultiplier = Phaser.Tweens.Builders.GetEaseFunction("Sine.easeIn")( + 1 - Math.min(this.turn - 2, 10 * partyMemberTurnMultiplier) / (10 * partyMemberTurnMultiplier), + ); const finalBattleScore = Math.ceil(this.battleScore * turnMultiplier); globalScene.score += finalBattleScore; - console.log(`Battle Score: ${finalBattleScore} (${this.turn - 1} Turns x${Math.floor(turnMultiplier * 100) / 100})`); + console.log( + `Battle Score: ${finalBattleScore} (${this.turn - 1} Turns x${Math.floor(turnMultiplier * 100) / 100})`, + ); console.log(`Total Score: ${globalScene.score}`); globalScene.updateScoreText(); } @@ -236,16 +257,20 @@ export default class Battle { // Music is overridden for MEs during ME onInit() // Should not use any BGM overrides before swapping from DEFAULT mode return null; - } else if (this.battleType === BattleType.TRAINER || this.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) { + } + if ( + this.battleType === BattleType.TRAINER || + this.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE + ) { if (!this.started && this.trainer?.config.encounterBgm && this.trainer?.getEncounterMessages()?.length) { return `encounter_${this.trainer?.getEncounterBgm()}`; } if (globalScene.musicPreference === MusicPreference.GENFIVE) { return this.trainer?.getBattleBgm() ?? null; - } else { - return this.trainer?.getMixedBattleBgm() ?? null; } - } else if (this.gameMode.isClassic && this.waveIndex > 195 && this.battleSpec !== BattleSpec.FINAL_BOSS) { + return this.trainer?.getMixedBattleBgm() ?? null; + } + if (this.gameMode.isClassic && this.waveIndex > 195 && this.battleSpec !== BattleSpec.FINAL_BOSS) { return "end_summit"; } const wildOpponents = globalScene.getEnemyParty(); @@ -274,7 +299,8 @@ export default class Battle { } return "battle_legendary_unova"; } - } else if (globalScene.musicPreference === MusicPreference.ALLGENS) { + } + if (globalScene.musicPreference === MusicPreference.ALLGENS) { switch (pokemon.species.speciesId) { case Species.ARTICUNO: case Species.ZAPDOS: @@ -427,7 +453,7 @@ export default class Battle { * @param min The minimum integer to pick, default `0` * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1) */ - randSeedInt(range: number, min: number = 0): number { + randSeedInt(range: number, min = 0): number { if (range <= 1) { return min; } @@ -437,7 +463,7 @@ export default class Battle { if (this.battleSeedState) { Phaser.Math.RND.state(this.battleSeedState); } else { - Phaser.Math.RND.sow([ Utils.shiftCharCodes(this.battleSeed, this.turn << 6) ]); + Phaser.Math.RND.sow([Utils.shiftCharCodes(this.battleSeed, this.turn << 6)]); console.log("Battle Seed:", this.battleSeed); } globalScene.rngCounter = this.rngCounter++; @@ -460,7 +486,13 @@ export default class Battle { export class FixedBattle extends Battle { constructor(waveIndex: number, config: FixedBattleConfig) { - super(globalScene.gameMode, waveIndex, config.battleType, config.battleType === BattleType.TRAINER ? config.getTrainer() : undefined, config.double); + super( + globalScene.gameMode, + waveIndex, + config.battleType, + config.battleType === BattleType.TRAINER ? config.getTrainer() : undefined, + config.double, + ); if (config.getEnemyParty) { this.enemyParty = config.getEnemyParty(); } @@ -509,7 +541,6 @@ export class FixedBattleConfig { } } - /** * Helper function to generate a random trainer for evil team trainers and the elite 4/champion * @param trainerPool The TrainerType or list of TrainerTypes that can possibly be generated @@ -517,31 +548,44 @@ export class FixedBattleConfig { * @param seedOffset the seed offset to use for the random generation of the trainer * @returns the generated trainer */ -export function getRandomTrainerFunc(trainerPool: (TrainerType | TrainerType[])[], randomGender: boolean = false, seedOffset: number = 0): GetTrainerFunc { +export function getRandomTrainerFunc( + trainerPool: (TrainerType | TrainerType[])[], + randomGender = false, + seedOffset = 0, +): GetTrainerFunc { return () => { const rand = Utils.randSeedInt(trainerPool.length); const trainerTypes: TrainerType[] = []; globalScene.executeWithSeedOffset(() => { for (const trainerPoolEntry of trainerPool) { - const trainerType = Array.isArray(trainerPoolEntry) - ? Utils.randSeedItem(trainerPoolEntry) - : trainerPoolEntry; + const trainerType = Array.isArray(trainerPoolEntry) ? Utils.randSeedItem(trainerPoolEntry) : trainerPoolEntry; trainerTypes.push(trainerType); } }, seedOffset); let trainerGender = TrainerVariant.DEFAULT; if (randomGender) { - trainerGender = (Utils.randInt(2) === 0) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT; + trainerGender = Utils.randInt(2) === 0 ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT; } /* 1/3 chance for evil team grunts to be double battles */ - const evilTeamGrunts = [ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT, TrainerType.STAR_GRUNT ]; + const evilTeamGrunts = [ + TrainerType.ROCKET_GRUNT, + TrainerType.MAGMA_GRUNT, + TrainerType.AQUA_GRUNT, + TrainerType.GALACTIC_GRUNT, + TrainerType.PLASMA_GRUNT, + TrainerType.FLARE_GRUNT, + TrainerType.AETHER_GRUNT, + TrainerType.SKULL_GRUNT, + TrainerType.MACRO_GRUNT, + TrainerType.STAR_GRUNT, + ]; const isEvilTeamGrunt = evilTeamGrunts.includes(trainerTypes[rand]); if (trainerConfigs[trainerTypes[rand]].hasDouble && isEvilTeamGrunt) { - return new Trainer(trainerTypes[rand], (Utils.randInt(3) === 0) ? TrainerVariant.DOUBLE : trainerGender); + return new Trainer(trainerTypes[rand], Utils.randInt(3) === 0 ? TrainerVariant.DOUBLE : trainerGender); } return new Trainer(trainerTypes[rand], trainerGender); @@ -549,7 +593,7 @@ export function getRandomTrainerFunc(trainerPool: (TrainerType | TrainerType[])[ } export interface FixedBattleConfigs { - [key: number]: FixedBattleConfig + [key: number]: FixedBattleConfig; } /** * Youngster/Lass on 5 @@ -561,51 +605,355 @@ export interface FixedBattleConfigs { * Champion on 190 */ export const classicFixedBattles: FixedBattleConfigs = { - [ClassicFixedBossWaves.TOWN_YOUNGSTER]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) - .setGetTrainerFunc(() => new Trainer(TrainerType.YOUNGSTER, Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)), - [ClassicFixedBossWaves.RIVAL_1]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) - .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)), - [ClassicFixedBossWaves.RIVAL_2]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) - .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL_2, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)) - .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT ], allowLuckUpgrades: false }), - [ClassicFixedBossWaves.EVIL_GRUNT_1]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT, TrainerType.STAR_GRUNT ], true)), - [ClassicFixedBossWaves.RIVAL_3]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) - .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL_3, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)) - .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT ], allowLuckUpgrades: false }), - [ClassicFixedBossWaves.EVIL_GRUNT_2]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT, TrainerType.STAR_GRUNT ], true)), - [ClassicFixedBossWaves.EVIL_GRUNT_3]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT, TrainerType.STAR_GRUNT ], true)), - [ClassicFixedBossWaves.EVIL_ADMIN_1]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) - .setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.COLRESS ], [ TrainerType.XEROSIC, TrainerType.BRYONY ], TrainerType.FABA, TrainerType.PLUMERIA, TrainerType.OLEANA, [ TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI ]], true)), - [ClassicFixedBossWaves.RIVAL_4]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) - .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL_4, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)) - .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false }), - [ClassicFixedBossWaves.EVIL_GRUNT_4]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT, TrainerType.STAR_GRUNT ], true)), - [ClassicFixedBossWaves.EVIL_ADMIN_2]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) - .setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.COLRESS ], [ TrainerType.XEROSIC, TrainerType.BRYONY ], TrainerType.FABA, TrainerType.PLUMERIA, TrainerType.OLEANA, [ TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI ]], true, 1)), - [ClassicFixedBossWaves.EVIL_BOSS_1]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_1, TrainerType.MAXIE, TrainerType.ARCHIE, TrainerType.CYRUS, TrainerType.GHETSIS, TrainerType.LYSANDRE, TrainerType.LUSAMINE, TrainerType.GUZMA, TrainerType.ROSE, TrainerType.PENNY ])) - .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false }), - [ClassicFixedBossWaves.RIVAL_5]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) - .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL_5, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)) - .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false }), - [ClassicFixedBossWaves.EVIL_BOSS_2]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_2, TrainerType.MAXIE_2, TrainerType.ARCHIE_2, TrainerType.CYRUS_2, TrainerType.GHETSIS_2, TrainerType.LYSANDRE_2, TrainerType.LUSAMINE_2, TrainerType.GUZMA_2, TrainerType.ROSE_2, TrainerType.PENNY_2 ])) - .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false }), - [ClassicFixedBossWaves.ELITE_FOUR_1]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.LORELEI, TrainerType.WILL, TrainerType.SIDNEY, TrainerType.AARON, TrainerType.SHAUNTAL, TrainerType.MALVA, [ TrainerType.HALA, TrainerType.MOLAYNE ], TrainerType.MARNIE_ELITE, TrainerType.RIKA, TrainerType.CRISPIN ])), - [ClassicFixedBossWaves.ELITE_FOUR_2]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.BRUNO, TrainerType.KOGA, TrainerType.PHOEBE, TrainerType.BERTHA, TrainerType.MARSHAL, TrainerType.SIEBOLD, TrainerType.OLIVIA, TrainerType.NESSA_ELITE, TrainerType.POPPY, TrainerType.AMARYS ])), - [ClassicFixedBossWaves.ELITE_FOUR_3]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.AGATHA, TrainerType.BRUNO, TrainerType.GLACIA, TrainerType.FLINT, TrainerType.GRIMSLEY, TrainerType.WIKSTROM, TrainerType.ACEROLA, [ TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE ], TrainerType.LARRY_ELITE, TrainerType.LACEY ])), - [ClassicFixedBossWaves.ELITE_FOUR_4]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.LANCE, TrainerType.KAREN, TrainerType.DRAKE, TrainerType.LUCIAN, TrainerType.CAITLIN, TrainerType.DRASNA, TrainerType.KAHILI, TrainerType.RAIHAN_ELITE, TrainerType.HASSEL, TrainerType.DRAYTON ])), - [ClassicFixedBossWaves.CHAMPION]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.BLUE, [ TrainerType.RED, TrainerType.LANCE_CHAMPION ], [ TrainerType.STEVEN, TrainerType.WALLACE ], TrainerType.CYNTHIA, [ TrainerType.ALDER, TrainerType.IRIS ], TrainerType.DIANTHA, [ TrainerType.KUKUI, TrainerType.HAU ], [ TrainerType.LEON, TrainerType.MUSTARD ], [ TrainerType.GEETA, TrainerType.NEMONA ], TrainerType.KIERAN ])), - [ClassicFixedBossWaves.RIVAL_6]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) - .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL_6, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)) - .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT ], allowLuckUpgrades: false }) + [ClassicFixedBossWaves.TOWN_YOUNGSTER]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setGetTrainerFunc( + () => new Trainer(TrainerType.YOUNGSTER, Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT), + ), + [ClassicFixedBossWaves.RIVAL_1]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setGetTrainerFunc( + () => + new Trainer( + TrainerType.RIVAL, + globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, + ), + ), + [ClassicFixedBossWaves.RIVAL_2]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setGetTrainerFunc( + () => + new Trainer( + TrainerType.RIVAL_2, + globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, + ), + ) + .setCustomModifierRewards({ + guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT], + allowLuckUpgrades: false, + }), + [ClassicFixedBossWaves.EVIL_GRUNT_1]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setGetTrainerFunc( + getRandomTrainerFunc( + [ + TrainerType.ROCKET_GRUNT, + TrainerType.MAGMA_GRUNT, + TrainerType.AQUA_GRUNT, + TrainerType.GALACTIC_GRUNT, + TrainerType.PLASMA_GRUNT, + TrainerType.FLARE_GRUNT, + TrainerType.AETHER_GRUNT, + TrainerType.SKULL_GRUNT, + TrainerType.MACRO_GRUNT, + TrainerType.STAR_GRUNT, + ], + true, + ), + ), + [ClassicFixedBossWaves.RIVAL_3]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setGetTrainerFunc( + () => + new Trainer( + TrainerType.RIVAL_3, + globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, + ), + ) + .setCustomModifierRewards({ + guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT], + allowLuckUpgrades: false, + }), + [ClassicFixedBossWaves.EVIL_GRUNT_2]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) + .setGetTrainerFunc( + getRandomTrainerFunc( + [ + TrainerType.ROCKET_GRUNT, + TrainerType.MAGMA_GRUNT, + TrainerType.AQUA_GRUNT, + TrainerType.GALACTIC_GRUNT, + TrainerType.PLASMA_GRUNT, + TrainerType.FLARE_GRUNT, + TrainerType.AETHER_GRUNT, + TrainerType.SKULL_GRUNT, + TrainerType.MACRO_GRUNT, + TrainerType.STAR_GRUNT, + ], + true, + ), + ), + [ClassicFixedBossWaves.EVIL_GRUNT_3]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) + .setGetTrainerFunc( + getRandomTrainerFunc( + [ + TrainerType.ROCKET_GRUNT, + TrainerType.MAGMA_GRUNT, + TrainerType.AQUA_GRUNT, + TrainerType.GALACTIC_GRUNT, + TrainerType.PLASMA_GRUNT, + TrainerType.FLARE_GRUNT, + TrainerType.AETHER_GRUNT, + TrainerType.SKULL_GRUNT, + TrainerType.MACRO_GRUNT, + TrainerType.STAR_GRUNT, + ], + true, + ), + ), + [ClassicFixedBossWaves.EVIL_ADMIN_1]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) + .setGetTrainerFunc( + getRandomTrainerFunc( + [ + [TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL], + [TrainerType.TABITHA, TrainerType.COURTNEY], + [TrainerType.MATT, TrainerType.SHELLY], + [TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN], + [TrainerType.ZINZOLIN, TrainerType.COLRESS], + [TrainerType.XEROSIC, TrainerType.BRYONY], + TrainerType.FABA, + TrainerType.PLUMERIA, + TrainerType.OLEANA, + [TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI], + ], + true, + ), + ), + [ClassicFixedBossWaves.RIVAL_4]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setGetTrainerFunc( + () => + new Trainer( + TrainerType.RIVAL_4, + globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, + ), + ) + .setCustomModifierRewards({ + guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA], + allowLuckUpgrades: false, + }), + [ClassicFixedBossWaves.EVIL_GRUNT_4]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) + .setGetTrainerFunc( + getRandomTrainerFunc( + [ + TrainerType.ROCKET_GRUNT, + TrainerType.MAGMA_GRUNT, + TrainerType.AQUA_GRUNT, + TrainerType.GALACTIC_GRUNT, + TrainerType.PLASMA_GRUNT, + TrainerType.FLARE_GRUNT, + TrainerType.AETHER_GRUNT, + TrainerType.SKULL_GRUNT, + TrainerType.MACRO_GRUNT, + TrainerType.STAR_GRUNT, + ], + true, + ), + ), + [ClassicFixedBossWaves.EVIL_ADMIN_2]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) + .setGetTrainerFunc( + getRandomTrainerFunc( + [ + [TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL], + [TrainerType.TABITHA, TrainerType.COURTNEY], + [TrainerType.MATT, TrainerType.SHELLY], + [TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN], + [TrainerType.ZINZOLIN, TrainerType.COLRESS], + [TrainerType.XEROSIC, TrainerType.BRYONY], + TrainerType.FABA, + TrainerType.PLUMERIA, + TrainerType.OLEANA, + [TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI], + ], + true, + 1, + ), + ), + [ClassicFixedBossWaves.EVIL_BOSS_1]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) + .setGetTrainerFunc( + getRandomTrainerFunc([ + TrainerType.ROCKET_BOSS_GIOVANNI_1, + TrainerType.MAXIE, + TrainerType.ARCHIE, + TrainerType.CYRUS, + TrainerType.GHETSIS, + TrainerType.LYSANDRE, + TrainerType.LUSAMINE, + TrainerType.GUZMA, + TrainerType.ROSE, + TrainerType.PENNY, + ]), + ) + .setCustomModifierRewards({ + guaranteedModifierTiers: [ + ModifierTier.ROGUE, + ModifierTier.ROGUE, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ], + allowLuckUpgrades: false, + }), + [ClassicFixedBossWaves.RIVAL_5]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setGetTrainerFunc( + () => + new Trainer( + TrainerType.RIVAL_5, + globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, + ), + ) + .setCustomModifierRewards({ + guaranteedModifierTiers: [ + ModifierTier.ROGUE, + ModifierTier.ROGUE, + ModifierTier.ROGUE, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ], + allowLuckUpgrades: false, + }), + [ClassicFixedBossWaves.EVIL_BOSS_2]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) + .setGetTrainerFunc( + getRandomTrainerFunc([ + TrainerType.ROCKET_BOSS_GIOVANNI_2, + TrainerType.MAXIE_2, + TrainerType.ARCHIE_2, + TrainerType.CYRUS_2, + TrainerType.GHETSIS_2, + TrainerType.LYSANDRE_2, + TrainerType.LUSAMINE_2, + TrainerType.GUZMA_2, + TrainerType.ROSE_2, + TrainerType.PENNY_2, + ]), + ) + .setCustomModifierRewards({ + guaranteedModifierTiers: [ + ModifierTier.ROGUE, + ModifierTier.ROGUE, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ], + allowLuckUpgrades: false, + }), + [ClassicFixedBossWaves.ELITE_FOUR_1]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setGetTrainerFunc( + getRandomTrainerFunc([ + TrainerType.LORELEI, + TrainerType.WILL, + TrainerType.SIDNEY, + TrainerType.AARON, + TrainerType.SHAUNTAL, + TrainerType.MALVA, + [TrainerType.HALA, TrainerType.MOLAYNE], + TrainerType.MARNIE_ELITE, + TrainerType.RIKA, + TrainerType.CRISPIN, + ]), + ), + [ClassicFixedBossWaves.ELITE_FOUR_2]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1) + .setGetTrainerFunc( + getRandomTrainerFunc([ + TrainerType.BRUNO, + TrainerType.KOGA, + TrainerType.PHOEBE, + TrainerType.BERTHA, + TrainerType.MARSHAL, + TrainerType.SIEBOLD, + TrainerType.OLIVIA, + TrainerType.NESSA_ELITE, + TrainerType.POPPY, + TrainerType.AMARYS, + ]), + ), + [ClassicFixedBossWaves.ELITE_FOUR_3]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1) + .setGetTrainerFunc( + getRandomTrainerFunc([ + TrainerType.AGATHA, + TrainerType.BRUNO, + TrainerType.GLACIA, + TrainerType.FLINT, + TrainerType.GRIMSLEY, + TrainerType.WIKSTROM, + TrainerType.ACEROLA, + [TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE], + TrainerType.LARRY_ELITE, + TrainerType.LACEY, + ]), + ), + [ClassicFixedBossWaves.ELITE_FOUR_4]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1) + .setGetTrainerFunc( + getRandomTrainerFunc([ + TrainerType.LANCE, + TrainerType.KAREN, + TrainerType.DRAKE, + TrainerType.LUCIAN, + TrainerType.CAITLIN, + TrainerType.DRASNA, + TrainerType.KAHILI, + TrainerType.RAIHAN_ELITE, + TrainerType.HASSEL, + TrainerType.DRAYTON, + ]), + ), + [ClassicFixedBossWaves.CHAMPION]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1) + .setGetTrainerFunc( + getRandomTrainerFunc([ + TrainerType.BLUE, + [TrainerType.RED, TrainerType.LANCE_CHAMPION], + [TrainerType.STEVEN, TrainerType.WALLACE], + TrainerType.CYNTHIA, + [TrainerType.ALDER, TrainerType.IRIS], + TrainerType.DIANTHA, + [TrainerType.KUKUI, TrainerType.HAU], + [TrainerType.LEON, TrainerType.MUSTARD], + [TrainerType.GEETA, TrainerType.NEMONA], + TrainerType.KIERAN, + ]), + ), + [ClassicFixedBossWaves.RIVAL_6]: new FixedBattleConfig() + .setBattleType(BattleType.TRAINER) + .setGetTrainerFunc( + () => + new Trainer( + TrainerType.RIVAL_6, + globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, + ), + ) + .setCustomModifierRewards({ + guaranteedModifierTiers: [ + ModifierTier.ROGUE, + ModifierTier.ROGUE, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ModifierTier.GREAT, + ModifierTier.GREAT, + ], + allowLuckUpgrades: false, + }), }; diff --git a/src/configs/inputs/cfg_keyboard_qwerty.ts b/src/configs/inputs/cfg_keyboard_qwerty.ts index 5ddc12e8784..2ad04ab418d 100644 --- a/src/configs/inputs/cfg_keyboard_qwerty.ts +++ b/src/configs/inputs/cfg_keyboard_qwerty.ts @@ -77,7 +77,7 @@ const cfg_keyboard_qwerty = { KEY_RIGHT_BRACKET: Phaser.Input.Keyboard.KeyCodes.CLOSED_BRACKET, KEY_SEMICOLON: Phaser.Input.Keyboard.KeyCodes.SEMICOLON, KEY_BACKSPACE: Phaser.Input.Keyboard.KeyCodes.BACKSPACE, - KEY_ALT: Phaser.Input.Keyboard.KeyCodes.ALT + KEY_ALT: Phaser.Input.Keyboard.KeyCodes.ALT, }, icons: { KEY_A: "A.png", @@ -131,7 +131,6 @@ const cfg_keyboard_qwerty = { KEY_F11: "F11.png", KEY_F12: "F12.png", - KEY_PAGE_DOWN: "PAGE_DOWN.png", KEY_PAGE_UP: "PAGE_UP.png", @@ -163,7 +162,7 @@ const cfg_keyboard_qwerty = { KEY_SEMICOLON: "SEMICOLON.png", KEY_BACKSPACE: "BACK.png", - KEY_ALT: "ALT.png" + KEY_ALT: "ALT.png", }, settings: { [SettingKeyboard.Button_Up]: Button.UP, @@ -180,9 +179,9 @@ const cfg_keyboard_qwerty = { [SettingKeyboard.Button_Cycle_Gender]: Button.CYCLE_GENDER, [SettingKeyboard.Button_Cycle_Ability]: Button.CYCLE_ABILITY, [SettingKeyboard.Button_Cycle_Nature]: Button.CYCLE_NATURE, - [SettingKeyboard.Button_Cycle_Variant]: Button.V, [SettingKeyboard.Button_Speed_Up]: Button.SPEED_UP, [SettingKeyboard.Button_Slow_Down]: Button.SLOW_DOWN, + [SettingKeyboard.Button_Cycle_Tera]: Button.CYCLE_TERA, [SettingKeyboard.Alt_Button_Up]: Button.UP, [SettingKeyboard.Alt_Button_Down]: Button.DOWN, [SettingKeyboard.Alt_Button_Left]: Button.LEFT, @@ -197,9 +196,9 @@ const cfg_keyboard_qwerty = { [SettingKeyboard.Alt_Button_Cycle_Gender]: Button.CYCLE_GENDER, [SettingKeyboard.Alt_Button_Cycle_Ability]: Button.CYCLE_ABILITY, [SettingKeyboard.Alt_Button_Cycle_Nature]: Button.CYCLE_NATURE, - [SettingKeyboard.Alt_Button_Cycle_Variant]: Button.V, [SettingKeyboard.Alt_Button_Speed_Up]: Button.SPEED_UP, [SettingKeyboard.Alt_Button_Slow_Down]: Button.SLOW_DOWN, + [SettingKeyboard.Alt_Button_Cycle_Tera]: Button.CYCLE_TERA, }, default: { KEY_ARROW_UP: SettingKeyboard.Button_Up, @@ -216,7 +215,7 @@ const cfg_keyboard_qwerty = { KEY_G: SettingKeyboard.Button_Cycle_Gender, KEY_E: SettingKeyboard.Button_Cycle_Ability, KEY_N: SettingKeyboard.Button_Cycle_Nature, - KEY_V: SettingKeyboard.Button_Cycle_Variant, + KEY_V: SettingKeyboard.Button_Cycle_Tera, KEY_PLUS: -1, KEY_MINUS: -1, KEY_A: SettingKeyboard.Alt_Button_Left, @@ -274,7 +273,7 @@ const cfg_keyboard_qwerty = { KEY_LEFT_BRACKET: -1, KEY_RIGHT_BRACKET: -1, KEY_SEMICOLON: -1, - KEY_ALT: -1 + KEY_ALT: -1, }, blacklist: [ "KEY_ENTER", @@ -287,7 +286,7 @@ const cfg_keyboard_qwerty = { "KEY_ARROW_RIGHT", "KEY_DEL", "KEY_HOME", - ] + ], }; export default cfg_keyboard_qwerty; diff --git a/src/configs/inputs/configHandler.ts b/src/configs/inputs/configHandler.ts index 50be692cbc3..b896f303cb3 100644 --- a/src/configs/inputs/configHandler.ts +++ b/src/configs/inputs/configHandler.ts @@ -93,7 +93,7 @@ export function getIconWithSettingName(config, settingName) { } export function getIconForLatestInput(configs, source, devices, settingName) { - let config; + let config: any; // TODO: refine type if (source === "gamepad") { config = configs[devices[Device.GAMEPAD]]; } else { @@ -102,7 +102,7 @@ export function getIconForLatestInput(configs, source, devices, settingName) { const icon = getIconWithSettingName(config, settingName); if (!icon) { const isAlt = settingName.includes("ALT_"); - let altSettingName; + let altSettingName: string; if (isAlt) { altSettingName = settingName.split("ALT_").splice(1)[0]; } else { @@ -115,7 +115,10 @@ export function getIconForLatestInput(configs, source, devices, settingName) { export function assign(config, settingNameTarget, keycode): boolean { // first, we need to check if this keycode is already used on another settingName - if (!canIAssignThisKey(config, getKeyWithKeycode(config, keycode)) || !canIOverrideThisSetting(config, settingNameTarget)) { + if ( + !canIAssignThisKey(config, getKeyWithKeycode(config, keycode)) || + !canIOverrideThisSetting(config, settingNameTarget) + ) { return false; } const previousSettingName = getSettingNameWithKeycode(config, keycode); diff --git a/src/configs/inputs/pad_dualshock.ts b/src/configs/inputs/pad_dualshock.ts index 2fbdd0ddfaa..51af1b2defd 100644 --- a/src/configs/inputs/pad_dualshock.ts +++ b/src/configs/inputs/pad_dualshock.ts @@ -24,7 +24,7 @@ const pad_dualshock = { LC_S: 13, LC_W: 14, LC_E: 15, - TOUCH: 17 + TOUCH: 17, }, icons: { RC_S: "CROSS.png", @@ -43,7 +43,7 @@ const pad_dualshock = { LC_S: "DOWN.png", LC_W: "LEFT.png", LC_E: "RIGHT.png", - TOUCH: "TOUCH.png" + TOUCH: "TOUCH.png", }, settings: { [SettingGamepad.Button_Up]: Button.UP, @@ -53,16 +53,16 @@ const pad_dualshock = { [SettingGamepad.Button_Action]: Button.ACTION, [SettingGamepad.Button_Cancel]: Button.CANCEL, [SettingGamepad.Button_Cycle_Nature]: Button.CYCLE_NATURE, - [SettingGamepad.Button_Cycle_Variant]: Button.V, + [SettingGamepad.Button_Cycle_Tera]: Button.CYCLE_TERA, [SettingGamepad.Button_Menu]: Button.MENU, [SettingGamepad.Button_Stats]: Button.STATS, - [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM, + [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM, [SettingGamepad.Button_Cycle_Shiny]: Button.CYCLE_SHINY, [SettingGamepad.Button_Cycle_Gender]: Button.CYCLE_GENDER, [SettingGamepad.Button_Cycle_Ability]: Button.CYCLE_ABILITY, [SettingGamepad.Button_Speed_Up]: Button.SPEED_UP, [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN, - [SettingGamepad.Button_Submit]: Button.SUBMIT + [SettingGamepad.Button_Submit]: Button.SUBMIT, }, default: { LC_N: SettingGamepad.Button_Up, @@ -72,7 +72,7 @@ const pad_dualshock = { RC_S: SettingGamepad.Button_Action, RC_E: SettingGamepad.Button_Cancel, RC_W: SettingGamepad.Button_Cycle_Nature, - RC_N: SettingGamepad.Button_Cycle_Variant, + RC_N: SettingGamepad.Button_Cycle_Tera, START: SettingGamepad.Button_Menu, SELECT: SettingGamepad.Button_Stats, LB: SettingGamepad.Button_Cycle_Form, diff --git a/src/configs/inputs/pad_generic.ts b/src/configs/inputs/pad_generic.ts index 256af8f0fe3..e47b7ce1ace 100644 --- a/src/configs/inputs/pad_generic.ts +++ b/src/configs/inputs/pad_generic.ts @@ -23,7 +23,7 @@ const pad_generic = { LC_N: 12, LC_S: 13, LC_W: 14, - LC_E: 15 + LC_E: 15, }, icons: { RC_S: "XB_Letter_A_OL.png", @@ -51,15 +51,15 @@ const pad_generic = { [SettingGamepad.Button_Action]: Button.ACTION, [SettingGamepad.Button_Cancel]: Button.CANCEL, [SettingGamepad.Button_Cycle_Nature]: Button.CYCLE_NATURE, - [SettingGamepad.Button_Cycle_Variant]: Button.V, + [SettingGamepad.Button_Cycle_Tera]: Button.CYCLE_TERA, [SettingGamepad.Button_Menu]: Button.MENU, [SettingGamepad.Button_Stats]: Button.STATS, - [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM, + [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM, [SettingGamepad.Button_Cycle_Shiny]: Button.CYCLE_SHINY, [SettingGamepad.Button_Cycle_Gender]: Button.CYCLE_GENDER, [SettingGamepad.Button_Cycle_Ability]: Button.CYCLE_ABILITY, [SettingGamepad.Button_Speed_Up]: Button.SPEED_UP, - [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN + [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN, }, default: { LC_N: SettingGamepad.Button_Up, @@ -69,7 +69,7 @@ const pad_generic = { RC_S: SettingGamepad.Button_Action, RC_E: SettingGamepad.Button_Cancel, RC_W: SettingGamepad.Button_Cycle_Nature, - RC_N: SettingGamepad.Button_Cycle_Variant, + RC_N: SettingGamepad.Button_Cycle_Tera, START: SettingGamepad.Button_Menu, SELECT: SettingGamepad.Button_Stats, LB: SettingGamepad.Button_Cycle_Form, @@ -77,14 +77,9 @@ const pad_generic = { LT: SettingGamepad.Button_Cycle_Gender, RT: SettingGamepad.Button_Cycle_Ability, LS: SettingGamepad.Button_Speed_Up, - RS: SettingGamepad.Button_Slow_Down + RS: SettingGamepad.Button_Slow_Down, }, - blacklist: [ - "LC_N", - "LC_S", - "LC_W", - "LC_E", - ] + blacklist: ["LC_N", "LC_S", "LC_W", "LC_E"], }; export default pad_generic; diff --git a/src/configs/inputs/pad_procon.ts b/src/configs/inputs/pad_procon.ts index 98d17c4ef57..61558c7365e 100644 --- a/src/configs/inputs/pad_procon.ts +++ b/src/configs/inputs/pad_procon.ts @@ -52,15 +52,15 @@ const pad_procon = { [SettingGamepad.Button_Action]: Button.ACTION, [SettingGamepad.Button_Cancel]: Button.CANCEL, [SettingGamepad.Button_Cycle_Nature]: Button.CYCLE_NATURE, - [SettingGamepad.Button_Cycle_Variant]: Button.V, + [SettingGamepad.Button_Cycle_Tera]: Button.CYCLE_TERA, [SettingGamepad.Button_Menu]: Button.MENU, [SettingGamepad.Button_Stats]: Button.STATS, - [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM, + [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM, [SettingGamepad.Button_Cycle_Shiny]: Button.CYCLE_SHINY, [SettingGamepad.Button_Cycle_Gender]: Button.CYCLE_GENDER, [SettingGamepad.Button_Cycle_Ability]: Button.CYCLE_ABILITY, [SettingGamepad.Button_Speed_Up]: Button.SPEED_UP, - [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN + [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN, }, default: { LC_N: SettingGamepad.Button_Up, @@ -70,7 +70,7 @@ const pad_procon = { RC_S: SettingGamepad.Button_Action, RC_E: SettingGamepad.Button_Cancel, RC_W: SettingGamepad.Button_Cycle_Nature, - RC_N: SettingGamepad.Button_Cycle_Variant, + RC_N: SettingGamepad.Button_Cycle_Tera, START: SettingGamepad.Button_Menu, SELECT: SettingGamepad.Button_Stats, LB: SettingGamepad.Button_Cycle_Form, @@ -78,7 +78,7 @@ const pad_procon = { LT: SettingGamepad.Button_Cycle_Gender, RT: SettingGamepad.Button_Cycle_Ability, LS: SettingGamepad.Button_Speed_Up, - RS: SettingGamepad.Button_Slow_Down + RS: SettingGamepad.Button_Slow_Down, }, }; diff --git a/src/configs/inputs/pad_unlicensedSNES.ts b/src/configs/inputs/pad_unlicensedSNES.ts index 77e68e6a644..d0c4f41c8f5 100644 --- a/src/configs/inputs/pad_unlicensedSNES.ts +++ b/src/configs/inputs/pad_unlicensedSNES.ts @@ -7,7 +7,7 @@ import { Button } from "#enums/buttons"; const pad_unlicensedSNES = { padID: "081f-e401", padType: "xbox", - deviceMapping : { + deviceMapping: { RC_S: 2, RC_E: 1, RC_W: 3, @@ -19,7 +19,7 @@ const pad_unlicensedSNES = { LC_N: 12, LC_S: 13, LC_W: 14, - LC_E: 15 + LC_E: 15, }, icons: { RC_S: "XB_Letter_A_OL.png", @@ -43,15 +43,15 @@ const pad_unlicensedSNES = { [SettingGamepad.Button_Action]: Button.ACTION, [SettingGamepad.Button_Cancel]: Button.CANCEL, [SettingGamepad.Button_Cycle_Nature]: Button.CYCLE_NATURE, - [SettingGamepad.Button_Cycle_Variant]: Button.V, + [SettingGamepad.Button_Cycle_Tera]: Button.CYCLE_TERA, [SettingGamepad.Button_Menu]: Button.MENU, [SettingGamepad.Button_Stats]: Button.STATS, - [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM, + [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM, [SettingGamepad.Button_Cycle_Shiny]: Button.CYCLE_SHINY, [SettingGamepad.Button_Cycle_Gender]: Button.CYCLE_GENDER, [SettingGamepad.Button_Cycle_Ability]: Button.CYCLE_ABILITY, [SettingGamepad.Button_Speed_Up]: Button.SPEED_UP, - [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN + [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN, }, default: { LC_N: SettingGamepad.Button_Up, @@ -61,7 +61,7 @@ const pad_unlicensedSNES = { RC_S: SettingGamepad.Button_Action, RC_E: SettingGamepad.Button_Cancel, RC_W: SettingGamepad.Button_Cycle_Nature, - RC_N: SettingGamepad.Button_Cycle_Variant, + RC_N: SettingGamepad.Button_Cycle_Tera, START: SettingGamepad.Button_Menu, SELECT: SettingGamepad.Button_Stats, LB: SettingGamepad.Button_Cycle_Form, @@ -69,7 +69,7 @@ const pad_unlicensedSNES = { LT: -1, RT: -1, LS: -1, - RS: -1 + RS: -1, }, }; diff --git a/src/configs/inputs/pad_xbox360.ts b/src/configs/inputs/pad_xbox360.ts index 6afc452f50b..60cbd9ab181 100644 --- a/src/configs/inputs/pad_xbox360.ts +++ b/src/configs/inputs/pad_xbox360.ts @@ -23,7 +23,7 @@ const pad_xbox360 = { LC_N: 12, LC_S: 13, LC_W: 14, - LC_E: 15 + LC_E: 15, }, icons: { RC_S: "XB_Letter_A_OL.png", @@ -51,15 +51,15 @@ const pad_xbox360 = { [SettingGamepad.Button_Action]: Button.ACTION, [SettingGamepad.Button_Cancel]: Button.CANCEL, [SettingGamepad.Button_Cycle_Nature]: Button.CYCLE_NATURE, - [SettingGamepad.Button_Cycle_Variant]: Button.V, + [SettingGamepad.Button_Cycle_Tera]: Button.CYCLE_TERA, [SettingGamepad.Button_Menu]: Button.MENU, [SettingGamepad.Button_Stats]: Button.STATS, - [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM, + [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM, [SettingGamepad.Button_Cycle_Shiny]: Button.CYCLE_SHINY, [SettingGamepad.Button_Cycle_Gender]: Button.CYCLE_GENDER, [SettingGamepad.Button_Cycle_Ability]: Button.CYCLE_ABILITY, [SettingGamepad.Button_Speed_Up]: Button.SPEED_UP, - [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN + [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN, }, default: { LC_N: SettingGamepad.Button_Up, @@ -69,7 +69,7 @@ const pad_xbox360 = { RC_S: SettingGamepad.Button_Action, RC_E: SettingGamepad.Button_Cancel, RC_W: SettingGamepad.Button_Cycle_Nature, - RC_N: SettingGamepad.Button_Cycle_Variant, + RC_N: SettingGamepad.Button_Cycle_Tera, START: SettingGamepad.Button_Menu, SELECT: SettingGamepad.Button_Stats, LB: SettingGamepad.Button_Cycle_Form, @@ -77,7 +77,7 @@ const pad_xbox360 = { LT: SettingGamepad.Button_Cycle_Gender, RT: SettingGamepad.Button_Cycle_Ability, LS: SettingGamepad.Button_Speed_Up, - RS: SettingGamepad.Button_Slow_Down + RS: SettingGamepad.Button_Slow_Down, }, }; diff --git a/src/data/ability.ts b/src/data/ability.ts index 8f0698e38b9..ab78d1dd06c 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -1,7 +1,7 @@ -import type { EnemyPokemon } from "../field/pokemon"; +import type { EnemyPokemon, PokemonMove } from "../field/pokemon"; import type Pokemon from "../field/pokemon"; -import { HitResult, MoveResult, PlayerPokemon, PokemonMove } from "../field/pokemon"; -import { Type } from "#enums/type"; +import { HitResult, MoveResult, PlayerPokemon } from "../field/pokemon"; +import { PokemonType } from "#enums/pokemon-type"; import type { Constructor } from "#app/utils"; import * as Utils from "../utils"; import { getPokemonNameWithAffix } from "../messages"; @@ -10,9 +10,12 @@ import type { BattlerTag } from "./battler-tags"; import { BattlerTagLapseType, GroundedTag } from "./battler-tags"; import { getNonVolatileStatusEffects, getStatusEffectDescriptor, getStatusEffectHealText } from "#app/data/status-effect"; import { Gender } from "./gender"; -import type Move from "./move"; -import { AttackMove, MoveCategory, MoveFlags, MoveTarget, FlinchAttr, OneHitKOAttr, HitHealAttr, allMoves, StatusMove, SelfStatusMove, VariablePowerAttr, applyMoveAttrs, VariableMoveTypeAttr, RandomMovesetMoveAttr, RandomMoveAttr, NaturePowerAttr, CopyMoveAttr, NeutralDamageAgainstFlyingTypeMultiplierAttr, FixedDamageAttr } from "./move"; -import type { ArenaTrapTag } from "./arena-tag"; +import type Move from "./moves/move"; +import { AttackMove, FlinchAttr, OneHitKOAttr, HitHealAttr, allMoves, StatusMove, SelfStatusMove, VariablePowerAttr, applyMoveAttrs, VariableMoveTypeAttr, RandomMovesetMoveAttr, RandomMoveAttr, NaturePowerAttr, CopyMoveAttr, NeutralDamageAgainstFlyingTypeMultiplierAttr, FixedDamageAttr } from "./moves/move"; +import { MoveFlags } from "#enums/MoveFlags"; +import { MoveTarget } from "#enums/MoveTarget"; +import { MoveCategory } from "#enums/MoveCategory"; +import type { ArenaTrapTag, SuppressAbilitiesTag } from "./arena-tag"; import { ArenaTagSide } from "./arena-tag"; import { BerryModifier, HitHealModifier, PokemonHeldItemModifier } from "../modifier/modifier"; import { TerrainType } from "./terrain"; @@ -32,7 +35,6 @@ import { Species } from "#enums/species"; import { Stat, type BattleStat, type EffectiveStat, BATTLE_STATS, EFFECTIVE_STATS, getStatKey } from "#app/enums/stat"; import { MovePhase } from "#app/phases/move-phase"; import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; -import { ShowAbilityPhase } from "#app/phases/show-ability-phase"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { globalScene } from "#app/global-scene"; import { SwitchType } from "#app/enums/switch-type"; @@ -44,6 +46,7 @@ import { MoveEndPhase } from "#app/phases/move-end-phase"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; import { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; +import { PokemonTransformPhase } from "#app/phases/pokemon-transform-phase"; export class Ability implements Localizable { public id: Abilities; @@ -51,13 +54,13 @@ export class Ability implements Localizable { private nameAppend: string; public name: string; public description: string; - public generation: integer; + public generation: number; public isBypassFaint: boolean; public isIgnorable: boolean; public attrs: AbAttr[]; public conditions: AbAttrCondition[]; - constructor(id: Abilities, generation: integer) { + constructor(id: Abilities, generation: number) { this.id = id; this.nameAppend = ""; @@ -143,7 +146,8 @@ export class Ability implements Localizable { } } -type AbAttrApplyFunc = (attr: TAttr, passive: boolean) => boolean | Promise; +type AbAttrApplyFunc = (attr: TAttr, passive: boolean) => void; +type AbAttrSuccessFunc = (attr: TAttr, passive: boolean) => boolean; type AbAttrCondition = (pokemon: Pokemon) => boolean; // TODO: Can this be improved? @@ -155,13 +159,19 @@ export abstract class AbAttr { public showAbility: boolean; private extraCondition: AbAttrCondition; - constructor(showAbility: boolean = true) { + constructor(showAbility = true) { this.showAbility = showAbility; } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder | null, args: any[]): boolean | Promise { - return false; - } + /** + * Applies ability effects without checking conditions + * @param pokemon - The pokemon to apply this ability to + * @param passive - Whether or not the ability is a passive + * @param simulated - Whether the call is simulated + * @param args - Extra args passed to the function. Handled by child classes. + * @see {@linkcode canApply} + */ + apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder | null, args: any[]): void {} getTriggerMessage(_pokemon: Pokemon, _abilityName: string, ..._args: any[]): string | null { return null; @@ -175,13 +185,28 @@ export abstract class AbAttr { this.extraCondition = condition; return this; } + + /** + * Returns a boolean describing whether the ability can be applied under current conditions + * @param pokemon - The pokemon to apply this ability to + * @param passive - Whether or not the ability is a passive + * @param simulated - Whether the call is simulated + * @param args - Extra args passed to the function. Handled by child classes. + * @returns `true` if the ability can be applied, `false` otherwise + * @see {@linkcode apply} + */ + canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return true; + } } export class BlockRecoilDamageAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - cancelled.value = true; + constructor() { + super(false); + } - return true; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]) { @@ -192,7 +217,7 @@ export class BlockRecoilDamageAttr extends AbAttr { /** * Attribute for abilities that increase the chance of a double battle * occurring. - * @see apply + * @see {@linkcode apply} */ export class DoubleBattleChanceAbAttr extends AbAttr { constructor() { @@ -202,106 +227,160 @@ export class DoubleBattleChanceAbAttr extends AbAttr { /** * Increases the chance of a double battle occurring * @param args [0] {@linkcode Utils.NumberHolder} for double battle chance - * @returns true if the ability was applied */ - apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]): void { const doubleBattleChance = args[0] as Utils.NumberHolder; // This is divided because the chance is generated as a number from 0 to doubleBattleChance.value using Utils.randSeedInt // A double battle will initiate if the generated number is 0 doubleBattleChance.value = doubleBattleChance.value / 4; - - return true; } } export class PostBattleInitAbAttr extends AbAttr { - applyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - return false; + canApplyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return true; } + + applyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {} } export class PostBattleInitFormChangeAbAttr extends PostBattleInitAbAttr { - private formFunc: (p: Pokemon) => integer; + private formFunc: (p: Pokemon) => number; - constructor(formFunc: ((p: Pokemon) => integer)) { - super(true); + constructor(formFunc: ((p: Pokemon) => number)) { + super(false); this.formFunc = formFunc; } - applyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override canApplyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { const formIndex = this.formFunc(pokemon); - if (formIndex !== pokemon.formIndex && !simulated) { - return globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false); - } + return formIndex !== pokemon.formIndex && !simulated; + } - return false; + override applyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false); } } -export class PostBattleInitStatStageChangeAbAttr extends PostBattleInitAbAttr { +export class PostTeraFormChangeStatChangeAbAttr extends AbAttr { private stats: BattleStat[]; private stages: number; - private selfTarget: boolean; - constructor(stats: BattleStat[], stages: number, selfTarget?: boolean) { + constructor(stats: BattleStat[], stages: number) { super(); this.stats = stats; this.stages = stages; - this.selfTarget = !!selfTarget; } - applyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder | null, args: any[]): void { const statStageChangePhases: StatStageChangePhase[] = []; if (!simulated) { - if (this.selfTarget) { - statStageChangePhases.push(new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages)); - } else { - for (const opponent of pokemon.getOpponents()) { - statStageChangePhases.push(new StatStageChangePhase(opponent.getBattlerIndex(), false, this.stats, this.stages)); - } - } + statStageChangePhases.push(new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages)); for (const statStageChangePhase of statStageChangePhases) { - if (!this.selfTarget && !statStageChangePhase.getPokemon()?.summonData) { - globalScene.pushPhase(statStageChangePhase); - } else { // TODO: This causes the ability bar to be shown at the wrong time - globalScene.unshiftPhase(statStageChangePhase); - } + globalScene.unshiftPhase(statStageChangePhase); } } + } +} - return true; +/** + * Clears a specified weather whenever this attribute is called. + */ +export class ClearWeatherAbAttr extends AbAttr { + private weather: WeatherType[]; + + /** + * @param weather {@linkcode WeatherType[]} - the weather to be removed + */ + constructor(weather: WeatherType[]) { + super(true); + + this.weather = weather; + } + + public override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return globalScene.arena.canSetWeather(WeatherType.NONE); + } + + public override apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + if (!simulated) { + globalScene.arena.trySetWeather(WeatherType.NONE, true); + } + } +} + +/** + * Clears a specified terrain whenever this attribute is called. + */ +export class ClearTerrainAbAttr extends AbAttr { + private terrain: TerrainType[]; + + /** + * @param terrain {@linkcode TerrainType[]} - the terrain to be removed + */ + constructor(terrain: TerrainType[]) { + super(true); + + this.terrain = terrain; + } + + public override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return globalScene.arena.canSetTerrain(TerrainType.NONE); + } + + public override apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + if (!simulated) { + globalScene.arena.trySetTerrain(TerrainType.NONE, true, true); + } } } type PreDefendAbAttrCondition = (pokemon: Pokemon, attacker: Pokemon, move: Move) => boolean; export class PreDefendAbAttr extends AbAttr { - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean | Promise { - return false; + canApplyPreDefend( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + attacker: Pokemon, + move: Move | null, + cancelled: Utils.BooleanHolder | null, + args: any[]): boolean { + return true; } + + applyPreDefend( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + attacker: Pokemon, + move: Move | null, + cancelled: Utils.BooleanHolder | null, + args: any[], + ): void {} } export class PreDefendFullHpEndureAbAttr extends PreDefendAbAttr { - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (pokemon.isFullHp() - && pokemon.getMaxHp() > 1 //Checks if pokemon has wonder_guard (which forces 1hp) - && (args[0] as Utils.NumberHolder).value >= pokemon.hp) { //Damage >= hp - return simulated || pokemon.addTag(BattlerTagType.STURDY, 1); - } + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return pokemon.isFullHp() + && pokemon.getMaxHp() > 1 //Checks if pokemon has wonder_guard (which forces 1hp) + && (args[0] as Utils.NumberHolder).value >= pokemon.hp; //Damage >= hp + } - return false; + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + if (!simulated) { + pokemon.addTag(BattlerTagType.STURDY, 1); + } } } export class BlockItemTheftAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { cancelled.value = true; - - return true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]) { @@ -313,13 +392,16 @@ export class BlockItemTheftAbAttr extends AbAttr { } export class StabBoostAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if ((args[0] as Utils.NumberHolder).value > 1) { - (args[0] as Utils.NumberHolder).value += 0.5; - return true; - } + constructor() { + super(false); + } - return false; + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return (args[0] as Utils.NumberHolder).value > 1; + } + + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + (args[0] as Utils.NumberHolder).value += 0.5; } } @@ -327,21 +409,19 @@ export class ReceivedMoveDamageMultiplierAbAttr extends PreDefendAbAttr { protected condition: PokemonDefendCondition; private damageMultiplier: number; - constructor(condition: PokemonDefendCondition, damageMultiplier: number) { - super(); + constructor(condition: PokemonDefendCondition, damageMultiplier: number, showAbility: boolean = false) { + super(showAbility); this.condition = condition; this.damageMultiplier = damageMultiplier; } - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (this.condition(pokemon, attacker, move)) { - (args[0] as Utils.NumberHolder).value = Utils.toDmgValue((args[0] as Utils.NumberHolder).value * this.damageMultiplier); + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return this.condition(pokemon, attacker, move); + } - return true; - } - - return false; + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + (args[0] as Utils.NumberHolder).value = Utils.toDmgValue((args[0] as Utils.NumberHolder).value * this.damageMultiplier); } } @@ -362,16 +442,15 @@ export class AlliedFieldDamageReductionAbAttr extends PreDefendAbAttr { * @param args * - `[0]` {@linkcode Utils.NumberHolder} - The damage being dealt */ - override applyPreDefend(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _attacker: Pokemon, _move: Move, _cancelled: Utils.BooleanHolder, args: any[]): boolean { + override applyPreDefend(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _attacker: Pokemon, _move: Move, _cancelled: Utils.BooleanHolder, args: any[]): void { const damage = args[0] as Utils.NumberHolder; damage.value = Utils.toDmgValue(damage.value * this.damageMultiplier); - return true; } } export class ReceivedTypeDamageMultiplierAbAttr extends ReceivedMoveDamageMultiplierAbAttr { - constructor(moveType: Type, damageMultiplier: number) { - super((target, user, move) => user.getMoveType(move) === moveType, damageMultiplier); + constructor(moveType: PokemonType, damageMultiplier: number) { + super((target, user, move) => user.getMoveType(move) === moveType, damageMultiplier, false); } } @@ -382,16 +461,20 @@ export class ReceivedTypeDamageMultiplierAbAttr extends ReceivedMoveDamageMultip * @see {@linkcode getCondition} */ export class TypeImmunityAbAttr extends PreDefendAbAttr { - private immuneType: Type | null; + private immuneType: PokemonType | null; private condition: AbAttrCondition | null; - constructor(immuneType: Type | null, condition?: AbAttrCondition) { - super(); + constructor(immuneType: PokemonType | null, condition?: AbAttrCondition) { + super(true); this.immuneType = immuneType; this.condition = condition ?? null; } + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return ![ MoveTarget.BOTH_SIDES, MoveTarget.ENEMY_SIDE, MoveTarget.USER_SIDE ].includes(move.moveTarget) && attacker !== pokemon && attacker.getMoveType(move) === this.immuneType; + } + /** * Applies immunity if this ability grants immunity to the type of the given move. * @param pokemon {@linkcode Pokemon} The defending Pokemon. @@ -402,19 +485,11 @@ export class TypeImmunityAbAttr extends PreDefendAbAttr { * @param args [0] {@linkcode Utils.NumberHolder} gets set to 0 if move is immuned by an ability. * @param args [1] - Whether the move is simulated. */ - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - // Field moves should ignore immunity - if ([ MoveTarget.BOTH_SIDES, MoveTarget.ENEMY_SIDE, MoveTarget.USER_SIDE ].includes(move.moveTarget)) { - return false; - } - if (attacker !== pokemon && attacker.getMoveType(move) === this.immuneType) { - (args[0] as Utils.NumberHolder).value = 0; - return true; - } - return false; + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + (args[0] as Utils.NumberHolder).value = 0; } - getImmuneType(): Type | null { + getImmuneType(): PokemonType | null { return this.immuneType; } @@ -424,43 +499,43 @@ export class TypeImmunityAbAttr extends PreDefendAbAttr { } export class AttackTypeImmunityAbAttr extends TypeImmunityAbAttr { - constructor(immuneType: Type, condition?: AbAttrCondition) { + constructor(immuneType: PokemonType, condition?: AbAttrCondition) { super(immuneType, condition); } + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return move.category !== MoveCategory.STATUS && !move.hasAttr(NeutralDamageAgainstFlyingTypeMultiplierAttr) + && super.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + } + /** * Applies immunity if the move used is not a status move. * Type immunity abilities that do not give additional benefits (HP recovery, stat boosts, etc) are not immune to status moves of the type * Example: Levitate */ - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { // this is a hacky way to fix the Levitate/Thousand Arrows interaction, but it works for now... - if (move.category !== MoveCategory.STATUS && !move.hasAttr(NeutralDamageAgainstFlyingTypeMultiplierAttr)) { - return super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); - } - return false; + super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); } } export class TypeImmunityHealAbAttr extends TypeImmunityAbAttr { - constructor(immuneType: Type) { + constructor(immuneType: PokemonType) { super(immuneType); } - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return super.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + } - if (ret) { - if (!pokemon.isFullHp() && !simulated) { - const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; - globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), - Utils.toDmgValue(pokemon.getMaxHp() / 4), i18next.t("abilityTriggers:typeImmunityHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true)); - cancelled.value = true; // Suppresses "No Effect" message - } - return true; + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + if (!pokemon.isFullHp() && !simulated) { + const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; + globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), + Utils.toDmgValue(pokemon.getMaxHp() / 4), i18next.t("abilityTriggers:typeImmunityHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true)); + cancelled.value = true; // Suppresses "No Effect" message } - - return false; } } @@ -468,49 +543,47 @@ class TypeImmunityStatStageChangeAbAttr extends TypeImmunityAbAttr { private stat: BattleStat; private stages: number; - constructor(immuneType: Type, stat: BattleStat, stages: number, condition?: AbAttrCondition) { + constructor(immuneType: PokemonType, stat: BattleStat, stages: number, condition?: AbAttrCondition) { super(immuneType, condition); this.stat = stat; this.stages = stages; } - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return super.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + } - if (ret) { - cancelled.value = true; // Suppresses "No Effect" message - if (!simulated) { - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ this.stat ], this.stages)); - } + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + cancelled.value = true; // Suppresses "No Effect" message + if (!simulated) { + globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ this.stat ], this.stages)); } - - return ret; } } class TypeImmunityAddBattlerTagAbAttr extends TypeImmunityAbAttr { private tagType: BattlerTagType; - private turnCount: integer; + private turnCount: number; - constructor(immuneType: Type, tagType: BattlerTagType, turnCount: integer, condition?: AbAttrCondition) { + constructor(immuneType: PokemonType, tagType: BattlerTagType, turnCount: number, condition?: AbAttrCondition) { super(immuneType, condition); this.tagType = tagType; this.turnCount = turnCount; } - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return super.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + } - if (ret) { - cancelled.value = true; // Suppresses "No Effect" message - if (!simulated) { - pokemon.addTag(this.tagType, this.turnCount, undefined, pokemon.id); - } + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + cancelled.value = true; // Suppresses "No Effect" message + if (!simulated) { + pokemon.addTag(this.tagType, this.turnCount, undefined, pokemon.id); } - - return ret; } } @@ -519,18 +592,16 @@ export class NonSuperEffectiveImmunityAbAttr extends TypeImmunityAbAttr { super(null, condition); } - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { const modifierValue = args.length > 0 ? (args[0] as Utils.NumberHolder).value : pokemon.getAttackTypeEffectiveness(attacker.getMoveType(move), attacker, undefined, undefined, move); + return move instanceof AttackMove && modifierValue < 2; + } - if (move instanceof AttackMove && modifierValue < 2) { - cancelled.value = true; // Suppresses "No Effect" message - (args[0] as Utils.NumberHolder).value = 0; - return true; - } - - return false; + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; // Suppresses "No Effect" message + (args[0] as Utils.NumberHolder).value = 0; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -547,6 +618,12 @@ export class NonSuperEffectiveImmunityAbAttr extends TypeImmunityAbAttr { * @extends PreDefendAbAttr */ export class FullHpResistTypeAbAttr extends PreDefendAbAttr { + + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + const typeMultiplier = args[0]; + return (typeMultiplier && typeMultiplier instanceof Utils.NumberHolder) && !(move && move.hasAttr(FixedDamageAttr)) && pokemon.isFullHp() && typeMultiplier.value > 0.5; + } + /** * Reduces a type multiplier to 0.5 if the source is at full HP. * @param pokemon {@linkcode Pokemon} the Pokemon with this ability @@ -556,24 +633,18 @@ export class FullHpResistTypeAbAttr extends PreDefendAbAttr { * @param move {@linkcode Move} the move being used on the source * @param cancelled n/a * @param args `[0]` a container for the move's current type effectiveness multiplier - * @returns `true` if the move's effectiveness is reduced; `false` otherwise */ - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean | Promise { + override applyPreDefend( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + attacker: Pokemon, + move: Move | null, + cancelled: Utils.BooleanHolder | null, + args: any[]): void { const typeMultiplier = args[0]; - if (!(typeMultiplier && typeMultiplier instanceof Utils.NumberHolder)) { - return false; - } - - if (move && move.hasAttr(FixedDamageAttr)) { - return false; - } - - if (pokemon.isFullHp() && typeMultiplier.value > 0.5) { - typeMultiplier.value = 0.5; - pokemon.turnData.moveEffectiveness = 0.5; - return true; - } - return false; + typeMultiplier.value = 0.5; + pokemon.turnData.moveEffectiveness = 0.5; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -584,30 +655,58 @@ export class FullHpResistTypeAbAttr extends PreDefendAbAttr { } export class PostDefendAbAttr extends AbAttr { - applyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean | Promise { - return false; + canApplyPostDefend( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + attacker: Pokemon, + move: Move, + hitResult: HitResult | null, + args: any[]): boolean { + return true; } + + applyPostDefend( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + attacker: Pokemon, + move: Move, + hitResult: HitResult | null, + args: any[], + ): void {} } export class FieldPriorityMoveImmunityAbAttr extends PreDefendAbAttr { - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (move.moveTarget === MoveTarget.USER || move.moveTarget === MoveTarget.NEAR_ALLY) { - return false; - } - if (move.getPriority(attacker) > 0 && !move.isMultiTarget()) { - cancelled.value = true; - return true; - } + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return !(move.moveTarget === MoveTarget.USER || move.moveTarget === MoveTarget.NEAR_ALLY) && move.getPriority(attacker) > 0 && !move.isMultiTarget(); + } - return false; + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } } export class PostStatStageChangeAbAttr extends AbAttr { - applyPostStatStageChange(pokemon: Pokemon, simulated: boolean, statsChanged: BattleStat[], stagesChanged: integer, selfTarget: boolean, args: any[]): boolean | Promise { - return false; + canApplyPostStatStageChange( + pokemon: Pokemon, + simulated: boolean, + statsChanged: BattleStat[], + stagesChanged: number, + selfTarget: boolean, + args: any[]): boolean { + return true; } + + applyPostStatStageChange( + pokemon: Pokemon, + simulated: boolean, + statsChanged: BattleStat[], + stagesChanged: number, + selfTarget: boolean, + args: any[], + ): void {} } export class MoveImmunityAbAttr extends PreDefendAbAttr { @@ -619,13 +718,12 @@ export class MoveImmunityAbAttr extends PreDefendAbAttr { this.immuneCondition = immuneCondition; } - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (this.immuneCondition(pokemon, attacker, move)) { - cancelled.value = true; - return true; - } + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return this.immuneCondition(pokemon, attacker, move); + } - return false; + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -640,14 +738,19 @@ export class MoveImmunityAbAttr extends PreDefendAbAttr { * @extends PreDefendAbAttr */ export class WonderSkinAbAttr extends PreDefendAbAttr { - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - const moveAccuracy = args[0] as Utils.NumberHolder; - if (move.category === MoveCategory.STATUS && moveAccuracy.value >= 50) { - moveAccuracy.value = 50; - return true; - } - return false; + constructor() { + super(false); + } + + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + const moveAccuracy = args[0] as Utils.NumberHolder; + return move.category === MoveCategory.STATUS && moveAccuracy.value >= 50; + } + + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + const moveAccuracy = args[0] as Utils.NumberHolder; + moveAccuracy.value = 50; } } @@ -661,13 +764,13 @@ export class MoveImmunityStatStageChangeAbAttr extends MoveImmunityAbAttr { this.stages = stages; } - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); - if (ret && !simulated) { - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ this.stat ], this.stages)); - } + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return !simulated && super.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + } - return ret; + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { + super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); + globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ this.stat ], this.stages)); } } /** @@ -676,6 +779,11 @@ export class MoveImmunityStatStageChangeAbAttr extends MoveImmunityAbAttr { * @see {@linkcode applyPostDefend} */ export class ReverseDrainAbAttr extends PostDefendAbAttr { + + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return move.hasAttr(HitHealAttr) && !move.hitsSubstitute(attacker, pokemon); + } + /** * Determines if a damage and draining move was used to check if this ability should stop the healing. * Examples include: Absorb, Draining Kiss, Bitter Blade, etc. @@ -686,16 +794,11 @@ export class ReverseDrainAbAttr extends PostDefendAbAttr { * @param move {@linkcode PokemonMove} that is being used * @param _hitResult N/A * @param _args N/A - * @returns true if healing should be reversed on a healing move, false otherwise. */ - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (move.hasAttr(HitHealAttr) && !move.hitsSubstitute(attacker, pokemon)) { - if (!simulated) { - globalScene.queueMessage(i18next.t("abilityTriggers:reverseDrain", { pokemonNameWithAffix: getPokemonNameWithAffix(attacker) })); - } - return true; + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + if (!simulated) { + globalScene.queueMessage(i18next.t("abilityTriggers:reverseDrain", { pokemonNameWithAffix: getPokemonNameWithAffix(attacker) })); } - return false; } } @@ -706,7 +809,7 @@ export class PostDefendStatStageChangeAbAttr extends PostDefendAbAttr { private selfTarget: boolean; private allOthers: boolean; - constructor(condition: PokemonDefendCondition, stat: BattleStat, stages: number, selfTarget: boolean = true, allOthers: boolean = false) { + constructor(condition: PokemonDefendCondition, stat: BattleStat, stages: number, selfTarget = true, allOthers = false) { super(true); this.condition = condition; @@ -716,24 +819,23 @@ export class PostDefendStatStageChangeAbAttr extends PostDefendAbAttr { this.allOthers = allOthers; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon)) { - if (simulated) { - return true; - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon); + } - if (this.allOthers) { - const otherPokemon = pokemon.getAlly() ? pokemon.getOpponents().concat([ pokemon.getAlly() ]) : pokemon.getOpponents(); - for (const other of otherPokemon) { - globalScene.unshiftPhase(new StatStageChangePhase((other).getBattlerIndex(), false, [ this.stat ], this.stages)); - } - return true; - } - globalScene.unshiftPhase(new StatStageChangePhase((this.selfTarget ? pokemon : attacker).getBattlerIndex(), this.selfTarget, [ this.stat ], this.stages)); - return true; + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + if (simulated) { + return; } - return false; + if (this.allOthers) { + const otherPokemon = pokemon.getAlly() ? pokemon.getOpponents().concat([ pokemon.getAlly() ]) : pokemon.getOpponents(); + for (const other of otherPokemon) { + globalScene.unshiftPhase(new StatStageChangePhase((other).getBattlerIndex(), false, [ this.stat ], this.stages)); + } + } else { + globalScene.unshiftPhase(new StatStageChangePhase((this.selfTarget ? pokemon : attacker).getBattlerIndex(), this.selfTarget, [ this.stat ], this.stages)); + } } } @@ -744,7 +846,7 @@ export class PostDefendHpGatedStatStageChangeAbAttr extends PostDefendAbAttr { private stages: number; private selfTarget: boolean; - constructor(condition: PokemonDefendCondition, hpGate: number, stats: BattleStat[], stages: number, selfTarget: boolean = true) { + constructor(condition: PokemonDefendCondition, hpGate: number, stats: BattleStat[], stages: number, selfTarget = true) { super(true); this.condition = condition; @@ -754,19 +856,17 @@ export class PostDefendHpGatedStatStageChangeAbAttr extends PostDefendAbAttr { this.selfTarget = selfTarget; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { const hpGateFlat: number = Math.ceil(pokemon.getMaxHp() * this.hpGate); const lastAttackReceived = pokemon.turnData.attacksReceived[pokemon.turnData.attacksReceived.length - 1]; const damageReceived = lastAttackReceived?.damage || 0; + return this.condition(pokemon, attacker, move) && (pokemon.hp <= hpGateFlat && (pokemon.hp + damageReceived) > hpGateFlat) && !move.hitsSubstitute(attacker, pokemon); + } - if (this.condition(pokemon, attacker, move) && (pokemon.hp <= hpGateFlat && (pokemon.hp + damageReceived) > hpGateFlat) && !move.hitsSubstitute(attacker, pokemon)) { - if (!simulated) { - globalScene.unshiftPhase(new StatStageChangePhase((this.selfTarget ? pokemon : attacker).getBattlerIndex(), true, this.stats, this.stages)); - } - return true; + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + if (!simulated) { + globalScene.unshiftPhase(new StatStageChangePhase((this.selfTarget ? pokemon : attacker).getBattlerIndex(), true, this.stats, this.stages)); } - - return false; } } @@ -781,17 +881,16 @@ export class PostDefendApplyArenaTrapTagAbAttr extends PostDefendAbAttr { this.tagType = tagType; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon)) { - const tag = globalScene.arena.getTag(this.tagType) as ArenaTrapTag; - if (!globalScene.arena.getTag(this.tagType) || tag.layers < tag.maxLayers) { - if (!simulated) { - globalScene.arena.addTag(this.tagType, 0, undefined, pokemon.id, pokemon.isPlayer() ? ArenaTagSide.ENEMY : ArenaTagSide.PLAYER); - } - return true; - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + const tag = globalScene.arena.getTag(this.tagType) as ArenaTrapTag; + return (this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon)) + && (!globalScene.arena.getTag(this.tagType) || tag.layers < tag.maxLayers); + } + + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + if (!simulated) { + globalScene.arena.addTag(this.tagType, 0, undefined, pokemon.id, pokemon.isPlayer() ? ArenaTagSide.ENEMY : ArenaTagSide.PLAYER); } - return false; } } @@ -805,40 +904,37 @@ export class PostDefendApplyBattlerTagAbAttr extends PostDefendAbAttr { this.tagType = tagType; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon)) { - if (!pokemon.getTag(this.tagType) && !simulated) { - pokemon.addTag(this.tagType, undefined, undefined, pokemon.id); - globalScene.queueMessage(i18next.t("abilityTriggers:windPowerCharged", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name })); - } - return true; + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon); + } + + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + if (!pokemon.getTag(this.tagType) && !simulated) { + pokemon.addTag(this.tagType, undefined, undefined, pokemon.id); + globalScene.queueMessage(i18next.t("abilityTriggers:windPowerCharged", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name })); } - return false; } } export class PostDefendTypeChangeAbAttr extends PostDefendAbAttr { - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): boolean { - if (hitResult < HitResult.NO_EFFECT && !move.hitsSubstitute(attacker, pokemon)) { - if (simulated) { - return true; - } - const type = attacker.getMoveType(move); - const pokemonTypes = pokemon.getTypes(true); - if (pokemonTypes.length !== 1 || pokemonTypes[0] !== type) { - pokemon.summonData.types = [ type ]; - return true; - } - } + private type: PokemonType; - return false; + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { + this.type = attacker.getMoveType(move); + const pokemonTypes = pokemon.getTypes(true); + return hitResult < HitResult.NO_EFFECT && !move.hitsSubstitute(attacker, pokemon) && (simulated || pokemonTypes.length !== 1 || pokemonTypes[0] !== this.type); + } + + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): void { + const type = attacker.getMoveType(move); + pokemon.summonData.types = [ type ]; } override getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string { return i18next.t("abilityTriggers:postDefendTypeChange", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName, - typeName: i18next.t(`pokemonInfo:Type.${Type[pokemon.getTypes(true)[0]]}`) + typeName: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`) }); } } @@ -852,42 +948,38 @@ export class PostDefendTerrainChangeAbAttr extends PostDefendAbAttr { this.terrainType = terrainType; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): boolean { - if (hitResult < HitResult.NO_EFFECT && !move.hitsSubstitute(attacker, pokemon)) { - if (simulated) { - return globalScene.arena.terrain?.terrainType !== (this.terrainType || undefined); - } else { - return globalScene.arena.trySetTerrain(this.terrainType, true); - } - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { + return hitResult < HitResult.NO_EFFECT && !move.hitsSubstitute(attacker, pokemon) && globalScene.arena.canSetTerrain(this.terrainType); + } - return false; + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): void { + if (!simulated) { + globalScene.arena.trySetTerrain(this.terrainType, true); + } } } export class PostDefendContactApplyStatusEffectAbAttr extends PostDefendAbAttr { - public chance: integer; + public chance: number; private effects: StatusEffect[]; - constructor(chance: integer, ...effects: StatusEffect[]) { - super(); + constructor(chance: number, ...effects: StatusEffect[]) { + super(true); this.chance = chance; this.effects = effects; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && !attacker.status - && (this.chance === -1 || pokemon.randSeedInt(100) < this.chance) && !move.hitsSubstitute(attacker, pokemon)) { - const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)]; - if (simulated) { - return attacker.canSetStatus(effect, true, false, pokemon); - } else { - return attacker.trySetStatus(effect, true, pokemon); - } - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)]; + return move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && !attacker.status + && (this.chance === -1 || pokemon.randSeedInt(100) < this.chance) && !move.hitsSubstitute(attacker, pokemon) + && attacker.canSetStatus(effect, true, false, pokemon); + } - return false; + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)]; + attacker.trySetStatus(effect, true, pokemon); } } @@ -896,20 +988,22 @@ export class EffectSporeAbAttr extends PostDefendContactApplyStatusEffectAbAttr super(10, StatusEffect.POISON, StatusEffect.PARALYSIS, StatusEffect.SLEEP); } - applyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { - if (attacker.hasAbility(Abilities.OVERCOAT) || attacker.isOfType(Type.GRASS)) { - return false; - } - return super.applyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args); + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return !(attacker.hasAbility(Abilities.OVERCOAT) || attacker.isOfType(PokemonType.GRASS)) + && super.canApplyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args); + } + + override applyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): void { + super.applyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args); } } export class PostDefendContactApplyTagChanceAbAttr extends PostDefendAbAttr { - private chance: integer; + private chance: number; private tagType: BattlerTagType; - private turnCount: integer | undefined; + private turnCount: number | undefined; - constructor(chance: integer, tagType: BattlerTagType, turnCount?: integer) { + constructor(chance: number, tagType: BattlerTagType, turnCount?: number) { super(); this.tagType = tagType; @@ -917,16 +1011,15 @@ export class PostDefendContactApplyTagChanceAbAttr extends PostDefendAbAttr { this.turnCount = turnCount; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && pokemon.randSeedInt(100) < this.chance && !move.hitsSubstitute(attacker, pokemon)) { - if (simulated) { - return attacker.canAddTag(this.tagType); - } else { - return attacker.addTag(this.tagType, this.turnCount, move.id, attacker.id); - } - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && pokemon.randSeedInt(100) < this.chance + && !move.hitsSubstitute(attacker, pokemon) && attacker.canAddTag(this.tagType); + } - return false; + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + if (!simulated) { + attacker.addTag(this.tagType, this.turnCount, move.id, attacker.id); + } } } @@ -941,16 +1034,14 @@ export class PostDefendCritStatStageChangeAbAttr extends PostDefendAbAttr { this.stages = stages; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (move.hitsSubstitute(attacker, pokemon)) { - return false; - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return !move.hitsSubstitute(attacker, pokemon); + } + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { if (!simulated) { globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ this.stat ], this.stages)); } - - return true; } override getCondition(): AbAttrCondition { @@ -959,23 +1050,22 @@ export class PostDefendCritStatStageChangeAbAttr extends PostDefendAbAttr { } export class PostDefendContactDamageAbAttr extends PostDefendAbAttr { - private damageRatio: integer; + private damageRatio: number; - constructor(damageRatio: integer) { + constructor(damageRatio: number) { super(); this.damageRatio = damageRatio; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (!simulated && move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) - && !attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr) && !move.hitsSubstitute(attacker, pokemon)) { - attacker.damageAndUpdate(Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER); - attacker.turnData.damageTaken += Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)); - return true; - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return !simulated && move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) + && !attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr) && !move.hitsSubstitute(attacker, pokemon); + } - return false; + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + attacker.damageAndUpdate(Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER); + attacker.turnData.damageTaken += Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)); } override getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string { @@ -993,27 +1083,24 @@ export class PostDefendContactDamageAbAttr extends PostDefendAbAttr { * @extends {PostDefendAbAttr} */ export class PostDefendPerishSongAbAttr extends PostDefendAbAttr { - private turns: integer; + private turns: number; - constructor(turns: integer) { + constructor(turns: number) { super(); this.turns = turns; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && !move.hitsSubstitute(attacker, pokemon)) { - if (pokemon.getTag(BattlerTagType.PERISH_SONG) || attacker.getTag(BattlerTagType.PERISH_SONG)) { - return false; - } else { - if (!simulated) { - attacker.addTag(BattlerTagType.PERISH_SONG, this.turns); - pokemon.addTag(BattlerTagType.PERISH_SONG, this.turns); - } - return true; - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && !move.hitsSubstitute(attacker, pokemon)) + && !attacker.getTag(BattlerTagType.PERISH_SONG); + } + + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + if (!simulated) { + attacker.addTag(BattlerTagType.PERISH_SONG, this.turns); + pokemon.addTag(BattlerTagType.PERISH_SONG, this.turns); } - return false; } override getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string { @@ -1032,18 +1119,15 @@ export class PostDefendWeatherChangeAbAttr extends PostDefendAbAttr { this.condition = condition; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (this.condition && !this.condition(pokemon, attacker, move) || move.hitsSubstitute(attacker, pokemon)) { - return false; - } - if (!globalScene.arena.weather?.isImmutable()) { - if (simulated) { - return globalScene.arena.weather?.weatherType !== this.weatherType; - } - return globalScene.arena.trySetWeather(this.weatherType, true); - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return (!(this.condition && !this.condition(pokemon, attacker, move) || move.hitsSubstitute(attacker, pokemon)) + && !globalScene.arena.weather?.isImmutable() && globalScene.arena.canSetWeather(this.weatherType)); + } - return false; + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + if (!simulated) { + globalScene.arena.trySetWeather(this.weatherType, true); + } } } @@ -1052,18 +1136,17 @@ export class PostDefendAbilitySwapAbAttr extends PostDefendAbAttr { super(); } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, args: any[]): boolean { - if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) - && !attacker.getAbility().hasAttr(UnswappableAbilityAbAttr) && !move.hitsSubstitute(attacker, pokemon)) { - if (!simulated) { - const tempAbilityId = attacker.getAbility().id; - attacker.summonData.ability = pokemon.getAbility().id; - pokemon.summonData.ability = tempAbilityId; - } - return true; - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) + && !attacker.getAbility().hasAttr(UnswappableAbilityAbAttr) && !move.hitsSubstitute(attacker, pokemon); + } - return false; + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, args: any[]): void { + if (!simulated) { + const tempAbility = attacker.getAbility(); + attacker.setTempAbility(pokemon.getAbility()); + pokemon.setTempAbility(tempAbility); + } } override getTriggerMessage(pokemon: Pokemon, _abilityName: string, ..._args: any[]): string { @@ -1079,17 +1162,15 @@ export class PostDefendAbilityGiveAbAttr extends PostDefendAbAttr { this.ability = ability; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && !attacker.getAbility().hasAttr(UnsuppressableAbilityAbAttr) - && !attacker.getAbility().hasAttr(PostDefendAbilityGiveAbAttr) && !move.hitsSubstitute(attacker, pokemon)) { - if (!simulated) { - attacker.summonData.ability = this.ability; - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && !attacker.getAbility().hasAttr(UnsuppressableAbilityAbAttr) + && !attacker.getAbility().hasAttr(PostDefendAbilityGiveAbAttr) && !move.hitsSubstitute(attacker, pokemon); + } - return true; + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + if (!simulated) { + attacker.setTempAbility(allAbilities[this.ability]); } - - return false; } override getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string { @@ -1101,30 +1182,27 @@ export class PostDefendAbilityGiveAbAttr extends PostDefendAbAttr { } export class PostDefendMoveDisableAbAttr extends PostDefendAbAttr { - private chance: integer; + private chance: number; private attacker: Pokemon; private move: Move; - constructor(chance: integer) { + constructor(chance: number) { super(); this.chance = chance; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean { - if (attacker.getTag(BattlerTagType.DISABLED) === null && !move.hitsSubstitute(attacker, pokemon)) { - if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && (this.chance === -1 || pokemon.randSeedInt(100) < this.chance)) { - if (simulated) { - return true; - } + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return attacker.getTag(BattlerTagType.DISABLED) === null && !move.hitsSubstitute(attacker, pokemon) + && move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && (this.chance === -1 || pokemon.randSeedInt(100) < this.chance); + } - this.attacker = attacker; - this.move = move; - this.attacker.addTag(BattlerTagType.DISABLED, 4, 0, pokemon.id); - return true; - } + override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void { + if (!simulated) { + this.attacker = attacker; + this.move = move; + this.attacker.addTag(BattlerTagType.DISABLED, 4, 0, pokemon.id); } - return false; } } @@ -1141,22 +1219,36 @@ export class PostStatStageChangeStatStageChangeAbAttr extends PostStatStageChang this.stages = stages; } - applyPostStatStageChange(pokemon: Pokemon, simulated: boolean, statStagesChanged: BattleStat[], stagesChanged: number, selfTarget: boolean, args: any[]): boolean { - if (this.condition(pokemon, statStagesChanged, stagesChanged) && !selfTarget) { - if (!simulated) { - globalScene.unshiftPhase(new StatStageChangePhase((pokemon).getBattlerIndex(), true, this.statsToChange, this.stages)); - } - return true; - } + override canApplyPostStatStageChange(pokemon: Pokemon, simulated: boolean, statStagesChanged: BattleStat[], stagesChanged: integer, selfTarget: boolean, args: any[]): boolean { + return this.condition(pokemon, statStagesChanged, stagesChanged) && !selfTarget; + } - return false; + override applyPostStatStageChange(pokemon: Pokemon, simulated: boolean, statStagesChanged: BattleStat[], stagesChanged: number, selfTarget: boolean, args: any[]): void { + if (!simulated) { + globalScene.unshiftPhase(new StatStageChangePhase((pokemon).getBattlerIndex(), true, this.statsToChange, this.stages)); + } } } export class PreAttackAbAttr extends AbAttr { - applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean | Promise { - return false; + canApplyPreAttack( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + defender: Pokemon | null, + move: Move, + args: any[]): boolean { + return true; } + + applyPreAttack( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + defender: Pokemon | null, + move: Move, + args: any[], + ): void {} } /** @@ -1168,26 +1260,22 @@ export class MoveEffectChanceMultiplierAbAttr extends AbAttr { private chanceMultiplier: number; constructor(chanceMultiplier: number) { - super(true); + super(false); this.chanceMultiplier = chanceMultiplier; } + + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + const exceptMoves = [ Moves.ORDER_UP, Moves.ELECTRO_SHOT ]; + return !((args[0] as Utils.NumberHolder).value <= 0 || exceptMoves.includes((args[1] as Move).id)); + } + /** * @param args [0]: {@linkcode Utils.NumberHolder} Move additional effect chance. Has to be higher than or equal to 0. * [1]: {@linkcode Moves } Move used by the ability user. */ - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - // Disable showAbility during getTargetBenefitScore - this.showAbility = args[4]; - - const exceptMoves = [ Moves.ORDER_UP, Moves.ELECTRO_SHOT ]; - if ((args[0] as Utils.NumberHolder).value <= 0 || exceptMoves.includes((args[1] as Move).id)) { - return false; - } - + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { (args[0] as Utils.NumberHolder).value *= this.chanceMultiplier; (args[0] as Utils.NumberHolder).value = Math.min((args[0] as Utils.NumberHolder).value, 100); - return true; - } } @@ -1197,32 +1285,34 @@ export class MoveEffectChanceMultiplierAbAttr extends AbAttr { * @see {@linkcode applyPreDefend} */ export class IgnoreMoveEffectsAbAttr extends PreDefendAbAttr { + + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return (args[0] as Utils.NumberHolder).value > 0; + } + /** * @param args [0]: {@linkcode Utils.NumberHolder} Move additional effect chance. */ - applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { - - if ((args[0] as Utils.NumberHolder).value <= 0) { - return false; - } - + override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { (args[0] as Utils.NumberHolder).value = 0; - return true; - } } export class VariableMovePowerAbAttr extends PreAttackAbAttr { - applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean { - //const power = args[0] as Utils.NumberHolder; - return false; + override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean { + return true; } } export class FieldPreventExplosiveMovesAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise { + override apply( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + cancelled: Utils.BooleanHolder, + args: any[], + ): void { cancelled.value = true; - return true; } } @@ -1238,7 +1328,7 @@ export class FieldMultiplyStatAbAttr extends AbAttr { private multiplier: number; private canStack: boolean; - constructor(stat: Stat, multiplier: number, canStack: boolean = false) { + constructor(stat: Stat, multiplier: number, canStack = false) { super(false); this.stat = stat; @@ -1246,6 +1336,11 @@ export class FieldMultiplyStatAbAttr extends AbAttr { this.canStack = canStack; } + canApplyFieldStat(pokemon: Pokemon, passive: boolean, simulated: boolean, stat: Stat, statValue: Utils.NumberHolder, checkedPokemon: Pokemon, hasApplied: Utils.BooleanHolder, args: any[]): boolean { + return this.canStack || !hasApplied.value + && this.stat === stat && checkedPokemon.getAbilityAttrs(FieldMultiplyStatAbAttr).every(attr => (attr as FieldMultiplyStatAbAttr).stat !== stat); + } + /** * applyFieldStat: Tries to multiply a Pokemon's Stat * @param pokemon {@linkcode Pokemon} the Pokemon using this ability @@ -1255,91 +1350,81 @@ export class FieldMultiplyStatAbAttr extends AbAttr { * @param checkedPokemon {@linkcode Pokemon} the Pokemon this ability is targeting * @param hasApplied {@linkcode Utils.BooleanHolder} whether or not another multiplier has been applied to this stat * @param args {any[]} unused - * @returns true if this changed the checked stat, false otherwise. */ - applyFieldStat(pokemon: Pokemon, passive: boolean, simulated: boolean, stat: Stat, statValue: Utils.NumberHolder, checkedPokemon: Pokemon, hasApplied: Utils.BooleanHolder, args: any[]): boolean { - if (!this.canStack && hasApplied.value) { - return false; - } - - if (this.stat === stat && checkedPokemon.getAbilityAttrs(FieldMultiplyStatAbAttr).every(attr => (attr as FieldMultiplyStatAbAttr).stat !== stat)) { - statValue.value *= this.multiplier; - hasApplied.value = true; - return true; - } - return false; + applyFieldStat(pokemon: Pokemon, passive: boolean, simulated: boolean, stat: Stat, statValue: Utils.NumberHolder, checkedPokemon: Pokemon, hasApplied: Utils.BooleanHolder, args: any[]): void { + statValue.value *= this.multiplier; + hasApplied.value = true; } } export class MoveTypeChangeAbAttr extends PreAttackAbAttr { constructor( - private newType: Type, + private newType: PokemonType, private powerMultiplier: number, private condition?: PokemonAttackCondition ) { - super(true); + super(false); + } + + override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean { + return (this.condition && this.condition(pokemon, defender, move)) ?? false; } // TODO: Decouple this into two attributes (type change / power boost) - applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean { - if (this.condition && this.condition(pokemon, defender, move)) { - if (args[0] && args[0] instanceof Utils.NumberHolder) { - args[0].value = this.newType; - } - if (args[1] && args[1] instanceof Utils.NumberHolder) { - args[1].value *= this.powerMultiplier; - } - return true; + override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void { + if (args[0] && args[0] instanceof Utils.NumberHolder) { + args[0].value = this.newType; + } + if (args[1] && args[1] instanceof Utils.NumberHolder) { + args[1].value *= this.powerMultiplier; } - - return false; } } /** Ability attribute for changing a pokemon's type before using a move */ export class PokemonTypeChangeAbAttr extends PreAttackAbAttr { - private moveType: Type; + private moveType: PokemonType; constructor() { super(true); } - applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean { - if ( - !pokemon.isTerastallized() && - move.id !== Moves.STRUGGLE && - /** - * Skip moves that call other moves because these moves generate a following move that will trigger this ability attribute - * @see {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_call_other_moves} - */ - !move.findAttr((attr) => - attr instanceof RandomMovesetMoveAttr || - attr instanceof RandomMoveAttr || - attr instanceof NaturePowerAttr || - attr instanceof CopyMoveAttr - ) - ) { + override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean { + if (!pokemon.isTerastallized && + move.id !== Moves.STRUGGLE && + /** + * Skip moves that call other moves because these moves generate a following move that will trigger this ability attribute + * @see {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_call_other_moves} + */ + !move.findAttr((attr) => + attr instanceof RandomMovesetMoveAttr || + attr instanceof RandomMoveAttr || + attr instanceof NaturePowerAttr || + attr instanceof CopyMoveAttr)) { const moveType = pokemon.getMoveType(move); - if (pokemon.getTypes().some((t) => t !== moveType)) { - if (!simulated) { - this.moveType = moveType; - pokemon.summonData.types = [ moveType ]; - pokemon.updateInfo(); - } - + this.moveType = moveType; return true; } } - return false; } + override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void { + const moveType = pokemon.getMoveType(move); + + if (!simulated) { + this.moveType = moveType; + pokemon.summonData.types = [ moveType ]; + pokemon.updateInfo(); + } + } + getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { return i18next.t("abilityTriggers:pokemonTypeChange", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - moveType: i18next.t(`pokemonInfo:Type.${Type[this.moveType]}`), + moveType: i18next.t(`pokemonInfo:Type.${PokemonType[this.moveType]}`), }); } } @@ -1357,6 +1442,10 @@ export class AddSecondStrikeAbAttr extends PreAttackAbAttr { this.damageMultiplier = damageMultiplier; } + override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean { + return move.canBeMultiStrikeEnhanced(pokemon, true); + } + /** * If conditions are met, this doubles the move's hit count (via args[1]) * or multiplies the damage of secondary strikes (via args[2]) @@ -1367,24 +1456,17 @@ export class AddSecondStrikeAbAttr extends PreAttackAbAttr { * @param args Additional arguments: * - `[0]` the number of strikes this move currently has ({@linkcode Utils.NumberHolder}) * - `[1]` the damage multiplier for the current strike ({@linkcode Utils.NumberHolder}) - * @returns */ - applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean { + override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void { const hitCount = args[0] as Utils.NumberHolder; const multiplier = args[1] as Utils.NumberHolder; - - if (move.canBeMultiStrikeEnhanced(pokemon, true)) { - this.showAbility = !!hitCount?.value; - if (hitCount?.value) { - hitCount.value += 1; - } - - if (multiplier?.value && pokemon.turnData.hitsLeft === 1) { - multiplier.value = this.damageMultiplier; - } - return true; + if (hitCount?.value) { + hitCount.value += 1; + } + + if (multiplier?.value && pokemon.turnData.hitsLeft === 1) { + multiplier.value = this.damageMultiplier; } - return false; } } @@ -1399,11 +1481,15 @@ export class DamageBoostAbAttr extends PreAttackAbAttr { private condition: PokemonAttackCondition; constructor(damageMultiplier: number, condition: PokemonAttackCondition) { - super(true); + super(false); this.damageMultiplier = damageMultiplier; this.condition = condition; } + override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean { + return this.condition(pokemon, defender, move); + } + /** * * @param pokemon the attacker pokemon @@ -1411,16 +1497,10 @@ export class DamageBoostAbAttr extends PreAttackAbAttr { * @param defender the target pokemon * @param move the move used by the attacker pokemon * @param args Utils.NumberHolder as damage - * @returns true if the function succeeds */ - applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean { - if (this.condition(pokemon, defender, move)) { - const power = args[0] as Utils.NumberHolder; - power.value = Math.floor(power.value * this.damageMultiplier); - return true; - } - - return false; + override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void { + const power = args[0] as Utils.NumberHolder; + power.value = Utils.toDmgValue(power.value * this.damageMultiplier); } } @@ -1428,31 +1508,29 @@ export class MovePowerBoostAbAttr extends VariableMovePowerAbAttr { private condition: PokemonAttackCondition; private powerMultiplier: number; - constructor(condition: PokemonAttackCondition, powerMultiplier: number, showAbility: boolean = true) { + constructor(condition: PokemonAttackCondition, powerMultiplier: number, showAbility: boolean = false) { super(showAbility); this.condition = condition; this.powerMultiplier = powerMultiplier; } - applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean { - if (this.condition(pokemon, defender, move)) { - (args[0] as Utils.NumberHolder).value *= this.powerMultiplier; + override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean { + return this.condition(pokemon, defender, move); + } - return true; - } - - return false; + override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void { + (args[0] as Utils.NumberHolder).value *= this.powerMultiplier; } } export class MoveTypePowerBoostAbAttr extends MovePowerBoostAbAttr { - constructor(boostedType: Type, powerMultiplier?: number) { - super((pokemon, defender, move) => pokemon?.getMoveType(move) === boostedType, powerMultiplier || 1.5); + constructor(boostedType: PokemonType, powerMultiplier?: number) { + super((pokemon, defender, move) => pokemon?.getMoveType(move) === boostedType, powerMultiplier || 1.5, false); } } export class LowHpMoveTypePowerBoostAbAttr extends MoveTypePowerBoostAbAttr { - constructor(boostedType: Type) { + constructor(boostedType: PokemonType) { super(boostedType); } @@ -1473,22 +1551,18 @@ export class VariableMovePowerBoostAbAttr extends VariableMovePowerAbAttr { * @param mult A function which takes the user, target, and move, and returns the power multiplier. 1 means no multiplier. * @param {boolean} showAbility Whether to show the ability when it activates. */ - constructor(mult: (user: Pokemon, target: Pokemon, move: Move) => number, showAbility: boolean = true) { + constructor(mult: (user: Pokemon, target: Pokemon, move: Move) => number, showAbility = true) { super(showAbility); this.mult = mult; } - /** - * @override - */ - applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move, args: any[]): boolean { - const multiplier = this.mult(pokemon, defender, move); - if (multiplier !== 1) { - (args[0] as Utils.NumberHolder).value *= multiplier; - return true; - } + override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean { + return this.mult(pokemon, defender, move) !== 1; + } - return false; + override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void { + const multiplier = this.mult(pokemon, defender, move); + (args[0] as Utils.NumberHolder).value *= multiplier; } } @@ -1497,6 +1571,7 @@ export class VariableMovePowerBoostAbAttr extends VariableMovePowerAbAttr { * @extends AbAttr */ export class FieldMovePowerBoostAbAttr extends AbAttr { + // TODO: Refactor this class? It extends from base AbAttr but has preAttack methods and gets called directly instead of going through applyAbAttrsInternal private condition: PokemonAttackCondition; private powerMultiplier: number; @@ -1510,14 +1585,14 @@ export class FieldMovePowerBoostAbAttr extends AbAttr { this.powerMultiplier = powerMultiplier; } - applyPreAttack(pokemon: Pokemon | null, passive: boolean | null, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean { + canApplyPreAttack(pokemon: Pokemon | null, passive: boolean | null, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean { + return true; // logic for this attr is handled in move.ts instead of normally + } + + applyPreAttack(pokemon: Pokemon | null, passive: boolean | null, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): void { if (this.condition(pokemon, defender, move)) { (args[0] as Utils.NumberHolder).value *= this.powerMultiplier; - - return true; } - - return false; } } @@ -1530,7 +1605,7 @@ export class PreAttackFieldMoveTypePowerBoostAbAttr extends FieldMovePowerBoostA * @param boostedType - The type of move that will receive the power boost. * @param powerMultiplier - The multiplier to apply to the move's power, defaults to 1.5 if not provided. */ - constructor(boostedType: Type, powerMultiplier?: number) { + constructor(boostedType: PokemonType, powerMultiplier?: number) { super((pokemon, defender, move) => pokemon?.getMoveType(move) === boostedType, powerMultiplier || 1.5); } } @@ -1574,14 +1649,25 @@ export class StatMultiplierAbAttr extends AbAttr { this.condition = condition ?? null; } - applyStatStage(pokemon: Pokemon, _passive: boolean, simulated: boolean, stat: BattleStat, statValue: Utils.NumberHolder, args: any[]): boolean | Promise { + canApplyStatStage( + pokemon: Pokemon, + _passive: boolean, + simulated: boolean, + stat: BattleStat, + statValue: Utils.NumberHolder, + args: any[]): boolean { const move = (args[0] as Move); - if (stat === this.stat && (!this.condition || this.condition(pokemon, null, move))) { - statValue.value *= this.multiplier; - return true; - } + return stat === this.stat && (!this.condition || this.condition(pokemon, null, move)); + } - return false; + applyStatStage( + pokemon: Pokemon, + _passive: boolean, + simulated: boolean, + stat: BattleStat, + statValue: Utils.NumberHolder, + args: any[]): void { + statValue.value *= this.multiplier; } } @@ -1589,33 +1675,38 @@ export class PostAttackAbAttr extends AbAttr { private attackCondition: PokemonAttackCondition; /** The default attackCondition requires that the selected move is a damaging move */ - constructor(attackCondition: PokemonAttackCondition = (user, target, move) => (move.category !== MoveCategory.STATUS), showAbility: boolean = true) { + constructor(attackCondition: PokemonAttackCondition = (user, target, move) => (move.category !== MoveCategory.STATUS), showAbility = true) { super(showAbility); this.attackCondition = attackCondition; } /** - * Please override {@link applyPostAttackAfterMoveTypeCheck} instead of this method. By default, this method checks that the move used is a damaging attack before + * By default, this method checks that the move used is a damaging attack before * applying the effect of any inherited class. This can be changed by providing a different {@link attackCondition} to the constructor. See {@link ConfusionOnStatusEffectAbAttr} * for an example of an effect that does not require a damaging move. */ - applyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean | Promise { + canApplyPostAttack( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + defender: Pokemon, + move: Move, + hitResult: HitResult | null, + args: any[]): boolean { // When attackRequired is true, we require the move to be an attack move and to deal damage before checking secondary requirements. // If attackRequired is false, we always defer to the secondary requirements. - if (this.attackCondition(pokemon, defender, move)) { - return this.applyPostAttackAfterMoveTypeCheck(pokemon, passive, simulated, defender, move, hitResult, args); - } else { - return false; - } + return this.attackCondition(pokemon, defender, move); } - /** - * This method is only called after {@link applyPostAttack} has already been applied. Use this for handling checks specific to the ability in question. - */ - applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean | Promise { - return false; - } + applyPostAttack( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + defender: Pokemon, + move: Move, + hitResult: HitResult | null, + args: any[]): void {} } /** @@ -1627,6 +1718,18 @@ export class GorillaTacticsAbAttr extends PostAttackAbAttr { super((user, target, move) => true, false); } + override canApplyPostAttack( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + defender: Pokemon, + move: Move, + hitResult: HitResult | null, + args: any[]): boolean { + return super.canApplyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args) + && simulated || !pokemon.getTag(BattlerTagType.GORILLA_TACTICS); + } + /** * * @param {Pokemon} pokemon the {@linkcode Pokemon} with this ability @@ -1636,24 +1739,24 @@ export class GorillaTacticsAbAttr extends PostAttackAbAttr { * @param move n/a * @param hitResult n/a * @param args n/a - * @returns `true` if the ability is applied */ - applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean | Promise { - if (simulated) { - return simulated; + override applyPostAttack( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + defender: Pokemon, + move: Move, + hitResult: HitResult | null, + args: any[]): void { + if (!simulated) { + pokemon.addTag(BattlerTagType.GORILLA_TACTICS); } - - if (pokemon.getTag(BattlerTagType.GORILLA_TACTICS)) { - return false; - } - - pokemon.addTag(BattlerTagType.GORILLA_TACTICS); - return true; } } export class PostAttackStealHeldItemAbAttr extends PostAttackAbAttr { private stealCondition: PokemonAttackCondition | null; + private stolenItem?: PokemonHeldItemModifier; constructor(stealCondition?: PokemonAttackCondition) { super(); @@ -1661,23 +1764,56 @@ export class PostAttackStealHeldItemAbAttr extends PostAttackAbAttr { this.stealCondition = stealCondition ?? null; } - applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult, args: any[]): Promise { - return new Promise(resolve => { - if (!simulated && hitResult < HitResult.NO_EFFECT && (!this.stealCondition || this.stealCondition(pokemon, defender, move))) { - const heldItems = this.getTargetHeldItems(defender).filter(i => i.isTransferable); - if (heldItems.length) { - const stolenItem = heldItems[pokemon.randSeedInt(heldItems.length)]; - globalScene.tryTransferHeldItemModifier(stolenItem, pokemon, false).then(success => { - if (success) { - globalScene.queueMessage(i18next.t("abilityTriggers:postAttackStealHeldItem", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), defenderName: defender.name, stolenItemType: stolenItem.type.name })); - } - resolve(success); - }); - return; + override canApplyPostAttack( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + defender: Pokemon, + move: Move, + hitResult: HitResult, + args: any[]): boolean { + if ( + super.canApplyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args) && + !simulated && + hitResult < HitResult.NO_EFFECT && + (!this.stealCondition || this.stealCondition(pokemon, defender, move)) + ) { + const heldItems = this.getTargetHeldItems(defender).filter((i) => i.isTransferable); + if (heldItems.length) { + // Ensure that the stolen item in testing is the same as when the effect is applied + this.stolenItem = heldItems[pokemon.randSeedInt(heldItems.length)]; + if (globalScene.canTransferHeldItemModifier(this.stolenItem, pokemon)) { + return true; } } - resolve(simulated); - }); + } + this.stolenItem = undefined; + return false; + } + + override applyPostAttack( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + defender: Pokemon, + move: Move, + hitResult: HitResult, + args: any[], + ): void { + const heldItems = this.getTargetHeldItems(defender).filter((i) => i.isTransferable); + if (!this.stolenItem) { + this.stolenItem = heldItems[pokemon.randSeedInt(heldItems.length)]; + } + if (globalScene.tryTransferHeldItemModifier(this.stolenItem, pokemon, false)) { + globalScene.queueMessage( + i18next.t("abilityTriggers:postAttackStealHeldItem", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + defenderName: defender.name, + stolenItemType: this.stolenItem.type.name, + }), + ); + } + this.stolenItem = undefined; } getTargetHeldItems(target: Pokemon): PokemonHeldItemModifier[] { @@ -1688,10 +1824,10 @@ export class PostAttackStealHeldItemAbAttr extends PostAttackAbAttr { export class PostAttackApplyStatusEffectAbAttr extends PostAttackAbAttr { private contactRequired: boolean; - private chance: integer; + private chance: number; private effects: StatusEffect[]; - constructor(contactRequired: boolean, chance: integer, ...effects: StatusEffect[]) { + constructor(contactRequired: boolean, chance: number, ...effects: StatusEffect[]) { super(); this.contactRequired = contactRequired; @@ -1699,54 +1835,65 @@ export class PostAttackApplyStatusEffectAbAttr extends PostAttackAbAttr { this.effects = effects; } - applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { - if (pokemon !== attacker && move.hitsSubstitute(attacker, pokemon)) { - return false; - } - - /**Status inflicted by abilities post attacking are also considered additional effects.*/ - if (!attacker.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && !simulated && pokemon !== attacker && (!this.contactRequired || move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) && pokemon.randSeedInt(100) < this.chance && !pokemon.status) { + override canApplyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + if ( + super.canApplyPostAttack(pokemon, passive, simulated, attacker, move, hitResult, args) + && !(pokemon !== attacker && move.hitsSubstitute(attacker, pokemon)) + && (simulated || !attacker.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && pokemon !== attacker + && (!this.contactRequired || move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) && pokemon.randSeedInt(100) < this.chance && !pokemon.status) + ) { const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)]; - return attacker.trySetStatus(effect, true, pokemon); + return simulated || attacker.canSetStatus(effect, true, false, pokemon); } - return simulated; + return false; + } + + applyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): void { + const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)]; + attacker.trySetStatus(effect, true, pokemon); } } export class PostAttackContactApplyStatusEffectAbAttr extends PostAttackApplyStatusEffectAbAttr { - constructor(chance: integer, ...effects: StatusEffect[]) { + constructor(chance: number, ...effects: StatusEffect[]) { super(true, chance, ...effects); } } export class PostAttackApplyBattlerTagAbAttr extends PostAttackAbAttr { private contactRequired: boolean; - private chance: (user: Pokemon, target: Pokemon, move: Move) => integer; + private chance: (user: Pokemon, target: Pokemon, move: Move) => number; private effects: BattlerTagType[]; - constructor(contactRequired: boolean, chance: (user: Pokemon, target: Pokemon, move: Move) => integer, ...effects: BattlerTagType[]) { - super(); + constructor(contactRequired: boolean, chance: (user: Pokemon, target: Pokemon, move: Move) => number, ...effects: BattlerTagType[]) { + super(undefined, false); this.contactRequired = contactRequired; this.chance = chance; this.effects = effects; } - applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { + override canApplyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { /**Battler tags inflicted by abilities post attacking are also considered additional effects.*/ - if (!attacker.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && pokemon !== attacker && (!this.contactRequired || move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) && pokemon.randSeedInt(100) < this.chance(attacker, pokemon, move) && !pokemon.status) { - const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)]; - return simulated || attacker.addTag(effect); - } + return super.canApplyPostAttack(pokemon, passive, simulated, attacker, move, hitResult, args) && + !attacker.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && pokemon !== attacker && + (!this.contactRequired || move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) && + pokemon.randSeedInt(100) < this.chance(attacker, pokemon, move) && !pokemon.status; + } - return false; + override applyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): void { + if (!simulated) { + const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)]; + attacker.addTag(effect); + } } } export class PostDefendStealHeldItemAbAttr extends PostDefendAbAttr { private condition?: PokemonDefendCondition; + private stolenItem?: PokemonHeldItemModifier; constructor(condition?: PokemonDefendCondition) { super(); @@ -1754,23 +1901,48 @@ export class PostDefendStealHeldItemAbAttr extends PostDefendAbAttr { this.condition = condition; } - override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): Promise { - return new Promise(resolve => { - if (!simulated && hitResult < HitResult.NO_EFFECT && (!this.condition || this.condition(pokemon, attacker, move)) && !move.hitsSubstitute(attacker, pokemon)) { - const heldItems = this.getTargetHeldItems(attacker).filter(i => i.isTransferable); - if (heldItems.length) { - const stolenItem = heldItems[pokemon.randSeedInt(heldItems.length)]; - globalScene.tryTransferHeldItemModifier(stolenItem, pokemon, false).then(success => { - if (success) { - globalScene.queueMessage(i18next.t("abilityTriggers:postDefendStealHeldItem", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), attackerName: attacker.name, stolenItemType: stolenItem.type.name })); - } - resolve(success); - }); - return; + override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { + if ( + !simulated && + hitResult < HitResult.NO_EFFECT && + (!this.condition || this.condition(pokemon, attacker, move)) && + !move.hitsSubstitute(attacker, pokemon) + ) { + const heldItems = this.getTargetHeldItems(attacker).filter((i) => i.isTransferable); + if (heldItems.length) { + this.stolenItem = heldItems[pokemon.randSeedInt(heldItems.length)]; + if (globalScene.canTransferHeldItemModifier(this.stolenItem, pokemon)) { + return true; } } - resolve(simulated); - }); + } + return false; + } + + override applyPostDefend( + pokemon: Pokemon, + _passive: boolean, + simulated: boolean, + attacker: Pokemon, + move: Move, + hitResult: HitResult, + _args: any[], + ): void { + + const heldItems = this.getTargetHeldItems(attacker).filter((i) => i.isTransferable); + if (!this.stolenItem) { + this.stolenItem = heldItems[pokemon.randSeedInt(heldItems.length)]; + } + if (globalScene.tryTransferHeldItemModifier(this.stolenItem, pokemon, false)) { + globalScene.queueMessage( + i18next.t("abilityTriggers:postDefendStealHeldItem", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + attackerName: attacker.name, + stolenItemType: this.stolenItem.type.name, + }), + ); + } + this.stolenItem = undefined; } getTargetHeldItems(target: Pokemon): PokemonHeldItemModifier[] { @@ -1784,6 +1956,16 @@ export class PostDefendStealHeldItemAbAttr extends PostDefendAbAttr { * @see {@linkcode applyPostSetStatus()}. */ export class PostSetStatusAbAttr extends AbAttr { + canApplyPostSetStatus( + pokemon: Pokemon, + sourcePokemon: Pokemon | null = null, + passive: boolean, + effect: StatusEffect, + simulated: boolean, + rgs: any[]): boolean { + return true; + } + /** * Does nothing after a status condition is set. * @param pokemon {@linkcode Pokemon} that status condition was set on. @@ -1791,11 +1973,15 @@ export class PostSetStatusAbAttr extends AbAttr { * @param passive Whether this ability is a passive. * @param effect {@linkcode StatusEffect} that was set. * @param args Set of unique arguments needed by this attribute. - * @returns `true` if application of the ability succeeds. */ - applyPostSetStatus(pokemon: Pokemon, sourcePokemon: Pokemon | null = null, passive: boolean, effect: StatusEffect, simulated: boolean, args: any[]) : boolean | Promise { - return false; - } + applyPostSetStatus( + pokemon: Pokemon, + sourcePokemon: Pokemon | null = null, + passive: boolean, + effect: StatusEffect, + simulated: boolean, + args: any[], + ): void {} } /** @@ -1804,17 +1990,7 @@ export class PostSetStatusAbAttr extends AbAttr { * ability attribute. For Synchronize ability. */ export class SynchronizeStatusAbAttr extends PostSetStatusAbAttr { - /** - * If the `StatusEffect` that was set is Burn, Paralysis, Poison, or Toxic, and the status - * was set by a source Pokemon, set the source Pokemon's status to the same `StatusEffect`. - * @param pokemon {@linkcode Pokemon} that status condition was set on. - * @param sourcePokemon {@linkcode Pokemon} that that set the status condition. Is null if status was not set by a Pokemon. - * @param passive Whether this ability is a passive. - * @param effect {@linkcode StatusEffect} that was set. - * @param args Set of unique arguments needed by this attribute. - * @returns `true` if application of the ability succeeds. - */ - override applyPostSetStatus(pokemon: Pokemon, sourcePokemon: Pokemon | null = null, passive: boolean, effect: StatusEffect, simulated: boolean, args: any[]): boolean { + override canApplyPostSetStatus(pokemon: Pokemon, sourcePokemon: (Pokemon | null) | undefined, passive: boolean, effect: StatusEffect, simulated: boolean, args: any[]): boolean { /** Synchronizable statuses */ const syncStatuses = new Set([ StatusEffect.BURN, @@ -1823,21 +1999,32 @@ export class SynchronizeStatusAbAttr extends PostSetStatusAbAttr { StatusEffect.TOXIC ]); - if (sourcePokemon && syncStatuses.has(effect)) { - if (!simulated) { - sourcePokemon.trySetStatus(effect, true, pokemon); - } - return true; - } + // synchronize does not need to check canSetStatus because the ability shows even if it fails to set the status + return ((sourcePokemon ?? false) && syncStatuses.has(effect)); + } - return false; + /** + * If the `StatusEffect` that was set is Burn, Paralysis, Poison, or Toxic, and the status + * was set by a source Pokemon, set the source Pokemon's status to the same `StatusEffect`. + * @param pokemon {@linkcode Pokemon} that status condition was set on. + * @param sourcePokemon {@linkcode Pokemon} that that set the status condition. Is null if status was not set by a Pokemon. + * @param passive Whether this ability is a passive. + * @param effect {@linkcode StatusEffect} that was set. + * @param args Set of unique arguments needed by this attribute. + */ + override applyPostSetStatus(pokemon: Pokemon, sourcePokemon: Pokemon | null = null, passive: boolean, effect: StatusEffect, simulated: boolean, args: any[]): void { + if (!simulated && sourcePokemon) { + sourcePokemon.trySetStatus(effect, true, pokemon); + } } } export class PostVictoryAbAttr extends AbAttr { - applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - return false; + canApplyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return true; } + + applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {} } class PostVictoryStatStageChangeAbAttr extends PostVictoryAbAttr { @@ -1851,43 +2038,41 @@ class PostVictoryStatStageChangeAbAttr extends PostVictoryAbAttr { this.stages = stages; } - applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - const stat = typeof this.stat === "function" - ? this.stat(pokemon) - : this.stat; + override applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + const stat = typeof this.stat === "function" ? this.stat(pokemon) : this.stat; if (!simulated) { globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ stat ], this.stages)); } - return true; } } export class PostVictoryFormChangeAbAttr extends PostVictoryAbAttr { - private formFunc: (p: Pokemon) => integer; + private formFunc: (p: Pokemon) => number; - constructor(formFunc: ((p: Pokemon) => integer)) { + constructor(formFunc: ((p: Pokemon) => number)) { super(true); this.formFunc = formFunc; } - applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { + override canApplyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { const formIndex = this.formFunc(pokemon); - if (formIndex !== pokemon.formIndex) { - if (!simulated) { - globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false); - } - return true; - } + return formIndex !== pokemon.formIndex; + } - return false; + override applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false); + } } } export class PostKnockOutAbAttr extends AbAttr { - applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): boolean | Promise { - return false; + canApplyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): boolean { + return true; } + + applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): void {} } export class PostKnockOutStatStageChangeAbAttr extends PostKnockOutAbAttr { @@ -1901,14 +2086,11 @@ export class PostKnockOutStatStageChangeAbAttr extends PostKnockOutAbAttr { this.stages = stages; } - applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): boolean | Promise { - const stat = typeof this.stat === "function" - ? this.stat(pokemon) - : this.stat; + override applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): void { + const stat = typeof this.stat === "function" ? this.stat(pokemon) : this.stat; if (!simulated) { globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ stat ], this.stages)); } - return true; } } @@ -1917,16 +2099,15 @@ export class CopyFaintedAllyAbilityAbAttr extends PostKnockOutAbAttr { super(); } - applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): boolean | Promise { - if (pokemon.isPlayer() === knockedOut.isPlayer() && !knockedOut.getAbility().hasAttr(UncopiableAbilityAbAttr)) { - if (!simulated) { - pokemon.summonData.ability = knockedOut.getAbility().id; - globalScene.queueMessage(i18next.t("abilityTriggers:copyFaintedAllyAbility", { pokemonNameWithAffix: getPokemonNameWithAffix(knockedOut), abilityName: allAbilities[knockedOut.getAbility().id].name })); - } - return true; - } + override canApplyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): boolean { + return pokemon.isPlayer() === knockedOut.isPlayer() && !knockedOut.getAbility().hasAttr(UncopiableAbilityAbAttr); + } - return false; + override applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): void { + if (!simulated) { + pokemon.setTempAbility(knockedOut.getAbility()); + globalScene.queueMessage(i18next.t("abilityTriggers:copyFaintedAllyAbility", { pokemonNameWithAffix: getPokemonNameWithAffix(knockedOut), abilityName: allAbilities[knockedOut.getAbility().id].name })); + } } } @@ -1943,6 +2124,10 @@ export class IgnoreOpponentStatStagesAbAttr extends AbAttr { this.stats = stats ?? BATTLE_STATS; } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return this.stats.includes(args[0]); + } + /** * Modifies a BooleanHolder and returns the result to see if a stat is ignored or not * @param _pokemon n/a @@ -1950,14 +2135,9 @@ export class IgnoreOpponentStatStagesAbAttr extends AbAttr { * @param simulated n/a * @param _cancelled n/a * @param args A BooleanHolder that represents whether or not to ignore a stat's stat changes - * @returns true if the stat is ignored, false otherwise */ - apply(_pokemon: Pokemon, _passive: boolean, simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]) { - if (this.stats.includes(args[0])) { - (args[1] as Utils.BooleanHolder).value = true; - return true; - } - return false; + override apply(_pokemon: Pokemon, _passive: boolean, simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]): void { + (args[1] as Utils.BooleanHolder).value = true; } } @@ -1966,9 +2146,8 @@ export class IntimidateImmunityAbAttr extends AbAttr { super(false); } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { cancelled.value = true; - return true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -1991,12 +2170,11 @@ export class PostIntimidateStatStageChangeAbAttr extends AbAttr { this.overwrites = !!overwrites; } - apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: Utils.BooleanHolder, args: any[]): void { if (!simulated) { globalScene.pushPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, this.stats, this.stages)); } cancelled.value = this.overwrites; - return true; } } @@ -2005,16 +2183,32 @@ export class PostIntimidateStatStageChangeAbAttr extends AbAttr { * @see {@linkcode applyPostSummon()} */ export class PostSummonAbAttr extends AbAttr { + /** Should the ability activate when gained in battle? This will almost always be true */ + private activateOnGain: boolean; + + constructor(showAbility = true, activateOnGain = true) { + super(showAbility); + this.activateOnGain = activateOnGain; + } + + /** + * @returns Whether the ability should activate when gained in battle + */ + shouldActivateOnGain(): boolean { + return this.activateOnGain; + } + + canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return true; + } + /** * Applies ability post summon (after switching in) * @param pokemon {@linkcode Pokemon} with this ability * @param passive Whether this ability is a passive * @param args Set of unique arguments needed by this attribute - * @returns true if application of the ability succeeds */ - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - return false; - } + applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {} } /** @@ -2032,13 +2226,43 @@ export class PostSummonRemoveArenaTagAbAttr extends PostSummonAbAttr { this.arenaTags = arenaTags; } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return globalScene.arena.tags.some(tag => this.arenaTags.includes(tag.tagType)); + } + + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { if (!simulated) { for (const arenaTag of this.arenaTags) { globalScene.arena.removeTag(arenaTag); } } - return true; + } +} + +/** + * Generic class to add an arena tag upon switching in + */ +export class PostSummonAddArenaTagAbAttr extends PostSummonAbAttr { + private readonly tagType: ArenaTagType; + private readonly turnCount: number; + private readonly side?: ArenaTagSide; + private readonly quiet?: boolean; + private sourceId: number; + + + constructor(showAbility: boolean, tagType: ArenaTagType, turnCount: number, side?: ArenaTagSide, quiet?: boolean) { + super(showAbility); + this.tagType = tagType; + this.turnCount = turnCount; + this.side = side; + this.quiet = quiet; + } + + public override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + this.sourceId = pokemon.id; + if (!simulated) { + globalScene.arena.addTag(this.tagType, this.turnCount, undefined, this.sourceId, this.side, this.quiet); + } } } @@ -2051,12 +2275,10 @@ export class PostSummonMessageAbAttr extends PostSummonAbAttr { this.messageFunc = messageFunc; } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { if (!simulated) { globalScene.queueMessage(this.messageFunc(pokemon)); } - - return true; } } @@ -2070,31 +2292,31 @@ export class PostSummonUnnamedMessageAbAttr extends PostSummonAbAttr { this.message = message; } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { if (!simulated) { globalScene.queueMessage(this.message); } - - return true; } } export class PostSummonAddBattlerTagAbAttr extends PostSummonAbAttr { private tagType: BattlerTagType; - private turnCount: integer; + private turnCount: number; - constructor(tagType: BattlerTagType, turnCount: integer, showAbility?: boolean) { + constructor(tagType: BattlerTagType, turnCount: number, showAbility?: boolean) { super(showAbility); this.tagType = tagType; this.turnCount = turnCount; } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - if (simulated) { - return pokemon.canAddTag(this.tagType); - } else { - return pokemon.addTag(this.tagType, this.turnCount); + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return pokemon.canAddTag(this.tagType); + } + + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + pokemon.addTag(this.tagType, this.turnCount); } } } @@ -2106,7 +2328,7 @@ export class PostSummonStatStageChangeAbAttr extends PostSummonAbAttr { private intimidate: boolean; constructor(stats: BattleStat[], stages: number, selfTarget?: boolean, intimidate?: boolean) { - super(false); + super(true); this.stats = stats; this.stages = stages; @@ -2114,33 +2336,31 @@ export class PostSummonStatStageChangeAbAttr extends PostSummonAbAttr { this.intimidate = !!intimidate; } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { if (simulated) { - return true; + return; } - queueShowAbility(pokemon, passive); // TODO: Better solution than manually showing the ability here if (this.selfTarget) { // we unshift the StatStageChangePhase to put it right after the showAbility and not at the end of the // phase list (which could be after CommandPhase for example) globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages)); - return true; - } - for (const opponent of pokemon.getOpponents()) { - const cancelled = new Utils.BooleanHolder(false); - if (this.intimidate) { - applyAbAttrs(IntimidateImmunityAbAttr, opponent, cancelled, simulated); - applyAbAttrs(PostIntimidateStatStageChangeAbAttr, opponent, cancelled, simulated); + } else { + for (const opponent of pokemon.getOpponents()) { + const cancelled = new Utils.BooleanHolder(false); + if (this.intimidate) { + applyAbAttrs(IntimidateImmunityAbAttr, opponent, cancelled, simulated); + applyAbAttrs(PostIntimidateStatStageChangeAbAttr, opponent, cancelled, simulated); - if (opponent.getTag(BattlerTagType.SUBSTITUTE)) { - cancelled.value = true; + if (opponent.getTag(BattlerTagType.SUBSTITUTE)) { + cancelled.value = true; + } + } + if (!cancelled.value) { + globalScene.unshiftPhase(new StatStageChangePhase(opponent.getBattlerIndex(), false, this.stats, this.stages)); } } - if (!cancelled.value) { - globalScene.unshiftPhase(new StatStageChangePhase(opponent.getBattlerIndex(), false, this.stats, this.stages)); - } } - return true; } } @@ -2148,25 +2368,23 @@ export class PostSummonAllyHealAbAttr extends PostSummonAbAttr { private healRatio: number; private showAnim: boolean; - constructor(healRatio: number, showAnim: boolean = false) { + constructor(healRatio: number, showAnim = false) { super(); this.healRatio = healRatio || 4; this.showAnim = showAnim; } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return pokemon.getAlly()?.isActive(true); + } + + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { const target = pokemon.getAlly(); - if (target?.isActive(true)) { - if (!simulated) { - globalScene.unshiftPhase(new PokemonHealPhase(target.getBattlerIndex(), - Utils.toDmgValue(pokemon.getMaxHp() / this.healRatio), i18next.t("abilityTriggers:postSummonAllyHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(target), pokemonName: pokemon.name }), true, !this.showAnim)); - } - - return true; + if (!simulated) { + globalScene.unshiftPhase(new PokemonHealPhase(target.getBattlerIndex(), + Utils.toDmgValue(pokemon.getMaxHp() / this.healRatio), i18next.t("abilityTriggers:postSummonAllyHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(target), pokemonName: pokemon.name }), true, !this.showAnim)); } - - return false; } } @@ -2183,21 +2401,19 @@ export class PostSummonClearAllyStatStagesAbAttr extends PostSummonAbAttr { super(); } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - const target = pokemon.getAlly(); - if (target?.isActive(true)) { - if (!simulated) { - for (const s of BATTLE_STATS) { - target.setStatStage(s, 0); - } + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return pokemon.getAlly()?.isActive(true); + } - globalScene.queueMessage(i18next.t("abilityTriggers:postSummonClearAllyStats", { pokemonNameWithAffix: getPokemonNameWithAffix(target) })); + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + const target = pokemon.getAlly(); + if (!simulated) { + for (const s of BATTLE_STATS) { + target.setStatStage(s, 0); } - return true; + globalScene.queueMessage(i18next.t("abilityTriggers:postSummonClearAllyStats", { pokemonNameWithAffix: getPokemonNameWithAffix(target) })); } - - return false; } } @@ -2209,20 +2425,12 @@ export class PostSummonClearAllyStatStagesAbAttr extends PostSummonAbAttr { * @see {applyPostSummon} */ export class DownloadAbAttr extends PostSummonAbAttr { - private enemyDef: integer; - private enemySpDef: integer; - private enemyCountTally: integer; + private enemyDef: number; + private enemySpDef: number; + private enemyCountTally: number; private stats: BattleStat[]; - /** - * Checks to see if it is the opening turn (starting a new game), if so, Download won't work. This is because Download takes into account - * vitamins and items, so it needs to use the Stat and the stat alone. - * @param {Pokemon} pokemon Pokemon that is using the move, as well as seeing the opposing pokemon. - * @param {boolean} passive N/A - * @param {any[]} args N/A - * @returns Returns true if ability is used successful, false if not. - */ - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { this.enemyDef = 0; this.enemySpDef = 0; this.enemyCountTally = 0; @@ -2234,21 +2442,26 @@ export class DownloadAbAttr extends PostSummonAbAttr { } this.enemyDef = Math.round(this.enemyDef / this.enemyCountTally); this.enemySpDef = Math.round(this.enemySpDef / this.enemyCountTally); + return this.enemyDef > 0 && this.enemySpDef > 0; + } + /** + * Checks to see if it is the opening turn (starting a new game), if so, Download won't work. This is because Download takes into account + * vitamins and items, so it needs to use the Stat and the stat alone. + * @param {Pokemon} pokemon Pokemon that is using the move, as well as seeing the opposing pokemon. + * @param {boolean} passive N/A + * @param {any[]} args N/A + */ + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { if (this.enemyDef < this.enemySpDef) { this.stats = [ Stat.ATK ]; } else { this.stats = [ Stat.SPATK ]; } - if (this.enemyDef > 0 && this.enemySpDef > 0) { // only activate if there's actually an enemy to download from - if (!simulated) { - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, this.stats, 1)); - } - return true; + if (!simulated) { + globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, this.stats, 1)); } - - return false; } } @@ -2261,18 +2474,17 @@ export class PostSummonWeatherChangeAbAttr extends PostSummonAbAttr { this.weatherType = weatherType; } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - if ((this.weatherType === WeatherType.HEAVY_RAIN || + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + const weatherReplaceable = (this.weatherType === WeatherType.HEAVY_RAIN || this.weatherType === WeatherType.HARSH_SUN || - this.weatherType === WeatherType.STRONG_WINDS) || !globalScene.arena.weather?.isImmutable()) { - if (simulated) { - return globalScene.arena.weather?.weatherType !== this.weatherType; - } else { - return globalScene.arena.trySetWeather(this.weatherType, true); - } - } + this.weatherType === WeatherType.STRONG_WINDS) || !globalScene.arena.weather?.isImmutable(); + return weatherReplaceable && globalScene.arena.canSetWeather(this.weatherType); + } - return false; + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + globalScene.arena.trySetWeather(this.weatherType, true); + } } } @@ -2285,31 +2497,34 @@ export class PostSummonTerrainChangeAbAttr extends PostSummonAbAttr { this.terrainType = terrainType; } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - if (simulated) { - return globalScene.arena.terrain?.terrainType !== this.terrainType; - } else { - return globalScene.arena.trySetTerrain(this.terrainType, true); + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return globalScene.arena.canSetTerrain(this.terrainType); + } + + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + globalScene.arena.trySetTerrain(this.terrainType, true); } } } export class PostSummonFormChangeAbAttr extends PostSummonAbAttr { - private formFunc: (p: Pokemon) => integer; + private formFunc: (p: Pokemon) => number; - constructor(formFunc: ((p: Pokemon) => integer)) { + constructor(formFunc: ((p: Pokemon) => number)) { super(true); this.formFunc = formFunc; } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - const formIndex = this.formFunc(pokemon); - if (formIndex !== pokemon.formIndex) { - return simulated || globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false); - } + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return this.formFunc(pokemon) !== pokemon.formIndex; + } - return false; + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false); + } } } @@ -2318,7 +2533,7 @@ export class PostSummonCopyAbilityAbAttr extends PostSummonAbAttr { private target: Pokemon; private targetAbilityName: string; - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { const targets = pokemon.getOpponents(); if (!targets.length) { return false; @@ -2339,15 +2554,17 @@ export class PostSummonCopyAbilityAbAttr extends PostSummonAbAttr { return false; } + this.target = target!; + this.targetAbilityName = allAbilities[target!.getAbility().id].name; + return true; + } + + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { if (!simulated) { - this.target = target!; - this.targetAbilityName = allAbilities[target!.getAbility().id].name; - pokemon.summonData.ability = target!.getAbility().id; - setAbilityRevealed(target!); + pokemon.setTempAbility(this.target!.getAbility()); + setAbilityRevealed(this.target!); pokemon.updateInfo(); } - - return true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -2374,22 +2591,22 @@ export class PostSummonUserFieldRemoveStatusEffectAbAttr extends PostSummonAbAtt this.statusEffect = statusEffect; } + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + const party = pokemon instanceof PlayerPokemon ? globalScene.getPlayerField() : globalScene.getEnemyField(); + return party.filter(p => p.isAllowedInBattle()).length > 0; + } + /** * Removes supplied status effect from the user's field when user of the ability is summoned. * * @param pokemon - The Pokémon that triggered the ability. * @param passive - n/a * @param args - n/a - * @returns A boolean or a promise that resolves to a boolean indicating the result of the ability application. */ - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { const party = pokemon instanceof PlayerPokemon ? globalScene.getPlayerField() : globalScene.getEnemyField(); const allowedParty = party.filter(p => p.isAllowedInBattle()); - if (allowedParty.length < 1) { - return false; - } - if (!simulated) { for (const pokemon of allowedParty) { if (pokemon.status && this.statusEffect.includes(pokemon.status.effect)) { @@ -2399,14 +2616,13 @@ export class PostSummonUserFieldRemoveStatusEffectAbAttr extends PostSummonAbAtt } } } - return true; } } /** Attempt to copy the stat changes on an ally pokemon */ export class PostSummonCopyAllyStatsAbAttr extends PostSummonAbAttr { - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { if (!globalScene.currentBattle.double) { return false; } @@ -2416,14 +2632,17 @@ export class PostSummonCopyAllyStatsAbAttr extends PostSummonAbAttr { return false; } + return true; + } + + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + const ally = pokemon.getAlly(); if (!simulated) { for (const s of BATTLE_STATS) { pokemon.setStatStage(s, ally.getStatStage(s)); } pokemon.updateInfo(); } - - return true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -2439,16 +2658,10 @@ export class PostSummonCopyAllyStatsAbAttr extends PostSummonAbAttr { */ export class PostSummonTransformAbAttr extends PostSummonAbAttr { constructor() { - super(true); + super(true, false); } - async applyPostSummon(pokemon: Pokemon, _passive: boolean, simulated: boolean, _args: any[]): Promise { - const targets = pokemon.getOpponents(); - if (simulated || !targets.length) { - return simulated; - } - const promises: Promise[] = []; - + private getTarget(targets: Pokemon[]): Pokemon { let target: Pokemon; if (targets.length > 1) { globalScene.executeWithSeedOffset(() => { @@ -2468,48 +2681,29 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr { } target = target!; + return target; + } + + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + const targets = pokemon.getOpponents(); + if (simulated || !targets.length) { + return simulated; + } + // transforming from or into fusion pokemon causes various problems (including crashes and save corruption) - if (target.fusionSpecies || pokemon.fusionSpecies) { + if (this.getTarget(targets).fusionSpecies || pokemon.fusionSpecies) { return false; } - pokemon.summonData.speciesForm = target.getSpeciesForm(); - pokemon.summonData.ability = target.getAbility().id; - pokemon.summonData.gender = target.getGender(); - - // Copy all stats (except HP) - for (const s of EFFECTIVE_STATS) { - pokemon.setStat(s, target.getStat(s, false), false); - } - - // Copy all stat stages - for (const s of BATTLE_STATS) { - pokemon.setStatStage(s, target.getStatStage(s)); - } - - pokemon.summonData.moveset = target.getMoveset().map((m) => { - if (m) { - // If PP value is less than 5, do nothing. If greater, we need to reduce the value to 5. - return new PokemonMove(m.moveId, 0, 0, false, Math.min(m.getMove().pp, 5)); - } else { - console.warn(`Imposter: somehow iterating over a ${m} value when copying moveset!`); - return new PokemonMove(Moves.NONE); - } - }); - pokemon.summonData.types = target.getTypes(); - promises.push(pokemon.updateInfo()); - - globalScene.queueMessage(i18next.t("abilityTriggers:postSummonTransform", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), targetName: target.name, })); - globalScene.playSound("battle_anims/PRSFX- Transform"); - promises.push(pokemon.loadAssets(false).then(() => { - pokemon.playAnim(); - pokemon.updateInfo(); - })); - - await Promise.all(promises); - return true; } + + override applyPostSummon(pokemon: Pokemon, _passive: boolean, simulated: boolean, _args: any[]): void { + const target = this.getTarget(pokemon.getOpponents()); + + globalScene.unshiftPhase(new PokemonTransformPhase(pokemon.getBattlerIndex(), target.getBattlerIndex(), true)); + + } } /** @@ -2518,25 +2712,20 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr { * @extends PostSummonAbAttr */ export class PostSummonWeatherSuppressedFormChangeAbAttr extends PostSummonAbAttr { + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return getPokemonWithWeatherBasedForms().length > 0; + } + /** * Triggers {@linkcode Arena.triggerWeatherBasedFormChangesToNormal | triggerWeatherBasedFormChangesToNormal} * @param {Pokemon} pokemon the Pokemon with this ability * @param passive n/a * @param args n/a - * @returns whether a Pokemon was reverted to its normal form */ - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]) { - const pokemonToTransform = getPokemonWithWeatherBasedForms(); - - if (pokemonToTransform.length < 1) { - return false; - } - + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { if (!simulated) { globalScene.arena.triggerWeatherBasedFormChangesToNormal(); } - - return true; } } @@ -2554,6 +2743,12 @@ export class PostSummonFormChangeByWeatherAbAttr extends PostSummonAbAttr { this.ability = ability; } + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + const isCastformWithForecast = (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST); + const isCherrimWithFlowerGift = (pokemon.species.speciesId === Species.CHERRIM && this.ability === Abilities.FLOWER_GIFT); + return isCastformWithForecast || isCherrimWithFlowerGift; + } + /** * Calls the {@linkcode BattleScene.triggerPokemonFormChange | triggerPokemonFormChange} for both * {@linkcode SpeciesFormChange.SpeciesFormChangeWeatherTrigger | SpeciesFormChangeWeatherTrigger} and @@ -2562,23 +2757,13 @@ export class PostSummonFormChangeByWeatherAbAttr extends PostSummonAbAttr { * @param {Pokemon} pokemon the Pokemon with this ability * @param passive n/a * @param args n/a - * @returns whether the form change was triggered */ - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - const isCastformWithForecast = (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST); - const isCherrimWithFlowerGift = (pokemon.species.speciesId === Species.CHERRIM && this.ability === Abilities.FLOWER_GIFT); - - if (isCastformWithForecast || isCherrimWithFlowerGift) { - if (simulated) { - return simulated; - } - + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeWeatherTrigger); globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeRevertWeatherFormTrigger); - queueShowAbility(pokemon, passive); - return true; + globalScene.queueAbilityDisplay(pokemon, passive, true); } - return false; } } @@ -2593,53 +2778,55 @@ export class CommanderAbAttr extends AbAttr { super(true); } - override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: null, args: any[]): boolean { - // TODO: Should this work with X + Dondozo fusions? - if (globalScene.currentBattle?.double && pokemon.getAlly()?.species.speciesId === Species.DONDOZO) { - // If the ally Dondozo is fainted or was previously "commanded" by - // another Pokemon, this effect cannot apply. - if (pokemon.getAlly().isFainted() || pokemon.getAlly().getTag(BattlerTagType.COMMANDED)) { - return false; - } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + // If the ally Dondozo is fainted or was previously "commanded" by + // another Pokemon, this effect cannot apply. - if (!simulated) { - // Lapse the source's semi-invulnerable tags (to avoid visual inconsistencies) - pokemon.lapseTags(BattlerTagLapseType.MOVE_EFFECT); - // Play an animation of the source jumping into the ally Dondozo's mouth - globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.COMMANDER_APPLY); - // Apply boosts from this effect to the ally Dondozo - pokemon.getAlly().addTag(BattlerTagType.COMMANDED, 0, Moves.NONE, pokemon.id); - // Cancel the source Pokemon's next move (if a move is queued) - globalScene.tryRemovePhase((phase) => phase instanceof MovePhase && phase.pokemon === pokemon); - } - return true; + // TODO: Should this work with X + Dondozo fusions? + return globalScene.currentBattle?.double && pokemon.getAlly()?.species.speciesId === Species.DONDOZO + && !(pokemon.getAlly().isFainted() || pokemon.getAlly().getTag(BattlerTagType.COMMANDED)); + } + + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: null, args: any[]): void { + if (!simulated) { + // Lapse the source's semi-invulnerable tags (to avoid visual inconsistencies) + pokemon.lapseTags(BattlerTagLapseType.MOVE_EFFECT); + // Play an animation of the source jumping into the ally Dondozo's mouth + globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.COMMANDER_APPLY); + // Apply boosts from this effect to the ally Dondozo + pokemon.getAlly().addTag(BattlerTagType.COMMANDED, 0, Moves.NONE, pokemon.id); + // Cancel the source Pokemon's next move (if a move is queued) + globalScene.tryRemovePhase((phase) => phase instanceof MovePhase && phase.pokemon === pokemon); } - return false; } } export class PreSwitchOutAbAttr extends AbAttr { - constructor() { - super(true); + constructor(showAbility: boolean = true) { + super(showAbility); } - applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - return false; + canApplyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return true; } + + applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {} } export class PreSwitchOutResetStatusAbAttr extends PreSwitchOutAbAttr { - applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - if (pokemon.status) { - if (!simulated) { - pokemon.resetStatus(); - pokemon.updateInfo(); - } + constructor() { + super(false); + } - return true; + override canApplyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return !Utils.isNullOrUndefined(pokemon.status); + } + + override applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + pokemon.resetStatus(); + pokemon.updateInfo(); } - - return false; } } @@ -2647,34 +2834,48 @@ export class PreSwitchOutResetStatusAbAttr extends PreSwitchOutAbAttr { * Clears Desolate Land/Primordial Sea/Delta Stream upon the Pokemon switching out. */ export class PreSwitchOutClearWeatherAbAttr extends PreSwitchOutAbAttr { - /** * @param pokemon The {@linkcode Pokemon} with the ability * @param passive N/A * @param args N/A * @returns {boolean} Returns true if the weather clears, otherwise false. */ - applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { + override applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { const weatherType = globalScene.arena.weather?.weatherType; let turnOffWeather = false; // Clear weather only if user's ability matches the weather and no other pokemon has the ability. switch (weatherType) { - case (WeatherType.HARSH_SUN): - if (pokemon.hasAbility(Abilities.DESOLATE_LAND) - && globalScene.getField(true).filter(p => p !== pokemon).filter(p => p.hasAbility(Abilities.DESOLATE_LAND)).length === 0) { + case WeatherType.HARSH_SUN: + if ( + pokemon.hasAbility(Abilities.DESOLATE_LAND) && + globalScene + .getField(true) + .filter((p) => p !== pokemon) + .filter((p) => p.hasAbility(Abilities.DESOLATE_LAND)).length === 0 + ) { turnOffWeather = true; } break; - case (WeatherType.HEAVY_RAIN): - if (pokemon.hasAbility(Abilities.PRIMORDIAL_SEA) - && globalScene.getField(true).filter(p => p !== pokemon).filter(p => p.hasAbility(Abilities.PRIMORDIAL_SEA)).length === 0) { + case WeatherType.HEAVY_RAIN: + if ( + pokemon.hasAbility(Abilities.PRIMORDIAL_SEA) && + globalScene + .getField(true) + .filter((p) => p !== pokemon) + .filter((p) => p.hasAbility(Abilities.PRIMORDIAL_SEA)).length === 0 + ) { turnOffWeather = true; } break; - case (WeatherType.STRONG_WINDS): - if (pokemon.hasAbility(Abilities.DELTA_STREAM) - && globalScene.getField(true).filter(p => p !== pokemon).filter(p => p.hasAbility(Abilities.DELTA_STREAM)).length === 0) { + case WeatherType.STRONG_WINDS: + if ( + pokemon.hasAbility(Abilities.DELTA_STREAM) && + globalScene + .getField(true) + .filter((p) => p !== pokemon) + .filter((p) => p.hasAbility(Abilities.DELTA_STREAM)).length === 0 + ) { turnOffWeather = true; } break; @@ -2694,18 +2895,16 @@ export class PreSwitchOutClearWeatherAbAttr extends PreSwitchOutAbAttr { } export class PreSwitchOutHealAbAttr extends PreSwitchOutAbAttr { - applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - if (!pokemon.isFullHp()) { - if (!simulated) { - const healAmount = Utils.toDmgValue(pokemon.getMaxHp() * 0.33); - pokemon.heal(healAmount); - pokemon.updateInfo(); - } + override canApplyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return !pokemon.isFullHp(); + } - return true; + override applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + const healAmount = Utils.toDmgValue(pokemon.getMaxHp() * 0.33); + pokemon.heal(healAmount); + pokemon.updateInfo(); } - - return false; } } @@ -2715,39 +2914,156 @@ export class PreSwitchOutHealAbAttr extends PreSwitchOutAbAttr { * @see {@linkcode applyPreSwitchOut} */ export class PreSwitchOutFormChangeAbAttr extends PreSwitchOutAbAttr { - private formFunc: (p: Pokemon) => integer; + private formFunc: (p: Pokemon) => number; - constructor(formFunc: ((p: Pokemon) => integer)) { + constructor(formFunc: ((p: Pokemon) => number)) { super(); this.formFunc = formFunc; } + override canApplyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return this.formFunc(pokemon) !== pokemon.formIndex; + } + /** * On switch out, trigger the form change to the one defined in the ability * @param pokemon The pokemon switching out and changing form {@linkcode Pokemon} * @param passive N/A * @param args N/A - * @returns true if the form change was successful */ - applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - const formIndex = this.formFunc(pokemon); - if (formIndex !== pokemon.formIndex) { - if (!simulated) { - globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false); - } - return true; + override applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false); } - - return false; } } -export class PreStatStageChangeAbAttr extends AbAttr { - applyPreStatStageChange(pokemon: Pokemon | null, passive: boolean, simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise { +export class PreLeaveFieldAbAttr extends AbAttr { + canApplyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return true; + } + + applyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {} +} + +/** + * Clears Desolate Land/Primordial Sea/Delta Stream upon the Pokemon switching out. + */ +export class PreLeaveFieldClearWeatherAbAttr extends PreLeaveFieldAbAttr { + + override canApplyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + const weatherType = globalScene.arena.weather?.weatherType; + // Clear weather only if user's ability matches the weather and no other pokemon has the ability. + switch (weatherType) { + case (WeatherType.HARSH_SUN): + if (pokemon.hasAbility(Abilities.DESOLATE_LAND) + && globalScene.getField(true).filter(p => p !== pokemon).filter(p => p.hasAbility(Abilities.DESOLATE_LAND)).length === 0) { + return true; + } + break; + case (WeatherType.HEAVY_RAIN): + if (pokemon.hasAbility(Abilities.PRIMORDIAL_SEA) + && globalScene.getField(true).filter(p => p !== pokemon).filter(p => p.hasAbility(Abilities.PRIMORDIAL_SEA)).length === 0) { + return true; + } + break; + case (WeatherType.STRONG_WINDS): + if (pokemon.hasAbility(Abilities.DELTA_STREAM) + && globalScene.getField(true).filter(p => p !== pokemon).filter(p => p.hasAbility(Abilities.DELTA_STREAM)).length === 0) { + return true; + } + break; + } return false; } + + /** + * @param pokemon The {@linkcode Pokemon} with the ability + * @param passive N/A + * @param args N/A + */ + override applyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + globalScene.arena.trySetWeather(WeatherType.NONE, false); + } + } +} + +/** + * Updates the active {@linkcode SuppressAbilitiesTag} when a pokemon with {@linkcode Abilities.NEUTRALIZING_GAS} leaves the field + */ +export class PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr extends PreLeaveFieldAbAttr { + constructor() { + super(false); + } + + public override canApplyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return !!globalScene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS); + } + + public override applyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + const suppressTag = globalScene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS) as SuppressAbilitiesTag; + suppressTag.onSourceLeave(globalScene.arena); + } +} + +export class PreStatStageChangeAbAttr extends AbAttr { + canApplyPreStatStageChange( + pokemon: Pokemon | null, + passive: boolean, + simulated: boolean, + stat: BattleStat, + cancelled: Utils.BooleanHolder, + args: any[]): boolean { + return true; + } + + applyPreStatStageChange( + pokemon: Pokemon | null, + passive: boolean, + simulated: boolean, + stat: BattleStat, + cancelled: Utils.BooleanHolder, + args: any[], + ): void {} +} + +/** + * Reflect all {@linkcode BattleStat} reductions caused by other Pokémon's moves and Abilities. + * Currently only applies to Mirror Armor. + */ +export class ReflectStatStageChangeAbAttr extends PreStatStageChangeAbAttr { + /** {@linkcode BattleStat} to reflect */ + private reflectedStat? : BattleStat; + + /** + * Apply the {@linkcode ReflectStatStageChangeAbAttr} to an interaction + * @param _pokemon The user pokemon + * @param _passive N/A + * @param simulated `true` if the ability is being simulated by the AI + * @param stat the {@linkcode BattleStat} being affected + * @param cancelled The {@linkcode Utils.BooleanHolder} that will be set to true due to reflection + * @param args + */ + override applyPreStatStageChange(_pokemon: Pokemon, _passive: boolean, simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, args: any[]): void { + const attacker: Pokemon = args[0]; + const stages = args[1]; + this.reflectedStat = stat; + if (!simulated) { + globalScene.unshiftPhase(new StatStageChangePhase(attacker.getBattlerIndex(), false, [ stat ], stages, true, false, true, null, true)); + } + cancelled.value = true; + } + + getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string { + return i18next.t("abilityTriggers:protectStat", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + abilityName, + statName: this.reflectedStat ? i18next.t(getStatKey(this.reflectedStat)) : i18next.t("battle:stats") + }); + } } /** @@ -2763,6 +3079,10 @@ export class ProtectStatAbAttr extends PreStatStageChangeAbAttr { this.protectedStat = protectedStat; } + override canApplyPreStatStageChange(pokemon: Pokemon | null, passive: boolean, simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, args: any[]): boolean { + return Utils.isNullOrUndefined(this.protectedStat) || stat === this.protectedStat; + } + /** * Apply the {@linkcode ProtectedStatAbAttr} to an interaction * @param _pokemon @@ -2771,15 +3091,9 @@ export class ProtectStatAbAttr extends PreStatStageChangeAbAttr { * @param stat the {@linkcode BattleStat} being affected * @param cancelled The {@linkcode Utils.BooleanHolder} that will be set to true if the stat is protected * @param _args - * @returns true if the stat is protected, false otherwise */ - applyPreStatStageChange(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, _args: any[]): boolean { - if (Utils.isNullOrUndefined(this.protectedStat) || stat === this.protectedStat) { - cancelled.value = true; - return true; - } - - return false; + override applyPreStatStageChange(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, _args: any[]): void { + cancelled.value = true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string { @@ -2807,6 +3121,13 @@ export class ConfusionOnStatusEffectAbAttr extends PostAttackAbAttr { super((user, target, move) => true); this.effects = effects; } + + override canApplyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { + return super.canApplyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args) + && this.effects.indexOf(args[0]) > -1 && !defender.isFainted() && defender.canAddTag(BattlerTagType.CONFUSED); + } + + /** * Applies confusion to the target pokemon. * @param pokemon {@link Pokemon} attacking @@ -2815,24 +3136,33 @@ export class ConfusionOnStatusEffectAbAttr extends PostAttackAbAttr { * @param move {@link Move} used to apply status effect and confusion * @param hitResult N/A * @param args [0] {@linkcode StatusEffect} applied by move - * @returns true if defender is confused */ - applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { - if (this.effects.indexOf(args[0]) > -1 && !defender.isFainted()) { - if (simulated) { - return defender.canAddTag(BattlerTagType.CONFUSED); - } else { - return defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 5), move.id, defender.id); - } + override applyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult, args: any[]): void { + if (!simulated) { + defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 5), move.id, defender.id); } - return false; } } export class PreSetStatusAbAttr extends AbAttr { - applyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect | undefined, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise { - return false; + canApplyPreSetStatus( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + effect: StatusEffect | undefined, + cancelled: Utils.BooleanHolder, + args: any[]): boolean { + return true; } + + applyPreSetStatus( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + effect: StatusEffect | undefined, + cancelled: Utils.BooleanHolder, + args: any[], + ): void {} } /** @@ -2850,6 +3180,10 @@ export class PreSetStatusEffectImmunityAbAttr extends PreSetStatusAbAttr { this.immuneEffects = immuneEffects; } + override canApplyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect, cancelled: Utils.BooleanHolder, args: any[]): boolean { + return effect !== StatusEffect.FAINT && this.immuneEffects.length < 1 || this.immuneEffects.includes(effect); + } + /** * Applies immunity to supplied status effects. * @@ -2858,15 +3192,9 @@ export class PreSetStatusEffectImmunityAbAttr extends PreSetStatusAbAttr { * @param effect - The status effect being applied. * @param cancelled - A holder for a boolean value indicating if the status application was cancelled. * @param args - n/a - * @returns A boolean indicating the result of the status application. */ - applyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (this.immuneEffects.length < 1 || this.immuneEffects.includes(effect)) { - cancelled.value = true; - return true; - } - - return false; + override applyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -2896,9 +3224,25 @@ export class StatusEffectImmunityAbAttr extends PreSetStatusEffectImmunityAbAttr export class UserFieldStatusEffectImmunityAbAttr extends PreSetStatusEffectImmunityAbAttr { } export class PreApplyBattlerTagAbAttr extends AbAttr { - applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise { - return false; + canApplyPreApplyBattlerTag( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + tag: BattlerTag, + cancelled: Utils.BooleanHolder, + args: any[], + ): boolean { + return true; } + + applyPreApplyBattlerTag( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + tag: BattlerTag, + cancelled: Utils.BooleanHolder, + args: any[], + ): void {} } /** @@ -2909,21 +3253,19 @@ export class PreApplyBattlerTagImmunityAbAttr extends PreApplyBattlerTagAbAttr { private battlerTag: BattlerTag; constructor(immuneTagTypes: BattlerTagType | BattlerTagType[]) { - super(); + super(true); this.immuneTagTypes = Array.isArray(immuneTagTypes) ? immuneTagTypes : [ immuneTagTypes ]; } - applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (this.immuneTagTypes.includes(tag.tagType)) { - cancelled.value = true; - if (!simulated) { - this.battlerTag = tag; - } - return true; - } + override canApplyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean { + this.battlerTag = tag; - return false; + return this.immuneTagTypes.includes(tag.tagType); + } + + override applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -2948,16 +3290,21 @@ export class BattlerTagImmunityAbAttr extends PreApplyBattlerTagImmunityAbAttr { export class UserFieldBattlerTagImmunityAbAttr extends PreApplyBattlerTagImmunityAbAttr { } export class BlockCritAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + constructor() { + super(false); + } + + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { (args[0] as Utils.BooleanHolder).value = true; - return true; } } export class BonusCritAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + constructor() { + super(false); + } + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { (args[0] as Utils.BooleanHolder).value = true; - return true; } } @@ -2965,19 +3312,19 @@ export class MultCritAbAttr extends AbAttr { public multAmount: number; constructor(multAmount: number) { - super(true); + super(false); this.multAmount = multAmount; } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { const critMult = args[0] as Utils.NumberHolder; - if (critMult.value > 1) { - critMult.value *= this.multAmount; - return true; - } + return critMult.value > 1; + } - return false; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + const critMult = args[0] as Utils.NumberHolder; + critMult.value *= this.multAmount; } } @@ -2989,34 +3336,36 @@ export class MultCritAbAttr extends AbAttr { export class ConditionalCritAbAttr extends AbAttr { private condition: PokemonAttackCondition; - constructor(condition: PokemonAttackCondition, checkUser?: Boolean) { - super(); + constructor(condition: PokemonAttackCondition, checkUser?: boolean) { + super(false); this.condition = condition; } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + const target = (args[1] as Pokemon); + const move = (args[2] as Move); + return this.condition(pokemon, target, move); + } + /** * @param pokemon {@linkcode Pokemon} user. * @param args [0] {@linkcode Utils.BooleanHolder} If true critical hit is guaranteed. * [1] {@linkcode Pokemon} Target. * [2] {@linkcode Move} used by ability user. */ - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - const target = (args[1] as Pokemon); - const move = (args[2] as Move); - if (!this.condition(pokemon, target, move)) { - return false; - } - + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { (args[0] as Utils.BooleanHolder).value = true; - return true; } } export class BlockNonDirectDamageAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + constructor() { + super(false); + } + + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { cancelled.value = true; - return true; } } @@ -3035,26 +3384,27 @@ export class BlockStatusDamageAbAttr extends AbAttr { this.effects = effects; } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + if (pokemon.status && this.effects.includes(pokemon.status.effect)) { + return true; + } + return false; + } + /** * @param {Pokemon} pokemon The pokemon with the ability * @param {boolean} passive N/A * @param {Utils.BooleanHolder} cancelled Whether to cancel the status damage * @param {any[]} args N/A - * @returns Returns true if status damage is blocked */ - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (pokemon.status && this.effects.includes(pokemon.status.effect)) { - cancelled.value = true; - return true; - } - return false; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } } export class BlockOneHitKOAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { cancelled.value = true; - return true; } } @@ -3072,28 +3422,42 @@ export class ChangeMovePriorityAbAttr extends AbAttr { * @param {number} changeAmount the amount of priority added or subtracted */ constructor(moveFunc: (pokemon: Pokemon, move: Move) => boolean, changeAmount: number) { - super(true); + super(false); this.moveFunc = moveFunc; this.changeAmount = changeAmount; } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (!this.moveFunc(pokemon, args[0] as Move)) { - return false; - } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return this.moveFunc(pokemon, args[0] as Move); + } - (args[1] as Utils.IntegerHolder).value += this.changeAmount; - return true; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + (args[1] as Utils.NumberHolder).value += this.changeAmount; } } export class IgnoreContactAbAttr extends AbAttr { } export class PreWeatherEffectAbAttr extends AbAttr { - applyPreWeatherEffect(pokemon: Pokemon, passive: Boolean, simulated: boolean, weather: Weather | null, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise { - return false; + canApplyPreWeatherEffect( + pokemon: Pokemon, + passive: Boolean, + simulated: boolean, + weather: Weather | null, + cancelled: Utils.BooleanHolder, + args: any[]): boolean { + return true; } + + applyPreWeatherEffect( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + weather: Weather | null, + cancelled: Utils.BooleanHolder, + args: any[], + ): void {} } export class PreWeatherDamageAbAttr extends PreWeatherEffectAbAttr { } @@ -3102,17 +3466,17 @@ export class BlockWeatherDamageAttr extends PreWeatherDamageAbAttr { private weatherTypes: WeatherType[]; constructor(...weatherTypes: WeatherType[]) { - super(); + super(false); this.weatherTypes = weatherTypes; } - applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (!this.weatherTypes.length || this.weatherTypes.indexOf(weather?.weatherType) > -1) { - cancelled.value = true; - } + override canApplyPreWeatherEffect(pokemon: Pokemon, passive: Boolean, simulated: boolean, weather: Weather, cancelled: Utils.BooleanHolder, args: any[]): boolean { + return !this.weatherTypes.length || this.weatherTypes.indexOf(weather?.weatherType) > -1; + } - return true; + override applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } } @@ -3120,18 +3484,17 @@ export class SuppressWeatherEffectAbAttr extends PreWeatherEffectAbAttr { public affectsImmutable: boolean; constructor(affectsImmutable?: boolean) { - super(); + super(true); this.affectsImmutable = !!affectsImmutable; } - applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (this.affectsImmutable || weather.isImmutable()) { - cancelled.value = true; - return true; - } + override canApplyPreWeatherEffect(pokemon: Pokemon, passive: Boolean, simulated: boolean, weather: Weather, cancelled: Utils.BooleanHolder, args: any[]): boolean { + return this.affectsImmutable || weather.isImmutable(); + } - return false; + override applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } } @@ -3203,10 +3566,10 @@ function getAnticipationCondition(): AbAttrCondition { + (opponent.ivs[Stat.SPDEF] & 1) * 32) * 15 / 63); const type = [ - Type.FIGHTING, Type.FLYING, Type.POISON, Type.GROUND, - Type.ROCK, Type.BUG, Type.GHOST, Type.STEEL, - Type.FIRE, Type.WATER, Type.GRASS, Type.ELECTRIC, - Type.PSYCHIC, Type.ICE, Type.DRAGON, Type.DARK ][iv_val]; + PokemonType.FIGHTING, PokemonType.FLYING, PokemonType.POISON, PokemonType.GROUND, + PokemonType.ROCK, PokemonType.BUG, PokemonType.GHOST, PokemonType.STEEL, + PokemonType.FIRE, PokemonType.WATER, PokemonType.GRASS, PokemonType.ELECTRIC, + PokemonType.PSYCHIC, PokemonType.ICE, PokemonType.DRAGON, PokemonType.DARK ][iv_val]; if (pokemon.getAttackTypeEffectiveness(type, opponent) >= 2) { return true; @@ -3236,7 +3599,7 @@ export class ForewarnAbAttr extends PostSummonAbAttr { super(true); } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { let maxPowerSeen = 0; let maxMove = ""; let movePower = 0; @@ -3263,7 +3626,6 @@ export class ForewarnAbAttr extends PostSummonAbAttr { if (!simulated) { globalScene.queueMessage(i18next.t("abilityTriggers:forewarn", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: maxMove })); } - return true; } } @@ -3272,21 +3634,22 @@ export class FriskAbAttr extends PostSummonAbAttr { super(true); } - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { if (!simulated) { for (const opponent of pokemon.getOpponents()) { globalScene.queueMessage(i18next.t("abilityTriggers:frisk", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), opponentName: opponent.name, opponentAbilityName: opponent.getAbility().name })); setAbilityRevealed(opponent); } } - return true; } } export class PostWeatherChangeAbAttr extends AbAttr { - applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean { - return false; + canApplyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean { + return true; } + + applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): void {} } /** @@ -3305,6 +3668,13 @@ export class PostWeatherChangeFormChangeAbAttr extends PostWeatherChangeAbAttr { this.formRevertingWeathers = formRevertingWeathers; } + override canApplyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean { + const isCastformWithForecast = (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST); + const isCherrimWithFlowerGift = (pokemon.species.speciesId === Species.CHERRIM && this.ability === Abilities.FLOWER_GIFT); + + return isCastformWithForecast || isCherrimWithFlowerGift; + } + /** * Calls {@linkcode Arena.triggerWeatherBasedFormChangesToNormal | triggerWeatherBasedFormChangesToNormal} when the * weather changed to form-reverting weather, otherwise calls {@linkcode Arena.triggerWeatherBasedFormChanges | triggerWeatherBasedFormChanges} @@ -3312,36 +3682,28 @@ export class PostWeatherChangeFormChangeAbAttr extends PostWeatherChangeAbAttr { * @param passive n/a * @param weather n/a * @param args n/a - * @returns whether the form change was triggered */ - applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean { - const isCastformWithForecast = (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST); - const isCherrimWithFlowerGift = (pokemon.species.speciesId === Species.CHERRIM && this.ability === Abilities.FLOWER_GIFT); - - if (isCastformWithForecast || isCherrimWithFlowerGift) { - if (simulated) { - return simulated; - } - - const weatherType = globalScene.arena.weather?.weatherType; - - if (weatherType && this.formRevertingWeathers.includes(weatherType)) { - globalScene.arena.triggerWeatherBasedFormChangesToNormal(); - } else { - globalScene.arena.triggerWeatherBasedFormChanges(); - } - return true; + override applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): void { + if (simulated) { + return; + } + + const weatherType = globalScene.arena.weather?.weatherType; + + if (weatherType && this.formRevertingWeathers.includes(weatherType)) { + globalScene.arena.triggerWeatherBasedFormChangesToNormal(); + } else { + globalScene.arena.triggerWeatherBasedFormChanges(); } - return false; } } export class PostWeatherChangeAddBattlerTagAttr extends PostWeatherChangeAbAttr { private tagType: BattlerTagType; - private turnCount: integer; + private turnCount: number; private weatherTypes: WeatherType[]; - constructor(tagType: BattlerTagType, turnCount: integer, ...weatherTypes: WeatherType[]) { + constructor(tagType: BattlerTagType, turnCount: number, ...weatherTypes: WeatherType[]) { super(); this.tagType = tagType; @@ -3349,16 +3711,13 @@ export class PostWeatherChangeAddBattlerTagAttr extends PostWeatherChangeAbAttr this.weatherTypes = weatherTypes; } - applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean { - console.log(this.weatherTypes.find(w => weather === w), WeatherType[weather]); - if (!this.weatherTypes.find(w => weather === w)) { - return false; - } + override canApplyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean { + return !!this.weatherTypes.find(w => weather === w) && pokemon.canAddTag(this.tagType); + } - if (simulated) { - return pokemon.canAddTag(this.tagType); - } else { - return pokemon.addTag(this.tagType, this.turnCount); + override applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): void { + if (!simulated) { + pokemon.addTag(this.tagType, this.turnCount); } } } @@ -3372,74 +3731,86 @@ export class PostWeatherLapseAbAttr extends AbAttr { this.weatherTypes = weatherTypes; } - applyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather | null, args: any[]): boolean | Promise { - return false; + canApplyPostWeatherLapse( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + weather: Weather | null, + args: any[]): boolean { + return true; } + applyPostWeatherLapse( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + weather: Weather | null, + args: any[], + ): void {} + getCondition(): AbAttrCondition { return getWeatherCondition(...this.weatherTypes); } } export class PostWeatherLapseHealAbAttr extends PostWeatherLapseAbAttr { - private healFactor: integer; + private healFactor: number; - constructor(healFactor: integer, ...weatherTypes: WeatherType[]) { + constructor(healFactor: number, ...weatherTypes: WeatherType[]) { super(...weatherTypes); this.healFactor = healFactor; } - applyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, args: any[]): boolean { - if (!pokemon.isFullHp()) { - const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; - if (!simulated) { - globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), - Utils.toDmgValue(pokemon.getMaxHp() / (16 / this.healFactor)), i18next.t("abilityTriggers:postWeatherLapseHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true)); - } - return true; - } + override canApplyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather | null, args: any[]): boolean { + return !pokemon.isFullHp(); + } - return false; + override applyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, args: any[]): void { + const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; + if (!simulated) { + globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), + Utils.toDmgValue(pokemon.getMaxHp() / (16 / this.healFactor)), i18next.t("abilityTriggers:postWeatherLapseHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true)); + } } } export class PostWeatherLapseDamageAbAttr extends PostWeatherLapseAbAttr { - private damageFactor: integer; + private damageFactor: number; - constructor(damageFactor: integer, ...weatherTypes: WeatherType[]) { + constructor(damageFactor: number, ...weatherTypes: WeatherType[]) { super(...weatherTypes); this.damageFactor = damageFactor; } - applyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, args: any[]): boolean { - if (pokemon.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) { - return false; - } + override canApplyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather | null, args: any[]): boolean { + return !pokemon.hasAbilityWithAttr(BlockNonDirectDamageAbAttr); + } + override applyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, args: any[]): void { if (!simulated) { const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; globalScene.queueMessage(i18next.t("abilityTriggers:postWeatherLapseDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName })); pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / (16 / this.damageFactor)), HitResult.OTHER); } - - return true; } } export class PostTerrainChangeAbAttr extends AbAttr { - applyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): boolean { - return false; + canApplyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): boolean { + return true; } + + applyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): void {} } export class PostTerrainChangeAddBattlerTagAttr extends PostTerrainChangeAbAttr { private tagType: BattlerTagType; - private turnCount: integer; + private turnCount: number; private terrainTypes: TerrainType[]; - constructor(tagType: BattlerTagType, turnCount: integer, ...terrainTypes: TerrainType[]) { + constructor(tagType: BattlerTagType, turnCount: number, ...terrainTypes: TerrainType[]) { super(); this.tagType = tagType; @@ -3447,15 +3818,13 @@ export class PostTerrainChangeAddBattlerTagAttr extends PostTerrainChangeAbAttr this.terrainTypes = terrainTypes; } - applyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): boolean { - if (!this.terrainTypes.find(t => t === terrain)) { - return false; - } + override canApplyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): boolean { + return !!this.terrainTypes.find(t => t === terrain) && pokemon.canAddTag(this.tagType); + } - if (simulated) { - return pokemon.canAddTag(this.tagType); - } else { - return pokemon.addTag(this.tagType, this.turnCount); + override applyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): void { + if (!simulated) { + pokemon.addTag(this.tagType, this.turnCount); } } } @@ -3468,9 +3837,11 @@ function getTerrainCondition(...terrainTypes: TerrainType[]): AbAttrCondition { } export class PostTurnAbAttr extends AbAttr { - applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - return false; + canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return true; } + + applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {} } /** @@ -3488,24 +3859,21 @@ export class PostTurnStatusHealAbAttr extends PostTurnAbAttr { this.effects = effects; } + override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return (pokemon.status !== null) && this.effects.includes(pokemon.status.effect) && !pokemon.isFullHp(); + } + /** * @param {Pokemon} pokemon The pokemon with the ability that will receive the healing * @param {Boolean} passive N/A * @param {any[]} args N/A - * @returns Returns true if healed from status, false if not */ - applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - if (pokemon.status && this.effects.includes(pokemon.status.effect)) { - if (!pokemon.isFullHp()) { - if (!simulated) { - const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; - globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), - Utils.toDmgValue(pokemon.getMaxHp() / 8), i18next.t("abilityTriggers:poisonHeal", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName }), true)); - } - return true; - } + override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; + globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), + Utils.toDmgValue(pokemon.getMaxHp() / 8), i18next.t("abilityTriggers:poisonHeal", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName }), true)); } - return false; } } @@ -3517,28 +3885,26 @@ export class PostTurnResetStatusAbAttr extends PostTurnAbAttr { private allyTarget: boolean; private target: Pokemon; - constructor(allyTarget: boolean = false) { + constructor(allyTarget = false) { super(true); this.allyTarget = allyTarget; } - applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { if (this.allyTarget) { this.target = pokemon.getAlly(); } else { this.target = pokemon; } - if (this.target?.status) { - if (!simulated) { - globalScene.queueMessage(getStatusEffectHealText(this.target.status?.effect, getPokemonNameWithAffix(this.target))); - this.target.resetStatus(false); - this.target.updateInfo(); - } + return !Utils.isNullOrUndefined(this.target.status); + } - return true; + override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated && this.target.status) { + globalScene.queueMessage(getStatusEffectHealText(this.target.status?.effect, getPokemonNameWithAffix(this.target))); + this.target.resetStatus(false); + this.target.updateInfo(); } - - return false; } } @@ -3559,18 +3925,14 @@ export class PostTurnLootAbAttr extends PostTurnAbAttr { super(); } - applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - const pass = Phaser.Math.RND.realInRange(0, 1); + override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { // Clamp procChance to [0, 1]. Skip if didn't proc (less than pass) - if (Math.max(Math.min(this.procChance(pokemon), 1), 0) < pass) { - return false; - } + const pass = Phaser.Math.RND.realInRange(0, 1); + return !(Math.max(Math.min(this.procChance(pokemon), 1), 0) < pass) && this.itemType === "EATEN_BERRIES" && !!pokemon.battleData.berriesEaten; + } - if (this.itemType === "EATEN_BERRIES") { - return this.createEatenBerry(pokemon, simulated); - } else { - return false; - } + override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + this.createEatenBerry(pokemon, simulated); } /** @@ -3631,13 +3993,12 @@ export class MoodyAbAttr extends PostTurnAbAttr { * @param passive N/A * @param simulated true if applying in a simulated call. * @param args N/A - * @returns true * * Any stat stages at +6 or -6 are excluded from being increased or decreased, respectively * If the pokemon already has all stat stages raised to 6, it will only decrease one stat stage by 1 * If the pokemon already has all stat stages lowered to -6, it will only increase one stat stage by 2 */ - applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { const canRaise = EFFECTIVE_STATS.filter(s => pokemon.getStatStage(s) < 6); let canLower = EFFECTIVE_STATS.filter(s => pokemon.getStatStage(s) > -6); @@ -3652,8 +4013,6 @@ export class MoodyAbAttr extends PostTurnAbAttr { globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ loweredStat ], -1)); } } - - return true; } } @@ -3663,54 +4022,46 @@ export class SpeedBoostAbAttr extends PostTurnAbAttr { super(true); } - applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - if (!simulated) { - if (!pokemon.turnData.switchedInThisTurn && !pokemon.turnData.failedRunAway) { - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.SPD ], 1)); - } else { - return false; - } - } - return true; + override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return simulated || (!pokemon.turnData.switchedInThisTurn && !pokemon.turnData.failedRunAway); + } + + override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.SPD ], 1)); } } export class PostTurnHealAbAttr extends PostTurnAbAttr { - applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - if (!pokemon.isFullHp()) { - if (!simulated) { - const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; - globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), - Utils.toDmgValue(pokemon.getMaxHp() / 16), i18next.t("abilityTriggers:postTurnHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true)); - } + override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return !pokemon.isFullHp(); + } - return true; + override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; + globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), + Utils.toDmgValue(pokemon.getMaxHp() / 16), i18next.t("abilityTriggers:postTurnHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true)); } - - return false; } } export class PostTurnFormChangeAbAttr extends PostTurnAbAttr { - private formFunc: (p: Pokemon) => integer; + private formFunc: (p: Pokemon) => number; - constructor(formFunc: ((p: Pokemon) => integer)) { + constructor(formFunc: ((p: Pokemon) => number)) { super(true); this.formFunc = formFunc; } - applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - const formIndex = this.formFunc(pokemon); - if (formIndex !== pokemon.formIndex) { - if (!simulated) { - globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false); - } + override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return this.formFunc(pokemon) !== pokemon.formIndex; + } - return true; + override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + if (!simulated) { + globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false); } - - return false; } } @@ -3719,28 +4070,25 @@ export class PostTurnFormChangeAbAttr extends PostTurnAbAttr { * Attribute used for abilities (Bad Dreams) that damages the opponents for being asleep */ export class PostTurnHurtIfSleepingAbAttr extends PostTurnAbAttr { - + override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return pokemon.getOpponents().some(opp => (opp.status?.effect === StatusEffect.SLEEP || opp.hasAbility(Abilities.COMATOSE)) && !opp.hasAbilityWithAttr(BlockNonDirectDamageAbAttr) && !opp.switchOutStatus); + } /** * Deals damage to all sleeping opponents equal to 1/8 of their max hp (min 1) * @param pokemon Pokemon that has this ability * @param passive N/A * @param simulated `true` if applying in a simulated call. * @param args N/A - * @returns `true` if any opponents are sleeping */ - applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - let hadEffect: boolean = false; + override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { for (const opp of pokemon.getOpponents()) { if ((opp.status?.effect === StatusEffect.SLEEP || opp.hasAbility(Abilities.COMATOSE)) && !opp.hasAbilityWithAttr(BlockNonDirectDamageAbAttr) && !opp.switchOutStatus) { if (!simulated) { opp.damageAndUpdate(Utils.toDmgValue(opp.getMaxHp() / 8), HitResult.OTHER); globalScene.queueMessage(i18next.t("abilityTriggers:badDreams", { pokemonName: getPokemonNameWithAffix(opp) })); } - hadEffect = true; } - } - return hadEffect; } } @@ -3753,25 +4101,22 @@ export class FetchBallAbAttr extends PostTurnAbAttr { constructor() { super(); } + + override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return !simulated && globalScene.currentBattle.lastUsedPokeball !== null && !!pokemon.isPlayer; + } + /** * Adds the last used Pokeball back into the player's inventory * @param pokemon {@linkcode Pokemon} with this ability * @param passive N/A * @param args N/A - * @returns true if player has used a pokeball and this pokemon is owned by the player */ - applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - if (simulated) { - return false; - } + override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { const lastUsed = globalScene.currentBattle.lastUsedPokeball; - if (lastUsed !== null && !!pokemon.isPlayer) { - globalScene.pokeballCounts[lastUsed]++; - globalScene.currentBattle.lastUsedPokeball = null; - globalScene.queueMessage(i18next.t("abilityTriggers:fetchBall", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), pokeballName: getPokeballName(lastUsed) })); - return true; - } - return false; + globalScene.pokeballCounts[lastUsed!]++; + globalScene.currentBattle.lastUsedPokeball = null; + globalScene.queueMessage(i18next.t("abilityTriggers:fetchBall", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), pokeballName: getPokeballName(lastUsed!) })); } } @@ -3786,16 +4131,14 @@ export class PostBiomeChangeWeatherChangeAbAttr extends PostBiomeChangeAbAttr { this.weatherType = weatherType; } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (!globalScene.arena.weather?.isImmutable()) { - if (simulated) { - return globalScene.arena.weather?.weatherType !== this.weatherType; - } else { - return globalScene.arena.trySetWeather(this.weatherType, true); - } - } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return ((globalScene.arena.weather?.isImmutable() ?? false) && globalScene.arena.canSetWeather(this.weatherType)); + } - return false; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + if (!simulated) { + globalScene.arena.trySetWeather(this.weatherType, true); + } } } @@ -3808,11 +4151,13 @@ export class PostBiomeChangeTerrainChangeAbAttr extends PostBiomeChangeAbAttr { this.terrainType = terrainType; } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (simulated) { - return globalScene.arena.terrain?.terrainType !== this.terrainType; - } else { - return globalScene.arena.trySetTerrain(this.terrainType, true); + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return globalScene.arena.canSetTerrain(this.terrainType); + } + + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + if (!simulated) { + globalScene.arena.trySetTerrain(this.terrainType, true); } } } @@ -3822,9 +4167,24 @@ export class PostBiomeChangeTerrainChangeAbAttr extends PostBiomeChangeAbAttr { * @extends AbAttr */ export class PostMoveUsedAbAttr extends AbAttr { - applyPostMoveUsed(pokemon: Pokemon, move: PokemonMove, source: Pokemon, targets: BattlerIndex[], simulated: boolean, args: any[]): boolean | Promise { - return false; + canApplyPostMoveUsed( + pokemon: Pokemon, + move: PokemonMove, + source: Pokemon, + targets: BattlerIndex[], + simulated: boolean, + args: any[]): boolean { + return true; } + + applyPostMoveUsed( + pokemon: Pokemon, + move: PokemonMove, + source: Pokemon, + targets: BattlerIndex[], + simulated: boolean, + args: any[], + ): void {} } /** @@ -3832,6 +4192,15 @@ export class PostMoveUsedAbAttr extends AbAttr { * @extends PostMoveUsedAbAttr */ export class PostDancingMoveAbAttr extends PostMoveUsedAbAttr { + override canApplyPostMoveUsed(dancer: Pokemon, move: PokemonMove, source: Pokemon, targets: BattlerIndex[], simulated: boolean, args: any[]): boolean { + // List of tags that prevent the Dancer from replicating the move + const forbiddenTags = [ BattlerTagType.FLYING, BattlerTagType.UNDERWATER, + BattlerTagType.UNDERGROUND, BattlerTagType.HIDDEN ]; + // The move to replicate cannot come from the Dancer + return source.getBattlerIndex() !== dancer.getBattlerIndex() + && !dancer.summonData.tags.some(tag => forbiddenTags.includes(tag.tagType)); + } + /** * Resolves the Dancer ability by replicating the move used by the source of the dance * either on the source itself or on the target of the dance @@ -3840,29 +4209,24 @@ export class PostDancingMoveAbAttr extends PostMoveUsedAbAttr { * @param source {@linkcode Pokemon} that used the dancing move * @param targets {@linkcode BattlerIndex}Targets of the dancing move * @param args N/A - * - * @return true if the Dancer ability was resolved */ - applyPostMoveUsed(dancer: Pokemon, move: PokemonMove, source: Pokemon, targets: BattlerIndex[], simulated: boolean, args: any[]): boolean | Promise { - // List of tags that prevent the Dancer from replicating the move - const forbiddenTags = [ BattlerTagType.FLYING, BattlerTagType.UNDERWATER, - BattlerTagType.UNDERGROUND, BattlerTagType.HIDDEN ]; - // The move to replicate cannot come from the Dancer - if (source.getBattlerIndex() !== dancer.getBattlerIndex() - && !dancer.summonData.tags.some(tag => forbiddenTags.includes(tag.tagType))) { - if (!simulated) { - // If the move is an AttackMove or a StatusMove the Dancer must replicate the move on the source of the Dance - if (move.getMove() instanceof AttackMove || move.getMove() instanceof StatusMove) { - const target = this.getTarget(dancer, source, targets); - globalScene.unshiftPhase(new MovePhase(dancer, target, move, true, true)); - } else if (move.getMove() instanceof SelfStatusMove) { - // If the move is a SelfStatusMove (ie. Swords Dance) the Dancer should replicate it on itself - globalScene.unshiftPhase(new MovePhase(dancer, [ dancer.getBattlerIndex() ], move, true, true)); - } + override applyPostMoveUsed( + dancer: Pokemon, + move: PokemonMove, + source: Pokemon, + targets: BattlerIndex[], + simulated: boolean, + args: any[]): void { + if (!simulated) { + // If the move is an AttackMove or a StatusMove the Dancer must replicate the move on the source of the Dance + if (move.getMove() instanceof AttackMove || move.getMove() instanceof StatusMove) { + const target = this.getTarget(dancer, source, targets); + globalScene.unshiftPhase(new MovePhase(dancer, target, move, true, true)); + } else if (move.getMove() instanceof SelfStatusMove) { + // If the move is a SelfStatusMove (ie. Swords Dance) the Dancer should replicate it on itself + globalScene.unshiftPhase(new MovePhase(dancer, [ dancer.getBattlerIndex() ], move, true, true)); } - return true; } - return false; } /** @@ -3885,9 +4249,11 @@ export class PostDancingMoveAbAttr extends PostMoveUsedAbAttr { * @extends AbAttr */ export class PostItemLostAbAttr extends AbAttr { - applyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): boolean | Promise { - return false; + canApplyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): boolean { + return true; } + + applyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): void {} } /** @@ -3897,46 +4263,49 @@ export class PostItemLostAbAttr extends AbAttr { export class PostItemLostApplyBattlerTagAbAttr extends PostItemLostAbAttr { private tagType: BattlerTagType; constructor(tagType: BattlerTagType) { - super(true); + super(false); this.tagType = tagType; } + + override canApplyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): boolean { + return !pokemon.getTag(this.tagType) && !simulated; + } + /** * Adds the last used Pokeball back into the player's inventory * @param pokemon {@linkcode Pokemon} with this ability * @param args N/A - * @returns true if BattlerTag was applied */ - applyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): boolean | Promise { - if (!pokemon.getTag(this.tagType) && !simulated) { - pokemon.addTag(this.tagType); - return true; - } - return false; + override applyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): void { + pokemon.addTag(this.tagType); } } export class StatStageChangeMultiplierAbAttr extends AbAttr { - private multiplier: integer; + private multiplier: number; - constructor(multiplier: integer) { - super(true); + constructor(multiplier: number) { + super(false); this.multiplier = multiplier; } - override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - (args[0] as Utils.IntegerHolder).value *= this.multiplier; - - return true; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + (args[0] as Utils.NumberHolder).value *= this.multiplier; } } export class StatStageChangeCopyAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise { + override apply( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + cancelled: Utils.BooleanHolder, + args: any[], + ): void { if (!simulated) { globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, (args[0] as BattleStat[]), (args[1] as number), true, false, false)); } - return true; } } @@ -3945,10 +4314,8 @@ export class BypassBurnDamageReductionAbAttr extends AbAttr { super(false); } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { cancelled.value = true; - - return true; } } @@ -3967,28 +4334,21 @@ export class ReduceBurnDamageAbAttr extends AbAttr { * @param passive N/A * @param cancelled N/A * @param args `[0]` {@linkcode Utils.NumberHolder} The damage value being modified - * @returns `true` */ - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { (args[0] as Utils.NumberHolder).value = Utils.toDmgValue((args[0] as Utils.NumberHolder).value * this.multiplier); - - return true; } } export class DoubleBerryEffectAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { (args[0] as Utils.NumberHolder).value *= 2; - - return true; } } export class PreventBerryUseAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { cancelled.value = true; - - return true; } } @@ -4008,7 +4368,7 @@ export class HealFromBerryUseAbAttr extends AbAttr { this.healPercent = Math.max(Math.min(healPercent, 1), 0); } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, ...args: [Utils.BooleanHolder, any[]]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, ...args: [Utils.BooleanHolder, any[]]): void { const { name: abilityName } = passive ? pokemon.getPassiveAbility() : pokemon.getAbility(); if (!simulated) { globalScene.unshiftPhase( @@ -4020,15 +4380,12 @@ export class HealFromBerryUseAbAttr extends AbAttr { ) ); } - return true; } } export class RunSuccessAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - (args[0] as Utils.IntegerHolder).value = 256; - - return true; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + (args[0] as Utils.NumberHolder).value = 256; } } @@ -4048,9 +4405,24 @@ export class CheckTrappedAbAttr extends AbAttr { this.arenaTrapCondition = condition; } - applyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, args: any[]): boolean | Promise { - return false; + canApplyCheckTrapped( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + trapped: Utils.BooleanHolder, + otherPokemon: Pokemon, + args: any[]): boolean { + return true; } + + applyCheckTrapped( + pokemon: Pokemon, + passive: boolean, + simulated: boolean, + trapped: Utils.BooleanHolder, + otherPokemon: Pokemon, + args: any[], + ): void {} } /** @@ -4060,6 +4432,12 @@ export class CheckTrappedAbAttr extends AbAttr { * @see {@linkcode applyCheckTrapped} */ export class ArenaTrapAbAttr extends CheckTrappedAbAttr { + override canApplyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, args: any[]): boolean { + return this.arenaTrapCondition(pokemon, otherPokemon) + && !(otherPokemon.getTypes(true).includes(PokemonType.GHOST) || (otherPokemon.getTypes(true).includes(PokemonType.STELLAR) && otherPokemon.getTypes().includes(PokemonType.GHOST))) + && !otherPokemon.hasAbility(Abilities.RUN_AWAY); + } + /** * Checks if enemy Pokemon is trapped by an Arena Trap-esque ability * If the enemy is a Ghost type, it is not trapped @@ -4071,22 +4449,9 @@ export class ArenaTrapAbAttr extends CheckTrappedAbAttr { * @param trapped {@link Utils.BooleanHolder} indicating whether the other Pokemon is trapped or not * @param otherPokemon The {@link Pokemon} that is affected by an Arena Trap ability * @param args N/A - * @returns if enemy Pokemon is trapped or not */ - applyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, args: any[]): boolean { - if (this.arenaTrapCondition(pokemon, otherPokemon)) { - if (otherPokemon.getTypes(true).includes(Type.GHOST) || (otherPokemon.getTypes(true).includes(Type.STELLAR) && otherPokemon.getTypes().includes(Type.GHOST))) { - trapped.value = false; - return false; - } else if (otherPokemon.hasAbility(Abilities.RUN_AWAY)) { - trapped.value = false; - return false; - } - trapped.value = true; - return true; - } - trapped.value = false; - return false; + override applyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, args: any[]): void { + trapped.value = true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -4095,10 +4460,12 @@ export class ArenaTrapAbAttr extends CheckTrappedAbAttr { } export class MaxMultiHitAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - (args[0] as Utils.IntegerHolder).value = 0; + constructor() { + super(false); + } - return true; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + (args[0] as Utils.NumberHolder).value = 0; } } @@ -4107,36 +4474,48 @@ export class PostBattleAbAttr extends AbAttr { super(true); } - applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - return false; + canApplyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return true; } + + applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {} } export class PostBattleLootAbAttr extends PostBattleAbAttr { - /** - * @param args - `[0]`: boolean for if the battle ended in a victory - * @returns `true` if successful - */ - applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + private randItem?: PokemonHeldItemModifier; + + override canApplyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { const postBattleLoot = globalScene.currentBattle.postBattleLoot; if (!simulated && postBattleLoot.length && args[0]) { - const randItem = Utils.randSeedItem(postBattleLoot); - //@ts-ignore - TODO see below - if (globalScene.tryTransferHeldItemModifier(randItem, pokemon, true, 1, true, undefined, false)) { // TODO: fix. This is a promise!? - postBattleLoot.splice(postBattleLoot.indexOf(randItem), 1); - globalScene.queueMessage(i18next.t("abilityTriggers:postBattleLoot", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), itemName: randItem.type.name })); - return true; - } + this.randItem = Utils.randSeedItem(postBattleLoot); + return globalScene.canTransferHeldItemModifier(this.randItem, pokemon, 1); + } + return false; + } + + /** + * @param args - `[0]`: boolean for if the battle ended in a victory + */ + override applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + const postBattleLoot = globalScene.currentBattle.postBattleLoot; + if (!this.randItem) { + this.randItem = Utils.randSeedItem(postBattleLoot); } - return false; + if (globalScene.tryTransferHeldItemModifier(this.randItem, pokemon, true, 1, true, undefined, false)) { + postBattleLoot.splice(postBattleLoot.indexOf(this.randItem), 1); + globalScene.queueMessage(i18next.t("abilityTriggers:postBattleLoot", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), itemName: this.randItem.type.name })); + } + this.randItem = undefined; } } export class PostFaintAbAttr extends AbAttr { - applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { - return false; + canApplyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { + return true; } + + applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): void {} } /** @@ -4145,6 +4524,10 @@ export class PostFaintAbAttr extends AbAttr { * @extends PostFaintAbAttr */ export class PostFaintUnsuppressedWeatherFormChangeAbAttr extends PostFaintAbAttr { + override canApplyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { + return getPokemonWithWeatherBasedForms().length > 0; + } + /** * Triggers {@linkcode Arena.triggerWeatherBasedFormChanges | triggerWeatherBasedFormChanges} * when the user of the ability faints @@ -4154,100 +4537,39 @@ export class PostFaintUnsuppressedWeatherFormChangeAbAttr extends PostFaintAbAtt * @param move n/a * @param hitResult n/a * @param args n/a - * @returns whether the form change was triggered */ - applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { - const pokemonToTransform = getPokemonWithWeatherBasedForms(); - - if (pokemonToTransform.length < 1) { - return false; - } - + override applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): void { if (!simulated) { globalScene.arena.triggerWeatherBasedFormChanges(); } - - return true; - } -} - -/** - * Clears Desolate Land/Primordial Sea/Delta Stream upon the Pokemon fainting - */ -export class PostFaintClearWeatherAbAttr extends PostFaintAbAttr { - - /** - * @param pokemon The {@linkcode Pokemon} with the ability - * @param passive N/A - * @param attacker N/A - * @param move N/A - * @param hitResult N/A - * @param args N/A - * @returns {boolean} Returns true if the weather clears, otherwise false. - */ - applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { - const weatherType = globalScene.arena.weather?.weatherType; - let turnOffWeather = false; - - // Clear weather only if user's ability matches the weather and no other pokemon has the ability. - switch (weatherType) { - case (WeatherType.HARSH_SUN): - if (pokemon.hasAbility(Abilities.DESOLATE_LAND) - && globalScene.getField(true).filter(p => p.hasAbility(Abilities.DESOLATE_LAND)).length === 0) { - turnOffWeather = true; - } - break; - case (WeatherType.HEAVY_RAIN): - if (pokemon.hasAbility(Abilities.PRIMORDIAL_SEA) - && globalScene.getField(true).filter(p => p.hasAbility(Abilities.PRIMORDIAL_SEA)).length === 0) { - turnOffWeather = true; - } - break; - case (WeatherType.STRONG_WINDS): - if (pokemon.hasAbility(Abilities.DELTA_STREAM) - && globalScene.getField(true).filter(p => p.hasAbility(Abilities.DELTA_STREAM)).length === 0) { - turnOffWeather = true; - } - break; - } - - if (simulated) { - return turnOffWeather; - } - - if (turnOffWeather) { - globalScene.arena.trySetWeather(WeatherType.NONE, false); - return true; - } - - return false; } } export class PostFaintContactDamageAbAttr extends PostFaintAbAttr { - private damageRatio: integer; + private damageRatio: number; - constructor(damageRatio: integer) { - super(); + constructor(damageRatio: number) { + super(true); this.damageRatio = damageRatio; } - applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { - if (move !== undefined && attacker !== undefined && move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) { //If the mon didn't die to indirect damage - const cancelled = new Utils.BooleanHolder(false); - globalScene.getField(true).map(p => applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled, simulated)); - if (cancelled.value || attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) { - return false; - } - if (!simulated) { - attacker.damageAndUpdate(Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER); - attacker.turnData.damageTaken += Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)); - } - return true; + override canApplyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { + const diedToDirectDamage = move !== undefined && attacker !== undefined && move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon); + const cancelled = new Utils.BooleanHolder(false); + globalScene.getField(true).map(p => applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled, simulated)); + if (!diedToDirectDamage || cancelled.value || attacker!.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) { + return false; } - return false; + return true; + } + + override applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): void { + if (!simulated) { + attacker!.damageAndUpdate(Utils.toDmgValue(attacker!.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER); + attacker!.turnData.damageTaken += Utils.toDmgValue(attacker!.getMaxHp() * (1 / this.damageRatio)); + } } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -4263,13 +4585,12 @@ export class PostFaintHPDamageAbAttr extends PostFaintAbAttr { super (); } - applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { + override applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): void { if (move !== undefined && attacker !== undefined && !simulated) { //If the mon didn't die to indirect damage const damage = pokemon.turnData.attacksReceived[0].damage; attacker.damageAndUpdate((damage), HitResult.OTHER); attacker.turnData.damageTaken += damage; } - return true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -4277,36 +4598,49 @@ export class PostFaintHPDamageAbAttr extends PostFaintAbAttr { } } +/** + * Redirects a move to the pokemon with this ability if it meets the conditions + */ export class RedirectMoveAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (this.canRedirect(args[0] as Moves)) { - const target = args[1] as Utils.IntegerHolder; - const newTarget = pokemon.getBattlerIndex(); - if (target.value !== newTarget) { - target.value = newTarget; - return true; - } - } + /** + * @param pokemon - The Pokemon with the redirection ability + * @param args - The args passed to the `AbAttr`: + * - `[0]` - The id of the {@linkcode Move} used + * - `[1]` - The target's battler index (before redirection) + * - `[2]` - The Pokemon that used the move being redirected + */ - return false; + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + if (!this.canRedirect(args[0] as Moves, args[2] as Pokemon)) { + return false; + } + const target = args[1] as Utils.NumberHolder; + const newTarget = pokemon.getBattlerIndex(); + return target.value !== newTarget; } - canRedirect(moveId: Moves): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + const target = args[1] as Utils.NumberHolder; + const newTarget = pokemon.getBattlerIndex(); + target.value = newTarget; + } + + canRedirect(moveId: Moves, user: Pokemon): boolean { const move = allMoves[moveId]; return !![ MoveTarget.NEAR_OTHER, MoveTarget.OTHER ].find(t => move.moveTarget === t); } } export class RedirectTypeMoveAbAttr extends RedirectMoveAbAttr { - public type: Type; + public type: PokemonType; - constructor(type: Type) { + constructor(type: PokemonType) { super(); this.type = type; } - canRedirect(moveId: Moves): boolean { - return super.canRedirect(moveId) && allMoves[moveId].type === this.type; + canRedirect(moveId: Moves, user: Pokemon): boolean { + return super.canRedirect(moveId, user) && user.getMoveType(allMoves[moveId]) === this.type; } } @@ -4321,28 +4655,23 @@ export class ReduceStatusEffectDurationAbAttr extends AbAttr { private statusEffect: StatusEffect; constructor(statusEffect: StatusEffect) { - super(true); + super(false); this.statusEffect = statusEffect; } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return args[1] instanceof Utils.NumberHolder && args[0] === this.statusEffect; + } + /** * Reduces the number of sleep turns remaining by an extra 1 when applied * @param args - The args passed to the `AbAttr`: * - `[0]` - The {@linkcode StatusEffect} of the Pokemon * - `[1]` - The number of turns remaining until the status is healed - * @returns `true` if the ability was applied */ - apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (!(args[1] instanceof Utils.NumberHolder)) { - return false; - } - if (args[0] === this.statusEffect) { - args[1].value -= 1; - return true; - } - - return false; + override apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]): void { + args[1].value -= 1; } } @@ -4365,20 +4694,18 @@ export class FlinchStatStageChangeAbAttr extends FlinchEffectAbAttr { this.stages = stages; } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { if (!simulated) { globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages)); } - return true; } } export class IncreasePpAbAttr extends AbAttr { } export class ForceSwitchOutImmunityAbAttr extends AbAttr { - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { cancelled.value = true; - return true; } } @@ -4387,15 +4714,13 @@ export class ReduceBerryUseThresholdAbAttr extends AbAttr { super(); } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { const hpRatio = pokemon.getHpRatio(); + return args[0].value < hpRatio; + } - if (args[0].value < hpRatio) { - args[0].value *= 2; - return args[0].value >= hpRatio; - } - - return false; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + args[0].value *= 2; } } @@ -4404,18 +4729,16 @@ export class ReduceBerryUseThresholdAbAttr extends AbAttr { * Used for Heavy Metal (doubling weight) and Light Metal (halving weight) */ export class WeightMultiplierAbAttr extends AbAttr { - private multiplier: integer; + private multiplier: number; - constructor(multiplier: integer) { - super(); + constructor(multiplier: number) { + super(false); this.multiplier = multiplier; } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { (args[0] as Utils.NumberHolder).value *= this.multiplier; - - return true; } } @@ -4424,10 +4747,8 @@ export class SyncEncounterNatureAbAttr extends AbAttr { super(false); } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { (args[0] as Pokemon).setNature(pokemon.getNature()); - - return true; } } @@ -4440,27 +4761,12 @@ export class MoveAbilityBypassAbAttr extends AbAttr { this.moveIgnoreFunc = moveIgnoreFunc || ((pokemon, move) => true); } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (this.moveIgnoreFunc(pokemon, (args[0] as Move))) { - cancelled.value = true; - return true; - } - return false; - } -} - -export class SuppressFieldAbilitiesAbAttr extends AbAttr { - constructor() { - super(false); + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return this.moveIgnoreFunc(pokemon, (args[0] as Move)); } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - const ability = (args[0] as Ability); - if (!ability.hasAttr(UnsuppressableAbilityAbAttr) && !ability.hasAttr(SuppressFieldAbilitiesAbAttr)) { - cancelled.value = true; - return true; - } - return false; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } } @@ -4474,6 +4780,14 @@ export class IgnoreProtectOnContactAbAttr extends AbAttr { } * Allows the source's moves to bypass the effects of opposing Light Screen, Reflect, Aurora Veil, Safeguard, Mist, and Substitute. */ export class InfiltratorAbAttr extends AbAttr { + constructor() { + super(false); + } + + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return args[0] instanceof Utils.BooleanHolder; + } + /** * Sets a flag to bypass screens, Substitute, Safeguard, and Mist * @param pokemon n/a @@ -4481,18 +4795,20 @@ export class InfiltratorAbAttr extends AbAttr { * @param simulated n/a * @param cancelled n/a * @param args `[0]` a {@linkcode Utils.BooleanHolder | BooleanHolder} containing the flag - * @returns `true` if the bypass flag was successfully set; `false` otherwise. */ - override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: null, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: null, args: any[]): void { const bypassed = args[0]; - if (args[0] instanceof Utils.BooleanHolder) { - bypassed.value = true; - return true; - } - return false; + bypassed.value = true; } } +/** + * Attribute implementing the effects of {@link https://bulbapedia.bulbagarden.net/wiki/Magic_Bounce_(ability) | Magic Bounce}. + * Allows the source to bounce back {@linkcode MoveFlags.REFLECTABLE | Reflectable} + * moves as if the user had used {@linkcode Moves.MAGIC_COAT | Magic Coat}. + */ +export class ReflectStatusMoveAbAttr extends AbAttr { } + export class UncopiableAbilityAbAttr extends AbAttr { constructor() { super(false); @@ -4524,21 +4840,21 @@ export class NoFusionAbilityAbAttr extends AbAttr { } export class IgnoreTypeImmunityAbAttr extends AbAttr { - private defenderType: Type; - private allowedMoveTypes: Type[]; + private defenderType: PokemonType; + private allowedMoveTypes: PokemonType[]; - constructor(defenderType: Type, allowedMoveTypes: Type[]) { - super(true); + constructor(defenderType: PokemonType, allowedMoveTypes: PokemonType[]) { + super(false); this.defenderType = defenderType; this.allowedMoveTypes = allowedMoveTypes; } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (this.defenderType === (args[1] as Type) && this.allowedMoveTypes.includes(args[0] as Type)) { - cancelled.value = true; - return true; - } - return false; + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return this.defenderType === (args[1] as PokemonType) && this.allowedMoveTypes.includes(args[0] as PokemonType); + } + + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } } @@ -4547,22 +4863,21 @@ export class IgnoreTypeImmunityAbAttr extends AbAttr { */ export class IgnoreTypeStatusEffectImmunityAbAttr extends AbAttr { private statusEffect: StatusEffect[]; - private defenderType: Type[]; + private defenderType: PokemonType[]; - constructor(statusEffect: StatusEffect[], defenderType: Type[]) { - super(true); + constructor(statusEffect: StatusEffect[], defenderType: PokemonType[]) { + super(false); this.statusEffect = statusEffect; this.defenderType = defenderType; } - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (this.statusEffect.includes(args[0] as StatusEffect) && this.defenderType.includes(args[1] as Type)) { - cancelled.value = true; - return true; - } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return this.statusEffect.includes(args[0] as StatusEffect) && this.defenderType.includes(args[1] as PokemonType); + } - return false; + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { + cancelled.value = true; } } @@ -4577,18 +4892,17 @@ export class MoneyAbAttr extends PostBattleAbAttr { super(); } + override canApplyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return !simulated && args[0]; + } + /** * @param pokemon {@linkcode Pokemon} that is the user of this ability. * @param passive N/A * @param args - `[0]`: boolean for if the battle ended in a victory - * @returns `true` if successful */ - applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - if (!simulated && args[0]) { - globalScene.currentBattle.moneyScattered += globalScene.getWaveMoneyAmount(0.2); - return true; - } - return false; + override applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + globalScene.currentBattle.moneyScattered += globalScene.getWaveMoneyAmount(0.2); } } @@ -4616,6 +4930,12 @@ export class PostSummonStatStageChangeOnArenaAbAttr extends PostSummonStatStageC this.tagType = tagType; } + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + const side = pokemon.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; + return (globalScene.arena.getTagOnSide(this.tagType, side) ?? false) + && super.canApplyPostSummon(pokemon, passive, simulated, args); + } + /** * Applies the post-summon stat change if the specified arena tag is present on pokemon's side. * This is used in Wind Rider ability. @@ -4623,15 +4943,9 @@ export class PostSummonStatStageChangeOnArenaAbAttr extends PostSummonStatStageC * @param {Pokemon} pokemon - The Pokémon being summoned. * @param {boolean} passive - Whether the effect is passive. * @param {any[]} args - Additional arguments. - * @returns {boolean} - Returns true if the stat change was applied, otherwise false. */ - applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { - const side = pokemon.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; - - if (globalScene.arena.getTagOnSide(this.tagType, side)) { - return super.applyPostSummon(pokemon, passive, simulated, args); - } - return false; + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + super.applyPostSummon(pokemon, passive, simulated, args); } } @@ -4655,6 +4969,10 @@ export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr { this.triggerMessageFunc = triggerMessageFunc; } + override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { + return this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon); + } + /** * Applies the pre-defense ability to the Pokémon. * Removes the appropriate `BattlerTagType` when hit by an attack and is in its defense form. @@ -4665,21 +4983,15 @@ export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr { * @param move The move being used. * @param _cancelled n/a * @param args Additional arguments. - * @returns `true` if the immunity was applied. */ - override applyPreDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon)) { - if (!simulated) { - (args[0] as Utils.NumberHolder).value = this.multiplier; - pokemon.removeTag(this.tagType); - if (this.recoilDamageFunc) { - pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER, false, false, true, true); - } + override applyPreDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _cancelled: Utils.BooleanHolder, args: any[]): void { + if (!simulated) { + (args[0] as Utils.NumberHolder).value = this.multiplier; + pokemon.removeTag(this.tagType); + if (this.recoilDamageFunc) { + pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER, false, false, true, true); } - return true; } - - return false; } /** @@ -4700,44 +5012,35 @@ export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr { * @extends AbAttr */ export class BypassSpeedChanceAbAttr extends AbAttr { - public chance: integer; + public chance: number; /** - * @param {integer} chance probability of ability being active. + * @param {number} chance probability of ability being active. */ - constructor(chance: integer) { + constructor(chance: number) { super(true); this.chance = chance; } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + const bypassSpeed = args[0] as Utils.BooleanHolder; + const turnCommand = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()]; + const isCommandFight = turnCommand?.command === Command.FIGHT; + const move = turnCommand?.move?.move ? allMoves[turnCommand.move.move] : null; + const isDamageMove = move?.category === MoveCategory.PHYSICAL || move?.category === MoveCategory.SPECIAL; + return !simulated && !bypassSpeed.value && pokemon.randSeedInt(100) < this.chance && isCommandFight && isDamageMove; + } + /** * bypass move order in their priority bracket when pokemon choose damaging move * @param {Pokemon} pokemon {@linkcode Pokemon} the Pokemon applying this ability * @param {boolean} passive N/A * @param {Utils.BooleanHolder} cancelled N/A * @param {any[]} args [0] {@linkcode Utils.BooleanHolder} set to true when the ability activated - * @returns {boolean} - whether the ability was activated. */ - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (simulated) { - return false; - } + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { const bypassSpeed = args[0] as Utils.BooleanHolder; - - if (!bypassSpeed.value && pokemon.randSeedInt(100) < this.chance) { - const turnCommand = - globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()]; - const isCommandFight = turnCommand?.command === Command.FIGHT; - const move = turnCommand?.move?.move ? allMoves[turnCommand.move.move] : null; - const isDamageMove = move?.category === MoveCategory.PHYSICAL || move?.category === MoveCategory.SPECIAL; - - if (isCommandFight && isDamageMove) { - bypassSpeed.value = true; - return true; - } - } - - return false; + bypassSpeed.value = true; } getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { @@ -4760,23 +5063,22 @@ export class PreventBypassSpeedChanceAbAttr extends AbAttr { this.condition = condition; } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + const turnCommand = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()]; + const isCommandFight = turnCommand?.command === Command.FIGHT; + const move = turnCommand?.move?.move ? allMoves[turnCommand.move.move] : null; + return isCommandFight && this.condition(pokemon, move!); + } + /** * @argument {boolean} bypassSpeed - determines if a Pokemon is able to bypass speed at the moment * @argument {boolean} canCheckHeldItems - determines if a Pokemon has access to Quick Claw's effects or not */ - apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { + override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void { const bypassSpeed = args[0] as Utils.BooleanHolder; const canCheckHeldItems = args[1] as Utils.BooleanHolder; - - const turnCommand = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()]; - const isCommandFight = turnCommand?.command === Command.FIGHT; - const move = turnCommand?.move?.move ? allMoves[turnCommand.move.move] : null; - if (this.condition(pokemon, move!) && isCommandFight) { - bypassSpeed.value = false; - canCheckHeldItems.value = false; - return false; - } - return true; + bypassSpeed.value = false; + canCheckHeldItems.value = false; } } @@ -4789,12 +5091,13 @@ export class TerrainEventTypeChangeAbAttr extends PostSummonAbAttr { super(true); } - override apply(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, _args: any[]): boolean { - if (pokemon.isTerastallized()) { - return false; - } + override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return !pokemon.isTerastallized; + } + + override apply(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, _args: any[]): void { const currentTerrain = globalScene.arena.getTerrainType(); - const typeChange: Type[] = this.determineTypeChange(pokemon, currentTerrain); + const typeChange: PokemonType[] = this.determineTypeChange(pokemon, currentTerrain); if (typeChange.length !== 0) { if (pokemon.summonData.addedType && typeChange.includes(pokemon.summonData.addedType)) { pokemon.summonData.addedType = null; @@ -4802,7 +5105,6 @@ export class TerrainEventTypeChangeAbAttr extends PostSummonAbAttr { pokemon.summonData.types = typeChange; pokemon.updateInfo(); } - return true; } /** @@ -4811,20 +5113,20 @@ export class TerrainEventTypeChangeAbAttr extends PostSummonAbAttr { * @param currentTerrain {@linkcode TerrainType} * @returns a list of type(s) */ - private determineTypeChange(pokemon: Pokemon, currentTerrain: TerrainType): Type[] { - const typeChange: Type[] = []; + private determineTypeChange(pokemon: Pokemon, currentTerrain: TerrainType): PokemonType[] { + const typeChange: PokemonType[] = []; switch (currentTerrain) { case TerrainType.ELECTRIC: - typeChange.push(Type.ELECTRIC); + typeChange.push(PokemonType.ELECTRIC); break; case TerrainType.MISTY: - typeChange.push(Type.FAIRY); + typeChange.push(PokemonType.FAIRY); break; case TerrainType.GRASSY: - typeChange.push(Type.GRASS); + typeChange.push(PokemonType.GRASS); break; case TerrainType.PSYCHIC: - typeChange.push(Type.PSYCHIC); + typeChange.push(PokemonType.PSYCHIC); break; default: pokemon.getTypes(false, false, true).forEach(t => { @@ -4835,15 +5137,16 @@ export class TerrainEventTypeChangeAbAttr extends PostSummonAbAttr { return typeChange; } + override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { + return globalScene.arena.getTerrainType() !== TerrainType.NONE && + this.canApply(pokemon, passive, simulated, args); + } + /** * Checks if the Pokemon should change types if summoned into an active terrain - * @returns `true` if there is an active terrain requiring a type change | `false` if not */ - override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise { - if (globalScene.arena.getTerrainType() !== TerrainType.NONE) { - return this.apply(pokemon, passive, simulated, new Utils.BooleanHolder(false), []); - } - return false; + override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void { + this.apply(pokemon, passive, simulated, new Utils.BooleanHolder(false), []); } override getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]) { @@ -4852,63 +5155,66 @@ export class TerrainEventTypeChangeAbAttr extends PostSummonAbAttr { if (currentTerrain === TerrainType.NONE) { return i18next.t("abilityTriggers:pokemonTypeChangeRevert", { pokemonNameWithAffix }); } else { - const moveType = i18next.t(`pokemonInfo:Type.${Type[this.determineTypeChange(pokemon, currentTerrain)[0]]}`); + const moveType = i18next.t(`pokemonInfo:Type.${PokemonType[this.determineTypeChange(pokemon, currentTerrain)[0]]}`); return i18next.t("abilityTriggers:pokemonTypeChange", { pokemonNameWithAffix, moveType }); } } } -async function applyAbAttrsInternal( +function applySingleAbAttrs( + pokemon: Pokemon, + passive: boolean, attrType: Constructor, - pokemon: Pokemon | null, applyFunc: AbAttrApplyFunc, + successFunc: AbAttrSuccessFunc, args: any[], - showAbilityInstant: boolean = false, + gainedMidTurn: boolean = false, simulated: boolean = false, - messages: string[] = [], + messages: string[] = [] ) { - for (const passive of [ false, true ]) { - if (!pokemon?.canApplyAbility(passive) || (passive && pokemon.getPassiveAbility().id === pokemon.getAbility().id)) { + if (!pokemon?.canApplyAbility(passive) || (passive && (pokemon.getPassiveAbility().id === pokemon.getAbility().id))) { + return; + } + + const ability = passive ? pokemon.getPassiveAbility() : pokemon.getAbility(); + if (gainedMidTurn && ability.getAttrs(attrType).some(attr => attr instanceof PostSummonAbAttr && !attr.shouldActivateOnGain())) { + return; + } + + for (const attr of ability.getAttrs(attrType)) { + const condition = attr.getCondition(); + let abShown = false; + if (condition && !condition(pokemon) || !successFunc(attr, passive)) { continue; } - const ability = passive ? pokemon.getPassiveAbility() : pokemon.getAbility(); - for (const attr of ability.getAttrs(attrType)) { - const condition = attr.getCondition(); - if (condition && !condition(pokemon)) { - continue; - } + globalScene.setPhaseQueueSplice(); - globalScene.setPhaseQueueSplice(); - - let result = applyFunc(attr, passive); - // TODO Remove this when promises get reworked - if (result instanceof Promise) { - result = await result; - } - if (result) { - if (pokemon.summonData && !pokemon.summonData.abilitiesApplied.includes(ability.id)) { - pokemon.summonData.abilitiesApplied.push(ability.id); - } - if (pokemon.battleData && !simulated && !pokemon.battleData.abilitiesApplied.includes(ability.id)) { - pokemon.battleData.abilitiesApplied.push(ability.id); - } - if (attr.showAbility && !simulated) { - if (showAbilityInstant) { - globalScene.abilityBar.showAbility(pokemon, passive); - } else { - queueShowAbility(pokemon, passive); - } - } - const message = attr.getTriggerMessage(pokemon, ability.name, args); - if (message) { - if (!simulated) { - globalScene.queueMessage(message); - } - } - messages.push(message!); - } + if (attr.showAbility && !simulated) { + globalScene.queueAbilityDisplay(pokemon, passive, true); + abShown = true; } + const message = attr.getTriggerMessage(pokemon, ability.name, args); + if (message) { + if (!simulated) { + globalScene.queueMessage(message); + } + messages.push(message); + } + + applyFunc(attr, passive); + + if (abShown) { + globalScene.queueAbilityDisplay(pokemon, passive, false); + } + + if (pokemon.summonData && !pokemon.summonData.abilitiesApplied.includes(ability.id)) { + pokemon.summonData.abilitiesApplied.push(ability.id); + } + if (pokemon.battleData && !simulated && !pokemon.battleData.abilitiesApplied.includes(ability.id)) { + pokemon.battleData.abilitiesApplied.push(ability.id); + } + globalScene.clearPhaseQueueSplice(); } } @@ -5053,9 +5359,24 @@ function calculateShellBellRecovery(pokemon: Pokemon): number { * @extends AbAttr */ export class PostDamageAbAttr extends AbAttr { - public applyPostDamage(pokemon: Pokemon, damage: number, passive: boolean, simulated: boolean, args: any[], source?: Pokemon): boolean | Promise { - return false; + public canApplyPostDamage( + pokemon: Pokemon, + damage: number, + passive: boolean, + simulated: boolean, + args: any[], + source?: Pokemon): boolean { + return true; } + + public applyPostDamage( + pokemon: Pokemon, + damage: number, + passive: boolean, + simulated: boolean, + args: any[], + source?: Pokemon, + ): void {} } /** @@ -5072,25 +5393,18 @@ export class PostDamageForceSwitchAbAttr extends PostDamageAbAttr { private helper: ForceSwitchOutHelper = new ForceSwitchOutHelper(SwitchType.SWITCH); private hpRatio: number; - constructor(hpRatio: number = 0.5) { + constructor(hpRatio = 0.5) { super(); this.hpRatio = hpRatio; } - /** - * Applies the switch-out logic after the Pokémon takes damage. - * Checks various conditions based on the moves used by the Pokémon, the opponents' moves, and - * the Pokémon's health after damage to determine whether the switch-out should occur. - * - * @param pokemon The Pokémon that took damage. - * @param damage The amount of damage taken by the Pokémon. - * @param passive N/A - * @param simulated Whether the ability is being simulated. - * @param args N/A - * @param source The Pokemon that dealt damage - * @returns `true` if the switch-out logic was successfully applied - */ - public override applyPostDamage(pokemon: Pokemon, damage: number, passive: boolean, simulated: boolean, args: any[], source?: Pokemon): boolean | Promise { + public override canApplyPostDamage( + pokemon: Pokemon, + damage: number, + passive: boolean, + simulated: boolean, + args: any[], + source?: Pokemon): boolean { const moveHistory = pokemon.getMoveHistory(); // Will not activate when the Pokémon's HP is lowered by cutting its own HP const fordbiddenAttackingMoves = [ Moves.BELLY_DRUM, Moves.SUBSTITUTE, Moves.CURSE, Moves.PAIN_SPLIT ]; @@ -5124,7 +5438,6 @@ export class PostDamageForceSwitchAbAttr extends PostDamageAbAttr { } if (pokemon.hp + damage >= pokemon.getMaxHp() * this.hpRatio) { - // Activates if it falls below half and recovers back above half from a Shell Bell const shellBellHeal = calculateShellBellRecovery(pokemon); if (pokemon.hp - shellBellHeal < pokemon.getMaxHp() * this.hpRatio) { for (const opponent of pokemon.getOpponents()) { @@ -5132,56 +5445,185 @@ export class PostDamageForceSwitchAbAttr extends PostDamageAbAttr { return false; } } - return this.helper.switchOutLogic(pokemon); - } else { - return false; + return true; } - } else { - return false; + } + + return false; + } + + /** + * Applies the switch-out logic after the Pokémon takes damage. + * Checks various conditions based on the moves used by the Pokémon, the opponents' moves, and + * the Pokémon's health after damage to determine whether the switch-out should occur. + * + * @param pokemon The Pokémon that took damage. + * @param damage N/A + * @param passive N/A + * @param simulated Whether the ability is being simulated. + * @param args N/A + * @param source N/A + */ + public override applyPostDamage(pokemon: Pokemon, damage: number, passive: boolean, simulated: boolean, args: any[], source?: Pokemon): void { + this.helper.switchOutLogic(pokemon); + } +} +function applyAbAttrsInternal( + attrType: Constructor, + pokemon: Pokemon | null, + applyFunc: AbAttrApplyFunc, + successFunc: AbAttrSuccessFunc, + args: any[], + simulated: boolean = false, + messages: string[] = [], + gainedMidTurn = false +) { + for (const passive of [ false, true ]) { + if (pokemon) { + applySingleAbAttrs(pokemon, passive, attrType, applyFunc, successFunc, args, gainedMidTurn, simulated, messages); + globalScene.clearPhaseQueueSplice(); } } - public getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null { - return this.helper.getFailedText(target); - } } - -export function applyAbAttrs(attrType: Constructor, pokemon: Pokemon, cancelled: Utils.BooleanHolder | null, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.apply(pokemon, passive, simulated, cancelled, args), args, false, simulated); +export function applyAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + cancelled: Utils.BooleanHolder | null, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.apply(pokemon, passive, simulated, cancelled, args), + (attr, passive) => attr.canApply(pokemon, passive, simulated, args), + args, + simulated, + ); } -export function applyPostBattleInitAbAttrs(attrType: Constructor, - pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostBattleInit(pokemon, passive, simulated, args), args, false, simulated); +export function applyPostBattleInitAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostBattleInit(pokemon, passive, simulated, args), + (attr, passive) => attr.canApplyPostBattleInit(pokemon, passive, simulated, args), + args, + simulated, + ); } -export function applyPreDefendAbAttrs(attrType: Constructor, - pokemon: Pokemon, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args), args, false, simulated); +export function applyPreDefendAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + attacker: Pokemon, + move: Move | null, + cancelled: Utils.BooleanHolder | null, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args), + (attr, passive) => attr.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args), + args, + simulated, + ); } -export function applyPostDefendAbAttrs(attrType: Constructor, - pokemon: Pokemon, attacker: Pokemon, move: Move, hitResult: HitResult | null, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args), args, false, simulated); +export function applyPostDefendAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + attacker: Pokemon, + move: Move, + hitResult: HitResult | null, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args), + (attr, passive) => attr.canApplyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args), args, + simulated, + ); } -export function applyPostMoveUsedAbAttrs(attrType: Constructor, - pokemon: Pokemon, move: PokemonMove, source: Pokemon, targets: BattlerIndex[], simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostMoveUsed(pokemon, move, source, targets, simulated, args), args, false, simulated); +export function applyPostMoveUsedAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + move: PokemonMove, + source: Pokemon, + targets: BattlerIndex[], + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostMoveUsed(pokemon, move, source, targets, simulated, args), + (attr, passive) => attr.canApplyPostMoveUsed(pokemon, move, source, targets, simulated, args), + args, + simulated, + ); } -export function applyStatMultiplierAbAttrs(attrType: Constructor, - pokemon: Pokemon, stat: BattleStat, statValue: Utils.NumberHolder, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyStatStage(pokemon, passive, simulated, stat, statValue, args), args); +export function applyStatMultiplierAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + stat: BattleStat, + statValue: Utils.NumberHolder, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyStatStage(pokemon, passive, simulated, stat, statValue, args), + (attr, passive) => attr.canApplyStatStage(pokemon, passive, simulated, stat, statValue, args), + args, + ); } -export function applyPostSetStatusAbAttrs(attrType: Constructor, - pokemon: Pokemon, effect: StatusEffect, sourcePokemon?: Pokemon | null, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostSetStatus(pokemon, sourcePokemon, passive, effect, simulated, args), args, false, simulated); +export function applyPostSetStatusAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + effect: StatusEffect, + sourcePokemon?: Pokemon | null, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostSetStatus(pokemon, sourcePokemon, passive, effect, simulated, args), + (attr, passive) => attr.canApplyPostSetStatus(pokemon, sourcePokemon, passive, effect, simulated, args), args, + simulated, + ); } -export function applyPostDamageAbAttrs(attrType: Constructor, - pokemon: Pokemon, damage: number, passive: boolean, simulated: boolean = false, args: any[], source?: Pokemon): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostDamage(pokemon, damage, passive, simulated, args, source), args); +export function applyPostDamageAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + damage: number, + passive: boolean, + simulated = false, + args: any[], + source?: Pokemon, +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostDamage(pokemon, damage, passive, simulated, args, source), + (attr, passive) => attr.canApplyPostDamage(pokemon, damage, passive, simulated, args, source), + args, + ); } /** @@ -5194,109 +5636,400 @@ export function applyPostDamageAbAttrs(attrType: Constructor, * @param hasApplied {@linkcode Utils.BooleanHolder} whether or not a FieldMultiplyBattleStatAbAttr has already affected this stat * @param args unused */ -export function applyFieldStatMultiplierAbAttrs(attrType: Constructor, - pokemon: Pokemon, stat: Stat, statValue: Utils.NumberHolder, checkedPokemon: Pokemon, hasApplied: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyFieldStat(pokemon, passive, simulated, stat, statValue, checkedPokemon, hasApplied, args), args); +export function applyFieldStatMultiplierAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + stat: Stat, + statValue: Utils.NumberHolder, + checkedPokemon: Pokemon, + hasApplied: Utils.BooleanHolder, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyFieldStat(pokemon, passive, simulated, stat, statValue, checkedPokemon, hasApplied, args), + (attr, passive) => attr.canApplyFieldStat(pokemon, passive, simulated, stat, statValue, checkedPokemon, hasApplied, args), args, + ); } -export function applyPreAttackAbAttrs(attrType: Constructor, - pokemon: Pokemon, defender: Pokemon | null, move: Move, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreAttack(pokemon, passive, simulated, defender, move, args), args, false, simulated); +export function applyPreAttackAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + defender: Pokemon | null, + move: Move, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPreAttack(pokemon, passive, simulated, defender, move, args), + (attr, passive) => attr.canApplyPreAttack(pokemon, passive, simulated, defender, move, args), + args, + simulated, + ); } -export function applyPostAttackAbAttrs(attrType: Constructor, - pokemon: Pokemon, defender: Pokemon, move: Move, hitResult: HitResult | null, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args), args, false, simulated); +export function applyPostAttackAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + defender: Pokemon, + move: Move, + hitResult: HitResult | null, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args), + (attr, passive) => attr.canApplyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args), args, + simulated, + ); } -export function applyPostKnockOutAbAttrs(attrType: Constructor, - pokemon: Pokemon, knockedOut: Pokemon, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostKnockOut(pokemon, passive, simulated, knockedOut, args), args, false, simulated); +export function applyPostKnockOutAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + knockedOut: Pokemon, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostKnockOut(pokemon, passive, simulated, knockedOut, args), + (attr, passive) => attr.canApplyPostKnockOut(pokemon, passive, simulated, knockedOut, args), + args, + simulated, + ); } -export function applyPostVictoryAbAttrs(attrType: Constructor, - pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostVictory(pokemon, passive, simulated, args), args, false, simulated); +export function applyPostVictoryAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostVictory(pokemon, passive, simulated, args), + (attr, passive) => attr.canApplyPostVictory(pokemon, passive, simulated, args), + args, + simulated, + ); } -export function applyPostSummonAbAttrs(attrType: Constructor, - pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostSummon(pokemon, passive, simulated, args), args, false, simulated); +export function applyPostSummonAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostSummon(pokemon, passive, simulated, args), + (attr, passive) => attr.canApplyPostSummon(pokemon, passive, simulated, args), + args, + simulated, + ); } -export function applyPreSwitchOutAbAttrs(attrType: Constructor, - pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreSwitchOut(pokemon, passive, simulated, args), args, true, simulated); +export function applyPreSwitchOutAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPreSwitchOut(pokemon, passive, simulated, args), + (attr, passive) => attr.canApplyPreSwitchOut(pokemon, passive, simulated, args), + args, + simulated, + ); } -export function applyPreStatStageChangeAbAttrs(attrType: Constructor, - pokemon: Pokemon | null, stat: BattleStat, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreStatStageChange(pokemon, passive, simulated, stat, cancelled, args), args, false, simulated); +export function applyPreLeaveFieldAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + simulated = false, + ...args: any[] +): void { + return applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => + attr.applyPreLeaveField(pokemon, passive, simulated, args), + (attr, passive) => attr.canApplyPreLeaveField(pokemon, passive, simulated, args), + args, + simulated + ); } -export function applyPostStatStageChangeAbAttrs(attrType: Constructor, - pokemon: Pokemon, stats: BattleStat[], stages: integer, selfTarget: boolean, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, _passive) => attr.applyPostStatStageChange(pokemon, simulated, stats, stages, selfTarget, args), args, false, simulated); +export function applyPreStatStageChangeAbAttrs( + attrType: Constructor, + pokemon: Pokemon | null, + stat: BattleStat, + cancelled: Utils.BooleanHolder, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPreStatStageChange(pokemon, passive, simulated, stat, cancelled, args), + (attr, passive) => attr.canApplyPreStatStageChange(pokemon, passive, simulated, stat, cancelled, args), args, + simulated, + ); } -export function applyPreSetStatusAbAttrs(attrType: Constructor, - pokemon: Pokemon, effect: StatusEffect | undefined, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreSetStatus(pokemon, passive, simulated, effect, cancelled, args), args, false, simulated); +export function applyPostStatStageChangeAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + stats: BattleStat[], + stages: integer, + selfTarget: boolean, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, _passive) => attr.applyPostStatStageChange(pokemon, simulated, stats, stages, selfTarget, args), + (attr, _passive) => attr.canApplyPostStatStageChange(pokemon, simulated, stats, stages, selfTarget, args), args, + simulated, + ); } -export function applyPreApplyBattlerTagAbAttrs(attrType: Constructor, - pokemon: Pokemon, tag: BattlerTag, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreApplyBattlerTag(pokemon, passive, simulated, tag, cancelled, args), args, false, simulated); +export function applyPreSetStatusAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + effect: StatusEffect | undefined, + cancelled: Utils.BooleanHolder, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPreSetStatus(pokemon, passive, simulated, effect, cancelled, args), + (attr, passive) => attr.canApplyPreSetStatus(pokemon, passive, simulated, effect, cancelled, args), + args, + simulated, + ); } -export function applyPreWeatherEffectAbAttrs(attrType: Constructor, - pokemon: Pokemon, weather: Weather | null, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreWeatherEffect(pokemon, passive, simulated, weather, cancelled, args), args, true, simulated); +export function applyPreApplyBattlerTagAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + tag: BattlerTag, + cancelled: Utils.BooleanHolder, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPreApplyBattlerTag(pokemon, passive, simulated, tag, cancelled, args), + (attr, passive) => attr.canApplyPreApplyBattlerTag(pokemon, passive, simulated, tag, cancelled, args), args, + simulated, + ); } -export function applyPostTurnAbAttrs(attrType: Constructor, - pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostTurn(pokemon, passive, simulated, args), args, false, simulated); +export function applyPreWeatherEffectAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + weather: Weather | null, + cancelled: Utils.BooleanHolder, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPreWeatherEffect(pokemon, passive, simulated, weather, cancelled, args), + (attr, passive) => attr.canApplyPreWeatherEffect(pokemon, passive, simulated, weather, cancelled, args), args, + simulated, + ); } -export function applyPostWeatherChangeAbAttrs(attrType: Constructor, - pokemon: Pokemon, weather: WeatherType, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostWeatherChange(pokemon, passive, simulated, weather, args), args, false, simulated); +export function applyPostTurnAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostTurn(pokemon, passive, simulated, args), + (attr, passive) => attr.canApplyPostTurn(pokemon, passive, simulated, args), + args, + simulated, + ); } -export function applyPostWeatherLapseAbAttrs(attrType: Constructor, - pokemon: Pokemon, weather: Weather | null, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostWeatherLapse(pokemon, passive, simulated, weather, args), args, false, simulated); +export function applyPostWeatherChangeAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + weather: WeatherType, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostWeatherChange(pokemon, passive, simulated, weather, args), + (attr, passive) => attr.canApplyPostWeatherChange(pokemon, passive, simulated, weather, args), + args, + simulated, + ); } -export function applyPostTerrainChangeAbAttrs(attrType: Constructor, - pokemon: Pokemon, terrain: TerrainType, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostTerrainChange(pokemon, passive, simulated, terrain, args), args, false, simulated); +export function applyPostWeatherLapseAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + weather: Weather | null, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostWeatherLapse(pokemon, passive, simulated, weather, args), + (attr, passive) => attr.canApplyPostWeatherLapse(pokemon, passive, simulated, weather, args), + args, + simulated, + ); } -export function applyCheckTrappedAbAttrs(attrType: Constructor, - pokemon: Pokemon, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, messages: string[], simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyCheckTrapped(pokemon, passive, simulated, trapped, otherPokemon, args), args, false, simulated, messages); +export function applyPostTerrainChangeAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + terrain: TerrainType, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostTerrainChange(pokemon, passive, simulated, terrain, args), + (attr, passive) => attr.canApplyPostTerrainChange(pokemon, passive, simulated, terrain, args), + args, + simulated, + ); } -export function applyPostBattleAbAttrs(attrType: Constructor, - pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostBattle(pokemon, passive, simulated, args), args, false, simulated); +export function applyCheckTrappedAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + trapped: Utils.BooleanHolder, + otherPokemon: Pokemon, + messages: string[], + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyCheckTrapped(pokemon, passive, simulated, trapped, otherPokemon, args), + (attr, passive) => attr.canApplyCheckTrapped(pokemon, passive, simulated, trapped, otherPokemon, args), args, + simulated, + messages, + ); } -export function applyPostFaintAbAttrs(attrType: Constructor, - pokemon: Pokemon, attacker?: Pokemon, move?: Move, hitResult?: HitResult, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostFaint(pokemon, passive, simulated, attacker, move, hitResult, args), args, false, simulated); +export function applyPostBattleAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostBattle(pokemon, passive, simulated, args), + (attr, passive) => attr.canApplyPostBattle(pokemon, passive, simulated, args), + args, + simulated, + ); } -export function applyPostItemLostAbAttrs(attrType: Constructor, - pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise { - return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostItemLost(pokemon, simulated, args), args); +export function applyPostFaintAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + attacker?: Pokemon, + move?: Move, + hitResult?: HitResult, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostFaint(pokemon, passive, simulated, attacker, move, hitResult, args), + (attr, passive) => attr.canApplyPostFaint(pokemon, passive, simulated, attacker, move, hitResult, args), + args, + simulated, + ); } -function queueShowAbility(pokemon: Pokemon, passive: boolean): void { - globalScene.unshiftPhase(new ShowAbilityPhase(pokemon.id, passive)); - globalScene.clearPhaseQueueSplice(); +export function applyPostItemLostAbAttrs( + attrType: Constructor, + pokemon: Pokemon, + simulated = false, + ...args: any[] +): void { + applyAbAttrsInternal( + attrType, + pokemon, + (attr, passive) => attr.applyPostItemLost(pokemon, simulated, args), + (attr, passive) => attr.canApplyPostItemLost(pokemon, simulated, args), + args, + ); +} + +/** + * Applies abilities when they become active mid-turn (ability switch) + * + * Ignores passives as they don't change and shouldn't be reapplied when main abilities change + */ +export function applyOnGainAbAttrs( + pokemon: Pokemon, + passive: boolean = false, + simulated: boolean = false, + ...args: any[]): void { + applySingleAbAttrs( + pokemon, + passive, + PostSummonAbAttr, + (attr, passive) => attr.applyPostSummon(pokemon, passive, simulated, args), + (attr, passive) => attr.canApplyPostSummon(pokemon, passive, simulated, args), + args, + true, + simulated, + ); +} + +/** + * Clears primal weather/neutralizing gas during the turn if {@linkcode pokemon}'s ability corresponds to one + */ +export function applyOnLoseAbAttrs(pokemon: Pokemon, passive = false, simulated = false, ...args: any[]): void { + applySingleAbAttrs( + pokemon, + passive, + PreLeaveFieldAbAttr, + (attr, passive) => attr.applyPreLeaveField(pokemon, passive, simulated, [ ...args, true ]), + (attr, passive) => attr.canApplyPreLeaveField(pokemon, passive, simulated, [ ...args, true ]), + args, + true, + simulated); } /** @@ -5353,10 +6086,10 @@ export function initAbilities() { .attr(PostDefendContactApplyStatusEffectAbAttr, 30, StatusEffect.PARALYSIS) .bypassFaint(), new Ability(Abilities.VOLT_ABSORB, 3) - .attr(TypeImmunityHealAbAttr, Type.ELECTRIC) + .attr(TypeImmunityHealAbAttr, PokemonType.ELECTRIC) .ignorable(), new Ability(Abilities.WATER_ABSORB, 3) - .attr(TypeImmunityHealAbAttr, Type.WATER) + .attr(TypeImmunityHealAbAttr, PokemonType.WATER) .ignorable(), new Ability(Abilities.OBLIVIOUS, 3) .attr(BattlerTagImmunityAbAttr, [ BattlerTagType.INFATUATED, BattlerTagType.TAUNT ]) @@ -5381,7 +6114,7 @@ export function initAbilities() { .attr(StatusEffectImmunityAbAttr, StatusEffect.POISON, StatusEffect.TOXIC) .ignorable(), new Ability(Abilities.FLASH_FIRE, 3) - .attr(TypeImmunityAddBattlerTagAbAttr, Type.FIRE, BattlerTagType.FIRE_BOOST, 1) + .attr(TypeImmunityAddBattlerTagAbAttr, PokemonType.FIRE, BattlerTagType.FIRE_BOOST, 1) .ignorable(), new Ability(Abilities.SHIELD_DUST, 3) .attr(IgnoreMoveEffectsAbAttr) @@ -5411,7 +6144,7 @@ export function initAbilities() { .attr(UnswappableAbilityAbAttr) .ignorable(), new Ability(Abilities.LEVITATE, 3) - .attr(AttackTypeImmunityAbAttr, Type.GROUND, (pokemon: Pokemon) => !pokemon.getTag(GroundedTag) && !globalScene.arena.getTag(ArenaTagType.GRAVITY)) + .attr(AttackTypeImmunityAbAttr, PokemonType.GROUND, (pokemon: Pokemon) => !pokemon.getTag(GroundedTag) && !globalScene.arena.getTag(ArenaTagType.GRAVITY)) .ignorable(), new Ability(Abilities.EFFECT_SPORE, 3) .attr(EffectSporeAbAttr), @@ -5424,8 +6157,8 @@ export function initAbilities() { new Ability(Abilities.NATURAL_CURE, 3) .attr(PreSwitchOutResetStatusAbAttr), new Ability(Abilities.LIGHTNING_ROD, 3) - .attr(RedirectTypeMoveAbAttr, Type.ELECTRIC) - .attr(TypeImmunityStatStageChangeAbAttr, Type.ELECTRIC, Stat.SPATK, 1) + .attr(RedirectTypeMoveAbAttr, PokemonType.ELECTRIC) + .attr(TypeImmunityStatStageChangeAbAttr, PokemonType.ELECTRIC, Stat.SPATK, 1) .ignorable(), new Ability(Abilities.SERENE_GRACE, 3) .attr(MoveEffectChanceMultiplierAbAttr, 2), @@ -5460,7 +6193,7 @@ export function initAbilities() { .ignorable(), new Ability(Abilities.MAGNET_PULL, 3) .attr(ArenaTrapAbAttr, (user, target) => { - if (target.getTypes(true).includes(Type.STEEL) || (target.getTypes(true).includes(Type.STELLAR) && target.getTypes().includes(Type.STEEL))) { + if (target.getTypes(true).includes(PokemonType.STEEL) || (target.getTypes(true).includes(PokemonType.STELLAR) && target.getTypes().includes(PokemonType.STEEL))) { return true; } return false; @@ -5477,8 +6210,8 @@ export function initAbilities() { .attr(IncreasePpAbAttr) .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonPressure", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })), new Ability(Abilities.THICK_FAT, 3) - .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 0.5) - .attr(ReceivedTypeDamageMultiplierAbAttr, Type.ICE, 0.5) + .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.FIRE, 0.5) + .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.ICE, 0.5) .ignorable(), new Ability(Abilities.EARLY_BIRD, 3) .attr(ReduceStatusEffectDurationAbAttr, StatusEffect.SLEEP), @@ -5494,7 +6227,8 @@ export function initAbilities() { .attr(ProtectStatAbAttr, Stat.ATK) .ignorable(), new Ability(Abilities.PICKUP, 3) - .attr(PostBattleLootAbAttr), + .attr(PostBattleLootAbAttr) + .attr(UnsuppressableAbilityAbAttr), new Ability(Abilities.TRUANT, 3) .attr(PostSummonAddBattlerTagAbAttr, BattlerTagType.TRUANT, 1, false), new Ability(Abilities.HUSTLE, 3) @@ -5526,13 +6260,13 @@ export function initAbilities() { new Ability(Abilities.LIQUID_OOZE, 3) .attr(ReverseDrainAbAttr), new Ability(Abilities.OVERGROW, 3) - .attr(LowHpMoveTypePowerBoostAbAttr, Type.GRASS), + .attr(LowHpMoveTypePowerBoostAbAttr, PokemonType.GRASS), new Ability(Abilities.BLAZE, 3) - .attr(LowHpMoveTypePowerBoostAbAttr, Type.FIRE), + .attr(LowHpMoveTypePowerBoostAbAttr, PokemonType.FIRE), new Ability(Abilities.TORRENT, 3) - .attr(LowHpMoveTypePowerBoostAbAttr, Type.WATER), + .attr(LowHpMoveTypePowerBoostAbAttr, PokemonType.WATER), new Ability(Abilities.SWARM, 3) - .attr(LowHpMoveTypePowerBoostAbAttr, Type.BUG), + .attr(LowHpMoveTypePowerBoostAbAttr, PokemonType.BUG), new Ability(Abilities.ROCK_HEAD, 3) .attr(BlockRecoilDamageAttr), new Ability(Abilities.DROUGHT, 3) @@ -5568,7 +6302,7 @@ export function initAbilities() { .conditionalAttr(pokemon => !!pokemon.getTag(BattlerTagType.CONFUSED), StatMultiplierAbAttr, Stat.EVA, 2) .ignorable(), new Ability(Abilities.MOTOR_DRIVE, 4) - .attr(TypeImmunityStatStageChangeAbAttr, Type.ELECTRIC, Stat.SPD, 1) + .attr(TypeImmunityStatStageChangeAbAttr, PokemonType.ELECTRIC, Stat.SPD, 1) .ignorable(), new Ability(Abilities.RIVALRY, 4) .attr(MovePowerBoostAbAttr, (user, target, move) => user?.gender !== Gender.GENDERLESS && target?.gender !== Gender.GENDERLESS && user?.gender === target?.gender, 1.25, true) @@ -5589,7 +6323,7 @@ export function initAbilities() { .bypassFaint() // Allows reviver seed to activate Unburden .edgeCase(), // Should not restore Unburden boost if Pokemon loses then regains Unburden ability new Ability(Abilities.HEATPROOF, 4) - .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 0.5) + .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.FIRE, 0.5) .attr(ReduceBurnDamageAbAttr, 0.5) .ignorable(), new Ability(Abilities.SIMPLE, 4) @@ -5598,8 +6332,8 @@ export function initAbilities() { new Ability(Abilities.DRY_SKIN, 4) .attr(PostWeatherLapseDamageAbAttr, 2, WeatherType.SUNNY, WeatherType.HARSH_SUN) .attr(PostWeatherLapseHealAbAttr, 2, WeatherType.RAIN, WeatherType.HEAVY_RAIN) - .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 1.25) - .attr(TypeImmunityHealAbAttr, Type.WATER) + .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.FIRE, 1.25) + .attr(TypeImmunityHealAbAttr, PokemonType.WATER) .ignorable(), new Ability(Abilities.DOWNLOAD, 4) .attr(DownloadAbAttr), @@ -5623,8 +6357,8 @@ export function initAbilities() { .conditionalAttr(pokemon => pokemon.status ? pokemon.status.effect === StatusEffect.PARALYSIS : false, StatMultiplierAbAttr, Stat.SPD, 2) .conditionalAttr(pokemon => !!pokemon.status || pokemon.hasAbility(Abilities.COMATOSE), StatMultiplierAbAttr, Stat.SPD, 1.5), new Ability(Abilities.NORMALIZE, 4) - .attr(MoveTypeChangeAbAttr, Type.NORMAL, 1.2, (user, target, move) => { - return ![ Moves.HIDDEN_POWER, Moves.WEATHER_BALL, Moves.NATURAL_GIFT, Moves.JUDGMENT, Moves.TECHNO_BLAST ].includes(move.id); + .attr(MoveTypeChangeAbAttr, PokemonType.NORMAL, 1.2, (user, target, move) => { + return ![ Moves.MULTI_ATTACK, Moves.REVELATION_DANCE, Moves.TERRAIN_PULSE, Moves.HIDDEN_POWER, Moves.WEATHER_BALL, Moves.NATURAL_GIFT, Moves.JUDGMENT, Moves.TECHNO_BLAST ].includes(move.id); }), new Ability(Abilities.SNIPER, 4) .attr(MultCritAbAttr, 1.5), @@ -5670,11 +6404,11 @@ export function initAbilities() { new Ability(Abilities.SLOW_START, 4) .attr(PostSummonAddBattlerTagAbAttr, BattlerTagType.SLOW_START, 5), new Ability(Abilities.SCRAPPY, 4) - .attr(IgnoreTypeImmunityAbAttr, Type.GHOST, [ Type.NORMAL, Type.FIGHTING ]) + .attr(IgnoreTypeImmunityAbAttr, PokemonType.GHOST, [ PokemonType.NORMAL, PokemonType.FIGHTING ]) .attr(IntimidateImmunityAbAttr), new Ability(Abilities.STORM_DRAIN, 4) - .attr(RedirectTypeMoveAbAttr, Type.WATER) - .attr(TypeImmunityStatStageChangeAbAttr, Type.WATER, Stat.SPATK, 1) + .attr(RedirectTypeMoveAbAttr, PokemonType.WATER) + .attr(TypeImmunityStatStageChangeAbAttr, PokemonType.WATER, Stat.SPATK, 1) .ignorable(), new Ability(Abilities.ICE_BODY, 4) .attr(BlockWeatherDamageAttr, WeatherType.HAIL) @@ -5686,7 +6420,8 @@ export function initAbilities() { .attr(PostSummonWeatherChangeAbAttr, WeatherType.SNOW) .attr(PostBiomeChangeWeatherChangeAbAttr, WeatherType.SNOW), new Ability(Abilities.HONEY_GATHER, 4) - .attr(MoneyAbAttr), + .attr(MoneyAbAttr) + .attr(UnsuppressableAbilityAbAttr), new Ability(Abilities.FRISK, 4) .attr(FriskAbAttr), new Ability(Abilities.RECKLESS, 4) @@ -5800,26 +6535,29 @@ export function initAbilities() { new Ability(Abilities.MOXIE, 5) .attr(PostVictoryStatStageChangeAbAttr, Stat.ATK, 1), new Ability(Abilities.JUSTIFIED, 5) - .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === Type.DARK && move.category !== MoveCategory.STATUS, Stat.ATK, 1), + .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === PokemonType.DARK && move.category !== MoveCategory.STATUS, Stat.ATK, 1), new Ability(Abilities.RATTLED, 5) .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => { const moveType = user.getMoveType(move); return move.category !== MoveCategory.STATUS - && (moveType === Type.DARK || moveType === Type.BUG || moveType === Type.GHOST); + && (moveType === PokemonType.DARK || moveType === PokemonType.BUG || moveType === PokemonType.GHOST); }, Stat.SPD, 1) .attr(PostIntimidateStatStageChangeAbAttr, [ Stat.SPD ], 1), new Ability(Abilities.MAGIC_BOUNCE, 5) + .attr(ReflectStatusMoveAbAttr) .ignorable() - .unimplemented(), + // Interactions with stomping tantrum, instruct, encore, and probably other moves that + // rely on move history + .edgeCase(), new Ability(Abilities.SAP_SIPPER, 5) - .attr(TypeImmunityStatStageChangeAbAttr, Type.GRASS, Stat.ATK, 1) + .attr(TypeImmunityStatStageChangeAbAttr, PokemonType.GRASS, Stat.ATK, 1) .ignorable(), new Ability(Abilities.PRANKSTER, 5) .attr(ChangeMovePriorityAbAttr, (pokemon, move: Move) => move.category === MoveCategory.STATUS, 1), new Ability(Abilities.SAND_FORCE, 5) - .attr(MoveTypePowerBoostAbAttr, Type.ROCK, 1.3) - .attr(MoveTypePowerBoostAbAttr, Type.GROUND, 1.3) - .attr(MoveTypePowerBoostAbAttr, Type.STEEL, 1.3) + .attr(MoveTypePowerBoostAbAttr, PokemonType.ROCK, 1.3) + .attr(MoveTypePowerBoostAbAttr, PokemonType.GROUND, 1.3) + .attr(MoveTypePowerBoostAbAttr, PokemonType.STEEL, 1.3) .attr(BlockWeatherDamageAttr, WeatherType.SANDSTORM) .condition(getWeatherCondition(WeatherType.SANDSTORM)), new Ability(Abilities.IRON_BARBS, 5) @@ -5867,7 +6605,7 @@ export function initAbilities() { new Ability(Abilities.STRONG_JAW, 6) .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.BITING_MOVE), 1.5), new Ability(Abilities.REFRIGERATE, 6) - .attr(MoveTypeChangeAbAttr, Type.ICE, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)), + .attr(MoveTypeChangeAbAttr, PokemonType.ICE, 1.2, (user, target, move) => move.type === PokemonType.NORMAL && !move.hasAttr(VariableMoveTypeAttr)), new Ability(Abilities.SWEET_VEIL, 6) .attr(UserFieldStatusEffectImmunityAbAttr, StatusEffect.SLEEP) .attr(UserFieldBattlerTagImmunityAbAttr, BattlerTagType.DROWSY) @@ -5879,7 +6617,7 @@ export function initAbilities() { .attr(UnsuppressableAbilityAbAttr) .attr(NoFusionAbilityAbAttr), new Ability(Abilities.GALE_WINGS, 6) - .attr(ChangeMovePriorityAbAttr, (pokemon, move) => pokemon.isFullHp() && pokemon.getMoveType(move) === Type.FLYING, 1), + .attr(ChangeMovePriorityAbAttr, (pokemon, move) => pokemon.isFullHp() && pokemon.getMoveType(move) === PokemonType.FLYING, 1), new Ability(Abilities.MEGA_LAUNCHER, 6) .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.PULSE_MOVE), 1.5), new Ability(Abilities.GRASS_PELT, 6) @@ -5890,42 +6628,39 @@ export function initAbilities() { new Ability(Abilities.TOUGH_CLAWS, 6) .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.MAKES_CONTACT), 1.3), new Ability(Abilities.PIXILATE, 6) - .attr(MoveTypeChangeAbAttr, Type.FAIRY, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)), + .attr(MoveTypeChangeAbAttr, PokemonType.FAIRY, 1.2, (user, target, move) => move.type === PokemonType.NORMAL && !move.hasAttr(VariableMoveTypeAttr)), new Ability(Abilities.GOOEY, 6) .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => move.hasFlag(MoveFlags.MAKES_CONTACT), Stat.SPD, -1, false), new Ability(Abilities.AERILATE, 6) - .attr(MoveTypeChangeAbAttr, Type.FLYING, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)), + .attr(MoveTypeChangeAbAttr, PokemonType.FLYING, 1.2, (user, target, move) => move.type === PokemonType.NORMAL && !move.hasAttr(VariableMoveTypeAttr)), new Ability(Abilities.PARENTAL_BOND, 6) .attr(AddSecondStrikeAbAttr, 0.25), new Ability(Abilities.DARK_AURA, 6) .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonDarkAura", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })) - .attr(FieldMoveTypePowerBoostAbAttr, Type.DARK, 4 / 3), + .attr(FieldMoveTypePowerBoostAbAttr, PokemonType.DARK, 4 / 3), new Ability(Abilities.FAIRY_AURA, 6) .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonFairyAura", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })) - .attr(FieldMoveTypePowerBoostAbAttr, Type.FAIRY, 4 / 3), + .attr(FieldMoveTypePowerBoostAbAttr, PokemonType.FAIRY, 4 / 3), new Ability(Abilities.AURA_BREAK, 6) .ignorable() - .conditionalAttr(pokemon => globalScene.getField(true).some(p => p.hasAbility(Abilities.DARK_AURA)), FieldMoveTypePowerBoostAbAttr, Type.DARK, 9 / 16) - .conditionalAttr(pokemon => globalScene.getField(true).some(p => p.hasAbility(Abilities.FAIRY_AURA)), FieldMoveTypePowerBoostAbAttr, Type.FAIRY, 9 / 16) + .conditionalAttr(pokemon => globalScene.getField(true).some(p => p.hasAbility(Abilities.DARK_AURA)), FieldMoveTypePowerBoostAbAttr, PokemonType.DARK, 9 / 16) + .conditionalAttr(pokemon => globalScene.getField(true).some(p => p.hasAbility(Abilities.FAIRY_AURA)), FieldMoveTypePowerBoostAbAttr, PokemonType.FAIRY, 9 / 16) .conditionalAttr(pokemon => globalScene.getField(true).some(p => p.hasAbility(Abilities.DARK_AURA) || p.hasAbility(Abilities.FAIRY_AURA)), PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonAuraBreak", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })), new Ability(Abilities.PRIMORDIAL_SEA, 6) .attr(PostSummonWeatherChangeAbAttr, WeatherType.HEAVY_RAIN) .attr(PostBiomeChangeWeatherChangeAbAttr, WeatherType.HEAVY_RAIN) - .attr(PreSwitchOutClearWeatherAbAttr) - .attr(PostFaintClearWeatherAbAttr) + .attr(PreLeaveFieldClearWeatherAbAttr) .bypassFaint(), new Ability(Abilities.DESOLATE_LAND, 6) .attr(PostSummonWeatherChangeAbAttr, WeatherType.HARSH_SUN) .attr(PostBiomeChangeWeatherChangeAbAttr, WeatherType.HARSH_SUN) - .attr(PreSwitchOutClearWeatherAbAttr) - .attr(PostFaintClearWeatherAbAttr) + .attr(PreLeaveFieldClearWeatherAbAttr) .bypassFaint(), new Ability(Abilities.DELTA_STREAM, 6) .attr(PostSummonWeatherChangeAbAttr, WeatherType.STRONG_WINDS) .attr(PostBiomeChangeWeatherChangeAbAttr, WeatherType.STRONG_WINDS) - .attr(PreSwitchOutClearWeatherAbAttr) - .attr(PostFaintClearWeatherAbAttr) + .attr(PreLeaveFieldClearWeatherAbAttr) .bypassFaint(), new Ability(Abilities.STAMINA, 7) .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => move.category !== MoveCategory.STATUS, Stat.DEF, 1), @@ -5936,7 +6671,7 @@ export function initAbilities() { .attr(PostDamageForceSwitchAbAttr) .edgeCase(), // Should not trigger when hurting itself in confusion, causes Fake Out to fail turn 1 and succeed turn 2 if pokemon is switched out before battle start via playing in Switch Mode new Ability(Abilities.WATER_COMPACTION, 7) - .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === Type.WATER && move.category !== MoveCategory.STATUS, Stat.DEF, 2), + .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === PokemonType.WATER && move.category !== MoveCategory.STATUS, Stat.DEF, 2), new Ability(Abilities.MERCILESS, 7) .attr(ConditionalCritAbAttr, (user, target, move) => target?.status?.effect === StatusEffect.TOXIC || target?.status?.effect === StatusEffect.POISON), new Ability(Abilities.SHIELDS_DOWN, 7) @@ -5954,12 +6689,12 @@ export function initAbilities() { new Ability(Abilities.STAKEOUT, 7) .attr(MovePowerBoostAbAttr, (user, target, move) => !!target?.turnData.switchedInThisTurn, 2), new Ability(Abilities.WATER_BUBBLE, 7) - .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 0.5) - .attr(MoveTypePowerBoostAbAttr, Type.WATER, 2) + .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.FIRE, 0.5) + .attr(MoveTypePowerBoostAbAttr, PokemonType.WATER, 2) .attr(StatusEffectImmunityAbAttr, StatusEffect.BURN) .ignorable(), new Ability(Abilities.STEELWORKER, 7) - .attr(MoveTypePowerBoostAbAttr, Type.STEEL), + .attr(MoveTypePowerBoostAbAttr, PokemonType.STEEL), new Ability(Abilities.BERSERK, 7) .attr(PostDefendHpGatedStatStageChangeAbAttr, (target, user, move) => move.category !== MoveCategory.STATUS, 0.5, [ Stat.SPATK ], 1) .condition(getSheerForceHitDisableAbCondition()), @@ -5969,11 +6704,11 @@ export function initAbilities() { new Ability(Abilities.LONG_REACH, 7) .attr(IgnoreContactAbAttr), new Ability(Abilities.LIQUID_VOICE, 7) - .attr(MoveTypeChangeAbAttr, Type.WATER, 1, (user, target, move) => move.hasFlag(MoveFlags.SOUND_BASED)), + .attr(MoveTypeChangeAbAttr, PokemonType.WATER, 1, (user, target, move) => move.hasFlag(MoveFlags.SOUND_BASED)), new Ability(Abilities.TRIAGE, 7) .attr(ChangeMovePriorityAbAttr, (pokemon, move) => move.hasFlag(MoveFlags.TRIAGE_MOVE), 3), new Ability(Abilities.GALVANIZE, 7) - .attr(MoveTypeChangeAbAttr, Type.ELECTRIC, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)), + .attr(MoveTypeChangeAbAttr, PokemonType.ELECTRIC, 1.2, (user, target, move) => move.type === PokemonType.NORMAL && !move.hasAttr(VariableMoveTypeAttr)), new Ability(Abilities.SURGE_SURFER, 7) .conditionalAttr(getTerrainCondition(TerrainType.ELECTRIC), StatMultiplierAbAttr, Stat.SPD, 2), new Ability(Abilities.SCHOOLING, 7) @@ -6021,8 +6756,8 @@ export function initAbilities() { .attr(NoFusionAbilityAbAttr) .bypassFaint(), new Ability(Abilities.CORROSION, 7) - .attr(IgnoreTypeStatusEffectImmunityAbAttr, [ StatusEffect.POISON, StatusEffect.TOXIC ], [ Type.STEEL, Type.POISON ]) - .edgeCase(), // Should interact correctly with magic coat/bounce (not yet implemented) + fling with toxic orb (not implemented yet) + .attr(IgnoreTypeStatusEffectImmunityAbAttr, [ StatusEffect.POISON, StatusEffect.TOXIC ], [ PokemonType.STEEL, PokemonType.POISON ]) + .edgeCase(), // Should poison itself with toxic orb. new Ability(Abilities.COMATOSE, 7) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) @@ -6041,7 +6776,7 @@ export function initAbilities() { .attr(AllyMoveCategoryPowerBoostAbAttr, [ MoveCategory.SPECIAL ], 1.3), new Ability(Abilities.FLUFFY, 7) .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => move.hasFlag(MoveFlags.MAKES_CONTACT), 0.5) - .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => user.getMoveType(move) === Type.FIRE, 2) + .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => user.getMoveType(move) === PokemonType.FIRE, 2) .ignorable(), new Ability(Abilities.DAZZLING, 7) .attr(FieldPriorityMoveImmunityAbAttr) @@ -6110,8 +6845,8 @@ export function initAbilities() { new Ability(Abilities.PROPELLER_TAIL, 8) .attr(BlockRedirectAbAttr), new Ability(Abilities.MIRROR_ARMOR, 8) - .ignorable() - .unimplemented(), + .attr(ReflectStatStageChangeAbAttr) + .ignorable(), /** * Right now, the logic is attached to Surf and Dive moves. Ideally, the post-defend/hit should be an * ability attribute but the current implementation of move effects for BattlerTag does not support this- in the case @@ -6131,14 +6866,15 @@ export function initAbilities() { .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => { const moveType = user.getMoveType(move); return move.category !== MoveCategory.STATUS - && (moveType === Type.FIRE || moveType === Type.WATER); + && (moveType === PokemonType.FIRE || moveType === PokemonType.WATER); }, Stat.SPD, 6), new Ability(Abilities.PUNK_ROCK, 8) .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.SOUND_BASED), 1.3) .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => move.hasFlag(MoveFlags.SOUND_BASED), 0.5) .ignorable(), new Ability(Abilities.SAND_SPIT, 8) - .attr(PostDefendWeatherChangeAbAttr, WeatherType.SANDSTORM, (target, user, move) => move.category !== MoveCategory.STATUS), + .attr(PostDefendWeatherChangeAbAttr, WeatherType.SANDSTORM, (target, user, move) => move.category !== MoveCategory.STATUS) + .bypassFaint(), new Ability(Abilities.ICE_SCALES, 8) .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => move.category === MoveCategory.SPECIAL, 0.5) .ignorable(), @@ -6169,9 +6905,10 @@ export function initAbilities() { new Ability(Abilities.SCREEN_CLEANER, 8) .attr(PostSummonRemoveArenaTagAbAttr, [ ArenaTagType.AURORA_VEIL, ArenaTagType.LIGHT_SCREEN, ArenaTagType.REFLECT ]), new Ability(Abilities.STEELY_SPIRIT, 8) - .attr(UserFieldMoveTypePowerBoostAbAttr, Type.STEEL), + .attr(UserFieldMoveTypePowerBoostAbAttr, PokemonType.STEEL), new Ability(Abilities.PERISH_BODY, 8) - .attr(PostDefendPerishSongAbAttr, 4), + .attr(PostDefendPerishSongAbAttr, 4) + .bypassFaint(), new Ability(Abilities.WANDERING_SPIRIT, 8) .attr(PostDefendAbilitySwapAbAttr) .bypassFaint() @@ -6179,12 +6916,12 @@ export function initAbilities() { new Ability(Abilities.GORILLA_TACTICS, 8) .attr(GorillaTacticsAbAttr), new Ability(Abilities.NEUTRALIZING_GAS, 8) - .attr(SuppressFieldAbilitiesAbAttr) + .attr(PostSummonAddArenaTagAbAttr, true, ArenaTagType.NEUTRALIZING_GAS, 0) + .attr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) .attr(NoTransformAbilityAbAttr) - .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonNeutralizingGas", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })) - .partial(), // A bunch of weird interactions with other abilities being suppressed then unsuppressed + .bypassFaint(), new Ability(Abilities.PASTEL_VEIL, 8) .attr(PostSummonUserFieldRemoveStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC) .attr(UserFieldStatusEffectImmunityAbAttr, StatusEffect.POISON, StatusEffect.TOXIC) @@ -6196,7 +6933,7 @@ export function initAbilities() { .attr(UnswappableAbilityAbAttr) .attr(NoTransformAbilityAbAttr) .attr(NoFusionAbilityAbAttr) - .condition((pokemon) => !pokemon.isTerastallized()), + .condition((pokemon) => !pokemon.isTerastallized), new Ability(Abilities.QUICK_DRAW, 8) .attr(BypassSpeedChanceAbAttr, 30), new Ability(Abilities.UNSEEN_FIST, 8) @@ -6204,9 +6941,9 @@ export function initAbilities() { new Ability(Abilities.CURIOUS_MEDICINE, 8) .attr(PostSummonClearAllyStatStagesAbAttr), new Ability(Abilities.TRANSISTOR, 8) - .attr(MoveTypePowerBoostAbAttr, Type.ELECTRIC), + .attr(MoveTypePowerBoostAbAttr, PokemonType.ELECTRIC), new Ability(Abilities.DRAGONS_MAW, 8) - .attr(MoveTypePowerBoostAbAttr, Type.DRAGON), + .attr(MoveTypePowerBoostAbAttr, PokemonType.DRAGON), new Ability(Abilities.CHILLING_NEIGH, 8) .attr(PostVictoryStatStageChangeAbAttr, Stat.ATK, 1), new Ability(Abilities.GRIM_NEIGH, 8) @@ -6229,9 +6966,10 @@ export function initAbilities() { .attr(PostDefendAbilityGiveAbAttr, Abilities.LINGERING_AROMA) .bypassFaint(), new Ability(Abilities.SEED_SOWER, 9) - .attr(PostDefendTerrainChangeAbAttr, TerrainType.GRASSY), + .attr(PostDefendTerrainChangeAbAttr, TerrainType.GRASSY) + .bypassFaint(), new Ability(Abilities.THERMAL_EXCHANGE, 9) - .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === Type.FIRE && move.category !== MoveCategory.STATUS, Stat.ATK, 1) + .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === PokemonType.FIRE && move.category !== MoveCategory.STATUS, Stat.ATK, 1) .attr(StatusEffectImmunityAbAttr, StatusEffect.BURN) .ignorable(), new Ability(Abilities.ANGER_SHELL, 9) @@ -6240,10 +6978,10 @@ export function initAbilities() { .condition(getSheerForceHitDisableAbCondition()), new Ability(Abilities.PURIFYING_SALT, 9) .attr(StatusEffectImmunityAbAttr) - .attr(ReceivedTypeDamageMultiplierAbAttr, Type.GHOST, 0.5) + .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.GHOST, 0.5) .ignorable(), new Ability(Abilities.WELL_BAKED_BODY, 9) - .attr(TypeImmunityStatStageChangeAbAttr, Type.FIRE, Stat.DEF, 2) + .attr(TypeImmunityStatStageChangeAbAttr, PokemonType.FIRE, Stat.DEF, 2) .ignorable(), new Ability(Abilities.WIND_RIDER, 9) .attr(MoveImmunityStatStageChangeAbAttr, (pokemon, attacker, move) => pokemon !== attacker && move.hasFlag(MoveFlags.WIND_MOVE) && move.category !== MoveCategory.STATUS, Stat.ATK, 1) @@ -6254,7 +6992,7 @@ export function initAbilities() { .attr(ForceSwitchOutImmunityAbAttr) .ignorable(), new Ability(Abilities.ROCKY_PAYLOAD, 9) - .attr(MoveTypePowerBoostAbAttr, Type.ROCK), + .attr(MoveTypePowerBoostAbAttr, PokemonType.ROCK), new Ability(Abilities.WIND_POWER, 9) .attr(PostDefendApplyBattlerTagAbAttr, (target, user, move) => move.hasFlag(MoveFlags.WIND_MOVE), BattlerTagType.CHARGED), new Ability(Abilities.ZERO_TO_HERO, 9) @@ -6279,19 +7017,16 @@ export function initAbilities() { .attr(PostWeatherChangeAddBattlerTagAttr, BattlerTagType.PROTOSYNTHESIS, 0, WeatherType.SUNNY, WeatherType.HARSH_SUN) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) - .attr(NoTransformAbilityAbAttr) - .partial(), // While setting the tag, the getbattlestat should ignore all modifiers to stats except stat stages + .attr(NoTransformAbilityAbAttr), new Ability(Abilities.QUARK_DRIVE, 9) .conditionalAttr(getTerrainCondition(TerrainType.ELECTRIC), PostSummonAddBattlerTagAbAttr, BattlerTagType.QUARK_DRIVE, 0, true) .attr(PostTerrainChangeAddBattlerTagAttr, BattlerTagType.QUARK_DRIVE, 0, TerrainType.ELECTRIC) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) - .attr(NoTransformAbilityAbAttr) - .partial(), // While setting the tag, the getbattlestat should ignore all modifiers to stats except stat stages + .attr(NoTransformAbilityAbAttr), new Ability(Abilities.GOOD_AS_GOLD, 9) - .attr(MoveImmunityAbAttr, (pokemon, attacker, move) => pokemon !== attacker && move.category === MoveCategory.STATUS) - .ignorable() - .partial(), // Lots of weird interactions with moves and abilities such as negating status moves that target the field + .attr(MoveImmunityAbAttr, (pokemon, attacker, move) => pokemon !== attacker && move.category === MoveCategory.STATUS && ![ MoveTarget.ENEMY_SIDE, MoveTarget.BOTH_SIDES, MoveTarget.USER_SIDE ].includes(move.moveTarget)) + .ignorable(), new Ability(Abilities.VESSEL_OF_RUIN, 9) .attr(FieldMultiplyStatAbAttr, Stat.SPATK, 0.75) .attr(PostSummonMessageAbAttr, (user) => i18next.t("abilityTriggers:postSummonVesselOfRuin", { pokemonNameWithAffix: getPokemonNameWithAffix(user), statName: i18next.t(getStatKey(Stat.SPATK)) })) @@ -6321,8 +7056,8 @@ export function initAbilities() { new Ability(Abilities.SHARPNESS, 9) .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.SLICING_MOVE), 1.5), new Ability(Abilities.SUPREME_OVERLORD, 9) - .attr(VariableMovePowerBoostAbAttr, (user, target, move) => 1 + 0.1 * Math.min(user.isPlayer() ? globalScene.currentBattle.playerFaints : globalScene.currentBattle.enemyFaints, 5)) - .partial(), // Counter resets every wave instead of on arena reset + .attr(VariableMovePowerBoostAbAttr, (user, target, move) => 1 + 0.1 * Math.min(user.isPlayer() ? globalScene.arena.playerFaints : globalScene.currentBattle.enemyFaints, 5)) + .partial(), // Should only boost once, on summon new Ability(Abilities.COSTAR, 9) .attr(PostSummonCopyAllyStatsAbAttr), new Ability(Abilities.TOXIC_DEBRIS, 9) @@ -6332,14 +7067,14 @@ export function initAbilities() { .attr(FieldPriorityMoveImmunityAbAttr) .ignorable(), new Ability(Abilities.EARTH_EATER, 9) - .attr(TypeImmunityHealAbAttr, Type.GROUND) + .attr(TypeImmunityHealAbAttr, PokemonType.GROUND) .ignorable(), new Ability(Abilities.MYCELIUM_MIGHT, 9) .attr(ChangeMovePriorityAbAttr, (pokemon, move) => move.category === MoveCategory.STATUS, -0.2) .attr(PreventBypassSpeedChanceAbAttr, (pokemon, move) => move.category === MoveCategory.STATUS) .attr(MoveAbilityBypassAbAttr, (pokemon, move: Move) => move.category === MoveCategory.STATUS), new Ability(Abilities.MINDS_EYE, 9) - .attr(IgnoreTypeImmunityAbAttr, Type.GHOST, [ Type.NORMAL, Type.FIGHTING ]) + .attr(IgnoreTypeImmunityAbAttr, PokemonType.GHOST, [ PokemonType.NORMAL, PokemonType.FIGHTING ]) .attr(ProtectStatAbAttr, Stat.ACC) .attr(IgnoreOpponentStatStagesAbAttr, [ Stat.EVA ]) .ignorable(), @@ -6350,29 +7085,25 @@ export function initAbilities() { new Ability(Abilities.TOXIC_CHAIN, 9) .attr(PostAttackApplyStatusEffectAbAttr, false, 30, StatusEffect.TOXIC), new Ability(Abilities.EMBODY_ASPECT_TEAL, 9) - .attr(PostBattleInitStatStageChangeAbAttr, [ Stat.SPD ], 1, true) + .attr(PostTeraFormChangeStatChangeAbAttr, [ Stat.SPD ], 1) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) - .attr(NoTransformAbilityAbAttr) - .partial(), // Ogerpon tera interactions + .attr(NoTransformAbilityAbAttr), new Ability(Abilities.EMBODY_ASPECT_WELLSPRING, 9) - .attr(PostBattleInitStatStageChangeAbAttr, [ Stat.SPDEF ], 1, true) + .attr(PostTeraFormChangeStatChangeAbAttr, [ Stat.SPDEF ], 1) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) - .attr(NoTransformAbilityAbAttr) - .partial(), // Ogerpon tera interactions + .attr(NoTransformAbilityAbAttr), new Ability(Abilities.EMBODY_ASPECT_HEARTHFLAME, 9) - .attr(PostBattleInitStatStageChangeAbAttr, [ Stat.ATK ], 1, true) + .attr(PostTeraFormChangeStatChangeAbAttr, [ Stat.ATK ], 1) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) - .attr(NoTransformAbilityAbAttr) - .partial(), // Ogerpon tera interactions + .attr(NoTransformAbilityAbAttr), new Ability(Abilities.EMBODY_ASPECT_CORNERSTONE, 9) - .attr(PostBattleInitStatStageChangeAbAttr, [ Stat.DEF ], 1, true) + .attr(PostTeraFormChangeStatChangeAbAttr, [ Stat.DEF ], 1) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) - .attr(NoTransformAbilityAbAttr) - .partial(), // Ogerpon tera interactions + .attr(NoTransformAbilityAbAttr), new Ability(Abilities.TERA_SHIFT, 9) .attr(PostSummonFormChangeAbAttr, p => p.getFormKey() ? 0 : 1) .attr(UncopiableAbilityAbAttr) @@ -6386,9 +7117,11 @@ export function initAbilities() { .attr(UnswappableAbilityAbAttr) .ignorable(), new Ability(Abilities.TERAFORM_ZERO, 9) + .attr(ClearWeatherAbAttr, [ WeatherType.SUNNY, WeatherType.RAIN, WeatherType.SANDSTORM, WeatherType.HAIL, WeatherType.SNOW, WeatherType.FOG, WeatherType.HEAVY_RAIN, WeatherType.HARSH_SUN, WeatherType.STRONG_WINDS ]) + .attr(ClearTerrainAbAttr, [ TerrainType.MISTY, TerrainType.ELECTRIC, TerrainType.GRASSY, TerrainType.PSYCHIC ]) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) - .unimplemented(), + .condition(getOncePerBattleCondition(Abilities.TERAFORM_ZERO)), new Ability(Abilities.POISON_PUPPETEER, 9) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts index 816de3e824c..276cfa035b8 100644 --- a/src/data/arena-tag.ts +++ b/src/data/arena-tag.ts @@ -1,14 +1,24 @@ import { globalScene } from "#app/global-scene"; import type { Arena } from "#app/field/arena"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { BooleanHolder, NumberHolder, toDmgValue } from "#app/utils"; -import { MoveCategory, allMoves, MoveTarget } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; +import { MoveTarget } from "#enums/MoveTarget"; +import { MoveCategory } from "#enums/MoveCategory"; import { getPokemonNameWithAffix } from "#app/messages"; import type Pokemon from "#app/field/pokemon"; import { HitResult, PokemonMove } from "#app/field/pokemon"; import { StatusEffect } from "#enums/status-effect"; import type { BattlerIndex } from "#app/battle"; -import { BlockNonDirectDamageAbAttr, InfiltratorAbAttr, ProtectStatAbAttr, applyAbAttrs } from "#app/data/ability"; +import { + BlockNonDirectDamageAbAttr, + InfiltratorAbAttr, + PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, + ProtectStatAbAttr, + applyAbAttrs, + applyOnGainAbAttrs, + applyOnLoseAbAttrs, +} from "#app/data/ability"; import { Stat } from "#enums/stat"; import { CommonAnim, CommonBattleAnim } from "#app/data/battle-anims"; import i18next from "i18next"; @@ -25,7 +35,7 @@ import { CommonAnimPhase } from "#app/phases/common-anim-phase"; export enum ArenaTagSide { BOTH, PLAYER, - ENEMY + ENEMY, } export abstract class ArenaTag { @@ -34,31 +44,34 @@ export abstract class ArenaTag { public turnCount: number, public sourceMove?: Moves, public sourceId?: number, - public side: ArenaTagSide = ArenaTagSide.BOTH + public side: ArenaTagSide = ArenaTagSide.BOTH, ) {} - apply(arena: Arena, simulated: boolean, ...args: unknown[]): boolean { + apply(_arena: Arena, _simulated: boolean, ..._args: unknown[]): boolean { return true; } - onAdd(arena: Arena, quiet: boolean = false): void { } + onAdd(_arena: Arena, _quiet = false): void {} - onRemove(arena: Arena, quiet: boolean = false): void { + onRemove(_arena: Arena, quiet = false): void { if (!quiet) { - globalScene.queueMessage(i18next.t(`arenaTag:arenaOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, { moveName: this.getMoveName() })); + globalScene.queueMessage( + i18next.t( + `arenaTag:arenaOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + { moveName: this.getMoveName() }, + ), + ); } } - onOverlap(arena: Arena): void { } + onOverlap(_arena: Arena): void {} - lapse(arena: Arena): boolean { - return this.turnCount < 1 || !!(--this.turnCount); + lapse(_arena: Arena): boolean { + return this.turnCount < 1 || !!--this.turnCount; } getMoveName(): string | null { - return this.sourceMove - ? allMoves[this.sourceMove].name - : null; + return this.sourceMove ? allMoves[this.sourceMove].name : null; } /** @@ -66,7 +79,7 @@ export abstract class ArenaTag { * This is meant to be inherited from by any arena tag with custom attributes * @param {ArenaTag | any} source An arena tag */ - loadTag(source : ArenaTag | any) : void { + loadTag(source: ArenaTag | any): void { this.turnCount = source.turnCount; this.sourceMove = source.sourceMove; this.sourceId = source.sourceId; @@ -107,14 +120,18 @@ export class MistTag extends ArenaTag { super(ArenaTagType.MIST, turnCount, Moves.MIST, sourceId, side); } - onAdd(arena: Arena, quiet: boolean = false): void { + onAdd(arena: Arena, quiet = false): void { super.onAdd(arena); if (this.sourceId) { const source = globalScene.getPokemonById(this.sourceId); if (!quiet && source) { - globalScene.queueMessage(i18next.t("arenaTag:mistOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(source) })); + globalScene.queueMessage( + i18next.t("arenaTag:mistOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(source), + }), + ); } else if (!quiet) { console.warn("Failed to get source for MistTag onAdd"); } @@ -123,14 +140,14 @@ export class MistTag extends ArenaTag { /** * Cancels the lowering of stats - * @param arena the {@linkcode Arena} containing this effect + * @param _arena the {@linkcode Arena} containing this effect * @param simulated `true` if the effect should be applied quietly * @param attacker the {@linkcode Pokemon} using a move into this effect. * @param cancelled a {@linkcode BooleanHolder} whose value is set to `true` * to flag the stat reduction as cancelled * @returns `true` if a stat reduction was cancelled; `false` otherwise */ - override apply(arena: Arena, simulated: boolean, attacker: Pokemon, cancelled: BooleanHolder): boolean { + override apply(_arena: Arena, simulated: boolean, attacker: Pokemon, cancelled: BooleanHolder): boolean { // `StatStageChangePhase` currently doesn't have a reference to the source of stat drops, // so this code currently has no effect on gameplay. if (attacker) { @@ -169,7 +186,14 @@ export class WeakenMoveScreenTag extends ArenaTag { * @param side - The side (player or enemy) the tag affects. * @param weakenedCategories - The categories of moves that are weakened by this tag. */ - constructor(tagType: ArenaTagType, turnCount: number, sourceMove: Moves, sourceId: number, side: ArenaTagSide, weakenedCategories: MoveCategory[]) { + constructor( + tagType: ArenaTagType, + turnCount: number, + sourceMove: Moves, + sourceId: number, + side: ArenaTagSide, + weakenedCategories: MoveCategory[], + ) { super(tagType, turnCount, sourceMove, sourceId, side); this.weakenedCategories = weakenedCategories; @@ -178,14 +202,20 @@ export class WeakenMoveScreenTag extends ArenaTag { /** * Applies the weakening effect to the move. * - * @param arena the {@linkcode Arena} where the move is applied. - * @param simulated n/a + * @param _arena the {@linkcode Arena} where the move is applied. + * @param _simulated n/a * @param attacker the attacking {@linkcode Pokemon} * @param moveCategory the attacking move's {@linkcode MoveCategory}. * @param damageMultiplier A {@linkcode NumberHolder} containing the damage multiplier * @returns `true` if the attacking move was weakened; `false` otherwise. */ - override apply(arena: Arena, simulated: boolean, attacker: Pokemon, moveCategory: MoveCategory, damageMultiplier: NumberHolder): boolean { + override apply( + _arena: Arena, + _simulated: boolean, + attacker: Pokemon, + moveCategory: MoveCategory, + damageMultiplier: NumberHolder, + ): boolean { if (this.weakenedCategories.includes(moveCategory)) { const bypassed = new BooleanHolder(false); applyAbAttrs(InfiltratorAbAttr, attacker, null, false, bypassed); @@ -205,12 +235,16 @@ export class WeakenMoveScreenTag extends ArenaTag { */ class ReflectTag extends WeakenMoveScreenTag { constructor(turnCount: number, sourceId: number, side: ArenaTagSide) { - super(ArenaTagType.REFLECT, turnCount, Moves.REFLECT, sourceId, side, [ MoveCategory.PHYSICAL ]); + super(ArenaTagType.REFLECT, turnCount, Moves.REFLECT, sourceId, side, [MoveCategory.PHYSICAL]); } - onAdd(arena: Arena, quiet: boolean = false): void { + onAdd(_arena: Arena, quiet = false): void { if (!quiet) { - globalScene.queueMessage(i18next.t(`arenaTag:reflectOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`)); + globalScene.queueMessage( + i18next.t( + `arenaTag:reflectOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + ), + ); } } } @@ -221,12 +255,16 @@ class ReflectTag extends WeakenMoveScreenTag { */ class LightScreenTag extends WeakenMoveScreenTag { constructor(turnCount: number, sourceId: number, side: ArenaTagSide) { - super(ArenaTagType.LIGHT_SCREEN, turnCount, Moves.LIGHT_SCREEN, sourceId, side, [ MoveCategory.SPECIAL ]); + super(ArenaTagType.LIGHT_SCREEN, turnCount, Moves.LIGHT_SCREEN, sourceId, side, [MoveCategory.SPECIAL]); } - onAdd(arena: Arena, quiet: boolean = false): void { + onAdd(_arena: Arena, quiet = false): void { if (!quiet) { - globalScene.queueMessage(i18next.t(`arenaTag:lightScreenOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`)); + globalScene.queueMessage( + i18next.t( + `arenaTag:lightScreenOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + ), + ); } } } @@ -237,12 +275,19 @@ class LightScreenTag extends WeakenMoveScreenTag { */ class AuroraVeilTag extends WeakenMoveScreenTag { constructor(turnCount: number, sourceId: number, side: ArenaTagSide) { - super(ArenaTagType.AURORA_VEIL, turnCount, Moves.AURORA_VEIL, sourceId, side, [ MoveCategory.SPECIAL, MoveCategory.PHYSICAL ]); + super(ArenaTagType.AURORA_VEIL, turnCount, Moves.AURORA_VEIL, sourceId, side, [ + MoveCategory.SPECIAL, + MoveCategory.PHYSICAL, + ]); } - onAdd(arena: Arena, quiet: boolean = false): void { + onAdd(_arena: Arena, quiet = false): void { if (!quiet) { - globalScene.queueMessage(i18next.t(`arenaTag:auroraVeilOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`)); + globalScene.queueMessage( + i18next.t( + `arenaTag:auroraVeilOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + ), + ); } } } @@ -259,19 +304,31 @@ export class ConditionalProtectTag extends ArenaTag { /** Does this apply to all moves, including those that ignore other forms of protection? */ protected ignoresBypass: boolean; - constructor(tagType: ArenaTagType, sourceMove: Moves, sourceId: number, side: ArenaTagSide, condition: ProtectConditionFunc, ignoresBypass: boolean = false) { + constructor( + tagType: ArenaTagType, + sourceMove: Moves, + sourceId: number, + side: ArenaTagSide, + condition: ProtectConditionFunc, + ignoresBypass = false, + ) { super(tagType, 1, sourceMove, sourceId, side); this.protectConditionFunc = condition; this.ignoresBypass = ignoresBypass; } - onAdd(arena: Arena): void { - globalScene.queueMessage(i18next.t(`arenaTag:conditionalProtectOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, { moveName: super.getMoveName() })); + onAdd(_arena: Arena): void { + globalScene.queueMessage( + i18next.t( + `arenaTag:conditionalProtectOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + { moveName: super.getMoveName() }, + ), + ); } // Removes default message for effect removal - onRemove(arena: Arena): void { } + onRemove(_arena: Arena): void {} /** * Checks incoming moves against the condition function @@ -285,18 +342,28 @@ export class ConditionalProtectTag extends ArenaTag { * @param ignoresProtectBypass a {@linkcode BooleanHolder} used to flag if a protection effect supercedes effects that ignore protection * @returns `true` if this tag protected against the attack; `false` otherwise */ - override apply(arena: Arena, simulated: boolean, isProtected: BooleanHolder, attacker: Pokemon, defender: Pokemon, - moveId: Moves, ignoresProtectBypass: BooleanHolder): boolean { - - if ((this.side === ArenaTagSide.PLAYER) === defender.isPlayer() - && this.protectConditionFunc(arena, moveId)) { + override apply( + arena: Arena, + simulated: boolean, + isProtected: BooleanHolder, + attacker: Pokemon, + defender: Pokemon, + moveId: Moves, + ignoresProtectBypass: BooleanHolder, + ): boolean { + if ((this.side === ArenaTagSide.PLAYER) === defender.isPlayer() && this.protectConditionFunc(arena, moveId)) { if (!isProtected.value) { isProtected.value = true; if (!simulated) { attacker.stopMultiHit(defender); new CommonBattleAnim(CommonAnim.PROTECT, defender).play(); - globalScene.queueMessage(i18next.t("arenaTag:conditionalProtectApply", { moveName: super.getMoveName(), pokemonNameWithAffix: getPokemonNameWithAffix(defender) })); + globalScene.queueMessage( + i18next.t("arenaTag:conditionalProtectApply", { + moveName: super.getMoveName(), + pokemonNameWithAffix: getPokemonNameWithAffix(defender), + }), + ); } } @@ -310,12 +377,12 @@ export class ConditionalProtectTag extends ArenaTag { /** * Condition function for {@link https://bulbapedia.bulbagarden.net/wiki/Quick_Guard_(move) Quick Guard's} * protection effect. - * @param arena {@linkcode Arena} The arena containing the protection effect + * @param _arena {@linkcode Arena} The arena containing the protection effect * @param moveId {@linkcode Moves} The move to check against this condition * @returns `true` if the incoming move's priority is greater than 0. * This includes moves with modified priorities from abilities (e.g. Prankster) */ -const QuickGuardConditionFunc: ProtectConditionFunc = (arena, moveId) => { +const QuickGuardConditionFunc: ProtectConditionFunc = (_arena, moveId) => { const move = allMoves[moveId]; const effectPhase = globalScene.getCurrentPhase(); @@ -341,11 +408,11 @@ class QuickGuardTag extends ConditionalProtectTag { /** * Condition function for {@link https://bulbapedia.bulbagarden.net/wiki/Wide_Guard_(move) Wide Guard's} * protection effect. - * @param arena {@linkcode Arena} The arena containing the protection effect + * @param _arena {@linkcode Arena} The arena containing the protection effect * @param moveId {@linkcode Moves} The move to check against this condition * @returns `true` if the incoming move is multi-targeted (even if it's only used against one Pokemon). */ -const WideGuardConditionFunc: ProtectConditionFunc = (arena, moveId) : boolean => { +const WideGuardConditionFunc: ProtectConditionFunc = (_arena, moveId): boolean => { const move = allMoves[moveId]; switch (move.moveTarget) { @@ -372,11 +439,11 @@ class WideGuardTag extends ConditionalProtectTag { /** * Condition function for {@link https://bulbapedia.bulbagarden.net/wiki/Mat_Block_(move) Mat Block's} * protection effect. - * @param arena {@linkcode Arena} The arena containing the protection effect. + * @param _arena {@linkcode Arena} The arena containing the protection effect. * @param moveId {@linkcode Moves} The move to check against this condition. * @returns `true` if the incoming move is not a Status move. */ -const MatBlockConditionFunc: ProtectConditionFunc = (arena, moveId) : boolean => { +const MatBlockConditionFunc: ProtectConditionFunc = (_arena, moveId): boolean => { const move = allMoves[moveId]; return move.category !== MoveCategory.STATUS; }; @@ -390,11 +457,15 @@ class MatBlockTag extends ConditionalProtectTag { super(ArenaTagType.MAT_BLOCK, Moves.MAT_BLOCK, sourceId, side, MatBlockConditionFunc); } - onAdd(arena: Arena) { + onAdd(_arena: Arena) { if (this.sourceId) { const source = globalScene.getPokemonById(this.sourceId); if (source) { - globalScene.queueMessage(i18next.t("arenaTag:matBlockOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(source) })); + globalScene.queueMessage( + i18next.t("arenaTag:matBlockOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(source), + }), + ); } else { console.warn("Failed to get source for MatBlockTag onAdd"); } @@ -405,24 +476,26 @@ class MatBlockTag extends ConditionalProtectTag { /** * Condition function for {@link https://bulbapedia.bulbagarden.net/wiki/Crafty_Shield_(move) Crafty Shield's} * protection effect. - * @param arena {@linkcode Arena} The arena containing the protection effect + * @param _arena {@linkcode Arena} The arena containing the protection effect * @param moveId {@linkcode Moves} The move to check against this condition * @returns `true` if the incoming move is a Status move, is not a hazard, and does not target all * Pokemon or sides of the field. */ -const CraftyShieldConditionFunc: ProtectConditionFunc = (arena, moveId) => { +const CraftyShieldConditionFunc: ProtectConditionFunc = (_arena, moveId) => { const move = allMoves[moveId]; - return move.category === MoveCategory.STATUS - && move.moveTarget !== MoveTarget.ENEMY_SIDE - && move.moveTarget !== MoveTarget.BOTH_SIDES - && move.moveTarget !== MoveTarget.ALL; + return ( + move.category === MoveCategory.STATUS && + move.moveTarget !== MoveTarget.ENEMY_SIDE && + move.moveTarget !== MoveTarget.BOTH_SIDES && + move.moveTarget !== MoveTarget.ALL + ); }; /** * Arena Tag class for {@link https://bulbapedia.bulbagarden.net/wiki/Crafty_Shield_(move) Crafty Shield} * Condition: The incoming move is a Status move, is not a hazard, and does * not target all Pokemon or sides of the field. -*/ + */ class CraftyShieldTag extends ConditionalProtectTag { constructor(sourceId: number, side: ArenaTagSide) { super(ArenaTagType.CRAFTY_SHIELD, Moves.CRAFTY_SHIELD, sourceId, side, CraftyShieldConditionFunc, true); @@ -446,19 +519,23 @@ export class NoCritTag extends ArenaTag { } /** Queues a message upon adding this effect to the field */ - onAdd(arena: Arena): void { - globalScene.queueMessage(i18next.t(`arenaTag:noCritOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : "Enemy"}`, { - moveName: this.getMoveName() - })); + onAdd(_arena: Arena): void { + globalScene.queueMessage( + i18next.t(`arenaTag:noCritOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : "Enemy"}`, { + moveName: this.getMoveName(), + }), + ); } /** Queues a message upon removing this effect from the field */ - onRemove(arena: Arena): void { + onRemove(_arena: Arena): void { const source = globalScene.getPokemonById(this.sourceId!); // TODO: is this bang correct? - globalScene.queueMessage(i18next.t("arenaTag:noCritOnRemove", { - pokemonNameWithAffix: getPokemonNameWithAffix(source ?? undefined), - moveName: this.getMoveName() - })); + globalScene.queueMessage( + i18next.t("arenaTag:noCritOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(source ?? undefined), + moveName: this.getMoveName(), + }), + ); } } @@ -475,12 +552,14 @@ class WishTag extends ArenaTag { super(ArenaTagType.WISH, turnCount, Moves.WISH, sourceId, side); } - onAdd(arena: Arena): void { + onAdd(_arena: Arena): void { if (this.sourceId) { const user = globalScene.getPokemonById(this.sourceId); if (user) { this.battlerIndex = user.getBattlerIndex(); - this.triggerMessage = i18next.t("arenaTag:wishTagOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(user) }); + this.triggerMessage = i18next.t("arenaTag:wishTagOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(user), + }); this.healHp = toDmgValue(user.getMaxHp() / 2); } else { console.warn("Failed to get source for WishTag onAdd"); @@ -488,7 +567,7 @@ class WishTag extends ArenaTag { } } - onRemove(arena: Arena): void { + onRemove(_arena: Arena): void { const target = globalScene.getField()[this.battlerIndex]; if (target?.isActive(true)) { globalScene.queueMessage(this.triggerMessage); @@ -501,7 +580,7 @@ class WishTag extends ArenaTag { * Abstract class to implement weakened moves of a specific type. */ export class WeakenMoveTypeTag extends ArenaTag { - private weakenedType: Type; + private weakenedType: PokemonType; /** * Creates a new instance of the WeakenMoveTypeTag class. @@ -512,7 +591,7 @@ export class WeakenMoveTypeTag extends ArenaTag { * @param sourceMove - The move that created the tag. * @param sourceId - The ID of the source of the tag. */ - constructor(tagType: ArenaTagType, turnCount: number, type: Type, sourceMove: Moves, sourceId: number) { + constructor(tagType: ArenaTagType, turnCount: number, type: PokemonType, sourceMove: Moves, sourceId: number) { super(tagType, turnCount, sourceMove, sourceId); this.weakenedType = type; @@ -520,13 +599,13 @@ export class WeakenMoveTypeTag extends ArenaTag { /** * Reduces an attack's power by 0.33x if it matches this tag's weakened type. - * @param arena n/a - * @param simulated n/a - * @param type the attack's {@linkcode Type} + * @param _arena n/a + * @param _simulated n/a + * @param type the attack's {@linkcode PokemonType} * @param power a {@linkcode NumberHolder} containing the attack's power * @returns `true` if the attack's power was reduced; `false` otherwise. */ - override apply(arena: Arena, simulated: boolean, type: Type, power: NumberHolder): boolean { + override apply(_arena: Arena, _simulated: boolean, type: PokemonType, power: NumberHolder): boolean { if (type === this.weakenedType) { power.value *= 0.33; return true; @@ -541,14 +620,14 @@ export class WeakenMoveTypeTag extends ArenaTag { */ class MudSportTag extends WeakenMoveTypeTag { constructor(turnCount: number, sourceId: number) { - super(ArenaTagType.MUD_SPORT, turnCount, Type.ELECTRIC, Moves.MUD_SPORT, sourceId); + super(ArenaTagType.MUD_SPORT, turnCount, PokemonType.ELECTRIC, Moves.MUD_SPORT, sourceId); } - onAdd(arena: Arena): void { + onAdd(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:mudSportOnAdd")); } - onRemove(arena: Arena): void { + onRemove(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:mudSportOnRemove")); } } @@ -559,14 +638,14 @@ class MudSportTag extends WeakenMoveTypeTag { */ class WaterSportTag extends WeakenMoveTypeTag { constructor(turnCount: number, sourceId: number) { - super(ArenaTagType.WATER_SPORT, turnCount, Type.FIRE, Moves.WATER_SPORT, sourceId); + super(ArenaTagType.WATER_SPORT, turnCount, PokemonType.FIRE, Moves.WATER_SPORT, sourceId); } - onAdd(arena: Arena): void { + onAdd(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:waterSportOnAdd")); } - onRemove(arena: Arena): void { + onRemove(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:waterSportOnRemove")); } } @@ -582,22 +661,22 @@ export class IonDelugeTag extends ArenaTag { } /** Queues an on-add message */ - onAdd(arena: Arena): void { + onAdd(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:plasmaFistsOnAdd")); } - onRemove(arena: Arena): void { } // Removes default on-remove message + onRemove(_arena: Arena): void {} // Removes default on-remove message /** * Converts Normal-type moves to Electric type - * @param arena n/a - * @param simulated n/a - * @param moveType a {@linkcode NumberHolder} containing a move's {@linkcode Type} + * @param _arena n/a + * @param _simulated n/a + * @param moveType a {@linkcode NumberHolder} containing a move's {@linkcode PokemonType} * @returns `true` if the given move type changed; `false` otherwise. */ - override apply(arena: Arena, simulated: boolean, moveType: NumberHolder): boolean { - if (moveType.value === Type.NORMAL) { - moveType.value = Type.ELECTRIC; + override apply(_arena: Arena, _simulated: boolean, moveType: NumberHolder): boolean { + if (moveType.value === PokemonType.NORMAL) { + moveType.value = PokemonType.ELECTRIC; return true; } return false; @@ -637,12 +716,12 @@ export class ArenaTrapTag extends ArenaTag { /** * Activates the hazard effect onto a Pokemon when it enters the field - * @param arena the {@linkcode Arena} containing this tag + * @param _arena the {@linkcode Arena} containing this tag * @param simulated if `true`, only checks if the hazard would activate. * @param pokemon the {@linkcode Pokemon} triggering this hazard * @returns `true` if this hazard affects the given Pokemon; `false` otherwise. */ - override apply(arena: Arena, simulated: boolean, pokemon: Pokemon): boolean { + override apply(_arena: Arena, simulated: boolean, pokemon: Pokemon): boolean { if ((this.side === ArenaTagSide.PLAYER) !== pokemon.isPlayer()) { return false; } @@ -650,12 +729,14 @@ export class ArenaTrapTag extends ArenaTag { return this.activateTrap(pokemon, simulated); } - activateTrap(pokemon: Pokemon, simulated: boolean): boolean { + activateTrap(_pokemon: Pokemon, _simulated: boolean): boolean { return false; } getMatchupScoreMultiplier(pokemon: Pokemon): number { - return pokemon.isGrounded() ? 1 : Phaser.Math.Linear(0, 1 / Math.pow(2, this.layers), Math.min(pokemon.getHpRatio(), 0.5) * 2); + return pokemon.isGrounded() + ? 1 + : Phaser.Math.Linear(0, 1 / Math.pow(2, this.layers), Math.min(pokemon.getHpRatio(), 0.5) * 2); } loadTag(source: any): void { @@ -675,12 +756,17 @@ class SpikesTag extends ArenaTrapTag { super(ArenaTagType.SPIKES, Moves.SPIKES, sourceId, side, 3); } - onAdd(arena: Arena, quiet: boolean = false): void { + onAdd(arena: Arena, quiet = false): void { super.onAdd(arena); const source = this.sourceId ? globalScene.getPokemonById(this.sourceId) : null; if (!quiet && source) { - globalScene.queueMessage(i18next.t("arenaTag:spikesOnAdd", { moveName: this.getMoveName(), opponentDesc: source.getOpponentDescriptor() })); + globalScene.queueMessage( + i18next.t("arenaTag:spikesOnAdd", { + moveName: this.getMoveName(), + opponentDesc: source.getOpponentDescriptor(), + }), + ); } } @@ -697,7 +783,11 @@ class SpikesTag extends ArenaTrapTag { const damageHpRatio = 1 / (10 - 2 * this.layers); const damage = toDmgValue(pokemon.getMaxHp() * damageHpRatio); - globalScene.queueMessage(i18next.t("arenaTag:spikesActivateTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("arenaTag:spikesActivateTrap", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); pokemon.damageAndUpdate(damage, HitResult.OTHER); if (pokemon.turnData) { pokemon.turnData.damageTaken += damage; @@ -724,12 +814,17 @@ class ToxicSpikesTag extends ArenaTrapTag { this.neutralized = false; } - onAdd(arena: Arena, quiet: boolean = false): void { + onAdd(arena: Arena, quiet = false): void { super.onAdd(arena); const source = this.sourceId ? globalScene.getPokemonById(this.sourceId) : null; if (!quiet && source) { - globalScene.queueMessage(i18next.t("arenaTag:toxicSpikesOnAdd", { moveName: this.getMoveName(), opponentDesc: source.getOpponentDescriptor() })); + globalScene.queueMessage( + i18next.t("arenaTag:toxicSpikesOnAdd", { + moveName: this.getMoveName(), + opponentDesc: source.getOpponentDescriptor(), + }), + ); } } @@ -744,15 +839,22 @@ class ToxicSpikesTag extends ArenaTrapTag { if (simulated) { return true; } - if (pokemon.isOfType(Type.POISON)) { + if (pokemon.isOfType(PokemonType.POISON)) { this.neutralized = true; if (globalScene.arena.removeTag(this.tagType)) { - globalScene.queueMessage(i18next.t("arenaTag:toxicSpikesActivateTrapPoison", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: this.getMoveName() })); + globalScene.queueMessage( + i18next.t("arenaTag:toxicSpikesActivateTrapPoison", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: this.getMoveName(), + }), + ); return true; } } else if (!pokemon.status) { const toxic = this.layers > 1; - if (pokemon.trySetStatus(!toxic ? StatusEffect.POISON : StatusEffect.TOXIC, true, null, 0, this.getMoveName())) { + if ( + pokemon.trySetStatus(!toxic ? StatusEffect.POISON : StatusEffect.TOXIC, true, null, 0, this.getMoveName()) + ) { return true; } } @@ -765,7 +867,7 @@ class ToxicSpikesTag extends ArenaTrapTag { if (pokemon.isGrounded() || !pokemon.canSetStatus(StatusEffect.POISON, true)) { return 1; } - if (pokemon.isOfType(Type.POISON)) { + if (pokemon.isOfType(PokemonType.POISON)) { return 1.25; } return super.getMatchupScoreMultiplier(pokemon); @@ -780,7 +882,13 @@ class ToxicSpikesTag extends ArenaTrapTag { export class DelayedAttackTag extends ArenaTag { public targetIndex: BattlerIndex; - constructor(tagType: ArenaTagType, sourceMove: Moves | undefined, sourceId: number, targetIndex: BattlerIndex, side: ArenaTagSide = ArenaTagSide.BOTH) { + constructor( + tagType: ArenaTagType, + sourceMove: Moves | undefined, + sourceId: number, + targetIndex: BattlerIndex, + side: ArenaTagSide = ArenaTagSide.BOTH, + ) { super(tagType, 3, sourceMove, sourceId, side); this.targetIndex = targetIndex; @@ -791,13 +899,15 @@ export class DelayedAttackTag extends ArenaTag { const ret = super.lapse(arena); if (!ret) { - globalScene.unshiftPhase(new MoveEffectPhase(this.sourceId!, [ this.targetIndex ], new PokemonMove(this.sourceMove!, 0, 0, true))); // TODO: are those bangs correct? + globalScene.unshiftPhase( + new MoveEffectPhase(this.sourceId!, [this.targetIndex], new PokemonMove(this.sourceMove!, 0, 0, true)), + ); // TODO: are those bangs correct? } return ret; } - onRemove(arena: Arena): void { } + onRemove(_arena: Arena): void {} } /** @@ -810,19 +920,23 @@ class StealthRockTag extends ArenaTrapTag { super(ArenaTagType.STEALTH_ROCK, Moves.STEALTH_ROCK, sourceId, side, 1); } - onAdd(arena: Arena, quiet: boolean = false): void { + onAdd(arena: Arena, quiet = false): void { super.onAdd(arena); const source = this.sourceId ? globalScene.getPokemonById(this.sourceId) : null; if (!quiet && source) { - globalScene.queueMessage(i18next.t("arenaTag:stealthRockOnAdd", { opponentDesc: source.getOpponentDescriptor() })); + globalScene.queueMessage( + i18next.t("arenaTag:stealthRockOnAdd", { + opponentDesc: source.getOpponentDescriptor(), + }), + ); } } getDamageHpRatio(pokemon: Pokemon): number { - const effectiveness = pokemon.getAttackTypeEffectiveness(Type.ROCK, undefined, true); + const effectiveness = pokemon.getAttackTypeEffectiveness(PokemonType.ROCK, undefined, true); - let damageHpRatio: number = 0; + let damageHpRatio = 0; switch (effectiveness) { case 0: @@ -850,7 +964,7 @@ class StealthRockTag extends ArenaTrapTag { override activateTrap(pokemon: Pokemon, simulated: boolean): boolean { const cancelled = new BooleanHolder(false); - applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled); + applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled); if (cancelled.value) { return false; @@ -863,7 +977,11 @@ class StealthRockTag extends ArenaTrapTag { return true; } const damage = toDmgValue(pokemon.getMaxHp() * damageHpRatio); - globalScene.queueMessage(i18next.t("arenaTag:stealthRockActivateTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("arenaTag:stealthRockActivateTrap", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); pokemon.damageAndUpdate(damage, HitResult.OTHER); if (pokemon.turnData) { pokemon.turnData.damageTaken += damage; @@ -890,11 +1008,16 @@ class StickyWebTag extends ArenaTrapTag { super(ArenaTagType.STICKY_WEB, Moves.STICKY_WEB, sourceId, side, 1); } - onAdd(arena: Arena, quiet: boolean = false): void { + onAdd(arena: Arena, quiet = false): void { super.onAdd(arena); const source = this.sourceId ? globalScene.getPokemonById(this.sourceId) : null; if (!quiet && source) { - globalScene.queueMessage(i18next.t("arenaTag:stickyWebOnAdd", { moveName: this.getMoveName(), opponentDesc: source.getOpponentDescriptor() })); + globalScene.queueMessage( + i18next.t("arenaTag:stickyWebOnAdd", { + moveName: this.getMoveName(), + opponentDesc: source.getOpponentDescriptor(), + }), + ); } } @@ -908,16 +1031,32 @@ class StickyWebTag extends ArenaTrapTag { } if (!cancelled.value) { - globalScene.queueMessage(i18next.t("arenaTag:stickyWebActivateTrap", { pokemonName: pokemon.getNameToRender() })); + globalScene.queueMessage( + i18next.t("arenaTag:stickyWebActivateTrap", { + pokemonName: pokemon.getNameToRender(), + }), + ); const stages = new NumberHolder(-1); - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, [ Stat.SPD ], stages.value)); + globalScene.unshiftPhase( + new StatStageChangePhase( + pokemon.getBattlerIndex(), + false, + [Stat.SPD], + stages.value, + true, + false, + true, + null, + false, + true, + ), + ); return true; } } return false; } - } /** @@ -932,25 +1071,29 @@ export class TrickRoomTag extends ArenaTag { /** * Reverses Speed-based turn order for all Pokemon on the field - * @param arena n/a - * @param simulated n/a + * @param _arena n/a + * @param _simulated n/a * @param speedReversed a {@linkcode BooleanHolder} used to flag if Speed-based * turn order should be reversed. * @returns `true` if turn order is successfully reversed; `false` otherwise */ - override apply(arena: Arena, simulated: boolean, speedReversed: BooleanHolder): boolean { + override apply(_arena: Arena, _simulated: boolean, speedReversed: BooleanHolder): boolean { speedReversed.value = !speedReversed.value; return true; } - onAdd(arena: Arena): void { + onAdd(_arena: Arena): void { const source = this.sourceId ? globalScene.getPokemonById(this.sourceId) : null; if (source) { - globalScene.queueMessage(i18next.t("arenaTag:trickRoomOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(source) })); + globalScene.queueMessage( + i18next.t("arenaTag:trickRoomOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(source), + }), + ); } } - onRemove(arena: Arena): void { + onRemove(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:trickRoomOnRemove")); } } @@ -965,9 +1108,9 @@ export class GravityTag extends ArenaTag { super(ArenaTagType.GRAVITY, turnCount, Moves.GRAVITY); } - onAdd(arena: Arena): void { + onAdd(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:gravityOnAdd")); - globalScene.getField(true).forEach((pokemon) => { + globalScene.getField(true).forEach(pokemon => { if (pokemon !== null) { pokemon.removeTag(BattlerTagType.FLOATING); pokemon.removeTag(BattlerTagType.TELEKINESIS); @@ -978,7 +1121,7 @@ export class GravityTag extends ArenaTag { }); } - onRemove(arena: Arena): void { + onRemove(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:gravityOnRemove")); } } @@ -993,9 +1136,13 @@ class TailwindTag extends ArenaTag { super(ArenaTagType.TAILWIND, turnCount, Moves.TAILWIND, sourceId, side); } - onAdd(arena: Arena, quiet: boolean = false): void { + onAdd(_arena: Arena, quiet = false): void { if (!quiet) { - globalScene.queueMessage(i18next.t(`arenaTag:tailwindOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`)); + globalScene.queueMessage( + i18next.t( + `arenaTag:tailwindOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + ), + ); } const source = globalScene.getPokemonById(this.sourceId!); //TODO: this bang is questionable! @@ -1005,19 +1152,28 @@ class TailwindTag extends ArenaTag { // Apply the CHARGED tag to party members with the WIND_POWER ability if (pokemon.hasAbility(Abilities.WIND_POWER) && !pokemon.getTag(BattlerTagType.CHARGED)) { pokemon.addTag(BattlerTagType.CHARGED); - globalScene.queueMessage(i18next.t("abilityTriggers:windPowerCharged", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: this.getMoveName() })); + globalScene.queueMessage( + i18next.t("abilityTriggers:windPowerCharged", { + pokemonName: getPokemonNameWithAffix(pokemon), + moveName: this.getMoveName(), + }), + ); } // Raise attack by one stage if party member has WIND_RIDER ability if (pokemon.hasAbility(Abilities.WIND_RIDER)) { globalScene.unshiftPhase(new ShowAbilityPhase(pokemon.getBattlerIndex())); - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.ATK ], 1, true)); + globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.ATK], 1, true)); } } } - onRemove(arena: Arena, quiet: boolean = false): void { + onRemove(_arena: Arena, quiet = false): void { if (!quiet) { - globalScene.queueMessage(i18next.t(`arenaTag:tailwindOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`)); + globalScene.queueMessage( + i18next.t( + `arenaTag:tailwindOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + ), + ); } } } @@ -1031,11 +1187,11 @@ class HappyHourTag extends ArenaTag { super(ArenaTagType.HAPPY_HOUR, turnCount, Moves.HAPPY_HOUR, sourceId, side); } - onAdd(arena: Arena): void { + onAdd(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:happyHourOnAdd")); } - onRemove(arena: Arena): void { + onRemove(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:happyHourOnRemove")); } } @@ -1045,12 +1201,20 @@ class SafeguardTag extends ArenaTag { super(ArenaTagType.SAFEGUARD, turnCount, Moves.SAFEGUARD, sourceId, side); } - onAdd(arena: Arena): void { - globalScene.queueMessage(i18next.t(`arenaTag:safeguardOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`)); + onAdd(_arena: Arena): void { + globalScene.queueMessage( + i18next.t( + `arenaTag:safeguardOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + ), + ); } - onRemove(arena: Arena): void { - globalScene.queueMessage(i18next.t(`arenaTag:safeguardOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`)); + onRemove(_arena: Arena): void { + globalScene.queueMessage( + i18next.t( + `arenaTag:safeguardOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + ), + ); } } @@ -1077,12 +1241,16 @@ class ImprisonTag extends ArenaTrapTag { const source = this.getSourcePokemon(); if (source) { const party = this.getAffectedPokemon(); - party?.forEach((p: Pokemon ) => { + party?.forEach((p: Pokemon) => { if (p.isAllowedInBattle()) { p.addTag(BattlerTagType.IMPRISON, 1, Moves.IMPRISON, this.sourceId); } }); - globalScene.queueMessage(i18next.t("battlerTags:imprisonOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(source) })); + globalScene.queueMessage( + i18next.t("battlerTags:imprisonOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(source), + }), + ); } } @@ -1103,7 +1271,7 @@ class ImprisonTag extends ArenaTrapTag { */ override activateTrap(pokemon: Pokemon): boolean { const source = this.getSourcePokemon(); - if (source && source.isActive(true) && pokemon.isAllowedInBattle()) { + if (source?.isActive(true) && pokemon.isAllowedInBattle()) { pokemon.addTag(BattlerTagType.IMPRISON, 1, Moves.IMPRISON, this.sourceId); } return true; @@ -1133,23 +1301,34 @@ class FireGrassPledgeTag extends ArenaTag { super(ArenaTagType.FIRE_GRASS_PLEDGE, 4, Moves.FIRE_PLEDGE, sourceId, side); } - override onAdd(arena: Arena): void { + override onAdd(_arena: Arena): void { // "A sea of fire enveloped your/the opposing team!" - globalScene.queueMessage(i18next.t(`arenaTag:fireGrassPledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`)); + globalScene.queueMessage( + i18next.t( + `arenaTag:fireGrassPledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + ), + ); } override lapse(arena: Arena): boolean { - const field: Pokemon[] = (this.side === ArenaTagSide.PLAYER) - ? globalScene.getPlayerField() - : globalScene.getEnemyField(); + const field: Pokemon[] = + this.side === ArenaTagSide.PLAYER ? globalScene.getPlayerField() : globalScene.getEnemyField(); - field.filter(pokemon => !pokemon.isOfType(Type.FIRE) && !pokemon.switchOutStatus).forEach(pokemon => { - // "{pokemonNameWithAffix} was hurt by the sea of fire!" - globalScene.queueMessage(i18next.t("arenaTag:fireGrassPledgeLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); - // TODO: Replace this with a proper animation - globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.MAGMA_STORM)); - pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8)); - }); + field + .filter(pokemon => !pokemon.isOfType(PokemonType.FIRE) && !pokemon.switchOutStatus) + .forEach(pokemon => { + // "{pokemonNameWithAffix} was hurt by the sea of fire!" + globalScene.queueMessage( + i18next.t("arenaTag:fireGrassPledgeLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); + // TODO: Replace this with a proper animation + globalScene.unshiftPhase( + new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.MAGMA_STORM), + ); + pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8)); + }); return super.lapse(arena); } @@ -1167,20 +1346,24 @@ class WaterFirePledgeTag extends ArenaTag { super(ArenaTagType.WATER_FIRE_PLEDGE, 4, Moves.WATER_PLEDGE, sourceId, side); } - override onAdd(arena: Arena): void { + override onAdd(_arena: Arena): void { // "A rainbow appeared in the sky on your/the opposing team's side!" - globalScene.queueMessage(i18next.t(`arenaTag:waterFirePledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`)); + globalScene.queueMessage( + i18next.t( + `arenaTag:waterFirePledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + ), + ); } /** * Doubles the chance for the given move's secondary effect(s) to trigger - * @param arena the {@linkcode Arena} containing this tag - * @param simulated n/a + * @param _arena the {@linkcode Arena} containing this tag + * @param _simulated n/a * @param moveChance a {@linkcode NumberHolder} containing * the move's current effect chance * @returns `true` if the move's effect chance was doubled (currently always `true`) */ - override apply(arena: Arena, simulated: boolean, moveChance: NumberHolder): boolean { + override apply(_arena: Arena, _simulated: boolean, moveChance: NumberHolder): boolean { moveChance.value *= 2; return true; } @@ -1197,9 +1380,13 @@ class GrassWaterPledgeTag extends ArenaTag { super(ArenaTagType.GRASS_WATER_PLEDGE, 4, Moves.GRASS_PLEDGE, sourceId, side); } - override onAdd(arena: Arena): void { + override onAdd(_arena: Arena): void { // "A swamp enveloped your/the opposing team!" - globalScene.queueMessage(i18next.t(`arenaTag:grassWaterPledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`)); + globalScene.queueMessage( + i18next.t( + `arenaTag:grassWaterPledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, + ), + ); } } @@ -1215,14 +1402,96 @@ export class FairyLockTag extends ArenaTag { super(ArenaTagType.FAIRY_LOCK, turnCount, Moves.FAIRY_LOCK, sourceId); } - onAdd(arena: Arena): void { + onAdd(_arena: Arena): void { globalScene.queueMessage(i18next.t("arenaTag:fairyLockOnAdd")); } +} +/** + * Arena tag class for {@link https://bulbapedia.bulbagarden.net/wiki/Neutralizing_Gas_(Ability) Neutralizing Gas} + * + * Keeps track of the number of pokemon on the field with Neutralizing Gas - If it drops to zero, the effect is ended and abilities are reactivated + * + * Additionally ends onLose abilities when it is activated + */ +export class SuppressAbilitiesTag extends ArenaTag { + private sourceCount: number; + private beingRemoved: boolean; + + constructor(sourceId: number) { + super(ArenaTagType.NEUTRALIZING_GAS, 0, undefined, sourceId); + this.sourceCount = 1; + this.beingRemoved = false; + } + + public override onAdd(_arena: Arena): void { + const pokemon = this.getSourcePokemon(); + if (pokemon) { + globalScene.queueMessage( + i18next.t("arenaTag:neutralizingGasOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); + + for (const fieldPokemon of globalScene.getField(true)) { + if (fieldPokemon && fieldPokemon.id !== pokemon.id) { + [true, false].forEach(passive => applyOnLoseAbAttrs(fieldPokemon, passive)); + } + } + } + } + + public override onOverlap(_arena: Arena): void { + this.sourceCount++; + } + + public onSourceLeave(arena: Arena): void { + this.sourceCount--; + if (this.sourceCount <= 0) { + arena.removeTag(ArenaTagType.NEUTRALIZING_GAS); + } else if (this.sourceCount === 1) { + // With 1 source left, that pokemon's other abilities should reactivate + // This may be confusing for players but would be the most accurate gameplay-wise + // Could have a custom message that plays when a specific pokemon's NG ends? This entire thing exists due to passives after all + const setter = globalScene + .getField() + .filter(p => p?.hasAbilityWithAttr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, false))[0]; + applyOnGainAbAttrs(setter, setter.getAbility().hasAttr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr)); + } + } + + public override onRemove(_arena: Arena, quiet = false) { + this.beingRemoved = true; + if (!quiet) { + globalScene.queueMessage(i18next.t("arenaTag:neutralizingGasOnRemove")); + } + + for (const pokemon of globalScene.getField(true)) { + // There is only one pokemon with this attr on the field on removal, so its abilities are already active + if (pokemon && !pokemon.hasAbilityWithAttr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, false)) { + [true, false].forEach(passive => applyOnGainAbAttrs(pokemon, passive)); + } + } + } + + public shouldApplyToSelf(): boolean { + return this.sourceCount > 1; + } + + public isBeingRemoved() { + return this.beingRemoved; + } } // TODO: swap `sourceMove` and `sourceId` and make `sourceMove` an optional parameter -export function getArenaTag(tagType: ArenaTagType, turnCount: number, sourceMove: Moves | undefined, sourceId: number, targetIndex?: BattlerIndex, side: ArenaTagSide = ArenaTagSide.BOTH): ArenaTag | null { +export function getArenaTag( + tagType: ArenaTagType, + turnCount: number, + sourceMove: Moves | undefined, + sourceId: number, + targetIndex?: BattlerIndex, + side: ArenaTagSide = ArenaTagSide.BOTH, +): ArenaTag | null { switch (tagType) { case ArenaTagType.MIST: return new MistTag(turnCount, sourceId, side); @@ -1281,6 +1550,8 @@ export function getArenaTag(tagType: ArenaTagType, turnCount: number, sourceMove return new GrassWaterPledgeTag(sourceId, side); case ArenaTagType.FAIRY_LOCK: return new FairyLockTag(turnCount, sourceId); + case ArenaTagType.NEUTRALIZING_GAS: + return new SuppressAbilitiesTag(sourceId); default: return null; } @@ -1292,9 +1563,15 @@ export function getArenaTag(tagType: ArenaTagType, turnCount: number, sourceMove * @return {ArenaTag} The valid arena tag */ export function loadArenaTag(source: ArenaTag | any): ArenaTag { - const tag = getArenaTag(source.tagType, source.turnCount, source.sourceMove, source.sourceId, source.targetIndex, source.side) - ?? new NoneTag(); + const tag = + getArenaTag( + source.tagType, + source.turnCount, + source.sourceMove, + source.sourceId, + source.targetIndex, + source.side, + ) ?? new NoneTag(); tag.loadTag(source); return tag; } - diff --git a/src/data/balance/biomes.ts b/src/data/balance/biomes.ts index 240881ad580..71a48162e57 100644 --- a/src/data/balance/biomes.ts +++ b/src/data/balance/biomes.ts @@ -1,4 +1,4 @@ -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import * as Utils from "#app/utils"; import type { SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions"; import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; @@ -26,11 +26,11 @@ export function getBiomeName(biome: Biome | -1) { } interface BiomeLinks { - [key: integer]: Biome | (Biome | [Biome, integer])[] + [key: number]: Biome | (Biome | [Biome, number])[] } interface BiomeDepths { - [key: integer]: [integer, integer] + [key: number]: [number, number] } export const biomeLinks: BiomeLinks = { @@ -87,27 +87,39 @@ export enum BiomePoolTier { export const uncatchableSpecies: Species[] = []; export interface SpeciesTree { - [key: integer]: Species[] + [key: number]: Species[] } export interface PokemonPools { - [key: integer]: (Species | SpeciesTree)[] + [key: number]: (Species | SpeciesTree)[] } export interface BiomeTierPokemonPools { - [key: integer]: PokemonPools + [key: number]: PokemonPools } export interface BiomePokemonPools { - [key: integer]: BiomeTierPokemonPools + [key: number]: BiomeTierPokemonPools } +export interface BiomeTierTod { + biome: Biome, + tier: BiomePoolTier, + tod: TimeOfDay[] +} + +export interface CatchableSpecies{ + [key: number]: BiomeTierTod[] +} + +export const catchableSpecies: CatchableSpecies = {}; + export interface BiomeTierTrainerPools { - [key: integer]: TrainerType[] + [key: number]: TrainerType[] } export interface BiomeTrainerPools { - [key: integer]: BiomeTierTrainerPools + [key: number]: BiomeTierTrainerPools } export const biomePokemonPools: BiomePokemonPools = { @@ -2010,450 +2022,451 @@ export const biomeTrainerPools: BiomeTrainerPools = { } }; +// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: init methods are expected to have many lines. export function initBiomes() { const pokemonBiomes = [ - [ Species.BULBASAUR, Type.GRASS, Type.POISON, [ + [ Species.BULBASAUR, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.GRASS, BiomePoolTier.RARE ] ] ], - [ Species.IVYSAUR, Type.GRASS, Type.POISON, [ + [ Species.IVYSAUR, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.GRASS, BiomePoolTier.RARE ] ] ], - [ Species.VENUSAUR, Type.GRASS, Type.POISON, [ + [ Species.VENUSAUR, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.GRASS, BiomePoolTier.RARE ], [ Biome.GRASS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.CHARMANDER, Type.FIRE, -1, [ + [ Species.CHARMANDER, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.CHARMELEON, Type.FIRE, -1, [ + [ Species.CHARMELEON, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.CHARIZARD, Type.FIRE, Type.FLYING, [ + [ Species.CHARIZARD, PokemonType.FIRE, PokemonType.FLYING, [ [ Biome.VOLCANO, BiomePoolTier.RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SQUIRTLE, Type.WATER, -1, [ + [ Species.SQUIRTLE, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ] ] ], - [ Species.WARTORTLE, Type.WATER, -1, [ + [ Species.WARTORTLE, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ] ] ], - [ Species.BLASTOISE, Type.WATER, -1, [ + [ Species.BLASTOISE, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ], [ Biome.LAKE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.CATERPIE, Type.BUG, -1, [ + [ Species.CATERPIE, PokemonType.BUG, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.METAPOD, Type.BUG, -1, [ + [ Species.METAPOD, PokemonType.BUG, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.BUTTERFREE, Type.BUG, Type.FLYING, [ + [ Species.BUTTERFREE, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.WEEDLE, Type.BUG, Type.POISON, [ + [ Species.WEEDLE, PokemonType.BUG, PokemonType.POISON, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.KAKUNA, Type.BUG, Type.POISON, [ + [ Species.KAKUNA, PokemonType.BUG, PokemonType.POISON, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.BEEDRILL, Type.BUG, Type.POISON, [ + [ Species.BEEDRILL, PokemonType.BUG, PokemonType.POISON, [ [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.PIDGEY, Type.NORMAL, Type.FLYING, [ + [ Species.PIDGEY, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.COMMON ] ] ], - [ Species.PIDGEOTTO, Type.NORMAL, Type.FLYING, [ + [ Species.PIDGEOTTO, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.COMMON ] ] ], - [ Species.PIDGEOT, Type.NORMAL, Type.FLYING, [ + [ Species.PIDGEOT, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.COMMON ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS ] ] ], - [ Species.RATTATA, Type.NORMAL, -1, [ + [ Species.RATTATA, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.METROPOLIS, BiomePoolTier.COMMON ], [ Biome.SLUM, BiomePoolTier.COMMON ] ] ], - [ Species.RATICATE, Type.NORMAL, -1, [ + [ Species.RATICATE, PokemonType.NORMAL, -1, [ [ Biome.METROPOLIS, BiomePoolTier.COMMON ], [ Biome.SLUM, BiomePoolTier.COMMON ] ] ], - [ Species.SPEAROW, Type.NORMAL, Type.FLYING, [ + [ Species.SPEAROW, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.COMMON ] ] ], - [ Species.FEAROW, Type.NORMAL, Type.FLYING, [ + [ Species.FEAROW, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.COMMON ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS ] ] ], - [ Species.EKANS, Type.POISON, -1, [ + [ Species.EKANS, PokemonType.POISON, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FOREST, BiomePoolTier.UNCOMMON ], [ Biome.SWAMP, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.ARBOK, Type.POISON, -1, [ + [ Species.ARBOK, PokemonType.POISON, -1, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON ], [ Biome.SWAMP, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SWAMP, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.PIKACHU, Type.ELECTRIC, -1, [ + [ Species.PIKACHU, PokemonType.ELECTRIC, -1, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], - [ Species.RAICHU, Type.ELECTRIC, -1, [ + [ Species.RAICHU, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.BOSS ] ] ], - [ Species.SANDSHREW, Type.GROUND, -1, [ + [ Species.SANDSHREW, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.DESERT, BiomePoolTier.COMMON ] ] ], - [ Species.SANDSLASH, Type.GROUND, -1, [ + [ Species.SANDSLASH, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.DESERT, BiomePoolTier.COMMON ], [ Biome.DESERT, BiomePoolTier.BOSS ] ] ], - [ Species.NIDORAN_F, Type.POISON, -1, [ + [ Species.NIDORAN_F, PokemonType.POISON, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, TimeOfDay.DAY ], [ Biome.TALL_GRASS, BiomePoolTier.COMMON, TimeOfDay.DAY ] ] ], - [ Species.NIDORINA, Type.POISON, -1, [ + [ Species.NIDORINA, PokemonType.POISON, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON, TimeOfDay.DAY ] ] ], - [ Species.NIDOQUEEN, Type.POISON, Type.GROUND, [ + [ Species.NIDOQUEEN, PokemonType.POISON, PokemonType.GROUND, [ [ Biome.TALL_GRASS, BiomePoolTier.BOSS, TimeOfDay.DAY ] ] ], - [ Species.NIDORAN_M, Type.POISON, -1, [ + [ Species.NIDORAN_M, PokemonType.POISON, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, TimeOfDay.DAY ], [ Biome.TALL_GRASS, BiomePoolTier.COMMON, TimeOfDay.DAY ] ] ], - [ Species.NIDORINO, Type.POISON, -1, [ + [ Species.NIDORINO, PokemonType.POISON, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON, TimeOfDay.DAY ] ] ], - [ Species.NIDOKING, Type.POISON, Type.GROUND, [ + [ Species.NIDOKING, PokemonType.POISON, PokemonType.GROUND, [ [ Biome.TALL_GRASS, BiomePoolTier.BOSS, TimeOfDay.DAY ] ] ], - [ Species.CLEFAIRY, Type.FAIRY, -1, [ + [ Species.CLEFAIRY, PokemonType.FAIRY, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ], [ Biome.SPACE, BiomePoolTier.COMMON ] ] ], - [ Species.CLEFABLE, Type.FAIRY, -1, [ + [ Species.CLEFABLE, PokemonType.FAIRY, -1, [ [ Biome.SPACE, BiomePoolTier.BOSS ] ] ], - [ Species.VULPIX, Type.FIRE, -1, [ + [ Species.VULPIX, PokemonType.FIRE, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], - [ Species.NINETALES, Type.FIRE, -1, [ + [ Species.NINETALES, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.JIGGLYPUFF, Type.NORMAL, Type.FAIRY, [ + [ Species.JIGGLYPUFF, PokemonType.NORMAL, PokemonType.FAIRY, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.WIGGLYTUFF, Type.NORMAL, Type.FAIRY, [ + [ Species.WIGGLYTUFF, PokemonType.NORMAL, PokemonType.FAIRY, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.ZUBAT, Type.POISON, Type.FLYING, [ + [ Species.ZUBAT, PokemonType.POISON, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.GOLBAT, Type.POISON, Type.FLYING, [ + [ Species.GOLBAT, PokemonType.POISON, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.ODDISH, Type.GRASS, Type.POISON, [ + [ Species.ODDISH, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.GLOOM, Type.GRASS, Type.POISON, [ + [ Species.GLOOM, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.VILEPLUME, Type.GRASS, Type.POISON, [ + [ Species.VILEPLUME, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.TALL_GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.PARAS, Type.BUG, Type.GRASS, [ + [ Species.PARAS, PokemonType.BUG, PokemonType.GRASS, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.PARASECT, Type.BUG, Type.GRASS, [ + [ Species.PARASECT, PokemonType.BUG, PokemonType.GRASS, [ [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.CAVE, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.VENONAT, Type.BUG, Type.POISON, [ + [ Species.VENONAT, PokemonType.BUG, PokemonType.POISON, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.FOREST, BiomePoolTier.COMMON, TimeOfDay.NIGHT ] ] ], - [ Species.VENOMOTH, Type.BUG, Type.POISON, [ + [ Species.VENOMOTH, PokemonType.BUG, PokemonType.POISON, [ [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.FOREST, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.FOREST, BiomePoolTier.BOSS, TimeOfDay.NIGHT ] ] ], - [ Species.DIGLETT, Type.GROUND, -1, [ + [ Species.DIGLETT, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.COMMON ] ] ], - [ Species.DUGTRIO, Type.GROUND, -1, [ + [ Species.DUGTRIO, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], - [ Species.MEOWTH, Type.NORMAL, -1, [ + [ Species.MEOWTH, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.PERSIAN, Type.NORMAL, -1, [ + [ Species.PERSIAN, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.PSYDUCK, Type.WATER, -1, [ + [ Species.PSYDUCK, PokemonType.WATER, -1, [ [ Biome.SWAMP, BiomePoolTier.UNCOMMON ], [ Biome.LAKE, BiomePoolTier.COMMON ] ] ], - [ Species.GOLDUCK, Type.WATER, -1, [ + [ Species.GOLDUCK, PokemonType.WATER, -1, [ [ Biome.SWAMP, BiomePoolTier.UNCOMMON ], [ Biome.LAKE, BiomePoolTier.COMMON ], [ Biome.LAKE, BiomePoolTier.BOSS ] ] ], - [ Species.MANKEY, Type.FIGHTING, -1, [ + [ Species.MANKEY, PokemonType.FIGHTING, -1, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.DOJO, BiomePoolTier.COMMON ] ] ], - [ Species.PRIMEAPE, Type.FIGHTING, -1, [ + [ Species.PRIMEAPE, PokemonType.FIGHTING, -1, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.DOJO, BiomePoolTier.COMMON ] ] ], - [ Species.GROWLITHE, Type.FIRE, -1, [ + [ Species.GROWLITHE, PokemonType.FIRE, -1, [ [ Biome.GRASS, BiomePoolTier.RARE ], [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], - [ Species.ARCANINE, Type.FIRE, -1, [ + [ Species.ARCANINE, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.POLIWAG, Type.WATER, -1, [ + [ Species.POLIWAG, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ], [ Biome.SWAMP, BiomePoolTier.COMMON ] ] ], - [ Species.POLIWHIRL, Type.WATER, -1, [ + [ Species.POLIWHIRL, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ], [ Biome.SWAMP, BiomePoolTier.COMMON ] ] ], - [ Species.POLIWRATH, Type.WATER, Type.FIGHTING, [ + [ Species.POLIWRATH, PokemonType.WATER, PokemonType.FIGHTING, [ [ Biome.SWAMP, BiomePoolTier.BOSS ] ] ], - [ Species.ABRA, Type.PSYCHIC, -1, [ + [ Species.ABRA, PokemonType.PSYCHIC, -1, [ [ Biome.TOWN, BiomePoolTier.RARE ], [ Biome.PLAINS, BiomePoolTier.RARE ], [ Biome.RUINS, BiomePoolTier.UNCOMMON ] ] ], - [ Species.KADABRA, Type.PSYCHIC, -1, [ + [ Species.KADABRA, PokemonType.PSYCHIC, -1, [ [ Biome.PLAINS, BiomePoolTier.RARE ], [ Biome.RUINS, BiomePoolTier.UNCOMMON ] ] ], - [ Species.ALAKAZAM, Type.PSYCHIC, -1, [ + [ Species.ALAKAZAM, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.BOSS ] ] ], - [ Species.MACHOP, Type.FIGHTING, -1, [ + [ Species.MACHOP, PokemonType.FIGHTING, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ] ] ], - [ Species.MACHOKE, Type.FIGHTING, -1, [ + [ Species.MACHOKE, PokemonType.FIGHTING, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ] ] ], - [ Species.MACHAMP, Type.FIGHTING, -1, [ + [ Species.MACHAMP, PokemonType.FIGHTING, -1, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS ] ] ], - [ Species.BELLSPROUT, Type.GRASS, Type.POISON, [ + [ Species.BELLSPROUT, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.WEEPINBELL, Type.GRASS, Type.POISON, [ + [ Species.WEEPINBELL, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.VICTREEBEL, Type.GRASS, Type.POISON, [ + [ Species.VICTREEBEL, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.TENTACOOL, Type.WATER, Type.POISON, [ + [ Species.TENTACOOL, PokemonType.WATER, PokemonType.POISON, [ [ Biome.SEA, BiomePoolTier.COMMON ], [ Biome.SEABED, BiomePoolTier.UNCOMMON ] ] ], - [ Species.TENTACRUEL, Type.WATER, Type.POISON, [ + [ Species.TENTACRUEL, PokemonType.WATER, PokemonType.POISON, [ [ Biome.SEA, BiomePoolTier.COMMON ], [ Biome.SEA, BiomePoolTier.BOSS ], [ Biome.SEABED, BiomePoolTier.UNCOMMON ] ] ], - [ Species.GEODUDE, Type.ROCK, Type.GROUND, [ + [ Species.GEODUDE, PokemonType.ROCK, PokemonType.GROUND, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.GRAVELER, Type.ROCK, Type.GROUND, [ + [ Species.GRAVELER, PokemonType.ROCK, PokemonType.GROUND, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.GOLEM, Type.ROCK, Type.GROUND, [ + [ Species.GOLEM, PokemonType.ROCK, PokemonType.GROUND, [ [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], - [ Species.PONYTA, Type.FIRE, -1, [ + [ Species.PONYTA, PokemonType.FIRE, -1, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], - [ Species.RAPIDASH, Type.FIRE, -1, [ + [ Species.RAPIDASH, PokemonType.FIRE, -1, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.VOLCANO, BiomePoolTier.COMMON ], [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.SLOWPOKE, Type.WATER, Type.PSYCHIC, [ + [ Species.SLOWPOKE, PokemonType.WATER, PokemonType.PSYCHIC, [ [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.LAKE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SLOWBRO, Type.WATER, Type.PSYCHIC, [ + [ Species.SLOWBRO, PokemonType.WATER, PokemonType.PSYCHIC, [ [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.LAKE, BiomePoolTier.UNCOMMON ], [ Biome.LAKE, BiomePoolTier.BOSS ] ] ], - [ Species.MAGNEMITE, Type.ELECTRIC, Type.STEEL, [ + [ Species.MAGNEMITE, PokemonType.ELECTRIC, PokemonType.STEEL, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ], [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ], [ Biome.LABORATORY, BiomePoolTier.COMMON ] ] ], - [ Species.MAGNETON, Type.ELECTRIC, Type.STEEL, [ + [ Species.MAGNETON, PokemonType.ELECTRIC, PokemonType.STEEL, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ], [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ], [ Biome.LABORATORY, BiomePoolTier.COMMON ] ] ], - [ Species.FARFETCHD, Type.NORMAL, Type.FLYING, [ + [ Species.FARFETCHD, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ], [ Biome.PLAINS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.DODUO, Type.NORMAL, Type.FLYING, [ + [ Species.DODUO, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.DODRIO, Type.NORMAL, Type.FLYING, [ + [ Species.DODRIO, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SEEL, Type.WATER, -1, [ + [ Species.SEEL, PokemonType.WATER, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.DEWGONG, Type.WATER, Type.ICE, [ + [ Species.DEWGONG, PokemonType.WATER, PokemonType.ICE, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.GRIMER, Type.POISON, -1, [ + [ Species.GRIMER, PokemonType.POISON, -1, [ [ Biome.SLUM, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ], [ Biome.LABORATORY, BiomePoolTier.COMMON ] ] ], - [ Species.MUK, Type.POISON, -1, [ + [ Species.MUK, PokemonType.POISON, -1, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ], [ Biome.SLUM, BiomePoolTier.COMMON ], [ Biome.SLUM, BiomePoolTier.BOSS ], @@ -2461,84 +2474,84 @@ export function initBiomes() { [ Biome.LABORATORY, BiomePoolTier.BOSS ] ] ], - [ Species.SHELLDER, Type.WATER, -1, [ + [ Species.SHELLDER, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.BEACH, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SEABED, BiomePoolTier.UNCOMMON ] ] ], - [ Species.CLOYSTER, Type.WATER, Type.ICE, [ + [ Species.CLOYSTER, PokemonType.WATER, PokemonType.ICE, [ [ Biome.BEACH, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.GASTLY, Type.GHOST, Type.POISON, [ + [ Species.GASTLY, PokemonType.GHOST, PokemonType.POISON, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ], [ Biome.TEMPLE, BiomePoolTier.COMMON ] ] ], - [ Species.HAUNTER, Type.GHOST, Type.POISON, [ + [ Species.HAUNTER, PokemonType.GHOST, PokemonType.POISON, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ], [ Biome.TEMPLE, BiomePoolTier.COMMON ] ] ], - [ Species.GENGAR, Type.GHOST, Type.POISON, [ + [ Species.GENGAR, PokemonType.GHOST, PokemonType.POISON, [ [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.ONIX, Type.ROCK, Type.GROUND, [ + [ Species.ONIX, PokemonType.ROCK, PokemonType.GROUND, [ [ Biome.BADLANDS, BiomePoolTier.RARE ], [ Biome.CAVE, BiomePoolTier.RARE ], [ Biome.CAVE, BiomePoolTier.BOSS ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE ] ] ], - [ Species.DROWZEE, Type.PSYCHIC, -1, [ + [ Species.DROWZEE, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.COMMON ] ] ], - [ Species.HYPNO, Type.PSYCHIC, -1, [ + [ Species.HYPNO, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.COMMON ], [ Biome.RUINS, BiomePoolTier.BOSS ] ] ], - [ Species.KRABBY, Type.WATER, -1, [ + [ Species.KRABBY, PokemonType.WATER, -1, [ [ Biome.BEACH, BiomePoolTier.COMMON ] ] ], - [ Species.KINGLER, Type.WATER, -1, [ + [ Species.KINGLER, PokemonType.WATER, -1, [ [ Biome.BEACH, BiomePoolTier.COMMON ], [ Biome.BEACH, BiomePoolTier.BOSS ] ] ], - [ Species.VOLTORB, Type.ELECTRIC, -1, [ + [ Species.VOLTORB, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ], [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.LABORATORY, BiomePoolTier.COMMON ] ] ], - [ Species.ELECTRODE, Type.ELECTRIC, -1, [ + [ Species.ELECTRODE, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ], [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.LABORATORY, BiomePoolTier.COMMON ], [ Biome.LABORATORY, BiomePoolTier.BOSS ] ] ], - [ Species.EXEGGCUTE, Type.GRASS, Type.PSYCHIC, [ + [ Species.EXEGGCUTE, PokemonType.GRASS, PokemonType.PSYCHIC, [ [ Biome.FOREST, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.EXEGGUTOR, Type.GRASS, Type.PSYCHIC, [ + [ Species.EXEGGUTOR, PokemonType.GRASS, PokemonType.PSYCHIC, [ [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.CUBONE, Type.GROUND, -1, [ + [ Species.CUBONE, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ], [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.MAROWAK, Type.GROUND, -1, [ + [ Species.MAROWAK, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ], [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ], @@ -2546,143 +2559,143 @@ export function initBiomes() { [ Biome.GRAVEYARD, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY, TimeOfDay.DUSK ]] ] ], - [ Species.HITMONLEE, Type.FIGHTING, -1, [ + [ Species.HITMONLEE, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.RARE ], [ Biome.DOJO, BiomePoolTier.BOSS ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE ] ] ], - [ Species.HITMONCHAN, Type.FIGHTING, -1, [ + [ Species.HITMONCHAN, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.RARE ], [ Biome.DOJO, BiomePoolTier.BOSS ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE ] ] ], - [ Species.LICKITUNG, Type.NORMAL, -1, [ + [ Species.LICKITUNG, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.KOFFING, Type.POISON, -1, [ + [ Species.KOFFING, PokemonType.POISON, -1, [ [ Biome.SLUM, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.WEEZING, Type.POISON, -1, [ + [ Species.WEEZING, PokemonType.POISON, -1, [ [ Biome.SLUM, BiomePoolTier.COMMON ], [ Biome.SLUM, BiomePoolTier.BOSS ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.RHYHORN, Type.GROUND, Type.ROCK, [ + [ Species.RHYHORN, PokemonType.GROUND, PokemonType.ROCK, [ [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.RHYDON, Type.GROUND, Type.ROCK, [ + [ Species.RHYDON, PokemonType.GROUND, PokemonType.ROCK, [ [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.CHANSEY, Type.NORMAL, -1, [ + [ Species.CHANSEY, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ], [ Biome.MEADOW, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.TANGELA, Type.GRASS, -1, [ + [ Species.TANGELA, PokemonType.GRASS, -1, [ [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.KANGASKHAN, Type.NORMAL, -1, [ + [ Species.KANGASKHAN, PokemonType.NORMAL, -1, [ [ Biome.JUNGLE, BiomePoolTier.SUPER_RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.HORSEA, Type.WATER, -1, [ + [ Species.HORSEA, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SEADRA, Type.WATER, -1, [ + [ Species.SEADRA, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ] ] ], - [ Species.GOLDEEN, Type.WATER, -1, [ + [ Species.GOLDEEN, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.COMMON ], [ Biome.SEA, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SEAKING, Type.WATER, -1, [ + [ Species.SEAKING, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.COMMON ], [ Biome.LAKE, BiomePoolTier.BOSS ], [ Biome.SEA, BiomePoolTier.UNCOMMON ] ] ], - [ Species.STARYU, Type.WATER, -1, [ + [ Species.STARYU, PokemonType.WATER, -1, [ [ Biome.BEACH, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.STARMIE, Type.WATER, Type.PSYCHIC, [ + [ Species.STARMIE, PokemonType.WATER, PokemonType.PSYCHIC, [ [ Biome.BEACH, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.BEACH, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.MR_MIME, Type.PSYCHIC, Type.FAIRY, [ + [ Species.MR_MIME, PokemonType.PSYCHIC, PokemonType.FAIRY, [ [ Biome.RUINS, BiomePoolTier.RARE ], [ Biome.RUINS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SCYTHER, Type.BUG, Type.FLYING, [ + [ Species.SCYTHER, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.TALL_GRASS, BiomePoolTier.SUPER_RARE ], [ Biome.FOREST, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.JUNGLE, BiomePoolTier.RARE ] ] ], - [ Species.JYNX, Type.ICE, Type.PSYCHIC, [ + [ Species.JYNX, PokemonType.ICE, PokemonType.PSYCHIC, [ [ Biome.ICE_CAVE, BiomePoolTier.RARE ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.ELECTABUZZ, Type.ELECTRIC, -1, [ + [ Species.ELECTABUZZ, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ] ] ], - [ Species.MAGMAR, Type.FIRE, -1, [ + [ Species.MAGMAR, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ] ] ], - [ Species.PINSIR, Type.BUG, -1, [ + [ Species.PINSIR, PokemonType.BUG, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.RARE ], [ Biome.TALL_GRASS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.TAUROS, Type.NORMAL, -1, [ + [ Species.TAUROS, PokemonType.NORMAL, -1, [ [ Biome.MEADOW, BiomePoolTier.RARE ], [ Biome.MEADOW, BiomePoolTier.BOSS ] ] ], - [ Species.MAGIKARP, Type.WATER, -1, [ + [ Species.MAGIKARP, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.COMMON ], [ Biome.LAKE, BiomePoolTier.COMMON ] ] ], - [ Species.GYARADOS, Type.WATER, Type.FLYING, [ + [ Species.GYARADOS, PokemonType.WATER, PokemonType.FLYING, [ [ Biome.SEA, BiomePoolTier.COMMON ], [ Biome.LAKE, BiomePoolTier.COMMON ], [ Biome.LAKE, BiomePoolTier.BOSS ] ] ], - [ Species.LAPRAS, Type.WATER, Type.ICE, [ + [ Species.LAPRAS, PokemonType.WATER, PokemonType.ICE, [ [ Biome.SEA, BiomePoolTier.RARE ], [ Biome.ICE_CAVE, BiomePoolTier.RARE ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.DITTO, Type.NORMAL, -1, [ + [ Species.DITTO, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.ULTRA_RARE ], [ Biome.PLAINS, BiomePoolTier.ULTRA_RARE ], [ Biome.METROPOLIS, BiomePoolTier.SUPER_RARE ], @@ -2690,164 +2703,164 @@ export function initBiomes() { [ Biome.LABORATORY, BiomePoolTier.RARE ] ] ], - [ Species.EEVEE, Type.NORMAL, -1, [ + [ Species.EEVEE, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.SUPER_RARE ], [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ], [ Biome.METROPOLIS, BiomePoolTier.SUPER_RARE ], [ Biome.MEADOW, BiomePoolTier.RARE ] ] ], - [ Species.VAPOREON, Type.WATER, -1, [ + [ Species.VAPOREON, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.SUPER_RARE ], [ Biome.LAKE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.JOLTEON, Type.ELECTRIC, -1, [ + [ Species.JOLTEON, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.SUPER_RARE ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.FLAREON, Type.FIRE, -1, [ + [ Species.FLAREON, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.PORYGON, Type.NORMAL, -1, [ + [ Species.PORYGON, PokemonType.NORMAL, -1, [ [ Biome.FACTORY, BiomePoolTier.RARE ], [ Biome.SPACE, BiomePoolTier.SUPER_RARE ], [ Biome.LABORATORY, BiomePoolTier.RARE ] ] ], - [ Species.OMANYTE, Type.ROCK, Type.WATER, [ + [ Species.OMANYTE, PokemonType.ROCK, PokemonType.WATER, [ [ Biome.SEABED, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.OMASTAR, Type.ROCK, Type.WATER, [ + [ Species.OMASTAR, PokemonType.ROCK, PokemonType.WATER, [ [ Biome.SEABED, BiomePoolTier.SUPER_RARE ], [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.KABUTO, Type.ROCK, Type.WATER, [ + [ Species.KABUTO, PokemonType.ROCK, PokemonType.WATER, [ [ Biome.SEABED, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.KABUTOPS, Type.ROCK, Type.WATER, [ + [ Species.KABUTOPS, PokemonType.ROCK, PokemonType.WATER, [ [ Biome.SEABED, BiomePoolTier.SUPER_RARE ], [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.AERODACTYL, Type.ROCK, Type.FLYING, [ + [ Species.AERODACTYL, PokemonType.ROCK, PokemonType.FLYING, [ [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SNORLAX, Type.NORMAL, -1, [ + [ Species.SNORLAX, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ], [ Biome.PLAINS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.ARTICUNO, Type.ICE, Type.FLYING, [ + [ Species.ARTICUNO, PokemonType.ICE, PokemonType.FLYING, [ [ Biome.ICE_CAVE, BiomePoolTier.ULTRA_RARE ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.ZAPDOS, Type.ELECTRIC, Type.FLYING, [ + [ Species.ZAPDOS, PokemonType.ELECTRIC, PokemonType.FLYING, [ [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.MOLTRES, Type.FIRE, Type.FLYING, [ + [ Species.MOLTRES, PokemonType.FIRE, PokemonType.FLYING, [ [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.DRATINI, Type.DRAGON, -1, [ + [ Species.DRATINI, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.RARE ] ] ], - [ Species.DRAGONAIR, Type.DRAGON, -1, [ + [ Species.DRAGONAIR, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.RARE ] ] ], - [ Species.DRAGONITE, Type.DRAGON, Type.FLYING, [ + [ Species.DRAGONITE, PokemonType.DRAGON, PokemonType.FLYING, [ [ Biome.WASTELAND, BiomePoolTier.RARE ], [ Biome.WASTELAND, BiomePoolTier.BOSS ] ] ], - [ Species.MEWTWO, Type.PSYCHIC, -1, [ + [ Species.MEWTWO, PokemonType.PSYCHIC, -1, [ [ Biome.LABORATORY, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.MEW, Type.PSYCHIC, -1, [ ] + [ Species.MEW, PokemonType.PSYCHIC, -1, [ ] ], - [ Species.CHIKORITA, Type.GRASS, -1, [ + [ Species.CHIKORITA, PokemonType.GRASS, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.RARE ] ] ], - [ Species.BAYLEEF, Type.GRASS, -1, [ + [ Species.BAYLEEF, PokemonType.GRASS, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.RARE ] ] ], - [ Species.MEGANIUM, Type.GRASS, -1, [ + [ Species.MEGANIUM, PokemonType.GRASS, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.RARE ], [ Biome.TALL_GRASS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.CYNDAQUIL, Type.FIRE, -1, [ + [ Species.CYNDAQUIL, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.QUILAVA, Type.FIRE, -1, [ + [ Species.QUILAVA, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.TYPHLOSION, Type.FIRE, -1, [ + [ Species.TYPHLOSION, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.TOTODILE, Type.WATER, -1, [ + [ Species.TOTODILE, PokemonType.WATER, -1, [ [ Biome.SWAMP, BiomePoolTier.RARE ] ] ], - [ Species.CROCONAW, Type.WATER, -1, [ + [ Species.CROCONAW, PokemonType.WATER, -1, [ [ Biome.SWAMP, BiomePoolTier.RARE ] ] ], - [ Species.FERALIGATR, Type.WATER, -1, [ + [ Species.FERALIGATR, PokemonType.WATER, -1, [ [ Biome.SWAMP, BiomePoolTier.RARE ], [ Biome.SWAMP, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SENTRET, Type.NORMAL, -1, [ + [ Species.SENTRET, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.FURRET, Type.NORMAL, -1, [ + [ Species.FURRET, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.HOOTHOOT, Type.NORMAL, Type.FLYING, [ + [ Species.HOOTHOOT, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.TOWN, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.FOREST, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ] ] ], - [ Species.NOCTOWL, Type.NORMAL, Type.FLYING, [ + [ Species.NOCTOWL, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.FOREST, BiomePoolTier.BOSS, TimeOfDay.NIGHT ] ] ], - [ Species.LEDYBA, Type.BUG, Type.FLYING, [ + [ Species.LEDYBA, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.TOWN, BiomePoolTier.COMMON, TimeOfDay.DAWN ], [ Biome.MEADOW, BiomePoolTier.COMMON, TimeOfDay.DAWN ] ] ], - [ Species.LEDIAN, Type.BUG, Type.FLYING, [ + [ Species.LEDIAN, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.MEADOW, BiomePoolTier.COMMON, TimeOfDay.DAWN ], [ Biome.MEADOW, BiomePoolTier.BOSS, TimeOfDay.DAWN ] ] ], - [ Species.SPINARAK, Type.BUG, Type.POISON, [ + [ Species.SPINARAK, PokemonType.BUG, PokemonType.POISON, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, TimeOfDay.DUSK ], [ Biome.TOWN, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], @@ -2857,7 +2870,7 @@ export function initBiomes() { [ Biome.JUNGLE, BiomePoolTier.COMMON, TimeOfDay.NIGHT ] ] ], - [ Species.ARIADOS, Type.BUG, Type.POISON, [ + [ Species.ARIADOS, PokemonType.BUG, PokemonType.POISON, [ [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.FOREST, BiomePoolTier.UNCOMMON, TimeOfDay.DUSK ], [ Biome.FOREST, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], @@ -2866,227 +2879,227 @@ export function initBiomes() { [ Biome.JUNGLE, BiomePoolTier.COMMON, TimeOfDay.NIGHT ] ] ], - [ Species.CROBAT, Type.POISON, Type.FLYING, [ + [ Species.CROBAT, PokemonType.POISON, PokemonType.FLYING, [ [ Biome.CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.CHINCHOU, Type.WATER, Type.ELECTRIC, [ + [ Species.CHINCHOU, PokemonType.WATER, PokemonType.ELECTRIC, [ [ Biome.SEA, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.SEABED, BiomePoolTier.COMMON ] ] ], - [ Species.LANTURN, Type.WATER, Type.ELECTRIC, [ + [ Species.LANTURN, PokemonType.WATER, PokemonType.ELECTRIC, [ [ Biome.SEA, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.SEABED, BiomePoolTier.COMMON ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.PICHU, Type.ELECTRIC, -1, [ ] + [ Species.PICHU, PokemonType.ELECTRIC, -1, [ ] ], - [ Species.CLEFFA, Type.FAIRY, -1, [ ] + [ Species.CLEFFA, PokemonType.FAIRY, -1, [ ] ], - [ Species.IGGLYBUFF, Type.NORMAL, Type.FAIRY, [ ] + [ Species.IGGLYBUFF, PokemonType.NORMAL, PokemonType.FAIRY, [ ] ], - [ Species.TOGEPI, Type.FAIRY, -1, [ ] + [ Species.TOGEPI, PokemonType.FAIRY, -1, [ ] ], - [ Species.TOGETIC, Type.FAIRY, Type.FLYING, [ + [ Species.TOGETIC, PokemonType.FAIRY, PokemonType.FLYING, [ [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.NATU, Type.PSYCHIC, Type.FLYING, [ + [ Species.NATU, PokemonType.PSYCHIC, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.RUINS, BiomePoolTier.COMMON ], [ Biome.TEMPLE, BiomePoolTier.COMMON ] ] ], - [ Species.XATU, Type.PSYCHIC, Type.FLYING, [ + [ Species.XATU, PokemonType.PSYCHIC, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.RUINS, BiomePoolTier.COMMON ], [ Biome.RUINS, BiomePoolTier.BOSS ], [ Biome.TEMPLE, BiomePoolTier.COMMON ] ] ], - [ Species.MAREEP, Type.ELECTRIC, -1, [ + [ Species.MAREEP, PokemonType.ELECTRIC, -1, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.POWER_PLANT, BiomePoolTier.RARE ] ] ], - [ Species.FLAAFFY, Type.ELECTRIC, -1, [ + [ Species.FLAAFFY, PokemonType.ELECTRIC, -1, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.POWER_PLANT, BiomePoolTier.RARE ] ] ], - [ Species.AMPHAROS, Type.ELECTRIC, -1, [ + [ Species.AMPHAROS, PokemonType.ELECTRIC, -1, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.BELLOSSOM, Type.GRASS, -1, [ + [ Species.BELLOSSOM, PokemonType.GRASS, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.MARILL, Type.WATER, Type.FAIRY, [ + [ Species.MARILL, PokemonType.WATER, PokemonType.FAIRY, [ [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.AZUMARILL, Type.WATER, Type.FAIRY, [ + [ Species.AZUMARILL, PokemonType.WATER, PokemonType.FAIRY, [ [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.LAKE, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.SUDOWOODO, Type.ROCK, -1, [ + [ Species.SUDOWOODO, PokemonType.ROCK, -1, [ [ Biome.GRASS, BiomePoolTier.SUPER_RARE ], [ Biome.GRASS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.POLITOED, Type.WATER, -1, [ + [ Species.POLITOED, PokemonType.WATER, -1, [ [ Biome.SWAMP, BiomePoolTier.SUPER_RARE ], [ Biome.SWAMP, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.HOPPIP, Type.GRASS, Type.FLYING, [ + [ Species.HOPPIP, PokemonType.GRASS, PokemonType.FLYING, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SKIPLOOM, Type.GRASS, Type.FLYING, [ + [ Species.SKIPLOOM, PokemonType.GRASS, PokemonType.FLYING, [ [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.JUMPLUFF, Type.GRASS, Type.FLYING, [ + [ Species.JUMPLUFF, PokemonType.GRASS, PokemonType.FLYING, [ [ Biome.GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.AIPOM, Type.NORMAL, -1, [ + [ Species.AIPOM, PokemonType.NORMAL, -1, [ [ Biome.JUNGLE, BiomePoolTier.COMMON ] ] ], - [ Species.SUNKERN, Type.GRASS, -1, [ + [ Species.SUNKERN, PokemonType.GRASS, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SUNFLORA, Type.GRASS, -1, [ + [ Species.SUNFLORA, PokemonType.GRASS, -1, [ [ Biome.GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.YANMA, Type.BUG, Type.FLYING, [ + [ Species.YANMA, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.JUNGLE, BiomePoolTier.RARE ] ] ], - [ Species.WOOPER, Type.WATER, Type.GROUND, [ + [ Species.WOOPER, PokemonType.WATER, PokemonType.GROUND, [ [ Biome.LAKE, BiomePoolTier.UNCOMMON ], [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.QUAGSIRE, Type.WATER, Type.GROUND, [ + [ Species.QUAGSIRE, PokemonType.WATER, PokemonType.GROUND, [ [ Biome.LAKE, BiomePoolTier.UNCOMMON ], [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SWAMP, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.ESPEON, Type.PSYCHIC, -1, [ + [ Species.ESPEON, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.SUPER_RARE, TimeOfDay.DAY ], [ Biome.RUINS, BiomePoolTier.BOSS_RARE, TimeOfDay.DAY ] ] ], - [ Species.UMBREON, Type.DARK, -1, [ + [ Species.UMBREON, PokemonType.DARK, -1, [ [ Biome.ABYSS, BiomePoolTier.SUPER_RARE ], [ Biome.ABYSS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.MURKROW, Type.DARK, Type.FLYING, [ + [ Species.MURKROW, PokemonType.DARK, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.RARE, TimeOfDay.NIGHT ], [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], - [ Species.SLOWKING, Type.WATER, Type.PSYCHIC, [ + [ Species.SLOWKING, PokemonType.WATER, PokemonType.PSYCHIC, [ [ Biome.LAKE, BiomePoolTier.SUPER_RARE ], [ Biome.LAKE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.MISDREAVUS, Type.GHOST, -1, [ + [ Species.MISDREAVUS, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.RARE ] ] ], - [ Species.UNOWN, Type.PSYCHIC, -1, [ + [ Species.UNOWN, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.COMMON ] ] ], - [ Species.WOBBUFFET, Type.PSYCHIC, -1, [ + [ Species.WOBBUFFET, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.RARE ], [ Biome.RUINS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.GIRAFARIG, Type.NORMAL, Type.PSYCHIC, [ + [ Species.GIRAFARIG, PokemonType.NORMAL, PokemonType.PSYCHIC, [ [ Biome.TALL_GRASS, BiomePoolTier.RARE ] ] ], - [ Species.PINECO, Type.BUG, -1, [ + [ Species.PINECO, PokemonType.BUG, -1, [ [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.FORRETRESS, Type.BUG, Type.STEEL, [ + [ Species.FORRETRESS, PokemonType.BUG, PokemonType.STEEL, [ [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.DUNSPARCE, Type.NORMAL, -1, [ + [ Species.DUNSPARCE, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.GLIGAR, Type.GROUND, Type.FLYING, [ + [ Species.GLIGAR, PokemonType.GROUND, PokemonType.FLYING, [ [ Biome.BADLANDS, BiomePoolTier.RARE ] ] ], - [ Species.STEELIX, Type.STEEL, Type.GROUND, [ + [ Species.STEELIX, PokemonType.STEEL, PokemonType.GROUND, [ [ Biome.BADLANDS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SNUBBULL, Type.FAIRY, -1, [ + [ Species.SNUBBULL, PokemonType.FAIRY, -1, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GRANBULL, Type.FAIRY, -1, [ + [ Species.GRANBULL, PokemonType.FAIRY, -1, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.QWILFISH, Type.WATER, Type.POISON, [ + [ Species.QWILFISH, PokemonType.WATER, PokemonType.POISON, [ [ Biome.SEABED, BiomePoolTier.RARE ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.SCIZOR, Type.BUG, Type.STEEL, [ + [ Species.SCIZOR, PokemonType.BUG, PokemonType.STEEL, [ [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SHUCKLE, Type.BUG, Type.ROCK, [ + [ Species.SHUCKLE, PokemonType.BUG, PokemonType.ROCK, [ [ Biome.CAVE, BiomePoolTier.SUPER_RARE ], [ Biome.CAVE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.HERACROSS, Type.BUG, Type.FIGHTING, [ + [ Species.HERACROSS, PokemonType.BUG, PokemonType.FIGHTING, [ [ Biome.FOREST, BiomePoolTier.RARE ], [ Biome.FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SNEASEL, Type.DARK, Type.ICE, [ + [ Species.SNEASEL, PokemonType.DARK, PokemonType.ICE, [ [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SNOWY_FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.TEDDIURSA, Type.NORMAL, -1, [ + [ Species.TEDDIURSA, PokemonType.NORMAL, -1, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SNOWY_FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.URSARING, Type.NORMAL, -1, [ + [ Species.URSARING, PokemonType.NORMAL, -1, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.BOSS ], @@ -3094,926 +3107,926 @@ export function initBiomes() { [ Biome.SNOWY_FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SLUGMA, Type.FIRE, -1, [ + [ Species.SLUGMA, PokemonType.FIRE, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], - [ Species.MAGCARGO, Type.FIRE, Type.ROCK, [ + [ Species.MAGCARGO, PokemonType.FIRE, PokemonType.ROCK, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.COMMON ], [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.SWINUB, Type.ICE, Type.GROUND, [ + [ Species.SWINUB, PokemonType.ICE, PokemonType.GROUND, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], - [ Species.PILOSWINE, Type.ICE, Type.GROUND, [ + [ Species.PILOSWINE, PokemonType.ICE, PokemonType.GROUND, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], - [ Species.CORSOLA, Type.WATER, Type.ROCK, [ + [ Species.CORSOLA, PokemonType.WATER, PokemonType.ROCK, [ [ Biome.SEABED, BiomePoolTier.RARE ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.REMORAID, Type.WATER, -1, [ + [ Species.REMORAID, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.COMMON ] ] ], - [ Species.OCTILLERY, Type.WATER, -1, [ + [ Species.OCTILLERY, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.RARE ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.DELIBIRD, Type.ICE, Type.FLYING, [ + [ Species.DELIBIRD, PokemonType.ICE, PokemonType.FLYING, [ [ Biome.ICE_CAVE, BiomePoolTier.SUPER_RARE ], [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ] ] ], - [ Species.MANTINE, Type.WATER, Type.FLYING, [ + [ Species.MANTINE, PokemonType.WATER, PokemonType.FLYING, [ [ Biome.SEABED, BiomePoolTier.RARE ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.SKARMORY, Type.STEEL, Type.FLYING, [ + [ Species.SKARMORY, PokemonType.STEEL, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.RARE ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS ] ] ], - [ Species.HOUNDOUR, Type.DARK, Type.FIRE, [ + [ Species.HOUNDOUR, PokemonType.DARK, PokemonType.FIRE, [ [ Biome.METROPOLIS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], - [ Species.HOUNDOOM, Type.DARK, Type.FIRE, [ + [ Species.HOUNDOOM, PokemonType.DARK, PokemonType.FIRE, [ [ Biome.METROPOLIS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.ABYSS, BiomePoolTier.COMMON ], [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.KINGDRA, Type.WATER, Type.DRAGON, [ + [ Species.KINGDRA, PokemonType.WATER, PokemonType.DRAGON, [ [ Biome.SEA, BiomePoolTier.SUPER_RARE ], [ Biome.SEA, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.PHANPY, Type.GROUND, -1, [ + [ Species.PHANPY, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.DONPHAN, Type.GROUND, -1, [ + [ Species.DONPHAN, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.BADLANDS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.PORYGON2, Type.NORMAL, -1, [ + [ Species.PORYGON2, PokemonType.NORMAL, -1, [ [ Biome.FACTORY, BiomePoolTier.RARE ], [ Biome.SPACE, BiomePoolTier.SUPER_RARE ], [ Biome.LABORATORY, BiomePoolTier.RARE ] ] ], - [ Species.STANTLER, Type.NORMAL, -1, [ + [ Species.STANTLER, PokemonType.NORMAL, -1, [ [ Biome.FOREST, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.FOREST, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SNOWY_FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SMEARGLE, Type.NORMAL, -1, [ + [ Species.SMEARGLE, PokemonType.NORMAL, -1, [ [ Biome.METROPOLIS, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.TYROGUE, Type.FIGHTING, -1, [ ] + [ Species.TYROGUE, PokemonType.FIGHTING, -1, [ ] ], - [ Species.HITMONTOP, Type.FIGHTING, -1, [ + [ Species.HITMONTOP, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.SUPER_RARE ], [ Biome.DOJO, BiomePoolTier.BOSS_RARE ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.SMOOCHUM, Type.ICE, Type.PSYCHIC, [ ] + [ Species.SMOOCHUM, PokemonType.ICE, PokemonType.PSYCHIC, [ ] ], - [ Species.ELEKID, Type.ELECTRIC, -1, [ ] + [ Species.ELEKID, PokemonType.ELECTRIC, -1, [ ] ], - [ Species.MAGBY, Type.FIRE, -1, [ ] + [ Species.MAGBY, PokemonType.FIRE, -1, [ ] ], - [ Species.MILTANK, Type.NORMAL, -1, [ + [ Species.MILTANK, PokemonType.NORMAL, -1, [ [ Biome.MEADOW, BiomePoolTier.RARE ], [ Biome.MEADOW, BiomePoolTier.BOSS ] ] ], - [ Species.BLISSEY, Type.NORMAL, -1, [ + [ Species.BLISSEY, PokemonType.NORMAL, -1, [ [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.RAIKOU, Type.ELECTRIC, -1, [ + [ Species.RAIKOU, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.ENTEI, Type.FIRE, -1, [ + [ Species.ENTEI, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.ULTRA_RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.SUICUNE, Type.WATER, -1, [ + [ Species.SUICUNE, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.ULTRA_RARE ], [ Biome.LAKE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.LARVITAR, Type.ROCK, Type.GROUND, [ + [ Species.LARVITAR, PokemonType.ROCK, PokemonType.GROUND, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.PUPITAR, Type.ROCK, Type.GROUND, [ + [ Species.PUPITAR, PokemonType.ROCK, PokemonType.GROUND, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.TYRANITAR, Type.ROCK, Type.DARK, [ + [ Species.TYRANITAR, PokemonType.ROCK, PokemonType.DARK, [ [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.WASTELAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.LUGIA, Type.PSYCHIC, Type.FLYING, [ + [ Species.LUGIA, PokemonType.PSYCHIC, PokemonType.FLYING, [ [ Biome.SEA, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.HO_OH, Type.FIRE, Type.FLYING, [ + [ Species.HO_OH, PokemonType.FIRE, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.CELEBI, Type.PSYCHIC, Type.GRASS, [ ] + [ Species.CELEBI, PokemonType.PSYCHIC, PokemonType.GRASS, [ ] ], - [ Species.TREECKO, Type.GRASS, -1, [ + [ Species.TREECKO, PokemonType.GRASS, -1, [ [ Biome.FOREST, BiomePoolTier.RARE ] ] ], - [ Species.GROVYLE, Type.GRASS, -1, [ + [ Species.GROVYLE, PokemonType.GRASS, -1, [ [ Biome.FOREST, BiomePoolTier.RARE ] ] ], - [ Species.SCEPTILE, Type.GRASS, -1, [ + [ Species.SCEPTILE, PokemonType.GRASS, -1, [ [ Biome.FOREST, BiomePoolTier.RARE ], [ Biome.FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.TORCHIC, Type.FIRE, -1, [ + [ Species.TORCHIC, PokemonType.FIRE, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.RARE ] ] ], - [ Species.COMBUSKEN, Type.FIRE, Type.FIGHTING, [ + [ Species.COMBUSKEN, PokemonType.FIRE, PokemonType.FIGHTING, [ [ Biome.MOUNTAIN, BiomePoolTier.RARE ] ] ], - [ Species.BLAZIKEN, Type.FIRE, Type.FIGHTING, [ + [ Species.BLAZIKEN, PokemonType.FIRE, PokemonType.FIGHTING, [ [ Biome.MOUNTAIN, BiomePoolTier.RARE ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.MUDKIP, Type.WATER, -1, [ + [ Species.MUDKIP, PokemonType.WATER, -1, [ [ Biome.SWAMP, BiomePoolTier.RARE ] ] ], - [ Species.MARSHTOMP, Type.WATER, Type.GROUND, [ + [ Species.MARSHTOMP, PokemonType.WATER, PokemonType.GROUND, [ [ Biome.SWAMP, BiomePoolTier.RARE ] ] ], - [ Species.SWAMPERT, Type.WATER, Type.GROUND, [ + [ Species.SWAMPERT, PokemonType.WATER, PokemonType.GROUND, [ [ Biome.SWAMP, BiomePoolTier.RARE ], [ Biome.SWAMP, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.POOCHYENA, Type.DARK, -1, [ + [ Species.POOCHYENA, PokemonType.DARK, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.MIGHTYENA, Type.DARK, -1, [ + [ Species.MIGHTYENA, PokemonType.DARK, -1, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.ZIGZAGOON, Type.NORMAL, -1, [ + [ Species.ZIGZAGOON, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.PLAINS, BiomePoolTier.COMMON ], [ Biome.METROPOLIS, BiomePoolTier.COMMON ] ] ], - [ Species.LINOONE, Type.NORMAL, -1, [ + [ Species.LINOONE, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.COMMON ], [ Biome.PLAINS, BiomePoolTier.BOSS ], [ Biome.METROPOLIS, BiomePoolTier.COMMON ] ] ], - [ Species.WURMPLE, Type.BUG, -1, [ + [ Species.WURMPLE, PokemonType.BUG, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ] ] ], - [ Species.SILCOON, Type.BUG, -1, [ + [ Species.SILCOON, PokemonType.BUG, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, TimeOfDay.DAY ] ] ], - [ Species.BEAUTIFLY, Type.BUG, Type.FLYING, [ + [ Species.BEAUTIFLY, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.FOREST, BiomePoolTier.COMMON, TimeOfDay.DAY ], [ Biome.FOREST, BiomePoolTier.BOSS, TimeOfDay.DAY ] ] ], - [ Species.CASCOON, Type.BUG, -1, [ + [ Species.CASCOON, PokemonType.BUG, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, TimeOfDay.NIGHT ] ] ], - [ Species.DUSTOX, Type.BUG, Type.POISON, [ + [ Species.DUSTOX, PokemonType.BUG, PokemonType.POISON, [ [ Biome.FOREST, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.FOREST, BiomePoolTier.BOSS, TimeOfDay.NIGHT ] ] ], - [ Species.LOTAD, Type.WATER, Type.GRASS, [ + [ Species.LOTAD, PokemonType.WATER, PokemonType.GRASS, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.LOMBRE, Type.WATER, Type.GRASS, [ + [ Species.LOMBRE, PokemonType.WATER, PokemonType.GRASS, [ [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.LUDICOLO, Type.WATER, Type.GRASS, [ + [ Species.LUDICOLO, PokemonType.WATER, PokemonType.GRASS, [ [ Biome.SWAMP, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SEEDOT, Type.GRASS, -1, [ + [ Species.SEEDOT, PokemonType.GRASS, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.NUZLEAF, Type.GRASS, Type.DARK, [ + [ Species.NUZLEAF, PokemonType.GRASS, PokemonType.DARK, [ [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.SHIFTRY, Type.GRASS, Type.DARK, [ + [ Species.SHIFTRY, PokemonType.GRASS, PokemonType.DARK, [ [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.TAILLOW, Type.NORMAL, Type.FLYING, [ + [ Species.TAILLOW, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SWELLOW, Type.NORMAL, Type.FLYING, [ + [ Species.SWELLOW, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.WINGULL, Type.WATER, Type.FLYING, [ + [ Species.WINGULL, PokemonType.WATER, PokemonType.FLYING, [ [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.PELIPPER, Type.WATER, Type.FLYING, [ + [ Species.PELIPPER, PokemonType.WATER, PokemonType.FLYING, [ [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SEA, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.RALTS, Type.PSYCHIC, Type.FAIRY, [ + [ Species.RALTS, PokemonType.PSYCHIC, PokemonType.FAIRY, [ [ Biome.TOWN, BiomePoolTier.SUPER_RARE ], [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.KIRLIA, Type.PSYCHIC, Type.FAIRY, [ + [ Species.KIRLIA, PokemonType.PSYCHIC, PokemonType.FAIRY, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.GARDEVOIR, Type.PSYCHIC, Type.FAIRY, [ + [ Species.GARDEVOIR, PokemonType.PSYCHIC, PokemonType.FAIRY, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.MEADOW, BiomePoolTier.BOSS ], [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SURSKIT, Type.BUG, Type.WATER, [ + [ Species.SURSKIT, PokemonType.BUG, PokemonType.WATER, [ [ Biome.TOWN, BiomePoolTier.RARE ], [ Biome.LAKE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.MASQUERAIN, Type.BUG, Type.FLYING, [ + [ Species.MASQUERAIN, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.LAKE, BiomePoolTier.UNCOMMON ], [ Biome.LAKE, BiomePoolTier.BOSS ] ] ], - [ Species.SHROOMISH, Type.GRASS, -1, [ + [ Species.SHROOMISH, PokemonType.GRASS, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.BRELOOM, Type.GRASS, Type.FIGHTING, [ + [ Species.BRELOOM, PokemonType.GRASS, PokemonType.FIGHTING, [ [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.SLAKOTH, Type.NORMAL, -1, [ + [ Species.SLAKOTH, PokemonType.NORMAL, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ] ] ], - [ Species.VIGOROTH, Type.NORMAL, -1, [ + [ Species.VIGOROTH, PokemonType.NORMAL, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ] ] ], - [ Species.SLAKING, Type.NORMAL, -1, [ + [ Species.SLAKING, PokemonType.NORMAL, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.NINCADA, Type.BUG, Type.GROUND, [ + [ Species.NINCADA, PokemonType.BUG, PokemonType.GROUND, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON ], [ Biome.TALL_GRASS, BiomePoolTier.COMMON ] ] ], - [ Species.NINJASK, Type.BUG, Type.FLYING, [ + [ Species.NINJASK, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON ], [ Biome.TALL_GRASS, BiomePoolTier.BOSS ] ] ], - [ Species.SHEDINJA, Type.BUG, Type.GHOST, [ + [ Species.SHEDINJA, PokemonType.BUG, PokemonType.GHOST, [ [ Biome.TALL_GRASS, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.WHISMUR, Type.NORMAL, -1, [ + [ Species.WHISMUR, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.LOUDRED, Type.NORMAL, -1, [ + [ Species.LOUDRED, PokemonType.NORMAL, -1, [ [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.EXPLOUD, Type.NORMAL, -1, [ + [ Species.EXPLOUD, PokemonType.NORMAL, -1, [ [ Biome.CAVE, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.MAKUHITA, Type.FIGHTING, -1, [ + [ Species.MAKUHITA, PokemonType.FIGHTING, -1, [ [ Biome.CAVE, BiomePoolTier.UNCOMMON ], [ Biome.DOJO, BiomePoolTier.COMMON ] ] ], - [ Species.HARIYAMA, Type.FIGHTING, -1, [ + [ Species.HARIYAMA, PokemonType.FIGHTING, -1, [ [ Biome.CAVE, BiomePoolTier.UNCOMMON ], [ Biome.DOJO, BiomePoolTier.COMMON ], [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], - [ Species.AZURILL, Type.NORMAL, Type.FAIRY, [ ] + [ Species.AZURILL, PokemonType.NORMAL, PokemonType.FAIRY, [ ] ], - [ Species.NOSEPASS, Type.ROCK, -1, [ + [ Species.NOSEPASS, PokemonType.ROCK, -1, [ [ Biome.CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SKITTY, Type.NORMAL, -1, [ + [ Species.SKITTY, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.DELCATTY, Type.NORMAL, -1, [ + [ Species.DELCATTY, PokemonType.NORMAL, -1, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SABLEYE, Type.DARK, Type.GHOST, [ + [ Species.SABLEYE, PokemonType.DARK, PokemonType.GHOST, [ [ Biome.ABYSS, BiomePoolTier.COMMON ], [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.MAWILE, Type.STEEL, Type.FAIRY, [ + [ Species.MAWILE, PokemonType.STEEL, PokemonType.FAIRY, [ [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.ARON, Type.STEEL, Type.ROCK, [ + [ Species.ARON, PokemonType.STEEL, PokemonType.ROCK, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.LAIRON, Type.STEEL, Type.ROCK, [ + [ Species.LAIRON, PokemonType.STEEL, PokemonType.ROCK, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.AGGRON, Type.STEEL, Type.ROCK, [ + [ Species.AGGRON, PokemonType.STEEL, PokemonType.ROCK, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.MOUNTAIN, BiomePoolTier.BOSS ] ] ], - [ Species.MEDITITE, Type.FIGHTING, Type.PSYCHIC, [ + [ Species.MEDITITE, PokemonType.FIGHTING, PokemonType.PSYCHIC, [ [ Biome.DOJO, BiomePoolTier.COMMON ] ] ], - [ Species.MEDICHAM, Type.FIGHTING, Type.PSYCHIC, [ + [ Species.MEDICHAM, PokemonType.FIGHTING, PokemonType.PSYCHIC, [ [ Biome.DOJO, BiomePoolTier.COMMON ], [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], - [ Species.ELECTRIKE, Type.ELECTRIC, -1, [ + [ Species.ELECTRIKE, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], - [ Species.MANECTRIC, Type.ELECTRIC, -1, [ + [ Species.MANECTRIC, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS ] ] ], - [ Species.PLUSLE, Type.ELECTRIC, -1, [ + [ Species.PLUSLE, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ] ] ], - [ Species.MINUN, Type.ELECTRIC, -1, [ + [ Species.MINUN, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ] ] ], - [ Species.VOLBEAT, Type.BUG, -1, [ + [ Species.VOLBEAT, PokemonType.BUG, -1, [ [ Biome.MEADOW, BiomePoolTier.RARE, TimeOfDay.NIGHT ] ] ], - [ Species.ILLUMISE, Type.BUG, -1, [ + [ Species.ILLUMISE, PokemonType.BUG, -1, [ [ Biome.MEADOW, BiomePoolTier.RARE, TimeOfDay.NIGHT ] ] ], - [ Species.ROSELIA, Type.GRASS, Type.POISON, [ + [ Species.ROSELIA, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MEADOW, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GULPIN, Type.POISON, -1, [ + [ Species.GULPIN, PokemonType.POISON, -1, [ [ Biome.SWAMP, BiomePoolTier.COMMON ] ] ], - [ Species.SWALOT, Type.POISON, -1, [ + [ Species.SWALOT, PokemonType.POISON, -1, [ [ Biome.SWAMP, BiomePoolTier.COMMON ], [ Biome.SWAMP, BiomePoolTier.BOSS ] ] ], - [ Species.CARVANHA, Type.WATER, Type.DARK, [ + [ Species.CARVANHA, PokemonType.WATER, PokemonType.DARK, [ [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.SHARPEDO, Type.WATER, Type.DARK, [ + [ Species.SHARPEDO, PokemonType.WATER, PokemonType.DARK, [ [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SEA, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.WAILMER, Type.WATER, -1, [ + [ Species.WAILMER, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ], [ Biome.SEABED, BiomePoolTier.UNCOMMON ] ] ], - [ Species.WAILORD, Type.WATER, -1, [ + [ Species.WAILORD, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ], [ Biome.SEABED, BiomePoolTier.UNCOMMON ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.NUMEL, Type.FIRE, Type.GROUND, [ + [ Species.NUMEL, PokemonType.FIRE, PokemonType.GROUND, [ [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], - [ Species.CAMERUPT, Type.FIRE, Type.GROUND, [ + [ Species.CAMERUPT, PokemonType.FIRE, PokemonType.GROUND, [ [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.COMMON ], [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.TORKOAL, Type.FIRE, -1, [ + [ Species.TORKOAL, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.SPOINK, Type.PSYCHIC, -1, [ + [ Species.SPOINK, PokemonType.PSYCHIC, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.RARE ], [ Biome.RUINS, BiomePoolTier.COMMON ] ] ], - [ Species.GRUMPIG, Type.PSYCHIC, -1, [ + [ Species.GRUMPIG, PokemonType.PSYCHIC, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.RARE ], [ Biome.RUINS, BiomePoolTier.COMMON ], [ Biome.RUINS, BiomePoolTier.BOSS ] ] ], - [ Species.SPINDA, Type.NORMAL, -1, [ + [ Species.SPINDA, PokemonType.NORMAL, -1, [ [ Biome.MEADOW, BiomePoolTier.RARE ] ] ], - [ Species.TRAPINCH, Type.GROUND, -1, [ + [ Species.TRAPINCH, PokemonType.GROUND, -1, [ [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.VIBRAVA, Type.GROUND, Type.DRAGON, [ + [ Species.VIBRAVA, PokemonType.GROUND, PokemonType.DRAGON, [ [ Biome.DESERT, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.WASTELAND, BiomePoolTier.COMMON ] ] ], - [ Species.FLYGON, Type.GROUND, Type.DRAGON, [ + [ Species.FLYGON, PokemonType.GROUND, PokemonType.DRAGON, [ [ Biome.DESERT, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.WASTELAND, BiomePoolTier.COMMON ], [ Biome.WASTELAND, BiomePoolTier.BOSS ] ] ], - [ Species.CACNEA, Type.GRASS, -1, [ + [ Species.CACNEA, PokemonType.GRASS, -1, [ [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.CACTURNE, Type.GRASS, Type.DARK, [ + [ Species.CACTURNE, PokemonType.GRASS, PokemonType.DARK, [ [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.DESERT, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.SWABLU, Type.NORMAL, Type.FLYING, [ + [ Species.SWABLU, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.WASTELAND, BiomePoolTier.UNCOMMON ] ] ], - [ Species.ALTARIA, Type.DRAGON, Type.FLYING, [ + [ Species.ALTARIA, PokemonType.DRAGON, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.WASTELAND, BiomePoolTier.UNCOMMON ] ] ], - [ Species.ZANGOOSE, Type.NORMAL, -1, [ + [ Species.ZANGOOSE, PokemonType.NORMAL, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.RARE ], [ Biome.TALL_GRASS, BiomePoolTier.BOSS ] ] ], - [ Species.SEVIPER, Type.POISON, -1, [ + [ Species.SEVIPER, PokemonType.POISON, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS ] ] ], - [ Species.LUNATONE, Type.ROCK, Type.PSYCHIC, [ + [ Species.LUNATONE, PokemonType.ROCK, PokemonType.PSYCHIC, [ [ Biome.SPACE, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.SPACE, BiomePoolTier.BOSS, TimeOfDay.NIGHT ] ] ], - [ Species.SOLROCK, Type.ROCK, Type.PSYCHIC, [ + [ Species.SOLROCK, PokemonType.ROCK, PokemonType.PSYCHIC, [ [ Biome.SPACE, BiomePoolTier.COMMON, TimeOfDay.DAY ], [ Biome.SPACE, BiomePoolTier.BOSS, TimeOfDay.DAY ] ] ], - [ Species.BARBOACH, Type.WATER, Type.GROUND, [ + [ Species.BARBOACH, PokemonType.WATER, PokemonType.GROUND, [ [ Biome.SWAMP, BiomePoolTier.UNCOMMON ] ] ], - [ Species.WHISCASH, Type.WATER, Type.GROUND, [ + [ Species.WHISCASH, PokemonType.WATER, PokemonType.GROUND, [ [ Biome.SWAMP, BiomePoolTier.UNCOMMON ], [ Biome.SWAMP, BiomePoolTier.BOSS ] ] ], - [ Species.CORPHISH, Type.WATER, -1, [ + [ Species.CORPHISH, PokemonType.WATER, -1, [ [ Biome.BEACH, BiomePoolTier.COMMON ] ] ], - [ Species.CRAWDAUNT, Type.WATER, Type.DARK, [ + [ Species.CRAWDAUNT, PokemonType.WATER, PokemonType.DARK, [ [ Biome.BEACH, BiomePoolTier.COMMON ], [ Biome.BEACH, BiomePoolTier.BOSS ] ] ], - [ Species.BALTOY, Type.GROUND, Type.PSYCHIC, [ + [ Species.BALTOY, PokemonType.GROUND, PokemonType.PSYCHIC, [ [ Biome.RUINS, BiomePoolTier.COMMON ], [ Biome.SPACE, BiomePoolTier.UNCOMMON ], [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.CLAYDOL, Type.GROUND, Type.PSYCHIC, [ + [ Species.CLAYDOL, PokemonType.GROUND, PokemonType.PSYCHIC, [ [ Biome.RUINS, BiomePoolTier.COMMON ], [ Biome.RUINS, BiomePoolTier.BOSS ], [ Biome.SPACE, BiomePoolTier.UNCOMMON ], [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.LILEEP, Type.ROCK, Type.GRASS, [ + [ Species.LILEEP, PokemonType.ROCK, PokemonType.GRASS, [ [ Biome.DESERT, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.CRADILY, Type.ROCK, Type.GRASS, [ + [ Species.CRADILY, PokemonType.ROCK, PokemonType.GRASS, [ [ Biome.DESERT, BiomePoolTier.SUPER_RARE ], [ Biome.DESERT, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.ANORITH, Type.ROCK, Type.BUG, [ + [ Species.ANORITH, PokemonType.ROCK, PokemonType.BUG, [ [ Biome.DESERT, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.ARMALDO, Type.ROCK, Type.BUG, [ + [ Species.ARMALDO, PokemonType.ROCK, PokemonType.BUG, [ [ Biome.DESERT, BiomePoolTier.SUPER_RARE ], [ Biome.DESERT, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.FEEBAS, Type.WATER, -1, [ + [ Species.FEEBAS, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.ULTRA_RARE ] ] ], - [ Species.MILOTIC, Type.WATER, -1, [ + [ Species.MILOTIC, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.CASTFORM, Type.NORMAL, -1, [ + [ Species.CASTFORM, PokemonType.NORMAL, -1, [ [ Biome.METROPOLIS, BiomePoolTier.ULTRA_RARE ], [ Biome.METROPOLIS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.KECLEON, Type.NORMAL, -1, [ + [ Species.KECLEON, PokemonType.NORMAL, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.RARE ], [ Biome.TALL_GRASS, BiomePoolTier.BOSS ] ] ], - [ Species.SHUPPET, Type.GHOST, -1, [ + [ Species.SHUPPET, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ] ] ], - [ Species.BANETTE, Type.GHOST, -1, [ + [ Species.BANETTE, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ], [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.DUSKULL, Type.GHOST, -1, [ + [ Species.DUSKULL, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ], [ Biome.TEMPLE, BiomePoolTier.COMMON ] ] ], - [ Species.DUSCLOPS, Type.GHOST, -1, [ + [ Species.DUSCLOPS, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ], [ Biome.TEMPLE, BiomePoolTier.COMMON ] ] ], - [ Species.TROPIUS, Type.GRASS, Type.FLYING, [ + [ Species.TROPIUS, PokemonType.GRASS, PokemonType.FLYING, [ [ Biome.TALL_GRASS, BiomePoolTier.RARE ], [ Biome.FOREST, BiomePoolTier.RARE ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.CHIMECHO, Type.PSYCHIC, -1, [ + [ Species.CHIMECHO, PokemonType.PSYCHIC, -1, [ [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ], [ Biome.TEMPLE, BiomePoolTier.BOSS ] ] ], - [ Species.ABSOL, Type.DARK, -1, [ + [ Species.ABSOL, PokemonType.DARK, -1, [ [ Biome.ABYSS, BiomePoolTier.RARE ], [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.WYNAUT, Type.PSYCHIC, -1, [ ] + [ Species.WYNAUT, PokemonType.PSYCHIC, -1, [ ] ], - [ Species.SNORUNT, Type.ICE, -1, [ + [ Species.SNORUNT, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.GLALIE, Type.ICE, -1, [ + [ Species.GLALIE, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.SPHEAL, Type.ICE, Type.WATER, [ + [ Species.SPHEAL, PokemonType.ICE, PokemonType.WATER, [ [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SEALEO, Type.ICE, Type.WATER, [ + [ Species.SEALEO, PokemonType.ICE, PokemonType.WATER, [ [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.WALREIN, Type.ICE, Type.WATER, [ + [ Species.WALREIN, PokemonType.ICE, PokemonType.WATER, [ [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.CLAMPERL, Type.WATER, -1, [ + [ Species.CLAMPERL, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.COMMON ] ] ], - [ Species.HUNTAIL, Type.WATER, -1, [ + [ Species.HUNTAIL, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.GOREBYSS, Type.WATER, -1, [ + [ Species.GOREBYSS, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.RELICANTH, Type.WATER, Type.ROCK, [ + [ Species.RELICANTH, PokemonType.WATER, PokemonType.ROCK, [ [ Biome.SEABED, BiomePoolTier.SUPER_RARE ], [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.LUVDISC, Type.WATER, -1, [ + [ Species.LUVDISC, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.UNCOMMON ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.BAGON, Type.DRAGON, -1, [ + [ Species.BAGON, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SHELGON, Type.DRAGON, -1, [ + [ Species.SHELGON, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SALAMENCE, Type.DRAGON, Type.FLYING, [ + [ Species.SALAMENCE, PokemonType.DRAGON, PokemonType.FLYING, [ [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.WASTELAND, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.BELDUM, Type.STEEL, Type.PSYCHIC, [ + [ Species.BELDUM, PokemonType.STEEL, PokemonType.PSYCHIC, [ [ Biome.FACTORY, BiomePoolTier.SUPER_RARE ], [ Biome.SPACE, BiomePoolTier.RARE ] ] ], - [ Species.METANG, Type.STEEL, Type.PSYCHIC, [ + [ Species.METANG, PokemonType.STEEL, PokemonType.PSYCHIC, [ [ Biome.FACTORY, BiomePoolTier.SUPER_RARE ], [ Biome.SPACE, BiomePoolTier.RARE ] ] ], - [ Species.METAGROSS, Type.STEEL, Type.PSYCHIC, [ + [ Species.METAGROSS, PokemonType.STEEL, PokemonType.PSYCHIC, [ [ Biome.FACTORY, BiomePoolTier.SUPER_RARE ], [ Biome.SPACE, BiomePoolTier.RARE ], [ Biome.SPACE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.REGIROCK, Type.ROCK, -1, [ + [ Species.REGIROCK, PokemonType.ROCK, -1, [ [ Biome.DESERT, BiomePoolTier.ULTRA_RARE ], [ Biome.DESERT, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.REGICE, Type.ICE, -1, [ + [ Species.REGICE, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.ULTRA_RARE ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.REGISTEEL, Type.STEEL, -1, [ + [ Species.REGISTEEL, PokemonType.STEEL, -1, [ [ Biome.RUINS, BiomePoolTier.ULTRA_RARE ], [ Biome.RUINS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.LATIAS, Type.DRAGON, Type.PSYCHIC, [ + [ Species.LATIAS, PokemonType.DRAGON, PokemonType.PSYCHIC, [ [ Biome.PLAINS, BiomePoolTier.ULTRA_RARE ], [ Biome.PLAINS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.LATIOS, Type.DRAGON, Type.PSYCHIC, [ + [ Species.LATIOS, PokemonType.DRAGON, PokemonType.PSYCHIC, [ [ Biome.PLAINS, BiomePoolTier.ULTRA_RARE ], [ Biome.PLAINS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.KYOGRE, Type.WATER, -1, [ + [ Species.KYOGRE, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.GROUDON, Type.GROUND, -1, [ + [ Species.GROUDON, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.RAYQUAZA, Type.DRAGON, Type.FLYING, [ + [ Species.RAYQUAZA, PokemonType.DRAGON, PokemonType.FLYING, [ [ Biome.SPACE, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.JIRACHI, Type.STEEL, Type.PSYCHIC, [ ] + [ Species.JIRACHI, PokemonType.STEEL, PokemonType.PSYCHIC, [ ] ], - [ Species.DEOXYS, Type.PSYCHIC, -1, [ ] + [ Species.DEOXYS, PokemonType.PSYCHIC, -1, [ ] ], - [ Species.TURTWIG, Type.GRASS, -1, [ + [ Species.TURTWIG, PokemonType.GRASS, -1, [ [ Biome.GRASS, BiomePoolTier.RARE ] ] ], - [ Species.GROTLE, Type.GRASS, -1, [ + [ Species.GROTLE, PokemonType.GRASS, -1, [ [ Biome.GRASS, BiomePoolTier.RARE ] ] ], - [ Species.TORTERRA, Type.GRASS, Type.GROUND, [ + [ Species.TORTERRA, PokemonType.GRASS, PokemonType.GROUND, [ [ Biome.GRASS, BiomePoolTier.RARE ], [ Biome.GRASS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.CHIMCHAR, Type.FIRE, -1, [ + [ Species.CHIMCHAR, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.MONFERNO, Type.FIRE, Type.FIGHTING, [ + [ Species.MONFERNO, PokemonType.FIRE, PokemonType.FIGHTING, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.INFERNAPE, Type.FIRE, Type.FIGHTING, [ + [ Species.INFERNAPE, PokemonType.FIRE, PokemonType.FIGHTING, [ [ Biome.VOLCANO, BiomePoolTier.RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.PIPLUP, Type.WATER, -1, [ + [ Species.PIPLUP, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.RARE ] ] ], - [ Species.PRINPLUP, Type.WATER, -1, [ + [ Species.PRINPLUP, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.RARE ] ] ], - [ Species.EMPOLEON, Type.WATER, Type.STEEL, [ + [ Species.EMPOLEON, PokemonType.WATER, PokemonType.STEEL, [ [ Biome.SEA, BiomePoolTier.RARE ], [ Biome.SEA, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.STARLY, Type.NORMAL, Type.FLYING, [ + [ Species.STARLY, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.STARAVIA, Type.NORMAL, Type.FLYING, [ + [ Species.STARAVIA, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.STARAPTOR, Type.NORMAL, Type.FLYING, [ + [ Species.STARAPTOR, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.BIDOOF, Type.NORMAL, -1, [ + [ Species.BIDOOF, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.PLAINS, BiomePoolTier.COMMON ] ] ], - [ Species.BIBAREL, Type.NORMAL, Type.WATER, [ + [ Species.BIBAREL, PokemonType.NORMAL, PokemonType.WATER, [ [ Biome.PLAINS, BiomePoolTier.COMMON ], [ Biome.PLAINS, BiomePoolTier.BOSS ] ] ], - [ Species.KRICKETOT, Type.BUG, -1, [ + [ Species.KRICKETOT, PokemonType.BUG, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.KRICKETUNE, Type.BUG, -1, [ + [ Species.KRICKETUNE, PokemonType.BUG, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.TALL_GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.SHINX, Type.ELECTRIC, -1, [ + [ Species.SHINX, PokemonType.ELECTRIC, -1, [ [ Biome.PLAINS, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], - [ Species.LUXIO, Type.ELECTRIC, -1, [ + [ Species.LUXIO, PokemonType.ELECTRIC, -1, [ [ Biome.PLAINS, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], - [ Species.LUXRAY, Type.ELECTRIC, -1, [ + [ Species.LUXRAY, PokemonType.ELECTRIC, -1, [ [ Biome.PLAINS, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.POWER_PLANT, BiomePoolTier.COMMON ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS ] ] ], - [ Species.BUDEW, Type.GRASS, Type.POISON, [ ] + [ Species.BUDEW, PokemonType.GRASS, PokemonType.POISON, [ ] ], - [ Species.ROSERADE, Type.GRASS, Type.POISON, [ + [ Species.ROSERADE, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.CRANIDOS, Type.ROCK, -1, [ + [ Species.CRANIDOS, PokemonType.ROCK, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.RAMPARDOS, Type.ROCK, -1, [ + [ Species.RAMPARDOS, PokemonType.ROCK, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SHIELDON, Type.ROCK, Type.STEEL, [ + [ Species.SHIELDON, PokemonType.ROCK, PokemonType.STEEL, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.BASTIODON, Type.ROCK, Type.STEEL, [ + [ Species.BASTIODON, PokemonType.ROCK, PokemonType.STEEL, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.BURMY, Type.BUG, -1, [ + [ Species.BURMY, PokemonType.BUG, -1, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON ], [ Biome.BEACH, BiomePoolTier.UNCOMMON ], [ Biome.SLUM, BiomePoolTier.UNCOMMON ] ] ], - [ Species.WORMADAM, Type.BUG, Type.GRASS, [ + [ Species.WORMADAM, PokemonType.BUG, PokemonType.GRASS, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON ], [ Biome.FOREST, BiomePoolTier.BOSS ], [ Biome.BEACH, BiomePoolTier.UNCOMMON ], @@ -4022,122 +4035,122 @@ export function initBiomes() { [ Biome.SLUM, BiomePoolTier.BOSS ] ] ], - [ Species.MOTHIM, Type.BUG, Type.FLYING, [ + [ Species.MOTHIM, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.COMBEE, Type.BUG, Type.FLYING, [ + [ Species.COMBEE, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.VESPIQUEN, Type.BUG, Type.FLYING, [ + [ Species.VESPIQUEN, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.PACHIRISU, Type.ELECTRIC, -1, [ + [ Species.PACHIRISU, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ] ] ], - [ Species.BUIZEL, Type.WATER, -1, [ + [ Species.BUIZEL, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.COMMON ] ] ], - [ Species.FLOATZEL, Type.WATER, -1, [ + [ Species.FLOATZEL, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.COMMON ], [ Biome.SEA, BiomePoolTier.BOSS ] ] ], - [ Species.CHERUBI, Type.GRASS, -1, [ + [ Species.CHERUBI, PokemonType.GRASS, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.CHERRIM, Type.GRASS, -1, [ + [ Species.CHERRIM, PokemonType.GRASS, -1, [ [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SHELLOS, Type.WATER, -1, [ + [ Species.SHELLOS, PokemonType.WATER, -1, [ [ Biome.SWAMP, BiomePoolTier.COMMON ], [ Biome.SEABED, BiomePoolTier.UNCOMMON ] ] ], - [ Species.GASTRODON, Type.WATER, Type.GROUND, [ + [ Species.GASTRODON, PokemonType.WATER, PokemonType.GROUND, [ [ Biome.SWAMP, BiomePoolTier.COMMON ], [ Biome.SWAMP, BiomePoolTier.BOSS ], [ Biome.SEABED, BiomePoolTier.UNCOMMON ] ] ], - [ Species.AMBIPOM, Type.NORMAL, -1, [ + [ Species.AMBIPOM, PokemonType.NORMAL, -1, [ [ Biome.JUNGLE, BiomePoolTier.BOSS ] ] ], - [ Species.DRIFLOON, Type.GHOST, Type.FLYING, [ + [ Species.DRIFLOON, PokemonType.GHOST, PokemonType.FLYING, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ] ] ], - [ Species.DRIFBLIM, Type.GHOST, Type.FLYING, [ + [ Species.DRIFBLIM, PokemonType.GHOST, PokemonType.FLYING, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ], [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.BUNEARY, Type.NORMAL, -1, [ + [ Species.BUNEARY, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.RARE ] ] ], - [ Species.LOPUNNY, Type.NORMAL, -1, [ + [ Species.LOPUNNY, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.RARE ], [ Biome.PLAINS, BiomePoolTier.BOSS ] ] ], - [ Species.MISMAGIUS, Type.GHOST, -1, [ + [ Species.MISMAGIUS, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.HONCHKROW, Type.DARK, Type.FLYING, [ + [ Species.HONCHKROW, PokemonType.DARK, PokemonType.FLYING, [ [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.GLAMEOW, Type.NORMAL, -1, [ + [ Species.GLAMEOW, PokemonType.NORMAL, -1, [ [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.MEADOW, BiomePoolTier.UNCOMMON ] ] ], - [ Species.PURUGLY, Type.NORMAL, -1, [ + [ Species.PURUGLY, PokemonType.NORMAL, -1, [ [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.MEADOW, BiomePoolTier.BOSS ] ] ], - [ Species.CHINGLING, Type.PSYCHIC, -1, [ + [ Species.CHINGLING, PokemonType.PSYCHIC, -1, [ [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.STUNKY, Type.POISON, Type.DARK, [ + [ Species.STUNKY, PokemonType.POISON, PokemonType.DARK, [ [ Biome.SLUM, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.SKUNTANK, Type.POISON, Type.DARK, [ + [ Species.SKUNTANK, PokemonType.POISON, PokemonType.DARK, [ [ Biome.SLUM, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SLUM, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.BRONZOR, Type.STEEL, Type.PSYCHIC, [ + [ Species.BRONZOR, PokemonType.STEEL, PokemonType.PSYCHIC, [ [ Biome.FACTORY, BiomePoolTier.UNCOMMON ], [ Biome.SPACE, BiomePoolTier.COMMON ], [ Biome.LABORATORY, BiomePoolTier.COMMON ] ] ], - [ Species.BRONZONG, Type.STEEL, Type.PSYCHIC, [ + [ Species.BRONZONG, PokemonType.STEEL, PokemonType.PSYCHIC, [ [ Biome.FACTORY, BiomePoolTier.UNCOMMON ], [ Biome.SPACE, BiomePoolTier.COMMON ], [ Biome.SPACE, BiomePoolTier.BOSS ], @@ -4145,186 +4158,186 @@ export function initBiomes() { [ Biome.LABORATORY, BiomePoolTier.BOSS ] ] ], - [ Species.BONSLY, Type.ROCK, -1, [ ] + [ Species.BONSLY, PokemonType.ROCK, -1, [ ] ], - [ Species.MIME_JR, Type.PSYCHIC, Type.FAIRY, [ ] + [ Species.MIME_JR, PokemonType.PSYCHIC, PokemonType.FAIRY, [ ] ], - [ Species.HAPPINY, Type.NORMAL, -1, [ ] + [ Species.HAPPINY, PokemonType.NORMAL, -1, [ ] ], - [ Species.CHATOT, Type.NORMAL, Type.FLYING, [ + [ Species.CHATOT, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.JUNGLE, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.SPIRITOMB, Type.GHOST, Type.DARK, [ + [ Species.SPIRITOMB, PokemonType.GHOST, PokemonType.DARK, [ [ Biome.GRAVEYARD, BiomePoolTier.SUPER_RARE ], [ Biome.ABYSS, BiomePoolTier.RARE ], [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.GIBLE, Type.DRAGON, Type.GROUND, [ + [ Species.GIBLE, PokemonType.DRAGON, PokemonType.GROUND, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.COMMON ] ] ], - [ Species.GABITE, Type.DRAGON, Type.GROUND, [ + [ Species.GABITE, PokemonType.DRAGON, PokemonType.GROUND, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.COMMON ] ] ], - [ Species.GARCHOMP, Type.DRAGON, Type.GROUND, [ + [ Species.GARCHOMP, PokemonType.DRAGON, PokemonType.GROUND, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.COMMON ], [ Biome.WASTELAND, BiomePoolTier.BOSS ] ] ], - [ Species.MUNCHLAX, Type.NORMAL, -1, [ ] + [ Species.MUNCHLAX, PokemonType.NORMAL, -1, [ ] ], - [ Species.RIOLU, Type.FIGHTING, -1, [ ] + [ Species.RIOLU, PokemonType.FIGHTING, -1, [ ] ], - [ Species.LUCARIO, Type.FIGHTING, Type.STEEL, [ + [ Species.LUCARIO, PokemonType.FIGHTING, PokemonType.STEEL, [ [ Biome.DOJO, BiomePoolTier.RARE ], [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], - [ Species.HIPPOPOTAS, Type.GROUND, -1, [ + [ Species.HIPPOPOTAS, PokemonType.GROUND, -1, [ [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.HIPPOWDON, Type.GROUND, -1, [ + [ Species.HIPPOWDON, PokemonType.GROUND, -1, [ [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.DESERT, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SKORUPI, Type.POISON, Type.BUG, [ + [ Species.SKORUPI, PokemonType.POISON, PokemonType.BUG, [ [ Biome.SWAMP, BiomePoolTier.UNCOMMON ], [ Biome.DESERT, BiomePoolTier.COMMON ], [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.DRAPION, Type.POISON, Type.DARK, [ + [ Species.DRAPION, PokemonType.POISON, PokemonType.DARK, [ [ Biome.SWAMP, BiomePoolTier.UNCOMMON ], [ Biome.DESERT, BiomePoolTier.COMMON ], [ Biome.DESERT, BiomePoolTier.BOSS ], [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.CROAGUNK, Type.POISON, Type.FIGHTING, [ + [ Species.CROAGUNK, PokemonType.POISON, PokemonType.FIGHTING, [ [ Biome.SWAMP, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.DOJO, BiomePoolTier.UNCOMMON ] ] ], - [ Species.TOXICROAK, Type.POISON, Type.FIGHTING, [ + [ Species.TOXICROAK, PokemonType.POISON, PokemonType.FIGHTING, [ [ Biome.SWAMP, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.DOJO, BiomePoolTier.UNCOMMON ], [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], - [ Species.CARNIVINE, Type.GRASS, -1, [ + [ Species.CARNIVINE, PokemonType.GRASS, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS ] ] ], - [ Species.FINNEON, Type.WATER, -1, [ + [ Species.FINNEON, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.COMMON, TimeOfDay.NIGHT ] ] ], - [ Species.LUMINEON, Type.WATER, -1, [ + [ Species.LUMINEON, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.COMMON, TimeOfDay.NIGHT ], [ Biome.SEA, BiomePoolTier.BOSS, TimeOfDay.NIGHT ] ] ], - [ Species.MANTYKE, Type.WATER, Type.FLYING, [ + [ Species.MANTYKE, PokemonType.WATER, PokemonType.FLYING, [ [ Biome.SEABED, BiomePoolTier.RARE ] ] ], - [ Species.SNOVER, Type.GRASS, Type.ICE, [ + [ Species.SNOVER, PokemonType.GRASS, PokemonType.ICE, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], - [ Species.ABOMASNOW, Type.GRASS, Type.ICE, [ + [ Species.ABOMASNOW, PokemonType.GRASS, PokemonType.ICE, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS ] ] ], - [ Species.WEAVILE, Type.DARK, Type.ICE, [ + [ Species.WEAVILE, PokemonType.DARK, PokemonType.ICE, [ [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.MAGNEZONE, Type.ELECTRIC, Type.STEEL, [ + [ Species.MAGNEZONE, PokemonType.ELECTRIC, PokemonType.STEEL, [ [ Biome.POWER_PLANT, BiomePoolTier.BOSS ], [ Biome.LABORATORY, BiomePoolTier.BOSS ] ] ], - [ Species.LICKILICKY, Type.NORMAL, -1, [ + [ Species.LICKILICKY, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.RHYPERIOR, Type.GROUND, Type.ROCK, [ + [ Species.RHYPERIOR, PokemonType.GROUND, PokemonType.ROCK, [ [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], - [ Species.TANGROWTH, Type.GRASS, -1, [ + [ Species.TANGROWTH, PokemonType.GRASS, -1, [ [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.ELECTIVIRE, Type.ELECTRIC, -1, [ + [ Species.ELECTIVIRE, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.BOSS ] ] ], - [ Species.MAGMORTAR, Type.FIRE, -1, [ + [ Species.MAGMORTAR, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.TOGEKISS, Type.FAIRY, Type.FLYING, [ + [ Species.TOGEKISS, PokemonType.FAIRY, PokemonType.FLYING, [ [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.YANMEGA, Type.BUG, Type.FLYING, [ + [ Species.YANMEGA, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.JUNGLE, BiomePoolTier.BOSS ] ] ], - [ Species.LEAFEON, Type.GRASS, -1, [ + [ Species.LEAFEON, PokemonType.GRASS, -1, [ [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.GLACEON, Type.ICE, -1, [ + [ Species.GLACEON, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.GLISCOR, Type.GROUND, Type.FLYING, [ + [ Species.GLISCOR, PokemonType.GROUND, PokemonType.FLYING, [ [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], - [ Species.MAMOSWINE, Type.ICE, Type.GROUND, [ + [ Species.MAMOSWINE, PokemonType.ICE, PokemonType.GROUND, [ [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.PORYGON_Z, Type.NORMAL, -1, [ + [ Species.PORYGON_Z, PokemonType.NORMAL, -1, [ [ Biome.SPACE, BiomePoolTier.BOSS_RARE ], [ Biome.LABORATORY, BiomePoolTier.BOSS ] ] ], - [ Species.GALLADE, Type.PSYCHIC, Type.FIGHTING, [ + [ Species.GALLADE, PokemonType.PSYCHIC, PokemonType.FIGHTING, [ [ Biome.DOJO, BiomePoolTier.SUPER_RARE ], [ Biome.DOJO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.PROBOPASS, Type.ROCK, Type.STEEL, [ + [ Species.PROBOPASS, PokemonType.ROCK, PokemonType.STEEL, [ [ Biome.CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.DUSKNOIR, Type.GHOST, -1, [ + [ Species.DUSKNOIR, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.FROSLASS, Type.ICE, Type.GHOST, [ + [ Species.FROSLASS, PokemonType.ICE, PokemonType.GHOST, [ [ Biome.ICE_CAVE, BiomePoolTier.RARE ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.ROTOM, Type.ELECTRIC, Type.GHOST, [ + [ Species.ROTOM, PokemonType.ELECTRIC, PokemonType.GHOST, [ [ Biome.LABORATORY, BiomePoolTier.SUPER_RARE ], [ Biome.LABORATORY, BiomePoolTier.BOSS_SUPER_RARE ], [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ], @@ -4339,104 +4352,104 @@ export function initBiomes() { [ Biome.TALL_GRASS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.UXIE, Type.PSYCHIC, -1, [ + [ Species.UXIE, PokemonType.PSYCHIC, -1, [ [ Biome.CAVE, BiomePoolTier.ULTRA_RARE ], [ Biome.CAVE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.MESPRIT, Type.PSYCHIC, -1, [ + [ Species.MESPRIT, PokemonType.PSYCHIC, -1, [ [ Biome.LAKE, BiomePoolTier.ULTRA_RARE ], [ Biome.LAKE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.AZELF, Type.PSYCHIC, -1, [ + [ Species.AZELF, PokemonType.PSYCHIC, -1, [ [ Biome.SWAMP, BiomePoolTier.ULTRA_RARE ], [ Biome.SWAMP, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.DIALGA, Type.STEEL, Type.DRAGON, [ + [ Species.DIALGA, PokemonType.STEEL, PokemonType.DRAGON, [ [ Biome.WASTELAND, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.PALKIA, Type.WATER, Type.DRAGON, [ + [ Species.PALKIA, PokemonType.WATER, PokemonType.DRAGON, [ [ Biome.ABYSS, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.HEATRAN, Type.FIRE, Type.STEEL, [ + [ Species.HEATRAN, PokemonType.FIRE, PokemonType.STEEL, [ [ Biome.VOLCANO, BiomePoolTier.ULTRA_RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.REGIGIGAS, Type.NORMAL, -1, [ + [ Species.REGIGIGAS, PokemonType.NORMAL, -1, [ [ Biome.TEMPLE, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.GIRATINA, Type.GHOST, Type.DRAGON, [ + [ Species.GIRATINA, PokemonType.GHOST, PokemonType.DRAGON, [ [ Biome.GRAVEYARD, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.CRESSELIA, Type.PSYCHIC, -1, [ + [ Species.CRESSELIA, PokemonType.PSYCHIC, -1, [ [ Biome.BEACH, BiomePoolTier.ULTRA_RARE ], [ Biome.BEACH, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.PHIONE, Type.WATER, -1, [ ] + [ Species.PHIONE, PokemonType.WATER, -1, [ ] ], - [ Species.MANAPHY, Type.WATER, -1, [ ] + [ Species.MANAPHY, PokemonType.WATER, -1, [ ] ], - [ Species.DARKRAI, Type.DARK, -1, [ + [ Species.DARKRAI, PokemonType.DARK, -1, [ [ Biome.ABYSS, BiomePoolTier.ULTRA_RARE ], [ Biome.ABYSS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.SHAYMIN, Type.GRASS, -1, [ + [ Species.SHAYMIN, PokemonType.GRASS, -1, [ [ Biome.MEADOW, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.ARCEUS, Type.NORMAL, -1, [ ] + [ Species.ARCEUS, PokemonType.NORMAL, -1, [ ] ], - [ Species.VICTINI, Type.PSYCHIC, Type.FIRE, [ ] + [ Species.VICTINI, PokemonType.PSYCHIC, PokemonType.FIRE, [ ] ], - [ Species.SNIVY, Type.GRASS, -1, [ + [ Species.SNIVY, PokemonType.GRASS, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ] ] ], - [ Species.SERVINE, Type.GRASS, -1, [ + [ Species.SERVINE, PokemonType.GRASS, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ] ] ], - [ Species.SERPERIOR, Type.GRASS, -1, [ + [ Species.SERPERIOR, PokemonType.GRASS, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.TEPIG, Type.FIRE, -1, [ + [ Species.TEPIG, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.PIGNITE, Type.FIRE, Type.FIGHTING, [ + [ Species.PIGNITE, PokemonType.FIRE, PokemonType.FIGHTING, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.EMBOAR, Type.FIRE, Type.FIGHTING, [ + [ Species.EMBOAR, PokemonType.FIRE, PokemonType.FIGHTING, [ [ Biome.VOLCANO, BiomePoolTier.RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.OSHAWOTT, Type.WATER, -1, [ + [ Species.OSHAWOTT, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ] ] ], - [ Species.DEWOTT, Type.WATER, -1, [ + [ Species.DEWOTT, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ] ] ], - [ Species.SAMUROTT, Type.WATER, -1, [ + [ Species.SAMUROTT, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ], [ Biome.LAKE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.PATRAT, Type.NORMAL, -1, [ + [ Species.PATRAT, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], @@ -4444,437 +4457,437 @@ export function initBiomes() { [ Biome.SLUM, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.WATCHOG, Type.NORMAL, -1, [ + [ Species.WATCHOG, PokemonType.NORMAL, -1, [ [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.METROPOLIS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SLUM, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SLUM, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.LILLIPUP, Type.NORMAL, -1, [ + [ Species.LILLIPUP, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.METROPOLIS, BiomePoolTier.COMMON ] ] ], - [ Species.HERDIER, Type.NORMAL, -1, [ + [ Species.HERDIER, PokemonType.NORMAL, -1, [ [ Biome.METROPOLIS, BiomePoolTier.COMMON ] ] ], - [ Species.STOUTLAND, Type.NORMAL, -1, [ + [ Species.STOUTLAND, PokemonType.NORMAL, -1, [ [ Biome.METROPOLIS, BiomePoolTier.COMMON ], [ Biome.METROPOLIS, BiomePoolTier.BOSS ] ] ], - [ Species.PURRLOIN, Type.DARK, -1, [ + [ Species.PURRLOIN, PokemonType.DARK, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.ABYSS, BiomePoolTier.COMMON ], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.LIEPARD, Type.DARK, -1, [ + [ Species.LIEPARD, PokemonType.DARK, -1, [ [ Biome.ABYSS, BiomePoolTier.COMMON ], [ Biome.ABYSS, BiomePoolTier.BOSS ], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.PANSAGE, Type.GRASS, -1, [ + [ Species.PANSAGE, PokemonType.GRASS, -1, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SIMISAGE, Type.GRASS, -1, [ + [ Species.SIMISAGE, PokemonType.GRASS, -1, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON ], [ Biome.FOREST, BiomePoolTier.BOSS ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.PANSEAR, Type.FIRE, -1, [ + [ Species.PANSEAR, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SIMISEAR, Type.FIRE, -1, [ + [ Species.SIMISEAR, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.BOSS ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.PANPOUR, Type.WATER, -1, [ + [ Species.PANPOUR, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SIMIPOUR, Type.WATER, -1, [ + [ Species.SIMIPOUR, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ], [ Biome.SEA, BiomePoolTier.BOSS ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.MUNNA, Type.PSYCHIC, -1, [ + [ Species.MUNNA, PokemonType.PSYCHIC, -1, [ [ Biome.SPACE, BiomePoolTier.COMMON ] ] ], - [ Species.MUSHARNA, Type.PSYCHIC, -1, [ + [ Species.MUSHARNA, PokemonType.PSYCHIC, -1, [ [ Biome.SPACE, BiomePoolTier.COMMON ], [ Biome.SPACE, BiomePoolTier.BOSS ] ] ], - [ Species.PIDOVE, Type.NORMAL, Type.FLYING, [ + [ Species.PIDOVE, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.TRANQUILL, Type.NORMAL, Type.FLYING, [ + [ Species.TRANQUILL, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.UNFEZANT, Type.NORMAL, Type.FLYING, [ + [ Species.UNFEZANT, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.BLITZLE, Type.ELECTRIC, -1, [ + [ Species.BLITZLE, PokemonType.ELECTRIC, -1, [ [ Biome.MEADOW, BiomePoolTier.COMMON ], [ Biome.JUNGLE, BiomePoolTier.COMMON ] ] ], - [ Species.ZEBSTRIKA, Type.ELECTRIC, -1, [ + [ Species.ZEBSTRIKA, PokemonType.ELECTRIC, -1, [ [ Biome.MEADOW, BiomePoolTier.COMMON ], [ Biome.MEADOW, BiomePoolTier.BOSS ], [ Biome.JUNGLE, BiomePoolTier.COMMON ] ] ], - [ Species.ROGGENROLA, Type.ROCK, -1, [ + [ Species.ROGGENROLA, PokemonType.ROCK, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.BOLDORE, Type.ROCK, -1, [ + [ Species.BOLDORE, PokemonType.ROCK, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.GIGALITH, Type.ROCK, -1, [ + [ Species.GIGALITH, PokemonType.ROCK, -1, [ [ Biome.CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.WOOBAT, Type.PSYCHIC, Type.FLYING, [ + [ Species.WOOBAT, PokemonType.PSYCHIC, PokemonType.FLYING, [ [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.SWOOBAT, Type.PSYCHIC, Type.FLYING, [ + [ Species.SWOOBAT, PokemonType.PSYCHIC, PokemonType.FLYING, [ [ Biome.CAVE, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.DRILBUR, Type.GROUND, -1, [ + [ Species.DRILBUR, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ] ] ], - [ Species.EXCADRILL, Type.GROUND, Type.STEEL, [ + [ Species.EXCADRILL, PokemonType.GROUND, PokemonType.STEEL, [ [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.BOSS ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ] ] ], - [ Species.AUDINO, Type.NORMAL, -1, [ + [ Species.AUDINO, PokemonType.NORMAL, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.RARE ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.TIMBURR, Type.FIGHTING, -1, [ + [ Species.TIMBURR, PokemonType.FIGHTING, -1, [ [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ] ] ], - [ Species.GURDURR, Type.FIGHTING, -1, [ + [ Species.GURDURR, PokemonType.FIGHTING, -1, [ [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ] ] ], - [ Species.CONKELDURR, Type.FIGHTING, -1, [ + [ Species.CONKELDURR, PokemonType.FIGHTING, -1, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS ] ] ], - [ Species.TYMPOLE, Type.WATER, -1, [ + [ Species.TYMPOLE, PokemonType.WATER, -1, [ [ Biome.SWAMP, BiomePoolTier.COMMON ] ] ], - [ Species.PALPITOAD, Type.WATER, Type.GROUND, [ + [ Species.PALPITOAD, PokemonType.WATER, PokemonType.GROUND, [ [ Biome.SWAMP, BiomePoolTier.COMMON ] ] ], - [ Species.SEISMITOAD, Type.WATER, Type.GROUND, [ + [ Species.SEISMITOAD, PokemonType.WATER, PokemonType.GROUND, [ [ Biome.SWAMP, BiomePoolTier.COMMON ], [ Biome.SWAMP, BiomePoolTier.BOSS ] ] ], - [ Species.THROH, Type.FIGHTING, -1, [ + [ Species.THROH, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.RARE ], [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], - [ Species.SAWK, Type.FIGHTING, -1, [ + [ Species.SAWK, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.RARE ], [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], - [ Species.SEWADDLE, Type.BUG, Type.GRASS, [ + [ Species.SEWADDLE, PokemonType.BUG, PokemonType.GRASS, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SWADLOON, Type.BUG, Type.GRASS, [ + [ Species.SWADLOON, PokemonType.BUG, PokemonType.GRASS, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.LEAVANNY, Type.BUG, Type.GRASS, [ + [ Species.LEAVANNY, PokemonType.BUG, PokemonType.GRASS, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.VENIPEDE, Type.BUG, Type.POISON, [ + [ Species.VENIPEDE, PokemonType.BUG, PokemonType.POISON, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.WHIRLIPEDE, Type.BUG, Type.POISON, [ + [ Species.WHIRLIPEDE, PokemonType.BUG, PokemonType.POISON, [ [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.SCOLIPEDE, Type.BUG, Type.POISON, [ + [ Species.SCOLIPEDE, PokemonType.BUG, PokemonType.POISON, [ [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.COTTONEE, Type.GRASS, Type.FAIRY, [ + [ Species.COTTONEE, PokemonType.GRASS, PokemonType.FAIRY, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MEADOW, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.WHIMSICOTT, Type.GRASS, Type.FAIRY, [ + [ Species.WHIMSICOTT, PokemonType.GRASS, PokemonType.FAIRY, [ [ Biome.GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.PETILIL, Type.GRASS, -1, [ + [ Species.PETILIL, PokemonType.GRASS, -1, [ [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.LILLIGANT, Type.GRASS, -1, [ + [ Species.LILLIGANT, PokemonType.GRASS, -1, [ [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.BASCULIN, Type.WATER, -1, [ + [ Species.BASCULIN, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.COMMON ] ] ], - [ Species.SANDILE, Type.GROUND, Type.DARK, [ + [ Species.SANDILE, PokemonType.GROUND, PokemonType.DARK, [ [ Biome.DESERT, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.KROKOROK, Type.GROUND, Type.DARK, [ + [ Species.KROKOROK, PokemonType.GROUND, PokemonType.DARK, [ [ Biome.DESERT, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.KROOKODILE, Type.GROUND, Type.DARK, [ + [ Species.KROOKODILE, PokemonType.GROUND, PokemonType.DARK, [ [ Biome.DESERT, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.DESERT, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.DARUMAKA, Type.FIRE, -1, [ + [ Species.DARUMAKA, PokemonType.FIRE, -1, [ [ Biome.DESERT, BiomePoolTier.RARE ] ] ], - [ Species.DARMANITAN, Type.FIRE, -1, [ + [ Species.DARMANITAN, PokemonType.FIRE, -1, [ [ Biome.DESERT, BiomePoolTier.RARE ], [ Biome.DESERT, BiomePoolTier.BOSS ] ] ], - [ Species.MARACTUS, Type.GRASS, -1, [ + [ Species.MARACTUS, PokemonType.GRASS, -1, [ [ Biome.DESERT, BiomePoolTier.UNCOMMON ], [ Biome.DESERT, BiomePoolTier.BOSS ] ] ], - [ Species.DWEBBLE, Type.BUG, Type.ROCK, [ + [ Species.DWEBBLE, PokemonType.BUG, PokemonType.ROCK, [ [ Biome.BEACH, BiomePoolTier.COMMON ] ] ], - [ Species.CRUSTLE, Type.BUG, Type.ROCK, [ + [ Species.CRUSTLE, PokemonType.BUG, PokemonType.ROCK, [ [ Biome.BEACH, BiomePoolTier.COMMON ], [ Biome.BEACH, BiomePoolTier.BOSS ] ] ], - [ Species.SCRAGGY, Type.DARK, Type.FIGHTING, [ + [ Species.SCRAGGY, PokemonType.DARK, PokemonType.FIGHTING, [ [ Biome.DOJO, BiomePoolTier.UNCOMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SCRAFTY, Type.DARK, Type.FIGHTING, [ + [ Species.SCRAFTY, PokemonType.DARK, PokemonType.FIGHTING, [ [ Biome.DOJO, BiomePoolTier.UNCOMMON ], [ Biome.DOJO, BiomePoolTier.BOSS ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SIGILYPH, Type.PSYCHIC, Type.FLYING, [ + [ Species.SIGILYPH, PokemonType.PSYCHIC, PokemonType.FLYING, [ [ Biome.RUINS, BiomePoolTier.UNCOMMON ], [ Biome.RUINS, BiomePoolTier.BOSS ], [ Biome.SPACE, BiomePoolTier.RARE ] ] ], - [ Species.YAMASK, Type.GHOST, -1, [ + [ Species.YAMASK, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ], [ Biome.TEMPLE, BiomePoolTier.COMMON ] ] ], - [ Species.COFAGRIGUS, Type.GHOST, -1, [ + [ Species.COFAGRIGUS, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ], [ Biome.TEMPLE, BiomePoolTier.COMMON ], [ Biome.TEMPLE, BiomePoolTier.BOSS ] ] ], - [ Species.TIRTOUGA, Type.WATER, Type.ROCK, [ + [ Species.TIRTOUGA, PokemonType.WATER, PokemonType.ROCK, [ [ Biome.SEA, BiomePoolTier.SUPER_RARE ], [ Biome.BEACH, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.CARRACOSTA, Type.WATER, Type.ROCK, [ + [ Species.CARRACOSTA, PokemonType.WATER, PokemonType.ROCK, [ [ Biome.SEA, BiomePoolTier.SUPER_RARE ], [ Biome.BEACH, BiomePoolTier.SUPER_RARE ], [ Biome.BEACH, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.ARCHEN, Type.ROCK, Type.FLYING, [ + [ Species.ARCHEN, PokemonType.ROCK, PokemonType.FLYING, [ [ Biome.RUINS, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.ARCHEOPS, Type.ROCK, Type.FLYING, [ + [ Species.ARCHEOPS, PokemonType.ROCK, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ], [ Biome.RUINS, BiomePoolTier.SUPER_RARE ], [ Biome.RUINS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.TRUBBISH, Type.POISON, -1, [ + [ Species.TRUBBISH, PokemonType.POISON, -1, [ [ Biome.SLUM, BiomePoolTier.COMMON ] ] ], - [ Species.GARBODOR, Type.POISON, -1, [ + [ Species.GARBODOR, PokemonType.POISON, -1, [ [ Biome.SLUM, BiomePoolTier.COMMON ], [ Biome.SLUM, BiomePoolTier.BOSS ] ] ], - [ Species.ZORUA, Type.DARK, -1, [ + [ Species.ZORUA, PokemonType.DARK, -1, [ [ Biome.ABYSS, BiomePoolTier.RARE ] ] ], - [ Species.ZOROARK, Type.DARK, -1, [ + [ Species.ZOROARK, PokemonType.DARK, -1, [ [ Biome.ABYSS, BiomePoolTier.RARE ], [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.MINCCINO, Type.NORMAL, -1, [ + [ Species.MINCCINO, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MEADOW, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.CINCCINO, Type.NORMAL, -1, [ + [ Species.CINCCINO, PokemonType.NORMAL, -1, [ [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GOTHITA, Type.PSYCHIC, -1, [ + [ Species.GOTHITA, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.RARE ] ] ], - [ Species.GOTHORITA, Type.PSYCHIC, -1, [ + [ Species.GOTHORITA, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.RARE ] ] ], - [ Species.GOTHITELLE, Type.PSYCHIC, -1, [ + [ Species.GOTHITELLE, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.RARE ], [ Biome.RUINS, BiomePoolTier.BOSS ] ] ], - [ Species.SOLOSIS, Type.PSYCHIC, -1, [ + [ Species.SOLOSIS, PokemonType.PSYCHIC, -1, [ [ Biome.SPACE, BiomePoolTier.RARE ], [ Biome.LABORATORY, BiomePoolTier.UNCOMMON ] ] ], - [ Species.DUOSION, Type.PSYCHIC, -1, [ + [ Species.DUOSION, PokemonType.PSYCHIC, -1, [ [ Biome.SPACE, BiomePoolTier.RARE ], [ Biome.LABORATORY, BiomePoolTier.UNCOMMON ] ] ], - [ Species.REUNICLUS, Type.PSYCHIC, -1, [ + [ Species.REUNICLUS, PokemonType.PSYCHIC, -1, [ [ Biome.SPACE, BiomePoolTier.RARE ], [ Biome.SPACE, BiomePoolTier.BOSS ], [ Biome.LABORATORY, BiomePoolTier.UNCOMMON ], [ Biome.LABORATORY, BiomePoolTier.BOSS ] ] ], - [ Species.DUCKLETT, Type.WATER, Type.FLYING, [ + [ Species.DUCKLETT, PokemonType.WATER, PokemonType.FLYING, [ [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SWANNA, Type.WATER, Type.FLYING, [ + [ Species.SWANNA, PokemonType.WATER, PokemonType.FLYING, [ [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.LAKE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.VANILLITE, Type.ICE, -1, [ + [ Species.VANILLITE, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.VANILLISH, Type.ICE, -1, [ + [ Species.VANILLISH, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.VANILLUXE, Type.ICE, -1, [ + [ Species.VANILLUXE, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.DEERLING, Type.NORMAL, Type.GRASS, [ + [ Species.DEERLING, PokemonType.NORMAL, PokemonType.GRASS, [ [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SAWSBUCK, Type.NORMAL, Type.GRASS, [ + [ Species.SAWSBUCK, PokemonType.NORMAL, PokemonType.GRASS, [ [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.EMOLGA, Type.ELECTRIC, Type.FLYING, [ + [ Species.EMOLGA, PokemonType.ELECTRIC, PokemonType.FLYING, [ [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ] ] ], - [ Species.KARRABLAST, Type.BUG, -1, [ + [ Species.KARRABLAST, PokemonType.BUG, -1, [ [ Biome.FOREST, BiomePoolTier.RARE ] ] ], - [ Species.ESCAVALIER, Type.BUG, Type.STEEL, [ + [ Species.ESCAVALIER, PokemonType.BUG, PokemonType.STEEL, [ [ Biome.FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.FOONGUS, Type.GRASS, Type.POISON, [ + [ Species.FOONGUS, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.JUNGLE, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.AMOONGUSS, Type.GRASS, Type.POISON, [ + [ Species.AMOONGUSS, PokemonType.GRASS, PokemonType.POISON, [ [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.JUNGLE, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], @@ -4882,712 +4895,712 @@ export function initBiomes() { [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.FRILLISH, Type.WATER, Type.GHOST, [ + [ Species.FRILLISH, PokemonType.WATER, PokemonType.GHOST, [ [ Biome.SEABED, BiomePoolTier.COMMON ] ] ], - [ Species.JELLICENT, Type.WATER, Type.GHOST, [ + [ Species.JELLICENT, PokemonType.WATER, PokemonType.GHOST, [ [ Biome.SEABED, BiomePoolTier.COMMON ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.ALOMOMOLA, Type.WATER, -1, [ + [ Species.ALOMOMOLA, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.RARE ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.JOLTIK, Type.BUG, Type.ELECTRIC, [ + [ Species.JOLTIK, PokemonType.BUG, PokemonType.ELECTRIC, [ [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.GALVANTULA, Type.BUG, Type.ELECTRIC, [ + [ Species.GALVANTULA, PokemonType.BUG, PokemonType.ELECTRIC, [ [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ], [ Biome.JUNGLE, BiomePoolTier.BOSS ] ] ], - [ Species.FERROSEED, Type.GRASS, Type.STEEL, [ + [ Species.FERROSEED, PokemonType.GRASS, PokemonType.STEEL, [ [ Biome.CAVE, BiomePoolTier.RARE ] ] ], - [ Species.FERROTHORN, Type.GRASS, Type.STEEL, [ + [ Species.FERROTHORN, PokemonType.GRASS, PokemonType.STEEL, [ [ Biome.CAVE, BiomePoolTier.RARE ], [ Biome.CAVE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.KLINK, Type.STEEL, -1, [ + [ Species.KLINK, PokemonType.STEEL, -1, [ [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.LABORATORY, BiomePoolTier.COMMON ] ] ], - [ Species.KLANG, Type.STEEL, -1, [ + [ Species.KLANG, PokemonType.STEEL, -1, [ [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.LABORATORY, BiomePoolTier.COMMON ] ] ], - [ Species.KLINKLANG, Type.STEEL, -1, [ + [ Species.KLINKLANG, PokemonType.STEEL, -1, [ [ Biome.FACTORY, BiomePoolTier.COMMON ], [ Biome.FACTORY, BiomePoolTier.BOSS ], [ Biome.LABORATORY, BiomePoolTier.COMMON ], [ Biome.LABORATORY, BiomePoolTier.BOSS ] ] ], - [ Species.TYNAMO, Type.ELECTRIC, -1, [ + [ Species.TYNAMO, PokemonType.ELECTRIC, -1, [ [ Biome.SEABED, BiomePoolTier.RARE ] ] ], - [ Species.EELEKTRIK, Type.ELECTRIC, -1, [ + [ Species.EELEKTRIK, PokemonType.ELECTRIC, -1, [ [ Biome.SEABED, BiomePoolTier.RARE ] ] ], - [ Species.EELEKTROSS, Type.ELECTRIC, -1, [ + [ Species.EELEKTROSS, PokemonType.ELECTRIC, -1, [ [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.ELGYEM, Type.PSYCHIC, -1, [ + [ Species.ELGYEM, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.COMMON ], [ Biome.SPACE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.BEHEEYEM, Type.PSYCHIC, -1, [ + [ Species.BEHEEYEM, PokemonType.PSYCHIC, -1, [ [ Biome.RUINS, BiomePoolTier.COMMON ], [ Biome.RUINS, BiomePoolTier.BOSS ], [ Biome.SPACE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.LITWICK, Type.GHOST, Type.FIRE, [ + [ Species.LITWICK, PokemonType.GHOST, PokemonType.FIRE, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ], [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.LAMPENT, Type.GHOST, Type.FIRE, [ + [ Species.LAMPENT, PokemonType.GHOST, PokemonType.FIRE, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ], [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.CHANDELURE, Type.GHOST, Type.FIRE, [ + [ Species.CHANDELURE, PokemonType.GHOST, PokemonType.FIRE, [ [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.AXEW, Type.DRAGON, -1, [ + [ Species.AXEW, PokemonType.DRAGON, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.COMMON ] ] ], - [ Species.FRAXURE, Type.DRAGON, -1, [ + [ Species.FRAXURE, PokemonType.DRAGON, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.COMMON ] ] ], - [ Species.HAXORUS, Type.DRAGON, -1, [ + [ Species.HAXORUS, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.COMMON ], [ Biome.WASTELAND, BiomePoolTier.BOSS ] ] ], - [ Species.CUBCHOO, Type.ICE, -1, [ + [ Species.CUBCHOO, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.BEARTIC, Type.ICE, -1, [ + [ Species.BEARTIC, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.CRYOGONAL, Type.ICE, -1, [ + [ Species.CRYOGONAL, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.RARE ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.SHELMET, Type.BUG, -1, [ + [ Species.SHELMET, PokemonType.BUG, -1, [ [ Biome.FOREST, BiomePoolTier.RARE ] ] ], - [ Species.ACCELGOR, Type.BUG, -1, [ + [ Species.ACCELGOR, PokemonType.BUG, -1, [ [ Biome.FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.STUNFISK, Type.GROUND, Type.ELECTRIC, [ + [ Species.STUNFISK, PokemonType.GROUND, PokemonType.ELECTRIC, [ [ Biome.SWAMP, BiomePoolTier.UNCOMMON ], [ Biome.SWAMP, BiomePoolTier.BOSS ] ] ], - [ Species.MIENFOO, Type.FIGHTING, -1, [ + [ Species.MIENFOO, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.UNCOMMON ] ] ], - [ Species.MIENSHAO, Type.FIGHTING, -1, [ + [ Species.MIENSHAO, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.UNCOMMON ], [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], - [ Species.DRUDDIGON, Type.DRAGON, -1, [ + [ Species.DRUDDIGON, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.GOLETT, Type.GROUND, Type.GHOST, [ + [ Species.GOLETT, PokemonType.GROUND, PokemonType.GHOST, [ [ Biome.TEMPLE, BiomePoolTier.COMMON ] ] ], - [ Species.GOLURK, Type.GROUND, Type.GHOST, [ + [ Species.GOLURK, PokemonType.GROUND, PokemonType.GHOST, [ [ Biome.TEMPLE, BiomePoolTier.COMMON ], [ Biome.TEMPLE, BiomePoolTier.BOSS ] ] ], - [ Species.PAWNIARD, Type.DARK, Type.STEEL, [ + [ Species.PAWNIARD, PokemonType.DARK, PokemonType.STEEL, [ [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], - [ Species.BISHARP, Type.DARK, Type.STEEL, [ + [ Species.BISHARP, PokemonType.DARK, PokemonType.STEEL, [ [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], - [ Species.BOUFFALANT, Type.NORMAL, -1, [ + [ Species.BOUFFALANT, PokemonType.NORMAL, -1, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.RUFFLET, Type.NORMAL, Type.FLYING, [ + [ Species.RUFFLET, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.BRAVIARY, Type.NORMAL, Type.FLYING, [ + [ Species.BRAVIARY, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.VULLABY, Type.DARK, Type.FLYING, [ + [ Species.VULLABY, PokemonType.DARK, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.MANDIBUZZ, Type.DARK, Type.FLYING, [ + [ Species.MANDIBUZZ, PokemonType.DARK, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.HEATMOR, Type.FIRE, -1, [ + [ Species.HEATMOR, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.DURANT, Type.BUG, Type.STEEL, [ + [ Species.DURANT, PokemonType.BUG, PokemonType.STEEL, [ [ Biome.FOREST, BiomePoolTier.SUPER_RARE ], [ Biome.FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.DEINO, Type.DARK, Type.DRAGON, [ + [ Species.DEINO, PokemonType.DARK, PokemonType.DRAGON, [ [ Biome.WASTELAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.ABYSS, BiomePoolTier.RARE ] ] ], - [ Species.ZWEILOUS, Type.DARK, Type.DRAGON, [ + [ Species.ZWEILOUS, PokemonType.DARK, PokemonType.DRAGON, [ [ Biome.WASTELAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.ABYSS, BiomePoolTier.RARE ] ] ], - [ Species.HYDREIGON, Type.DARK, Type.DRAGON, [ + [ Species.HYDREIGON, PokemonType.DARK, PokemonType.DRAGON, [ [ Biome.WASTELAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.ABYSS, BiomePoolTier.RARE ], [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.LARVESTA, Type.BUG, Type.FIRE, [ + [ Species.LARVESTA, PokemonType.BUG, PokemonType.FIRE, [ [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.VOLCARONA, Type.BUG, Type.FIRE, [ + [ Species.VOLCARONA, PokemonType.BUG, PokemonType.FIRE, [ [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.COBALION, Type.STEEL, Type.FIGHTING, [ + [ Species.COBALION, PokemonType.STEEL, PokemonType.FIGHTING, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.ULTRA_RARE ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.TERRAKION, Type.ROCK, Type.FIGHTING, [ + [ Species.TERRAKION, PokemonType.ROCK, PokemonType.FIGHTING, [ [ Biome.DOJO, BiomePoolTier.ULTRA_RARE ], [ Biome.DOJO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.VIRIZION, Type.GRASS, Type.FIGHTING, [ + [ Species.VIRIZION, PokemonType.GRASS, PokemonType.FIGHTING, [ [ Biome.GRASS, BiomePoolTier.ULTRA_RARE ], [ Biome.GRASS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.TORNADUS, Type.FLYING, -1, [ + [ Species.TORNADUS, PokemonType.FLYING, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.ULTRA_RARE ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.THUNDURUS, Type.ELECTRIC, Type.FLYING, [ + [ Species.THUNDURUS, PokemonType.ELECTRIC, PokemonType.FLYING, [ [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.RESHIRAM, Type.DRAGON, Type.FIRE, [ + [ Species.RESHIRAM, PokemonType.DRAGON, PokemonType.FIRE, [ [ Biome.VOLCANO, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.ZEKROM, Type.DRAGON, Type.ELECTRIC, [ + [ Species.ZEKROM, PokemonType.DRAGON, PokemonType.ELECTRIC, [ [ Biome.POWER_PLANT, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.LANDORUS, Type.GROUND, Type.FLYING, [ + [ Species.LANDORUS, PokemonType.GROUND, PokemonType.FLYING, [ [ Biome.BADLANDS, BiomePoolTier.ULTRA_RARE ], [ Biome.BADLANDS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.KYUREM, Type.DRAGON, Type.ICE, [ + [ Species.KYUREM, PokemonType.DRAGON, PokemonType.ICE, [ [ Biome.ICE_CAVE, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.KELDEO, Type.WATER, Type.FIGHTING, [ + [ Species.KELDEO, PokemonType.WATER, PokemonType.FIGHTING, [ [ Biome.BEACH, BiomePoolTier.ULTRA_RARE ], [ Biome.BEACH, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.MELOETTA, Type.NORMAL, Type.PSYCHIC, [ + [ Species.MELOETTA, PokemonType.NORMAL, PokemonType.PSYCHIC, [ [ Biome.MEADOW, BiomePoolTier.ULTRA_RARE ], [ Biome.MEADOW, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.GENESECT, Type.BUG, Type.STEEL, [ + [ Species.GENESECT, PokemonType.BUG, PokemonType.STEEL, [ [ Biome.FACTORY, BiomePoolTier.ULTRA_RARE ], [ Biome.FACTORY, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.CHESPIN, Type.GRASS, -1, [ + [ Species.CHESPIN, PokemonType.GRASS, -1, [ [ Biome.FOREST, BiomePoolTier.RARE ] ] ], - [ Species.QUILLADIN, Type.GRASS, -1, [ + [ Species.QUILLADIN, PokemonType.GRASS, -1, [ [ Biome.FOREST, BiomePoolTier.RARE ] ] ], - [ Species.CHESNAUGHT, Type.GRASS, Type.FIGHTING, [ + [ Species.CHESNAUGHT, PokemonType.GRASS, PokemonType.FIGHTING, [ [ Biome.FOREST, BiomePoolTier.RARE ], [ Biome.FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.FENNEKIN, Type.FIRE, -1, [ + [ Species.FENNEKIN, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.BRAIXEN, Type.FIRE, -1, [ + [ Species.BRAIXEN, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.DELPHOX, Type.FIRE, Type.PSYCHIC, [ + [ Species.DELPHOX, PokemonType.FIRE, PokemonType.PSYCHIC, [ [ Biome.VOLCANO, BiomePoolTier.RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.FROAKIE, Type.WATER, -1, [ + [ Species.FROAKIE, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ] ] ], - [ Species.FROGADIER, Type.WATER, -1, [ + [ Species.FROGADIER, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ] ] ], - [ Species.GRENINJA, Type.WATER, Type.DARK, [ + [ Species.GRENINJA, PokemonType.WATER, PokemonType.DARK, [ [ Biome.LAKE, BiomePoolTier.RARE ], [ Biome.LAKE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.BUNNELBY, Type.NORMAL, -1, [ + [ Species.BUNNELBY, PokemonType.NORMAL, -1, [ [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.DIGGERSBY, Type.NORMAL, Type.GROUND, [ + [ Species.DIGGERSBY, PokemonType.NORMAL, PokemonType.GROUND, [ [ Biome.CAVE, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.FLETCHLING, Type.NORMAL, Type.FLYING, [ + [ Species.FLETCHLING, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.FLETCHINDER, Type.FIRE, Type.FLYING, [ + [ Species.FLETCHINDER, PokemonType.FIRE, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.TALONFLAME, Type.FIRE, Type.FLYING, [ + [ Species.TALONFLAME, PokemonType.FIRE, PokemonType.FLYING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SCATTERBUG, Type.BUG, -1, [ + [ Species.SCATTERBUG, PokemonType.BUG, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SPEWPA, Type.BUG, -1, [ + [ Species.SPEWPA, PokemonType.BUG, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.VIVILLON, Type.BUG, Type.FLYING, [ + [ Species.VIVILLON, PokemonType.BUG, PokemonType.FLYING, [ [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.LITLEO, Type.FIRE, Type.NORMAL, [ + [ Species.LITLEO, PokemonType.FIRE, PokemonType.NORMAL, [ [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.PYROAR, Type.FIRE, Type.NORMAL, [ + [ Species.PYROAR, PokemonType.FIRE, PokemonType.NORMAL, [ [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ], [ Biome.JUNGLE, BiomePoolTier.BOSS ] ] ], - [ Species.FLABEBE, Type.FAIRY, -1, [ + [ Species.FLABEBE, PokemonType.FAIRY, -1, [ [ Biome.MEADOW, BiomePoolTier.COMMON ] ] ], - [ Species.FLOETTE, Type.FAIRY, -1, [ + [ Species.FLOETTE, PokemonType.FAIRY, -1, [ [ Biome.MEADOW, BiomePoolTier.COMMON ] ] ], - [ Species.FLORGES, Type.FAIRY, -1, [ + [ Species.FLORGES, PokemonType.FAIRY, -1, [ [ Biome.MEADOW, BiomePoolTier.BOSS ] ] ], - [ Species.SKIDDO, Type.GRASS, -1, [ + [ Species.SKIDDO, PokemonType.GRASS, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.COMMON ] ] ], - [ Species.GOGOAT, Type.GRASS, -1, [ + [ Species.GOGOAT, PokemonType.GRASS, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.COMMON ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS ] ] ], - [ Species.PANCHAM, Type.FIGHTING, -1, [ + [ Species.PANCHAM, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.RARE ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.PANGORO, Type.FIGHTING, Type.DARK, [ + [ Species.PANGORO, PokemonType.FIGHTING, PokemonType.DARK, [ [ Biome.DOJO, BiomePoolTier.RARE ], [ Biome.DOJO, BiomePoolTier.BOSS_RARE ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.FURFROU, Type.NORMAL, -1, [ + [ Species.FURFROU, PokemonType.NORMAL, -1, [ [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.METROPOLIS, BiomePoolTier.BOSS ] ] ], - [ Species.ESPURR, Type.PSYCHIC, -1, [ + [ Species.ESPURR, PokemonType.PSYCHIC, -1, [ [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.MEOWSTIC, Type.PSYCHIC, -1, [ + [ Species.MEOWSTIC, PokemonType.PSYCHIC, -1, [ [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.METROPOLIS, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.HONEDGE, Type.STEEL, Type.GHOST, [ + [ Species.HONEDGE, PokemonType.STEEL, PokemonType.GHOST, [ [ Biome.TEMPLE, BiomePoolTier.COMMON ] ] ], - [ Species.DOUBLADE, Type.STEEL, Type.GHOST, [ + [ Species.DOUBLADE, PokemonType.STEEL, PokemonType.GHOST, [ [ Biome.TEMPLE, BiomePoolTier.COMMON ] ] ], - [ Species.AEGISLASH, Type.STEEL, Type.GHOST, [ + [ Species.AEGISLASH, PokemonType.STEEL, PokemonType.GHOST, [ [ Biome.TEMPLE, BiomePoolTier.BOSS ] ] ], - [ Species.SPRITZEE, Type.FAIRY, -1, [ + [ Species.SPRITZEE, PokemonType.FAIRY, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.AROMATISSE, Type.FAIRY, -1, [ + [ Species.AROMATISSE, PokemonType.FAIRY, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.SWIRLIX, Type.FAIRY, -1, [ + [ Species.SWIRLIX, PokemonType.FAIRY, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.SLURPUFF, Type.FAIRY, -1, [ + [ Species.SLURPUFF, PokemonType.FAIRY, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.INKAY, Type.DARK, Type.PSYCHIC, [ + [ Species.INKAY, PokemonType.DARK, PokemonType.PSYCHIC, [ [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.MALAMAR, Type.DARK, Type.PSYCHIC, [ + [ Species.MALAMAR, PokemonType.DARK, PokemonType.PSYCHIC, [ [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SEA, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.BINACLE, Type.ROCK, Type.WATER, [ + [ Species.BINACLE, PokemonType.ROCK, PokemonType.WATER, [ [ Biome.BEACH, BiomePoolTier.COMMON ] ] ], - [ Species.BARBARACLE, Type.ROCK, Type.WATER, [ + [ Species.BARBARACLE, PokemonType.ROCK, PokemonType.WATER, [ [ Biome.BEACH, BiomePoolTier.COMMON ], [ Biome.BEACH, BiomePoolTier.BOSS ] ] ], - [ Species.SKRELP, Type.POISON, Type.WATER, [ + [ Species.SKRELP, PokemonType.POISON, PokemonType.WATER, [ [ Biome.SEABED, BiomePoolTier.UNCOMMON ] ] ], - [ Species.DRAGALGE, Type.POISON, Type.DRAGON, [ + [ Species.DRAGALGE, PokemonType.POISON, PokemonType.DRAGON, [ [ Biome.SEABED, BiomePoolTier.UNCOMMON ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.CLAUNCHER, Type.WATER, -1, [ + [ Species.CLAUNCHER, PokemonType.WATER, -1, [ [ Biome.BEACH, BiomePoolTier.UNCOMMON ] ] ], - [ Species.CLAWITZER, Type.WATER, -1, [ + [ Species.CLAWITZER, PokemonType.WATER, -1, [ [ Biome.BEACH, BiomePoolTier.UNCOMMON ], [ Biome.BEACH, BiomePoolTier.BOSS ] ] ], - [ Species.HELIOPTILE, Type.ELECTRIC, Type.NORMAL, [ + [ Species.HELIOPTILE, PokemonType.ELECTRIC, PokemonType.NORMAL, [ [ Biome.DESERT, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.HELIOLISK, Type.ELECTRIC, Type.NORMAL, [ + [ Species.HELIOLISK, PokemonType.ELECTRIC, PokemonType.NORMAL, [ [ Biome.DESERT, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.TYRUNT, Type.ROCK, Type.DRAGON, [ + [ Species.TYRUNT, PokemonType.ROCK, PokemonType.DRAGON, [ [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.TYRANTRUM, Type.ROCK, Type.DRAGON, [ + [ Species.TYRANTRUM, PokemonType.ROCK, PokemonType.DRAGON, [ [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.AMAURA, Type.ROCK, Type.ICE, [ + [ Species.AMAURA, PokemonType.ROCK, PokemonType.ICE, [ [ Biome.ICE_CAVE, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.AURORUS, Type.ROCK, Type.ICE, [ + [ Species.AURORUS, PokemonType.ROCK, PokemonType.ICE, [ [ Biome.ICE_CAVE, BiomePoolTier.SUPER_RARE ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SYLVEON, Type.FAIRY, -1, [ + [ Species.SYLVEON, PokemonType.FAIRY, -1, [ [ Biome.MEADOW, BiomePoolTier.SUPER_RARE ], [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.HAWLUCHA, Type.FIGHTING, Type.FLYING, [ + [ Species.HAWLUCHA, PokemonType.FIGHTING, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.RARE ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.DEDENNE, Type.ELECTRIC, Type.FAIRY, [ + [ Species.DEDENNE, PokemonType.ELECTRIC, PokemonType.FAIRY, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS ] ] ], - [ Species.CARBINK, Type.ROCK, Type.FAIRY, [ + [ Species.CARBINK, PokemonType.ROCK, PokemonType.FAIRY, [ [ Biome.CAVE, BiomePoolTier.RARE ], [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.GOOMY, Type.DRAGON, -1, [ + [ Species.GOOMY, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SLIGGOO, Type.DRAGON, -1, [ + [ Species.SLIGGOO, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GOODRA, Type.DRAGON, -1, [ + [ Species.GOODRA, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.WASTELAND, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.KLEFKI, Type.STEEL, Type.FAIRY, [ + [ Species.KLEFKI, PokemonType.STEEL, PokemonType.FAIRY, [ [ Biome.FACTORY, BiomePoolTier.UNCOMMON ], [ Biome.FACTORY, BiomePoolTier.BOSS ] ] ], - [ Species.PHANTUMP, Type.GHOST, Type.GRASS, [ + [ Species.PHANTUMP, PokemonType.GHOST, PokemonType.GRASS, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ] ] ], - [ Species.TREVENANT, Type.GHOST, Type.GRASS, [ + [ Species.TREVENANT, PokemonType.GHOST, PokemonType.GRASS, [ [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.PUMPKABOO, Type.GHOST, Type.GRASS, [ + [ Species.PUMPKABOO, PokemonType.GHOST, PokemonType.GRASS, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ] ] ], - [ Species.GOURGEIST, Type.GHOST, Type.GRASS, [ + [ Species.GOURGEIST, PokemonType.GHOST, PokemonType.GRASS, [ [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.BERGMITE, Type.ICE, -1, [ + [ Species.BERGMITE, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.AVALUGG, Type.ICE, -1, [ + [ Species.AVALUGG, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.NOIBAT, Type.FLYING, Type.DRAGON, [ + [ Species.NOIBAT, PokemonType.FLYING, PokemonType.DRAGON, [ [ Biome.CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.NOIVERN, Type.FLYING, Type.DRAGON, [ + [ Species.NOIVERN, PokemonType.FLYING, PokemonType.DRAGON, [ [ Biome.CAVE, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.XERNEAS, Type.FAIRY, -1, [ + [ Species.XERNEAS, PokemonType.FAIRY, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.YVELTAL, Type.DARK, Type.FLYING, [ + [ Species.YVELTAL, PokemonType.DARK, PokemonType.FLYING, [ [ Biome.ABYSS, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.ZYGARDE, Type.DRAGON, Type.GROUND, [ + [ Species.ZYGARDE, PokemonType.DRAGON, PokemonType.GROUND, [ [ Biome.LABORATORY, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.DIANCIE, Type.ROCK, Type.FAIRY, [ + [ Species.DIANCIE, PokemonType.ROCK, PokemonType.FAIRY, [ [ Biome.FAIRY_CAVE, BiomePoolTier.ULTRA_RARE ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.HOOPA, Type.PSYCHIC, Type.GHOST, [ + [ Species.HOOPA, PokemonType.PSYCHIC, PokemonType.GHOST, [ [ Biome.TEMPLE, BiomePoolTier.ULTRA_RARE ], [ Biome.TEMPLE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.VOLCANION, Type.FIRE, Type.WATER, [ + [ Species.VOLCANION, PokemonType.FIRE, PokemonType.WATER, [ [ Biome.VOLCANO, BiomePoolTier.ULTRA_RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.ROWLET, Type.GRASS, Type.FLYING, [ + [ Species.ROWLET, PokemonType.GRASS, PokemonType.FLYING, [ [ Biome.FOREST, BiomePoolTier.RARE ] ] ], - [ Species.DARTRIX, Type.GRASS, Type.FLYING, [ + [ Species.DARTRIX, PokemonType.GRASS, PokemonType.FLYING, [ [ Biome.FOREST, BiomePoolTier.RARE ] ] ], - [ Species.DECIDUEYE, Type.GRASS, Type.GHOST, [ + [ Species.DECIDUEYE, PokemonType.GRASS, PokemonType.GHOST, [ [ Biome.FOREST, BiomePoolTier.RARE ], [ Biome.FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.LITTEN, Type.FIRE, -1, [ + [ Species.LITTEN, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.TORRACAT, Type.FIRE, -1, [ + [ Species.TORRACAT, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.INCINEROAR, Type.FIRE, Type.DARK, [ + [ Species.INCINEROAR, PokemonType.FIRE, PokemonType.DARK, [ [ Biome.VOLCANO, BiomePoolTier.RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.POPPLIO, Type.WATER, -1, [ + [ Species.POPPLIO, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.RARE ] ] ], - [ Species.BRIONNE, Type.WATER, -1, [ + [ Species.BRIONNE, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.RARE ] ] ], - [ Species.PRIMARINA, Type.WATER, Type.FAIRY, [ + [ Species.PRIMARINA, PokemonType.WATER, PokemonType.FAIRY, [ [ Biome.SEA, BiomePoolTier.RARE ], [ Biome.SEA, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.PIKIPEK, Type.NORMAL, Type.FLYING, [ + [ Species.PIKIPEK, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.JUNGLE, BiomePoolTier.COMMON ] ] ], - [ Species.TRUMBEAK, Type.NORMAL, Type.FLYING, [ + [ Species.TRUMBEAK, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.JUNGLE, BiomePoolTier.COMMON ] ] ], - [ Species.TOUCANNON, Type.NORMAL, Type.FLYING, [ + [ Species.TOUCANNON, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.JUNGLE, BiomePoolTier.COMMON ], [ Biome.JUNGLE, BiomePoolTier.BOSS ] ] ], - [ Species.YUNGOOS, Type.NORMAL, -1, [ + [ Species.YUNGOOS, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GUMSHOOS, Type.NORMAL, -1, [ + [ Species.GUMSHOOS, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GRUBBIN, Type.BUG, -1, [ + [ Species.GRUBBIN, PokemonType.BUG, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], - [ Species.CHARJABUG, Type.BUG, Type.ELECTRIC, [ + [ Species.CHARJABUG, PokemonType.BUG, PokemonType.ELECTRIC, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], - [ Species.VIKAVOLT, Type.BUG, Type.ELECTRIC, [ + [ Species.VIKAVOLT, PokemonType.BUG, PokemonType.ELECTRIC, [ [ Biome.POWER_PLANT, BiomePoolTier.BOSS ] ] ], - [ Species.CRABRAWLER, Type.FIGHTING, -1, [ + [ Species.CRABRAWLER, PokemonType.FIGHTING, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.CRABOMINABLE, Type.FIGHTING, Type.ICE, [ + [ Species.CRABOMINABLE, PokemonType.FIGHTING, PokemonType.ICE, [ [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.ORICORIO, Type.FIRE, Type.FLYING, [ + [ Species.ORICORIO, PokemonType.FIRE, PokemonType.FLYING, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.ISLAND, BiomePoolTier.COMMON ], [ Biome.ISLAND, BiomePoolTier.BOSS ] ] ], - [ Species.CUTIEFLY, Type.BUG, Type.FAIRY, [ + [ Species.CUTIEFLY, PokemonType.BUG, PokemonType.FAIRY, [ [ Biome.MEADOW, BiomePoolTier.COMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.RIBOMBEE, Type.BUG, Type.FAIRY, [ + [ Species.RIBOMBEE, PokemonType.BUG, PokemonType.FAIRY, [ [ Biome.MEADOW, BiomePoolTier.COMMON ], [ Biome.MEADOW, BiomePoolTier.BOSS ], [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.ROCKRUFF, Type.ROCK, -1, [ + [ Species.ROCKRUFF, PokemonType.ROCK, -1, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, TimeOfDay.DAY ], [ Biome.FOREST, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], [ Biome.CAVE, BiomePoolTier.UNCOMMON, TimeOfDay.DUSK ] ] ], - [ Species.LYCANROC, Type.ROCK, -1, [ + [ Species.LYCANROC, PokemonType.ROCK, -1, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, TimeOfDay.DAY ], [ Biome.PLAINS, BiomePoolTier.BOSS_RARE, TimeOfDay.DAY ], [ Biome.FOREST, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ], @@ -5596,1529 +5609,1529 @@ export function initBiomes() { [ Biome.CAVE, BiomePoolTier.BOSS_RARE, TimeOfDay.DUSK ] ] ], - [ Species.WISHIWASHI, Type.WATER, -1, [ + [ Species.WISHIWASHI, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.UNCOMMON ], [ Biome.LAKE, BiomePoolTier.BOSS ] ] ], - [ Species.MAREANIE, Type.POISON, Type.WATER, [ + [ Species.MAREANIE, PokemonType.POISON, PokemonType.WATER, [ [ Biome.BEACH, BiomePoolTier.COMMON ], [ Biome.SWAMP, BiomePoolTier.UNCOMMON ] ] ], - [ Species.TOXAPEX, Type.POISON, Type.WATER, [ + [ Species.TOXAPEX, PokemonType.POISON, PokemonType.WATER, [ [ Biome.BEACH, BiomePoolTier.COMMON ], [ Biome.BEACH, BiomePoolTier.BOSS ], [ Biome.SWAMP, BiomePoolTier.UNCOMMON ], [ Biome.SWAMP, BiomePoolTier.BOSS ] ] ], - [ Species.MUDBRAY, Type.GROUND, -1, [ + [ Species.MUDBRAY, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.COMMON ] ] ], - [ Species.MUDSDALE, Type.GROUND, -1, [ + [ Species.MUDSDALE, PokemonType.GROUND, -1, [ [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], - [ Species.DEWPIDER, Type.WATER, Type.BUG, [ + [ Species.DEWPIDER, PokemonType.WATER, PokemonType.BUG, [ [ Biome.LAKE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.ARAQUANID, Type.WATER, Type.BUG, [ + [ Species.ARAQUANID, PokemonType.WATER, PokemonType.BUG, [ [ Biome.LAKE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.LAKE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.FOMANTIS, Type.GRASS, -1, [ + [ Species.FOMANTIS, PokemonType.GRASS, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.LURANTIS, Type.GRASS, -1, [ + [ Species.LURANTIS, PokemonType.GRASS, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON ], [ Biome.TALL_GRASS, BiomePoolTier.BOSS ], [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ], [ Biome.JUNGLE, BiomePoolTier.BOSS ] ] ], - [ Species.MORELULL, Type.GRASS, Type.FAIRY, [ + [ Species.MORELULL, PokemonType.GRASS, PokemonType.FAIRY, [ [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.SHIINOTIC, Type.GRASS, Type.FAIRY, [ + [ Species.SHIINOTIC, PokemonType.GRASS, PokemonType.FAIRY, [ [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.SALANDIT, Type.POISON, Type.FIRE, [ + [ Species.SALANDIT, PokemonType.POISON, PokemonType.FIRE, [ [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], - [ Species.SALAZZLE, Type.POISON, Type.FIRE, [ + [ Species.SALAZZLE, PokemonType.POISON, PokemonType.FIRE, [ [ Biome.VOLCANO, BiomePoolTier.COMMON ], [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.STUFFUL, Type.NORMAL, Type.FIGHTING, [ + [ Species.STUFFUL, PokemonType.NORMAL, PokemonType.FIGHTING, [ [ Biome.DOJO, BiomePoolTier.COMMON ] ] ], - [ Species.BEWEAR, Type.NORMAL, Type.FIGHTING, [ + [ Species.BEWEAR, PokemonType.NORMAL, PokemonType.FIGHTING, [ [ Biome.DOJO, BiomePoolTier.COMMON ], [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], - [ Species.BOUNSWEET, Type.GRASS, -1, [ + [ Species.BOUNSWEET, PokemonType.GRASS, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.STEENEE, Type.GRASS, -1, [ + [ Species.STEENEE, PokemonType.GRASS, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.TSAREENA, Type.GRASS, -1, [ + [ Species.TSAREENA, PokemonType.GRASS, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.TALL_GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.COMFEY, Type.FAIRY, -1, [ + [ Species.COMFEY, PokemonType.FAIRY, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.ORANGURU, Type.NORMAL, Type.PSYCHIC, [ + [ Species.ORANGURU, PokemonType.NORMAL, PokemonType.PSYCHIC, [ [ Biome.JUNGLE, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.PASSIMIAN, Type.FIGHTING, -1, [ + [ Species.PASSIMIAN, PokemonType.FIGHTING, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.WIMPOD, Type.BUG, Type.WATER, [ + [ Species.WIMPOD, PokemonType.BUG, PokemonType.WATER, [ [ Biome.CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.GOLISOPOD, Type.BUG, Type.WATER, [ + [ Species.GOLISOPOD, PokemonType.BUG, PokemonType.WATER, [ [ Biome.CAVE, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.SANDYGAST, Type.GHOST, Type.GROUND, [ + [ Species.SANDYGAST, PokemonType.GHOST, PokemonType.GROUND, [ [ Biome.BEACH, BiomePoolTier.UNCOMMON ] ] ], - [ Species.PALOSSAND, Type.GHOST, Type.GROUND, [ + [ Species.PALOSSAND, PokemonType.GHOST, PokemonType.GROUND, [ [ Biome.BEACH, BiomePoolTier.UNCOMMON ], [ Biome.BEACH, BiomePoolTier.BOSS ] ] ], - [ Species.PYUKUMUKU, Type.WATER, -1, [ + [ Species.PYUKUMUKU, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.SUPER_RARE ], [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.TYPE_NULL, Type.NORMAL, -1, [ + [ Species.TYPE_NULL, PokemonType.NORMAL, -1, [ [ Biome.LABORATORY, BiomePoolTier.ULTRA_RARE ] ] ], - [ Species.SILVALLY, Type.NORMAL, -1, [ + [ Species.SILVALLY, PokemonType.NORMAL, -1, [ [ Biome.LABORATORY, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.MINIOR, Type.ROCK, Type.FLYING, [ + [ Species.MINIOR, PokemonType.ROCK, PokemonType.FLYING, [ [ Biome.SPACE, BiomePoolTier.COMMON ], [ Biome.SPACE, BiomePoolTier.BOSS ] ] ], - [ Species.KOMALA, Type.NORMAL, -1, [ + [ Species.KOMALA, PokemonType.NORMAL, -1, [ [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.TURTONATOR, Type.FIRE, Type.DRAGON, [ + [ Species.TURTONATOR, PokemonType.FIRE, PokemonType.DRAGON, [ [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.TOGEDEMARU, Type.ELECTRIC, Type.STEEL, [ + [ Species.TOGEDEMARU, PokemonType.ELECTRIC, PokemonType.STEEL, [ [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS ] ] ], - [ Species.MIMIKYU, Type.GHOST, Type.FAIRY, [ + [ Species.MIMIKYU, PokemonType.GHOST, PokemonType.FAIRY, [ [ Biome.GRAVEYARD, BiomePoolTier.RARE ], [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.BRUXISH, Type.WATER, Type.PSYCHIC, [ + [ Species.BRUXISH, PokemonType.WATER, PokemonType.PSYCHIC, [ [ Biome.ISLAND, BiomePoolTier.UNCOMMON ], [ Biome.ISLAND, BiomePoolTier.BOSS ] ] ], - [ Species.DRAMPA, Type.NORMAL, Type.DRAGON, [ + [ Species.DRAMPA, PokemonType.NORMAL, PokemonType.DRAGON, [ [ Biome.WASTELAND, BiomePoolTier.UNCOMMON ], [ Biome.WASTELAND, BiomePoolTier.BOSS ] ] ], - [ Species.DHELMISE, Type.GHOST, Type.GRASS, [ + [ Species.DHELMISE, PokemonType.GHOST, PokemonType.GRASS, [ [ Biome.SEABED, BiomePoolTier.RARE ], [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.JANGMO_O, Type.DRAGON, -1, [ + [ Species.JANGMO_O, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.HAKAMO_O, Type.DRAGON, Type.FIGHTING, [ + [ Species.HAKAMO_O, PokemonType.DRAGON, PokemonType.FIGHTING, [ [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.KOMMO_O, Type.DRAGON, Type.FIGHTING, [ + [ Species.KOMMO_O, PokemonType.DRAGON, PokemonType.FIGHTING, [ [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.WASTELAND, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.TAPU_KOKO, Type.ELECTRIC, Type.FAIRY, [ + [ Species.TAPU_KOKO, PokemonType.ELECTRIC, PokemonType.FAIRY, [ [ Biome.TEMPLE, BiomePoolTier.ULTRA_RARE ], [ Biome.TEMPLE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.TAPU_LELE, Type.PSYCHIC, Type.FAIRY, [ + [ Species.TAPU_LELE, PokemonType.PSYCHIC, PokemonType.FAIRY, [ [ Biome.JUNGLE, BiomePoolTier.ULTRA_RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.TAPU_BULU, Type.GRASS, Type.FAIRY, [ + [ Species.TAPU_BULU, PokemonType.GRASS, PokemonType.FAIRY, [ [ Biome.DESERT, BiomePoolTier.ULTRA_RARE ], [ Biome.DESERT, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.TAPU_FINI, Type.WATER, Type.FAIRY, [ + [ Species.TAPU_FINI, PokemonType.WATER, PokemonType.FAIRY, [ [ Biome.BEACH, BiomePoolTier.ULTRA_RARE ], [ Biome.BEACH, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.COSMOG, Type.PSYCHIC, -1, [ + [ Species.COSMOG, PokemonType.PSYCHIC, -1, [ [ Biome.SPACE, BiomePoolTier.ULTRA_RARE ] ] ], - [ Species.COSMOEM, Type.PSYCHIC, -1, [ + [ Species.COSMOEM, PokemonType.PSYCHIC, -1, [ [ Biome.SPACE, BiomePoolTier.ULTRA_RARE ] ] ], - [ Species.SOLGALEO, Type.PSYCHIC, Type.STEEL, [ + [ Species.SOLGALEO, PokemonType.PSYCHIC, PokemonType.STEEL, [ [ Biome.SPACE, BiomePoolTier.BOSS_ULTRA_RARE, TimeOfDay.DAY ] ] ], - [ Species.LUNALA, Type.PSYCHIC, Type.GHOST, [ + [ Species.LUNALA, PokemonType.PSYCHIC, PokemonType.GHOST, [ [ Biome.SPACE, BiomePoolTier.BOSS_ULTRA_RARE, TimeOfDay.NIGHT ] ] ], - [ Species.NIHILEGO, Type.ROCK, Type.POISON, [ + [ Species.NIHILEGO, PokemonType.ROCK, PokemonType.POISON, [ [ Biome.SEABED, BiomePoolTier.ULTRA_RARE ], [ Biome.SEABED, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.BUZZWOLE, Type.BUG, Type.FIGHTING, [ + [ Species.BUZZWOLE, PokemonType.BUG, PokemonType.FIGHTING, [ [ Biome.JUNGLE, BiomePoolTier.ULTRA_RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.PHEROMOSA, Type.BUG, Type.FIGHTING, [ + [ Species.PHEROMOSA, PokemonType.BUG, PokemonType.FIGHTING, [ [ Biome.DESERT, BiomePoolTier.ULTRA_RARE ], [ Biome.DESERT, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.XURKITREE, Type.ELECTRIC, -1, [ + [ Species.XURKITREE, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.CELESTEELA, Type.STEEL, Type.FLYING, [ + [ Species.CELESTEELA, PokemonType.STEEL, PokemonType.FLYING, [ [ Biome.SPACE, BiomePoolTier.ULTRA_RARE ], [ Biome.SPACE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.KARTANA, Type.GRASS, Type.STEEL, [ + [ Species.KARTANA, PokemonType.GRASS, PokemonType.STEEL, [ [ Biome.FOREST, BiomePoolTier.ULTRA_RARE ], [ Biome.FOREST, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.GUZZLORD, Type.DARK, Type.DRAGON, [ + [ Species.GUZZLORD, PokemonType.DARK, PokemonType.DRAGON, [ [ Biome.SLUM, BiomePoolTier.ULTRA_RARE ], [ Biome.SLUM, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.NECROZMA, Type.PSYCHIC, -1, [ + [ Species.NECROZMA, PokemonType.PSYCHIC, -1, [ [ Biome.SPACE, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.MAGEARNA, Type.STEEL, Type.FAIRY, [ + [ Species.MAGEARNA, PokemonType.STEEL, PokemonType.FAIRY, [ [ Biome.FACTORY, BiomePoolTier.ULTRA_RARE ], [ Biome.FACTORY, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.MARSHADOW, Type.FIGHTING, Type.GHOST, [ + [ Species.MARSHADOW, PokemonType.FIGHTING, PokemonType.GHOST, [ [ Biome.GRAVEYARD, BiomePoolTier.ULTRA_RARE ], [ Biome.GRAVEYARD, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.POIPOLE, Type.POISON, -1, [ + [ Species.POIPOLE, PokemonType.POISON, -1, [ [ Biome.SWAMP, BiomePoolTier.ULTRA_RARE ] ] ], - [ Species.NAGANADEL, Type.POISON, Type.DRAGON, [ + [ Species.NAGANADEL, PokemonType.POISON, PokemonType.DRAGON, [ [ Biome.SWAMP, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.STAKATAKA, Type.ROCK, Type.STEEL, [ + [ Species.STAKATAKA, PokemonType.ROCK, PokemonType.STEEL, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.ULTRA_RARE ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.BLACEPHALON, Type.FIRE, Type.GHOST, [ + [ Species.BLACEPHALON, PokemonType.FIRE, PokemonType.GHOST, [ [ Biome.ISLAND, BiomePoolTier.ULTRA_RARE ], [ Biome.ISLAND, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.ZERAORA, Type.ELECTRIC, -1, [ + [ Species.ZERAORA, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.MELTAN, Type.STEEL, -1, [ ] + [ Species.MELTAN, PokemonType.STEEL, -1, [ ] ], - [ Species.MELMETAL, Type.STEEL, -1, [ ] + [ Species.MELMETAL, PokemonType.STEEL, -1, [ ] ], - [ Species.GROOKEY, Type.GRASS, -1, [ + [ Species.GROOKEY, PokemonType.GRASS, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ] ] ], - [ Species.THWACKEY, Type.GRASS, -1, [ + [ Species.THWACKEY, PokemonType.GRASS, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ] ] ], - [ Species.RILLABOOM, Type.GRASS, -1, [ + [ Species.RILLABOOM, PokemonType.GRASS, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SCORBUNNY, Type.FIRE, -1, [ + [ Species.SCORBUNNY, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.RABOOT, Type.FIRE, -1, [ + [ Species.RABOOT, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.CINDERACE, Type.FIRE, -1, [ + [ Species.CINDERACE, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SOBBLE, Type.WATER, -1, [ + [ Species.SOBBLE, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ] ] ], - [ Species.DRIZZILE, Type.WATER, -1, [ + [ Species.DRIZZILE, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ] ] ], - [ Species.INTELEON, Type.WATER, -1, [ + [ Species.INTELEON, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.RARE ], [ Biome.LAKE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SKWOVET, Type.NORMAL, -1, [ + [ Species.SKWOVET, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GREEDENT, Type.NORMAL, -1, [ + [ Species.GREEDENT, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.ROOKIDEE, Type.FLYING, -1, [ + [ Species.ROOKIDEE, PokemonType.FLYING, -1, [ [ Biome.TOWN, BiomePoolTier.RARE ], [ Biome.PLAINS, BiomePoolTier.RARE ], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.CORVISQUIRE, Type.FLYING, -1, [ + [ Species.CORVISQUIRE, PokemonType.FLYING, -1, [ [ Biome.PLAINS, BiomePoolTier.RARE ], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.CORVIKNIGHT, Type.FLYING, Type.STEEL, [ + [ Species.CORVIKNIGHT, PokemonType.FLYING, PokemonType.STEEL, [ [ Biome.PLAINS, BiomePoolTier.RARE ], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.BLIPBUG, Type.BUG, -1, [ + [ Species.BLIPBUG, PokemonType.BUG, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.DOTTLER, Type.BUG, Type.PSYCHIC, [ + [ Species.DOTTLER, PokemonType.BUG, PokemonType.PSYCHIC, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.ORBEETLE, Type.BUG, Type.PSYCHIC, [ + [ Species.ORBEETLE, PokemonType.BUG, PokemonType.PSYCHIC, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.NICKIT, Type.DARK, -1, [ + [ Species.NICKIT, PokemonType.DARK, -1, [ [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], - [ Species.THIEVUL, Type.DARK, -1, [ + [ Species.THIEVUL, PokemonType.DARK, -1, [ [ Biome.ABYSS, BiomePoolTier.COMMON ], [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.GOSSIFLEUR, Type.GRASS, -1, [ + [ Species.GOSSIFLEUR, PokemonType.GRASS, -1, [ [ Biome.MEADOW, BiomePoolTier.COMMON ] ] ], - [ Species.ELDEGOSS, Type.GRASS, -1, [ + [ Species.ELDEGOSS, PokemonType.GRASS, -1, [ [ Biome.MEADOW, BiomePoolTier.COMMON ] ] ], - [ Species.WOOLOO, Type.NORMAL, -1, [ + [ Species.WOOLOO, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.MEADOW, BiomePoolTier.COMMON ] ] ], - [ Species.DUBWOOL, Type.NORMAL, -1, [ + [ Species.DUBWOOL, PokemonType.NORMAL, -1, [ [ Biome.MEADOW, BiomePoolTier.COMMON ], [ Biome.MEADOW, BiomePoolTier.BOSS ] ] ], - [ Species.CHEWTLE, Type.WATER, -1, [ + [ Species.CHEWTLE, PokemonType.WATER, -1, [ [ Biome.LAKE, BiomePoolTier.COMMON ] ] ], - [ Species.DREDNAW, Type.WATER, Type.ROCK, [ + [ Species.DREDNAW, PokemonType.WATER, PokemonType.ROCK, [ [ Biome.LAKE, BiomePoolTier.COMMON ], [ Biome.LAKE, BiomePoolTier.BOSS ] ] ], - [ Species.YAMPER, Type.ELECTRIC, -1, [ + [ Species.YAMPER, PokemonType.ELECTRIC, -1, [ [ Biome.METROPOLIS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.BOLTUND, Type.ELECTRIC, -1, [ + [ Species.BOLTUND, PokemonType.ELECTRIC, -1, [ [ Biome.METROPOLIS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.METROPOLIS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.ROLYCOLY, Type.ROCK, -1, [ + [ Species.ROLYCOLY, PokemonType.ROCK, -1, [ [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], - [ Species.CARKOL, Type.ROCK, Type.FIRE, [ + [ Species.CARKOL, PokemonType.ROCK, PokemonType.FIRE, [ [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], - [ Species.COALOSSAL, Type.ROCK, Type.FIRE, [ + [ Species.COALOSSAL, PokemonType.ROCK, PokemonType.FIRE, [ [ Biome.VOLCANO, BiomePoolTier.COMMON ], [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], - [ Species.APPLIN, Type.GRASS, Type.DRAGON, [ + [ Species.APPLIN, PokemonType.GRASS, PokemonType.DRAGON, [ [ Biome.MEADOW, BiomePoolTier.RARE ] ] ], - [ Species.FLAPPLE, Type.GRASS, Type.DRAGON, [ + [ Species.FLAPPLE, PokemonType.GRASS, PokemonType.DRAGON, [ [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.APPLETUN, Type.GRASS, Type.DRAGON, [ + [ Species.APPLETUN, PokemonType.GRASS, PokemonType.DRAGON, [ [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SILICOBRA, Type.GROUND, -1, [ + [ Species.SILICOBRA, PokemonType.GROUND, -1, [ [ Biome.DESERT, BiomePoolTier.COMMON ] ] ], - [ Species.SANDACONDA, Type.GROUND, -1, [ + [ Species.SANDACONDA, PokemonType.GROUND, -1, [ [ Biome.DESERT, BiomePoolTier.COMMON ], [ Biome.DESERT, BiomePoolTier.BOSS ] ] ], - [ Species.CRAMORANT, Type.FLYING, Type.WATER, [ + [ Species.CRAMORANT, PokemonType.FLYING, PokemonType.WATER, [ [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SEA, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.ARROKUDA, Type.WATER, -1, [ + [ Species.ARROKUDA, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.COMMON ] ] ], - [ Species.BARRASKEWDA, Type.WATER, -1, [ + [ Species.BARRASKEWDA, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.COMMON ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.TOXEL, Type.ELECTRIC, Type.POISON, [ ] + [ Species.TOXEL, PokemonType.ELECTRIC, PokemonType.POISON, [ ] ], - [ Species.TOXTRICITY, Type.ELECTRIC, Type.POISON, [ + [ Species.TOXTRICITY, PokemonType.ELECTRIC, PokemonType.POISON, [ [ Biome.SLUM, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SLUM, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.SIZZLIPEDE, Type.FIRE, Type.BUG, [ + [ Species.SIZZLIPEDE, PokemonType.FIRE, PokemonType.BUG, [ [ Biome.BADLANDS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.CENTISKORCH, Type.FIRE, Type.BUG, [ + [ Species.CENTISKORCH, PokemonType.FIRE, PokemonType.BUG, [ [ Biome.BADLANDS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.BADLANDS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.CLOBBOPUS, Type.FIGHTING, -1, [ + [ Species.CLOBBOPUS, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.COMMON ] ] ], - [ Species.GRAPPLOCT, Type.FIGHTING, -1, [ + [ Species.GRAPPLOCT, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.COMMON ], [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], - [ Species.SINISTEA, Type.GHOST, -1, [ + [ Species.SINISTEA, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ] ] ], - [ Species.POLTEAGEIST, Type.GHOST, -1, [ + [ Species.POLTEAGEIST, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ], [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.HATENNA, Type.PSYCHIC, -1, [ + [ Species.HATENNA, PokemonType.PSYCHIC, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.HATTREM, Type.PSYCHIC, -1, [ + [ Species.HATTREM, PokemonType.PSYCHIC, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.HATTERENE, Type.PSYCHIC, Type.FAIRY, [ + [ Species.HATTERENE, PokemonType.PSYCHIC, PokemonType.FAIRY, [ [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.IMPIDIMP, Type.DARK, Type.FAIRY, [ + [ Species.IMPIDIMP, PokemonType.DARK, PokemonType.FAIRY, [ [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], - [ Species.MORGREM, Type.DARK, Type.FAIRY, [ + [ Species.MORGREM, PokemonType.DARK, PokemonType.FAIRY, [ [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], - [ Species.GRIMMSNARL, Type.DARK, Type.FAIRY, [ + [ Species.GRIMMSNARL, PokemonType.DARK, PokemonType.FAIRY, [ [ Biome.ABYSS, BiomePoolTier.COMMON ], [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.OBSTAGOON, Type.DARK, Type.NORMAL, [ + [ Species.OBSTAGOON, PokemonType.DARK, PokemonType.NORMAL, [ [ Biome.SLUM, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SLUM, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.PERRSERKER, Type.STEEL, -1, [ + [ Species.PERRSERKER, PokemonType.STEEL, -1, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE, TimeOfDay.DUSK ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS_RARE, TimeOfDay.DUSK ] ] ], - [ Species.CURSOLA, Type.GHOST, -1, [ + [ Species.CURSOLA, PokemonType.GHOST, -1, [ [ Biome.SEABED, BiomePoolTier.SUPER_RARE ], [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SIRFETCHD, Type.FIGHTING, -1, [ + [ Species.SIRFETCHD, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.MR_RIME, Type.ICE, Type.PSYCHIC, [ + [ Species.MR_RIME, PokemonType.ICE, PokemonType.PSYCHIC, [ [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.RUNERIGUS, Type.GROUND, Type.GHOST, [ + [ Species.RUNERIGUS, PokemonType.GROUND, PokemonType.GHOST, [ [ Biome.RUINS, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.RUINS, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.MILCERY, Type.FAIRY, -1, [ + [ Species.MILCERY, PokemonType.FAIRY, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.ALCREMIE, Type.FAIRY, -1, [ + [ Species.ALCREMIE, PokemonType.FAIRY, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.FALINKS, Type.FIGHTING, -1, [ + [ Species.FALINKS, PokemonType.FIGHTING, -1, [ [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ], [ Biome.JUNGLE, BiomePoolTier.BOSS ] ] ], - [ Species.PINCURCHIN, Type.ELECTRIC, -1, [ + [ Species.PINCURCHIN, PokemonType.ELECTRIC, -1, [ [ Biome.SEABED, BiomePoolTier.UNCOMMON ] ] ], - [ Species.SNOM, Type.ICE, Type.BUG, [ + [ Species.SNOM, PokemonType.ICE, PokemonType.BUG, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.FROSMOTH, Type.ICE, Type.BUG, [ + [ Species.FROSMOTH, PokemonType.ICE, PokemonType.BUG, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.STONJOURNER, Type.ROCK, -1, [ + [ Species.STONJOURNER, PokemonType.ROCK, -1, [ [ Biome.RUINS, BiomePoolTier.RARE ] ] ], - [ Species.EISCUE, Type.ICE, -1, [ + [ Species.EISCUE, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], - [ Species.INDEEDEE, Type.PSYCHIC, Type.NORMAL, [ + [ Species.INDEEDEE, PokemonType.PSYCHIC, PokemonType.NORMAL, [ [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.MORPEKO, Type.ELECTRIC, Type.DARK, [ + [ Species.MORPEKO, PokemonType.ELECTRIC, PokemonType.DARK, [ [ Biome.METROPOLIS, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.CUFANT, Type.STEEL, -1, [ + [ Species.CUFANT, PokemonType.STEEL, -1, [ [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ] ] ], - [ Species.COPPERAJAH, Type.STEEL, -1, [ + [ Species.COPPERAJAH, PokemonType.STEEL, -1, [ [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], - [ Species.DRACOZOLT, Type.ELECTRIC, Type.DRAGON, [ + [ Species.DRACOZOLT, PokemonType.ELECTRIC, PokemonType.DRAGON, [ [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.ARCTOZOLT, Type.ELECTRIC, Type.ICE, [ + [ Species.ARCTOZOLT, PokemonType.ELECTRIC, PokemonType.ICE, [ [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.DRACOVISH, Type.WATER, Type.DRAGON, [ + [ Species.DRACOVISH, PokemonType.WATER, PokemonType.DRAGON, [ [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ], [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.ARCTOVISH, Type.WATER, Type.ICE, [ + [ Species.ARCTOVISH, PokemonType.WATER, PokemonType.ICE, [ [ Biome.SEABED, BiomePoolTier.SUPER_RARE ], [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.DURALUDON, Type.STEEL, Type.DRAGON, [ + [ Species.DURALUDON, PokemonType.STEEL, PokemonType.DRAGON, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE ] ] ], - [ Species.DREEPY, Type.DRAGON, Type.GHOST, [ + [ Species.DREEPY, PokemonType.DRAGON, PokemonType.GHOST, [ [ Biome.WASTELAND, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.DRAKLOAK, Type.DRAGON, Type.GHOST, [ + [ Species.DRAKLOAK, PokemonType.DRAGON, PokemonType.GHOST, [ [ Biome.WASTELAND, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.DRAGAPULT, Type.DRAGON, Type.GHOST, [ + [ Species.DRAGAPULT, PokemonType.DRAGON, PokemonType.GHOST, [ [ Biome.WASTELAND, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.WASTELAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.ZACIAN, Type.FAIRY, -1, [ + [ Species.ZACIAN, PokemonType.FAIRY, -1, [ [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.ZAMAZENTA, Type.FIGHTING, -1, [ + [ Species.ZAMAZENTA, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.ETERNATUS, Type.POISON, Type.DRAGON, [ + [ Species.ETERNATUS, PokemonType.POISON, PokemonType.DRAGON, [ [ Biome.END, BiomePoolTier.BOSS ] ] ], - [ Species.KUBFU, Type.FIGHTING, -1, [ + [ Species.KUBFU, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.ULTRA_RARE ] ] ], - [ Species.URSHIFU, Type.FIGHTING, Type.DARK, [ + [ Species.URSHIFU, PokemonType.FIGHTING, PokemonType.DARK, [ [ Biome.DOJO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.ZARUDE, Type.DARK, Type.GRASS, [ + [ Species.ZARUDE, PokemonType.DARK, PokemonType.GRASS, [ [ Biome.JUNGLE, BiomePoolTier.ULTRA_RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.REGIELEKI, Type.ELECTRIC, -1, [ + [ Species.REGIELEKI, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.REGIDRAGO, Type.DRAGON, -1, [ + [ Species.REGIDRAGO, PokemonType.DRAGON, -1, [ [ Biome.WASTELAND, BiomePoolTier.ULTRA_RARE ], [ Biome.WASTELAND, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.GLASTRIER, Type.ICE, -1, [ + [ Species.GLASTRIER, PokemonType.ICE, -1, [ [ Biome.SNOWY_FOREST, BiomePoolTier.ULTRA_RARE ], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.SPECTRIER, Type.GHOST, -1, [ + [ Species.SPECTRIER, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.ULTRA_RARE ], [ Biome.GRAVEYARD, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.CALYREX, Type.PSYCHIC, Type.GRASS, [ + [ Species.CALYREX, PokemonType.PSYCHIC, PokemonType.GRASS, [ [ Biome.FOREST, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.WYRDEER, Type.NORMAL, Type.PSYCHIC, [ + [ Species.WYRDEER, PokemonType.NORMAL, PokemonType.PSYCHIC, [ [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.KLEAVOR, Type.BUG, Type.ROCK, [ + [ Species.KLEAVOR, PokemonType.BUG, PokemonType.ROCK, [ [ Biome.JUNGLE, BiomePoolTier.SUPER_RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.URSALUNA, Type.GROUND, Type.NORMAL, [ + [ Species.URSALUNA, PokemonType.GROUND, PokemonType.NORMAL, [ [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS ] ] ], - [ Species.BASCULEGION, Type.WATER, Type.GHOST, [ + [ Species.BASCULEGION, PokemonType.WATER, PokemonType.GHOST, [ [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.SNEASLER, Type.FIGHTING, Type.POISON, [ + [ Species.SNEASLER, PokemonType.FIGHTING, PokemonType.POISON, [ [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.OVERQWIL, Type.DARK, Type.POISON, [ + [ Species.OVERQWIL, PokemonType.DARK, PokemonType.POISON, [ [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.ENAMORUS, Type.FAIRY, Type.FLYING, [ + [ Species.ENAMORUS, PokemonType.FAIRY, PokemonType.FLYING, [ [ Biome.FAIRY_CAVE, BiomePoolTier.ULTRA_RARE ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.SPRIGATITO, Type.GRASS, -1, [ + [ Species.SPRIGATITO, PokemonType.GRASS, -1, [ [ Biome.MEADOW, BiomePoolTier.RARE ] ] ], - [ Species.FLORAGATO, Type.GRASS, -1, [ + [ Species.FLORAGATO, PokemonType.GRASS, -1, [ [ Biome.MEADOW, BiomePoolTier.RARE ] ] ], - [ Species.MEOWSCARADA, Type.GRASS, Type.DARK, [ + [ Species.MEOWSCARADA, PokemonType.GRASS, PokemonType.DARK, [ [ Biome.MEADOW, BiomePoolTier.RARE ], [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.FUECOCO, Type.FIRE, -1, [ + [ Species.FUECOCO, PokemonType.FIRE, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.RARE ] ] ], - [ Species.CROCALOR, Type.FIRE, -1, [ + [ Species.CROCALOR, PokemonType.FIRE, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.RARE ] ] ], - [ Species.SKELEDIRGE, Type.FIRE, Type.GHOST, [ + [ Species.SKELEDIRGE, PokemonType.FIRE, PokemonType.GHOST, [ [ Biome.GRAVEYARD, BiomePoolTier.RARE ], [ Biome.GRAVEYARD, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.QUAXLY, Type.WATER, -1, [ + [ Species.QUAXLY, PokemonType.WATER, -1, [ [ Biome.BEACH, BiomePoolTier.RARE ] ] ], - [ Species.QUAXWELL, Type.WATER, -1, [ + [ Species.QUAXWELL, PokemonType.WATER, -1, [ [ Biome.BEACH, BiomePoolTier.RARE ] ] ], - [ Species.QUAQUAVAL, Type.WATER, Type.FIGHTING, [ + [ Species.QUAQUAVAL, PokemonType.WATER, PokemonType.FIGHTING, [ [ Biome.BEACH, BiomePoolTier.RARE ], [ Biome.BEACH, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.LECHONK, Type.NORMAL, -1, [ + [ Species.LECHONK, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.PLAINS, BiomePoolTier.COMMON ] ] ], - [ Species.OINKOLOGNE, Type.NORMAL, -1, [ + [ Species.OINKOLOGNE, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.COMMON ], [ Biome.PLAINS, BiomePoolTier.BOSS ] ] ], - [ Species.TAROUNTULA, Type.BUG, -1, [ + [ Species.TAROUNTULA, PokemonType.BUG, -1, [ [ Biome.FOREST, BiomePoolTier.COMMON ] ] ], - [ Species.SPIDOPS, Type.BUG, -1, [ + [ Species.SPIDOPS, PokemonType.BUG, -1, [ [ Biome.FOREST, BiomePoolTier.COMMON ], [ Biome.FOREST, BiomePoolTier.BOSS ] ] ], - [ Species.NYMBLE, Type.BUG, -1, [ + [ Species.NYMBLE, PokemonType.BUG, -1, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON ], [ Biome.FOREST, BiomePoolTier.COMMON ] ] ], - [ Species.LOKIX, Type.BUG, Type.DARK, [ + [ Species.LOKIX, PokemonType.BUG, PokemonType.DARK, [ [ Biome.TALL_GRASS, BiomePoolTier.COMMON ], [ Biome.TALL_GRASS, BiomePoolTier.BOSS ], [ Biome.FOREST, BiomePoolTier.COMMON ], [ Biome.FOREST, BiomePoolTier.BOSS ] ] ], - [ Species.PAWMI, Type.ELECTRIC, -1, [ + [ Species.PAWMI, PokemonType.ELECTRIC, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], - [ Species.PAWMO, Type.ELECTRIC, Type.FIGHTING, [ + [ Species.PAWMO, PokemonType.ELECTRIC, PokemonType.FIGHTING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], - [ Species.PAWMOT, Type.ELECTRIC, Type.FIGHTING, [ + [ Species.PAWMOT, PokemonType.ELECTRIC, PokemonType.FIGHTING, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.POWER_PLANT, BiomePoolTier.COMMON ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS ] ] ], - [ Species.TANDEMAUS, Type.NORMAL, -1, [ + [ Species.TANDEMAUS, PokemonType.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.METROPOLIS, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.MAUSHOLD, Type.NORMAL, -1, [ + [ Species.MAUSHOLD, PokemonType.NORMAL, -1, [ [ Biome.METROPOLIS, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.METROPOLIS, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.FIDOUGH, Type.FAIRY, -1, [ + [ Species.FIDOUGH, PokemonType.FAIRY, -1, [ [ Biome.TOWN, BiomePoolTier.UNCOMMON ], [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ] ] ], - [ Species.DACHSBUN, Type.FAIRY, -1, [ + [ Species.DACHSBUN, PokemonType.FAIRY, -1, [ [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.METROPOLIS, BiomePoolTier.BOSS ] ] ], - [ Species.SMOLIV, Type.GRASS, Type.NORMAL, [ + [ Species.SMOLIV, PokemonType.GRASS, PokemonType.NORMAL, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.DOLLIV, Type.GRASS, Type.NORMAL, [ + [ Species.DOLLIV, PokemonType.GRASS, PokemonType.NORMAL, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.ARBOLIVA, Type.GRASS, Type.NORMAL, [ + [ Species.ARBOLIVA, PokemonType.GRASS, PokemonType.NORMAL, [ [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SQUAWKABILLY, Type.NORMAL, Type.FLYING, [ + [ Species.SQUAWKABILLY, PokemonType.NORMAL, PokemonType.FLYING, [ [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.FOREST, BiomePoolTier.RARE ] ] ], - [ Species.NACLI, Type.ROCK, -1, [ + [ Species.NACLI, PokemonType.ROCK, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.NACLSTACK, Type.ROCK, -1, [ + [ Species.NACLSTACK, PokemonType.ROCK, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], - [ Species.GARGANACL, Type.ROCK, -1, [ + [ Species.GARGANACL, PokemonType.ROCK, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS ], [ Biome.CAVE, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.CHARCADET, Type.FIRE, -1, [ + [ Species.CHARCADET, PokemonType.FIRE, -1, [ [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], - [ Species.ARMAROUGE, Type.FIRE, Type.PSYCHIC, [ + [ Species.ARMAROUGE, PokemonType.FIRE, PokemonType.PSYCHIC, [ [ Biome.VOLCANO, BiomePoolTier.RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.CERULEDGE, Type.FIRE, Type.GHOST, [ + [ Species.CERULEDGE, PokemonType.FIRE, PokemonType.GHOST, [ [ Biome.GRAVEYARD, BiomePoolTier.RARE ], [ Biome.GRAVEYARD, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.TADBULB, Type.ELECTRIC, -1, [ + [ Species.TADBULB, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], - [ Species.BELLIBOLT, Type.ELECTRIC, -1, [ + [ Species.BELLIBOLT, PokemonType.ELECTRIC, -1, [ [ Biome.POWER_PLANT, BiomePoolTier.COMMON ], [ Biome.POWER_PLANT, BiomePoolTier.BOSS ] ] ], - [ Species.WATTREL, Type.ELECTRIC, Type.FLYING, [ + [ Species.WATTREL, PokemonType.ELECTRIC, PokemonType.FLYING, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ] ] ], - [ Species.KILOWATTREL, Type.ELECTRIC, Type.FLYING, [ + [ Species.KILOWATTREL, PokemonType.ELECTRIC, PokemonType.FLYING, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ], [ Biome.SEA, BiomePoolTier.BOSS ] ] ], - [ Species.MASCHIFF, Type.DARK, -1, [ + [ Species.MASCHIFF, PokemonType.DARK, -1, [ [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], - [ Species.MABOSSTIFF, Type.DARK, -1, [ + [ Species.MABOSSTIFF, PokemonType.DARK, -1, [ [ Biome.ABYSS, BiomePoolTier.COMMON ], [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.SHROODLE, Type.POISON, Type.NORMAL, [ + [ Species.SHROODLE, PokemonType.POISON, PokemonType.NORMAL, [ [ Biome.FOREST, BiomePoolTier.COMMON ] ] ], - [ Species.GRAFAIAI, Type.POISON, Type.NORMAL, [ + [ Species.GRAFAIAI, PokemonType.POISON, PokemonType.NORMAL, [ [ Biome.FOREST, BiomePoolTier.COMMON ], [ Biome.FOREST, BiomePoolTier.BOSS ] ] ], - [ Species.BRAMBLIN, Type.GRASS, Type.GHOST, [ + [ Species.BRAMBLIN, PokemonType.GRASS, PokemonType.GHOST, [ [ Biome.DESERT, BiomePoolTier.UNCOMMON ] ] ], - [ Species.BRAMBLEGHAST, Type.GRASS, Type.GHOST, [ + [ Species.BRAMBLEGHAST, PokemonType.GRASS, PokemonType.GHOST, [ [ Biome.DESERT, BiomePoolTier.UNCOMMON ], [ Biome.DESERT, BiomePoolTier.BOSS ] ] ], - [ Species.TOEDSCOOL, Type.GROUND, Type.GRASS, [ + [ Species.TOEDSCOOL, PokemonType.GROUND, PokemonType.GRASS, [ [ Biome.FOREST, BiomePoolTier.RARE ] ] ], - [ Species.TOEDSCRUEL, Type.GROUND, Type.GRASS, [ + [ Species.TOEDSCRUEL, PokemonType.GROUND, PokemonType.GRASS, [ [ Biome.FOREST, BiomePoolTier.RARE ], [ Biome.FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.KLAWF, Type.ROCK, -1, [ + [ Species.KLAWF, PokemonType.ROCK, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.RARE ] ] ], - [ Species.CAPSAKID, Type.GRASS, -1, [ + [ Species.CAPSAKID, PokemonType.GRASS, -1, [ [ Biome.BADLANDS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.SCOVILLAIN, Type.GRASS, Type.FIRE, [ + [ Species.SCOVILLAIN, PokemonType.GRASS, PokemonType.FIRE, [ [ Biome.BADLANDS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.BADLANDS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.RELLOR, Type.BUG, -1, [ + [ Species.RELLOR, PokemonType.BUG, -1, [ [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.RABSCA, Type.BUG, Type.PSYCHIC, [ + [ Species.RABSCA, PokemonType.BUG, PokemonType.PSYCHIC, [ [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.DESERT, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.FLITTLE, Type.PSYCHIC, -1, [ + [ Species.FLITTLE, PokemonType.PSYCHIC, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.ESPATHRA, Type.PSYCHIC, -1, [ + [ Species.ESPATHRA, PokemonType.PSYCHIC, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.TINKATINK, Type.FAIRY, Type.STEEL, [ + [ Species.TINKATINK, PokemonType.FAIRY, PokemonType.STEEL, [ [ Biome.RUINS, BiomePoolTier.UNCOMMON ] ] ], - [ Species.TINKATUFF, Type.FAIRY, Type.STEEL, [ + [ Species.TINKATUFF, PokemonType.FAIRY, PokemonType.STEEL, [ [ Biome.RUINS, BiomePoolTier.UNCOMMON ] ] ], - [ Species.TINKATON, Type.FAIRY, Type.STEEL, [ + [ Species.TINKATON, PokemonType.FAIRY, PokemonType.STEEL, [ [ Biome.RUINS, BiomePoolTier.UNCOMMON ], [ Biome.RUINS, BiomePoolTier.BOSS ] ] ], - [ Species.WIGLETT, Type.WATER, -1, [ + [ Species.WIGLETT, PokemonType.WATER, -1, [ [ Biome.BEACH, BiomePoolTier.COMMON ] ] ], - [ Species.WUGTRIO, Type.WATER, -1, [ + [ Species.WUGTRIO, PokemonType.WATER, -1, [ [ Biome.BEACH, BiomePoolTier.COMMON ] ] ], - [ Species.BOMBIRDIER, Type.FLYING, Type.DARK, [ + [ Species.BOMBIRDIER, PokemonType.FLYING, PokemonType.DARK, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.FINIZEN, Type.WATER, -1, [ + [ Species.FINIZEN, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.PALAFIN, Type.WATER, -1, [ + [ Species.PALAFIN, PokemonType.WATER, -1, [ [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SEA, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.VAROOM, Type.STEEL, Type.POISON, [ + [ Species.VAROOM, PokemonType.STEEL, PokemonType.POISON, [ [ Biome.METROPOLIS, BiomePoolTier.RARE ], [ Biome.SLUM, BiomePoolTier.RARE ] ] ], - [ Species.REVAVROOM, Type.STEEL, Type.POISON, [ + [ Species.REVAVROOM, PokemonType.STEEL, PokemonType.POISON, [ [ Biome.METROPOLIS, BiomePoolTier.RARE ], [ Biome.METROPOLIS, BiomePoolTier.BOSS_RARE ], [ Biome.SLUM, BiomePoolTier.RARE ], [ Biome.SLUM, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.CYCLIZAR, Type.DRAGON, Type.NORMAL, [ + [ Species.CYCLIZAR, PokemonType.DRAGON, PokemonType.NORMAL, [ [ Biome.WASTELAND, BiomePoolTier.UNCOMMON ] ] ], - [ Species.ORTHWORM, Type.STEEL, -1, [ + [ Species.ORTHWORM, PokemonType.STEEL, -1, [ [ Biome.DESERT, BiomePoolTier.UNCOMMON ] ] ], - [ Species.GLIMMET, Type.ROCK, Type.POISON, [ + [ Species.GLIMMET, PokemonType.ROCK, PokemonType.POISON, [ [ Biome.CAVE, BiomePoolTier.RARE ] ] ], - [ Species.GLIMMORA, Type.ROCK, Type.POISON, [ + [ Species.GLIMMORA, PokemonType.ROCK, PokemonType.POISON, [ [ Biome.CAVE, BiomePoolTier.RARE ], [ Biome.CAVE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.GREAVARD, Type.GHOST, -1, [ + [ Species.GREAVARD, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ] ] ], - [ Species.HOUNDSTONE, Type.GHOST, -1, [ + [ Species.HOUNDSTONE, PokemonType.GHOST, -1, [ [ Biome.GRAVEYARD, BiomePoolTier.COMMON ], [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], - [ Species.FLAMIGO, Type.FLYING, Type.FIGHTING, [ + [ Species.FLAMIGO, PokemonType.FLYING, PokemonType.FIGHTING, [ [ Biome.LAKE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.CETODDLE, Type.ICE, -1, [ + [ Species.CETODDLE, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ Species.CETITAN, Type.ICE, -1, [ + [ Species.CETITAN, PokemonType.ICE, -1, [ [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], - [ Species.VELUZA, Type.WATER, Type.PSYCHIC, [ + [ Species.VELUZA, PokemonType.WATER, PokemonType.PSYCHIC, [ [ Biome.SEABED, BiomePoolTier.COMMON ] ] ], - [ Species.DONDOZO, Type.WATER, -1, [ + [ Species.DONDOZO, PokemonType.WATER, -1, [ [ Biome.SEABED, BiomePoolTier.UNCOMMON ], [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], - [ Species.TATSUGIRI, Type.DRAGON, Type.WATER, [ + [ Species.TATSUGIRI, PokemonType.DRAGON, PokemonType.WATER, [ [ Biome.BEACH, BiomePoolTier.RARE ] ] ], - [ Species.ANNIHILAPE, Type.FIGHTING, Type.GHOST, [ + [ Species.ANNIHILAPE, PokemonType.FIGHTING, PokemonType.GHOST, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.DOJO, BiomePoolTier.COMMON ], [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], - [ Species.CLODSIRE, Type.POISON, Type.GROUND, [ + [ Species.CLODSIRE, PokemonType.POISON, PokemonType.GROUND, [ [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SWAMP, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.FARIGIRAF, Type.NORMAL, Type.PSYCHIC, [ + [ Species.FARIGIRAF, PokemonType.NORMAL, PokemonType.PSYCHIC, [ [ Biome.TALL_GRASS, BiomePoolTier.RARE ], [ Biome.TALL_GRASS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.DUDUNSPARCE, Type.NORMAL, -1, [ + [ Species.DUDUNSPARCE, PokemonType.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ], [ Biome.PLAINS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.KINGAMBIT, Type.DARK, Type.STEEL, [ + [ Species.KINGAMBIT, PokemonType.DARK, PokemonType.STEEL, [ [ Biome.ABYSS, BiomePoolTier.COMMON ], [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], - [ Species.GREAT_TUSK, Type.GROUND, Type.FIGHTING, [ + [ Species.GREAT_TUSK, PokemonType.GROUND, PokemonType.FIGHTING, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.SCREAM_TAIL, Type.FAIRY, Type.PSYCHIC, [ + [ Species.SCREAM_TAIL, PokemonType.FAIRY, PokemonType.PSYCHIC, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.BRUTE_BONNET, Type.GRASS, Type.DARK, [ + [ Species.BRUTE_BONNET, PokemonType.GRASS, PokemonType.DARK, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.FLUTTER_MANE, Type.GHOST, Type.FAIRY, [ + [ Species.FLUTTER_MANE, PokemonType.GHOST, PokemonType.FAIRY, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.SLITHER_WING, Type.BUG, Type.FIGHTING, [ + [ Species.SLITHER_WING, PokemonType.BUG, PokemonType.FIGHTING, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.SANDY_SHOCKS, Type.ELECTRIC, Type.GROUND, [ + [ Species.SANDY_SHOCKS, PokemonType.ELECTRIC, PokemonType.GROUND, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.IRON_TREADS, Type.GROUND, Type.STEEL, [ + [ Species.IRON_TREADS, PokemonType.GROUND, PokemonType.STEEL, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.IRON_BUNDLE, Type.ICE, Type.WATER, [ + [ Species.IRON_BUNDLE, PokemonType.ICE, PokemonType.WATER, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.IRON_HANDS, Type.FIGHTING, Type.ELECTRIC, [ + [ Species.IRON_HANDS, PokemonType.FIGHTING, PokemonType.ELECTRIC, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.IRON_JUGULIS, Type.DARK, Type.FLYING, [ + [ Species.IRON_JUGULIS, PokemonType.DARK, PokemonType.FLYING, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.IRON_MOTH, Type.FIRE, Type.POISON, [ + [ Species.IRON_MOTH, PokemonType.FIRE, PokemonType.POISON, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.IRON_THORNS, Type.ROCK, Type.ELECTRIC, [ + [ Species.IRON_THORNS, PokemonType.ROCK, PokemonType.ELECTRIC, [ [ Biome.END, BiomePoolTier.COMMON ] ] ], - [ Species.FRIGIBAX, Type.DRAGON, Type.ICE, [ + [ Species.FRIGIBAX, PokemonType.DRAGON, PokemonType.ICE, [ [ Biome.WASTELAND, BiomePoolTier.RARE ] ] ], - [ Species.ARCTIBAX, Type.DRAGON, Type.ICE, [ + [ Species.ARCTIBAX, PokemonType.DRAGON, PokemonType.ICE, [ [ Biome.WASTELAND, BiomePoolTier.RARE ] ] ], - [ Species.BAXCALIBUR, Type.DRAGON, Type.ICE, [ + [ Species.BAXCALIBUR, PokemonType.DRAGON, PokemonType.ICE, [ [ Biome.WASTELAND, BiomePoolTier.RARE ], [ Biome.WASTELAND, BiomePoolTier.BOSS ] ] ], - [ Species.GIMMIGHOUL, Type.GHOST, -1, [ + [ Species.GIMMIGHOUL, PokemonType.GHOST, -1, [ [ Biome.TEMPLE, BiomePoolTier.RARE ] ] ], - [ Species.GHOLDENGO, Type.STEEL, Type.GHOST, [ + [ Species.GHOLDENGO, PokemonType.STEEL, PokemonType.GHOST, [ [ Biome.TEMPLE, BiomePoolTier.RARE ], [ Biome.TEMPLE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.WO_CHIEN, Type.DARK, Type.GRASS, [ + [ Species.WO_CHIEN, PokemonType.DARK, PokemonType.GRASS, [ [ Biome.FOREST, BiomePoolTier.ULTRA_RARE ], [ Biome.FOREST, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.CHIEN_PAO, Type.DARK, Type.ICE, [ + [ Species.CHIEN_PAO, PokemonType.DARK, PokemonType.ICE, [ [ Biome.SNOWY_FOREST, BiomePoolTier.ULTRA_RARE ], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.TING_LU, Type.DARK, Type.GROUND, [ + [ Species.TING_LU, PokemonType.DARK, PokemonType.GROUND, [ [ Biome.MOUNTAIN, BiomePoolTier.ULTRA_RARE ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.CHI_YU, Type.DARK, Type.FIRE, [ + [ Species.CHI_YU, PokemonType.DARK, PokemonType.FIRE, [ [ Biome.VOLCANO, BiomePoolTier.ULTRA_RARE ], [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.ROARING_MOON, Type.DRAGON, Type.DARK, [ + [ Species.ROARING_MOON, PokemonType.DRAGON, PokemonType.DARK, [ [ Biome.END, BiomePoolTier.UNCOMMON ] ] ], - [ Species.IRON_VALIANT, Type.FAIRY, Type.FIGHTING, [ + [ Species.IRON_VALIANT, PokemonType.FAIRY, PokemonType.FIGHTING, [ [ Biome.END, BiomePoolTier.UNCOMMON ] ] ], - [ Species.KORAIDON, Type.FIGHTING, Type.DRAGON, [ + [ Species.KORAIDON, PokemonType.FIGHTING, PokemonType.DRAGON, [ [ Biome.RUINS, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.MIRAIDON, Type.ELECTRIC, Type.DRAGON, [ + [ Species.MIRAIDON, PokemonType.ELECTRIC, PokemonType.DRAGON, [ [ Biome.LABORATORY, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.WALKING_WAKE, Type.WATER, Type.DRAGON, [ + [ Species.WALKING_WAKE, PokemonType.WATER, PokemonType.DRAGON, [ [ Biome.END, BiomePoolTier.RARE ] ] ], - [ Species.IRON_LEAVES, Type.GRASS, Type.PSYCHIC, [ + [ Species.IRON_LEAVES, PokemonType.GRASS, PokemonType.PSYCHIC, [ [ Biome.END, BiomePoolTier.RARE ] ] ], - [ Species.DIPPLIN, Type.GRASS, Type.DRAGON, [ + [ Species.DIPPLIN, PokemonType.GRASS, PokemonType.DRAGON, [ [ Biome.MEADOW, BiomePoolTier.RARE ] ] ], - [ Species.POLTCHAGEIST, Type.GRASS, Type.GHOST, [ + [ Species.POLTCHAGEIST, PokemonType.GRASS, PokemonType.GHOST, [ [ Biome.BADLANDS, BiomePoolTier.RARE ] ] ], - [ Species.SINISTCHA, Type.GRASS, Type.GHOST, [ + [ Species.SINISTCHA, PokemonType.GRASS, PokemonType.GHOST, [ [ Biome.BADLANDS, BiomePoolTier.RARE ], [ Biome.BADLANDS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.OKIDOGI, Type.POISON, Type.FIGHTING, [ + [ Species.OKIDOGI, PokemonType.POISON, PokemonType.FIGHTING, [ [ Biome.BADLANDS, BiomePoolTier.ULTRA_RARE ], [ Biome.BADLANDS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.MUNKIDORI, Type.POISON, Type.PSYCHIC, [ + [ Species.MUNKIDORI, PokemonType.POISON, PokemonType.PSYCHIC, [ [ Biome.JUNGLE, BiomePoolTier.ULTRA_RARE ], [ Biome.JUNGLE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.FEZANDIPITI, Type.POISON, Type.FAIRY, [ + [ Species.FEZANDIPITI, PokemonType.POISON, PokemonType.FAIRY, [ [ Biome.RUINS, BiomePoolTier.ULTRA_RARE ], [ Biome.RUINS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.OGERPON, Type.GRASS, -1, [ + [ Species.OGERPON, PokemonType.GRASS, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.ULTRA_RARE ], [ Biome.MOUNTAIN, BiomePoolTier.BOSS_SUPER_RARE ] ] ], - [ Species.ARCHALUDON, Type.STEEL, Type.DRAGON, [ + [ Species.ARCHALUDON, PokemonType.STEEL, PokemonType.DRAGON, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.HYDRAPPLE, Type.GRASS, Type.DRAGON, [ + [ Species.HYDRAPPLE, PokemonType.GRASS, PokemonType.DRAGON, [ [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.GOUGING_FIRE, Type.FIRE, Type.DRAGON, [ + [ Species.GOUGING_FIRE, PokemonType.FIRE, PokemonType.DRAGON, [ [ Biome.END, BiomePoolTier.RARE ] ] ], - [ Species.RAGING_BOLT, Type.ELECTRIC, Type.DRAGON, [ + [ Species.RAGING_BOLT, PokemonType.ELECTRIC, PokemonType.DRAGON, [ [ Biome.END, BiomePoolTier.RARE ] ] ], - [ Species.IRON_BOULDER, Type.ROCK, Type.PSYCHIC, [ + [ Species.IRON_BOULDER, PokemonType.ROCK, PokemonType.PSYCHIC, [ [ Biome.END, BiomePoolTier.RARE ] ] ], - [ Species.IRON_CROWN, Type.STEEL, Type.PSYCHIC, [ + [ Species.IRON_CROWN, PokemonType.STEEL, PokemonType.PSYCHIC, [ [ Biome.END, BiomePoolTier.RARE ] ] ], - [ Species.TERAPAGOS, Type.NORMAL, -1, [ + [ Species.TERAPAGOS, PokemonType.NORMAL, -1, [ [ Biome.CAVE, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.PECHARUNT, Type.POISON, Type.GHOST, [ ] + [ Species.PECHARUNT, PokemonType.POISON, PokemonType.GHOST, [ ] ], - [ Species.ALOLA_RATTATA, Type.DARK, Type.NORMAL, [ + [ Species.ALOLA_RATTATA, PokemonType.DARK, PokemonType.NORMAL, [ [ Biome.ISLAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.ALOLA_RATICATE, Type.DARK, Type.NORMAL, [ + [ Species.ALOLA_RATICATE, PokemonType.DARK, PokemonType.NORMAL, [ [ Biome.ISLAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.ALOLA_RAICHU, Type.ELECTRIC, Type.PSYCHIC, [ + [ Species.ALOLA_RAICHU, PokemonType.ELECTRIC, PokemonType.PSYCHIC, [ [ Biome.ISLAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.ALOLA_SANDSHREW, Type.ICE, Type.STEEL, [ + [ Species.ALOLA_SANDSHREW, PokemonType.ICE, PokemonType.STEEL, [ [ Biome.ISLAND, BiomePoolTier.COMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ] ] ], - [ Species.ALOLA_SANDSLASH, Type.ICE, Type.STEEL, [ + [ Species.ALOLA_SANDSLASH, PokemonType.ICE, PokemonType.STEEL, [ [ Biome.ISLAND, BiomePoolTier.COMMON ], [ Biome.ISLAND, BiomePoolTier.BOSS ], [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.ALOLA_VULPIX, Type.ICE, -1, [ + [ Species.ALOLA_VULPIX, PokemonType.ICE, -1, [ [ Biome.ISLAND, BiomePoolTier.COMMON ], [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ] ] ], - [ Species.ALOLA_NINETALES, Type.ICE, Type.FAIRY, [ + [ Species.ALOLA_NINETALES, PokemonType.ICE, PokemonType.FAIRY, [ [ Biome.ISLAND, BiomePoolTier.COMMON ], [ Biome.ISLAND, BiomePoolTier.BOSS ], [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.ALOLA_DIGLETT, Type.GROUND, Type.STEEL, [ + [ Species.ALOLA_DIGLETT, PokemonType.GROUND, PokemonType.STEEL, [ [ Biome.ISLAND, BiomePoolTier.COMMON ] ] ], - [ Species.ALOLA_DUGTRIO, Type.GROUND, Type.STEEL, [ + [ Species.ALOLA_DUGTRIO, PokemonType.GROUND, PokemonType.STEEL, [ [ Biome.ISLAND, BiomePoolTier.COMMON ], [ Biome.ISLAND, BiomePoolTier.BOSS ] ] ], - [ Species.ALOLA_MEOWTH, Type.DARK, -1, [ + [ Species.ALOLA_MEOWTH, PokemonType.DARK, -1, [ [ Biome.ISLAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.ALOLA_PERSIAN, Type.DARK, -1, [ + [ Species.ALOLA_PERSIAN, PokemonType.DARK, -1, [ [ Biome.ISLAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.ALOLA_GEODUDE, Type.ROCK, Type.ELECTRIC, [ + [ Species.ALOLA_GEODUDE, PokemonType.ROCK, PokemonType.ELECTRIC, [ [ Biome.ISLAND, BiomePoolTier.COMMON ] ] ], - [ Species.ALOLA_GRAVELER, Type.ROCK, Type.ELECTRIC, [ + [ Species.ALOLA_GRAVELER, PokemonType.ROCK, PokemonType.ELECTRIC, [ [ Biome.ISLAND, BiomePoolTier.COMMON ] ] ], - [ Species.ALOLA_GOLEM, Type.ROCK, Type.ELECTRIC, [ + [ Species.ALOLA_GOLEM, PokemonType.ROCK, PokemonType.ELECTRIC, [ [ Biome.ISLAND, BiomePoolTier.COMMON ], [ Biome.ISLAND, BiomePoolTier.BOSS ] ] ], - [ Species.ALOLA_GRIMER, Type.POISON, Type.DARK, [ + [ Species.ALOLA_GRIMER, PokemonType.POISON, PokemonType.DARK, [ [ Biome.ISLAND, BiomePoolTier.COMMON ] ] ], - [ Species.ALOLA_MUK, Type.POISON, Type.DARK, [ + [ Species.ALOLA_MUK, PokemonType.POISON, PokemonType.DARK, [ [ Biome.ISLAND, BiomePoolTier.COMMON ], [ Biome.ISLAND, BiomePoolTier.BOSS ] ] ], - [ Species.ALOLA_EXEGGUTOR, Type.GRASS, Type.DRAGON, [ + [ Species.ALOLA_EXEGGUTOR, PokemonType.GRASS, PokemonType.DRAGON, [ [ Biome.ISLAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.ALOLA_MAROWAK, Type.FIRE, Type.GHOST, [ + [ Species.ALOLA_MAROWAK, PokemonType.FIRE, PokemonType.GHOST, [ [ Biome.ISLAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.ETERNAL_FLOETTE, Type.FAIRY, -1, [ + [ Species.ETERNAL_FLOETTE, PokemonType.FAIRY, -1, [ [ Biome.FAIRY_CAVE, BiomePoolTier.RARE ], [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.GALAR_MEOWTH, Type.STEEL, -1, [ + [ Species.GALAR_MEOWTH, PokemonType.STEEL, -1, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE, TimeOfDay.DUSK ] ] ], - [ Species.GALAR_PONYTA, Type.PSYCHIC, -1, [ + [ Species.GALAR_PONYTA, PokemonType.PSYCHIC, -1, [ [ Biome.JUNGLE, BiomePoolTier.RARE, TimeOfDay.DAWN ] ] ], - [ Species.GALAR_RAPIDASH, Type.PSYCHIC, Type.FAIRY, [ + [ Species.GALAR_RAPIDASH, PokemonType.PSYCHIC, PokemonType.FAIRY, [ [ Biome.JUNGLE, BiomePoolTier.RARE, TimeOfDay.DAWN ], [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE, TimeOfDay.DAWN ] ] ], - [ Species.GALAR_SLOWPOKE, Type.PSYCHIC, -1, [ + [ Species.GALAR_SLOWPOKE, PokemonType.PSYCHIC, -1, [ [ Biome.SWAMP, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GALAR_SLOWBRO, Type.POISON, Type.PSYCHIC, [ + [ Species.GALAR_SLOWBRO, PokemonType.POISON, PokemonType.PSYCHIC, [ [ Biome.SWAMP, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SWAMP, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GALAR_FARFETCHD, Type.FIGHTING, -1, [ + [ Species.GALAR_FARFETCHD, PokemonType.FIGHTING, -1, [ [ Biome.DOJO, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.GALAR_WEEZING, Type.POISON, Type.FAIRY, [ + [ Species.GALAR_WEEZING, PokemonType.POISON, PokemonType.FAIRY, [ [ Biome.SLUM, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.GALAR_MR_MIME, Type.ICE, Type.PSYCHIC, [ + [ Species.GALAR_MR_MIME, PokemonType.ICE, PokemonType.PSYCHIC, [ [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.GALAR_ARTICUNO, Type.PSYCHIC, Type.FLYING, [ + [ Species.GALAR_ARTICUNO, PokemonType.PSYCHIC, PokemonType.FLYING, [ [ Biome.SNOWY_FOREST, BiomePoolTier.ULTRA_RARE ], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.GALAR_ZAPDOS, Type.FIGHTING, Type.FLYING, [ + [ Species.GALAR_ZAPDOS, PokemonType.FIGHTING, PokemonType.FLYING, [ [ Biome.DOJO, BiomePoolTier.ULTRA_RARE ], [ Biome.DOJO, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.GALAR_MOLTRES, Type.DARK, Type.FLYING, [ + [ Species.GALAR_MOLTRES, PokemonType.DARK, PokemonType.FLYING, [ [ Biome.ABYSS, BiomePoolTier.ULTRA_RARE ], [ Biome.ABYSS, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.GALAR_SLOWKING, Type.POISON, Type.PSYCHIC, [ + [ Species.GALAR_SLOWKING, PokemonType.POISON, PokemonType.PSYCHIC, [ [ Biome.SWAMP, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GALAR_CORSOLA, Type.GHOST, -1, [ + [ Species.GALAR_CORSOLA, PokemonType.GHOST, -1, [ [ Biome.SEABED, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.GALAR_ZIGZAGOON, Type.DARK, Type.NORMAL, [ + [ Species.GALAR_ZIGZAGOON, PokemonType.DARK, PokemonType.NORMAL, [ [ Biome.SLUM, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.GALAR_LINOONE, Type.DARK, Type.NORMAL, [ + [ Species.GALAR_LINOONE, PokemonType.DARK, PokemonType.NORMAL, [ [ Biome.SLUM, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.GALAR_DARUMAKA, Type.ICE, -1, [ + [ Species.GALAR_DARUMAKA, PokemonType.ICE, -1, [ [ Biome.SNOWY_FOREST, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GALAR_DARMANITAN, Type.ICE, -1, [ + [ Species.GALAR_DARMANITAN, PokemonType.ICE, -1, [ [ Biome.SNOWY_FOREST, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.GALAR_YAMASK, Type.GROUND, Type.GHOST, [ + [ Species.GALAR_YAMASK, PokemonType.GROUND, PokemonType.GHOST, [ [ Biome.RUINS, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.GALAR_STUNFISK, Type.GROUND, Type.STEEL, [ + [ Species.GALAR_STUNFISK, PokemonType.GROUND, PokemonType.STEEL, [ [ Biome.SWAMP, BiomePoolTier.SUPER_RARE ], [ Biome.SWAMP, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.HISUI_GROWLITHE, Type.FIRE, Type.ROCK, [ + [ Species.HISUI_GROWLITHE, PokemonType.FIRE, PokemonType.ROCK, [ [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.HISUI_ARCANINE, Type.FIRE, Type.ROCK, [ + [ Species.HISUI_ARCANINE, PokemonType.FIRE, PokemonType.ROCK, [ [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.HISUI_VOLTORB, Type.ELECTRIC, Type.GRASS, [ + [ Species.HISUI_VOLTORB, PokemonType.ELECTRIC, PokemonType.GRASS, [ [ Biome.POWER_PLANT, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.HISUI_ELECTRODE, Type.ELECTRIC, Type.GRASS, [ + [ Species.HISUI_ELECTRODE, PokemonType.ELECTRIC, PokemonType.GRASS, [ [ Biome.POWER_PLANT, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.HISUI_TYPHLOSION, Type.FIRE, Type.GHOST, [ + [ Species.HISUI_TYPHLOSION, PokemonType.FIRE, PokemonType.GHOST, [ [ Biome.GRAVEYARD, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.HISUI_QWILFISH, Type.DARK, Type.POISON, [ + [ Species.HISUI_QWILFISH, PokemonType.DARK, PokemonType.POISON, [ [ Biome.SEABED, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.HISUI_SNEASEL, Type.FIGHTING, Type.POISON, [ + [ Species.HISUI_SNEASEL, PokemonType.FIGHTING, PokemonType.POISON, [ [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.HISUI_SAMUROTT, Type.WATER, Type.DARK, [ + [ Species.HISUI_SAMUROTT, PokemonType.WATER, PokemonType.DARK, [ [ Biome.ABYSS, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.HISUI_LILLIGANT, Type.GRASS, Type.FIGHTING, [ + [ Species.HISUI_LILLIGANT, PokemonType.GRASS, PokemonType.FIGHTING, [ [ Biome.MEADOW, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.HISUI_ZORUA, Type.NORMAL, Type.GHOST, [ + [ Species.HISUI_ZORUA, PokemonType.NORMAL, PokemonType.GHOST, [ [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.HISUI_ZOROARK, Type.NORMAL, Type.GHOST, [ + [ Species.HISUI_ZOROARK, PokemonType.NORMAL, PokemonType.GHOST, [ [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]], [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.HISUI_BRAVIARY, Type.PSYCHIC, Type.FLYING, [ + [ Species.HISUI_BRAVIARY, PokemonType.PSYCHIC, PokemonType.FLYING, [ [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.HISUI_SLIGGOO, Type.STEEL, Type.DRAGON, [ + [ Species.HISUI_SLIGGOO, PokemonType.STEEL, PokemonType.DRAGON, [ [ Biome.SWAMP, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.HISUI_GOODRA, Type.STEEL, Type.DRAGON, [ + [ Species.HISUI_GOODRA, PokemonType.STEEL, PokemonType.DRAGON, [ [ Biome.SWAMP, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.SWAMP, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.HISUI_AVALUGG, Type.ICE, Type.ROCK, [ + [ Species.HISUI_AVALUGG, PokemonType.ICE, PokemonType.ROCK, [ [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ] ] ], - [ Species.HISUI_DECIDUEYE, Type.GRASS, Type.FIGHTING, [ + [ Species.HISUI_DECIDUEYE, PokemonType.GRASS, PokemonType.FIGHTING, [ [ Biome.DOJO, BiomePoolTier.BOSS_RARE ] ] ], - [ Species.PALDEA_TAUROS, Type.FIGHTING, -1, [ + [ Species.PALDEA_TAUROS, PokemonType.FIGHTING, -1, [ [ Biome.PLAINS, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]], [ Biome.PLAINS, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]] ] ], - [ Species.PALDEA_WOOPER, Type.POISON, Type.GROUND, [ + [ Species.PALDEA_WOOPER, PokemonType.POISON, PokemonType.GROUND, [ [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]] ] ], - [ Species.BLOODMOON_URSALUNA, Type.GROUND, Type.NORMAL, [ + [ Species.BLOODMOON_URSALUNA, PokemonType.GROUND, PokemonType.NORMAL, [ [ Biome.FOREST, BiomePoolTier.SUPER_RARE, TimeOfDay.NIGHT ], [ Biome.FOREST, BiomePoolTier.BOSS_RARE, TimeOfDay.NIGHT ] ] @@ -7663,15 +7676,15 @@ export function initBiomes() { biomeDepths[Biome.TOWN] = [ 0, 1 ]; - const traverseBiome = (biome: Biome, depth: integer) => { + const traverseBiome = (biome: Biome, depth: number) => { if (biome === Biome.END) { - const biomeList = Object.keys(Biome).filter(key => !isNaN(Number(key))); + const biomeList = Object.keys(Biome).filter(key => !Number.isNaN(Number(key))); biomeList.pop(); // Removes Biome.END from the list const randIndex = Utils.randSeedInt(biomeList.length, 1); // Will never be Biome.TOWN biome = Biome[biomeList[randIndex]]; } - const linkedBiomes: (Biome | [ Biome, integer ])[] = Array.isArray(biomeLinks[biome]) - ? biomeLinks[biome] as (Biome | [ Biome, integer ])[] + const linkedBiomes: (Biome | [ Biome, number ])[] = Array.isArray(biomeLinks[biome]) + ? biomeLinks[biome] as (Biome | [ Biome, number ])[] : [ biomeLinks[biome] as Biome ]; for (const linkedBiomeEntry of linkedBiomes) { const linkedBiome = !Array.isArray(linkedBiomeEntry) @@ -7688,7 +7701,7 @@ export function initBiomes() { }; traverseBiome(Biome.TOWN, 0); - biomeDepths[Biome.END] = [ Object.values(biomeDepths).map(d => d[0]).reduce((max: integer, value: integer) => Math.max(max, value), 0) + 1, 1 ]; + biomeDepths[Biome.END] = [ Object.values(biomeDepths).map(d => d[0]).reduce((max: number, value: number) => Math.max(max, value), 0) + 1, 1 ]; for (const biome of Utils.getEnumValues(Biome)) { biomePokemonPools[biome] = {}; @@ -7716,6 +7729,9 @@ export function initBiomes() { uncatchableSpecies.push(speciesId); } + // array of biome options for the current species + catchableSpecies[speciesId] = []; + for (const b of biomeEntries) { const biome = b[0]; const tier = b[1]; @@ -7725,6 +7741,12 @@ export function initBiomes() { : [ b[2] ] : [ TimeOfDay.ALL ]; + catchableSpecies[speciesId].push({ + biome: biome as Biome, + tier: tier as BiomePoolTier, + tod: timesOfDay as TimeOfDay[] + }); + for (const tod of timesOfDay) { if (!biomePokemonPools.hasOwnProperty(biome) || !biomePokemonPools[biome].hasOwnProperty(tier) || !biomePokemonPools[biome][tier].hasOwnProperty(tod)) { continue; @@ -7743,7 +7765,8 @@ export function initBiomes() { treeIndex = t; arrayIndex = es + 1; break; - } else if (speciesEvolutions && speciesEvolutions.find(se => se.speciesId === existingSpeciesId)) { + } + if (speciesEvolutions?.find(se => se.speciesId === existingSpeciesId)) { treeIndex = t; arrayIndex = es; break; @@ -7765,7 +7788,7 @@ export function initBiomes() { for (const b of Object.keys(biomePokemonPools)) { for (const t of Object.keys(biomePokemonPools[b])) { - const tier = parseInt(t) as BiomePoolTier; + const tier = Number.parseInt(t) as BiomePoolTier; for (const tod of Object.keys(biomePokemonPools[b][t])) { const biomeTierTimePool = biomePokemonPools[b][t][tod]; for (let e = 0; e < biomeTierTimePool.length; e++) { @@ -7778,7 +7801,7 @@ export function initBiomes() { }; for (let s = 1; s < entry.length; s++) { const speciesId = entry[s]; - const prevolution = entry.map(s => pokemonEvolutions[s]).flat().find(e => e && e.speciesId === speciesId); + const prevolution = entry.flatMap((s: string | number) => pokemonEvolutions[s]).find(e => e && e.speciesId === speciesId); const level = prevolution.level - (prevolution.level === 1 ? 1 : 0) + (prevolution.wildDelay * 10) - (tier >= BiomePoolTier.BOSS ? 10 : 0); if (!newEntry.hasOwnProperty(level)) { newEntry[level] = [ speciesId ]; diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts index 4855379f675..5829e3e10aa 100644 --- a/src/data/balance/egg-moves.ts +++ b/src/data/balance/egg-moves.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import * as Utils from "#app/utils"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -7,10 +7,10 @@ import { Species } from "#enums/species"; export const speciesEggMoves = { [Species.BULBASAUR]: [ Moves.SAPPY_SEED, Moves.MALIGNANT_CHAIN, Moves.EARTH_POWER, Moves.MATCHA_GOTCHA ], [Species.CHARMANDER]: [ Moves.DRAGON_DANCE, Moves.BITTER_BLADE, Moves.EARTH_POWER, Moves.OBLIVION_WING ], - [Species.SQUIRTLE]: [ Moves.FREEZE_DRY, Moves.ARMOR_CANNON, Moves.BOUNCY_BUBBLE, Moves.ORIGIN_PULSE ], + [Species.SQUIRTLE]: [ Moves.FREEZE_DRY, Moves.ARMOR_CANNON, Moves.SHORE_UP, Moves.ORIGIN_PULSE ], [Species.CATERPIE]: [ Moves.SANDSEAR_STORM, Moves.SILK_TRAP, Moves.TWIN_BEAM, Moves.BLEAKWIND_STORM ], [Species.WEEDLE]: [ Moves.THOUSAND_ARROWS, Moves.NOXIOUS_TORQUE, Moves.ATTACK_ORDER, Moves.VICTORY_DANCE ], - [Species.PIDGEY]: [ Moves.WILDBOLT_STORM, Moves.SANDSEAR_STORM, Moves.NASTY_PLOT, Moves.BOOMBURST ], + [Species.PIDGEY]: [ Moves.BLEAKWIND_STORM, Moves.SANDSEAR_STORM, Moves.CALM_MIND, Moves.BOOMBURST ], [Species.RATTATA]: [ Moves.HYPER_FANG, Moves.PSYCHIC_FANGS, Moves.FIRE_FANG, Moves.EXTREME_SPEED ], [Species.SPEAROW]: [ Moves.FLOATY_FALL, Moves.HYPER_DRILL, Moves.TIDY_UP, Moves.TRIPLE_ARROWS ], [Species.EKANS]: [ Moves.NOXIOUS_TORQUE, Moves.DRAGON_DANCE, Moves.SLACK_OFF, Moves.SHED_TAIL ], @@ -34,7 +34,7 @@ export const speciesEggMoves = { [Species.TENTACOOL]: [ Moves.BANEFUL_BUNKER, Moves.MALIGNANT_CHAIN, Moves.BOUNCY_BUBBLE, Moves.STRENGTH_SAP ], [Species.GEODUDE]: [ Moves.FLARE_BLITZ, Moves.HEAD_SMASH, Moves.SHORE_UP, Moves.SHELL_SMASH ], [Species.PONYTA]: [ Moves.HEADLONG_RUSH, Moves.FIRE_LASH, Moves.SWORDS_DANCE, Moves.VOLT_TACKLE ], - [Species.SLOWPOKE]: [ Moves.BOUNCY_BUBBLE, Moves.FROST_BREATH, Moves.SHED_TAIL, Moves.MYSTICAL_POWER ], + [Species.SLOWPOKE]: [ Moves.SPLISHY_SPLASH, Moves.FROST_BREATH, Moves.SHED_TAIL, Moves.MYSTICAL_POWER ], [Species.MAGNEMITE]: [ Moves.PARABOLIC_CHARGE, Moves.FLAMETHROWER, Moves.ICE_BEAM, Moves.THUNDERCLAP ], [Species.FARFETCHD]: [ Moves.IVY_CUDGEL, Moves.TRIPLE_ARROWS, Moves.DRILL_RUN, Moves.VICTORY_DANCE ], [Species.DODUO]: [ Moves.TRIPLE_AXEL, Moves.HYPER_DRILL, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ], @@ -46,20 +46,20 @@ export const speciesEggMoves = { [Species.DROWZEE]: [ Moves.BADDY_BAD, Moves.STRENGTH_SAP, Moves.LUMINA_CRASH, Moves.DARK_VOID ], [Species.KRABBY]: [ Moves.DIRE_CLAW, Moves.DRAGON_HAMMER, Moves.IVY_CUDGEL, Moves.JET_PUNCH ], [Species.VOLTORB]: [ Moves.NASTY_PLOT, Moves.FUSION_FLARE, Moves.FROST_BREATH, Moves.ELECTRO_DRIFT ], - [Species.EXEGGCUTE]: [ Moves.FICKLE_BEAM, Moves.APPLE_ACID, Moves.TRICK_ROOM, Moves.LUMINA_CRASH ], + [Species.EXEGGCUTE]: [ Moves.FICKLE_BEAM, Moves.APPLE_ACID, Moves.HEAT_WAVE, Moves.LUMINA_CRASH ], [Species.CUBONE]: [ Moves.HEAD_SMASH, Moves.WOOD_HAMMER, Moves.SHADOW_SNEAK, Moves.BITTER_BLADE ], [Species.LICKITUNG]: [ Moves.CRUSH_GRIP, Moves.FIRE_LASH, Moves.SLACK_OFF, Moves.MAGICAL_TORQUE ], [Species.KOFFING]: [ Moves.SCALD, Moves.RECOVER, Moves.BODY_PRESS, Moves.MALIGNANT_CHAIN ], [Species.RHYHORN]: [ Moves.SHORE_UP, Moves.ICE_HAMMER, Moves.ACCELEROCK, Moves.HEAD_SMASH ], [Species.TANGELA]: [ Moves.NATURES_MADNESS, Moves.SNAP_TRAP, Moves.PARTING_SHOT, Moves.SAPPY_SEED ], - [Species.KANGASKHAN]: [ Moves.POWER_UP_PUNCH, Moves.TRAILBLAZE, Moves.FACADE, Moves.SEISMIC_TOSS ], + [Species.KANGASKHAN]: [ Moves.POWER_UP_PUNCH, Moves.TRAILBLAZE, Moves.COVET, Moves.SEISMIC_TOSS ], [Species.HORSEA]: [ Moves.SNIPE_SHOT, Moves.FROST_BREATH, Moves.SLUDGE_BOMB, Moves.CLANGING_SCALES ], [Species.GOLDEEN]: [ Moves.GLACIAL_LANCE, Moves.SUPERCELL_SLAM, Moves.DRAGON_DANCE, Moves.FISHIOUS_REND ], [Species.STARYU]: [ Moves.CALM_MIND, Moves.BOUNCY_BUBBLE, Moves.MOONBLAST, Moves.MYSTICAL_POWER ], [Species.SCYTHER]: [ Moves.MIGHTY_CLEAVE, Moves.GEAR_GRIND, Moves.STORM_THROW, Moves.BITTER_BLADE ], [Species.PINSIR]: [ Moves.HEADLONG_RUSH, Moves.LEECH_LIFE, Moves.CRUSH_GRIP, Moves.EXTREME_SPEED ], [Species.TAUROS]: [ Moves.SWORDS_DANCE, Moves.FIRE_LASH, Moves.WICKED_TORQUE, Moves.COLLISION_COURSE ], - [Species.MAGIKARP]: [ Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.DRAGON_ASCENT, Moves.SURGING_STRIKES ], + [Species.MAGIKARP]: [ Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.KNOCK_OFF, Moves.DRAGON_ASCENT ], [Species.LAPRAS]: [ Moves.RECOVER, Moves.FREEZE_DRY, Moves.SCALD, Moves.SHELL_SMASH ], [Species.DITTO]: [ Moves.MIMIC, Moves.SKETCH, Moves.METRONOME, Moves.IMPRISON ], [Species.EEVEE]: [ Moves.WISH, Moves.NO_RETREAT, Moves.ZIPPY_ZAP, Moves.BOOMBURST ], @@ -76,7 +76,7 @@ export const speciesEggMoves = { [Species.CHIKORITA]: [ Moves.SAPPY_SEED, Moves.STONE_AXE, Moves.DRAGON_DANCE, Moves.SPORE ], [Species.CYNDAQUIL]: [ Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.FIERY_DANCE, Moves.ELECTRO_DRIFT ], - [Species.TOTODILE]: [ Moves.THUNDER_PUNCH, Moves.DRAGON_DANCE, Moves.TRIPLE_AXEL, Moves.SURGING_STRIKES ], + [Species.TOTODILE]: [ Moves.THUNDER_PUNCH, Moves.DRAGON_DANCE, Moves.PLAY_ROUGH, Moves.SURGING_STRIKES ], [Species.SENTRET]: [ Moves.TIDY_UP, Moves.FAKE_OUT, Moves.NUZZLE, Moves.EXTREME_SPEED ], [Species.HOOTHOOT]: [ Moves.CALM_MIND, Moves.ESPER_WING, Moves.AEROBLAST, Moves.BOOMBURST ], [Species.LEDYBA]: [ Moves.POLLEN_PUFF, Moves.MAT_BLOCK, Moves.PARTING_SHOT, Moves.SPORE ], @@ -112,7 +112,7 @@ export const speciesEggMoves = { [Species.REMORAID]: [ Moves.WATER_SHURIKEN, Moves.TAKE_HEART, Moves.SHELL_SIDE_ARM, Moves.BOUNCY_BUBBLE ], [Species.DELIBIRD]: [ Moves.BONEMERANG, Moves.FLOATY_FALL, Moves.VICTORY_DANCE, Moves.GLACIAL_LANCE ], [Species.SKARMORY]: [ Moves.ROOST, Moves.BODY_PRESS, Moves.SPIKY_SHIELD, Moves.BEAK_BLAST ], - [Species.HOUNDOUR]: [ Moves.EARTH_POWER, Moves.THUNDERBOLT, Moves.MOONBLAST, Moves.FIERY_WRATH ], + [Species.HOUNDOUR]: [ Moves.FIERY_WRATH, Moves.THUNDERBOLT, Moves.MOONBLAST, Moves.ARMOR_CANNON ], [Species.PHANPY]: [ Moves.SHORE_UP, Moves.SWORDS_DANCE, Moves.MOUNTAIN_GALE, Moves.COLLISION_COURSE ], [Species.STANTLER]: [ Moves.THUNDEROUS_KICK, Moves.PHOTON_GEYSER, Moves.SWORDS_DANCE, Moves.BOOMBURST ], [Species.SMEARGLE]: [ Moves.CONVERSION, Moves.BURNING_BULWARK, Moves.SALT_CURE, Moves.DARK_VOID ], @@ -132,7 +132,7 @@ export const speciesEggMoves = { [Species.TREECKO]: [ Moves.NASTY_PLOT, Moves.CORE_ENFORCER, Moves.FLAMETHROWER, Moves.SEED_FLARE ], [Species.TORCHIC]: [ Moves.THUNDEROUS_KICK, Moves.ZING_ZAP, Moves.BURNING_BULWARK, Moves.PYRO_BALL ], [Species.MUDKIP]: [ Moves.SHORE_UP, Moves.MOUNTAIN_GALE, Moves.AQUA_STEP, Moves.PRECIPICE_BLADES ], - [Species.POOCHYENA]: [ Moves.JAW_LOCK, Moves.CLOSE_COMBAT, Moves.DIRE_CLAW, Moves.NO_RETREAT ], + [Species.POOCHYENA]: [ Moves.KNOCK_OFF, Moves.CLOSE_COMBAT, Moves.DIRE_CLAW, Moves.VICTORY_DANCE ], [Species.ZIGZAGOON]: [ Moves.EXTREME_SPEED, Moves.NUZZLE, Moves.HIGH_HORSEPOWER, Moves.TIDY_UP ], [Species.WURMPLE]: [ Moves.BATON_PASS, Moves.BLEAKWIND_STORM, Moves.STORED_POWER, Moves.MALIGNANT_CHAIN ], [Species.LOTAD]: [ Moves.REVELATION_DANCE, Moves.APPLE_ACID, Moves.ICE_BEAM, Moves.QUIVER_DANCE ], @@ -159,7 +159,7 @@ export const speciesEggMoves = { [Species.VOLBEAT]: [ Moves.BATON_PASS, Moves.STICKY_WEB, Moves.DECORATE, Moves.VICTORY_DANCE ], [Species.ILLUMISE]: [ Moves.PARTING_SHOT, Moves.GLITZY_GLOW, Moves.POWDER, Moves.QUIVER_DANCE ], [Species.GULPIN]: [ Moves.MALIGNANT_CHAIN, Moves.EARTH_POWER, Moves.CALM_MIND, Moves.STRENGTH_SAP ], - [Species.CARVANHA]: [ Moves.THUNDER_FANG, Moves.SWORDS_DANCE, Moves.OBSTRUCT, Moves.SURGING_STRIKES ], + [Species.CARVANHA]: [ Moves.THUNDER_FANG, Moves.GUNK_SHOT, Moves.OBSTRUCT, Moves.SURGING_STRIKES ], [Species.WAILMER]: [ Moves.TAKE_HEART, Moves.COMEUPPANCE, Moves.SLACK_OFF, Moves.STEAM_ERUPTION ], [Species.NUMEL]: [ Moves.TRICK_ROOM, Moves.ENERGY_BALL, Moves.SLACK_OFF, Moves.BLUE_FLARE ], [Species.TORKOAL]: [ Moves.MORNING_SUN, Moves.BURNING_BULWARK, Moves.BODY_PRESS, Moves.HYDRO_STEAM ], @@ -185,26 +185,26 @@ export const speciesEggMoves = { [Species.TROPIUS]: [ Moves.STUFF_CHEEKS, Moves.EARTH_POWER, Moves.APPLE_ACID, Moves.SAPPY_SEED ], [Species.ABSOL]: [ Moves.KOWTOW_CLEAVE, Moves.SACRED_SWORD, Moves.PSYBLADE, Moves.BITTER_BLADE ], [Species.WYNAUT]: [ Moves.RECOVER, Moves.SHED_TAIL, Moves.TAUNT, Moves.COMEUPPANCE ], - [Species.SNORUNT]: [ Moves.FREEZY_FROST, Moves.EXTREME_SPEED, Moves.EARTH_POWER, Moves.NO_RETREAT ], + [Species.SNORUNT]: [ Moves.SPARKLY_SWIRL, Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.BLOOD_MOON ], [Species.SPHEAL]: [ Moves.FLIP_TURN, Moves.FREEZE_DRY, Moves.SLACK_OFF, Moves.STEAM_ERUPTION ], [Species.CLAMPERL]: [ Moves.SHELL_SIDE_ARM, Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ], [Species.RELICANTH]: [ Moves.DRAGON_DANCE, Moves.SHORE_UP, Moves.WAVE_CRASH, Moves.DIAMOND_STORM ], [Species.LUVDISC]: [ Moves.BATON_PASS, Moves.HEART_SWAP, Moves.GLITZY_GLOW, Moves.REVIVAL_BLESSING ], - [Species.BAGON]: [ Moves.FLOATY_FALL, Moves.FIRE_LASH, Moves.DRAGON_DANCE, Moves.DRAGON_DARTS ], + [Species.BAGON]: [ Moves.HEADLONG_RUSH, Moves.FIRE_LASH, Moves.DRAGON_DANCE, Moves.DRAGON_DARTS ], [Species.BELDUM]: [ Moves.HEADLONG_RUSH, Moves.DRAIN_PUNCH, Moves.TRIPLE_AXEL, Moves.SHIFT_GEAR ], [Species.REGIROCK]: [ Moves.STONE_AXE, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SALT_CURE ], [Species.REGICE]: [ Moves.EARTH_POWER, Moves.TAKE_HEART, Moves.RECOVER, Moves.FREEZE_DRY ], [Species.REGISTEEL]: [ Moves.BODY_PRESS, Moves.SIZZLY_SLIDE, Moves.RECOVER, Moves.GIGATON_HAMMER ], [Species.LATIAS]: [ Moves.CORE_ENFORCER, Moves.FUSION_FLARE, Moves.SPARKLY_SWIRL, Moves.MYSTICAL_POWER ], [Species.LATIOS]: [ Moves.CORE_ENFORCER, Moves.BLUE_FLARE, Moves.NASTY_PLOT, Moves.TACHYON_CUTTER ], - [Species.KYOGRE]: [ Moves.WILDBOLT_STORM, Moves.HURRICANE, Moves.FREEZY_FROST, Moves.BOUNCY_BUBBLE ], + [Species.KYOGRE]: [ Moves.RECOVER, Moves.HURRICANE, Moves.FREEZY_FROST, Moves.WILDBOLT_STORM ], [Species.GROUDON]: [ Moves.STONE_AXE, Moves.SOLAR_BLADE, Moves.MORNING_SUN, Moves.SACRED_FIRE ], [Species.RAYQUAZA]: [ Moves.V_CREATE, Moves.DRAGON_DARTS, Moves.CORE_ENFORCER, Moves.OBLIVION_WING ], [Species.JIRACHI]: [ Moves.TACHYON_CUTTER, Moves.TRIPLE_ARROWS, Moves.ROCK_SLIDE, Moves.SHELL_SMASH ], [Species.DEOXYS]: [ Moves.COLLISION_COURSE, Moves.FUSION_FLARE, Moves.PARTING_SHOT, Moves.LUMINA_CRASH ], [Species.TURTWIG]: [ Moves.SHELL_SMASH, Moves.MIGHTY_CLEAVE, Moves.ICE_SPINNER, Moves.SAPPY_SEED ], - [Species.CHIMCHAR]: [ Moves.FIERY_DANCE, Moves.SECRET_SWORD, Moves.TRIPLE_AXEL, Moves.SACRED_FIRE ], + [Species.CHIMCHAR]: [ Moves.THUNDERBOLT, Moves.SECRET_SWORD, Moves.TRIPLE_AXEL, Moves.SACRED_FIRE ], [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.TACHYON_CUTTER, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ], [Species.STARLY]: [ Moves.SWORDS_DANCE, Moves.HEAD_CHARGE, Moves.FLARE_BLITZ, Moves.EXTREME_SPEED ], [Species.BIDOOF]: [ Moves.EXTREME_SPEED, Moves.COSMIC_POWER, Moves.POWER_TRIP, Moves.AQUA_STEP ], @@ -215,15 +215,15 @@ export const speciesEggMoves = { [Species.SHIELDON]: [ Moves.SHORE_UP, Moves.BODY_PRESS, Moves.KINGS_SHIELD, Moves.DIAMOND_STORM ], [Species.BURMY]: [ Moves.FIERY_DANCE, Moves.DEFEND_ORDER, Moves.HEAL_ORDER, Moves.SAPPY_SEED ], [Species.COMBEE]: [ Moves.SPORE, Moves.FLOATY_FALL, Moves.KINGS_SHIELD, Moves.VICTORY_DANCE ], - [Species.PACHIRISU]: [ Moves.FREEZY_FROST, Moves.SIZZLY_SLIDE, Moves.SLACK_OFF, Moves.ZIPPY_ZAP ], + [Species.PACHIRISU]: [ Moves.FREEZY_FROST, Moves.SIZZLY_SLIDE, Moves.SLACK_OFF, Moves.THUNDER_CAGE ], [Species.BUIZEL]: [ Moves.JET_PUNCH, Moves.TRIPLE_AXEL, Moves.SUPERCELL_SLAM, Moves.SURGING_STRIKES ], [Species.CHERUBI]: [ Moves.SLEEP_POWDER, Moves.STRENGTH_SAP, Moves.FIRE_LASH, Moves.FLOWER_TRICK ], [Species.SHELLOS]: [ Moves.BOUNCY_BUBBLE, Moves.SCORCHING_SANDS, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ], - [Species.DRIFLOON]: [ Moves.WILL_O_WISP, Moves.MIND_BLOWN, Moves.CALM_MIND, Moves.OBLIVION_WING ], - [Species.BUNEARY]: [ Moves.TRIPLE_AXEL, Moves.SWORDS_DANCE, Moves.THUNDEROUS_KICK, Moves.MULTI_ATTACK ], + [Species.DRIFLOON]: [ Moves.PSYCHO_SHIFT, Moves.MIND_BLOWN, Moves.CALM_MIND, Moves.OBLIVION_WING ], + [Species.BUNEARY]: [ Moves.TRIPLE_AXEL, Moves.EXTREME_SPEED, Moves.THUNDEROUS_KICK, Moves.SWORDS_DANCE ], [Species.GLAMEOW]: [ Moves.PARTING_SHOT, Moves.HIGH_HORSEPOWER, Moves.SWORDS_DANCE, Moves.EXTREME_SPEED ], [Species.CHINGLING]: [ Moves.BUZZY_BUZZ, Moves.EERIE_SPELL, Moves.TORCH_SONG, Moves.BOOMBURST ], - [Species.STUNKY]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.RECOVER, Moves.DIRE_CLAW ], + [Species.STUNKY]: [ Moves.CEASELESS_EDGE, Moves.FIRE_LASH, Moves.RECOVER, Moves.DIRE_CLAW ], [Species.BRONZOR]: [ Moves.RECOVER, Moves.TACHYON_CUTTER, Moves.GLARE, Moves.LUMINA_CRASH ], [Species.BONSLY]: [ Moves.ACCELEROCK, Moves.SWORDS_DANCE, Moves.STRENGTH_SAP, Moves.SAPPY_SEED ], [Species.MIME_JR]: [ Moves.CHILLY_RECEPTION, Moves.MOONBLAST, Moves.FROST_BREATH, Moves.LUMINA_CRASH ], @@ -235,20 +235,20 @@ export const speciesEggMoves = { [Species.RIOLU]: [ Moves.THUNDEROUS_KICK, Moves.TACHYON_CUTTER, Moves.TRIPLE_AXEL, Moves.SUNSTEEL_STRIKE ], [Species.HIPPOPOTAS]: [ Moves.SHORE_UP, Moves.STONE_AXE, Moves.BULK_UP, Moves.SALT_CURE ], [Species.SKORUPI]: [ Moves.COIL, Moves.DIRE_CLAW, Moves.CRABHAMMER, Moves.WICKED_BLOW ], - [Species.CROAGUNK]: [ Moves.DIRE_CLAW, Moves.ICE_SPINNER, Moves.THUNDEROUS_KICK, Moves.VICTORY_DANCE ], + [Species.CROAGUNK]: [ Moves.DIRE_CLAW, Moves.TRIPLE_AXEL, Moves.THUNDEROUS_KICK, Moves.VICTORY_DANCE ], [Species.CARNIVINE]: [ Moves.STRENGTH_SAP, Moves.FIRE_LASH, Moves.COIL, Moves.SAPPY_SEED ], - [Species.FINNEON]: [ Moves.QUIVER_DANCE, Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.ORIGIN_PULSE ], + [Species.FINNEON]: [ Moves.QUIVER_DANCE, Moves.SPLISHY_SPLASH, Moves.FREEZE_DRY, Moves.OBLIVION_WING ], [Species.MANTYKE]: [ Moves.SPLISHY_SPLASH, Moves.FREEZY_FROST, Moves.NASTY_PLOT, Moves.OBLIVION_WING ], [Species.SNOVER]: [ Moves.LANDS_WRATH, Moves.POWDER, Moves.CALM_MIND, Moves.MATCHA_GOTCHA ], [Species.ROTOM]: [ Moves.STRENGTH_SAP, Moves.FIERY_DANCE, Moves.SPLISHY_SPLASH, Moves.ELECTRO_DRIFT ], - [Species.UXIE]: [ Moves.COSMIC_POWER, Moves.SECRET_SWORD, Moves.RECOVER, Moves.SPARKLY_SWIRL ], - [Species.MESPRIT]: [ Moves.TAIL_GLOW, Moves.AURA_SPHERE, Moves.RECOVER, Moves.LUMINA_CRASH ], - [Species.AZELF]: [ Moves.PSYSTRIKE, Moves.ICE_BEAM, Moves.MOONBLAST, Moves.TAIL_GLOW ], + [Species.UXIE]: [ Moves.LUMINA_CRASH, Moves.AURA_SPHERE, Moves.RECOVER, Moves.TAIL_GLOW ], + [Species.MESPRIT]: [ Moves.PHOTON_GEYSER, Moves.AURA_SPHERE, Moves.RECOVER, Moves.TAIL_GLOW ], + [Species.AZELF]: [ Moves.PSYSTRIKE, Moves.AURA_SPHERE, Moves.ICE_BEAM, Moves.TAIL_GLOW ], [Species.DIALGA]: [ Moves.CORE_ENFORCER, Moves.TAKE_HEART, Moves.RECOVER, Moves.MAKE_IT_RAIN ], [Species.PALKIA]: [ Moves.MALIGNANT_CHAIN, Moves.TAKE_HEART, Moves.RECOVER, Moves.ORIGIN_PULSE ], [Species.HEATRAN]: [ Moves.MATCHA_GOTCHA, Moves.RECOVER, Moves.ERUPTION, Moves.TACHYON_CUTTER ], [Species.REGIGIGAS]: [ Moves.SKILL_SWAP, Moves.RECOVER, Moves.EXTREME_SPEED, Moves.GIGATON_HAMMER ], - [Species.GIRATINA]: [ Moves.DRAGON_DANCE, Moves.GLAIVE_RUSH, Moves.RECOVER, Moves.SPECTRAL_THIEF ], + [Species.GIRATINA]: [ Moves.DRAGON_DANCE, Moves.SPECTRAL_THIEF, Moves.RECOVER, Moves.COLLISION_COURSE ], [Species.CRESSELIA]: [ Moves.COSMIC_POWER, Moves.BODY_PRESS, Moves.SIZZLY_SLIDE, Moves.LUMINA_CRASH ], [Species.PHIONE]: [ Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.STORED_POWER, Moves.ORIGIN_PULSE ], [Species.MANAPHY]: [ Moves.BOUNCY_BUBBLE, Moves.FROST_BREATH, Moves.WILDBOLT_STORM, Moves.ORIGIN_PULSE ], @@ -264,14 +264,14 @@ export const speciesEggMoves = { [Species.LILLIPUP]: [ Moves.CLOSE_COMBAT, Moves.BODY_SLAM, Moves.HIGH_HORSEPOWER, Moves.LAST_RESPECTS ], [Species.PURRLOIN]: [ Moves.ENCORE, Moves.OBSTRUCT, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], [Species.PANSAGE]: [ Moves.SWORDS_DANCE, Moves.FIRE_LASH, Moves.EARTHQUAKE, Moves.IVY_CUDGEL ], - [Species.PANSEAR]: [ Moves.NASTY_PLOT, Moves.HYDRO_STEAM, Moves.SCORCHING_SANDS, Moves.TORCH_SONG ], - [Species.PANPOUR]: [ Moves.NASTY_PLOT, Moves.ENERGY_BALL, Moves.EARTH_POWER, Moves.STEAM_ERUPTION ], + [Species.PANSEAR]: [ Moves.NASTY_PLOT, Moves.HYDRO_STEAM, Moves.EARTH_POWER, Moves.ERUPTION ], + [Species.PANPOUR]: [ Moves.NASTY_PLOT, Moves.ENERGY_BALL, Moves.EARTH_POWER, Moves.WATER_SPOUT ], [Species.MUNNA]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.LUNAR_BLESSING, Moves.MYSTICAL_POWER ], - [Species.PIDOVE]: [ Moves.GUNK_SHOT, Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ], + [Species.PIDOVE]: [ Moves.SLASH, Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ], [Species.BLITZLE]: [ Moves.HORN_LEECH, Moves.SWORDS_DANCE, Moves.FLARE_BLITZ, Moves.BOLT_STRIKE ], [Species.ROGGENROLA]: [ Moves.BODY_PRESS, Moves.CURSE, Moves.SHORE_UP, Moves.DIAMOND_STORM ], [Species.WOOBAT]: [ Moves.ESPER_WING, Moves.STORED_POWER, Moves.MYSTICAL_FIRE, Moves.OBLIVION_WING ], - [Species.DRILBUR]: [ Moves.METEOR_MASH, Moves.MOUNTAIN_GALE, Moves.SHIFT_GEAR, Moves.PRECIPICE_BLADES ], + [Species.DRILBUR]: [ Moves.METEOR_MASH, Moves.ICE_SPINNER, Moves.SHIFT_GEAR, Moves.THOUSAND_ARROWS ], [Species.AUDINO]: [ Moves.TAKE_HEART, Moves.MOONBLAST, Moves.WISH, Moves.MATCHA_GOTCHA ], [Species.TIMBURR]: [ Moves.MACH_PUNCH, Moves.DRAIN_PUNCH, Moves.ICE_HAMMER, Moves.DOUBLE_IRON_BASH ], [Species.TYMPOLE]: [ Moves.JET_PUNCH, Moves.HIGH_HORSEPOWER, Moves.BULK_UP, Moves.SURGING_STRIKES ], @@ -282,7 +282,7 @@ export const speciesEggMoves = { [Species.COTTONEE]: [ Moves.POLLEN_PUFF, Moves.PARTING_SHOT, Moves.SLEEP_POWDER, Moves.SEED_FLARE ], [Species.PETILIL]: [ Moves.THUNDEROUS_KICK, Moves.SPARKLING_ARIA, Moves.FIERY_DANCE, Moves.FLOWER_TRICK ], [Species.BASCULIN]: [ Moves.LAST_RESPECTS, Moves.CLOSE_COMBAT, Moves.SPLISHY_SPLASH, Moves.NO_RETREAT ], - [Species.SANDILE]: [ Moves.DIRE_CLAW, Moves.HEADLONG_RUSH, Moves.FIRE_LASH, Moves.WICKED_BLOW ], + [Species.SANDILE]: [ Moves.DIRE_CLAW, Moves.SUCKER_PUNCH, Moves.FIRE_LASH, Moves.HEADLONG_RUSH ], [Species.DARUMAKA]: [ Moves.DRAIN_PUNCH, Moves.ZIPPY_ZAP, Moves.HEADLONG_RUSH, Moves.PYRO_BALL ], [Species.MARACTUS]: [ Moves.EARTH_POWER, Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.SEED_FLARE ], [Species.DWEBBLE]: [ Moves.CRABHAMMER, Moves.STONE_AXE, Moves.LEECH_LIFE, Moves.MIGHTY_CLEAVE ], @@ -298,18 +298,18 @@ export const speciesEggMoves = { [Species.SOLOSIS]: [ Moves.MIST_BALL, Moves.SPEED_SWAP, Moves.FLAMETHROWER, Moves.LIGHT_OF_RUIN ], [Species.DUCKLETT]: [ Moves.SPLISHY_SPLASH, Moves.SANDSEAR_STORM, Moves.WILDBOLT_STORM, Moves.QUIVER_DANCE ], [Species.VANILLITE]: [ Moves.EARTH_POWER, Moves.AURORA_VEIL, Moves.CALM_MIND, Moves.SPARKLY_SWIRL ], - [Species.DEERLING]: [ Moves.TIDY_UP, Moves.FLOWER_TRICK, Moves.BODY_SLAM, Moves.COMBAT_TORQUE ], + [Species.DEERLING]: [ Moves.TIDY_UP, Moves.HEADBUTT, Moves.COMBAT_TORQUE, Moves.FLOWER_TRICK ], [Species.EMOLGA]: [ Moves.ICICLE_CRASH, Moves.ZING_ZAP, Moves.FLOATY_FALL, Moves.ELECTRIFY ], [Species.KARRABLAST]: [ Moves.LEECH_LIFE, Moves.BITTER_BLADE, Moves.OBSTRUCT, Moves.DOUBLE_IRON_BASH ], [Species.FOONGUS]: [ Moves.POLLEN_PUFF, Moves.PARTING_SHOT, Moves.FOUL_PLAY, Moves.SAPPY_SEED ], [Species.FRILLISH]: [ Moves.CALM_MIND, Moves.BUZZY_BUZZ, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ], [Species.ALOMOMOLA]: [ Moves.FLIP_TURN, Moves.HEART_SWAP, Moves.GLITZY_GLOW, Moves.REVIVAL_BLESSING ], [Species.JOLTIK]: [ Moves.WILDBOLT_STORM, Moves.PARABOLIC_CHARGE, Moves.EARTH_POWER, Moves.QUIVER_DANCE ], - [Species.FERROSEED]: [ Moves.SYNTHESIS, Moves.COMBAT_TORQUE, Moves.SPIKY_SHIELD, Moves.SAPPY_SEED ], + [Species.FERROSEED]: [ Moves.SYNTHESIS, Moves.CEASELESS_EDGE, Moves.SPIKY_SHIELD, Moves.SAPPY_SEED ], [Species.KLINK]: [ Moves.TRIPLE_AXEL, Moves.HIGH_HORSEPOWER, Moves.RECOVER, Moves.AURA_WHEEL ], [Species.TYNAMO]: [ Moves.SCALD, Moves.STRENGTH_SAP, Moves.FIRE_LASH, Moves.AURA_WHEEL ], [Species.ELGYEM]: [ Moves.THUNDERCLAP, Moves.BADDY_BAD, Moves.AURA_SPHERE, Moves.PHOTON_GEYSER ], - [Species.LITWICK]: [ Moves.PARTING_SHOT, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.TORCH_SONG ], + [Species.LITWICK]: [ Moves.GIGA_DRAIN, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.TORCH_SONG ], [Species.AXEW]: [ Moves.STONE_AXE, Moves.DIRE_CLAW, Moves.BITTER_BLADE, Moves.GLAIVE_RUSH ], [Species.CUBCHOO]: [ Moves.MOUNTAIN_GALE, Moves.AQUA_STEP, Moves.ICE_SHARD, Moves.COLLISION_COURSE ], [Species.CRYOGONAL]: [ Moves.FREEZING_GLARE, Moves.AURORA_VEIL, Moves.NASTY_PLOT, Moves.ORIGIN_PULSE ], @@ -325,14 +325,14 @@ export const speciesEggMoves = { [Species.HEATMOR]: [ Moves.EARTH_POWER, Moves.OVERHEAT, Moves.THUNDERBOLT, Moves.V_CREATE ], [Species.DURANT]: [ Moves.HIGH_HORSEPOWER, Moves.FIRST_IMPRESSION, Moves.SWORDS_DANCE, Moves.BEHEMOTH_BASH ], [Species.DEINO]: [ Moves.FIERY_WRATH, Moves.ESPER_WING, Moves.SLUDGE_BOMB, Moves.FICKLE_BEAM ], - [Species.LARVESTA]: [ Moves.THUNDERBOLT, Moves.MAGMA_STORM, Moves.EARTH_POWER, Moves.MATCHA_GOTCHA ], + [Species.LARVESTA]: [ Moves.THUNDERBOLT, Moves.DAZZLING_GLEAM, Moves.EARTH_POWER, Moves.HYDRO_STEAM ], [Species.COBALION]: [ Moves.BEHEMOTH_BLADE, Moves.MIGHTY_CLEAVE, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ], - [Species.TERRAKION]: [ Moves.MIGHTY_CLEAVE, Moves.HEADLONG_RUSH, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ], - [Species.VIRIZION]: [ Moves.PSYBLADE, Moves.SAPPY_SEED, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ], + [Species.TERRAKION]: [ Moves.MIGHTY_CLEAVE, Moves.HEADLONG_RUSH, Moves.KNOCK_OFF, Moves.VICTORY_DANCE ], + [Species.VIRIZION]: [ Moves.SAPPY_SEED, Moves.PSYBLADE, Moves.STONE_AXE, Moves.VICTORY_DANCE ], [Species.TORNADUS]: [ Moves.SANDSEAR_STORM, Moves.PARTING_SHOT, Moves.SPLISHY_SPLASH, Moves.OBLIVION_WING ], [Species.THUNDURUS]: [ Moves.SANDSEAR_STORM, Moves.HURRICANE, Moves.FROST_BREATH, Moves.ELECTRO_SHOT ], [Species.RESHIRAM]: [ Moves.ENERGY_BALL, Moves.TAKE_HEART, Moves.FICKLE_BEAM, Moves.ERUPTION ], - [Species.ZEKROM]: [ Moves.TRIPLE_AXEL, Moves.THUNDEROUS_KICK, Moves.DRAGON_HAMMER, Moves.BOLT_BEAK ], + [Species.ZEKROM]: [ Moves.TRIPLE_AXEL, Moves.THUNDEROUS_KICK, Moves.DRAGON_HAMMER, Moves.DRAGON_ENERGY ], [Species.LANDORUS]: [ Moves.STONE_AXE, Moves.FLOATY_FALL, Moves.ROOST, Moves.BLEAKWIND_STORM ], [Species.KYUREM]: [ Moves.DRAGON_DARTS, Moves.GLACIAL_LANCE, Moves.NO_RETREAT, Moves.DRAGON_ENERGY ], [Species.KELDEO]: [ Moves.BOUNCY_BUBBLE, Moves.THUNDERBOLT, Moves.ICE_BEAM, Moves.STEAM_ERUPTION ], @@ -342,7 +342,7 @@ export const speciesEggMoves = { [Species.CHESPIN]: [ Moves.COMBAT_TORQUE, Moves.SYNTHESIS, Moves.CEASELESS_EDGE, Moves.SAPPY_SEED ], [Species.FENNEKIN]: [ Moves.TWIN_BEAM, Moves.FIERY_DANCE, Moves.THUNDERBOLT, Moves.SPARKLY_SWIRL ], [Species.FROAKIE]: [ Moves.MOONBLAST, Moves.SHELL_SIDE_ARM, Moves.FIERY_WRATH, Moves.STEAM_ERUPTION ], - [Species.BUNNELBY]: [ Moves.DRAIN_PUNCH, Moves.TIDY_UP, Moves.FACADE, Moves.EXTREME_SPEED ], + [Species.BUNNELBY]: [ Moves.DRAIN_PUNCH, Moves.TIDY_UP, Moves.LANDS_WRATH, Moves.EXTREME_SPEED ], [Species.FLETCHLING]: [ Moves.DRILL_RUN, Moves.BURNING_BULWARK, Moves.HEAD_SMASH, Moves.VOLT_TACKLE ], [Species.SCATTERBUG]: [ Moves.FOCUS_BLAST, Moves.AFTER_YOU, Moves.DECORATE, Moves.BLIZZARD ], [Species.LITLEO]: [ Moves.EARTH_POWER, Moves.NASTY_PLOT, Moves.BURNING_BULWARK, Moves.BLUE_FLARE ], @@ -366,35 +366,35 @@ export const speciesEggMoves = { [Species.CARBINK]: [ Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SPARKLY_SWIRL, Moves.DIAMOND_STORM ], [Species.GOOMY]: [ Moves.DRAGON_HAMMER, Moves.RECOVER, Moves.CALM_MIND, Moves.MAKE_IT_RAIN ], [Species.KLEFKI]: [ Moves.HEAL_BELL, Moves.ENCORE, Moves.INSTRUCT, Moves.TOPSY_TURVY ], - [Species.PHANTUMP]: [ Moves.RAGE_FIST, Moves.SLEEP_POWDER, Moves.SYNTHESIS, Moves.SAPPY_SEED ], + [Species.PHANTUMP]: [ Moves.RAGE_FIST, Moves.SLEEP_POWDER, Moves.BULK_UP, Moves.SAPPY_SEED ], [Species.PUMPKABOO]: [ Moves.SPIRIT_SHACKLE, Moves.FIRE_LASH, Moves.DIRE_CLAW, Moves.SAPPY_SEED ], [Species.BERGMITE]: [ Moves.STONE_AXE, Moves.METAL_BURST, Moves.BODY_PRESS, Moves.GLACIAL_LANCE ], [Species.NOIBAT]: [ Moves.AEROBLAST, Moves.OVERDRIVE, Moves.NASTY_PLOT, Moves.CLANGING_SCALES ], [Species.XERNEAS]: [ Moves.EARTH_POWER, Moves.SPRINGTIDE_STORM, Moves.STRENGTH_SAP, Moves.TAIL_GLOW ], - [Species.YVELTAL]: [ Moves.SHELL_SIDE_ARM, Moves.POWER_TRIP, Moves.FIERY_WRATH, Moves.CLANGOROUS_SOUL ], - [Species.ZYGARDE]: [ Moves.DRAGON_DARTS, Moves.HEAL_ORDER, Moves.CLANGOROUS_SOUL, Moves.DOUBLE_IRON_BASH ], + [Species.YVELTAL]: [ Moves.SLUDGE_WAVE, Moves.POWER_TRIP, Moves.FIERY_WRATH, Moves.CLANGOROUS_SOUL ], + [Species.ZYGARDE]: [ Moves.DRAGON_DARTS, Moves.V_CREATE, Moves.CLANGOROUS_SOUL, Moves.HEAL_ORDER ], [Species.DIANCIE]: [ Moves.MAGICAL_TORQUE, Moves.FIERY_DANCE, Moves.SHORE_UP, Moves.GEOMANCY ], [Species.HOOPA]: [ Moves.PHOTON_GEYSER, Moves.SECRET_SWORD, Moves.FIERY_WRATH, Moves.SHELL_SMASH ], - [Species.VOLCANION]: [ Moves.HYDRO_STEAM, Moves.CALM_MIND, Moves.ENERGY_BALL, Moves.MAGMA_STORM ], + [Species.VOLCANION]: [ Moves.HYDRO_STEAM, Moves.CALM_MIND, Moves.SEARING_SHOT, Moves.THUNDERCLAP ], [Species.ETERNAL_FLOETTE]: [ Moves.MIND_BLOWN, Moves.CHLOROBLAST, Moves.LUSTER_PURGE, Moves.QUIVER_DANCE ], [Species.ROWLET]: [ Moves.THOUSAND_ARROWS, Moves.SHADOW_BONE, Moves.FIRST_IMPRESSION, Moves.VICTORY_DANCE ], [Species.LITTEN]: [ Moves.SUCKER_PUNCH, Moves.PARTING_SHOT, Moves.SLACK_OFF, Moves.SACRED_FIRE ], - [Species.POPPLIO]: [ Moves.PSYCHIC_NOISE, Moves.BOUNCY_BUBBLE, Moves.OVERDRIVE, Moves.TORCH_SONG ], + [Species.POPPLIO]: [ Moves.PSYCHIC_NOISE, Moves.MOONLIGHT, Moves.OVERDRIVE, Moves.TORCH_SONG ], [Species.PIKIPEK]: [ Moves.DUAL_WINGBEAT, Moves.BONE_RUSH, Moves.BURNING_BULWARK, Moves.POPULATION_BOMB ], [Species.YUNGOOS]: [ Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.TIDY_UP, Moves.MULTI_ATTACK ], [Species.GRUBBIN]: [ Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.THUNDERCLAP, Moves.QUIVER_DANCE ], - [Species.CRABRAWLER]: [ Moves.JET_PUNCH, Moves.SHORE_UP, Moves.SUCKER_PUNCH, Moves.SURGING_STRIKES ], + [Species.CRABRAWLER]: [ Moves.JET_PUNCH, Moves.SHORE_UP, Moves.MACH_PUNCH, Moves.SURGING_STRIKES ], [Species.ORICORIO]: [ Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.THUNDERCLAP, Moves.OBLIVION_WING ], [Species.CUTIEFLY]: [ Moves.STICKY_WEB, Moves.SLEEP_POWDER, Moves.HEAT_WAVE, Moves.SPARKLY_SWIRL ], [Species.ROCKRUFF]: [ Moves.HIGH_HORSEPOWER, Moves.TIDY_UP, Moves.ICE_SPINNER, Moves.MIGHTY_CLEAVE ], [Species.WISHIWASHI]: [ Moves.HEAL_ORDER, Moves.FREEZE_DRY, Moves.WATER_SHURIKEN, Moves.TAIL_GLOW ], [Species.MAREANIE]: [ Moves.CEASELESS_EDGE, Moves.SIZZLY_SLIDE, Moves.BODY_PRESS, Moves.LEECH_SEED ], [Species.MUDBRAY]: [ Moves.BODY_PRESS, Moves.YAWN, Moves.SHORE_UP, Moves.THOUSAND_WAVES ], - [Species.DEWPIDER]: [ Moves.JET_PUNCH, Moves.SILK_TRAP, Moves.SWORDS_DANCE, Moves.AQUA_STEP ], + [Species.DEWPIDER]: [ Moves.AQUA_STEP, Moves.SILK_TRAP, Moves.SWORDS_DANCE, Moves.JET_PUNCH ], [Species.FOMANTIS]: [ Moves.SUPERPOWER, Moves.HEADLONG_RUSH, Moves.ICE_HAMMER, Moves.BITTER_BLADE ], [Species.MORELULL]: [ Moves.CALM_MIND, Moves.SAPPY_SEED, Moves.DRAINING_KISS, Moves.MATCHA_GOTCHA ], - [Species.SALANDIT]: [ Moves.SCALD, Moves.SLUDGE_WAVE, Moves.CORE_ENFORCER, Moves.ERUPTION ], + [Species.SALANDIT]: [ Moves.SCALD, Moves.MALIGNANT_CHAIN, Moves.CORE_ENFORCER, Moves.ERUPTION ], [Species.STUFFUL]: [ Moves.DRAIN_PUNCH, Moves.METEOR_MASH, Moves.TRIPLE_AXEL, Moves.RAGE_FIST ], [Species.BOUNSWEET]: [ Moves.TRIPLE_AXEL, Moves.AQUA_STEP, Moves.THUNDEROUS_KICK, Moves.SAPPY_SEED ], [Species.COMFEY]: [ Moves.REVIVAL_BLESSING, Moves.TAKE_HEART, Moves.STRENGTH_SAP, Moves.MATCHA_GOTCHA ], @@ -415,26 +415,26 @@ export const speciesEggMoves = { [Species.JANGMO_O]: [ Moves.BODY_PRESS, Moves.SHELL_SIDE_ARM, Moves.SECRET_SWORD, Moves.GLAIVE_RUSH ], [Species.TAPU_KOKO]: [ Moves.MAGICAL_TORQUE, Moves.TRIPLE_AXEL, Moves.SWORDS_DANCE, Moves.BOLT_STRIKE ], [Species.TAPU_LELE]: [ Moves.MOONLIGHT, Moves.NASTY_PLOT, Moves.HEAT_WAVE, Moves.EXPANDING_FORCE ], - [Species.TAPU_BULU]: [ Moves.SAPPY_SEED, Moves.DRAIN_PUNCH, Moves.MAGICAL_TORQUE, Moves.VICTORY_DANCE ], - [Species.TAPU_FINI]: [ Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.RECOVER, Moves.QUIVER_DANCE ], + [Species.TAPU_BULU]: [ Moves.SAPPY_SEED, Moves.LANDS_WRATH, Moves.MAGICAL_TORQUE, Moves.VICTORY_DANCE ], + [Species.TAPU_FINI]: [ Moves.SPRINGTIDE_STORM, Moves.EARTH_POWER, Moves.RECOVER, Moves.QUIVER_DANCE ], [Species.COSMOG]: [ Moves.PHOTON_GEYSER, Moves.PRECIPICE_BLADES, Moves.SACRED_FIRE, Moves.ASTRAL_BARRAGE ], [Species.NIHILEGO]: [ Moves.STRENGTH_SAP, Moves.MALIGNANT_CHAIN, Moves.EARTH_POWER, Moves.QUIVER_DANCE ], [Species.BUZZWOLE]: [ Moves.FIRST_IMPRESSION, Moves.COMBAT_TORQUE, Moves.ROCK_BLAST, Moves.DOUBLE_IRON_BASH ], [Species.PHEROMOSA]: [ Moves.SECRET_SWORD, Moves.MAKE_IT_RAIN, Moves.ATTACK_ORDER, Moves.DIAMOND_STORM ], [Species.XURKITREE]: [ Moves.FLAMETHROWER, Moves.GIGA_DRAIN, Moves.TAIL_GLOW, Moves.THUNDERCLAP ], - [Species.CELESTEELA]: [ Moves.RECOVER, Moves.BUZZY_BUZZ, Moves.SANDSEAR_STORM, Moves.OBLIVION_WING ], + [Species.CELESTEELA]: [ Moves.RECOVER, Moves.BUZZY_BUZZ, Moves.EARTH_POWER, Moves.OBLIVION_WING ], [Species.KARTANA]: [ Moves.MIGHTY_CLEAVE, Moves.PSYBLADE, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ], [Species.GUZZLORD]: [ Moves.SUCKER_PUNCH, Moves.COMEUPPANCE, Moves.SLACK_OFF, Moves.SHED_TAIL ], [Species.NECROZMA]: [ Moves.DYNAMAX_CANNON, Moves.SACRED_FIRE, Moves.ASTRAL_BARRAGE, Moves.CLANGOROUS_SOUL ], [Species.MAGEARNA]: [ Moves.STRENGTH_SAP, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.MAKE_IT_RAIN ], - [Species.MARSHADOW]: [ Moves.POWER_UP_PUNCH, Moves.TRIPLE_AXEL, Moves.METEOR_MASH, Moves.STORM_THROW ], + [Species.MARSHADOW]: [ Moves.POWER_UP_PUNCH, Moves.BONEMERANG, Moves.METEOR_MASH, Moves.TRIPLE_AXEL ], [Species.POIPOLE]: [ Moves.MALIGNANT_CHAIN, Moves.ICE_BEAM, Moves.ARMOR_CANNON, Moves.CLANGING_SCALES ], [Species.STAKATAKA]: [ Moves.HEAVY_SLAM, Moves.SHORE_UP, Moves.CURSE, Moves.SALT_CURE ], [Species.BLACEPHALON]: [ Moves.STEEL_BEAM, Moves.MOONBLAST, Moves.CHLOROBLAST, Moves.MOONGEIST_BEAM ], - [Species.ZERAORA]: [ Moves.SWORDS_DANCE, Moves.TRIPLE_AXEL, Moves.BOLT_STRIKE, Moves.PYRO_BALL ], + [Species.ZERAORA]: [ Moves.SWORDS_DANCE, Moves.U_TURN, Moves.COLLISION_COURSE, Moves.TRIPLE_AXEL ], [Species.MELTAN]: [ Moves.BULLET_PUNCH, Moves.DRAIN_PUNCH, Moves.BULK_UP, Moves.PLASMA_FISTS ], [Species.ALOLA_RATTATA]: [ Moves.FALSE_SURRENDER, Moves.PSYCHIC_FANGS, Moves.COIL, Moves.EXTREME_SPEED ], - [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.AQUA_CUTTER, Moves.SHIFT_GEAR, Moves.GLACIAL_LANCE ], + [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.LIQUIDATION, Moves.SHIFT_GEAR, Moves.GLACIAL_LANCE ], [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.PARTING_SHOT, Moves.EARTH_POWER, Moves.REVIVAL_BLESSING ], [Species.ALOLA_DIGLETT]: [ Moves.THOUSAND_WAVES, Moves.SWORDS_DANCE, Moves.TRIPLE_DIVE, Moves.MOUNTAIN_GALE ], [Species.ALOLA_MEOWTH]: [ Moves.BADDY_BAD, Moves.BUZZY_BUZZ, Moves.PARTING_SHOT, Moves.MAKE_IT_RAIN ], @@ -449,22 +449,22 @@ export const speciesEggMoves = { [Species.BLIPBUG]: [ Moves.HEAL_ORDER, Moves.LUSTER_PURGE, Moves.SLEEP_POWDER, Moves.TAIL_GLOW ], [Species.NICKIT]: [ Moves.BADDY_BAD, Moves.FLAMETHROWER, Moves.SPARKLY_SWIRL, Moves.MAKE_IT_RAIN ], [Species.GOSSIFLEUR]: [ Moves.PARTING_SHOT, Moves.STRENGTH_SAP, Moves.SAPPY_SEED, Moves.SEED_FLARE ], - [Species.WOOLOO]: [ Moves.PSYSHIELD_BASH, Moves.MILK_DRINK, Moves.BODY_PRESS, Moves.MULTI_ATTACK ], + [Species.WOOLOO]: [ Moves.NUZZLE, Moves.MILK_DRINK, Moves.BODY_PRESS, Moves.MULTI_ATTACK ], [Species.CHEWTLE]: [ Moves.ICE_FANG, Moves.PSYCHIC_FANGS, Moves.SHELL_SMASH, Moves.MIGHTY_CLEAVE ], [Species.YAMPER]: [ Moves.ICE_FANG, Moves.SWORDS_DANCE, Moves.THUNDER_FANG, Moves.BOLT_STRIKE ], [Species.ROLYCOLY]: [ Moves.BITTER_BLADE, Moves.BODY_PRESS, Moves.BULK_UP, Moves.DIAMOND_STORM ], [Species.APPLIN]: [ Moves.CORE_ENFORCER, Moves.DRAGON_HAMMER, Moves.FLOWER_TRICK, Moves.MATCHA_GOTCHA ], [Species.SILICOBRA]: [ Moves.SHORE_UP, Moves.SHED_TAIL, Moves.MOUNTAIN_GALE, Moves.THOUSAND_ARROWS ], - [Species.CRAMORANT]: [ Moves.APPLE_ACID, Moves.SURF, Moves.SCORCHING_SANDS, Moves.OBLIVION_WING ], + [Species.CRAMORANT]: [ Moves.APPLE_ACID, Moves.SURF, Moves.BOLT_BEAK, Moves.OBLIVION_WING ], [Species.ARROKUDA]: [ Moves.SUPERCELL_SLAM, Moves.TRIPLE_DIVE, Moves.ICE_SPINNER, Moves.SWORDS_DANCE ], [Species.TOXEL]: [ Moves.NASTY_PLOT, Moves.BUG_BUZZ, Moves.SPARKLING_ARIA, Moves.TORCH_SONG ], [Species.SIZZLIPEDE]: [ Moves.BURNING_BULWARK, Moves.ZING_ZAP, Moves.FIRST_IMPRESSION, Moves.BITTER_BLADE ], [Species.CLOBBOPUS]: [ Moves.STORM_THROW, Moves.JET_PUNCH, Moves.MACH_PUNCH, Moves.SURGING_STRIKES ], - [Species.SINISTEA]: [ Moves.SCALD, Moves.TAKE_HEART, Moves.SPARKLY_SWIRL, Moves.MATCHA_GOTCHA ], + [Species.SINISTEA]: [ Moves.SPLISHY_SPLASH, Moves.MATCHA_GOTCHA, Moves.DRAINING_KISS, Moves.MOONGEIST_BEAM ], [Species.HATENNA]: [ Moves.RECOVER, Moves.MOONBLAST, Moves.BUZZY_BUZZ, Moves.TORCH_SONG ], - [Species.IMPIDIMP]: [ Moves.ENCORE, Moves.PARTING_SHOT, Moves.TOPSY_TURVY, Moves.WICKED_BLOW ], + [Species.IMPIDIMP]: [ Moves.SLACK_OFF, Moves.PARTING_SHOT, Moves.OCTOLOCK, Moves.WICKED_BLOW ], [Species.MILCERY]: [ Moves.MOONBLAST, Moves.CHILLY_RECEPTION, Moves.EARTH_POWER, Moves.GEOMANCY ], - [Species.FALINKS]: [ Moves.COMBAT_TORQUE, Moves.PSYSHIELD_BASH, Moves.HEAL_ORDER, Moves.POPULATION_BOMB ], + [Species.FALINKS]: [ Moves.BATON_PASS, Moves.POWER_TRIP, Moves.HEAL_ORDER, Moves.COMBAT_TORQUE ], [Species.PINCURCHIN]: [ Moves.TRICK_ROOM, Moves.VOLT_SWITCH, Moves.STRENGTH_SAP, Moves.THUNDERCLAP ], [Species.SNOM]: [ Moves.FROST_BREATH, Moves.HEAL_ORDER, Moves.EARTH_POWER, Moves.SPORE ], [Species.STONJOURNER]: [ Moves.BODY_PRESS, Moves.HELPING_HAND, Moves.ACCELEROCK, Moves.DIAMOND_STORM ], @@ -484,9 +484,9 @@ export const speciesEggMoves = { [Species.KUBFU]: [ Moves.METEOR_MASH, Moves.DRAIN_PUNCH, Moves.JET_PUNCH, Moves.DRAGON_DANCE ], [Species.ZARUDE]: [ Moves.SAPPY_SEED, Moves.MIGHTY_CLEAVE, Moves.WICKED_BLOW, Moves.VICTORY_DANCE ], [Species.REGIELEKI]: [ Moves.NASTY_PLOT, Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.ELECTRO_DRIFT ], - [Species.REGIDRAGO]: [ Moves.METEOR_MASH, Moves.FLAMETHROWER, Moves.TAKE_HEART, Moves.DRAGON_DARTS ], + [Species.REGIDRAGO]: [ Moves.SHELL_SIDE_ARM, Moves.FLAMETHROWER, Moves.TAKE_HEART, Moves.DRAGON_DARTS ], [Species.GLASTRIER]: [ Moves.SPEED_SWAP, Moves.SLACK_OFF, Moves.HIGH_HORSEPOWER, Moves.GLACIAL_LANCE ], - [Species.SPECTRIER]: [ Moves.EARTH_POWER, Moves.PARTING_SHOT, Moves.AURA_SPHERE, Moves.ASTRAL_BARRAGE ], + [Species.SPECTRIER]: [ Moves.EARTH_POWER, Moves.MOONLIGHT, Moves.AURA_SPHERE, Moves.ASTRAL_BARRAGE ], [Species.CALYREX]: [ Moves.SAPPY_SEED, Moves.RECOVER, Moves.SECRET_SWORD, Moves.PHOTON_GEYSER ], [Species.ENAMORUS]: [ Moves.AEROBLAST, Moves.THOUSAND_ARROWS, Moves.STORED_POWER, Moves.FLEUR_CANNON ], [Species.GALAR_MEOWTH]: [ Moves.LIQUIDATION, Moves.HORN_LEECH, Moves.BULLET_PUNCH, Moves.BEHEMOTH_BASH ], @@ -494,7 +494,7 @@ export const speciesEggMoves = { [Species.GALAR_SLOWPOKE]: [ Moves.SHED_TAIL, Moves.BADDY_BAD, Moves.MOONBLAST, Moves.PHOTON_GEYSER ], [Species.GALAR_FARFETCHD]: [ Moves.ROOST, Moves.SACRED_SWORD, Moves.KINGS_SHIELD, Moves.BEHEMOTH_BLADE ], [Species.GALAR_ARTICUNO]: [ Moves.SECRET_SWORD, Moves.NIGHT_DAZE, Moves.ICE_BEAM, Moves.OBLIVION_WING ], - [Species.GALAR_ZAPDOS]: [ Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.ROOST, Moves.BOLT_BEAK ], + [Species.GALAR_ZAPDOS]: [ Moves.POISON_JAB, Moves.FLOATY_FALL, Moves.ROOST, Moves.BOLT_BEAK ], [Species.GALAR_MOLTRES]: [ Moves.ROOST, Moves.SLUDGE_BOMB, Moves.FLAMETHROWER, Moves.OBLIVION_WING ], [Species.GALAR_CORSOLA]: [ Moves.SHELL_SMASH, Moves.AURA_SPHERE, Moves.INFERNAL_PARADE, Moves.ASTRAL_BARRAGE ], [Species.GALAR_ZIGZAGOON]: [ Moves.CEASELESS_EDGE, Moves.FACADE, Moves.PARTING_SHOT, Moves.EXTREME_SPEED ], @@ -505,12 +505,12 @@ export const speciesEggMoves = { [Species.HISUI_VOLTORB]: [ Moves.FROST_BREATH, Moves.NASTY_PLOT, Moves.APPLE_ACID, Moves.ELECTRO_DRIFT ], [Species.HISUI_QWILFISH]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.RECOVER, Moves.FISHIOUS_REND ], [Species.HISUI_SNEASEL]: [ Moves.DRAIN_PUNCH, Moves.KNOCK_OFF, Moves.PSYCHIC_FANGS, Moves.TRIPLE_AXEL ], - [Species.HISUI_ZORUA]: [ Moves.MOONBLAST, Moves.HYPER_VOICE, Moves.PARTING_SHOT, Moves.BLOOD_MOON ], + [Species.HISUI_ZORUA]: [ Moves.MOONBLAST, Moves.SECRET_SWORD, Moves.PARTING_SHOT, Moves.BLOOD_MOON ], [Species.SPRIGATITO]: [ Moves.FIRE_LASH, Moves.TRIPLE_AXEL, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ], [Species.FUECOCO]: [ Moves.ALLURING_VOICE, Moves.SLACK_OFF, Moves.OVERDRIVE, Moves.MOONGEIST_BEAM ], [Species.QUAXLY]: [ Moves.DRAGON_DANCE, Moves.TRIPLE_AXEL, Moves.POWER_TRIP, Moves.THUNDEROUS_KICK ], - [Species.LECHONK]: [ Moves.MILK_DRINK, Moves.PSYSHIELD_BASH, Moves.FILLET_AWAY, Moves.MULTI_ATTACK ], + [Species.LECHONK]: [ Moves.MILK_DRINK, Moves.PSYSHIELD_BASH, Moves.BLAZING_TORQUE, Moves.FILLET_AWAY ], [Species.TAROUNTULA]: [ Moves.STONE_AXE, Moves.LEECH_LIFE, Moves.THIEF, Moves.SPORE ], [Species.NYMBLE]: [ Moves.KNOCK_OFF, Moves.FELL_STINGER, Moves.ATTACK_ORDER, Moves.WICKED_BLOW ], [Species.PAWMI]: [ Moves.DRAIN_PUNCH, Moves.METEOR_MASH, Moves.JET_PUNCH, Moves.PLASMA_FISTS ], @@ -522,13 +522,13 @@ export const speciesEggMoves = { [Species.CHARCADET]: [ Moves.SACRED_SWORD, Moves.PHOTON_GEYSER, Moves.MOONBLAST, Moves.SPECTRAL_THIEF ], [Species.TADBULB]: [ Moves.PARABOLIC_CHARGE, Moves.SCALD, Moves.EARTH_POWER, Moves.ELECTRO_SHOT ], [Species.WATTREL]: [ Moves.NASTY_PLOT, Moves.SPLISHY_SPLASH, Moves.SANDSEAR_STORM, Moves.ELECTRO_SHOT ], - [Species.MASCHIFF]: [ Moves.PARTING_SHOT, Moves.CLOSE_COMBAT, Moves.PSYCHIC_FANGS, Moves.NO_RETREAT ], + [Species.MASCHIFF]: [ Moves.PARTING_SHOT, Moves.COMBAT_TORQUE, Moves.PSYCHIC_FANGS, Moves.NO_RETREAT ], [Species.SHROODLE]: [ Moves.GASTRO_ACID, Moves.PARTING_SHOT, Moves.TOXIC, Moves.SKETCH ], [Species.BRAMBLIN]: [ Moves.TAILWIND, Moves.STRENGTH_SAP, Moves.FLOWER_TRICK, Moves.LAST_RESPECTS ], [Species.TOEDSCOOL]: [ Moves.STRENGTH_SAP, Moves.TOPSY_TURVY, Moves.SAPPY_SEED, Moves.TAIL_GLOW ], [Species.KLAWF]: [ Moves.CRABHAMMER, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE, Moves.SHELL_SMASH ], [Species.CAPSAKID]: [ Moves.STRENGTH_SAP, Moves.APPLE_ACID, Moves.FROST_BREATH, Moves.TORCH_SONG ], - [Species.RELLOR]: [ Moves.HEAL_BLOCK, Moves.RECOVER, Moves.HEAT_WAVE, Moves.LUMINA_CRASH ], + [Species.RELLOR]: [ Moves.HEAL_BLOCK, Moves.RECOVER, Moves.MAGIC_POWDER, Moves.LUMINA_CRASH ], [Species.FLITTLE]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.ROOST, Moves.FIERY_DANCE ], [Species.TINKATINK]: [ Moves.MAGICAL_TORQUE, Moves.PYRO_BALL, Moves.IVY_CUDGEL, Moves.SHIFT_GEAR ], [Species.WIGLETT]: [ Moves.SHELL_SMASH, Moves.ICICLE_CRASH, Moves.SEED_BOMB, Moves.SURGING_STRIKES ], @@ -537,11 +537,11 @@ export const speciesEggMoves = { [Species.VAROOM]: [ Moves.COMBAT_TORQUE, Moves.U_TURN, Moves.BLAZING_TORQUE, Moves.NOXIOUS_TORQUE ], [Species.CYCLIZAR]: [ Moves.PARTING_SHOT, Moves.FIRE_LASH, Moves.MAGICAL_TORQUE, Moves.GLAIVE_RUSH ], [Species.ORTHWORM]: [ Moves.SIZZLY_SLIDE, Moves.COIL, Moves.BODY_PRESS, Moves.SHORE_UP ], - [Species.GLIMMET]: [ Moves.CALM_MIND, Moves.EARTH_POWER, Moves.FIERY_DANCE, Moves.MALIGNANT_CHAIN ], - [Species.GREAVARD]: [ Moves.SHADOW_BONE, Moves.YAWN, Moves.SHORE_UP, Moves.COLLISION_COURSE ], + [Species.GLIMMET]: [ Moves.CALM_MIND, Moves.GIGA_DRAIN, Moves.FIERY_DANCE, Moves.MALIGNANT_CHAIN ], + [Species.GREAVARD]: [ Moves.SHADOW_BONE, Moves.SIZZLY_SLIDE, Moves.SHORE_UP, Moves.COLLISION_COURSE ], [Species.FLAMIGO]: [ Moves.THUNDEROUS_KICK, Moves.TRIPLE_AXEL, Moves.FLOATY_FALL, Moves.VICTORY_DANCE ], - [Species.CETODDLE]: [ Moves.MOUNTAIN_GALE, Moves.HIGH_HORSEPOWER, Moves.SLACK_OFF, Moves.DRAGON_DANCE ], - [Species.VELUZA]: [ Moves.PSYBLADE, Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.BITTER_BLADE ], + [Species.CETODDLE]: [ Moves.ZING_ZAP, Moves.HIGH_HORSEPOWER, Moves.SLACK_OFF, Moves.DRAGON_DANCE ], + [Species.VELUZA]: [ Moves.PSYBLADE, Moves.LEAF_BLADE, Moves.CEASELESS_EDGE, Moves.BITTER_BLADE ], [Species.DONDOZO]: [ Moves.SOFT_BOILED, Moves.SIZZLY_SLIDE, Moves.BREAKING_SWIPE, Moves.SALT_CURE ], [Species.TATSUGIRI]: [ Moves.SLUDGE_BOMB, Moves.FILLET_AWAY, Moves.CORE_ENFORCER, Moves.STEAM_ERUPTION ], [Species.GREAT_TUSK]: [ Moves.STONE_AXE, Moves.MORNING_SUN, Moves.COLLISION_COURSE, Moves.SHIFT_GEAR ], @@ -550,8 +550,8 @@ export const speciesEggMoves = { [Species.FLUTTER_MANE]: [ Moves.MOONLIGHT, Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.MOONGEIST_BEAM ], [Species.SLITHER_WING]: [ Moves.MIGHTY_CLEAVE, Moves.THUNDEROUS_KICK, Moves.FIRE_LASH, Moves.VICTORY_DANCE ], [Species.SANDY_SHOCKS]: [ Moves.MORNING_SUN, Moves.ICE_BEAM, Moves.NASTY_PLOT, Moves.THUNDERCLAP ], - [Species.IRON_TREADS]: [ Moves.FUSION_BOLT, Moves.BULK_UP, Moves.SHORE_UP, Moves.SUNSTEEL_STRIKE ], - [Species.IRON_BUNDLE]: [ Moves.EARTH_POWER, Moves.BOUNCY_BUBBLE, Moves.NASTY_PLOT, Moves.STEAM_ERUPTION ], + [Species.IRON_TREADS]: [ Moves.FUSION_BOLT, Moves.SHIFT_GEAR, Moves.SHORE_UP, Moves.SUNSTEEL_STRIKE ], + [Species.IRON_BUNDLE]: [ Moves.EARTH_POWER, Moves.SPLISHY_SPLASH, Moves.VOLT_SWITCH, Moves.NASTY_PLOT ], [Species.IRON_HANDS]: [ Moves.DRAIN_PUNCH, Moves.BULK_UP, Moves.PLASMA_FISTS, Moves.ICE_HAMMER ], [Species.IRON_JUGULIS]: [ Moves.FIERY_WRATH, Moves.ROOST, Moves.NASTY_PLOT, Moves.OBLIVION_WING ], [Species.IRON_MOTH]: [ Moves.EARTH_POWER, Moves.SEARING_SHOT, Moves.MALIGNANT_CHAIN, Moves.QUIVER_DANCE ], @@ -562,11 +562,11 @@ export const speciesEggMoves = { [Species.CHIEN_PAO]: [ Moves.KNOCK_OFF, Moves.PARTING_SHOT, Moves.TRIPLE_AXEL, Moves.BITTER_BLADE ], [Species.TING_LU]: [ Moves.SHORE_UP, Moves.CEASELESS_EDGE, Moves.SAPPY_SEED, Moves.PRECIPICE_BLADES ], [Species.CHI_YU]: [ Moves.FIERY_WRATH, Moves.HYDRO_STEAM, Moves.MORNING_SUN, Moves.BLUE_FLARE ], - [Species.ROARING_MOON]: [ Moves.FIRE_LASH, Moves.DRAGON_HAMMER, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ], + [Species.ROARING_MOON]: [ Moves.FIRE_LASH, Moves.DRAGON_HAMMER, Moves.METEOR_MASH, Moves.DRAGON_ASCENT ], [Species.IRON_VALIANT]: [ Moves.PLASMA_FISTS, Moves.NO_RETREAT, Moves.SECRET_SWORD, Moves.MAGICAL_TORQUE ], [Species.KORAIDON]: [ Moves.SUNSTEEL_STRIKE, Moves.SOLAR_BLADE, Moves.DRAGON_DARTS, Moves.BITTER_BLADE ], [Species.MIRAIDON]: [ Moves.ICE_BEAM, Moves.CLANGOROUS_SOUL, Moves.CORE_ENFORCER, Moves.RISING_VOLTAGE ], - [Species.WALKING_WAKE]: [ Moves.BOUNCY_BUBBLE, Moves.NASTY_PLOT, Moves.SLUDGE_WAVE, Moves.CORE_ENFORCER ], + [Species.WALKING_WAKE]: [ Moves.BOUNCY_BUBBLE, Moves.FUSION_FLARE, Moves.SLUDGE_WAVE, Moves.CORE_ENFORCER ], [Species.IRON_LEAVES]: [ Moves.BITTER_BLADE, Moves.U_TURN, Moves.MIGHTY_CLEAVE, Moves.VICTORY_DANCE ], [Species.POLTCHAGEIST]: [ Moves.PARABOLIC_CHARGE, Moves.BOUNCY_BUBBLE, Moves.LEECH_SEED, Moves.SPARKLY_SWIRL ], [Species.OKIDOGI]: [ Moves.COMBAT_TORQUE, Moves.TIDY_UP, Moves.DIRE_CLAW, Moves.WICKED_BLOW ], @@ -577,8 +577,8 @@ export const speciesEggMoves = { [Species.RAGING_BOLT]: [ Moves.NASTY_PLOT, Moves.FLAMETHROWER, Moves.MORNING_SUN, Moves.ELECTRO_DRIFT ], [Species.IRON_BOULDER]: [ Moves.PSYBLADE, Moves.KOWTOW_CLEAVE, Moves.STONE_AXE, Moves.BITTER_BLADE ], [Species.IRON_CROWN]: [ Moves.NASTY_PLOT, Moves.SECRET_SWORD, Moves.PSYSTRIKE, Moves.ELECTRO_DRIFT ], - [Species.TERAPAGOS]: [ Moves.MOONBLAST, Moves.RECOVER, Moves.ICE_BEAM, Moves.SHELL_SMASH ], - [Species.PECHARUNT]: [ Moves.TAKE_HEART, Moves.BODY_PRESS, Moves.SAPPY_SEED, Moves.KINGS_SHIELD ], + [Species.TERAPAGOS]: [ Moves.MOONBLAST, Moves.NASTY_PLOT, Moves.ASTRAL_BARRAGE, Moves.RECOVER ], + [Species.PECHARUNT]: [ Moves.TAKE_HEART, Moves.BODY_PRESS, Moves.SAPPY_SEED, Moves.ASTRAL_BARRAGE ], [Species.PALDEA_TAUROS]: [ Moves.NO_RETREAT, Moves.BLAZING_TORQUE, Moves.AQUA_STEP, Moves.THUNDEROUS_KICK ], [Species.PALDEA_WOOPER]: [ Moves.STONE_AXE, Moves.RECOVER, Moves.BANEFUL_BUNKER, Moves.BARB_BARRAGE ], [Species.BLOODMOON_URSALUNA]: [ Moves.NASTY_PLOT, Moves.ROCK_POLISH, Moves.SANDSEAR_STORM, Moves.BOOMBURST ] @@ -591,7 +591,7 @@ function parseEggMoves(content: string): void { const speciesValues = Utils.getEnumValues(Species); const lines = content.split(/\n/g); - lines.forEach((line, l) => { + for (const line of lines) { const cols = line.split(",").slice(0, 5); const moveNames = allMoves.map(m => m.name.replace(/ \([A-Z]\)$/, "").toLowerCase()); const enumSpeciesName = cols[0].toUpperCase().replace(/[ -]/g, "_"); @@ -612,7 +612,7 @@ function parseEggMoves(content: string): void { if (eggMoves.find(m => m !== Moves.NONE)) { output += `[Species.${Species[species]}]: [ ${eggMoves.map(m => `Moves.${Moves[m]}`).join(", ")} ],\n`; } - }); + } console.log(output); } diff --git a/src/data/balance/passives.ts b/src/data/balance/passives.ts index 60b50c7909c..c613be0137b 100644 --- a/src/data/balance/passives.ts +++ b/src/data/balance/passives.ts @@ -1,10 +1,18 @@ import { Abilities } from "#app/enums/abilities"; import { Species } from "#app/enums/species"; -export const starterPassiveAbilities = { +export interface PassiveAbilities { + [key: number]: Abilities +} + +interface StarterPassiveAbilities { + [key: number]: PassiveAbilities +} + +export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.BULBASAUR]: { 0: Abilities.GRASSY_SURGE }, [Species.CHARMANDER]: { 0: Abilities.BEAST_BOOST }, - [Species.SQUIRTLE]: { 0: Abilities.STURDY }, + [Species.SQUIRTLE]: { 0: Abilities.DAUNTLESS_SHIELD }, [Species.CATERPIE]: { 0: Abilities.MAGICIAN }, [Species.WEEDLE]: { 0: Abilities.TINTED_LENS }, [Species.PIDGEY]: { 0: Abilities.SHEER_FORCE }, @@ -49,7 +57,7 @@ export const starterPassiveAbilities = { [Species.KOFFING]: { 0: Abilities.PARENTAL_BOND }, [Species.RHYHORN]: { 0: Abilities.FILTER }, [Species.TANGELA]: { 0: Abilities.SEED_SOWER }, - [Species.KANGASKHAN]: { 0: Abilities.GUTS }, + [Species.KANGASKHAN]: { 0: Abilities.TECHNICIAN }, [Species.HORSEA]: { 0: Abilities.DRAGONS_MAW }, [Species.GOLDEEN]: { 0: Abilities.MULTISCALE }, [Species.STARYU]: { 0: Abilities.REGENERATOR }, @@ -121,7 +129,7 @@ export const starterPassiveAbilities = { [Species.RAIKOU]: { 0: Abilities.BEAST_BOOST }, [Species.ENTEI]: { 0: Abilities.BEAST_BOOST }, [Species.SUICUNE]: { 0: Abilities.BEAST_BOOST }, - [Species.LARVITAR]: { 0: Abilities.SAND_RUSH }, + [Species.LARVITAR]: { 0: Abilities.SOLID_ROCK }, [Species.LUGIA]: { 0: Abilities.DELTA_STREAM }, [Species.HO_OH]: { 0: Abilities.MAGIC_GUARD }, [Species.CELEBI]: { 0: Abilities.PSYCHIC_SURGE }, @@ -238,11 +246,11 @@ export const starterPassiveAbilities = { [Species.MANTYKE]: { 0: Abilities.UNAWARE }, [Species.SNOVER]: { 0: Abilities.GRASSY_SURGE }, [Species.ROTOM]: { 0: Abilities.HADRON_ENGINE }, - [Species.UXIE]: { 0: Abilities.UNAWARE }, + [Species.UXIE]: { 0: Abilities.UNNERVE }, [Species.MESPRIT]: { 0: Abilities.MOODY }, [Species.AZELF]: { 0: Abilities.NEUROFORCE }, - [Species.DIALGA]: { 0: Abilities.LEVITATE }, - [Species.PALKIA]: { 0: Abilities.SPEED_BOOST }, + [Species.DIALGA]: { 0: Abilities.BERSERK }, + [Species.PALKIA]: { 0: Abilities.BERSERK }, [Species.HEATRAN]: { 0: Abilities.EARTH_EATER }, [Species.REGIGIGAS]: { 0: Abilities.SCRAPPY }, [Species.GIRATINA]: { 0: Abilities.SHADOW_SHIELD }, @@ -277,7 +285,7 @@ export const starterPassiveAbilities = { [Species.SEWADDLE]: { 0: Abilities.SHARPNESS }, [Species.VENIPEDE]: { 0: Abilities.STAMINA }, [Species.COTTONEE]: { 0: Abilities.FLUFFY }, - [Species.PETILIL]: { 0: Abilities.SIMPLE }, + [Species.PETILIL]: { 0: Abilities.FLOWER_VEIL }, [Species.BASCULIN]: { 0: Abilities.SUPREME_OVERLORD }, [Species.SANDILE]: { 0: Abilities.TOUGH_CLAWS }, [Species.DARUMAKA]: { 0: Abilities.GORILLA_TACTICS }, @@ -339,7 +347,7 @@ export const starterPassiveAbilities = { [Species.CHESPIN]: { 0: Abilities.DAUNTLESS_SHIELD }, [Species.FENNEKIN]: { 0: Abilities.PSYCHIC_SURGE }, [Species.FROAKIE]: { 0: Abilities.STAKEOUT }, - [Species.BUNNELBY]: { 0: Abilities.GUTS }, + [Species.BUNNELBY]: { 0: Abilities.THICK_FAT }, [Species.FLETCHLING]: { 0: Abilities.MAGIC_GUARD }, [Species.SCATTERBUG]: { 0: Abilities.PRANKSTER }, [Species.LITLEO]: { 0: Abilities.BEAST_BOOST }, @@ -372,7 +380,7 @@ export const starterPassiveAbilities = { [Species.ZYGARDE]: { 0: Abilities.ADAPTABILITY }, [Species.DIANCIE]: { 0: Abilities.PRISM_ARMOR }, [Species.HOOPA]: { 0: Abilities.OPPORTUNIST }, - [Species.VOLCANION]: { 0: Abilities.FILTER }, + [Species.VOLCANION]: { 0: Abilities.NEUTRALIZING_GAS }, [Species.ETERNAL_FLOETTE]: { 0: Abilities.MAGIC_GUARD }, [Species.ROWLET]: { 0: Abilities.SNIPER }, @@ -387,7 +395,7 @@ export const starterPassiveAbilities = { [Species.ROCKRUFF]: { 0: Abilities.ROCKY_PAYLOAD }, [Species.WISHIWASHI]: { 0: Abilities.REGENERATOR }, [Species.MAREANIE]: { 0: Abilities.TOXIC_DEBRIS }, - [Species.MUDBRAY]: { 0: Abilities.CUD_CHEW }, + [Species.MUDBRAY]: { 0: Abilities.SAP_SIPPER }, [Species.DEWPIDER]: { 0: Abilities.TINTED_LENS }, [Species.FOMANTIS]: { 0: Abilities.SHARPNESS }, [Species.MORELULL]: { 0: Abilities.TRIAGE }, @@ -411,8 +419,8 @@ export const starterPassiveAbilities = { [Species.DHELMISE]: { 0: Abilities.WATER_BUBBLE }, [Species.JANGMO_O]: { 0: Abilities.DAUNTLESS_SHIELD }, [Species.TAPU_KOKO]: { 0: Abilities.DAUNTLESS_SHIELD }, - [Species.TAPU_LELE]: { 0: Abilities.SHEER_FORCE }, - [Species.TAPU_BULU]: { 0: Abilities.TRIAGE }, + [Species.TAPU_LELE]: { 0: Abilities.BERSERK }, + [Species.TAPU_BULU]: { 0: Abilities.FLOWER_VEIL }, [Species.TAPU_FINI]: { 0: Abilities.FAIRY_AURA }, [Species.COSMOG]: { 0: Abilities.BEAST_BOOST }, [Species.NIHILEGO]: { 0: Abilities.LEVITATE }, @@ -534,7 +542,7 @@ export const starterPassiveAbilities = { [Species.VAROOM]: { 0: Abilities.LEVITATE }, [Species.CYCLIZAR]: { 0: Abilities.PROTEAN }, [Species.ORTHWORM]: { 0: Abilities.REGENERATOR }, - [Species.GLIMMET]: { 0: Abilities.LEVITATE }, + [Species.GLIMMET]: { 0: Abilities.TERA_SHELL }, [Species.GREAVARD]: { 0: Abilities.UNAWARE }, [Species.FLAMIGO]: { 0: Abilities.MOXIE }, [Species.CETODDLE]: { 0: Abilities.REFRIGERATE }, @@ -547,7 +555,7 @@ export const starterPassiveAbilities = { [Species.FLUTTER_MANE]: { 0: Abilities.DAZZLING }, [Species.SLITHER_WING]: { 0: Abilities.SCRAPPY }, [Species.SANDY_SHOCKS]: { 0: Abilities.ELECTRIC_SURGE }, - [Species.IRON_TREADS]: { 0: Abilities.STEELY_SPIRIT }, + [Species.IRON_TREADS]: { 0: Abilities.DAUNTLESS_SHIELD }, [Species.IRON_BUNDLE]: { 0: Abilities.SNOW_WARNING }, [Species.IRON_HANDS]: { 0: Abilities.IRON_FIST }, [Species.IRON_JUGULIS]: { 0: Abilities.LIGHTNING_ROD }, @@ -559,7 +567,7 @@ export const starterPassiveAbilities = { [Species.CHIEN_PAO]: { 0: Abilities.INTIMIDATE }, [Species.TING_LU]: { 0: Abilities.STAMINA }, [Species.CHI_YU]: { 0: Abilities.BERSERK }, - [Species.ROARING_MOON]: { 0: Abilities.TOUGH_CLAWS }, + [Species.ROARING_MOON]: { 0: Abilities.INTIMIDATE }, [Species.IRON_VALIANT]: { 0: Abilities.NEUROFORCE }, [Species.KORAIDON]: { 0: Abilities.OPPORTUNIST }, [Species.MIRAIDON]: { 0: Abilities.OPPORTUNIST }, @@ -574,7 +582,7 @@ export const starterPassiveAbilities = { [Species.RAGING_BOLT]: { 0: Abilities.BEAST_BOOST }, [Species.IRON_BOULDER]: { 0: Abilities.SHARPNESS }, [Species.IRON_CROWN]: { 0: Abilities.SHARPNESS }, - [Species.TERAPAGOS]: { 0: Abilities.SOUL_HEART }, + [Species.TERAPAGOS]: { 0: Abilities.SHIELD_DUST }, [Species.PECHARUNT]: { 0: Abilities.TOXIC_CHAIN }, [Species.PALDEA_TAUROS]: { 0: Abilities.ADAPTABILITY }, [Species.PALDEA_WOOPER]: { 0: Abilities.THICK_FAT }, diff --git a/src/data/balance/pokemon-evolutions.ts b/src/data/balance/pokemon-evolutions.ts index a8fe3b5f4ab..c34bc229bd7 100644 --- a/src/data/balance/pokemon-evolutions.ts +++ b/src/data/balance/pokemon-evolutions.ts @@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene"; import { Gender } from "#app/data/gender"; import { PokeballType } from "#enums/pokeball"; import type Pokemon from "#app/field/pokemon"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import * as Utils from "#app/utils"; import { WeatherType } from "#enums/weather-type"; import { Nature } from "#enums/nature"; @@ -77,9 +77,9 @@ export enum EvolutionItem { /** * Pokemon Evolution tuple type consisting of: * @property 0 {@linkcode Species} The species of the Pokemon. - * @property 1 {@linkcode integer} The level at which the Pokemon evolves. + * @property 1 {@linkcode number} The level at which the Pokemon evolves. */ -export type EvolutionLevel = [species: Species, level: integer]; +export type EvolutionLevel = [species: Species, level: number]; export type EvolutionConditionPredicate = (p: Pokemon) => boolean; export type EvolutionConditionEnforceFunc = (p: Pokemon) => void; @@ -88,12 +88,13 @@ export class SpeciesFormEvolution { public speciesId: Species; public preFormKey: string | null; public evoFormKey: string | null; - public level: integer; + public level: number; public item: EvolutionItem | null; public condition: SpeciesEvolutionCondition | null; public wildDelay: SpeciesWildEvolutionDelay; + public description = ""; - constructor(speciesId: Species, preFormKey: string | null, evoFormKey: string | null, level: integer, item: EvolutionItem | null, condition: SpeciesEvolutionCondition | null, wildDelay?: SpeciesWildEvolutionDelay) { + constructor(speciesId: Species, preFormKey: string | null, evoFormKey: string | null, level: number, item: EvolutionItem | null, condition: SpeciesEvolutionCondition | null, wildDelay?: SpeciesWildEvolutionDelay) { this.speciesId = speciesId; this.preFormKey = preFormKey; this.evoFormKey = evoFormKey; @@ -101,11 +102,28 @@ export class SpeciesFormEvolution { this.item = item || EvolutionItem.NONE; this.condition = condition; this.wildDelay = wildDelay ?? SpeciesWildEvolutionDelay.NONE; + + const strings: string[] = []; + if (this.level > 1) { + strings.push(i18next.t("pokemonEvolutions:level") + ` ${this.level}`); + } + if (this.item) { + const itemDescription = i18next.t(`modifierType:EvolutionItem.${EvolutionItem[this.item].toUpperCase()}`); + const rarity = this.item > 50 ? i18next.t("pokemonEvolutions:ULTRA") : i18next.t("pokemonEvolutions:GREAT"); + strings.push(i18next.t("pokemonEvolutions:using") + itemDescription + ` (${rarity})`); + } + if (this.condition) { + strings.push(this.condition.description); + } + this.description = strings + .filter(str => str !== "") + .map((str, index) => index > 0 ? str[0].toLowerCase() + str.slice(1) : str) + .join(i18next.t("pokemonEvolutions:connector")); } } export class SpeciesEvolution extends SpeciesFormEvolution { - constructor(speciesId: Species, level: integer, item: EvolutionItem | null, condition: SpeciesEvolutionCondition | null, wildDelay?: SpeciesWildEvolutionDelay) { + constructor(speciesId: Species, level: number, item: EvolutionItem | null, condition: SpeciesEvolutionCondition | null, wildDelay?: SpeciesWildEvolutionDelay) { super(speciesId, null, null, level, item, condition, wildDelay); } } @@ -169,7 +187,7 @@ class MoveEvolutionCondition extends SpeciesEvolutionCondition { } class FriendshipEvolutionCondition extends SpeciesEvolutionCondition { - public amount: integer; + public amount: number; constructor(amount: number) { super(p => p.friendship >= amount); this.amount = amount; @@ -178,7 +196,7 @@ class FriendshipEvolutionCondition extends SpeciesEvolutionCondition { } class FriendshipTimeOfDayEvolutionCondition extends SpeciesEvolutionCondition { - public amount: integer; + public amount: number; public timesOfDay: TimeOfDay[]; constructor(amount: number, tod: "day" | "night") { if (tod === "day") { @@ -188,7 +206,7 @@ class FriendshipTimeOfDayEvolutionCondition extends SpeciesEvolutionCondition { super(p => p.friendship >= amount && (globalScene.arena.getTimeOfDay() === TimeOfDay.DUSK || globalScene.arena.getTimeOfDay() === TimeOfDay.NIGHT)); this.timesOfDay = [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]; } else { - super(p => false); + super(_p => false); this.timesOfDay = []; } this.amount = amount; @@ -197,13 +215,13 @@ class FriendshipTimeOfDayEvolutionCondition extends SpeciesEvolutionCondition { } class FriendshipMoveTypeEvolutionCondition extends SpeciesEvolutionCondition { - public amount: integer; - public type: Type; - constructor(amount: number, type: Type) { + public amount: number; + public type: PokemonType; + constructor(amount: number, type: PokemonType) { super(p => p.friendship >= amount && !!p.getMoveset().find(m => m?.getMove().type === type)); this.amount = amount; this.type = type; - this.description = i18next.t("pokemonEvolutions:friendshipMoveType", { type: i18next.t(`pokemonInfo:Type.${Type[this.type]}`) }); + this.description = i18next.t("pokemonEvolutions:friendshipMoveType", { type: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`) }); } } @@ -215,11 +233,11 @@ class ShedinjaEvolutionCondition extends SpeciesEvolutionCondition { } class PartyTypeEvolutionCondition extends SpeciesEvolutionCondition { - public type: Type; - constructor(type: Type) { + public type: PokemonType; + constructor(type: PokemonType) { super(() => !!globalScene.getPlayerParty().find(p => p.getTypes(false, false, true).indexOf(type) > -1)); this.type = type; - this.description = i18next.t("pokemonEvolutions:partyType", { type: i18next.t(`pokemonInfo:Type.${Type[this.type]}`) }); + this.description = i18next.t("pokemonEvolutions:partyType", { type: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`) }); } } @@ -237,15 +255,16 @@ class WeatherEvolutionCondition extends SpeciesEvolutionCondition { constructor(weatherTypes: WeatherType[]) { super(() => weatherTypes.indexOf(globalScene.arena.weather?.weatherType || WeatherType.NONE) > -1); this.weatherTypes = weatherTypes; + this.description = i18next.t("pokemonEvolutions:weather"); } } class MoveTypeEvolutionCondition extends SpeciesEvolutionCondition { - public type: Type; - constructor(type: Type) { + public type: PokemonType; + constructor(type: PokemonType) { super(p => p.moveset.filter(m => m?.getMove().type === type).length > 0); this.type = type; - this.description = i18next.t("pokemonEvolutions:moveType", { type: i18next.t(`pokemonInfo:Type.${Type[this.type]}`) }); + this.description = i18next.t("pokemonEvolutions:moveType", { type: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`) }); } } @@ -1084,7 +1103,7 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.GOGOAT, 32, null, null) ], [Species.PANCHAM]: [ - new SpeciesEvolution(Species.PANGORO, 32, null, new PartyTypeEvolutionCondition(Type.DARK), SpeciesWildEvolutionDelay.MEDIUM) + new SpeciesEvolution(Species.PANGORO, 32, null, new PartyTypeEvolutionCondition(PokemonType.DARK), SpeciesWildEvolutionDelay.MEDIUM) ], [Species.ESPURR]: [ new SpeciesFormEvolution(Species.MEOWSTIC, "", "female", 25, null, new GenderEvolutionCondition(Gender.FEMALE)), @@ -1377,7 +1396,7 @@ export const pokemonEvolutions: PokemonEvolutions = { ], [Species.TANDEMAUS]: [ new SpeciesFormEvolution(Species.MAUSHOLD, "", "three", 25, null, new TandemausEvolutionCondition()), - new SpeciesEvolution(Species.MAUSHOLD, 25, null, null) + new SpeciesFormEvolution(Species.MAUSHOLD, "", "four", 25, null, null) ], [Species.FIDOUGH]: [ new SpeciesEvolution(Species.DACHSBUN, 26, null, null) @@ -1500,8 +1519,8 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.STARMIE, 1, EvolutionItem.WATER_STONE, null, SpeciesWildEvolutionDelay.LONG) ], [Species.EEVEE]: [ - new SpeciesFormEvolution(Species.SYLVEON, "", "", 1, null, new FriendshipMoveTypeEvolutionCondition(120, Type.FAIRY), SpeciesWildEvolutionDelay.LONG), - new SpeciesFormEvolution(Species.SYLVEON, "partner", "", 1, null, new FriendshipMoveTypeEvolutionCondition(120, Type.FAIRY), SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.SYLVEON, "", "", 1, null, new FriendshipMoveTypeEvolutionCondition(120, PokemonType.FAIRY), SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.SYLVEON, "partner", "", 1, null, new FriendshipMoveTypeEvolutionCondition(120, PokemonType.FAIRY), SpeciesWildEvolutionDelay.LONG), new SpeciesFormEvolution(Species.ESPEON, "", "", 1, null, new FriendshipTimeOfDayEvolutionCondition(120, "day"), SpeciesWildEvolutionDelay.LONG), new SpeciesFormEvolution(Species.ESPEON, "partner", "", 1, null, new FriendshipTimeOfDayEvolutionCondition(120, "day"), SpeciesWildEvolutionDelay.LONG), new SpeciesFormEvolution(Species.UMBREON, "", "", 1, null, new FriendshipTimeOfDayEvolutionCondition(120, "night"), SpeciesWildEvolutionDelay.LONG), @@ -1540,7 +1559,7 @@ export const pokemonEvolutions: PokemonEvolutions = { ], [Species.DUNSPARCE]: [ new SpeciesFormEvolution(Species.DUDUNSPARCE, "", "three-segment", 32, null, new DunsparceEvolutionCondition(), SpeciesWildEvolutionDelay.LONG), - new SpeciesEvolution(Species.DUDUNSPARCE, 32, null, new MoveEvolutionCondition(Moves.HYPER_DRILL), SpeciesWildEvolutionDelay.LONG) + new SpeciesFormEvolution(Species.DUDUNSPARCE, "", "two-segment", 32, null, new MoveEvolutionCondition(Moves.HYPER_DRILL), SpeciesWildEvolutionDelay.LONG) ], [Species.GLIGAR]: [ new SpeciesEvolution(Species.GLISCOR, 1, EvolutionItem.RAZOR_FANG, new TimeOfDayEvolutionCondition("night") /* Razor fang at night*/, SpeciesWildEvolutionDelay.VERY_LONG) @@ -1739,7 +1758,7 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.GENGAR, 1, EvolutionItem.LINKING_CORD, null, SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.ONIX]: [ - new SpeciesEvolution(Species.STEELIX, 1, EvolutionItem.LINKING_CORD, new MoveTypeEvolutionCondition(Type.STEEL), SpeciesWildEvolutionDelay.VERY_LONG) + new SpeciesEvolution(Species.STEELIX, 1, EvolutionItem.LINKING_CORD, new MoveTypeEvolutionCondition(PokemonType.STEEL), SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.RHYDON]: [ new SpeciesEvolution(Species.RHYPERIOR, 1, EvolutionItem.PROTECTOR, null, SpeciesWildEvolutionDelay.VERY_LONG) @@ -1748,7 +1767,7 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.KINGDRA, 1, EvolutionItem.DRAGON_SCALE, null, SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.SCYTHER]: [ - new SpeciesEvolution(Species.SCIZOR, 1, EvolutionItem.LINKING_CORD, new MoveTypeEvolutionCondition(Type.STEEL), SpeciesWildEvolutionDelay.VERY_LONG), + new SpeciesEvolution(Species.SCIZOR, 1, EvolutionItem.LINKING_CORD, new MoveTypeEvolutionCondition(PokemonType.STEEL), SpeciesWildEvolutionDelay.VERY_LONG), new SpeciesEvolution(Species.KLEAVOR, 1, EvolutionItem.BLACK_AUGURITE, null, SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.ELECTABUZZ]: [ @@ -1879,7 +1898,7 @@ export function initPokemonPrevolutions(): void { if (ev.evoFormKey && megaFormKeys.indexOf(ev.evoFormKey) > -1) { continue; } - pokemonPrevolutions[ev.speciesId] = parseInt(pk) as Species; + pokemonPrevolutions[ev.speciesId] = Number.parseInt(pk) as Species; } }); } diff --git a/src/data/balance/pokemon-level-moves.ts b/src/data/balance/pokemon-level-moves.ts index 8fe61da35c0..dcbc2fb0c0d 100644 --- a/src/data/balance/pokemon-level-moves.ts +++ b/src/data/balance/pokemon-level-moves.ts @@ -1,18 +1,18 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -export type LevelMoves = ([integer, Moves])[]; +export type LevelMoves = ([number, Moves])[]; interface PokemonSpeciesLevelMoves { - [key: integer]: LevelMoves + [key: number]: LevelMoves } interface PokemonFormLevelMoves { - [key: integer]: LevelMoves + [key: number]: LevelMoves } interface PokemonSpeciesFormLevelMoves { - [key: integer]: PokemonFormLevelMoves + [key: number]: PokemonFormLevelMoves } /** Moves that can only be learned with a memory-mushroom */ diff --git a/src/data/balance/signature-species.ts b/src/data/balance/signature-species.ts new file mode 100644 index 00000000000..a1b73af40cd --- /dev/null +++ b/src/data/balance/signature-species.ts @@ -0,0 +1,162 @@ +import { Species } from "#enums/species"; + +export type SignatureSpecies = { + [key in string]: (Species | Species[])[]; +}; + +/* + * The signature species for each Gym Leader, Elite Four member, and Champion. + * The key is the trainer type, and the value is an array of Species or Species arrays. + * This is in a separate const so it can be accessed from other places and not just the trainerConfigs + */ +export const signatureSpecies: SignatureSpecies = { + // Gym Leaders- Kanto + BROCK: [Species.GEODUDE, Species.ONIX], + MISTY: [Species.STARYU, Species.PSYDUCK], + LT_SURGE: [Species.VOLTORB, Species.PIKACHU, Species.ELECTABUZZ], + ERIKA: [Species.ODDISH, Species.BELLSPROUT, Species.TANGELA, Species.HOPPIP], + JANINE: [Species.VENONAT, Species.SPINARAK, Species.ZUBAT], + SABRINA: [Species.ABRA, Species.MR_MIME, Species.ESPEON], + BLAINE: [Species.GROWLITHE, Species.PONYTA, Species.MAGMAR], + GIOVANNI: [Species.SANDILE, Species.MURKROW, Species.NIDORAN_M, Species.NIDORAN_F], + // Gym Leaders- Johto + FALKNER: [Species.PIDGEY, Species.HOOTHOOT, Species.DODUO], + BUGSY: [Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR], + WHITNEY: [Species.JIGGLYPUFF, Species.MILTANK, Species.AIPOM, Species.GIRAFARIG], + MORTY: [Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE], + CHUCK: [Species.POLIWRATH, Species.MANKEY], + JASMINE: [Species.MAGNEMITE, Species.STEELIX], + PRYCE: [Species.SEEL, Species.SWINUB], + CLAIR: [Species.DRATINI, Species.HORSEA, Species.GYARADOS], + // Gym Leaders- Hoenn + ROXANNE: [Species.GEODUDE, Species.NOSEPASS], + BRAWLY: [Species.MACHOP, Species.MAKUHITA], + WATTSON: [Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE], + FLANNERY: [Species.SLUGMA, Species.TORKOAL, Species.NUMEL], + NORMAN: [Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON, Species.KECLEON], + WINONA: [Species.SWABLU, Species.WINGULL, Species.TROPIUS, Species.SKARMORY], + TATE: [Species.SOLROCK, Species.NATU, Species.CHIMECHO, Species.GALLADE], + LIZA: [Species.LUNATONE, Species.SPOINK, Species.BALTOY, Species.GARDEVOIR], + JUAN: [Species.HORSEA, Species.BARBOACH, Species.SPHEAL, Species.RELICANTH], + // Gym Leaders- Sinnoh + ROARK: [Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE], + GARDENIA: [Species.ROSELIA, Species.TANGELA, Species.TURTWIG], + MAYLENE: [Species.LUCARIO, Species.MEDITITE, Species.CHIMCHAR], + CRASHER_WAKE: [Species.BUIZEL, Species.WOOPER, Species.PIPLUP, Species.MAGIKARP], + FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.SPIRITOMB], + BYRON: [Species.SHIELDON, Species.BRONZOR, Species.AGGRON], + CANDICE: [Species.SNEASEL, Species.SNOVER, Species.SNORUNT], + VOLKNER: [Species.SHINX, Species.CHINCHOU, Species.ROTOM], + // Gym Leaders- Unova + CILAN: [Species.PANSAGE, Species.FOONGUS, Species.PETILIL], + CHILI: [Species.PANSEAR, Species.DARUMAKA, Species.NUMEL], + CRESS: [Species.PANPOUR, Species.TYMPOLE, Species.SLOWPOKE], + CHEREN: [Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE], + LENORA: [Species.PATRAT, Species.DEERLING, Species.AUDINO], + ROXIE: [Species.VENIPEDE, Species.TRUBBISH, Species.SKORUPI], + BURGH: [Species.SEWADDLE, Species.SHELMET, Species.KARRABLAST], + ELESA: [Species.EMOLGA, Species.BLITZLE, Species.JOLTIK], + CLAY: [Species.DRILBUR, Species.SANDILE, Species.GOLETT], + SKYLA: [Species.DUCKLETT, Species.WOOBAT, Species.RUFFLET], + BRYCEN: [Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO], + DRAYDEN: [Species.DRUDDIGON, Species.AXEW, Species.DEINO], + MARLON: [Species.WAILMER, Species.FRILLISH, Species.TIRTOUGA], + // Gym Leaders- Kalos + VIOLA: [Species.SURSKIT, Species.SCATTERBUG], + GRANT: [Species.AMAURA, Species.TYRUNT], + KORRINA: [Species.HAWLUCHA, Species.LUCARIO, Species.MIENFOO], + RAMOS: [Species.SKIDDO, Species.HOPPIP, Species.BELLSPROUT], + CLEMONT: [Species.HELIOPTILE, Species.MAGNEMITE, Species.EMOLGA], + VALERIE: [Species.SYLVEON, Species.MAWILE, Species.MR_MIME], + OLYMPIA: [Species.ESPURR, Species.SIGILYPH, Species.SLOWKING], + WULFRIC: [Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL], + // Gym Leaders- Galar + MILO: [Species.GOSSIFLEUR, Species.APPLIN, Species.BOUNSWEET], + NESSA: [Species.CHEWTLE, Species.ARROKUDA, Species.WIMPOD], + KABU: [Species.SIZZLIPEDE, Species.VULPIX, Species.TORKOAL], + BEA: [Species.GALAR_FARFETCHD, Species.MACHOP, Species.CLOBBOPUS], + ALLISTER: [Species.GALAR_YAMASK, Species.GALAR_CORSOLA, Species.GASTLY], + OPAL: [Species.MILCERY, Species.TOGETIC, Species.GALAR_WEEZING], + BEDE: [Species.HATENNA, Species.GALAR_PONYTA, Species.GARDEVOIR], + GORDIE: [Species.ROLYCOLY, Species.STONJOURNER, Species.BINACLE], + MELONY: [Species.SNOM, Species.GALAR_DARUMAKA, Species.GALAR_MR_MIME], + PIERS: [Species.GALAR_ZIGZAGOON, Species.SCRAGGY, Species.INKAY], + MARNIE: [Species.IMPIDIMP, Species.PURRLOIN, Species.MORPEKO], + RAIHAN: [Species.DURALUDON, Species.TURTONATOR, Species.GOOMY], + // Gym Leaders- Paldea; First slot is Tera + KATY: [Species.TEDDIURSA, Species.NYMBLE, Species.TAROUNTULA], // Tera Bug Teddiursa + BRASSIUS: [Species.SUDOWOODO, Species.BRAMBLIN, Species.SMOLIV], // Tera Grass Sudowoodo + IONO: [Species.MISDREAVUS, Species.TADBULB, Species.WATTREL], // Tera Ghost Misdreavus + KOFU: [Species.CRABRAWLER, Species.VELUZA, Species.WIGLETT, Species.WINGULL], // Tera Water Crabrawler + LARRY: [Species.STARLY, Species.DUNSPARCE, Species.LECHONK, Species.KOMALA], // Tera Normal Starly + RYME: [Species.TOXEL, Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU], // Tera Ghost Toxel + TULIP: [Species.FLABEBE, Species.FLITTLE, Species.RALTS, Species.GIRAFARIG], // Tera Psychic Flabebe + GRUSHA: [Species.SWABLU, Species.CETODDLE, Species.CUBCHOO, Species.ALOLA_VULPIX], // Tera Ice Swablu + + // Elite Four- Kanto + LORELEI: [ + Species.JYNX, + [Species.SLOWBRO, Species.GALAR_SLOWBRO], + Species.LAPRAS, + [Species.CLOYSTER, Species.ALOLA_SANDSLASH], + ], + BRUNO: [Species.MACHAMP, Species.HITMONCHAN, Species.HITMONLEE, [Species.GOLEM, Species.ALOLA_GOLEM]], + AGATHA: [Species.GENGAR, [Species.ARBOK, Species.WEEZING], Species.CROBAT, Species.ALOLA_MAROWAK], + LANCE: [Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR], + // Elite Four- Johto (Bruno included) + WILL: [Species.XATU, Species.JYNX, [Species.SLOWBRO, Species.SLOWKING], Species.EXEGGUTOR], + KOGA: [[Species.MUK, Species.WEEZING], [Species.VENOMOTH, Species.ARIADOS], Species.CROBAT, Species.TENTACRUEL], + KAREN: [Species.UMBREON, Species.HONCHKROW, Species.HOUNDOOM, Species.WEAVILE], + // Elite Four- Hoenn + SIDNEY: [ + [Species.SHIFTRY, Species.CACTURNE], + [Species.SHARPEDO, Species.CRAWDAUNT], + Species.ABSOL, + Species.MIGHTYENA, + ], + PHOEBE: [Species.SABLEYE, Species.DUSKNOIR, Species.BANETTE, [Species.DRIFBLIM, Species.MISMAGIUS]], + GLACIA: [Species.GLALIE, Species.WALREIN, Species.FROSLASS, Species.ABOMASNOW], + DRAKE: [Species.ALTARIA, Species.SALAMENCE, Species.FLYGON, Species.KINGDRA], + // Elite Four- Sinnoh + AARON: [[Species.SCIZOR, Species.KLEAVOR], Species.HERACROSS, [Species.VESPIQUEN, Species.YANMEGA], Species.DRAPION], + BERTHA: [Species.WHISCASH, Species.HIPPOWDON, Species.GLISCOR, Species.RHYPERIOR], + FLINT: [ + [Species.RAPIDASH, Species.FLAREON], + Species.MAGMORTAR, + [Species.STEELIX, Species.LOPUNNY], + Species.INFERNAPE, + ], // Tera Fire Steelix or Lopunny + LUCIAN: [Species.MR_MIME, Species.GALLADE, Species.BRONZONG, [Species.ALAKAZAM, Species.ESPEON]], + // Elite Four- Unova + SHAUNTAL: [Species.COFAGRIGUS, Species.CHANDELURE, Species.GOLURK, Species.JELLICENT], + MARSHAL: [Species.CONKELDURR, Species.MIENSHAO, Species.THROH, Species.SAWK], + GRIMSLEY: [Species.LIEPARD, Species.KINGAMBIT, Species.SCRAFTY, Species.KROOKODILE], + CAITLIN: [Species.MUSHARNA, Species.GOTHITELLE, Species.SIGILYPH, Species.REUNICLUS], + // Elite Four- Kalos + MALVA: [Species.PYROAR, Species.TORKOAL, Species.CHANDELURE, Species.TALONFLAME], + SIEBOLD: [Species.CLAWITZER, Species.GYARADOS, Species.BARBARACLE, Species.STARMIE], + WIKSTROM: [Species.KLEFKI, Species.PROBOPASS, Species.SCIZOR, Species.AEGISLASH], + DRASNA: [Species.DRAGALGE, Species.DRUDDIGON, Species.ALTARIA, Species.NOIVERN], + // Elite Four- Alola + HALA: [Species.HARIYAMA, Species.BEWEAR, Species.CRABOMINABLE, [Species.POLIWRATH, Species.ANNIHILAPE]], + MOLAYNE: [Species.KLEFKI, Species.MAGNEZONE, Species.METAGROSS, Species.ALOLA_DUGTRIO], + OLIVIA: [Species.RELICANTH, Species.CARBINK, Species.ALOLA_GOLEM, Species.LYCANROC], + ACEROLA: [[Species.BANETTE, Species.DRIFBLIM], Species.MIMIKYU, Species.DHELMISE, Species.PALOSSAND], + KAHILI: [[Species.BRAVIARY, Species.MANDIBUZZ], Species.HAWLUCHA, Species.ORICORIO, Species.TOUCANNON], + // Elite Four- Galar + MARNIE_ELITE: [Species.MORPEKO, Species.LIEPARD, [Species.TOXICROAK, Species.SCRAFTY], Species.GRIMMSNARL], + NESSA_ELITE: [Species.GOLISOPOD, [Species.QUAGSIRE, Species.PELIPPER], Species.TOXAPEX, Species.DREDNAW], + BEA_ELITE: [Species.HAWLUCHA, [Species.GRAPPLOCT, Species.SIRFETCHD], Species.FALINKS, Species.MACHAMP], + ALLISTER_ELITE: [Species.DUSKNOIR, [Species.POLTEAGEIST, Species.RUNERIGUS], Species.CURSOLA, Species.GENGAR], + RAIHAN_ELITE: [Species.GOODRA, [Species.TORKOAL, Species.TURTONATOR], Species.FLYGON, Species.ARCHALUDON], + // Elite Four- Paldea + RIKA: [Species.CLODSIRE, [Species.DUGTRIO, Species.DONPHAN], Species.CAMERUPT, Species.WHISCASH], // Tera Ground Clodsire + POPPY: [Species.TINKATON, Species.BRONZONG, Species.CORVIKNIGHT, Species.COPPERAJAH], // Tera Steel Tinkaton + LARRY_ELITE: [Species.FLAMIGO, Species.STARAPTOR, [Species.ALTARIA, Species.TROPIUS], Species.ORICORIO], // Tera Flying Flamigo; random Oricorio + HASSEL: [Species.BAXCALIBUR, [Species.FLAPPLE, Species.APPLETUN], Species.DRAGALGE, Species.NOIVERN], // Tera Dragon Baxcalibur + // Elite Four- BBL + CRISPIN: [Species.BLAZIKEN, Species.MAGMORTAR, [Species.CAMERUPT, Species.TALONFLAME], Species.ROTOM], // Tera Fire Blaziken; Heat Rotom + AMARYS: [Species.METAGROSS, Species.SCIZOR, Species.EMPOLEON, Species.SKARMORY], // Tera Steel Metagross + LACEY: [Species.EXCADRILL, Species.PRIMARINA, [Species.WHIMSICOTT, Species.ALCREMIE], Species.GRANBULL], // Tera Fairy Excadrill + DRAYTON: [Species.ARCHALUDON, Species.DRAGONITE, Species.HAXORUS, Species.SCEPTILE], // Tera Dragon Archaludon +}; diff --git a/src/data/balance/starters.ts b/src/data/balance/starters.ts index ee33142e981..3468163c988 100644 --- a/src/data/balance/starters.ts +++ b/src/data/balance/starters.ts @@ -128,7 +128,7 @@ export const speciesStarterCosts = { [Species.YANMA]: 3, [Species.WOOPER]: 2, [Species.MURKROW]: 3, - [Species.MISDREAVUS]: 2, + [Species.MISDREAVUS]: 3, [Species.UNOWN]: 1, [Species.GIRAFARIG]: 3, [Species.PINECO]: 2, @@ -245,7 +245,7 @@ export const speciesStarterCosts = { [Species.KRICKETOT]: 1, [Species.SHINX]: 2, [Species.BUDEW]: 3, - [Species.CRANIDOS]: 3, + [Species.CRANIDOS]: 2, [Species.SHIELDON]: 3, [Species.BURMY]: 2, [Species.COMBEE]: 2, @@ -274,7 +274,7 @@ export const speciesStarterCosts = { [Species.FINNEON]: 1, [Species.MANTYKE]: 2, [Species.SNOVER]: 2, - [Species.ROTOM]: 5, + [Species.ROTOM]: 4, [Species.UXIE]: 5, [Species.MESPRIT]: 5, [Species.AZELF]: 6, @@ -287,10 +287,10 @@ export const speciesStarterCosts = { [Species.PHIONE]: 4, [Species.MANAPHY]: 7, [Species.DARKRAI]: 7, - [Species.SHAYMIN]: 5, + [Species.SHAYMIN]: 6, [Species.ARCEUS]: 9, - [Species.VICTINI]: 7, + [Species.VICTINI]: 6, [Species.SNIVY]: 3, [Species.TEPIG]: 3, [Species.OSHAWOTT]: 3, @@ -461,7 +461,7 @@ export const speciesStarterCosts = { [Species.GUZZLORD]: 6, [Species.NECROZMA]: 8, [Species.MAGEARNA]: 7, - [Species.MARSHADOW]: 7, + [Species.MARSHADOW]: 8, [Species.POIPOLE]: 8, [Species.STAKATAKA]: 6, [Species.BLACEPHALON]: 7, @@ -611,7 +611,7 @@ export const speciesStarterCosts = { [Species.RAGING_BOLT]: 7, [Species.IRON_BOULDER]: 7, [Species.IRON_CROWN]: 7, - [Species.TERAPAGOS]: 8, + [Species.TERAPAGOS]: 9, [Species.PECHARUNT]: 6, [Species.PALDEA_TAUROS]: 5, [Species.PALDEA_WOOPER]: 3, diff --git a/src/data/balance/tms.ts b/src/data/balance/tms.ts index da900768987..788ffd4f273 100644 --- a/src/data/balance/tms.ts +++ b/src/data/balance/tms.ts @@ -3,7 +3,7 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; interface TmSpecies { - [key: integer]: Array> + [key: number]: Array> } export const reverseCompatibleTms: Moves[] = [];/*[ @@ -68433,8 +68433,48 @@ export const tmSpecies: TmSpecies = { ], }; +interface SpeciesTmMoves { + [key: number]: (Moves | [string | Species, Moves])[]; +} + +function transposeTmSpecies(): SpeciesTmMoves { + const flipped: SpeciesTmMoves = {}; + + for (const move in tmSpecies) { + const moveKey = Number(move); + const speciesList = tmSpecies[move]; + + for (const species of speciesList) { + + if (Array.isArray(species)) { + // Extract base species and all associated forms + const [ baseSpecies, ...forms ] = species; + const speciesKey = Number(baseSpecies); + + if (!flipped[speciesKey]) { + flipped[speciesKey] = []; + } + + for (const form of forms) { + flipped[speciesKey].push([ form, moveKey ]); + } + + } else { + const speciesKey = Number(species); + if (!flipped[speciesKey]) { + flipped[speciesKey] = []; + } + flipped[speciesKey].push(moveKey); + } + } + } + return flipped; +} + +export const speciesTmMoves: SpeciesTmMoves = transposeTmSpecies(); + interface TmPoolTiers { - [key: integer]: ModifierTier + [key: number]: ModifierTier } export const tmPoolTiers: TmPoolTiers = { diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts index c3da8db57c4..86060ef4bfc 100644 --- a/src/data/battle-anims.ts +++ b/src/data/battle-anims.ts @@ -1,7 +1,8 @@ import { globalScene } from "#app/global-scene"; -import { AttackMove, BeakBlastHeaderAttr, DelayedAttackAttr, MoveFlags, SelfStatusMove, allMoves } from "./move"; +import { AttackMove, BeakBlastHeaderAttr, DelayedAttackAttr, SelfStatusMove, allMoves } from "./moves/move"; +import { MoveFlags } from "#enums/MoveFlags"; import type Pokemon from "../field/pokemon"; -import * as Utils from "../utils"; +import { type nil, getFrameMs, getEnumKeys, getEnumValues, animationFileName } from "../utils"; import type { BattlerIndex } from "../battle"; import type { Element } from "json-stable-stringify"; import { Moves } from "#enums/moves"; @@ -11,110 +12,111 @@ import Phaser from "phaser"; import { EncounterAnim } from "#enums/encounter-anims"; export enum AnimFrameTarget { - USER, - TARGET, - GRAPHIC + USER, + TARGET, + GRAPHIC, } enum AnimFocus { - TARGET = 1, - USER, - USER_TARGET, - SCREEN + TARGET = 1, + USER, + USER_TARGET, + SCREEN, } enum AnimBlendType { - NORMAL, - ADD, - SUBTRACT + NORMAL, + ADD, + SUBTRACT, } export enum ChargeAnim { - FLY_CHARGING = 1000, - BOUNCE_CHARGING, - DIG_CHARGING, - FUTURE_SIGHT_CHARGING, - DIVE_CHARGING, - SOLAR_BEAM_CHARGING, - SHADOW_FORCE_CHARGING, - SKULL_BASH_CHARGING, - FREEZE_SHOCK_CHARGING, - SKY_DROP_CHARGING, - SKY_ATTACK_CHARGING, - ICE_BURN_CHARGING, - DOOM_DESIRE_CHARGING, - RAZOR_WIND_CHARGING, - PHANTOM_FORCE_CHARGING, - GEOMANCY_CHARGING, - SHADOW_BLADE_CHARGING, - SOLAR_BLADE_CHARGING, - BEAK_BLAST_CHARGING, - METEOR_BEAM_CHARGING, - ELECTRO_SHOT_CHARGING + FLY_CHARGING = 1000, + BOUNCE_CHARGING, + DIG_CHARGING, + FUTURE_SIGHT_CHARGING, + DIVE_CHARGING, + SOLAR_BEAM_CHARGING, + SHADOW_FORCE_CHARGING, + SKULL_BASH_CHARGING, + FREEZE_SHOCK_CHARGING, + SKY_DROP_CHARGING, + SKY_ATTACK_CHARGING, + ICE_BURN_CHARGING, + DOOM_DESIRE_CHARGING, + RAZOR_WIND_CHARGING, + PHANTOM_FORCE_CHARGING, + GEOMANCY_CHARGING, + SHADOW_BLADE_CHARGING, + SOLAR_BLADE_CHARGING, + BEAK_BLAST_CHARGING, + METEOR_BEAM_CHARGING, + ELECTRO_SHOT_CHARGING, } export enum CommonAnim { - USE_ITEM = 2000, - HEALTH_UP, - POISON = 2010, - TOXIC, - PARALYSIS, - SLEEP, - FROZEN, - BURN, - CONFUSION, - ATTRACT, - BIND, - WRAP, - CURSE_NO_GHOST, - LEECH_SEED, - FIRE_SPIN, - PROTECT, - COVET, - WHIRLPOOL, - BIDE, - SAND_TOMB, - QUICK_GUARD, - WIDE_GUARD, - CURSE, - MAGMA_STORM, - CLAMP, - SNAP_TRAP, - THUNDER_CAGE, - INFESTATION, - ORDER_UP_CURLY, - ORDER_UP_DROOPY, - ORDER_UP_STRETCHY, - RAGING_BULL_FIRE, - RAGING_BULL_WATER, - SALT_CURE, - POWDER, - SUNNY = 2100, - RAIN, - SANDSTORM, - HAIL, - SNOW, - WIND, - HEAVY_RAIN, - HARSH_SUN, - STRONG_WINDS, - MISTY_TERRAIN = 2110, - ELECTRIC_TERRAIN, - GRASSY_TERRAIN, - PSYCHIC_TERRAIN, - LOCK_ON = 2120 + USE_ITEM = 2000, + HEALTH_UP, + TERASTALLIZE, + POISON = 2010, + TOXIC, + PARALYSIS, + SLEEP, + FROZEN, + BURN, + CONFUSION, + ATTRACT, + BIND, + WRAP, + CURSE_NO_GHOST, + LEECH_SEED, + FIRE_SPIN, + PROTECT, + COVET, + WHIRLPOOL, + BIDE, + SAND_TOMB, + QUICK_GUARD, + WIDE_GUARD, + CURSE, + MAGMA_STORM, + CLAMP, + SNAP_TRAP, + THUNDER_CAGE, + INFESTATION, + ORDER_UP_CURLY, + ORDER_UP_DROOPY, + ORDER_UP_STRETCHY, + RAGING_BULL_FIRE, + RAGING_BULL_WATER, + SALT_CURE, + POWDER, + SUNNY = 2100, + RAIN, + SANDSTORM, + HAIL, + SNOW, + WIND, + HEAVY_RAIN, + HARSH_SUN, + STRONG_WINDS, + MISTY_TERRAIN = 2110, + ELECTRIC_TERRAIN, + GRASSY_TERRAIN, + PSYCHIC_TERRAIN, + LOCK_ON = 2120, } export class AnimConfig { - public id: integer; + public id: number; public graphic: string; public frames: AnimFrame[][]; - public frameTimedEvents: Map; - public position: integer; - public hue: integer; + public frameTimedEvents: Map; + public position: number; + public hue: number; constructor(source?: any) { - this.frameTimedEvents = new Map; + this.frameTimedEvents = new Map(); if (source) { this.id = source.id; @@ -146,7 +148,7 @@ export class AnimConfig { timedEvent && timedEvents.push(timedEvent); } - this.frameTimedEvents.set(parseInt(fte), timedEvents); + this.frameTimedEvents.set(Number.parseInt(fte), timedEvents); } this.position = source.position; @@ -195,18 +197,43 @@ class AnimFrame { public visible: boolean; public blendType: AnimBlendType; public target: AnimFrameTarget; - public graphicFrame: integer; - public opacity: integer; - public color: integer[]; - public tone: integer[]; - public flash: integer[]; + public graphicFrame: number; + public opacity: number; + public color: number[]; + public tone: number[]; + public flash: number[]; public locked: boolean; - public priority: integer; + public priority: number; public focus: AnimFocus; - constructor(x: number, y: number, zoomX: number, zoomY: number, angle: number, mirror: boolean, visible: boolean, blendType: AnimBlendType, pattern: integer, - opacity: integer, colorR: integer, colorG: integer, colorB: integer, colorA: integer, toneR: integer, toneG: integer, toneB: integer, toneA: integer, - flashR: integer, flashG: integer, flashB: integer, flashA: integer, locked: boolean, priority: integer, focus: AnimFocus, init?: boolean) { + constructor( + x: number, + y: number, + zoomX: number, + zoomY: number, + angle: number, + mirror: boolean, + visible: boolean, + blendType: AnimBlendType, + pattern: number, + opacity: number, + colorR: number, + colorG: number, + colorB: number, + colorA: number, + toneR: number, + toneG: number, + toneB: number, + toneA: number, + flashR: number, + flashG: number, + flashB: number, + flashA: number, + locked: boolean, + priority: number, + focus: AnimFocus, + init?: boolean, + ) { this.x = !init ? ((x || 0) - 128) * 0.5 : x; this.y = !init ? ((y || 0) - 224) * 0.5 : y; if (zoomX) { @@ -258,19 +285,19 @@ class AnimFrame { this.opacity = 0; } if (colorR || colorG || colorB || colorA) { - this.color = [ colorR || 0, colorG || 0, colorB || 0, colorA || 0 ]; + this.color = [colorR || 0, colorG || 0, colorB || 0, colorA || 0]; } else if (init) { - this.color = [ 0, 0, 0, 0 ]; + this.color = [0, 0, 0, 0]; } if (toneR || toneG || toneB || toneA) { - this.tone = [ toneR || 0, toneG || 0, toneB || 0, toneA || 0 ]; + this.tone = [toneR || 0, toneG || 0, toneB || 0, toneA || 0]; } else if (init) { - this.tone = [ 0, 0, 0, 0 ]; + this.tone = [0, 0, 0, 0]; } if (flashR || flashG || flashB || flashA) { - this.flash = [ flashR || 0, flashG || 0, flashB || 0, flashA || 0 ]; + this.flash = [flashR || 0, flashG || 0, flashB || 0, flashA || 0]; } else if (init) { - this.flash = [ 0, 0, 0, 0 ]; + this.flash = [0, 0, 0, 0]; } if (locked) { this.locked = locked; @@ -288,34 +315,61 @@ class AnimFrame { class ImportedAnimFrame extends AnimFrame { constructor(source: any) { - const color: integer[] = source.color || [ 0, 0, 0, 0 ]; - const tone: integer[] = source.tone || [ 0, 0, 0, 0 ]; - const flash: integer[] = source.flash || [ 0, 0, 0, 0 ]; - super(source.x, source.y, source.zoomX, source.zoomY, source.angle, source.mirror, source.visible, source.blendType, source.graphicFrame, source.opacity, color[0], color[1], color[2], color[3], tone[0], tone[1], tone[2], tone[3], flash[0], flash[1], flash[2], flash[3], source.locked, source.priority, source.focus, true); + const color: number[] = source.color || [0, 0, 0, 0]; + const tone: number[] = source.tone || [0, 0, 0, 0]; + const flash: number[] = source.flash || [0, 0, 0, 0]; + super( + source.x, + source.y, + source.zoomX, + source.zoomY, + source.angle, + source.mirror, + source.visible, + source.blendType, + source.graphicFrame, + source.opacity, + color[0], + color[1], + color[2], + color[3], + tone[0], + tone[1], + tone[2], + tone[3], + flash[0], + flash[1], + flash[2], + flash[3], + source.locked, + source.priority, + source.focus, + true, + ); this.target = source.target; this.graphicFrame = source.graphicFrame; } } abstract class AnimTimedEvent { - public frameIndex: integer; + public frameIndex: number; public resourceName: string; - constructor(frameIndex: integer, resourceName: string) { + constructor(frameIndex: number, resourceName: string) { this.frameIndex = frameIndex; this.resourceName = resourceName; } - abstract execute(battleAnim: BattleAnim, priority?: number): integer; + abstract execute(battleAnim: BattleAnim, priority?: number): number; - abstract getEventType(): string; + abstract getEventType(): string; } class AnimTimedSoundEvent extends AnimTimedEvent { - public volume: number = 100; - public pitch: number = 100; + public volume = 100; + public pitch = 100; - constructor(frameIndex: integer, resourceName: string, source?: any) { + constructor(frameIndex: number, resourceName: string, source?: any) { super(frameIndex, resourceName); if (source) { @@ -324,8 +378,8 @@ class AnimTimedSoundEvent extends AnimTimedEvent { } } - execute(battleAnim: BattleAnim, priority?: number): integer { - const soundConfig = { rate: (this.pitch * 0.01), volume: (this.volume * 0.01) }; + execute(battleAnim: BattleAnim): number { + const soundConfig = { rate: this.pitch * 0.01, volume: this.volume * 0.01 }; if (this.resourceName) { try { globalScene.playSound(`battle_anims/${this.resourceName}`, soundConfig); @@ -333,9 +387,8 @@ class AnimTimedSoundEvent extends AnimTimedEvent { console.error(err); } return Math.ceil((globalScene.sound.get(`battle_anims/${this.resourceName}`).totalDuration * 1000) / 33.33); - } else { - return Math.ceil((battleAnim.user!.cry(soundConfig).totalDuration * 1000) / 33.33); // TODO: is the bang behind user correct? } + return Math.ceil((battleAnim.user!.cry(soundConfig).totalDuration * 1000) / 33.33); // TODO: is the bang behind user correct? } getEventType(): string { @@ -344,22 +397,22 @@ class AnimTimedSoundEvent extends AnimTimedEvent { } abstract class AnimTimedBgEvent extends AnimTimedEvent { - public bgX: number = 0; - public bgY: number = 0; - public opacity: integer = 0; - /*public colorRed: integer = 0; - public colorGreen: integer = 0; - public colorBlue: integer = 0; - public colorAlpha: integer = 0;*/ - public duration: integer = 0; - /*public flashScope: integer = 0; - public flashRed: integer = 0; - public flashGreen: integer = 0; - public flashBlue: integer = 0; - public flashAlpha: integer = 0; - public flashDuration: integer = 0;*/ + public bgX = 0; + public bgY = 0; + public opacity = 0; + /*public colorRed: number = 0; + public colorGreen: number = 0; + public colorBlue: number = 0; + public colorAlpha: number = 0;*/ + public duration = 0; + /*public flashScope: number = 0; + public flashRed: number = 0; + public flashGreen: number = 0; + public flashBlue: number = 0; + public flashAlpha: number = 0; + public flashDuration: number = 0;*/ - constructor(frameIndex: integer, resourceName: string, source: any) { + constructor(frameIndex: number, resourceName: string, source?: any) { super(frameIndex, resourceName); if (source) { @@ -382,26 +435,28 @@ abstract class AnimTimedBgEvent extends AnimTimedEvent { } class AnimTimedUpdateBgEvent extends AnimTimedBgEvent { - constructor(frameIndex: integer, resourceName: string, source?: any) { - super(frameIndex, resourceName, source); - } - - execute(moveAnim: MoveAnim, priority?: number): integer { + // biome-ignore lint/correctness/noUnusedVariables: seems intentional + execute(moveAnim: MoveAnim, priority?: number): number { const tweenProps = {}; if (this.bgX !== undefined) { - tweenProps["x"] = (this.bgX * 0.5) - 320; + tweenProps["x"] = this.bgX * 0.5 - 320; } if (this.bgY !== undefined) { - tweenProps["y"] = (this.bgY * 0.5) - 284; + tweenProps["y"] = this.bgY * 0.5 - 284; } if (this.opacity !== undefined) { tweenProps["alpha"] = (this.opacity || 0) / 255; } if (Object.keys(tweenProps).length) { - globalScene.tweens.add(Object.assign({ - targets: moveAnim.bgSprite, - duration: Utils.getFrameMs(this.duration * 3) - }, tweenProps)); + globalScene.tweens.add( + Object.assign( + { + targets: moveAnim.bgSprite, + duration: getFrameMs(this.duration * 3), + }, + tweenProps, + ), + ); } return this.duration * 2; } @@ -412,11 +467,7 @@ class AnimTimedUpdateBgEvent extends AnimTimedBgEvent { } class AnimTimedAddBgEvent extends AnimTimedBgEvent { - constructor(frameIndex: integer, resourceName: string, source?: any) { - super(frameIndex, resourceName, source); - } - - execute(moveAnim: MoveAnim, priority?: number): integer { + execute(moveAnim: MoveAnim, priority?: number): number { if (moveAnim.bgSprite) { moveAnim.bgSprite.destroy(); } @@ -436,7 +487,7 @@ class AnimTimedAddBgEvent extends AnimTimedBgEvent { globalScene.tweens.add({ targets: moveAnim.bgSprite, - duration: Utils.getFrameMs(this.duration * 3) + duration: getFrameMs(this.duration * 3), }); return this.duration * 2; @@ -454,14 +505,17 @@ export const encounterAnims = new Map(); export function initCommonAnims(): Promise { return new Promise(resolve => { - const commonAnimNames = Utils.getEnumKeys(CommonAnim); - const commonAnimIds = Utils.getEnumValues(CommonAnim); + const commonAnimNames = getEnumKeys(CommonAnim); + const commonAnimIds = getEnumValues(CommonAnim); const commonAnimFetches: Promise>[] = []; for (let ca = 0; ca < commonAnimIds.length; ca++) { const commonAnimId = commonAnimIds[ca]; - commonAnimFetches.push(globalScene.cachedFetch(`./battle-anims/common-${commonAnimNames[ca].toLowerCase().replace(/\_/g, "-")}.json`) - .then(response => response.json()) - .then(cas => commonAnims.set(commonAnimId, new AnimConfig(cas)))); + commonAnimFetches.push( + globalScene + .cachedFetch(`./battle-anims/common-${commonAnimNames[ca].toLowerCase().replace(/\_/g, "-")}.json`) + .then(response => response.json()) + .then(cas => commonAnims.set(commonAnimId, new AnimConfig(cas))), + ); } Promise.allSettled(commonAnimFetches).then(() => resolve()); }); @@ -475,10 +529,9 @@ export function initMoveAnim(move: Moves): Promise { } else { const loadedCheckTimer = setInterval(() => { if (moveAnims.get(move) !== null) { - const chargeAnimSource = (allMoves[move].isChargingMove()) + const chargeAnimSource = allMoves[move].isChargingMove() ? allMoves[move] - : (allMoves[move].getAttrs(DelayedAttackAttr)[0] - ?? allMoves[move].getAttrs(BeakBlastHeaderAttr)[0]); + : (allMoves[move].getAttrs(DelayedAttackAttr)[0] ?? allMoves[move].getAttrs(BeakBlastHeaderAttr)[0]); if (chargeAnimSource && chargeAnims.get(chargeAnimSource.chargeAnim) === null) { return; } @@ -489,10 +542,16 @@ export function initMoveAnim(move: Moves): Promise { } } else { moveAnims.set(move, null); - const defaultMoveAnim = allMoves[move] instanceof AttackMove ? Moves.TACKLE : allMoves[move] instanceof SelfStatusMove ? Moves.FOCUS_ENERGY : Moves.TAIL_WHIP; + const defaultMoveAnim = + allMoves[move] instanceof AttackMove + ? Moves.TACKLE + : allMoves[move] instanceof SelfStatusMove + ? Moves.FOCUS_ENERGY + : Moves.TAIL_WHIP; const fetchAnimAndResolve = (move: Moves) => { - globalScene.cachedFetch(`./battle-anims/${Utils.animationFileName(move)}.json`) + globalScene + .cachedFetch(`./battle-anims/${animationFileName(move)}.json`) .then(response => { const contentType = response.headers.get("content-type"); if (!response.ok || contentType?.indexOf("application/json") === -1) { @@ -509,10 +568,9 @@ export function initMoveAnim(move: Moves): Promise { } else { populateMoveAnim(move, ba); } - const chargeAnimSource = (allMoves[move].isChargingMove()) + const chargeAnimSource = allMoves[move].isChargingMove() ? allMoves[move] - : (allMoves[move].getAttrs(DelayedAttackAttr)[0] - ?? allMoves[move].getAttrs(BeakBlastHeaderAttr)[0]); + : (allMoves[move].getAttrs(DelayedAttackAttr)[0] ?? allMoves[move].getAttrs(BeakBlastHeaderAttr)[0]); if (chargeAnimSource) { initMoveChargeAnim(chargeAnimSource.chargeAnim).then(() => resolve()); } else { @@ -549,7 +607,7 @@ function useDefaultAnim(move: Moves, defaultMoveAnim: Moves) { * @remarks use {@linkcode useDefaultAnim} to use a default animation */ function logMissingMoveAnim(move: Moves, ...optionalParams: any[]) { - const moveName = Utils.animationFileName(move); + const moveName = animationFileName(move); console.warn(`Could not load animation file for move '${moveName}'`, ...optionalParams); } @@ -558,16 +616,19 @@ function logMissingMoveAnim(move: Moves, ...optionalParams: any[]) { * @param encounterAnim one or more animations to fetch */ export async function initEncounterAnims(encounterAnim: EncounterAnim | EncounterAnim[]): Promise { - const anims = Array.isArray(encounterAnim) ? encounterAnim : [ encounterAnim ]; - const encounterAnimNames = Utils.getEnumKeys(EncounterAnim); + const anims = Array.isArray(encounterAnim) ? encounterAnim : [encounterAnim]; + const encounterAnimNames = getEnumKeys(EncounterAnim); const encounterAnimFetches: Promise>[] = []; for (const anim of anims) { if (encounterAnims.has(anim) && !isNullOrUndefined(encounterAnims.get(anim))) { continue; } - encounterAnimFetches.push(globalScene.cachedFetch(`./battle-anims/encounter-${encounterAnimNames[anim].toLowerCase().replace(/\_/g, "-")}.json`) - .then(response => response.json()) - .then(cas => encounterAnims.set(anim, new AnimConfig(cas)))); + encounterAnimFetches.push( + globalScene + .cachedFetch(`./battle-anims/encounter-${encounterAnimNames[anim].toLowerCase().replace(/\_/g, "-")}.json`) + .then(response => response.json()) + .then(cas => encounterAnims.set(anim, new AnimConfig(cas))), + ); } await Promise.allSettled(encounterAnimFetches); } @@ -587,7 +648,8 @@ export function initMoveChargeAnim(chargeAnim: ChargeAnim): Promise { } } else { chargeAnims.set(chargeAnim, null); - globalScene.cachedFetch(`./battle-anims/${ChargeAnim[chargeAnim].toLowerCase().replace(/\_/g, "-")}.json`) + globalScene + .cachedFetch(`./battle-anims/${ChargeAnim[chargeAnim].toLowerCase().replace(/\_/g, "-")}.json`) .then(response => response.json()) .then(ca => { if (Array.isArray(ca)) { @@ -608,7 +670,7 @@ function populateMoveAnim(move: Moves, animSource: any): void { moveAnims.set(move, moveAnim); return; } - moveAnims.set(move, [ moveAnims.get(move) as AnimConfig, moveAnim ]); + moveAnims.set(move, [moveAnims.get(move) as AnimConfig, moveAnim]); } function populateMoveChargeAnim(chargeAnim: ChargeAnim, animSource: any) { @@ -617,7 +679,7 @@ function populateMoveChargeAnim(chargeAnim: ChargeAnim, animSource: any) { chargeAnims.set(chargeAnim, moveChargeAnim); return; } - chargeAnims.set(chargeAnim, [ chargeAnims.get(chargeAnim) as AnimConfig, moveChargeAnim ]); + chargeAnims.set(chargeAnim, [chargeAnims.get(chargeAnim) as AnimConfig, moveChargeAnim]); } export function loadCommonAnimAssets(startLoad?: boolean): Promise { @@ -637,12 +699,11 @@ export async function loadEncounterAnimAssets(startLoad?: boolean): Promise { return new Promise(resolve => { - const moveAnimations = moveIds.map(m => moveAnims.get(m) as AnimConfig).flat(); + const moveAnimations = moveIds.flatMap(m => moveAnims.get(m) as AnimConfig); for (const moveId of moveIds) { - const chargeAnimSource = (allMoves[moveId].isChargingMove()) + const chargeAnimSource = allMoves[moveId].isChargingMove() ? allMoves[moveId] - : (allMoves[moveId].getAttrs(DelayedAttackAttr)[0] - ?? allMoves[moveId].getAttrs(BeakBlastHeaderAttr)[0]); + : (allMoves[moveId].getAttrs(DelayedAttackAttr)[0] ?? allMoves[moveId].getAttrs(BeakBlastHeaderAttr)[0]); if (chargeAnimSource) { const moveChargeAnims = chargeAnims.get(chargeAnimSource.chargeAnim); moveAnimations.push(moveChargeAnims instanceof AnimConfig ? moveChargeAnims : moveChargeAnims![0]); // TODO: is the bang correct? @@ -693,11 +754,11 @@ function loadAnimAssets(anims: AnimConfig[], startLoad?: boolean): Promise } interface GraphicFrameData { - x: number, - y: number, - scaleX: number, - scaleY: number, - angle: number + x: number; + y: number; + scaleX: number; + scaleY: number; + angle: number; } const userFocusX = 106; @@ -705,25 +766,43 @@ const userFocusY = 148 - 32; const targetFocusX = 234; const targetFocusY = 84 - 32; -function transformPoint(x1: number, y1: number, x2: number, y2: number, x3: number, y3: number, x4: number, y4: number, px: number, py: number): [ x: number, y: number ] { +function transformPoint( + x1: number, + y1: number, + x2: number, + y2: number, + x3: number, + y3: number, + x4: number, + y4: number, + px: number, + py: number, +): [x: number, y: number] { const yIntersect = yAxisIntersect(x1, y1, x2, y2, px, py); return repositionY(x3, y3, x4, y4, yIntersect[0], yIntersect[1]); } -function yAxisIntersect(x1: number, y1: number, x2: number, y2: number, px: number, py: number): [ x: number, y: number ] { +function yAxisIntersect( + x1: number, + y1: number, + x2: number, + y2: number, + px: number, + py: number, +): [x: number, y: number] { const dx = x2 - x1; const dy = y2 - y1; const x = dx === 0 ? 0 : (px - x1) / dx; const y = dy === 0 ? 0 : (py - y1) / dy; - return [ x, y ]; + return [x, y]; } -function repositionY(x1: number, y1: number, x2: number, y2: number, tx: number, ty: number): [ x: number, y: number ] { +function repositionY(x1: number, y1: number, x2: number, y2: number, tx: number, ty: number): [x: number, y: number] { const dx = x2 - x1; const dy = y2 - y1; - const x = x1 + (tx * dx); - const y = y1 + (ty * dy); - return [ x, y ]; + const x = x1 + tx * dx; + const y = y1 + ty * dy; + return [x, y]; } function isReversed(src1: number, src2: number, dst1: number, dst2: number) { @@ -737,7 +816,7 @@ function isReversed(src1: number, src2: number, dst1: number, dst2: number) { } interface SpriteCache { - [key: integer]: Phaser.GameObjects.Sprite[] + [key: number]: Phaser.GameObjects.Sprite[]; } export abstract class BattleAnim { @@ -755,516 +834,590 @@ export abstract class BattleAnim { private srcLine: number[]; private dstLine: number[]; - constructor(user?: Pokemon, target?: Pokemon, playRegardlessOfIssues: boolean = false) { + constructor(user?: Pokemon, target?: Pokemon, playRegardlessOfIssues = false) { this.user = user ?? null; this.target = target ?? null; this.sprites = []; this.playRegardlessOfIssues = playRegardlessOfIssues; } - abstract getAnim(): AnimConfig | null; + abstract getAnim(): AnimConfig | null; - abstract isOppAnim(): boolean; + abstract isOppAnim(): boolean; - protected isHideUser(): boolean { - return false; - } + protected isHideUser(): boolean { + return false; + } - protected isHideTarget(): boolean { - return false; - } + protected isHideTarget(): boolean { + return false; + } - private getGraphicFrameData(frames: AnimFrame[], onSubstitute?: boolean): Map> { - const ret: Map> = new Map([ - [ AnimFrameTarget.GRAPHIC, new Map() ], - [ AnimFrameTarget.USER, new Map() ], - [ AnimFrameTarget.TARGET, new Map() ] - ]); + private getGraphicFrameData( + frames: AnimFrame[], + onSubstitute?: boolean, + ): Map> { + const ret: Map> = new Map([ + [AnimFrameTarget.GRAPHIC, new Map()], + [AnimFrameTarget.USER, new Map()], + [AnimFrameTarget.TARGET, new Map()], + ]); - const isOppAnim = this.isOppAnim(); - const user = !isOppAnim ? this.user : this.target; - const target = !isOppAnim ? this.target : this.user; + const isOppAnim = this.isOppAnim(); + const user = !isOppAnim ? this.user : this.target; + const target = !isOppAnim ? this.target : this.user; - const targetSubstitute = (onSubstitute && user !== target) ? target!.getTag(SubstituteTag) : null; + const targetSubstitute = onSubstitute && user !== target ? target!.getTag(SubstituteTag) : null; - const userInitialX = user!.x; // TODO: is this bang correct? - const userInitialY = user!.y; // TODO: is this bang correct? - const userHalfHeight = user!.getSprite().displayHeight! / 2; // TODO: is this bang correct? + const userInitialX = user!.x; // TODO: is this bang correct? + const userInitialY = user!.y; // TODO: is this bang correct? + const userHalfHeight = user!.getSprite().displayHeight! / 2; // TODO: is this bang correct? - const targetInitialX = targetSubstitute?.sprite?.x ?? target!.x; // TODO: is this bang correct? - const targetInitialY = targetSubstitute?.sprite?.y ?? target!.y; // TODO: is this bang correct? - const targetHalfHeight = (targetSubstitute?.sprite ?? target!.getSprite()).displayHeight! / 2; // TODO: is this bang correct? + const targetInitialX = targetSubstitute?.sprite?.x ?? target!.x; // TODO: is this bang correct? + const targetInitialY = targetSubstitute?.sprite?.y ?? target!.y; // TODO: is this bang correct? + const targetHalfHeight = (targetSubstitute?.sprite ?? target!.getSprite()).displayHeight! / 2; // TODO: is this bang correct? - let g = 0; - let u = 0; - let t = 0; + let g = 0; + let u = 0; + let t = 0; - for (const frame of frames) { - let x = frame.x + 106; - let y = frame.y + 116; - let scaleX = (frame.zoomX / 100) * (!frame.mirror ? 1 : -1); - const scaleY = (frame.zoomY / 100); - switch (frame.focus) { - case AnimFocus.TARGET: - x += targetInitialX - targetFocusX; - y += (targetInitialY - targetHalfHeight) - targetFocusY; - break; - case AnimFocus.USER: - x += userInitialX - userFocusX; - y += (userInitialY - userHalfHeight) - userFocusY; - break; - case AnimFocus.USER_TARGET: - const point = transformPoint(this.srcLine[0], this.srcLine[1], this.srcLine[2], this.srcLine[3], - this.dstLine[0], this.dstLine[1] - userHalfHeight, this.dstLine[2], this.dstLine[3] - targetHalfHeight, x, y); + for (const frame of frames) { + let x = frame.x + 106; + let y = frame.y + 116; + let scaleX = (frame.zoomX / 100) * (!frame.mirror ? 1 : -1); + const scaleY = frame.zoomY / 100; + switch (frame.focus) { + case AnimFocus.TARGET: + x += targetInitialX - targetFocusX; + y += targetInitialY - targetHalfHeight - targetFocusY; + break; + case AnimFocus.USER: + x += userInitialX - userFocusX; + y += userInitialY - userHalfHeight - userFocusY; + break; + case AnimFocus.USER_TARGET: + { + const point = transformPoint( + this.srcLine[0], + this.srcLine[1], + this.srcLine[2], + this.srcLine[3], + this.dstLine[0], + this.dstLine[1] - userHalfHeight, + this.dstLine[2], + this.dstLine[3] - targetHalfHeight, + x, + y, + ); x = point[0]; y = point[1]; - if (frame.target === AnimFrameTarget.GRAPHIC && isReversed(this.srcLine[0], this.srcLine[2], this.dstLine[0], this.dstLine[2])) { + if ( + frame.target === AnimFrameTarget.GRAPHIC && + isReversed(this.srcLine[0], this.srcLine[2], this.dstLine[0], this.dstLine[2]) + ) { scaleX = scaleX * -1; } - break; - } - const angle = -frame.angle; - const key = frame.target === AnimFrameTarget.GRAPHIC ? g++ : frame.target === AnimFrameTarget.USER ? u++ : t++; - ret.get(frame.target)!.set(key, { x: x, y: y, scaleX: scaleX, scaleY: scaleY, angle: angle }); // TODO: is the bang correct? + } + break; } - - return ret; + const angle = -frame.angle; + const key = frame.target === AnimFrameTarget.GRAPHIC ? g++ : frame.target === AnimFrameTarget.USER ? u++ : t++; + ret.get(frame.target)!.set(key, { x: x, y: y, scaleX: scaleX, scaleY: scaleY, angle: angle }); // TODO: is the bang correct? } - play(onSubstitute?: boolean, callback?: Function) { - const isOppAnim = this.isOppAnim(); - const user = !isOppAnim ? this.user! : this.target!; // TODO: are those bangs correct? - const target = !isOppAnim ? this.target! : this.user!; + return ret; + } - if (!target?.isOnField() && !this.playRegardlessOfIssues) { - if (callback) { - callback(); - } - return; + // biome-ignore lint/complexity/noBannedTypes: callback is used liberally + play(onSubstitute?: boolean, callback?: Function) { + const isOppAnim = this.isOppAnim(); + const user = !isOppAnim ? this.user! : this.target!; // TODO: are those bangs correct? + const target = !isOppAnim ? this.target! : this.user!; + + if (!target?.isOnField() && !this.playRegardlessOfIssues) { + if (callback) { + callback(); } - - const targetSubstitute = (!!onSubstitute && user !== target) ? target.getTag(SubstituteTag) : null; - - const userSprite = user.getSprite(); - const targetSprite = targetSubstitute?.sprite ?? target.getSprite(); - - const spriteCache: SpriteCache = { - [AnimFrameTarget.GRAPHIC]: [], - [AnimFrameTarget.USER]: [], - [AnimFrameTarget.TARGET]: [] - }; - const spritePriorities: integer[] = []; - - const cleanUpAndComplete = () => { - userSprite.setPosition(0, 0); - userSprite.setScale(1); - userSprite.setAlpha(1); - userSprite.pipelineData["tone"] = [ 0.0, 0.0, 0.0, 0.0 ]; - userSprite.setAngle(0); - if (!targetSubstitute) { - targetSprite.setPosition(0, 0); - targetSprite.setScale(1); - targetSprite.setAlpha(1); - } else { - targetSprite.setPosition( - target.x - target.getSubstituteOffset()[0], - target.y - target.getSubstituteOffset()[1] - ); - targetSprite.setScale(target.getSpriteScale() * (target.isPlayer() ? 0.5 : 1)); - targetSprite.setAlpha(1); - } - targetSprite.pipelineData["tone"] = [ 0.0, 0.0, 0.0, 0.0 ]; - targetSprite.setAngle(0); - - /** - * This and `targetSpriteToShow` are used to restore context lost - * from the `isOppAnim` swap. Using these references instead of `this.user` - * and `this.target` prevent the target's Substitute doll from disappearing - * after being the target of an animation. - */ - const userSpriteToShow = !isOppAnim ? userSprite : targetSprite; - const targetSpriteToShow = !isOppAnim ? targetSprite : userSprite; - if (!this.isHideUser() && userSpriteToShow) { - userSpriteToShow.setVisible(true); - } - if (!this.isHideTarget() && (targetSpriteToShow !== userSpriteToShow || !this.isHideUser())) { - targetSpriteToShow.setVisible(true); - } - for (const ms of Object.values(spriteCache).flat()) { - if (ms) { - ms.destroy(); - } - } - if (this.bgSprite) { - this.bgSprite.destroy(); - } - if (callback) { - callback(); - } - }; - - if (!globalScene.moveAnimations && !this.playRegardlessOfIssues) { - return cleanUpAndComplete(); - } - - const anim = this.getAnim(); - - const userInitialX = user.x; - const userInitialY = user.y; - const targetInitialX = targetSubstitute?.sprite?.x ?? target.x; - const targetInitialY = targetSubstitute?.sprite?.y ?? target.y; - - this.srcLine = [ userFocusX, userFocusY, targetFocusX, targetFocusY ]; - this.dstLine = [ userInitialX, userInitialY, targetInitialX, targetInitialY ]; - - let r = anim?.frames.length ?? 0; - let f = 0; - - globalScene.tweens.addCounter({ - duration: Utils.getFrameMs(3), - repeat: anim?.frames.length ?? 0, - onRepeat: () => { - if (!f) { - userSprite.setVisible(false); - targetSprite.setVisible(false); - } - - const spriteFrames = anim!.frames[f]; // TODO: is the bang correcT? - const frameData = this.getGraphicFrameData(anim!.frames[f], onSubstitute); // TODO: is the bang correct? - let u = 0; - let t = 0; - let g = 0; - for (const frame of spriteFrames) { - if (frame.target !== AnimFrameTarget.GRAPHIC) { - const isUser = frame.target === AnimFrameTarget.USER; - if (isUser && target === user) { - continue; - } else if (this.playRegardlessOfIssues && frame.target === AnimFrameTarget.TARGET && !target.isOnField()) { - continue; - } - const sprites = spriteCache[isUser ? AnimFrameTarget.USER : AnimFrameTarget.TARGET]; - const spriteSource = isUser ? userSprite : targetSprite; - if ((isUser ? u : t) === sprites.length) { - if (isUser || !targetSubstitute) { - const sprite = globalScene.addPokemonSprite(isUser ? user! : target, 0, 0, spriteSource!.texture, spriteSource!.frame.name, true); // TODO: are those bangs correct? - [ "spriteColors", "fusionSpriteColors" ].map(k => sprite.pipelineData[k] = (isUser ? user! : target).getSprite().pipelineData[k]); // TODO: are those bangs correct? - sprite.setPipelineData("spriteKey", (isUser ? user! : target).getBattleSpriteKey()); - sprite.setPipelineData("shiny", (isUser ? user : target).shiny); - sprite.setPipelineData("variant", (isUser ? user : target).variant); - sprite.setPipelineData("ignoreFieldPos", true); - spriteSource.on("animationupdate", (_anim, frame) => sprite.setFrame(frame.textureFrame)); - globalScene.field.add(sprite); - sprites.push(sprite); - } else { - const sprite = globalScene.addFieldSprite(spriteSource.x, spriteSource.y, spriteSource.texture); - spriteSource.on("animationupdate", (_anim, frame) => sprite.setFrame(frame.textureFrame)); - globalScene.field.add(sprite); - sprites.push(sprite); - } - } - - const spriteIndex = isUser ? u++ : t++; - const pokemonSprite = sprites[spriteIndex]; - const graphicFrameData = frameData.get(frame.target)!.get(spriteIndex)!; // TODO: are the bangs correct? - const spriteSourceScale = (isUser || !targetSubstitute) - ? spriteSource.parentContainer.scale - : target.getSpriteScale() * (target.isPlayer() ? 0.5 : 1); - pokemonSprite.setPosition(graphicFrameData.x, graphicFrameData.y - ((spriteSource.height / 2) * (spriteSourceScale - 1))); - - pokemonSprite.setAngle(graphicFrameData.angle); - pokemonSprite.setScale(graphicFrameData.scaleX * spriteSourceScale, graphicFrameData.scaleY * spriteSourceScale); - - pokemonSprite.setData("locked", frame.locked); - - pokemonSprite.setAlpha(frame.opacity / 255); - pokemonSprite.pipelineData["tone"] = frame.tone; - pokemonSprite.setVisible(frame.visible && (isUser ? user.visible : target.visible)); - pokemonSprite.setBlendMode(frame.blendType === AnimBlendType.NORMAL ? Phaser.BlendModes.NORMAL : frame.blendType === AnimBlendType.ADD ? Phaser.BlendModes.ADD : Phaser.BlendModes.DIFFERENCE); - } else { - const sprites = spriteCache[AnimFrameTarget.GRAPHIC]; - if (g === sprites.length) { - const newSprite: Phaser.GameObjects.Sprite = globalScene.addFieldSprite(0, 0, anim!.graphic, 1); // TODO: is the bang correct? - sprites.push(newSprite); - globalScene.field.add(newSprite); - spritePriorities.push(1); - } - - const graphicIndex = g++; - const moveSprite = sprites[graphicIndex]; - if (spritePriorities[graphicIndex] !== frame.priority) { - spritePriorities[graphicIndex] = frame.priority; - const setSpritePriority = (priority: integer) => { - switch (priority) { - case 0: - globalScene.field.moveBelow(moveSprite as Phaser.GameObjects.GameObject, globalScene.getEnemyPokemon(false) ?? globalScene.getPlayerPokemon(false)!); // TODO: is this bang correct? - break; - case 1: - globalScene.field.moveTo(moveSprite, globalScene.field.getAll().length - 1); - break; - case 2: - switch (frame.focus) { - case AnimFocus.USER: - if (this.bgSprite) { - globalScene.field.moveAbove(moveSprite as Phaser.GameObjects.GameObject, this.bgSprite); - } else { - globalScene.field.moveBelow(moveSprite as Phaser.GameObjects.GameObject, this.user!); // TODO: is this bang correct? - } - break; - case AnimFocus.TARGET: - globalScene.field.moveBelow(moveSprite as Phaser.GameObjects.GameObject, this.target!); // TODO: is this bang correct? - break; - default: - setSpritePriority(1); - break; - } - break; - case 3: - switch (frame.focus) { - case AnimFocus.USER: - globalScene.field.moveAbove(moveSprite as Phaser.GameObjects.GameObject, this.user!); // TODO: is this bang correct? - break; - case AnimFocus.TARGET: - globalScene.field.moveAbove(moveSprite as Phaser.GameObjects.GameObject, this.target!); // TODO: is this bang correct? - break; - default: - setSpritePriority(1); - break; - } - break; - default: - setSpritePriority(1); - } - }; - setSpritePriority(frame.priority); - } - moveSprite.setFrame(frame.graphicFrame); - //console.log(AnimFocus[frame.focus]); - - const graphicFrameData = frameData.get(frame.target)!.get(graphicIndex)!; // TODO: are those bangs correct? - moveSprite.setPosition(graphicFrameData.x, graphicFrameData.y); - moveSprite.setAngle(graphicFrameData.angle); - moveSprite.setScale(graphicFrameData.scaleX, graphicFrameData.scaleY); - - moveSprite.setAlpha(frame.opacity / 255); - moveSprite.setVisible(frame.visible); - moveSprite.setBlendMode(frame.blendType === AnimBlendType.NORMAL ? Phaser.BlendModes.NORMAL : frame.blendType === AnimBlendType.ADD ? Phaser.BlendModes.ADD : Phaser.BlendModes.DIFFERENCE); - } - } - if (anim?.frameTimedEvents.has(f)) { - for (const event of anim.frameTimedEvents.get(f)!) { // TODO: is this bang correct? - r = Math.max((anim.frames.length - f) + event.execute(this), r); - } - } - const targets = Utils.getEnumValues(AnimFrameTarget); - for (const i of targets) { - const count = i === AnimFrameTarget.GRAPHIC ? g : i === AnimFrameTarget.USER ? u : t; - if (count < spriteCache[i].length) { - const spritesToRemove = spriteCache[i].slice(count, spriteCache[i].length); - for (const rs of spritesToRemove) { - if (!rs.getData("locked") as boolean) { - const spriteCacheIndex = spriteCache[i].indexOf(rs); - spriteCache[i].splice(spriteCacheIndex, 1); - if (i === AnimFrameTarget.GRAPHIC) { - spritePriorities.splice(spriteCacheIndex, 1); - } - rs.destroy(); - } - } - } - } - f++; - r--; - }, - onComplete: () => { - for (const ms of Object.values(spriteCache).flat()) { - if (ms && !ms.getData("locked")) { - ms.destroy(); - } - } - if (r) { - globalScene.tweens.addCounter({ - duration: Utils.getFrameMs(r), - onComplete: () => cleanUpAndComplete() - }); - } else { - cleanUpAndComplete(); - } - } - }); + return; } - private getGraphicFrameDataWithoutTarget(frames: AnimFrame[], targetInitialX: number, targetInitialY: number): Map> { - const ret: Map> = new Map([ - [ AnimFrameTarget.GRAPHIC, new Map() ], - [ AnimFrameTarget.USER, new Map() ], - [ AnimFrameTarget.TARGET, new Map() ] - ]); + const targetSubstitute = !!onSubstitute && user !== target ? target.getTag(SubstituteTag) : null; - let g = 0; - let u = 0; - let t = 0; + const userSprite = user.getSprite(); + const targetSprite = targetSubstitute?.sprite ?? target.getSprite(); - for (const frame of frames) { - let { x, y } = frame; - const scaleX = (frame.zoomX / 100) * (!frame.mirror ? 1 : -1); - const scaleY = (frame.zoomY / 100); - x += targetInitialX; - y += targetInitialY; - const angle = -frame.angle; - const key = frame.target === AnimFrameTarget.GRAPHIC ? g++ : frame.target === AnimFrameTarget.USER ? u++ : t++; - ret.get(frame.target)?.set(key, { x: x, y: y, scaleX: scaleX, scaleY: scaleY, angle: angle }); + const spriteCache: SpriteCache = { + [AnimFrameTarget.GRAPHIC]: [], + [AnimFrameTarget.USER]: [], + [AnimFrameTarget.TARGET]: [], + }; + const spritePriorities: number[] = []; + + const cleanUpAndComplete = () => { + userSprite.setPosition(0, 0); + userSprite.setScale(1); + userSprite.setAlpha(1); + userSprite.pipelineData["tone"] = [0.0, 0.0, 0.0, 0.0]; + userSprite.setAngle(0); + if (!targetSubstitute) { + targetSprite.setPosition(0, 0); + targetSprite.setScale(1); + targetSprite.setAlpha(1); + } else { + targetSprite.setPosition( + target.x - target.getSubstituteOffset()[0], + target.y - target.getSubstituteOffset()[1], + ); + targetSprite.setScale(target.getSpriteScale() * (target.isPlayer() ? 0.5 : 1)); + targetSprite.setAlpha(1); } + targetSprite.pipelineData["tone"] = [0.0, 0.0, 0.0, 0.0]; + targetSprite.setAngle(0); - return ret; + /** + * This and `targetSpriteToShow` are used to restore context lost + * from the `isOppAnim` swap. Using these references instead of `this.user` + * and `this.target` prevent the target's Substitute doll from disappearing + * after being the target of an animation. + */ + const userSpriteToShow = !isOppAnim ? userSprite : targetSprite; + const targetSpriteToShow = !isOppAnim ? targetSprite : userSprite; + if (!this.isHideUser() && userSpriteToShow) { + userSpriteToShow.setVisible(true); + } + if (!this.isHideTarget() && (targetSpriteToShow !== userSpriteToShow || !this.isHideUser())) { + targetSpriteToShow.setVisible(true); + } + for (const ms of Object.values(spriteCache).flat()) { + if (ms) { + ms.destroy(); + } + } + if (this.bgSprite) { + this.bgSprite.destroy(); + } + if (callback) { + callback(); + } + }; + + if (!globalScene.moveAnimations && !this.playRegardlessOfIssues) { + return cleanUpAndComplete(); } - /** - * @param targetInitialX - * @param targetInitialY - * @param frameTimeMult - * @param frameTimedEventPriority - * - 0 is behind all other sprites (except BG) - * - 1 on top of player field - * - 3 is on top of both fields - * - 5 is on top of player sprite - * @param callback - */ - playWithoutTargets(targetInitialX: number, targetInitialY: number, frameTimeMult: number, frameTimedEventPriority?: 0 | 1 | 3 | 5, callback?: Function) { - const spriteCache: SpriteCache = { - [AnimFrameTarget.GRAPHIC]: [], - [AnimFrameTarget.USER]: [], - [AnimFrameTarget.TARGET]: [] - }; + const anim = this.getAnim(); - const cleanUpAndComplete = () => { - for (const ms of Object.values(spriteCache).flat()) { - if (ms) { - ms.destroy(); - } + const userInitialX = user.x; + const userInitialY = user.y; + const targetInitialX = targetSubstitute?.sprite?.x ?? target.x; + const targetInitialY = targetSubstitute?.sprite?.y ?? target.y; + + this.srcLine = [userFocusX, userFocusY, targetFocusX, targetFocusY]; + this.dstLine = [userInitialX, userInitialY, targetInitialX, targetInitialY]; + + let r = anim?.frames.length ?? 0; + let f = 0; + + globalScene.tweens.addCounter({ + duration: getFrameMs(3), + repeat: anim?.frames.length ?? 0, + onRepeat: () => { + if (!f) { + userSprite.setVisible(false); + targetSprite.setVisible(false); } - if (this.bgSprite) { - this.bgSprite.destroy(); - } - if (callback) { - callback(); - } - }; - if (!globalScene.moveAnimations && !this.playRegardlessOfIssues) { - return cleanUpAndComplete(); - } - - const anim = this.getAnim(); - - this.srcLine = [ userFocusX, userFocusY, targetFocusX, targetFocusY ]; - this.dstLine = [ 150, 75, targetInitialX, targetInitialY ]; - - let totalFrames = anim!.frames.length; - let frameCount = 0; - - let existingFieldSprites = globalScene.field.getAll().slice(0); - - globalScene.tweens.addCounter({ - duration: Utils.getFrameMs(3) * frameTimeMult, - repeat: anim!.frames.length, - onRepeat: () => { - existingFieldSprites = globalScene.field.getAll().slice(0); - const spriteFrames = anim!.frames[frameCount]; - const frameData = this.getGraphicFrameDataWithoutTarget(anim!.frames[frameCount], targetInitialX, targetInitialY); - let graphicFrameCount = 0; - for (const frame of spriteFrames) { - if (frame.target !== AnimFrameTarget.GRAPHIC) { - console.log("Encounter animations do not support targets"); + const spriteFrames = anim!.frames[f]; // TODO: is the bang correcT? + const frameData = this.getGraphicFrameData(anim!.frames[f], onSubstitute); // TODO: is the bang correct? + let u = 0; + let t = 0; + let g = 0; + for (const frame of spriteFrames) { + if (frame.target !== AnimFrameTarget.GRAPHIC) { + const isUser = frame.target === AnimFrameTarget.USER; + if (isUser && target === user) { continue; } - - const sprites = spriteCache[AnimFrameTarget.GRAPHIC]; - if (graphicFrameCount === sprites.length) { - const newSprite: Phaser.GameObjects.Sprite = globalScene.addFieldSprite(0, 0, anim!.graphic, 1); - sprites.push(newSprite); - globalScene.field.add(newSprite); + if (this.playRegardlessOfIssues && frame.target === AnimFrameTarget.TARGET && !target.isOnField()) { + continue; + } + const sprites = spriteCache[isUser ? AnimFrameTarget.USER : AnimFrameTarget.TARGET]; + const spriteSource = isUser ? userSprite : targetSprite; + if ((isUser ? u : t) === sprites.length) { + if (isUser || !targetSubstitute) { + const sprite = globalScene.addPokemonSprite( + isUser ? user! : target, + 0, + 0, + spriteSource!.texture, + spriteSource!.frame.name, + true, + ); // TODO: are those bangs correct? + ["spriteColors", "fusionSpriteColors"].map( + k => (sprite.pipelineData[k] = (isUser ? user! : target).getSprite().pipelineData[k]), + ); // TODO: are those bangs correct? + sprite.setPipelineData("spriteKey", (isUser ? user! : target).getBattleSpriteKey()); + sprite.setPipelineData("shiny", (isUser ? user : target).shiny); + sprite.setPipelineData("variant", (isUser ? user : target).variant); + sprite.setPipelineData("ignoreFieldPos", true); + spriteSource.on("animationupdate", (_anim, frame) => sprite.setFrame(frame.textureFrame)); + globalScene.field.add(sprite); + sprites.push(sprite); + } else { + const sprite = globalScene.addFieldSprite(spriteSource.x, spriteSource.y, spriteSource.texture); + spriteSource.on("animationupdate", (_anim, frame) => sprite.setFrame(frame.textureFrame)); + globalScene.field.add(sprite); + sprites.push(sprite); + } } - const graphicIndex = graphicFrameCount++; + const spriteIndex = isUser ? u++ : t++; + const pokemonSprite = sprites[spriteIndex]; + const graphicFrameData = frameData.get(frame.target)!.get(spriteIndex)!; // TODO: are the bangs correct? + const spriteSourceScale = + isUser || !targetSubstitute + ? spriteSource.parentContainer.scale + : target.getSpriteScale() * (target.isPlayer() ? 0.5 : 1); + pokemonSprite.setPosition( + graphicFrameData.x, + graphicFrameData.y - (spriteSource.height / 2) * (spriteSourceScale - 1), + ); + + pokemonSprite.setAngle(graphicFrameData.angle); + pokemonSprite.setScale( + graphicFrameData.scaleX * spriteSourceScale, + graphicFrameData.scaleY * spriteSourceScale, + ); + + pokemonSprite.setData("locked", frame.locked); + + pokemonSprite.setAlpha(frame.opacity / 255); + pokemonSprite.pipelineData["tone"] = frame.tone; + pokemonSprite.setVisible(frame.visible && (isUser ? user.visible : target.visible)); + pokemonSprite.setBlendMode( + frame.blendType === AnimBlendType.NORMAL + ? Phaser.BlendModes.NORMAL + : frame.blendType === AnimBlendType.ADD + ? Phaser.BlendModes.ADD + : Phaser.BlendModes.DIFFERENCE, + ); + } else { + const sprites = spriteCache[AnimFrameTarget.GRAPHIC]; + if (g === sprites.length) { + const newSprite: Phaser.GameObjects.Sprite = globalScene.addFieldSprite(0, 0, anim!.graphic, 1); // TODO: is the bang correct? + sprites.push(newSprite); + globalScene.field.add(newSprite); + spritePriorities.push(1); + } + + const graphicIndex = g++; const moveSprite = sprites[graphicIndex]; - if (!isNullOrUndefined(frame.priority)) { - const setSpritePriority = (priority: integer) => { - if (existingFieldSprites.length > priority) { - // Move to specified priority index - const index = globalScene.field.getIndex(existingFieldSprites[priority]); - globalScene.field.moveTo(moveSprite, index); - } else { - // Move to top of scene - globalScene.field.moveTo(moveSprite, globalScene.field.getAll().length - 1); + if (spritePriorities[graphicIndex] !== frame.priority) { + spritePriorities[graphicIndex] = frame.priority; + /** Move the position that the moveSprite is rendered in based on the priority. + * @param priority The priority level to draw the sprite. + * - 0: Draw the sprite in front of the pokemon on the field. + * - 1: Draw the sprite in front of the user pokemon. + * - 2: Draw the sprite in front of its `bgSprite` (if it has one), or its + * `AnimFocus` (if that is user/target), otherwise behind everything. + * - 3: Draw the sprite behind its `AnimFocus` (if that is user/target), otherwise in front of everything. + */ + const setSpritePriority = (priority: number) => { + /** The sprite we are moving the moveSprite in relation to */ + let targetSprite: Phaser.GameObjects.GameObject | nil; + /** The method that is being used to move the sprite.*/ + let moveFunc: + | ((sprite: Phaser.GameObjects.GameObject, target: Phaser.GameObjects.GameObject) => void) + | ((sprite: Phaser.GameObjects.GameObject) => void) = globalScene.field.bringToTop; + + if (priority === 0) { + // Place the sprite in front of the pokemon on the field. + targetSprite = globalScene.getEnemyField().find(p => p) ?? globalScene.getPlayerField().find(p => p); + console.log(typeof targetSprite); + moveFunc = globalScene.field.moveBelow; + } else if (priority === 2 && this.bgSprite) { + moveFunc = globalScene.field.moveAbove; + targetSprite = this.bgSprite; + } else if (priority === 2 || priority === 3) { + moveFunc = priority === 2 ? globalScene.field.moveBelow : globalScene.field.moveAbove; + if (frame.focus === AnimFocus.USER) { + targetSprite = this.user; + } else if (frame.focus === AnimFocus.TARGET) { + targetSprite = this.target; + } } + // If target sprite is not undefined and exists in the field container, then move the sprite using the moveFunc. + // Otherwise, default to just bringing it to the top. + targetSprite && globalScene.field.exists(targetSprite) + ? moveFunc.bind(globalScene.field)(moveSprite as Phaser.GameObjects.GameObject, targetSprite) + : globalScene.field.bringToTop(moveSprite as Phaser.GameObjects.GameObject); }; setSpritePriority(frame.priority); } moveSprite.setFrame(frame.graphicFrame); + //console.log(AnimFocus[frame.focus]); - const graphicFrameData = frameData.get(frame.target)?.get(graphicIndex); - if (graphicFrameData) { - moveSprite.setPosition(graphicFrameData.x, graphicFrameData.y); - moveSprite.setAngle(graphicFrameData.angle); - moveSprite.setScale(graphicFrameData.scaleX, graphicFrameData.scaleY); + const graphicFrameData = frameData.get(frame.target)!.get(graphicIndex)!; // TODO: are those bangs correct? + moveSprite.setPosition(graphicFrameData.x, graphicFrameData.y); + moveSprite.setAngle(graphicFrameData.angle); + moveSprite.setScale(graphicFrameData.scaleX, graphicFrameData.scaleY); - moveSprite.setAlpha(frame.opacity / 255); - moveSprite.setVisible(frame.visible); - moveSprite.setBlendMode(frame.blendType === AnimBlendType.NORMAL ? Phaser.BlendModes.NORMAL : frame.blendType === AnimBlendType.ADD ? Phaser.BlendModes.ADD : Phaser.BlendModes.DIFFERENCE); - } + moveSprite.setAlpha(frame.opacity / 255); + moveSprite.setVisible(frame.visible); + moveSprite.setBlendMode( + frame.blendType === AnimBlendType.NORMAL + ? Phaser.BlendModes.NORMAL + : frame.blendType === AnimBlendType.ADD + ? Phaser.BlendModes.ADD + : Phaser.BlendModes.DIFFERENCE, + ); } - if (anim?.frameTimedEvents.get(frameCount)) { - for (const event of anim.frameTimedEvents.get(frameCount)!) { - totalFrames = Math.max((anim.frames.length - frameCount) + event.execute(this, frameTimedEventPriority), totalFrames); - } + } + if (anim?.frameTimedEvents.has(f)) { + const base = anim.frames.length - f; + // Bang is correct due to `has` check above, which cannot return true for an undefined / null `f` + for (const event of anim.frameTimedEvents.get(f)!) { + r = Math.max(base + event.execute(this), r); } - const targets = Utils.getEnumValues(AnimFrameTarget); - for (const i of targets) { - const count = graphicFrameCount; - if (count < spriteCache[i].length) { - const spritesToRemove = spriteCache[i].slice(count, spriteCache[i].length); - for (const sprite of spritesToRemove) { - if (!sprite.getData("locked") as boolean) { - const spriteCacheIndex = spriteCache[i].indexOf(sprite); - spriteCache[i].splice(spriteCacheIndex, 1); - sprite.destroy(); + } + const targets = getEnumValues(AnimFrameTarget); + for (const i of targets) { + const count = i === AnimFrameTarget.GRAPHIC ? g : i === AnimFrameTarget.USER ? u : t; + if (count < spriteCache[i].length) { + const spritesToRemove = spriteCache[i].slice(count, spriteCache[i].length); + for (const rs of spritesToRemove) { + if (!rs.getData("locked") as boolean) { + const spriteCacheIndex = spriteCache[i].indexOf(rs); + spriteCache[i].splice(spriteCacheIndex, 1); + if (i === AnimFrameTarget.GRAPHIC) { + spritePriorities.splice(spriteCacheIndex, 1); } + rs.destroy(); } } } - frameCount++; - totalFrames--; - }, - onComplete: () => { - for (const sprite of Object.values(spriteCache).flat()) { - if (sprite && !sprite.getData("locked")) { - sprite.destroy(); - } - } - if (totalFrames) { - globalScene.tweens.addCounter({ - duration: Utils.getFrameMs(totalFrames), - onComplete: () => cleanUpAndComplete() - }); - } else { - cleanUpAndComplete(); + } + f++; + r--; + }, + onComplete: () => { + for (const ms of Object.values(spriteCache).flat()) { + if (ms && !ms.getData("locked")) { + ms.destroy(); } } + if (r) { + globalScene.tweens.addCounter({ + duration: getFrameMs(r), + onComplete: () => cleanUpAndComplete(), + }); + } else { + cleanUpAndComplete(); + } + }, + }); + } + + private getGraphicFrameDataWithoutTarget( + frames: AnimFrame[], + targetInitialX: number, + targetInitialY: number, + ): Map> { + const ret: Map> = new Map([ + [AnimFrameTarget.GRAPHIC, new Map()], + [AnimFrameTarget.USER, new Map()], + [AnimFrameTarget.TARGET, new Map()], + ]); + + let g = 0; + let u = 0; + let t = 0; + + for (const frame of frames) { + let { x, y } = frame; + const scaleX = (frame.zoomX / 100) * (!frame.mirror ? 1 : -1); + const scaleY = frame.zoomY / 100; + x += targetInitialX; + y += targetInitialY; + const angle = -frame.angle; + const key = frame.target === AnimFrameTarget.GRAPHIC ? g++ : frame.target === AnimFrameTarget.USER ? u++ : t++; + ret.get(frame.target)?.set(key, { + x: x, + y: y, + scaleX: scaleX, + scaleY: scaleY, + angle: angle, }); } + + return ret; + } + + /** + * @param targetInitialX + * @param targetInitialY + * @param frameTimeMult + * @param frameTimedEventPriority + * - 0 is behind all other sprites (except BG) + * - 1 on top of player field + * - 3 is on top of both fields + * - 5 is on top of player sprite + * @param callback + */ + playWithoutTargets( + targetInitialX: number, + targetInitialY: number, + frameTimeMult: number, + frameTimedEventPriority?: 0 | 1 | 3 | 5, + // biome-ignore lint/complexity/noBannedTypes: callback is used liberally + callback?: Function, + ) { + const spriteCache: SpriteCache = { + [AnimFrameTarget.GRAPHIC]: [], + [AnimFrameTarget.USER]: [], + [AnimFrameTarget.TARGET]: [], + }; + + const cleanUpAndComplete = () => { + for (const ms of Object.values(spriteCache).flat()) { + if (ms) { + ms.destroy(); + } + } + if (this.bgSprite) { + this.bgSprite.destroy(); + } + if (callback) { + callback(); + } + }; + + if (!globalScene.moveAnimations && !this.playRegardlessOfIssues) { + return cleanUpAndComplete(); + } + + const anim = this.getAnim(); + + this.srcLine = [userFocusX, userFocusY, targetFocusX, targetFocusY]; + this.dstLine = [150, 75, targetInitialX, targetInitialY]; + + let totalFrames = anim!.frames.length; + let frameCount = 0; + + let existingFieldSprites = globalScene.field.getAll().slice(0); + + globalScene.tweens.addCounter({ + duration: getFrameMs(3) * frameTimeMult, + repeat: anim!.frames.length, + onRepeat: () => { + existingFieldSprites = globalScene.field.getAll().slice(0); + const spriteFrames = anim!.frames[frameCount]; + const frameData = this.getGraphicFrameDataWithoutTarget( + anim!.frames[frameCount], + targetInitialX, + targetInitialY, + ); + let graphicFrameCount = 0; + for (const frame of spriteFrames) { + if (frame.target !== AnimFrameTarget.GRAPHIC) { + console.log("Encounter animations do not support targets"); + continue; + } + + const sprites = spriteCache[AnimFrameTarget.GRAPHIC]; + if (graphicFrameCount === sprites.length) { + const newSprite: Phaser.GameObjects.Sprite = globalScene.addFieldSprite(0, 0, anim!.graphic, 1); + sprites.push(newSprite); + globalScene.field.add(newSprite); + } + + const graphicIndex = graphicFrameCount++; + const moveSprite = sprites[graphicIndex]; + if (!isNullOrUndefined(frame.priority)) { + const setSpritePriority = (priority: number) => { + if (existingFieldSprites.length > priority) { + // Move to specified priority index + const index = globalScene.field.getIndex(existingFieldSprites[priority]); + globalScene.field.moveTo(moveSprite, index); + } else { + // Move to top of scene + globalScene.field.moveTo(moveSprite, globalScene.field.getAll().length - 1); + } + }; + setSpritePriority(frame.priority); + } + moveSprite.setFrame(frame.graphicFrame); + + const graphicFrameData = frameData.get(frame.target)?.get(graphicIndex); + if (graphicFrameData) { + moveSprite.setPosition(graphicFrameData.x, graphicFrameData.y); + moveSprite.setAngle(graphicFrameData.angle); + moveSprite.setScale(graphicFrameData.scaleX, graphicFrameData.scaleY); + + moveSprite.setAlpha(frame.opacity / 255); + moveSprite.setVisible(frame.visible); + moveSprite.setBlendMode( + frame.blendType === AnimBlendType.NORMAL + ? Phaser.BlendModes.NORMAL + : frame.blendType === AnimBlendType.ADD + ? Phaser.BlendModes.ADD + : Phaser.BlendModes.DIFFERENCE, + ); + } + } + if (anim?.frameTimedEvents.get(frameCount)) { + const base = anim.frames.length - frameCount; + for (const event of anim.frameTimedEvents.get(frameCount)!) { + totalFrames = Math.max(base + event.execute(this, frameTimedEventPriority), totalFrames); + } + } + const targets = getEnumValues(AnimFrameTarget); + for (const i of targets) { + const count = graphicFrameCount; + if (count < spriteCache[i].length) { + const spritesToRemove = spriteCache[i].slice(count, spriteCache[i].length); + for (const sprite of spritesToRemove) { + if (!sprite.getData("locked") as boolean) { + const spriteCacheIndex = spriteCache[i].indexOf(sprite); + spriteCache[i].splice(spriteCacheIndex, 1); + sprite.destroy(); + } + } + } + } + frameCount++; + totalFrames--; + }, + onComplete: () => { + for (const sprite of Object.values(spriteCache).flat()) { + if (sprite && !sprite.getData("locked")) { + sprite.destroy(); + } + } + if (totalFrames) { + globalScene.tweens.addCounter({ + duration: getFrameMs(totalFrames), + onComplete: () => cleanUpAndComplete(), + }); + } else { + cleanUpAndComplete(); + } + }, + }); + } } export class CommonBattleAnim extends BattleAnim { public commonAnim: CommonAnim | null; - constructor(commonAnim: CommonAnim | null, user: Pokemon, target?: Pokemon, playOnEmptyField: boolean = false) { + constructor(commonAnim: CommonAnim | null, user: Pokemon, target?: Pokemon, playOnEmptyField = false) { super(user, target || user, playOnEmptyField); this.commonAnim = commonAnim; } getAnim(): AnimConfig | null { - return this.commonAnim ? commonAnims.get(this.commonAnim) ?? null : null; + return this.commonAnim ? (commonAnims.get(this.commonAnim) ?? null) : null; } isOppAnim(): boolean { @@ -1275,7 +1428,7 @@ export class CommonBattleAnim extends BattleAnim { export class MoveAnim extends BattleAnim { public move: Moves; - constructor(move: Moves, user: Pokemon, target: BattlerIndex, playOnEmptyField: boolean = false) { + constructor(move: Moves, user: Pokemon, target: BattlerIndex, playOnEmptyField = false) { super(user, globalScene.getField()[target], playOnEmptyField); this.move = move; @@ -1283,8 +1436,8 @@ export class MoveAnim extends BattleAnim { getAnim(): AnimConfig { return moveAnims.get(this.move) instanceof AnimConfig - ? moveAnims.get(this.move) as AnimConfig - : moveAnims.get(this.move)?.[this.user?.isPlayer() ? 0 : 1] as AnimConfig; + ? (moveAnims.get(this.move) as AnimConfig) + : (moveAnims.get(this.move)?.[this.user?.isPlayer() ? 0 : 1] as AnimConfig); } isOppAnim(): boolean { @@ -1315,8 +1468,8 @@ export class MoveChargeAnim extends MoveAnim { getAnim(): AnimConfig { return chargeAnims.get(this.chargeAnim) instanceof AnimConfig - ? chargeAnims.get(this.chargeAnim) as AnimConfig - : chargeAnims.get(this.chargeAnim)?.[this.user?.isPlayer() ? 0 : 1] as AnimConfig; + ? (chargeAnims.get(this.chargeAnim) as AnimConfig) + : (chargeAnims.get(this.chargeAnim)?.[this.user?.isPlayer() ? 0 : 1] as AnimConfig); } } @@ -1341,22 +1494,22 @@ export class EncounterBattleAnim extends BattleAnim { } export async function populateAnims() { - const commonAnimNames = Utils.getEnumKeys(CommonAnim).map(k => k.toLowerCase()); + const commonAnimNames = getEnumKeys(CommonAnim).map(k => k.toLowerCase()); const commonAnimMatchNames = commonAnimNames.map(k => k.replace(/\_/g, "")); - const commonAnimIds = Utils.getEnumValues(CommonAnim) as CommonAnim[]; - const chargeAnimNames = Utils.getEnumKeys(ChargeAnim).map(k => k.toLowerCase()); + const commonAnimIds = getEnumValues(CommonAnim) as CommonAnim[]; + const chargeAnimNames = getEnumKeys(ChargeAnim).map(k => k.toLowerCase()); const chargeAnimMatchNames = chargeAnimNames.map(k => k.replace(/\_/g, " ")); - const chargeAnimIds = Utils.getEnumValues(ChargeAnim) as ChargeAnim[]; + const chargeAnimIds = getEnumValues(ChargeAnim) as ChargeAnim[]; const commonNamePattern = /name: (?:Common:)?(Opp )?(.*)/; const moveNameToId = {}; - for (const move of Utils.getEnumValues(Moves).slice(1)) { + for (const move of getEnumValues(Moves).slice(1)) { const moveName = Moves[move].toUpperCase().replace(/\_/g, ""); moveNameToId[moveName] = move; } - const seNames: string[] = [];//(await fs.readdir('./public/audio/se/battle_anims/')).map(se => se.toString()); + const seNames: string[] = []; //(await fs.readdir('./public/audio/se/battle_anims/')).map(se => se.toString()); - const animsData : any[] = [];//battleAnimRawData.split('!ruby/array:PBAnimation').slice(1); // TODO: add a proper type + const animsData: any[] = []; //battleAnimRawData.split('!ruby/array:PBAnimation').slice(1); // TODO: add a proper type for (let a = 0; a < animsData.length; a++) { const fields = animsData[a].split("@").slice(1); @@ -1387,51 +1540,84 @@ export async function populateAnims() { if (commonAnimId) { commonAnims.set(commonAnimId, anim); } else if (chargeAnimId) { - chargeAnims.set(chargeAnimId, !isOppMove ? anim : [ chargeAnims.get(chargeAnimId) as AnimConfig, anim ]); + chargeAnims.set(chargeAnimId, !isOppMove ? anim : [chargeAnims.get(chargeAnimId) as AnimConfig, anim]); } else { - moveAnims.set(moveNameToId[animName], !isOppMove ? anim as AnimConfig : [ moveAnims.get(moveNameToId[animName]) as AnimConfig, anim as AnimConfig ]); + moveAnims.set( + moveNameToId[animName], + !isOppMove ? (anim as AnimConfig) : [moveAnims.get(moveNameToId[animName]) as AnimConfig, anim as AnimConfig], + ); } for (let f = 0; f < fields.length; f++) { const field = fields[f]; const fieldName = field.slice(0, field.indexOf(":")); const fieldData = field.slice(fieldName.length + 1, field.lastIndexOf("\n")).trim(); switch (fieldName) { - case "array": + case "array": { const framesData = fieldData.split(" - - - ").slice(1); for (let fd = 0; fd < framesData.length; fd++) { anim.frames.push([]); const frameData = framesData[fd]; const focusFramesData = frameData.split(" - - "); for (let tf = 0; tf < focusFramesData.length; tf++) { - const values = focusFramesData[tf].replace(/ \- /g, "").split("\n"); - const targetFrame = new AnimFrame(parseFloat(values[0]), parseFloat(values[1]), parseFloat(values[2]), parseFloat(values[11]), parseFloat(values[3]), - parseInt(values[4]) === 1, parseInt(values[6]) === 1, parseInt(values[5]), parseInt(values[7]), parseInt(values[8]), parseInt(values[12]), parseInt(values[13]), - parseInt(values[14]), parseInt(values[15]), parseInt(values[16]), parseInt(values[17]), parseInt(values[18]), parseInt(values[19]), - parseInt(values[21]), parseInt(values[22]), parseInt(values[23]), parseInt(values[24]), parseInt(values[20]) === 1, parseInt(values[25]), parseInt(values[26]) as AnimFocus); + const values = focusFramesData[tf].replace(/ {6}\- /g, "").split("\n"); + const targetFrame = new AnimFrame( + Number.parseFloat(values[0]), + Number.parseFloat(values[1]), + Number.parseFloat(values[2]), + Number.parseFloat(values[11]), + Number.parseFloat(values[3]), + Number.parseInt(values[4]) === 1, + Number.parseInt(values[6]) === 1, + Number.parseInt(values[5]), + Number.parseInt(values[7]), + Number.parseInt(values[8]), + Number.parseInt(values[12]), + Number.parseInt(values[13]), + Number.parseInt(values[14]), + Number.parseInt(values[15]), + Number.parseInt(values[16]), + Number.parseInt(values[17]), + Number.parseInt(values[18]), + Number.parseInt(values[19]), + Number.parseInt(values[21]), + Number.parseInt(values[22]), + Number.parseInt(values[23]), + Number.parseInt(values[24]), + Number.parseInt(values[20]) === 1, + Number.parseInt(values[25]), + Number.parseInt(values[26]) as AnimFocus, + ); anim.frames[fd].push(targetFrame); } } break; - case "graphic": + } + case "graphic": { const graphic = fieldData !== "''" ? fieldData : ""; - anim.graphic = graphic.indexOf(".") > -1 - ? graphic.slice(0, fieldData.indexOf(".")) - : graphic; + anim.graphic = graphic.indexOf(".") > -1 ? graphic.slice(0, fieldData.indexOf(".")) : graphic; break; - case "timing": + } + case "timing": { const timingEntries = fieldData.split("- !ruby/object:PBAnimTiming ").slice(1); for (let t = 0; t < timingEntries.length; t++) { - const timingData = timingEntries[t].replace(/\n/g, " ").replace(/[ ]{2,}/g, " ").replace(/[a-z]+: ! '', /ig, "").replace(/name: (.*?),/, "name: \"$1\",") - .replace(/flashColor: !ruby\/object:Color { alpha: ([\d\.]+), blue: ([\d\.]+), green: ([\d\.]+), red: ([\d\.]+)}/, "flashRed: $4, flashGreen: $3, flashBlue: $2, flashAlpha: $1"); - const frameIndex = parseInt(/frame: (\d+)/.exec(timingData)![1]); // TODO: is the bang correct? + const timingData = timingEntries[t] + .replace(/\n/g, " ") + .replace(/[ ]{2,}/g, " ") + .replace(/[a-z]+: ! '', /gi, "") + .replace(/name: (.*?),/, 'name: "$1",') + .replace( + /flashColor: !ruby\/object:Color { alpha: ([\d\.]+), blue: ([\d\.]+), green: ([\d\.]+), red: ([\d\.]+)}/, + "flashRed: $4, flashGreen: $3, flashBlue: $2, flashAlpha: $1", + ); + const frameIndex = Number.parseInt(/frame: (\d+)/.exec(timingData)![1]); // TODO: is the bang correct? let resourceName = /name: "(.*?)"/.exec(timingData)![1].replace("''", ""); // TODO: is the bang correct? - const timingType = parseInt(/timingType: (\d)/.exec(timingData)![1]); // TODO: is the bang correct? + const timingType = Number.parseInt(/timingType: (\d)/.exec(timingData)![1]); // TODO: is the bang correct? let timedEvent: AnimTimedEvent | undefined; switch (timingType) { case 0: if (resourceName && resourceName.indexOf(".") === -1) { let ext: string | undefined; - [ "wav", "mp3", "m4a" ].every(e => { + ["wav", "mp3", "m4a"].every(e => { if (seNames.indexOf(`${resourceName}.${e}`) > -1) { ext = e; return false; @@ -1455,15 +1641,16 @@ export async function populateAnims() { if (!timedEvent) { continue; } - const propPattern = /([a-z]+): (.*?)(?:,|\})/ig; + const propPattern = /([a-z]+): (.*?)(?:,|\})/gi; let propMatch: RegExpExecArray; - while ((propMatch = propPattern.exec(timingData)!)) { // TODO: is this bang correct? + while ((propMatch = propPattern.exec(timingData)!)) { + // TODO: is this bang correct? const prop = propMatch[1]; let value: any = propMatch[2]; switch (prop) { case "bgX": case "bgY": - value = parseFloat(value); + value = Number.parseFloat(value); break; case "volume": case "pitch": @@ -1479,7 +1666,7 @@ export async function populateAnims() { case "flashBlue": case "flashAlpha": case "flashDuration": - value = parseInt(value); + value = Number.parseInt(value); break; } if (timedEvent.hasOwnProperty(prop)) { @@ -1489,21 +1676,21 @@ export async function populateAnims() { if (!anim.frameTimedEvents.has(frameIndex)) { anim.frameTimedEvents.set(frameIndex, []); } - anim.frameTimedEvents.get(frameIndex)!.push(timedEvent); // TODO: is this bang correct? + anim.frameTimedEvents.get(frameIndex)!.push(timedEvent); // TODO: is this bang correct? } break; + } case "position": - anim.position = parseInt(fieldData); + anim.position = Number.parseInt(fieldData); break; case "hue": - anim.hue = parseInt(fieldData); + anim.hue = Number.parseInt(fieldData); break; } } } - // used in commented code - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // biome-ignore lint/correctness/noUnusedVariables: used in commented code const animReplacer = (k, v) => { if (k === "id" && !v) { return undefined; @@ -1517,12 +1704,29 @@ export async function populateAnims() { return v; }; - const animConfigProps = [ "id", "graphic", "frames", "frameTimedEvents", "position", "hue" ]; - const animFrameProps = [ "x", "y", "zoomX", "zoomY", "angle", "mirror", "visible", "blendType", "target", "graphicFrame", "opacity", "color", "tone", "flash", "locked", "priority", "focus" ]; - const propSets = [ animConfigProps, animFrameProps ]; + const animConfigProps = ["id", "graphic", "frames", "frameTimedEvents", "position", "hue"]; + const animFrameProps = [ + "x", + "y", + "zoomX", + "zoomY", + "angle", + "mirror", + "visible", + "blendType", + "target", + "graphicFrame", + "opacity", + "color", + "tone", + "flash", + "locked", + "priority", + "focus", + ]; + const propSets = [animConfigProps, animFrameProps]; - // used in commented code - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // biome-ignore lint/correctness/noUnusedVariables: used in commented code const animComparator = (a: Element, b: Element) => { let props: string[]; for (let p = 0; p < propSets.length; p++) { diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 4c68de5abc5..43a7072fd12 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -5,23 +5,23 @@ import { BlockNonDirectDamageAbAttr, FlinchEffectAbAttr, ProtectStatAbAttr, - ReverseDrainAbAttr + ReverseDrainAbAttr, } from "#app/data/ability"; import { ChargeAnim, CommonAnim, CommonBattleAnim, MoveChargeAnim } from "#app/data/battle-anims"; -import type Move from "#app/data/move"; +import type Move from "#app/data/moves/move"; import { allMoves, applyMoveAttrs, ConsecutiveUseDoublePowerAttr, HealOnAllyAttr, - MoveCategory, - MoveFlags, - StatusCategoryOnAllyAttr -} from "#app/data/move"; + StatusCategoryOnAllyAttr, +} from "#app/data/moves/move"; +import { MoveFlags } from "#enums/MoveFlags"; +import { MoveCategory } from "#enums/MoveCategory"; import { SpeciesFormChangeAbilityTrigger } from "#app/data/pokemon-forms"; import { getStatusEffectHealText } from "#app/data/status-effect"; import { TerrainType } from "#app/data/terrain"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import type Pokemon from "#app/field/pokemon"; import { HitResult, MoveResult } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; @@ -42,6 +42,7 @@ import { Species } from "#enums/species"; import { EFFECTIVE_STATS, getStatKey, Stat, type BattleStat, type EffectiveStat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; +import * as Utils from "../utils"; export enum BattlerTagLapseType { FAINT, @@ -52,7 +53,7 @@ export enum BattlerTagLapseType { TURN_END, HIT, AFTER_HIT, - CUSTOM + CUSTOM, } export class BattlerTag { @@ -63,26 +64,33 @@ export class BattlerTag { public sourceId?: number; public isBatonPassable: boolean; - constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType | BattlerTagLapseType[], turnCount: number, sourceMove?: Moves, sourceId?: number, isBatonPassable: boolean = false) { + constructor( + tagType: BattlerTagType, + lapseType: BattlerTagLapseType | BattlerTagLapseType[], + turnCount: number, + sourceMove?: Moves, + sourceId?: number, + isBatonPassable = false, + ) { this.tagType = tagType; - this.lapseTypes = Array.isArray(lapseType) ? lapseType : [ lapseType ]; + this.lapseTypes = Array.isArray(lapseType) ? lapseType : [lapseType]; this.turnCount = turnCount; this.sourceMove = sourceMove!; // TODO: is this bang correct? this.sourceId = sourceId; this.isBatonPassable = isBatonPassable; } - canAdd(pokemon: Pokemon): boolean { + canAdd(_pokemon: Pokemon): boolean { return true; } - onAdd(pokemon: Pokemon): void { } + onAdd(_pokemon: Pokemon): void {} - onRemove(pokemon: Pokemon): void { } + onRemove(_pokemon: Pokemon): void {} - onOverlap(pokemon: Pokemon): void { } + onOverlap(_pokemon: Pokemon): void {} - lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { + lapse(_pokemon: Pokemon, _lapseType: BattlerTagLapseType): boolean { return --this.turnCount > 0; } @@ -95,16 +103,14 @@ export class BattlerTag { } getMoveName(): string | null { - return this.sourceMove - ? allMoves[this.sourceMove].name - : null; + return this.sourceMove ? allMoves[this.sourceMove].name : null; } /** - * When given a battler tag or json representing one, load the data for it. - * This is meant to be inherited from by any battler tag with custom attributes - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * This is meant to be inherited from by any battler tag with custom attributes + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { this.turnCount = source.turnCount; this.sourceMove = source.sourceMove; @@ -137,7 +143,13 @@ export interface TerrainBattlerTag { * to select restricted moves. */ export abstract class MoveRestrictionBattlerTag extends BattlerTag { - constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType | BattlerTagLapseType[], turnCount: integer, sourceMove?: Moves, sourceId?: integer) { + constructor( + tagType: BattlerTagType, + lapseType: BattlerTagLapseType | BattlerTagLapseType[], + turnCount: number, + sourceMove?: Moves, + sourceId?: number, + ) { super(tagType, lapseType, turnCount, sourceMove, sourceId); } @@ -173,12 +185,12 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag { /** * Checks if this tag is restricting a move based on a user's decisions during the target selection phase * - * @param {Moves} move {@linkcode Moves} move ID to check restriction for - * @param {Pokemon} user {@linkcode Pokemon} the user of the above move - * @param {Pokemon} target {@linkcode Pokemon} the target of the above move + * @param {Moves} _move {@linkcode Moves} move ID to check restriction for + * @param {Pokemon} _user {@linkcode Pokemon} the user of the above move + * @param {Pokemon} _target {@linkcode Pokemon} the target of the above move * @returns {boolean} `false` unless overridden by the child tag */ - isMoveTargetRestricted(move: Moves, user: Pokemon, target: Pokemon): boolean { + isMoveTargetRestricted(_move: Moves, _user: Pokemon, _target: Pokemon): boolean { return false; } @@ -196,11 +208,11 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag { * Because restriction effects also prevent selection of the move, this situation can only arise if a * pokemon first selects a move, then gets outsped by a pokemon using a move that restricts the selected move. * - * @param {Pokemon} pokemon {@linkcode Pokemon} attempting to use the restricted move - * @param {Moves} move {@linkcode Moves} ID of the move being interrupted + * @param {Pokemon} _pokemon {@linkcode Pokemon} attempting to use the restricted move + * @param {Moves} _move {@linkcode Moves} ID of the move being interrupted * @returns {string} text to display when the move is interrupted */ - interruptedText(pokemon: Pokemon, move: Moves): string { + interruptedText(_pokemon: Pokemon, _move: Moves): string { return ""; } } @@ -212,7 +224,12 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag { */ export class ThroatChoppedTag extends MoveRestrictionBattlerTag { constructor() { - super(BattlerTagType.THROAT_CHOPPED, [ BattlerTagLapseType.TURN_END, BattlerTagLapseType.PRE_MOVE ], 2, Moves.THROAT_CHOP); + super( + BattlerTagType.THROAT_CHOPPED, + [BattlerTagLapseType.TURN_END, BattlerTagLapseType.PRE_MOVE], + 2, + Moves.THROAT_CHOP, + ); } /** @@ -228,23 +245,27 @@ export class ThroatChoppedTag extends MoveRestrictionBattlerTag { /** * Shows a message when the player attempts to select a move that is restricted by Throat Chop. * @override - * @param {Pokemon} pokemon the {@linkcode Pokemon} that is attempting to select the restricted move + * @param {Pokemon} _pokemon the {@linkcode Pokemon} that is attempting to select the restricted move * @param {Moves} move the {@linkcode Moves | move} that is being restricted * @returns the message to display when the player attempts to select the restricted move */ - override selectionDeniedText(pokemon: Pokemon, move: Moves): string { - return i18next.t("battle:moveCannotBeSelected", { moveName: allMoves[move].name }); + override selectionDeniedText(_pokemon: Pokemon, move: Moves): string { + return i18next.t("battle:moveCannotBeSelected", { + moveName: allMoves[move].name, + }); } /** * Shows a message when a move is interrupted by Throat Chop. * @override * @param {Pokemon} pokemon the interrupted {@linkcode Pokemon} - * @param {Moves} move the {@linkcode Moves | move} that was interrupted + * @param {Moves} _move the {@linkcode Moves | move} that was interrupted * @returns the message to display when the move is interrupted */ - override interruptedText(pokemon: Pokemon, move: Moves): string { - return i18next.t("battle:throatChopInterruptedMove", { pokemonName: getPokemonNameWithAffix(pokemon) }); + override interruptedText(pokemon: Pokemon, _move: Moves): string { + return i18next.t("battle:throatChopInterruptedMove", { + pokemonName: getPokemonNameWithAffix(pokemon), + }); } } @@ -257,7 +278,13 @@ export class DisabledTag extends MoveRestrictionBattlerTag { private moveId: Moves = Moves.NONE; constructor(sourceId: number) { - super(BattlerTagType.DISABLED, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 4, Moves.DISABLE, sourceId); + super( + BattlerTagType.DISABLED, + [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], + 4, + Moves.DISABLE, + sourceId, + ); } /** @override */ @@ -274,26 +301,35 @@ export class DisabledTag extends MoveRestrictionBattlerTag { override onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - const move = pokemon.getLastXMoves() - .find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual); - if (move === undefined) { + const move = pokemon.getLastXMoves(-1).find(m => !m.virtual); + if (Utils.isNullOrUndefined(move) || move.move === Moves.STRUGGLE || move.move === Moves.NONE) { return; } this.moveId = move.move; - globalScene.queueMessage(i18next.t("battlerTags:disabledOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[this.moveId].name })); + globalScene.queueMessage( + i18next.t("battlerTags:disabledOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: allMoves[this.moveId].name, + }), + ); } /** @override */ override onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:disabledLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[this.moveId].name })); + globalScene.queueMessage( + i18next.t("battlerTags:disabledLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: allMoves[this.moveId].name, + }), + ); } /** @override */ - override selectionDeniedText(pokemon: Pokemon, move: Moves): string { + override selectionDeniedText(_pokemon: Pokemon, move: Moves): string { return i18next.t("battle:moveDisabled", { moveName: allMoves[move].name }); } @@ -304,7 +340,10 @@ export class DisabledTag extends MoveRestrictionBattlerTag { * @returns {string} text to display when the move is interrupted */ override interruptedText(pokemon: Pokemon, move: Moves): string { - return i18next.t("battle:disableInterruptedMove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name }); + return i18next.t("battle:disableInterruptedMove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: allMoves[move].name, + }); } /** @override */ @@ -336,7 +375,7 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag { * @returns `true` if the pokemon has a valid move and no existing {@linkcode GorillaTacticsTag}; `false` otherwise */ override canAdd(pokemon: Pokemon): boolean { - return (this.getLastValidMove(pokemon) !== undefined) && !pokemon.getTag(GorillaTacticsTag); + return this.getLastValidMove(pokemon) !== undefined && !pokemon.getTag(GorillaTacticsTag); } /** @@ -370,11 +409,14 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag { * * @override * @param {Pokemon} pokemon n/a - * @param {Moves} move {@linkcode Moves} ID of the move being denied + * @param {Moves} _move {@linkcode Moves} ID of the move being denied * @returns {string} text to display when the move is denied - */ - override selectionDeniedText(pokemon: Pokemon, move: Moves): string { - return i18next.t("battle:canOnlyUseMove", { moveName: allMoves[this.moveId].name, pokemonName: getPokemonNameWithAffix(pokemon) }); + */ + override selectionDeniedText(pokemon: Pokemon, _move: Moves): string { + return i18next.t("battle:canOnlyUseMove", { + moveName: allMoves[this.moveId].name, + pokemonName: getPokemonNameWithAffix(pokemon), + }); } /** @@ -383,8 +425,7 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag { * @returns {Moves | undefined} the last valid move from the pokemon's move history */ getLastValidMove(pokemon: Pokemon): Moves | undefined { - const move = pokemon.getLastXMoves() - .find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual); + const move = pokemon.getLastXMoves().find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual); return move?.move; } @@ -395,20 +436,24 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag { */ export class RechargingTag extends BattlerTag { constructor(sourceMove: Moves) { - super(BattlerTagType.RECHARGING, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 2, sourceMove); + super(BattlerTagType.RECHARGING, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], 2, sourceMove); } onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); // Queue a placeholder move for the Pokemon to "use" next turn - pokemon.getMoveQueue().push({ move: Moves.NONE, targets: []}); + pokemon.getMoveQueue().push({ move: Moves.NONE, targets: [] }); } /** Cancels the source's move this turn and queues a "__ must recharge!" message */ lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { if (lapseType === BattlerTagLapseType.PRE_MOVE) { - globalScene.queueMessage(i18next.t("battlerTags:rechargingLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:rechargingLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); (globalScene.getCurrentPhase() as MovePhase).cancel(); pokemon.getMoveQueue().shift(); } @@ -423,7 +468,12 @@ export class RechargingTag extends BattlerTag { */ export class BeakBlastChargingTag extends BattlerTag { constructor() { - super(BattlerTagType.BEAK_BLAST_CHARGING, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END, BattlerTagLapseType.AFTER_HIT ], 1, Moves.BEAK_BLAST); + super( + BattlerTagType.BEAK_BLAST_CHARGING, + [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END, BattlerTagLapseType.AFTER_HIT], + 1, + Moves.BEAK_BLAST, + ); } onAdd(pokemon: Pokemon): void { @@ -431,7 +481,11 @@ export class BeakBlastChargingTag extends BattlerTag { new MoveChargeAnim(ChargeAnim.BEAK_BLAST_CHARGING, this.sourceMove, pokemon).play(); // Queue Beak Blast's header message - globalScene.queueMessage(i18next.t("moveTriggers:startedHeatingUpBeak", { pokemonName: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("moveTriggers:startedHeatingUpBeak", { + pokemonName: getPokemonNameWithAffix(pokemon), + }), + ); } /** @@ -459,14 +513,18 @@ export class BeakBlastChargingTag extends BattlerTag { * @see {@link https://bulbapedia.bulbagarden.net/wiki/Shell_Trap_(move) | Shell Trap} */ export class ShellTrapTag extends BattlerTag { - public activated: boolean = false; + public activated = false; constructor() { - super(BattlerTagType.SHELL_TRAP, [ BattlerTagLapseType.TURN_END, BattlerTagLapseType.AFTER_HIT ], 1); + super(BattlerTagType.SHELL_TRAP, [BattlerTagLapseType.TURN_END, BattlerTagLapseType.AFTER_HIT], 1); } onAdd(pokemon: Pokemon): void { - globalScene.queueMessage(i18next.t("moveTriggers:setUpShellTrap", { pokemonName: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("moveTriggers:setUpShellTrap", { + pokemonName: getPokemonNameWithAffix(pokemon), + }), + ); } /** @@ -482,11 +540,9 @@ export class ShellTrapTag extends BattlerTag { // Trap should only be triggered by opponent's Physical moves if (phaseData?.move.category === MoveCategory.PHYSICAL && pokemon.isOpponent(phaseData.attacker)) { const shellTrapPhaseIndex = globalScene.phaseQueue.findIndex( - phase => phase instanceof MovePhase && phase.pokemon === pokemon - ); - const firstMovePhaseIndex = globalScene.phaseQueue.findIndex( - phase => phase instanceof MovePhase + phase => phase instanceof MovePhase && phase.pokemon === pokemon, ); + const firstMovePhaseIndex = globalScene.phaseQueue.findIndex(phase => phase instanceof MovePhase); // Only shift MovePhase timing if it's not already next up if (shellTrapPhaseIndex !== -1 && shellTrapPhaseIndex !== firstMovePhaseIndex) { @@ -505,7 +561,13 @@ export class ShellTrapTag extends BattlerTag { } export class TrappedTag extends BattlerTag { - constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType, turnCount: number, sourceMove: Moves, sourceId: number) { + constructor( + tagType: BattlerTagType, + lapseType: BattlerTagLapseType, + turnCount: number, + sourceMove: Moves, + sourceId: number, + ) { super(tagType, lapseType, turnCount, sourceMove, sourceId, true); } @@ -513,7 +575,7 @@ export class TrappedTag extends BattlerTag { const source = globalScene.getPokemonById(this.sourceId!)!; const move = allMoves[this.sourceMove]; - const isGhost = pokemon.isOfType(Type.GHOST); + const isGhost = pokemon.isOfType(PokemonType.GHOST); const isTrapped = pokemon.getTag(TrappedTag); const hasSubstitute = move.hitsSubstitute(source, pokemon); @@ -529,10 +591,12 @@ export class TrappedTag extends BattlerTag { onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:trappedOnRemove", { - pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - moveName: this.getMoveName() - })); + globalScene.queueMessage( + i18next.t("battlerTags:trappedOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: this.getMoveName(), + }), + ); } getDescriptor(): string { @@ -544,7 +608,9 @@ export class TrappedTag extends BattlerTag { } getTrapMessage(pokemon: Pokemon): string { - return i18next.t("battlerTags:trappedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); + return i18next.t("battlerTags:trappedOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }); } } @@ -570,7 +636,7 @@ class NoRetreatTag extends TrappedTag { */ export class FlinchedTag extends BattlerTag { constructor(sourceMove: Moves) { - super(BattlerTagType.FLINCHED, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 0, sourceMove); + super(BattlerTagType.FLINCHED, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], 0, sourceMove); } onAdd(pokemon: Pokemon): void { @@ -588,7 +654,11 @@ export class FlinchedTag extends BattlerTag { lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { if (lapseType === BattlerTagLapseType.PRE_MOVE) { (globalScene.getCurrentPhase() as MovePhase).cancel(); - globalScene.queueMessage(i18next.t("battlerTags:flinchedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:flinchedLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } return super.lapse(pokemon, lapseType); @@ -612,7 +682,11 @@ export class InterruptedTag extends BattlerTag { super.onAdd(pokemon); pokemon.getMoveQueue().shift(); - pokemon.pushMoveHistory({ move: Moves.NONE, result: MoveResult.OTHER, targets: []}); + pokemon.pushMoveHistory({ + move: Moves.NONE, + result: MoveResult.OTHER, + targets: [], + }); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { @@ -637,33 +711,51 @@ export class ConfusedTag extends BattlerTag { super.onAdd(pokemon); globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION)); - globalScene.queueMessage(i18next.t("battlerTags:confusedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:confusedOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:confusedOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:confusedOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } onOverlap(pokemon: Pokemon): void { super.onOverlap(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:confusedOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:confusedOnOverlap", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { const ret = lapseType !== BattlerTagLapseType.CUSTOM && super.lapse(pokemon, lapseType); if (ret) { - globalScene.queueMessage(i18next.t("battlerTags:confusedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:confusedLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION)); // 1/3 chance of hitting self with a 40 base power move if (pokemon.randSeedInt(3) === 0) { const atk = pokemon.getEffectiveStat(Stat.ATK); const def = pokemon.getEffectiveStat(Stat.DEF); - const damage = toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedIntRange(85, 100) / 100)); + const damage = toDmgValue( + ((((2 * pokemon.level) / 5 + 2) * 40 * atk) / def / 50 + 2) * (pokemon.randSeedIntRange(85, 100) / 100), + ); globalScene.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself")); pokemon.damageAndUpdate(damage); pokemon.battleData.hitCount++; @@ -712,15 +804,19 @@ export class DestinyBondTag extends BattlerTag { } if (pokemon.isBossImmune()) { - globalScene.queueMessage(i18next.t("battlerTags:destinyBondLapseIsBoss", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:destinyBondLapseIsBoss", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); return false; } globalScene.queueMessage( i18next.t("battlerTags:destinyBondLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(source), - pokemonNameWithAffix2: getPokemonNameWithAffix(pokemon) - }) + pokemonNameWithAffix2: getPokemonNameWithAffix(pokemon), + }), ); pokemon.damageAndUpdate(pokemon.hp, HitResult.ONE_HIT_KO, false, false, true); return false; @@ -738,14 +834,12 @@ export class InfatuatedTag extends BattlerTag { if (pkm) { return pokemon.isOppositeGender(pkm); - } else { - console.warn("canAdd: this.sourceId is not a valid pokemon id!", this.sourceId); - return false; } - } else { - console.warn("canAdd: this.sourceId is undefined"); + console.warn("canAdd: this.sourceId is not a valid pokemon id!", this.sourceId); return false; } + console.warn("canAdd: this.sourceId is undefined"); + return false; } onAdd(pokemon: Pokemon): void { @@ -754,15 +848,19 @@ export class InfatuatedTag extends BattlerTag { globalScene.queueMessage( i18next.t("battlerTags:infatuatedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined) // TODO: is that bang correct? - }) + sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct? + }), ); } onOverlap(pokemon: Pokemon): void { super.onOverlap(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:infatuatedOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:infatuatedOnOverlap", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { @@ -772,13 +870,17 @@ export class InfatuatedTag extends BattlerTag { globalScene.queueMessage( i18next.t("battlerTags:infatuatedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined) // TODO: is that bang correct? - }) + sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct? + }), ); globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.ATTRACT)); if (pokemon.randSeedInt(2)) { - globalScene.queueMessage(i18next.t("battlerTags:infatuatedLapseImmobilize", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:infatuatedLapseImmobilize", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); (globalScene.getCurrentPhase() as MovePhase).cancel(); } } @@ -789,7 +891,11 @@ export class InfatuatedTag extends BattlerTag { onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:infatuatedOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:infatuatedOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } isSourceLinked(): boolean { @@ -809,22 +915,26 @@ export class SeedTag extends BattlerTag { } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.sourceIndex = source.sourceIndex; } canAdd(pokemon: Pokemon): boolean { - return !pokemon.isOfType(Type.GRASS); + return !pokemon.isOfType(PokemonType.GRASS); } onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:seededOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:seededOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); this.sourceIndex = globalScene.getPokemonById(this.sourceId!)!.getBattlerIndex(); // TODO: are those bangs correct? } @@ -838,14 +948,27 @@ export class SeedTag extends BattlerTag { applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled); if (!cancelled.value) { - globalScene.unshiftPhase(new CommonAnimPhase(source.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.LEECH_SEED)); + globalScene.unshiftPhase( + new CommonAnimPhase(source.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.LEECH_SEED), + ); const damage = pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8)); const reverseDrain = pokemon.hasAbilityWithAttr(ReverseDrainAbAttr, false); - globalScene.unshiftPhase(new PokemonHealPhase(source.getBattlerIndex(), - !reverseDrain ? damage : damage * -1, - !reverseDrain ? i18next.t("battlerTags:seededLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }) : i18next.t("battlerTags:seededLapseShed", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), - false, true)); + globalScene.unshiftPhase( + new PokemonHealPhase( + source.getBattlerIndex(), + !reverseDrain ? damage : damage * -1, + !reverseDrain + ? i18next.t("battlerTags:seededLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }) + : i18next.t("battlerTags:seededLapseShed", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + false, + true, + ), + ); } } } @@ -865,14 +988,18 @@ export class SeedTag extends BattlerTag { */ export class PowderTag extends BattlerTag { constructor() { - super(BattlerTagType.POWDER, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 1); + super(BattlerTagType.POWDER, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], 1); } onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); // "{Pokemon} is covered in powder!" - globalScene.queueMessage(i18next.t("battlerTags:powderOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:powderOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } /** @@ -888,11 +1015,16 @@ export class PowderTag extends BattlerTag { if (movePhase instanceof MovePhase) { const move = movePhase.move.getMove(); const weather = globalScene.arena.weather; - if (pokemon.getMoveType(move) === Type.FIRE && !(weather && weather.weatherType === WeatherType.HEAVY_RAIN && !weather.isEffectSuppressed())) { + if ( + pokemon.getMoveType(move) === PokemonType.FIRE && + !(weather && weather.weatherType === WeatherType.HEAVY_RAIN && !weather.isEffectSuppressed()) + ) { movePhase.fail(); movePhase.showMoveText(); - globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.POWDER)); + globalScene.unshiftPhase( + new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.POWDER), + ); const cancelDamage = new BooleanHolder(false); applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelDamage); @@ -905,9 +1037,8 @@ export class PowderTag extends BattlerTag { } } return true; - } else { - return super.lapse(pokemon, lapseType); } + return super.lapse(pokemon, lapseType); } } @@ -919,20 +1050,32 @@ export class NightmareTag extends BattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:nightmareOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:nightmareOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } onOverlap(pokemon: Pokemon): void { super.onOverlap(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:nightmareOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:nightmareOnOverlap", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); if (ret) { - globalScene.queueMessage(i18next.t("battlerTags:nightmareLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:nightmareLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.CURSE)); // TODO: Update animation type const cancelled = new BooleanHolder(false); @@ -959,7 +1102,8 @@ export class FrenzyTag extends BattlerTag { onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - if (this.turnCount < 2) { // Only add CONFUSED tag if a disruption occurs on the final confusion-inducing turn of FRENZY + if (this.turnCount < 2) { + // Only add CONFUSED tag if a disruption occurs on the final confusion-inducing turn of FRENZY pokemon.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 4)); } } @@ -973,13 +1117,19 @@ export class EncoreTag extends MoveRestrictionBattlerTag { public moveId: Moves; constructor(sourceId: number) { - super(BattlerTagType.ENCORE, [ BattlerTagLapseType.CUSTOM, BattlerTagLapseType.AFTER_MOVE ], 3, Moves.ENCORE, sourceId); + super( + BattlerTagType.ENCORE, + [BattlerTagLapseType.CUSTOM, BattlerTagLapseType.AFTER_MOVE], + 3, + Moves.ENCORE, + sourceId, + ); } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.moveId = source.moveId as Moves; @@ -1016,15 +1166,21 @@ export class EncoreTag extends MoveRestrictionBattlerTag { onAdd(pokemon: Pokemon): void { super.onRemove(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:encoreOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:encoreOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); const movePhase = globalScene.findPhase(m => m instanceof MovePhase && m.pokemon === pokemon); if (movePhase) { const movesetMove = pokemon.getMoveset().find(m => m!.moveId === this.moveId); // TODO: is this bang correct? if (movesetMove) { const lastMove = pokemon.getLastXMoves(1)[0]; - globalScene.tryReplacePhase((m => m instanceof MovePhase && m.pokemon === pokemon), - new MovePhase(pokemon, lastMove.targets!, movesetMove)); // TODO: is this bang correct? + globalScene.tryReplacePhase( + m => m instanceof MovePhase && m.pokemon === pokemon, + new MovePhase(pokemon, lastMove.targets!, movesetMove), + ); // TODO: is this bang correct? } } } @@ -1040,9 +1196,8 @@ export class EncoreTag extends MoveRestrictionBattlerTag { return true; } return false; - } else { - return super.lapse(pokemon, lapseType); } + return super.lapse(pokemon, lapseType); } /** @@ -1065,7 +1220,11 @@ export class EncoreTag extends MoveRestrictionBattlerTag { onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:encoreOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:encoreOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } } @@ -1078,8 +1237,8 @@ export class HelpingHandTag extends BattlerTag { globalScene.queueMessage( i18next.t("battlerTags:helpingHandOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct? - pokemonName: getPokemonNameWithAffix(pokemon) - }) + pokemonName: getPokemonNameWithAffix(pokemon), + }), ); } } @@ -1112,9 +1271,11 @@ export class IngrainTag extends TrappedTag { new PokemonHealPhase( pokemon.getBattlerIndex(), toDmgValue(pokemon.getMaxHp() / 16), - i18next.t("battlerTags:ingrainLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), - true - ) + i18next.t("battlerTags:ingrainLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + true, + ), ); } @@ -1122,7 +1283,9 @@ export class IngrainTag extends TrappedTag { } getTrapMessage(pokemon: Pokemon): string { - return i18next.t("battlerTags:ingrainOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); + return i18next.t("battlerTags:ingrainOnTrap", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }); } getDescriptor(): string { @@ -1143,7 +1306,7 @@ export class OctolockTag extends TrappedTag { const shouldLapse = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); if (shouldLapse) { - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, [ Stat.DEF, Stat.SPDEF ], -1)); + globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, [Stat.DEF, Stat.SPDEF], -1)); return true; } @@ -1159,7 +1322,11 @@ export class AquaRingTag extends BattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:aquaRingOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:aquaRingOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { @@ -1172,9 +1339,11 @@ export class AquaRingTag extends BattlerTag { toDmgValue(pokemon.getMaxHp() / 16), i18next.t("battlerTags:aquaRingLapse", { moveName: this.getMoveName(), - pokemonName: getPokemonNameWithAffix(pokemon) + pokemonName: getPokemonNameWithAffix(pokemon), }), - true)); + true, + ), + ); } return ret; @@ -1212,7 +1381,11 @@ export class DrowsyTag extends BattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:drowsyOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:drowsyOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { @@ -1239,9 +1412,9 @@ export abstract class DamagingTrapTag extends TrappedTag { } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.commonAnim = source.commonAnim as CommonAnim; @@ -1258,8 +1431,8 @@ export abstract class DamagingTrapTag extends TrappedTag { globalScene.queueMessage( i18next.t("battlerTags:damagingTrapLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - moveName: this.getMoveName() - }) + moveName: this.getMoveName(), + }), ); globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, this.commonAnim)); @@ -1284,7 +1457,7 @@ export class BindTag extends DamagingTrapTag { return i18next.t("battlerTags:bindOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct? - moveName: this.getMoveName() + moveName: this.getMoveName(), }); } } @@ -1308,7 +1481,9 @@ export abstract class VortexTrapTag extends DamagingTrapTag { } getTrapMessage(pokemon: Pokemon): string { - return i18next.t("battlerTags:vortexOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); + return i18next.t("battlerTags:vortexOnTrap", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }); } } @@ -1345,7 +1520,7 @@ export class SandTombTag extends DamagingTrapTag { getTrapMessage(pokemon: Pokemon): string { return i18next.t("battlerTags:sandTombOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - moveName: this.getMoveName() + moveName: this.getMoveName(), }); } } @@ -1356,7 +1531,9 @@ export class MagmaStormTag extends DamagingTrapTag { } getTrapMessage(pokemon: Pokemon): string { - return i18next.t("battlerTags:magmaStormOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); + return i18next.t("battlerTags:magmaStormOnTrap", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }); } } @@ -1366,7 +1543,9 @@ export class SnapTrapTag extends DamagingTrapTag { } getTrapMessage(pokemon: Pokemon): string { - return i18next.t("battlerTags:snapTrapOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); + return i18next.t("battlerTags:snapTrapOnTrap", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }); } } @@ -1396,7 +1575,6 @@ export class InfestationTag extends DamagingTrapTag { } } - export class ProtectedTag extends BattlerTag { constructor(sourceMove: Moves, tagType: BattlerTagType = BattlerTagType.PROTECTED) { super(tagType, BattlerTagLapseType.TURN_END, 0, sourceMove); @@ -1405,13 +1583,21 @@ export class ProtectedTag extends BattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:protectedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:protectedOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { if (lapseType === BattlerTagLapseType.CUSTOM) { new CommonBattleAnim(CommonAnim.PROTECT, pokemon).play(); - globalScene.queueMessage(i18next.t("battlerTags:protectedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:protectedLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); // Stop multi-hit moves early const effectPhase = globalScene.getCurrentPhase(); @@ -1442,9 +1628,9 @@ export class ContactDamageProtectedTag extends ProtectedTag { } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.damageRatio = source.damageRatio; @@ -1483,9 +1669,9 @@ export class ContactStatStageChangeProtectedTag extends DamageProtectedTag { } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.stat = source.stat; @@ -1499,7 +1685,7 @@ export class ContactStatStageChangeProtectedTag extends DamageProtectedTag { const effectPhase = globalScene.getCurrentPhase(); if (effectPhase instanceof MoveEffectPhase && effectPhase.move.getMove().hasFlag(MoveFlags.MAKES_CONTACT)) { const attacker = effectPhase.getPokemon(); - globalScene.unshiftPhase(new StatStageChangePhase(attacker.getBattlerIndex(), false, [ this.stat ], this.levels)); + globalScene.unshiftPhase(new StatStageChangePhase(attacker.getBattlerIndex(), false, [this.stat], this.levels)); } } @@ -1564,12 +1750,20 @@ export class EnduringTag extends BattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:enduringOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:enduringOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { if (lapseType === BattlerTagLapseType.CUSTOM) { - globalScene.queueMessage(i18next.t("battlerTags:enduringLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:enduringLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); return true; } @@ -1584,7 +1778,11 @@ export class SturdyTag extends BattlerTag { lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { if (lapseType === BattlerTagLapseType.CUSTOM) { - globalScene.queueMessage(i18next.t("battlerTags:sturdyLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:sturdyLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); return true; } @@ -1608,8 +1806,8 @@ export class PerishSongTag extends BattlerTag { globalScene.queueMessage( i18next.t("battlerTags:perishSongLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - turnCount: this.turnCount - }) + turnCount: this.turnCount, + }), ); } else { pokemon.damageAndUpdate(pokemon.hp, HitResult.ONE_HIT_KO, false, true, true); @@ -1629,7 +1827,7 @@ export class CenterOfAttentionTag extends BattlerTag { constructor(sourceMove: Moves) { super(BattlerTagType.CENTER_OF_ATTENTION, BattlerTagLapseType.TURN_END, 1, sourceMove); - this.powder = (this.sourceMove === Moves.RAGE_POWDER); + this.powder = this.sourceMove === Moves.RAGE_POWDER; } /** "Center of Attention" can't be added if an ally is already the Center of Attention. */ @@ -1642,7 +1840,11 @@ export class CenterOfAttentionTag extends BattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:centerOfAttentionOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:centerOfAttentionOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } } @@ -1656,9 +1858,9 @@ export class AbilityBattlerTag extends BattlerTag { } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.ability = source.ability as Abilities; @@ -1697,7 +1899,11 @@ export class TruantTag extends AbilityBattlerTag { if (lastMove && lastMove.move !== Moves.NONE) { (globalScene.getCurrentPhase() as MovePhase).cancel(); globalScene.unshiftPhase(new ShowAbilityPhase(pokemon.id, passive)); - globalScene.queueMessage(i18next.t("battlerTags:truantLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:truantLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } return true; @@ -1712,7 +1918,15 @@ export class SlowStartTag extends AbilityBattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:slowStartOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, false, null, true); + globalScene.queueMessage( + i18next.t("battlerTags:slowStartOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + null, + false, + null, + true, + ); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { @@ -1726,7 +1940,14 @@ export class SlowStartTag extends AbilityBattlerTag { onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:slowStartOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, false, null); + globalScene.queueMessage( + i18next.t("battlerTags:slowStartOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + null, + false, + null, + ); } } @@ -1739,9 +1960,9 @@ export class HighestStatBoostTag extends AbilityBattlerTag { } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.stat = source.stat as Stat; @@ -1752,7 +1973,9 @@ export class HighestStatBoostTag extends AbilityBattlerTag { super.onAdd(pokemon); let highestStat: EffectiveStat; - EFFECTIVE_STATS.map(s => pokemon.getEffectiveStat(s)).reduce((highestValue: number, value: number, i: number) => { + EFFECTIVE_STATS.map(s => + pokemon.getEffectiveStat(s, undefined, undefined, undefined, undefined, undefined, undefined, true), + ).reduce((highestValue: number, value: number, i: number) => { if (value > highestValue) { highestStat = EFFECTIVE_STATS[i]; return value; @@ -1763,22 +1986,28 @@ export class HighestStatBoostTag extends AbilityBattlerTag { highestStat = highestStat!; // tell TS compiler it's defined! this.stat = highestStat; - switch (this.stat) { - case Stat.SPD: - this.multiplier = 1.5; - break; - default: - this.multiplier = 1.3; - break; - } - - globalScene.queueMessage(i18next.t("battlerTags:highestStatBoostOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), statName: i18next.t(getStatKey(highestStat)) }), null, false, null, true); + this.multiplier = this.stat === Stat.SPD ? 1.5 : 1.3; + globalScene.queueMessage( + i18next.t("battlerTags:highestStatBoostOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + statName: i18next.t(getStatKey(highestStat)), + }), + null, + false, + null, + true, + ); } onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:highestStatBoostOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: allAbilities[this.ability].name })); + globalScene.queueMessage( + i18next.t("battlerTags:highestStatBoostOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + abilityName: allAbilities[this.ability].name, + }), + ); } } @@ -1791,9 +2020,9 @@ export class WeatherHighestStatBoostTag extends HighestStatBoostTag implements W } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.weatherTypes = source.weatherTypes.map(w => w as WeatherType); @@ -1809,9 +2038,9 @@ export class TerrainHighestStatBoostTag extends HighestStatBoostTag implements T } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.terrainTypes = source.terrainTypes.map(w => w as TerrainType); @@ -1833,27 +2062,27 @@ export class SemiInvulnerableTag extends BattlerTag { // Wait 2 frames before setting visible for battle animations that don't immediately show the sprite invisible globalScene.tweens.addCounter({ duration: getFrameMs(2), - onComplete: () => pokemon.setVisible(true) + onComplete: () => pokemon.setVisible(true), }); } } export class TypeImmuneTag extends BattlerTag { - public immuneType: Type; + public immuneType: PokemonType; - constructor(tagType: BattlerTagType, sourceMove: Moves, immuneType: Type, length: number = 1) { + constructor(tagType: BattlerTagType, sourceMove: Moves, immuneType: PokemonType, length = 1) { super(tagType, BattlerTagLapseType.TURN_END, length, sourceMove, undefined, true); this.immuneType = immuneType; } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); - this.immuneType = source.immuneType as Type; + this.immuneType = source.immuneType as PokemonType; } } @@ -1864,32 +2093,45 @@ export class TypeImmuneTag extends BattlerTag { */ export class FloatingTag extends TypeImmuneTag { constructor(tagType: BattlerTagType, sourceMove: Moves, turnCount: number) { - super(tagType, sourceMove, Type.GROUND, turnCount); + super(tagType, sourceMove, PokemonType.GROUND, turnCount); } onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); if (this.sourceMove === Moves.MAGNET_RISE) { - globalScene.queueMessage(i18next.t("battlerTags:magnetRisenOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:magnetRisenOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } - } onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); if (this.sourceMove === Moves.MAGNET_RISE) { - globalScene.queueMessage(i18next.t("battlerTags:magnetRisenOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:magnetRisenOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } } } export class TypeBoostTag extends BattlerTag { - public boostedType: Type; + public boostedType: PokemonType; public boostValue: number; public oneUse: boolean; - constructor(tagType: BattlerTagType, sourceMove: Moves, boostedType: Type, boostValue: number, oneUse: boolean) { + constructor( + tagType: BattlerTagType, + sourceMove: Moves, + boostedType: PokemonType, + boostValue: number, + oneUse: boolean, + ) { super(tagType, BattlerTagLapseType.TURN_END, 1, sourceMove); this.boostedType = boostedType; @@ -1898,12 +2140,12 @@ export class TypeBoostTag extends BattlerTag { } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); - this.boostedType = source.boostedType as Type; + this.boostedType = source.boostedType as PokemonType; this.boostValue = source.boostValue; this.oneUse = source.oneUse; } @@ -1921,7 +2163,11 @@ export class CritBoostTag extends BattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:critBoostOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:critBoostOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { @@ -1931,7 +2177,11 @@ export class CritBoostTag extends BattlerTag { onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:critBoostOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:critBoostOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } } @@ -1941,7 +2191,7 @@ export class CritBoostTag extends BattlerTag { */ export class DragonCheerTag extends CritBoostTag { /** The types of the user's ally when the tag is added */ - public typesOnAdd: Type[]; + public typesOnAdd: PokemonType[]; constructor() { super(BattlerTagType.CRIT_BOOST, Moves.DRAGON_CHEER); @@ -1962,9 +2212,9 @@ export class SaltCuredTag extends BattlerTag { } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.sourceIndex = source.sourceIndex; @@ -1973,7 +2223,11 @@ export class SaltCuredTag extends BattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:saltCuredOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:saltCuredOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); this.sourceIndex = globalScene.getPokemonById(this.sourceId!)!.getBattlerIndex(); // TODO: are those bangs correct? } @@ -1981,20 +2235,22 @@ export class SaltCuredTag extends BattlerTag { const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); if (ret) { - globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE)); + globalScene.unshiftPhase( + new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE), + ); const cancelled = new BooleanHolder(false); applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled); if (!cancelled.value) { - const pokemonSteelOrWater = pokemon.isOfType(Type.STEEL) || pokemon.isOfType(Type.WATER); + const pokemonSteelOrWater = pokemon.isOfType(PokemonType.STEEL) || pokemon.isOfType(PokemonType.WATER); pokemon.damageAndUpdate(toDmgValue(pokemonSteelOrWater ? pokemon.getMaxHp() / 4 : pokemon.getMaxHp() / 8)); globalScene.queueMessage( i18next.t("battlerTags:saltCuredLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - moveName: this.getMoveName() - }) + moveName: this.getMoveName(), + }), ); } } @@ -2011,9 +2267,9 @@ export class CursedTag extends BattlerTag { } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.sourceIndex = source.sourceIndex; @@ -2028,14 +2284,20 @@ export class CursedTag extends BattlerTag { const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); if (ret) { - globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE)); + globalScene.unshiftPhase( + new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE), + ); const cancelled = new BooleanHolder(false); applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled); if (!cancelled.value) { pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 4)); - globalScene.queueMessage(i18next.t("battlerTags:cursedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:cursedLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } } @@ -2067,8 +2329,8 @@ export class GroundedTag extends BattlerTag { */ export class RoostedTag extends BattlerTag { - private isBaseFlying : boolean; - private isBasePureFlying : boolean; + private isBaseFlying: boolean; + private isBasePureFlying: boolean; constructor() { super(BattlerTagType.ROOSTED, BattlerTagLapseType.TURN_END, 1, Moves.ROOST); @@ -2078,21 +2340,23 @@ export class RoostedTag extends BattlerTag { const currentTypes = pokemon.getTypes(); const baseTypes = pokemon.getTypes(false, false, true); - const forestsCurseApplied: boolean = currentTypes.includes(Type.GRASS) && !baseTypes.includes(Type.GRASS); - const trickOrTreatApplied: boolean = currentTypes.includes(Type.GHOST) && !baseTypes.includes(Type.GHOST); + const forestsCurseApplied: boolean = + currentTypes.includes(PokemonType.GRASS) && !baseTypes.includes(PokemonType.GRASS); + const trickOrTreatApplied: boolean = + currentTypes.includes(PokemonType.GHOST) && !baseTypes.includes(PokemonType.GHOST); if (this.isBaseFlying) { - let modifiedTypes: Type[] = []; + let modifiedTypes: PokemonType[] = []; if (this.isBasePureFlying) { if (forestsCurseApplied || trickOrTreatApplied) { - modifiedTypes = currentTypes.filter(type => type !== Type.NORMAL); - modifiedTypes.push(Type.FLYING); + modifiedTypes = currentTypes.filter(type => type !== PokemonType.NORMAL); + modifiedTypes.push(PokemonType.FLYING); } else { - modifiedTypes = [ Type.FLYING ]; + modifiedTypes = [PokemonType.FLYING]; } } else { - modifiedTypes = [ ...currentTypes ]; - modifiedTypes.push(Type.FLYING); + modifiedTypes = [...currentTypes]; + modifiedTypes.push(PokemonType.FLYING); } pokemon.summonData.types = modifiedTypes; pokemon.updateInfo(); @@ -2105,18 +2369,18 @@ export class RoostedTag extends BattlerTag { const isOriginallyDualType = baseTypes.length === 2; const isCurrentlyDualType = currentTypes.length === 2; - this.isBaseFlying = baseTypes.includes(Type.FLYING); - this.isBasePureFlying = baseTypes[0] === Type.FLYING && baseTypes.length === 1; + this.isBaseFlying = baseTypes.includes(PokemonType.FLYING); + this.isBasePureFlying = baseTypes[0] === PokemonType.FLYING && baseTypes.length === 1; if (this.isBaseFlying) { - let modifiedTypes: Type[]; + let modifiedTypes: PokemonType[]; if (this.isBasePureFlying && !isCurrentlyDualType) { - modifiedTypes = [ Type.NORMAL ]; + modifiedTypes = [PokemonType.NORMAL]; } else { if (!!pokemon.getTag(RemovedTypeTag) && isOriginallyDualType && !isCurrentlyDualType) { - modifiedTypes = [ Type.UNKNOWN ]; + modifiedTypes = [PokemonType.UNKNOWN]; } else { - modifiedTypes = currentTypes.filter(type => type !== Type.FLYING); + modifiedTypes = currentTypes.filter(type => type !== PokemonType.FLYING); } } pokemon.summonData.types = modifiedTypes; @@ -2166,10 +2430,6 @@ export class FormBlockDamageTag extends BattlerTag { } /** Provides the additional weather-based effects of the Ice Face ability */ export class IceFaceBlockDamageTag extends FormBlockDamageTag { - constructor(tagType: BattlerTagType) { - super(tagType); - } - /** * Determines if the tag can be added to the Pokémon. * @param {Pokemon} pokemon The Pokémon to which the tag might be added. @@ -2201,7 +2461,14 @@ export class CommandedTag extends BattlerTag { /** Caches the Tatsugiri's form key and sharply boosts the tagged Pokemon's stats */ override onAdd(pokemon: Pokemon): void { this._tatsugiriFormKey = this.getSourcePokemon()?.getFormKey() ?? "curly"; - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 2)); + globalScene.unshiftPhase( + new StatStageChangePhase( + pokemon.getBattlerIndex(), + true, + [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD], + 2, + ), + ); } /** Triggers an {@linkcode PokemonAnimType | animation} of the tagged Pokemon "spitting out" Tatsugiri */ @@ -2228,10 +2495,10 @@ export class CommandedTag extends BattlerTag { * the stat when added. */ export class StockpilingTag extends BattlerTag { - public stockpiledCount: number = 0; + public stockpiledCount = 0; public statChangeCounts: { [Stat.DEF]: number; [Stat.SPDEF]: number } = { [Stat.DEF]: 0, - [Stat.SPDEF]: 0 + [Stat.SPDEF]: 0, }; constructor(sourceMove: Moves = Moves.NONE) { @@ -2269,16 +2536,26 @@ export class StockpilingTag extends BattlerTag { if (this.stockpiledCount < 3) { this.stockpiledCount++; - globalScene.queueMessage(i18next.t("battlerTags:stockpilingOnAdd", { - pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - stockpiledCount: this.stockpiledCount - })); + globalScene.queueMessage( + i18next.t("battlerTags:stockpilingOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + stockpiledCount: this.stockpiledCount, + }), + ); // Attempt to increase DEF and SPDEF by one stage, keeping track of successful changes. - globalScene.unshiftPhase(new StatStageChangePhase( - pokemon.getBattlerIndex(), true, - [ Stat.SPDEF, Stat.DEF ], 1, true, false, true, this.onStatStagesChanged - )); + globalScene.unshiftPhase( + new StatStageChangePhase( + pokemon.getBattlerIndex(), + true, + [Stat.SPDEF, Stat.DEF], + 1, + true, + false, + true, + this.onStatStagesChanged, + ), + ); } } @@ -2295,11 +2572,15 @@ export class StockpilingTag extends BattlerTag { const spDefChange = this.statChangeCounts[Stat.SPDEF]; if (defChange) { - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.DEF ], -defChange, true, false, true)); + globalScene.unshiftPhase( + new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.DEF], -defChange, true, false, true), + ); } if (spDefChange) { - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.SPDEF ], -spDefChange, true, false, true)); + globalScene.unshiftPhase( + new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPDEF], -spDefChange, true, false, true), + ); } } } @@ -2313,7 +2594,7 @@ export class GulpMissileTag extends BattlerTag { super(tagType, BattlerTagLapseType.HIT, 0, sourceMove); } - override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { + override lapse(pokemon: Pokemon, _lapseType: BattlerTagLapseType): boolean { if (pokemon.getTag(BattlerTagType.UNDERWATER)) { return true; } @@ -2338,7 +2619,7 @@ export class GulpMissileTag extends BattlerTag { } if (this.tagType === BattlerTagType.GULP_MISSILE_ARROKUDA) { - globalScene.unshiftPhase(new StatStageChangePhase(attacker.getBattlerIndex(), false, [ Stat.DEF ], -1)); + globalScene.unshiftPhase(new StatStageChangePhase(attacker.getBattlerIndex(), false, [Stat.DEF], -1)); } else { attacker.trySetStatus(StatusEffect.PARALYSIS, true, pokemon); } @@ -2352,8 +2633,11 @@ export class GulpMissileTag extends BattlerTag { * @returns Whether the BattlerTag can be added. */ canAdd(pokemon: Pokemon): boolean { - const isSurfOrDive = [ Moves.SURF, Moves.DIVE ].includes(this.sourceMove); - const isNormalForm = pokemon.formIndex === 0 && !pokemon.getTag(BattlerTagType.GULP_MISSILE_ARROKUDA) && !pokemon.getTag(BattlerTagType.GULP_MISSILE_PIKACHU); + const isSurfOrDive = [Moves.SURF, Moves.DIVE].includes(this.sourceMove); + const isNormalForm = + pokemon.formIndex === 0 && + !pokemon.getTag(BattlerTagType.GULP_MISSILE_ARROKUDA) && + !pokemon.getTag(BattlerTagType.GULP_MISSILE_PIKACHU); const isCramorant = pokemon.species.speciesId === Species.CRAMORANT; return isSurfOrDive && isNormalForm && isCramorant; @@ -2381,31 +2665,31 @@ export class GulpMissileTag extends BattlerTag { * @see {@linkcode ignoreImmunity} */ export class ExposedTag extends BattlerTag { - private defenderType: Type; - private allowedTypes: Type[]; + private defenderType: PokemonType; + private allowedTypes: PokemonType[]; - constructor(tagType: BattlerTagType, sourceMove: Moves, defenderType: Type, allowedTypes: Type[]) { + constructor(tagType: BattlerTagType, sourceMove: Moves, defenderType: PokemonType, allowedTypes: PokemonType[]) { super(tagType, BattlerTagLapseType.CUSTOM, 1, sourceMove); this.defenderType = defenderType; this.allowedTypes = allowedTypes; } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); - this.defenderType = source.defenderType as Type; - this.allowedTypes = source.allowedTypes as Type[]; + this.defenderType = source.defenderType as PokemonType; + this.allowedTypes = source.allowedTypes as PokemonType[]; } /** - * @param types {@linkcode Type} of the defending Pokemon - * @param moveType {@linkcode Type} of the move targetting it + * @param types {@linkcode PokemonType} of the defending Pokemon + * @param moveType {@linkcode PokemonType} of the move targetting it * @returns `true` if the move should be allowed to target the defender. */ - ignoreImmunity(type: Type, moveType: Type): boolean { + ignoreImmunity(type: PokemonType, moveType: PokemonType): boolean { return type === this.defenderType && this.allowedTypes.includes(moveType); } } @@ -2418,11 +2702,18 @@ export class ExposedTag extends BattlerTag { */ export class HealBlockTag extends MoveRestrictionBattlerTag { constructor(turnCount: number, sourceMove: Moves) { - super(BattlerTagType.HEAL_BLOCK, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], turnCount, sourceMove); + super( + BattlerTagType.HEAL_BLOCK, + [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], + turnCount, + sourceMove, + ); } onActivation(pokemon: Pokemon): string { - return i18next.t("battle:battlerTagsHealBlock", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); + return i18next.t("battle:battlerTagsHealBlock", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }); } /** @@ -2448,7 +2739,7 @@ export class HealBlockTag extends MoveRestrictionBattlerTag { override isMoveTargetRestricted(move: Moves, user: Pokemon, target: Pokemon) { const moveCategory = new NumberHolder(allMoves[move].category); applyMoveAttrs(StatusCategoryOnAllyAttr, user, target, allMoves[move], moveCategory); - if (allMoves[move].hasAttr(HealOnAllyAttr) && moveCategory.value === MoveCategory.STATUS ) { + if (allMoves[move].hasAttr(HealOnAllyAttr) && moveCategory.value === MoveCategory.STATUS) { return true; } return false; @@ -2458,7 +2749,11 @@ export class HealBlockTag extends MoveRestrictionBattlerTag { * Uses its own unique selectionDeniedText() message */ override selectionDeniedText(pokemon: Pokemon, move: Moves): string { - return i18next.t("battle:moveDisabledHealBlock", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name, healBlockName: allMoves[Moves.HEAL_BLOCK].name }); + return i18next.t("battle:moveDisabledHealBlock", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: allMoves[move].name, + healBlockName: allMoves[Moves.HEAL_BLOCK].name, + }); } /** @@ -2468,13 +2763,24 @@ export class HealBlockTag extends MoveRestrictionBattlerTag { * @returns {string} text to display when the move is interrupted */ override interruptedText(pokemon: Pokemon, move: Moves): string { - return i18next.t("battle:moveDisabledHealBlock", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name, healBlockName: allMoves[Moves.HEAL_BLOCK].name }); + return i18next.t("battle:moveDisabledHealBlock", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: allMoves[move].name, + healBlockName: allMoves[Moves.HEAL_BLOCK].name, + }); } override onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - globalScene.queueMessage(i18next.t("battle:battlerTagsHealBlockOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, false, null); + globalScene.queueMessage( + i18next.t("battle:battlerTagsHealBlockOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + null, + false, + null, + ); } } @@ -2493,11 +2799,15 @@ export class TarShotTag extends BattlerTag { * @returns whether the tag is applied */ override canAdd(pokemon: Pokemon): boolean { - return !pokemon.isTerastallized(); + return !pokemon.isTerastallized; } override onAdd(pokemon: Pokemon): void { - globalScene.queueMessage(i18next.t("battlerTags:tarShotOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:tarShotOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } } @@ -2512,7 +2822,11 @@ export class ElectrifiedTag extends BattlerTag { override onAdd(pokemon: Pokemon): void { // "{pokemonNameWithAffix}'s moves have been electrified!" - globalScene.queueMessage(i18next.t("battlerTags:electrifiedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:electrifiedOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } } @@ -2521,7 +2835,7 @@ export class ElectrifiedTag extends BattlerTag { * Each count of Autotomization reduces the weight by 100kg */ export class AutotomizedTag extends BattlerTag { - public autotomizeCount: number = 0; + public autotomizeCount = 0; constructor(sourceMove: Moves = Moves.AUTOTOMIZE) { super(BattlerTagType.AUTOTOMIZED, BattlerTagLapseType.CUSTOM, 1, sourceMove); } @@ -2534,9 +2848,11 @@ export class AutotomizedTag extends BattlerTag { onAdd(pokemon: Pokemon): void { const minWeight = 0.1; if (pokemon.getWeight() > minWeight) { - globalScene.queueMessage(i18next.t("battlerTags:autotomizeOnAdd", { - pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) - })); + globalScene.queueMessage( + i18next.t("battlerTags:autotomizeOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } this.autotomizeCount += 1; } @@ -2559,8 +2875,15 @@ export class SubstituteTag extends BattlerTag { /** Is the source Pokemon "in focus," i.e. is it fully visible on the field? */ public sourceInFocus: boolean; - constructor(sourceMove: Moves, sourceId: integer) { - super(BattlerTagType.SUBSTITUTE, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE, BattlerTagLapseType.HIT ], 0, sourceMove, sourceId, true); + constructor(sourceMove: Moves, sourceId: number) { + super( + BattlerTagType.SUBSTITUTE, + [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE, BattlerTagLapseType.HIT], + 0, + sourceMove, + sourceId, + true, + ); } /** Sets the Substitute's HP and queues an on-add battle animation that initializes the Substitute's sprite. */ @@ -2571,9 +2894,19 @@ export class SubstituteTag extends BattlerTag { // Queue battle animation and message globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_ADD); if (this.sourceMove === Moves.SHED_TAIL) { - globalScene.queueMessage(i18next.t("battlerTags:shedTailOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), 1500); + globalScene.queueMessage( + i18next.t("battlerTags:shedTailOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + 1500, + ); } else { - globalScene.queueMessage(i18next.t("battlerTags:substituteOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), 1500); + globalScene.queueMessage( + i18next.t("battlerTags:substituteOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + 1500, + ); } // Remove any binding effects from the user @@ -2584,11 +2917,15 @@ export class SubstituteTag extends BattlerTag { onRemove(pokemon: Pokemon): void { // Only play the animation if the cause of removal isn't from the source's own move if (!this.sourceInFocus) { - globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_REMOVE, [ this.sprite ]); + globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_REMOVE, [this.sprite]); } else { this.sprite.destroy(); } - globalScene.queueMessage(i18next.t("battlerTags:substituteOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:substituteOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { @@ -2608,13 +2945,13 @@ export class SubstituteTag extends BattlerTag { /** Triggers an animation that brings the Pokemon into focus before it uses a move */ onPreMove(pokemon: Pokemon): void { - globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_PRE_MOVE, [ this.sprite ]); + globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_PRE_MOVE, [this.sprite]); this.sourceInFocus = true; } /** Triggers an animation that brings the Pokemon out of focus after it uses a move */ onAfterMove(pokemon: Pokemon): void { - globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_POST_MOVE, [ this.sprite ]); + globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_POST_MOVE, [this.sprite]); this.sourceInFocus = false; } @@ -2627,18 +2964,22 @@ export class SubstituteTag extends BattlerTag { return; } const move = moveEffectPhase.move.getMove(); - const firstHit = (attacker.turnData.hitCount === attacker.turnData.hitsLeft); + const firstHit = attacker.turnData.hitCount === attacker.turnData.hitsLeft; if (firstHit && move.hitsSubstitute(attacker, pokemon)) { - globalScene.queueMessage(i18next.t("battlerTags:substituteOnHit", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:substituteOnHit", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } } } /** - * When given a battler tag or json representing one, load the data for it. - * @param {BattlerTag | any} source A battler tag - */ + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ loadTag(source: BattlerTag | any): void { super.loadTag(source); this.hp = source.hp; @@ -2702,7 +3043,12 @@ export class TormentTag extends MoveRestrictionBattlerTag { */ override onAdd(pokemon: Pokemon) { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:tormentOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), 1500); + globalScene.queueMessage( + i18next.t("battlerTags:tormentOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + 1500, + ); } /** @@ -2725,14 +3071,14 @@ export class TormentTag extends MoveRestrictionBattlerTag { return false; } const lastMove = user.getLastXMoves(1)[0]; - if ( !lastMove ) { + if (!lastMove) { return false; } // This checks for locking / momentum moves like Rollout and Hydro Cannon + if the user is under the influence of BattlerTagType.FRENZY // Because Uproar's unique behavior is not implemented, it does not check for Uproar. Torment has been marked as partial in moves.ts const moveObj = allMoves[lastMove.move]; const isUnaffected = moveObj.hasAttr(ConsecutiveUseDoublePowerAttr) || user.getTag(BattlerTagType.FRENZY); - const validLastMoveResult = (lastMove.result === MoveResult.SUCCESS) || (lastMove.result === MoveResult.MISS); + const validLastMoveResult = lastMove.result === MoveResult.SUCCESS || lastMove.result === MoveResult.MISS; if (lastMove.move === move && validLastMoveResult && lastMove.move !== Moves.STRUGGLE && !isUnaffected) { return true; } @@ -2740,7 +3086,9 @@ export class TormentTag extends MoveRestrictionBattlerTag { } override selectionDeniedText(pokemon: Pokemon, _move: Moves): string { - return i18next.t("battle:moveDisabledTorment", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); + return i18next.t("battle:moveDisabledTorment", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }); } } @@ -2751,12 +3099,27 @@ export class TormentTag extends MoveRestrictionBattlerTag { */ export class TauntTag extends MoveRestrictionBattlerTag { constructor() { - super(BattlerTagType.TAUNT, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE ], 4, Moves.TAUNT); + super(BattlerTagType.TAUNT, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE], 4, Moves.TAUNT); } override onAdd(pokemon: Pokemon) { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:tauntOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), 1500); + globalScene.queueMessage( + i18next.t("battlerTags:tauntOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + 1500, + ); + } + + public override onRemove(pokemon: Pokemon): void { + super.onRemove(pokemon); + + globalScene.queueMessage( + i18next.t("battlerTags:tauntOnRemove", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } /** @@ -2769,11 +3132,17 @@ export class TauntTag extends MoveRestrictionBattlerTag { } override selectionDeniedText(pokemon: Pokemon, move: Moves): string { - return i18next.t("battle:moveDisabledTaunt", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name }); + return i18next.t("battle:moveDisabledTaunt", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: allMoves[move].name, + }); } override interruptedText(pokemon: Pokemon, move: Moves): string { - return i18next.t("battle:moveDisabledTaunt", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name }); + return i18next.t("battle:moveDisabledTaunt", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: allMoves[move].name, + }); } } @@ -2784,7 +3153,13 @@ export class TauntTag extends MoveRestrictionBattlerTag { */ export class ImprisonTag extends MoveRestrictionBattlerTag { constructor(sourceId: number) { - super(BattlerTagType.IMPRISON, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE ], 1, Moves.IMPRISON, sourceId); + super( + BattlerTagType.IMPRISON, + [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE], + 1, + Moves.IMPRISON, + sourceId, + ); } /** @@ -2798,9 +3173,8 @@ export class ImprisonTag extends MoveRestrictionBattlerTag { if (source) { if (lapseType === BattlerTagLapseType.PRE_MOVE) { return super.lapse(pokemon, lapseType) && source.isActive(true); - } else { - return source.isActive(true); } + return source.isActive(true); } return false; } @@ -2811,7 +3185,7 @@ export class ImprisonTag extends MoveRestrictionBattlerTag { * @param {Moves} move the move under investigation * @returns `false` if either condition is not met */ - public override isMoveRestricted(move: Moves, user: Pokemon): boolean { + public override isMoveRestricted(move: Moves, _user: Pokemon): boolean { const source = this.getSourcePokemon(); if (source) { const sourceMoveset = source.getMoveset().map(m => m!.moveId); @@ -2821,11 +3195,17 @@ export class ImprisonTag extends MoveRestrictionBattlerTag { } override selectionDeniedText(pokemon: Pokemon, move: Moves): string { - return i18next.t("battle:moveDisabledImprison", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name }); + return i18next.t("battle:moveDisabledImprison", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: allMoves[move].name, + }); } override interruptedText(pokemon: Pokemon, move: Moves): string { - return i18next.t("battle:moveDisabledImprison", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name }); + return i18next.t("battle:moveDisabledImprison", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: allMoves[move].name, + }); } } @@ -2845,7 +3225,11 @@ export class SyrupBombTag extends BattlerTag { */ override onAdd(pokemon: Pokemon) { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:syrupBombOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:syrupBombOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } /** @@ -2859,11 +3243,14 @@ export class SyrupBombTag extends BattlerTag { return false; } // Custom message in lieu of an animation in mainline - globalScene.queueMessage(i18next.t("battlerTags:syrupBombLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); - globalScene.unshiftPhase(new StatStageChangePhase( - pokemon.getBattlerIndex(), true, - [ Stat.SPD ], -1, true, false, true - )); + globalScene.queueMessage( + i18next.t("battlerTags:syrupBombLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); + globalScene.unshiftPhase( + new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPD], -1, true, false, true), + ); return --this.turnCount > 0; } } @@ -2871,16 +3258,27 @@ export class SyrupBombTag extends BattlerTag { /** * Telekinesis raises the target into the air for three turns and causes all moves used against the target (aside from OHKO moves) to hit the target unless the target is in a semi-invulnerable state from Fly/Dig. * The first effect is provided by {@linkcode FloatingTag}, the accuracy-bypass effect is provided by TelekinesisTag - * The effects of Telekinesis can be baton passed to a teammate. Unlike the mainline games, Telekinesis can be baton-passed to Mega Gengar. + * The effects of Telekinesis can be baton passed to a teammate. * @see {@link https://bulbapedia.bulbagarden.net/wiki/Telekinesis_(move) | Moves.TELEKINESIS} */ export class TelekinesisTag extends BattlerTag { constructor(sourceMove: Moves) { - super(BattlerTagType.TELEKINESIS, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE ], 3, sourceMove, undefined, true); + super( + BattlerTagType.TELEKINESIS, + [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE], + 3, + sourceMove, + undefined, + true, + ); } - override onAdd(pokemon: Pokemon) { - globalScene.queueMessage(i18next.t("battlerTags:telekinesisOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + override onAdd(pokemon: Pokemon) { + globalScene.queueMessage( + i18next.t("battlerTags:telekinesisOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } } @@ -2895,12 +3293,20 @@ export class PowerTrickTag extends BattlerTag { onAdd(pokemon: Pokemon): void { this.swapStat(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:powerTrickActive", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:powerTrickActive", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } onRemove(pokemon: Pokemon): void { this.swapStat(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:powerTrickActive", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:powerTrickActive", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } /** @@ -2929,12 +3335,16 @@ export class PowerTrickTag extends BattlerTag { */ export class GrudgeTag extends BattlerTag { constructor() { - super(BattlerTagType.GRUDGE, [ BattlerTagLapseType.CUSTOM, BattlerTagLapseType.PRE_MOVE ], 1, Moves.GRUDGE); + super(BattlerTagType.GRUDGE, [BattlerTagLapseType.CUSTOM, BattlerTagLapseType.PRE_MOVE], 1, Moves.GRUDGE); } onAdd(pokemon: Pokemon) { super.onAdd(pokemon); - globalScene.queueMessage(i18next.t("battlerTags:grudgeOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("battlerTags:grudgeOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } /** @@ -2951,13 +3361,17 @@ export class GrudgeTag extends BattlerTag { const lastMoveData = sourcePokemon.getMoveset().find(m => m?.moveId === lastMove.move); if (lastMoveData && lastMove.move !== Moves.STRUGGLE) { lastMoveData.ppUsed = lastMoveData.getMovePp(); - globalScene.queueMessage(i18next.t("battlerTags:grudgeLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: lastMoveData.getName() })); + globalScene.queueMessage( + i18next.t("battlerTags:grudgeLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: lastMoveData.getName(), + }), + ); } } return false; - } else { - return super.lapse(pokemon, lapseType); } + return super.lapse(pokemon, lapseType); } } @@ -2983,12 +3397,39 @@ export class PsychoShiftTag extends BattlerTag { } } +/** + * Tag associated with the move Magic Coat. + */ +export class MagicCoatTag extends BattlerTag { + constructor() { + super(BattlerTagType.MAGIC_COAT, BattlerTagLapseType.TURN_END, 1, Moves.MAGIC_COAT); + } + + /** + * Queues the "[PokemonName] shrouded itself with Magic Coat" message when the tag is added. + * @param pokemon - The target {@linkcode Pokemon} + */ + override onAdd(pokemon: Pokemon) { + // "{pokemonNameWithAffix} shrouded itself with Magic Coat!" + globalScene.queueMessage( + i18next.t("battlerTags:magicCoatOnAdd", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); + } +} + /** * Retrieves a {@linkcode BattlerTag} based on the provided tag type, turn count, source move, and source ID. * @param sourceId - The ID of the pokemon adding the tag * @returns The corresponding {@linkcode BattlerTag} object. */ -export function getBattlerTag(tagType: BattlerTagType, turnCount: number, sourceMove: Moves, sourceId: number): BattlerTag { +export function getBattlerTag( + tagType: BattlerTagType, + turnCount: number, + sourceMove: Moves, + sourceId: number, +): BattlerTag { switch (tagType) { case BattlerTagType.RECHARGING: return new RechargingTag(sourceMove); @@ -3077,7 +3518,12 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source case BattlerTagType.SLOW_START: return new SlowStartTag(); case BattlerTagType.PROTOSYNTHESIS: - return new WeatherHighestStatBoostTag(tagType, Abilities.PROTOSYNTHESIS, WeatherType.SUNNY, WeatherType.HARSH_SUN); + return new WeatherHighestStatBoostTag( + tagType, + Abilities.PROTOSYNTHESIS, + WeatherType.SUNNY, + WeatherType.HARSH_SUN, + ); case BattlerTagType.QUARK_DRIVE: return new TerrainHighestStatBoostTag(tagType, Abilities.QUARK_DRIVE, TerrainType.ELECTRIC); case BattlerTagType.FLYING: @@ -3086,7 +3532,7 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source case BattlerTagType.HIDDEN: return new SemiInvulnerableTag(tagType, turnCount, sourceMove); case BattlerTagType.FIRE_BOOST: - return new TypeBoostTag(tagType, sourceMove, Type.FIRE, 1.5, false); + return new TypeBoostTag(tagType, sourceMove, PokemonType.FIRE, 1.5, false); case BattlerTagType.CRIT_BOOST: return new CritBoostTag(tagType, sourceMove); case BattlerTagType.DRAGON_CHEER: @@ -3112,7 +3558,7 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source case BattlerTagType.CURSED: return new CursedTag(sourceId); case BattlerTagType.CHARGED: - return new TypeBoostTag(tagType, sourceMove, Type.ELECTRIC, 2, true); + return new TypeBoostTag(tagType, sourceMove, PokemonType.ELECTRIC, 2, true); case BattlerTagType.FLOATING: return new FloatingTag(tagType, sourceMove, turnCount); case BattlerTagType.MINIMIZED: @@ -3132,9 +3578,9 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source case BattlerTagType.DISABLED: return new DisabledTag(sourceId); case BattlerTagType.IGNORE_GHOST: - return new ExposedTag(tagType, sourceMove, Type.GHOST, [ Type.NORMAL, Type.FIGHTING ]); + return new ExposedTag(tagType, sourceMove, PokemonType.GHOST, [PokemonType.NORMAL, PokemonType.FIGHTING]); case BattlerTagType.IGNORE_DARK: - return new ExposedTag(tagType, sourceMove, Type.DARK, [ Type.PSYCHIC ]); + return new ExposedTag(tagType, sourceMove, PokemonType.DARK, [PokemonType.PSYCHIC]); case BattlerTagType.GULP_MISSILE_ARROKUDA: case BattlerTagType.GULP_MISSILE_PIKACHU: return new GulpMissileTag(tagType, sourceMove); @@ -3172,6 +3618,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source return new GrudgeTag(); case BattlerTagType.PSYCHO_SHIFT: return new PsychoShiftTag(); + case BattlerTagType.MAGIC_COAT: + return new MagicCoatTag(); case BattlerTagType.NONE: default: return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId); @@ -3179,10 +3627,10 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source } /** -* When given a battler tag or json representing one, creates an actual BattlerTag object with the same data. -* @param {BattlerTag | any} source A battler tag -* @return {BattlerTag} The valid battler tag -*/ + * When given a battler tag or json representing one, creates an actual BattlerTag object with the same data. + * @param {BattlerTag | any} source A battler tag + * @return {BattlerTag} The valid battler tag + */ export function loadBattlerTag(source: BattlerTag | any): BattlerTag { const tag = getBattlerTag(source.tagType, source.turnCount, source.sourceMove, source.sourceId); tag.loadTag(source); @@ -3192,17 +3640,17 @@ export function loadBattlerTag(source: BattlerTag | any): BattlerTag { /** * Helper function to verify that the current phase is a MoveEffectPhase and provide quick access to commonly used fields * - * @param pokemon {@linkcode Pokemon} The Pokémon used to access the current phase + * @param _pokemon {@linkcode Pokemon} The Pokémon used to access the current phase * @returns null if current phase is not MoveEffectPhase, otherwise Object containing the {@linkcode MoveEffectPhase}, and its * corresponding {@linkcode Move} and user {@linkcode Pokemon} */ -function getMoveEffectPhaseData(pokemon: Pokemon): {phase: MoveEffectPhase, attacker: Pokemon, move: Move} | null { +function getMoveEffectPhaseData(_pokemon: Pokemon): { phase: MoveEffectPhase; attacker: Pokemon; move: Move } | null { const phase = globalScene.getCurrentPhase(); if (phase instanceof MoveEffectPhase) { return { - phase : phase, - attacker : phase.getPokemon(), - move : phase.move.getMove() + phase: phase, + attacker: phase.getPokemon(), + move: phase.move.getMove(), }; } return null; diff --git a/src/data/berry.ts b/src/data/berry.ts index 06f52b2f38b..ed8ae8d2b62 100644 --- a/src/data/berry.ts +++ b/src/data/berry.ts @@ -3,7 +3,13 @@ import type Pokemon from "../field/pokemon"; import { HitResult } from "../field/pokemon"; import { getStatusEffectHealText } from "./status-effect"; import * as Utils from "../utils"; -import { DoubleBerryEffectAbAttr, PostItemLostAbAttr, ReduceBerryUseThresholdAbAttr, applyAbAttrs, applyPostItemLostAbAttrs } from "./ability"; +import { + DoubleBerryEffectAbAttr, + PostItemLostAbAttr, + ReduceBerryUseThresholdAbAttr, + applyAbAttrs, + applyPostItemLostAbAttrs, +} from "./ability"; import i18next from "i18next"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; @@ -29,7 +35,8 @@ export function getBerryPredicate(berryType: BerryType): BerryPredicate { case BerryType.LUM: return (pokemon: Pokemon) => !!pokemon.status || !!pokemon.getTag(BattlerTagType.CONFUSED); case BerryType.ENIGMA: - return (pokemon: Pokemon) => !!pokemon.turnData.attacksReceived.filter(a => a.result === HitResult.SUPER_EFFECTIVE).length; + return (pokemon: Pokemon) => + !!pokemon.turnData.attacksReceived.filter(a => a.result === HitResult.SUPER_EFFECTIVE).length; case BerryType.LIECHI: case BerryType.GANLON: case BerryType.PETAYA: @@ -75,8 +82,17 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc { } const hpHealed = new Utils.NumberHolder(Utils.toDmgValue(pokemon.getMaxHp() / 4)); applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, hpHealed); - globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), - hpHealed.value, i18next.t("battle:hpHealBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), berryName: getBerryName(berryType) }), true)); + globalScene.unshiftPhase( + new PokemonHealPhase( + pokemon.getBattlerIndex(), + hpHealed.value, + i18next.t("battle:hpHealBerry", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + berryName: getBerryName(berryType), + }), + true, + ), + ); applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false); }; case BerryType.LUM: @@ -104,7 +120,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc { const stat: BattleStat = berryType - BerryType.ENIGMA; const statStages = new Utils.NumberHolder(1); applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, statStages); - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ stat ], statStages.value)); + globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [stat], statStages.value)); applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false); }; case BerryType.LANSAT: @@ -123,7 +139,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc { const randStat = Utils.randSeedInt(Stat.SPD, Stat.ATK); const stages = new Utils.NumberHolder(2); applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, stages); - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ randStat ], stages.value)); + globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [randStat], stages.value)); applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false); }; case BerryType.LEPPA: @@ -131,11 +147,19 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc { if (pokemon.battleData) { pokemon.battleData.berriesEaten.push(berryType); } - const ppRestoreMove = pokemon.getMoveset().find(m => !m?.getPpRatio()) ? pokemon.getMoveset().find(m => !m?.getPpRatio()) : pokemon.getMoveset().find(m => m!.getPpRatio() < 1); // TODO: is this bang correct? + const ppRestoreMove = pokemon.getMoveset().find(m => !m?.getPpRatio()) + ? pokemon.getMoveset().find(m => !m?.getPpRatio()) + : pokemon.getMoveset().find(m => m!.getPpRatio() < 1); // TODO: is this bang correct? if (ppRestoreMove !== undefined) { - ppRestoreMove!.ppUsed = Math.max(ppRestoreMove!.ppUsed - 10, 0); - globalScene.queueMessage(i18next.t("battle:ppHealBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: ppRestoreMove!.getName(), berryName: getBerryName(berryType) })); - applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false); + ppRestoreMove!.ppUsed = Math.max(ppRestoreMove!.ppUsed - 10, 0); + globalScene.queueMessage( + i18next.t("battle:ppHealBerry", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + moveName: ppRestoreMove!.getName(), + berryName: getBerryName(berryType), + }), + ); + applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false); } }; } diff --git a/src/data/challenge.ts b/src/data/challenge.ts index 2b2048ca18d..b9d817836c3 100644 --- a/src/data/challenge.ts +++ b/src/data/challenge.ts @@ -11,7 +11,7 @@ import type { FixedBattleConfig } from "#app/battle"; import { ClassicFixedBossWaves, BattleType, getRandomTrainerFunc } from "#app/battle"; import Trainer, { TrainerVariant } from "#app/field/trainer"; import type { GameMode } from "#app/game-mode"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Challenges } from "#enums/challenges"; import { Species } from "#enums/species"; import { TrainerType } from "#enums/trainer-type"; @@ -33,37 +33,37 @@ export enum ChallengeType { /** * Challenges which modify what starters you can choose * @see {@link Challenge.applyStarterChoice} - */ + */ STARTER_CHOICE, /** * Challenges which modify how many starter points you have * @see {@link Challenge.applyStarterPoints} - */ + */ STARTER_POINTS, /** * Challenges which modify how many starter points you have * @see {@link Challenge.applyStarterPointCost} - */ + */ STARTER_COST, /** * Challenges which modify your starters in some way * @see {@link Challenge.applyStarterModify} - */ + */ STARTER_MODIFY, /** * Challenges which limit which pokemon you can have in battle. * @see {@link Challenge.applyPokemonInBattle} - */ + */ POKEMON_IN_BATTLE, /** * Adds or modifies the fixed battles in a run * @see {@link Challenge.applyFixedBattle} - */ + */ FIXED_BATTLES, /** * Modifies the effectiveness of Type matchups in battle * @see {@linkcode Challenge.applyTypeEffectiveness} - */ + */ TYPE_EFFECTIVENESS, /** * Modifies what level the AI pokemon are. UNIMPLEMENTED. @@ -93,7 +93,6 @@ export enum ChallengeType { * Modifies what the pokemon stats for Flip Stat Mode. */ FLIP_STAT, - } /** @@ -106,7 +105,7 @@ export enum MoveSourceType { GREAT_TM, ULTRA_TM, COMMON_EGG, - RARE_EGG + RARE_EGG, } /** @@ -115,17 +114,17 @@ export enum MoveSourceType { export abstract class Challenge { public id: Challenges; // The id of the challenge - public value: integer; // The "strength" of the challenge, all challenges have a numerical value. - public maxValue: integer; // The maximum strength of the challenge. - public severity: integer; // The current severity of the challenge. Some challenges have multiple severities in addition to strength. - public maxSeverity: integer; // The maximum severity of the challenge. + public value: number; // The "strength" of the challenge, all challenges have a numerical value. + public maxValue: number; // The maximum strength of the challenge. + public severity: number; // The current severity of the challenge. Some challenges have multiple severities in addition to strength. + public maxSeverity: number; // The maximum severity of the challenge. public conditions: ChallengeCondition[]; /** * @param id {@link Challenges} The enum value for the challenge */ - constructor(id: Challenges, maxValue: integer = Number.MAX_SAFE_INTEGER) { + constructor(id: Challenges, maxValue: number = Number.MAX_SAFE_INTEGER) { this.id = id; this.value = 0; @@ -148,7 +147,10 @@ export abstract class Challenge { * @returns {@link string} The i18n key for this challenge */ geti18nKey(): string { - return Challenges[this.id].split("_").map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join(""); + return Challenges[this.id] + .split("_") + .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase())) + .join(""); } /** @@ -180,7 +182,7 @@ export abstract class Challenge { /** * Returns the textual representation of a challenge's current value. - * @param overrideValue {@link integer} The value to check for. If undefined, gets the current value. + * @param overrideValue {@link number} The value to check for. If undefined, gets the current value. * @returns {@link string} The localised name for the current value. */ getValue(overrideValue?: number): string { @@ -190,12 +192,12 @@ export abstract class Challenge { /** * Returns the description of a challenge's current value. - * @param overrideValue {@link integer} The value to check for. If undefined, gets the current value. + * @param overrideValue {@link number} The value to check for. If undefined, gets the current value. * @returns {@link string} The localised description for the current value. */ getDescription(overrideValue?: number): string { const value = overrideValue ?? this.value; - return `${i18next.t([ `challenges:${this.geti18nKey()}.desc.${value}`, `challenges:${this.geti18nKey()}.desc` ])}`; + return `${i18next.t([`challenges:${this.geti18nKey()}.desc.${value}`, `challenges:${this.geti18nKey()}.desc`])}`; } /** @@ -257,7 +259,7 @@ export abstract class Challenge { * Gets the "difficulty" value of this challenge. * @returns {@link integer} The difficulty value. */ - getDifficulty(): integer { + getDifficulty(): number { return this.value; } @@ -265,7 +267,7 @@ export abstract class Challenge { * Gets the minimum difficulty added by this challenge. * @returns {@link integer} The difficulty value. */ - getMinDifficulty(): integer { + getMinDifficulty(): number { return 0; } @@ -274,98 +276,103 @@ export abstract class Challenge { * @param source The source challenge or json. * @returns This challenge. */ - static loadChallenge(source: Challenge | any): Challenge { + static loadChallenge(_source: Challenge | any): Challenge { throw new Error("Method not implemented! Use derived class"); } /** * An apply function for STARTER_CHOICE challenges. Derived classes should alter this. - * @param pokemon {@link PokemonSpecies} The pokemon to check the validity of. - * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed. - * @param dexAttr {@link DexAttrProps} The dex attributes of the pokemon. - * @param soft {@link boolean} If true, allow it if it could become a valid pokemon. + * @param _pokemon {@link PokemonSpecies} The pokemon to check the validity of. + * @param _valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed. + * @param _dexAttr {@link DexAttrProps} The dex attributes of the pokemon. + * @param _soft {@link boolean} If true, allow it if it could become a valid pokemon. * @returns {@link boolean} Whether this function did anything. */ - applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean { + applyStarterChoice( + _pokemon: PokemonSpecies, + _valid: Utils.BooleanHolder, + _dexAttr: DexAttrProps, + _soft = false, + ): boolean { return false; } /** * An apply function for STARTER_POINTS challenges. Derived classes should alter this. - * @param points {@link Utils.NumberHolder} The amount of points you have available. + * @param _points {@link Utils.NumberHolder} The amount of points you have available. * @returns {@link boolean} Whether this function did anything. */ - applyStarterPoints(points: Utils.NumberHolder): boolean { + applyStarterPoints(_points: Utils.NumberHolder): boolean { return false; } /** * An apply function for STARTER_COST challenges. Derived classes should alter this. - * @param species {@link Species} The pokemon to change the cost of. - * @param cost {@link Utils.NumberHolder} The cost of the starter. + * @param _species {@link Species} The pokemon to change the cost of. + * @param _cost {@link Utils.NumberHolder} The cost of the starter. * @returns {@link boolean} Whether this function did anything. */ - applyStarterCost(species: Species, cost: Utils.NumberHolder): boolean { + applyStarterCost(_species: Species, _cost: Utils.NumberHolder): boolean { return false; } /** * An apply function for STARTER_MODIFY challenges. Derived classes should alter this. - * @param pokemon {@link Pokemon} The starter pokemon to modify. + * @param _pokemon {@link Pokemon} The starter pokemon to modify. * @returns {@link boolean} Whether this function did anything. */ - applyStarterModify(pokemon: Pokemon): boolean { + applyStarterModify(_pokemon: Pokemon): boolean { return false; } /** * An apply function for POKEMON_IN_BATTLE challenges. Derived classes should alter this. - * @param pokemon {@link Pokemon} The pokemon to check the validity of. - * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed. + * @param _pokemon {@link Pokemon} The pokemon to check the validity of. + * @param _valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed. * @returns {@link boolean} Whether this function did anything. */ - applyPokemonInBattle(pokemon: Pokemon, valid: Utils.BooleanHolder): boolean { + applyPokemonInBattle(_pokemon: Pokemon, _valid: Utils.BooleanHolder): boolean { return false; } /** * An apply function for FIXED_BATTLE challenges. Derived classes should alter this. - * @param waveIndex {@link Number} The current wave index. - * @param battleConfig {@link FixedBattleConfig} The battle config to modify. + * @param _waveIndex {@link Number} The current wave index. + * @param _battleConfig {@link FixedBattleConfig} The battle config to modify. * @returns {@link boolean} Whether this function did anything. */ - applyFixedBattle(waveIndex: Number, battleConfig: FixedBattleConfig): boolean { + applyFixedBattle(_waveIndex: number, _battleConfig: FixedBattleConfig): boolean { return false; } /** * An apply function for TYPE_EFFECTIVENESS challenges. Derived classes should alter this. - * @param effectiveness {@linkcode Utils.NumberHolder} The current effectiveness of the move. + * @param _effectiveness {@linkcode Utils.NumberHolder} The current effectiveness of the move. * @returns Whether this function did anything. */ - applyTypeEffectiveness(effectiveness: Utils.NumberHolder): boolean { + applyTypeEffectiveness(_effectiveness: Utils.NumberHolder): boolean { return false; } /** * An apply function for AI_LEVEL challenges. Derived classes should alter this. - * @param level {@link Utils.IntegerHolder} The generated level. - * @param levelCap {@link Number} The current level cap. - * @param isTrainer {@link Boolean} Whether this is a trainer pokemon. - * @param isBoss {@link Boolean} Whether this is a non-trainer boss pokemon. + * @param _level {@link Utils.NumberHolder} The generated level. + * @param _levelCap {@link Number} The current level cap. + * @param _isTrainer {@link Boolean} Whether this is a trainer pokemon. + * @param _isBoss {@link Boolean} Whether this is a non-trainer boss pokemon. * @returns {@link boolean} Whether this function did anything. */ - applyLevelChange(level: Utils.IntegerHolder, levelCap: number, isTrainer: boolean, isBoss: boolean): boolean { + applyLevelChange(_level: Utils.NumberHolder, _levelCap: number, _isTrainer: boolean, _isBoss: boolean): boolean { return false; } /** * An apply function for AI_MOVE_SLOTS challenges. Derived classes should alter this. * @param pokemon {@link Pokemon} The pokemon that is being considered. - * @param moveSlots {@link Utils.IntegerHolder} The amount of move slots. + * @param moveSlots {@link Utils.NumberHolder} The amount of move slots. * @returns {@link boolean} Whether this function did anything. */ - applyMoveSlot(pokemon: Pokemon, moveSlots: Utils.IntegerHolder): boolean { + applyMoveSlot(_pokemon: Pokemon, _moveSlots: Utils.NumberHolder): boolean { return false; } @@ -375,7 +382,7 @@ export abstract class Challenge { * @param hasPassive {@link Utils.BooleanHolder} Whether it should have its passive. * @returns {@link boolean} Whether this function did anything. */ - applyPassiveAccess(pokemon: Pokemon, hasPassive: Utils.BooleanHolder): boolean { + applyPassiveAccess(_pokemon: Pokemon, _hasPassive: Utils.BooleanHolder): boolean { return false; } @@ -384,41 +391,46 @@ export abstract class Challenge { * @param gameMode {@link GameMode} The current game mode. * @returns {@link boolean} Whether this function did anything. */ - applyGameModeModify(gameMode: GameMode): boolean { + applyGameModeModify(_gameMode: GameMode): boolean { return false; } /** * An apply function for MOVE_ACCESS. Derived classes should alter this. - * @param pokemon {@link Pokemon} What pokemon would learn the move. - * @param moveSource {@link MoveSourceType} What source the pokemon would get the move from. - * @param move {@link Moves} The move in question. - * @param level {@link Utils.IntegerHolder} The level threshold for access. + * @param _pokemon {@link Pokemon} What pokemon would learn the move. + * @param _moveSource {@link MoveSourceType} What source the pokemon would get the move from. + * @param _move {@link Moves} The move in question. + * @param _level {@link Utils.NumberHolder} The level threshold for access. * @returns {@link boolean} Whether this function did anything. */ - applyMoveAccessLevel(pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: Utils.IntegerHolder): boolean { + applyMoveAccessLevel( + _pokemon: Pokemon, + _moveSource: MoveSourceType, + _move: Moves, + _level: Utils.NumberHolder, + ): boolean { return false; } /** * An apply function for MOVE_WEIGHT. Derived classes should alter this. - * @param pokemon {@link Pokemon} What pokemon would learn the move. - * @param moveSource {@link MoveSourceType} What source the pokemon would get the move from. - * @param move {@link Moves} The move in question. - * @param weight {@link Utils.IntegerHolder} The base weight of the move + * @param _pokemon {@link Pokemon} What pokemon would learn the move. + * @param _moveSource {@link MoveSourceType} What source the pokemon would get the move from. + * @param _move {@link Moves} The move in question. + * @param _weight {@link Utils.NumberHolder} The base weight of the move * @returns {@link boolean} Whether this function did anything. */ - applyMoveWeight(pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: Utils.IntegerHolder): boolean { + applyMoveWeight(_pokemon: Pokemon, _moveSource: MoveSourceType, _move: Moves, _level: Utils.NumberHolder): boolean { return false; } /** * An apply function for FlipStats. Derived classes should alter this. - * @param pokemon {@link Pokemon} What pokemon would learn the move. - * @param baseStats What are the stats to flip. + * @param _pokemon {@link Pokemon} What pokemon would learn the move. + * @param _baseStats What are the stats to flip. * @returns {@link boolean} Whether this function did anything. */ - applyFlipStat(pokemon: Pokemon, baseStats: number[]) { + applyFlipStat(_pokemon: Pokemon, _baseStats: number[]) { return false; } } @@ -433,10 +445,15 @@ export class SingleGenerationChallenge extends Challenge { super(Challenges.SINGLE_GENERATION, 9); } - applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean { - const generations = [ pokemon.generation ]; + applyStarterChoice( + pokemon: PokemonSpecies, + valid: Utils.BooleanHolder, + _dexAttr: DexAttrProps, + soft = false, + ): boolean { + const generations = [pokemon.generation]; if (soft) { - const speciesToCheck = [ pokemon.speciesId ]; + const speciesToCheck = [pokemon.speciesId]; while (speciesToCheck.length) { const checking = speciesToCheck.pop(); if (checking && pokemonEvolutions.hasOwnProperty(checking)) { @@ -456,9 +473,12 @@ export class SingleGenerationChallenge extends Challenge { } applyPokemonInBattle(pokemon: Pokemon, valid: Utils.BooleanHolder): boolean { - const baseGeneration = pokemon.species.speciesId === Species.VICTINI ? 5 : getPokemonSpecies(pokemon.species.speciesId).generation; - const fusionGeneration = pokemon.isFusion() ? pokemon.fusionSpecies?.speciesId === Species.VICTINI ? 5 : getPokemonSpecies(pokemon.fusionSpecies!.speciesId).generation : 0; // TODO: is the bang on fusionSpecies correct? - if (pokemon.isPlayer() && (baseGeneration !== this.value || (pokemon.isFusion() && fusionGeneration !== this.value))) { + const baseGeneration = getPokemonSpecies(pokemon.species.speciesId).generation; + const fusionGeneration = pokemon.isFusion() ? getPokemonSpecies(pokemon.fusionSpecies!.speciesId).generation : 0; // TODO: is the bang on fusionSpecies correct? + if ( + pokemon.isPlayer() && + (baseGeneration !== this.value || (pokemon.isFusion() && fusionGeneration !== this.value)) + ) { valid.value = false; return true; } @@ -467,11 +487,63 @@ export class SingleGenerationChallenge extends Challenge { applyFixedBattle(waveIndex: number, battleConfig: FixedBattleConfig): boolean { let trainerTypes: (TrainerType | TrainerType[])[] = []; - const evilTeamWaves: number[] = [ ClassicFixedBossWaves.EVIL_GRUNT_1, ClassicFixedBossWaves.EVIL_GRUNT_2, ClassicFixedBossWaves.EVIL_GRUNT_3, ClassicFixedBossWaves.EVIL_ADMIN_1, ClassicFixedBossWaves.EVIL_GRUNT_4, ClassicFixedBossWaves.EVIL_ADMIN_2, ClassicFixedBossWaves.EVIL_BOSS_1, ClassicFixedBossWaves.EVIL_BOSS_2 ]; - const evilTeamGrunts = [[ TrainerType.ROCKET_GRUNT ], [ TrainerType.ROCKET_GRUNT ], [ TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT ], [ TrainerType.GALACTIC_GRUNT ], [ TrainerType.PLASMA_GRUNT ], [ TrainerType.FLARE_GRUNT ], [ TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT ], [ TrainerType.MACRO_GRUNT ], [ TrainerType.STAR_GRUNT ]]; - const evilTeamAdmins = [[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [[ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ]], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.COLRESS ], [ TrainerType.XEROSIC, TrainerType.BRYONY ], [ TrainerType.FABA, TrainerType.PLUMERIA ], [ TrainerType.OLEANA ], [ TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI ]]; - const evilTeamBosses = [[ TrainerType.ROCKET_BOSS_GIOVANNI_1 ], [ TrainerType.ROCKET_BOSS_GIOVANNI_1 ], [ TrainerType.MAXIE, TrainerType.ARCHIE ], [ TrainerType.CYRUS ], [ TrainerType.GHETSIS ], [ TrainerType.LYSANDRE ], [ TrainerType.LUSAMINE, TrainerType.GUZMA ], [ TrainerType.ROSE ], [ TrainerType.PENNY ]]; - const evilTeamBossRematches = [[ TrainerType.ROCKET_BOSS_GIOVANNI_2 ], [ TrainerType.ROCKET_BOSS_GIOVANNI_2 ], [ TrainerType.MAXIE_2, TrainerType.ARCHIE_2 ], [ TrainerType.CYRUS_2 ], [ TrainerType.GHETSIS_2 ], [ TrainerType.LYSANDRE_2 ], [ TrainerType.LUSAMINE_2, TrainerType.GUZMA_2 ], [ TrainerType.ROSE_2 ], [ TrainerType.PENNY_2 ]]; + const evilTeamWaves: number[] = [ + ClassicFixedBossWaves.EVIL_GRUNT_1, + ClassicFixedBossWaves.EVIL_GRUNT_2, + ClassicFixedBossWaves.EVIL_GRUNT_3, + ClassicFixedBossWaves.EVIL_ADMIN_1, + ClassicFixedBossWaves.EVIL_GRUNT_4, + ClassicFixedBossWaves.EVIL_ADMIN_2, + ClassicFixedBossWaves.EVIL_BOSS_1, + ClassicFixedBossWaves.EVIL_BOSS_2, + ]; + const evilTeamGrunts = [ + [TrainerType.ROCKET_GRUNT], + [TrainerType.ROCKET_GRUNT], + [TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT], + [TrainerType.GALACTIC_GRUNT], + [TrainerType.PLASMA_GRUNT], + [TrainerType.FLARE_GRUNT], + [TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT], + [TrainerType.MACRO_GRUNT], + [TrainerType.STAR_GRUNT], + ]; + const evilTeamAdmins = [ + [TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL], + [TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL], + [ + [TrainerType.TABITHA, TrainerType.COURTNEY], + [TrainerType.MATT, TrainerType.SHELLY], + ], + [TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN], + [TrainerType.ZINZOLIN, TrainerType.COLRESS], + [TrainerType.XEROSIC, TrainerType.BRYONY], + [TrainerType.FABA, TrainerType.PLUMERIA], + [TrainerType.OLEANA], + [TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI], + ]; + const evilTeamBosses = [ + [TrainerType.ROCKET_BOSS_GIOVANNI_1], + [TrainerType.ROCKET_BOSS_GIOVANNI_1], + [TrainerType.MAXIE, TrainerType.ARCHIE], + [TrainerType.CYRUS], + [TrainerType.GHETSIS], + [TrainerType.LYSANDRE], + [TrainerType.LUSAMINE, TrainerType.GUZMA], + [TrainerType.ROSE], + [TrainerType.PENNY], + ]; + const evilTeamBossRematches = [ + [TrainerType.ROCKET_BOSS_GIOVANNI_2], + [TrainerType.ROCKET_BOSS_GIOVANNI_2], + [TrainerType.MAXIE_2, TrainerType.ARCHIE_2], + [TrainerType.CYRUS_2], + [TrainerType.GHETSIS_2], + [TrainerType.LYSANDRE_2], + [TrainerType.LUSAMINE_2, TrainerType.GUZMA_2], + [TrainerType.ROSE_2], + [TrainerType.PENNY_2], + ]; switch (waveIndex) { case ClassicFixedBossWaves.EVIL_GRUNT_1: trainerTypes = evilTeamGrunts[this.value - 1]; @@ -488,42 +560,123 @@ export class SingleGenerationChallenge extends Challenge { break; case ClassicFixedBossWaves.EVIL_BOSS_1: trainerTypes = evilTeamBosses[this.value - 1]; - battleConfig.setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1).setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true)) - .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false }); + battleConfig + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) + .setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true)) + .setCustomModifierRewards({ + guaranteedModifierTiers: [ + ModifierTier.ROGUE, + ModifierTier.ROGUE, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ], + allowLuckUpgrades: false, + }); return true; case ClassicFixedBossWaves.EVIL_BOSS_2: trainerTypes = evilTeamBossRematches[this.value - 1]; - battleConfig.setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1).setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true)) - .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false }); + battleConfig + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) + .setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true)) + .setCustomModifierRewards({ + guaranteedModifierTiers: [ + ModifierTier.ROGUE, + ModifierTier.ROGUE, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ], + allowLuckUpgrades: false, + }); return true; case ClassicFixedBossWaves.ELITE_FOUR_1: - trainerTypes = [ TrainerType.LORELEI, TrainerType.WILL, TrainerType.SIDNEY, TrainerType.AARON, TrainerType.SHAUNTAL, TrainerType.MALVA, Utils.randSeedItem([ TrainerType.HALA, TrainerType.MOLAYNE ]), TrainerType.MARNIE_ELITE, TrainerType.RIKA ]; + trainerTypes = [ + TrainerType.LORELEI, + TrainerType.WILL, + TrainerType.SIDNEY, + TrainerType.AARON, + TrainerType.SHAUNTAL, + TrainerType.MALVA, + Utils.randSeedItem([TrainerType.HALA, TrainerType.MOLAYNE]), + TrainerType.MARNIE_ELITE, + TrainerType.RIKA, + ]; break; case ClassicFixedBossWaves.ELITE_FOUR_2: - trainerTypes = [ TrainerType.BRUNO, TrainerType.KOGA, TrainerType.PHOEBE, TrainerType.BERTHA, TrainerType.MARSHAL, TrainerType.SIEBOLD, TrainerType.OLIVIA, TrainerType.NESSA_ELITE, TrainerType.POPPY ]; + trainerTypes = [ + TrainerType.BRUNO, + TrainerType.KOGA, + TrainerType.PHOEBE, + TrainerType.BERTHA, + TrainerType.MARSHAL, + TrainerType.SIEBOLD, + TrainerType.OLIVIA, + TrainerType.NESSA_ELITE, + TrainerType.POPPY, + ]; break; case ClassicFixedBossWaves.ELITE_FOUR_3: - trainerTypes = [ TrainerType.AGATHA, TrainerType.BRUNO, TrainerType.GLACIA, TrainerType.FLINT, TrainerType.GRIMSLEY, TrainerType.WIKSTROM, TrainerType.ACEROLA, Utils.randSeedItem([ TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE ]), TrainerType.LARRY_ELITE ]; + trainerTypes = [ + TrainerType.AGATHA, + TrainerType.BRUNO, + TrainerType.GLACIA, + TrainerType.FLINT, + TrainerType.GRIMSLEY, + TrainerType.WIKSTROM, + TrainerType.ACEROLA, + Utils.randSeedItem([TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE]), + TrainerType.LARRY_ELITE, + ]; break; case ClassicFixedBossWaves.ELITE_FOUR_4: - trainerTypes = [ TrainerType.LANCE, TrainerType.KAREN, TrainerType.DRAKE, TrainerType.LUCIAN, TrainerType.CAITLIN, TrainerType.DRASNA, TrainerType.KAHILI, TrainerType.RAIHAN_ELITE, TrainerType.HASSEL ]; + trainerTypes = [ + TrainerType.LANCE, + TrainerType.KAREN, + TrainerType.DRAKE, + TrainerType.LUCIAN, + TrainerType.CAITLIN, + TrainerType.DRASNA, + TrainerType.KAHILI, + TrainerType.RAIHAN_ELITE, + TrainerType.HASSEL, + ]; break; case ClassicFixedBossWaves.CHAMPION: - trainerTypes = [ TrainerType.BLUE, Utils.randSeedItem([ TrainerType.RED, TrainerType.LANCE_CHAMPION ]), Utils.randSeedItem([ TrainerType.STEVEN, TrainerType.WALLACE ]), TrainerType.CYNTHIA, Utils.randSeedItem([ TrainerType.ALDER, TrainerType.IRIS ]), TrainerType.DIANTHA, Utils.randSeedItem([ TrainerType.KUKUI, TrainerType.HAU ]), Utils.randSeedItem([ TrainerType.LEON, TrainerType.MUSTARD ]), Utils.randSeedItem([ TrainerType.GEETA, TrainerType.NEMONA ]) ]; + trainerTypes = [ + TrainerType.BLUE, + Utils.randSeedItem([TrainerType.RED, TrainerType.LANCE_CHAMPION]), + Utils.randSeedItem([TrainerType.STEVEN, TrainerType.WALLACE]), + TrainerType.CYNTHIA, + Utils.randSeedItem([TrainerType.ALDER, TrainerType.IRIS]), + TrainerType.DIANTHA, + Utils.randSeedItem([TrainerType.KUKUI, TrainerType.HAU]), + Utils.randSeedItem([TrainerType.LEON, TrainerType.MUSTARD]), + Utils.randSeedItem([TrainerType.GEETA, TrainerType.NEMONA]), + ]; break; } if (trainerTypes.length === 0) { return false; - } else if (evilTeamWaves.includes(waveIndex)) { - battleConfig.setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1).setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true)); - return true; - } else if (waveIndex >= ClassicFixedBossWaves.ELITE_FOUR_1 && waveIndex <= ClassicFixedBossWaves.CHAMPION) { - const ttypes = trainerTypes as TrainerType[]; - battleConfig.setBattleType(BattleType.TRAINER).setGetTrainerFunc(() => new Trainer(ttypes[this.value - 1], TrainerVariant.DEFAULT)); - return true; - } else { - return false; } + if (evilTeamWaves.includes(waveIndex)) { + battleConfig + .setBattleType(BattleType.TRAINER) + .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1) + .setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true)); + return true; + } + if (waveIndex >= ClassicFixedBossWaves.ELITE_FOUR_1 && waveIndex <= ClassicFixedBossWaves.CHAMPION) { + const ttypes = trainerTypes as TrainerType[]; + battleConfig + .setBattleType(BattleType.TRAINER) + .setGetTrainerFunc(() => new Trainer(ttypes[this.value - 1], TrainerVariant.DEFAULT)); + return true; + } + return false; } /** @@ -556,10 +709,11 @@ export class SingleGenerationChallenge extends Challenge { if (value === 0) { return i18next.t("challenges:singleGeneration.desc_default"); } - return i18next.t("challenges:singleGeneration.desc", { gen: i18next.t(`challenges:singleGeneration.gen_${value}`) }); + return i18next.t("challenges:singleGeneration.desc", { + gen: i18next.t(`challenges:singleGeneration.gen_${value}`), + }); } - static loadChallenge(source: SingleGenerationChallenge | any): SingleGenerationChallenge { const newChallenge = new SingleGenerationChallenge(); newChallenge.value = source.value; @@ -572,7 +726,7 @@ interface monotypeOverride { /** The species to override */ species: Species; /** The type to count as */ - type: Type; + type: PokemonType; /** If part of a fusion, should we check the fused species instead of the base species? */ fusion: boolean; } @@ -582,20 +736,25 @@ interface monotypeOverride { */ export class SingleTypeChallenge extends Challenge { private static TYPE_OVERRIDES: monotypeOverride[] = [ - { species: Species.CASTFORM, type: Type.NORMAL, fusion: false }, + { species: Species.CASTFORM, type: PokemonType.NORMAL, fusion: false }, ]; // TODO: Find a solution for all Pokemon with this ssui issue, including Basculin and Burmy - private static SPECIES_OVERRIDES: Species[] = [ Species.MELOETTA ]; + private static SPECIES_OVERRIDES: Species[] = [Species.MELOETTA]; constructor() { super(Challenges.SINGLE_TYPE, 18); } - override applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean { + override applyStarterChoice( + pokemon: PokemonSpecies, + valid: Utils.BooleanHolder, + dexAttr: DexAttrProps, + soft = false, + ): boolean { const speciesForm = getPokemonSpeciesForm(pokemon.speciesId, dexAttr.formIndex); - const types = [ speciesForm.type1, speciesForm.type2 ]; + const types = [speciesForm.type1, speciesForm.type2]; if (soft && !SingleTypeChallenge.SPECIES_OVERRIDES.includes(pokemon.speciesId)) { - const speciesToCheck = [ pokemon.speciesId ]; + const speciesToCheck = [pokemon.speciesId]; while (speciesToCheck.length) { const checking = speciesToCheck.pop(); if (checking && pokemonEvolutions.hasOwnProperty(checking)) { @@ -623,8 +782,16 @@ export class SingleTypeChallenge extends Challenge { } applyPokemonInBattle(pokemon: Pokemon, valid: Utils.BooleanHolder): boolean { - if (pokemon.isPlayer() && !pokemon.isOfType(this.value - 1, false, false, true) - && !SingleTypeChallenge.TYPE_OVERRIDES.some(o => o.type === (this.value - 1) && (pokemon.isFusion() && o.fusion ? pokemon.fusionSpecies! : pokemon.species).speciesId === o.species)) { // TODO: is the bang on fusionSpecies correct? + if ( + pokemon.isPlayer() && + !pokemon.isOfType(this.value - 1, false, false, true) && + !SingleTypeChallenge.TYPE_OVERRIDES.some( + o => + o.type === this.value - 1 && + (pokemon.isFusion() && o.fusion ? pokemon.fusionSpecies! : pokemon.species).speciesId === o.species, + ) + ) { + // TODO: is the bang on fusionSpecies correct? valid.value = false; return true; } @@ -643,11 +810,11 @@ export class SingleTypeChallenge extends Challenge { * @param {value} overrideValue The value to check for. If undefined, gets the current value. * @returns {string} The localised name for the current value. */ - getValue(overrideValue?: integer): string { + getValue(overrideValue?: number): string { if (overrideValue === undefined) { overrideValue = this.value; } - return Type[this.value - 1].toLowerCase(); + return PokemonType[this.value - 1].toLowerCase(); } /** @@ -655,14 +822,16 @@ export class SingleTypeChallenge extends Challenge { * @param {value} overrideValue The value to check for. If undefined, gets the current value. * @returns {string} The localised description for the current value. */ - getDescription(overrideValue?: integer): string { + getDescription(overrideValue?: number): string { if (overrideValue === undefined) { overrideValue = this.value; } - const type = i18next.t(`pokemonInfo:Type.${Type[this.value - 1]}`); - const typeColor = `[color=${TypeColor[Type[this.value - 1]]}][shadow=${TypeShadow[Type[this.value - 1]]}]${type}[/shadow][/color]`; + const type = i18next.t(`pokemonInfo:Type.${PokemonType[this.value - 1]}`); + const typeColor = `[color=${TypeColor[PokemonType[this.value - 1]]}][shadow=${TypeShadow[PokemonType[this.value - 1]]}]${type}[/shadow][/color]`; const defaultDesc = i18next.t("challenges:singleType.desc_default"); - const typeDesc = i18next.t("challenges:singleType.desc", { type: typeColor }); + const typeDesc = i18next.t("challenges:singleType.desc", { + type: typeColor, + }); return this.value === 0 ? defaultDesc : typeDesc; } @@ -702,12 +871,18 @@ export class FreshStartChallenge extends Challenge { pokemon.abilityIndex = 0; // Always base ability, not hidden ability pokemon.passive = false; // Passive isn't unlocked pokemon.nature = Nature.HARDY; // Neutral nature - pokemon.moveset = pokemon.species.getLevelMoves().filter(m => m[0] <= 5).map(lm => lm[1]).slice(0, 4).map(m => new PokemonMove(m)); // No egg moves + pokemon.moveset = pokemon.species + .getLevelMoves() + .filter(m => m[0] <= 5) + .map(lm => lm[1]) + .slice(0, 4) + .map(m => new PokemonMove(m)); // No egg moves pokemon.luck = 0; // No luck pokemon.shiny = false; // Not shiny pokemon.variant = 0; // Not shiny pokemon.formIndex = 0; // Froakie should be base form - pokemon.ivs = [ 15, 15, 15, 15, 15, 15 ]; // Default IVs of 15 for all stats (Updated to 15 from 10 in 1.2.0) + pokemon.ivs = [15, 15, 15, 15, 15, 15]; // Default IVs of 15 for all stats (Updated to 15 from 10 in 1.2.0) + pokemon.teraType = pokemon.species.type1; // Always primary tera type return true; } @@ -746,7 +921,8 @@ export class InverseBattleChallenge extends Challenge { if (effectiveness.value < 1) { effectiveness.value = 2; return true; - } else if (effectiveness.value > 1) { + } + if (effectiveness.value > 1) { effectiveness.value = 0.5; return true; } @@ -763,7 +939,7 @@ export class FlipStatChallenge extends Challenge { super(Challenges.FLIP_STAT, 1); } - override applyFlipStat(pokemon: Pokemon, baseStats: number[]) { + override applyFlipStat(_pokemon: Pokemon, baseStats: number[]) { const origStats = Utils.deepCopy(baseStats); baseStats[0] = origStats[5]; baseStats[1] = origStats[4]; @@ -793,7 +969,7 @@ export class LowerStarterMaxCostChallenge extends Challenge { /** * @override */ - getValue(overrideValue?: integer): string { + getValue(overrideValue?: number): string { if (overrideValue === undefined) { overrideValue = this.value; } @@ -827,7 +1003,7 @@ export class LowerStarterPointsChallenge extends Challenge { /** * @override */ - getValue(overrideValue?: integer): string { + getValue(overrideValue?: number): string { if (overrideValue === undefined) { overrideValue = this.value; } @@ -857,7 +1033,14 @@ export class LowerStarterPointsChallenge extends Challenge { * @param soft {@link boolean} If true, allow it if it could become a valid pokemon. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_CHOICE, pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.STARTER_CHOICE, + pokemon: PokemonSpecies, + valid: Utils.BooleanHolder, + dexAttr: DexAttrProps, + soft: boolean, +): boolean; /** * Apply all challenges that modify available total starter points. * @param gameMode {@link GameMode} The current gameMode @@ -865,7 +1048,11 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType * @param points {@link Utils.NumberHolder} The amount of points you have available. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_POINTS, points: Utils.NumberHolder): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.STARTER_POINTS, + points: Utils.NumberHolder, +): boolean; /** * Apply all challenges that modify the cost of a starter. * @param gameMode {@link GameMode} The current gameMode @@ -874,7 +1061,12 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType * @param points {@link Utils.NumberHolder} The cost of the pokemon. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_COST, species: Species, cost: Utils.NumberHolder): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.STARTER_COST, + species: Species, + cost: Utils.NumberHolder, +): boolean; /** * Apply all challenges that modify a starter after selection. * @param gameMode {@link GameMode} The current gameMode @@ -882,7 +1074,11 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType * @param pokemon {@link Pokemon} The starter pokemon to modify. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_MODIFY, pokemon: Pokemon): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.STARTER_MODIFY, + pokemon: Pokemon, +): boolean; /** * Apply all challenges that what pokemon you can have in battle. * @param gameMode {@link GameMode} The current gameMode @@ -891,7 +1087,12 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.POKEMON_IN_BATTLE, pokemon: Pokemon, valid: Utils.BooleanHolder): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.POKEMON_IN_BATTLE, + pokemon: Pokemon, + valid: Utils.BooleanHolder, +): boolean; /** * Apply all challenges that modify what fixed battles there are. * @param gameMode {@link GameMode} The current gameMode @@ -900,7 +1101,12 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType * @param battleConfig {@link FixedBattleConfig} The battle config to modify. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.FIXED_BATTLES, waveIndex: Number, battleConfig: FixedBattleConfig): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.FIXED_BATTLES, + waveIndex: number, + battleConfig: FixedBattleConfig, +): boolean; /** * Apply all challenges that modify type effectiveness. * @param gameMode {@linkcode GameMode} The current gameMode @@ -908,27 +1114,43 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType * @param effectiveness {@linkcode Utils.NumberHolder} The current effectiveness of the move. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.TYPE_EFFECTIVENESS, effectiveness: Utils.NumberHolder): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.TYPE_EFFECTIVENESS, + effectiveness: Utils.NumberHolder, +): boolean; /** * Apply all challenges that modify what level AI are. * @param gameMode {@link GameMode} The current gameMode * @param challengeType {@link ChallengeType} ChallengeType.AI_LEVEL - * @param level {@link Utils.IntegerHolder} The generated level of the pokemon. + * @param level {@link Utils.NumberHolder} The generated level of the pokemon. * @param levelCap {@link Number} The maximum level cap for the current wave. * @param isTrainer {@link Boolean} Whether this is a trainer pokemon. * @param isBoss {@link Boolean} Whether this is a non-trainer boss pokemon. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.AI_LEVEL, level: Utils.IntegerHolder, levelCap: number, isTrainer: boolean, isBoss: boolean): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.AI_LEVEL, + level: Utils.NumberHolder, + levelCap: number, + isTrainer: boolean, + isBoss: boolean, +): boolean; /** * Apply all challenges that modify how many move slots the AI has. * @param gameMode {@link GameMode} The current gameMode * @param challengeType {@link ChallengeType} ChallengeType.AI_MOVE_SLOTS * @param pokemon {@link Pokemon} The pokemon being considered. - * @param moveSlots {@link Utils.IntegerHolder} The amount of move slots. + * @param moveSlots {@link Utils.NumberHolder} The amount of move slots. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.AI_MOVE_SLOTS, pokemon: Pokemon, moveSlots: Utils.IntegerHolder): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.AI_MOVE_SLOTS, + pokemon: Pokemon, + moveSlots: Utils.NumberHolder, +): boolean; /** * Apply all challenges that modify whether a pokemon has its passive. * @param gameMode {@link GameMode} The current gameMode @@ -937,7 +1159,12 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType * @param hasPassive {@link Utils.BooleanHolder} Whether it has its passive. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.PASSIVE_ACCESS, pokemon: Pokemon, hasPassive: Utils.BooleanHolder): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.PASSIVE_ACCESS, + pokemon: Pokemon, + hasPassive: Utils.BooleanHolder, +): boolean; /** * Apply all challenges that modify the game modes settings. * @param gameMode {@link GameMode} The current gameMode @@ -952,10 +1179,17 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType * @param pokemon {@link Pokemon} What pokemon would learn the move. * @param moveSource {@link MoveSourceType} What source the pokemon would get the move from. * @param move {@link Moves} The move in question. - * @param level {@link Utils.IntegerHolder} The level threshold for access. + * @param level {@link Utils.NumberHolder} The level threshold for access. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.MOVE_ACCESS, pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: Utils.IntegerHolder): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.MOVE_ACCESS, + pokemon: Pokemon, + moveSource: MoveSourceType, + move: Moves, + level: Utils.NumberHolder, +): boolean; /** * Apply all challenges that modify what weight a pokemon gives to move generation * @param gameMode {@link GameMode} The current gameMode @@ -963,12 +1197,24 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType * @param pokemon {@link Pokemon} What pokemon would learn the move. * @param moveSource {@link MoveSourceType} What source the pokemon would get the move from. * @param move {@link Moves} The move in question. - * @param weight {@link Utils.IntegerHolder} The weight of the move. + * @param weight {@link Utils.NumberHolder} The weight of the move. * @returns True if any challenge was successfully applied. */ -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.MOVE_WEIGHT, pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, weight: Utils.IntegerHolder): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.MOVE_WEIGHT, + pokemon: Pokemon, + moveSource: MoveSourceType, + move: Moves, + weight: Utils.NumberHolder, +): boolean; -export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.FLIP_STAT, pokemon: Pokemon, baseStats: number[]): boolean; +export function applyChallenges( + gameMode: GameMode, + challengeType: ChallengeType.FLIP_STAT, + pokemon: Pokemon, + baseStats: number[], +): boolean; export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType, ...args: any[]): boolean { let ret = false; @@ -1056,6 +1302,6 @@ export function initChallenges() { new SingleTypeChallenge(), new FreshStartChallenge(), new InverseBattleChallenge(), - new FlipStatChallenge() + new FlipStatChallenge(), ); } diff --git a/src/data/custom-pokemon-data.ts b/src/data/custom-pokemon-data.ts index 4a5eb89aeed..d95d9f77b83 100644 --- a/src/data/custom-pokemon-data.ts +++ b/src/data/custom-pokemon-data.ts @@ -1,5 +1,5 @@ import type { Abilities } from "#enums/abilities"; -import type { Type } from "#enums/type"; +import type { PokemonType } from "#enums/pokemon-type"; import { isNullOrUndefined } from "#app/utils"; import type { Nature } from "#enums/nature"; @@ -13,7 +13,7 @@ export class CustomPokemonData { public ability: Abilities | -1; public passive: Abilities | -1; public nature: Nature | -1; - public types: Type[]; + public types: PokemonType[]; /** `hitsReceivedCount` aka `hitsRecCount` saves how often the pokemon got hit until a new arena encounter (used for Rage Fist) */ public hitsRecCount: number; diff --git a/src/data/daily-run.ts b/src/data/daily-run.ts index 2a4a78a9caf..22fb7db10ae 100644 --- a/src/data/daily-run.ts +++ b/src/data/daily-run.ts @@ -11,12 +11,12 @@ import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; import { Biome } from "#app/enums/biome"; export interface DailyRunConfig { - seed: integer; + seed: number; starters: Starter; } export function fetchDailyRunSeed(): Promise { - return new Promise((resolve, reject) => { + return new Promise((resolve, _reject) => { pokerogueApi.daily.getSeed().then(dailySeed => { resolve(dailySeed); }); @@ -26,55 +26,76 @@ export function fetchDailyRunSeed(): Promise { export function getDailyRunStarters(seed: string): Starter[] { const starters: Starter[] = []; - globalScene.executeWithSeedOffset(() => { - const startingLevel = globalScene.gameMode.getStartingLevel(); + globalScene.executeWithSeedOffset( + () => { + const startingLevel = globalScene.gameMode.getStartingLevel(); - if (/\d{18}$/.test(seed)) { - for (let s = 0; s < 3; s++) { - const offset = 6 + s * 6; - const starterSpeciesForm = getPokemonSpeciesForm(parseInt(seed.slice(offset, offset + 4)) as Species, parseInt(seed.slice(offset + 4, offset + 6))); - starters.push(getDailyRunStarter(starterSpeciesForm, startingLevel)); + if (/\d{18}$/.test(seed)) { + for (let s = 0; s < 3; s++) { + const offset = 6 + s * 6; + const starterSpeciesForm = getPokemonSpeciesForm( + Number.parseInt(seed.slice(offset, offset + 4)) as Species, + Number.parseInt(seed.slice(offset + 4, offset + 6)), + ); + starters.push(getDailyRunStarter(starterSpeciesForm, startingLevel)); + } + return; } - return; - } - const starterCosts: integer[] = []; - starterCosts.push(Math.min(Math.round(3.5 + Math.abs(Utils.randSeedGauss(1))), 8)); - starterCosts.push(Utils.randSeedInt(9 - starterCosts[0], 1)); - starterCosts.push(10 - (starterCosts[0] + starterCosts[1])); + const starterCosts: number[] = []; + starterCosts.push(Math.min(Math.round(3.5 + Math.abs(Utils.randSeedGauss(1))), 8)); + starterCosts.push(Utils.randSeedInt(9 - starterCosts[0], 1)); + starterCosts.push(10 - (starterCosts[0] + starterCosts[1])); - for (let c = 0; c < starterCosts.length; c++) { - const cost = starterCosts[c]; - const costSpecies = Object.keys(speciesStarterCosts) - .map(s => parseInt(s) as Species) - .filter(s => speciesStarterCosts[s] === cost); - const randPkmSpecies = getPokemonSpecies(Utils.randSeedItem(costSpecies)); - const starterSpecies = getPokemonSpecies(randPkmSpecies.getTrainerSpeciesForLevel(startingLevel, true, PartyMemberStrength.STRONGER)); - starters.push(getDailyRunStarter(starterSpecies, startingLevel)); - } - }, 0, seed); + for (let c = 0; c < starterCosts.length; c++) { + const cost = starterCosts[c]; + const costSpecies = Object.keys(speciesStarterCosts) + .map(s => Number.parseInt(s) as Species) + .filter(s => speciesStarterCosts[s] === cost); + const randPkmSpecies = getPokemonSpecies(Utils.randSeedItem(costSpecies)); + const starterSpecies = getPokemonSpecies( + randPkmSpecies.getTrainerSpeciesForLevel(startingLevel, true, PartyMemberStrength.STRONGER), + ); + starters.push(getDailyRunStarter(starterSpecies, startingLevel)); + } + }, + 0, + seed, + ); return starters; } -function getDailyRunStarter(starterSpeciesForm: PokemonSpeciesForm, startingLevel: integer): Starter { - const starterSpecies = starterSpeciesForm instanceof PokemonSpecies ? starterSpeciesForm : getPokemonSpecies(starterSpeciesForm.speciesId); +function getDailyRunStarter(starterSpeciesForm: PokemonSpeciesForm, startingLevel: number): Starter { + const starterSpecies = + starterSpeciesForm instanceof PokemonSpecies ? starterSpeciesForm : getPokemonSpecies(starterSpeciesForm.speciesId); const formIndex = starterSpeciesForm instanceof PokemonSpecies ? undefined : starterSpeciesForm.formIndex; - const pokemon = new PlayerPokemon(starterSpecies, startingLevel, undefined, formIndex, undefined, undefined, undefined, undefined, undefined, undefined); + const pokemon = new PlayerPokemon( + starterSpecies, + startingLevel, + undefined, + formIndex, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + ); const starter: Starter = { species: starterSpecies, dexAttr: pokemon.getDexAttr(), abilityIndex: pokemon.abilityIndex, passive: false, nature: pokemon.getNature(), - pokerus: pokemon.pokerus + pokerus: pokemon.pokerus, }; pokemon.destroy(); return starter; } interface BiomeWeights { - [key: integer]: integer + [key: number]: number; } // Initially weighted by amount of exits each biome has @@ -125,7 +146,7 @@ export function getDailyStartingBiome(): Biome { const biomes = Utils.getEnumValues(Biome).filter(b => b !== Biome.TOWN && b !== Biome.END); let totalWeight = 0; - const biomeThresholds: integer[] = []; + const biomeThresholds: number[] = []; for (const biome of biomes) { // Keep track of the total weight totalWeight += dailyBiomeWeights[biome]; diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts index b42850fe4de..208e269bd9c 100644 --- a/src/data/dialogue.ts +++ b/src/data/dialogue.ts @@ -3,13 +3,13 @@ import { TrainerType } from "#enums/trainer-type"; import { trainerConfigs } from "./trainer-config"; export interface TrainerTypeMessages { - encounter?: string | string[], - victory?: string | string[], - defeat?: string | string[] + encounter?: string | string[]; + victory?: string | string[]; + defeat?: string | string[]; } export interface TrainerTypeDialogue { - [key: integer]: TrainerTypeMessages | Array + [key: number]: TrainerTypeMessages | Array; } export function getTrainerTypeDialogue(): TrainerTypeDialogue { @@ -32,7 +32,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:youngster.encounter.10", "dialogue:youngster.encounter.11", "dialogue:youngster.encounter.12", - "dialogue:youngster.encounter.13" + "dialogue:youngster.encounter.13", ], victory: [ "dialogue:youngster.victory.1", @@ -48,7 +48,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:youngster.victory.11", "dialogue:youngster.victory.12", "dialogue:youngster.victory.13", - ] + ], }, //LASS { @@ -61,7 +61,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:lass.encounter.6", "dialogue:lass.encounter.7", "dialogue:lass.encounter.8", - "dialogue:lass.encounter.9" + "dialogue:lass.encounter.9", ], victory: [ "dialogue:lass.victory.1", @@ -72,27 +72,15 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:lass.victory.6", "dialogue:lass.victory.7", "dialogue:lass.victory.8", - "dialogue:lass.victory.9" - ] - } + "dialogue:lass.victory.9", + ], + }, ], [TrainerType.BREEDER]: [ { - encounter: [ - "dialogue:breeder.encounter.1", - "dialogue:breeder.encounter.2", - "dialogue:breeder.encounter.3", - ], - victory: [ - "dialogue:breeder.victory.1", - "dialogue:breeder.victory.2", - "dialogue:breeder.victory.3", - ], - defeat: [ - "dialogue:breeder.defeat.1", - "dialogue:breeder.defeat.2", - "dialogue:breeder.defeat.3", - ] + encounter: ["dialogue:breeder.encounter.1", "dialogue:breeder.encounter.2", "dialogue:breeder.encounter.3"], + victory: ["dialogue:breeder.victory.1", "dialogue:breeder.victory.2", "dialogue:breeder.victory.3"], + defeat: ["dialogue:breeder.defeat.1", "dialogue:breeder.defeat.2", "dialogue:breeder.defeat.3"], }, { encounter: [ @@ -109,21 +97,13 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:breeder_female.defeat.1", "dialogue:breeder_female.defeat.2", "dialogue:breeder_female.defeat.3", - ] - } + ], + }, ], [TrainerType.FISHERMAN]: [ { - encounter: [ - "dialogue:fisherman.encounter.1", - "dialogue:fisherman.encounter.2", - "dialogue:fisherman.encounter.3", - ], - victory: [ - "dialogue:fisherman.victory.1", - "dialogue:fisherman.victory.2", - "dialogue:fisherman.victory.3", - ] + encounter: ["dialogue:fisherman.encounter.1", "dialogue:fisherman.encounter.2", "dialogue:fisherman.encounter.3"], + victory: ["dialogue:fisherman.victory.1", "dialogue:fisherman.victory.2", "dialogue:fisherman.victory.3"], }, { encounter: [ @@ -135,22 +115,14 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:fisherman_female.victory.1", "dialogue:fisherman_female.victory.2", "dialogue:fisherman_female.victory.3", - ] - } + ], + }, ], [TrainerType.SWIMMER]: [ { - encounter: [ - "dialogue:swimmer.encounter.1", - "dialogue:swimmer.encounter.2", - "dialogue:swimmer.encounter.3", - ], - victory: [ - "dialogue:swimmer.victory.1", - "dialogue:swimmer.victory.2", - "dialogue:swimmer.victory.3", - ] - } + encounter: ["dialogue:swimmer.encounter.1", "dialogue:swimmer.encounter.2", "dialogue:swimmer.encounter.3"], + victory: ["dialogue:swimmer.victory.1", "dialogue:swimmer.victory.2", "dialogue:swimmer.victory.3"], + }, ], [TrainerType.BACKPACKER]: [ { @@ -165,8 +137,8 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:backpacker.victory.2", "dialogue:backpacker.victory.3", "dialogue:backpacker.victory.4", - ] - } + ], + }, ], [TrainerType.ACE_TRAINER]: [ { @@ -187,258 +159,138 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:ace_trainer.defeat.2", "dialogue:ace_trainer.defeat.3", "dialogue:ace_trainer.defeat.4", - ] - } + ], + }, ], [TrainerType.PARASOL_LADY]: [ { - encounter: [ - "dialogue:parasol_lady.encounter.1", - ], - victory: [ - "dialogue:parasol_lady.victory.1", - ] - } + encounter: ["dialogue:parasol_lady.encounter.1"], + victory: ["dialogue:parasol_lady.victory.1"], + }, ], [TrainerType.TWINS]: [ { - encounter: [ - "dialogue:twins.encounter.1", - "dialogue:twins.encounter.2", - "dialogue:twins.encounter.3", - ], - victory: [ - "dialogue:twins.victory.1", - "dialogue:twins.victory.2", - "dialogue:twins.victory.3", - ], - defeat: [ - "dialogue:twins.defeat.1", - "dialogue:twins.defeat.2", - "dialogue:twins.defeat.3", - ], - } + encounter: ["dialogue:twins.encounter.1", "dialogue:twins.encounter.2", "dialogue:twins.encounter.3"], + victory: ["dialogue:twins.victory.1", "dialogue:twins.victory.2", "dialogue:twins.victory.3"], + defeat: ["dialogue:twins.defeat.1", "dialogue:twins.defeat.2", "dialogue:twins.defeat.3"], + }, ], [TrainerType.CYCLIST]: [ { - encounter: [ - "dialogue:cyclist.encounter.1", - "dialogue:cyclist.encounter.2", - "dialogue:cyclist.encounter.3", - ], - victory: [ - "dialogue:cyclist.victory.1", - "dialogue:cyclist.victory.2", - "dialogue:cyclist.victory.3", - ] - } + encounter: ["dialogue:cyclist.encounter.1", "dialogue:cyclist.encounter.2", "dialogue:cyclist.encounter.3"], + victory: ["dialogue:cyclist.victory.1", "dialogue:cyclist.victory.2", "dialogue:cyclist.victory.3"], + }, ], [TrainerType.BLACK_BELT]: [ { - encounter: [ - "dialogue:black_belt.encounter.1", - "dialogue:black_belt.encounter.2", - ], - victory: [ - "dialogue:black_belt.victory.1", - "dialogue:black_belt.victory.2", - ] + encounter: ["dialogue:black_belt.encounter.1", "dialogue:black_belt.encounter.2"], + victory: ["dialogue:black_belt.victory.1", "dialogue:black_belt.victory.2"], }, //BATTLE GIRL { - encounter: [ - "dialogue:battle_girl.encounter.1", - ], - victory: [ - "dialogue:battle_girl.victory.1", - ] - } + encounter: ["dialogue:battle_girl.encounter.1"], + victory: ["dialogue:battle_girl.victory.1"], + }, ], [TrainerType.HIKER]: [ { - encounter: [ - "dialogue:hiker.encounter.1", - "dialogue:hiker.encounter.2", - ], - victory: [ - "dialogue:hiker.victory.1", - "dialogue:hiker.victory.2", - ] - } + encounter: ["dialogue:hiker.encounter.1", "dialogue:hiker.encounter.2"], + victory: ["dialogue:hiker.victory.1", "dialogue:hiker.victory.2"], + }, ], [TrainerType.RANGER]: [ { - encounter: [ - "dialogue:ranger.encounter.1", - "dialogue:ranger.encounter.2", - ], - victory: [ - "dialogue:ranger.victory.1", - "dialogue:ranger.victory.2", - ], - defeat: [ - "dialogue:ranger.defeat.1", - "dialogue:ranger.defeat.2", - ] - } + encounter: ["dialogue:ranger.encounter.1", "dialogue:ranger.encounter.2"], + victory: ["dialogue:ranger.victory.1", "dialogue:ranger.victory.2"], + defeat: ["dialogue:ranger.defeat.1", "dialogue:ranger.defeat.2"], + }, ], [TrainerType.SCIENTIST]: [ { - encounter: [ - "dialogue:scientist.encounter.1", - ], - victory: [ - "dialogue:scientist.victory.1", - ] - } + encounter: ["dialogue:scientist.encounter.1"], + victory: ["dialogue:scientist.victory.1"], + }, ], [TrainerType.SCHOOL_KID]: [ { - encounter: [ - "dialogue:school_kid.encounter.1", - "dialogue:school_kid.encounter.2", - ], - victory: [ - "dialogue:school_kid.victory.1", - "dialogue:school_kid.victory.2", - ] - } + encounter: ["dialogue:school_kid.encounter.1", "dialogue:school_kid.encounter.2"], + victory: ["dialogue:school_kid.victory.1", "dialogue:school_kid.victory.2"], + }, ], [TrainerType.ARTIST]: [ { - encounter: [ - "dialogue:artist.encounter.1", - ], - victory: [ - "dialogue:artist.victory.1", - ] - } + encounter: ["dialogue:artist.encounter.1"], + victory: ["dialogue:artist.victory.1"], + }, ], [TrainerType.GUITARIST]: [ { - encounter: [ - "dialogue:guitarist.encounter.1", - ], - victory: [ - "dialogue:guitarist.victory.1", - ] - } + encounter: ["dialogue:guitarist.encounter.1"], + victory: ["dialogue:guitarist.victory.1"], + }, ], [TrainerType.WORKER]: [ { - encounter: [ - "dialogue:worker.encounter.1", - ], - victory: [ - "dialogue:worker.victory.1", - ] + encounter: ["dialogue:worker.encounter.1"], + victory: ["dialogue:worker.victory.1"], }, { - encounter: [ - "dialogue:worker_female.encounter.1", - ], - victory: [ - "dialogue:worker_female.victory.1", - ], - defeat: [ - "dialogue:worker_female.defeat.1", - ] + encounter: ["dialogue:worker_female.encounter.1"], + victory: ["dialogue:worker_female.victory.1"], + defeat: ["dialogue:worker_female.defeat.1"], }, { - encounter: [ - "dialogue:worker_double.encounter.1", - ], - victory: [ - "dialogue:worker_double.victory.1", - ] + encounter: ["dialogue:worker_double.encounter.1"], + victory: ["dialogue:worker_double.victory.1"], }, ], // Defeat dialogue in the language .JSONS exist as translated or placeholders; (en, fr, it, es, de, ja, ko, zh_cn, zh_tw, pt_br) [TrainerType.SNOW_WORKER]: [ { - encounter: [ - "dialogue:snow_worker.encounter.1", - ], - victory: [ - "dialogue:snow_worker.victory.1", - ] + encounter: ["dialogue:snow_worker.encounter.1"], + victory: ["dialogue:snow_worker.victory.1"], }, { - encounter: [ - "dialogue:snow_worker_double.encounter.1", - ], - victory: [ - "dialogue:snow_worker_double.victory.1", - ] + encounter: ["dialogue:snow_worker_double.encounter.1"], + victory: ["dialogue:snow_worker_double.victory.1"], }, ], [TrainerType.HEX_MANIAC]: [ { - encounter: [ - "dialogue:hex_maniac.encounter.1", - "dialogue:hex_maniac.encounter.2", - ], - victory: [ - "dialogue:hex_maniac.victory.1", - "dialogue:hex_maniac.victory.2", - ], - defeat: [ - "dialogue:hex_maniac.defeat.1", - "dialogue:hex_maniac.defeat.2", - ] - } + encounter: ["dialogue:hex_maniac.encounter.1", "dialogue:hex_maniac.encounter.2"], + victory: ["dialogue:hex_maniac.victory.1", "dialogue:hex_maniac.victory.2"], + defeat: ["dialogue:hex_maniac.defeat.1", "dialogue:hex_maniac.defeat.2"], + }, ], [TrainerType.PSYCHIC]: [ { - encounter: [ - "dialogue:psychic.encounter.1", - ], - victory: [ - "dialogue:psychic.victory.1", - ] - } + encounter: ["dialogue:psychic.encounter.1"], + victory: ["dialogue:psychic.victory.1"], + }, ], [TrainerType.OFFICER]: [ { - encounter: [ - "dialogue:officer.encounter.1", - "dialogue:officer.encounter.2", - ], - victory: [ - "dialogue:officer.victory.1", - "dialogue:officer.victory.2", - ], - } + encounter: ["dialogue:officer.encounter.1", "dialogue:officer.encounter.2"], + victory: ["dialogue:officer.victory.1", "dialogue:officer.victory.2"], + }, ], [TrainerType.BEAUTY]: [ { - encounter: [ - "dialogue:beauty.encounter.1", - ], - victory: [ - "dialogue:beauty.victory.1", - ] - } + encounter: ["dialogue:beauty.encounter.1"], + victory: ["dialogue:beauty.victory.1"], + }, ], [TrainerType.BAKER]: [ { - encounter: [ - "dialogue:baker.encounter.1", - ], - victory: [ - "dialogue:baker.victory.1", - ] - } + encounter: ["dialogue:baker.encounter.1"], + victory: ["dialogue:baker.victory.1"], + }, ], [TrainerType.BIKER]: [ { - encounter: [ - "dialogue:biker.encounter.1", - ], - victory: [ - "dialogue:biker.victory.1", - ] - } + encounter: ["dialogue:biker.encounter.1"], + victory: ["dialogue:biker.victory.1"], + }, ], [TrainerType.FIREBREATHER]: [ { @@ -451,22 +303,14 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:firebreather.victory.1", "dialogue:firebreather.victory.2", "dialogue:firebreather.victory.3", - ] - } + ], + }, ], [TrainerType.SAILOR]: [ { - encounter: [ - "dialogue:sailor.encounter.1", - "dialogue:sailor.encounter.2", - "dialogue:sailor.encounter.3", - ], - victory: [ - "dialogue:sailor.victory.1", - "dialogue:sailor.victory.2", - "dialogue:sailor.victory.3", - ] - } + encounter: ["dialogue:sailor.encounter.1", "dialogue:sailor.encounter.2", "dialogue:sailor.encounter.3"], + victory: ["dialogue:sailor.victory.1", "dialogue:sailor.victory.2", "dialogue:sailor.victory.3"], + }, ], [TrainerType.ROCKET_GRUNT]: [ { @@ -483,64 +327,32 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:rocket_grunt.victory.3", "dialogue:rocket_grunt.victory.4", "dialogue:rocket_grunt.victory.5", - ] - } + ], + }, ], [TrainerType.ARCHER]: [ { - encounter: [ - "dialogue:archer.encounter.1", - "dialogue:archer.encounter.2", - "dialogue:archer.encounter.3", - ], - victory: [ - "dialogue:archer.victory.1", - "dialogue:archer.victory.2", - "dialogue:archer.victory.3", - ] - } + encounter: ["dialogue:archer.encounter.1", "dialogue:archer.encounter.2", "dialogue:archer.encounter.3"], + victory: ["dialogue:archer.victory.1", "dialogue:archer.victory.2", "dialogue:archer.victory.3"], + }, ], [TrainerType.ARIANA]: [ { - encounter: [ - "dialogue:ariana.encounter.1", - "dialogue:ariana.encounter.2", - "dialogue:ariana.encounter.3", - ], - victory: [ - "dialogue:ariana.victory.1", - "dialogue:ariana.victory.2", - "dialogue:ariana.victory.3", - ] - } + encounter: ["dialogue:ariana.encounter.1", "dialogue:ariana.encounter.2", "dialogue:ariana.encounter.3"], + victory: ["dialogue:ariana.victory.1", "dialogue:ariana.victory.2", "dialogue:ariana.victory.3"], + }, ], [TrainerType.PROTON]: [ { - encounter: [ - "dialogue:proton.encounter.1", - "dialogue:proton.encounter.2", - "dialogue:proton.encounter.3", - ], - victory: [ - "dialogue:proton.victory.1", - "dialogue:proton.victory.2", - "dialogue:proton.victory.3", - ] - } + encounter: ["dialogue:proton.encounter.1", "dialogue:proton.encounter.2", "dialogue:proton.encounter.3"], + victory: ["dialogue:proton.victory.1", "dialogue:proton.victory.2", "dialogue:proton.victory.3"], + }, ], [TrainerType.PETREL]: [ { - encounter: [ - "dialogue:petrel.encounter.1", - "dialogue:petrel.encounter.2", - "dialogue:petrel.encounter.3", - ], - victory: [ - "dialogue:petrel.victory.1", - "dialogue:petrel.victory.2", - "dialogue:petrel.victory.3", - ] - } + encounter: ["dialogue:petrel.encounter.1", "dialogue:petrel.encounter.2", "dialogue:petrel.encounter.3"], + victory: ["dialogue:petrel.victory.1", "dialogue:petrel.victory.2", "dialogue:petrel.victory.3"], + }, ], [TrainerType.MAGMA_GRUNT]: [ { @@ -557,36 +369,20 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:magma_grunt.victory.3", "dialogue:magma_grunt.victory.4", "dialogue:magma_grunt.victory.5", - ] - } + ], + }, ], [TrainerType.TABITHA]: [ { - encounter: [ - "dialogue:tabitha.encounter.1", - "dialogue:tabitha.encounter.2", - "dialogue:tabitha.encounter.3", - ], - victory: [ - "dialogue:tabitha.victory.1", - "dialogue:tabitha.victory.2", - "dialogue:tabitha.victory.3", - ] - } + encounter: ["dialogue:tabitha.encounter.1", "dialogue:tabitha.encounter.2", "dialogue:tabitha.encounter.3"], + victory: ["dialogue:tabitha.victory.1", "dialogue:tabitha.victory.2", "dialogue:tabitha.victory.3"], + }, ], [TrainerType.COURTNEY]: [ { - encounter: [ - "dialogue:courtney.encounter.1", - "dialogue:courtney.encounter.2", - "dialogue:courtney.encounter.3", - ], - victory: [ - "dialogue:courtney.victory.1", - "dialogue:courtney.victory.2", - "dialogue:courtney.victory.3", - ] - } + encounter: ["dialogue:courtney.encounter.1", "dialogue:courtney.encounter.2", "dialogue:courtney.encounter.3"], + victory: ["dialogue:courtney.victory.1", "dialogue:courtney.victory.2", "dialogue:courtney.victory.3"], + }, ], [TrainerType.AQUA_GRUNT]: [ { @@ -603,36 +399,20 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:aqua_grunt.victory.3", "dialogue:aqua_grunt.victory.4", "dialogue:aqua_grunt.victory.5", - ] - } + ], + }, ], [TrainerType.MATT]: [ { - encounter: [ - "dialogue:matt.encounter.1", - "dialogue:matt.encounter.2", - "dialogue:matt.encounter.3", - ], - victory: [ - "dialogue:matt.victory.1", - "dialogue:matt.victory.2", - "dialogue:matt.victory.3", - ] - } + encounter: ["dialogue:matt.encounter.1", "dialogue:matt.encounter.2", "dialogue:matt.encounter.3"], + victory: ["dialogue:matt.victory.1", "dialogue:matt.victory.2", "dialogue:matt.victory.3"], + }, ], [TrainerType.SHELLY]: [ { - encounter: [ - "dialogue:shelly.encounter.1", - "dialogue:shelly.encounter.2", - "dialogue:shelly.encounter.3", - ], - victory: [ - "dialogue:shelly.victory.1", - "dialogue:shelly.victory.2", - "dialogue:shelly.victory.3", - ] - } + encounter: ["dialogue:shelly.encounter.1", "dialogue:shelly.encounter.2", "dialogue:shelly.encounter.3"], + victory: ["dialogue:shelly.victory.1", "dialogue:shelly.victory.2", "dialogue:shelly.victory.3"], + }, ], [TrainerType.GALACTIC_GRUNT]: [ { @@ -649,50 +429,26 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:galactic_grunt.victory.3", "dialogue:galactic_grunt.victory.4", "dialogue:galactic_grunt.victory.5", - ] - } + ], + }, ], [TrainerType.JUPITER]: [ { - encounter: [ - "dialogue:jupiter.encounter.1", - "dialogue:jupiter.encounter.2", - "dialogue:jupiter.encounter.3", - ], - victory: [ - "dialogue:jupiter.victory.1", - "dialogue:jupiter.victory.2", - "dialogue:jupiter.victory.3", - ] - } + encounter: ["dialogue:jupiter.encounter.1", "dialogue:jupiter.encounter.2", "dialogue:jupiter.encounter.3"], + victory: ["dialogue:jupiter.victory.1", "dialogue:jupiter.victory.2", "dialogue:jupiter.victory.3"], + }, ], [TrainerType.MARS]: [ { - encounter: [ - "dialogue:mars.encounter.1", - "dialogue:mars.encounter.2", - "dialogue:mars.encounter.3", - ], - victory: [ - "dialogue:mars.victory.1", - "dialogue:mars.victory.2", - "dialogue:mars.victory.3", - ] - } + encounter: ["dialogue:mars.encounter.1", "dialogue:mars.encounter.2", "dialogue:mars.encounter.3"], + victory: ["dialogue:mars.victory.1", "dialogue:mars.victory.2", "dialogue:mars.victory.3"], + }, ], [TrainerType.SATURN]: [ { - encounter: [ - "dialogue:saturn.encounter.1", - "dialogue:saturn.encounter.2", - "dialogue:saturn.encounter.3", - ], - victory: [ - "dialogue:saturn.victory.1", - "dialogue:saturn.victory.2", - "dialogue:saturn.victory.3", - ] - } + encounter: ["dialogue:saturn.encounter.1", "dialogue:saturn.encounter.2", "dialogue:saturn.encounter.3"], + victory: ["dialogue:saturn.victory.1", "dialogue:saturn.victory.2", "dialogue:saturn.victory.3"], + }, ], [TrainerType.PLASMA_GRUNT]: [ { @@ -709,36 +465,20 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:plasma_grunt.victory.3", "dialogue:plasma_grunt.victory.4", "dialogue:plasma_grunt.victory.5", - ] - } + ], + }, ], [TrainerType.ZINZOLIN]: [ { - encounter: [ - "dialogue:zinzolin.encounter.1", - "dialogue:zinzolin.encounter.2", - "dialogue:zinzolin.encounter.3", - ], - victory: [ - "dialogue:zinzolin.victory.1", - "dialogue:zinzolin.victory.2", - "dialogue:zinzolin.victory.3", - ] - } + encounter: ["dialogue:zinzolin.encounter.1", "dialogue:zinzolin.encounter.2", "dialogue:zinzolin.encounter.3"], + victory: ["dialogue:zinzolin.victory.1", "dialogue:zinzolin.victory.2", "dialogue:zinzolin.victory.3"], + }, ], [TrainerType.COLRESS]: [ { - encounter: [ - "dialogue:colress.encounter.1", - "dialogue:colress.encounter.2", - "dialogue:colress.encounter.3", - ], - victory: [ - "dialogue:colress.victory.1", - "dialogue:colress.victory.2", - "dialogue:colress.victory.3", - ] - } + encounter: ["dialogue:colress.encounter.1", "dialogue:colress.encounter.2", "dialogue:colress.encounter.3"], + victory: ["dialogue:colress.victory.1", "dialogue:colress.victory.2", "dialogue:colress.victory.3"], + }, ], [TrainerType.FLARE_GRUNT]: [ { @@ -755,36 +495,20 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:flare_grunt.victory.3", "dialogue:flare_grunt.victory.4", "dialogue:flare_grunt.victory.5", - ] - } + ], + }, ], [TrainerType.BRYONY]: [ { - encounter: [ - "dialogue:bryony.encounter.1", - "dialogue:bryony.encounter.2", - "dialogue:bryony.encounter.3", - ], - victory: [ - "dialogue:bryony.victory.1", - "dialogue:bryony.victory.2", - "dialogue:bryony.victory.3", - ] - } + encounter: ["dialogue:bryony.encounter.1", "dialogue:bryony.encounter.2", "dialogue:bryony.encounter.3"], + victory: ["dialogue:bryony.victory.1", "dialogue:bryony.victory.2", "dialogue:bryony.victory.3"], + }, ], [TrainerType.XEROSIC]: [ { - encounter: [ - "dialogue:xerosic.encounter.1", - "dialogue:xerosic.encounter.2", - "dialogue:xerosic.encounter.3", - ], - victory: [ - "dialogue:xerosic.victory.1", - "dialogue:xerosic.victory.2", - "dialogue:xerosic.victory.3", - ] - } + encounter: ["dialogue:xerosic.encounter.1", "dialogue:xerosic.encounter.2", "dialogue:xerosic.encounter.3"], + victory: ["dialogue:xerosic.victory.1", "dialogue:xerosic.victory.2", "dialogue:xerosic.victory.3"], + }, ], [TrainerType.AETHER_GRUNT]: [ { @@ -801,22 +525,14 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:aether_grunt.victory.3", "dialogue:aether_grunt.victory.4", "dialogue:aether_grunt.victory.5", - ] - } + ], + }, ], [TrainerType.FABA]: [ { - encounter: [ - "dialogue:faba.encounter.1", - "dialogue:faba.encounter.2", - "dialogue:faba.encounter.3", - ], - victory: [ - "dialogue:faba.victory.1", - "dialogue:faba.victory.2", - "dialogue:faba.victory.3", - ] - } + encounter: ["dialogue:faba.encounter.1", "dialogue:faba.encounter.2", "dialogue:faba.encounter.3"], + victory: ["dialogue:faba.victory.1", "dialogue:faba.victory.2", "dialogue:faba.victory.3"], + }, ], [TrainerType.SKULL_GRUNT]: [ { @@ -833,22 +549,14 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:skull_grunt.victory.3", "dialogue:skull_grunt.victory.4", "dialogue:skull_grunt.victory.5", - ] - } + ], + }, ], [TrainerType.PLUMERIA]: [ { - encounter: [ - "dialogue:plumeria.encounter.1", - "dialogue:plumeria.encounter.2", - "dialogue:plumeria.encounter.3", - ], - victory: [ - "dialogue:plumeria.victory.1", - "dialogue:plumeria.victory.2", - "dialogue:plumeria.victory.3", - ] - } + encounter: ["dialogue:plumeria.encounter.1", "dialogue:plumeria.encounter.2", "dialogue:plumeria.encounter.3"], + victory: ["dialogue:plumeria.victory.1", "dialogue:plumeria.victory.2", "dialogue:plumeria.victory.3"], + }, ], [TrainerType.MACRO_GRUNT]: [ { @@ -865,22 +573,14 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:macro_grunt.victory.3", "dialogue:macro_grunt.victory.4", "dialogue:macro_grunt.victory.5", - ] - } + ], + }, ], [TrainerType.OLEANA]: [ { - encounter: [ - "dialogue:oleana.encounter.1", - "dialogue:oleana.encounter.2", - "dialogue:oleana.encounter.3", - ], - victory: [ - "dialogue:oleana.victory.1", - "dialogue:oleana.victory.2", - "dialogue:oleana.victory.3", - ] - } + encounter: ["dialogue:oleana.encounter.1", "dialogue:oleana.encounter.2", "dialogue:oleana.encounter.3"], + victory: ["dialogue:oleana.victory.1", "dialogue:oleana.victory.2", "dialogue:oleana.victory.3"], + }, ], [TrainerType.STAR_GRUNT]: [ { @@ -897,509 +597,258 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:star_grunt.victory.3", "dialogue:star_grunt.victory.4", "dialogue:star_grunt.victory.5", - ] - } + ], + }, ], [TrainerType.GIACOMO]: [ { - encounter: [ - "dialogue:giacomo.encounter.1", - "dialogue:giacomo.encounter.2", - ], - victory: [ - "dialogue:giacomo.victory.1", - "dialogue:giacomo.victory.2", - ] - } + encounter: ["dialogue:giacomo.encounter.1", "dialogue:giacomo.encounter.2"], + victory: ["dialogue:giacomo.victory.1", "dialogue:giacomo.victory.2"], + }, ], [TrainerType.MELA]: [ { - encounter: [ - "dialogue:mela.encounter.1", - "dialogue:mela.encounter.2", - ], - victory: [ - "dialogue:mela.victory.1", - "dialogue:mela.victory.2", - ] - } + encounter: ["dialogue:mela.encounter.1", "dialogue:mela.encounter.2"], + victory: ["dialogue:mela.victory.1", "dialogue:mela.victory.2"], + }, ], [TrainerType.ATTICUS]: [ { - encounter: [ - "dialogue:atticus.encounter.1", - "dialogue:atticus.encounter.2", - ], - victory: [ - "dialogue:atticus.victory.1", - "dialogue:atticus.victory.2", - ] - } + encounter: ["dialogue:atticus.encounter.1", "dialogue:atticus.encounter.2"], + victory: ["dialogue:atticus.victory.1", "dialogue:atticus.victory.2"], + }, ], [TrainerType.ORTEGA]: [ { - encounter: [ - "dialogue:ortega.encounter.1", - "dialogue:ortega.encounter.2", - ], - victory: [ - "dialogue:ortega.victory.1", - "dialogue:ortega.victory.2", - ] - } + encounter: ["dialogue:ortega.encounter.1", "dialogue:ortega.encounter.2"], + victory: ["dialogue:ortega.victory.1", "dialogue:ortega.victory.2"], + }, ], [TrainerType.ERI]: [ { - encounter: [ - "dialogue:eri.encounter.1", - "dialogue:eri.encounter.2", - ], - victory: [ - "dialogue:eri.victory.1", - "dialogue:eri.victory.2", - ] - } + encounter: ["dialogue:eri.encounter.1", "dialogue:eri.encounter.2"], + victory: ["dialogue:eri.victory.1", "dialogue:eri.victory.2"], + }, ], [TrainerType.ROCKET_BOSS_GIOVANNI_1]: [ { - encounter: [ - "dialogue:rocket_boss_giovanni_1.encounter.1" - ], - victory: [ - "dialogue:rocket_boss_giovanni_1.victory.1" - ], - defeat: [ - "dialogue:rocket_boss_giovanni_1.defeat.1" - ] - } + encounter: ["dialogue:rocket_boss_giovanni_1.encounter.1"], + victory: ["dialogue:rocket_boss_giovanni_1.victory.1"], + defeat: ["dialogue:rocket_boss_giovanni_1.defeat.1"], + }, ], [TrainerType.ROCKET_BOSS_GIOVANNI_2]: [ { - encounter: [ - "dialogue:rocket_boss_giovanni_2.encounter.1" - ], - victory: [ - "dialogue:rocket_boss_giovanni_2.victory.1" - ], - defeat: [ - "dialogue:rocket_boss_giovanni_2.defeat.1" - ] - } + encounter: ["dialogue:rocket_boss_giovanni_2.encounter.1"], + victory: ["dialogue:rocket_boss_giovanni_2.victory.1"], + defeat: ["dialogue:rocket_boss_giovanni_2.defeat.1"], + }, ], [TrainerType.MAXIE]: [ { - encounter: [ - "dialogue:magma_boss_maxie_1.encounter.1" - ], - victory: [ - "dialogue:magma_boss_maxie_1.victory.1" - ], - defeat: [ - "dialogue:magma_boss_maxie_1.defeat.1" - ] - } + encounter: ["dialogue:magma_boss_maxie_1.encounter.1"], + victory: ["dialogue:magma_boss_maxie_1.victory.1"], + defeat: ["dialogue:magma_boss_maxie_1.defeat.1"], + }, ], [TrainerType.MAXIE_2]: [ { - encounter: [ - "dialogue:magma_boss_maxie_2.encounter.1" - ], - victory: [ - "dialogue:magma_boss_maxie_2.victory.1" - ], - defeat: [ - "dialogue:magma_boss_maxie_2.defeat.1" - ] - } + encounter: ["dialogue:magma_boss_maxie_2.encounter.1"], + victory: ["dialogue:magma_boss_maxie_2.victory.1"], + defeat: ["dialogue:magma_boss_maxie_2.defeat.1"], + }, ], [TrainerType.ARCHIE]: [ { - encounter: [ - "dialogue:aqua_boss_archie_1.encounter.1" - ], - victory: [ - "dialogue:aqua_boss_archie_1.victory.1" - ], - defeat: [ - "dialogue:aqua_boss_archie_1.defeat.1" - ] - } + encounter: ["dialogue:aqua_boss_archie_1.encounter.1"], + victory: ["dialogue:aqua_boss_archie_1.victory.1"], + defeat: ["dialogue:aqua_boss_archie_1.defeat.1"], + }, ], [TrainerType.ARCHIE_2]: [ { - encounter: [ - "dialogue:aqua_boss_archie_2.encounter.1" - ], - victory: [ - "dialogue:aqua_boss_archie_2.victory.1" - ], - defeat: [ - "dialogue:aqua_boss_archie_2.defeat.1" - ] - } + encounter: ["dialogue:aqua_boss_archie_2.encounter.1"], + victory: ["dialogue:aqua_boss_archie_2.victory.1"], + defeat: ["dialogue:aqua_boss_archie_2.defeat.1"], + }, ], [TrainerType.CYRUS]: [ { - encounter: [ - "dialogue:galactic_boss_cyrus_1.encounter.1" - ], - victory: [ - "dialogue:galactic_boss_cyrus_1.victory.1" - ], - defeat: [ - "dialogue:galactic_boss_cyrus_1.defeat.1" - ] - } + encounter: ["dialogue:galactic_boss_cyrus_1.encounter.1"], + victory: ["dialogue:galactic_boss_cyrus_1.victory.1"], + defeat: ["dialogue:galactic_boss_cyrus_1.defeat.1"], + }, ], [TrainerType.CYRUS_2]: [ { - encounter: [ - "dialogue:galactic_boss_cyrus_2.encounter.1" - ], - victory: [ - "dialogue:galactic_boss_cyrus_2.victory.1" - ], - defeat: [ - "dialogue:galactic_boss_cyrus_2.defeat.1" - ] - } + encounter: ["dialogue:galactic_boss_cyrus_2.encounter.1"], + victory: ["dialogue:galactic_boss_cyrus_2.victory.1"], + defeat: ["dialogue:galactic_boss_cyrus_2.defeat.1"], + }, ], [TrainerType.GHETSIS]: [ { - encounter: [ - "dialogue:plasma_boss_ghetsis_1.encounter.1" - ], - victory: [ - "dialogue:plasma_boss_ghetsis_1.victory.1" - ], - defeat: [ - "dialogue:plasma_boss_ghetsis_1.defeat.1" - ] - } + encounter: ["dialogue:plasma_boss_ghetsis_1.encounter.1"], + victory: ["dialogue:plasma_boss_ghetsis_1.victory.1"], + defeat: ["dialogue:plasma_boss_ghetsis_1.defeat.1"], + }, ], [TrainerType.GHETSIS_2]: [ { - encounter: [ - "dialogue:plasma_boss_ghetsis_2.encounter.1" - ], - victory: [ - "dialogue:plasma_boss_ghetsis_2.victory.1" - ], - defeat: [ - "dialogue:plasma_boss_ghetsis_2.defeat.1" - ] - } + encounter: ["dialogue:plasma_boss_ghetsis_2.encounter.1"], + victory: ["dialogue:plasma_boss_ghetsis_2.victory.1"], + defeat: ["dialogue:plasma_boss_ghetsis_2.defeat.1"], + }, ], [TrainerType.LYSANDRE]: [ { - encounter: [ - "dialogue:flare_boss_lysandre_1.encounter.1" - ], - victory: [ - "dialogue:flare_boss_lysandre_1.victory.1" - ], - defeat: [ - "dialogue:flare_boss_lysandre_1.defeat.1" - ] - } + encounter: ["dialogue:flare_boss_lysandre_1.encounter.1"], + victory: ["dialogue:flare_boss_lysandre_1.victory.1"], + defeat: ["dialogue:flare_boss_lysandre_1.defeat.1"], + }, ], [TrainerType.LYSANDRE_2]: [ { - encounter: [ - "dialogue:flare_boss_lysandre_2.encounter.1" - ], - victory: [ - "dialogue:flare_boss_lysandre_2.victory.1" - ], - defeat: [ - "dialogue:flare_boss_lysandre_2.defeat.1" - ] - } + encounter: ["dialogue:flare_boss_lysandre_2.encounter.1"], + victory: ["dialogue:flare_boss_lysandre_2.victory.1"], + defeat: ["dialogue:flare_boss_lysandre_2.defeat.1"], + }, ], [TrainerType.LUSAMINE]: [ { - encounter: [ - "dialogue:aether_boss_lusamine_1.encounter.1" - ], - victory: [ - "dialogue:aether_boss_lusamine_1.victory.1" - ], - defeat: [ - "dialogue:aether_boss_lusamine_1.defeat.1" - ] - } + encounter: ["dialogue:aether_boss_lusamine_1.encounter.1"], + victory: ["dialogue:aether_boss_lusamine_1.victory.1"], + defeat: ["dialogue:aether_boss_lusamine_1.defeat.1"], + }, ], [TrainerType.LUSAMINE_2]: [ { - encounter: [ - "dialogue:aether_boss_lusamine_2.encounter.1" - ], - victory: [ - "dialogue:aether_boss_lusamine_2.victory.1" - ], - defeat: [ - "dialogue:aether_boss_lusamine_2.defeat.1" - ] - } + encounter: ["dialogue:aether_boss_lusamine_2.encounter.1"], + victory: ["dialogue:aether_boss_lusamine_2.victory.1"], + defeat: ["dialogue:aether_boss_lusamine_2.defeat.1"], + }, ], [TrainerType.GUZMA]: [ { - encounter: [ - "dialogue:skull_boss_guzma_1.encounter.1" - ], - victory: [ - "dialogue:skull_boss_guzma_1.victory.1" - ], - defeat: [ - "dialogue:skull_boss_guzma_1.defeat.1" - ] - } + encounter: ["dialogue:skull_boss_guzma_1.encounter.1"], + victory: ["dialogue:skull_boss_guzma_1.victory.1"], + defeat: ["dialogue:skull_boss_guzma_1.defeat.1"], + }, ], [TrainerType.GUZMA_2]: [ { - encounter: [ - "dialogue:skull_boss_guzma_2.encounter.1" - ], - victory: [ - "dialogue:skull_boss_guzma_2.victory.1" - ], - defeat: [ - "dialogue:skull_boss_guzma_2.defeat.1" - ] - } + encounter: ["dialogue:skull_boss_guzma_2.encounter.1"], + victory: ["dialogue:skull_boss_guzma_2.victory.1"], + defeat: ["dialogue:skull_boss_guzma_2.defeat.1"], + }, ], [TrainerType.ROSE]: [ { - encounter: [ - "dialogue:macro_boss_rose_1.encounter.1" - ], - victory: [ - "dialogue:macro_boss_rose_1.victory.1" - ], - defeat: [ - "dialogue:macro_boss_rose_1.defeat.1" - ] - } + encounter: ["dialogue:macro_boss_rose_1.encounter.1"], + victory: ["dialogue:macro_boss_rose_1.victory.1"], + defeat: ["dialogue:macro_boss_rose_1.defeat.1"], + }, ], [TrainerType.ROSE_2]: [ { - encounter: [ - "dialogue:macro_boss_rose_2.encounter.1" - ], - victory: [ - "dialogue:macro_boss_rose_2.victory.1" - ], - defeat: [ - "dialogue:macro_boss_rose_2.defeat.1" - ] - } + encounter: ["dialogue:macro_boss_rose_2.encounter.1"], + victory: ["dialogue:macro_boss_rose_2.victory.1"], + defeat: ["dialogue:macro_boss_rose_2.defeat.1"], + }, ], [TrainerType.PENNY]: [ { - encounter: [ - "dialogue:star_boss_penny_1.encounter.1" - ], - victory: [ - "dialogue:star_boss_penny_1.victory.1" - ], - defeat: [ - "dialogue:star_boss_penny_1.defeat.1" - ] - } + encounter: ["dialogue:star_boss_penny_1.encounter.1"], + victory: ["dialogue:star_boss_penny_1.victory.1"], + defeat: ["dialogue:star_boss_penny_1.defeat.1"], + }, ], [TrainerType.PENNY_2]: [ { - encounter: [ - "dialogue:star_boss_penny_2.encounter.1" - ], - victory: [ - "dialogue:star_boss_penny_2.victory.1" - ], - defeat: [ - "dialogue:star_boss_penny_2.defeat.1" - ] - } + encounter: ["dialogue:star_boss_penny_2.encounter.1"], + victory: ["dialogue:star_boss_penny_2.victory.1"], + defeat: ["dialogue:star_boss_penny_2.defeat.1"], + }, ], [TrainerType.BUCK]: [ { - encounter: [ - "dialogue:stat_trainer_buck.encounter.1", - "dialogue:stat_trainer_buck.encounter.2" - ], - victory: [ - "dialogue:stat_trainer_buck.victory.1", - "dialogue:stat_trainer_buck.victory.2" - ], - defeat: [ - "dialogue:stat_trainer_buck.defeat.1", - "dialogue:stat_trainer_buck.defeat.2" - ] - } + encounter: ["dialogue:stat_trainer_buck.encounter.1", "dialogue:stat_trainer_buck.encounter.2"], + victory: ["dialogue:stat_trainer_buck.victory.1", "dialogue:stat_trainer_buck.victory.2"], + defeat: ["dialogue:stat_trainer_buck.defeat.1", "dialogue:stat_trainer_buck.defeat.2"], + }, ], [TrainerType.CHERYL]: [ { - encounter: [ - "dialogue:stat_trainer_cheryl.encounter.1", - "dialogue:stat_trainer_cheryl.encounter.2" - ], - victory: [ - "dialogue:stat_trainer_cheryl.victory.1", - "dialogue:stat_trainer_cheryl.victory.2" - ], - defeat: [ - "dialogue:stat_trainer_cheryl.defeat.1", - "dialogue:stat_trainer_cheryl.defeat.2" - ] - } + encounter: ["dialogue:stat_trainer_cheryl.encounter.1", "dialogue:stat_trainer_cheryl.encounter.2"], + victory: ["dialogue:stat_trainer_cheryl.victory.1", "dialogue:stat_trainer_cheryl.victory.2"], + defeat: ["dialogue:stat_trainer_cheryl.defeat.1", "dialogue:stat_trainer_cheryl.defeat.2"], + }, ], [TrainerType.MARLEY]: [ { - encounter: [ - "dialogue:stat_trainer_marley.encounter.1", - "dialogue:stat_trainer_marley.encounter.2" - ], - victory: [ - "dialogue:stat_trainer_marley.victory.1", - "dialogue:stat_trainer_marley.victory.2" - ], - defeat: [ - "dialogue:stat_trainer_marley.defeat.1", - "dialogue:stat_trainer_marley.defeat.2" - ] - } + encounter: ["dialogue:stat_trainer_marley.encounter.1", "dialogue:stat_trainer_marley.encounter.2"], + victory: ["dialogue:stat_trainer_marley.victory.1", "dialogue:stat_trainer_marley.victory.2"], + defeat: ["dialogue:stat_trainer_marley.defeat.1", "dialogue:stat_trainer_marley.defeat.2"], + }, ], [TrainerType.MIRA]: [ { - encounter: [ - "dialogue:stat_trainer_mira.encounter.1", - "dialogue:stat_trainer_mira.encounter.2" - ], - victory: [ - "dialogue:stat_trainer_mira.victory.1", - "dialogue:stat_trainer_mira.victory.2" - ], - defeat: [ - "dialogue:stat_trainer_mira.defeat.1", - "dialogue:stat_trainer_mira.defeat.2" - ] - } + encounter: ["dialogue:stat_trainer_mira.encounter.1", "dialogue:stat_trainer_mira.encounter.2"], + victory: ["dialogue:stat_trainer_mira.victory.1", "dialogue:stat_trainer_mira.victory.2"], + defeat: ["dialogue:stat_trainer_mira.defeat.1", "dialogue:stat_trainer_mira.defeat.2"], + }, ], [TrainerType.RILEY]: [ { - encounter: [ - "dialogue:stat_trainer_riley.encounter.1", - "dialogue:stat_trainer_riley.encounter.2" - ], - victory: [ - "dialogue:stat_trainer_riley.victory.1", - "dialogue:stat_trainer_riley.victory.2" - ], - defeat: [ - "dialogue:stat_trainer_riley.defeat.1", - "dialogue:stat_trainer_riley.defeat.2" - ] - } + encounter: ["dialogue:stat_trainer_riley.encounter.1", "dialogue:stat_trainer_riley.encounter.2"], + victory: ["dialogue:stat_trainer_riley.victory.1", "dialogue:stat_trainer_riley.victory.2"], + defeat: ["dialogue:stat_trainer_riley.defeat.1", "dialogue:stat_trainer_riley.defeat.2"], + }, ], [TrainerType.VICTOR]: [ { - encounter: [ - "dialogue:winstrates_victor.encounter.1", - ], - victory: [ - "dialogue:winstrates_victor.victory.1" - ], - } + encounter: ["dialogue:winstrates_victor.encounter.1"], + victory: ["dialogue:winstrates_victor.victory.1"], + }, ], [TrainerType.VICTORIA]: [ { - encounter: [ - "dialogue:winstrates_victoria.encounter.1", - ], - victory: [ - "dialogue:winstrates_victoria.victory.1" - ], - } + encounter: ["dialogue:winstrates_victoria.encounter.1"], + victory: ["dialogue:winstrates_victoria.victory.1"], + }, ], [TrainerType.VIVI]: [ { - encounter: [ - "dialogue:winstrates_vivi.encounter.1", - ], - victory: [ - "dialogue:winstrates_vivi.victory.1" - ], - } + encounter: ["dialogue:winstrates_vivi.encounter.1"], + victory: ["dialogue:winstrates_vivi.victory.1"], + }, ], [TrainerType.VICKY]: [ { - encounter: [ - "dialogue:winstrates_vicky.encounter.1", - ], - victory: [ - "dialogue:winstrates_vicky.victory.1" - ], - } + encounter: ["dialogue:winstrates_vicky.encounter.1"], + victory: ["dialogue:winstrates_vicky.victory.1"], + }, ], [TrainerType.VITO]: [ { - encounter: [ - "dialogue:winstrates_vito.encounter.1", - ], - victory: [ - "dialogue:winstrates_vito.victory.1" - ], - } + encounter: ["dialogue:winstrates_vito.encounter.1"], + victory: ["dialogue:winstrates_vito.victory.1"], + }, ], [TrainerType.BROCK]: { - encounter: [ - "dialogue:brock.encounter.1", - "dialogue:brock.encounter.2", - "dialogue:brock.encounter.3", - ], - victory: [ - "dialogue:brock.victory.1", - "dialogue:brock.victory.2", - "dialogue:brock.victory.3", - ], - defeat: [ - "dialogue:brock.defeat.1", - "dialogue:brock.defeat.2", - "dialogue:brock.defeat.3", - ] + encounter: ["dialogue:brock.encounter.1", "dialogue:brock.encounter.2", "dialogue:brock.encounter.3"], + victory: ["dialogue:brock.victory.1", "dialogue:brock.victory.2", "dialogue:brock.victory.3"], + defeat: ["dialogue:brock.defeat.1", "dialogue:brock.defeat.2", "dialogue:brock.defeat.3"], }, [TrainerType.MISTY]: { - encounter: [ - "dialogue:misty.encounter.1", - "dialogue:misty.encounter.2", - "dialogue:misty.encounter.3", - ], - victory: [ - "dialogue:misty.victory.1", - "dialogue:misty.victory.2", - "dialogue:misty.victory.3", - ], - defeat: [ - "dialogue:misty.defeat.1", - "dialogue:misty.defeat.2", - "dialogue:misty.defeat.3", - ] + encounter: ["dialogue:misty.encounter.1", "dialogue:misty.encounter.2", "dialogue:misty.encounter.3"], + victory: ["dialogue:misty.victory.1", "dialogue:misty.victory.2", "dialogue:misty.victory.3"], + defeat: ["dialogue:misty.defeat.1", "dialogue:misty.defeat.2", "dialogue:misty.defeat.3"], }, [TrainerType.LT_SURGE]: { - encounter: [ - "dialogue:lt_surge.encounter.1", - "dialogue:lt_surge.encounter.2", - "dialogue:lt_surge.encounter.3", - ], - victory: [ - "dialogue:lt_surge.victory.1", - "dialogue:lt_surge.victory.2", - "dialogue:lt_surge.victory.3", - ], - defeat: [ - "dialogue:lt_surge.defeat.1", - "dialogue:lt_surge.defeat.2", - "dialogue:lt_surge.defeat.3", - ] + encounter: ["dialogue:lt_surge.encounter.1", "dialogue:lt_surge.encounter.2", "dialogue:lt_surge.encounter.3"], + victory: ["dialogue:lt_surge.victory.1", "dialogue:lt_surge.victory.2", "dialogue:lt_surge.victory.3"], + defeat: ["dialogue:lt_surge.defeat.1", "dialogue:lt_surge.defeat.2", "dialogue:lt_surge.defeat.3"], }, [TrainerType.ERIKA]: { encounter: [ @@ -1419,420 +868,151 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:erika.defeat.2", "dialogue:erika.defeat.3", "dialogue:erika.defeat.4", - ] + ], }, [TrainerType.JANINE]: { - encounter: [ - "dialogue:janine.encounter.1", - "dialogue:janine.encounter.2", - "dialogue:janine.encounter.3", - ], - victory: [ - "dialogue:janine.victory.1", - "dialogue:janine.victory.2", - "dialogue:janine.victory.3", - ], - defeat: [ - "dialogue:janine.defeat.1", - "dialogue:janine.defeat.2", - "dialogue:janine.defeat.3", - ] + encounter: ["dialogue:janine.encounter.1", "dialogue:janine.encounter.2", "dialogue:janine.encounter.3"], + victory: ["dialogue:janine.victory.1", "dialogue:janine.victory.2", "dialogue:janine.victory.3"], + defeat: ["dialogue:janine.defeat.1", "dialogue:janine.defeat.2", "dialogue:janine.defeat.3"], }, [TrainerType.SABRINA]: { - encounter: [ - "dialogue:sabrina.encounter.1", - "dialogue:sabrina.encounter.2", - "dialogue:sabrina.encounter.3", - ], - victory: [ - "dialogue:sabrina.victory.1", - "dialogue:sabrina.victory.2", - "dialogue:sabrina.victory.3", - ], - defeat: [ - "dialogue:sabrina.defeat.1", - "dialogue:sabrina.defeat.2", - "dialogue:sabrina.defeat.3", - ] + encounter: ["dialogue:sabrina.encounter.1", "dialogue:sabrina.encounter.2", "dialogue:sabrina.encounter.3"], + victory: ["dialogue:sabrina.victory.1", "dialogue:sabrina.victory.2", "dialogue:sabrina.victory.3"], + defeat: ["dialogue:sabrina.defeat.1", "dialogue:sabrina.defeat.2", "dialogue:sabrina.defeat.3"], }, [TrainerType.BLAINE]: { - encounter: [ - "dialogue:blaine.encounter.1", - "dialogue:blaine.encounter.2", - "dialogue:blaine.encounter.3", - ], - victory: [ - "dialogue:blaine.victory.1", - "dialogue:blaine.victory.2", - "dialogue:blaine.victory.3", - ], - defeat: [ - "dialogue:blaine.defeat.1", - "dialogue:blaine.defeat.2", - "dialogue:blaine.defeat.3", - ] + encounter: ["dialogue:blaine.encounter.1", "dialogue:blaine.encounter.2", "dialogue:blaine.encounter.3"], + victory: ["dialogue:blaine.victory.1", "dialogue:blaine.victory.2", "dialogue:blaine.victory.3"], + defeat: ["dialogue:blaine.defeat.1", "dialogue:blaine.defeat.2", "dialogue:blaine.defeat.3"], }, [TrainerType.GIOVANNI]: { - encounter: [ - "dialogue:giovanni.encounter.1", - "dialogue:giovanni.encounter.2", - "dialogue:giovanni.encounter.3", - ], - victory: [ - "dialogue:giovanni.victory.1", - "dialogue:giovanni.victory.2", - "dialogue:giovanni.victory.3", - ], - defeat: [ - "dialogue:giovanni.defeat.1", - "dialogue:giovanni.defeat.2", - "dialogue:giovanni.defeat.3", - ] + encounter: ["dialogue:giovanni.encounter.1", "dialogue:giovanni.encounter.2", "dialogue:giovanni.encounter.3"], + victory: ["dialogue:giovanni.victory.1", "dialogue:giovanni.victory.2", "dialogue:giovanni.victory.3"], + defeat: ["dialogue:giovanni.defeat.1", "dialogue:giovanni.defeat.2", "dialogue:giovanni.defeat.3"], }, [TrainerType.ROXANNE]: { - encounter: [ - "dialogue:roxanne.encounter.1", - "dialogue:roxanne.encounter.2", - "dialogue:roxanne.encounter.3" - ], - victory: [ - "dialogue:roxanne.victory.1", - "dialogue:roxanne.victory.2", - "dialogue:roxanne.victory.3" - ], - defeat: [ - "dialogue:roxanne.defeat.1", - "dialogue:roxanne.defeat.2", - "dialogue:roxanne.defeat.3" - ] + encounter: ["dialogue:roxanne.encounter.1", "dialogue:roxanne.encounter.2", "dialogue:roxanne.encounter.3"], + victory: ["dialogue:roxanne.victory.1", "dialogue:roxanne.victory.2", "dialogue:roxanne.victory.3"], + defeat: ["dialogue:roxanne.defeat.1", "dialogue:roxanne.defeat.2", "dialogue:roxanne.defeat.3"], }, [TrainerType.BRAWLY]: { - encounter: [ - "dialogue:brawly.encounter.1", - "dialogue:brawly.encounter.2", - "dialogue:brawly.encounter.3" - ], - victory: [ - "dialogue:brawly.victory.1", - "dialogue:brawly.victory.2", - "dialogue:brawly.victory.3" - ], - defeat: [ - "dialogue:brawly.defeat.1", - "dialogue:brawly.defeat.2", - "dialogue:brawly.defeat.3" - ] + encounter: ["dialogue:brawly.encounter.1", "dialogue:brawly.encounter.2", "dialogue:brawly.encounter.3"], + victory: ["dialogue:brawly.victory.1", "dialogue:brawly.victory.2", "dialogue:brawly.victory.3"], + defeat: ["dialogue:brawly.defeat.1", "dialogue:brawly.defeat.2", "dialogue:brawly.defeat.3"], }, [TrainerType.WATTSON]: { - encounter: [ - "dialogue:wattson.encounter.1", - "dialogue:wattson.encounter.2", - "dialogue:wattson.encounter.3" - ], - victory: [ - "dialogue:wattson.victory.1", - "dialogue:wattson.victory.2", - "dialogue:wattson.victory.3" - ], - defeat: [ - "dialogue:wattson.defeat.1", - "dialogue:wattson.defeat.2", - "dialogue:wattson.defeat.3" - ] + encounter: ["dialogue:wattson.encounter.1", "dialogue:wattson.encounter.2", "dialogue:wattson.encounter.3"], + victory: ["dialogue:wattson.victory.1", "dialogue:wattson.victory.2", "dialogue:wattson.victory.3"], + defeat: ["dialogue:wattson.defeat.1", "dialogue:wattson.defeat.2", "dialogue:wattson.defeat.3"], }, [TrainerType.FLANNERY]: { - encounter: [ - "dialogue:flannery.encounter.1", - "dialogue:flannery.encounter.2", - "dialogue:flannery.encounter.3" - ], - victory: [ - "dialogue:flannery.victory.1", - "dialogue:flannery.victory.2", - "dialogue:flannery.victory.3" - ], - defeat: [ - "dialogue:flannery.defeat.1", - "dialogue:flannery.defeat.2", - "dialogue:flannery.defeat.3" - ] + encounter: ["dialogue:flannery.encounter.1", "dialogue:flannery.encounter.2", "dialogue:flannery.encounter.3"], + victory: ["dialogue:flannery.victory.1", "dialogue:flannery.victory.2", "dialogue:flannery.victory.3"], + defeat: ["dialogue:flannery.defeat.1", "dialogue:flannery.defeat.2", "dialogue:flannery.defeat.3"], }, [TrainerType.NORMAN]: { - encounter: [ - "dialogue:norman.encounter.1", - "dialogue:norman.encounter.2", - "dialogue:norman.encounter.3" - ], - victory: [ - "dialogue:norman.victory.1", - "dialogue:norman.victory.2", - "dialogue:norman.victory.3" - ], - defeat: [ - "dialogue:norman.defeat.1", - "dialogue:norman.defeat.2", - "dialogue:norman.defeat.3" - ] + encounter: ["dialogue:norman.encounter.1", "dialogue:norman.encounter.2", "dialogue:norman.encounter.3"], + victory: ["dialogue:norman.victory.1", "dialogue:norman.victory.2", "dialogue:norman.victory.3"], + defeat: ["dialogue:norman.defeat.1", "dialogue:norman.defeat.2", "dialogue:norman.defeat.3"], }, [TrainerType.WINONA]: { - encounter: [ - "dialogue:winona.encounter.1", - "dialogue:winona.encounter.2", - "dialogue:winona.encounter.3" - ], - victory: [ - "dialogue:winona.victory.1", - "dialogue:winona.victory.2", - "dialogue:winona.victory.3" - ], - defeat: [ - "dialogue:winona.defeat.1", - "dialogue:winona.defeat.2", - "dialogue:winona.defeat.3" - ] + encounter: ["dialogue:winona.encounter.1", "dialogue:winona.encounter.2", "dialogue:winona.encounter.3"], + victory: ["dialogue:winona.victory.1", "dialogue:winona.victory.2", "dialogue:winona.victory.3"], + defeat: ["dialogue:winona.defeat.1", "dialogue:winona.defeat.2", "dialogue:winona.defeat.3"], }, [TrainerType.TATE]: { - encounter: [ - "dialogue:tate.encounter.1", - "dialogue:tate.encounter.2", - "dialogue:tate.encounter.3" - ], - victory: [ - "dialogue:tate.victory.1", - "dialogue:tate.victory.2", - "dialogue:tate.victory.3" - ], - defeat: [ - "dialogue:tate.defeat.1", - "dialogue:tate.defeat.2", - "dialogue:tate.defeat.3" - ] + encounter: ["dialogue:tate.encounter.1", "dialogue:tate.encounter.2", "dialogue:tate.encounter.3"], + victory: ["dialogue:tate.victory.1", "dialogue:tate.victory.2", "dialogue:tate.victory.3"], + defeat: ["dialogue:tate.defeat.1", "dialogue:tate.defeat.2", "dialogue:tate.defeat.3"], }, [TrainerType.LIZA]: { - encounter: [ - "dialogue:liza.encounter.1", - "dialogue:liza.encounter.2", - "dialogue:liza.encounter.3" - ], - victory: [ - "dialogue:liza.victory.1", - "dialogue:liza.victory.2", - "dialogue:liza.victory.3" - ], - defeat: [ - "dialogue:liza.defeat.1", - "dialogue:liza.defeat.2", - "dialogue:liza.defeat.3" - ] + encounter: ["dialogue:liza.encounter.1", "dialogue:liza.encounter.2", "dialogue:liza.encounter.3"], + victory: ["dialogue:liza.victory.1", "dialogue:liza.victory.2", "dialogue:liza.victory.3"], + defeat: ["dialogue:liza.defeat.1", "dialogue:liza.defeat.2", "dialogue:liza.defeat.3"], }, [TrainerType.JUAN]: { encounter: [ "dialogue:juan.encounter.1", "dialogue:juan.encounter.2", "dialogue:juan.encounter.3", - "dialogue:juan.encounter.4" + "dialogue:juan.encounter.4", ], victory: [ "dialogue:juan.victory.1", "dialogue:juan.victory.2", "dialogue:juan.victory.3", - "dialogue:juan.victory.4" + "dialogue:juan.victory.4", ], - defeat: [ - "dialogue:juan.defeat.1", - "dialogue:juan.defeat.2", - "dialogue:juan.defeat.3", - "dialogue:juan.defeat.4" - ] + defeat: ["dialogue:juan.defeat.1", "dialogue:juan.defeat.2", "dialogue:juan.defeat.3", "dialogue:juan.defeat.4"], }, [TrainerType.CRASHER_WAKE]: { encounter: [ "dialogue:crasher_wake.encounter.1", "dialogue:crasher_wake.encounter.2", - "dialogue:crasher_wake.encounter.3" + "dialogue:crasher_wake.encounter.3", ], - victory: [ - "dialogue:crasher_wake.victory.1", - "dialogue:crasher_wake.victory.2", - "dialogue:crasher_wake.victory.3" - ], - defeat: [ - "dialogue:crasher_wake.defeat.1", - "dialogue:crasher_wake.defeat.2", - "dialogue:crasher_wake.defeat.3" - ] + victory: ["dialogue:crasher_wake.victory.1", "dialogue:crasher_wake.victory.2", "dialogue:crasher_wake.victory.3"], + defeat: ["dialogue:crasher_wake.defeat.1", "dialogue:crasher_wake.defeat.2", "dialogue:crasher_wake.defeat.3"], }, [TrainerType.FALKNER]: { - encounter: [ - "dialogue:falkner.encounter.1", - "dialogue:falkner.encounter.2", - "dialogue:falkner.encounter.3" - ], - victory: [ - "dialogue:falkner.victory.1", - "dialogue:falkner.victory.2", - "dialogue:falkner.victory.3" - ], - defeat: [ - "dialogue:falkner.defeat.1", - "dialogue:falkner.defeat.2", - "dialogue:falkner.defeat.3" - ] + encounter: ["dialogue:falkner.encounter.1", "dialogue:falkner.encounter.2", "dialogue:falkner.encounter.3"], + victory: ["dialogue:falkner.victory.1", "dialogue:falkner.victory.2", "dialogue:falkner.victory.3"], + defeat: ["dialogue:falkner.defeat.1", "dialogue:falkner.defeat.2", "dialogue:falkner.defeat.3"], }, [TrainerType.NESSA]: { - encounter: [ - "dialogue:nessa.encounter.1", - "dialogue:nessa.encounter.2", - "dialogue:nessa.encounter.3" - ], - victory: [ - "dialogue:nessa.victory.1", - "dialogue:nessa.victory.2", - "dialogue:nessa.victory.3" - ], - defeat: [ - "dialogue:nessa.defeat.1", - "dialogue:nessa.defeat.2", - "dialogue:nessa.defeat.3" - ] + encounter: ["dialogue:nessa.encounter.1", "dialogue:nessa.encounter.2", "dialogue:nessa.encounter.3"], + victory: ["dialogue:nessa.victory.1", "dialogue:nessa.victory.2", "dialogue:nessa.victory.3"], + defeat: ["dialogue:nessa.defeat.1", "dialogue:nessa.defeat.2", "dialogue:nessa.defeat.3"], }, [TrainerType.MELONY]: { - encounter: [ - "dialogue:melony.encounter.1", - "dialogue:melony.encounter.2", - "dialogue:melony.encounter.3" - ], - victory: [ - "dialogue:melony.victory.1", - "dialogue:melony.victory.2", - "dialogue:melony.victory.3" - ], - defeat: [ - "dialogue:melony.defeat.1", - "dialogue:melony.defeat.2", - "dialogue:melony.defeat.3" - ] + encounter: ["dialogue:melony.encounter.1", "dialogue:melony.encounter.2", "dialogue:melony.encounter.3"], + victory: ["dialogue:melony.victory.1", "dialogue:melony.victory.2", "dialogue:melony.victory.3"], + defeat: ["dialogue:melony.defeat.1", "dialogue:melony.defeat.2", "dialogue:melony.defeat.3"], }, [TrainerType.MARLON]: { - encounter: [ - "dialogue:marlon.encounter.1", - "dialogue:marlon.encounter.2", - "dialogue:marlon.encounter.3" - ], - victory: [ - "dialogue:marlon.victory.1", - "dialogue:marlon.victory.2", - "dialogue:marlon.victory.3" - ], - defeat: [ - "dialogue:marlon.defeat.1", - "dialogue:marlon.defeat.2", - "dialogue:marlon.defeat.3" - ] + encounter: ["dialogue:marlon.encounter.1", "dialogue:marlon.encounter.2", "dialogue:marlon.encounter.3"], + victory: ["dialogue:marlon.victory.1", "dialogue:marlon.victory.2", "dialogue:marlon.victory.3"], + defeat: ["dialogue:marlon.defeat.1", "dialogue:marlon.defeat.2", "dialogue:marlon.defeat.3"], }, [TrainerType.SHAUNTAL]: { - encounter: [ - "dialogue:shauntal.encounter.1", - "dialogue:shauntal.encounter.2", - "dialogue:shauntal.encounter.3" - ], - victory: [ - "dialogue:shauntal.victory.1", - "dialogue:shauntal.victory.2", - "dialogue:shauntal.victory.3" - ], - defeat: [ - "dialogue:shauntal.defeat.1", - "dialogue:shauntal.defeat.2", - "dialogue:shauntal.defeat.3" - ] + encounter: ["dialogue:shauntal.encounter.1", "dialogue:shauntal.encounter.2", "dialogue:shauntal.encounter.3"], + victory: ["dialogue:shauntal.victory.1", "dialogue:shauntal.victory.2", "dialogue:shauntal.victory.3"], + defeat: ["dialogue:shauntal.defeat.1", "dialogue:shauntal.defeat.2", "dialogue:shauntal.defeat.3"], }, [TrainerType.MARSHAL]: { - encounter: [ - "dialogue:marshal.encounter.1", - "dialogue:marshal.encounter.2", - "dialogue:marshal.encounter.3" - ], - victory: [ - "dialogue:marshal.victory.1", - "dialogue:marshal.victory.2", - "dialogue:marshal.victory.3" - ], - defeat: [ - "dialogue:marshal.defeat.1", - "dialogue:marshal.defeat.2", - "dialogue:marshal.defeat.3" - ] + encounter: ["dialogue:marshal.encounter.1", "dialogue:marshal.encounter.2", "dialogue:marshal.encounter.3"], + victory: ["dialogue:marshal.victory.1", "dialogue:marshal.victory.2", "dialogue:marshal.victory.3"], + defeat: ["dialogue:marshal.defeat.1", "dialogue:marshal.defeat.2", "dialogue:marshal.defeat.3"], }, [TrainerType.CHEREN]: { - encounter: [ - "dialogue:cheren.encounter.1", - "dialogue:cheren.encounter.2", - "dialogue:cheren.encounter.3" - ], - victory: [ - "dialogue:cheren.victory.1", - "dialogue:cheren.victory.2", - "dialogue:cheren.victory.3" - ], - defeat: [ - "dialogue:cheren.defeat.1", - "dialogue:cheren.defeat.2", - "dialogue:cheren.defeat.3" - ] + encounter: ["dialogue:cheren.encounter.1", "dialogue:cheren.encounter.2", "dialogue:cheren.encounter.3"], + victory: ["dialogue:cheren.victory.1", "dialogue:cheren.victory.2", "dialogue:cheren.victory.3"], + defeat: ["dialogue:cheren.defeat.1", "dialogue:cheren.defeat.2", "dialogue:cheren.defeat.3"], }, [TrainerType.CHILI]: { - encounter: [ - "dialogue:chili.encounter.1", - "dialogue:chili.encounter.2", - "dialogue:chili.encounter.3" - ], - victory: [ - "dialogue:chili.victory.1", - "dialogue:chili.victory.2", - "dialogue:chili.victory.3" - ], - defeat: [ - "dialogue:chili.defeat.1", - "dialogue:chili.defeat.2", - "dialogue:chili.defeat.3" - ] + encounter: ["dialogue:chili.encounter.1", "dialogue:chili.encounter.2", "dialogue:chili.encounter.3"], + victory: ["dialogue:chili.victory.1", "dialogue:chili.victory.2", "dialogue:chili.victory.3"], + defeat: ["dialogue:chili.defeat.1", "dialogue:chili.defeat.2", "dialogue:chili.defeat.3"], }, [TrainerType.CILAN]: { - encounter: [ - "dialogue:cilan.encounter.1", - "dialogue:cilan.encounter.2", - "dialogue:cilan.encounter.3" - ], - victory: [ - "dialogue:cilan.victory.1", - "dialogue:cilan.victory.2", - "dialogue:cilan.victory.3" - ], - defeat: [ - "dialogue:cilan.defeat.1", - "dialogue:cilan.defeat.2", - "dialogue:cilan.defeat.3" - ] + encounter: ["dialogue:cilan.encounter.1", "dialogue:cilan.encounter.2", "dialogue:cilan.encounter.3"], + victory: ["dialogue:cilan.victory.1", "dialogue:cilan.victory.2", "dialogue:cilan.victory.3"], + defeat: ["dialogue:cilan.defeat.1", "dialogue:cilan.defeat.2", "dialogue:cilan.defeat.3"], }, [TrainerType.ROARK]: { encounter: [ "dialogue:roark.encounter.1", "dialogue:roark.encounter.2", "dialogue:roark.encounter.3", - "dialogue:roark.encounter.4" + "dialogue:roark.encounter.4", ], victory: [ "dialogue:roark.victory.1", "dialogue:roark.victory.2", "dialogue:roark.victory.3", - "dialogue:roark.victory.4" + "dialogue:roark.victory.4", ], - defeat: [ - "dialogue:roark.defeat.1", - "dialogue:roark.defeat.2", - "dialogue:roark.defeat.3" - ] + defeat: ["dialogue:roark.defeat.1", "dialogue:roark.defeat.2", "dialogue:roark.defeat.3"], }, [TrainerType.MORTY]: { encounter: [ @@ -1841,7 +1021,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:morty.encounter.3", "dialogue:morty.encounter.4", "dialogue:morty.encounter.5", - "dialogue:morty.encounter.6" + "dialogue:morty.encounter.6", ], victory: [ "dialogue:morty.victory.1", @@ -1849,7 +1029,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:morty.victory.3", "dialogue:morty.victory.4", "dialogue:morty.victory.5", - "dialogue:morty.victory.6" + "dialogue:morty.victory.6", ], defeat: [ "dialogue:morty.defeat.1", @@ -1857,1335 +1037,626 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:morty.defeat.3", "dialogue:morty.defeat.4", "dialogue:morty.defeat.5", - "dialogue:morty.defeat.6" - ] + "dialogue:morty.defeat.6", + ], }, [TrainerType.CRISPIN]: { - encounter: [ - "dialogue:crispin.encounter.1", - "dialogue:crispin.encounter.2" - ], - victory: [ - "dialogue:crispin.victory.1", - "dialogue:crispin.victory.2" - ], - defeat: [ - "dialogue:crispin.defeat.1", - "dialogue:crispin.defeat.2" - ] + encounter: ["dialogue:crispin.encounter.1", "dialogue:crispin.encounter.2"], + victory: ["dialogue:crispin.victory.1", "dialogue:crispin.victory.2"], + defeat: ["dialogue:crispin.defeat.1", "dialogue:crispin.defeat.2"], }, [TrainerType.AMARYS]: { - encounter: [ - "dialogue:amarys.encounter.1" - ], - victory: [ - "dialogue:amarys.victory.1" - ], - defeat: [ - "dialogue:amarys.defeat.1" - ] + encounter: ["dialogue:amarys.encounter.1"], + victory: ["dialogue:amarys.victory.1"], + defeat: ["dialogue:amarys.defeat.1"], }, [TrainerType.LACEY]: { - encounter: [ - "dialogue:lacey.encounter.1" - ], - victory: [ - "dialogue:lacey.victory.1" - ], - defeat: [ - "dialogue:lacey.defeat.1" - ] + encounter: ["dialogue:lacey.encounter.1"], + victory: ["dialogue:lacey.victory.1"], + defeat: ["dialogue:lacey.defeat.1"], }, [TrainerType.DRAYTON]: { - encounter: [ - "dialogue:drayton.encounter.1" - ], - victory: [ - "dialogue:drayton.victory.1" - ], - defeat: [ - "dialogue:drayton.defeat.1" - ] + encounter: ["dialogue:drayton.encounter.1"], + victory: ["dialogue:drayton.victory.1"], + defeat: ["dialogue:drayton.defeat.1"], }, [TrainerType.RAMOS]: { - encounter: [ - "dialogue:ramos.encounter.1" - ], - victory: [ - "dialogue:ramos.victory.1" - ], - defeat: [ - "dialogue:ramos.defeat.1" - ] + encounter: ["dialogue:ramos.encounter.1"], + victory: ["dialogue:ramos.victory.1"], + defeat: ["dialogue:ramos.defeat.1"], }, [TrainerType.VIOLA]: { - encounter: [ - "dialogue:viola.encounter.1", - "dialogue:viola.encounter.2" - ], - victory: [ - "dialogue:viola.victory.1", - "dialogue:viola.victory.2" - ], - defeat: [ - "dialogue:viola.defeat.1", - "dialogue:viola.defeat.2" - ] + encounter: ["dialogue:viola.encounter.1", "dialogue:viola.encounter.2"], + victory: ["dialogue:viola.victory.1", "dialogue:viola.victory.2"], + defeat: ["dialogue:viola.defeat.1", "dialogue:viola.defeat.2"], }, [TrainerType.CANDICE]: { - encounter: [ - "dialogue:candice.encounter.1", - "dialogue:candice.encounter.2" - ], - victory: [ - "dialogue:candice.victory.1", - "dialogue:candice.victory.2" - ], - defeat: [ - "dialogue:candice.defeat.1", - "dialogue:candice.defeat.2" - ] + encounter: ["dialogue:candice.encounter.1", "dialogue:candice.encounter.2"], + victory: ["dialogue:candice.victory.1", "dialogue:candice.victory.2"], + defeat: ["dialogue:candice.defeat.1", "dialogue:candice.defeat.2"], }, [TrainerType.GARDENIA]: { - encounter: [ - "dialogue:gardenia.encounter.1" - ], - victory: [ - "dialogue:gardenia.victory.1" - ], - defeat: [ - "dialogue:gardenia.defeat.1" - ] + encounter: ["dialogue:gardenia.encounter.1"], + victory: ["dialogue:gardenia.victory.1"], + defeat: ["dialogue:gardenia.defeat.1"], }, [TrainerType.AARON]: { - encounter: [ - "dialogue:aaron.encounter.1" - ], - victory: [ - "dialogue:aaron.victory.1" - ], - defeat: [ - "dialogue:aaron.defeat.1" - ] + encounter: ["dialogue:aaron.encounter.1"], + victory: ["dialogue:aaron.victory.1"], + defeat: ["dialogue:aaron.defeat.1"], }, [TrainerType.CRESS]: { - encounter: [ - "dialogue:cress.encounter.1" - ], - victory: [ - "dialogue:cress.victory.1" - ], - defeat: [ - "dialogue:cress.defeat.1" - ] + encounter: ["dialogue:cress.encounter.1"], + victory: ["dialogue:cress.victory.1"], + defeat: ["dialogue:cress.defeat.1"], }, [TrainerType.ALLISTER]: { - encounter: [ - "dialogue:allister.encounter.1" - ], - victory: [ - "dialogue:allister.victory.1" - ], - defeat: [ - "dialogue:allister.defeat.1" - ] + encounter: ["dialogue:allister.encounter.1"], + victory: ["dialogue:allister.victory.1"], + defeat: ["dialogue:allister.defeat.1"], }, [TrainerType.CLAY]: { - encounter: [ - "dialogue:clay.encounter.1" - ], - victory: [ - "dialogue:clay.victory.1" - ], - defeat: [ - "dialogue:clay.defeat.1" - ] + encounter: ["dialogue:clay.encounter.1"], + victory: ["dialogue:clay.victory.1"], + defeat: ["dialogue:clay.defeat.1"], }, [TrainerType.KOFU]: { - encounter: [ - "dialogue:kofu.encounter.1" - ], - victory: [ - "dialogue:kofu.victory.1" - ], - defeat: [ - "dialogue:kofu.defeat.1" - ] + encounter: ["dialogue:kofu.encounter.1"], + victory: ["dialogue:kofu.victory.1"], + defeat: ["dialogue:kofu.defeat.1"], }, [TrainerType.TULIP]: { - encounter: [ - "dialogue:tulip.encounter.1" - ], - victory: [ - "dialogue:tulip.victory.1" - ], - defeat: [ - "dialogue:tulip.defeat.1" - ] + encounter: ["dialogue:tulip.encounter.1"], + victory: ["dialogue:tulip.victory.1"], + defeat: ["dialogue:tulip.defeat.1"], }, [TrainerType.SIDNEY]: { - encounter: [ - "dialogue:sidney.encounter.1" - ], - victory: [ - "dialogue:sidney.victory.1" - ], - defeat: [ - "dialogue:sidney.defeat.1" - ] + encounter: ["dialogue:sidney.encounter.1"], + victory: ["dialogue:sidney.victory.1"], + defeat: ["dialogue:sidney.defeat.1"], }, [TrainerType.PHOEBE]: { - encounter: [ - "dialogue:phoebe.encounter.1" - ], - victory: [ - "dialogue:phoebe.victory.1" - ], - defeat: [ - "dialogue:phoebe.defeat.1" - ] + encounter: ["dialogue:phoebe.encounter.1"], + victory: ["dialogue:phoebe.victory.1"], + defeat: ["dialogue:phoebe.defeat.1"], }, [TrainerType.GLACIA]: { - encounter: [ - "dialogue:glacia.encounter.1" - ], - victory: [ - "dialogue:glacia.victory.1" - ], - defeat: [ - "dialogue:glacia.defeat.1" - ] + encounter: ["dialogue:glacia.encounter.1"], + victory: ["dialogue:glacia.victory.1"], + defeat: ["dialogue:glacia.defeat.1"], }, [TrainerType.DRAKE]: { - encounter: [ - "dialogue:drake.encounter.1" - ], - victory: [ - "dialogue:drake.victory.1" - ], - defeat: [ - "dialogue:drake.defeat.1" - ] + encounter: ["dialogue:drake.encounter.1"], + victory: ["dialogue:drake.victory.1"], + defeat: ["dialogue:drake.defeat.1"], }, [TrainerType.WALLACE]: { - encounter: [ - "dialogue:wallace.encounter.1" - ], - victory: [ - "dialogue:wallace.victory.1" - ], - defeat: [ - "dialogue:wallace.defeat.1" - ] + encounter: ["dialogue:wallace.encounter.1"], + victory: ["dialogue:wallace.victory.1"], + defeat: ["dialogue:wallace.defeat.1"], }, [TrainerType.LORELEI]: { - encounter: [ - "dialogue:lorelei.encounter.1" - ], - victory: [ - "dialogue:lorelei.victory.1" - ], - defeat: [ - "dialogue:lorelei.defeat.1" - ] + encounter: ["dialogue:lorelei.encounter.1"], + victory: ["dialogue:lorelei.victory.1"], + defeat: ["dialogue:lorelei.defeat.1"], }, [TrainerType.WILL]: { - encounter: [ - "dialogue:will.encounter.1" - ], - victory: [ - "dialogue:will.victory.1" - ], - defeat: [ - "dialogue:will.defeat.1" - ] + encounter: ["dialogue:will.encounter.1"], + victory: ["dialogue:will.victory.1"], + defeat: ["dialogue:will.defeat.1"], }, [TrainerType.MALVA]: { - encounter: [ - "dialogue:malva.encounter.1" - ], - victory: [ - "dialogue:malva.victory.1" - ], - defeat: [ - "dialogue:malva.defeat.1" - ] + encounter: ["dialogue:malva.encounter.1"], + victory: ["dialogue:malva.victory.1"], + defeat: ["dialogue:malva.defeat.1"], }, [TrainerType.HALA]: { - encounter: [ - "dialogue:hala.encounter.1" - ], - victory: [ - "dialogue:hala.victory.1" - ], - defeat: [ - "dialogue:hala.defeat.1" - ] + encounter: ["dialogue:hala.encounter.1"], + victory: ["dialogue:hala.victory.1"], + defeat: ["dialogue:hala.defeat.1"], }, [TrainerType.MOLAYNE]: { - encounter: [ - "dialogue:molayne.encounter.1" - ], - victory: [ - "dialogue:molayne.victory.1" - ], - defeat: [ - "dialogue:molayne.defeat.1" - ] + encounter: ["dialogue:molayne.encounter.1"], + victory: ["dialogue:molayne.victory.1"], + defeat: ["dialogue:molayne.defeat.1"], }, [TrainerType.RIKA]: { - encounter: [ - "dialogue:rika.encounter.1" - ], - victory: [ - "dialogue:rika.victory.1" - ], - defeat: [ - "dialogue:rika.defeat.1" - ] + encounter: ["dialogue:rika.encounter.1"], + victory: ["dialogue:rika.victory.1"], + defeat: ["dialogue:rika.defeat.1"], }, [TrainerType.BRUNO]: { - encounter: [ - "dialogue:bruno.encounter.1" - ], - victory: [ - "dialogue:bruno.victory.1" - ], - defeat: [ - "dialogue:bruno.defeat.1" - ] + encounter: ["dialogue:bruno.encounter.1"], + victory: ["dialogue:bruno.victory.1"], + defeat: ["dialogue:bruno.defeat.1"], }, [TrainerType.BUGSY]: { - encounter: [ - "dialogue:bugsy.encounter.1" - ], - victory: [ - "dialogue:bugsy.victory.1" - ], - defeat: [ - "dialogue:bugsy.defeat.1" - ] + encounter: ["dialogue:bugsy.encounter.1"], + victory: ["dialogue:bugsy.victory.1"], + defeat: ["dialogue:bugsy.defeat.1"], }, [TrainerType.KOGA]: { - encounter: [ - "dialogue:koga.encounter.1" - ], - victory: [ - "dialogue:koga.victory.1" - ], - defeat: [ - "dialogue:koga.defeat.1" - ] + encounter: ["dialogue:koga.encounter.1"], + victory: ["dialogue:koga.victory.1"], + defeat: ["dialogue:koga.defeat.1"], }, [TrainerType.BERTHA]: { - encounter: [ - "dialogue:bertha.encounter.1" - ], - victory: [ - "dialogue:bertha.victory.1" - ], - defeat: [ - "dialogue:bertha.defeat.1" - ] + encounter: ["dialogue:bertha.encounter.1"], + victory: ["dialogue:bertha.victory.1"], + defeat: ["dialogue:bertha.defeat.1"], }, [TrainerType.LENORA]: { - encounter: [ - "dialogue:lenora.encounter.1" - ], - victory: [ - "dialogue:lenora.victory.1" - ], - defeat: [ - "dialogue:lenora.defeat.1" - ] + encounter: ["dialogue:lenora.encounter.1"], + victory: ["dialogue:lenora.victory.1"], + defeat: ["dialogue:lenora.defeat.1"], }, [TrainerType.SIEBOLD]: { - encounter: [ - "dialogue:siebold.encounter.1" - ], - victory: [ - "dialogue:siebold.victory.1" - ], - defeat: [ - "dialogue:siebold.defeat.1" - ] + encounter: ["dialogue:siebold.encounter.1"], + victory: ["dialogue:siebold.victory.1"], + defeat: ["dialogue:siebold.defeat.1"], }, [TrainerType.ROXIE]: { - encounter: [ - "dialogue:roxie.encounter.1" - ], - victory: [ - "dialogue:roxie.victory.1" - ], - defeat: [ - "dialogue:roxie.defeat.1" - ] + encounter: ["dialogue:roxie.encounter.1"], + victory: ["dialogue:roxie.victory.1"], + defeat: ["dialogue:roxie.defeat.1"], }, [TrainerType.OLIVIA]: { - encounter: [ - "dialogue:olivia.encounter.1" - ], - victory: [ - "dialogue:olivia.victory.1" - ], - defeat: [ - "dialogue:olivia.defeat.1" - ] + encounter: ["dialogue:olivia.encounter.1"], + victory: ["dialogue:olivia.victory.1"], + defeat: ["dialogue:olivia.defeat.1"], }, [TrainerType.POPPY]: { - encounter: [ - "dialogue:poppy.encounter.1" - ], - victory: [ - "dialogue:poppy.victory.1" - ], - defeat: [ - "dialogue:poppy.defeat.1" - ] + encounter: ["dialogue:poppy.encounter.1"], + victory: ["dialogue:poppy.victory.1"], + defeat: ["dialogue:poppy.defeat.1"], }, [TrainerType.AGATHA]: { - encounter: [ - "dialogue:agatha.encounter.1" - ], - victory: [ - "dialogue:agatha.victory.1" - ], - defeat: [ - "dialogue:agatha.defeat.1" - ] + encounter: ["dialogue:agatha.encounter.1"], + victory: ["dialogue:agatha.victory.1"], + defeat: ["dialogue:agatha.defeat.1"], }, [TrainerType.FLINT]: { - encounter: [ - "dialogue:flint.encounter.1" - ], - victory: [ - "dialogue:flint.victory.1" - ], - defeat: [ - "dialogue:flint.defeat.1" - ] + encounter: ["dialogue:flint.encounter.1"], + victory: ["dialogue:flint.victory.1"], + defeat: ["dialogue:flint.defeat.1"], }, [TrainerType.GRIMSLEY]: { - encounter: [ - "dialogue:grimsley.encounter.1" - ], - victory: [ - "dialogue:grimsley.victory.1" - ], - defeat: [ - "dialogue:grimsley.defeat.1" - ] + encounter: ["dialogue:grimsley.encounter.1"], + victory: ["dialogue:grimsley.victory.1"], + defeat: ["dialogue:grimsley.defeat.1"], }, [TrainerType.CAITLIN]: { - encounter: [ - "dialogue:caitlin.encounter.1" - ], - victory: [ - "dialogue:caitlin.victory.1" - ], - defeat: [ - "dialogue:caitlin.defeat.1" - ] + encounter: ["dialogue:caitlin.encounter.1"], + victory: ["dialogue:caitlin.victory.1"], + defeat: ["dialogue:caitlin.defeat.1"], }, [TrainerType.DIANTHA]: { - encounter: [ - "dialogue:diantha.encounter.1" - ], - victory: [ - "dialogue:diantha.victory.1" - ], - defeat: [ - "dialogue:diantha.defeat.1" - ] + encounter: ["dialogue:diantha.encounter.1"], + victory: ["dialogue:diantha.victory.1"], + defeat: ["dialogue:diantha.defeat.1"], }, [TrainerType.WIKSTROM]: { - encounter: [ - "dialogue:wikstrom.encounter.1" - ], - victory: [ - "dialogue:wikstrom.victory.1" - ], - defeat: [ - "dialogue:wikstrom.defeat.1" - ] + encounter: ["dialogue:wikstrom.encounter.1"], + victory: ["dialogue:wikstrom.victory.1"], + defeat: ["dialogue:wikstrom.defeat.1"], }, [TrainerType.ACEROLA]: { - encounter: [ - "dialogue:acerola.encounter.1" - ], - victory: [ - "dialogue:acerola.victory.1" - ], - defeat: [ - "dialogue:acerola.defeat.1" - ] + encounter: ["dialogue:acerola.encounter.1"], + victory: ["dialogue:acerola.victory.1"], + defeat: ["dialogue:acerola.defeat.1"], }, [TrainerType.LARRY_ELITE]: { - encounter: [ - "dialogue:larry_elite.encounter.1" - ], - victory: [ - "dialogue:larry_elite.victory.1" - ], - defeat: [ - "dialogue:larry_elite.defeat.1" - ] + encounter: ["dialogue:larry_elite.encounter.1"], + victory: ["dialogue:larry_elite.victory.1"], + defeat: ["dialogue:larry_elite.defeat.1"], }, [TrainerType.LANCE]: { - encounter: [ - "dialogue:lance.encounter.1", - "dialogue:lance.encounter.2" - ], - victory: [ - "dialogue:lance.victory.1", - "dialogue:lance.victory.2" - ], - defeat: [ - "dialogue:lance.defeat.1", - "dialogue:lance.defeat.2" - ] + encounter: ["dialogue:lance.encounter.1", "dialogue:lance.encounter.2"], + victory: ["dialogue:lance.victory.1", "dialogue:lance.victory.2"], + defeat: ["dialogue:lance.defeat.1", "dialogue:lance.defeat.2"], }, [TrainerType.KAREN]: { - encounter: [ - "dialogue:karen.encounter.1", - "dialogue:karen.encounter.2", - "dialogue:karen.encounter.3" - ], - victory: [ - "dialogue:karen.victory.1", - "dialogue:karen.victory.2", - "dialogue:karen.victory.3" - ], - defeat: [ - "dialogue:karen.defeat.1", - "dialogue:karen.defeat.2", - "dialogue:karen.defeat.3" - ] + encounter: ["dialogue:karen.encounter.1", "dialogue:karen.encounter.2", "dialogue:karen.encounter.3"], + victory: ["dialogue:karen.victory.1", "dialogue:karen.victory.2", "dialogue:karen.victory.3"], + defeat: ["dialogue:karen.defeat.1", "dialogue:karen.defeat.2", "dialogue:karen.defeat.3"], }, [TrainerType.MILO]: { - encounter: [ - "dialogue:milo.encounter.1" - ], - victory: [ - "dialogue:milo.victory.1" - ], - defeat: [ - "dialogue:milo.defeat.1" - ] + encounter: ["dialogue:milo.encounter.1"], + victory: ["dialogue:milo.victory.1"], + defeat: ["dialogue:milo.defeat.1"], }, [TrainerType.LUCIAN]: { - encounter: [ - "dialogue:lucian.encounter.1" - ], - victory: [ - "dialogue:lucian.victory.1" - ], - defeat: [ - "dialogue:lucian.defeat.1" - ] + encounter: ["dialogue:lucian.encounter.1"], + victory: ["dialogue:lucian.victory.1"], + defeat: ["dialogue:lucian.defeat.1"], }, [TrainerType.DRASNA]: { - encounter: [ - "dialogue:drasna.encounter.1" - ], - victory: [ - "dialogue:drasna.victory.1" - ], - defeat: [ - "dialogue:drasna.defeat.1" - ] + encounter: ["dialogue:drasna.encounter.1"], + victory: ["dialogue:drasna.victory.1"], + defeat: ["dialogue:drasna.defeat.1"], }, [TrainerType.KAHILI]: { - encounter: [ - "dialogue:kahili.encounter.1" - ], - victory: [ - "dialogue:kahili.victory.1" - ], - defeat: [ - "dialogue:kahili.defeat.1" - ] + encounter: ["dialogue:kahili.encounter.1"], + victory: ["dialogue:kahili.victory.1"], + defeat: ["dialogue:kahili.defeat.1"], }, [TrainerType.HASSEL]: { - encounter: [ - "dialogue:hassel.encounter.1" - ], - victory: [ - "dialogue:hassel.victory.1" - ], - defeat: [ - "dialogue:hassel.defeat.1" - ] + encounter: ["dialogue:hassel.encounter.1"], + victory: ["dialogue:hassel.victory.1"], + defeat: ["dialogue:hassel.defeat.1"], }, [TrainerType.BLUE]: { - encounter: [ - "dialogue:blue.encounter.1" - ], - victory: [ - "dialogue:blue.victory.1" - ], - defeat: [ - "dialogue:blue.defeat.1" - ] + encounter: ["dialogue:blue.encounter.1"], + victory: ["dialogue:blue.victory.1"], + defeat: ["dialogue:blue.defeat.1"], }, [TrainerType.PIERS]: { - encounter: [ - "dialogue:piers.encounter.1" - ], - victory: [ - "dialogue:piers.victory.1" - ], - defeat: [ - "dialogue:piers.defeat.1" - ] + encounter: ["dialogue:piers.encounter.1"], + victory: ["dialogue:piers.victory.1"], + defeat: ["dialogue:piers.defeat.1"], }, [TrainerType.RED]: { - encounter: [ - "dialogue:red.encounter.1" - ], - victory: [ - "dialogue:red.victory.1" - ], - defeat: [ - "dialogue:red.defeat.1" - ] + encounter: ["dialogue:red.encounter.1"], + victory: ["dialogue:red.victory.1"], + defeat: ["dialogue:red.defeat.1"], }, [TrainerType.JASMINE]: { - encounter: [ - "dialogue:jasmine.encounter.1" - ], - victory: [ - "dialogue:jasmine.victory.1" - ], - defeat: [ - "dialogue:jasmine.defeat.1" - ] + encounter: ["dialogue:jasmine.encounter.1"], + victory: ["dialogue:jasmine.victory.1"], + defeat: ["dialogue:jasmine.defeat.1"], }, [TrainerType.LANCE_CHAMPION]: { - encounter: [ - "dialogue:lance_champion.encounter.1" - ], - victory: [ - "dialogue:lance_champion.victory.1" - ], - defeat: [ - "dialogue:lance_champion.defeat.1" - ] + encounter: ["dialogue:lance_champion.encounter.1"], + victory: ["dialogue:lance_champion.victory.1"], + defeat: ["dialogue:lance_champion.defeat.1"], }, [TrainerType.STEVEN]: { - encounter: [ - "dialogue:steven.encounter.1" - ], - victory: [ - "dialogue:steven.victory.1" - ], - defeat: [ - "dialogue:steven.defeat.1" - ] + encounter: ["dialogue:steven.encounter.1"], + victory: ["dialogue:steven.victory.1"], + defeat: ["dialogue:steven.defeat.1"], }, [TrainerType.CYNTHIA]: { - encounter: [ - "dialogue:cynthia.encounter.1" - ], - victory: [ - "dialogue:cynthia.victory.1" - ], - defeat: [ - "dialogue:cynthia.defeat.1" - ] + encounter: ["dialogue:cynthia.encounter.1"], + victory: ["dialogue:cynthia.victory.1"], + defeat: ["dialogue:cynthia.defeat.1"], }, [TrainerType.IRIS]: { - encounter: [ - "dialogue:iris.encounter.1" - ], - victory: [ - "dialogue:iris.victory.1" - ], - defeat: [ - "dialogue:iris.defeat.1" - ] + encounter: ["dialogue:iris.encounter.1"], + victory: ["dialogue:iris.victory.1"], + defeat: ["dialogue:iris.defeat.1"], }, [TrainerType.KUKUI]: { - encounter: [ - "dialogue:kukui.encounter.1" - ], - victory: [ - "dialogue:kukui.victory.1" - ], - defeat: [ - "dialogue:kukui.defeat.1" - ] + encounter: ["dialogue:kukui.encounter.1"], + victory: ["dialogue:kukui.victory.1"], + defeat: ["dialogue:kukui.defeat.1"], }, [TrainerType.HAU]: { - encounter: [ - "dialogue:hau.encounter.1" - ], - victory: [ - "dialogue:hau.victory.1" - ], - defeat: [ - "dialogue:hau.defeat.1" - ] + encounter: ["dialogue:hau.encounter.1"], + victory: ["dialogue:hau.victory.1"], + defeat: ["dialogue:hau.defeat.1"], }, [TrainerType.GEETA]: { - encounter: [ - "dialogue:geeta.encounter.1" - ], - victory: [ - "dialogue:geeta.victory.1" - ], - defeat: [ - "dialogue:geeta.defeat.1" - ] + encounter: ["dialogue:geeta.encounter.1"], + victory: ["dialogue:geeta.victory.1"], + defeat: ["dialogue:geeta.defeat.1"], }, [TrainerType.NEMONA]: { - encounter: [ - "dialogue:nemona.encounter.1" - ], - victory: [ - "dialogue:nemona.victory.1" - ], - defeat: [ - "dialogue:nemona.defeat.1" - ] + encounter: ["dialogue:nemona.encounter.1"], + victory: ["dialogue:nemona.victory.1"], + defeat: ["dialogue:nemona.defeat.1"], }, [TrainerType.LEON]: { - encounter: [ - "dialogue:leon.encounter.1" - ], - victory: [ - "dialogue:leon.victory.1" - ], - defeat: [ - "dialogue:leon.defeat.1" - ] + encounter: ["dialogue:leon.encounter.1"], + victory: ["dialogue:leon.victory.1"], + defeat: ["dialogue:leon.defeat.1"], }, [TrainerType.MUSTARD]: { - encounter: [ - "dialogue:mustard.encounter.1" - ], - victory: [ - "dialogue:mustard.victory.1" - ], - defeat: [ - "dialogue:mustard.defeat.1" - ] + encounter: ["dialogue:mustard.encounter.1"], + victory: ["dialogue:mustard.victory.1"], + defeat: ["dialogue:mustard.defeat.1"], }, [TrainerType.WHITNEY]: { - encounter: [ - "dialogue:whitney.encounter.1" - ], - victory: [ - "dialogue:whitney.victory.1" - ], - defeat: [ - "dialogue:whitney.defeat.1" - ] + encounter: ["dialogue:whitney.encounter.1"], + victory: ["dialogue:whitney.victory.1"], + defeat: ["dialogue:whitney.defeat.1"], }, [TrainerType.CHUCK]: { - encounter: [ - "dialogue:chuck.encounter.1" - ], - victory: [ - "dialogue:chuck.victory.1" - ], - defeat: [ - "dialogue:chuck.defeat.1" - ] + encounter: ["dialogue:chuck.encounter.1"], + victory: ["dialogue:chuck.victory.1"], + defeat: ["dialogue:chuck.defeat.1"], }, [TrainerType.KATY]: { - encounter: [ - "dialogue:katy.encounter.1" - ], - victory: [ - "dialogue:katy.victory.1" - ], - defeat: [ - "dialogue:katy.defeat.1" - ] + encounter: ["dialogue:katy.encounter.1"], + victory: ["dialogue:katy.victory.1"], + defeat: ["dialogue:katy.defeat.1"], }, [TrainerType.PRYCE]: { - encounter: [ - "dialogue:pryce.encounter.1" - ], - victory: [ - "dialogue:pryce.victory.1" - ], - defeat: [ - "dialogue:pryce.defeat.1" - ] + encounter: ["dialogue:pryce.encounter.1"], + victory: ["dialogue:pryce.victory.1"], + defeat: ["dialogue:pryce.defeat.1"], }, [TrainerType.CLAIR]: { - encounter: [ - "dialogue:clair.encounter.1" - ], - victory: [ - "dialogue:clair.victory.1" - ], - defeat: [ - "dialogue:clair.defeat.1" - ] + encounter: ["dialogue:clair.encounter.1"], + victory: ["dialogue:clair.victory.1"], + defeat: ["dialogue:clair.defeat.1"], }, [TrainerType.MAYLENE]: { - encounter: [ - "dialogue:maylene.encounter.1" - ], - victory: [ - "dialogue:maylene.victory.1" - ], - defeat: [ - "dialogue:maylene.defeat.1" - ] + encounter: ["dialogue:maylene.encounter.1"], + victory: ["dialogue:maylene.victory.1"], + defeat: ["dialogue:maylene.defeat.1"], }, [TrainerType.FANTINA]: { - encounter: [ - "dialogue:fantina.encounter.1" - ], - victory: [ - "dialogue:fantina.victory.1" - ], - defeat: [ - "dialogue:fantina.defeat.1" - ] + encounter: ["dialogue:fantina.encounter.1"], + victory: ["dialogue:fantina.victory.1"], + defeat: ["dialogue:fantina.defeat.1"], }, [TrainerType.BYRON]: { - encounter: [ - "dialogue:byron.encounter.1" - ], - victory: [ - "dialogue:byron.victory.1" - ], - defeat: [ - "dialogue:byron.defeat.1" - ] + encounter: ["dialogue:byron.encounter.1"], + victory: ["dialogue:byron.victory.1"], + defeat: ["dialogue:byron.defeat.1"], }, [TrainerType.OLYMPIA]: { - encounter: [ - "dialogue:olympia.encounter.1" - ], - victory: [ - "dialogue:olympia.victory.1" - ], - defeat: [ - "dialogue:olympia.defeat.1" - ] + encounter: ["dialogue:olympia.encounter.1"], + victory: ["dialogue:olympia.victory.1"], + defeat: ["dialogue:olympia.defeat.1"], }, [TrainerType.VOLKNER]: { - encounter: [ - "dialogue:volkner.encounter.1" - ], - victory: [ - "dialogue:volkner.victory.1" - ], - defeat: [ - "dialogue:volkner.defeat.1" - ] + encounter: ["dialogue:volkner.encounter.1"], + victory: ["dialogue:volkner.victory.1"], + defeat: ["dialogue:volkner.defeat.1"], }, [TrainerType.BURGH]: { - encounter: [ - "dialogue:burgh.encounter.1", - "dialogue:burgh.encounter.2" - ], - victory: [ - "dialogue:burgh.victory.1", - "dialogue:burgh.victory.2" - ], - defeat: [ - "dialogue:burgh.defeat.1", - "dialogue:burgh.defeat.2" - ] + encounter: ["dialogue:burgh.encounter.1", "dialogue:burgh.encounter.2"], + victory: ["dialogue:burgh.victory.1", "dialogue:burgh.victory.2"], + defeat: ["dialogue:burgh.defeat.1", "dialogue:burgh.defeat.2"], }, [TrainerType.ELESA]: { - encounter: [ - "dialogue:elesa.encounter.1" - ], - victory: [ - "dialogue:elesa.victory.1" - ], - defeat: [ - "dialogue:elesa.defeat.1" - ] + encounter: ["dialogue:elesa.encounter.1"], + victory: ["dialogue:elesa.victory.1"], + defeat: ["dialogue:elesa.defeat.1"], }, [TrainerType.SKYLA]: { - encounter: [ - "dialogue:skyla.encounter.1" - ], - victory: [ - "dialogue:skyla.victory.1" - ], - defeat: [ - "dialogue:skyla.defeat.1" - ] + encounter: ["dialogue:skyla.encounter.1"], + victory: ["dialogue:skyla.victory.1"], + defeat: ["dialogue:skyla.defeat.1"], }, [TrainerType.BRYCEN]: { - encounter: [ - "dialogue:brycen.encounter.1" - ], - victory: [ - "dialogue:brycen.victory.1" - ], - defeat: [ - "dialogue:brycen.defeat.1" - ] + encounter: ["dialogue:brycen.encounter.1"], + victory: ["dialogue:brycen.victory.1"], + defeat: ["dialogue:brycen.defeat.1"], }, [TrainerType.DRAYDEN]: { - encounter: [ - "dialogue:drayden.encounter.1" - ], - victory: [ - "dialogue:drayden.victory.1" - ], - defeat: [ - "dialogue:drayden.defeat.1" - ] + encounter: ["dialogue:drayden.encounter.1"], + victory: ["dialogue:drayden.victory.1"], + defeat: ["dialogue:drayden.defeat.1"], }, [TrainerType.GRANT]: { - encounter: [ - "dialogue:grant.encounter.1" - ], - victory: [ - "dialogue:grant.victory.1" - ], - defeat: [ - "dialogue:grant.defeat.1" - ] + encounter: ["dialogue:grant.encounter.1"], + victory: ["dialogue:grant.victory.1"], + defeat: ["dialogue:grant.defeat.1"], }, [TrainerType.KORRINA]: { - encounter: [ - "dialogue:korrina.encounter.1" - ], - victory: [ - "dialogue:korrina.victory.1" - ], - defeat: [ - "dialogue:korrina.defeat.1" - ] + encounter: ["dialogue:korrina.encounter.1"], + victory: ["dialogue:korrina.victory.1"], + defeat: ["dialogue:korrina.defeat.1"], }, [TrainerType.CLEMONT]: { - encounter: [ - "dialogue:clemont.encounter.1" - ], - victory: [ - "dialogue:clemont.victory.1" - ], - defeat: [ - "dialogue:clemont.defeat.1" - ] + encounter: ["dialogue:clemont.encounter.1"], + victory: ["dialogue:clemont.victory.1"], + defeat: ["dialogue:clemont.defeat.1"], }, [TrainerType.VALERIE]: { - encounter: [ - "dialogue:valerie.encounter.1" - ], - victory: [ - "dialogue:valerie.victory.1" - ], - defeat: [ - "dialogue:valerie.defeat.1" - ] + encounter: ["dialogue:valerie.encounter.1"], + victory: ["dialogue:valerie.victory.1"], + defeat: ["dialogue:valerie.defeat.1"], }, [TrainerType.WULFRIC]: { - encounter: [ - "dialogue:wulfric.encounter.1" - ], - victory: [ - "dialogue:wulfric.victory.1" - ], - defeat: [ - "dialogue:wulfric.defeat.1" - ] + encounter: ["dialogue:wulfric.encounter.1"], + victory: ["dialogue:wulfric.victory.1"], + defeat: ["dialogue:wulfric.defeat.1"], }, [TrainerType.KABU]: { - encounter: [ - "dialogue:kabu.encounter.1" - ], - victory: [ - "dialogue:kabu.victory.1" - ], - defeat: [ - "dialogue:kabu.defeat.1" - ] + encounter: ["dialogue:kabu.encounter.1"], + victory: ["dialogue:kabu.victory.1"], + defeat: ["dialogue:kabu.defeat.1"], }, [TrainerType.BEA]: { - encounter: [ - "dialogue:bea.encounter.1" - ], - victory: [ - "dialogue:bea.victory.1" - ], - defeat: [ - "dialogue:bea.defeat.1" - ] + encounter: ["dialogue:bea.encounter.1"], + victory: ["dialogue:bea.victory.1"], + defeat: ["dialogue:bea.defeat.1"], }, [TrainerType.OPAL]: { - encounter: [ - "dialogue:opal.encounter.1" - ], - victory: [ - "dialogue:opal.victory.1" - ], - defeat: [ - "dialogue:opal.defeat.1" - ] + encounter: ["dialogue:opal.encounter.1"], + victory: ["dialogue:opal.victory.1"], + defeat: ["dialogue:opal.defeat.1"], }, [TrainerType.BEDE]: { - encounter: [ - "dialogue:bede.encounter.1" - ], - victory: [ - "dialogue:bede.victory.1" - ], - defeat: [ - "dialogue:bede.defeat.1" - ] + encounter: ["dialogue:bede.encounter.1"], + victory: ["dialogue:bede.victory.1"], + defeat: ["dialogue:bede.defeat.1"], }, [TrainerType.GORDIE]: { - encounter: [ - "dialogue:gordie.encounter.1" - ], - victory: [ - "dialogue:gordie.victory.1" - ], - defeat: [ - "dialogue:gordie.defeat.1" - ] + encounter: ["dialogue:gordie.encounter.1"], + victory: ["dialogue:gordie.victory.1"], + defeat: ["dialogue:gordie.defeat.1"], }, [TrainerType.MARNIE]: { - encounter: [ - "dialogue:marnie.encounter.1" - ], - victory: [ - "dialogue:marnie.victory.1" - ], - defeat: [ - "dialogue:marnie.defeat.1" - ] + encounter: ["dialogue:marnie.encounter.1"], + victory: ["dialogue:marnie.victory.1"], + defeat: ["dialogue:marnie.defeat.1"], }, [TrainerType.RAIHAN]: { - encounter: [ - "dialogue:raihan.encounter.1" - ], - victory: [ - "dialogue:raihan.victory.1" - ], - defeat: [ - "dialogue:raihan.defeat.1" - ] + encounter: ["dialogue:raihan.encounter.1"], + victory: ["dialogue:raihan.victory.1"], + defeat: ["dialogue:raihan.defeat.1"], }, [TrainerType.BRASSIUS]: { - encounter: [ - "dialogue:brassius.encounter.1" - ], - victory: [ - "dialogue:brassius.victory.1" - ], - defeat: [ - "dialogue:brassius.defeat.1" - ] + encounter: ["dialogue:brassius.encounter.1"], + victory: ["dialogue:brassius.victory.1"], + defeat: ["dialogue:brassius.defeat.1"], }, [TrainerType.IONO]: { - encounter: [ - "dialogue:iono.encounter.1" - ], - victory: [ - "dialogue:iono.victory.1" - ], - defeat: [ - "dialogue:iono.defeat.1" - ] + encounter: ["dialogue:iono.encounter.1"], + victory: ["dialogue:iono.victory.1"], + defeat: ["dialogue:iono.defeat.1"], }, [TrainerType.LARRY]: { - encounter: [ - "dialogue:larry.encounter.1" - ], - victory: [ - "dialogue:larry.victory.1" - ], - defeat: [ - "dialogue:larry.defeat.1" - ] + encounter: ["dialogue:larry.encounter.1"], + victory: ["dialogue:larry.victory.1"], + defeat: ["dialogue:larry.defeat.1"], }, [TrainerType.RYME]: { - encounter: [ - "dialogue:ryme.encounter.1" - ], - victory: [ - "dialogue:ryme.victory.1" - ], - defeat: [ - "dialogue:ryme.defeat.1" - ] + encounter: ["dialogue:ryme.encounter.1"], + victory: ["dialogue:ryme.victory.1"], + defeat: ["dialogue:ryme.defeat.1"], }, [TrainerType.GRUSHA]: { - encounter: [ - "dialogue:grusha.encounter.1" - ], - victory: [ - "dialogue:grusha.victory.1" - ], - defeat: [ - "dialogue:grusha.defeat.1" - ] + encounter: ["dialogue:grusha.encounter.1"], + victory: ["dialogue:grusha.victory.1"], + defeat: ["dialogue:grusha.defeat.1"], }, [TrainerType.MARNIE_ELITE]: { - encounter: [ - "dialogue:marnie_elite.encounter.1", - "dialogue:marnie_elite.encounter.2" - ], - victory: [ - "dialogue:marnie_elite.victory.1", - "dialogue:marnie_elite.victory.2" - ], - defeat: [ - "dialogue:marnie_elite.defeat.1", - "dialogue:marnie_elite.defeat.2" - ] + encounter: ["dialogue:marnie_elite.encounter.1", "dialogue:marnie_elite.encounter.2"], + victory: ["dialogue:marnie_elite.victory.1", "dialogue:marnie_elite.victory.2"], + defeat: ["dialogue:marnie_elite.defeat.1", "dialogue:marnie_elite.defeat.2"], }, [TrainerType.NESSA_ELITE]: { - encounter: [ - "dialogue:nessa_elite.encounter.1", - "dialogue:nessa_elite.encounter.2" - ], - victory: [ - "dialogue:nessa_elite.victory.1", - "dialogue:nessa_elite.victory.2" - ], - defeat: [ - "dialogue:nessa_elite.defeat.1", - "dialogue:nessa_elite.defeat.2" - ] + encounter: ["dialogue:nessa_elite.encounter.1", "dialogue:nessa_elite.encounter.2"], + victory: ["dialogue:nessa_elite.victory.1", "dialogue:nessa_elite.victory.2"], + defeat: ["dialogue:nessa_elite.defeat.1", "dialogue:nessa_elite.defeat.2"], }, [TrainerType.BEA_ELITE]: { - encounter: [ - "dialogue:bea_elite.encounter.1", - "dialogue:bea_elite.encounter.2" - ], - victory: [ - "dialogue:bea_elite.victory.1", - "dialogue:bea_elite.victory.2" - ], - defeat: [ - "dialogue:bea_elite.defeat.1", - "dialogue:bea_elite.defeat.2" - ] + encounter: ["dialogue:bea_elite.encounter.1", "dialogue:bea_elite.encounter.2"], + victory: ["dialogue:bea_elite.victory.1", "dialogue:bea_elite.victory.2"], + defeat: ["dialogue:bea_elite.defeat.1", "dialogue:bea_elite.defeat.2"], }, [TrainerType.ALLISTER_ELITE]: { - encounter: [ - "dialogue:allister_elite.encounter.1", - "dialogue:allister_elite.encounter.2" - ], - victory: [ - "dialogue:allister_elite.victory.1", - "dialogue:allister_elite.victory.2" - ], - defeat: [ - "dialogue:allister_elite.defeat.1", - "dialogue:allister_elite.defeat.2" - ] + encounter: ["dialogue:allister_elite.encounter.1", "dialogue:allister_elite.encounter.2"], + victory: ["dialogue:allister_elite.victory.1", "dialogue:allister_elite.victory.2"], + defeat: ["dialogue:allister_elite.defeat.1", "dialogue:allister_elite.defeat.2"], }, [TrainerType.RAIHAN_ELITE]: { - encounter: [ - "dialogue:raihan_elite.encounter.1", - "dialogue:raihan_elite.encounter.2" - ], - victory: [ - "dialogue:raihan_elite.victory.1", - "dialogue:raihan_elite.victory.2" - ], - defeat: [ - "dialogue:raihan_elite.defeat.1", - "dialogue:raihan_elite.defeat.2" - ] + encounter: ["dialogue:raihan_elite.encounter.1", "dialogue:raihan_elite.encounter.2"], + victory: ["dialogue:raihan_elite.victory.1", "dialogue:raihan_elite.victory.2"], + defeat: ["dialogue:raihan_elite.defeat.1", "dialogue:raihan_elite.defeat.2"], }, [TrainerType.ALDER]: { - encounter: [ - "dialogue:alder.encounter.1" - ], - victory: [ - "dialogue:alder.victory.1" - ], - defeat: [ - "dialogue:alder.defeat.1" - ] + encounter: ["dialogue:alder.encounter.1"], + victory: ["dialogue:alder.victory.1"], + defeat: ["dialogue:alder.defeat.1"], }, [TrainerType.KIERAN]: { - encounter: [ - "dialogue:kieran.encounter.1" - ], - victory: [ - "dialogue:kieran.victory.1" - ], - defeat: [ - "dialogue:kieran.defeat.1" - ] + encounter: ["dialogue:kieran.encounter.1"], + victory: ["dialogue:kieran.victory.1"], + defeat: ["dialogue:kieran.defeat.1"], }, [TrainerType.RIVAL]: [ { - encounter: [ - "dialogue:rival.encounter.1", - ], - victory: [ - "dialogue:rival.victory.1", - ], - + encounter: ["dialogue:rival.encounter.1"], + victory: ["dialogue:rival.victory.1"], }, { - encounter: [ - "dialogue:rival_female.encounter.1", - ], - victory: [ - "dialogue:rival_female.victory.1", - ] - } + encounter: ["dialogue:rival_female.encounter.1"], + victory: ["dialogue:rival_female.victory.1"], + }, ], [TrainerType.RIVAL_2]: [ { - encounter: [ - "dialogue:rival_2.encounter.1", - ], - victory: [ - "dialogue:rival_2.victory.1", - ], - + encounter: ["dialogue:rival_2.encounter.1"], + victory: ["dialogue:rival_2.victory.1"], }, { - encounter: [ - "dialogue:rival_2_female.encounter.1", - ], - victory: [ - "dialogue:rival_2_female.victory.1", - ], - defeat: [ - "dialogue:rival_2_female.defeat.1", - ] + encounter: ["dialogue:rival_2_female.encounter.1"], + victory: ["dialogue:rival_2_female.victory.1"], + defeat: ["dialogue:rival_2_female.defeat.1"], }, ], [TrainerType.RIVAL_3]: [ { - encounter: [ - "dialogue:rival_3.encounter.1", - ], - victory: [ - "dialogue:rival_3.victory.1", - ] + encounter: ["dialogue:rival_3.encounter.1"], + victory: ["dialogue:rival_3.victory.1"], }, { - encounter: [ - "dialogue:rival_3_female.encounter.1", - ], - victory: [ - "dialogue:rival_3_female.victory.1", - ], - defeat: [ - "dialogue:rival_3_female.defeat.1", - ] - } + encounter: ["dialogue:rival_3_female.encounter.1"], + victory: ["dialogue:rival_3_female.victory.1"], + defeat: ["dialogue:rival_3_female.defeat.1"], + }, ], [TrainerType.RIVAL_4]: [ { - encounter: [ - "dialogue:rival_4.encounter.1", - ], - victory: [ - "dialogue:rival_4.victory.1", - ] + encounter: ["dialogue:rival_4.encounter.1"], + victory: ["dialogue:rival_4.victory.1"], }, { - encounter: [ - "dialogue:rival_4_female.encounter.1", - ], - victory: [ - "dialogue:rival_4_female.victory.1", - ], - defeat: [ - "dialogue:rival_4_female.defeat.1", - ] - } + encounter: ["dialogue:rival_4_female.encounter.1"], + victory: ["dialogue:rival_4_female.victory.1"], + defeat: ["dialogue:rival_4_female.defeat.1"], + }, ], [TrainerType.RIVAL_5]: [ { - encounter: [ - "dialogue:rival_5.encounter.1", - ], - victory: [ - "dialogue:rival_5.victory.1", - ] + encounter: ["dialogue:rival_5.encounter.1"], + victory: ["dialogue:rival_5.victory.1"], }, { - encounter: [ - "dialogue:rival_5_female.encounter.1", - ], - victory: [ - "dialogue:rival_5_female.victory.1", - ], - defeat: [ - "dialogue:rival_5_female.defeat.1", - ] - } + encounter: ["dialogue:rival_5_female.encounter.1"], + victory: ["dialogue:rival_5_female.victory.1"], + defeat: ["dialogue:rival_5_female.defeat.1"], + }, ], [TrainerType.RIVAL_6]: [ { - encounter: [ - "dialogue:rival_6.encounter.1", - ], - victory: [ - "dialogue:rival_6.victory.1", - ] + encounter: ["dialogue:rival_6.encounter.1"], + victory: ["dialogue:rival_6.victory.1"], }, { - encounter: [ - "dialogue:rival_6_female.encounter.1", - ], - victory: [ - "dialogue:rival_6_female.victory.1", - ], - } - ] + encounter: ["dialogue:rival_6_female.encounter.1"], + victory: ["dialogue:rival_6_female.victory.1"], + }, + ], }; - export const doubleBattleDialogue = { - "blue_red_double": { - encounter: [ "doubleBattleDialogue:blue_red_double.encounter.1" ], - victory: [ "doubleBattleDialogue:blue_red_double.victory.1" ] + blue_red_double: { + encounter: ["doubleBattleDialogue:blue_red_double.encounter.1"], + victory: ["doubleBattleDialogue:blue_red_double.victory.1"], }, - "red_blue_double": { - encounter: [ "doubleBattleDialogue:red_blue_double.encounter.1" ], - victory: [ "doubleBattleDialogue:red_blue_double.victory.1" ] + red_blue_double: { + encounter: ["doubleBattleDialogue:red_blue_double.encounter.1"], + victory: ["doubleBattleDialogue:red_blue_double.victory.1"], }, - "tate_liza_double": { - encounter: [ "doubleBattleDialogue:tate_liza_double.encounter.1" ], - victory: [ "doubleBattleDialogue:tate_liza_double.victory.1" ] + tate_liza_double: { + encounter: ["doubleBattleDialogue:tate_liza_double.encounter.1"], + victory: ["doubleBattleDialogue:tate_liza_double.victory.1"], }, - "liza_tate_double": { - encounter: [ "doubleBattleDialogue:liza_tate_double.encounter.1" ], - victory: [ "doubleBattleDialogue:liza_tate_double.victory.1" ] + liza_tate_double: { + encounter: ["doubleBattleDialogue:liza_tate_double.encounter.1"], + victory: ["doubleBattleDialogue:liza_tate_double.victory.1"], }, - "wallace_steven_double": { - encounter: [ "doubleBattleDialogue:wallace_steven_double.encounter.1" ], - victory: [ "doubleBattleDialogue:wallace_steven_double.victory.1" ] + wallace_steven_double: { + encounter: ["doubleBattleDialogue:wallace_steven_double.encounter.1"], + victory: ["doubleBattleDialogue:wallace_steven_double.victory.1"], }, - "steven_wallace_double": { - encounter: [ "doubleBattleDialogue:steven_wallace_double.encounter.1" ], - victory: [ "doubleBattleDialogue:steven_wallace_double.victory.1" ] + steven_wallace_double: { + encounter: ["doubleBattleDialogue:steven_wallace_double.encounter.1"], + victory: ["doubleBattleDialogue:steven_wallace_double.victory.1"], }, - "alder_iris_double": { - encounter: [ "doubleBattleDialogue:alder_iris_double.encounter.1" ], - victory: [ "doubleBattleDialogue:alder_iris_double.victory.1" ] + alder_iris_double: { + encounter: ["doubleBattleDialogue:alder_iris_double.encounter.1"], + victory: ["doubleBattleDialogue:alder_iris_double.victory.1"], }, - "iris_alder_double": { - encounter: [ "doubleBattleDialogue:iris_alder_double.encounter.1" ], - victory: [ "doubleBattleDialogue:iris_alder_double.victory.1" ] + iris_alder_double: { + encounter: ["doubleBattleDialogue:iris_alder_double.encounter.1"], + victory: ["doubleBattleDialogue:iris_alder_double.victory.1"], }, - "marnie_piers_double": { - encounter: [ "doubleBattleDialogue:marnie_piers_double.encounter.1" ], - victory: [ "doubleBattleDialogue:marnie_piers_double.victory.1" ] + marnie_piers_double: { + encounter: ["doubleBattleDialogue:marnie_piers_double.encounter.1"], + victory: ["doubleBattleDialogue:marnie_piers_double.victory.1"], }, - "piers_marnie_double": { - encounter: [ "doubleBattleDialogue:piers_marnie_double.encounter.1" ], - victory: [ "doubleBattleDialogue:piers_marnie_double.victory.1" ] + piers_marnie_double: { + encounter: ["doubleBattleDialogue:piers_marnie_double.encounter.1"], + victory: ["doubleBattleDialogue:piers_marnie_double.victory.1"], }, - - }; export const battleSpecDialogue = { @@ -3193,14 +1664,11 @@ export const battleSpecDialogue = { encounter: "battleSpecDialogue:encounter", firstStageWin: "battleSpecDialogue:firstStageWin", secondStageWin: "battleSpecDialogue:secondStageWin", - } + }, }; export const miscDialogue = { - ending: [ - "miscDialogue:ending", - "miscDialogue:ending_female" - ] + ending: ["miscDialogue:ending", "miscDialogue:ending_female"], }; export function getCharVariantFromDialogue(message: string): string { @@ -3212,17 +1680,18 @@ export function getCharVariantFromDialogue(message: string): string { } export function initTrainerTypeDialogue(): void { - const trainerTypes = Object.keys(trainerTypeDialogue).map(t => parseInt(t) as TrainerType); + const trainerTypes = Object.keys(trainerTypeDialogue).map(t => Number.parseInt(t) as TrainerType); for (const trainerType of trainerTypes) { const messages = trainerTypeDialogue[trainerType]; - const messageTypes = [ "encounter", "victory", "defeat" ]; + const messageTypes = ["encounter", "victory", "defeat"]; for (const messageType of messageTypes) { if (Array.isArray(messages)) { if (messages[0][messageType]) { trainerConfigs[trainerType][`${messageType}Messages`] = messages[0][messageType]; } if (messages.length > 1) { - trainerConfigs[trainerType][`female${messageType.slice(0, 1).toUpperCase()}${messageType.slice(1)}Messages`] = messages[1][messageType]; + trainerConfigs[trainerType][`female${messageType.slice(0, 1).toUpperCase()}${messageType.slice(1)}Messages`] = + messages[1][messageType]; } } else { trainerConfigs[trainerType][`${messageType}Messages`] = messages[messageType]; diff --git a/src/data/egg-hatch-data.ts b/src/data/egg-hatch-data.ts index 37ee9bede09..949ed1af063 100644 --- a/src/data/egg-hatch-data.ts +++ b/src/data/egg-hatch-data.ts @@ -24,17 +24,17 @@ export class EggHatchData { } /** - * Sets the boolean for if the egg move for the hatch is a new unlock - * @param unlocked True if the EM is new - */ + * Sets the boolean for if the egg move for the hatch is a new unlock + * @param unlocked True if the EM is new + */ setEggMoveUnlocked(unlocked: boolean) { - this.eggMoveUnlocked = unlocked; + this.eggMoveUnlocked = unlocked; } /** - * Stores a copy of the current DexEntry of the pokemon and StarterDataEntry of its starter - * Used before updating the dex, so comparing the pokemon to these entries will show the new attributes - */ + * Stores a copy of the current DexEntry of the pokemon and StarterDataEntry of its starter + * Used before updating the dex, so comparing the pokemon to these entries will show the new attributes + */ setDex() { const currDexEntry = globalScene.gameData.dexData[this.pokemon.species.speciesId]; const currStarterDataEntry = globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId()]; @@ -45,7 +45,7 @@ export class EggHatchData { seenCount: currDexEntry.seenCount, caughtCount: currDexEntry.caughtCount, hatchedCount: currDexEntry.hatchedCount, - ivs: [ ...currDexEntry.ivs ] + ivs: [...currDexEntry.ivs], }; this.starterDataEntryBeforeUpdate = { moveset: currStarterDataEntry.moveset, @@ -55,37 +55,37 @@ export class EggHatchData { abilityAttr: currStarterDataEntry.abilityAttr, passiveAttr: currStarterDataEntry.passiveAttr, valueReduction: currStarterDataEntry.valueReduction, - classicWinCount: currStarterDataEntry.classicWinCount + classicWinCount: currStarterDataEntry.classicWinCount, }; } /** - * Gets the dex entry before update - * @returns Dex Entry corresponding to this pokemon before the pokemon was added / updated to dex - */ + * Gets the dex entry before update + * @returns Dex Entry corresponding to this pokemon before the pokemon was added / updated to dex + */ getDex(): DexEntry { return this.dexEntryBeforeUpdate; } /** - * Gets the starter dex entry before update - * @returns Starter Dex Entry corresponding to this pokemon before the pokemon was added / updated to dex - */ + * Gets the starter dex entry before update + * @returns Starter Dex Entry corresponding to this pokemon before the pokemon was added / updated to dex + */ getStarterEntry(): StarterDataEntry { return this.starterDataEntryBeforeUpdate; } /** - * Update the pokedex data corresponding with the new hatch's pokemon data - * Also sets whether the egg move is a new unlock or not - * @param showMessage boolean to show messages for the new catches and egg moves (false by default) - * @returns - */ - updatePokemon(showMessage : boolean = false) { + * Update the pokedex data corresponding with the new hatch's pokemon data + * Also sets whether the egg move is a new unlock or not + * @param showMessage boolean to show messages for the new catches and egg moves (false by default) + * @returns + */ + updatePokemon(showMessage = false) { return new Promise(resolve => { globalScene.gameData.setPokemonCaught(this.pokemon, true, true, showMessage).then(() => { globalScene.gameData.updateSpeciesDexIvs(this.pokemon.species.speciesId, this.pokemon.ivs); - globalScene.gameData.setEggMoveUnlocked(this.pokemon.species, this.eggMoveIndex, showMessage).then((value) => { + globalScene.gameData.setEggMoveUnlocked(this.pokemon.species, this.eggMoveIndex, showMessage).then(value => { this.setEggMoveUnlocked(value); resolve(); }); diff --git a/src/data/egg.ts b/src/data/egg.ts index 2599994ecf6..0dabf8f1119 100644 --- a/src/data/egg.ts +++ b/src/data/egg.ts @@ -12,7 +12,31 @@ import i18next from "i18next"; import { EggTier } from "#enums/egg-type"; import { Species } from "#enums/species"; import { EggSourceType } from "#enums/egg-source-types"; -import { MANAPHY_EGG_MANAPHY_RATE, SAME_SPECIES_EGG_HA_RATE, GACHA_EGG_HA_RATE, GACHA_DEFAULT_RARE_EGGMOVE_RATE, SAME_SPECIES_EGG_RARE_EGGMOVE_RATE, GACHA_MOVE_UP_RARE_EGGMOVE_RATE, GACHA_DEFAULT_SHINY_RATE, GACHA_SHINY_UP_SHINY_RATE, SAME_SPECIES_EGG_SHINY_RATE, EGG_PITY_LEGENDARY_THRESHOLD, EGG_PITY_EPIC_THRESHOLD, EGG_PITY_RARE_THRESHOLD, SHINY_VARIANT_CHANCE, SHINY_EPIC_CHANCE, GACHA_DEFAULT_COMMON_EGG_THRESHOLD, GACHA_DEFAULT_RARE_EGG_THRESHOLD, GACHA_DEFAULT_EPIC_EGG_THRESHOLD, GACHA_LEGENDARY_UP_THRESHOLD_OFFSET, HATCH_WAVES_MANAPHY_EGG, HATCH_WAVES_COMMON_EGG, HATCH_WAVES_RARE_EGG, HATCH_WAVES_EPIC_EGG, HATCH_WAVES_LEGENDARY_EGG } from "#app/data/balance/rates"; +import { + MANAPHY_EGG_MANAPHY_RATE, + SAME_SPECIES_EGG_HA_RATE, + GACHA_EGG_HA_RATE, + GACHA_DEFAULT_RARE_EGGMOVE_RATE, + SAME_SPECIES_EGG_RARE_EGGMOVE_RATE, + GACHA_MOVE_UP_RARE_EGGMOVE_RATE, + GACHA_DEFAULT_SHINY_RATE, + GACHA_SHINY_UP_SHINY_RATE, + SAME_SPECIES_EGG_SHINY_RATE, + EGG_PITY_LEGENDARY_THRESHOLD, + EGG_PITY_EPIC_THRESHOLD, + EGG_PITY_RARE_THRESHOLD, + SHINY_VARIANT_CHANCE, + SHINY_EPIC_CHANCE, + GACHA_DEFAULT_COMMON_EGG_THRESHOLD, + GACHA_DEFAULT_RARE_EGG_THRESHOLD, + GACHA_DEFAULT_EPIC_EGG_THRESHOLD, + GACHA_LEGENDARY_UP_THRESHOLD_OFFSET, + HATCH_WAVES_MANAPHY_EGG, + HATCH_WAVES_COMMON_EGG, + HATCH_WAVES_RARE_EGG, + HATCH_WAVES_EPIC_EGG, + HATCH_WAVES_LEGENDARY_EGG, +} from "#app/data/balance/rates"; import { speciesEggTiers } from "#app/data/balance/species-egg-tiers"; export const EGG_SEED = 1073741824; @@ -60,7 +84,6 @@ export interface IEggOptions { } export class Egg { - //// // #region Private properties //// @@ -141,7 +164,7 @@ export class Egg { this._sourceType = eggOptions?.sourceType!; // TODO: is this bang correct? // Ensure _sourceType is defined before invoking rollEggTier(), as it is referenced - this._tier = eggOptions?.tier ?? (Overrides.EGG_TIER_OVERRIDE ?? this.rollEggTier()); + this._tier = eggOptions?.tier ?? Overrides.EGG_TIER_OVERRIDE ?? this.rollEggTier(); // If egg was pulled, check if egg pity needs to override the egg tier if (eggOptions?.pulled) { // Needs this._tier and this._sourceType to work @@ -156,7 +179,7 @@ export class Egg { // First roll shiny and variant so we can filter if species with an variant exist this._isShiny = eggOptions?.isShiny ?? (Overrides.EGG_SHINY_OVERRIDE || this.rollShiny()); - this._variantTier = eggOptions?.variantTier ?? (Overrides.EGG_VARIANT_OVERRIDE ?? this.rollVariant()); + this._variantTier = eggOptions?.variantTier ?? Overrides.EGG_VARIANT_OVERRIDE ?? this.rollVariant(); this._species = eggOptions?.species ?? this.rollSpecies()!; // TODO: Is this bang correct? this._overrideHiddenAbility = eggOptions?.overrideHiddenAbility ?? false; @@ -181,9 +204,13 @@ export class Egg { }; const seedOverride = Utils.randomString(24); - globalScene.executeWithSeedOffset(() => { - generateEggProperties(eggOptions); - }, 0, seedOverride); + globalScene.executeWithSeedOffset( + () => { + generateEggProperties(eggOptions); + }, + 0, + seedOverride, + ); this._eggDescriptor = eggOptions?.eggDescriptor; } @@ -193,8 +220,11 @@ export class Egg { //// public isManaphyEgg(): boolean { - return (this._species === Species.PHIONE || this._species === Species.MANAPHY) || - this._tier === EggTier.COMMON && !(this._id % 204) && !this._species; + return ( + this._species === Species.PHIONE || + this._species === Species.MANAPHY || + (this._tier === EggTier.COMMON && !(this._id % 204) && !this._species) + ); } public getKey(): string { @@ -218,14 +248,18 @@ export class Egg { let pokemonSpecies = getPokemonSpecies(this._species); // Special condition to have Phione eggs also have a chance of generating Manaphy if (this._species === Species.PHIONE && this._sourceType === EggSourceType.SAME_SPECIES_EGG) { - pokemonSpecies = getPokemonSpecies(Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) ? Species.PHIONE : Species.MANAPHY); + pokemonSpecies = getPokemonSpecies( + Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) ? Species.PHIONE : Species.MANAPHY, + ); } // Sets the hidden ability if a hidden ability exists and // the override is set or the egg hits the chance let abilityIndex: number | undefined = undefined; - const sameSpeciesEggHACheck = (this._sourceType === EggSourceType.SAME_SPECIES_EGG && !Utils.randSeedInt(SAME_SPECIES_EGG_HA_RATE)); - const gachaEggHACheck = (!(this._sourceType === EggSourceType.SAME_SPECIES_EGG) && !Utils.randSeedInt(GACHA_EGG_HA_RATE)); + const sameSpeciesEggHACheck = + this._sourceType === EggSourceType.SAME_SPECIES_EGG && !Utils.randSeedInt(SAME_SPECIES_EGG_HA_RATE); + const gachaEggHACheck = + !(this._sourceType === EggSourceType.SAME_SPECIES_EGG) && !Utils.randSeedInt(GACHA_EGG_HA_RATE); if (pokemonSpecies.abilityHidden && (this._overrideHiddenAbility || sameSpeciesEggHACheck || gachaEggHACheck)) { abilityIndex = 2; } @@ -242,10 +276,14 @@ export class Egg { } }; - ret = ret!; // Tell TS compiler it's defined now - globalScene.executeWithSeedOffset(() => { - generatePlayerPokemonHelper(); - }, this._id, EGG_SEED.toString()); + ret = ret!; // Tell TS compiler it's defined now + globalScene.executeWithSeedOffset( + () => { + generatePlayerPokemonHelper(); + }, + this._id, + EGG_SEED.toString(), + ); return ret; } @@ -287,9 +325,17 @@ export class Egg { public getEggTypeDescriptor(): string { switch (this.sourceType) { case EggSourceType.SAME_SPECIES_EGG: - return this._eggDescriptor ?? i18next.t("egg:sameSpeciesEgg", { species: getPokemonSpecies(this._species).getName() }); + return ( + this._eggDescriptor ?? + i18next.t("egg:sameSpeciesEgg", { + species: getPokemonSpecies(this._species).getName(), + }) + ); case EggSourceType.GACHA_LEGENDARY: - return this._eggDescriptor ?? `${i18next.t("egg:gachaTypeLegendary")} (${getPokemonSpecies(getLegendaryGachaSpeciesForTimestamp(this.timestamp)).getName()})`; + return ( + this._eggDescriptor ?? + `${i18next.t("egg:gachaTypeLegendary")} (${getPokemonSpecies(getLegendaryGachaSpeciesForTimestamp(this.timestamp)).getName()})` + ); case EggSourceType.GACHA_SHINY: return this._eggDescriptor ?? i18next.t("egg:gachaTypeShiny"); case EggSourceType.GACHA_MOVE: @@ -344,9 +390,16 @@ export class Egg { } private rollEggTier(): EggTier { - const tierValueOffset = this._sourceType === EggSourceType.GACHA_LEGENDARY ? GACHA_LEGENDARY_UP_THRESHOLD_OFFSET : 0; + const tierValueOffset = + this._sourceType === EggSourceType.GACHA_LEGENDARY ? GACHA_LEGENDARY_UP_THRESHOLD_OFFSET : 0; const tierValue = Utils.randInt(256); - return tierValue >= GACHA_DEFAULT_COMMON_EGG_THRESHOLD + tierValueOffset ? EggTier.COMMON : tierValue >= GACHA_DEFAULT_RARE_EGG_THRESHOLD + tierValueOffset ? EggTier.RARE : tierValue >= GACHA_DEFAULT_EPIC_EGG_THRESHOLD + tierValueOffset ? EggTier.EPIC : EggTier.LEGENDARY; + return tierValue >= GACHA_DEFAULT_COMMON_EGG_THRESHOLD + tierValueOffset + ? EggTier.COMMON + : tierValue >= GACHA_DEFAULT_RARE_EGG_THRESHOLD + tierValueOffset + ? EggTier.RARE + : tierValue >= GACHA_DEFAULT_EPIC_EGG_THRESHOLD + tierValueOffset + ? EggTier.EPIC + : EggTier.LEGENDARY; } private rollSpecies(): Species | null { @@ -364,17 +417,17 @@ export class Egg { * when Utils.randSeedInt(8) = 1, and by making the generatePlayerPokemon() species * check pass when Utils.randSeedInt(8) = 0, we can tell them apart during tests. */ - const rand = (Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) !== 1); + const rand = Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) !== 1; return rand ? Species.PHIONE : Species.MANAPHY; - } else if (this.tier === EggTier.LEGENDARY - && this._sourceType === EggSourceType.GACHA_LEGENDARY) { + } + if (this.tier === EggTier.LEGENDARY && this._sourceType === EggSourceType.GACHA_LEGENDARY) { if (!Utils.randSeedInt(2)) { return getLegendaryGachaSpeciesForTimestamp(this.timestamp); } } - let minStarterValue: integer; - let maxStarterValue: integer; + let minStarterValue: number; + let maxStarterValue: number; switch (this.tier) { case EggTier.RARE: @@ -395,17 +448,25 @@ export class Egg { break; } - const ignoredSpecies = [ Species.PHIONE, Species.MANAPHY, Species.ETERNATUS ]; + const ignoredSpecies = [Species.PHIONE, Species.MANAPHY, Species.ETERNATUS]; let speciesPool = Object.keys(speciesEggTiers) .filter(s => speciesEggTiers[s] === this.tier) - .map(s => parseInt(s) as Species) - .filter(s => !pokemonPrevolutions.hasOwnProperty(s) && getPokemonSpecies(s).isObtainable() && ignoredSpecies.indexOf(s) === -1); + .map(s => Number.parseInt(s) as Species) + .filter( + s => + !pokemonPrevolutions.hasOwnProperty(s) && + getPokemonSpecies(s).isObtainable() && + ignoredSpecies.indexOf(s) === -1, + ); // If this is the 10th egg without unlocking something new, attempt to force it. if (globalScene.gameData.unlockPity[this.tier] >= 9) { - const lockedPool = speciesPool.filter(s => !globalScene.gameData.dexData[s].caughtAttr && !globalScene.gameData.eggs.some(e => e.species === s)); - if (lockedPool.length) { // Skip this if everything is unlocked + const lockedPool = speciesPool.filter( + s => !globalScene.gameData.dexData[s].caughtAttr && !globalScene.gameData.eggs.some(e => e.species === s), + ); + if (lockedPool.length) { + // Skip this if everything is unlocked speciesPool = lockedPool; } } @@ -427,11 +488,13 @@ export class Egg { * and being the same each time */ let totalWeight = 0; - const speciesWeights : number[] = []; + const speciesWeights: number[] = []; for (const speciesId of speciesPool) { // Accounts for species that have starter costs outside of the normal range for their EggTier const speciesCostClamped = Phaser.Math.Clamp(speciesStarterCosts[speciesId], minStarterValue, maxStarterValue); - const weight = Math.floor((((maxStarterValue - speciesCostClamped) / ((maxStarterValue - minStarterValue) + 1)) * 1.5 + 1) * 100); + const weight = Math.floor( + (((maxStarterValue - speciesCostClamped) / (maxStarterValue - minStarterValue + 1)) * 1.5 + 1) * 100, + ); speciesWeights.push(totalWeight + weight); totalWeight += weight; } @@ -447,7 +510,10 @@ export class Egg { } species = species!; // tell TS compiled it's defined now! - if (globalScene.gameData.dexData[species].caughtAttr || globalScene.gameData.eggs.some(e => e.species === species)) { + if ( + globalScene.gameData.dexData[species].caughtAttr || + globalScene.gameData.eggs.some(e => e.species === species) + ) { globalScene.gameData.unlockPity[this.tier] = Math.min(globalScene.gameData.unlockPity[this.tier] + 1, 10); } else { globalScene.gameData.unlockPity[this.tier] = 0; @@ -457,9 +523,9 @@ export class Egg { } /** - * Rolls whether the egg is shiny or not. - * @returns `true` if the egg is shiny - **/ + * Rolls whether the egg is shiny or not. + * @returns `true` if the egg is shiny + **/ private rollShiny(): boolean { let shinyChance = GACHA_DEFAULT_SHINY_RATE; switch (this._sourceType) { @@ -487,20 +553,24 @@ export class Egg { const rand = Utils.randSeedInt(10); if (rand >= SHINY_VARIANT_CHANCE) { return VariantTier.STANDARD; // 6/10 - } else if (rand >= SHINY_EPIC_CHANCE) { - return VariantTier.RARE; // 3/10 - } else { - return VariantTier.EPIC; // 1/10 } + if (rand >= SHINY_EPIC_CHANCE) { + return VariantTier.RARE; // 3/10 + } + return VariantTier.EPIC; // 1/10 } private checkForPityTierOverrides(): void { - const tierValueOffset = this._sourceType === EggSourceType.GACHA_LEGENDARY ? GACHA_LEGENDARY_UP_THRESHOLD_OFFSET : 0; + const tierValueOffset = + this._sourceType === EggSourceType.GACHA_LEGENDARY ? GACHA_LEGENDARY_UP_THRESHOLD_OFFSET : 0; globalScene.gameData.eggPity[EggTier.RARE] += 1; globalScene.gameData.eggPity[EggTier.EPIC] += 1; globalScene.gameData.eggPity[EggTier.LEGENDARY] += 1 + tierValueOffset; // These numbers are roughly the 80% mark. That is, 80% of the time you'll get an egg before this gets triggered. - if (globalScene.gameData.eggPity[EggTier.LEGENDARY] >= EGG_PITY_LEGENDARY_THRESHOLD && this._tier === EggTier.COMMON) { + if ( + globalScene.gameData.eggPity[EggTier.LEGENDARY] >= EGG_PITY_LEGENDARY_THRESHOLD && + this._tier === EggTier.COMMON + ) { this._tier = EggTier.LEGENDARY; } else if (globalScene.gameData.eggPity[EggTier.EPIC] >= EGG_PITY_EPIC_THRESHOLD && this._tier === EggTier.COMMON) { this._tier = EggTier.EPIC; @@ -539,10 +609,10 @@ export class Egg { //// } -export function getValidLegendaryGachaSpecies() : Species[] { +export function getValidLegendaryGachaSpecies(): Species[] { return Object.entries(speciesEggTiers) .filter(s => s[1] === EggTier.LEGENDARY) - .map(s => parseInt(s[0])) + .map(s => Number.parseInt(s[0])) .filter(s => getPokemonSpecies(s).isObtainable() && s !== Species.ETERNATUS); } @@ -557,9 +627,13 @@ export function getLegendaryGachaSpeciesForTimestamp(timestamp: number): Species const offset = Math.floor(Math.floor(dayTimestamp / 86400000) / legendarySpecies.length); // Cycle number const index = Math.floor(dayTimestamp / 86400000) % legendarySpecies.length; // Index within cycle - globalScene.executeWithSeedOffset(() => { - ret = Phaser.Math.RND.shuffle(legendarySpecies)[index]; - }, offset, EGG_SEED.toString()); + globalScene.executeWithSeedOffset( + () => { + ret = Phaser.Math.RND.shuffle(legendarySpecies)[index]; + }, + offset, + EGG_SEED.toString(), + ); ret = ret!; // tell TS compiler it's return ret; @@ -570,6 +644,6 @@ export function getLegendaryGachaSpeciesForTimestamp(timestamp: number): Species * @param pokemonSpecies - Species for wich we will check the egg tier it belongs to * @returns The egg tier of a given pokemon species */ -export function getEggTierForSpecies(pokemonSpecies :PokemonSpecies): EggTier { +export function getEggTierForSpecies(pokemonSpecies: PokemonSpecies): EggTier { return speciesEggTiers[pokemonSpecies.getRootSpeciesId()]; } diff --git a/src/data/exp.ts b/src/data/exp.ts index c03abddadfc..9f8ccce6d88 100644 --- a/src/data/exp.ts +++ b/src/data/exp.ts @@ -4,19 +4,67 @@ export enum GrowthRate { MEDIUM_FAST, MEDIUM_SLOW, SLOW, - FLUCTUATING + FLUCTUATING, } const expLevels = [ - [ 0, 15, 52, 122, 237, 406, 637, 942, 1326, 1800, 2369, 3041, 3822, 4719, 5737, 6881, 8155, 9564, 11111, 12800, 14632, 16610, 18737, 21012, 23437, 26012, 28737, 31610, 34632, 37800, 41111, 44564, 48155, 51881, 55737, 59719, 63822, 68041, 72369, 76800, 81326, 85942, 90637, 95406, 100237, 105122, 110052, 115015, 120001, 125000, 131324, 137795, 144410, 151165, 158056, 165079, 172229, 179503, 186894, 194400, 202013, 209728, 217540, 225443, 233431, 241496, 249633, 257834, 267406, 276458, 286328, 296358, 305767, 316074, 326531, 336255, 346965, 357812, 367807, 378880, 390077, 400293, 411686, 423190, 433572, 445239, 457001, 467489, 479378, 491346, 501878, 513934, 526049, 536557, 548720, 560922, 571333, 583539, 591882, 600000 ], - [ 0, 6, 21, 51, 100, 172, 274, 409, 583, 800, 1064, 1382, 1757, 2195, 2700, 3276, 3930, 4665, 5487, 6400, 7408, 8518, 9733, 11059, 12500, 14060, 15746, 17561, 19511, 21600, 23832, 26214, 28749, 31443, 34300, 37324, 40522, 43897, 47455, 51200, 55136, 59270, 63605, 68147, 72900, 77868, 83058, 88473, 94119, 100000, 106120, 112486, 119101, 125971, 133100, 140492, 148154, 156089, 164303, 172800, 181584, 190662, 200037, 209715, 219700, 229996, 240610, 251545, 262807, 274400, 286328, 298598, 311213, 324179, 337500, 351180, 365226, 379641, 394431, 409600, 425152, 441094, 457429, 474163, 491300, 508844, 526802, 545177, 563975, 583200, 602856, 622950, 643485, 664467, 685900, 707788, 730138, 752953, 776239, 800000 ], - [ 0, 8, 27, 64, 125, 216, 343, 512, 729, 1000, 1331, 1728, 2197, 2744, 3375, 4096, 4913, 5832, 6859, 8000, 9261, 10648, 12167, 13824, 15625, 17576, 19683, 21952, 24389, 27000, 29791, 32768, 35937, 39304, 42875, 46656, 50653, 54872, 59319, 64000, 68921, 74088, 79507, 85184, 91125, 97336, 103823, 110592, 117649, 125000, 132651, 140608, 148877, 157464, 166375, 175616, 185193, 195112, 205379, 216000, 226981, 238328, 250047, 262144, 274625, 287496, 300763, 314432, 328509, 343000, 357911, 373248, 389017, 405224, 421875, 438976, 456533, 474552, 493039, 512000, 531441, 551368, 571787, 592704, 614125, 636056, 658503, 681472, 704969, 729000, 753571, 778688, 804357, 830584, 857375, 884736, 912673, 941192, 970299, 1000000 ], - [ 0, 9, 57, 96, 135, 179, 236, 314, 419, 560, 742, 973, 1261, 1612, 2035, 2535, 3120, 3798, 4575, 5460, 6458, 7577, 8825, 10208, 11735, 13411, 15244, 17242, 19411, 21760, 24294, 27021, 29949, 33084, 36435, 40007, 43808, 47846, 52127, 56660, 61450, 66505, 71833, 77440, 83335, 89523, 96012, 102810, 109923, 117360, 125126, 133229, 141677, 150476, 159635, 169159, 179056, 189334, 199999, 211060, 222522, 234393, 246681, 259392, 272535, 286115, 300140, 314618, 329555, 344960, 360838, 377197, 394045, 411388, 429235, 447591, 466464, 485862, 505791, 526260, 547274, 568841, 590969, 613664, 636935, 660787, 685228, 710266, 735907, 762160, 789030, 816525, 844653, 873420, 902835, 932903, 963632, 995030, 1027103, 1059860 ], - [ 0, 10, 33, 80, 156, 270, 428, 640, 911, 1250, 1663, 2160, 2746, 3430, 4218, 5120, 6141, 7290, 8573, 10000, 11576, 13310, 15208, 17280, 19531, 21970, 24603, 27440, 30486, 33750, 37238, 40960, 44921, 49130, 53593, 58320, 63316, 68590, 74148, 80000, 86151, 92610, 99383, 106480, 113906, 121670, 129778, 138240, 147061, 156250, 165813, 175760, 186096, 196830, 207968, 219520, 231491, 243890, 256723, 270000, 283726, 297910, 312558, 327680, 343281, 359370, 375953, 393040, 410636, 428750, 447388, 466560, 486271, 506530, 527343, 548720, 570666, 593190, 616298, 640000, 664301, 689210, 714733, 740880, 767656, 795070, 823128, 851840, 881211, 911250, 941963, 973360, 1005446, 1038230, 1071718, 1105920, 1140841, 1176490, 1212873, 1250000 ], - [ 0, 4, 13, 32, 65, 112, 178, 276, 393, 540, 745, 967, 1230, 1591, 1957, 2457, 3046, 3732, 4526, 5440, 6482, 7666, 9003, 10506, 12187, 14060, 16140, 18439, 20974, 23760, 26811, 30146, 33780, 37731, 42017, 46656, 50653, 55969, 60505, 66560, 71677, 78533, 84277, 91998, 98415, 107069, 114205, 123863, 131766, 142500, 151222, 163105, 172697, 185807, 196322, 210739, 222231, 238036, 250562, 267840, 281456, 300293, 315059, 335544, 351520, 373744, 390991, 415050, 433631, 459620, 479600, 507617, 529063, 559209, 582187, 614566, 639146, 673863, 700115, 737280, 765275, 804997, 834809, 877201, 908905, 954084, 987754, 1035837, 1071552, 1122660, 1160499, 1214753, 1254796, 1312322, 1354652, 1415577, 1460276, 1524731, 1571884, 1640000 ] + [ + 0, 15, 52, 122, 237, 406, 637, 942, 1326, 1800, 2369, 3041, 3822, 4719, 5737, 6881, 8155, 9564, 11111, 12800, 14632, + 16610, 18737, 21012, 23437, 26012, 28737, 31610, 34632, 37800, 41111, 44564, 48155, 51881, 55737, 59719, 63822, + 68041, 72369, 76800, 81326, 85942, 90637, 95406, 100237, 105122, 110052, 115015, 120001, 125000, 131324, 137795, + 144410, 151165, 158056, 165079, 172229, 179503, 186894, 194400, 202013, 209728, 217540, 225443, 233431, 241496, + 249633, 257834, 267406, 276458, 286328, 296358, 305767, 316074, 326531, 336255, 346965, 357812, 367807, 378880, + 390077, 400293, 411686, 423190, 433572, 445239, 457001, 467489, 479378, 491346, 501878, 513934, 526049, 536557, + 548720, 560922, 571333, 583539, 591882, 600000, + ], + [ + 0, 6, 21, 51, 100, 172, 274, 409, 583, 800, 1064, 1382, 1757, 2195, 2700, 3276, 3930, 4665, 5487, 6400, 7408, 8518, + 9733, 11059, 12500, 14060, 15746, 17561, 19511, 21600, 23832, 26214, 28749, 31443, 34300, 37324, 40522, 43897, + 47455, 51200, 55136, 59270, 63605, 68147, 72900, 77868, 83058, 88473, 94119, 100000, 106120, 112486, 119101, 125971, + 133100, 140492, 148154, 156089, 164303, 172800, 181584, 190662, 200037, 209715, 219700, 229996, 240610, 251545, + 262807, 274400, 286328, 298598, 311213, 324179, 337500, 351180, 365226, 379641, 394431, 409600, 425152, 441094, + 457429, 474163, 491300, 508844, 526802, 545177, 563975, 583200, 602856, 622950, 643485, 664467, 685900, 707788, + 730138, 752953, 776239, 800000, + ], + [ + 0, 8, 27, 64, 125, 216, 343, 512, 729, 1000, 1331, 1728, 2197, 2744, 3375, 4096, 4913, 5832, 6859, 8000, 9261, + 10648, 12167, 13824, 15625, 17576, 19683, 21952, 24389, 27000, 29791, 32768, 35937, 39304, 42875, 46656, 50653, + 54872, 59319, 64000, 68921, 74088, 79507, 85184, 91125, 97336, 103823, 110592, 117649, 125000, 132651, 140608, + 148877, 157464, 166375, 175616, 185193, 195112, 205379, 216000, 226981, 238328, 250047, 262144, 274625, 287496, + 300763, 314432, 328509, 343000, 357911, 373248, 389017, 405224, 421875, 438976, 456533, 474552, 493039, 512000, + 531441, 551368, 571787, 592704, 614125, 636056, 658503, 681472, 704969, 729000, 753571, 778688, 804357, 830584, + 857375, 884736, 912673, 941192, 970299, 1000000, + ], + [ + 0, 9, 57, 96, 135, 179, 236, 314, 419, 560, 742, 973, 1261, 1612, 2035, 2535, 3120, 3798, 4575, 5460, 6458, 7577, + 8825, 10208, 11735, 13411, 15244, 17242, 19411, 21760, 24294, 27021, 29949, 33084, 36435, 40007, 43808, 47846, + 52127, 56660, 61450, 66505, 71833, 77440, 83335, 89523, 96012, 102810, 109923, 117360, 125126, 133229, 141677, + 150476, 159635, 169159, 179056, 189334, 199999, 211060, 222522, 234393, 246681, 259392, 272535, 286115, 300140, + 314618, 329555, 344960, 360838, 377197, 394045, 411388, 429235, 447591, 466464, 485862, 505791, 526260, 547274, + 568841, 590969, 613664, 636935, 660787, 685228, 710266, 735907, 762160, 789030, 816525, 844653, 873420, 902835, + 932903, 963632, 995030, 1027103, 1059860, + ], + [ + 0, 10, 33, 80, 156, 270, 428, 640, 911, 1250, 1663, 2160, 2746, 3430, 4218, 5120, 6141, 7290, 8573, 10000, 11576, + 13310, 15208, 17280, 19531, 21970, 24603, 27440, 30486, 33750, 37238, 40960, 44921, 49130, 53593, 58320, 63316, + 68590, 74148, 80000, 86151, 92610, 99383, 106480, 113906, 121670, 129778, 138240, 147061, 156250, 165813, 175760, + 186096, 196830, 207968, 219520, 231491, 243890, 256723, 270000, 283726, 297910, 312558, 327680, 343281, 359370, + 375953, 393040, 410636, 428750, 447388, 466560, 486271, 506530, 527343, 548720, 570666, 593190, 616298, 640000, + 664301, 689210, 714733, 740880, 767656, 795070, 823128, 851840, 881211, 911250, 941963, 973360, 1005446, 1038230, + 1071718, 1105920, 1140841, 1176490, 1212873, 1250000, + ], + [ + 0, 4, 13, 32, 65, 112, 178, 276, 393, 540, 745, 967, 1230, 1591, 1957, 2457, 3046, 3732, 4526, 5440, 6482, 7666, + 9003, 10506, 12187, 14060, 16140, 18439, 20974, 23760, 26811, 30146, 33780, 37731, 42017, 46656, 50653, 55969, + 60505, 66560, 71677, 78533, 84277, 91998, 98415, 107069, 114205, 123863, 131766, 142500, 151222, 163105, 172697, + 185807, 196322, 210739, 222231, 238036, 250562, 267840, 281456, 300293, 315059, 335544, 351520, 373744, 390991, + 415050, 433631, 459620, 479600, 507617, 529063, 559209, 582187, 614566, 639146, 673863, 700115, 737280, 765275, + 804997, 834809, 877201, 908905, 954084, 987754, 1035837, 1071552, 1122660, 1160499, 1214753, 1254796, 1312322, + 1354652, 1415577, 1460276, 1524731, 1571884, 1640000, + ], ]; -export function getLevelTotalExp(level: integer, growthRate: GrowthRate): integer { +export function getLevelTotalExp(level: number, growthRate: GrowthRate): number { if (level < 100) { const levelExp = expLevels[growthRate][level - 1]; if (growthRate !== GrowthRate.MEDIUM_FAST) { @@ -25,26 +73,26 @@ export function getLevelTotalExp(level: integer, growthRate: GrowthRate): intege return levelExp; } - let ret: integer; + let ret: number; switch (growthRate) { case GrowthRate.ERRATIC: - ret = (Math.pow(level, 4) + (Math.pow(level, 3) * 2000)) / 3500; + ret = (Math.pow(level, 4) + Math.pow(level, 3) * 2000) / 3500; break; case GrowthRate.FAST: - ret = Math.pow(level, 3) * 4 / 5; + ret = (Math.pow(level, 3) * 4) / 5; break; case GrowthRate.MEDIUM_FAST: ret = Math.pow(level, 3); break; case GrowthRate.MEDIUM_SLOW: - ret = (Math.pow(level, 3) * 6 / 5) - (15 * Math.pow(level, 2)) + (100 * level) - 140; + ret = (Math.pow(level, 3) * 6) / 5 - 15 * Math.pow(level, 2) + 100 * level - 140; break; case GrowthRate.SLOW: - ret = Math.pow(level, 3) * 5 / 4; + ret = (Math.pow(level, 3) * 5) / 4; break; case GrowthRate.FLUCTUATING: - ret = (Math.pow(level, 3) * ((level / 2) + 8)) * 4 / (100 + level); + ret = (Math.pow(level, 3) * (level / 2 + 8) * 4) / (100 + level); break; } @@ -55,7 +103,7 @@ export function getLevelTotalExp(level: integer, growthRate: GrowthRate): intege return Math.floor(ret); } -export function getLevelRelExp(level: integer, growthRate: GrowthRate): number { +export function getLevelRelExp(level: number, growthRate: GrowthRate): number { return getLevelTotalExp(level, growthRate) - getLevelTotalExp(level - 1, growthRate); } diff --git a/src/data/gender.ts b/src/data/gender.ts index dae7723dd85..5a835c2e786 100644 --- a/src/data/gender.ts +++ b/src/data/gender.ts @@ -1,7 +1,7 @@ export enum Gender { - GENDERLESS = -1, - MALE, - FEMALE + GENDERLESS = -1, + MALE, + FEMALE, } export function getGenderSymbol(gender: Gender) { diff --git a/src/data/moves/invalid-moves.ts b/src/data/moves/invalid-moves.ts new file mode 100644 index 00000000000..50f815b9e58 --- /dev/null +++ b/src/data/moves/invalid-moves.ts @@ -0,0 +1,281 @@ +import { Moves } from "#enums/moves"; + +/** Set of moves that cannot be called by {@linkcode Moves.METRONOME Metronome} */ +export const invalidMetronomeMoves: ReadonlySet = new Set([ + Moves.AFTER_YOU, + Moves.APPLE_ACID, + Moves.ARMOR_CANNON, + Moves.ASSIST, + Moves.ASTRAL_BARRAGE, + Moves.AURA_WHEEL, + Moves.BANEFUL_BUNKER, + Moves.BEAK_BLAST, + Moves.BEHEMOTH_BASH, + Moves.BEHEMOTH_BLADE, + Moves.BELCH, + Moves.BESTOW, + Moves.BLAZING_TORQUE, + Moves.BODY_PRESS, + Moves.BRANCH_POKE, + Moves.BREAKING_SWIPE, + Moves.CELEBRATE, + Moves.CHATTER, + Moves.CHILLING_WATER, + Moves.CHILLY_RECEPTION, + Moves.CLANGOROUS_SOUL, + Moves.COLLISION_COURSE, + Moves.COMBAT_TORQUE, + Moves.COMEUPPANCE, + Moves.COPYCAT, + Moves.COUNTER, + Moves.COVET, + Moves.CRAFTY_SHIELD, + Moves.DECORATE, + Moves.DESTINY_BOND, + Moves.DETECT, + Moves.DIAMOND_STORM, + Moves.DOODLE, + Moves.DOUBLE_IRON_BASH, + Moves.DOUBLE_SHOCK, + Moves.DRAGON_ASCENT, + Moves.DRAGON_ENERGY, + Moves.DRUM_BEATING, + Moves.DYNAMAX_CANNON, + Moves.ELECTRO_DRIFT, + Moves.ENDURE, + Moves.ETERNABEAM, + Moves.FALSE_SURRENDER, + Moves.FEINT, + Moves.FIERY_WRATH, + Moves.FILLET_AWAY, + Moves.FLEUR_CANNON, + Moves.FOCUS_PUNCH, + Moves.FOLLOW_ME, + Moves.FREEZE_SHOCK, + Moves.FREEZING_GLARE, + Moves.GLACIAL_LANCE, + Moves.GRAV_APPLE, + Moves.HELPING_HAND, + Moves.HOLD_HANDS, + Moves.HYPER_DRILL, + Moves.HYPERSPACE_FURY, + Moves.HYPERSPACE_HOLE, + Moves.ICE_BURN, + Moves.INSTRUCT, + Moves.JET_PUNCH, + Moves.JUNGLE_HEALING, + Moves.KINGS_SHIELD, + Moves.LIFE_DEW, + Moves.LIGHT_OF_RUIN, + Moves.MAKE_IT_RAIN, + Moves.MAGICAL_TORQUE, + Moves.MAT_BLOCK, + Moves.ME_FIRST, + Moves.METEOR_ASSAULT, + Moves.METRONOME, + Moves.MIMIC, + Moves.MIND_BLOWN, + Moves.MIRROR_COAT, + Moves.MIRROR_MOVE, + Moves.MOONGEIST_BEAM, + Moves.NATURE_POWER, + Moves.NATURES_MADNESS, + Moves.NOXIOUS_TORQUE, + Moves.OBSTRUCT, + Moves.ORDER_UP, + Moves.ORIGIN_PULSE, + Moves.OVERDRIVE, + Moves.PHOTON_GEYSER, + Moves.PLASMA_FISTS, + Moves.POPULATION_BOMB, + Moves.POUNCE, + Moves.POWER_SHIFT, + Moves.PRECIPICE_BLADES, + Moves.PROTECT, + Moves.PYRO_BALL, + Moves.QUASH, + Moves.QUICK_GUARD, + Moves.RAGE_FIST, + Moves.RAGE_POWDER, + Moves.RAGING_BULL, + Moves.RAGING_FURY, + Moves.RELIC_SONG, + Moves.REVIVAL_BLESSING, + Moves.RUINATION, + Moves.SALT_CURE, + Moves.SECRET_SWORD, + Moves.SHED_TAIL, + Moves.SHELL_TRAP, + Moves.SILK_TRAP, + Moves.SKETCH, + Moves.SLEEP_TALK, + Moves.SNAP_TRAP, + Moves.SNARL, + Moves.SNATCH, + Moves.SNORE, + Moves.SNOWSCAPE, + Moves.SPECTRAL_THIEF, + Moves.SPICY_EXTRACT, + Moves.SPIKY_SHIELD, + Moves.SPIRIT_BREAK, + Moves.SPOTLIGHT, + Moves.STEAM_ERUPTION, + Moves.STEEL_BEAM, + Moves.STRANGE_STEAM, + Moves.STRUGGLE, + Moves.SUNSTEEL_STRIKE, + Moves.SURGING_STRIKES, + Moves.SWITCHEROO, + Moves.TECHNO_BLAST, + Moves.TERA_STARSTORM, + Moves.THIEF, + Moves.THOUSAND_ARROWS, + Moves.THOUSAND_WAVES, + Moves.THUNDER_CAGE, + Moves.THUNDEROUS_KICK, + Moves.TIDY_UP, + Moves.TRAILBLAZE, + Moves.TRANSFORM, + Moves.TRICK, + Moves.TWIN_BEAM, + Moves.V_CREATE, + Moves.WICKED_BLOW, + Moves.WICKED_TORQUE, + Moves.WIDE_GUARD, +]); + +/** Set of moves that cannot be called by {@linkcode Moves.ASSIST Assist} */ +export const invalidAssistMoves: ReadonlySet = new Set([ + Moves.ASSIST, + Moves.BANEFUL_BUNKER, + Moves.BEAK_BLAST, + Moves.BELCH, + Moves.BESTOW, + Moves.BOUNCE, + Moves.CELEBRATE, + Moves.CHATTER, + Moves.CIRCLE_THROW, + Moves.COPYCAT, + Moves.COUNTER, + Moves.COVET, + Moves.DESTINY_BOND, + Moves.DETECT, + Moves.DIG, + Moves.DIVE, + Moves.DRAGON_TAIL, + Moves.ENDURE, + Moves.FEINT, + Moves.FLY, + Moves.FOCUS_PUNCH, + Moves.FOLLOW_ME, + Moves.HELPING_HAND, + Moves.HOLD_HANDS, + Moves.KINGS_SHIELD, + Moves.MAT_BLOCK, + Moves.ME_FIRST, + Moves.METRONOME, + Moves.MIMIC, + Moves.MIRROR_COAT, + Moves.MIRROR_MOVE, + Moves.NATURE_POWER, + Moves.PHANTOM_FORCE, + Moves.PROTECT, + Moves.RAGE_POWDER, + Moves.ROAR, + Moves.SHADOW_FORCE, + Moves.SHELL_TRAP, + Moves.SKETCH, + Moves.SKY_DROP, + Moves.SLEEP_TALK, + Moves.SNATCH, + Moves.SPIKY_SHIELD, + Moves.SPOTLIGHT, + Moves.STRUGGLE, + Moves.SWITCHEROO, + Moves.THIEF, + Moves.TRANSFORM, + Moves.TRICK, + Moves.WHIRLWIND, +]); + +/** Set of moves that cannot be called by {@linkcode Moves.SLEEP_TALK Sleep Talk} */ +export const invalidSleepTalkMoves: ReadonlySet = new Set([ + Moves.ASSIST, + Moves.BELCH, + Moves.BEAK_BLAST, + Moves.BIDE, + Moves.BOUNCE, + Moves.COPYCAT, + Moves.DIG, + Moves.DIVE, + Moves.DYNAMAX_CANNON, + Moves.FREEZE_SHOCK, + Moves.FLY, + Moves.FOCUS_PUNCH, + Moves.GEOMANCY, + Moves.ICE_BURN, + Moves.ME_FIRST, + Moves.METRONOME, + Moves.MIRROR_MOVE, + Moves.MIMIC, + Moves.PHANTOM_FORCE, + Moves.RAZOR_WIND, + Moves.SHADOW_FORCE, + Moves.SHELL_TRAP, + Moves.SKETCH, + Moves.SKULL_BASH, + Moves.SKY_ATTACK, + Moves.SKY_DROP, + Moves.SLEEP_TALK, + Moves.SOLAR_BLADE, + Moves.SOLAR_BEAM, + Moves.STRUGGLE, + Moves.UPROAR, +]); + +/** Set of moves that cannot be copied by {@linkcode Moves.COPYCAT Copycat} */ +export const invalidCopycatMoves: ReadonlySet = new Set([ + Moves.ASSIST, + Moves.BANEFUL_BUNKER, + Moves.BEAK_BLAST, + Moves.BEHEMOTH_BASH, + Moves.BEHEMOTH_BLADE, + Moves.BESTOW, + Moves.CELEBRATE, + Moves.CHATTER, + Moves.CIRCLE_THROW, + Moves.COPYCAT, + Moves.COUNTER, + Moves.COVET, + Moves.DESTINY_BOND, + Moves.DETECT, + Moves.DRAGON_TAIL, + Moves.ENDURE, + Moves.FEINT, + Moves.FOCUS_PUNCH, + Moves.FOLLOW_ME, + Moves.HELPING_HAND, + Moves.HOLD_HANDS, + Moves.KINGS_SHIELD, + Moves.MAT_BLOCK, + Moves.ME_FIRST, + Moves.METRONOME, + Moves.MIMIC, + Moves.MIRROR_COAT, + Moves.MIRROR_MOVE, + Moves.PROTECT, + Moves.RAGE_POWDER, + Moves.ROAR, + Moves.SHELL_TRAP, + Moves.SKETCH, + Moves.SLEEP_TALK, + Moves.SNATCH, + Moves.SPIKY_SHIELD, + Moves.SPOTLIGHT, + Moves.STRUGGLE, + Moves.SWITCHEROO, + Moves.THIEF, + Moves.TRANSFORM, + Moves.TRICK, + Moves.WHIRLWIND, +]); diff --git a/src/data/move.ts b/src/data/moves/move.ts similarity index 71% rename from src/data/move.ts rename to src/data/moves/move.ts index 9219272267c..f2157ab65b7 100644 --- a/src/data/move.ts +++ b/src/data/moves/move.ts @@ -1,28 +1,91 @@ -import { ChargeAnim, initMoveAnim, loadMoveAnimAssets, MoveChargeAnim } from "./battle-anims"; -import { CommandedTag, EncoreTag, GulpMissileTag, HelpingHandTag, SemiInvulnerableTag, ShellTrapTag, StockpilingTag, SubstituteTag, TrappedTag, TypeBoostTag } from "./battler-tags"; -import { getPokemonNameWithAffix } from "../messages"; -import type { AttackMoveResult, TurnMove } from "../field/pokemon"; -import type Pokemon from "../field/pokemon"; -import { EnemyPokemon, HitResult, MoveResult, PlayerPokemon, PokemonMove } from "../field/pokemon"; -import { getNonVolatileStatusEffects, getStatusEffectHealText, isNonVolatileStatusEffect } from "./status-effect"; -import { getTypeDamageMultiplier } from "./type"; -import { Type } from "#enums/type"; +import { ChargeAnim, MoveChargeAnim } from "../battle-anims"; +import { + CommandedTag, + EncoreTag, + GulpMissileTag, + HelpingHandTag, + SemiInvulnerableTag, + ShellTrapTag, + StockpilingTag, + SubstituteTag, + TrappedTag, + TypeBoostTag, +} from "../battler-tags"; +import { getPokemonNameWithAffix } from "../../messages"; +import type { AttackMoveResult, TurnMove } from "../../field/pokemon"; +import type Pokemon from "../../field/pokemon"; +import { + EnemyPokemon, + HitResult, + MoveResult, + PlayerPokemon, + PokemonMove, +} from "../../field/pokemon"; +import { + getNonVolatileStatusEffects, + getStatusEffectHealText, + isNonVolatileStatusEffect, +} from "../status-effect"; +import { getTypeDamageMultiplier } from "../type"; +import { PokemonType } from "#enums/pokemon-type"; import type { Constructor } from "#app/utils"; import { NumberHolder } from "#app/utils"; -import * as Utils from "../utils"; +import * as Utils from "../../utils"; import { WeatherType } from "#enums/weather-type"; -import type { ArenaTrapTag } from "./arena-tag"; -import { ArenaTagSide, WeakenMoveTypeTag } from "./arena-tag"; -import { allAbilities, AllyMoveCategoryPowerBoostAbAttr, applyAbAttrs, applyPostAttackAbAttrs, applyPostItemLostAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, BlockItemTheftAbAttr, BlockNonDirectDamageAbAttr, BlockOneHitKOAbAttr, BlockRecoilDamageAttr, ChangeMovePriorityAbAttr, ConfusionOnStatusEffectAbAttr, FieldMoveTypePowerBoostAbAttr, FieldPreventExplosiveMovesAbAttr, ForceSwitchOutImmunityAbAttr, HealFromBerryUseAbAttr, IgnoreContactAbAttr, IgnoreMoveEffectsAbAttr, IgnoreProtectOnContactAbAttr, InfiltratorAbAttr, MaxMultiHitAbAttr, MoveAbilityBypassAbAttr, MoveEffectChanceMultiplierAbAttr, MoveTypeChangeAbAttr, PostDamageForceSwitchAbAttr, PostItemLostAbAttr, ReverseDrainAbAttr, UncopiableAbilityAbAttr, UnsuppressableAbilityAbAttr, UnswappableAbilityAbAttr, UserFieldMoveTypePowerBoostAbAttr, VariableMovePowerAbAttr, WonderSkinAbAttr } from "./ability"; -import { AttackTypeBoosterModifier, BerryModifier, PokemonHeldItemModifier, PokemonMoveAccuracyBoosterModifier, PokemonMultiHitModifier, PreserveBerryModifier } from "../modifier/modifier"; -import type { BattlerIndex } from "../battle"; -import { BattleType } from "../battle"; -import { TerrainType } from "./terrain"; +import type { ArenaTrapTag } from "../arena-tag"; +import { ArenaTagSide, WeakenMoveTypeTag } from "../arena-tag"; +import { + allAbilities, + AllyMoveCategoryPowerBoostAbAttr, + applyAbAttrs, + applyPostAttackAbAttrs, + applyPostItemLostAbAttrs, + applyPreAttackAbAttrs, + applyPreDefendAbAttrs, + BlockItemTheftAbAttr, + BlockNonDirectDamageAbAttr, + BlockOneHitKOAbAttr, + BlockRecoilDamageAttr, + ChangeMovePriorityAbAttr, + ConfusionOnStatusEffectAbAttr, + FieldMoveTypePowerBoostAbAttr, + FieldPreventExplosiveMovesAbAttr, + ForceSwitchOutImmunityAbAttr, + HealFromBerryUseAbAttr, + IgnoreContactAbAttr, + IgnoreMoveEffectsAbAttr, + IgnoreProtectOnContactAbAttr, + InfiltratorAbAttr, + MaxMultiHitAbAttr, + MoveAbilityBypassAbAttr, + MoveEffectChanceMultiplierAbAttr, + MoveTypeChangeAbAttr, + PostDamageForceSwitchAbAttr, + PostItemLostAbAttr, + ReverseDrainAbAttr, + UncopiableAbilityAbAttr, + UnsuppressableAbilityAbAttr, + UnswappableAbilityAbAttr, + UserFieldMoveTypePowerBoostAbAttr, + VariableMovePowerAbAttr, + WonderSkinAbAttr, +} from "../ability"; +import { + AttackTypeBoosterModifier, + BerryModifier, + PokemonHeldItemModifier, + PokemonMoveAccuracyBoosterModifier, + PokemonMultiHitModifier, + PreserveBerryModifier, +} from "../../modifier/modifier"; +import type { BattlerIndex } from "../../battle"; +import { BattleType } from "../../battle"; +import { TerrainType } from "../terrain"; import { ModifierPoolType } from "#app/modifier/modifier-type"; -import { Command } from "../ui/command-ui-handler"; +import { Command } from "../../ui/command-ui-handler"; import i18next from "i18next"; import type { Localizable } from "#app/interfaces/locales"; -import { getBerryEffectFunc } from "./berry"; +import { getBerryEffectFunc } from "../berry"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; @@ -30,7 +93,13 @@ import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { MoveUsedEvent } from "#app/events/battle-scene"; -import { BATTLE_STATS, type BattleStat, EFFECTIVE_STATS, type EffectiveStat, getStatKey, Stat } from "#app/enums/stat"; +import { + BATTLE_STATS, + type BattleStat, + type EffectiveStat, + getStatKey, + Stat, +} from "#app/enums/stat"; import { BattleEndPhase } from "#app/phases/battle-end-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { MovePhase } from "#app/phases/move-phase"; @@ -40,93 +109,23 @@ import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { SwitchPhase } from "#app/phases/switch-phase"; import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; import { ShowAbilityPhase } from "#app/phases/show-ability-phase"; -import { SpeciesFormChangeRevertWeatherFormTrigger } from "./pokemon-forms"; +import { SpeciesFormChangeRevertWeatherFormTrigger } from "../pokemon-forms"; import type { GameMode } from "#app/game-mode"; -import { applyChallenges, ChallengeType } from "./challenge"; +import { applyChallenges, ChallengeType } from "../challenge"; import { SwitchType } from "#enums/switch-type"; -import { StatusEffect } from "enums/status-effect"; +import { StatusEffect } from "#enums/status-effect"; import { globalScene } from "#app/global-scene"; - -export enum MoveCategory { - PHYSICAL, - SPECIAL, - STATUS -} - -export enum MoveTarget { - /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_the_user Moves that target the User} */ - USER, - OTHER, - ALL_OTHERS, - NEAR_OTHER, - /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_adjacent_Pok%C3%A9mon Moves that target all adjacent Pokemon} */ - ALL_NEAR_OTHERS, - NEAR_ENEMY, - /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_adjacent_foes Moves that target all adjacent foes} */ - ALL_NEAR_ENEMIES, - RANDOM_NEAR_ENEMY, - ALL_ENEMIES, - /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Counterattacks Counterattacks} */ - ATTACKER, - /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_one_adjacent_ally Moves that target one adjacent ally} */ - NEAR_ALLY, - ALLY, - USER_OR_NEAR_ALLY, - USER_AND_ALLIES, - /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_Pok%C3%A9mon Moves that target all Pokemon} */ - ALL, - USER_SIDE, - /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Entry_hazard-creating_moves Entry hazard-creating moves} */ - ENEMY_SIDE, - BOTH_SIDES, - PARTY, - CURSE -} - -export enum MoveFlags { - NONE = 0, - MAKES_CONTACT = 1 << 0, - IGNORE_PROTECT = 1 << 1, - /** - * Sound-based moves have the following effects: - * - Pokemon with the {@linkcode Abilities.SOUNDPROOF Soundproof Ability} are unaffected by other Pokemon's sound-based moves. - * - Pokemon affected by {@linkcode Moves.THROAT_CHOP Throat Chop} cannot use sound-based moves for two turns. - * - Sound-based moves used by a Pokemon with {@linkcode Abilities.LIQUID_VOICE Liquid Voice} become Water-type moves. - * - Sound-based moves used by a Pokemon with {@linkcode Abilities.PUNK_ROCK Punk Rock} are boosted by 30%. Pokemon with Punk Rock also take half damage from sound-based moves. - * - All sound-based moves (except Howl) can hit Pokemon behind an active {@linkcode Moves.SUBSTITUTE Substitute}. - * - * cf https://bulbapedia.bulbagarden.net/wiki/Sound-based_move - */ - SOUND_BASED = 1 << 2, - HIDE_USER = 1 << 3, - HIDE_TARGET = 1 << 4, - BITING_MOVE = 1 << 5, - PULSE_MOVE = 1 << 6, - PUNCHING_MOVE = 1 << 7, - SLICING_MOVE = 1 << 8, - /** - * Indicates a move should be affected by {@linkcode Abilities.RECKLESS} - * @see {@linkcode Move.recklessMove()} - */ - RECKLESS_MOVE = 1 << 9, - /** Indicates a move should be affected by {@linkcode Abilities.BULLETPROOF} */ - BALLBOMB_MOVE = 1 << 10, - /** Grass types and pokemon with {@linkcode Abilities.OVERCOAT} are immune to powder moves */ - POWDER_MOVE = 1 << 11, - /** Indicates a move should trigger {@linkcode Abilities.DANCER} */ - DANCE_MOVE = 1 << 12, - /** Indicates a move should trigger {@linkcode Abilities.WIND_RIDER} */ - WIND_MOVE = 1 << 13, - /** Indicates a move should trigger {@linkcode Abilities.TRIAGE} */ - TRIAGE_MOVE = 1 << 14, - IGNORE_ABILITIES = 1 << 15, - /** Enables all hits of a multi-hit move to be accuracy checked individually */ - CHECK_ALL_HITS = 1 << 16, - /** Indicates a move is able to bypass its target's Substitute (if the target has one) */ - IGNORE_SUBSTITUTE = 1 << 17, - /** Indicates a move is able to be redirected to allies in a double battle if the attacker faints */ - REDIRECT_COUNTER = 1 << 18, -} +import { RevivalBlessingPhase } from "#app/phases/revival-blessing-phase"; +import { LoadMoveAnimPhase } from "#app/phases/load-move-anim-phase"; +import { PokemonTransformPhase } from "#app/phases/pokemon-transform-phase"; +import { MoveAnimPhase } from "#app/phases/move-anim-phase"; +import { loggedInUser } from "#app/account"; +import { MoveCategory } from "#enums/MoveCategory"; +import { MoveTarget } from "#enums/MoveTarget"; +import { MoveFlags } from "#enums/MoveFlags"; +import { MoveEffectTrigger } from "#enums/MoveEffectTrigger"; +import { MultiHitType } from "#enums/MultiHitType"; +import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidSleepTalkMoves } from "./invalid-moves"; type MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => boolean; type UserMoveConditionFunc = (user: Pokemon, move: Move) => boolean; @@ -134,7 +133,7 @@ type UserMoveConditionFunc = (user: Pokemon, move: Move) => boolean; export default class Move implements Localizable { public id: Moves; public name: string; - private _type: Type; + private _type: PokemonType; private _category: MoveCategory; public moveTarget: MoveTarget; public power: number; @@ -151,7 +150,7 @@ export default class Move implements Localizable { private flags: number = 0; private nameAppend: string = ""; - constructor(id: Moves, type: Type, category: MoveCategory, defaultMoveTarget: MoveTarget, power: number, accuracy: number, pp: number, chance: number, priority: number, generation: number) { + constructor(id: Moves, type: PokemonType, category: MoveCategory, defaultMoveTarget: MoveTarget, power: number, accuracy: number, pp: number, chance: number, priority: number, generation: number) { this.id = id; this._type = type; this._category = category; @@ -321,21 +320,21 @@ export default class Move implements Localizable { * Currently looks at cases of Grass types with powder moves and Dark types with moves affected by Prankster. * @param {Pokemon} user the source of this move * @param {Pokemon} target the target of this move - * @param {Type} type the type of the move's target + * @param {PokemonType} type the type of the move's target * @returns boolean */ - isTypeImmune(user: Pokemon, target: Pokemon, type: Type): boolean { + isTypeImmune(user: Pokemon, target: Pokemon, type: PokemonType): boolean { if (this.moveTarget === MoveTarget.USER) { return false; } switch (type) { - case Type.GRASS: + case PokemonType.GRASS: if (this.hasFlag(MoveFlags.POWDER_MOVE)) { return true; } break; - case Type.DARK: + case PokemonType.DARK: if (user.hasAbility(Abilities.PRANKSTER) && this.category === MoveCategory.STATUS && (user.isPlayer() !== target.isPlayer())) { return true; } @@ -610,6 +609,16 @@ export default class Move implements Localizable { return this; } + /** + * Sets the {@linkcode MoveFlags.REFLECTABLE} flag for the calling Move + * @see {@linkcode Moves.ATTRACT} + * @returns The {@linkcode Move} that called this function + */ + reflectable(): this { + this.setFlag(MoveFlags.REFLECTABLE, true); + return this; + } + /** * Checks if the move flag applies to the pokemon(s) using/receiving the move * @param flag {@linkcode MoveFlags} MoveFlag to check on user and/or target @@ -665,19 +674,17 @@ export default class Move implements Localizable { /** * Sees if a move has a custom failure text (by looking at each {@linkcode MoveAttr} of this move) * @param user {@linkcode Pokemon} using the move - * @param target {@linkcode Pokemon} receiving the move - * @param move {@linkcode Move} using the move - * @param cancelled {@linkcode Utils.BooleanHolder} to hold boolean value + * @param target {@linkcode Pokemon} target of the move + * @param move {@linkcode Move} with this attribute * @returns string of the custom failure text, or `null` if it uses the default text ("But it failed!") */ - getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null { + getFailedText(user: Pokemon, target: Pokemon, move: Move): string | undefined { for (const attr of this.attrs) { - const failedText = attr.getFailedText(user, target, move, cancelled); - if (failedText !== null) { + const failedText = attr.getFailedText(user, target, move); + if (failedText) { return failedText; } } - return null; } /** @@ -687,7 +694,7 @@ export default class Move implements Localizable { * @param move {@linkcode Move} using the move * @returns integer representing the total benefitScore */ - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { let score = 0; for (const attr of this.attrs) { @@ -708,7 +715,7 @@ export default class Move implements Localizable { * @param move {@linkcode Move} using the move * @returns integer representing the total benefitScore */ - getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { let score = 0; if (target.getAlly()?.getTag(BattlerTagType.COMMANDED)?.getSourcePokemon() === target) { @@ -779,7 +786,7 @@ export default class Move implements Localizable { applyPreAttackAbAttrs(MoveTypeChangeAbAttr, source, target, this, true, null, typeChangeMovePowerMultiplier); const sourceTeraType = source.getTeraType(); - if (sourceTeraType !== Type.UNKNOWN && sourceTeraType === this.type && power.value < 60 && this.priority <= 0 && !this.hasAttr(MultiHitAttr) && !globalScene.findModifier(m => m instanceof PokemonMultiHitModifier && m.pokemonId === source.id)) { + if (source.isTerastallized && sourceTeraType === this.type && power.value < 60 && this.priority <= 0 && !this.hasAttr(MultiHitAttr) && !globalScene.findModifier(m => m instanceof PokemonMultiHitModifier && m.pokemonId === source.id)) { power.value = 60; } @@ -834,6 +841,46 @@ export default class Move implements Localizable { return priority.value; } + /** + * Calculate the [Expected Power](https://en.wikipedia.org/wiki/Expected_value) per turn + * of this move, taking into account multi hit moves, accuracy, and the number of turns it + * takes to execute. + * + * Does not (yet) consider the current field effects or the user's abilities. + */ + calculateEffectivePower(): number { + let effectivePower: number; + // Triple axel and triple kick are easier to special case. + if (this.id === Moves.TRIPLE_AXEL) { + effectivePower = 94.14; + } else if (this.id === Moves.TRIPLE_KICK) { + effectivePower = 47.07; + } else { + const multiHitAttr = this.getAttrs(MultiHitAttr)[0]; + if (multiHitAttr) { + effectivePower = multiHitAttr.calculateExpectedHitCount(this) * this.power; + } else { + effectivePower = this.power * (this.accuracy === -1 ? 1 : this.accuracy / 100); + } + } + /** The number of turns the user must commit to for this move's damage */ + let numTurns = 1; + + // These are intentionally not else-if statements even though there are no + // pokemon moves that have more than one of these attributes. This allows + // the function to future proof new moves / custom move behaviors. + if (this.hasAttr(DelayedAttackAttr)) { + numTurns += 2; + } + if (this.hasAttr(RechargeAttr)) { + numTurns += 1; + } + if (this.isChargingMove()) { + numTurns += 1; + } + return effectivePower / numTurns; + } + /** * Returns `true` if this move can be given additional strikes * by enhancing effects. @@ -875,70 +922,60 @@ export default class Move implements Localizable { } export class AttackMove extends Move { - constructor(id: Moves, type: Type, category: MoveCategory, power: integer, accuracy: integer, pp: integer, chance: integer, priority: integer, generation: integer) { + constructor(id: Moves, type: PokemonType, category: MoveCategory, power: number, accuracy: number, pp: number, chance: number, priority: number, generation: number) { super(id, type, category, MoveTarget.NEAR_OTHER, power, accuracy, pp, chance, priority, generation); /** * {@link https://bulbapedia.bulbagarden.net/wiki/Freeze_(status_condition)} * > All damaging Fire-type moves can now thaw a frozen target, regardless of whether or not they have a chance to burn; */ - if (this.type === Type.FIRE) { + if (this.type === PokemonType.FIRE) { this.addAttr(new HealStatusEffectAttr(false, StatusEffect.FREEZE)); } } - getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { - let ret = super.getTargetBenefitScore(user, target, move); - + /** + * Compute the benefit score of this move based on the offensive stat used and the move's power. + * @param user The Pokemon using the move + * @param target The Pokemon targeted by the move + * @param move The move being used + * @returns The benefit score of using this move + */ + getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { + // TODO: Properly handle foul play, body press, and opponent stat stages. + const ret = super.getTargetBenefitScore(user, target, move); let attackScore = 0; const effectiveness = target.getAttackTypeEffectiveness(this.type, user, undefined, undefined, this); - attackScore = Math.pow(effectiveness - 1, 2) * effectiveness < 1 ? -2 : 2; - if (attackScore) { - if (this.category === MoveCategory.PHYSICAL) { - const atk = new Utils.IntegerHolder(user.getEffectiveStat(Stat.ATK, target)); - applyMoveAttrs(VariableAtkAttr, user, target, move, atk); - if (atk.value > user.getEffectiveStat(Stat.SPATK, target)) { - const statRatio = user.getEffectiveStat(Stat.SPATK, target) / atk.value; - if (statRatio <= 0.75) { - attackScore *= 2; - } else if (statRatio <= 0.875) { - attackScore *= 1.5; - } - } - } else { - const spAtk = new Utils.IntegerHolder(user.getEffectiveStat(Stat.SPATK, target)); - applyMoveAttrs(VariableAtkAttr, user, target, move, spAtk); - if (spAtk.value > user.getEffectiveStat(Stat.ATK, target)) { - const statRatio = user.getEffectiveStat(Stat.ATK, target) / spAtk.value; - if (statRatio <= 0.75) { - attackScore *= 2; - } else if (statRatio <= 0.875) { - attackScore *= 1.5; - } - } - } - - const power = new Utils.NumberHolder(this.power); - applyMoveAttrs(VariablePowerAttr, user, target, move, power); - - attackScore += Math.floor(power.value / 5); + attackScore = Math.pow(effectiveness - 1, 2) * (effectiveness < 1 ? -2 : 2); + const [ thisStat, offStat ]: EffectiveStat[] = this.category === MoveCategory.PHYSICAL ? [ Stat.ATK, Stat.SPATK ] : [ Stat.SPATK, Stat.ATK ]; + const statHolder = new Utils.NumberHolder(user.getEffectiveStat(thisStat, target)); + const offStatValue = user.getEffectiveStat(offStat, target); + applyMoveAttrs(VariableAtkAttr, user, target, move, statHolder); + const statRatio = offStatValue / statHolder.value; + if (statRatio <= 0.75) { + attackScore *= 2; + } else if (statRatio <= 0.875) { + attackScore *= 1.5; } - ret -= attackScore; + const power = new Utils.NumberHolder(this.calculateEffectivePower()); + applyMoveAttrs(VariablePowerAttr, user, target, move, power); - return ret; + attackScore += Math.floor(power.value / 5); + + return ret - attackScore; } } export class StatusMove extends Move { - constructor(id: Moves, type: Type, accuracy: integer, pp: integer, chance: integer, priority: integer, generation: integer) { + constructor(id: Moves, type: PokemonType, accuracy: number, pp: number, chance: number, priority: number, generation: number) { super(id, type, MoveCategory.STATUS, MoveTarget.NEAR_OTHER, -1, accuracy, pp, chance, priority, generation); } } export class SelfStatusMove extends Move { - constructor(id: Moves, type: Type, accuracy: integer, pp: integer, chance: integer, priority: integer, generation: integer) { + constructor(id: Moves, type: PokemonType, accuracy: number, pp: number, chance: number, priority: number, generation: number) { super(id, type, MoveCategory.STATUS, MoveTarget.USER, -1, accuracy, pp, chance, priority, generation); } } @@ -1045,7 +1082,7 @@ export abstract class MoveAttr { * @param args Set of unique arguments needed by this attribute * @returns true if application of the ability succeeds */ - apply(user: Pokemon | null, target: Pokemon | null, move: Move, args: any[]): boolean | Promise { + apply(user: Pokemon | null, target: Pokemon | null, move: Move, args: any[]): boolean { return true; } @@ -1062,11 +1099,10 @@ export abstract class MoveAttr { * @param user {@linkcode Pokemon} using the move * @param target {@linkcode Pokemon} target of the move * @param move {@linkcode Move} with this attribute - * @param cancelled {@linkcode Utils.BooleanHolder} which stores if the move should fail * @returns the string representing failure of this {@linkcode Move} */ - getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null { - return null; + getFailedText(user: Pokemon, target: Pokemon, move: Move): string | undefined { + return; } /** @@ -1074,7 +1110,7 @@ export abstract class MoveAttr { * @see {@linkcode EnemyPokemon.getNextMove} * @virtual */ - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return 0; } @@ -1083,19 +1119,11 @@ export abstract class MoveAttr { * @see {@linkcode EnemyPokemon.getNextMove} * @virtual */ - getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return 0; } } -export enum MoveEffectTrigger { - PRE_APPLY, - POST_APPLY, - HIT, - /** Triggers one time after all target effects have applied */ - POST_TARGET, -} - interface MoveEffectAttrOptions { /** * Defines when this effect should trigger in the move's effect order @@ -1188,7 +1216,7 @@ export class MoveEffectAttr extends MoveAttr { } /** Applies move effects so long as they are able based on {@linkcode canApply} */ - apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean | Promise { + apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean { return this.canApply(user, target, move, args); } @@ -1201,7 +1229,7 @@ export class MoveEffectAttr extends MoveAttr { * @param selfEffect `true` if move targets user. * @returns Move effect chance value. */ - getMoveChance(user: Pokemon, target: Pokemon, move: Move, selfEffect?: Boolean, showAbility?: Boolean): integer { + getMoveChance(user: Pokemon, target: Pokemon, move: Move, selfEffect?: Boolean, showAbility?: Boolean): number { const moveChance = new Utils.NumberHolder(this.effectChanceOverride ?? move.chance); applyAbAttrs(MoveEffectChanceMultiplierAbAttr, user, null, false, moveChance, move, target, selfEffect, showAbility); @@ -1308,6 +1336,54 @@ export class PreMoveMessageAttr extends MoveAttr { } } +/** + * Attribute for moves that can be conditionally interrupted to be considered to + * have failed before their "useMove" message is displayed. Currently used by + * Focus Punch. + * @extends MoveAttr + */ +export class PreUseInterruptAttr extends MoveAttr { + protected message?: string | ((user: Pokemon, target: Pokemon, move: Move) => string); + protected overridesFailedMessage: boolean; + protected conditionFunc: MoveConditionFunc; + + /** + * Create a new MoveInterruptedMessageAttr. + * @param message The message to display when the move is interrupted, or a function that formats the message based on the user, target, and move. + */ + constructor(message?: string | ((user: Pokemon, target: Pokemon, move: Move) => string), conditionFunc?: MoveConditionFunc) { + super(); + this.message = message; + this.conditionFunc = conditionFunc ?? (() => true); + } + + /** + * Message to display when a move is interrupted. + * @param user {@linkcode Pokemon} using the move + * @param target {@linkcode Pokemon} target of the move + * @param move {@linkcode Move} with this attribute + */ + override apply(user: Pokemon, target: Pokemon, move: Move): boolean { + return this.conditionFunc(user, target, move); + } + + /** + * Message to display when a move is interrupted. + * @param user {@linkcode Pokemon} using the move + * @param target {@linkcode Pokemon} target of the move + * @param move {@linkcode Move} with this attribute + */ + override getFailedText(user: Pokemon, target: Pokemon, move: Move): string | undefined { + if (this.message && this.conditionFunc(user, target, move)) { + const message = + typeof this.message === "string" + ? (this.message as string) + : this.message(user, target, move); + return message; + } + } +} + /** * Attribute for Status moves that take attack type effectiveness * into consideration (i.e. {@linkcode https://bulbapedia.bulbagarden.net/wiki/Thunder_Wave_(move) | Thunder Wave}) @@ -1325,12 +1401,12 @@ export class IgnoreOpponentStatStagesAttr extends MoveAttr { export class HighCritAttr extends MoveAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - (args[0] as Utils.IntegerHolder).value++; + (args[0] as Utils.NumberHolder).value++; return true; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return 3; } } @@ -1342,27 +1418,27 @@ export class CritOnlyAttr extends MoveAttr { return true; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return 5; } } export class FixedDamageAttr extends MoveAttr { - private damage: integer; + private damage: number; - constructor(damage: integer) { + constructor(damage: number) { super(); this.damage = damage; } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - (args[0] as Utils.IntegerHolder).value = this.getDamage(user, target, move); + (args[0] as Utils.NumberHolder).value = this.getDamage(user, target, move); return true; } - getDamage(user: Pokemon, target: Pokemon, move: Move): integer { + getDamage(user: Pokemon, target: Pokemon, move: Move): number { return this.damage; } } @@ -1373,7 +1449,7 @@ export class UserHpDamageAttr extends FixedDamageAttr { } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - (args[0] as Utils.IntegerHolder).value = user.hp; + (args[0] as Utils.NumberHolder).value = user.hp; return true; } @@ -1425,7 +1501,7 @@ export class MatchHpAttr extends FixedDamageAttr { } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - (args[0] as Utils.IntegerHolder).value = target.hp - user.hp; + (args[0] as Utils.NumberHolder).value = target.hp - user.hp; return true; } @@ -1435,7 +1511,7 @@ export class MatchHpAttr extends FixedDamageAttr { } // TODO - /*getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + /*getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return 0; }*/ } @@ -1446,7 +1522,7 @@ export class CounterDamageAttr extends FixedDamageAttr { private moveFilter: MoveFilter; private multiplier: number; - constructor(moveFilter: MoveFilter, multiplier: integer) { + constructor(moveFilter: MoveFilter, multiplier: number) { super(0); this.moveFilter = moveFilter; @@ -1454,8 +1530,8 @@ export class CounterDamageAttr extends FixedDamageAttr { } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - const damage = user.turnData.attacksReceived.filter(ar => this.moveFilter(allMoves[ar.move])).reduce((total: integer, ar: AttackMoveResult) => total + ar.damage, 0); - (args[0] as Utils.IntegerHolder).value = Utils.toDmgValue(damage * this.multiplier); + const damage = user.turnData.attacksReceived.filter(ar => this.moveFilter(allMoves[ar.move])).reduce((total: number, ar: AttackMoveResult) => total + ar.damage, 0); + (args[0] as Utils.NumberHolder).value = Utils.toDmgValue(damage * this.multiplier); return true; } @@ -1487,13 +1563,13 @@ export class RandomLevelDamageAttr extends FixedDamageAttr { export class ModifiedDamageAttr extends MoveAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - const initialDamage = args[0] as Utils.IntegerHolder; + const initialDamage = args[0] as Utils.NumberHolder; initialDamage.value = this.getModifiedDamage(user, target, move, initialDamage.value); return true; } - getModifiedDamage(user: Pokemon, target: Pokemon, move: Move, damage: integer): integer { + getModifiedDamage(user: Pokemon, target: Pokemon, move: Move, damage: number): number { return damage; } } @@ -1507,11 +1583,25 @@ export class SurviveDamageAttr extends ModifiedDamageAttr { return (user, target, move) => target.hp > 1; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return target.hp > 1 ? 0 : -20; } } +export class SplashAttr extends MoveEffectAttr { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + globalScene.queueMessage(i18next.t("moveTriggers:splash")); + return true; + } +} + +export class CelebrateAttr extends MoveEffectAttr { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + globalScene.queueMessage(i18next.t("moveTriggers:celebrate", { playerName: loggedInUser?.username })); + return true; + } +} + export class RecoilAttr extends MoveEffectAttr { private useHp: boolean; private damageRatio: number; @@ -1563,7 +1653,7 @@ export class RecoilAttr extends MoveEffectAttr { return true; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return Math.floor((move.power / 5) / -4); } } @@ -1594,7 +1684,7 @@ export class SacrificialAttr extends MoveEffectAttr { return true; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { if (user.isBoss()) { return -20; } @@ -1632,7 +1722,7 @@ export class SacrificialAttrOnHit extends MoveEffectAttr { return true; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { if (user.isBoss()) { return -20; } @@ -1674,7 +1764,7 @@ export class HalfSacrificialAttr extends MoveEffectAttr { return true; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { if (user.isBoss()) { return -10; } @@ -1691,11 +1781,14 @@ export class HalfSacrificialAttr extends MoveEffectAttr { export class AddSubstituteAttr extends MoveEffectAttr { /** The ratio of the user's max HP that is required to apply this effect */ private hpCost: number; + /** Whether the damage taken should be rounded up (Shed Tail rounds up) */ + private roundUp: boolean; - constructor(hpCost: number = 0.25) { + constructor(hpCost: number, roundUp: boolean) { super(true); this.hpCost = hpCost; + this.roundUp = roundUp; } /** @@ -1711,7 +1804,8 @@ export class AddSubstituteAttr extends MoveEffectAttr { return false; } - user.damageAndUpdate(Math.floor(user.getMaxHp() * this.hpCost), HitResult.OTHER, false, true, true); + const damageTaken = this.roundUp ? Math.ceil(user.getMaxHp() * this.hpCost) : Math.floor(user.getMaxHp() * this.hpCost); + user.damageAndUpdate(damageTaken, HitResult.OTHER, false, true, true); user.addTag(BattlerTagType.SUBSTITUTE, 0, move.id, user.id); return true; } @@ -1724,28 +1818,23 @@ export class AddSubstituteAttr extends MoveEffectAttr { } getCondition(): MoveConditionFunc { - return (user, target, move) => !user.getTag(SubstituteTag) && user.hp > Math.floor(user.getMaxHp() * this.hpCost) && user.getMaxHp() > 1; + return (user, target, move) => !user.getTag(SubstituteTag) && user.hp > (this.roundUp ? Math.ceil(user.getMaxHp() * this.hpCost) : Math.floor(user.getMaxHp() * this.hpCost)) && user.getMaxHp() > 1; } - getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null { + /** + * Get the substitute-specific failure message if one should be displayed. + * @param user The pokemon using the move. + * @returns The substitute-specific failure message if the conditions apply, otherwise `undefined` + */ + getFailedText(user: Pokemon, _target: Pokemon, _move: Move): string | undefined { if (user.getTag(SubstituteTag)) { return i18next.t("moveTriggers:substituteOnOverlap", { pokemonName: getPokemonNameWithAffix(user) }); } else if (user.hp <= Math.floor(user.getMaxHp() / 4) || user.getMaxHp() === 1) { return i18next.t("moveTriggers:substituteNotEnoughHp"); - } else { - return i18next.t("battle:attackFailed"); } } } -export enum MultiHitType { - _2, - _2_TO_5, - _3, - _10, - BEAT_UP, -} - /** * Heals the user or target by {@linkcode healRatio} depending on the value of {@linkcode selfTarget} * @extends MoveEffectAttr @@ -1778,7 +1867,7 @@ export class HealAttr extends MoveEffectAttr { Utils.toDmgValue(target.getMaxHp() * healRatio), i18next.t("moveTriggers:healHp", { pokemonName: getPokemonNameWithAffix(target) }), true, !this.showAnim)); } - getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { const score = ((1 - (this.selfTarget ? user : target).getHpRatio()) * 20) - this.healRatio * 10; return Math.round(score / (1 - this.healRatio / 2)); } @@ -1854,7 +1943,7 @@ export class FlameBurstAttr extends MoveEffectAttr { * @param args - n/a * @returns A boolean indicating whether the effect was successfully applied. */ - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const targetAlly = target.getAlly(); const cancelled = new Utils.BooleanHolder(false); @@ -1870,7 +1959,7 @@ export class FlameBurstAttr extends MoveEffectAttr { return true; } - getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return target.getAlly() ? -5 : 0; } } @@ -1893,7 +1982,7 @@ export class SacrificialFullRestoreAttr extends SacrificialAttr { // We don't know which party member will be chosen, so pick the highest max HP in the party const party = user.isPlayer() ? globalScene.getPlayerParty() : globalScene.getEnemyParty(); - const maxPartyMemberHp = party.map(p => p.getMaxHp()).reduce((maxHp: integer, hp: integer) => Math.max(hp, maxHp), 0); + const maxPartyMemberHp = party.map(p => p.getMaxHp()).reduce((maxHp: number, hp: number) => Math.max(hp, maxHp), 0); globalScene.pushPhase( new PokemonHealPhase( @@ -1911,7 +2000,7 @@ export class SacrificialFullRestoreAttr extends SacrificialAttr { return true; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return -20; } @@ -2118,7 +2207,7 @@ export class HitHealAttr extends MoveEffectAttr { * @param move {@linkcode Move} being used * @returns an integer. Higher means enemy is more likely to use that move. */ - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { if (this.healStat) { const healAmount = target.getEffectiveStat(this.healStat); return Math.floor(Math.max(0, (Math.min(1, (healAmount + user.hp) / user.getMaxHp() - 0.33))) / user.getHpRatio()); @@ -2138,7 +2227,7 @@ export class IncrementMovePriorityAttr extends MoveAttr { /** The condition for a move's priority being incremented */ private moveIncrementFunc: (pokemon: Pokemon, target:Pokemon, move: Move) => boolean; /** The amount to increment priority by, if condition passes. */ - private increaseAmount: integer; + private increaseAmount: number; constructor(moveIncrementFunc: (pokemon: Pokemon, target:Pokemon, move: Move) => boolean, increaseAmount = 1) { super(); @@ -2152,7 +2241,7 @@ export class IncrementMovePriorityAttr extends MoveAttr { * @param user {@linkcode Pokemon} using this move * @param target {@linkcode Pokemon} target of this move * @param move {@linkcode Move} being used - * @param args [0] {@linkcode Utils.IntegerHolder} for move priority. + * @param args [0] {@linkcode Utils.NumberHolder} for move priority. * @returns true if function succeeds */ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { @@ -2160,7 +2249,7 @@ export class IncrementMovePriorityAttr extends MoveAttr { return false; } - (args[0] as Utils.IntegerHolder).value += this.increaseAmount; + (args[0] as Utils.NumberHolder).value += this.increaseAmount; return true; } } @@ -2198,7 +2287,7 @@ export class MultiHitAttr extends MoveAttr { * @param user {@linkcode Pokemon} that used the attack * @param target {@linkcode Pokemon} targeted by the attack * @param move {@linkcode Move} being used - * @param args [0] {@linkcode Utils.IntegerHolder} storing the hit count of the attack + * @param args [0] {@linkcode Utils.NumberHolder} storing the hit count of the attack * @returns True */ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { @@ -2222,7 +2311,7 @@ export class MultiHitAttr extends MoveAttr { * @param target {@linkcode Pokemon} targeted by the attack * @returns The number of hits this attack should deal */ - getHitCount(user: Pokemon, target: Pokemon): integer { + getHitCount(user: Pokemon, target: Pokemon): number { switch (this.multiHitType) { case MultiHitType._2_TO_5: { @@ -2253,6 +2342,46 @@ export class MultiHitAttr extends MoveAttr { }, 0); } } + + /** + * Calculate the expected number of hits given this attribute's {@linkcode MultiHitType}, + * the move's accuracy, and a number of situational parameters. + * + * @param move - The move that this attribtue is applied to + * @param partySize - The size of the user's party, used for {@linkcode Moves.BEAT_UP | Beat Up} (default: `1`) + * @param maxMultiHit - Whether the move should always hit the maximum number of times, e.g. due to {@linkcode Abilities.SKILL_LINK | Skill Link} (default: `false`) + * @param ignoreAcc - `true` if the move should ignore accuracy checks, e.g. due to {@linkcode Abilities.NO_GUARD | No Guard} (default: `false`) + */ + calculateExpectedHitCount(move: Move, { ignoreAcc = false, maxMultiHit = false, partySize = 1 }: {ignoreAcc?: boolean, maxMultiHit?: boolean, partySize?: number} = {}): number { + let expectedHits: number; + switch (this.multiHitType) { + case MultiHitType._2_TO_5: + expectedHits = maxMultiHit ? 5 : 3.1; + break; + case MultiHitType._2: + expectedHits = 2; + break; + case MultiHitType._3: + expectedHits = 3; + break; + case MultiHitType._10: + expectedHits = 10; + break; + case MultiHitType.BEAT_UP: + // Estimate that half of the party can contribute to beat up. + expectedHits = Math.max(1, partySize / 2); + break; + } + if (ignoreAcc || move.accuracy === -1) { + return expectedHits; + } + const acc = move.accuracy / 100; + if (move.hasFlag(MoveFlags.CHECK_ALL_HITS) && !maxMultiHit) { + // N.B. No moves should be the _2_TO_5 variant and have the CHECK_ALL_HITS flag. + return acc * (1 - Math.pow(acc, expectedHits)) / (1 - acc); + } + return expectedHits *= acc; + } } export class ChangeMultiHitTypeAttr extends MoveAttr { @@ -2265,7 +2394,7 @@ export class ChangeMultiHitTypeAttr extends MoveAttr { export class WaterShurikenMultiHitTypeAttr extends ChangeMultiHitTypeAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { if (user.species.speciesId === Species.GRENINJA && user.hasAbility(Abilities.BATTLE_BOND) && user.formIndex === 2) { - (args[0] as Utils.IntegerHolder).value = MultiHitType._3; + (args[0] as Utils.NumberHolder).value = MultiHitType._3; return true; } return false; @@ -2394,32 +2523,27 @@ export class StealHeldItemChanceAttr extends MoveEffectAttr { this.chance = chance; } - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { - return new Promise(resolve => { - if (move.hitsSubstitute(user, target)) { - return resolve(false); - } - const rand = Phaser.Math.RND.realInRange(0, 1); - if (rand >= this.chance) { - return resolve(false); - } - const heldItems = this.getTargetHeldItems(target).filter(i => i.isTransferable); - if (heldItems.length) { - const poolType = target.isPlayer() ? ModifierPoolType.PLAYER : target.hasTrainer() ? ModifierPoolType.TRAINER : ModifierPoolType.WILD; - const highestItemTier = heldItems.map(m => m.type.getOrInferTier(poolType)).reduce((highestTier, tier) => Math.max(tier!, highestTier), 0); // TODO: is the bang after tier correct? - const tierHeldItems = heldItems.filter(m => m.type.getOrInferTier(poolType) === highestItemTier); - const stolenItem = tierHeldItems[user.randSeedInt(tierHeldItems.length)]; - globalScene.tryTransferHeldItemModifier(stolenItem, user, false).then(success => { - if (success) { - globalScene.queueMessage(i18next.t("moveTriggers:stoleItem", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), itemName: stolenItem.type.name })); - } - resolve(success); - }); - return; - } + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + if (move.hitsSubstitute(user, target)) { + return false; + } - resolve(false); - }); + const rand = Phaser.Math.RND.realInRange(0, 1); + if (rand >= this.chance) { + return false; + } + const heldItems = this.getTargetHeldItems(target).filter((i) => i.isTransferable); + if (heldItems.length) { + const poolType = target.isPlayer() ? ModifierPoolType.PLAYER : target.hasTrainer() ? ModifierPoolType.TRAINER : ModifierPoolType.WILD; + const highestItemTier = heldItems.map((m) => m.type.getOrInferTier(poolType)).reduce((highestTier, tier) => Math.max(tier!, highestTier), 0); // TODO: is the bang after tier correct? + const tierHeldItems = heldItems.filter((m) => m.type.getOrInferTier(poolType) === highestItemTier); + const stolenItem = tierHeldItems[user.randSeedInt(tierHeldItems.length)]; + if (globalScene.tryTransferHeldItemModifier(stolenItem, user, false)) { + globalScene.queueMessage(i18next.t("moveTriggers:stoleItem", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), itemName: stolenItem.type.name })); + return true; + } + } + return false; } getTargetHeldItems(target: Pokemon): PokemonHeldItemModifier[] { @@ -2669,7 +2793,7 @@ export class HealStatusEffectAttr extends MoveEffectAttr { return this.effects.includes(effect); } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return user.status ? 10 : 0; } } @@ -2690,7 +2814,7 @@ export class BypassSleepAttr extends MoveAttr { * @param target * @param move */ - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return user.status && user.status.effect === StatusEffect.SLEEP ? 200 : -10; } } @@ -2863,9 +2987,7 @@ export class WeatherInstantChargeAttr extends InstantChargeAttr { } export class OverrideMoveEffectAttr extends MoveAttr { - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise { - //const overridden = args[0] as Utils.BooleanHolder; - //const virtual = arg[1] as boolean; + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { return true; } } @@ -2891,26 +3013,27 @@ export class DelayedAttackAttr extends OverrideMoveEffectAttr { this.chargeText = chargeText; } - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { // Edge case for the move applied on a pokemon that has fainted if (!target) { - return Promise.resolve(true); + return true; } - const side = target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; - return new Promise(resolve => { - if (args.length < 2 || !args[1]) { - new MoveChargeAnim(this.chargeAnim, move.id, user).play(false, () => { - (args[0] as Utils.BooleanHolder).value = true; - globalScene.queueMessage(this.chargeText.replace("{TARGET}", getPokemonNameWithAffix(target)).replace("{USER}", getPokemonNameWithAffix(user))); - user.pushMoveHistory({ move: move.id, targets: [ target.getBattlerIndex() ], result: MoveResult.OTHER }); - globalScene.arena.addTag(this.tagType, 3, move.id, user.id, side, false, target.getBattlerIndex()); - resolve(true); - }); - } else { - globalScene.ui.showText(i18next.t("moveTriggers:tookMoveAttack", { pokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(target.id) ?? undefined), moveName: move.name }), null, () => resolve(true)); - } - }); + const overridden = args[0] as Utils.BooleanHolder; + const virtual = args[1] as boolean; + + if (!virtual) { + overridden.value = true; + globalScene.unshiftPhase(new MoveAnimPhase(new MoveChargeAnim(this.chargeAnim, move.id, user))); + globalScene.queueMessage(this.chargeText.replace("{TARGET}", getPokemonNameWithAffix(target)).replace("{USER}", getPokemonNameWithAffix(user))); + user.pushMoveHistory({ move: move.id, targets: [ target.getBattlerIndex() ], result: MoveResult.OTHER }); + const side = target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; + globalScene.arena.addTag(this.tagType, 3, move.id, user.id, side, false, target.getBattlerIndex()); + } else { + globalScene.queueMessage(i18next.t("moveTriggers:tookMoveAttack", { pokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(target.id) ?? undefined), moveName: move.name })); + } + + return true; } } @@ -3041,7 +3164,7 @@ export class StatStageChangeAttr extends MoveEffectAttr { * @param args unused * @returns whether stat stages were changed */ - apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean | Promise { + apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean { if (!super.apply(user, target, move, args) || (this.condition && !this.condition(user, target, move))) { return false; } @@ -3060,11 +3183,11 @@ export class StatStageChangeAttr extends MoveEffectAttr { return false; } - getLevels(_user: Pokemon): integer { + getLevels(_user: Pokemon): number { return this.stages; } - getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { let ret = 0; const moveLevels = this.getLevels(user); for (const stat of this.stats) { @@ -3119,7 +3242,7 @@ export class SecretPowerAttr extends MoveEffectAttr { * Used to apply the secondary effect to the target Pokemon * @returns `true` if a secondary effect is successfully applied */ - override apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean | Promise { + override apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean { if (!super.apply(user, target, move, args)) { return false; } @@ -3274,8 +3397,8 @@ export class AcupressureStatStageChangeAttr extends MoveEffectAttr { super(); } - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise { - const randStats = BATTLE_STATS.filter(s => target.getStatStage(s) < 6); + override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + const randStats = BATTLE_STATS.filter((s) => target.getStatStage(s) < 6); if (randStats.length > 0) { const boostStat = [ randStats[user.randSeedInt(randStats.length)] ]; globalScene.unshiftPhase(new StatStageChangePhase(target.getBattlerIndex(), this.selfTarget, boostStat, 2)); @@ -3302,27 +3425,24 @@ export class GrowthStatStageChangeAttr extends StatStageChangeAttr { } export class CutHpStatStageBoostAttr extends StatStageChangeAttr { - private cutRatio: integer; + private cutRatio: number; private messageCallback: ((user: Pokemon) => void) | undefined; - constructor(stat: BattleStat[], levels: integer, cutRatio: integer, messageCallback?: ((user: Pokemon) => void) | undefined) { + constructor(stat: BattleStat[], levels: number, cutRatio: number, messageCallback?: ((user: Pokemon) => void) | undefined) { super(stat, levels, true); this.cutRatio = cutRatio; this.messageCallback = messageCallback; } - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { - return new Promise(resolve => { - user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp() / this.cutRatio), HitResult.OTHER, false, true); - user.updateInfo().then(() => { - const ret = super.apply(user, target, move, args); - if (this.messageCallback) { - this.messageCallback(user); - } - resolve(ret); - }); - }); + override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp() / this.cutRatio), HitResult.OTHER, false, true); + user.updateInfo(); + const ret = super.apply(user, target, move, args); + if (this.messageCallback) { + this.messageCallback(user); + } + return ret; } getCondition(): MoveConditionFunc { @@ -3414,28 +3534,27 @@ export class ResetStatsAttr extends MoveEffectAttr { super(); this.targetAllPokemon = targetAllPokemon; } - async apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { - const promises: Promise[] = []; - if (this.targetAllPokemon) { // Target all pokemon on the field when Freezy Frost or Haze are used + + override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + if (this.targetAllPokemon) { + // Target all pokemon on the field when Freezy Frost or Haze are used const activePokemon = globalScene.getField(true); - activePokemon.forEach(p => promises.push(this.resetStats(p))); + activePokemon.forEach((p) => this.resetStats(p)); globalScene.queueMessage(i18next.t("moveTriggers:statEliminated")); } else { // Affects only the single target when Clear Smog is used if (!move.hitsSubstitute(user, target)) { - promises.push(this.resetStats(target)); + this.resetStats(target); globalScene.queueMessage(i18next.t("moveTriggers:resetStats", { pokemonName: getPokemonNameWithAffix(target) })); } } - - await Promise.all(promises); return true; } - async resetStats(pokemon: Pokemon): Promise { + private resetStats(pokemon: Pokemon): void { for (const s of BATTLE_STATS) { pokemon.setStatStage(s, 0); } - return pokemon.updateInfo(); + pokemon.updateInfo(); } } @@ -3491,43 +3610,28 @@ export class SwapStatStagesAttr extends MoveEffectAttr { } export class HpSplitAttr extends MoveEffectAttr { - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { - return new Promise(resolve => { - if (!super.apply(user, target, move, args)) { - return resolve(false); - } + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + if (!super.apply(user, target, move, args)) { + return false; + } - const infoUpdates: Promise[] = []; - - const hpValue = Math.floor((target.hp + user.hp) / 2); - if (user.hp < hpValue) { - const healing = user.heal(hpValue - user.hp); + const hpValue = Math.floor((target.hp + user.hp) / 2); + [ user, target ].forEach((p) => { + if (p.hp < hpValue) { + const healing = p.heal(hpValue - p.hp); if (healing) { - globalScene.damageNumberHandler.add(user, healing, HitResult.HEAL); + globalScene.damageNumberHandler.add(p, healing, HitResult.HEAL); } - } else if (user.hp > hpValue) { - const damage = user.damage(user.hp - hpValue, true); + } else if (p.hp > hpValue) { + const damage = p.damage(p.hp - hpValue, true); if (damage) { - globalScene.damageNumberHandler.add(user, damage); + globalScene.damageNumberHandler.add(p, damage); } } - infoUpdates.push(user.updateInfo()); - - if (target.hp < hpValue) { - const healing = target.heal(hpValue - target.hp); - if (healing) { - globalScene.damageNumberHandler.add(user, healing, HitResult.HEAL); - } - } else if (target.hp > hpValue) { - const damage = target.damage(target.hp - hpValue, true); - if (damage) { - globalScene.damageNumberHandler.add(target, damage); - } - } - infoUpdates.push(target.updateInfo()); - - return Promise.all(infoUpdates).then(() => resolve(true)); + p.updateInfo(); }); + + return true; } } @@ -3655,7 +3759,7 @@ const doublePowerChanceMessageFunc = (user: Pokemon, target: Pokemon, move: Move export class DoublePowerChanceAttr extends VariablePowerAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - let rand: integer; + let rand: number; globalScene.executeWithSeedOffset(() => rand = Utils.randSeedInt(100), globalScene.currentBattle.turn << 6, globalScene.waveSeed); if (rand! < move.chance) { const power = args[0] as Utils.NumberHolder; @@ -3668,7 +3772,7 @@ export class DoublePowerChanceAttr extends VariablePowerAttr { } export abstract class ConsecutiveUsePowerMultiplierAttr extends MovePowerMultiplierAttr { - constructor(limit: integer, resetOnFail: boolean, resetOnLimit?: boolean, ...comboMoves: Moves[]) { + constructor(limit: number, resetOnFail: boolean, resetOnLimit?: boolean, ...comboMoves: Moves[]) { super((user: Pokemon, target: Pokemon, move: Move): number => { const moveHistory = user.getLastXMoves(limit + 1).slice(1); @@ -3689,7 +3793,7 @@ export abstract class ConsecutiveUsePowerMultiplierAttr extends MovePowerMultipl }); } - abstract getMultiplier(count: integer): number; + abstract getMultiplier(count: number): number; } export class ConsecutiveUseDoublePowerAttr extends ConsecutiveUsePowerMultiplierAttr { @@ -3938,7 +4042,7 @@ export class MagnitudePowerAttr extends VariablePowerAttr { const magnitudeThresholds = [ 5, 15, 35, 65, 75, 95 ]; const magnitudePowers = [ 10, 30, 50, 70, 90, 100, 110, 150 ]; - let rand: integer; + let rand: number; globalScene.executeWithSeedOffset(() => rand = Utils.randSeedInt(100), globalScene.currentBattle.turn << 6, globalScene.waveSeed); @@ -4106,7 +4210,7 @@ export class PresentPowerAttr extends VariablePowerAttr { export class WaterShurikenPowerAttr extends VariablePowerAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { if (user.species.speciesId === Species.GRENINJA && user.hasAbility(Abilities.BATTLE_BOND) && user.formIndex === 2) { - (args[0] as Utils.IntegerHolder).value = 20; + (args[0] as Utils.NumberHolder).value = 20; return true; } return false; @@ -4128,7 +4232,7 @@ export class SpitUpPowerAttr extends VariablePowerAttr { const stockpilingTag = user.getTag(StockpilingTag); if (stockpilingTag && stockpilingTag.stockpiledCount > 0) { - const power = args[0] as Utils.IntegerHolder; + const power = args[0] as Utils.NumberHolder; power.value = this.multiplier * stockpilingTag.stockpiledCount; return true; } @@ -4180,9 +4284,9 @@ const hasStockpileStacksCondition: MoveConditionFunc = (user) => { */ export class MultiHitPowerIncrementAttr extends VariablePowerAttr { /** The max number of base power increments allowed for this move */ - private maxHits: integer; + private maxHits: number; - constructor(maxHits: integer) { + constructor(maxHits: number) { super(); this.maxHits = maxHits; @@ -4368,13 +4472,76 @@ export class CueNextRoundAttr extends MoveEffectAttr { } } +/** + * Attribute that changes stat stages before the damage is calculated + */ +export class StatChangeBeforeDmgCalcAttr extends MoveAttr { + /** + * Applies Stat Changes before damage is calculated + * + * @param user {@linkcode Pokemon} that called {@linkcode move} + * @param target {@linkcode Pokemon} that is the target of {@linkcode move} + * @param move {@linkcode Move} called by {@linkcode user} + * @param args N/A + * + * @returns true if stat stages where correctly applied + */ + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + return false; + } +} + +/** + * Steals the postitive Stat stages of the target before damage calculation so stat changes + * apply to damage calculation (e.g. {@linkcode Moves.SPECTRAL_THIEF}) + * {@link https://bulbapedia.bulbagarden.net/wiki/Spectral_Thief_(move) | Spectral Thief} + */ +export class SpectralThiefAttr extends StatChangeBeforeDmgCalcAttr { + /** + * steals max amount of positive stats of the target while not exceeding the limit of max 6 stat stages + * + * @param user {@linkcode Pokemon} that called {@linkcode move} + * @param target {@linkcode Pokemon} that is the target of {@linkcode move} + * @param move {@linkcode Move} called by {@linkcode user} + * @param args N/A + * + * @returns true if stat stages where correctly stolen + */ + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + /** + * Copy all positive stat stages to user and reduce copied stat stages on target. + */ + for (const s of BATTLE_STATS) { + const statStageValueTarget = target.getStatStage(s); + const statStageValueUser = user.getStatStage(s); + + if (statStageValueTarget > 0) { + /** + * Only value of up to 6 can be stolen (stat stages don't exceed 6) + */ + const availableToSteal = Math.min(statStageValueTarget, 6 - statStageValueUser); + + globalScene.unshiftPhase(new StatStageChangePhase(user.getBattlerIndex(), this.selfTarget, [ s ], availableToSteal)); + target.setStatStage(s, statStageValueTarget - availableToSteal); + } + } + + target.updateInfo(); + user.updateInfo(); + globalScene.queueMessage(i18next.t("moveTriggers:stealPositiveStats", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) })); + + return true; + } + +} + export class VariableAtkAttr extends MoveAttr { constructor() { super(); } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - //const atk = args[0] as Utils.IntegerHolder; + //const atk = args[0] as Utils.NumberHolder; return false; } } @@ -4384,7 +4551,7 @@ export class TargetAtkUserAtkAttr extends VariableAtkAttr { super(); } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - (args[0] as Utils.IntegerHolder).value = target.getEffectiveStat(Stat.ATK, target); + (args[0] as Utils.NumberHolder).value = target.getEffectiveStat(Stat.ATK, target); return true; } } @@ -4395,7 +4562,7 @@ export class DefAtkAttr extends VariableAtkAttr { } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - (args[0] as Utils.IntegerHolder).value = user.getEffectiveStat(Stat.DEF, target); + (args[0] as Utils.NumberHolder).value = user.getEffectiveStat(Stat.DEF, target); return true; } } @@ -4406,7 +4573,7 @@ export class VariableDefAttr extends MoveAttr { } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - //const def = args[0] as Utils.IntegerHolder; + //const def = args[0] as Utils.NumberHolder; return false; } } @@ -4417,7 +4584,7 @@ export class DefDefAttr extends VariableDefAttr { } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - (args[0] as Utils.IntegerHolder).value = target.getEffectiveStat(Stat.DEF, user); + (args[0] as Utils.NumberHolder).value = target.getEffectiveStat(Stat.DEF, user); return true; } } @@ -4504,7 +4671,7 @@ export class AlwaysHitMinimizeAttr extends VariableAccuracyAttr { export class ToxicAccuracyAttr extends VariableAccuracyAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - if (user.isOfType(Type.POISON)) { + if (user.isOfType(PokemonType.POISON)) { const accuracy = args[0] as Utils.NumberHolder; accuracy.value = -1; return true; @@ -4559,7 +4726,8 @@ export class TeraMoveCategoryAttr extends VariableMoveCategoryAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const category = (args[0] as Utils.NumberHolder); - if (user.isTerastallized() && user.getEffectiveStat(Stat.ATK, target, move) > user.getEffectiveStat(Stat.SPATK, target, move)) { + if (user.isTerastallized && user.getEffectiveStat(Stat.ATK, target, move, true, true, false, false, true) > + user.getEffectiveStat(Stat.SPATK, target, move, true, true, false, false, true)) { category.value = MoveCategory.PHYSICAL; return true; } @@ -4586,7 +4754,7 @@ export class TeraBlastPowerAttr extends VariablePowerAttr { */ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const power = args[0] as Utils.NumberHolder; - if (user.isTerastallized() && user.getTeraType() === Type.STELLAR) { + if (user.isTerastallized && user.getTeraType() === PokemonType.STELLAR) { power.value = 100; return true; } @@ -4644,30 +4812,6 @@ export class VariableMoveTypeAttr extends MoveAttr { } } -/** - * Attribute used for Tera Starstorm that changes the move type to Stellar - * @extends VariableMoveTypeAttr - */ -export class TeraStarstormTypeAttr extends VariableMoveTypeAttr { - /** - * - * @param user the {@linkcode Pokemon} using the move - * @param target n/a - * @param move n/a - * @param args[0] {@linkcode Utils.NumberHolder} the move type - * @returns `true` if the move type is changed to {@linkcode Type.STELLAR}, `false` otherwise - */ - override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - if (user.isTerastallized() && (user.hasFusionSpecies(Species.TERAPAGOS) || user.species.speciesId === Species.TERAPAGOS)) { - const moveType = args[0] as Utils.NumberHolder; - - moveType.value = Type.STELLAR; - return true; - } - return false; - } -} - export class FormChangeItemTypeAttr extends VariableMoveTypeAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const moveType = args[0]; @@ -4678,7 +4822,7 @@ export class FormChangeItemTypeAttr extends VariableMoveTypeAttr { if ([ user.species.speciesId, user.fusionSpecies?.speciesId ].includes(Species.ARCEUS) || [ user.species.speciesId, user.fusionSpecies?.speciesId ].includes(Species.SILVALLY)) { const form = user.species.speciesId === Species.ARCEUS || user.species.speciesId === Species.SILVALLY ? user.formIndex : user.fusionSpecies?.formIndex!; - moveType.value = Type[Type[form]]; + moveType.value = PokemonType[PokemonType[form]]; return true; } @@ -4698,19 +4842,19 @@ export class TechnoBlastTypeAttr extends VariableMoveTypeAttr { switch (form) { case 1: // Shock Drive - moveType.value = Type.ELECTRIC; + moveType.value = PokemonType.ELECTRIC; break; case 2: // Burn Drive - moveType.value = Type.FIRE; + moveType.value = PokemonType.FIRE; break; case 3: // Chill Drive - moveType.value = Type.ICE; + moveType.value = PokemonType.ICE; break; case 4: // Douse Drive - moveType.value = Type.WATER; + moveType.value = PokemonType.WATER; break; default: - moveType.value = Type.NORMAL; + moveType.value = PokemonType.NORMAL; break; } return true; @@ -4732,10 +4876,10 @@ export class AuraWheelTypeAttr extends VariableMoveTypeAttr { switch (form) { case 1: // Hangry Mode - moveType.value = Type.DARK; + moveType.value = PokemonType.DARK; break; default: // Full Belly Mode - moveType.value = Type.ELECTRIC; + moveType.value = PokemonType.ELECTRIC; break; } return true; @@ -4757,13 +4901,13 @@ export class RagingBullTypeAttr extends VariableMoveTypeAttr { switch (form) { case 1: // Blaze breed - moveType.value = Type.FIRE; + moveType.value = PokemonType.FIRE; break; case 2: // Aqua breed - moveType.value = Type.WATER; + moveType.value = PokemonType.WATER; break; default: - moveType.value = Type.FIGHTING; + moveType.value = PokemonType.FIGHTING; break; } return true; @@ -4786,19 +4930,19 @@ export class IvyCudgelTypeAttr extends VariableMoveTypeAttr { switch (form) { case 1: // Wellspring Mask case 5: // Wellspring Mask Tera - moveType.value = Type.WATER; + moveType.value = PokemonType.WATER; break; case 2: // Hearthflame Mask case 6: // Hearthflame Mask Tera - moveType.value = Type.FIRE; + moveType.value = PokemonType.FIRE; break; case 3: // Cornerstone Mask case 7: // Cornerstone Mask Tera - moveType.value = Type.ROCK; + moveType.value = PokemonType.ROCK; break; case 4: // Teal Mask Tera default: - moveType.value = Type.GRASS; + moveType.value = PokemonType.GRASS; break; } return true; @@ -4819,18 +4963,18 @@ export class WeatherBallTypeAttr extends VariableMoveTypeAttr { switch (globalScene.arena.weather?.weatherType) { case WeatherType.SUNNY: case WeatherType.HARSH_SUN: - moveType.value = Type.FIRE; + moveType.value = PokemonType.FIRE; break; case WeatherType.RAIN: case WeatherType.HEAVY_RAIN: - moveType.value = Type.WATER; + moveType.value = PokemonType.WATER; break; case WeatherType.SANDSTORM: - moveType.value = Type.ROCK; + moveType.value = PokemonType.ROCK; break; case WeatherType.HAIL: case WeatherType.SNOW: - moveType.value = Type.ICE; + moveType.value = PokemonType.ICE; break; default: return false; @@ -4869,16 +5013,16 @@ export class TerrainPulseTypeAttr extends VariableMoveTypeAttr { const currentTerrain = globalScene.arena.getTerrainType(); switch (currentTerrain) { case TerrainType.MISTY: - moveType.value = Type.FAIRY; + moveType.value = PokemonType.FAIRY; break; case TerrainType.ELECTRIC: - moveType.value = Type.ELECTRIC; + moveType.value = PokemonType.ELECTRIC; break; case TerrainType.GRASSY: - moveType.value = Type.GRASS; + moveType.value = PokemonType.GRASS; break; case TerrainType.PSYCHIC: - moveType.value = Type.PSYCHIC; + moveType.value = PokemonType.PSYCHIC; break; default: return false; @@ -4906,10 +5050,10 @@ export class HiddenPowerTypeAttr extends VariableMoveTypeAttr { + (user.ivs[Stat.SPDEF] & 1) * 32) * 15 / 63); moveType.value = [ - Type.FIGHTING, Type.FLYING, Type.POISON, Type.GROUND, - Type.ROCK, Type.BUG, Type.GHOST, Type.STEEL, - Type.FIRE, Type.WATER, Type.GRASS, Type.ELECTRIC, - Type.PSYCHIC, Type.ICE, Type.DRAGON, Type.DARK ][iv_val]; + PokemonType.FIGHTING, PokemonType.FLYING, PokemonType.POISON, PokemonType.GROUND, + PokemonType.ROCK, PokemonType.BUG, PokemonType.GHOST, PokemonType.STEEL, + PokemonType.FIRE, PokemonType.WATER, PokemonType.GRASS, PokemonType.ELECTRIC, + PokemonType.PSYCHIC, PokemonType.ICE, PokemonType.DRAGON, PokemonType.DARK ][iv_val]; return true; } @@ -4933,7 +5077,7 @@ export class TeraBlastTypeAttr extends VariableMoveTypeAttr { return false; } - if (user.isTerastallized()) { + if (user.isTerastallized) { moveType.value = user.getTeraType(); // changes move type to tera type return true; } @@ -4942,6 +5086,30 @@ export class TeraBlastTypeAttr extends VariableMoveTypeAttr { } } +/** + * Attribute used for Tera Starstorm that changes the move type to Stellar + * @extends VariableMoveTypeAttr + */ +export class TeraStarstormTypeAttr extends VariableMoveTypeAttr { + /** + * + * @param user the {@linkcode Pokemon} using the move + * @param target n/a + * @param move n/a + * @param args[0] {@linkcode Utils.NumberHolder} the move type + * @returns `true` if the move type is changed to {@linkcode PokemonType.STELLAR}, `false` otherwise + */ + override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + if (user.isTerastallized && user.hasSpecies(Species.TERAPAGOS)) { + const moveType = args[0] as Utils.NumberHolder; + + moveType.value = PokemonType.STELLAR; + return true; + } + return false; + } +} + export class MatchUserTypeAttr extends VariableMoveTypeAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const moveType = args[0]; @@ -4950,7 +5118,7 @@ export class MatchUserTypeAttr extends VariableMoveTypeAttr { } const userTypes = user.getTypes(true); - if (userTypes.includes(Type.STELLAR)) { // will not change to stellar type + if (userTypes.includes(PokemonType.STELLAR)) { // will not change to stellar type const nonTeraTypes = user.getTypes(); moveType.value = nonTeraTypes[0]; return true; @@ -4975,7 +5143,7 @@ export class CombinedPledgeTypeAttr extends VariableMoveTypeAttr { return false; } - const combinedPledgeMove = user.turnData.combiningPledge; + const combinedPledgeMove = user?.turnData?.combiningPledge; if (!combinedPledgeMove) { return false; } @@ -4983,19 +5151,19 @@ export class CombinedPledgeTypeAttr extends VariableMoveTypeAttr { switch (move.id) { case Moves.FIRE_PLEDGE: if (combinedPledgeMove === Moves.WATER_PLEDGE) { - moveType.value = Type.WATER; + moveType.value = PokemonType.WATER; return true; } return false; case Moves.WATER_PLEDGE: if (combinedPledgeMove === Moves.GRASS_PLEDGE) { - moveType.value = Type.GRASS; + moveType.value = PokemonType.GRASS; return true; } return false; case Moves.GRASS_PLEDGE: if (combinedPledgeMove === Moves.FIRE_PLEDGE) { - moveType.value = Type.FIRE; + moveType.value = PokemonType.FIRE; return true; } return false; @@ -5016,7 +5184,7 @@ export class NeutralDamageAgainstFlyingTypeMultiplierAttr extends VariableMoveTy if (!target.getTag(BattlerTagType.IGNORE_FLYING)) { const multiplier = args[0] as Utils.NumberHolder; //When a flying type is hit, the first hit is always 1x multiplier. - if (target.isOfType(Type.FLYING)) { + if (target.isOfType(PokemonType.FLYING)) { multiplier.value = 1; } return true; @@ -5037,7 +5205,7 @@ export class IceNoEffectTypeAttr extends VariableMoveTypeMultiplierAttr { */ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const multiplier = args[0] as Utils.NumberHolder; - if (target.isOfType(Type.ICE)) { + if (target.isOfType(PokemonType.ICE)) { multiplier.value = 0; return true; } @@ -5048,7 +5216,7 @@ export class IceNoEffectTypeAttr extends VariableMoveTypeMultiplierAttr { export class FlyingTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const multiplier = args[0] as Utils.NumberHolder; - multiplier.value *= target.getAttackTypeEffectiveness(Type.FLYING, user); + multiplier.value *= target.getAttackTypeEffectiveness(PokemonType.FLYING, user); return true; } } @@ -5077,9 +5245,9 @@ export class VariableMoveTypeChartAttr extends MoveAttr { export class FreezeDryAttr extends VariableMoveTypeChartAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const multiplier = args[0] as Utils.NumberHolder; - const defType = args[1] as Type; + const defType = args[1] as PokemonType; - if (defType === Type.WATER) { + if (defType === PokemonType.WATER) { multiplier.value = 2; return true; } else { @@ -5116,7 +5284,7 @@ export class SheerColdAccuracyAttr extends OneHitKOAccuracyAttr { if (user.level < target.level) { accuracy.value = 0; } else { - const baseAccuracy = user.isOfType(Type.ICE) ? 30 : 20; + const baseAccuracy = user.isOfType(PokemonType.ICE) ? 30 : 20; accuracy.value = Math.min(Math.max(baseAccuracy + 100 * (1 - target.level / user.level), 0), 100); } return true; @@ -5251,12 +5419,12 @@ export class SemiInvulnerableAttr extends MoveEffectAttr { export class AddBattlerTagAttr extends MoveEffectAttr { public tagType: BattlerTagType; - public turnCountMin: integer; - public turnCountMax: integer; + public turnCountMin: number; + public turnCountMax: number; protected cancelOnFail: boolean; private failOnOverlap: boolean; - constructor(tagType: BattlerTagType, selfTarget: boolean = false, failOnOverlap: boolean = false, turnCountMin: integer = 0, turnCountMax?: integer, lastHitOnly: boolean = false, cancelOnFail: boolean = false) { + constructor(tagType: BattlerTagType, selfTarget: boolean = false, failOnOverlap: boolean = false, turnCountMin: number = 0, turnCountMax?: number, lastHitOnly: boolean = false, cancelOnFail: boolean = false) { super(selfTarget, { lastHitOnly: lastHitOnly }); this.tagType = tagType; @@ -5293,7 +5461,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr { : null; } - getTagTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer | void { + getTagTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number | void { switch (this.tagType) { case BattlerTagType.RECHARGING: case BattlerTagType.PERISH_SONG: @@ -5331,6 +5499,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr { case BattlerTagType.INGRAIN: case BattlerTagType.IGNORE_ACCURACY: case BattlerTagType.AQUA_RING: + case BattlerTagType.MAGIC_COAT: return 3; case BattlerTagType.PROTECTED: case BattlerTagType.FLYING: @@ -5340,7 +5509,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr { } } - getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { let moveChance = this.getMoveChance(user, target, move, this.selfTarget, false); if (moveChance < 0) { moveChance = 100; @@ -5407,7 +5576,7 @@ export class GulpMissileTagAttr extends MoveEffectAttr { return false; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { const isCramorant = user.hasAbility(Abilities.GULP_MISSILE) && user.species.speciesId === Species.CRAMORANT; return isCramorant && !user.getTag(GulpMissileTag) ? 10 : 0; } @@ -5449,7 +5618,7 @@ export class JawLockAttr extends AddBattlerTagAttr { export class CurseAttr extends MoveEffectAttr { apply(user: Pokemon, target: Pokemon, move:Move, args: any[]): boolean { - if (user.getTypes(true).includes(Type.GHOST)) { + if (user.getTypes(true).includes(PokemonType.GHOST)) { if (target.getTag(BattlerTagType.CURSED)) { globalScene.queueMessage(i18next.t("battle:attackFailed")); return false; @@ -5669,7 +5838,7 @@ export class HitsTagAttr extends MoveAttr { this.doubleDamage = !!doubleDamage; } - getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return target.getTag(this.tagType) ? this.doubleDamage ? 10 : 5 : 0; } } @@ -5687,11 +5856,11 @@ export class HitsTagForDoubleDamageAttr extends HitsTagAttr { export class AddArenaTagAttr extends MoveEffectAttr { public tagType: ArenaTagType; - public turnCount: integer; + public turnCount: number; private failOnOverlap: boolean; public selfSideTarget: boolean; - constructor(tagType: ArenaTagType, turnCount?: integer | null, failOnOverlap: boolean = false, selfSideTarget: boolean = false) { + constructor(tagType: ArenaTagType, turnCount?: number | null, failOnOverlap: boolean = false, selfSideTarget: boolean = false) { super(true); this.tagType = tagType; @@ -5947,44 +6116,44 @@ export class RevivalBlessingAttr extends MoveEffectAttr { * @param args N/A * @returns Promise, true if function succeeds. */ - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { - return new Promise(resolve => { - // If user is player, checks if the user has fainted pokemon - if (user instanceof PlayerPokemon - && globalScene.getPlayerParty().findIndex(p => p.isFainted()) > -1) { - (user as PlayerPokemon).revivalBlessing().then(() => { - resolve(true); - }); - // If user is enemy, checks that it is a trainer, and it has fainted non-boss pokemon in party - } else if (user instanceof EnemyPokemon - && user.hasTrainer() - && globalScene.getEnemyParty().findIndex(p => p.isFainted() && !p.isBoss()) > -1) { - // Selects a random fainted pokemon - const faintedPokemon = globalScene.getEnemyParty().filter(p => p.isFainted() && !p.isBoss()); - const pokemon = faintedPokemon[user.randSeedInt(faintedPokemon.length)]; - const slotIndex = globalScene.getEnemyParty().findIndex(p => pokemon.id === p.id); - pokemon.resetStatus(); - pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp())); - globalScene.queueMessage(i18next.t("moveTriggers:revivalBlessing", { pokemonName: getPokemonNameWithAffix(pokemon) }), 0, true); + override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + // If user is player, checks if the user has fainted pokemon + if (user instanceof PlayerPokemon) { + globalScene.unshiftPhase(new RevivalBlessingPhase(user)); + return true; + } else if (user instanceof EnemyPokemon && user.hasTrainer() && globalScene.getEnemyParty().findIndex((p) => p.isFainted() && !p.isBoss()) > -1) { + // If used by an enemy trainer with at least one fainted non-boss Pokemon, this + // revives one of said Pokemon selected at random. + const faintedPokemon = globalScene.getEnemyParty().filter((p) => p.isFainted() && !p.isBoss()); + const pokemon = faintedPokemon[user.randSeedInt(faintedPokemon.length)]; + const slotIndex = globalScene.getEnemyParty().findIndex((p) => pokemon.id === p.id); + pokemon.resetStatus(); + pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp())); + globalScene.queueMessage(i18next.t("moveTriggers:revivalBlessing", { pokemonName: getPokemonNameWithAffix(pokemon) }), 0, true); - if (globalScene.currentBattle.double && globalScene.getEnemyParty().length > 1) { - const allyPokemon = user.getAlly(); - if (slotIndex <= 1) { - globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, pokemon.getFieldIndex(), slotIndex, false, false)); - } else if (allyPokemon.isFainted()) { - globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, false)); - } + if (globalScene.currentBattle.double && globalScene.getEnemyParty().length > 1) { + const allyPokemon = user.getAlly(); + if (slotIndex <= 1) { + globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, pokemon.getFieldIndex(), slotIndex, false, false)); + } else if (allyPokemon.isFainted()) { + globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, false)); } - resolve(true); - } else { - globalScene.queueMessage(i18next.t("battle:attackFailed")); - resolve(false); } - }); + return true; + } + return false; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { - if (user.hasTrainer() && globalScene.getEnemyParty().findIndex(p => p.isFainted() && !p.isBoss()) > -1) { + getCondition(): MoveConditionFunc { + return (user, target, move) => + (user instanceof PlayerPokemon && globalScene.getPlayerParty().some((p) => p.isFainted())) || + (user instanceof EnemyPokemon && + user.hasTrainer() && + globalScene.getEnemyParty().some((p) => p.isFainted() && !p.isBoss())); + } + + override getUserBenefitScore(user: Pokemon, _target: Pokemon, _move: Move): number { + if (user.hasTrainer() && globalScene.getEnemyParty().some((p) => p.isFainted() && !p.isBoss())) { return 20; } @@ -6163,10 +6332,12 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { return (user, target, move) => (move.category !== MoveCategory.STATUS || this.getSwitchOutCondition()(user, target, move)); } - getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null { + getFailedText(_user: Pokemon, target: Pokemon, _move: Move): string | undefined { const blockedByAbility = new Utils.BooleanHolder(false); applyAbAttrs(ForceSwitchOutImmunityAbAttr, target, blockedByAbility); - return blockedByAbility.value ? i18next.t("moveTriggers:cannotBeSwitchedOut", { pokemonName: getPokemonNameWithAffix(target) }) : null; + if (blockedByAbility.value) { + return i18next.t("moveTriggers:cannotBeSwitchedOut", { pokemonName: getPokemonNameWithAffix(target) }); + } } getSwitchOutCondition(): MoveConditionFunc { @@ -6212,13 +6383,13 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { }; } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { if (!globalScene.getEnemyParty().find(p => p.isActive() && !p.isOnField())) { return -20; } let ret = this.selfSwitch ? Math.floor((1 - user.getHpRatio()) * 20) : super.getUserBenefitScore(user, target, move); if (this.selfSwitch && this.isBatonPass()) { - const statStageTotal = user.getStatStages().reduce((s: integer, total: integer) => total += s, 0); + const statStageTotal = user.getStatStages().reduce((s: number, total: number) => total += s, 0); ret = ret / 2 + (Phaser.Tweens.Builders.GetEaseFunction("Sine.easeOut")(Math.min(Math.abs(statStageTotal), 10) / 10) * (statStageTotal >= 0 ? 10 : -10)); } return ret; @@ -6253,10 +6424,10 @@ export class ChillyReceptionAttr extends ForceSwitchOutAttr { } export class RemoveTypeAttr extends MoveEffectAttr { - private removedType: Type; + private removedType: PokemonType; private messageCallback: ((user: Pokemon) => void) | undefined; - constructor(removedType: Type, messageCallback?: (user: Pokemon) => void) { + constructor(removedType: PokemonType, messageCallback?: (user: Pokemon) => void) { super(true, { trigger: MoveEffectTrigger.POST_TARGET }); this.removedType = removedType; this.messageCallback = messageCallback; @@ -6268,14 +6439,14 @@ export class RemoveTypeAttr extends MoveEffectAttr { return false; } - if (user.isTerastallized() && user.getTeraType() === this.removedType) { // active tera types cannot be removed + if (user.isTerastallized && user.getTeraType() === this.removedType) { // active tera types cannot be removed return false; } const userTypes = user.getTypes(true); const modifiedTypes = userTypes.filter(type => type !== this.removedType); if (modifiedTypes.length === 0) { - modifiedTypes.push(Type.UNKNOWN); + modifiedTypes.push(PokemonType.UNKNOWN); } user.summonData.types = modifiedTypes; user.updateInfo(); @@ -6300,8 +6471,8 @@ export class CopyTypeAttr extends MoveEffectAttr { } const targetTypes = target.getTypes(true); - if (targetTypes.includes(Type.UNKNOWN) && targetTypes.indexOf(Type.UNKNOWN) > -1) { - targetTypes[targetTypes.indexOf(Type.UNKNOWN)] = Type.NORMAL; + if (targetTypes.includes(PokemonType.UNKNOWN) && targetTypes.indexOf(PokemonType.UNKNOWN) > -1) { + targetTypes[targetTypes.indexOf(PokemonType.UNKNOWN)] = PokemonType.NORMAL; } user.summonData.types = targetTypes; user.updateInfo(); @@ -6312,7 +6483,7 @@ export class CopyTypeAttr extends MoveEffectAttr { } getCondition(): MoveConditionFunc { - return (user, target, move) => target.getTypes()[0] !== Type.UNKNOWN || target.summonData.addedType !== null; + return (user, target, move) => target.getTypes()[0] !== PokemonType.UNKNOWN || target.summonData.addedType !== null; } } @@ -6327,7 +6498,7 @@ export class CopyBiomeTypeAttr extends MoveEffectAttr { } const terrainType = globalScene.arena.getTerrainType(); - let typeChange: Type; + let typeChange: PokemonType; if (terrainType !== TerrainType.NONE) { typeChange = this.getTypeForTerrain(globalScene.arena.getTerrainType()); } else { @@ -6337,7 +6508,7 @@ export class CopyBiomeTypeAttr extends MoveEffectAttr { user.summonData.types = [ typeChange ]; user.updateInfo(); - globalScene.queueMessage(i18next.t("moveTriggers:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), typeName: i18next.t(`pokemonInfo:Type.${Type[typeChange]}`) })); + globalScene.queueMessage(i18next.t("moveTriggers:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), typeName: i18next.t(`pokemonInfo:Type.${PokemonType[typeChange]}`) })); return true; } @@ -6347,19 +6518,19 @@ export class CopyBiomeTypeAttr extends MoveEffectAttr { * @param terrainType {@linkcode TerrainType} * @returns {@linkcode Type} */ - private getTypeForTerrain(terrainType: TerrainType): Type { + private getTypeForTerrain(terrainType: TerrainType): PokemonType { switch (terrainType) { case TerrainType.ELECTRIC: - return Type.ELECTRIC; + return PokemonType.ELECTRIC; case TerrainType.MISTY: - return Type.FAIRY; + return PokemonType.FAIRY; case TerrainType.GRASSY: - return Type.GRASS; + return PokemonType.GRASS; case TerrainType.PSYCHIC: - return Type.PSYCHIC; + return PokemonType.PSYCHIC; case TerrainType.NONE: default: - return Type.UNKNOWN; + return PokemonType.UNKNOWN; } } @@ -6368,71 +6539,71 @@ export class CopyBiomeTypeAttr extends MoveEffectAttr { * @param biomeType {@linkcode Biome} * @returns {@linkcode Type} */ - private getTypeForBiome(biomeType: Biome): Type { + private getTypeForBiome(biomeType: Biome): PokemonType { switch (biomeType) { case Biome.TOWN: case Biome.PLAINS: case Biome.METROPOLIS: - return Type.NORMAL; + return PokemonType.NORMAL; case Biome.GRASS: case Biome.TALL_GRASS: - return Type.GRASS; + return PokemonType.GRASS; case Biome.FOREST: case Biome.JUNGLE: - return Type.BUG; + return PokemonType.BUG; case Biome.SLUM: case Biome.SWAMP: - return Type.POISON; + return PokemonType.POISON; case Biome.SEA: case Biome.BEACH: case Biome.LAKE: case Biome.SEABED: - return Type.WATER; + return PokemonType.WATER; case Biome.MOUNTAIN: - return Type.FLYING; + return PokemonType.FLYING; case Biome.BADLANDS: - return Type.GROUND; + return PokemonType.GROUND; case Biome.CAVE: case Biome.DESERT: - return Type.ROCK; + return PokemonType.ROCK; case Biome.ICE_CAVE: case Biome.SNOWY_FOREST: - return Type.ICE; + return PokemonType.ICE; case Biome.MEADOW: case Biome.FAIRY_CAVE: case Biome.ISLAND: - return Type.FAIRY; + return PokemonType.FAIRY; case Biome.POWER_PLANT: - return Type.ELECTRIC; + return PokemonType.ELECTRIC; case Biome.VOLCANO: - return Type.FIRE; + return PokemonType.FIRE; case Biome.GRAVEYARD: case Biome.TEMPLE: - return Type.GHOST; + return PokemonType.GHOST; case Biome.DOJO: case Biome.CONSTRUCTION_SITE: - return Type.FIGHTING; + return PokemonType.FIGHTING; case Biome.FACTORY: case Biome.LABORATORY: - return Type.STEEL; + return PokemonType.STEEL; case Biome.RUINS: case Biome.SPACE: - return Type.PSYCHIC; + return PokemonType.PSYCHIC; case Biome.WASTELAND: case Biome.END: - return Type.DRAGON; + return PokemonType.DRAGON; case Biome.ABYSS: - return Type.DARK; + return PokemonType.DARK; default: - return Type.UNKNOWN; + return PokemonType.UNKNOWN; } } } export class ChangeTypeAttr extends MoveEffectAttr { - private type: Type; + private type: PokemonType; - constructor(type: Type) { + constructor(type: PokemonType) { super(false, { trigger: MoveEffectTrigger.HIT }); this.type = type; @@ -6442,20 +6613,20 @@ export class ChangeTypeAttr extends MoveEffectAttr { target.summonData.types = [ this.type ]; target.updateInfo(); - globalScene.queueMessage(i18next.t("moveTriggers:transformedIntoType", { pokemonName: getPokemonNameWithAffix(target), typeName: i18next.t(`pokemonInfo:Type.${Type[this.type]}`) })); + globalScene.queueMessage(i18next.t("moveTriggers:transformedIntoType", { pokemonName: getPokemonNameWithAffix(target), typeName: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`) })); return true; } getCondition(): MoveConditionFunc { - return (user, target, move) => !target.isTerastallized() && !target.hasAbility(Abilities.MULTITYPE) && !target.hasAbility(Abilities.RKS_SYSTEM) && !(target.getTypes().length === 1 && target.getTypes()[0] === this.type); + return (user, target, move) => !target.isTerastallized && !target.hasAbility(Abilities.MULTITYPE) && !target.hasAbility(Abilities.RKS_SYSTEM) && !(target.getTypes().length === 1 && target.getTypes()[0] === this.type); } } export class AddTypeAttr extends MoveEffectAttr { - private type: Type; + private type: PokemonType; - constructor(type: Type) { + constructor(type: PokemonType) { super(false, { trigger: MoveEffectTrigger.HIT }); this.type = type; @@ -6465,13 +6636,13 @@ export class AddTypeAttr extends MoveEffectAttr { target.summonData.addedType = this.type; target.updateInfo(); - globalScene.queueMessage(i18next.t("moveTriggers:addType", { typeName: i18next.t(`pokemonInfo:Type.${Type[this.type]}`), pokemonName: getPokemonNameWithAffix(target) })); + globalScene.queueMessage(i18next.t("moveTriggers:addType", { typeName: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`), pokemonName: getPokemonNameWithAffix(target) })); return true; } getCondition(): MoveConditionFunc { - return (user, target, move) => !target.isTerastallized() && !target.getTypes().includes(this.type); + return (user, target, move) => !target.isTerastallized && !target.getTypes().includes(this.type); } } @@ -6487,7 +6658,7 @@ export class FirstMoveTypeAttr extends MoveEffectAttr { const firstMoveType = target.getMoveset()[0]?.getMove().type!; // TODO: is this bang correct? user.summonData.types = [ firstMoveType ]; - globalScene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: i18next.t(`pokemonInfo:Type.${Type[firstMoveType]}`) })); + globalScene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: i18next.t(`pokemonInfo:Type.${PokemonType[firstMoveType]}`) })); return true; } @@ -6500,9 +6671,9 @@ export class FirstMoveTypeAttr extends MoveEffectAttr { * @extends OverrideMoveEffectAttr */ class CallMoveAttr extends OverrideMoveEffectAttr { - protected invalidMoves: Moves[]; + protected invalidMoves: ReadonlySet; protected hasTarget: boolean; - async apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const replaceMoveTarget = move.moveTarget === MoveTarget.NEAR_OTHER ? MoveTarget.NEAR_ENEMY : undefined; const moveTargets = getMoveTargets(user, move.id, replaceMoveTarget); if (moveTargets.targets.length === 0) { @@ -6512,11 +6683,8 @@ class CallMoveAttr extends OverrideMoveEffectAttr { ? moveTargets.targets : [ this.hasTarget ? target.getBattlerIndex() : moveTargets.targets[user.randSeedInt(moveTargets.targets.length)] ]; // account for Mirror Move having a target already user.getMoveQueue().push({ move: move.id, targets: targets, virtual: true, ignorePP: true }); + globalScene.unshiftPhase(new LoadMoveAnimPhase(move.id)); globalScene.unshiftPhase(new MovePhase(user, targets, new PokemonMove(move.id, 0, 0, true), true, true)); - - await Promise.resolve(initMoveAnim(move.id).then(() => { - loadMoveAnimAssets([ move.id ], true); - })); return true; } } @@ -6528,7 +6696,7 @@ class CallMoveAttr extends OverrideMoveEffectAttr { * @extends CallMoveAttr to call a selected move */ export class RandomMoveAttr extends CallMoveAttr { - constructor(invalidMoves: Moves[]) { + constructor(invalidMoves: ReadonlySet) { super(); this.invalidMoves = invalidMoves; } @@ -6549,8 +6717,8 @@ export class RandomMoveAttr extends CallMoveAttr { * @param move Move being used * @param args Unused */ - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { - const moveIds = Utils.getEnumValues(Moves).map(m => !this.invalidMoves.includes(m) && !allMoves[m].name.endsWith(" (N)") ? m : Moves.NONE); + override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + const moveIds = Utils.getEnumValues(Moves).map(m => !this.invalidMoves.has(m) && !allMoves[m].name.endsWith(" (N)") ? m : Moves.NONE); let moveId: Moves = Moves.NONE; do { moveId = this.getMoveOverride() ?? moveIds[user.randSeedInt(moveIds.length)]; @@ -6573,7 +6741,7 @@ export class RandomMoveAttr extends CallMoveAttr { export class RandomMovesetMoveAttr extends CallMoveAttr { private includeParty: boolean; private moveId: number; - constructor(invalidMoves: Moves[], includeParty: boolean = false) { + constructor(invalidMoves: ReadonlySet, includeParty: boolean = false) { super(); this.includeParty = includeParty; this.invalidMoves = invalidMoves; @@ -6586,7 +6754,7 @@ export class RandomMovesetMoveAttr extends CallMoveAttr { * @param move Move being used * @param args Unused */ - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { return super.apply(user, target, allMoves[this.moveId], args); } @@ -6600,7 +6768,7 @@ export class RandomMovesetMoveAttr extends CallMoveAttr { allies = [ user ]; } const partyMoveset = allies.map(p => p.moveset).flat(); - const moves = partyMoveset.filter(m => !this.invalidMoves.includes(m!.moveId) && !m!.getMove().name.endsWith(" (N)")); + const moves = partyMoveset.filter(m => !this.invalidMoves.has(m!.moveId) && !m!.getMove().name.endsWith(" (N)")); if (moves.length === 0) { return false; } @@ -6611,422 +6779,142 @@ export class RandomMovesetMoveAttr extends CallMoveAttr { } } -const invalidMetronomeMoves: Moves[] = [ - Moves.AFTER_YOU, - Moves.APPLE_ACID, - Moves.ARMOR_CANNON, - Moves.ASSIST, - Moves.ASTRAL_BARRAGE, - Moves.AURA_WHEEL, - Moves.BANEFUL_BUNKER, - Moves.BEAK_BLAST, - Moves.BEHEMOTH_BASH, - Moves.BEHEMOTH_BLADE, - Moves.BELCH, - Moves.BESTOW, - Moves.BLAZING_TORQUE, - Moves.BODY_PRESS, - Moves.BRANCH_POKE, - Moves.BREAKING_SWIPE, - Moves.CELEBRATE, - Moves.CHATTER, - Moves.CHILLING_WATER, - Moves.CHILLY_RECEPTION, - Moves.CLANGOROUS_SOUL, - Moves.COLLISION_COURSE, - Moves.COMBAT_TORQUE, - Moves.COMEUPPANCE, - Moves.COPYCAT, - Moves.COUNTER, - Moves.COVET, - Moves.CRAFTY_SHIELD, - Moves.DECORATE, - Moves.DESTINY_BOND, - Moves.DETECT, - Moves.DIAMOND_STORM, - Moves.DOODLE, - Moves.DOUBLE_IRON_BASH, - Moves.DOUBLE_SHOCK, - Moves.DRAGON_ASCENT, - Moves.DRAGON_ENERGY, - Moves.DRUM_BEATING, - Moves.DYNAMAX_CANNON, - Moves.ELECTRO_DRIFT, - Moves.ENDURE, - Moves.ETERNABEAM, - Moves.FALSE_SURRENDER, - Moves.FEINT, - Moves.FIERY_WRATH, - Moves.FILLET_AWAY, - Moves.FLEUR_CANNON, - Moves.FOCUS_PUNCH, - Moves.FOLLOW_ME, - Moves.FREEZE_SHOCK, - Moves.FREEZING_GLARE, - Moves.GLACIAL_LANCE, - Moves.GRAV_APPLE, - Moves.HELPING_HAND, - Moves.HOLD_HANDS, - Moves.HYPER_DRILL, - Moves.HYPERSPACE_FURY, - Moves.HYPERSPACE_HOLE, - Moves.ICE_BURN, - Moves.INSTRUCT, - Moves.JET_PUNCH, - Moves.JUNGLE_HEALING, - Moves.KINGS_SHIELD, - Moves.LIFE_DEW, - Moves.LIGHT_OF_RUIN, - Moves.MAKE_IT_RAIN, - Moves.MAGICAL_TORQUE, - Moves.MAT_BLOCK, - Moves.ME_FIRST, - Moves.METEOR_ASSAULT, - Moves.METRONOME, - Moves.MIMIC, - Moves.MIND_BLOWN, - Moves.MIRROR_COAT, - Moves.MIRROR_MOVE, - Moves.MOONGEIST_BEAM, - Moves.NATURE_POWER, - Moves.NATURES_MADNESS, - Moves.NOXIOUS_TORQUE, - Moves.OBSTRUCT, - Moves.ORDER_UP, - Moves.ORIGIN_PULSE, - Moves.OVERDRIVE, - Moves.PHOTON_GEYSER, - Moves.PLASMA_FISTS, - Moves.POPULATION_BOMB, - Moves.POUNCE, - Moves.POWER_SHIFT, - Moves.PRECIPICE_BLADES, - Moves.PROTECT, - Moves.PYRO_BALL, - Moves.QUASH, - Moves.QUICK_GUARD, - Moves.RAGE_FIST, - Moves.RAGE_POWDER, - Moves.RAGING_BULL, - Moves.RAGING_FURY, - Moves.RELIC_SONG, - Moves.REVIVAL_BLESSING, - Moves.RUINATION, - Moves.SALT_CURE, - Moves.SECRET_SWORD, - Moves.SHED_TAIL, - Moves.SHELL_TRAP, - Moves.SILK_TRAP, - Moves.SKETCH, - Moves.SLEEP_TALK, - Moves.SNAP_TRAP, - Moves.SNARL, - Moves.SNATCH, - Moves.SNORE, - Moves.SNOWSCAPE, - Moves.SPECTRAL_THIEF, - Moves.SPICY_EXTRACT, - Moves.SPIKY_SHIELD, - Moves.SPIRIT_BREAK, - Moves.SPOTLIGHT, - Moves.STEAM_ERUPTION, - Moves.STEEL_BEAM, - Moves.STRANGE_STEAM, - Moves.STRUGGLE, - Moves.SUNSTEEL_STRIKE, - Moves.SURGING_STRIKES, - Moves.SWITCHEROO, - Moves.TECHNO_BLAST, - Moves.TERA_STARSTORM, - Moves.THIEF, - Moves.THOUSAND_ARROWS, - Moves.THOUSAND_WAVES, - Moves.THUNDER_CAGE, - Moves.THUNDEROUS_KICK, - Moves.TIDY_UP, - Moves.TRAILBLAZE, - Moves.TRANSFORM, - Moves.TRICK, - Moves.TWIN_BEAM, - Moves.V_CREATE, - Moves.WICKED_BLOW, - Moves.WICKED_TORQUE, - Moves.WIDE_GUARD, -]; - -const invalidAssistMoves: Moves[] = [ - Moves.ASSIST, - Moves.BANEFUL_BUNKER, - Moves.BEAK_BLAST, - Moves.BELCH, - Moves.BESTOW, - Moves.BOUNCE, - Moves.CELEBRATE, - Moves.CHATTER, - Moves.CIRCLE_THROW, - Moves.COPYCAT, - Moves.COUNTER, - Moves.COVET, - Moves.DESTINY_BOND, - Moves.DETECT, - Moves.DIG, - Moves.DIVE, - Moves.DRAGON_TAIL, - Moves.ENDURE, - Moves.FEINT, - Moves.FLY, - Moves.FOCUS_PUNCH, - Moves.FOLLOW_ME, - Moves.HELPING_HAND, - Moves.HOLD_HANDS, - Moves.KINGS_SHIELD, - Moves.MAT_BLOCK, - Moves.ME_FIRST, - Moves.METRONOME, - Moves.MIMIC, - Moves.MIRROR_COAT, - Moves.MIRROR_MOVE, - Moves.NATURE_POWER, - Moves.PHANTOM_FORCE, - Moves.PROTECT, - Moves.RAGE_POWDER, - Moves.ROAR, - Moves.SHADOW_FORCE, - Moves.SHELL_TRAP, - Moves.SKETCH, - Moves.SKY_DROP, - Moves.SLEEP_TALK, - Moves.SNATCH, - Moves.SPIKY_SHIELD, - Moves.SPOTLIGHT, - Moves.STRUGGLE, - Moves.SWITCHEROO, - Moves.THIEF, - Moves.TRANSFORM, - Moves.TRICK, - Moves.WHIRLWIND, -]; - -const invalidSleepTalkMoves: Moves[] = [ - Moves.ASSIST, - Moves.BELCH, - Moves.BEAK_BLAST, - Moves.BIDE, - Moves.BOUNCE, - Moves.COPYCAT, - Moves.DIG, - Moves.DIVE, - Moves.DYNAMAX_CANNON, - Moves.FREEZE_SHOCK, - Moves.FLY, - Moves.FOCUS_PUNCH, - Moves.GEOMANCY, - Moves.ICE_BURN, - Moves.ME_FIRST, - Moves.METRONOME, - Moves.MIRROR_MOVE, - Moves.MIMIC, - Moves.PHANTOM_FORCE, - Moves.RAZOR_WIND, - Moves.SHADOW_FORCE, - Moves.SHELL_TRAP, - Moves.SKETCH, - Moves.SKULL_BASH, - Moves.SKY_ATTACK, - Moves.SKY_DROP, - Moves.SLEEP_TALK, - Moves.SOLAR_BLADE, - Moves.SOLAR_BEAM, - Moves.STRUGGLE, - Moves.UPROAR, -]; - -const invalidCopycatMoves = [ - Moves.ASSIST, - Moves.BANEFUL_BUNKER, - Moves.BEAK_BLAST, - Moves.BEHEMOTH_BASH, - Moves.BEHEMOTH_BLADE, - Moves.BESTOW, - Moves.CELEBRATE, - Moves.CHATTER, - Moves.CIRCLE_THROW, - Moves.COPYCAT, - Moves.COUNTER, - Moves.COVET, - Moves.DESTINY_BOND, - Moves.DETECT, - Moves.DRAGON_TAIL, - Moves.ENDURE, - Moves.FEINT, - Moves.FOCUS_PUNCH, - Moves.FOLLOW_ME, - Moves.HELPING_HAND, - Moves.HOLD_HANDS, - Moves.KINGS_SHIELD, - Moves.MAT_BLOCK, - Moves.ME_FIRST, - Moves.METRONOME, - Moves.MIMIC, - Moves.MIRROR_COAT, - Moves.MIRROR_MOVE, - Moves.PROTECT, - Moves.RAGE_POWDER, - Moves.ROAR, - Moves.SHELL_TRAP, - Moves.SKETCH, - Moves.SLEEP_TALK, - Moves.SNATCH, - Moves.SPIKY_SHIELD, - Moves.SPOTLIGHT, - Moves.STRUGGLE, - Moves.SWITCHEROO, - Moves.THIEF, - Moves.TRANSFORM, - Moves.TRICK, - Moves.WHIRLWIND, -]; - export class NaturePowerAttr extends OverrideMoveEffectAttr { - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { - return new Promise(resolve => { - let moveId; - switch (globalScene.arena.getTerrainType()) { - // this allows terrains to 'override' the biome move - case TerrainType.NONE: - switch (globalScene.arena.biomeType) { - case Biome.TOWN: - moveId = Moves.ROUND; - break; - case Biome.METROPOLIS: - moveId = Moves.TRI_ATTACK; - break; - case Biome.SLUM: - moveId = Moves.SLUDGE_BOMB; - break; - case Biome.PLAINS: - moveId = Moves.SILVER_WIND; - break; - case Biome.GRASS: - moveId = Moves.GRASS_KNOT; - break; - case Biome.TALL_GRASS: - moveId = Moves.POLLEN_PUFF; - break; - case Biome.MEADOW: - moveId = Moves.GIGA_DRAIN; - break; - case Biome.FOREST: - moveId = Moves.BUG_BUZZ; - break; - case Biome.JUNGLE: - moveId = Moves.LEAF_STORM; - break; - case Biome.SEA: - moveId = Moves.HYDRO_PUMP; - break; - case Biome.SWAMP: - moveId = Moves.MUD_BOMB; - break; - case Biome.BEACH: - moveId = Moves.SCALD; - break; - case Biome.LAKE: - moveId = Moves.BUBBLE_BEAM; - break; - case Biome.SEABED: - moveId = Moves.BRINE; - break; - case Biome.ISLAND: - moveId = Moves.LEAF_TORNADO; - break; - case Biome.MOUNTAIN: - moveId = Moves.AIR_SLASH; - break; - case Biome.BADLANDS: - moveId = Moves.EARTH_POWER; - break; - case Biome.DESERT: - moveId = Moves.SCORCHING_SANDS; - break; - case Biome.WASTELAND: - moveId = Moves.DRAGON_PULSE; - break; - case Biome.CONSTRUCTION_SITE: - moveId = Moves.STEEL_BEAM; - break; - case Biome.CAVE: - moveId = Moves.POWER_GEM; - break; - case Biome.ICE_CAVE: - moveId = Moves.ICE_BEAM; - break; - case Biome.SNOWY_FOREST: - moveId = Moves.FROST_BREATH; - break; - case Biome.VOLCANO: - moveId = Moves.LAVA_PLUME; - break; - case Biome.GRAVEYARD: - moveId = Moves.SHADOW_BALL; - break; - case Biome.RUINS: - moveId = Moves.ANCIENT_POWER; - break; - case Biome.TEMPLE: - moveId = Moves.EXTRASENSORY; - break; - case Biome.DOJO: - moveId = Moves.FOCUS_BLAST; - break; - case Biome.FAIRY_CAVE: - moveId = Moves.ALLURING_VOICE; - break; - case Biome.ABYSS: - moveId = Moves.OMINOUS_WIND; - break; - case Biome.SPACE: - moveId = Moves.DRACO_METEOR; - break; - case Biome.FACTORY: - moveId = Moves.FLASH_CANNON; - break; - case Biome.LABORATORY: - moveId = Moves.ZAP_CANNON; - break; - case Biome.POWER_PLANT: - moveId = Moves.CHARGE_BEAM; - break; - case Biome.END: - moveId = Moves.ETERNABEAM; - break; - } - break; - case TerrainType.MISTY: - moveId = Moves.MOONBLAST; - break; - case TerrainType.ELECTRIC: - moveId = Moves.THUNDERBOLT; - break; - case TerrainType.GRASSY: - moveId = Moves.ENERGY_BALL; - break; - case TerrainType.PSYCHIC: - moveId = Moves.PSYCHIC; - break; - default: - // Just in case there's no match - moveId = Moves.TRI_ATTACK; - break; - } + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + let moveId; + switch (globalScene.arena.getTerrainType()) { + // this allows terrains to 'override' the biome move + case TerrainType.NONE: + switch (globalScene.arena.biomeType) { + case Biome.TOWN: + moveId = Moves.ROUND; + break; + case Biome.METROPOLIS: + moveId = Moves.TRI_ATTACK; + break; + case Biome.SLUM: + moveId = Moves.SLUDGE_BOMB; + break; + case Biome.PLAINS: + moveId = Moves.SILVER_WIND; + break; + case Biome.GRASS: + moveId = Moves.GRASS_KNOT; + break; + case Biome.TALL_GRASS: + moveId = Moves.POLLEN_PUFF; + break; + case Biome.MEADOW: + moveId = Moves.GIGA_DRAIN; + break; + case Biome.FOREST: + moveId = Moves.BUG_BUZZ; + break; + case Biome.JUNGLE: + moveId = Moves.LEAF_STORM; + break; + case Biome.SEA: + moveId = Moves.HYDRO_PUMP; + break; + case Biome.SWAMP: + moveId = Moves.MUD_BOMB; + break; + case Biome.BEACH: + moveId = Moves.SCALD; + break; + case Biome.LAKE: + moveId = Moves.BUBBLE_BEAM; + break; + case Biome.SEABED: + moveId = Moves.BRINE; + break; + case Biome.ISLAND: + moveId = Moves.LEAF_TORNADO; + break; + case Biome.MOUNTAIN: + moveId = Moves.AIR_SLASH; + break; + case Biome.BADLANDS: + moveId = Moves.EARTH_POWER; + break; + case Biome.DESERT: + moveId = Moves.SCORCHING_SANDS; + break; + case Biome.WASTELAND: + moveId = Moves.DRAGON_PULSE; + break; + case Biome.CONSTRUCTION_SITE: + moveId = Moves.STEEL_BEAM; + break; + case Biome.CAVE: + moveId = Moves.POWER_GEM; + break; + case Biome.ICE_CAVE: + moveId = Moves.ICE_BEAM; + break; + case Biome.SNOWY_FOREST: + moveId = Moves.FROST_BREATH; + break; + case Biome.VOLCANO: + moveId = Moves.LAVA_PLUME; + break; + case Biome.GRAVEYARD: + moveId = Moves.SHADOW_BALL; + break; + case Biome.RUINS: + moveId = Moves.ANCIENT_POWER; + break; + case Biome.TEMPLE: + moveId = Moves.EXTRASENSORY; + break; + case Biome.DOJO: + moveId = Moves.FOCUS_BLAST; + break; + case Biome.FAIRY_CAVE: + moveId = Moves.ALLURING_VOICE; + break; + case Biome.ABYSS: + moveId = Moves.OMINOUS_WIND; + break; + case Biome.SPACE: + moveId = Moves.DRACO_METEOR; + break; + case Biome.FACTORY: + moveId = Moves.FLASH_CANNON; + break; + case Biome.LABORATORY: + moveId = Moves.ZAP_CANNON; + break; + case Biome.POWER_PLANT: + moveId = Moves.CHARGE_BEAM; + break; + case Biome.END: + moveId = Moves.ETERNABEAM; + break; + } + break; + case TerrainType.MISTY: + moveId = Moves.MOONBLAST; + break; + case TerrainType.ELECTRIC: + moveId = Moves.THUNDERBOLT; + break; + case TerrainType.GRASSY: + moveId = Moves.ENERGY_BALL; + break; + case TerrainType.PSYCHIC: + moveId = Moves.PSYCHIC; + break; + default: + // Just in case there's no match + moveId = Moves.TRI_ATTACK; + break; + } - user.getMoveQueue().push({ move: moveId, targets: [ target.getBattlerIndex() ], ignorePP: true }); - globalScene.unshiftPhase(new MovePhase(user, [ target.getBattlerIndex() ], new PokemonMove(moveId, 0, 0, true), true)); - initMoveAnim(moveId).then(() => { - loadMoveAnimAssets([ moveId ], true) - .then(() => resolve(true)); - }); - }); + user.getMoveQueue().push({ move: moveId, targets: [ target.getBattlerIndex() ], ignorePP: true }); + globalScene.unshiftPhase(new LoadMoveAnimPhase(moveId)); + globalScene.unshiftPhase(new MovePhase(user, [ target.getBattlerIndex() ], new PokemonMove(moveId, 0, 0, true), true)); + return true; } } @@ -7038,13 +6926,13 @@ export class NaturePowerAttr extends OverrideMoveEffectAttr { */ export class CopyMoveAttr extends CallMoveAttr { private mirrorMove: boolean; - constructor(mirrorMove: boolean, invalidMoves: Moves[] = []) { + constructor(mirrorMove: boolean, invalidMoves: ReadonlySet = new Set()) { super(); this.mirrorMove = mirrorMove; this.invalidMoves = invalidMoves; } - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { this.hasTarget = this.mirrorMove; const lastMove = this.mirrorMove ? target.getLastXMoves()[0].move : globalScene.currentBattle.lastMove; return super.apply(user, target, allMoves[lastMove], args); @@ -7056,7 +6944,7 @@ export class CopyMoveAttr extends CallMoveAttr { return target.getMoveHistory().length !== 0; } else { const lastMove = globalScene.currentBattle.lastMove; - return lastMove !== undefined && !this.invalidMoves.includes(lastMove); + return lastMove !== undefined && !this.invalidMoves.has(lastMove); } }; } @@ -7185,7 +7073,7 @@ export class RepeatMoveAttr extends MoveEffectAttr { }; } - getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { // TODO: Make the AI actually use instruct /* Ideally, the AI would score instruct based on the scorings of the on-field pokemons' * last used moves at the time of using Instruct (by the time the instructor gets to act) @@ -7444,11 +7332,11 @@ export class AbilityChangeAttr extends MoveEffectAttr { const moveTarget = this.selfTarget ? user : target; - moveTarget.summonData.ability = this.ability; - globalScene.triggerPokemonFormChange(moveTarget, SpeciesFormChangeRevertWeatherFormTrigger); - globalScene.queueMessage(i18next.t("moveTriggers:acquiredAbility", { pokemonName: getPokemonNameWithAffix((this.selfTarget ? user : target)), abilityName: allAbilities[this.ability].name })); + moveTarget.setTempAbility(allAbilities[this.ability]); + globalScene.triggerPokemonFormChange(moveTarget, SpeciesFormChangeRevertWeatherFormTrigger); + return true; } @@ -7471,13 +7359,13 @@ export class AbilityCopyAttr extends MoveEffectAttr { return false; } - user.summonData.ability = target.getAbility().id; - globalScene.queueMessage(i18next.t("moveTriggers:copiedTargetAbility", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), abilityName: allAbilities[target.getAbility().id].name })); + user.setTempAbility(target.getAbility()); + if (this.copyToPartner && globalScene.currentBattle?.double && user.getAlly().hp) { - user.getAlly().summonData.ability = target.getAbility().id; globalScene.queueMessage(i18next.t("moveTriggers:copiedTargetAbility", { pokemonName: getPokemonNameWithAffix(user.getAlly()), targetName: getPokemonNameWithAffix(target), abilityName: allAbilities[target.getAbility().id].name })); + user.getAlly().setTempAbility(target.getAbility()); } return true; @@ -7508,10 +7396,10 @@ export class AbilityGiveAttr extends MoveEffectAttr { return false; } - target.summonData.ability = user.getAbility().id; - globalScene.queueMessage(i18next.t("moveTriggers:acquiredAbility", { pokemonName: getPokemonNameWithAffix(target), abilityName: allAbilities[user.getAbility().id].name })); + target.setTempAbility(user.getAbility()); + return true; } @@ -7526,15 +7414,14 @@ export class SwitchAbilitiesAttr extends MoveEffectAttr { return false; } - const tempAbilityId = user.getAbility().id; - user.summonData.ability = target.getAbility().id; - target.summonData.ability = tempAbilityId; + const tempAbility = user.getAbility(); globalScene.queueMessage(i18next.t("moveTriggers:swappedAbilitiesWithTarget", { pokemonName: getPokemonNameWithAffix(user) })); + + user.setTempAbility(target.getAbility()); + target.setTempAbility(tempAbility); // Swaps Forecast/Flower Gift from Castform/Cherrim globalScene.arena.triggerWeatherBasedFormChangesToNormal(); - // Swaps Forecast/Flower Gift to Castform/Cherrim (edge case) - globalScene.arena.triggerWeatherBasedFormChanges(); return true; } @@ -7559,11 +7446,12 @@ export class SuppressAbilitiesAttr extends MoveEffectAttr { return false; } - target.summonData.abilitySuppressed = true; - globalScene.arena.triggerWeatherBasedFormChangesToNormal(); - globalScene.queueMessage(i18next.t("moveTriggers:suppressAbilities", { pokemonName: getPokemonNameWithAffix(target) })); + target.suppressAbility(); + + globalScene.arena.triggerWeatherBasedFormChangesToNormal(); + return true; } @@ -7606,49 +7494,15 @@ export class SuppressAbilitiesIfActedAttr extends MoveEffectAttr { * Used by Transform */ export class TransformAttr extends MoveEffectAttr { - async apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { + override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { if (!super.apply(user, target, move, args)) { return false; } - const promises: Promise[] = []; - user.summonData.speciesForm = target.getSpeciesForm(); - user.summonData.ability = target.getAbility().id; - user.summonData.gender = target.getGender(); - - // Power Trick's effect will not preserved after using Transform - user.removeTag(BattlerTagType.POWER_TRICK); - - // Copy all stats (except HP) - for (const s of EFFECTIVE_STATS) { - user.setStat(s, target.getStat(s, false), false); - } - - // Copy all stat stages - for (const s of BATTLE_STATS) { - user.setStatStage(s, target.getStatStage(s)); - } - - user.summonData.moveset = target.getMoveset().map((m) => { - if (m) { - // If PP value is less than 5, do nothing. If greater, we need to reduce the value to 5. - return new PokemonMove(m.moveId, 0, 0, false, Math.min(m.getMove().pp, 5)); - } else { - console.warn(`Transform: somehow iterating over a ${m} value when copying moveset!`); - return new PokemonMove(Moves.NONE); - } - }); - user.summonData.types = target.getTypes(); - promises.push(user.updateInfo()); + globalScene.unshiftPhase(new PokemonTransformPhase(user.getBattlerIndex(), target.getBattlerIndex())); globalScene.queueMessage(i18next.t("moveTriggers:transformedIntoTarget", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) })); - promises.push(user.loadAssets(false).then(() => { - user.playAnim(); - user.updateInfo(); - })); - - await Promise.all(promises); return true; } } @@ -7746,7 +7600,7 @@ export class ShiftStatAttr extends MoveEffectAttr { * @param move n/a * @returns number of points to add to the user's benefit score */ - override getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + override getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return user.getStat(this.statToSwitchWith, false) > user.getStat(this.statToSwitch, false) ? 10 : 0; } } @@ -7798,7 +7652,7 @@ export class AverageStatsAttr extends MoveEffectAttr { } export class DiscourageFrequentUseAttr extends MoveAttr { - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { const lastMoves = user.getLastXMoves(4); console.log(lastMoves); for (let m = 0; m < lastMoves.length; m++) { @@ -7958,6 +7812,56 @@ export class AfterYouAttr extends MoveEffectAttr { } } +/** + * Move effect to force the target to move last, ignoring priority. + * If applied to multiple targets, they move in speed order after all other moves. + * @extends MoveEffectAttr + */ +export class ForceLastAttr extends MoveEffectAttr { + /** + * Forces the target of this move to move last. + * + * @param user {@linkcode Pokemon} that is using the move. + * @param target {@linkcode Pokemon} that will be forced to move last. + * @param move {@linkcode Move} {@linkcode Moves.QUASH} + * @param _args N/A + * @returns true + */ + override apply(user: Pokemon, target: Pokemon, _move: Move, _args: any[]): boolean { + globalScene.queueMessage(i18next.t("moveTriggers:forceLast", { targetPokemonName: getPokemonNameWithAffix(target) })); + + const targetMovePhase = globalScene.findPhase((phase) => phase.pokemon === target); + if (targetMovePhase && !targetMovePhase.isForcedLast() && globalScene.tryRemovePhase((phase: MovePhase) => phase.pokemon === target)) { + // Finding the phase to insert the move in front of - + // Either the end of the turn or in front of another, slower move which has also been forced last + const prependPhase = globalScene.findPhase((phase) => + [ MovePhase, MoveEndPhase ].every(cls => !(phase instanceof cls)) + || (phase instanceof MovePhase) && phaseForcedSlower(phase, target, !!globalScene.arena.getTag(ArenaTagType.TRICK_ROOM)) + ); + if (prependPhase) { + globalScene.phaseQueue.splice( + globalScene.phaseQueue.indexOf(prependPhase), + 0, + new MovePhase(target, [ ...targetMovePhase.targets ], targetMovePhase.move, false, false, false, true) + ); + } + } + return true; + } +} + +/** Returns whether a {@linkcode MovePhase} has been forced last and the corresponding pokemon is slower than {@linkcode target} */ +const phaseForcedSlower = (phase: MovePhase, target: Pokemon, trickRoom: boolean): boolean => { + let slower: boolean; + // quashed pokemon still have speed ties + if (phase.pokemon.getEffectiveStat(Stat.SPD) === target.getEffectiveStat(Stat.SPD)) { + slower = !!target.randSeedInt(2); + } else { + slower = !trickRoom ? phase.pokemon.getEffectiveStat(Stat.SPD) < target.getEffectiveStat(Stat.SPD) : phase.pokemon.getEffectiveStat(Stat.SPD) > target.getEffectiveStat(Stat.SPD); + } + return phase.isForcedLast() && slower; +}; + const failOnGravityCondition: MoveConditionFunc = (user, target, move) => !globalScene.arena.getTag(ArenaTagType.GRAVITY); const failOnBossCondition: MoveConditionFunc = (user, target, move) => !target.isBossImmune(); @@ -7985,7 +7889,7 @@ const failIfLastInPartyCondition: MoveConditionFunc = (user: Pokemon, target: Po return party.some(pokemon => pokemon.isActive() && !pokemon.isOnField()); }; -const failIfGhostTypeCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => !target.isOfType(Type.GHOST); +const failIfGhostTypeCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => !target.isOfType(PokemonType.GHOST); const failIfNoTargetHeldItemsCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => target.getHeldItems().filter(i => i.isTransferable)?.length > 0; @@ -8001,44 +7905,54 @@ const attackedByItemMessageFunc = (user: Pokemon, target: Pokemon, move: Move) = export type MoveAttrFilter = (attr: MoveAttr) => boolean; -function applyMoveAttrsInternal(attrFilter: MoveAttrFilter, user: Pokemon | null, target: Pokemon | null, move: Move, args: any[]): Promise { - return new Promise(resolve => { - const attrPromises: Promise[] = []; - const moveAttrs = move.attrs.filter(a => attrFilter(a)); - for (const attr of moveAttrs) { - const result = attr.apply(user, target, move, args); - if (result instanceof Promise) { - attrPromises.push(result); - } - } - Promise.allSettled(attrPromises).then(() => resolve()); - }); +function applyMoveAttrsInternal( + attrFilter: MoveAttrFilter, + user: Pokemon | null, + target: Pokemon | null, + move: Move, + args: any[], +): void { + move.attrs.filter((attr) => attrFilter(attr)).forEach((attr) => attr.apply(user, target, move, args)); } -function applyMoveChargeAttrsInternal(attrFilter: MoveAttrFilter, user: Pokemon | null, target: Pokemon | null, move: ChargingMove, args: any[]): Promise { - return new Promise(resolve => { - const chargeAttrPromises: Promise[] = []; - const chargeMoveAttrs = move.chargeAttrs.filter(a => attrFilter(a)); - for (const attr of chargeMoveAttrs) { - const result = attr.apply(user, target, move, args); - if (result instanceof Promise) { - chargeAttrPromises.push(result); - } - } - Promise.allSettled(chargeAttrPromises).then(() => resolve()); - }); +function applyMoveChargeAttrsInternal( + attrFilter: MoveAttrFilter, + user: Pokemon | null, + target: Pokemon | null, + move: ChargingMove, + args: any[], +): void { + move.chargeAttrs.filter((attr) => attrFilter(attr)).forEach((attr) => attr.apply(user, target, move, args)); } -export function applyMoveAttrs(attrType: Constructor, user: Pokemon | null, target: Pokemon | null, move: Move, ...args: any[]): Promise { - return applyMoveAttrsInternal((attr: MoveAttr) => attr instanceof attrType, user, target, move, args); +export function applyMoveAttrs( + attrType: Constructor, + user: Pokemon | null, + target: Pokemon | null, + move: Move, + ...args: any[] +): void { + applyMoveAttrsInternal((attr: MoveAttr) => attr instanceof attrType, user, target, move, args); } -export function applyFilteredMoveAttrs(attrFilter: MoveAttrFilter, user: Pokemon, target: Pokemon | null, move: Move, ...args: any[]): Promise { - return applyMoveAttrsInternal(attrFilter, user, target, move, args); +export function applyFilteredMoveAttrs( + attrFilter: MoveAttrFilter, + user: Pokemon, + target: Pokemon | null, + move: Move, + ...args: any[] +): void { + applyMoveAttrsInternal(attrFilter, user, target, move, args); } -export function applyMoveChargeAttrs(attrType: Constructor, user: Pokemon | null, target: Pokemon | null, move: ChargingMove, ...args: any[]): Promise { - return applyMoveChargeAttrsInternal((attr: MoveAttr) => attr instanceof attrType, user, target, move, args); +export function applyMoveChargeAttrs( + attrType: Constructor, + user: Pokemon | null, + target: Pokemon | null, + move: ChargingMove, + ...args: any[] +): void { + applyMoveChargeAttrsInternal((attr: MoveAttr) => attr instanceof attrType, user, target, move, args); } export class MoveCondition { @@ -8052,7 +7966,7 @@ export class MoveCondition { return this.func(user, target, move); } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return 0; } } @@ -8062,7 +7976,7 @@ export class FirstMoveCondition extends MoveCondition { super((user, target, move) => user.battleSummonData?.waveTurnCount === 1); } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { return this.apply(user, target, move) ? 10 : -20; } } @@ -8131,7 +8045,7 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr { } const moveData = allMoves[targetMove.move]; - if (moveData.type === Type.STELLAR || moveData.type === Type.UNKNOWN) { + if (moveData.type === PokemonType.STELLAR || moveData.type === PokemonType.UNKNOWN) { return false; } const userTypes = user.getTypes(); @@ -8141,7 +8055,7 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr { } const type = validTypes[user.randSeedInt(validTypes.length)]; user.summonData.types = [ type ]; - globalScene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: Utils.toReadableString(Type[type]) })); + globalScene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: Utils.toReadableString(PokemonType[type]) })); user.updateInfo(); return true; @@ -8151,10 +8065,10 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr { * Retrieve the types resisting a given type. Used by Conversion 2 * @returns An array populated with Types, or an empty array if no resistances exist (Unknown or Stellar type) */ - getTypeResistances(gameMode: GameMode, type: number): Type[] { - const typeResistances: Type[] = []; + getTypeResistances(gameMode: GameMode, type: number): PokemonType[] { + const typeResistances: PokemonType[] = []; - for (let i = 0; i < Object.keys(Type).length; i++) { + for (let i = 0; i < Object.keys(PokemonType).length; i++) { const multiplier = new NumberHolder(1); multiplier.value = getTypeDamageMultiplier(type, i); applyChallenges(gameMode, ChallengeType.TYPE_EFFECTIVENESS, multiplier); @@ -8207,7 +8121,7 @@ export class ExposedMoveAttr extends AddBattlerTagAttr { } -const unknownTypeCondition: MoveConditionFunc = (user, target, move) => !user.getTypes().includes(Type.UNKNOWN); +const unknownTypeCondition: MoveConditionFunc = (user, target, move) => !user.getTypes().includes(PokemonType.UNKNOWN); export type MoveTargetSet = { targets: BattlerIndex[]; @@ -8273,7 +8187,7 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT multiple = true; break; case MoveTarget.CURSE: - set = user.getTypes(true).includes(Type.GHOST) ? (opponents.concat([ user.getAlly() ])) : [ user ]; + set = user.getTypes(true).includes(PokemonType.GHOST) ? (opponents.concat([ user.getAlly() ])) : [ user ]; break; } @@ -8281,540 +8195,577 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT } export const allMoves: Move[] = [ - new SelfStatusMove(Moves.NONE, Type.NORMAL, MoveCategory.STATUS, -1, -1, 0, 1), + new SelfStatusMove(Moves.NONE, PokemonType.NORMAL, MoveCategory.STATUS, -1, -1, 0, 1), ]; export const selfStatLowerMoves: Moves[] = []; export function initMoves() { allMoves.push( - new AttackMove(Moves.POUND, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1), - new AttackMove(Moves.KARATE_CHOP, Type.FIGHTING, MoveCategory.PHYSICAL, 50, 100, 25, -1, 0, 1) + new AttackMove(Moves.POUND, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1), + new AttackMove(Moves.KARATE_CHOP, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 50, 100, 25, -1, 0, 1) .attr(HighCritAttr), - new AttackMove(Moves.DOUBLE_SLAP, Type.NORMAL, MoveCategory.PHYSICAL, 15, 85, 10, -1, 0, 1) + new AttackMove(Moves.DOUBLE_SLAP, PokemonType.NORMAL, MoveCategory.PHYSICAL, 15, 85, 10, -1, 0, 1) .attr(MultiHitAttr), - new AttackMove(Moves.COMET_PUNCH, Type.NORMAL, MoveCategory.PHYSICAL, 18, 85, 15, -1, 0, 1) + new AttackMove(Moves.COMET_PUNCH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 18, 85, 15, -1, 0, 1) .attr(MultiHitAttr) .punchingMove(), - new AttackMove(Moves.MEGA_PUNCH, Type.NORMAL, MoveCategory.PHYSICAL, 80, 85, 20, -1, 0, 1) + new AttackMove(Moves.MEGA_PUNCH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 80, 85, 20, -1, 0, 1) .punchingMove(), - new AttackMove(Moves.PAY_DAY, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 20, -1, 0, 1) + new AttackMove(Moves.PAY_DAY, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 20, -1, 0, 1) .attr(MoneyAttr) .makesContact(false), - new AttackMove(Moves.FIRE_PUNCH, Type.FIRE, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1) + new AttackMove(Moves.FIRE_PUNCH, PokemonType.FIRE, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1) .attr(StatusEffectAttr, StatusEffect.BURN) .punchingMove(), - new AttackMove(Moves.ICE_PUNCH, Type.ICE, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1) + new AttackMove(Moves.ICE_PUNCH, PokemonType.ICE, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1) .attr(StatusEffectAttr, StatusEffect.FREEZE) .punchingMove(), - new AttackMove(Moves.THUNDER_PUNCH, Type.ELECTRIC, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1) + new AttackMove(Moves.THUNDER_PUNCH, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .punchingMove(), - new AttackMove(Moves.SCRATCH, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1), - new AttackMove(Moves.VISE_GRIP, Type.NORMAL, MoveCategory.PHYSICAL, 55, 100, 30, -1, 0, 1), - new AttackMove(Moves.GUILLOTINE, Type.NORMAL, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1) + new AttackMove(Moves.SCRATCH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1), + new AttackMove(Moves.VISE_GRIP, PokemonType.NORMAL, MoveCategory.PHYSICAL, 55, 100, 30, -1, 0, 1), + new AttackMove(Moves.GUILLOTINE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1) .attr(OneHitKOAttr) .attr(OneHitKOAccuracyAttr), - new ChargingAttackMove(Moves.RAZOR_WIND, Type.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 1) + new ChargingAttackMove(Moves.RAZOR_WIND, PokemonType.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 1) .chargeText(i18next.t("moveTriggers:whippedUpAWhirlwind", { pokemonName: "{USER}" })) .attr(HighCritAttr) .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new SelfStatusMove(Moves.SWORDS_DANCE, Type.NORMAL, -1, 20, -1, 0, 1) + new SelfStatusMove(Moves.SWORDS_DANCE, PokemonType.NORMAL, -1, 20, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.ATK ], 2, true) .danceMove(), - new AttackMove(Moves.CUT, Type.NORMAL, MoveCategory.PHYSICAL, 50, 95, 30, -1, 0, 1) + new AttackMove(Moves.CUT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 50, 95, 30, -1, 0, 1) .slicingMove(), - new AttackMove(Moves.GUST, Type.FLYING, MoveCategory.SPECIAL, 40, 100, 35, -1, 0, 1) + new AttackMove(Moves.GUST, PokemonType.FLYING, MoveCategory.SPECIAL, 40, 100, 35, -1, 0, 1) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.FLYING) .windMove(), - new AttackMove(Moves.WING_ATTACK, Type.FLYING, MoveCategory.PHYSICAL, 60, 100, 35, -1, 0, 1), - new StatusMove(Moves.WHIRLWIND, Type.NORMAL, -1, 20, -1, -6, 1) + new AttackMove(Moves.WING_ATTACK, PokemonType.FLYING, MoveCategory.PHYSICAL, 60, 100, 35, -1, 0, 1), + new StatusMove(Moves.WHIRLWIND, PokemonType.NORMAL, -1, 20, -1, -6, 1) .attr(ForceSwitchOutAttr, false, SwitchType.FORCE_SWITCH) .ignoresSubstitute() .hidesTarget() - .windMove(), - new ChargingAttackMove(Moves.FLY, Type.FLYING, MoveCategory.PHYSICAL, 90, 95, 15, -1, 0, 1) + .windMove() + .reflectable(), + new ChargingAttackMove(Moves.FLY, PokemonType.FLYING, MoveCategory.PHYSICAL, 90, 95, 15, -1, 0, 1) .chargeText(i18next.t("moveTriggers:flewUpHigh", { pokemonName: "{USER}" })) .chargeAttr(SemiInvulnerableAttr, BattlerTagType.FLYING) .condition(failOnGravityCondition), - new AttackMove(Moves.BIND, Type.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1) + new AttackMove(Moves.BIND, PokemonType.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1) .attr(TrapAttr, BattlerTagType.BIND), - new AttackMove(Moves.SLAM, Type.NORMAL, MoveCategory.PHYSICAL, 80, 75, 20, -1, 0, 1), - new AttackMove(Moves.VINE_WHIP, Type.GRASS, MoveCategory.PHYSICAL, 45, 100, 25, -1, 0, 1), - new AttackMove(Moves.STOMP, Type.NORMAL, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 1) + new AttackMove(Moves.SLAM, PokemonType.NORMAL, MoveCategory.PHYSICAL, 80, 75, 20, -1, 0, 1), + new AttackMove(Moves.VINE_WHIP, PokemonType.GRASS, MoveCategory.PHYSICAL, 45, 100, 25, -1, 0, 1), + new AttackMove(Moves.STOMP, PokemonType.NORMAL, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 1) .attr(AlwaysHitMinimizeAttr) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED) .attr(FlinchAttr), - new AttackMove(Moves.DOUBLE_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 30, 100, 30, -1, 0, 1) + new AttackMove(Moves.DOUBLE_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 30, 100, 30, -1, 0, 1) .attr(MultiHitAttr, MultiHitType._2), - new AttackMove(Moves.MEGA_KICK, Type.NORMAL, MoveCategory.PHYSICAL, 120, 75, 5, -1, 0, 1), - new AttackMove(Moves.JUMP_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 95, 10, -1, 0, 1) + new AttackMove(Moves.MEGA_KICK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 120, 75, 5, -1, 0, 1), + new AttackMove(Moves.JUMP_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 95, 10, -1, 0, 1) .attr(MissEffectAttr, crashDamageFunc) .attr(NoEffectAttr, crashDamageFunc) .condition(failOnGravityCondition) .recklessMove(), - new AttackMove(Moves.ROLLING_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 60, 85, 15, 30, 0, 1) + new AttackMove(Moves.ROLLING_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 60, 85, 15, 30, 0, 1) .attr(FlinchAttr), - new StatusMove(Moves.SAND_ATTACK, Type.GROUND, 100, 15, -1, 0, 1) - .attr(StatStageChangeAttr, [ Stat.ACC ], -1), - new AttackMove(Moves.HEADBUTT, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 15, 30, 0, 1) + new StatusMove(Moves.SAND_ATTACK, PokemonType.GROUND, 100, 15, -1, 0, 1) + .attr(StatStageChangeAttr, [ Stat.ACC ], -1) + .reflectable(), + new AttackMove(Moves.HEADBUTT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 15, 30, 0, 1) .attr(FlinchAttr), - new AttackMove(Moves.HORN_ATTACK, Type.NORMAL, MoveCategory.PHYSICAL, 65, 100, 25, -1, 0, 1), - new AttackMove(Moves.FURY_ATTACK, Type.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1) + new AttackMove(Moves.HORN_ATTACK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 65, 100, 25, -1, 0, 1), + new AttackMove(Moves.FURY_ATTACK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1) .attr(MultiHitAttr), - new AttackMove(Moves.HORN_DRILL, Type.NORMAL, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1) + new AttackMove(Moves.HORN_DRILL, PokemonType.NORMAL, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1) .attr(OneHitKOAttr) .attr(OneHitKOAccuracyAttr), - new AttackMove(Moves.TACKLE, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1), - new AttackMove(Moves.BODY_SLAM, Type.NORMAL, MoveCategory.PHYSICAL, 85, 100, 15, 30, 0, 1) + new AttackMove(Moves.TACKLE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1), + new AttackMove(Moves.BODY_SLAM, PokemonType.NORMAL, MoveCategory.PHYSICAL, 85, 100, 15, 30, 0, 1) .attr(AlwaysHitMinimizeAttr) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED) .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new AttackMove(Moves.WRAP, Type.NORMAL, MoveCategory.PHYSICAL, 15, 90, 20, -1, 0, 1) + new AttackMove(Moves.WRAP, PokemonType.NORMAL, MoveCategory.PHYSICAL, 15, 90, 20, -1, 0, 1) .attr(TrapAttr, BattlerTagType.WRAP), - new AttackMove(Moves.TAKE_DOWN, Type.NORMAL, MoveCategory.PHYSICAL, 90, 85, 20, -1, 0, 1) + new AttackMove(Moves.TAKE_DOWN, PokemonType.NORMAL, MoveCategory.PHYSICAL, 90, 85, 20, -1, 0, 1) .attr(RecoilAttr) .recklessMove(), - new AttackMove(Moves.THRASH, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 1) + new AttackMove(Moves.THRASH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 1) .attr(FrenzyAttr) .attr(MissEffectAttr, frenzyMissFunc) .attr(NoEffectAttr, frenzyMissFunc) .target(MoveTarget.RANDOM_NEAR_ENEMY), - new AttackMove(Moves.DOUBLE_EDGE, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 1) + new AttackMove(Moves.DOUBLE_EDGE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 1) .attr(RecoilAttr, false, 0.33) .recklessMove(), - new StatusMove(Moves.TAIL_WHIP, Type.NORMAL, 100, 30, -1, 0, 1) + new StatusMove(Moves.TAIL_WHIP, PokemonType.NORMAL, 100, 30, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.DEF ], -1) - .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.POISON_STING, Type.POISON, MoveCategory.PHYSICAL, 15, 100, 35, 30, 0, 1) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new AttackMove(Moves.POISON_STING, PokemonType.POISON, MoveCategory.PHYSICAL, 15, 100, 35, 30, 0, 1) .attr(StatusEffectAttr, StatusEffect.POISON) .makesContact(false), - new AttackMove(Moves.TWINEEDLE, Type.BUG, MoveCategory.PHYSICAL, 25, 100, 20, 20, 0, 1) + new AttackMove(Moves.TWINEEDLE, PokemonType.BUG, MoveCategory.PHYSICAL, 25, 100, 20, 20, 0, 1) .attr(MultiHitAttr, MultiHitType._2) .attr(StatusEffectAttr, StatusEffect.POISON) .makesContact(false), - new AttackMove(Moves.PIN_MISSILE, Type.BUG, MoveCategory.PHYSICAL, 25, 95, 20, -1, 0, 1) + new AttackMove(Moves.PIN_MISSILE, PokemonType.BUG, MoveCategory.PHYSICAL, 25, 95, 20, -1, 0, 1) .attr(MultiHitAttr) .makesContact(false), - new StatusMove(Moves.LEER, Type.NORMAL, 100, 30, -1, 0, 1) + new StatusMove(Moves.LEER, PokemonType.NORMAL, 100, 30, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.DEF ], -1) - .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.BITE, Type.DARK, MoveCategory.PHYSICAL, 60, 100, 25, 30, 0, 1) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new AttackMove(Moves.BITE, PokemonType.DARK, MoveCategory.PHYSICAL, 60, 100, 25, 30, 0, 1) .attr(FlinchAttr) .bitingMove(), - new StatusMove(Moves.GROWL, Type.NORMAL, 100, 40, -1, 0, 1) + new StatusMove(Moves.GROWL, PokemonType.NORMAL, 100, 40, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.ATK ], -1) .soundBased() - .target(MoveTarget.ALL_NEAR_ENEMIES), - new StatusMove(Moves.ROAR, Type.NORMAL, -1, 20, -1, -6, 1) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new StatusMove(Moves.ROAR, PokemonType.NORMAL, -1, 20, -1, -6, 1) .attr(ForceSwitchOutAttr, false, SwitchType.FORCE_SWITCH) .soundBased() - .hidesTarget(), - new StatusMove(Moves.SING, Type.NORMAL, 55, 15, -1, 0, 1) + .hidesTarget() + .reflectable(), + new StatusMove(Moves.SING, PokemonType.NORMAL, 55, 15, -1, 0, 1) .attr(StatusEffectAttr, StatusEffect.SLEEP) - .soundBased(), - new StatusMove(Moves.SUPERSONIC, Type.NORMAL, 55, 20, -1, 0, 1) + .soundBased() + .reflectable(), + new StatusMove(Moves.SUPERSONIC, PokemonType.NORMAL, 55, 20, -1, 0, 1) .attr(ConfuseAttr) - .soundBased(), - new AttackMove(Moves.SONIC_BOOM, Type.NORMAL, MoveCategory.SPECIAL, -1, 90, 20, -1, 0, 1) + .soundBased() + .reflectable(), + new AttackMove(Moves.SONIC_BOOM, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, 90, 20, -1, 0, 1) .attr(FixedDamageAttr, 20), - new StatusMove(Moves.DISABLE, Type.NORMAL, 100, 20, -1, 0, 1) + new StatusMove(Moves.DISABLE, PokemonType.NORMAL, 100, 20, -1, 0, 1) .attr(AddBattlerTagAttr, BattlerTagType.DISABLED, false, true) - .condition((user, target, move) => target.getMoveHistory().reverse().find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual) !== undefined) - .ignoresSubstitute(), - new AttackMove(Moves.ACID, Type.POISON, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1) + .condition((user, target, move) => { + const lastRealMove = target.getLastXMoves(-1).find(m => !m.virtual); + return !Utils.isNullOrUndefined(lastRealMove) && lastRealMove.move !== Moves.NONE && lastRealMove.move !== Moves.STRUGGLE; + }) + .ignoresSubstitute() + .reflectable(), + new AttackMove(Moves.ACID, PokemonType.POISON, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.EMBER, Type.FIRE, MoveCategory.SPECIAL, 40, 100, 25, 10, 0, 1) + new AttackMove(Moves.EMBER, PokemonType.FIRE, MoveCategory.SPECIAL, 40, 100, 25, 10, 0, 1) .attr(StatusEffectAttr, StatusEffect.BURN), - new AttackMove(Moves.FLAMETHROWER, Type.FIRE, MoveCategory.SPECIAL, 90, 100, 15, 10, 0, 1) + new AttackMove(Moves.FLAMETHROWER, PokemonType.FIRE, MoveCategory.SPECIAL, 90, 100, 15, 10, 0, 1) .attr(StatusEffectAttr, StatusEffect.BURN), - new StatusMove(Moves.MIST, Type.ICE, -1, 30, -1, 0, 1) + new StatusMove(Moves.MIST, PokemonType.ICE, -1, 30, -1, 0, 1) .attr(AddArenaTagAttr, ArenaTagType.MIST, 5, true) .target(MoveTarget.USER_SIDE), - new AttackMove(Moves.WATER_GUN, Type.WATER, MoveCategory.SPECIAL, 40, 100, 25, -1, 0, 1), - new AttackMove(Moves.HYDRO_PUMP, Type.WATER, MoveCategory.SPECIAL, 110, 80, 5, -1, 0, 1), - new AttackMove(Moves.SURF, Type.WATER, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 1) + new AttackMove(Moves.WATER_GUN, PokemonType.WATER, MoveCategory.SPECIAL, 40, 100, 25, -1, 0, 1), + new AttackMove(Moves.HYDRO_PUMP, PokemonType.WATER, MoveCategory.SPECIAL, 110, 80, 5, -1, 0, 1), + new AttackMove(Moves.SURF, PokemonType.WATER, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 1) .target(MoveTarget.ALL_NEAR_OTHERS) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.UNDERWATER) .attr(GulpMissileTagAttr), - new AttackMove(Moves.ICE_BEAM, Type.ICE, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 1) + new AttackMove(Moves.ICE_BEAM, PokemonType.ICE, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 1) .attr(StatusEffectAttr, StatusEffect.FREEZE), - new AttackMove(Moves.BLIZZARD, Type.ICE, MoveCategory.SPECIAL, 110, 70, 5, 10, 0, 1) + new AttackMove(Moves.BLIZZARD, PokemonType.ICE, MoveCategory.SPECIAL, 110, 70, 5, 10, 0, 1) .attr(BlizzardAccuracyAttr) .attr(StatusEffectAttr, StatusEffect.FREEZE) .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.PSYBEAM, Type.PSYCHIC, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1) + new AttackMove(Moves.PSYBEAM, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1) .attr(ConfuseAttr), - new AttackMove(Moves.BUBBLE_BEAM, Type.WATER, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1) + new AttackMove(Moves.BUBBLE_BEAM, PokemonType.WATER, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1) .attr(StatStageChangeAttr, [ Stat.SPD ], -1), - new AttackMove(Moves.AURORA_BEAM, Type.ICE, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1) + new AttackMove(Moves.AURORA_BEAM, PokemonType.ICE, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1) .attr(StatStageChangeAttr, [ Stat.ATK ], -1), - new AttackMove(Moves.HYPER_BEAM, Type.NORMAL, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 1) + new AttackMove(Moves.HYPER_BEAM, PokemonType.NORMAL, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 1) .attr(RechargeAttr), - new AttackMove(Moves.PECK, Type.FLYING, MoveCategory.PHYSICAL, 35, 100, 35, -1, 0, 1), - new AttackMove(Moves.DRILL_PECK, Type.FLYING, MoveCategory.PHYSICAL, 80, 100, 20, -1, 0, 1), - new AttackMove(Moves.SUBMISSION, Type.FIGHTING, MoveCategory.PHYSICAL, 80, 80, 20, -1, 0, 1) + new AttackMove(Moves.PECK, PokemonType.FLYING, MoveCategory.PHYSICAL, 35, 100, 35, -1, 0, 1), + new AttackMove(Moves.DRILL_PECK, PokemonType.FLYING, MoveCategory.PHYSICAL, 80, 100, 20, -1, 0, 1), + new AttackMove(Moves.SUBMISSION, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 80, 80, 20, -1, 0, 1) .attr(RecoilAttr) .recklessMove(), - new AttackMove(Moves.LOW_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 1) + new AttackMove(Moves.LOW_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 1) .attr(WeightPowerAttr), - new AttackMove(Moves.COUNTER, Type.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, -5, 1) + new AttackMove(Moves.COUNTER, PokemonType.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, -5, 1) .attr(CounterDamageAttr, (move: Move) => move.category === MoveCategory.PHYSICAL, 2) .target(MoveTarget.ATTACKER), - new AttackMove(Moves.SEISMIC_TOSS, Type.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 1) + new AttackMove(Moves.SEISMIC_TOSS, PokemonType.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 1) .attr(LevelDamageAttr), - new AttackMove(Moves.STRENGTH, Type.NORMAL, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 1), - new AttackMove(Moves.ABSORB, Type.GRASS, MoveCategory.SPECIAL, 20, 100, 25, -1, 0, 1) + new AttackMove(Moves.STRENGTH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 1), + new AttackMove(Moves.ABSORB, PokemonType.GRASS, MoveCategory.SPECIAL, 20, 100, 25, -1, 0, 1) .attr(HitHealAttr) .triageMove(), - new AttackMove(Moves.MEGA_DRAIN, Type.GRASS, MoveCategory.SPECIAL, 40, 100, 15, -1, 0, 1) + new AttackMove(Moves.MEGA_DRAIN, PokemonType.GRASS, MoveCategory.SPECIAL, 40, 100, 15, -1, 0, 1) .attr(HitHealAttr) .triageMove(), - new StatusMove(Moves.LEECH_SEED, Type.GRASS, 90, 10, -1, 0, 1) + new StatusMove(Moves.LEECH_SEED, PokemonType.GRASS, 90, 10, -1, 0, 1) .attr(LeechSeedAttr) - .condition((user, target, move) => !target.getTag(BattlerTagType.SEEDED) && !target.isOfType(Type.GRASS)), - new SelfStatusMove(Moves.GROWTH, Type.NORMAL, -1, 20, -1, 0, 1) + .condition((user, target, move) => !target.getTag(BattlerTagType.SEEDED) && !target.isOfType(PokemonType.GRASS)) + .reflectable(), + new SelfStatusMove(Moves.GROWTH, PokemonType.NORMAL, -1, 20, -1, 0, 1) .attr(GrowthStatStageChangeAttr), - new AttackMove(Moves.RAZOR_LEAF, Type.GRASS, MoveCategory.PHYSICAL, 55, 95, 25, -1, 0, 1) + new AttackMove(Moves.RAZOR_LEAF, PokemonType.GRASS, MoveCategory.PHYSICAL, 55, 95, 25, -1, 0, 1) .attr(HighCritAttr) .makesContact(false) .slicingMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new ChargingAttackMove(Moves.SOLAR_BEAM, Type.GRASS, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 1) + new ChargingAttackMove(Moves.SOLAR_BEAM, PokemonType.GRASS, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 1) .chargeText(i18next.t("moveTriggers:tookInSunlight", { pokemonName: "{USER}" })) .chargeAttr(WeatherInstantChargeAttr, [ WeatherType.SUNNY, WeatherType.HARSH_SUN ]) .attr(AntiSunlightPowerDecreaseAttr), - new StatusMove(Moves.POISON_POWDER, Type.POISON, 75, 35, -1, 0, 1) + new StatusMove(Moves.POISON_POWDER, PokemonType.POISON, 75, 35, -1, 0, 1) .attr(StatusEffectAttr, StatusEffect.POISON) - .powderMove(), - new StatusMove(Moves.STUN_SPORE, Type.GRASS, 75, 30, -1, 0, 1) + .powderMove() + .reflectable(), + new StatusMove(Moves.STUN_SPORE, PokemonType.GRASS, 75, 30, -1, 0, 1) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) - .powderMove(), - new StatusMove(Moves.SLEEP_POWDER, Type.GRASS, 75, 15, -1, 0, 1) + .powderMove() + .reflectable(), + new StatusMove(Moves.SLEEP_POWDER, PokemonType.GRASS, 75, 15, -1, 0, 1) .attr(StatusEffectAttr, StatusEffect.SLEEP) - .powderMove(), - new AttackMove(Moves.PETAL_DANCE, Type.GRASS, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 1) + .powderMove() + .reflectable(), + new AttackMove(Moves.PETAL_DANCE, PokemonType.GRASS, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 1) .attr(FrenzyAttr) .attr(MissEffectAttr, frenzyMissFunc) .attr(NoEffectAttr, frenzyMissFunc) .makesContact() .danceMove() .target(MoveTarget.RANDOM_NEAR_ENEMY), - new StatusMove(Moves.STRING_SHOT, Type.BUG, 95, 40, -1, 0, 1) + new StatusMove(Moves.STRING_SHOT, PokemonType.BUG, 95, 40, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.SPD ], -2) - .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.DRAGON_RAGE, Type.DRAGON, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 1) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new AttackMove(Moves.DRAGON_RAGE, PokemonType.DRAGON, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 1) .attr(FixedDamageAttr, 40), - new AttackMove(Moves.FIRE_SPIN, Type.FIRE, MoveCategory.SPECIAL, 35, 85, 15, -1, 0, 1) + new AttackMove(Moves.FIRE_SPIN, PokemonType.FIRE, MoveCategory.SPECIAL, 35, 85, 15, -1, 0, 1) .attr(TrapAttr, BattlerTagType.FIRE_SPIN), - new AttackMove(Moves.THUNDER_SHOCK, Type.ELECTRIC, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1) + new AttackMove(Moves.THUNDER_SHOCK, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1) .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new AttackMove(Moves.THUNDERBOLT, Type.ELECTRIC, MoveCategory.SPECIAL, 90, 100, 15, 10, 0, 1) + new AttackMove(Moves.THUNDERBOLT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 90, 100, 15, 10, 0, 1) .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new StatusMove(Moves.THUNDER_WAVE, Type.ELECTRIC, 90, 20, -1, 0, 1) + new StatusMove(Moves.THUNDER_WAVE, PokemonType.ELECTRIC, 90, 20, -1, 0, 1) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) - .attr(RespectAttackTypeImmunityAttr), - new AttackMove(Moves.THUNDER, Type.ELECTRIC, MoveCategory.SPECIAL, 110, 70, 10, 30, 0, 1) + .attr(RespectAttackTypeImmunityAttr) + .reflectable(), + new AttackMove(Moves.THUNDER, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 110, 70, 10, 30, 0, 1) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .attr(ThunderAccuracyAttr) .attr(HitsTagAttr, BattlerTagType.FLYING), - new AttackMove(Moves.ROCK_THROW, Type.ROCK, MoveCategory.PHYSICAL, 50, 90, 15, -1, 0, 1) + new AttackMove(Moves.ROCK_THROW, PokemonType.ROCK, MoveCategory.PHYSICAL, 50, 90, 15, -1, 0, 1) .makesContact(false), - new AttackMove(Moves.EARTHQUAKE, Type.GROUND, MoveCategory.PHYSICAL, 100, 100, 10, -1, 0, 1) + new AttackMove(Moves.EARTHQUAKE, PokemonType.GROUND, MoveCategory.PHYSICAL, 100, 100, 10, -1, 0, 1) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.UNDERGROUND) .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.GRASSY && target.isGrounded() ? 0.5 : 1) .makesContact(false) .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.FISSURE, Type.GROUND, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1) + new AttackMove(Moves.FISSURE, PokemonType.GROUND, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1) .attr(OneHitKOAttr) .attr(OneHitKOAccuracyAttr) .attr(HitsTagAttr, BattlerTagType.UNDERGROUND) .makesContact(false), - new ChargingAttackMove(Moves.DIG, Type.GROUND, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 1) + new ChargingAttackMove(Moves.DIG, PokemonType.GROUND, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 1) .chargeText(i18next.t("moveTriggers:dugAHole", { pokemonName: "{USER}" })) .chargeAttr(SemiInvulnerableAttr, BattlerTagType.UNDERGROUND), - new StatusMove(Moves.TOXIC, Type.POISON, 90, 10, -1, 0, 1) + new StatusMove(Moves.TOXIC, PokemonType.POISON, 90, 10, -1, 0, 1) .attr(StatusEffectAttr, StatusEffect.TOXIC) - .attr(ToxicAccuracyAttr), - new AttackMove(Moves.CONFUSION, Type.PSYCHIC, MoveCategory.SPECIAL, 50, 100, 25, 10, 0, 1) + .attr(ToxicAccuracyAttr) + .reflectable(), + new AttackMove(Moves.CONFUSION, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 50, 100, 25, 10, 0, 1) .attr(ConfuseAttr), - new AttackMove(Moves.PSYCHIC, Type.PSYCHIC, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 1) + new AttackMove(Moves.PSYCHIC, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 1) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1), - new StatusMove(Moves.HYPNOSIS, Type.PSYCHIC, 60, 20, -1, 0, 1) - .attr(StatusEffectAttr, StatusEffect.SLEEP), - new SelfStatusMove(Moves.MEDITATE, Type.PSYCHIC, -1, 40, -1, 0, 1) + new StatusMove(Moves.HYPNOSIS, PokemonType.PSYCHIC, 60, 20, -1, 0, 1) + .attr(StatusEffectAttr, StatusEffect.SLEEP) + .reflectable(), + new SelfStatusMove(Moves.MEDITATE, PokemonType.PSYCHIC, -1, 40, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true), - new SelfStatusMove(Moves.AGILITY, Type.PSYCHIC, -1, 30, -1, 0, 1) + new SelfStatusMove(Moves.AGILITY, PokemonType.PSYCHIC, -1, 30, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.SPD ], 2, true), - new AttackMove(Moves.QUICK_ATTACK, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 1), - new AttackMove(Moves.RAGE, Type.NORMAL, MoveCategory.PHYSICAL, 20, 100, 20, -1, 0, 1) + new AttackMove(Moves.QUICK_ATTACK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 1), + new AttackMove(Moves.RAGE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 20, 100, 20, -1, 0, 1) .partial(), // No effect implemented - new SelfStatusMove(Moves.TELEPORT, Type.PSYCHIC, -1, 20, -1, -6, 1) + new SelfStatusMove(Moves.TELEPORT, PokemonType.PSYCHIC, -1, 20, -1, -6, 1) .attr(ForceSwitchOutAttr, true) .hidesUser(), - new AttackMove(Moves.NIGHT_SHADE, Type.GHOST, MoveCategory.SPECIAL, -1, 100, 15, -1, 0, 1) + new AttackMove(Moves.NIGHT_SHADE, PokemonType.GHOST, MoveCategory.SPECIAL, -1, 100, 15, -1, 0, 1) .attr(LevelDamageAttr), - new StatusMove(Moves.MIMIC, Type.NORMAL, -1, 10, -1, 0, 1) + new StatusMove(Moves.MIMIC, PokemonType.NORMAL, -1, 10, -1, 0, 1) .attr(MovesetCopyMoveAttr) .ignoresSubstitute(), - new StatusMove(Moves.SCREECH, Type.NORMAL, 85, 40, -1, 0, 1) + new StatusMove(Moves.SCREECH, PokemonType.NORMAL, 85, 40, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.DEF ], -2) - .soundBased(), - new SelfStatusMove(Moves.DOUBLE_TEAM, Type.NORMAL, -1, 15, -1, 0, 1) + .soundBased() + .reflectable(), + new SelfStatusMove(Moves.DOUBLE_TEAM, PokemonType.NORMAL, -1, 15, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.EVA ], 1, true), - new SelfStatusMove(Moves.RECOVER, Type.NORMAL, -1, 5, -1, 0, 1) + new SelfStatusMove(Moves.RECOVER, PokemonType.NORMAL, -1, 5, -1, 0, 1) .attr(HealAttr, 0.5) .triageMove(), - new SelfStatusMove(Moves.HARDEN, Type.NORMAL, -1, 30, -1, 0, 1) + new SelfStatusMove(Moves.HARDEN, PokemonType.NORMAL, -1, 30, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true), - new SelfStatusMove(Moves.MINIMIZE, Type.NORMAL, -1, 10, -1, 0, 1) + new SelfStatusMove(Moves.MINIMIZE, PokemonType.NORMAL, -1, 10, -1, 0, 1) .attr(AddBattlerTagAttr, BattlerTagType.MINIMIZED, true, false) .attr(StatStageChangeAttr, [ Stat.EVA ], 2, true), - new StatusMove(Moves.SMOKESCREEN, Type.NORMAL, 100, 20, -1, 0, 1) - .attr(StatStageChangeAttr, [ Stat.ACC ], -1), - new StatusMove(Moves.CONFUSE_RAY, Type.GHOST, 100, 10, -1, 0, 1) - .attr(ConfuseAttr), - new SelfStatusMove(Moves.WITHDRAW, Type.WATER, -1, 40, -1, 0, 1) + new StatusMove(Moves.SMOKESCREEN, PokemonType.NORMAL, 100, 20, -1, 0, 1) + .attr(StatStageChangeAttr, [ Stat.ACC ], -1) + .reflectable(), + new StatusMove(Moves.CONFUSE_RAY, PokemonType.GHOST, 100, 10, -1, 0, 1) + .attr(ConfuseAttr) + .reflectable(), + new SelfStatusMove(Moves.WITHDRAW, PokemonType.WATER, -1, 40, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true), - new SelfStatusMove(Moves.DEFENSE_CURL, Type.NORMAL, -1, 40, -1, 0, 1) + new SelfStatusMove(Moves.DEFENSE_CURL, PokemonType.NORMAL, -1, 40, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true), - new SelfStatusMove(Moves.BARRIER, Type.PSYCHIC, -1, 20, -1, 0, 1) + new SelfStatusMove(Moves.BARRIER, PokemonType.PSYCHIC, -1, 20, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true), - new StatusMove(Moves.LIGHT_SCREEN, Type.PSYCHIC, -1, 30, -1, 0, 1) + new StatusMove(Moves.LIGHT_SCREEN, PokemonType.PSYCHIC, -1, 30, -1, 0, 1) .attr(AddArenaTagAttr, ArenaTagType.LIGHT_SCREEN, 5, true) .target(MoveTarget.USER_SIDE), - new SelfStatusMove(Moves.HAZE, Type.ICE, -1, 30, -1, 0, 1) + new SelfStatusMove(Moves.HAZE, PokemonType.ICE, -1, 30, -1, 0, 1) .ignoresSubstitute() .attr(ResetStatsAttr, true), - new StatusMove(Moves.REFLECT, Type.PSYCHIC, -1, 20, -1, 0, 1) + new StatusMove(Moves.REFLECT, PokemonType.PSYCHIC, -1, 20, -1, 0, 1) .attr(AddArenaTagAttr, ArenaTagType.REFLECT, 5, true) .target(MoveTarget.USER_SIDE), - new SelfStatusMove(Moves.FOCUS_ENERGY, Type.NORMAL, -1, 30, -1, 0, 1) + new SelfStatusMove(Moves.FOCUS_ENERGY, PokemonType.NORMAL, -1, 30, -1, 0, 1) .attr(AddBattlerTagAttr, BattlerTagType.CRIT_BOOST, true, true), - new AttackMove(Moves.BIDE, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 10, -1, 1, 1) + new AttackMove(Moves.BIDE, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, -1, 10, -1, 1, 1) .target(MoveTarget.USER) .unimplemented(), - new SelfStatusMove(Moves.METRONOME, Type.NORMAL, -1, 10, -1, 0, 1) + new SelfStatusMove(Moves.METRONOME, PokemonType.NORMAL, -1, 10, -1, 0, 1) .attr(RandomMoveAttr, invalidMetronomeMoves), - new StatusMove(Moves.MIRROR_MOVE, Type.FLYING, -1, 20, -1, 0, 1) + new StatusMove(Moves.MIRROR_MOVE, PokemonType.FLYING, -1, 20, -1, 0, 1) .attr(CopyMoveAttr, true), - new AttackMove(Moves.SELF_DESTRUCT, Type.NORMAL, MoveCategory.PHYSICAL, 200, 100, 5, -1, 0, 1) + new AttackMove(Moves.SELF_DESTRUCT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 200, 100, 5, -1, 0, 1) .attr(SacrificialAttr) .makesContact(false) .condition(failIfDampCondition) .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.EGG_BOMB, Type.NORMAL, MoveCategory.PHYSICAL, 100, 75, 10, -1, 0, 1) + new AttackMove(Moves.EGG_BOMB, PokemonType.NORMAL, MoveCategory.PHYSICAL, 100, 75, 10, -1, 0, 1) .makesContact(false) .ballBombMove(), - new AttackMove(Moves.LICK, Type.GHOST, MoveCategory.PHYSICAL, 30, 100, 30, 30, 0, 1) + new AttackMove(Moves.LICK, PokemonType.GHOST, MoveCategory.PHYSICAL, 30, 100, 30, 30, 0, 1) .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new AttackMove(Moves.SMOG, Type.POISON, MoveCategory.SPECIAL, 30, 70, 20, 40, 0, 1) + new AttackMove(Moves.SMOG, PokemonType.POISON, MoveCategory.SPECIAL, 30, 70, 20, 40, 0, 1) .attr(StatusEffectAttr, StatusEffect.POISON), - new AttackMove(Moves.SLUDGE, Type.POISON, MoveCategory.SPECIAL, 65, 100, 20, 30, 0, 1) + new AttackMove(Moves.SLUDGE, PokemonType.POISON, MoveCategory.SPECIAL, 65, 100, 20, 30, 0, 1) .attr(StatusEffectAttr, StatusEffect.POISON), - new AttackMove(Moves.BONE_CLUB, Type.GROUND, MoveCategory.PHYSICAL, 65, 85, 20, 10, 0, 1) + new AttackMove(Moves.BONE_CLUB, PokemonType.GROUND, MoveCategory.PHYSICAL, 65, 85, 20, 10, 0, 1) .attr(FlinchAttr) .makesContact(false), - new AttackMove(Moves.FIRE_BLAST, Type.FIRE, MoveCategory.SPECIAL, 110, 85, 5, 10, 0, 1) + new AttackMove(Moves.FIRE_BLAST, PokemonType.FIRE, MoveCategory.SPECIAL, 110, 85, 5, 10, 0, 1) .attr(StatusEffectAttr, StatusEffect.BURN), - new AttackMove(Moves.WATERFALL, Type.WATER, MoveCategory.PHYSICAL, 80, 100, 15, 20, 0, 1) + new AttackMove(Moves.WATERFALL, PokemonType.WATER, MoveCategory.PHYSICAL, 80, 100, 15, 20, 0, 1) .attr(FlinchAttr), - new AttackMove(Moves.CLAMP, Type.WATER, MoveCategory.PHYSICAL, 35, 85, 15, -1, 0, 1) + new AttackMove(Moves.CLAMP, PokemonType.WATER, MoveCategory.PHYSICAL, 35, 85, 15, -1, 0, 1) .attr(TrapAttr, BattlerTagType.CLAMP), - new AttackMove(Moves.SWIFT, Type.NORMAL, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 1) + new AttackMove(Moves.SWIFT, PokemonType.NORMAL, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 1) .target(MoveTarget.ALL_NEAR_ENEMIES), - new ChargingAttackMove(Moves.SKULL_BASH, Type.NORMAL, MoveCategory.PHYSICAL, 130, 100, 10, -1, 0, 1) + new ChargingAttackMove(Moves.SKULL_BASH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 130, 100, 10, -1, 0, 1) .chargeText(i18next.t("moveTriggers:loweredItsHead", { pokemonName: "{USER}" })) .chargeAttr(StatStageChangeAttr, [ Stat.DEF ], 1, true), - new AttackMove(Moves.SPIKE_CANNON, Type.NORMAL, MoveCategory.PHYSICAL, 20, 100, 15, -1, 0, 1) + new AttackMove(Moves.SPIKE_CANNON, PokemonType.NORMAL, MoveCategory.PHYSICAL, 20, 100, 15, -1, 0, 1) .attr(MultiHitAttr) .makesContact(false), - new AttackMove(Moves.CONSTRICT, Type.NORMAL, MoveCategory.PHYSICAL, 10, 100, 35, 10, 0, 1) + new AttackMove(Moves.CONSTRICT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 10, 100, 35, 10, 0, 1) .attr(StatStageChangeAttr, [ Stat.SPD ], -1), - new SelfStatusMove(Moves.AMNESIA, Type.PSYCHIC, -1, 20, -1, 0, 1) + new SelfStatusMove(Moves.AMNESIA, PokemonType.PSYCHIC, -1, 20, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.SPDEF ], 2, true), - new StatusMove(Moves.KINESIS, Type.PSYCHIC, 80, 15, -1, 0, 1) - .attr(StatStageChangeAttr, [ Stat.ACC ], -1), - new SelfStatusMove(Moves.SOFT_BOILED, Type.NORMAL, -1, 5, -1, 0, 1) + new StatusMove(Moves.KINESIS, PokemonType.PSYCHIC, 80, 15, -1, 0, 1) + .attr(StatStageChangeAttr, [ Stat.ACC ], -1) + .reflectable(), + new SelfStatusMove(Moves.SOFT_BOILED, PokemonType.NORMAL, -1, 5, -1, 0, 1) .attr(HealAttr, 0.5) .triageMove(), - new AttackMove(Moves.HIGH_JUMP_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 130, 90, 10, -1, 0, 1) + new AttackMove(Moves.HIGH_JUMP_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 130, 90, 10, -1, 0, 1) .attr(MissEffectAttr, crashDamageFunc) .attr(NoEffectAttr, crashDamageFunc) .condition(failOnGravityCondition) .recklessMove(), - new StatusMove(Moves.GLARE, Type.NORMAL, 100, 30, -1, 0, 1) - .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new AttackMove(Moves.DREAM_EATER, Type.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 15, -1, 0, 1) + new StatusMove(Moves.GLARE, PokemonType.NORMAL, 100, 30, -1, 0, 1) + .attr(StatusEffectAttr, StatusEffect.PARALYSIS) + .reflectable(), + new AttackMove(Moves.DREAM_EATER, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 15, -1, 0, 1) .attr(HitHealAttr) .condition(targetSleptOrComatoseCondition) .triageMove(), - new StatusMove(Moves.POISON_GAS, Type.POISON, 90, 40, -1, 0, 1) + new StatusMove(Moves.POISON_GAS, PokemonType.POISON, 90, 40, -1, 0, 1) .attr(StatusEffectAttr, StatusEffect.POISON) - .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.BARRAGE, Type.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new AttackMove(Moves.BARRAGE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1) .attr(MultiHitAttr) .makesContact(false) .ballBombMove(), - new AttackMove(Moves.LEECH_LIFE, Type.BUG, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 1) + new AttackMove(Moves.LEECH_LIFE, PokemonType.BUG, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 1) .attr(HitHealAttr) .triageMove(), - new StatusMove(Moves.LOVELY_KISS, Type.NORMAL, 75, 10, -1, 0, 1) - .attr(StatusEffectAttr, StatusEffect.SLEEP), - new ChargingAttackMove(Moves.SKY_ATTACK, Type.FLYING, MoveCategory.PHYSICAL, 140, 90, 5, 30, 0, 1) + new StatusMove(Moves.LOVELY_KISS, PokemonType.NORMAL, 75, 10, -1, 0, 1) + .attr(StatusEffectAttr, StatusEffect.SLEEP) + .reflectable(), + new ChargingAttackMove(Moves.SKY_ATTACK, PokemonType.FLYING, MoveCategory.PHYSICAL, 140, 90, 5, 30, 0, 1) .chargeText(i18next.t("moveTriggers:isGlowing", { pokemonName: "{USER}" })) .attr(HighCritAttr) .attr(FlinchAttr) .makesContact(false), - new StatusMove(Moves.TRANSFORM, Type.NORMAL, -1, 10, -1, 0, 1) + new StatusMove(Moves.TRANSFORM, PokemonType.NORMAL, -1, 10, -1, 0, 1) .attr(TransformAttr) // transforming from or into fusion pokemon causes various problems (such as crashes) .condition((user, target, move) => !target.getTag(BattlerTagType.SUBSTITUTE) && !user.fusionSpecies && !target.fusionSpecies) .ignoresProtect(), - new AttackMove(Moves.BUBBLE, Type.WATER, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1) + new AttackMove(Moves.BUBBLE, PokemonType.WATER, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1) .attr(StatStageChangeAttr, [ Stat.SPD ], -1) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.DIZZY_PUNCH, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 10, 20, 0, 1) + new AttackMove(Moves.DIZZY_PUNCH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 10, 20, 0, 1) .attr(ConfuseAttr) .punchingMove(), - new StatusMove(Moves.SPORE, Type.GRASS, 100, 15, -1, 0, 1) + new StatusMove(Moves.SPORE, PokemonType.GRASS, 100, 15, -1, 0, 1) .attr(StatusEffectAttr, StatusEffect.SLEEP) - .powderMove(), - new StatusMove(Moves.FLASH, Type.NORMAL, 100, 20, -1, 0, 1) - .attr(StatStageChangeAttr, [ Stat.ACC ], -1), - new AttackMove(Moves.PSYWAVE, Type.PSYCHIC, MoveCategory.SPECIAL, -1, 100, 15, -1, 0, 1) + .powderMove() + .reflectable(), + new StatusMove(Moves.FLASH, PokemonType.NORMAL, 100, 20, -1, 0, 1) + .attr(StatStageChangeAttr, [ Stat.ACC ], -1) + .reflectable(), + new AttackMove(Moves.PSYWAVE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, -1, 100, 15, -1, 0, 1) .attr(RandomLevelDamageAttr), - new SelfStatusMove(Moves.SPLASH, Type.NORMAL, -1, 40, -1, 0, 1) + new SelfStatusMove(Moves.SPLASH, PokemonType.NORMAL, -1, 40, -1, 0, 1) + .attr(SplashAttr) .condition(failOnGravityCondition), - new SelfStatusMove(Moves.ACID_ARMOR, Type.POISON, -1, 20, -1, 0, 1) + new SelfStatusMove(Moves.ACID_ARMOR, PokemonType.POISON, -1, 20, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true), - new AttackMove(Moves.CRABHAMMER, Type.WATER, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 1) + new AttackMove(Moves.CRABHAMMER, PokemonType.WATER, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 1) .attr(HighCritAttr), - new AttackMove(Moves.EXPLOSION, Type.NORMAL, MoveCategory.PHYSICAL, 250, 100, 5, -1, 0, 1) + new AttackMove(Moves.EXPLOSION, PokemonType.NORMAL, MoveCategory.PHYSICAL, 250, 100, 5, -1, 0, 1) .condition(failIfDampCondition) .attr(SacrificialAttr) .makesContact(false) .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.FURY_SWIPES, Type.NORMAL, MoveCategory.PHYSICAL, 18, 80, 15, -1, 0, 1) + new AttackMove(Moves.FURY_SWIPES, PokemonType.NORMAL, MoveCategory.PHYSICAL, 18, 80, 15, -1, 0, 1) .attr(MultiHitAttr), - new AttackMove(Moves.BONEMERANG, Type.GROUND, MoveCategory.PHYSICAL, 50, 90, 10, -1, 0, 1) + new AttackMove(Moves.BONEMERANG, PokemonType.GROUND, MoveCategory.PHYSICAL, 50, 90, 10, -1, 0, 1) .attr(MultiHitAttr, MultiHitType._2) .makesContact(false), - new SelfStatusMove(Moves.REST, Type.PSYCHIC, -1, 5, -1, 0, 1) + new SelfStatusMove(Moves.REST, PokemonType.PSYCHIC, -1, 5, -1, 0, 1) .attr(StatusEffectAttr, StatusEffect.SLEEP, true, 3, true) .attr(HealAttr, 1, true) .condition((user, target, move) => !user.isFullHp() && user.canSetStatus(StatusEffect.SLEEP, true, true)) .triageMove(), - new AttackMove(Moves.ROCK_SLIDE, Type.ROCK, MoveCategory.PHYSICAL, 75, 90, 10, 30, 0, 1) + new AttackMove(Moves.ROCK_SLIDE, PokemonType.ROCK, MoveCategory.PHYSICAL, 75, 90, 10, 30, 0, 1) .attr(FlinchAttr) .makesContact(false) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.HYPER_FANG, Type.NORMAL, MoveCategory.PHYSICAL, 80, 90, 15, 10, 0, 1) + new AttackMove(Moves.HYPER_FANG, PokemonType.NORMAL, MoveCategory.PHYSICAL, 80, 90, 15, 10, 0, 1) .attr(FlinchAttr) .bitingMove(), - new SelfStatusMove(Moves.SHARPEN, Type.NORMAL, -1, 30, -1, 0, 1) + new SelfStatusMove(Moves.SHARPEN, PokemonType.NORMAL, -1, 30, -1, 0, 1) .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true), - new SelfStatusMove(Moves.CONVERSION, Type.NORMAL, -1, 30, -1, 0, 1) + new SelfStatusMove(Moves.CONVERSION, PokemonType.NORMAL, -1, 30, -1, 0, 1) .attr(FirstMoveTypeAttr), - new AttackMove(Moves.TRI_ATTACK, Type.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, 20, 0, 1) + new AttackMove(Moves.TRI_ATTACK, PokemonType.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, 20, 0, 1) .attr(MultiStatusEffectAttr, [ StatusEffect.BURN, StatusEffect.FREEZE, StatusEffect.PARALYSIS ]), - new AttackMove(Moves.SUPER_FANG, Type.NORMAL, MoveCategory.PHYSICAL, -1, 90, 10, -1, 0, 1) + new AttackMove(Moves.SUPER_FANG, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 90, 10, -1, 0, 1) .attr(TargetHalfHpDamageAttr), - new AttackMove(Moves.SLASH, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 1) + new AttackMove(Moves.SLASH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 1) .attr(HighCritAttr) .slicingMove(), - new SelfStatusMove(Moves.SUBSTITUTE, Type.NORMAL, -1, 10, -1, 0, 1) - .attr(AddSubstituteAttr), - new AttackMove(Moves.STRUGGLE, Type.NORMAL, MoveCategory.PHYSICAL, 50, -1, 1, -1, 0, 1) + new SelfStatusMove(Moves.SUBSTITUTE, PokemonType.NORMAL, -1, 10, -1, 0, 1) + .attr(AddSubstituteAttr, 0.25, false), + new AttackMove(Moves.STRUGGLE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 50, -1, 1, -1, 0, 1) .attr(RecoilAttr, true, 0.25, true) .attr(TypelessAttr) .target(MoveTarget.RANDOM_NEAR_ENEMY), - new StatusMove(Moves.SKETCH, Type.NORMAL, -1, 1, -1, 0, 2) + new StatusMove(Moves.SKETCH, PokemonType.NORMAL, -1, 1, -1, 0, 2) .ignoresSubstitute() .attr(SketchAttr), - new AttackMove(Moves.TRIPLE_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 10, 90, 10, -1, 0, 2) + new AttackMove(Moves.TRIPLE_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 10, 90, 10, -1, 0, 2) .attr(MultiHitAttr, MultiHitType._3) .attr(MultiHitPowerIncrementAttr, 3) .checkAllHits(), - new AttackMove(Moves.THIEF, Type.DARK, MoveCategory.PHYSICAL, 60, 100, 25, -1, 0, 2) + new AttackMove(Moves.THIEF, PokemonType.DARK, MoveCategory.PHYSICAL, 60, 100, 25, -1, 0, 2) .attr(StealHeldItemChanceAttr, 0.3), - new StatusMove(Moves.SPIDER_WEB, Type.BUG, -1, 10, -1, 0, 2) + new StatusMove(Moves.SPIDER_WEB, PokemonType.BUG, -1, 10, -1, 0, 2) .condition(failIfGhostTypeCondition) - .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1), - new StatusMove(Moves.MIND_READER, Type.NORMAL, -1, 5, -1, 0, 2) + .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1) + .reflectable(), + new StatusMove(Moves.MIND_READER, PokemonType.NORMAL, -1, 5, -1, 0, 2) .attr(IgnoreAccuracyAttr), - new StatusMove(Moves.NIGHTMARE, Type.GHOST, 100, 15, -1, 0, 2) + new StatusMove(Moves.NIGHTMARE, PokemonType.GHOST, 100, 15, -1, 0, 2) .attr(AddBattlerTagAttr, BattlerTagType.NIGHTMARE) .condition(targetSleptOrComatoseCondition), - new AttackMove(Moves.FLAME_WHEEL, Type.FIRE, MoveCategory.PHYSICAL, 60, 100, 25, 10, 0, 2) + new AttackMove(Moves.FLAME_WHEEL, PokemonType.FIRE, MoveCategory.PHYSICAL, 60, 100, 25, 10, 0, 2) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN), - new AttackMove(Moves.SNORE, Type.NORMAL, MoveCategory.SPECIAL, 50, 100, 15, 30, 0, 2) + new AttackMove(Moves.SNORE, PokemonType.NORMAL, MoveCategory.SPECIAL, 50, 100, 15, 30, 0, 2) .attr(BypassSleepAttr) .attr(FlinchAttr) .condition(userSleptOrComatoseCondition) .soundBased(), - new StatusMove(Moves.CURSE, Type.GHOST, -1, 10, -1, 0, 2) + new StatusMove(Moves.CURSE, PokemonType.GHOST, -1, 10, -1, 0, 2) .attr(CurseAttr) .ignoresSubstitute() .ignoresProtect() .target(MoveTarget.CURSE), - new AttackMove(Moves.FLAIL, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 2) + new AttackMove(Moves.FLAIL, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 2) .attr(LowHpPowerAttr), - new StatusMove(Moves.CONVERSION_2, Type.NORMAL, -1, 30, -1, 0, 2) + new StatusMove(Moves.CONVERSION_2, PokemonType.NORMAL, -1, 30, -1, 0, 2) .attr(ResistLastMoveTypeAttr) .ignoresSubstitute() .partial(), // Checks the move's original typing and not if its type is changed through some other means - new AttackMove(Moves.AEROBLAST, Type.FLYING, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 2) + new AttackMove(Moves.AEROBLAST, PokemonType.FLYING, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 2) .windMove() .attr(HighCritAttr), - new StatusMove(Moves.COTTON_SPORE, Type.GRASS, 100, 40, -1, 0, 2) + new StatusMove(Moves.COTTON_SPORE, PokemonType.GRASS, 100, 40, -1, 0, 2) .attr(StatStageChangeAttr, [ Stat.SPD ], -2) .powderMove() - .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.REVERSAL, Type.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 2) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new AttackMove(Moves.REVERSAL, PokemonType.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 2) .attr(LowHpPowerAttr), - new StatusMove(Moves.SPITE, Type.GHOST, 100, 10, -1, 0, 2) + new StatusMove(Moves.SPITE, PokemonType.GHOST, 100, 10, -1, 0, 2) .ignoresSubstitute() - .attr(ReducePpMoveAttr, 4), - new AttackMove(Moves.POWDER_SNOW, Type.ICE, MoveCategory.SPECIAL, 40, 100, 25, 10, 0, 2) + .attr(ReducePpMoveAttr, 4) + .reflectable(), + new AttackMove(Moves.POWDER_SNOW, PokemonType.ICE, MoveCategory.SPECIAL, 40, 100, 25, 10, 0, 2) .attr(StatusEffectAttr, StatusEffect.FREEZE) .target(MoveTarget.ALL_NEAR_ENEMIES), - new SelfStatusMove(Moves.PROTECT, Type.NORMAL, -1, 10, -1, 4, 2) + new SelfStatusMove(Moves.PROTECT, PokemonType.NORMAL, -1, 10, -1, 4, 2) .attr(ProtectAttr) .condition(failIfLastCondition), - new AttackMove(Moves.MACH_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 2) + new AttackMove(Moves.MACH_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 2) .punchingMove(), - new StatusMove(Moves.SCARY_FACE, Type.NORMAL, 100, 10, -1, 0, 2) - .attr(StatStageChangeAttr, [ Stat.SPD ], -2), - new AttackMove(Moves.FEINT_ATTACK, Type.DARK, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 2), - new StatusMove(Moves.SWEET_KISS, Type.FAIRY, 75, 10, -1, 0, 2) - .attr(ConfuseAttr), - new SelfStatusMove(Moves.BELLY_DRUM, Type.NORMAL, -1, 10, -1, 0, 2) + new StatusMove(Moves.SCARY_FACE, PokemonType.NORMAL, 100, 10, -1, 0, 2) + .attr(StatStageChangeAttr, [ Stat.SPD ], -2) + .reflectable(), + new AttackMove(Moves.FEINT_ATTACK, PokemonType.DARK, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 2), + new StatusMove(Moves.SWEET_KISS, PokemonType.FAIRY, 75, 10, -1, 0, 2) + .attr(ConfuseAttr) + .reflectable(), + new SelfStatusMove(Moves.BELLY_DRUM, PokemonType.NORMAL, -1, 10, -1, 0, 2) .attr(CutHpStatStageBoostAttr, [ Stat.ATK ], 12, 2, (user) => { globalScene.queueMessage(i18next.t("moveTriggers:cutOwnHpAndMaximizedStat", { pokemonName: getPokemonNameWithAffix(user), statName: i18next.t(getStatKey(Stat.ATK)) })); }), - new AttackMove(Moves.SLUDGE_BOMB, Type.POISON, MoveCategory.SPECIAL, 90, 100, 10, 30, 0, 2) + new AttackMove(Moves.SLUDGE_BOMB, PokemonType.POISON, MoveCategory.SPECIAL, 90, 100, 10, 30, 0, 2) .attr(StatusEffectAttr, StatusEffect.POISON) .ballBombMove(), - new AttackMove(Moves.MUD_SLAP, Type.GROUND, MoveCategory.SPECIAL, 20, 100, 10, 100, 0, 2) + new AttackMove(Moves.MUD_SLAP, PokemonType.GROUND, MoveCategory.SPECIAL, 20, 100, 10, 100, 0, 2) .attr(StatStageChangeAttr, [ Stat.ACC ], -1), - new AttackMove(Moves.OCTAZOOKA, Type.WATER, MoveCategory.SPECIAL, 65, 85, 10, 50, 0, 2) + new AttackMove(Moves.OCTAZOOKA, PokemonType.WATER, MoveCategory.SPECIAL, 65, 85, 10, 50, 0, 2) .attr(StatStageChangeAttr, [ Stat.ACC ], -1) .ballBombMove(), - new StatusMove(Moves.SPIKES, Type.GROUND, -1, 20, -1, 0, 2) + new StatusMove(Moves.SPIKES, PokemonType.GROUND, -1, 20, -1, 0, 2) .attr(AddArenaTrapTagAttr, ArenaTagType.SPIKES) - .target(MoveTarget.ENEMY_SIDE), - new AttackMove(Moves.ZAP_CANNON, Type.ELECTRIC, MoveCategory.SPECIAL, 120, 50, 5, 100, 0, 2) + .target(MoveTarget.ENEMY_SIDE) + .reflectable(), + new AttackMove(Moves.ZAP_CANNON, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 120, 50, 5, 100, 0, 2) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .ballBombMove(), - new StatusMove(Moves.FORESIGHT, Type.NORMAL, -1, 40, -1, 0, 2) + new StatusMove(Moves.FORESIGHT, PokemonType.NORMAL, -1, 40, -1, 0, 2) .attr(ExposedMoveAttr, BattlerTagType.IGNORE_GHOST) - .ignoresSubstitute(), - new SelfStatusMove(Moves.DESTINY_BOND, Type.GHOST, -1, 5, -1, 0, 2) + .ignoresSubstitute() + .reflectable(), + new SelfStatusMove(Moves.DESTINY_BOND, PokemonType.GHOST, -1, 5, -1, 0, 2) .ignoresProtect() .attr(DestinyBondAttr) .condition((user, target, move) => { @@ -8826,115 +8777,120 @@ export function initMoves() { // - the previous move was unsuccessful return lastTurnMove.length === 0 || lastTurnMove[0].move !== move.id || lastTurnMove[0].result !== MoveResult.SUCCESS; }), - new StatusMove(Moves.PERISH_SONG, Type.NORMAL, -1, 5, -1, 0, 2) + new StatusMove(Moves.PERISH_SONG, PokemonType.NORMAL, -1, 5, -1, 0, 2) .attr(FaintCountdownAttr) .ignoresProtect() .soundBased() .condition(failOnBossCondition) .target(MoveTarget.ALL), - new AttackMove(Moves.ICY_WIND, Type.ICE, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 2) + new AttackMove(Moves.ICY_WIND, PokemonType.ICE, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 2) .attr(StatStageChangeAttr, [ Stat.SPD ], -1) .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new SelfStatusMove(Moves.DETECT, Type.FIGHTING, -1, 5, -1, 4, 2) + new SelfStatusMove(Moves.DETECT, PokemonType.FIGHTING, -1, 5, -1, 4, 2) .attr(ProtectAttr) .condition(failIfLastCondition), - new AttackMove(Moves.BONE_RUSH, Type.GROUND, MoveCategory.PHYSICAL, 25, 90, 10, -1, 0, 2) + new AttackMove(Moves.BONE_RUSH, PokemonType.GROUND, MoveCategory.PHYSICAL, 25, 90, 10, -1, 0, 2) .attr(MultiHitAttr) .makesContact(false), - new StatusMove(Moves.LOCK_ON, Type.NORMAL, -1, 5, -1, 0, 2) + new StatusMove(Moves.LOCK_ON, PokemonType.NORMAL, -1, 5, -1, 0, 2) .attr(IgnoreAccuracyAttr), - new AttackMove(Moves.OUTRAGE, Type.DRAGON, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 2) + new AttackMove(Moves.OUTRAGE, PokemonType.DRAGON, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 2) .attr(FrenzyAttr) .attr(MissEffectAttr, frenzyMissFunc) .attr(NoEffectAttr, frenzyMissFunc) .target(MoveTarget.RANDOM_NEAR_ENEMY), - new StatusMove(Moves.SANDSTORM, Type.ROCK, -1, 10, -1, 0, 2) + new StatusMove(Moves.SANDSTORM, PokemonType.ROCK, -1, 10, -1, 0, 2) .attr(WeatherChangeAttr, WeatherType.SANDSTORM) .target(MoveTarget.BOTH_SIDES), - new AttackMove(Moves.GIGA_DRAIN, Type.GRASS, MoveCategory.SPECIAL, 75, 100, 10, -1, 0, 2) + new AttackMove(Moves.GIGA_DRAIN, PokemonType.GRASS, MoveCategory.SPECIAL, 75, 100, 10, -1, 0, 2) .attr(HitHealAttr) .triageMove(), - new SelfStatusMove(Moves.ENDURE, Type.NORMAL, -1, 10, -1, 4, 2) + new SelfStatusMove(Moves.ENDURE, PokemonType.NORMAL, -1, 10, -1, 4, 2) .attr(ProtectAttr, BattlerTagType.ENDURING) .condition(failIfLastCondition), - new StatusMove(Moves.CHARM, Type.FAIRY, 100, 20, -1, 0, 2) - .attr(StatStageChangeAttr, [ Stat.ATK ], -2), - new AttackMove(Moves.ROLLOUT, Type.ROCK, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 2) + new StatusMove(Moves.CHARM, PokemonType.FAIRY, 100, 20, -1, 0, 2) + .attr(StatStageChangeAttr, [ Stat.ATK ], -2) + .reflectable(), + new AttackMove(Moves.ROLLOUT, PokemonType.ROCK, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 2) .partial() // Does not lock the user, also does not increase damage properly .attr(ConsecutiveUseDoublePowerAttr, 5, true, true, Moves.DEFENSE_CURL), - new AttackMove(Moves.FALSE_SWIPE, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 2) + new AttackMove(Moves.FALSE_SWIPE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 2) .attr(SurviveDamageAttr), - new StatusMove(Moves.SWAGGER, Type.NORMAL, 85, 15, -1, 0, 2) + new StatusMove(Moves.SWAGGER, PokemonType.NORMAL, 85, 15, -1, 0, 2) .attr(StatStageChangeAttr, [ Stat.ATK ], 2) - .attr(ConfuseAttr), - new SelfStatusMove(Moves.MILK_DRINK, Type.NORMAL, -1, 5, -1, 0, 2) + .attr(ConfuseAttr) + .reflectable(), + new SelfStatusMove(Moves.MILK_DRINK, PokemonType.NORMAL, -1, 5, -1, 0, 2) .attr(HealAttr, 0.5) .triageMove(), - new AttackMove(Moves.SPARK, Type.ELECTRIC, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 2) + new AttackMove(Moves.SPARK, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 2) .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new AttackMove(Moves.FURY_CUTTER, Type.BUG, MoveCategory.PHYSICAL, 40, 95, 20, -1, 0, 2) + new AttackMove(Moves.FURY_CUTTER, PokemonType.BUG, MoveCategory.PHYSICAL, 40, 95, 20, -1, 0, 2) .attr(ConsecutiveUseDoublePowerAttr, 3, true) .slicingMove(), - new AttackMove(Moves.STEEL_WING, Type.STEEL, MoveCategory.PHYSICAL, 70, 90, 25, 10, 0, 2) + new AttackMove(Moves.STEEL_WING, PokemonType.STEEL, MoveCategory.PHYSICAL, 70, 90, 25, 10, 0, 2) .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true), - new StatusMove(Moves.MEAN_LOOK, Type.NORMAL, -1, 5, -1, 0, 2) + new StatusMove(Moves.MEAN_LOOK, PokemonType.NORMAL, -1, 5, -1, 0, 2) .condition(failIfGhostTypeCondition) - .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1), - new StatusMove(Moves.ATTRACT, Type.NORMAL, 100, 15, -1, 0, 2) + .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1) + .reflectable(), + new StatusMove(Moves.ATTRACT, PokemonType.NORMAL, 100, 15, -1, 0, 2) .attr(AddBattlerTagAttr, BattlerTagType.INFATUATED) .ignoresSubstitute() - .condition((user, target, move) => user.isOppositeGender(target)), - new SelfStatusMove(Moves.SLEEP_TALK, Type.NORMAL, -1, 10, -1, 0, 2) + .condition((user, target, move) => user.isOppositeGender(target)) + .reflectable(), + new SelfStatusMove(Moves.SLEEP_TALK, PokemonType.NORMAL, -1, 10, -1, 0, 2) .attr(BypassSleepAttr) .attr(RandomMovesetMoveAttr, invalidSleepTalkMoves, false) .condition(userSleptOrComatoseCondition) .target(MoveTarget.NEAR_ENEMY), - new StatusMove(Moves.HEAL_BELL, Type.NORMAL, -1, 5, -1, 0, 2) + new StatusMove(Moves.HEAL_BELL, PokemonType.NORMAL, -1, 5, -1, 0, 2) .attr(PartyStatusCureAttr, i18next.t("moveTriggers:bellChimed"), Abilities.SOUNDPROOF) .soundBased() .target(MoveTarget.PARTY), - new AttackMove(Moves.RETURN, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 2) + new AttackMove(Moves.RETURN, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 2) .attr(FriendshipPowerAttr), - new AttackMove(Moves.PRESENT, Type.NORMAL, MoveCategory.PHYSICAL, -1, 90, 15, -1, 0, 2) + new AttackMove(Moves.PRESENT, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 90, 15, -1, 0, 2) .attr(PresentPowerAttr) .makesContact(false), - new AttackMove(Moves.FRUSTRATION, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 2) + new AttackMove(Moves.FRUSTRATION, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 2) .attr(FriendshipPowerAttr, true), - new StatusMove(Moves.SAFEGUARD, Type.NORMAL, -1, 25, -1, 0, 2) + new StatusMove(Moves.SAFEGUARD, PokemonType.NORMAL, -1, 25, -1, 0, 2) .target(MoveTarget.USER_SIDE) .attr(AddArenaTagAttr, ArenaTagType.SAFEGUARD, 5, true, true), - new StatusMove(Moves.PAIN_SPLIT, Type.NORMAL, -1, 20, -1, 0, 2) + new StatusMove(Moves.PAIN_SPLIT, PokemonType.NORMAL, -1, 20, -1, 0, 2) .attr(HpSplitAttr) .condition(failOnBossCondition), - new AttackMove(Moves.SACRED_FIRE, Type.FIRE, MoveCategory.PHYSICAL, 100, 95, 5, 50, 0, 2) + new AttackMove(Moves.SACRED_FIRE, PokemonType.FIRE, MoveCategory.PHYSICAL, 100, 95, 5, 50, 0, 2) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN) .makesContact(false), - new AttackMove(Moves.MAGNITUDE, Type.GROUND, MoveCategory.PHYSICAL, -1, 100, 30, -1, 0, 2) + new AttackMove(Moves.MAGNITUDE, PokemonType.GROUND, MoveCategory.PHYSICAL, -1, 100, 30, -1, 0, 2) .attr(PreMoveMessageAttr, magnitudeMessageFunc) .attr(MagnitudePowerAttr) .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.GRASSY && target.isGrounded() ? 0.5 : 1) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.UNDERGROUND) .makesContact(false) .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.DYNAMIC_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 50, 5, 100, 0, 2) + new AttackMove(Moves.DYNAMIC_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 50, 5, 100, 0, 2) .attr(ConfuseAttr) .punchingMove(), - new AttackMove(Moves.MEGAHORN, Type.BUG, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 2), - new AttackMove(Moves.DRAGON_BREATH, Type.DRAGON, MoveCategory.SPECIAL, 60, 100, 20, 30, 0, 2) + new AttackMove(Moves.MEGAHORN, PokemonType.BUG, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 2), + new AttackMove(Moves.DRAGON_BREATH, PokemonType.DRAGON, MoveCategory.SPECIAL, 60, 100, 20, 30, 0, 2) .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new SelfStatusMove(Moves.BATON_PASS, Type.NORMAL, -1, 40, -1, 0, 2) + new SelfStatusMove(Moves.BATON_PASS, PokemonType.NORMAL, -1, 40, -1, 0, 2) .attr(ForceSwitchOutAttr, true, SwitchType.BATON_PASS) .condition(failIfLastInPartyCondition) .hidesUser(), - new StatusMove(Moves.ENCORE, Type.NORMAL, 100, 5, -1, 0, 2) + new StatusMove(Moves.ENCORE, PokemonType.NORMAL, 100, 5, -1, 0, 2) .attr(AddBattlerTagAttr, BattlerTagType.ENCORE, false, true) .ignoresSubstitute() - .condition((user, target, move) => new EncoreTag(user.id).canAdd(target)), - new AttackMove(Moves.PURSUIT, Type.DARK, MoveCategory.PHYSICAL, 40, 100, 20, -1, 0, 2) + .condition((user, target, move) => new EncoreTag(user.id).canAdd(target)) + .reflectable(), + new AttackMove(Moves.PURSUIT, PokemonType.DARK, MoveCategory.PHYSICAL, 40, 100, 20, -1, 0, 2) .partial(), // No effect implemented - new AttackMove(Moves.RAPID_SPIN, Type.NORMAL, MoveCategory.PHYSICAL, 50, 100, 40, 100, 0, 2) + new AttackMove(Moves.RAPID_SPIN, PokemonType.NORMAL, MoveCategory.PHYSICAL, 50, 100, 40, 100, 0, 2) .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true) .attr(RemoveBattlerTagAttr, [ BattlerTagType.BIND, @@ -8950,424 +8906,445 @@ export function initMoves() { BattlerTagType.INFESTATION ], true) .attr(RemoveArenaTrapAttr), - new StatusMove(Moves.SWEET_SCENT, Type.NORMAL, 100, 20, -1, 0, 2) + new StatusMove(Moves.SWEET_SCENT, PokemonType.NORMAL, 100, 20, -1, 0, 2) .attr(StatStageChangeAttr, [ Stat.EVA ], -2) - .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.IRON_TAIL, Type.STEEL, MoveCategory.PHYSICAL, 100, 75, 15, 30, 0, 2) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new AttackMove(Moves.IRON_TAIL, PokemonType.STEEL, MoveCategory.PHYSICAL, 100, 75, 15, 30, 0, 2) .attr(StatStageChangeAttr, [ Stat.DEF ], -1), - new AttackMove(Moves.METAL_CLAW, Type.STEEL, MoveCategory.PHYSICAL, 50, 95, 35, 10, 0, 2) + new AttackMove(Moves.METAL_CLAW, PokemonType.STEEL, MoveCategory.PHYSICAL, 50, 95, 35, 10, 0, 2) .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true), - new AttackMove(Moves.VITAL_THROW, Type.FIGHTING, MoveCategory.PHYSICAL, 70, -1, 10, -1, -1, 2), - new SelfStatusMove(Moves.MORNING_SUN, Type.NORMAL, -1, 5, -1, 0, 2) + new AttackMove(Moves.VITAL_THROW, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 70, -1, 10, -1, -1, 2), + new SelfStatusMove(Moves.MORNING_SUN, PokemonType.NORMAL, -1, 5, -1, 0, 2) .attr(PlantHealAttr) .triageMove(), - new SelfStatusMove(Moves.SYNTHESIS, Type.GRASS, -1, 5, -1, 0, 2) + new SelfStatusMove(Moves.SYNTHESIS, PokemonType.GRASS, -1, 5, -1, 0, 2) .attr(PlantHealAttr) .triageMove(), - new SelfStatusMove(Moves.MOONLIGHT, Type.FAIRY, -1, 5, -1, 0, 2) + new SelfStatusMove(Moves.MOONLIGHT, PokemonType.FAIRY, -1, 5, -1, 0, 2) .attr(PlantHealAttr) .triageMove(), - new AttackMove(Moves.HIDDEN_POWER, Type.NORMAL, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 2) + new AttackMove(Moves.HIDDEN_POWER, PokemonType.NORMAL, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 2) .attr(HiddenPowerTypeAttr), - new AttackMove(Moves.CROSS_CHOP, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 80, 5, -1, 0, 2) + new AttackMove(Moves.CROSS_CHOP, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 80, 5, -1, 0, 2) .attr(HighCritAttr), - new AttackMove(Moves.TWISTER, Type.DRAGON, MoveCategory.SPECIAL, 40, 100, 20, 20, 0, 2) + new AttackMove(Moves.TWISTER, PokemonType.DRAGON, MoveCategory.SPECIAL, 40, 100, 20, 20, 0, 2) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.FLYING) .attr(FlinchAttr) .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new StatusMove(Moves.RAIN_DANCE, Type.WATER, -1, 5, -1, 0, 2) + new StatusMove(Moves.RAIN_DANCE, PokemonType.WATER, -1, 5, -1, 0, 2) .attr(WeatherChangeAttr, WeatherType.RAIN) .target(MoveTarget.BOTH_SIDES), - new StatusMove(Moves.SUNNY_DAY, Type.FIRE, -1, 5, -1, 0, 2) + new StatusMove(Moves.SUNNY_DAY, PokemonType.FIRE, -1, 5, -1, 0, 2) .attr(WeatherChangeAttr, WeatherType.SUNNY) .target(MoveTarget.BOTH_SIDES), - new AttackMove(Moves.CRUNCH, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 20, 0, 2) + new AttackMove(Moves.CRUNCH, PokemonType.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 20, 0, 2) .attr(StatStageChangeAttr, [ Stat.DEF ], -1) .bitingMove(), - new AttackMove(Moves.MIRROR_COAT, Type.PSYCHIC, MoveCategory.SPECIAL, -1, 100, 20, -1, -5, 2) + new AttackMove(Moves.MIRROR_COAT, PokemonType.PSYCHIC, MoveCategory.SPECIAL, -1, 100, 20, -1, -5, 2) .attr(CounterDamageAttr, (move: Move) => move.category === MoveCategory.SPECIAL, 2) .target(MoveTarget.ATTACKER), - new StatusMove(Moves.PSYCH_UP, Type.NORMAL, -1, 10, -1, 0, 2) + new StatusMove(Moves.PSYCH_UP, PokemonType.NORMAL, -1, 10, -1, 0, 2) .ignoresSubstitute() .attr(CopyStatsAttr), - new AttackMove(Moves.EXTREME_SPEED, Type.NORMAL, MoveCategory.PHYSICAL, 80, 100, 5, -1, 2, 2), - new AttackMove(Moves.ANCIENT_POWER, Type.ROCK, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 2) + new AttackMove(Moves.EXTREME_SPEED, PokemonType.NORMAL, MoveCategory.PHYSICAL, 80, 100, 5, -1, 2, 2), + new AttackMove(Moves.ANCIENT_POWER, PokemonType.ROCK, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 2) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true), - new AttackMove(Moves.SHADOW_BALL, Type.GHOST, MoveCategory.SPECIAL, 80, 100, 15, 20, 0, 2) + new AttackMove(Moves.SHADOW_BALL, PokemonType.GHOST, MoveCategory.SPECIAL, 80, 100, 15, 20, 0, 2) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1) .ballBombMove(), - new AttackMove(Moves.FUTURE_SIGHT, Type.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 2) + new AttackMove(Moves.FUTURE_SIGHT, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 2) .partial() // cannot be used on multiple Pokemon on the same side in a double battle, hits immediately when called by Metronome/etc, should not apply abilities or held items if user is off the field .ignoresProtect() .attr(DelayedAttackAttr, ArenaTagType.FUTURE_SIGHT, ChargeAnim.FUTURE_SIGHT_CHARGING, i18next.t("moveTriggers:foresawAnAttack", { pokemonName: "{USER}" })), - new AttackMove(Moves.ROCK_SMASH, Type.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 15, 50, 0, 2) + new AttackMove(Moves.ROCK_SMASH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 15, 50, 0, 2) .attr(StatStageChangeAttr, [ Stat.DEF ], -1), - new AttackMove(Moves.WHIRLPOOL, Type.WATER, MoveCategory.SPECIAL, 35, 85, 15, -1, 0, 2) + new AttackMove(Moves.WHIRLPOOL, PokemonType.WATER, MoveCategory.SPECIAL, 35, 85, 15, -1, 0, 2) .attr(TrapAttr, BattlerTagType.WHIRLPOOL) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.UNDERWATER), - new AttackMove(Moves.BEAT_UP, Type.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 2) + new AttackMove(Moves.BEAT_UP, PokemonType.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 2) .attr(MultiHitAttr, MultiHitType.BEAT_UP) .attr(BeatUpAttr) .makesContact(false), - new AttackMove(Moves.FAKE_OUT, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 10, 100, 3, 3) + new AttackMove(Moves.FAKE_OUT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 10, 100, 3, 3) .attr(FlinchAttr) .condition(new FirstMoveCondition()), - new AttackMove(Moves.UPROAR, Type.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3) + new AttackMove(Moves.UPROAR, PokemonType.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3) .soundBased() .target(MoveTarget.RANDOM_NEAR_ENEMY) .partial(), // Does not lock the user, does not stop Pokemon from sleeping - new SelfStatusMove(Moves.STOCKPILE, Type.NORMAL, -1, 20, -1, 0, 3) + new SelfStatusMove(Moves.STOCKPILE, PokemonType.NORMAL, -1, 20, -1, 0, 3) .condition(user => (user.getTag(StockpilingTag)?.stockpiledCount ?? 0) < 3) .attr(AddBattlerTagAttr, BattlerTagType.STOCKPILING, true), - new AttackMove(Moves.SPIT_UP, Type.NORMAL, MoveCategory.SPECIAL, -1, -1, 10, -1, 0, 3) + new AttackMove(Moves.SPIT_UP, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, -1, 10, -1, 0, 3) .condition(hasStockpileStacksCondition) .attr(SpitUpPowerAttr, 100) .attr(RemoveBattlerTagAttr, [ BattlerTagType.STOCKPILING ], true), - new SelfStatusMove(Moves.SWALLOW, Type.NORMAL, -1, 10, -1, 0, 3) + new SelfStatusMove(Moves.SWALLOW, PokemonType.NORMAL, -1, 10, -1, 0, 3) .condition(hasStockpileStacksCondition) .attr(SwallowHealAttr) .attr(RemoveBattlerTagAttr, [ BattlerTagType.STOCKPILING ], true) .triageMove(), - new AttackMove(Moves.HEAT_WAVE, Type.FIRE, MoveCategory.SPECIAL, 95, 90, 10, 10, 0, 3) + new AttackMove(Moves.HEAT_WAVE, PokemonType.FIRE, MoveCategory.SPECIAL, 95, 90, 10, 10, 0, 3) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN) .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new StatusMove(Moves.HAIL, Type.ICE, -1, 10, -1, 0, 3) + new StatusMove(Moves.HAIL, PokemonType.ICE, -1, 10, -1, 0, 3) .attr(WeatherChangeAttr, WeatherType.HAIL) .target(MoveTarget.BOTH_SIDES), - new StatusMove(Moves.TORMENT, Type.DARK, 100, 15, -1, 0, 3) + new StatusMove(Moves.TORMENT, PokemonType.DARK, 100, 15, -1, 0, 3) .ignoresSubstitute() .edgeCase() // Incomplete implementation because of Uproar's partial implementation - .attr(AddBattlerTagAttr, BattlerTagType.TORMENT, false, true, 1), - new StatusMove(Moves.FLATTER, Type.DARK, 100, 15, -1, 0, 3) + .attr(AddBattlerTagAttr, BattlerTagType.TORMENT, false, true, 1) + .reflectable(), + new StatusMove(Moves.FLATTER, PokemonType.DARK, 100, 15, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPATK ], 1) - .attr(ConfuseAttr), - new StatusMove(Moves.WILL_O_WISP, Type.FIRE, 85, 15, -1, 0, 3) - .attr(StatusEffectAttr, StatusEffect.BURN), - new StatusMove(Moves.MEMENTO, Type.DARK, 100, 10, -1, 0, 3) + .attr(ConfuseAttr) + .reflectable(), + new StatusMove(Moves.WILL_O_WISP, PokemonType.FIRE, 85, 15, -1, 0, 3) + .attr(StatusEffectAttr, StatusEffect.BURN) + .reflectable(), + new StatusMove(Moves.MEMENTO, PokemonType.DARK, 100, 10, -1, 0, 3) .attr(SacrificialAttrOnHit) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -2), - new AttackMove(Moves.FACADE, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 3) + new AttackMove(Moves.FACADE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 3) .attr(MovePowerMultiplierAttr, (user, target, move) => user.status && (user.status.effect === StatusEffect.BURN || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.PARALYSIS) ? 2 : 1) .attr(BypassBurnDamageReductionAttr), - new AttackMove(Moves.FOCUS_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 20, -1, -3, 3) + new AttackMove(Moves.FOCUS_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 20, -1, -3, 3) .attr(MessageHeaderAttr, (user, move) => i18next.t("moveTriggers:isTighteningFocus", { pokemonName: getPokemonNameWithAffix(user) })) - .punchingMove() - .condition((user, target, move) => !user.turnData.attacksReceived.find(r => r.damage)), - new AttackMove(Moves.SMELLING_SALTS, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 10, -1, 0, 3) + .attr(PreUseInterruptAttr, (user, target, move) => i18next.t("moveTriggers:lostFocus", { pokemonName: getPokemonNameWithAffix(user) }), user => !!user.turnData.attacksReceived.find(r => r.damage)) + .punchingMove(), + new AttackMove(Moves.SMELLING_SALTS, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 10, -1, 0, 3) .attr(MovePowerMultiplierAttr, (user, target, move) => target.status?.effect === StatusEffect.PARALYSIS ? 2 : 1) .attr(HealStatusEffectAttr, true, StatusEffect.PARALYSIS), - new SelfStatusMove(Moves.FOLLOW_ME, Type.NORMAL, -1, 20, -1, 2, 3) + new SelfStatusMove(Moves.FOLLOW_ME, PokemonType.NORMAL, -1, 20, -1, 2, 3) .attr(AddBattlerTagAttr, BattlerTagType.CENTER_OF_ATTENTION, true), - new StatusMove(Moves.NATURE_POWER, Type.NORMAL, -1, 20, -1, 0, 3) + new StatusMove(Moves.NATURE_POWER, PokemonType.NORMAL, -1, 20, -1, 0, 3) .attr(NaturePowerAttr), - new SelfStatusMove(Moves.CHARGE, Type.ELECTRIC, -1, 20, -1, 0, 3) + new SelfStatusMove(Moves.CHARGE, PokemonType.ELECTRIC, -1, 20, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPDEF ], 1, true) .attr(AddBattlerTagAttr, BattlerTagType.CHARGED, true, false), - new StatusMove(Moves.TAUNT, Type.DARK, 100, 20, -1, 0, 3) + new StatusMove(Moves.TAUNT, PokemonType.DARK, 100, 20, -1, 0, 3) .ignoresSubstitute() - .attr(AddBattlerTagAttr, BattlerTagType.TAUNT, false, true, 4), - new StatusMove(Moves.HELPING_HAND, Type.NORMAL, -1, 20, -1, 5, 3) + .attr(AddBattlerTagAttr, BattlerTagType.TAUNT, false, true, 4) + .reflectable(), + new StatusMove(Moves.HELPING_HAND, PokemonType.NORMAL, -1, 20, -1, 5, 3) .attr(AddBattlerTagAttr, BattlerTagType.HELPING_HAND) .ignoresSubstitute() .target(MoveTarget.NEAR_ALLY) .condition(failIfSingleBattle), - new StatusMove(Moves.TRICK, Type.PSYCHIC, 100, 10, -1, 0, 3) + new StatusMove(Moves.TRICK, PokemonType.PSYCHIC, 100, 10, -1, 0, 3) .unimplemented(), - new StatusMove(Moves.ROLE_PLAY, Type.PSYCHIC, -1, 10, -1, 0, 3) + new StatusMove(Moves.ROLE_PLAY, PokemonType.PSYCHIC, -1, 10, -1, 0, 3) .ignoresSubstitute() .attr(AbilityCopyAttr), - new SelfStatusMove(Moves.WISH, Type.NORMAL, -1, 10, -1, 0, 3) + new SelfStatusMove(Moves.WISH, PokemonType.NORMAL, -1, 10, -1, 0, 3) .triageMove() .attr(AddArenaTagAttr, ArenaTagType.WISH, 2, true), - new SelfStatusMove(Moves.ASSIST, Type.NORMAL, -1, 20, -1, 0, 3) + new SelfStatusMove(Moves.ASSIST, PokemonType.NORMAL, -1, 20, -1, 0, 3) .attr(RandomMovesetMoveAttr, invalidAssistMoves, true), - new SelfStatusMove(Moves.INGRAIN, Type.GRASS, -1, 20, -1, 0, 3) + new SelfStatusMove(Moves.INGRAIN, PokemonType.GRASS, -1, 20, -1, 0, 3) .attr(AddBattlerTagAttr, BattlerTagType.INGRAIN, true, true) .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, true, true) .attr(RemoveBattlerTagAttr, [ BattlerTagType.FLOATING ], true), - new AttackMove(Moves.SUPERPOWER, Type.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 3) + new AttackMove(Moves.SUPERPOWER, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], -1, true), - new SelfStatusMove(Moves.MAGIC_COAT, Type.PSYCHIC, -1, 15, -1, 4, 3) + new SelfStatusMove(Moves.MAGIC_COAT, PokemonType.PSYCHIC, -1, 15, -1, 4, 3) + .attr(AddBattlerTagAttr, BattlerTagType.MAGIC_COAT, true, true, 0) + .condition(failIfLastCondition) + // Interactions with stomping tantrum, instruct, and other moves that + // rely on move history + // Also will not reflect roar / whirlwind if the target has ForceSwitchOutImmunityAbAttr + .edgeCase(), + new SelfStatusMove(Moves.RECYCLE, PokemonType.NORMAL, -1, 10, -1, 0, 3) .unimplemented(), - new SelfStatusMove(Moves.RECYCLE, Type.NORMAL, -1, 10, -1, 0, 3) - .unimplemented(), - new AttackMove(Moves.REVENGE, Type.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, -1, -4, 3) + new AttackMove(Moves.REVENGE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, -1, -4, 3) .attr(TurnDamagedDoublePowerAttr), - new AttackMove(Moves.BRICK_BREAK, Type.FIGHTING, MoveCategory.PHYSICAL, 75, 100, 15, -1, 0, 3) + new AttackMove(Moves.BRICK_BREAK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 75, 100, 15, -1, 0, 3) .attr(RemoveScreensAttr), - new StatusMove(Moves.YAWN, Type.NORMAL, -1, 10, -1, 0, 3) + new StatusMove(Moves.YAWN, PokemonType.NORMAL, -1, 10, -1, 0, 3) .attr(AddBattlerTagAttr, BattlerTagType.DROWSY, false, true) - .condition((user, target, move) => !target.status && !target.isSafeguarded(user)), - new AttackMove(Moves.KNOCK_OFF, Type.DARK, MoveCategory.PHYSICAL, 65, 100, 20, -1, 0, 3) + .condition((user, target, move) => !target.status && !target.isSafeguarded(user)) + .reflectable(), + new AttackMove(Moves.KNOCK_OFF, PokemonType.DARK, MoveCategory.PHYSICAL, 65, 100, 20, -1, 0, 3) .attr(MovePowerMultiplierAttr, (user, target, move) => target.getHeldItems().filter(i => i.isTransferable).length > 0 ? 1.5 : 1) .attr(RemoveHeldItemAttr, false), - new AttackMove(Moves.ENDEAVOR, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 3) + new AttackMove(Moves.ENDEAVOR, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 3) .attr(MatchHpAttr) .condition(failOnBossCondition), - new AttackMove(Moves.ERUPTION, Type.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 3) + new AttackMove(Moves.ERUPTION, PokemonType.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 3) .attr(HpPowerAttr) .target(MoveTarget.ALL_NEAR_ENEMIES), - new StatusMove(Moves.SKILL_SWAP, Type.PSYCHIC, -1, 10, -1, 0, 3) + new StatusMove(Moves.SKILL_SWAP, PokemonType.PSYCHIC, -1, 10, -1, 0, 3) .ignoresSubstitute() .attr(SwitchAbilitiesAttr), - new StatusMove(Moves.IMPRISON, Type.PSYCHIC, 100, 10, -1, 0, 3) + new StatusMove(Moves.IMPRISON, PokemonType.PSYCHIC, 100, 10, -1, 0, 3) .ignoresSubstitute() .attr(AddArenaTagAttr, ArenaTagType.IMPRISON, 1, true, false) .target(MoveTarget.ENEMY_SIDE), - new SelfStatusMove(Moves.REFRESH, Type.NORMAL, -1, 20, -1, 0, 3) + new SelfStatusMove(Moves.REFRESH, PokemonType.NORMAL, -1, 20, -1, 0, 3) .attr(HealStatusEffectAttr, true, [ StatusEffect.PARALYSIS, StatusEffect.POISON, StatusEffect.TOXIC, StatusEffect.BURN ]) .condition((user, target, move) => !!user.status && (user.status.effect === StatusEffect.PARALYSIS || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.BURN)), - new SelfStatusMove(Moves.GRUDGE, Type.GHOST, -1, 5, -1, 0, 3) + new SelfStatusMove(Moves.GRUDGE, PokemonType.GHOST, -1, 5, -1, 0, 3) .attr(AddBattlerTagAttr, BattlerTagType.GRUDGE, true, undefined, 1), - new SelfStatusMove(Moves.SNATCH, Type.DARK, -1, 10, -1, 4, 3) + new SelfStatusMove(Moves.SNATCH, PokemonType.DARK, -1, 10, -1, 4, 3) .unimplemented(), - new AttackMove(Moves.SECRET_POWER, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, 30, 0, 3) + new AttackMove(Moves.SECRET_POWER, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, 30, 0, 3) .makesContact(false) .attr(SecretPowerAttr), - new ChargingAttackMove(Moves.DIVE, Type.WATER, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 3) + new ChargingAttackMove(Moves.DIVE, PokemonType.WATER, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 3) .chargeText(i18next.t("moveTriggers:hidUnderwater", { pokemonName: "{USER}" })) .chargeAttr(SemiInvulnerableAttr, BattlerTagType.UNDERWATER) .chargeAttr(GulpMissileTagAttr), - new AttackMove(Moves.ARM_THRUST, Type.FIGHTING, MoveCategory.PHYSICAL, 15, 100, 20, -1, 0, 3) + new AttackMove(Moves.ARM_THRUST, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 15, 100, 20, -1, 0, 3) .attr(MultiHitAttr), - new SelfStatusMove(Moves.CAMOUFLAGE, Type.NORMAL, -1, 20, -1, 0, 3) + new SelfStatusMove(Moves.CAMOUFLAGE, PokemonType.NORMAL, -1, 20, -1, 0, 3) .attr(CopyBiomeTypeAttr), - new SelfStatusMove(Moves.TAIL_GLOW, Type.BUG, -1, 20, -1, 0, 3) + new SelfStatusMove(Moves.TAIL_GLOW, PokemonType.BUG, -1, 20, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPATK ], 3, true), - new AttackMove(Moves.LUSTER_PURGE, Type.PSYCHIC, MoveCategory.SPECIAL, 95, 100, 5, 50, 0, 3) + new AttackMove(Moves.LUSTER_PURGE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 95, 100, 5, 50, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1), - new AttackMove(Moves.MIST_BALL, Type.PSYCHIC, MoveCategory.SPECIAL, 95, 100, 5, 50, 0, 3) + new AttackMove(Moves.MIST_BALL, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 95, 100, 5, 50, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPATK ], -1) .ballBombMove(), - new StatusMove(Moves.FEATHER_DANCE, Type.FLYING, 100, 15, -1, 0, 3) + new StatusMove(Moves.FEATHER_DANCE, PokemonType.FLYING, 100, 15, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.ATK ], -2) - .danceMove(), - new StatusMove(Moves.TEETER_DANCE, Type.NORMAL, 100, 20, -1, 0, 3) + .danceMove() + .reflectable(), + new StatusMove(Moves.TEETER_DANCE, PokemonType.NORMAL, 100, 20, -1, 0, 3) .attr(ConfuseAttr) .danceMove() .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.BLAZE_KICK, Type.FIRE, MoveCategory.PHYSICAL, 85, 90, 10, 10, 0, 3) + new AttackMove(Moves.BLAZE_KICK, PokemonType.FIRE, MoveCategory.PHYSICAL, 85, 90, 10, 10, 0, 3) .attr(HighCritAttr) .attr(StatusEffectAttr, StatusEffect.BURN), - new StatusMove(Moves.MUD_SPORT, Type.GROUND, -1, 15, -1, 0, 3) + new StatusMove(Moves.MUD_SPORT, PokemonType.GROUND, -1, 15, -1, 0, 3) .ignoresProtect() .attr(AddArenaTagAttr, ArenaTagType.MUD_SPORT, 5) .target(MoveTarget.BOTH_SIDES), - new AttackMove(Moves.ICE_BALL, Type.ICE, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 3) + new AttackMove(Moves.ICE_BALL, PokemonType.ICE, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 3) .partial() // Does not lock the user properly, does not increase damage correctly .attr(ConsecutiveUseDoublePowerAttr, 5, true, true, Moves.DEFENSE_CURL) .ballBombMove(), - new AttackMove(Moves.NEEDLE_ARM, Type.GRASS, MoveCategory.PHYSICAL, 60, 100, 15, 30, 0, 3) + new AttackMove(Moves.NEEDLE_ARM, PokemonType.GRASS, MoveCategory.PHYSICAL, 60, 100, 15, 30, 0, 3) .attr(FlinchAttr), - new SelfStatusMove(Moves.SLACK_OFF, Type.NORMAL, -1, 5, -1, 0, 3) + new SelfStatusMove(Moves.SLACK_OFF, PokemonType.NORMAL, -1, 5, -1, 0, 3) .attr(HealAttr, 0.5) .triageMove(), - new AttackMove(Moves.HYPER_VOICE, Type.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3) + new AttackMove(Moves.HYPER_VOICE, PokemonType.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3) .soundBased() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.POISON_FANG, Type.POISON, MoveCategory.PHYSICAL, 50, 100, 15, 50, 0, 3) + new AttackMove(Moves.POISON_FANG, PokemonType.POISON, MoveCategory.PHYSICAL, 50, 100, 15, 50, 0, 3) .attr(StatusEffectAttr, StatusEffect.TOXIC) .bitingMove(), - new AttackMove(Moves.CRUSH_CLAW, Type.NORMAL, MoveCategory.PHYSICAL, 75, 95, 10, 50, 0, 3) + new AttackMove(Moves.CRUSH_CLAW, PokemonType.NORMAL, MoveCategory.PHYSICAL, 75, 95, 10, 50, 0, 3) .attr(StatStageChangeAttr, [ Stat.DEF ], -1), - new AttackMove(Moves.BLAST_BURN, Type.FIRE, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3) + new AttackMove(Moves.BLAST_BURN, PokemonType.FIRE, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3) .attr(RechargeAttr), - new AttackMove(Moves.HYDRO_CANNON, Type.WATER, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3) + new AttackMove(Moves.HYDRO_CANNON, PokemonType.WATER, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3) .attr(RechargeAttr), - new AttackMove(Moves.METEOR_MASH, Type.STEEL, MoveCategory.PHYSICAL, 90, 90, 10, 20, 0, 3) + new AttackMove(Moves.METEOR_MASH, PokemonType.STEEL, MoveCategory.PHYSICAL, 90, 90, 10, 20, 0, 3) .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true) .punchingMove(), - new AttackMove(Moves.ASTONISH, Type.GHOST, MoveCategory.PHYSICAL, 30, 100, 15, 30, 0, 3) + new AttackMove(Moves.ASTONISH, PokemonType.GHOST, MoveCategory.PHYSICAL, 30, 100, 15, 30, 0, 3) .attr(FlinchAttr), - new AttackMove(Moves.WEATHER_BALL, Type.NORMAL, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 3) + new AttackMove(Moves.WEATHER_BALL, PokemonType.NORMAL, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 3) .attr(WeatherBallTypeAttr) .attr(MovePowerMultiplierAttr, (user, target, move) => [ WeatherType.SUNNY, WeatherType.RAIN, WeatherType.SANDSTORM, WeatherType.HAIL, WeatherType.SNOW, WeatherType.FOG, WeatherType.HEAVY_RAIN, WeatherType.HARSH_SUN ].includes(globalScene.arena.weather?.weatherType!) && !globalScene.arena.weather?.isEffectSuppressed() ? 2 : 1) // TODO: is this bang correct? .ballBombMove(), - new StatusMove(Moves.AROMATHERAPY, Type.GRASS, -1, 5, -1, 0, 3) + new StatusMove(Moves.AROMATHERAPY, PokemonType.GRASS, -1, 5, -1, 0, 3) .attr(PartyStatusCureAttr, i18next.t("moveTriggers:soothingAromaWaftedThroughArea"), Abilities.SAP_SIPPER) .target(MoveTarget.PARTY), - new StatusMove(Moves.FAKE_TEARS, Type.DARK, 100, 20, -1, 0, 3) - .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2), - new AttackMove(Moves.AIR_CUTTER, Type.FLYING, MoveCategory.SPECIAL, 60, 95, 25, -1, 0, 3) + new StatusMove(Moves.FAKE_TEARS, PokemonType.DARK, 100, 20, -1, 0, 3) + .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2) + .reflectable(), + new AttackMove(Moves.AIR_CUTTER, PokemonType.FLYING, MoveCategory.SPECIAL, 60, 95, 25, -1, 0, 3) .attr(HighCritAttr) .slicingMove() .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.OVERHEAT, Type.FIRE, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 3) + new AttackMove(Moves.OVERHEAT, PokemonType.FIRE, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE), - new StatusMove(Moves.ODOR_SLEUTH, Type.NORMAL, -1, 40, -1, 0, 3) + new StatusMove(Moves.ODOR_SLEUTH, PokemonType.NORMAL, -1, 40, -1, 0, 3) .attr(ExposedMoveAttr, BattlerTagType.IGNORE_GHOST) - .ignoresSubstitute(), - new AttackMove(Moves.ROCK_TOMB, Type.ROCK, MoveCategory.PHYSICAL, 60, 95, 15, 100, 0, 3) + .ignoresSubstitute() + .reflectable(), + new AttackMove(Moves.ROCK_TOMB, PokemonType.ROCK, MoveCategory.PHYSICAL, 60, 95, 15, 100, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPD ], -1) .makesContact(false), - new AttackMove(Moves.SILVER_WIND, Type.BUG, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 3) + new AttackMove(Moves.SILVER_WIND, PokemonType.BUG, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 3) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true) .windMove(), - new StatusMove(Moves.METAL_SOUND, Type.STEEL, 85, 40, -1, 0, 3) + new StatusMove(Moves.METAL_SOUND, PokemonType.STEEL, 85, 40, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2) - .soundBased(), - new StatusMove(Moves.GRASS_WHISTLE, Type.GRASS, 55, 15, -1, 0, 3) + .soundBased() + .reflectable(), + new StatusMove(Moves.GRASS_WHISTLE, PokemonType.GRASS, 55, 15, -1, 0, 3) .attr(StatusEffectAttr, StatusEffect.SLEEP) - .soundBased(), - new StatusMove(Moves.TICKLE, Type.NORMAL, 100, 20, -1, 0, 3) - .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], -1), - new SelfStatusMove(Moves.COSMIC_POWER, Type.PSYCHIC, -1, 20, -1, 0, 3) + .soundBased() + .reflectable(), + new StatusMove(Moves.TICKLE, PokemonType.NORMAL, 100, 20, -1, 0, 3) + .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], -1) + .reflectable(), + new SelfStatusMove(Moves.COSMIC_POWER, PokemonType.PSYCHIC, -1, 20, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], 1, true), - new AttackMove(Moves.WATER_SPOUT, Type.WATER, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 3) + new AttackMove(Moves.WATER_SPOUT, PokemonType.WATER, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 3) .attr(HpPowerAttr) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.SIGNAL_BEAM, Type.BUG, MoveCategory.SPECIAL, 75, 100, 15, 10, 0, 3) + new AttackMove(Moves.SIGNAL_BEAM, PokemonType.BUG, MoveCategory.SPECIAL, 75, 100, 15, 10, 0, 3) .attr(ConfuseAttr), - new AttackMove(Moves.SHADOW_PUNCH, Type.GHOST, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 3) + new AttackMove(Moves.SHADOW_PUNCH, PokemonType.GHOST, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 3) .punchingMove(), - new AttackMove(Moves.EXTRASENSORY, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 20, 10, 0, 3) + new AttackMove(Moves.EXTRASENSORY, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 20, 10, 0, 3) .attr(FlinchAttr), - new AttackMove(Moves.SKY_UPPERCUT, Type.FIGHTING, MoveCategory.PHYSICAL, 85, 90, 15, -1, 0, 3) + new AttackMove(Moves.SKY_UPPERCUT, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 85, 90, 15, -1, 0, 3) .attr(HitsTagAttr, BattlerTagType.FLYING) .punchingMove(), - new AttackMove(Moves.SAND_TOMB, Type.GROUND, MoveCategory.PHYSICAL, 35, 85, 15, -1, 0, 3) + new AttackMove(Moves.SAND_TOMB, PokemonType.GROUND, MoveCategory.PHYSICAL, 35, 85, 15, -1, 0, 3) .attr(TrapAttr, BattlerTagType.SAND_TOMB) .makesContact(false), - new AttackMove(Moves.SHEER_COLD, Type.ICE, MoveCategory.SPECIAL, 200, 20, 5, -1, 0, 3) + new AttackMove(Moves.SHEER_COLD, PokemonType.ICE, MoveCategory.SPECIAL, 200, 20, 5, -1, 0, 3) .attr(IceNoEffectTypeAttr) .attr(OneHitKOAttr) .attr(SheerColdAccuracyAttr), - new AttackMove(Moves.MUDDY_WATER, Type.WATER, MoveCategory.SPECIAL, 90, 85, 10, 30, 0, 3) + new AttackMove(Moves.MUDDY_WATER, PokemonType.WATER, MoveCategory.SPECIAL, 90, 85, 10, 30, 0, 3) .attr(StatStageChangeAttr, [ Stat.ACC ], -1) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.BULLET_SEED, Type.GRASS, MoveCategory.PHYSICAL, 25, 100, 30, -1, 0, 3) + new AttackMove(Moves.BULLET_SEED, PokemonType.GRASS, MoveCategory.PHYSICAL, 25, 100, 30, -1, 0, 3) .attr(MultiHitAttr) .makesContact(false) .ballBombMove(), - new AttackMove(Moves.AERIAL_ACE, Type.FLYING, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 3) + new AttackMove(Moves.AERIAL_ACE, PokemonType.FLYING, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 3) .slicingMove(), - new AttackMove(Moves.ICICLE_SPEAR, Type.ICE, MoveCategory.PHYSICAL, 25, 100, 30, -1, 0, 3) + new AttackMove(Moves.ICICLE_SPEAR, PokemonType.ICE, MoveCategory.PHYSICAL, 25, 100, 30, -1, 0, 3) .attr(MultiHitAttr) .makesContact(false), - new SelfStatusMove(Moves.IRON_DEFENSE, Type.STEEL, -1, 15, -1, 0, 3) + new SelfStatusMove(Moves.IRON_DEFENSE, PokemonType.STEEL, -1, 15, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true), - new StatusMove(Moves.BLOCK, Type.NORMAL, -1, 5, -1, 0, 3) + new StatusMove(Moves.BLOCK, PokemonType.NORMAL, -1, 5, -1, 0, 3) .condition(failIfGhostTypeCondition) - .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1), - new StatusMove(Moves.HOWL, Type.NORMAL, -1, 40, -1, 0, 3) + .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1) + .reflectable(), + new StatusMove(Moves.HOWL, PokemonType.NORMAL, -1, 40, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.ATK ], 1) .soundBased() .target(MoveTarget.USER_AND_ALLIES), - new AttackMove(Moves.DRAGON_CLAW, Type.DRAGON, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 3), - new AttackMove(Moves.FRENZY_PLANT, Type.GRASS, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3) + new AttackMove(Moves.DRAGON_CLAW, PokemonType.DRAGON, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 3), + new AttackMove(Moves.FRENZY_PLANT, PokemonType.GRASS, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3) .attr(RechargeAttr), - new SelfStatusMove(Moves.BULK_UP, Type.FIGHTING, -1, 20, -1, 0, 3) + new SelfStatusMove(Moves.BULK_UP, PokemonType.FIGHTING, -1, 20, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], 1, true), - new ChargingAttackMove(Moves.BOUNCE, Type.FLYING, MoveCategory.PHYSICAL, 85, 85, 5, 30, 0, 3) + new ChargingAttackMove(Moves.BOUNCE, PokemonType.FLYING, MoveCategory.PHYSICAL, 85, 85, 5, 30, 0, 3) .chargeText(i18next.t("moveTriggers:sprangUp", { pokemonName: "{USER}" })) .chargeAttr(SemiInvulnerableAttr, BattlerTagType.FLYING) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .condition(failOnGravityCondition), - new AttackMove(Moves.MUD_SHOT, Type.GROUND, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 3) + new AttackMove(Moves.MUD_SHOT, PokemonType.GROUND, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPD ], -1), - new AttackMove(Moves.POISON_TAIL, Type.POISON, MoveCategory.PHYSICAL, 50, 100, 25, 10, 0, 3) + new AttackMove(Moves.POISON_TAIL, PokemonType.POISON, MoveCategory.PHYSICAL, 50, 100, 25, 10, 0, 3) .attr(HighCritAttr) .attr(StatusEffectAttr, StatusEffect.POISON), - new AttackMove(Moves.COVET, Type.NORMAL, MoveCategory.PHYSICAL, 60, 100, 25, -1, 0, 3) + new AttackMove(Moves.COVET, PokemonType.NORMAL, MoveCategory.PHYSICAL, 60, 100, 25, -1, 0, 3) .attr(StealHeldItemChanceAttr, 0.3), - new AttackMove(Moves.VOLT_TACKLE, Type.ELECTRIC, MoveCategory.PHYSICAL, 120, 100, 15, 10, 0, 3) + new AttackMove(Moves.VOLT_TACKLE, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 120, 100, 15, 10, 0, 3) .attr(RecoilAttr, false, 0.33) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .recklessMove(), - new AttackMove(Moves.MAGICAL_LEAF, Type.GRASS, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 3), - new StatusMove(Moves.WATER_SPORT, Type.WATER, -1, 15, -1, 0, 3) + new AttackMove(Moves.MAGICAL_LEAF, PokemonType.GRASS, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 3), + new StatusMove(Moves.WATER_SPORT, PokemonType.WATER, -1, 15, -1, 0, 3) .ignoresProtect() .attr(AddArenaTagAttr, ArenaTagType.WATER_SPORT, 5) .target(MoveTarget.BOTH_SIDES), - new SelfStatusMove(Moves.CALM_MIND, Type.PSYCHIC, -1, 20, -1, 0, 3) + new SelfStatusMove(Moves.CALM_MIND, PokemonType.PSYCHIC, -1, 20, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPATK, Stat.SPDEF ], 1, true), - new AttackMove(Moves.LEAF_BLADE, Type.GRASS, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 3) + new AttackMove(Moves.LEAF_BLADE, PokemonType.GRASS, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 3) .attr(HighCritAttr) .slicingMove(), - new SelfStatusMove(Moves.DRAGON_DANCE, Type.DRAGON, -1, 20, -1, 0, 3) + new SelfStatusMove(Moves.DRAGON_DANCE, PokemonType.DRAGON, -1, 20, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPD ], 1, true) .danceMove(), - new AttackMove(Moves.ROCK_BLAST, Type.ROCK, MoveCategory.PHYSICAL, 25, 90, 10, -1, 0, 3) + new AttackMove(Moves.ROCK_BLAST, PokemonType.ROCK, MoveCategory.PHYSICAL, 25, 90, 10, -1, 0, 3) .attr(MultiHitAttr) .makesContact(false) .ballBombMove(), - new AttackMove(Moves.SHOCK_WAVE, Type.ELECTRIC, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 3), - new AttackMove(Moves.WATER_PULSE, Type.WATER, MoveCategory.SPECIAL, 60, 100, 20, 20, 0, 3) + new AttackMove(Moves.SHOCK_WAVE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 3), + new AttackMove(Moves.WATER_PULSE, PokemonType.WATER, MoveCategory.SPECIAL, 60, 100, 20, 20, 0, 3) .attr(ConfuseAttr) .pulseMove(), - new AttackMove(Moves.DOOM_DESIRE, Type.STEEL, MoveCategory.SPECIAL, 140, 100, 5, -1, 0, 3) + new AttackMove(Moves.DOOM_DESIRE, PokemonType.STEEL, MoveCategory.SPECIAL, 140, 100, 5, -1, 0, 3) .partial() // cannot be used on multiple Pokemon on the same side in a double battle, hits immediately when called by Metronome/etc, should not apply abilities or held items if user is off the field .ignoresProtect() .attr(DelayedAttackAttr, ArenaTagType.DOOM_DESIRE, ChargeAnim.DOOM_DESIRE_CHARGING, i18next.t("moveTriggers:choseDoomDesireAsDestiny", { pokemonName: "{USER}" })), - new AttackMove(Moves.PSYCHO_BOOST, Type.PSYCHIC, MoveCategory.SPECIAL, 140, 90, 5, -1, 0, 3) + new AttackMove(Moves.PSYCHO_BOOST, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 140, 90, 5, -1, 0, 3) .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true), - new SelfStatusMove(Moves.ROOST, Type.FLYING, -1, 5, -1, 0, 4) + new SelfStatusMove(Moves.ROOST, PokemonType.FLYING, -1, 5, -1, 0, 4) .attr(HealAttr, 0.5) .attr(AddBattlerTagAttr, BattlerTagType.ROOSTED, true, false) .triageMove(), - new StatusMove(Moves.GRAVITY, Type.PSYCHIC, -1, 5, -1, 0, 4) + new StatusMove(Moves.GRAVITY, PokemonType.PSYCHIC, -1, 5, -1, 0, 4) .ignoresProtect() .attr(AddArenaTagAttr, ArenaTagType.GRAVITY, 5) .target(MoveTarget.BOTH_SIDES), - new StatusMove(Moves.MIRACLE_EYE, Type.PSYCHIC, -1, 40, -1, 0, 4) + new StatusMove(Moves.MIRACLE_EYE, PokemonType.PSYCHIC, -1, 40, -1, 0, 4) .attr(ExposedMoveAttr, BattlerTagType.IGNORE_DARK) - .ignoresSubstitute(), - new AttackMove(Moves.WAKE_UP_SLAP, Type.FIGHTING, MoveCategory.PHYSICAL, 70, 100, 10, -1, 0, 4) + .ignoresSubstitute() + .reflectable(), + new AttackMove(Moves.WAKE_UP_SLAP, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 70, 100, 10, -1, 0, 4) .attr(MovePowerMultiplierAttr, (user, target, move) => targetSleptOrComatoseCondition(user, target, move) ? 2 : 1) .attr(HealStatusEffectAttr, false, StatusEffect.SLEEP), - new AttackMove(Moves.HAMMER_ARM, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 4) + new AttackMove(Moves.HAMMER_ARM, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPD ], -1, true) .punchingMove(), - new AttackMove(Moves.GYRO_BALL, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4) + new AttackMove(Moves.GYRO_BALL, PokemonType.STEEL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4) .attr(GyroBallPowerAttr) .ballBombMove(), - new SelfStatusMove(Moves.HEALING_WISH, Type.PSYCHIC, -1, 10, -1, 0, 4) + new SelfStatusMove(Moves.HEALING_WISH, PokemonType.PSYCHIC, -1, 10, -1, 0, 4) .attr(SacrificialFullRestoreAttr, false, "moveTriggers:sacrificialFullRestore") - .triageMove(), - new AttackMove(Moves.BRINE, Type.WATER, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 4) + .triageMove() + .condition(failIfLastInPartyCondition), + new AttackMove(Moves.BRINE, PokemonType.WATER, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 4) .attr(MovePowerMultiplierAttr, (user, target, move) => target.getHpRatio() < 0.5 ? 2 : 1), - new AttackMove(Moves.NATURAL_GIFT, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 4) + new AttackMove(Moves.NATURAL_GIFT, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 4) .makesContact(false) .unimplemented(), - new AttackMove(Moves.FEINT, Type.NORMAL, MoveCategory.PHYSICAL, 30, 100, 10, -1, 2, 4) + new AttackMove(Moves.FEINT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 30, 100, 10, -1, 2, 4) .attr(RemoveBattlerTagAttr, [ BattlerTagType.PROTECTED ]) .attr(RemoveArenaTagsAttr, [ ArenaTagType.QUICK_GUARD, ArenaTagType.WIDE_GUARD, ArenaTagType.MAT_BLOCK, ArenaTagType.CRAFTY_SHIELD ], false) .makesContact(false) .ignoresProtect(), - new AttackMove(Moves.PLUCK, Type.FLYING, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 4) + new AttackMove(Moves.PLUCK, PokemonType.FLYING, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 4) .attr(StealEatBerryAttr), - new StatusMove(Moves.TAILWIND, Type.FLYING, -1, 15, -1, 0, 4) + new StatusMove(Moves.TAILWIND, PokemonType.FLYING, -1, 15, -1, 0, 4) .windMove() .attr(AddArenaTagAttr, ArenaTagType.TAILWIND, 4, true) .target(MoveTarget.USER_SIDE), - new StatusMove(Moves.ACUPRESSURE, Type.NORMAL, -1, 30, -1, 0, 4) + new StatusMove(Moves.ACUPRESSURE, PokemonType.NORMAL, -1, 30, -1, 0, 4) .attr(AcupressureStatStageChangeAttr) .target(MoveTarget.USER_OR_NEAR_ALLY), - new AttackMove(Moves.METAL_BURST, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 4) + new AttackMove(Moves.METAL_BURST, PokemonType.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 4) .attr(CounterDamageAttr, (move: Move) => (move.category === MoveCategory.PHYSICAL || move.category === MoveCategory.SPECIAL), 1.5) .redirectCounter() .makesContact(false) .target(MoveTarget.ATTACKER), - new AttackMove(Moves.U_TURN, Type.BUG, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 4) + new AttackMove(Moves.U_TURN, PokemonType.BUG, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 4) .attr(ForceSwitchOutAttr, true), - new AttackMove(Moves.CLOSE_COMBAT, Type.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 4) + new AttackMove(Moves.CLOSE_COMBAT, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 4) .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true), - new AttackMove(Moves.PAYBACK, Type.DARK, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 4) + new AttackMove(Moves.PAYBACK, PokemonType.DARK, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 4) .attr(MovePowerMultiplierAttr, (user, target, move) => target.getLastXMoves(1).find(m => m.turn === globalScene.currentBattle.turn) || globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.BALL ? 2 : 1), - new AttackMove(Moves.ASSURANCE, Type.DARK, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 4) + new AttackMove(Moves.ASSURANCE, PokemonType.DARK, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 4) .attr(MovePowerMultiplierAttr, (user, target, move) => target.turnData.damageTaken > 0 ? 2 : 1), - new StatusMove(Moves.EMBARGO, Type.DARK, 100, 15, -1, 0, 4) + new StatusMove(Moves.EMBARGO, PokemonType.DARK, 100, 15, -1, 0, 4) + .reflectable() .unimplemented(), - new AttackMove(Moves.FLING, Type.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 4) + new AttackMove(Moves.FLING, PokemonType.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 4) .makesContact(false) .unimplemented(), - new StatusMove(Moves.PSYCHO_SHIFT, Type.PSYCHIC, 100, 10, -1, 0, 4) + new StatusMove(Moves.PSYCHO_SHIFT, PokemonType.PSYCHIC, 100, 10, -1, 0, 4) .attr(PsychoShiftEffectAttr) .condition((user, target, move) => { let statusToApply = user.hasAbility(Abilities.COMATOSE) ? StatusEffect.SLEEP : undefined; @@ -9377,397 +9354,412 @@ export function initMoves() { return !!statusToApply && target.canSetStatus(statusToApply, false, false, user); } ), - new AttackMove(Moves.TRUMP_CARD, Type.NORMAL, MoveCategory.SPECIAL, -1, -1, 5, -1, 0, 4) + new AttackMove(Moves.TRUMP_CARD, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, -1, 5, -1, 0, 4) .makesContact() .attr(LessPPMorePowerAttr), - new StatusMove(Moves.HEAL_BLOCK, Type.PSYCHIC, 100, 15, -1, 0, 4) + new StatusMove(Moves.HEAL_BLOCK, PokemonType.PSYCHIC, 100, 15, -1, 0, 4) .attr(AddBattlerTagAttr, BattlerTagType.HEAL_BLOCK, false, true, 5) - .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.WRING_OUT, Type.NORMAL, MoveCategory.SPECIAL, -1, 100, 5, -1, 0, 4) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new AttackMove(Moves.WRING_OUT, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, 100, 5, -1, 0, 4) .attr(OpponentHighHpPowerAttr, 120) .makesContact(), - new SelfStatusMove(Moves.POWER_TRICK, Type.PSYCHIC, -1, 10, -1, 0, 4) + new SelfStatusMove(Moves.POWER_TRICK, PokemonType.PSYCHIC, -1, 10, -1, 0, 4) .attr(AddBattlerTagAttr, BattlerTagType.POWER_TRICK, true), - new StatusMove(Moves.GASTRO_ACID, Type.POISON, 100, 10, -1, 0, 4) - .attr(SuppressAbilitiesAttr), - new StatusMove(Moves.LUCKY_CHANT, Type.NORMAL, -1, 30, -1, 0, 4) + new StatusMove(Moves.GASTRO_ACID, PokemonType.POISON, 100, 10, -1, 0, 4) + .attr(SuppressAbilitiesAttr) + .reflectable(), + new StatusMove(Moves.LUCKY_CHANT, PokemonType.NORMAL, -1, 30, -1, 0, 4) .attr(AddArenaTagAttr, ArenaTagType.NO_CRIT, 5, true, true) .target(MoveTarget.USER_SIDE), - new StatusMove(Moves.ME_FIRST, Type.NORMAL, -1, 20, -1, 0, 4) + new StatusMove(Moves.ME_FIRST, PokemonType.NORMAL, -1, 20, -1, 0, 4) .ignoresSubstitute() .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new SelfStatusMove(Moves.COPYCAT, Type.NORMAL, -1, 20, -1, 0, 4) + new SelfStatusMove(Moves.COPYCAT, PokemonType.NORMAL, -1, 20, -1, 0, 4) .attr(CopyMoveAttr, false, invalidCopycatMoves), - new StatusMove(Moves.POWER_SWAP, Type.PSYCHIC, -1, 10, 100, 0, 4) + new StatusMove(Moves.POWER_SWAP, PokemonType.PSYCHIC, -1, 10, 100, 0, 4) .attr(SwapStatStagesAttr, [ Stat.ATK, Stat.SPATK ]) .ignoresSubstitute(), - new StatusMove(Moves.GUARD_SWAP, Type.PSYCHIC, -1, 10, 100, 0, 4) + new StatusMove(Moves.GUARD_SWAP, PokemonType.PSYCHIC, -1, 10, 100, 0, 4) .attr(SwapStatStagesAttr, [ Stat.DEF, Stat.SPDEF ]) .ignoresSubstitute(), - new AttackMove(Moves.PUNISHMENT, Type.DARK, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4) + new AttackMove(Moves.PUNISHMENT, PokemonType.DARK, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4) .makesContact(true) .attr(PunishmentPowerAttr), - new AttackMove(Moves.LAST_RESORT, Type.NORMAL, MoveCategory.PHYSICAL, 140, 100, 5, -1, 0, 4) + new AttackMove(Moves.LAST_RESORT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 140, 100, 5, -1, 0, 4) .attr(LastResortAttr), - new StatusMove(Moves.WORRY_SEED, Type.GRASS, 100, 10, -1, 0, 4) - .attr(AbilityChangeAttr, Abilities.INSOMNIA), - new AttackMove(Moves.SUCKER_PUNCH, Type.DARK, MoveCategory.PHYSICAL, 70, 100, 5, -1, 1, 4) + new StatusMove(Moves.WORRY_SEED, PokemonType.GRASS, 100, 10, -1, 0, 4) + .attr(AbilityChangeAttr, Abilities.INSOMNIA) + .reflectable(), + new AttackMove(Moves.SUCKER_PUNCH, PokemonType.DARK, MoveCategory.PHYSICAL, 70, 100, 5, -1, 1, 4) .condition((user, target, move) => globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.FIGHT && !target.turnData.acted && allMoves[globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.move?.move!].category !== MoveCategory.STATUS), // TODO: is this bang correct? - new StatusMove(Moves.TOXIC_SPIKES, Type.POISON, -1, 20, -1, 0, 4) + new StatusMove(Moves.TOXIC_SPIKES, PokemonType.POISON, -1, 20, -1, 0, 4) .attr(AddArenaTrapTagAttr, ArenaTagType.TOXIC_SPIKES) - .target(MoveTarget.ENEMY_SIDE), - new StatusMove(Moves.HEART_SWAP, Type.PSYCHIC, -1, 10, -1, 0, 4) + .target(MoveTarget.ENEMY_SIDE) + .reflectable(), + new StatusMove(Moves.HEART_SWAP, PokemonType.PSYCHIC, -1, 10, -1, 0, 4) .attr(SwapStatStagesAttr, BATTLE_STATS) .ignoresSubstitute(), - new SelfStatusMove(Moves.AQUA_RING, Type.WATER, -1, 20, -1, 0, 4) + new SelfStatusMove(Moves.AQUA_RING, PokemonType.WATER, -1, 20, -1, 0, 4) .attr(AddBattlerTagAttr, BattlerTagType.AQUA_RING, true, true), - new SelfStatusMove(Moves.MAGNET_RISE, Type.ELECTRIC, -1, 10, -1, 0, 4) + new SelfStatusMove(Moves.MAGNET_RISE, PokemonType.ELECTRIC, -1, 10, -1, 0, 4) .attr(AddBattlerTagAttr, BattlerTagType.FLOATING, true, true, 5) .condition((user, target, move) => !globalScene.arena.getTag(ArenaTagType.GRAVITY) && [ BattlerTagType.FLOATING, BattlerTagType.IGNORE_FLYING, BattlerTagType.INGRAIN ].every((tag) => !user.getTag(tag))), - new AttackMove(Moves.FLARE_BLITZ, Type.FIRE, MoveCategory.PHYSICAL, 120, 100, 15, 10, 0, 4) + new AttackMove(Moves.FLARE_BLITZ, PokemonType.FIRE, MoveCategory.PHYSICAL, 120, 100, 15, 10, 0, 4) .attr(RecoilAttr, false, 0.33) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN) .recklessMove(), - new AttackMove(Moves.FORCE_PALM, Type.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, 30, 0, 4) + new AttackMove(Moves.FORCE_PALM, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, 30, 0, 4) .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new AttackMove(Moves.AURA_SPHERE, Type.FIGHTING, MoveCategory.SPECIAL, 80, -1, 20, -1, 0, 4) + new AttackMove(Moves.AURA_SPHERE, PokemonType.FIGHTING, MoveCategory.SPECIAL, 80, -1, 20, -1, 0, 4) .pulseMove() .ballBombMove(), - new SelfStatusMove(Moves.ROCK_POLISH, Type.ROCK, -1, 20, -1, 0, 4) + new SelfStatusMove(Moves.ROCK_POLISH, PokemonType.ROCK, -1, 20, -1, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPD ], 2, true), - new AttackMove(Moves.POISON_JAB, Type.POISON, MoveCategory.PHYSICAL, 80, 100, 20, 30, 0, 4) + new AttackMove(Moves.POISON_JAB, PokemonType.POISON, MoveCategory.PHYSICAL, 80, 100, 20, 30, 0, 4) .attr(StatusEffectAttr, StatusEffect.POISON), - new AttackMove(Moves.DARK_PULSE, Type.DARK, MoveCategory.SPECIAL, 80, 100, 15, 20, 0, 4) + new AttackMove(Moves.DARK_PULSE, PokemonType.DARK, MoveCategory.SPECIAL, 80, 100, 15, 20, 0, 4) .attr(FlinchAttr) .pulseMove(), - new AttackMove(Moves.NIGHT_SLASH, Type.DARK, MoveCategory.PHYSICAL, 70, 100, 15, -1, 0, 4) + new AttackMove(Moves.NIGHT_SLASH, PokemonType.DARK, MoveCategory.PHYSICAL, 70, 100, 15, -1, 0, 4) .attr(HighCritAttr) .slicingMove(), - new AttackMove(Moves.AQUA_TAIL, Type.WATER, MoveCategory.PHYSICAL, 90, 90, 10, -1, 0, 4), - new AttackMove(Moves.SEED_BOMB, Type.GRASS, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 4) + new AttackMove(Moves.AQUA_TAIL, PokemonType.WATER, MoveCategory.PHYSICAL, 90, 90, 10, -1, 0, 4), + new AttackMove(Moves.SEED_BOMB, PokemonType.GRASS, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 4) .makesContact(false) .ballBombMove(), - new AttackMove(Moves.AIR_SLASH, Type.FLYING, MoveCategory.SPECIAL, 75, 95, 15, 30, 0, 4) + new AttackMove(Moves.AIR_SLASH, PokemonType.FLYING, MoveCategory.SPECIAL, 75, 95, 15, 30, 0, 4) .attr(FlinchAttr) .slicingMove(), - new AttackMove(Moves.X_SCISSOR, Type.BUG, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 4) + new AttackMove(Moves.X_SCISSOR, PokemonType.BUG, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 4) .slicingMove(), - new AttackMove(Moves.BUG_BUZZ, Type.BUG, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4) + new AttackMove(Moves.BUG_BUZZ, PokemonType.BUG, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1) .soundBased(), - new AttackMove(Moves.DRAGON_PULSE, Type.DRAGON, MoveCategory.SPECIAL, 85, 100, 10, -1, 0, 4) + new AttackMove(Moves.DRAGON_PULSE, PokemonType.DRAGON, MoveCategory.SPECIAL, 85, 100, 10, -1, 0, 4) .pulseMove(), - new AttackMove(Moves.DRAGON_RUSH, Type.DRAGON, MoveCategory.PHYSICAL, 100, 75, 10, 20, 0, 4) + new AttackMove(Moves.DRAGON_RUSH, PokemonType.DRAGON, MoveCategory.PHYSICAL, 100, 75, 10, 20, 0, 4) .attr(AlwaysHitMinimizeAttr) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED) .attr(FlinchAttr), - new AttackMove(Moves.POWER_GEM, Type.ROCK, MoveCategory.SPECIAL, 80, 100, 20, -1, 0, 4), - new AttackMove(Moves.DRAIN_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 4) + new AttackMove(Moves.POWER_GEM, PokemonType.ROCK, MoveCategory.SPECIAL, 80, 100, 20, -1, 0, 4), + new AttackMove(Moves.DRAIN_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 4) .attr(HitHealAttr) .punchingMove() .triageMove(), - new AttackMove(Moves.VACUUM_WAVE, Type.FIGHTING, MoveCategory.SPECIAL, 40, 100, 30, -1, 1, 4), - new AttackMove(Moves.FOCUS_BLAST, Type.FIGHTING, MoveCategory.SPECIAL, 120, 70, 5, 10, 0, 4) + new AttackMove(Moves.VACUUM_WAVE, PokemonType.FIGHTING, MoveCategory.SPECIAL, 40, 100, 30, -1, 1, 4), + new AttackMove(Moves.FOCUS_BLAST, PokemonType.FIGHTING, MoveCategory.SPECIAL, 120, 70, 5, 10, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1) .ballBombMove(), - new AttackMove(Moves.ENERGY_BALL, Type.GRASS, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4) + new AttackMove(Moves.ENERGY_BALL, PokemonType.GRASS, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1) .ballBombMove(), - new AttackMove(Moves.BRAVE_BIRD, Type.FLYING, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 4) + new AttackMove(Moves.BRAVE_BIRD, PokemonType.FLYING, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 4) .attr(RecoilAttr, false, 0.33) .recklessMove(), - new AttackMove(Moves.EARTH_POWER, Type.GROUND, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4) + new AttackMove(Moves.EARTH_POWER, PokemonType.GROUND, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1), - new StatusMove(Moves.SWITCHEROO, Type.DARK, 100, 10, -1, 0, 4) + new StatusMove(Moves.SWITCHEROO, PokemonType.DARK, 100, 10, -1, 0, 4) .unimplemented(), - new AttackMove(Moves.GIGA_IMPACT, Type.NORMAL, MoveCategory.PHYSICAL, 150, 90, 5, -1, 0, 4) + new AttackMove(Moves.GIGA_IMPACT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 150, 90, 5, -1, 0, 4) .attr(RechargeAttr), - new SelfStatusMove(Moves.NASTY_PLOT, Type.DARK, -1, 20, -1, 0, 4) + new SelfStatusMove(Moves.NASTY_PLOT, PokemonType.DARK, -1, 20, -1, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPATK ], 2, true), - new AttackMove(Moves.BULLET_PUNCH, Type.STEEL, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4) + new AttackMove(Moves.BULLET_PUNCH, PokemonType.STEEL, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4) .punchingMove(), - new AttackMove(Moves.AVALANCHE, Type.ICE, MoveCategory.PHYSICAL, 60, 100, 10, -1, -4, 4) + new AttackMove(Moves.AVALANCHE, PokemonType.ICE, MoveCategory.PHYSICAL, 60, 100, 10, -1, -4, 4) .attr(TurnDamagedDoublePowerAttr), - new AttackMove(Moves.ICE_SHARD, Type.ICE, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4) + new AttackMove(Moves.ICE_SHARD, PokemonType.ICE, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4) .makesContact(false), - new AttackMove(Moves.SHADOW_CLAW, Type.GHOST, MoveCategory.PHYSICAL, 70, 100, 15, -1, 0, 4) + new AttackMove(Moves.SHADOW_CLAW, PokemonType.GHOST, MoveCategory.PHYSICAL, 70, 100, 15, -1, 0, 4) .attr(HighCritAttr), - new AttackMove(Moves.THUNDER_FANG, Type.ELECTRIC, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4) + new AttackMove(Moves.THUNDER_FANG, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4) .attr(FlinchAttr) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .bitingMove(), - new AttackMove(Moves.ICE_FANG, Type.ICE, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4) + new AttackMove(Moves.ICE_FANG, PokemonType.ICE, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4) .attr(FlinchAttr) .attr(StatusEffectAttr, StatusEffect.FREEZE) .bitingMove(), - new AttackMove(Moves.FIRE_FANG, Type.FIRE, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4) + new AttackMove(Moves.FIRE_FANG, PokemonType.FIRE, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4) .attr(FlinchAttr) .attr(StatusEffectAttr, StatusEffect.BURN) .bitingMove(), - new AttackMove(Moves.SHADOW_SNEAK, Type.GHOST, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4), - new AttackMove(Moves.MUD_BOMB, Type.GROUND, MoveCategory.SPECIAL, 65, 85, 10, 30, 0, 4) + new AttackMove(Moves.SHADOW_SNEAK, PokemonType.GHOST, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4), + new AttackMove(Moves.MUD_BOMB, PokemonType.GROUND, MoveCategory.SPECIAL, 65, 85, 10, 30, 0, 4) .attr(StatStageChangeAttr, [ Stat.ACC ], -1) .ballBombMove(), - new AttackMove(Moves.PSYCHO_CUT, Type.PSYCHIC, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 4) + new AttackMove(Moves.PSYCHO_CUT, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 4) .attr(HighCritAttr) .slicingMove() .makesContact(false), - new AttackMove(Moves.ZEN_HEADBUTT, Type.PSYCHIC, MoveCategory.PHYSICAL, 80, 90, 15, 20, 0, 4) + new AttackMove(Moves.ZEN_HEADBUTT, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 80, 90, 15, 20, 0, 4) .attr(FlinchAttr), - new AttackMove(Moves.MIRROR_SHOT, Type.STEEL, MoveCategory.SPECIAL, 65, 85, 10, 30, 0, 4) + new AttackMove(Moves.MIRROR_SHOT, PokemonType.STEEL, MoveCategory.SPECIAL, 65, 85, 10, 30, 0, 4) .attr(StatStageChangeAttr, [ Stat.ACC ], -1), - new AttackMove(Moves.FLASH_CANNON, Type.STEEL, MoveCategory.SPECIAL, 80, 100, 10, 10, 0, 4) + new AttackMove(Moves.FLASH_CANNON, PokemonType.STEEL, MoveCategory.SPECIAL, 80, 100, 10, 10, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1), - new AttackMove(Moves.ROCK_CLIMB, Type.NORMAL, MoveCategory.PHYSICAL, 90, 85, 20, 20, 0, 4) + new AttackMove(Moves.ROCK_CLIMB, PokemonType.NORMAL, MoveCategory.PHYSICAL, 90, 85, 20, 20, 0, 4) .attr(ConfuseAttr), - new StatusMove(Moves.DEFOG, Type.FLYING, -1, 15, -1, 0, 4) + new StatusMove(Moves.DEFOG, PokemonType.FLYING, -1, 15, -1, 0, 4) .attr(StatStageChangeAttr, [ Stat.EVA ], -1) .attr(ClearWeatherAttr, WeatherType.FOG) .attr(ClearTerrainAttr) .attr(RemoveScreensAttr, false) .attr(RemoveArenaTrapAttr, true) - .attr(RemoveArenaTagsAttr, [ ArenaTagType.MIST, ArenaTagType.SAFEGUARD ], false), - new StatusMove(Moves.TRICK_ROOM, Type.PSYCHIC, -1, 5, -1, -7, 4) + .attr(RemoveArenaTagsAttr, [ ArenaTagType.MIST, ArenaTagType.SAFEGUARD ], false) + .reflectable(), + new StatusMove(Moves.TRICK_ROOM, PokemonType.PSYCHIC, -1, 5, -1, -7, 4) .attr(AddArenaTagAttr, ArenaTagType.TRICK_ROOM, 5) .ignoresProtect() .target(MoveTarget.BOTH_SIDES), - new AttackMove(Moves.DRACO_METEOR, Type.DRAGON, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 4) + new AttackMove(Moves.DRACO_METEOR, PokemonType.DRAGON, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true), - new AttackMove(Moves.DISCHARGE, Type.ELECTRIC, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 4) + new AttackMove(Moves.DISCHARGE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 4) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.LAVA_PLUME, Type.FIRE, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 4) + new AttackMove(Moves.LAVA_PLUME, PokemonType.FIRE, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 4) .attr(StatusEffectAttr, StatusEffect.BURN) .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.LEAF_STORM, Type.GRASS, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 4) + new AttackMove(Moves.LEAF_STORM, PokemonType.GRASS, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true), - new AttackMove(Moves.POWER_WHIP, Type.GRASS, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 4), - new AttackMove(Moves.ROCK_WRECKER, Type.ROCK, MoveCategory.PHYSICAL, 150, 90, 5, -1, 0, 4) + new AttackMove(Moves.POWER_WHIP, PokemonType.GRASS, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 4), + new AttackMove(Moves.ROCK_WRECKER, PokemonType.ROCK, MoveCategory.PHYSICAL, 150, 90, 5, -1, 0, 4) .attr(RechargeAttr) .makesContact(false) .ballBombMove(), - new AttackMove(Moves.CROSS_POISON, Type.POISON, MoveCategory.PHYSICAL, 70, 100, 20, 10, 0, 4) + new AttackMove(Moves.CROSS_POISON, PokemonType.POISON, MoveCategory.PHYSICAL, 70, 100, 20, 10, 0, 4) .attr(HighCritAttr) .attr(StatusEffectAttr, StatusEffect.POISON) .slicingMove(), - new AttackMove(Moves.GUNK_SHOT, Type.POISON, MoveCategory.PHYSICAL, 120, 80, 5, 30, 0, 4) + new AttackMove(Moves.GUNK_SHOT, PokemonType.POISON, MoveCategory.PHYSICAL, 120, 80, 5, 30, 0, 4) .attr(StatusEffectAttr, StatusEffect.POISON) .makesContact(false), - new AttackMove(Moves.IRON_HEAD, Type.STEEL, MoveCategory.PHYSICAL, 80, 100, 15, 30, 0, 4) + new AttackMove(Moves.IRON_HEAD, PokemonType.STEEL, MoveCategory.PHYSICAL, 80, 100, 15, 30, 0, 4) .attr(FlinchAttr), - new AttackMove(Moves.MAGNET_BOMB, Type.STEEL, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 4) + new AttackMove(Moves.MAGNET_BOMB, PokemonType.STEEL, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 4) .makesContact(false) .ballBombMove(), - new AttackMove(Moves.STONE_EDGE, Type.ROCK, MoveCategory.PHYSICAL, 100, 80, 5, -1, 0, 4) + new AttackMove(Moves.STONE_EDGE, PokemonType.ROCK, MoveCategory.PHYSICAL, 100, 80, 5, -1, 0, 4) .attr(HighCritAttr) .makesContact(false), - new StatusMove(Moves.CAPTIVATE, Type.NORMAL, 100, 20, -1, 0, 4) + new StatusMove(Moves.CAPTIVATE, PokemonType.NORMAL, 100, 20, -1, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPATK ], -2) .condition((user, target, move) => target.isOppositeGender(user)) - .target(MoveTarget.ALL_NEAR_ENEMIES), - new StatusMove(Moves.STEALTH_ROCK, Type.ROCK, -1, 20, -1, 0, 4) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new StatusMove(Moves.STEALTH_ROCK, PokemonType.ROCK, -1, 20, -1, 0, 4) .attr(AddArenaTrapTagAttr, ArenaTagType.STEALTH_ROCK) - .target(MoveTarget.ENEMY_SIDE), - new AttackMove(Moves.GRASS_KNOT, Type.GRASS, MoveCategory.SPECIAL, -1, 100, 20, -1, 0, 4) + .target(MoveTarget.ENEMY_SIDE) + .reflectable(), + new AttackMove(Moves.GRASS_KNOT, PokemonType.GRASS, MoveCategory.SPECIAL, -1, 100, 20, -1, 0, 4) .attr(WeightPowerAttr) .makesContact(), - new AttackMove(Moves.CHATTER, Type.FLYING, MoveCategory.SPECIAL, 65, 100, 20, 100, 0, 4) + new AttackMove(Moves.CHATTER, PokemonType.FLYING, MoveCategory.SPECIAL, 65, 100, 20, 100, 0, 4) .attr(ConfuseAttr) .soundBased(), - new AttackMove(Moves.JUDGMENT, Type.NORMAL, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 4) + new AttackMove(Moves.JUDGMENT, PokemonType.NORMAL, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 4) .attr(FormChangeItemTypeAttr), - new AttackMove(Moves.BUG_BITE, Type.BUG, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 4) + new AttackMove(Moves.BUG_BITE, PokemonType.BUG, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 4) .attr(StealEatBerryAttr), - new AttackMove(Moves.CHARGE_BEAM, Type.ELECTRIC, MoveCategory.SPECIAL, 50, 90, 10, 70, 0, 4) + new AttackMove(Moves.CHARGE_BEAM, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 50, 90, 10, 70, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPATK ], 1, true), - new AttackMove(Moves.WOOD_HAMMER, Type.GRASS, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 4) + new AttackMove(Moves.WOOD_HAMMER, PokemonType.GRASS, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 4) .attr(RecoilAttr, false, 0.33) .recklessMove(), - new AttackMove(Moves.AQUA_JET, Type.WATER, MoveCategory.PHYSICAL, 40, 100, 20, -1, 1, 4), - new AttackMove(Moves.ATTACK_ORDER, Type.BUG, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 4) + new AttackMove(Moves.AQUA_JET, PokemonType.WATER, MoveCategory.PHYSICAL, 40, 100, 20, -1, 1, 4), + new AttackMove(Moves.ATTACK_ORDER, PokemonType.BUG, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 4) .attr(HighCritAttr) .makesContact(false), - new SelfStatusMove(Moves.DEFEND_ORDER, Type.BUG, -1, 10, -1, 0, 4) + new SelfStatusMove(Moves.DEFEND_ORDER, PokemonType.BUG, -1, 10, -1, 0, 4) .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], 1, true), - new SelfStatusMove(Moves.HEAL_ORDER, Type.BUG, -1, 5, -1, 0, 4) + new SelfStatusMove(Moves.HEAL_ORDER, PokemonType.BUG, -1, 5, -1, 0, 4) .attr(HealAttr, 0.5) .triageMove(), - new AttackMove(Moves.HEAD_SMASH, Type.ROCK, MoveCategory.PHYSICAL, 150, 80, 5, -1, 0, 4) + new AttackMove(Moves.HEAD_SMASH, PokemonType.ROCK, MoveCategory.PHYSICAL, 150, 80, 5, -1, 0, 4) .attr(RecoilAttr, false, 0.5) .recklessMove(), - new AttackMove(Moves.DOUBLE_HIT, Type.NORMAL, MoveCategory.PHYSICAL, 35, 90, 10, -1, 0, 4) + new AttackMove(Moves.DOUBLE_HIT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 35, 90, 10, -1, 0, 4) .attr(MultiHitAttr, MultiHitType._2), - new AttackMove(Moves.ROAR_OF_TIME, Type.DRAGON, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 4) + new AttackMove(Moves.ROAR_OF_TIME, PokemonType.DRAGON, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 4) .attr(RechargeAttr), - new AttackMove(Moves.SPACIAL_REND, Type.DRAGON, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 4) + new AttackMove(Moves.SPACIAL_REND, PokemonType.DRAGON, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 4) .attr(HighCritAttr), - new SelfStatusMove(Moves.LUNAR_DANCE, Type.PSYCHIC, -1, 10, -1, 0, 4) + new SelfStatusMove(Moves.LUNAR_DANCE, PokemonType.PSYCHIC, -1, 10, -1, 0, 4) .attr(SacrificialFullRestoreAttr, true, "moveTriggers:lunarDanceRestore") .danceMove() - .triageMove(), - new AttackMove(Moves.CRUSH_GRIP, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4) + .triageMove() + .condition(failIfLastInPartyCondition), + new AttackMove(Moves.CRUSH_GRIP, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4) .attr(OpponentHighHpPowerAttr, 120), - new AttackMove(Moves.MAGMA_STORM, Type.FIRE, MoveCategory.SPECIAL, 100, 75, 5, -1, 0, 4) + new AttackMove(Moves.MAGMA_STORM, PokemonType.FIRE, MoveCategory.SPECIAL, 100, 75, 5, -1, 0, 4) .attr(TrapAttr, BattlerTagType.MAGMA_STORM), - new StatusMove(Moves.DARK_VOID, Type.DARK, 80, 10, -1, 0, 4) //Accuracy from Generations 4-6 + new StatusMove(Moves.DARK_VOID, PokemonType.DARK, 80, 10, -1, 0, 4) //Accuracy from Generations 4-6 .attr(StatusEffectAttr, StatusEffect.SLEEP) - .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.SEED_FLARE, Type.GRASS, MoveCategory.SPECIAL, 120, 85, 5, 40, 0, 4) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new AttackMove(Moves.SEED_FLARE, PokemonType.GRASS, MoveCategory.SPECIAL, 120, 85, 5, 40, 0, 4) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2), - new AttackMove(Moves.OMINOUS_WIND, Type.GHOST, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 4) + new AttackMove(Moves.OMINOUS_WIND, PokemonType.GHOST, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 4) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true) .windMove(), - new ChargingAttackMove(Moves.SHADOW_FORCE, Type.GHOST, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 4) + new ChargingAttackMove(Moves.SHADOW_FORCE, PokemonType.GHOST, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 4) .chargeText(i18next.t("moveTriggers:vanishedInstantly", { pokemonName: "{USER}" })) .chargeAttr(SemiInvulnerableAttr, BattlerTagType.HIDDEN) .ignoresProtect(), - new SelfStatusMove(Moves.HONE_CLAWS, Type.DARK, -1, 15, -1, 0, 5) + new SelfStatusMove(Moves.HONE_CLAWS, PokemonType.DARK, -1, 15, -1, 0, 5) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.ACC ], 1, true), - new StatusMove(Moves.WIDE_GUARD, Type.ROCK, -1, 10, -1, 3, 5) + new StatusMove(Moves.WIDE_GUARD, PokemonType.ROCK, -1, 10, -1, 3, 5) .target(MoveTarget.USER_SIDE) .attr(AddArenaTagAttr, ArenaTagType.WIDE_GUARD, 1, true, true) .condition(failIfLastCondition), - new StatusMove(Moves.GUARD_SPLIT, Type.PSYCHIC, -1, 10, -1, 0, 5) + new StatusMove(Moves.GUARD_SPLIT, PokemonType.PSYCHIC, -1, 10, -1, 0, 5) .attr(AverageStatsAttr, [ Stat.DEF, Stat.SPDEF ], "moveTriggers:sharedGuard"), - new StatusMove(Moves.POWER_SPLIT, Type.PSYCHIC, -1, 10, -1, 0, 5) + new StatusMove(Moves.POWER_SPLIT, PokemonType.PSYCHIC, -1, 10, -1, 0, 5) .attr(AverageStatsAttr, [ Stat.ATK, Stat.SPATK ], "moveTriggers:sharedPower"), - new StatusMove(Moves.WONDER_ROOM, Type.PSYCHIC, -1, 10, -1, 0, 5) + new StatusMove(Moves.WONDER_ROOM, PokemonType.PSYCHIC, -1, 10, -1, 0, 5) .ignoresProtect() .target(MoveTarget.BOTH_SIDES) .unimplemented(), - new AttackMove(Moves.PSYSHOCK, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5) + new AttackMove(Moves.PSYSHOCK, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5) .attr(DefDefAttr), - new AttackMove(Moves.VENOSHOCK, Type.POISON, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 5) + new AttackMove(Moves.VENOSHOCK, PokemonType.POISON, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 5) .attr(MovePowerMultiplierAttr, (user, target, move) => target.status && (target.status.effect === StatusEffect.POISON || target.status.effect === StatusEffect.TOXIC) ? 2 : 1), - new SelfStatusMove(Moves.AUTOTOMIZE, Type.STEEL, -1, 15, -1, 0, 5) + new SelfStatusMove(Moves.AUTOTOMIZE, PokemonType.STEEL, -1, 15, -1, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPD ], 2, true) .attr(AddBattlerTagAttr, BattlerTagType.AUTOTOMIZED, true), - new SelfStatusMove(Moves.RAGE_POWDER, Type.BUG, -1, 20, -1, 2, 5) + new SelfStatusMove(Moves.RAGE_POWDER, PokemonType.BUG, -1, 20, -1, 2, 5) .powderMove() .attr(AddBattlerTagAttr, BattlerTagType.CENTER_OF_ATTENTION, true), - new StatusMove(Moves.TELEKINESIS, Type.PSYCHIC, -1, 15, -1, 0, 5) + new StatusMove(Moves.TELEKINESIS, PokemonType.PSYCHIC, -1, 15, -1, 0, 5) .condition(failOnGravityCondition) .condition((_user, target, _move) => ![ Species.DIGLETT, Species.DUGTRIO, Species.ALOLA_DIGLETT, Species.ALOLA_DUGTRIO, Species.SANDYGAST, Species.PALOSSAND, Species.WIGLETT, Species.WUGTRIO ].includes(target.species.speciesId)) .condition((_user, target, _move) => !(target.species.speciesId === Species.GENGAR && target.getFormKey() === "mega")) .condition((_user, target, _move) => Utils.isNullOrUndefined(target.getTag(BattlerTagType.INGRAIN)) && Utils.isNullOrUndefined(target.getTag(BattlerTagType.IGNORE_FLYING))) .attr(AddBattlerTagAttr, BattlerTagType.TELEKINESIS, false, true, 3) - .attr(AddBattlerTagAttr, BattlerTagType.FLOATING, false, true, 3), - new StatusMove(Moves.MAGIC_ROOM, Type.PSYCHIC, -1, 10, -1, 0, 5) + .attr(AddBattlerTagAttr, BattlerTagType.FLOATING, false, true, 3) + .reflectable(), + new StatusMove(Moves.MAGIC_ROOM, PokemonType.PSYCHIC, -1, 10, -1, 0, 5) .ignoresProtect() .target(MoveTarget.BOTH_SIDES) .unimplemented(), - new AttackMove(Moves.SMACK_DOWN, Type.ROCK, MoveCategory.PHYSICAL, 50, 100, 15, 100, 0, 5) + new AttackMove(Moves.SMACK_DOWN, PokemonType.ROCK, MoveCategory.PHYSICAL, 50, 100, 15, 100, 0, 5) .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true) .attr(AddBattlerTagAttr, BattlerTagType.INTERRUPTED) .attr(RemoveBattlerTagAttr, [ BattlerTagType.FLYING, BattlerTagType.FLOATING, BattlerTagType.TELEKINESIS ]) .attr(HitsTagAttr, BattlerTagType.FLYING) .makesContact(false), - new AttackMove(Moves.STORM_THROW, Type.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 5) + new AttackMove(Moves.STORM_THROW, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 5) .attr(CritOnlyAttr), - new AttackMove(Moves.FLAME_BURST, Type.FIRE, MoveCategory.SPECIAL, 70, 100, 15, -1, 0, 5) + new AttackMove(Moves.FLAME_BURST, PokemonType.FIRE, MoveCategory.SPECIAL, 70, 100, 15, -1, 0, 5) .attr(FlameBurstAttr), - new AttackMove(Moves.SLUDGE_WAVE, Type.POISON, MoveCategory.SPECIAL, 95, 100, 10, 10, 0, 5) + new AttackMove(Moves.SLUDGE_WAVE, PokemonType.POISON, MoveCategory.SPECIAL, 95, 100, 10, 10, 0, 5) .attr(StatusEffectAttr, StatusEffect.POISON) .target(MoveTarget.ALL_NEAR_OTHERS), - new SelfStatusMove(Moves.QUIVER_DANCE, Type.BUG, -1, 20, -1, 0, 5) + new SelfStatusMove(Moves.QUIVER_DANCE, PokemonType.BUG, -1, 20, -1, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true) .danceMove(), - new AttackMove(Moves.HEAVY_SLAM, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 5) + new AttackMove(Moves.HEAVY_SLAM, PokemonType.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 5) .attr(AlwaysHitMinimizeAttr) .attr(CompareWeightPowerAttr) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED), - new AttackMove(Moves.SYNCHRONOISE, Type.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 5) + new AttackMove(Moves.SYNCHRONOISE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 5) .target(MoveTarget.ALL_NEAR_OTHERS) .condition(unknownTypeCondition) .attr(hitsSameTypeAttr), - new AttackMove(Moves.ELECTRO_BALL, Type.ELECTRIC, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 5) + new AttackMove(Moves.ELECTRO_BALL, PokemonType.ELECTRIC, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 5) .attr(ElectroBallPowerAttr) .ballBombMove(), - new StatusMove(Moves.SOAK, Type.WATER, 100, 20, -1, 0, 5) - .attr(ChangeTypeAttr, Type.WATER), - new AttackMove(Moves.FLAME_CHARGE, Type.FIRE, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 5) + new StatusMove(Moves.SOAK, PokemonType.WATER, 100, 20, -1, 0, 5) + .attr(ChangeTypeAttr, PokemonType.WATER) + .reflectable(), + new AttackMove(Moves.FLAME_CHARGE, PokemonType.FIRE, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true), - new SelfStatusMove(Moves.COIL, Type.POISON, -1, 20, -1, 0, 5) + new SelfStatusMove(Moves.COIL, PokemonType.POISON, -1, 20, -1, 0, 5) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.ACC ], 1, true), - new AttackMove(Moves.LOW_SWEEP, Type.FIGHTING, MoveCategory.PHYSICAL, 65, 100, 20, 100, 0, 5) + new AttackMove(Moves.LOW_SWEEP, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 65, 100, 20, 100, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPD ], -1), - new AttackMove(Moves.ACID_SPRAY, Type.POISON, MoveCategory.SPECIAL, 40, 100, 20, 100, 0, 5) + new AttackMove(Moves.ACID_SPRAY, PokemonType.POISON, MoveCategory.SPECIAL, 40, 100, 20, 100, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2) .ballBombMove(), - new AttackMove(Moves.FOUL_PLAY, Type.DARK, MoveCategory.PHYSICAL, 95, 100, 15, -1, 0, 5) + new AttackMove(Moves.FOUL_PLAY, PokemonType.DARK, MoveCategory.PHYSICAL, 95, 100, 15, -1, 0, 5) .attr(TargetAtkUserAtkAttr), - new StatusMove(Moves.SIMPLE_BEAM, Type.NORMAL, 100, 15, -1, 0, 5) - .attr(AbilityChangeAttr, Abilities.SIMPLE), - new StatusMove(Moves.ENTRAINMENT, Type.NORMAL, 100, 15, -1, 0, 5) - .attr(AbilityGiveAttr), - new StatusMove(Moves.AFTER_YOU, Type.NORMAL, -1, 15, -1, 0, 5) + new StatusMove(Moves.SIMPLE_BEAM, PokemonType.NORMAL, 100, 15, -1, 0, 5) + .attr(AbilityChangeAttr, Abilities.SIMPLE) + .reflectable(), + new StatusMove(Moves.ENTRAINMENT, PokemonType.NORMAL, 100, 15, -1, 0, 5) + .attr(AbilityGiveAttr) + .reflectable(), + new StatusMove(Moves.AFTER_YOU, PokemonType.NORMAL, -1, 15, -1, 0, 5) .ignoresProtect() .ignoresSubstitute() .target(MoveTarget.NEAR_OTHER) .condition(failIfSingleBattle) .condition((user, target, move) => !target.turnData.acted) .attr(AfterYouAttr), - new AttackMove(Moves.ROUND, Type.NORMAL, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 5) + new AttackMove(Moves.ROUND, PokemonType.NORMAL, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 5) .attr(CueNextRoundAttr) .attr(RoundPowerAttr) .soundBased(), - new AttackMove(Moves.ECHOED_VOICE, Type.NORMAL, MoveCategory.SPECIAL, 40, 100, 15, -1, 0, 5) + new AttackMove(Moves.ECHOED_VOICE, PokemonType.NORMAL, MoveCategory.SPECIAL, 40, 100, 15, -1, 0, 5) .attr(ConsecutiveUseMultiBasePowerAttr, 5, false) .soundBased(), - new AttackMove(Moves.CHIP_AWAY, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 5) + new AttackMove(Moves.CHIP_AWAY, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 5) .attr(IgnoreOpponentStatStagesAttr), - new AttackMove(Moves.CLEAR_SMOG, Type.POISON, MoveCategory.SPECIAL, 50, -1, 15, -1, 0, 5) + new AttackMove(Moves.CLEAR_SMOG, PokemonType.POISON, MoveCategory.SPECIAL, 50, -1, 15, -1, 0, 5) .attr(ResetStatsAttr, false), - new AttackMove(Moves.STORED_POWER, Type.PSYCHIC, MoveCategory.SPECIAL, 20, 100, 10, -1, 0, 5) + new AttackMove(Moves.STORED_POWER, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 20, 100, 10, -1, 0, 5) .attr(PositiveStatStagePowerAttr), - new StatusMove(Moves.QUICK_GUARD, Type.FIGHTING, -1, 15, -1, 3, 5) + new StatusMove(Moves.QUICK_GUARD, PokemonType.FIGHTING, -1, 15, -1, 3, 5) .target(MoveTarget.USER_SIDE) .attr(AddArenaTagAttr, ArenaTagType.QUICK_GUARD, 1, true, true) .condition(failIfLastCondition), - new SelfStatusMove(Moves.ALLY_SWITCH, Type.PSYCHIC, -1, 15, -1, 2, 5) + new SelfStatusMove(Moves.ALLY_SWITCH, PokemonType.PSYCHIC, -1, 15, -1, 2, 5) .ignoresProtect() .unimplemented(), - new AttackMove(Moves.SCALD, Type.WATER, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 5) + new AttackMove(Moves.SCALD, PokemonType.WATER, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 5) .attr(HealStatusEffectAttr, false, StatusEffect.FREEZE) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN), - new SelfStatusMove(Moves.SHELL_SMASH, Type.NORMAL, -1, 15, -1, 0, 5) + new SelfStatusMove(Moves.SHELL_SMASH, PokemonType.NORMAL, -1, 15, -1, 0, 5) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK, Stat.SPD ], 2, true) .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true), - new StatusMove(Moves.HEAL_PULSE, Type.PSYCHIC, -1, 10, -1, 0, 5) + new StatusMove(Moves.HEAL_PULSE, PokemonType.PSYCHIC, -1, 10, -1, 0, 5) .attr(HealAttr, 0.5, false, false) .pulseMove() - .triageMove(), - new AttackMove(Moves.HEX, Type.GHOST, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 5) + .triageMove() + .reflectable(), + new AttackMove(Moves.HEX, PokemonType.GHOST, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 5) .attr( MovePowerMultiplierAttr, (user, target, move) => target.status || target.hasAbility(Abilities.COMATOSE) ? 2 : 1), - new ChargingAttackMove(Moves.SKY_DROP, Type.FLYING, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 5) + new ChargingAttackMove(Moves.SKY_DROP, PokemonType.FLYING, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 5) .chargeText(i18next.t("moveTriggers:tookTargetIntoSky", { pokemonName: "{USER}", targetName: "{TARGET}" })) .chargeAttr(SemiInvulnerableAttr, BattlerTagType.FLYING) .condition(failOnGravityCondition) .condition((user, target, move) => !target.getTag(BattlerTagType.SUBSTITUTE)) .partial(), // Should immobilize the target, Flying types should take no damage. cf https://bulbapedia.bulbagarden.net/wiki/Sky_Drop_(move) and https://www.smogon.com/dex/sv/moves/sky-drop/ - new SelfStatusMove(Moves.SHIFT_GEAR, Type.STEEL, -1, 10, -1, 0, 5) + new SelfStatusMove(Moves.SHIFT_GEAR, PokemonType.STEEL, -1, 10, -1, 0, 5) .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true) .attr(StatStageChangeAttr, [ Stat.SPD ], 2, true), - new AttackMove(Moves.CIRCLE_THROW, Type.FIGHTING, MoveCategory.PHYSICAL, 60, 90, 10, -1, -6, 5) + new AttackMove(Moves.CIRCLE_THROW, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 60, 90, 10, -1, -6, 5) .attr(ForceSwitchOutAttr, false, SwitchType.FORCE_SWITCH) .hidesTarget(), - new AttackMove(Moves.INCINERATE, Type.FIRE, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 5) + new AttackMove(Moves.INCINERATE, PokemonType.FIRE, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 5) .target(MoveTarget.ALL_NEAR_ENEMIES) .attr(RemoveHeldItemAttr, true), - new StatusMove(Moves.QUASH, Type.DARK, 100, 15, -1, 0, 5) + new StatusMove(Moves.QUASH, PokemonType.DARK, 100, 15, -1, 0, 5) .condition(failIfSingleBattle) - .unimplemented(), - new AttackMove(Moves.ACROBATICS, Type.FLYING, MoveCategory.PHYSICAL, 55, 100, 15, -1, 0, 5) + .condition((user, target, move) => !target.turnData.acted) + .attr(ForceLastAttr), + new AttackMove(Moves.ACROBATICS, PokemonType.FLYING, MoveCategory.PHYSICAL, 55, 100, 15, -1, 0, 5) .attr(MovePowerMultiplierAttr, (user, target, move) => Math.max(1, 2 - 0.2 * user.getHeldItems().filter(i => i.isTransferable).reduce((v, m) => v + m.stackCount, 0))), - new StatusMove(Moves.REFLECT_TYPE, Type.NORMAL, -1, 15, -1, 0, 5) + new StatusMove(Moves.REFLECT_TYPE, PokemonType.NORMAL, -1, 15, -1, 0, 5) .ignoresSubstitute() .attr(CopyTypeAttr), - new AttackMove(Moves.RETALIATE, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 5, -1, 0, 5) + new AttackMove(Moves.RETALIATE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 5, -1, 0, 5) .attr(MovePowerMultiplierAttr, (user, target, move) => { const turn = globalScene.currentBattle.turn; const lastPlayerFaint = globalScene.currentBattle.playerFaintsHistory[globalScene.currentBattle.playerFaintsHistory.length - 1]; @@ -9777,16 +9769,16 @@ export function initMoves() { (lastEnemyFaint !== undefined && turn - lastEnemyFaint.turn === 1 && !user.isPlayer()) ) ? 2 : 1; }), - new AttackMove(Moves.FINAL_GAMBIT, Type.FIGHTING, MoveCategory.SPECIAL, -1, 100, 5, -1, 0, 5) + new AttackMove(Moves.FINAL_GAMBIT, PokemonType.FIGHTING, MoveCategory.SPECIAL, -1, 100, 5, -1, 0, 5) .attr(UserHpDamageAttr) .attr(SacrificialAttrOnHit), - new StatusMove(Moves.BESTOW, Type.NORMAL, -1, 15, -1, 0, 5) + new StatusMove(Moves.BESTOW, PokemonType.NORMAL, -1, 15, -1, 0, 5) .ignoresProtect() .ignoresSubstitute() .unimplemented(), - new AttackMove(Moves.INFERNO, Type.FIRE, MoveCategory.SPECIAL, 100, 50, 5, 100, 0, 5) + new AttackMove(Moves.INFERNO, PokemonType.FIRE, MoveCategory.SPECIAL, 100, 50, 5, 100, 0, 5) .attr(StatusEffectAttr, StatusEffect.BURN), - new AttackMove(Moves.WATER_PLEDGE, Type.WATER, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5) + new AttackMove(Moves.WATER_PLEDGE, PokemonType.WATER, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5) .attr(AwaitCombinedPledgeAttr) .attr(CombinedPledgeTypeAttr) .attr(CombinedPledgePowerAttr) @@ -9794,7 +9786,7 @@ export function initMoves() { .attr(AddPledgeEffectAttr, ArenaTagType.WATER_FIRE_PLEDGE, Moves.FIRE_PLEDGE, true) .attr(AddPledgeEffectAttr, ArenaTagType.GRASS_WATER_PLEDGE, Moves.GRASS_PLEDGE) .attr(BypassRedirectAttr, true), - new AttackMove(Moves.FIRE_PLEDGE, Type.FIRE, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5) + new AttackMove(Moves.FIRE_PLEDGE, PokemonType.FIRE, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5) .attr(AwaitCombinedPledgeAttr) .attr(CombinedPledgeTypeAttr) .attr(CombinedPledgePowerAttr) @@ -9802,7 +9794,7 @@ export function initMoves() { .attr(AddPledgeEffectAttr, ArenaTagType.FIRE_GRASS_PLEDGE, Moves.GRASS_PLEDGE) .attr(AddPledgeEffectAttr, ArenaTagType.WATER_FIRE_PLEDGE, Moves.WATER_PLEDGE, true) .attr(BypassRedirectAttr, true), - new AttackMove(Moves.GRASS_PLEDGE, Type.GRASS, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5) + new AttackMove(Moves.GRASS_PLEDGE, PokemonType.GRASS, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5) .attr(AwaitCombinedPledgeAttr) .attr(CombinedPledgeTypeAttr) .attr(CombinedPledgePowerAttr) @@ -9810,287 +9802,300 @@ export function initMoves() { .attr(AddPledgeEffectAttr, ArenaTagType.GRASS_WATER_PLEDGE, Moves.WATER_PLEDGE) .attr(AddPledgeEffectAttr, ArenaTagType.FIRE_GRASS_PLEDGE, Moves.FIRE_PLEDGE) .attr(BypassRedirectAttr, true), - new AttackMove(Moves.VOLT_SWITCH, Type.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 20, -1, 0, 5) + new AttackMove(Moves.VOLT_SWITCH, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 20, -1, 0, 5) .attr(ForceSwitchOutAttr, true), - new AttackMove(Moves.STRUGGLE_BUG, Type.BUG, MoveCategory.SPECIAL, 50, 100, 20, 100, 0, 5) + new AttackMove(Moves.STRUGGLE_BUG, PokemonType.BUG, MoveCategory.SPECIAL, 50, 100, 20, 100, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPATK ], -1) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.BULLDOZE, Type.GROUND, MoveCategory.PHYSICAL, 60, 100, 20, 100, 0, 5) + new AttackMove(Moves.BULLDOZE, PokemonType.GROUND, MoveCategory.PHYSICAL, 60, 100, 20, 100, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPD ], -1) .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.GRASSY && target.isGrounded() ? 0.5 : 1) .makesContact(false) .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.FROST_BREATH, Type.ICE, MoveCategory.SPECIAL, 60, 90, 10, 100, 0, 5) + new AttackMove(Moves.FROST_BREATH, PokemonType.ICE, MoveCategory.SPECIAL, 60, 90, 10, 100, 0, 5) .attr(CritOnlyAttr), - new AttackMove(Moves.DRAGON_TAIL, Type.DRAGON, MoveCategory.PHYSICAL, 60, 90, 10, -1, -6, 5) + new AttackMove(Moves.DRAGON_TAIL, PokemonType.DRAGON, MoveCategory.PHYSICAL, 60, 90, 10, -1, -6, 5) .attr(ForceSwitchOutAttr, false, SwitchType.FORCE_SWITCH) .hidesTarget(), - new SelfStatusMove(Moves.WORK_UP, Type.NORMAL, -1, 30, -1, 0, 5) + new SelfStatusMove(Moves.WORK_UP, PokemonType.NORMAL, -1, 30, -1, 0, 5) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, true), - new AttackMove(Moves.ELECTROWEB, Type.ELECTRIC, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 5) + new AttackMove(Moves.ELECTROWEB, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPD ], -1) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.WILD_CHARGE, Type.ELECTRIC, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 5) + new AttackMove(Moves.WILD_CHARGE, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 5) .attr(RecoilAttr) .recklessMove(), - new AttackMove(Moves.DRILL_RUN, Type.GROUND, MoveCategory.PHYSICAL, 80, 95, 10, -1, 0, 5) + new AttackMove(Moves.DRILL_RUN, PokemonType.GROUND, MoveCategory.PHYSICAL, 80, 95, 10, -1, 0, 5) .attr(HighCritAttr), - new AttackMove(Moves.DUAL_CHOP, Type.DRAGON, MoveCategory.PHYSICAL, 40, 90, 15, -1, 0, 5) + new AttackMove(Moves.DUAL_CHOP, PokemonType.DRAGON, MoveCategory.PHYSICAL, 40, 90, 15, -1, 0, 5) .attr(MultiHitAttr, MultiHitType._2), - new AttackMove(Moves.HEART_STAMP, Type.PSYCHIC, MoveCategory.PHYSICAL, 60, 100, 25, 30, 0, 5) + new AttackMove(Moves.HEART_STAMP, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 60, 100, 25, 30, 0, 5) .attr(FlinchAttr), - new AttackMove(Moves.HORN_LEECH, Type.GRASS, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 5) + new AttackMove(Moves.HORN_LEECH, PokemonType.GRASS, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 5) .attr(HitHealAttr) .triageMove(), - new AttackMove(Moves.SACRED_SWORD, Type.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 5) + new AttackMove(Moves.SACRED_SWORD, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 5) .attr(IgnoreOpponentStatStagesAttr) .slicingMove(), - new AttackMove(Moves.RAZOR_SHELL, Type.WATER, MoveCategory.PHYSICAL, 75, 95, 10, 50, 0, 5) + new AttackMove(Moves.RAZOR_SHELL, PokemonType.WATER, MoveCategory.PHYSICAL, 75, 95, 10, 50, 0, 5) .attr(StatStageChangeAttr, [ Stat.DEF ], -1) .slicingMove(), - new AttackMove(Moves.HEAT_CRASH, Type.FIRE, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 5) + new AttackMove(Moves.HEAT_CRASH, PokemonType.FIRE, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 5) .attr(AlwaysHitMinimizeAttr) .attr(CompareWeightPowerAttr) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED), - new AttackMove(Moves.LEAF_TORNADO, Type.GRASS, MoveCategory.SPECIAL, 65, 90, 10, 50, 0, 5) + new AttackMove(Moves.LEAF_TORNADO, PokemonType.GRASS, MoveCategory.SPECIAL, 65, 90, 10, 50, 0, 5) .attr(StatStageChangeAttr, [ Stat.ACC ], -1), - new AttackMove(Moves.STEAMROLLER, Type.BUG, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 5) + new AttackMove(Moves.STEAMROLLER, PokemonType.BUG, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 5) .attr(AlwaysHitMinimizeAttr) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED) .attr(FlinchAttr), - new SelfStatusMove(Moves.COTTON_GUARD, Type.GRASS, -1, 10, -1, 0, 5) + new SelfStatusMove(Moves.COTTON_GUARD, PokemonType.GRASS, -1, 10, -1, 0, 5) .attr(StatStageChangeAttr, [ Stat.DEF ], 3, true), - new AttackMove(Moves.NIGHT_DAZE, Type.DARK, MoveCategory.SPECIAL, 85, 95, 10, 40, 0, 5) + new AttackMove(Moves.NIGHT_DAZE, PokemonType.DARK, MoveCategory.SPECIAL, 85, 95, 10, 40, 0, 5) .attr(StatStageChangeAttr, [ Stat.ACC ], -1), - new AttackMove(Moves.PSYSTRIKE, Type.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 5) + new AttackMove(Moves.PSYSTRIKE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 5) .attr(DefDefAttr), - new AttackMove(Moves.TAIL_SLAP, Type.NORMAL, MoveCategory.PHYSICAL, 25, 85, 10, -1, 0, 5) + new AttackMove(Moves.TAIL_SLAP, PokemonType.NORMAL, MoveCategory.PHYSICAL, 25, 85, 10, -1, 0, 5) .attr(MultiHitAttr), - new AttackMove(Moves.HURRICANE, Type.FLYING, MoveCategory.SPECIAL, 110, 70, 10, 30, 0, 5) + new AttackMove(Moves.HURRICANE, PokemonType.FLYING, MoveCategory.SPECIAL, 110, 70, 10, 30, 0, 5) .attr(ThunderAccuracyAttr) .attr(ConfuseAttr) .attr(HitsTagAttr, BattlerTagType.FLYING) .windMove(), - new AttackMove(Moves.HEAD_CHARGE, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 5) + new AttackMove(Moves.HEAD_CHARGE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 5) .attr(RecoilAttr) .recklessMove(), - new AttackMove(Moves.GEAR_GRIND, Type.STEEL, MoveCategory.PHYSICAL, 50, 85, 15, -1, 0, 5) + new AttackMove(Moves.GEAR_GRIND, PokemonType.STEEL, MoveCategory.PHYSICAL, 50, 85, 15, -1, 0, 5) .attr(MultiHitAttr, MultiHitType._2), - new AttackMove(Moves.SEARING_SHOT, Type.FIRE, MoveCategory.SPECIAL, 100, 100, 5, 30, 0, 5) + new AttackMove(Moves.SEARING_SHOT, PokemonType.FIRE, MoveCategory.SPECIAL, 100, 100, 5, 30, 0, 5) .attr(StatusEffectAttr, StatusEffect.BURN) .ballBombMove() .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.TECHNO_BLAST, Type.NORMAL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 5) + new AttackMove(Moves.TECHNO_BLAST, PokemonType.NORMAL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 5) .attr(TechnoBlastTypeAttr), - new AttackMove(Moves.RELIC_SONG, Type.NORMAL, MoveCategory.SPECIAL, 75, 100, 10, 10, 0, 5) + new AttackMove(Moves.RELIC_SONG, PokemonType.NORMAL, MoveCategory.SPECIAL, 75, 100, 10, 10, 0, 5) .attr(StatusEffectAttr, StatusEffect.SLEEP) .soundBased() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.SECRET_SWORD, Type.FIGHTING, MoveCategory.SPECIAL, 85, 100, 10, -1, 0, 5) + new AttackMove(Moves.SECRET_SWORD, PokemonType.FIGHTING, MoveCategory.SPECIAL, 85, 100, 10, -1, 0, 5) .attr(DefDefAttr) .slicingMove(), - new AttackMove(Moves.GLACIATE, Type.ICE, MoveCategory.SPECIAL, 65, 95, 10, 100, 0, 5) + new AttackMove(Moves.GLACIATE, PokemonType.ICE, MoveCategory.SPECIAL, 65, 95, 10, 100, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPD ], -1) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.BOLT_STRIKE, Type.ELECTRIC, MoveCategory.PHYSICAL, 130, 85, 5, 20, 0, 5) + new AttackMove(Moves.BOLT_STRIKE, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 130, 85, 5, 20, 0, 5) .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new AttackMove(Moves.BLUE_FLARE, Type.FIRE, MoveCategory.SPECIAL, 130, 85, 5, 20, 0, 5) + new AttackMove(Moves.BLUE_FLARE, PokemonType.FIRE, MoveCategory.SPECIAL, 130, 85, 5, 20, 0, 5) .attr(StatusEffectAttr, StatusEffect.BURN), - new AttackMove(Moves.FIERY_DANCE, Type.FIRE, MoveCategory.SPECIAL, 80, 100, 10, 50, 0, 5) + new AttackMove(Moves.FIERY_DANCE, PokemonType.FIRE, MoveCategory.SPECIAL, 80, 100, 10, 50, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPATK ], 1, true) .danceMove(), - new ChargingAttackMove(Moves.FREEZE_SHOCK, Type.ICE, MoveCategory.PHYSICAL, 140, 90, 5, 30, 0, 5) + new ChargingAttackMove(Moves.FREEZE_SHOCK, PokemonType.ICE, MoveCategory.PHYSICAL, 140, 90, 5, 30, 0, 5) .chargeText(i18next.t("moveTriggers:becameCloakedInFreezingLight", { pokemonName: "{USER}" })) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .makesContact(false), - new ChargingAttackMove(Moves.ICE_BURN, Type.ICE, MoveCategory.SPECIAL, 140, 90, 5, 30, 0, 5) + new ChargingAttackMove(Moves.ICE_BURN, PokemonType.ICE, MoveCategory.SPECIAL, 140, 90, 5, 30, 0, 5) .chargeText(i18next.t("moveTriggers:becameCloakedInFreezingAir", { pokemonName: "{USER}" })) .attr(StatusEffectAttr, StatusEffect.BURN), - new AttackMove(Moves.SNARL, Type.DARK, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 5) + new AttackMove(Moves.SNARL, PokemonType.DARK, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 5) .attr(StatStageChangeAttr, [ Stat.SPATK ], -1) .soundBased() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.ICICLE_CRASH, Type.ICE, MoveCategory.PHYSICAL, 85, 90, 10, 30, 0, 5) + new AttackMove(Moves.ICICLE_CRASH, PokemonType.ICE, MoveCategory.PHYSICAL, 85, 90, 10, 30, 0, 5) .attr(FlinchAttr) .makesContact(false), - new AttackMove(Moves.V_CREATE, Type.FIRE, MoveCategory.PHYSICAL, 180, 95, 5, -1, 0, 5) + new AttackMove(Moves.V_CREATE, PokemonType.FIRE, MoveCategory.PHYSICAL, 180, 95, 5, -1, 0, 5) .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF, Stat.SPD ], -1, true), - new AttackMove(Moves.FUSION_FLARE, Type.FIRE, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 5) + new AttackMove(Moves.FUSION_FLARE, PokemonType.FIRE, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 5) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(LastMoveDoublePowerAttr, Moves.FUSION_BOLT), - new AttackMove(Moves.FUSION_BOLT, Type.ELECTRIC, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 5) + new AttackMove(Moves.FUSION_BOLT, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 5) .attr(LastMoveDoublePowerAttr, Moves.FUSION_FLARE) .makesContact(false), - new AttackMove(Moves.FLYING_PRESS, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 95, 10, -1, 0, 6) + new AttackMove(Moves.FLYING_PRESS, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 95, 10, -1, 0, 6) .attr(AlwaysHitMinimizeAttr) .attr(FlyingTypeMultiplierAttr) .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED) .condition(failOnGravityCondition), - new StatusMove(Moves.MAT_BLOCK, Type.FIGHTING, -1, 10, -1, 0, 6) + new StatusMove(Moves.MAT_BLOCK, PokemonType.FIGHTING, -1, 10, -1, 0, 6) .target(MoveTarget.USER_SIDE) .attr(AddArenaTagAttr, ArenaTagType.MAT_BLOCK, 1, true, true) .condition(new FirstMoveCondition()) .condition(failIfLastCondition), - new AttackMove(Moves.BELCH, Type.POISON, MoveCategory.SPECIAL, 120, 90, 10, -1, 0, 6) + new AttackMove(Moves.BELCH, PokemonType.POISON, MoveCategory.SPECIAL, 120, 90, 10, -1, 0, 6) .condition((user, target, move) => user.battleData.berriesEaten.length > 0), - new StatusMove(Moves.ROTOTILLER, Type.GROUND, -1, 10, -1, 0, 6) + new StatusMove(Moves.ROTOTILLER, PokemonType.GROUND, -1, 10, -1, 0, 6) .target(MoveTarget.ALL) .condition((user, target, move) => { // If any fielded pokémon is grass-type and grounded. - return [ ...globalScene.getEnemyParty(), ...globalScene.getPlayerParty() ].some((poke) => poke.isOfType(Type.GRASS) && poke.isGrounded()); + return [ ...globalScene.getEnemyParty(), ...globalScene.getPlayerParty() ].some((poke) => poke.isOfType(PokemonType.GRASS) && poke.isGrounded()); }) - .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, false, { condition: (user, target, move) => target.isOfType(Type.GRASS) && target.isGrounded() }), - new StatusMove(Moves.STICKY_WEB, Type.BUG, -1, 20, -1, 0, 6) + .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, false, { condition: (user, target, move) => target.isOfType(PokemonType.GRASS) && target.isGrounded() }), + new StatusMove(Moves.STICKY_WEB, PokemonType.BUG, -1, 20, -1, 0, 6) .attr(AddArenaTrapTagAttr, ArenaTagType.STICKY_WEB) - .target(MoveTarget.ENEMY_SIDE), - new AttackMove(Moves.FELL_STINGER, Type.BUG, MoveCategory.PHYSICAL, 50, 100, 25, -1, 0, 6) + .target(MoveTarget.ENEMY_SIDE) + .reflectable(), + new AttackMove(Moves.FELL_STINGER, PokemonType.BUG, MoveCategory.PHYSICAL, 50, 100, 25, -1, 0, 6) .attr(PostVictoryStatStageChangeAttr, [ Stat.ATK ], 3, true ), - new ChargingAttackMove(Moves.PHANTOM_FORCE, Type.GHOST, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6) + new ChargingAttackMove(Moves.PHANTOM_FORCE, PokemonType.GHOST, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6) .chargeText(i18next.t("moveTriggers:vanishedInstantly", { pokemonName: "{USER}" })) .chargeAttr(SemiInvulnerableAttr, BattlerTagType.HIDDEN) .ignoresProtect(), - new StatusMove(Moves.TRICK_OR_TREAT, Type.GHOST, 100, 20, -1, 0, 6) - .attr(AddTypeAttr, Type.GHOST), - new StatusMove(Moves.NOBLE_ROAR, Type.NORMAL, 100, 30, -1, 0, 6) + new StatusMove(Moves.TRICK_OR_TREAT, PokemonType.GHOST, 100, 20, -1, 0, 6) + .attr(AddTypeAttr, PokemonType.GHOST) + .reflectable(), + new StatusMove(Moves.NOBLE_ROAR, PokemonType.NORMAL, 100, 30, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1) - .soundBased(), - new StatusMove(Moves.ION_DELUGE, Type.ELECTRIC, -1, 25, -1, 1, 6) + .soundBased() + .reflectable(), + new StatusMove(Moves.ION_DELUGE, PokemonType.ELECTRIC, -1, 25, -1, 1, 6) .attr(AddArenaTagAttr, ArenaTagType.ION_DELUGE) .target(MoveTarget.BOTH_SIDES), - new AttackMove(Moves.PARABOLIC_CHARGE, Type.ELECTRIC, MoveCategory.SPECIAL, 65, 100, 20, -1, 0, 6) + new AttackMove(Moves.PARABOLIC_CHARGE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 65, 100, 20, -1, 0, 6) .attr(HitHealAttr) .target(MoveTarget.ALL_NEAR_OTHERS) .triageMove(), - new StatusMove(Moves.FORESTS_CURSE, Type.GRASS, 100, 20, -1, 0, 6) - .attr(AddTypeAttr, Type.GRASS), - new AttackMove(Moves.PETAL_BLIZZARD, Type.GRASS, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 6) + new StatusMove(Moves.FORESTS_CURSE, PokemonType.GRASS, 100, 20, -1, 0, 6) + .attr(AddTypeAttr, PokemonType.GRASS) + .reflectable(), + new AttackMove(Moves.PETAL_BLIZZARD, PokemonType.GRASS, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 6) .windMove() .makesContact(false) .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.FREEZE_DRY, Type.ICE, MoveCategory.SPECIAL, 70, 100, 20, 10, 0, 6) + new AttackMove(Moves.FREEZE_DRY, PokemonType.ICE, MoveCategory.SPECIAL, 70, 100, 20, 10, 0, 6) .attr(StatusEffectAttr, StatusEffect.FREEZE) .attr(FreezeDryAttr), - new AttackMove(Moves.DISARMING_VOICE, Type.FAIRY, MoveCategory.SPECIAL, 40, -1, 15, -1, 0, 6) + new AttackMove(Moves.DISARMING_VOICE, PokemonType.FAIRY, MoveCategory.SPECIAL, 40, -1, 15, -1, 0, 6) .soundBased() .target(MoveTarget.ALL_NEAR_ENEMIES), - new StatusMove(Moves.PARTING_SHOT, Type.DARK, 100, 20, -1, 0, 6) + new StatusMove(Moves.PARTING_SHOT, PokemonType.DARK, 100, 20, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, false, { trigger: MoveEffectTrigger.PRE_APPLY }) .attr(ForceSwitchOutAttr, true) - .soundBased(), - new StatusMove(Moves.TOPSY_TURVY, Type.DARK, -1, 20, -1, 0, 6) - .attr(InvertStatsAttr), - new AttackMove(Moves.DRAINING_KISS, Type.FAIRY, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 6) + .soundBased() + .reflectable(), + new StatusMove(Moves.TOPSY_TURVY, PokemonType.DARK, -1, 20, -1, 0, 6) + .attr(InvertStatsAttr) + .reflectable(), + new AttackMove(Moves.DRAINING_KISS, PokemonType.FAIRY, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 6) .attr(HitHealAttr, 0.75) .makesContact() .triageMove(), - new StatusMove(Moves.CRAFTY_SHIELD, Type.FAIRY, -1, 10, -1, 3, 6) + new StatusMove(Moves.CRAFTY_SHIELD, PokemonType.FAIRY, -1, 10, -1, 3, 6) .target(MoveTarget.USER_SIDE) .attr(AddArenaTagAttr, ArenaTagType.CRAFTY_SHIELD, 1, true, true) .condition(failIfLastCondition), - new StatusMove(Moves.FLOWER_SHIELD, Type.FAIRY, -1, 10, -1, 0, 6) + new StatusMove(Moves.FLOWER_SHIELD, PokemonType.FAIRY, -1, 10, -1, 0, 6) .target(MoveTarget.ALL) - .attr(StatStageChangeAttr, [ Stat.DEF ], 1, false, { condition: (user, target, move) => target.getTypes().includes(Type.GRASS) && !target.getTag(SemiInvulnerableTag) }), - new StatusMove(Moves.GRASSY_TERRAIN, Type.GRASS, -1, 10, -1, 0, 6) + .attr(StatStageChangeAttr, [ Stat.DEF ], 1, false, { condition: (user, target, move) => target.getTypes().includes(PokemonType.GRASS) && !target.getTag(SemiInvulnerableTag) }), + new StatusMove(Moves.GRASSY_TERRAIN, PokemonType.GRASS, -1, 10, -1, 0, 6) .attr(TerrainChangeAttr, TerrainType.GRASSY) .target(MoveTarget.BOTH_SIDES), - new StatusMove(Moves.MISTY_TERRAIN, Type.FAIRY, -1, 10, -1, 0, 6) + new StatusMove(Moves.MISTY_TERRAIN, PokemonType.FAIRY, -1, 10, -1, 0, 6) .attr(TerrainChangeAttr, TerrainType.MISTY) .target(MoveTarget.BOTH_SIDES), - new StatusMove(Moves.ELECTRIFY, Type.ELECTRIC, -1, 20, -1, 0, 6) + new StatusMove(Moves.ELECTRIFY, PokemonType.ELECTRIC, -1, 20, -1, 0, 6) .attr(AddBattlerTagAttr, BattlerTagType.ELECTRIFIED, false, true), - new AttackMove(Moves.PLAY_ROUGH, Type.FAIRY, MoveCategory.PHYSICAL, 90, 90, 10, 10, 0, 6) + new AttackMove(Moves.PLAY_ROUGH, PokemonType.FAIRY, MoveCategory.PHYSICAL, 90, 90, 10, 10, 0, 6) .attr(StatStageChangeAttr, [ Stat.ATK ], -1), - new AttackMove(Moves.FAIRY_WIND, Type.FAIRY, MoveCategory.SPECIAL, 40, 100, 30, -1, 0, 6) + new AttackMove(Moves.FAIRY_WIND, PokemonType.FAIRY, MoveCategory.SPECIAL, 40, 100, 30, -1, 0, 6) .windMove(), - new AttackMove(Moves.MOONBLAST, Type.FAIRY, MoveCategory.SPECIAL, 95, 100, 15, 30, 0, 6) + new AttackMove(Moves.MOONBLAST, PokemonType.FAIRY, MoveCategory.SPECIAL, 95, 100, 15, 30, 0, 6) .attr(StatStageChangeAttr, [ Stat.SPATK ], -1), - new AttackMove(Moves.BOOMBURST, Type.NORMAL, MoveCategory.SPECIAL, 140, 100, 10, -1, 0, 6) + new AttackMove(Moves.BOOMBURST, PokemonType.NORMAL, MoveCategory.SPECIAL, 140, 100, 10, -1, 0, 6) .soundBased() .target(MoveTarget.ALL_NEAR_OTHERS), - new StatusMove(Moves.FAIRY_LOCK, Type.FAIRY, -1, 10, -1, 0, 6) + new StatusMove(Moves.FAIRY_LOCK, PokemonType.FAIRY, -1, 10, -1, 0, 6) .ignoresSubstitute() .ignoresProtect() .target(MoveTarget.BOTH_SIDES) .attr(AddArenaTagAttr, ArenaTagType.FAIRY_LOCK, 2, true), - new SelfStatusMove(Moves.KINGS_SHIELD, Type.STEEL, -1, 10, -1, 4, 6) + new SelfStatusMove(Moves.KINGS_SHIELD, PokemonType.STEEL, -1, 10, -1, 4, 6) .attr(ProtectAttr, BattlerTagType.KINGS_SHIELD) .condition(failIfLastCondition), - new StatusMove(Moves.PLAY_NICE, Type.NORMAL, -1, 20, -1, 0, 6) + new StatusMove(Moves.PLAY_NICE, PokemonType.NORMAL, -1, 20, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.ATK ], -1) - .ignoresSubstitute(), - new StatusMove(Moves.CONFIDE, Type.NORMAL, -1, 20, -1, 0, 6) + .ignoresSubstitute() + .reflectable(), + new StatusMove(Moves.CONFIDE, PokemonType.NORMAL, -1, 20, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.SPATK ], -1) - .soundBased(), - new AttackMove(Moves.DIAMOND_STORM, Type.ROCK, MoveCategory.PHYSICAL, 100, 95, 5, 50, 0, 6) + .soundBased() + .reflectable(), + new AttackMove(Moves.DIAMOND_STORM, PokemonType.ROCK, MoveCategory.PHYSICAL, 100, 95, 5, 50, 0, 6) .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true, { firstTargetOnly: true }) .makesContact(false) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.STEAM_ERUPTION, Type.WATER, MoveCategory.SPECIAL, 110, 95, 5, 30, 0, 6) + new AttackMove(Moves.STEAM_ERUPTION, PokemonType.WATER, MoveCategory.SPECIAL, 110, 95, 5, 30, 0, 6) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(HealStatusEffectAttr, false, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN), - new AttackMove(Moves.HYPERSPACE_HOLE, Type.PSYCHIC, MoveCategory.SPECIAL, 80, -1, 5, -1, 0, 6) + new AttackMove(Moves.HYPERSPACE_HOLE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, -1, 5, -1, 0, 6) .ignoresProtect() .ignoresSubstitute(), - new AttackMove(Moves.WATER_SHURIKEN, Type.WATER, MoveCategory.SPECIAL, 15, 100, 20, -1, 1, 6) + new AttackMove(Moves.WATER_SHURIKEN, PokemonType.WATER, MoveCategory.SPECIAL, 15, 100, 20, -1, 1, 6) .attr(MultiHitAttr) .attr(WaterShurikenPowerAttr) .attr(WaterShurikenMultiHitTypeAttr), - new AttackMove(Moves.MYSTICAL_FIRE, Type.FIRE, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 6) + new AttackMove(Moves.MYSTICAL_FIRE, PokemonType.FIRE, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 6) .attr(StatStageChangeAttr, [ Stat.SPATK ], -1), - new SelfStatusMove(Moves.SPIKY_SHIELD, Type.GRASS, -1, 10, -1, 4, 6) + new SelfStatusMove(Moves.SPIKY_SHIELD, PokemonType.GRASS, -1, 10, -1, 4, 6) .attr(ProtectAttr, BattlerTagType.SPIKY_SHIELD) .condition(failIfLastCondition), - new StatusMove(Moves.AROMATIC_MIST, Type.FAIRY, -1, 20, -1, 0, 6) + new StatusMove(Moves.AROMATIC_MIST, PokemonType.FAIRY, -1, 20, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.SPDEF ], 1) .ignoresSubstitute() .condition(failIfSingleBattle) .target(MoveTarget.NEAR_ALLY), - new StatusMove(Moves.EERIE_IMPULSE, Type.ELECTRIC, 100, 15, -1, 0, 6) - .attr(StatStageChangeAttr, [ Stat.SPATK ], -2), - new StatusMove(Moves.VENOM_DRENCH, Type.POISON, 100, 20, -1, 0, 6) + new StatusMove(Moves.EERIE_IMPULSE, PokemonType.ELECTRIC, 100, 15, -1, 0, 6) + .attr(StatStageChangeAttr, [ Stat.SPATK ], -2) + .reflectable(), + new StatusMove(Moves.VENOM_DRENCH, PokemonType.POISON, 100, 20, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK, Stat.SPD ], -1, false, { condition: (user, target, move) => target.status?.effect === StatusEffect.POISON || target.status?.effect === StatusEffect.TOXIC }) - .target(MoveTarget.ALL_NEAR_ENEMIES), - new StatusMove(Moves.POWDER, Type.BUG, 100, 20, -1, 1, 6) + .target(MoveTarget.ALL_NEAR_ENEMIES) + .reflectable(), + new StatusMove(Moves.POWDER, PokemonType.BUG, 100, 20, -1, 1, 6) .attr(AddBattlerTagAttr, BattlerTagType.POWDER, false, true) .ignoresSubstitute() - .powderMove(), - new ChargingSelfStatusMove(Moves.GEOMANCY, Type.FAIRY, -1, 10, -1, 0, 6) + .powderMove() + .reflectable(), + new ChargingSelfStatusMove(Moves.GEOMANCY, PokemonType.FAIRY, -1, 10, -1, 0, 6) .chargeText(i18next.t("moveTriggers:isChargingPower", { pokemonName: "{USER}" })) .attr(StatStageChangeAttr, [ Stat.SPATK, Stat.SPDEF, Stat.SPD ], 2, true), - new StatusMove(Moves.MAGNETIC_FLUX, Type.ELECTRIC, -1, 20, -1, 0, 6) + new StatusMove(Moves.MAGNETIC_FLUX, PokemonType.ELECTRIC, -1, 20, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], 1, false, { condition: (user, target, move) => !![ Abilities.PLUS, Abilities.MINUS ].find(a => target.hasAbility(a, false)) }) .ignoresSubstitute() .target(MoveTarget.USER_AND_ALLIES) .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS ].find(a => p.hasAbility(a, false)))), - new StatusMove(Moves.HAPPY_HOUR, Type.NORMAL, -1, 30, -1, 0, 6) // No animation + new StatusMove(Moves.HAPPY_HOUR, PokemonType.NORMAL, -1, 30, -1, 0, 6) // No animation .attr(AddArenaTagAttr, ArenaTagType.HAPPY_HOUR, null, true) .target(MoveTarget.USER_SIDE), - new StatusMove(Moves.ELECTRIC_TERRAIN, Type.ELECTRIC, -1, 10, -1, 0, 6) + new StatusMove(Moves.ELECTRIC_TERRAIN, PokemonType.ELECTRIC, -1, 10, -1, 0, 6) .attr(TerrainChangeAttr, TerrainType.ELECTRIC) .target(MoveTarget.BOTH_SIDES), - new AttackMove(Moves.DAZZLING_GLEAM, Type.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 6) + new AttackMove(Moves.DAZZLING_GLEAM, PokemonType.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 6) .target(MoveTarget.ALL_NEAR_ENEMIES), - new SelfStatusMove(Moves.CELEBRATE, Type.NORMAL, -1, 40, -1, 0, 6), - new StatusMove(Moves.HOLD_HANDS, Type.NORMAL, -1, 40, -1, 0, 6) + new SelfStatusMove(Moves.CELEBRATE, PokemonType.NORMAL, -1, 40, -1, 0, 6) + .attr(CelebrateAttr), + new StatusMove(Moves.HOLD_HANDS, PokemonType.NORMAL, -1, 40, -1, 0, 6) .ignoresSubstitute() .target(MoveTarget.NEAR_ALLY), - new StatusMove(Moves.BABY_DOLL_EYES, Type.FAIRY, 100, 30, -1, 1, 6) - .attr(StatStageChangeAttr, [ Stat.ATK ], -1), - new AttackMove(Moves.NUZZLE, Type.ELECTRIC, MoveCategory.PHYSICAL, 20, 100, 20, 100, 0, 6) + new StatusMove(Moves.BABY_DOLL_EYES, PokemonType.FAIRY, 100, 30, -1, 1, 6) + .attr(StatStageChangeAttr, [ Stat.ATK ], -1) + .reflectable(), + new AttackMove(Moves.NUZZLE, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 20, 100, 20, 100, 0, 6) .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new AttackMove(Moves.HOLD_BACK, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 6) + new AttackMove(Moves.HOLD_BACK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 6) .attr(SurviveDamageAttr), - new AttackMove(Moves.INFESTATION, Type.BUG, MoveCategory.SPECIAL, 20, 100, 20, -1, 0, 6) + new AttackMove(Moves.INFESTATION, PokemonType.BUG, MoveCategory.SPECIAL, 20, 100, 20, -1, 0, 6) .makesContact() .attr(TrapAttr, BattlerTagType.INFESTATION), - new AttackMove(Moves.POWER_UP_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 20, 100, 0, 6) + new AttackMove(Moves.POWER_UP_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 20, 100, 0, 6) .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true) .punchingMove(), - new AttackMove(Moves.OBLIVION_WING, Type.FLYING, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 6) + new AttackMove(Moves.OBLIVION_WING, PokemonType.FLYING, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 6) .attr(HitHealAttr, 0.75) .triageMove(), - new AttackMove(Moves.THOUSAND_ARROWS, Type.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6) + new AttackMove(Moves.THOUSAND_ARROWS, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6) .attr(NeutralDamageAgainstFlyingTypeMultiplierAttr) .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true) .attr(HitsTagAttr, BattlerTagType.FLYING) @@ -10099,367 +10104,372 @@ export function initMoves() { .attr(RemoveBattlerTagAttr, [ BattlerTagType.FLYING, BattlerTagType.FLOATING, BattlerTagType.TELEKINESIS ]) .makesContact(false) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.THOUSAND_WAVES, Type.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6) + new AttackMove(Moves.THOUSAND_WAVES, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6) .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, true) .makesContact(false) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.LANDS_WRATH, Type.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6) + new AttackMove(Moves.LANDS_WRATH, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6) .makesContact(false) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.LIGHT_OF_RUIN, Type.FAIRY, MoveCategory.SPECIAL, 140, 90, 5, -1, 0, 6) + new AttackMove(Moves.LIGHT_OF_RUIN, PokemonType.FAIRY, MoveCategory.SPECIAL, 140, 90, 5, -1, 0, 6) .attr(RecoilAttr, false, 0.5) .recklessMove(), - new AttackMove(Moves.ORIGIN_PULSE, Type.WATER, MoveCategory.SPECIAL, 110, 85, 10, -1, 0, 6) + new AttackMove(Moves.ORIGIN_PULSE, PokemonType.WATER, MoveCategory.SPECIAL, 110, 85, 10, -1, 0, 6) .pulseMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.PRECIPICE_BLADES, Type.GROUND, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 6) + new AttackMove(Moves.PRECIPICE_BLADES, PokemonType.GROUND, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 6) .makesContact(false) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.DRAGON_ASCENT, Type.FLYING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 6) + new AttackMove(Moves.DRAGON_ASCENT, PokemonType.FLYING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true), - new AttackMove(Moves.HYPERSPACE_FURY, Type.DARK, MoveCategory.PHYSICAL, 100, -1, 5, -1, 0, 6) + new AttackMove(Moves.HYPERSPACE_FURY, PokemonType.DARK, MoveCategory.PHYSICAL, 100, -1, 5, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.DEF ], -1, true) .ignoresSubstitute() .makesContact(false) .ignoresProtect(), /* Unused */ - new AttackMove(Moves.BREAKNECK_BLITZ__PHYSICAL, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.BREAKNECK_BLITZ__PHYSICAL, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.BREAKNECK_BLITZ__SPECIAL, Type.NORMAL, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.BREAKNECK_BLITZ__SPECIAL, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.ALL_OUT_PUMMELING__PHYSICAL, Type.FIGHTING, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.ALL_OUT_PUMMELING__PHYSICAL, PokemonType.FIGHTING, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.ALL_OUT_PUMMELING__SPECIAL, Type.FIGHTING, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.ALL_OUT_PUMMELING__SPECIAL, PokemonType.FIGHTING, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.SUPERSONIC_SKYSTRIKE__PHYSICAL, Type.FLYING, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.SUPERSONIC_SKYSTRIKE__PHYSICAL, PokemonType.FLYING, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.SUPERSONIC_SKYSTRIKE__SPECIAL, Type.FLYING, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.SUPERSONIC_SKYSTRIKE__SPECIAL, PokemonType.FLYING, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.ACID_DOWNPOUR__PHYSICAL, Type.POISON, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.ACID_DOWNPOUR__PHYSICAL, PokemonType.POISON, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.ACID_DOWNPOUR__SPECIAL, Type.POISON, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.ACID_DOWNPOUR__SPECIAL, PokemonType.POISON, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.TECTONIC_RAGE__PHYSICAL, Type.GROUND, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.TECTONIC_RAGE__PHYSICAL, PokemonType.GROUND, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.TECTONIC_RAGE__SPECIAL, Type.GROUND, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.TECTONIC_RAGE__SPECIAL, PokemonType.GROUND, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.CONTINENTAL_CRUSH__PHYSICAL, Type.ROCK, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.CONTINENTAL_CRUSH__PHYSICAL, PokemonType.ROCK, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.CONTINENTAL_CRUSH__SPECIAL, Type.ROCK, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.CONTINENTAL_CRUSH__SPECIAL, PokemonType.ROCK, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.SAVAGE_SPIN_OUT__PHYSICAL, Type.BUG, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.SAVAGE_SPIN_OUT__PHYSICAL, PokemonType.BUG, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.SAVAGE_SPIN_OUT__SPECIAL, Type.BUG, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.SAVAGE_SPIN_OUT__SPECIAL, PokemonType.BUG, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.NEVER_ENDING_NIGHTMARE__PHYSICAL, Type.GHOST, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.NEVER_ENDING_NIGHTMARE__PHYSICAL, PokemonType.GHOST, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.NEVER_ENDING_NIGHTMARE__SPECIAL, Type.GHOST, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.NEVER_ENDING_NIGHTMARE__SPECIAL, PokemonType.GHOST, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.CORKSCREW_CRASH__PHYSICAL, Type.STEEL, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.CORKSCREW_CRASH__PHYSICAL, PokemonType.STEEL, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.CORKSCREW_CRASH__SPECIAL, Type.STEEL, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.CORKSCREW_CRASH__SPECIAL, PokemonType.STEEL, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.INFERNO_OVERDRIVE__PHYSICAL, Type.FIRE, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.INFERNO_OVERDRIVE__PHYSICAL, PokemonType.FIRE, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.INFERNO_OVERDRIVE__SPECIAL, Type.FIRE, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.INFERNO_OVERDRIVE__SPECIAL, PokemonType.FIRE, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.HYDRO_VORTEX__PHYSICAL, Type.WATER, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.HYDRO_VORTEX__PHYSICAL, PokemonType.WATER, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.HYDRO_VORTEX__SPECIAL, Type.WATER, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.HYDRO_VORTEX__SPECIAL, PokemonType.WATER, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.BLOOM_DOOM__PHYSICAL, Type.GRASS, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.BLOOM_DOOM__PHYSICAL, PokemonType.GRASS, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.BLOOM_DOOM__SPECIAL, Type.GRASS, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.BLOOM_DOOM__SPECIAL, PokemonType.GRASS, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.GIGAVOLT_HAVOC__PHYSICAL, Type.ELECTRIC, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.GIGAVOLT_HAVOC__PHYSICAL, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.GIGAVOLT_HAVOC__SPECIAL, Type.ELECTRIC, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.GIGAVOLT_HAVOC__SPECIAL, PokemonType.ELECTRIC, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.SHATTERED_PSYCHE__PHYSICAL, Type.PSYCHIC, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.SHATTERED_PSYCHE__PHYSICAL, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.SHATTERED_PSYCHE__SPECIAL, Type.PSYCHIC, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.SHATTERED_PSYCHE__SPECIAL, PokemonType.PSYCHIC, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.SUBZERO_SLAMMER__PHYSICAL, Type.ICE, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.SUBZERO_SLAMMER__PHYSICAL, PokemonType.ICE, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.SUBZERO_SLAMMER__SPECIAL, Type.ICE, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.SUBZERO_SLAMMER__SPECIAL, PokemonType.ICE, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.DEVASTATING_DRAKE__PHYSICAL, Type.DRAGON, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.DEVASTATING_DRAKE__PHYSICAL, PokemonType.DRAGON, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.DEVASTATING_DRAKE__SPECIAL, Type.DRAGON, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.DEVASTATING_DRAKE__SPECIAL, PokemonType.DRAGON, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.BLACK_HOLE_ECLIPSE__PHYSICAL, Type.DARK, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.BLACK_HOLE_ECLIPSE__PHYSICAL, PokemonType.DARK, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.BLACK_HOLE_ECLIPSE__SPECIAL, Type.DARK, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.BLACK_HOLE_ECLIPSE__SPECIAL, PokemonType.DARK, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.TWINKLE_TACKLE__PHYSICAL, Type.FAIRY, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.TWINKLE_TACKLE__PHYSICAL, PokemonType.FAIRY, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.TWINKLE_TACKLE__SPECIAL, Type.FAIRY, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.TWINKLE_TACKLE__SPECIAL, PokemonType.FAIRY, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.CATASTROPIKA, Type.ELECTRIC, MoveCategory.PHYSICAL, 210, -1, 1, -1, 0, 7) + new AttackMove(Moves.CATASTROPIKA, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 210, -1, 1, -1, 0, 7) .unimplemented(), /* End Unused */ - new SelfStatusMove(Moves.SHORE_UP, Type.GROUND, -1, 5, -1, 0, 7) + new SelfStatusMove(Moves.SHORE_UP, PokemonType.GROUND, -1, 5, -1, 0, 7) .attr(SandHealAttr) .triageMove(), - new AttackMove(Moves.FIRST_IMPRESSION, Type.BUG, MoveCategory.PHYSICAL, 90, 100, 10, -1, 2, 7) + new AttackMove(Moves.FIRST_IMPRESSION, PokemonType.BUG, MoveCategory.PHYSICAL, 90, 100, 10, -1, 2, 7) .condition(new FirstMoveCondition()), - new SelfStatusMove(Moves.BANEFUL_BUNKER, Type.POISON, -1, 10, -1, 4, 7) + new SelfStatusMove(Moves.BANEFUL_BUNKER, PokemonType.POISON, -1, 10, -1, 4, 7) .attr(ProtectAttr, BattlerTagType.BANEFUL_BUNKER) .condition(failIfLastCondition), - new AttackMove(Moves.SPIRIT_SHACKLE, Type.GHOST, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 7) + new AttackMove(Moves.SPIRIT_SHACKLE, PokemonType.GHOST, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 7) .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, true) .makesContact(false), - new AttackMove(Moves.DARKEST_LARIAT, Type.DARK, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 7) + new AttackMove(Moves.DARKEST_LARIAT, PokemonType.DARK, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 7) .attr(IgnoreOpponentStatStagesAttr), - new AttackMove(Moves.SPARKLING_ARIA, Type.WATER, MoveCategory.SPECIAL, 90, 100, 10, 100, 0, 7) + new AttackMove(Moves.SPARKLING_ARIA, PokemonType.WATER, MoveCategory.SPECIAL, 90, 100, 10, 100, 0, 7) .attr(HealStatusEffectAttr, false, StatusEffect.BURN) .soundBased() .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.ICE_HAMMER, Type.ICE, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 7) + new AttackMove(Moves.ICE_HAMMER, PokemonType.ICE, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 7) .attr(StatStageChangeAttr, [ Stat.SPD ], -1, true) .punchingMove(), - new StatusMove(Moves.FLORAL_HEALING, Type.FAIRY, -1, 10, -1, 0, 7) + new StatusMove(Moves.FLORAL_HEALING, PokemonType.FAIRY, -1, 10, -1, 0, 7) .attr(BoostHealAttr, 0.5, 2 / 3, true, false, (user, target, move) => globalScene.arena.terrain?.terrainType === TerrainType.GRASSY) - .triageMove(), - new AttackMove(Moves.HIGH_HORSEPOWER, Type.GROUND, MoveCategory.PHYSICAL, 95, 95, 10, -1, 0, 7), - new StatusMove(Moves.STRENGTH_SAP, Type.GRASS, 100, 10, -1, 0, 7) + .triageMove() + .reflectable(), + new AttackMove(Moves.HIGH_HORSEPOWER, PokemonType.GROUND, MoveCategory.PHYSICAL, 95, 95, 10, -1, 0, 7), + new StatusMove(Moves.STRENGTH_SAP, PokemonType.GRASS, 100, 10, -1, 0, 7) .attr(HitHealAttr, null, Stat.ATK) .attr(StatStageChangeAttr, [ Stat.ATK ], -1) .condition((user, target, move) => target.getStatStage(Stat.ATK) > -6) - .triageMove(), - new ChargingAttackMove(Moves.SOLAR_BLADE, Type.GRASS, MoveCategory.PHYSICAL, 125, 100, 10, -1, 0, 7) + .triageMove() + .reflectable(), + new ChargingAttackMove(Moves.SOLAR_BLADE, PokemonType.GRASS, MoveCategory.PHYSICAL, 125, 100, 10, -1, 0, 7) .chargeText(i18next.t("moveTriggers:isGlowing", { pokemonName: "{USER}" })) .chargeAttr(WeatherInstantChargeAttr, [ WeatherType.SUNNY, WeatherType.HARSH_SUN ]) .attr(AntiSunlightPowerDecreaseAttr) .slicingMove(), - new AttackMove(Moves.LEAFAGE, Type.GRASS, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 7) + new AttackMove(Moves.LEAFAGE, PokemonType.GRASS, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 7) .makesContact(false), - new StatusMove(Moves.SPOTLIGHT, Type.NORMAL, -1, 15, -1, 3, 7) + new StatusMove(Moves.SPOTLIGHT, PokemonType.NORMAL, -1, 15, -1, 3, 7) .attr(AddBattlerTagAttr, BattlerTagType.CENTER_OF_ATTENTION, false) - .condition(failIfSingleBattle), - new StatusMove(Moves.TOXIC_THREAD, Type.POISON, 100, 20, -1, 0, 7) + .condition(failIfSingleBattle) + .reflectable(), + new StatusMove(Moves.TOXIC_THREAD, PokemonType.POISON, 100, 20, -1, 0, 7) .attr(StatusEffectAttr, StatusEffect.POISON) - .attr(StatStageChangeAttr, [ Stat.SPD ], -1), - new SelfStatusMove(Moves.LASER_FOCUS, Type.NORMAL, -1, 30, -1, 0, 7) + .attr(StatStageChangeAttr, [ Stat.SPD ], -1) + .reflectable(), + new SelfStatusMove(Moves.LASER_FOCUS, PokemonType.NORMAL, -1, 30, -1, 0, 7) .attr(AddBattlerTagAttr, BattlerTagType.ALWAYS_CRIT, true, false), - new StatusMove(Moves.GEAR_UP, Type.STEEL, -1, 20, -1, 0, 7) + new StatusMove(Moves.GEAR_UP, PokemonType.STEEL, -1, 20, -1, 0, 7) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, false, { condition: (user, target, move) => !![ Abilities.PLUS, Abilities.MINUS ].find(a => target.hasAbility(a, false)) }) .ignoresSubstitute() .target(MoveTarget.USER_AND_ALLIES) .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS ].find(a => p.hasAbility(a, false)))), - new AttackMove(Moves.THROAT_CHOP, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7) + new AttackMove(Moves.THROAT_CHOP, PokemonType.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7) .attr(AddBattlerTagAttr, BattlerTagType.THROAT_CHOPPED), - new AttackMove(Moves.POLLEN_PUFF, Type.BUG, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7) + new AttackMove(Moves.POLLEN_PUFF, PokemonType.BUG, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7) .attr(StatusCategoryOnAllyAttr) .attr(HealOnAllyAttr, 0.5, true, false) .ballBombMove(), - new AttackMove(Moves.ANCHOR_SHOT, Type.STEEL, MoveCategory.PHYSICAL, 80, 100, 20, 100, 0, 7) + new AttackMove(Moves.ANCHOR_SHOT, PokemonType.STEEL, MoveCategory.PHYSICAL, 80, 100, 20, 100, 0, 7) .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, true), - new StatusMove(Moves.PSYCHIC_TERRAIN, Type.PSYCHIC, -1, 10, -1, 0, 7) + new StatusMove(Moves.PSYCHIC_TERRAIN, PokemonType.PSYCHIC, -1, 10, -1, 0, 7) .attr(TerrainChangeAttr, TerrainType.PSYCHIC) .target(MoveTarget.BOTH_SIDES), - new AttackMove(Moves.LUNGE, Type.BUG, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7) + new AttackMove(Moves.LUNGE, PokemonType.BUG, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7) .attr(StatStageChangeAttr, [ Stat.ATK ], -1), - new AttackMove(Moves.FIRE_LASH, Type.FIRE, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7) + new AttackMove(Moves.FIRE_LASH, PokemonType.FIRE, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7) .attr(StatStageChangeAttr, [ Stat.DEF ], -1), - new AttackMove(Moves.POWER_TRIP, Type.DARK, MoveCategory.PHYSICAL, 20, 100, 10, -1, 0, 7) + new AttackMove(Moves.POWER_TRIP, PokemonType.DARK, MoveCategory.PHYSICAL, 20, 100, 10, -1, 0, 7) .attr(PositiveStatStagePowerAttr), - new AttackMove(Moves.BURN_UP, Type.FIRE, MoveCategory.SPECIAL, 130, 100, 5, -1, 0, 7) + new AttackMove(Moves.BURN_UP, PokemonType.FIRE, MoveCategory.SPECIAL, 130, 100, 5, -1, 0, 7) .condition((user) => { const userTypes = user.getTypes(true); - return userTypes.includes(Type.FIRE); + return userTypes.includes(PokemonType.FIRE); }) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(AddBattlerTagAttr, BattlerTagType.BURNED_UP, true, false) - .attr(RemoveTypeAttr, Type.FIRE, (user) => { + .attr(RemoveTypeAttr, PokemonType.FIRE, (user) => { globalScene.queueMessage(i18next.t("moveTriggers:burnedItselfOut", { pokemonName: getPokemonNameWithAffix(user) })); }), - new StatusMove(Moves.SPEED_SWAP, Type.PSYCHIC, -1, 10, -1, 0, 7) + new StatusMove(Moves.SPEED_SWAP, PokemonType.PSYCHIC, -1, 10, -1, 0, 7) .attr(SwapStatAttr, Stat.SPD) .ignoresSubstitute(), - new AttackMove(Moves.SMART_STRIKE, Type.STEEL, MoveCategory.PHYSICAL, 70, -1, 10, -1, 0, 7), - new StatusMove(Moves.PURIFY, Type.POISON, -1, 20, -1, 0, 7) + new AttackMove(Moves.SMART_STRIKE, PokemonType.STEEL, MoveCategory.PHYSICAL, 70, -1, 10, -1, 0, 7), + new StatusMove(Moves.PURIFY, PokemonType.POISON, -1, 20, -1, 0, 7) .condition( (user: Pokemon, target: Pokemon, move: Move) => isNonVolatileStatusEffect(target.status?.effect!)) // TODO: is this bang correct? .attr(HealAttr, 0.5) .attr(HealStatusEffectAttr, false, getNonVolatileStatusEffects()) - .triageMove(), - new AttackMove(Moves.REVELATION_DANCE, Type.NORMAL, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7) + .triageMove() + .reflectable(), + new AttackMove(Moves.REVELATION_DANCE, PokemonType.NORMAL, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7) .danceMove() .attr(MatchUserTypeAttr), - new AttackMove(Moves.CORE_ENFORCER, Type.DRAGON, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 7) + new AttackMove(Moves.CORE_ENFORCER, PokemonType.DRAGON, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 7) .target(MoveTarget.ALL_NEAR_ENEMIES) .attr(SuppressAbilitiesIfActedAttr), - new AttackMove(Moves.TROP_KICK, Type.GRASS, MoveCategory.PHYSICAL, 70, 100, 15, 100, 0, 7) + new AttackMove(Moves.TROP_KICK, PokemonType.GRASS, MoveCategory.PHYSICAL, 70, 100, 15, 100, 0, 7) .attr(StatStageChangeAttr, [ Stat.ATK ], -1), - new StatusMove(Moves.INSTRUCT, Type.PSYCHIC, -1, 15, -1, 0, 7) + new StatusMove(Moves.INSTRUCT, PokemonType.PSYCHIC, -1, 15, -1, 0, 7) .ignoresSubstitute() .attr(RepeatMoveAttr) // incorrect interactions with Gigaton Hammer, Blood Moon & Torment // Also has incorrect interactions with Dancer due to the latter // erroneously adding copied moves to move history. .edgeCase(), - new AttackMove(Moves.BEAK_BLAST, Type.FLYING, MoveCategory.PHYSICAL, 100, 100, 15, -1, -3, 7) + new AttackMove(Moves.BEAK_BLAST, PokemonType.FLYING, MoveCategory.PHYSICAL, 100, 100, 15, -1, -3, 7) .attr(BeakBlastHeaderAttr) .ballBombMove() .makesContact(false), - new AttackMove(Moves.CLANGING_SCALES, Type.DRAGON, MoveCategory.SPECIAL, 110, 100, 5, -1, 0, 7) + new AttackMove(Moves.CLANGING_SCALES, PokemonType.DRAGON, MoveCategory.SPECIAL, 110, 100, 5, -1, 0, 7) .attr(StatStageChangeAttr, [ Stat.DEF ], -1, true, { firstTargetOnly: true }) .soundBased() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.DRAGON_HAMMER, Type.DRAGON, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 7), - new AttackMove(Moves.BRUTAL_SWING, Type.DARK, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 7) + new AttackMove(Moves.DRAGON_HAMMER, PokemonType.DRAGON, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 7), + new AttackMove(Moves.BRUTAL_SWING, PokemonType.DARK, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 7) .target(MoveTarget.ALL_NEAR_OTHERS), - new StatusMove(Moves.AURORA_VEIL, Type.ICE, -1, 20, -1, 0, 7) + new StatusMove(Moves.AURORA_VEIL, PokemonType.ICE, -1, 20, -1, 0, 7) .condition((user, target, move) => (globalScene.arena.weather?.weatherType === WeatherType.HAIL || globalScene.arena.weather?.weatherType === WeatherType.SNOW) && !globalScene.arena.weather?.isEffectSuppressed()) .attr(AddArenaTagAttr, ArenaTagType.AURORA_VEIL, 5, true) .target(MoveTarget.USER_SIDE), /* Unused */ - new AttackMove(Moves.SINISTER_ARROW_RAID, Type.GHOST, MoveCategory.PHYSICAL, 180, -1, 1, -1, 0, 7) + new AttackMove(Moves.SINISTER_ARROW_RAID, PokemonType.GHOST, MoveCategory.PHYSICAL, 180, -1, 1, -1, 0, 7) .unimplemented() .makesContact(false) .edgeCase(), // I assume it's because the user needs spirit shackle and decidueye - new AttackMove(Moves.MALICIOUS_MOONSAULT, Type.DARK, MoveCategory.PHYSICAL, 180, -1, 1, -1, 0, 7) + new AttackMove(Moves.MALICIOUS_MOONSAULT, PokemonType.DARK, MoveCategory.PHYSICAL, 180, -1, 1, -1, 0, 7) .unimplemented() .attr(AlwaysHitMinimizeAttr) .attr(HitsTagAttr, BattlerTagType.MINIMIZED, true) .edgeCase(), // I assume it's because it needs darkest lariat and incineroar - new AttackMove(Moves.OCEANIC_OPERETTA, Type.WATER, MoveCategory.SPECIAL, 195, -1, 1, -1, 0, 7) + new AttackMove(Moves.OCEANIC_OPERETTA, PokemonType.WATER, MoveCategory.SPECIAL, 195, -1, 1, -1, 0, 7) .unimplemented() .edgeCase(), // I assume it's because it needs sparkling aria and primarina - new AttackMove(Moves.GUARDIAN_OF_ALOLA, Type.FAIRY, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) + new AttackMove(Moves.GUARDIAN_OF_ALOLA, PokemonType.FAIRY, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.SOUL_STEALING_7_STAR_STRIKE, Type.GHOST, MoveCategory.PHYSICAL, 195, -1, 1, -1, 0, 7) + new AttackMove(Moves.SOUL_STEALING_7_STAR_STRIKE, PokemonType.GHOST, MoveCategory.PHYSICAL, 195, -1, 1, -1, 0, 7) .unimplemented(), - new AttackMove(Moves.STOKED_SPARKSURFER, Type.ELECTRIC, MoveCategory.SPECIAL, 175, -1, 1, 100, 0, 7) + new AttackMove(Moves.STOKED_SPARKSURFER, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 175, -1, 1, 100, 0, 7) .unimplemented() .edgeCase(), // I assume it's because it needs thunderbolt and Alola Raichu - new AttackMove(Moves.PULVERIZING_PANCAKE, Type.NORMAL, MoveCategory.PHYSICAL, 210, -1, 1, -1, 0, 7) + new AttackMove(Moves.PULVERIZING_PANCAKE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 210, -1, 1, -1, 0, 7) .unimplemented() .edgeCase(), // I assume it's because it needs giga impact and snorlax - new SelfStatusMove(Moves.EXTREME_EVOBOOST, Type.NORMAL, -1, 1, -1, 0, 7) + new SelfStatusMove(Moves.EXTREME_EVOBOOST, PokemonType.NORMAL, -1, 1, -1, 0, 7) .unimplemented() .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 2, true), - new AttackMove(Moves.GENESIS_SUPERNOVA, Type.PSYCHIC, MoveCategory.SPECIAL, 185, -1, 1, 100, 0, 7) + new AttackMove(Moves.GENESIS_SUPERNOVA, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 185, -1, 1, 100, 0, 7) .unimplemented() .attr(TerrainChangeAttr, TerrainType.PSYCHIC), /* End Unused */ - new AttackMove(Moves.SHELL_TRAP, Type.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, -3, 7) + new AttackMove(Moves.SHELL_TRAP, PokemonType.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, -3, 7) .attr(AddBattlerTagHeaderAttr, BattlerTagType.SHELL_TRAP) .target(MoveTarget.ALL_NEAR_ENEMIES) // Fails if the user was not hit by a physical attack during the turn .condition((user, target, move) => user.getTag(ShellTrapTag)?.activated === true), - new AttackMove(Moves.FLEUR_CANNON, Type.FAIRY, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 7) + new AttackMove(Moves.FLEUR_CANNON, PokemonType.FAIRY, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 7) .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true), - new AttackMove(Moves.PSYCHIC_FANGS, Type.PSYCHIC, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 7) + new AttackMove(Moves.PSYCHIC_FANGS, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 7) .bitingMove() .attr(RemoveScreensAttr), - new AttackMove(Moves.STOMPING_TANTRUM, Type.GROUND, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 7) + new AttackMove(Moves.STOMPING_TANTRUM, PokemonType.GROUND, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 7) .attr(MovePowerMultiplierAttr, (user, target, move) => user.getLastXMoves(2)[1]?.result === MoveResult.MISS || user.getLastXMoves(2)[1]?.result === MoveResult.FAIL ? 2 : 1), - new AttackMove(Moves.SHADOW_BONE, Type.GHOST, MoveCategory.PHYSICAL, 85, 100, 10, 20, 0, 7) + new AttackMove(Moves.SHADOW_BONE, PokemonType.GHOST, MoveCategory.PHYSICAL, 85, 100, 10, 20, 0, 7) .attr(StatStageChangeAttr, [ Stat.DEF ], -1) .makesContact(false), - new AttackMove(Moves.ACCELEROCK, Type.ROCK, MoveCategory.PHYSICAL, 40, 100, 20, -1, 1, 7), - new AttackMove(Moves.LIQUIDATION, Type.WATER, MoveCategory.PHYSICAL, 85, 100, 10, 20, 0, 7) + new AttackMove(Moves.ACCELEROCK, PokemonType.ROCK, MoveCategory.PHYSICAL, 40, 100, 20, -1, 1, 7), + new AttackMove(Moves.LIQUIDATION, PokemonType.WATER, MoveCategory.PHYSICAL, 85, 100, 10, 20, 0, 7) .attr(StatStageChangeAttr, [ Stat.DEF ], -1), - new AttackMove(Moves.PRISMATIC_LASER, Type.PSYCHIC, MoveCategory.SPECIAL, 160, 100, 10, -1, 0, 7) + new AttackMove(Moves.PRISMATIC_LASER, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 160, 100, 10, -1, 0, 7) .attr(RechargeAttr), - new AttackMove(Moves.SPECTRAL_THIEF, Type.GHOST, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 7) - .ignoresSubstitute() - .partial(), // Does not steal stats - new AttackMove(Moves.SUNSTEEL_STRIKE, Type.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 7) + new AttackMove(Moves.SPECTRAL_THIEF, PokemonType.GHOST, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 7) + .attr(SpectralThiefAttr) + .ignoresSubstitute(), + new AttackMove(Moves.SUNSTEEL_STRIKE, PokemonType.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 7) .ignoresAbilities(), - new AttackMove(Moves.MOONGEIST_BEAM, Type.GHOST, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 7) + new AttackMove(Moves.MOONGEIST_BEAM, PokemonType.GHOST, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 7) .ignoresAbilities(), - new StatusMove(Moves.TEARFUL_LOOK, Type.NORMAL, -1, 20, -1, 0, 7) - .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1), - new AttackMove(Moves.ZING_ZAP, Type.ELECTRIC, MoveCategory.PHYSICAL, 80, 100, 10, 30, 0, 7) + new StatusMove(Moves.TEARFUL_LOOK, PokemonType.NORMAL, -1, 20, -1, 0, 7) + .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1) + .reflectable(), + new AttackMove(Moves.ZING_ZAP, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 80, 100, 10, 30, 0, 7) .attr(FlinchAttr), - new AttackMove(Moves.NATURES_MADNESS, Type.FAIRY, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 7) + new AttackMove(Moves.NATURES_MADNESS, PokemonType.FAIRY, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 7) .attr(TargetHalfHpDamageAttr), - new AttackMove(Moves.MULTI_ATTACK, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 7) + new AttackMove(Moves.MULTI_ATTACK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 7) .attr(FormChangeItemTypeAttr), /* Unused */ - new AttackMove(Moves.TEN_MILLION_VOLT_THUNDERBOLT, Type.ELECTRIC, MoveCategory.SPECIAL, 195, -1, 1, -1, 0, 7) + new AttackMove(Moves.TEN_MILLION_VOLT_THUNDERBOLT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 195, -1, 1, -1, 0, 7) .unimplemented() .edgeCase(), // I assume it's because it needs thunderbolt and pikachu in a cap /* End Unused */ - new AttackMove(Moves.MIND_BLOWN, Type.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 7) + new AttackMove(Moves.MIND_BLOWN, PokemonType.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 7) .condition(failIfDampCondition) .attr(HalfSacrificialAttr) .target(MoveTarget.ALL_NEAR_OTHERS), - new AttackMove(Moves.PLASMA_FISTS, Type.ELECTRIC, MoveCategory.PHYSICAL, 100, 100, 15, -1, 0, 7) + new AttackMove(Moves.PLASMA_FISTS, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 100, 100, 15, -1, 0, 7) .attr(AddArenaTagAttr, ArenaTagType.ION_DELUGE, 1) .punchingMove(), - new AttackMove(Moves.PHOTON_GEYSER, Type.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 7) + new AttackMove(Moves.PHOTON_GEYSER, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 7) .attr(PhotonGeyserCategoryAttr) .ignoresAbilities(), /* Unused */ - new AttackMove(Moves.LIGHT_THAT_BURNS_THE_SKY, Type.PSYCHIC, MoveCategory.SPECIAL, 200, -1, 1, -1, 0, 7) + new AttackMove(Moves.LIGHT_THAT_BURNS_THE_SKY, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 200, -1, 1, -1, 0, 7) .unimplemented() .attr(PhotonGeyserCategoryAttr) .ignoresAbilities(), - new AttackMove(Moves.SEARING_SUNRAZE_SMASH, Type.STEEL, MoveCategory.PHYSICAL, 200, -1, 1, -1, 0, 7) + new AttackMove(Moves.SEARING_SUNRAZE_SMASH, PokemonType.STEEL, MoveCategory.PHYSICAL, 200, -1, 1, -1, 0, 7) .unimplemented() .ignoresAbilities(), - new AttackMove(Moves.MENACING_MOONRAZE_MAELSTROM, Type.GHOST, MoveCategory.SPECIAL, 200, -1, 1, -1, 0, 7) + new AttackMove(Moves.MENACING_MOONRAZE_MAELSTROM, PokemonType.GHOST, MoveCategory.SPECIAL, 200, -1, 1, -1, 0, 7) .unimplemented() .ignoresAbilities(), - new AttackMove(Moves.LETS_SNUGGLE_FOREVER, Type.FAIRY, MoveCategory.PHYSICAL, 190, -1, 1, -1, 0, 7) + new AttackMove(Moves.LETS_SNUGGLE_FOREVER, PokemonType.FAIRY, MoveCategory.PHYSICAL, 190, -1, 1, -1, 0, 7) .unimplemented() .edgeCase(), // I assume it needs play rough and mimikyu - new AttackMove(Moves.SPLINTERED_STORMSHARDS, Type.ROCK, MoveCategory.PHYSICAL, 190, -1, 1, -1, 0, 7) + new AttackMove(Moves.SPLINTERED_STORMSHARDS, PokemonType.ROCK, MoveCategory.PHYSICAL, 190, -1, 1, -1, 0, 7) .unimplemented() .attr(ClearTerrainAttr) .makesContact(false), - new AttackMove(Moves.CLANGOROUS_SOULBLAZE, Type.DRAGON, MoveCategory.SPECIAL, 185, -1, 1, 100, 0, 7) + new AttackMove(Moves.CLANGOROUS_SOULBLAZE, PokemonType.DRAGON, MoveCategory.SPECIAL, 185, -1, 1, 100, 0, 7) .unimplemented() .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true, { firstTargetOnly: true }) .soundBased() .target(MoveTarget.ALL_NEAR_ENEMIES) .edgeCase(), // I assume it needs clanging scales and Kommo-O /* End Unused */ - new AttackMove(Moves.ZIPPY_ZAP, Type.ELECTRIC, MoveCategory.PHYSICAL, 50, 100, 15, -1, 2, 7) // LGPE Implementation + new AttackMove(Moves.ZIPPY_ZAP, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 50, 100, 15, -1, 2, 7) // LGPE Implementation .attr(CritOnlyAttr), - new AttackMove(Moves.SPLISHY_SPLASH, Type.WATER, MoveCategory.SPECIAL, 90, 100, 15, 30, 0, 7) + new AttackMove(Moves.SPLISHY_SPLASH, PokemonType.WATER, MoveCategory.SPECIAL, 90, 100, 15, 30, 0, 7) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.FLOATY_FALL, Type.FLYING, MoveCategory.PHYSICAL, 90, 95, 15, 30, 0, 7) + new AttackMove(Moves.FLOATY_FALL, PokemonType.FLYING, MoveCategory.PHYSICAL, 90, 95, 15, 30, 0, 7) .attr(FlinchAttr), - new AttackMove(Moves.PIKA_PAPOW, Type.ELECTRIC, MoveCategory.SPECIAL, -1, -1, 20, -1, 0, 7) + new AttackMove(Moves.PIKA_PAPOW, PokemonType.ELECTRIC, MoveCategory.SPECIAL, -1, -1, 20, -1, 0, 7) .attr(FriendshipPowerAttr), - new AttackMove(Moves.BOUNCY_BUBBLE, Type.WATER, MoveCategory.SPECIAL, 60, 100, 20, -1, 0, 7) - .attr(HitHealAttr) // Custom - .triageMove() - .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.BUZZY_BUZZ, Type.ELECTRIC, MoveCategory.SPECIAL, 60, 100, 20, 100, 0, 7) + new AttackMove(Moves.BOUNCY_BUBBLE, PokemonType.WATER, MoveCategory.SPECIAL, 60, 100, 20, -1, 0, 7) + .attr(HitHealAttr, 1) + .triageMove(), + new AttackMove(Moves.BUZZY_BUZZ, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 60, 100, 20, 100, 0, 7) .attr(StatusEffectAttr, StatusEffect.PARALYSIS), - new AttackMove(Moves.SIZZLY_SLIDE, Type.FIRE, MoveCategory.PHYSICAL, 60, 100, 20, 100, 0, 7) + new AttackMove(Moves.SIZZLY_SLIDE, PokemonType.FIRE, MoveCategory.PHYSICAL, 60, 100, 20, 100, 0, 7) .attr(StatusEffectAttr, StatusEffect.BURN), - new AttackMove(Moves.GLITZY_GLOW, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 95, 15, -1, 0, 7) + new AttackMove(Moves.GLITZY_GLOW, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 95, 15, -1, 0, 7) .attr(AddArenaTagAttr, ArenaTagType.LIGHT_SCREEN, 5, false, true), - new AttackMove(Moves.BADDY_BAD, Type.DARK, MoveCategory.SPECIAL, 80, 95, 15, -1, 0, 7) + new AttackMove(Moves.BADDY_BAD, PokemonType.DARK, MoveCategory.SPECIAL, 80, 95, 15, -1, 0, 7) .attr(AddArenaTagAttr, ArenaTagType.REFLECT, 5, false, true), - new AttackMove(Moves.SAPPY_SEED, Type.GRASS, MoveCategory.PHYSICAL, 100, 90, 10, 100, 0, 7) + new AttackMove(Moves.SAPPY_SEED, PokemonType.GRASS, MoveCategory.PHYSICAL, 100, 90, 10, 100, 0, 7) .attr(LeechSeedAttr) .makesContact(false), - new AttackMove(Moves.FREEZY_FROST, Type.ICE, MoveCategory.SPECIAL, 100, 90, 10, -1, 0, 7) + new AttackMove(Moves.FREEZY_FROST, PokemonType.ICE, MoveCategory.SPECIAL, 100, 90, 10, -1, 0, 7) .attr(ResetStatsAttr, true), - new AttackMove(Moves.SPARKLY_SWIRL, Type.FAIRY, MoveCategory.SPECIAL, 120, 85, 5, -1, 0, 7) + new AttackMove(Moves.SPARKLY_SWIRL, PokemonType.FAIRY, MoveCategory.SPECIAL, 120, 85, 5, -1, 0, 7) .attr(PartyStatusCureAttr, null, Abilities.NONE), - new AttackMove(Moves.VEEVEE_VOLLEY, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 20, -1, 0, 7) + new AttackMove(Moves.VEEVEE_VOLLEY, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, -1, 20, -1, 0, 7) .attr(FriendshipPowerAttr), - new AttackMove(Moves.DOUBLE_IRON_BASH, Type.STEEL, MoveCategory.PHYSICAL, 60, 100, 5, 30, 0, 7) + new AttackMove(Moves.DOUBLE_IRON_BASH, PokemonType.STEEL, MoveCategory.PHYSICAL, 60, 100, 5, 30, 0, 7) .attr(MultiHitAttr, MultiHitType._2) .attr(FlinchAttr) .punchingMove(), /* Unused */ - new SelfStatusMove(Moves.MAX_GUARD, Type.NORMAL, -1, 10, -1, 4, 8) + new SelfStatusMove(Moves.MAX_GUARD, PokemonType.NORMAL, -1, 10, -1, 4, 8) .unimplemented() .attr(ProtectAttr) .condition(failIfLastCondition), /* End Unused */ - new AttackMove(Moves.DYNAMAX_CANNON, Type.DRAGON, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8) + new AttackMove(Moves.DYNAMAX_CANNON, PokemonType.DRAGON, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8) .attr(MovePowerMultiplierAttr, (user, target, move) => { // Move is only stronger against overleveled foes. if (target.level > globalScene.getMaxExpLevel()) { @@ -10472,13 +10482,13 @@ export function initMoves() { }) .attr(DiscourageFrequentUseAttr), - new AttackMove(Moves.SNIPE_SHOT, Type.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 8) + new AttackMove(Moves.SNIPE_SHOT, PokemonType.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 8) .attr(HighCritAttr) .attr(BypassRedirectAttr), - new AttackMove(Moves.JAW_LOCK, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8) + new AttackMove(Moves.JAW_LOCK, PokemonType.DARK, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8) .attr(JawLockAttr) .bitingMove(), - new SelfStatusMove(Moves.STUFF_CHEEKS, Type.NORMAL, -1, 10, -1, 0, 8) + new SelfStatusMove(Moves.STUFF_CHEEKS, PokemonType.NORMAL, -1, 10, -1, 0, 8) .attr(EatBerryAttr) .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true) .condition((user) => { @@ -10486,323 +10496,326 @@ export function initMoves() { return userBerries.length > 0; }) .edgeCase(), // Stuff Cheeks should not be selectable when the user does not have a berry, see wiki - new SelfStatusMove(Moves.NO_RETREAT, Type.FIGHTING, -1, 5, -1, 0, 8) + new SelfStatusMove(Moves.NO_RETREAT, PokemonType.FIGHTING, -1, 5, -1, 0, 8) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true) .attr(AddBattlerTagAttr, BattlerTagType.NO_RETREAT, true, false) .condition((user, target, move) => user.getTag(TrappedTag)?.sourceMove !== Moves.NO_RETREAT), // fails if the user is currently trapped by No Retreat - new StatusMove(Moves.TAR_SHOT, Type.ROCK, 100, 15, -1, 0, 8) + new StatusMove(Moves.TAR_SHOT, PokemonType.ROCK, 100, 15, -1, 0, 8) .attr(StatStageChangeAttr, [ Stat.SPD ], -1) - .attr(AddBattlerTagAttr, BattlerTagType.TAR_SHOT, false), - new StatusMove(Moves.MAGIC_POWDER, Type.PSYCHIC, 100, 20, -1, 0, 8) - .attr(ChangeTypeAttr, Type.PSYCHIC) - .powderMove(), - new AttackMove(Moves.DRAGON_DARTS, Type.DRAGON, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 8) + .attr(AddBattlerTagAttr, BattlerTagType.TAR_SHOT, false) + .reflectable(), + new StatusMove(Moves.MAGIC_POWDER, PokemonType.PSYCHIC, 100, 20, -1, 0, 8) + .attr(ChangeTypeAttr, PokemonType.PSYCHIC) + .powderMove() + .reflectable(), + new AttackMove(Moves.DRAGON_DARTS, PokemonType.DRAGON, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 8) .attr(MultiHitAttr, MultiHitType._2) .makesContact(false) .partial(), // smart targetting is unimplemented - new StatusMove(Moves.TEATIME, Type.NORMAL, -1, 10, -1, 0, 8) + new StatusMove(Moves.TEATIME, PokemonType.NORMAL, -1, 10, -1, 0, 8) .attr(EatBerryAttr) .target(MoveTarget.ALL), - new StatusMove(Moves.OCTOLOCK, Type.FIGHTING, 100, 15, -1, 0, 8) + new StatusMove(Moves.OCTOLOCK, PokemonType.FIGHTING, 100, 15, -1, 0, 8) .condition(failIfGhostTypeCondition) .attr(AddBattlerTagAttr, BattlerTagType.OCTOLOCK, false, true, 1), - new AttackMove(Moves.BOLT_BEAK, Type.ELECTRIC, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 8) + new AttackMove(Moves.BOLT_BEAK, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 8) .attr(FirstAttackDoublePowerAttr), - new AttackMove(Moves.FISHIOUS_REND, Type.WATER, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 8) + new AttackMove(Moves.FISHIOUS_REND, PokemonType.WATER, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 8) .attr(FirstAttackDoublePowerAttr) .bitingMove(), - new StatusMove(Moves.COURT_CHANGE, Type.NORMAL, 100, 10, -1, 0, 8) + new StatusMove(Moves.COURT_CHANGE, PokemonType.NORMAL, 100, 10, -1, 0, 8) .attr(SwapArenaTagsAttr, [ ArenaTagType.AURORA_VEIL, ArenaTagType.LIGHT_SCREEN, ArenaTagType.MIST, ArenaTagType.REFLECT, ArenaTagType.SPIKES, ArenaTagType.STEALTH_ROCK, ArenaTagType.STICKY_WEB, ArenaTagType.TAILWIND, ArenaTagType.TOXIC_SPIKES ]), /* Unused */ - new AttackMove(Moves.MAX_FLARE, Type.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_FLARE, PokemonType.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_FLUTTERBY, Type.BUG, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_FLUTTERBY, PokemonType.BUG, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_LIGHTNING, Type.ELECTRIC, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_LIGHTNING, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_STRIKE, Type.NORMAL, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_STRIKE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_KNUCKLE, Type.FIGHTING, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_KNUCKLE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_PHANTASM, Type.GHOST, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_PHANTASM, PokemonType.GHOST, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_HAILSTORM, Type.ICE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_HAILSTORM, PokemonType.ICE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_OOZE, Type.POISON, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_OOZE, PokemonType.POISON, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_GEYSER, Type.WATER, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_GEYSER, PokemonType.WATER, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_AIRSTREAM, Type.FLYING, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_AIRSTREAM, PokemonType.FLYING, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_STARFALL, Type.FAIRY, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_STARFALL, PokemonType.FAIRY, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_WYRMWIND, Type.DRAGON, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_WYRMWIND, PokemonType.DRAGON, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_MINDSTORM, Type.PSYCHIC, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_MINDSTORM, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_ROCKFALL, Type.ROCK, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_ROCKFALL, PokemonType.ROCK, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_QUAKE, Type.GROUND, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_QUAKE, PokemonType.GROUND, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_DARKNESS, Type.DARK, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_DARKNESS, PokemonType.DARK, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_OVERGROWTH, Type.GRASS, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_OVERGROWTH, PokemonType.GRASS, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), - new AttackMove(Moves.MAX_STEELSPIKE, Type.STEEL, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.MAX_STEELSPIKE, PokemonType.STEEL, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) .unimplemented(), /* End Unused */ - new SelfStatusMove(Moves.CLANGOROUS_SOUL, Type.DRAGON, 100, 5, -1, 0, 8) + new SelfStatusMove(Moves.CLANGOROUS_SOUL, PokemonType.DRAGON, 100, 5, -1, 0, 8) .attr(CutHpStatStageBoostAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, 3) .soundBased() .danceMove(), - new AttackMove(Moves.BODY_PRESS, Type.FIGHTING, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8) + new AttackMove(Moves.BODY_PRESS, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8) .attr(DefAtkAttr), - new StatusMove(Moves.DECORATE, Type.FAIRY, -1, 15, -1, 0, 8) + new StatusMove(Moves.DECORATE, PokemonType.FAIRY, -1, 15, -1, 0, 8) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 2) .ignoresProtect(), - new AttackMove(Moves.DRUM_BEATING, Type.GRASS, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 8) + new AttackMove(Moves.DRUM_BEATING, PokemonType.GRASS, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.SPD ], -1) .makesContact(false), - new AttackMove(Moves.SNAP_TRAP, Type.GRASS, MoveCategory.PHYSICAL, 35, 100, 15, -1, 0, 8) + new AttackMove(Moves.SNAP_TRAP, PokemonType.GRASS, MoveCategory.PHYSICAL, 35, 100, 15, -1, 0, 8) .attr(TrapAttr, BattlerTagType.SNAP_TRAP), - new AttackMove(Moves.PYRO_BALL, Type.FIRE, MoveCategory.PHYSICAL, 120, 90, 5, 10, 0, 8) + new AttackMove(Moves.PYRO_BALL, PokemonType.FIRE, MoveCategory.PHYSICAL, 120, 90, 5, 10, 0, 8) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN) .ballBombMove() .makesContact(false), - new AttackMove(Moves.BEHEMOTH_BLADE, Type.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 8) + new AttackMove(Moves.BEHEMOTH_BLADE, PokemonType.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 8) .slicingMove(), - new AttackMove(Moves.BEHEMOTH_BASH, Type.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 8), - new AttackMove(Moves.AURA_WHEEL, Type.ELECTRIC, MoveCategory.PHYSICAL, 110, 100, 10, 100, 0, 8) + new AttackMove(Moves.BEHEMOTH_BASH, PokemonType.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 8), + new AttackMove(Moves.AURA_WHEEL, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 110, 100, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true) .makesContact(false) .attr(AuraWheelTypeAttr), - new AttackMove(Moves.BREAKING_SWIPE, Type.DRAGON, MoveCategory.PHYSICAL, 60, 100, 15, 100, 0, 8) + new AttackMove(Moves.BREAKING_SWIPE, PokemonType.DRAGON, MoveCategory.PHYSICAL, 60, 100, 15, 100, 0, 8) .target(MoveTarget.ALL_NEAR_ENEMIES) .attr(StatStageChangeAttr, [ Stat.ATK ], -1), - new AttackMove(Moves.BRANCH_POKE, Type.GRASS, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 8), - new AttackMove(Moves.OVERDRIVE, Type.ELECTRIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 8) + new AttackMove(Moves.BRANCH_POKE, PokemonType.GRASS, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 8), + new AttackMove(Moves.OVERDRIVE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 8) .soundBased() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.APPLE_ACID, Type.GRASS, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 8) + new AttackMove(Moves.APPLE_ACID, PokemonType.GRASS, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1), - new AttackMove(Moves.GRAV_APPLE, Type.GRASS, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 8) + new AttackMove(Moves.GRAV_APPLE, PokemonType.GRASS, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.DEF ], -1) .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTag(ArenaTagType.GRAVITY) ? 1.5 : 1) .makesContact(false), - new AttackMove(Moves.SPIRIT_BREAK, Type.FAIRY, MoveCategory.PHYSICAL, 75, 100, 15, 100, 0, 8) + new AttackMove(Moves.SPIRIT_BREAK, PokemonType.FAIRY, MoveCategory.PHYSICAL, 75, 100, 15, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.SPATK ], -1), - new AttackMove(Moves.STRANGE_STEAM, Type.FAIRY, MoveCategory.SPECIAL, 90, 95, 10, 20, 0, 8) + new AttackMove(Moves.STRANGE_STEAM, PokemonType.FAIRY, MoveCategory.SPECIAL, 90, 95, 10, 20, 0, 8) .attr(ConfuseAttr), - new StatusMove(Moves.LIFE_DEW, Type.WATER, -1, 10, -1, 0, 8) + new StatusMove(Moves.LIFE_DEW, PokemonType.WATER, -1, 10, -1, 0, 8) .attr(HealAttr, 0.25, true, false) .target(MoveTarget.USER_AND_ALLIES) .ignoresProtect(), - new SelfStatusMove(Moves.OBSTRUCT, Type.DARK, 100, 10, -1, 4, 8) + new SelfStatusMove(Moves.OBSTRUCT, PokemonType.DARK, 100, 10, -1, 4, 8) .attr(ProtectAttr, BattlerTagType.OBSTRUCT) .condition(failIfLastCondition), - new AttackMove(Moves.FALSE_SURRENDER, Type.DARK, MoveCategory.PHYSICAL, 80, -1, 10, -1, 0, 8), - new AttackMove(Moves.METEOR_ASSAULT, Type.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 5, -1, 0, 8) + new AttackMove(Moves.FALSE_SURRENDER, PokemonType.DARK, MoveCategory.PHYSICAL, 80, -1, 10, -1, 0, 8), + new AttackMove(Moves.METEOR_ASSAULT, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 5, -1, 0, 8) .attr(RechargeAttr) .makesContact(false), - new AttackMove(Moves.ETERNABEAM, Type.DRAGON, MoveCategory.SPECIAL, 160, 90, 5, -1, 0, 8) + new AttackMove(Moves.ETERNABEAM, PokemonType.DRAGON, MoveCategory.SPECIAL, 160, 90, 5, -1, 0, 8) .attr(RechargeAttr), - new AttackMove(Moves.STEEL_BEAM, Type.STEEL, MoveCategory.SPECIAL, 140, 95, 5, -1, 0, 8) + new AttackMove(Moves.STEEL_BEAM, PokemonType.STEEL, MoveCategory.SPECIAL, 140, 95, 5, -1, 0, 8) .attr(HalfSacrificialAttr), - new AttackMove(Moves.EXPANDING_FORCE, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 8) + new AttackMove(Moves.EXPANDING_FORCE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 8) .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.PSYCHIC && user.isGrounded() ? 1.5 : 1) .attr(VariableTargetAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.PSYCHIC && user.isGrounded() ? MoveTarget.ALL_NEAR_ENEMIES : MoveTarget.NEAR_OTHER), - new AttackMove(Moves.STEEL_ROLLER, Type.STEEL, MoveCategory.PHYSICAL, 130, 100, 5, -1, 0, 8) + new AttackMove(Moves.STEEL_ROLLER, PokemonType.STEEL, MoveCategory.PHYSICAL, 130, 100, 5, -1, 0, 8) .attr(ClearTerrainAttr) .condition((user, target, move) => !!globalScene.arena.terrain), - new AttackMove(Moves.SCALE_SHOT, Type.DRAGON, MoveCategory.PHYSICAL, 25, 90, 20, -1, 0, 8) + new AttackMove(Moves.SCALE_SHOT, PokemonType.DRAGON, MoveCategory.PHYSICAL, 25, 90, 20, -1, 0, 8) .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true, { lastHitOnly: true }) .attr(StatStageChangeAttr, [ Stat.DEF ], -1, true, { lastHitOnly: true }) .attr(MultiHitAttr) .makesContact(false), - new ChargingAttackMove(Moves.METEOR_BEAM, Type.ROCK, MoveCategory.SPECIAL, 120, 90, 10, -1, 0, 8) + new ChargingAttackMove(Moves.METEOR_BEAM, PokemonType.ROCK, MoveCategory.SPECIAL, 120, 90, 10, -1, 0, 8) .chargeText(i18next.t("moveTriggers:isOverflowingWithSpacePower", { pokemonName: "{USER}" })) .chargeAttr(StatStageChangeAttr, [ Stat.SPATK ], 1, true), - new AttackMove(Moves.SHELL_SIDE_ARM, Type.POISON, MoveCategory.SPECIAL, 90, 100, 10, 20, 0, 8) + new AttackMove(Moves.SHELL_SIDE_ARM, PokemonType.POISON, MoveCategory.SPECIAL, 90, 100, 10, 20, 0, 8) .attr(ShellSideArmCategoryAttr) .attr(StatusEffectAttr, StatusEffect.POISON) .partial(), // Physical version of the move does not make contact - new AttackMove(Moves.MISTY_EXPLOSION, Type.FAIRY, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8) + new AttackMove(Moves.MISTY_EXPLOSION, PokemonType.FAIRY, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8) .attr(SacrificialAttr) .target(MoveTarget.ALL_NEAR_OTHERS) .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.MISTY && user.isGrounded() ? 1.5 : 1) .condition(failIfDampCondition) .makesContact(false), - new AttackMove(Moves.GRASSY_GLIDE, Type.GRASS, MoveCategory.PHYSICAL, 55, 100, 20, -1, 0, 8) + new AttackMove(Moves.GRASSY_GLIDE, PokemonType.GRASS, MoveCategory.PHYSICAL, 55, 100, 20, -1, 0, 8) .attr(IncrementMovePriorityAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.GRASSY && user.isGrounded()), - new AttackMove(Moves.RISING_VOLTAGE, Type.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 20, -1, 0, 8) + new AttackMove(Moves.RISING_VOLTAGE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 20, -1, 0, 8) .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.ELECTRIC && target.isGrounded() ? 2 : 1), - new AttackMove(Moves.TERRAIN_PULSE, Type.NORMAL, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 8) + new AttackMove(Moves.TERRAIN_PULSE, PokemonType.NORMAL, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 8) .attr(TerrainPulseTypeAttr) .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() !== TerrainType.NONE && user.isGrounded() ? 2 : 1) .pulseMove(), - new AttackMove(Moves.SKITTER_SMACK, Type.BUG, MoveCategory.PHYSICAL, 70, 90, 10, 100, 0, 8) + new AttackMove(Moves.SKITTER_SMACK, PokemonType.BUG, MoveCategory.PHYSICAL, 70, 90, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.SPATK ], -1), - new AttackMove(Moves.BURNING_JEALOUSY, Type.FIRE, MoveCategory.SPECIAL, 70, 100, 5, 100, 0, 8) + new AttackMove(Moves.BURNING_JEALOUSY, PokemonType.FIRE, MoveCategory.SPECIAL, 70, 100, 5, 100, 0, 8) .attr(StatusIfBoostedAttr, StatusEffect.BURN) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.LASH_OUT, Type.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8) + new AttackMove(Moves.LASH_OUT, PokemonType.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8) .attr(MovePowerMultiplierAttr, (user, _target, _move) => user.turnData.statStagesDecreased ? 2 : 1), - new AttackMove(Moves.POLTERGEIST, Type.GHOST, MoveCategory.PHYSICAL, 110, 90, 5, -1, 0, 8) + new AttackMove(Moves.POLTERGEIST, PokemonType.GHOST, MoveCategory.PHYSICAL, 110, 90, 5, -1, 0, 8) .condition(failIfNoTargetHeldItemsCondition) .attr(PreMoveMessageAttr, attackedByItemMessageFunc) .makesContact(false), - new StatusMove(Moves.CORROSIVE_GAS, Type.POISON, 100, 40, -1, 0, 8) + new StatusMove(Moves.CORROSIVE_GAS, PokemonType.POISON, 100, 40, -1, 0, 8) .target(MoveTarget.ALL_NEAR_OTHERS) + .reflectable() .unimplemented(), - new StatusMove(Moves.COACHING, Type.FIGHTING, -1, 10, -1, 0, 8) + new StatusMove(Moves.COACHING, PokemonType.FIGHTING, -1, 10, -1, 0, 8) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], 1) .target(MoveTarget.NEAR_ALLY) .condition(failIfSingleBattle), - new AttackMove(Moves.FLIP_TURN, Type.WATER, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 8) + new AttackMove(Moves.FLIP_TURN, PokemonType.WATER, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 8) .attr(ForceSwitchOutAttr, true), - new AttackMove(Moves.TRIPLE_AXEL, Type.ICE, MoveCategory.PHYSICAL, 20, 90, 10, -1, 0, 8) + new AttackMove(Moves.TRIPLE_AXEL, PokemonType.ICE, MoveCategory.PHYSICAL, 20, 90, 10, -1, 0, 8) .attr(MultiHitAttr, MultiHitType._3) .attr(MultiHitPowerIncrementAttr, 3) .checkAllHits(), - new AttackMove(Moves.DUAL_WINGBEAT, Type.FLYING, MoveCategory.PHYSICAL, 40, 90, 10, -1, 0, 8) + new AttackMove(Moves.DUAL_WINGBEAT, PokemonType.FLYING, MoveCategory.PHYSICAL, 40, 90, 10, -1, 0, 8) .attr(MultiHitAttr, MultiHitType._2), - new AttackMove(Moves.SCORCHING_SANDS, Type.GROUND, MoveCategory.SPECIAL, 70, 100, 10, 30, 0, 8) + new AttackMove(Moves.SCORCHING_SANDS, PokemonType.GROUND, MoveCategory.SPECIAL, 70, 100, 10, 30, 0, 8) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(HealStatusEffectAttr, false, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN), - new StatusMove(Moves.JUNGLE_HEALING, Type.GRASS, -1, 10, -1, 0, 8) + new StatusMove(Moves.JUNGLE_HEALING, PokemonType.GRASS, -1, 10, -1, 0, 8) .attr(HealAttr, 0.25, true, false) .attr(HealStatusEffectAttr, false, getNonVolatileStatusEffects()) .target(MoveTarget.USER_AND_ALLIES), - new AttackMove(Moves.WICKED_BLOW, Type.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8) + new AttackMove(Moves.WICKED_BLOW, PokemonType.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8) .attr(CritOnlyAttr) .punchingMove(), - new AttackMove(Moves.SURGING_STRIKES, Type.WATER, MoveCategory.PHYSICAL, 25, 100, 5, -1, 0, 8) + new AttackMove(Moves.SURGING_STRIKES, PokemonType.WATER, MoveCategory.PHYSICAL, 25, 100, 5, -1, 0, 8) .attr(MultiHitAttr, MultiHitType._3) .attr(CritOnlyAttr) .punchingMove(), - new AttackMove(Moves.THUNDER_CAGE, Type.ELECTRIC, MoveCategory.SPECIAL, 80, 90, 15, -1, 0, 8) + new AttackMove(Moves.THUNDER_CAGE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 80, 90, 15, -1, 0, 8) .attr(TrapAttr, BattlerTagType.THUNDER_CAGE), - new AttackMove(Moves.DRAGON_ENERGY, Type.DRAGON, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 8) + new AttackMove(Moves.DRAGON_ENERGY, PokemonType.DRAGON, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 8) .attr(HpPowerAttr) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.FREEZING_GLARE, Type.PSYCHIC, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 8) + new AttackMove(Moves.FREEZING_GLARE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 8) .attr(StatusEffectAttr, StatusEffect.FREEZE), - new AttackMove(Moves.FIERY_WRATH, Type.DARK, MoveCategory.SPECIAL, 90, 100, 10, 20, 0, 8) + new AttackMove(Moves.FIERY_WRATH, PokemonType.DARK, MoveCategory.SPECIAL, 90, 100, 10, 20, 0, 8) .attr(FlinchAttr) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.THUNDEROUS_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 10, 100, 0, 8) + new AttackMove(Moves.THUNDEROUS_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.DEF ], -1), - new AttackMove(Moves.GLACIAL_LANCE, Type.ICE, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 8) + new AttackMove(Moves.GLACIAL_LANCE, PokemonType.ICE, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 8) .target(MoveTarget.ALL_NEAR_ENEMIES) .makesContact(false), - new AttackMove(Moves.ASTRAL_BARRAGE, Type.GHOST, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 8) + new AttackMove(Moves.ASTRAL_BARRAGE, PokemonType.GHOST, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 8) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.EERIE_SPELL, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 5, 100, 0, 8) + new AttackMove(Moves.EERIE_SPELL, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 5, 100, 0, 8) .attr(AttackReducePpMoveAttr, 3) .soundBased(), - new AttackMove(Moves.DIRE_CLAW, Type.POISON, MoveCategory.PHYSICAL, 80, 100, 15, 50, 0, 8) + new AttackMove(Moves.DIRE_CLAW, PokemonType.POISON, MoveCategory.PHYSICAL, 80, 100, 15, 50, 0, 8) .attr(MultiStatusEffectAttr, [ StatusEffect.POISON, StatusEffect.PARALYSIS, StatusEffect.SLEEP ]), - new AttackMove(Moves.PSYSHIELD_BASH, Type.PSYCHIC, MoveCategory.PHYSICAL, 70, 90, 10, 100, 0, 8) + new AttackMove(Moves.PSYSHIELD_BASH, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 70, 90, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true), - new SelfStatusMove(Moves.POWER_SHIFT, Type.NORMAL, -1, 10, -1, 0, 8) + new SelfStatusMove(Moves.POWER_SHIFT, PokemonType.NORMAL, -1, 10, -1, 0, 8) .target(MoveTarget.USER) .attr(ShiftStatAttr, Stat.ATK, Stat.DEF), - new AttackMove(Moves.STONE_AXE, Type.ROCK, MoveCategory.PHYSICAL, 65, 90, 15, 100, 0, 8) + new AttackMove(Moves.STONE_AXE, PokemonType.ROCK, MoveCategory.PHYSICAL, 65, 90, 15, 100, 0, 8) .attr(AddArenaTrapTagHitAttr, ArenaTagType.STEALTH_ROCK) .slicingMove(), - new AttackMove(Moves.SPRINGTIDE_STORM, Type.FAIRY, MoveCategory.SPECIAL, 100, 80, 5, 30, 0, 8) + new AttackMove(Moves.SPRINGTIDE_STORM, PokemonType.FAIRY, MoveCategory.SPECIAL, 100, 80, 5, 30, 0, 8) .attr(StatStageChangeAttr, [ Stat.ATK ], -1) .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.MYSTICAL_POWER, Type.PSYCHIC, MoveCategory.SPECIAL, 70, 90, 10, 100, 0, 8) + new AttackMove(Moves.MYSTICAL_POWER, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 70, 90, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.SPATK ], 1, true), - new AttackMove(Moves.RAGING_FURY, Type.FIRE, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8) + new AttackMove(Moves.RAGING_FURY, PokemonType.FIRE, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8) .makesContact(false) .attr(FrenzyAttr) .attr(MissEffectAttr, frenzyMissFunc) .attr(NoEffectAttr, frenzyMissFunc) .target(MoveTarget.RANDOM_NEAR_ENEMY), - new AttackMove(Moves.WAVE_CRASH, Type.WATER, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8) + new AttackMove(Moves.WAVE_CRASH, PokemonType.WATER, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8) .attr(RecoilAttr, false, 0.33) .recklessMove(), - new AttackMove(Moves.CHLOROBLAST, Type.GRASS, MoveCategory.SPECIAL, 150, 95, 5, -1, 0, 8) + new AttackMove(Moves.CHLOROBLAST, PokemonType.GRASS, MoveCategory.SPECIAL, 150, 95, 5, -1, 0, 8) .attr(RecoilAttr, true, 0.5), - new AttackMove(Moves.MOUNTAIN_GALE, Type.ICE, MoveCategory.PHYSICAL, 100, 85, 10, 30, 0, 8) + new AttackMove(Moves.MOUNTAIN_GALE, PokemonType.ICE, MoveCategory.PHYSICAL, 100, 85, 10, 30, 0, 8) .makesContact(false) .attr(FlinchAttr), - new SelfStatusMove(Moves.VICTORY_DANCE, Type.FIGHTING, -1, 10, -1, 0, 8) + new SelfStatusMove(Moves.VICTORY_DANCE, PokemonType.FIGHTING, -1, 10, -1, 0, 8) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPD ], 1, true) .danceMove(), - new AttackMove(Moves.HEADLONG_RUSH, Type.GROUND, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 8) + new AttackMove(Moves.HEADLONG_RUSH, PokemonType.GROUND, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 8) .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true) .punchingMove(), - new AttackMove(Moves.BARB_BARRAGE, Type.POISON, MoveCategory.PHYSICAL, 60, 100, 10, 50, 0, 8) + new AttackMove(Moves.BARB_BARRAGE, PokemonType.POISON, MoveCategory.PHYSICAL, 60, 100, 10, 50, 0, 8) .makesContact(false) .attr(MovePowerMultiplierAttr, (user, target, move) => target.status && (target.status.effect === StatusEffect.POISON || target.status.effect === StatusEffect.TOXIC) ? 2 : 1) .attr(StatusEffectAttr, StatusEffect.POISON), - new AttackMove(Moves.ESPER_WING, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 8) + new AttackMove(Moves.ESPER_WING, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 8) .attr(HighCritAttr) .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true), - new AttackMove(Moves.BITTER_MALICE, Type.GHOST, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 8) + new AttackMove(Moves.BITTER_MALICE, PokemonType.GHOST, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.ATK ], -1), - new SelfStatusMove(Moves.SHELTER, Type.STEEL, -1, 10, 100, 0, 8) + new SelfStatusMove(Moves.SHELTER, PokemonType.STEEL, -1, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true), - new AttackMove(Moves.TRIPLE_ARROWS, Type.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 10, 30, 0, 8) + new AttackMove(Moves.TRIPLE_ARROWS, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 10, 30, 0, 8) .makesContact(false) .attr(HighCritAttr) .attr(StatStageChangeAttr, [ Stat.DEF ], -1, false, { effectChanceOverride: 50 }) .attr(FlinchAttr), - new AttackMove(Moves.INFERNAL_PARADE, Type.GHOST, MoveCategory.SPECIAL, 60, 100, 15, 30, 0, 8) + new AttackMove(Moves.INFERNAL_PARADE, PokemonType.GHOST, MoveCategory.SPECIAL, 60, 100, 15, 30, 0, 8) .attr(StatusEffectAttr, StatusEffect.BURN) .attr(MovePowerMultiplierAttr, (user, target, move) => target.status ? 2 : 1), - new AttackMove(Moves.CEASELESS_EDGE, Type.DARK, MoveCategory.PHYSICAL, 65, 90, 15, 100, 0, 8) + new AttackMove(Moves.CEASELESS_EDGE, PokemonType.DARK, MoveCategory.PHYSICAL, 65, 90, 15, 100, 0, 8) .attr(AddArenaTrapTagHitAttr, ArenaTagType.SPIKES) .slicingMove(), - new AttackMove(Moves.BLEAKWIND_STORM, Type.FLYING, MoveCategory.SPECIAL, 100, 80, 10, 30, 0, 8) + new AttackMove(Moves.BLEAKWIND_STORM, PokemonType.FLYING, MoveCategory.SPECIAL, 100, 80, 10, 30, 0, 8) .attr(StormAccuracyAttr) .attr(StatStageChangeAttr, [ Stat.SPD ], -1) .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.WILDBOLT_STORM, Type.ELECTRIC, MoveCategory.SPECIAL, 100, 80, 10, 20, 0, 8) + new AttackMove(Moves.WILDBOLT_STORM, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 100, 80, 10, 20, 0, 8) .attr(StormAccuracyAttr) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.SANDSEAR_STORM, Type.GROUND, MoveCategory.SPECIAL, 100, 80, 10, 20, 0, 8) + new AttackMove(Moves.SANDSEAR_STORM, PokemonType.GROUND, MoveCategory.SPECIAL, 100, 80, 10, 20, 0, 8) .attr(StormAccuracyAttr) .attr(StatusEffectAttr, StatusEffect.BURN) .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), - new StatusMove(Moves.LUNAR_BLESSING, Type.PSYCHIC, -1, 5, -1, 0, 8) + new StatusMove(Moves.LUNAR_BLESSING, PokemonType.PSYCHIC, -1, 5, -1, 0, 8) .attr(HealAttr, 0.25, true, false) .attr(HealStatusEffectAttr, false, getNonVolatileStatusEffects()) .target(MoveTarget.USER_AND_ALLIES) .triageMove(), - new SelfStatusMove(Moves.TAKE_HEART, Type.PSYCHIC, -1, 10, -1, 0, 8) + new SelfStatusMove(Moves.TAKE_HEART, PokemonType.PSYCHIC, -1, 10, -1, 0, 8) .attr(StatStageChangeAttr, [ Stat.SPATK, Stat.SPDEF ], 1, true) .attr(HealStatusEffectAttr, true, [ StatusEffect.PARALYSIS, StatusEffect.POISON, StatusEffect.TOXIC, StatusEffect.BURN, StatusEffect.SLEEP ]), /* Unused - new AttackMove(Moves.G_MAX_WILDFIRE, Type.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.G_MAX_WILDFIRE, PokemonType.Fire, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.ALL_NEAR_ENEMIES) .unimplemented(), new AttackMove(Moves.G_MAX_BEFUDDLE, Type.BUG, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) @@ -10877,7 +10890,7 @@ export function initMoves() { new AttackMove(Moves.G_MAX_FOAM_BURST, Type.WATER, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.ALL_NEAR_ENEMIES) .unimplemented(), - new AttackMove(Moves.G_MAX_CENTIFERNO, Type.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.G_MAX_CENTIFERNO, PokemonType.Fire, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.ALL_NEAR_ENEMIES) .unimplemented(), new AttackMove(Moves.G_MAX_VINE_LASH, Type.GRASS, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) @@ -10889,7 +10902,7 @@ export function initMoves() { new AttackMove(Moves.G_MAX_DRUM_SOLO, Type.GRASS, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.ALL_NEAR_ENEMIES) .unimplemented(), - new AttackMove(Moves.G_MAX_FIREBALL, Type.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) + new AttackMove(Moves.G_MAX_FIREBALL, PokemonType.Fire, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.ALL_NEAR_ENEMIES) .unimplemented(), new AttackMove(Moves.G_MAX_HYDROSNIPE, Type.WATER, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) @@ -10902,58 +10915,56 @@ export function initMoves() { .target(MoveTarget.ALL_NEAR_ENEMIES) .unimplemented(), End Unused */ - new AttackMove(Moves.TERA_BLAST, Type.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 9) + new AttackMove(Moves.TERA_BLAST, PokemonType.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 9) .attr(TeraMoveCategoryAttr) .attr(TeraBlastTypeAttr) .attr(TeraBlastPowerAttr) - .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, true, { condition: (user, target, move) => user.isTerastallized() && user.isOfType(Type.STELLAR) }) - .partial(), /** Does not ignore abilities that affect stats, relevant in determining the move's category {@see TeraMoveCategoryAttr} */ - new SelfStatusMove(Moves.SILK_TRAP, Type.BUG, -1, 10, -1, 4, 9) + .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, true, { condition: (user, target, move) => user.isTerastallized && user.isOfType(PokemonType.STELLAR) }), + new SelfStatusMove(Moves.SILK_TRAP, PokemonType.BUG, -1, 10, -1, 4, 9) .attr(ProtectAttr, BattlerTagType.SILK_TRAP) .condition(failIfLastCondition), - new AttackMove(Moves.AXE_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 120, 90, 10, 30, 0, 9) + new AttackMove(Moves.AXE_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 120, 90, 10, 30, 0, 9) .attr(MissEffectAttr, crashDamageFunc) .attr(NoEffectAttr, crashDamageFunc) .attr(ConfuseAttr) .recklessMove(), - new AttackMove(Moves.LAST_RESPECTS, Type.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 9) - .partial() // Counter resets every wave instead of on arena reset - .attr(MovePowerMultiplierAttr, (user, target, move) => 1 + Math.min(user.isPlayer() ? globalScene.currentBattle.playerFaints : globalScene.currentBattle.enemyFaints, 100)) + new AttackMove(Moves.LAST_RESPECTS, PokemonType.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 9) + .attr(MovePowerMultiplierAttr, (user, target, move) => 1 + Math.min(user.isPlayer() ? globalScene.arena.playerFaints : globalScene.currentBattle.enemyFaints, 100)) .makesContact(false), - new AttackMove(Moves.LUMINA_CRASH, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9) + new AttackMove(Moves.LUMINA_CRASH, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2), - new AttackMove(Moves.ORDER_UP, Type.DRAGON, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 9) + new AttackMove(Moves.ORDER_UP, PokemonType.DRAGON, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 9) .attr(OrderUpStatBoostAttr) .makesContact(false), - new AttackMove(Moves.JET_PUNCH, Type.WATER, MoveCategory.PHYSICAL, 60, 100, 15, -1, 1, 9) + new AttackMove(Moves.JET_PUNCH, PokemonType.WATER, MoveCategory.PHYSICAL, 60, 100, 15, -1, 1, 9) .punchingMove(), - new StatusMove(Moves.SPICY_EXTRACT, Type.GRASS, -1, 15, -1, 0, 9) + new StatusMove(Moves.SPICY_EXTRACT, PokemonType.GRASS, -1, 15, -1, 0, 9) .attr(StatStageChangeAttr, [ Stat.ATK ], 2) .attr(StatStageChangeAttr, [ Stat.DEF ], -2), - new AttackMove(Moves.SPIN_OUT, Type.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9) + new AttackMove(Moves.SPIN_OUT, PokemonType.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9) .attr(StatStageChangeAttr, [ Stat.SPD ], -2, true), - new AttackMove(Moves.POPULATION_BOMB, Type.NORMAL, MoveCategory.PHYSICAL, 20, 90, 10, -1, 0, 9) + new AttackMove(Moves.POPULATION_BOMB, PokemonType.NORMAL, MoveCategory.PHYSICAL, 20, 90, 10, -1, 0, 9) .attr(MultiHitAttr, MultiHitType._10) .slicingMove() .checkAllHits(), - new AttackMove(Moves.ICE_SPINNER, Type.ICE, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 9) + new AttackMove(Moves.ICE_SPINNER, PokemonType.ICE, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 9) .attr(ClearTerrainAttr), - new AttackMove(Moves.GLAIVE_RUSH, Type.DRAGON, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 9) + new AttackMove(Moves.GLAIVE_RUSH, PokemonType.DRAGON, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 9) .attr(AddBattlerTagAttr, BattlerTagType.ALWAYS_GET_HIT, true, false, 0, 0, true) .attr(AddBattlerTagAttr, BattlerTagType.RECEIVE_DOUBLE_DAMAGE, true, false, 0, 0, true) .condition((user, target, move) => { return !(target.getTag(BattlerTagType.PROTECTED)?.tagType === "PROTECTED" || globalScene.arena.getTag(ArenaTagType.MAT_BLOCK)?.tagType === "MAT_BLOCK"); }), - new StatusMove(Moves.REVIVAL_BLESSING, Type.NORMAL, -1, 1, -1, 0, 9) + new StatusMove(Moves.REVIVAL_BLESSING, PokemonType.NORMAL, -1, 1, -1, 0, 9) .triageMove() .attr(RevivalBlessingAttr) .target(MoveTarget.USER), - new AttackMove(Moves.SALT_CURE, Type.ROCK, MoveCategory.PHYSICAL, 40, 100, 15, 100, 0, 9) + new AttackMove(Moves.SALT_CURE, PokemonType.ROCK, MoveCategory.PHYSICAL, 40, 100, 15, 100, 0, 9) .attr(AddBattlerTagAttr, BattlerTagType.SALT_CURED) .makesContact(false), - new AttackMove(Moves.TRIPLE_DIVE, Type.WATER, MoveCategory.PHYSICAL, 30, 95, 10, -1, 0, 9) + new AttackMove(Moves.TRIPLE_DIVE, PokemonType.WATER, MoveCategory.PHYSICAL, 30, 95, 10, -1, 0, 9) .attr(MultiHitAttr, MultiHitType._3), - new AttackMove(Moves.MORTAL_SPIN, Type.POISON, MoveCategory.PHYSICAL, 30, 100, 15, 100, 0, 9) + new AttackMove(Moves.MORTAL_SPIN, PokemonType.POISON, MoveCategory.PHYSICAL, 30, 100, 15, 100, 0, 9) .attr(LapseBattlerTagAttr, [ BattlerTagType.BIND, BattlerTagType.WRAP, @@ -10970,176 +10981,176 @@ export function initMoves() { .attr(StatusEffectAttr, StatusEffect.POISON) .attr(RemoveArenaTrapAttr) .target(MoveTarget.ALL_NEAR_ENEMIES), - new StatusMove(Moves.DOODLE, Type.NORMAL, 100, 10, -1, 0, 9) + new StatusMove(Moves.DOODLE, PokemonType.NORMAL, 100, 10, -1, 0, 9) .attr(AbilityCopyAttr, true), - new SelfStatusMove(Moves.FILLET_AWAY, Type.NORMAL, -1, 10, -1, 0, 9) + new SelfStatusMove(Moves.FILLET_AWAY, PokemonType.NORMAL, -1, 10, -1, 0, 9) .attr(CutHpStatStageBoostAttr, [ Stat.ATK, Stat.SPATK, Stat.SPD ], 2, 2), - new AttackMove(Moves.KOWTOW_CLEAVE, Type.DARK, MoveCategory.PHYSICAL, 85, -1, 10, -1, 0, 9) + new AttackMove(Moves.KOWTOW_CLEAVE, PokemonType.DARK, MoveCategory.PHYSICAL, 85, -1, 10, -1, 0, 9) .slicingMove(), - new AttackMove(Moves.FLOWER_TRICK, Type.GRASS, MoveCategory.PHYSICAL, 70, -1, 10, 100, 0, 9) + new AttackMove(Moves.FLOWER_TRICK, PokemonType.GRASS, MoveCategory.PHYSICAL, 70, -1, 10, 100, 0, 9) .attr(CritOnlyAttr) .makesContact(false), - new AttackMove(Moves.TORCH_SONG, Type.FIRE, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9) + new AttackMove(Moves.TORCH_SONG, PokemonType.FIRE, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9) .attr(StatStageChangeAttr, [ Stat.SPATK ], 1, true) .soundBased(), - new AttackMove(Moves.AQUA_STEP, Type.WATER, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 9) + new AttackMove(Moves.AQUA_STEP, PokemonType.WATER, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 9) .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true) .danceMove(), - new AttackMove(Moves.RAGING_BULL, Type.NORMAL, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 9) + new AttackMove(Moves.RAGING_BULL, PokemonType.NORMAL, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 9) .attr(RagingBullTypeAttr) .attr(RemoveScreensAttr), - new AttackMove(Moves.MAKE_IT_RAIN, Type.STEEL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9) + new AttackMove(Moves.MAKE_IT_RAIN, PokemonType.STEEL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9) .attr(MoneyAttr) .attr(StatStageChangeAttr, [ Stat.SPATK ], -1, true, { firstTargetOnly: true }) .target(MoveTarget.ALL_NEAR_ENEMIES), - new AttackMove(Moves.PSYBLADE, Type.PSYCHIC, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 9) + new AttackMove(Moves.PSYBLADE, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 9) .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.ELECTRIC && user.isGrounded() ? 1.5 : 1) .slicingMove(), - new AttackMove(Moves.HYDRO_STEAM, Type.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 9) + new AttackMove(Moves.HYDRO_STEAM, PokemonType.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 9) .attr(IgnoreWeatherTypeDebuffAttr, WeatherType.SUNNY) .attr(MovePowerMultiplierAttr, (user, target, move) => [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(globalScene.arena.weather?.weatherType!) && !globalScene.arena.weather?.isEffectSuppressed() ? 1.5 : 1), // TODO: is this bang correct? - new AttackMove(Moves.RUINATION, Type.DARK, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 9) + new AttackMove(Moves.RUINATION, PokemonType.DARK, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 9) .attr(TargetHalfHpDamageAttr), - new AttackMove(Moves.COLLISION_COURSE, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9) + new AttackMove(Moves.COLLISION_COURSE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9) .attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2 ? 5461 / 4096 : 1), - new AttackMove(Moves.ELECTRO_DRIFT, Type.ELECTRIC, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 9) + new AttackMove(Moves.ELECTRO_DRIFT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 9) .attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2 ? 5461 / 4096 : 1) .makesContact(), - new SelfStatusMove(Moves.SHED_TAIL, Type.NORMAL, -1, 10, -1, 0, 9) - .attr(AddSubstituteAttr, 0.5) + new SelfStatusMove(Moves.SHED_TAIL, PokemonType.NORMAL, -1, 10, -1, 0, 9) + .attr(AddSubstituteAttr, 0.5, true) .attr(ForceSwitchOutAttr, true, SwitchType.SHED_TAIL) .condition(failIfLastInPartyCondition), - new SelfStatusMove(Moves.CHILLY_RECEPTION, Type.ICE, -1, 10, -1, 0, 9) + new SelfStatusMove(Moves.CHILLY_RECEPTION, PokemonType.ICE, -1, 10, -1, 0, 9) .attr(PreMoveMessageAttr, (user, move) => i18next.t("moveTriggers:chillyReception", { pokemonName: getPokemonNameWithAffix(user) })) .attr(ChillyReceptionAttr, true), - new SelfStatusMove(Moves.TIDY_UP, Type.NORMAL, -1, 10, -1, 0, 9) + new SelfStatusMove(Moves.TIDY_UP, PokemonType.NORMAL, -1, 10, -1, 0, 9) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPD ], 1, true) .attr(RemoveArenaTrapAttr, true) .attr(RemoveAllSubstitutesAttr), - new StatusMove(Moves.SNOWSCAPE, Type.ICE, -1, 10, -1, 0, 9) + new StatusMove(Moves.SNOWSCAPE, PokemonType.ICE, -1, 10, -1, 0, 9) .attr(WeatherChangeAttr, WeatherType.SNOW) .target(MoveTarget.BOTH_SIDES), - new AttackMove(Moves.POUNCE, Type.BUG, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 9) + new AttackMove(Moves.POUNCE, PokemonType.BUG, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 9) .attr(StatStageChangeAttr, [ Stat.SPD ], -1), - new AttackMove(Moves.TRAILBLAZE, Type.GRASS, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 9) + new AttackMove(Moves.TRAILBLAZE, PokemonType.GRASS, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 9) .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true), - new AttackMove(Moves.CHILLING_WATER, Type.WATER, MoveCategory.SPECIAL, 50, 100, 20, 100, 0, 9) + new AttackMove(Moves.CHILLING_WATER, PokemonType.WATER, MoveCategory.SPECIAL, 50, 100, 20, 100, 0, 9) .attr(StatStageChangeAttr, [ Stat.ATK ], -1), - new AttackMove(Moves.HYPER_DRILL, Type.NORMAL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9) + new AttackMove(Moves.HYPER_DRILL, PokemonType.NORMAL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9) .ignoresProtect(), - new AttackMove(Moves.TWIN_BEAM, Type.PSYCHIC, MoveCategory.SPECIAL, 40, 100, 10, -1, 0, 9) + new AttackMove(Moves.TWIN_BEAM, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 40, 100, 10, -1, 0, 9) .attr(MultiHitAttr, MultiHitType._2), - new AttackMove(Moves.RAGE_FIST, Type.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 9) + new AttackMove(Moves.RAGE_FIST, PokemonType.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 9) .edgeCase() // Counter incorrectly increases on confusion self-hits .attr(RageFistPowerAttr) .punchingMove(), - new AttackMove(Moves.ARMOR_CANNON, Type.FIRE, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9) + new AttackMove(Moves.ARMOR_CANNON, PokemonType.FIRE, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9) .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true), - new AttackMove(Moves.BITTER_BLADE, Type.FIRE, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 9) + new AttackMove(Moves.BITTER_BLADE, PokemonType.FIRE, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 9) .attr(HitHealAttr) .slicingMove() .triageMove(), - new AttackMove(Moves.DOUBLE_SHOCK, Type.ELECTRIC, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 9) + new AttackMove(Moves.DOUBLE_SHOCK, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 9) .condition((user) => { const userTypes = user.getTypes(true); - return userTypes.includes(Type.ELECTRIC); + return userTypes.includes(PokemonType.ELECTRIC); }) .attr(AddBattlerTagAttr, BattlerTagType.DOUBLE_SHOCKED, true, false) - .attr(RemoveTypeAttr, Type.ELECTRIC, (user) => { + .attr(RemoveTypeAttr, PokemonType.ELECTRIC, (user) => { globalScene.queueMessage(i18next.t("moveTriggers:usedUpAllElectricity", { pokemonName: getPokemonNameWithAffix(user) })); }), - new AttackMove(Moves.GIGATON_HAMMER, Type.STEEL, MoveCategory.PHYSICAL, 160, 100, 5, -1, 0, 9) + new AttackMove(Moves.GIGATON_HAMMER, PokemonType.STEEL, MoveCategory.PHYSICAL, 160, 100, 5, -1, 0, 9) .makesContact(false) .condition((user, target, move) => { const turnMove = user.getLastXMoves(1); return !turnMove.length || turnMove[0].move !== move.id || turnMove[0].result !== MoveResult.SUCCESS; }), // TODO Add Instruct/Encore interaction - new AttackMove(Moves.COMEUPPANCE, Type.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9) + new AttackMove(Moves.COMEUPPANCE, PokemonType.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9) .attr(CounterDamageAttr, (move: Move) => (move.category === MoveCategory.PHYSICAL || move.category === MoveCategory.SPECIAL), 1.5) .redirectCounter() .target(MoveTarget.ATTACKER), - new AttackMove(Moves.AQUA_CUTTER, Type.WATER, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 9) + new AttackMove(Moves.AQUA_CUTTER, PokemonType.WATER, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 9) .attr(HighCritAttr) .slicingMove() .makesContact(false), - new AttackMove(Moves.BLAZING_TORQUE, Type.FIRE, MoveCategory.PHYSICAL, 80, 100, 10, 30, 0, 9) + new AttackMove(Moves.BLAZING_TORQUE, PokemonType.FIRE, MoveCategory.PHYSICAL, 80, 100, 10, 30, 0, 9) .attr(StatusEffectAttr, StatusEffect.BURN) .makesContact(false), - new AttackMove(Moves.WICKED_TORQUE, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 10, 10, 0, 9) + new AttackMove(Moves.WICKED_TORQUE, PokemonType.DARK, MoveCategory.PHYSICAL, 80, 100, 10, 10, 0, 9) .attr(StatusEffectAttr, StatusEffect.SLEEP) .makesContact(false), - new AttackMove(Moves.NOXIOUS_TORQUE, Type.POISON, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9) + new AttackMove(Moves.NOXIOUS_TORQUE, PokemonType.POISON, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9) .attr(StatusEffectAttr, StatusEffect.POISON) .makesContact(false), - new AttackMove(Moves.COMBAT_TORQUE, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9) + new AttackMove(Moves.COMBAT_TORQUE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9) .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .makesContact(false), - new AttackMove(Moves.MAGICAL_TORQUE, Type.FAIRY, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9) + new AttackMove(Moves.MAGICAL_TORQUE, PokemonType.FAIRY, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9) .attr(ConfuseAttr) .makesContact(false), - new AttackMove(Moves.BLOOD_MOON, Type.NORMAL, MoveCategory.SPECIAL, 140, 100, 5, -1, 0, 9) + new AttackMove(Moves.BLOOD_MOON, PokemonType.NORMAL, MoveCategory.SPECIAL, 140, 100, 5, -1, 0, 9) .condition((user, target, move) => { const turnMove = user.getLastXMoves(1); return !turnMove.length || turnMove[0].move !== move.id || turnMove[0].result !== MoveResult.SUCCESS; }), // TODO Add Instruct/Encore interaction - new AttackMove(Moves.MATCHA_GOTCHA, Type.GRASS, MoveCategory.SPECIAL, 80, 90, 15, 20, 0, 9) + new AttackMove(Moves.MATCHA_GOTCHA, PokemonType.GRASS, MoveCategory.SPECIAL, 80, 90, 15, 20, 0, 9) .attr(HitHealAttr) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(HealStatusEffectAttr, false, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN) .target(MoveTarget.ALL_NEAR_ENEMIES) .triageMove(), - new AttackMove(Moves.SYRUP_BOMB, Type.GRASS, MoveCategory.SPECIAL, 60, 85, 10, -1, 0, 9) + new AttackMove(Moves.SYRUP_BOMB, PokemonType.GRASS, MoveCategory.SPECIAL, 60, 85, 10, -1, 0, 9) .attr(AddBattlerTagAttr, BattlerTagType.SYRUP_BOMB, false, false, 3) .ballBombMove(), - new AttackMove(Moves.IVY_CUDGEL, Type.GRASS, MoveCategory.PHYSICAL, 100, 100, 10, -1, 0, 9) + new AttackMove(Moves.IVY_CUDGEL, PokemonType.GRASS, MoveCategory.PHYSICAL, 100, 100, 10, -1, 0, 9) .attr(IvyCudgelTypeAttr) .attr(HighCritAttr) .makesContact(false), - new ChargingAttackMove(Moves.ELECTRO_SHOT, Type.ELECTRIC, MoveCategory.SPECIAL, 130, 100, 10, 100, 0, 9) + new ChargingAttackMove(Moves.ELECTRO_SHOT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 130, 100, 10, 100, 0, 9) .chargeText(i18next.t("moveTriggers:absorbedElectricity", { pokemonName: "{USER}" })) .chargeAttr(StatStageChangeAttr, [ Stat.SPATK ], 1, true) .chargeAttr(WeatherInstantChargeAttr, [ WeatherType.RAIN, WeatherType.HEAVY_RAIN ]), - new AttackMove(Moves.TERA_STARSTORM, Type.NORMAL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9) + new AttackMove(Moves.TERA_STARSTORM, PokemonType.NORMAL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9) .attr(TeraMoveCategoryAttr) .attr(TeraStarstormTypeAttr) - .attr(VariableTargetAttr, (user, target, move) => (user.hasFusionSpecies(Species.TERAPAGOS) || user.species.speciesId === Species.TERAPAGOS) && user.isTerastallized() ? MoveTarget.ALL_NEAR_ENEMIES : MoveTarget.NEAR_OTHER) + .attr(VariableTargetAttr, (user, target, move) => user.hasSpecies(Species.TERAPAGOS) && user.isTerastallized ? MoveTarget.ALL_NEAR_ENEMIES : MoveTarget.NEAR_OTHER) .partial(), /** Does not ignore abilities that affect stats, relevant in determining the move's category {@see TeraMoveCategoryAttr} */ - new AttackMove(Moves.FICKLE_BEAM, Type.DRAGON, MoveCategory.SPECIAL, 80, 100, 5, 30, 0, 9) + new AttackMove(Moves.FICKLE_BEAM, PokemonType.DRAGON, MoveCategory.SPECIAL, 80, 100, 5, 30, 0, 9) .attr(PreMoveMessageAttr, doublePowerChanceMessageFunc) .attr(DoublePowerChanceAttr), - new SelfStatusMove(Moves.BURNING_BULWARK, Type.FIRE, -1, 10, -1, 4, 9) + new SelfStatusMove(Moves.BURNING_BULWARK, PokemonType.FIRE, -1, 10, -1, 4, 9) .attr(ProtectAttr, BattlerTagType.BURNING_BULWARK) .condition(failIfLastCondition), - new AttackMove(Moves.THUNDERCLAP, Type.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 5, -1, 1, 9) + new AttackMove(Moves.THUNDERCLAP, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 5, -1, 1, 9) .condition((user, target, move) => globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.FIGHT && !target.turnData.acted && allMoves[globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.move?.move!].category !== MoveCategory.STATUS), // TODO: is this bang correct? - new AttackMove(Moves.MIGHTY_CLEAVE, Type.ROCK, MoveCategory.PHYSICAL, 95, 100, 5, -1, 0, 9) + new AttackMove(Moves.MIGHTY_CLEAVE, PokemonType.ROCK, MoveCategory.PHYSICAL, 95, 100, 5, -1, 0, 9) .slicingMove() .ignoresProtect(), - new AttackMove(Moves.TACHYON_CUTTER, Type.STEEL, MoveCategory.SPECIAL, 50, -1, 10, -1, 0, 9) + new AttackMove(Moves.TACHYON_CUTTER, PokemonType.STEEL, MoveCategory.SPECIAL, 50, -1, 10, -1, 0, 9) .attr(MultiHitAttr, MultiHitType._2) .slicingMove(), - new AttackMove(Moves.HARD_PRESS, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9) + new AttackMove(Moves.HARD_PRESS, PokemonType.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9) .attr(OpponentHighHpPowerAttr, 100), - new StatusMove(Moves.DRAGON_CHEER, Type.DRAGON, -1, 15, -1, 0, 9) + new StatusMove(Moves.DRAGON_CHEER, PokemonType.DRAGON, -1, 15, -1, 0, 9) .attr(AddBattlerTagAttr, BattlerTagType.DRAGON_CHEER, false, true) .target(MoveTarget.NEAR_ALLY), - new AttackMove(Moves.ALLURING_VOICE, Type.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 9) + new AttackMove(Moves.ALLURING_VOICE, PokemonType.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 9) .attr(AddBattlerTagIfBoostedAttr, BattlerTagType.CONFUSED) .soundBased(), - new AttackMove(Moves.TEMPER_FLARE, Type.FIRE, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 9) + new AttackMove(Moves.TEMPER_FLARE, PokemonType.FIRE, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 9) .attr(MovePowerMultiplierAttr, (user, target, move) => user.getLastXMoves(2)[1]?.result === MoveResult.MISS || user.getLastXMoves(2)[1]?.result === MoveResult.FAIL ? 2 : 1), - new AttackMove(Moves.SUPERCELL_SLAM, Type.ELECTRIC, MoveCategory.PHYSICAL, 100, 95, 15, -1, 0, 9) + new AttackMove(Moves.SUPERCELL_SLAM, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 100, 95, 15, -1, 0, 9) .attr(MissEffectAttr, crashDamageFunc) .attr(NoEffectAttr, crashDamageFunc) .recklessMove(), - new AttackMove(Moves.PSYCHIC_NOISE, Type.PSYCHIC, MoveCategory.SPECIAL, 75, 100, 10, -1, 0, 9) + new AttackMove(Moves.PSYCHIC_NOISE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 75, 100, 10, -1, 0, 9) .soundBased() .attr(AddBattlerTagAttr, BattlerTagType.HEAL_BLOCK, false, false, 2), - new AttackMove(Moves.UPPER_HAND, Type.FIGHTING, MoveCategory.PHYSICAL, 65, 100, 15, 100, 3, 9) + new AttackMove(Moves.UPPER_HAND, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 65, 100, 15, 100, 3, 9) .attr(FlinchAttr) .condition(new UpperHandCondition()), - new AttackMove(Moves.MALIGNANT_CHAIN, Type.POISON, MoveCategory.SPECIAL, 100, 100, 5, 50, 0, 9) + new AttackMove(Moves.MALIGNANT_CHAIN, PokemonType.POISON, MoveCategory.SPECIAL, 100, 100, 5, 50, 0, 9) .attr(StatusEffectAttr, StatusEffect.TOXIC) ); allMoves.map(m => { diff --git a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts index 407644ee939..6cea85346b3 100644 --- a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts +++ b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts @@ -1,7 +1,12 @@ import { globalScene } from "#app/global-scene"; import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { trainerConfigs, } from "#app/data/trainer-config"; +import { + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { trainerConfigs } from "#app/data/trainer-config"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; @@ -27,161 +32,172 @@ const namespace = "mysteryEncounters/aTrainersTest"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3816 | GitHub Issue #3816} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const ATrainersTestEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.A_TRAINERS_TEST) - .withEncounterTier(MysteryEncounterTier.ROGUE) - .withSceneWaveRangeRequirement(100, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) - .withIntroSpriteConfigs([]) // These are set in onInit() - .withIntroDialogue([ +export const ATrainersTestEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.A_TRAINERS_TEST, +) + .withEncounterTier(MysteryEncounterTier.ROGUE) + .withSceneWaveRangeRequirement(100, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) + .withIntroSpriteConfigs([]) // These are set in onInit() + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .withAutoHideIntroVisuals(false) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + + // Randomly pick from 1 of the 5 stat trainers to spawn + let trainerType: TrainerType; + let spriteKeys: { spriteKey: any; fileRoot: any }; + let trainerNameKey: string; + switch (randSeedInt(5)) { + case 1: + trainerType = TrainerType.CHERYL; + spriteKeys = getSpriteKeysFromSpecies(Species.BLISSEY); + trainerNameKey = "cheryl"; + break; + case 2: + trainerType = TrainerType.MARLEY; + spriteKeys = getSpriteKeysFromSpecies(Species.ARCANINE); + trainerNameKey = "marley"; + break; + case 3: + trainerType = TrainerType.MIRA; + spriteKeys = getSpriteKeysFromSpecies(Species.ALAKAZAM, false, 1); + trainerNameKey = "mira"; + break; + case 4: + trainerType = TrainerType.RILEY; + spriteKeys = getSpriteKeysFromSpecies(Species.LUCARIO, false, 1); + trainerNameKey = "riley"; + break; + default: + trainerType = TrainerType.BUCK; + spriteKeys = getSpriteKeysFromSpecies(Species.CLAYDOL); + trainerNameKey = "buck"; + break; + } + + // Dialogue and tokens for trainer + encounter.dialogue.intro = [ { - text: `${namespace}:intro`, + speaker: `trainerNames:${trainerNameKey}`, + text: `${namespace}:${trainerNameKey}.intro_dialogue`, }, - ]) - .withAutoHideIntroVisuals(false) - .withOnInit(() => { + ]; + encounter.options[0].dialogue!.selected = [ + { + speaker: `trainerNames:${trainerNameKey}`, + text: `${namespace}:${trainerNameKey}.accept`, + }, + ]; + encounter.options[1].dialogue!.selected = [ + { + speaker: `trainerNames:${trainerNameKey}`, + text: `${namespace}:${trainerNameKey}.decline`, + }, + ]; + + encounter.setDialogueToken("statTrainerName", i18next.t(`trainerNames:${trainerNameKey}`)); + const eggDescription = `${i18next.t(`${namespace}:title`)}:\n${i18next.t(`trainerNames:${trainerNameKey}`)}`; + encounter.misc = { + trainerType, + trainerNameKey, + trainerEggDescription: eggDescription, + }; + + // Trainer config + const trainerConfig = trainerConfigs[trainerType].clone(); + const trainerSpriteKey = trainerConfig.getSpriteKey(); + encounter.enemyPartyConfigs.push({ + levelAdditiveModifier: 1, + trainerConfig: trainerConfig, + }); + + encounter.spriteConfigs = [ + { + spriteKey: spriteKeys.spriteKey, + fileRoot: spriteKeys.fileRoot, + hasShadow: true, + repeat: true, + isPokemon: true, + x: 22, + y: -2, + yShadow: -2, + }, + { + spriteKey: trainerSpriteKey, + fileRoot: "trainer", + hasShadow: true, + disableAnimation: true, + x: -24, + y: 4, + yShadow: 4, + }, + ]; + + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withIntroDialogue() + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + }, + async () => { const encounter = globalScene.currentBattle.mysteryEncounter!; + // Battle the stat trainer for an Egg and great rewards + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; - // Randomly pick from 1 of the 5 stat trainers to spawn - let trainerType: TrainerType; - let spriteKeys; - let trainerNameKey: string; - switch (randSeedInt(5)) { - default: - case 0: - trainerType = TrainerType.BUCK; - spriteKeys = getSpriteKeysFromSpecies(Species.CLAYDOL); - trainerNameKey = "buck"; - break; - case 1: - trainerType = TrainerType.CHERYL; - spriteKeys = getSpriteKeysFromSpecies(Species.BLISSEY); - trainerNameKey = "cheryl"; - break; - case 2: - trainerType = TrainerType.MARLEY; - spriteKeys = getSpriteKeysFromSpecies(Species.ARCANINE); - trainerNameKey = "marley"; - break; - case 3: - trainerType = TrainerType.MIRA; - spriteKeys = getSpriteKeysFromSpecies(Species.ALAKAZAM, false, 1); - trainerNameKey = "mira"; - break; - case 4: - trainerType = TrainerType.RILEY; - spriteKeys = getSpriteKeysFromSpecies(Species.LUCARIO, false, 1); - trainerNameKey = "riley"; - break; - } + await transitionMysteryEncounterIntroVisuals(); - // Dialogue and tokens for trainer - encounter.dialogue.intro = [ + const eggOptions: IEggOptions = { + pulled: false, + sourceType: EggSourceType.EVENT, + eggDescriptor: encounter.misc.trainerEggDescription, + tier: EggTier.EPIC, + }; + encounter.setDialogueToken("eggType", i18next.t(`${namespace}:eggTypes.epic`)); + setEncounterRewards( { - speaker: `trainerNames:${trainerNameKey}`, - text: `${namespace}:${trainerNameKey}.intro_dialogue` - } - ]; - encounter.options[0].dialogue!.selected = [ - { - speaker: `trainerNames:${trainerNameKey}`, - text: `${namespace}:${trainerNameKey}.accept` - } - ]; - encounter.options[1].dialogue!.selected = [ - { - speaker: `trainerNames:${trainerNameKey}`, - text: `${namespace}:${trainerNameKey}.decline` - } - ]; - - encounter.setDialogueToken("statTrainerName", i18next.t(`trainerNames:${trainerNameKey}`)); - const eggDescription = i18next.t(`${namespace}:title`) + ":\n" + i18next.t(`trainerNames:${trainerNameKey}`); - encounter.misc = { trainerType, trainerNameKey, trainerEggDescription: eggDescription }; - - // Trainer config - const trainerConfig = trainerConfigs[trainerType].clone(); - const trainerSpriteKey = trainerConfig.getSpriteKey(); - encounter.enemyPartyConfigs.push({ - levelAdditiveModifier: 1, - trainerConfig: trainerConfig - }); - - encounter.spriteConfigs = [ - { - spriteKey: spriteKeys.spriteKey, - fileRoot: spriteKeys.fileRoot, - hasShadow: true, - repeat: true, - isPokemon: true, - x: 22, - y: -2, - yShadow: -2 + guaranteedModifierTypeFuncs: [modifierTypes.SACRED_ASH], + guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ULTRA], + fillRemaining: true, }, - { - spriteKey: trainerSpriteKey, - fileRoot: "trainer", - hasShadow: true, - disableAnimation: true, - x: -24, - y: 4, - yShadow: 4 - } - ]; + [eggOptions], + ); + await initBattleWithEnemyConfig(config); + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + }, + async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Full heal party + globalScene.unshiftPhase(new PartyHealPhase(true)); - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withIntroDialogue() - .withSimpleOption( - { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip` - }, - async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Battle the stat trainer for an Egg and great rewards - const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; - - await transitionMysteryEncounterIntroVisuals(); - - const eggOptions: IEggOptions = { - pulled: false, - sourceType: EggSourceType.EVENT, - eggDescriptor: encounter.misc.trainerEggDescription, - tier: EggTier.EPIC - }; - encounter.setDialogueToken("eggType", i18next.t(`${namespace}:eggTypes.epic`)); - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.SACRED_ASH ], guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ULTRA ], fillRemaining: true }, [ eggOptions ]); - await initBattleWithEnemyConfig(config); - } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip` - }, - async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Full heal party - globalScene.unshiftPhase(new PartyHealPhase(true)); - - const eggOptions: IEggOptions = { - pulled: false, - sourceType: EggSourceType.EVENT, - eggDescriptor: encounter.misc.trainerEggDescription, - tier: EggTier.RARE - }; - encounter.setDialogueToken("eggType", i18next.t(`${namespace}:eggTypes.rare`)); - setEncounterRewards({ fillRemaining: false, rerollMultiplier: -1 }, [ eggOptions ]); - leaveEncounterWithoutBattle(); - } - ) - .withOutroDialogue([ - { - text: `${namespace}:outro` - } - ]) - .build(); + const eggOptions: IEggOptions = { + pulled: false, + sourceType: EggSourceType.EVENT, + eggDescriptor: encounter.misc.trainerEggDescription, + tier: EggTier.RARE, + }; + encounter.setDialogueToken("eggType", i18next.t(`${namespace}:eggTypes.rare`)); + setEncounterRewards({ fillRemaining: false, rerollMultiplier: -1 }, [eggOptions]); + leaveEncounterWithoutBattle(); + }, + ) + .withOutroDialogue([ + { + text: `${namespace}:outro`, + }, + ]) + .build(); diff --git a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts index 1499d953941..ca44782691d 100644 --- a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts +++ b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts @@ -1,5 +1,11 @@ import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + generateModifierType, + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import type Pokemon from "#app/field/pokemon"; import { EnemyPokemon, PokemonMove } from "#app/field/pokemon"; import type { BerryModifierType, PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; @@ -20,7 +26,11 @@ import { Moves } from "#enums/moves"; import { BattlerTagType } from "#enums/battler-tag-type"; import { randInt } from "#app/utils"; import { BattlerIndex } from "#app/battle"; -import { applyModifierTypeToPlayerPokemon, catchPokemon, getHighestLevelPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + applyModifierTypeToPlayerPokemon, + catchPokemon, + getHighestLevelPlayerPokemon, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { TrainerSlot } from "#app/data/trainer-config"; import { PokeballType } from "#enums/pokeball"; import type HeldModifierConfig from "#app/interfaces/held-modifier-config"; @@ -38,339 +48,348 @@ const namespace = "mysteryEncounters/absoluteAvarice"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3805 | GitHub Issue #3805} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const AbsoluteAvariceEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.ABSOLUTE_AVARICE) - .withEncounterTier(MysteryEncounterTier.GREAT) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 4)) // Must have at least 4 berries to spawn - .withFleeAllowed(false) - .withIntroSpriteConfigs([ - { - // This sprite has the shadow - spriteKey: "", - fileRoot: "", - species: Species.GREEDENT, - hasShadow: true, - alpha: 0.001, - repeat: true, - x: -5 - }, - { - spriteKey: "", - fileRoot: "", - species: Species.GREEDENT, - hasShadow: false, - repeat: true, - x: -5 - }, - { - spriteKey: "lum_berry", - fileRoot: "items", - isItem: true, - x: 7, - y: -14, - hidden: true, - disableAnimation: true - }, - { - spriteKey: "salac_berry", - fileRoot: "items", - isItem: true, - x: 2, - y: 4, - hidden: true, - disableAnimation: true - }, - { - spriteKey: "lansat_berry", - fileRoot: "items", - isItem: true, - x: 32, - y: 5, - hidden: true, - disableAnimation: true - }, - { - spriteKey: "liechi_berry", - fileRoot: "items", - isItem: true, - x: 6, - y: -5, - hidden: true, - disableAnimation: true - }, - { - spriteKey: "sitrus_berry", - fileRoot: "items", - isItem: true, - x: 7, - y: 8, - hidden: true, - disableAnimation: true - }, - { - spriteKey: "enigma_berry", - fileRoot: "items", - isItem: true, - x: 26, - y: -4, - hidden: true, - disableAnimation: true - }, - { - spriteKey: "leppa_berry", - fileRoot: "items", - isItem: true, - x: 16, - y: -27, - hidden: true, - disableAnimation: true - }, - { - spriteKey: "petaya_berry", - fileRoot: "items", - isItem: true, - x: 30, - y: -17, - hidden: true, - disableAnimation: true - }, - { - spriteKey: "ganlon_berry", - fileRoot: "items", - isItem: true, - x: 16, - y: -11, - hidden: true, - disableAnimation: true - }, - { - spriteKey: "apicot_berry", - fileRoot: "items", - isItem: true, - x: 14, - y: -2, - hidden: true, - disableAnimation: true - }, - { - spriteKey: "starf_berry", - fileRoot: "items", - isItem: true, - x: 18, - y: 9, - hidden: true, - disableAnimation: true - }, - ]) - .withHideWildIntroMessage(true) - .withAutoHideIntroVisuals(false) - .withIntroDialogue([ - { - text: `${namespace}:intro`, +export const AbsoluteAvariceEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.ABSOLUTE_AVARICE, +) + .withEncounterTier(MysteryEncounterTier.GREAT) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 4)) // Must have at least 4 berries to spawn + .withFleeAllowed(false) + .withIntroSpriteConfigs([ + { + // This sprite has the shadow + spriteKey: "", + fileRoot: "", + species: Species.GREEDENT, + hasShadow: true, + alpha: 0.001, + repeat: true, + x: -5, + }, + { + spriteKey: "", + fileRoot: "", + species: Species.GREEDENT, + hasShadow: false, + repeat: true, + x: -5, + }, + { + spriteKey: "lum_berry", + fileRoot: "items", + isItem: true, + x: 7, + y: -14, + hidden: true, + disableAnimation: true, + }, + { + spriteKey: "salac_berry", + fileRoot: "items", + isItem: true, + x: 2, + y: 4, + hidden: true, + disableAnimation: true, + }, + { + spriteKey: "lansat_berry", + fileRoot: "items", + isItem: true, + x: 32, + y: 5, + hidden: true, + disableAnimation: true, + }, + { + spriteKey: "liechi_berry", + fileRoot: "items", + isItem: true, + x: 6, + y: -5, + hidden: true, + disableAnimation: true, + }, + { + spriteKey: "sitrus_berry", + fileRoot: "items", + isItem: true, + x: 7, + y: 8, + hidden: true, + disableAnimation: true, + }, + { + spriteKey: "enigma_berry", + fileRoot: "items", + isItem: true, + x: 26, + y: -4, + hidden: true, + disableAnimation: true, + }, + { + spriteKey: "leppa_berry", + fileRoot: "items", + isItem: true, + x: 16, + y: -27, + hidden: true, + disableAnimation: true, + }, + { + spriteKey: "petaya_berry", + fileRoot: "items", + isItem: true, + x: 30, + y: -17, + hidden: true, + disableAnimation: true, + }, + { + spriteKey: "ganlon_berry", + fileRoot: "items", + isItem: true, + x: 16, + y: -11, + hidden: true, + disableAnimation: true, + }, + { + spriteKey: "apicot_berry", + fileRoot: "items", + isItem: true, + x: 14, + y: -2, + hidden: true, + disableAnimation: true, + }, + { + spriteKey: "starf_berry", + fileRoot: "items", + isItem: true, + x: 18, + y: 9, + hidden: true, + disableAnimation: true, + }, + ]) + .withHideWildIntroMessage(true) + .withAutoHideIntroVisuals(false) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + + globalScene.loadSe("PRSFX- Bug Bite", "battle_anims", "PRSFX- Bug Bite.wav"); + globalScene.loadSe("Follow Me", "battle_anims", "Follow Me.mp3"); + + // Get all player berry items, remove from party, and store reference + const berryItems = globalScene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[]; + + // Sort berries by party member ID to more easily re-add later if necessary + const berryItemsMap = new Map(); + globalScene.getPlayerParty().forEach(pokemon => { + const pokemonBerries = berryItems.filter(b => b.pokemonId === pokemon.id); + if (pokemonBerries?.length > 0) { + berryItemsMap.set(pokemon.id, pokemonBerries); } - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; + }); - globalScene.loadSe("PRSFX- Bug Bite", "battle_anims", "PRSFX- Bug Bite.wav"); - globalScene.loadSe("Follow Me", "battle_anims", "Follow Me.mp3"); + encounter.misc = { berryItemsMap }; - // Get all player berry items, remove from party, and store reference - const berryItems = globalScene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[]; + // Generates copies of the stolen berries to put on the Greedent + const bossModifierConfigs: HeldModifierConfig[] = []; + berryItems.forEach(berryMod => { + // Can't define stack count on a ModifierType, have to just create separate instances for each stack + // Overflow berries will be "lost" on the boss, but it's un-catchable anyway + for (let i = 0; i < berryMod.stackCount; i++) { + const modifierType = generateModifierType(modifierTypes.BERRY, [ + berryMod.berryType, + ]) as PokemonHeldItemModifierType; + bossModifierConfigs.push({ modifier: modifierType }); + } + }); - // Sort berries by party member ID to more easily re-add later if necessary - const berryItemsMap = new Map(); - globalScene.getPlayerParty().forEach(pokemon => { - const pokemonBerries = berryItems.filter(b => b.pokemonId === pokemon.id); - if (pokemonBerries?.length > 0) { - berryItemsMap.set(pokemon.id, pokemonBerries); - } - }); + // Do NOT remove the real berries yet or else it will be persisted in the session data - encounter.misc = { berryItemsMap }; + // SpDef buff below wave 50, +1 to all stats otherwise + const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = + globalScene.currentBattle.waveIndex < 50 ? [Stat.SPDEF] : [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD]; - // Generates copies of the stolen berries to put on the Greedent - const bossModifierConfigs: HeldModifierConfig[] = []; - berryItems.forEach(berryMod => { - // Can't define stack count on a ModifierType, have to just create separate instances for each stack - // Overflow berries will be "lost" on the boss, but it's un-catchable anyway - for (let i = 0; i < berryMod.stackCount; i++) { - const modifierType = generateModifierType(modifierTypes.BERRY, [ berryMod.berryType ]) as PokemonHeldItemModifierType; - bossModifierConfigs.push({ modifier: modifierType }); - } - }); + // Calculate boss mon + const config: EnemyPartyConfig = { + levelAdditiveModifier: 1, + pokemonConfigs: [ + { + species: getPokemonSpecies(Species.GREEDENT), + isBoss: true, + bossSegments: 3, + shiny: false, // Shiny lock because of consistency issues between the different options + moveSet: [Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.CRUNCH], + modifierConfigs: bossModifierConfigs, + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], + mysteryEncounterBattleEffects: (pokemon: Pokemon) => { + queueEncounterMessage(`${namespace}:option.1.boss_enraged`); + globalScene.unshiftPhase( + new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1), + ); + }, + }, + ], + }; - // Do NOT remove the real berries yet or else it will be persisted in the session data + encounter.enemyPartyConfigs = [config]; + encounter.setDialogueToken("greedentName", getPokemonSpecies(Species.GREEDENT).getName()); - // SpDef buff below wave 50, +1 to all stats otherwise - const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = globalScene.currentBattle.waveIndex < 50 ? - [ Stat.SPDEF ] : - [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ]; + return true; + }) + .withOnVisualsStart(() => { + doGreedentSpriteSteal(); + doBerrySpritePile(); - // Calculate boss mon - const config: EnemyPartyConfig = { - levelAdditiveModifier: 1, - pokemonConfigs: [ + // Remove the berries from the party + // Session has been safely saved at this point, so data won't be lost + const berryItems = globalScene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[]; + berryItems.forEach(berryMod => { + globalScene.removeModifier(berryMod); + }); + + globalScene.updateModifiers(true); + + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ { - species: getPokemonSpecies(Species.GREEDENT), - isBoss: true, - bossSegments: 3, - shiny: false, // Shiny lock because of consistency issues between the different options - moveSet: [ Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.CRUNCH ], - modifierConfigs: bossModifierConfigs, - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], - mysteryEncounterBattleEffects: (pokemon: Pokemon) => { - queueEncounterMessage(`${namespace}:option.1.boss_enraged`); - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1)); + text: `${namespace}:option.1.selected`, + }, + ], + }) + .withOptionPhase(async () => { + // Pick battle + const encounter = globalScene.currentBattle.mysteryEncounter!; + + // Provides 1x Reviver Seed to each party member at end of battle + const revSeed = generateModifierType(modifierTypes.REVIVER_SEED); + encounter.setDialogueToken( + "foodReward", + revSeed?.name ?? i18next.t("modifierType:ModifierType.REVIVER_SEED.name"), + ); + const givePartyPokemonReviverSeeds = () => { + const party = globalScene.getPlayerParty(); + party.forEach(p => { + const heldItems = p.getHeldItems(); + if (revSeed && !heldItems.some(item => item instanceof PokemonInstantReviveModifier)) { + const seedModifier = revSeed.newModifier(p); + globalScene.addModifier(seedModifier, false, false, false, true); + } + }); + queueEncounterMessage(`${namespace}:option.1.food_stash`); + }; + + setEncounterRewards({ fillRemaining: true }, undefined, givePartyPokemonReviverSeeds); + encounter.startOfBattleEffects.push({ + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [BattlerIndex.ENEMY], + move: new PokemonMove(Moves.STUFF_CHEEKS), + ignorePp: true, + }); + + await transitionMysteryEncounterIntroVisuals(true, true, 500); + await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const berryMap = encounter.misc.berryItemsMap; + + // Returns 2/5 of the berries stolen to each Pokemon + const party = globalScene.getPlayerParty(); + party.forEach(pokemon => { + const stolenBerries: BerryModifier[] = berryMap.get(pokemon.id); + const berryTypesAsArray: BerryType[] = []; + stolenBerries?.forEach(bMod => berryTypesAsArray.push(...new Array(bMod.stackCount).fill(bMod.berryType))); + const returnedBerryCount = Math.floor(((berryTypesAsArray.length ?? 0) * 2) / 5); + + if (returnedBerryCount > 0) { + for (let i = 0; i < returnedBerryCount; i++) { + // Shuffle remaining berry types and pop + Phaser.Math.RND.shuffle(berryTypesAsArray); + const randBerryType = berryTypesAsArray.pop(); + + const berryModType = generateModifierType(modifierTypes.BERRY, [randBerryType]) as BerryModifierType; + applyModifierTypeToPlayerPokemon(pokemon, berryModType); } } + }); + await globalScene.updateModifiers(true); + + await transitionMysteryEncounterIntroVisuals(true, true, 500); + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + selected: [ + { + text: `${namespace}:option.3.selected`, + }, ], - }; + }) + .withPreOptionPhase(async () => { + // Animate berries being eaten + doGreedentEatBerries(); + doBerrySpritePile(true); + return true; + }) + .withOptionPhase(async () => { + // Let it have the food + // Greedent joins the team, level equal to 2 below highest party member (shiny locked) + const level = getHighestLevelPlayerPokemon(false, true).level - 2; + const greedent = new EnemyPokemon(getPokemonSpecies(Species.GREEDENT), level, TrainerSlot.NONE, false, true); + greedent.moveset = [ + new PokemonMove(Moves.THRASH), + new PokemonMove(Moves.BODY_PRESS), + new PokemonMove(Moves.STUFF_CHEEKS), + new PokemonMove(Moves.SLACK_OFF), + ]; + greedent.passive = true; - encounter.enemyPartyConfigs = [ config ]; - encounter.setDialogueToken("greedentName", getPokemonSpecies(Species.GREEDENT).getName()); - - return true; - }) - .withOnVisualsStart(() => { - doGreedentSpriteSteal(); - doBerrySpritePile(); - - // Remove the berries from the party - // Session has been safely saved at this point, so data won't be lost - const berryItems = globalScene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[]; - berryItems.forEach(berryMod => { - globalScene.removeModifier(berryMod); - }); - - globalScene.updateModifiers(true); - - return true; - }) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected`, - }, - ], - }) - .withOptionPhase(async () => { - // Pick battle - const encounter = globalScene.currentBattle.mysteryEncounter!; - - // Provides 1x Reviver Seed to each party member at end of battle - const revSeed = generateModifierType(modifierTypes.REVIVER_SEED); - encounter.setDialogueToken("foodReward", revSeed?.name ?? i18next.t("modifierType:ModifierType.REVIVER_SEED.name")); - const givePartyPokemonReviverSeeds = () => { - const party = globalScene.getPlayerParty(); - party.forEach(p => { - const heldItems = p.getHeldItems(); - if (revSeed && !heldItems.some(item => item instanceof PokemonInstantReviveModifier)) { - const seedModifier = revSeed.newModifier(p); - globalScene.addModifier(seedModifier, false, false, false, true); - } - }); - queueEncounterMessage(`${namespace}:option.1.food_stash`); - }; - - setEncounterRewards({ fillRemaining: true }, undefined, givePartyPokemonReviverSeeds); - encounter.startOfBattleEffects.push({ - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ BattlerIndex.ENEMY ], - move: new PokemonMove(Moves.STUFF_CHEEKS), - ignorePp: true - }); - - await transitionMysteryEncounterIntroVisuals(true, true, 500); - await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - }, - ], - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const berryMap = encounter.misc.berryItemsMap; - - // Returns 2/5 of the berries stolen to each Pokemon - const party = globalScene.getPlayerParty(); - party.forEach(pokemon => { - const stolenBerries: BerryModifier[] = berryMap.get(pokemon.id); - const berryTypesAsArray: BerryType[] = []; - stolenBerries?.forEach(bMod => berryTypesAsArray.push(...new Array(bMod.stackCount).fill(bMod.berryType))); - const returnedBerryCount = Math.floor((berryTypesAsArray.length ?? 0) * 2 / 5); - - if (returnedBerryCount > 0) { - for (let i = 0; i < returnedBerryCount; i++) { - // Shuffle remaining berry types and pop - Phaser.Math.RND.shuffle(berryTypesAsArray); - const randBerryType = berryTypesAsArray.pop(); - - const berryModType = generateModifierType(modifierTypes.BERRY, [ randBerryType ]) as BerryModifierType; - applyModifierTypeToPlayerPokemon(pokemon, berryModType); - } - } - }); - await globalScene.updateModifiers(true); - - await transitionMysteryEncounterIntroVisuals(true, true, 500); - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - selected: [ - { - text: `${namespace}:option.3.selected`, - }, - ], - }) - .withPreOptionPhase(async () => { - // Animate berries being eaten - doGreedentEatBerries(); - doBerrySpritePile(true); - return true; - }) - .withOptionPhase(async () => { - // Let it have the food - // Greedent joins the team, level equal to 2 below highest party member (shiny locked) - const level = getHighestLevelPlayerPokemon(false, true).level - 2; - const greedent = new EnemyPokemon(getPokemonSpecies(Species.GREEDENT), level, TrainerSlot.NONE, false, true); - greedent.moveset = [ new PokemonMove(Moves.THRASH), new PokemonMove(Moves.BODY_PRESS), new PokemonMove(Moves.STUFF_CHEEKS), new PokemonMove(Moves.SLACK_OFF) ]; - greedent.passive = true; - - await transitionMysteryEncounterIntroVisuals(true, true, 500); - await catchPokemon(greedent, null, PokeballType.POKEBALL, false); - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .build(); + await transitionMysteryEncounterIntroVisuals(true, true, 500); + await catchPokemon(greedent, null, PokeballType.POKEBALL, false); + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .build(); function doGreedentSpriteSteal() { const shakeDelay = 50; @@ -382,70 +401,79 @@ function doGreedentSpriteSteal() { globalScene.tweens.chain({ targets: greedentSprites, tweens: [ - { // Slide Greedent diagonally + { + // Slide Greedent diagonally duration: slideDelay, ease: "Cubic.easeOut", y: "+=75", x: "-=65", - scale: 1.1 + scale: 1.1, }, - { // Shake + { + // Shake duration: shakeDelay, ease: "Cubic.easeOut", yoyo: true, x: (randInt(2) > 0 ? "-=" : "+=") + 5, y: (randInt(2) > 0 ? "-=" : "+=") + 5, }, - { // Shake + { + // Shake duration: shakeDelay, ease: "Cubic.easeOut", yoyo: true, x: (randInt(2) > 0 ? "-=" : "+=") + 5, y: (randInt(2) > 0 ? "-=" : "+=") + 5, }, - { // Shake + { + // Shake duration: shakeDelay, ease: "Cubic.easeOut", yoyo: true, x: (randInt(2) > 0 ? "-=" : "+=") + 5, y: (randInt(2) > 0 ? "-=" : "+=") + 5, }, - { // Shake + { + // Shake duration: shakeDelay, ease: "Cubic.easeOut", yoyo: true, x: (randInt(2) > 0 ? "-=" : "+=") + 5, y: (randInt(2) > 0 ? "-=" : "+=") + 5, }, - { // Shake + { + // Shake duration: shakeDelay, ease: "Cubic.easeOut", yoyo: true, x: (randInt(2) > 0 ? "-=" : "+=") + 5, y: (randInt(2) > 0 ? "-=" : "+=") + 5, }, - { // Shake + { + // Shake duration: shakeDelay, ease: "Cubic.easeOut", yoyo: true, x: (randInt(2) > 0 ? "-=" : "+=") + 5, y: (randInt(2) > 0 ? "-=" : "+=") + 5, }, - { // Slide Greedent diagonally + { + // Slide Greedent diagonally duration: slideDelay, ease: "Cubic.easeOut", y: "-=75", x: "+=65", - scale: 1 + scale: 1, }, - { // Bounce at the end + { + // Bounce at the end duration: 300, ease: "Cubic.easeOut", yoyo: true, y: "-=20", loop: 1, - } - ] + }, + ], }); } @@ -467,16 +495,28 @@ function doGreedentEatBerries() { globalScene.playSound("battle_anims/PRSFX- Bug Bite"); } index++; - } + }, }); } /** * @param isEat Default false. Will "create" pile when false, and remove pile when true. */ -function doBerrySpritePile(isEat: boolean = false) { +function doBerrySpritePile(isEat = false) { const berryAddDelay = 150; - let animationOrder = [ "starf", "sitrus", "lansat", "salac", "apicot", "enigma", "liechi", "ganlon", "lum", "petaya", "leppa" ]; + let animationOrder = [ + "starf", + "sitrus", + "lansat", + "salac", + "apicot", + "enigma", + "liechi", + "ganlon", + "lum", + "petaya", + "leppa", + ]; if (isEat) { animationOrder = animationOrder.reverse(); } @@ -500,7 +540,7 @@ function doBerrySpritePile(isEat: boolean = false) { // Animate Petaya berry falling off the pile if (berry === "petaya" && sprite && tintSprite && !isEat) { globalScene.time.delayedCall(200, () => { - doBerryBounce([ sprite, tintSprite ], 30, 500); + doBerryBounce([sprite, tintSprite], 30, 500); }); } }); @@ -515,7 +555,7 @@ function doBerryBounce(berrySprites: Phaser.GameObjects.Sprite[], yd: number, ba globalScene.tweens.add({ targets: berrySprites, y: "+=" + bounceYOffset, - x: { value: "+=" + (bouncePower * bouncePower * 10), ease: "Linear" }, + x: { value: "+=" + bouncePower * bouncePower * 10, ease: "Linear" }, duration: bouncePower * baseBounceDuration, ease: "Cubic.easeIn", onComplete: () => { @@ -527,13 +567,13 @@ function doBerryBounce(berrySprites: Phaser.GameObjects.Sprite[], yd: number, ba globalScene.tweens.add({ targets: berrySprites, y: "-=" + bounceYOffset, - x: { value: "+=" + (bouncePower * bouncePower * 10), ease: "Linear" }, + x: { value: "+=" + bouncePower * bouncePower * 10, ease: "Linear" }, duration: bouncePower * baseBounceDuration, ease: "Cubic.easeOut", - onComplete: () => doBounce() + onComplete: () => doBounce(), }); } - } + }, }); }; diff --git a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts index 671eb3d3ab8..b66052cfd16 100644 --- a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts +++ b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts @@ -1,4 +1,9 @@ -import { generateModifierType, leaveEncounterWithoutBattle, setEncounterExp, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + generateModifierType, + leaveEncounterWithoutBattle, + setEncounterExp, + updatePlayerMoney, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { modifierTypes } from "#app/modifier/modifier-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; @@ -6,7 +11,11 @@ import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { AbilityRequirement, CombinationPokemonRequirement, MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; +import { + AbilityRequirement, + CombinationPokemonRequirement, + MoveRequirement, +} from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { getHighestStatTotalPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { EXTORTION_ABILITIES, EXTORTION_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; import { getPokemonSpecies } from "#app/data/pokemon-species"; @@ -33,153 +42,152 @@ const MONEY_MAXIMUM_MULTIPLIER = 30; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3808 | GitHub Issue #3808} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const AnOfferYouCantRefuseEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE) - .withEncounterTier(MysteryEncounterTier.GREAT) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 pokemon in party - .withIntroSpriteConfigs([ - { - spriteKey: Species.LIEPARD.toString(), - fileRoot: "pokemon", - hasShadow: true, - repeat: true, - x: 0, - y: -4, - yShadow: -4 - }, - { - spriteKey: "rich_kid_m", - fileRoot: "trainer", - hasShadow: true, - x: 2, - y: 5, - yShadow: 5 - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - { - text: `${namespace}:intro_dialogue`, - speaker: `${namespace}:speaker`, - }, - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const pokemon = getHighestStatTotalPlayerPokemon(true, true); +export const AnOfferYouCantRefuseEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, +) + .withEncounterTier(MysteryEncounterTier.GREAT) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 pokemon in party + .withIntroSpriteConfigs([ + { + spriteKey: Species.LIEPARD.toString(), + fileRoot: "pokemon", + hasShadow: true, + repeat: true, + x: 0, + y: -4, + yShadow: -4, + }, + { + spriteKey: "rich_kid_m", + fileRoot: "trainer", + hasShadow: true, + x: 2, + y: 5, + yShadow: 5, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + text: `${namespace}:intro_dialogue`, + speaker: `${namespace}:speaker`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const pokemon = getHighestStatTotalPlayerPokemon(true, true); - const baseSpecies = pokemon.getSpeciesForm().getRootSpeciesId(); - const starterValue: number = speciesStarterCosts[baseSpecies] ?? 1; - const multiplier = Math.max(MONEY_MAXIMUM_MULTIPLIER / 10 * starterValue, MONEY_MINIMUM_MULTIPLIER); - const price = globalScene.getWaveMoneyAmount(multiplier); + const baseSpecies = pokemon.getSpeciesForm().getRootSpeciesId(); + const starterValue: number = speciesStarterCosts[baseSpecies] ?? 1; + const multiplier = Math.max((MONEY_MAXIMUM_MULTIPLIER / 10) * starterValue, MONEY_MINIMUM_MULTIPLIER); + const price = globalScene.getWaveMoneyAmount(multiplier); - encounter.setDialogueToken("strongestPokemon", pokemon.getNameToRender()); - encounter.setDialogueToken("price", price.toString()); + encounter.setDialogueToken("strongestPokemon", pokemon.getNameToRender()); + encounter.setDialogueToken("price", price.toString()); - // Store pokemon and price - encounter.misc = { - pokemon: pokemon, - price: price - }; + // Store pokemon and price + encounter.misc = { + pokemon: pokemon, + price: price, + }; - // If player meets the combo OR requirements for option 2, populate the token - const opt2Req = encounter.options[1].primaryPokemonRequirements[0]; - if (opt2Req.meetsRequirement()) { - const abilityToken = encounter.dialogueTokens["option2PrimaryAbility"]; - const moveToken = encounter.dialogueTokens["option2PrimaryMove"]; - if (abilityToken) { - encounter.setDialogueToken("moveOrAbility", abilityToken); - } else if (moveToken) { - encounter.setDialogueToken("moveOrAbility", moveToken); - } + // If player meets the combo OR requirements for option 2, populate the token + const opt2Req = encounter.options[1].primaryPokemonRequirements[0]; + if (opt2Req.meetsRequirement()) { + const abilityToken = encounter.dialogueTokens["option2PrimaryAbility"]; + const moveToken = encounter.dialogueTokens["option2PrimaryMove"]; + if (abilityToken) { + encounter.setDialogueToken("moveOrAbility", abilityToken); + } else if (moveToken) { + encounter.setDialogueToken("moveOrAbility", moveToken); } + } - const shinyCharm = generateModifierType(modifierTypes.SHINY_CHARM); - encounter.setDialogueToken("itemName", shinyCharm?.name ?? i18next.t("modifierType:ModifierType.SHINY_CHARM.name")); - encounter.setDialogueToken("liepardName", getPokemonSpecies(Species.LIEPARD).getName()); + const shinyCharm = generateModifierType(modifierTypes.SHINY_CHARM); + encounter.setDialogueToken("itemName", shinyCharm?.name ?? i18next.t("modifierType:ModifierType.SHINY_CHARM.name")); + encounter.setDialogueToken("liepardName", getPokemonSpecies(Species.LIEPARD).getName()); - return true; - }) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected`, - speaker: `${namespace}:speaker`, - }, - ], - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Update money and remove pokemon from party - updatePlayerMoney(encounter.misc.price); - globalScene.removePokemonFromPlayerParty(encounter.misc.pokemon); - return true; - }) - .withOptionPhase(async () => { - // Give the player a Shiny Charm - globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.SHINY_CHARM)); - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) - .withPrimaryPokemonRequirement( - CombinationPokemonRequirement.Some( - new MoveRequirement(EXTORTION_MOVES, true), - new AbilityRequirement(EXTORTION_ABILITIES, true) - ) - ) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - disabledButtonTooltip: `${namespace}:option.2.tooltip_disabled`, - selected: [ - { - speaker: `${namespace}:speaker`, - text: `${namespace}:option.2.selected`, - }, - ], - }) - .withOptionPhase(async () => { - // Extort the rich kid for money - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Update money and remove pokemon from party - updatePlayerMoney(encounter.misc.price); - - setEncounterExp(encounter.options[1].primaryPokemon!.id, getPokemonSpecies(Species.LIEPARD).baseExp, true); - - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + speaker: `${namespace}:speaker`, + }, + ], + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Update money and remove pokemon from party + updatePlayerMoney(encounter.misc.price); + globalScene.removePokemonFromPlayerParty(encounter.misc.pokemon); + return true; + }) + .withOptionPhase(async () => { + // Give the player a Shiny Charm + globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.SHINY_CHARM)); + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + .withPrimaryPokemonRequirement( + CombinationPokemonRequirement.Some( + new MoveRequirement(EXTORTION_MOVES, true), + new AbilityRequirement(EXTORTION_ABILITIES, true), + ), + ) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + disabledButtonTooltip: `${namespace}:option.2.tooltip_disabled`, selected: [ { speaker: `${namespace}:speaker`, - text: `${namespace}:option.3.selected`, + text: `${namespace}:option.2.selected`, }, ], - }, - async () => { - // Leave encounter with no rewards or exp + }) + .withOptionPhase(async () => { + // Extort the rich kid for money + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Update money and remove pokemon from party + updatePlayerMoney(encounter.misc.price); + + setEncounterExp(encounter.options[1].primaryPokemon!.id, getPokemonSpecies(Species.LIEPARD).baseExp, true); + leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + selected: [ + { + speaker: `${namespace}:speaker`, + text: `${namespace}:option.3.selected`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); diff --git a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts index 550d9bd4f13..94e27e32773 100644 --- a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts +++ b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts @@ -1,6 +1,5 @@ import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import type { - EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { generateModifierType, generateModifierTypeOption, @@ -8,18 +7,12 @@ import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, - setEncounterRewards + setEncounterRewards, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import type { PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; -import type { - BerryModifierType, - ModifierTypeOption } from "#app/modifier/modifier-type"; -import { - ModifierPoolType, - modifierTypes, - regenerateModifierPoolThresholds, -} from "#app/modifier/modifier-type"; +import type { BerryModifierType, ModifierTypeOption } from "#app/modifier/modifier-type"; +import { ModifierPoolType, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; import { randSeedInt } from "#app/utils"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; @@ -30,7 +23,13 @@ import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-enco import { getPokemonNameWithAffix } from "#app/messages"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { applyModifierTypeToPlayerPokemon, getEncounterPokemonLevelForWave, getHighestStatPlayerPokemon, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + applyModifierTypeToPlayerPokemon, + getEncounterPokemonLevelForWave, + getHighestStatPlayerPokemon, + getSpriteKeysFromPokemon, + STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import PokemonData from "#app/system/pokemon-data"; import { BerryModifier } from "#app/modifier/modifier"; import i18next from "#app/plugins/i18n"; @@ -47,107 +46,150 @@ const namespace = "mysteryEncounters/berriesAbound"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3810 | GitHub Issue #3810} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const BerriesAboundEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.BERRIES_ABOUND) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withCatchAllowed(true) - .withHideWildIntroMessage(true) - .withFleeAllowed(false) - .withIntroSpriteConfigs([]) // Set in onInit() - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - ]) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; +export const BerriesAboundEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.BERRIES_ABOUND, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withCatchAllowed(true) + .withHideWildIntroMessage(true) + .withFleeAllowed(false) + .withIntroSpriteConfigs([]) // Set in onInit() + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; - // Calculate boss mon - const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - const bossPokemon = getRandomEncounterSpecies(level, true); - encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon)); - const config: EnemyPartyConfig = { - pokemonConfigs: [{ + // Calculate boss mon + const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); + const bossPokemon = getRandomEncounterSpecies(level, true); + encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon)); + const config: EnemyPartyConfig = { + pokemonConfigs: [ + { level: level, species: bossPokemon.species, dataSource: new PokemonData(bossPokemon), - isBoss: true - }], - }; - encounter.enemyPartyConfigs = [ config ]; - - // Calculate the number of extra berries that player receives - // 10-40: 2, 40-120: 4, 120-160: 5, 160-180: 7 - const numBerries = - globalScene.currentBattle.waveIndex > 160 ? 7 - : globalScene.currentBattle.waveIndex > 120 ? 5 - : globalScene.currentBattle.waveIndex > 40 ? 4 : 2; - regenerateModifierPoolThresholds(globalScene.getPlayerParty(), ModifierPoolType.PLAYER, 0); - encounter.misc = { numBerries }; - - const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon); - encounter.spriteConfigs = [ - { - spriteKey: "berries_abound_bush", - fileRoot: "mystery-encounters", - x: 25, - y: -6, - yShadow: -7, - disableAnimation: true, - hasShadow: true + isBoss: true, }, - { - spriteKey: spriteKey, - fileRoot: fileRoot, - hasShadow: true, - tint: 0.25, - x: -5, - repeat: true, - isPokemon: true, - isShiny: bossPokemon.shiny, - variant: bossPokemon.variant - } - ]; + ], + }; + encounter.enemyPartyConfigs = [config]; - // Get fastest party pokemon for option 2 - const fastestPokemon = getHighestStatPlayerPokemon(PERMANENT_STATS[Stat.SPD], true, false); - encounter.misc.fastestPokemon = fastestPokemon; - encounter.misc.enemySpeed = bossPokemon.getStat(Stat.SPD); - encounter.setDialogueToken("fastestPokemon", fastestPokemon.getNameToRender()); + // Calculate the number of extra berries that player receives + // 10-40: 2, 40-120: 4, 120-160: 5, 160-180: 7 + const numBerries = + globalScene.currentBattle.waveIndex > 160 + ? 7 + : globalScene.currentBattle.waveIndex > 120 + ? 5 + : globalScene.currentBattle.waveIndex > 40 + ? 4 + : 2; + regenerateModifierPoolThresholds(globalScene.getPlayerParty(), ModifierPoolType.PLAYER, 0); + encounter.misc = { numBerries }; - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withSimpleOption( + const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon); + encounter.spriteConfigs = [ { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected`, - }, - ], + spriteKey: "berries_abound_bush", + fileRoot: "mystery-encounters", + x: 25, + y: -6, + yShadow: -7, + disableAnimation: true, + hasShadow: true, }, - async () => { - // Pick battle + { + spriteKey: spriteKey, + fileRoot: fileRoot, + hasShadow: true, + tint: 0.25, + x: -5, + repeat: true, + isPokemon: true, + isShiny: bossPokemon.shiny, + variant: bossPokemon.variant, + }, + ]; + + // Get fastest party pokemon for option 2 + const fastestPokemon = getHighestStatPlayerPokemon(PERMANENT_STATS[Stat.SPD], true, false); + encounter.misc.fastestPokemon = fastestPokemon; + encounter.misc.enemySpeed = bossPokemon.getStat(Stat.SPD); + encounter.setDialogueToken("fastestPokemon", fastestPokemon.getNameToRender()); + + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + }, + ], + }, + async () => { + // Pick battle + const encounter = globalScene.currentBattle.mysteryEncounter!; + const numBerries = encounter.misc.numBerries; + + const doBerryRewards = () => { + const berryText = i18next.t(`${namespace}:berries`); + + globalScene.playSound("item_fanfare"); + queueEncounterMessage( + i18next.t("battle:rewardGainCount", { + modifierName: berryText, + count: numBerries, + }), + ); + + // Generate a random berry and give it to the first Pokemon with room for it + for (let i = 0; i < numBerries; i++) { + tryGiveBerry(); + } + }; + + const shopOptions: ModifierTypeOption[] = []; + for (let i = 0; i < 5; i++) { + // Generate shop berries + const mod = generateModifierTypeOption(modifierTypes.BERRY); + if (mod) { + shopOptions.push(mod); + } + } + + setEncounterRewards( + { guaranteedModifierTypeOptions: shopOptions, fillRemaining: false }, + undefined, + doBerryRewards, + ); + await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]); + }, + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + }) + .withOptionPhase(async () => { + // Pick race for berries const encounter = globalScene.currentBattle.mysteryEncounter!; - const numBerries = encounter.misc.numBerries; - - const doBerryRewards = () => { - const berryText = i18next.t(`${namespace}:berries`); - - globalScene.playSound("item_fanfare"); - queueEncounterMessage(i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerries })); - - // Generate a random berry and give it to the first Pokemon with room for it - for (let i = 0; i < numBerries; i++) { - tryGiveBerry(); - } - }; + const fastestPokemon: PlayerPokemon = encounter.misc.fastestPokemon; + const enemySpeed: number = encounter.misc.enemySpeed; + const speedDiff = fastestPokemon.getStat(Stat.SPD) / (enemySpeed * 1.1); + const numBerries: number = encounter.misc.numBerries; const shopOptions: ModifierTypeOption[] = []; for (let i = 0; i < 5; i++) { @@ -158,115 +200,126 @@ export const BerriesAboundEncounter: MysteryEncounter = } } - setEncounterRewards({ guaranteedModifierTypeOptions: shopOptions, fillRemaining: false }, undefined, doBerryRewards); - await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]); - } - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip` - }) - .withOptionPhase(async () => { - // Pick race for berries - const encounter = globalScene.currentBattle.mysteryEncounter!; - const fastestPokemon: PlayerPokemon = encounter.misc.fastestPokemon; - const enemySpeed: number = encounter.misc.enemySpeed; - const speedDiff = fastestPokemon.getStat(Stat.SPD) / (enemySpeed * 1.1); - const numBerries: number = encounter.misc.numBerries; + if (speedDiff < 1) { + // Caught and attacked by boss, gets +1 to all stats at start of fight + const doBerryRewards = () => { + const berryText = i18next.t(`${namespace}:berries`); - const shopOptions: ModifierTypeOption[] = []; - for (let i = 0; i < 5; i++) { - // Generate shop berries - const mod = generateModifierTypeOption(modifierTypes.BERRY); - if (mod) { - shopOptions.push(mod); + globalScene.playSound("item_fanfare"); + queueEncounterMessage( + i18next.t("battle:rewardGainCount", { + modifierName: berryText, + count: numBerries, + }), + ); + + // Generate a random berry and give it to the first Pokemon with room for it + for (let i = 0; i < numBerries; i++) { + tryGiveBerry(); } + }; + + // Defense/Spd buffs below wave 50, +1 to all stats otherwise + const statChangesForBattle: ( + | Stat.ATK + | Stat.DEF + | Stat.SPATK + | Stat.SPDEF + | Stat.SPD + | Stat.ACC + | Stat.EVA + )[] = + globalScene.currentBattle.waveIndex < 50 + ? [Stat.DEF, Stat.SPDEF, Stat.SPD] + : [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD]; + + const config = globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]; + config.pokemonConfigs![0].tags = [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON]; + config.pokemonConfigs![0].mysteryEncounterBattleEffects = (pokemon: Pokemon) => { + queueEncounterMessage(`${namespace}:option.2.boss_enraged`); + globalScene.unshiftPhase( + new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1), + ); + }; + setEncounterRewards( + { + guaranteedModifierTypeOptions: shopOptions, + fillRemaining: false, + }, + undefined, + doBerryRewards, + ); + await showEncounterText(`${namespace}:option.2.selected_bad`); + await initBattleWithEnemyConfig(config); + return; + } + // Gains 1 berry for every 10% faster the player's pokemon is than the enemy, up to a max of numBerries, minimum of 2 + const numBerriesGrabbed = Math.max(Math.min(Math.round((speedDiff - 1) / 0.08), numBerries), 2); + encounter.setDialogueToken("numBerries", String(numBerriesGrabbed)); + const doFasterBerryRewards = () => { + const berryText = i18next.t(`${namespace}:berries`); + + globalScene.playSound("item_fanfare"); + queueEncounterMessage( + i18next.t("battle:rewardGainCount", { + modifierName: berryText, + count: numBerriesGrabbed, + }), + ); + + // Generate a random berry and give it to the first Pokemon with room for it (trying to give to fastest first) + for (let i = 0; i < numBerriesGrabbed; i++) { + tryGiveBerry(fastestPokemon); } + }; - if (speedDiff < 1) { - // Caught and attacked by boss, gets +1 to all stats at start of fight - const doBerryRewards = () => { - const berryText = i18next.t(`${namespace}:berries`); - - globalScene.playSound("item_fanfare"); - queueEncounterMessage(i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerries })); - - // Generate a random berry and give it to the first Pokemon with room for it - for (let i = 0; i < numBerries; i++) { - tryGiveBerry(); - } - }; - - // Defense/Spd buffs below wave 50, +1 to all stats otherwise - const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = globalScene.currentBattle.waveIndex < 50 ? - [ Stat.DEF, Stat.SPDEF, Stat.SPD ] : - [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ]; - - const config = globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]; - config.pokemonConfigs![0].tags = [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ]; - config.pokemonConfigs![0].mysteryEncounterBattleEffects = (pokemon: Pokemon) => { - queueEncounterMessage(`${namespace}:option.2.boss_enraged`); - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1)); - }; - setEncounterRewards({ guaranteedModifierTypeOptions: shopOptions, fillRemaining: false }, undefined, doBerryRewards); - await showEncounterText(`${namespace}:option.2.selected_bad`); - await initBattleWithEnemyConfig(config); - return; - } else { - // Gains 1 berry for every 10% faster the player's pokemon is than the enemy, up to a max of numBerries, minimum of 2 - const numBerriesGrabbed = Math.max(Math.min(Math.round((speedDiff - 1) / 0.08), numBerries), 2); - encounter.setDialogueToken("numBerries", String(numBerriesGrabbed)); - const doFasterBerryRewards = () => { - const berryText = i18next.t(`${namespace}:berries`); - - globalScene.playSound("item_fanfare"); - queueEncounterMessage(i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerriesGrabbed })); - - // Generate a random berry and give it to the first Pokemon with room for it (trying to give to fastest first) - for (let i = 0; i < numBerriesGrabbed; i++) { - tryGiveBerry(fastestPokemon); - } - }; - - setEncounterExp(fastestPokemon.id, encounter.enemyPartyConfigs[0].pokemonConfigs![0].species.baseExp); - setEncounterRewards({ guaranteedModifierTypeOptions: shopOptions, fillRemaining: false }, undefined, doFasterBerryRewards); - await showEncounterText(`${namespace}:option.2.selected`); - leaveEncounterWithoutBattle(); - } - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - selected: [ + setEncounterExp(fastestPokemon.id, encounter.enemyPartyConfigs[0].pokemonConfigs![0].species.baseExp); + setEncounterRewards( { - text: `${namespace}:option.3.selected`, + guaranteedModifierTypeOptions: shopOptions, + fillRemaining: false, }, - ], - }, - async () => { - // Leave encounter with no rewards or exp - leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + undefined, + doFasterBerryRewards, + ); + await showEncounterText(`${namespace}:option.2.selected`); + leaveEncounterWithoutBattle(); + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + selected: [ + { + text: `${namespace}:option.3.selected`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); function tryGiveBerry(prioritizedPokemon?: PlayerPokemon) { - const berryType = randSeedInt(Object.keys(BerryType).filter(s => !isNaN(Number(s))).length) as BerryType; - const berry = generateModifierType(modifierTypes.BERRY, [ berryType ]) as BerryModifierType; + const berryType = randSeedInt(Object.keys(BerryType).filter(s => !Number.isNaN(Number(s))).length) as BerryType; + const berry = generateModifierType(modifierTypes.BERRY, [berryType]) as BerryModifierType; const party = globalScene.getPlayerParty(); // Will try to apply to prioritized pokemon first, then do normal application method if it fails if (prioritizedPokemon) { - const heldBerriesOfType = globalScene.findModifier(m => m instanceof BerryModifier - && m.pokemonId === prioritizedPokemon.id && (m as BerryModifier).berryType === berryType, true) as BerryModifier; + const heldBerriesOfType = globalScene.findModifier( + m => + m instanceof BerryModifier && + m.pokemonId === prioritizedPokemon.id && + (m as BerryModifier).berryType === berryType, + true, + ) as BerryModifier; if (!heldBerriesOfType || heldBerriesOfType.getStackCount() < heldBerriesOfType.getMaxStackCount()) { applyModifierTypeToPlayerPokemon(prioritizedPokemon, berry); @@ -276,8 +329,10 @@ function tryGiveBerry(prioritizedPokemon?: PlayerPokemon) { // Iterate over the party until berry was successfully given for (const pokemon of party) { - const heldBerriesOfType = globalScene.findModifier(m => m instanceof BerryModifier - && m.pokemonId === pokemon.id && (m as BerryModifier).berryType === berryType, true) as BerryModifier; + const heldBerriesOfType = globalScene.findModifier( + m => m instanceof BerryModifier && m.pokemonId === pokemon.id && (m as BerryModifier).berryType === berryType, + true, + ) as BerryModifier; if (!heldBerriesOfType || heldBerriesOfType.getStackCount() < heldBerriesOfType.getMaxStackCount()) { applyModifierTypeToPlayerPokemon(pokemon, berry); diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts index 209cc7a7ec5..15cba1fa103 100644 --- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts +++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts @@ -1,5 +1,4 @@ -import type { - EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { generateModifierType, generateModifierTypeOption, @@ -39,24 +38,22 @@ import { AttackTypeBoosterHeldItemTypeRequirement, CombinationPokemonRequirement, HeldItemRequirement, - TypeRequirement + TypeRequirement, } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import type { AttackTypeBoosterModifierType, ModifierTypeOption } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; -import type { - PokemonHeldItemModifier -} from "#app/modifier/modifier"; +import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; import { AttackTypeBoosterModifier, BypassSpeedChanceModifier, ContactHeldItemTransferChanceModifier, GigantamaxAccessModifier, - MegaEvolutionAccessModifier + MegaEvolutionAccessModifier, } from "#app/modifier/modifier"; import i18next from "i18next"; import MoveInfoOverlay from "#app/ui/move-info-overlay"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; @@ -87,7 +84,7 @@ const POOL_1_POKEMON = [ Species.CHARJABUG, Species.RIBOMBEE, Species.SPIDOPS, - Species.LOKIX + Species.LOKIX, ]; const POOL_2_POKEMON = [ @@ -116,26 +113,26 @@ const POOL_2_POKEMON = [ Species.KLEAVOR, ]; -const POOL_3_POKEMON: { species: Species, formIndex?: number }[] = [ +const POOL_3_POKEMON: { species: Species; formIndex?: number }[] = [ { species: Species.PINSIR, - formIndex: 1 + formIndex: 1, }, { species: Species.SCIZOR, - formIndex: 1 + formIndex: 1, }, { species: Species.HERACROSS, - formIndex: 1 + formIndex: 1, }, { species: Species.ORBEETLE, - formIndex: 1 + formIndex: 1, }, { species: Species.CENTISKORCH, - formIndex: 1 + formIndex: 1, }, { species: Species.DURANT, @@ -148,35 +145,19 @@ const POOL_3_POKEMON: { species: Species, formIndex?: number }[] = [ }, ]; -const POOL_4_POKEMON = [ - Species.GENESECT, - Species.SLITHER_WING, - Species.BUZZWOLE, - Species.PHEROMOSA -]; +const POOL_4_POKEMON = [Species.GENESECT, Species.SLITHER_WING, Species.BUZZWOLE, Species.PHEROMOSA]; const PHYSICAL_TUTOR_MOVES = [ Moves.MEGAHORN, Moves.X_SCISSOR, Moves.ATTACK_ORDER, Moves.PIN_MISSILE, - Moves.FIRST_IMPRESSION + Moves.FIRST_IMPRESSION, ]; -const SPECIAL_TUTOR_MOVES = [ - Moves.SILVER_WIND, - Moves.BUG_BUZZ, - Moves.SIGNAL_BEAM, - Moves.POLLEN_PUFF -]; +const SPECIAL_TUTOR_MOVES = [Moves.SILVER_WIND, Moves.BUG_BUZZ, Moves.SIGNAL_BEAM, Moves.POLLEN_PUFF]; -const STATUS_TUTOR_MOVES = [ - Moves.STRING_SHOT, - Moves.STICKY_WEB, - Moves.SILK_TRAP, - Moves.RAGE_POWDER, - Moves.HEAL_ORDER -]; +const STATUS_TUTOR_MOVES = [Moves.STRING_SHOT, Moves.STICKY_WEB, Moves.SILK_TRAP, Moves.RAGE_POWDER, Moves.HEAL_ORDER]; const MISC_TUTOR_MOVES = [ Moves.BUG_BITE, @@ -185,166 +166,172 @@ const MISC_TUTOR_MOVES = [ Moves.QUIVER_DANCE, Moves.TAIL_GLOW, Moves.INFESTATION, - Moves.U_TURN + Moves.U_TURN, ]; /** * Wave breakpoints that determine how strong to make the Bug-Type Superfan's team */ -const WAVE_LEVEL_BREAKPOINTS = [ 30, 50, 70, 100, 120, 140, 160 ]; +const WAVE_LEVEL_BREAKPOINTS = [30, 50, 70, 100, 120, 140, 160]; /** * Bug Type Superfan encounter. * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3820 | GitHub Issue #3820} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const BugTypeSuperfanEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.BUG_TYPE_SUPERFAN) - .withEncounterTier(MysteryEncounterTier.GREAT) - .withPrimaryPokemonRequirement( - CombinationPokemonRequirement.Some( - // Must have at least 1 Bug type on team, OR have a bug item somewhere on the team - new HeldItemRequirement([ "BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier" ], 1), - new AttackTypeBoosterHeldItemTypeRequirement(Type.BUG, 1), - new TypeRequirement(Type.BUG, false, 1) - ) - ) - .withMaxAllowedEncounters(1) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withIntroSpriteConfigs([]) // These are set in onInit() - .withAutoHideIntroVisuals(false) - .withIntroDialogue([ +export const BugTypeSuperfanEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.BUG_TYPE_SUPERFAN, +) + .withEncounterTier(MysteryEncounterTier.GREAT) + .withPrimaryPokemonRequirement( + CombinationPokemonRequirement.Some( + // Must have at least 1 Bug type on team, OR have a bug item somewhere on the team + new HeldItemRequirement(["BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier"], 1), + new AttackTypeBoosterHeldItemTypeRequirement(PokemonType.BUG, 1), + new TypeRequirement(PokemonType.BUG, false, 1), + ), + ) + .withMaxAllowedEncounters(1) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withIntroSpriteConfigs([]) // These are set in onInit() + .withAutoHideIntroVisuals(false) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + speaker: `${namespace}:speaker`, + text: `${namespace}:intro_dialogue`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Calculates what trainers are available for battle in the encounter + + // Bug type superfan trainer config + const config = getTrainerConfigForWave(globalScene.currentBattle.waveIndex); + const spriteKey = config.getSpriteKey(); + encounter.enemyPartyConfigs.push({ + trainerConfig: config, + female: true, + }); + + let beedrillKeys: { spriteKey: string; fileRoot: string }, butterfreeKeys: { spriteKey: string; fileRoot: string }; + if (globalScene.currentBattle.waveIndex < WAVE_LEVEL_BREAKPOINTS[3]) { + beedrillKeys = getSpriteKeysFromSpecies(Species.BEEDRILL, false); + butterfreeKeys = getSpriteKeysFromSpecies(Species.BUTTERFREE, false); + } else { + // Mega Beedrill/Gmax Butterfree + beedrillKeys = getSpriteKeysFromSpecies(Species.BEEDRILL, false, 1); + butterfreeKeys = getSpriteKeysFromSpecies(Species.BUTTERFREE, false, 1); + } + + encounter.spriteConfigs = [ { - text: `${namespace}:intro`, + spriteKey: beedrillKeys.spriteKey, + fileRoot: beedrillKeys.fileRoot, + hasShadow: true, + repeat: true, + isPokemon: true, + x: -30, + tint: 0.15, + y: -4, + yShadow: -4, }, { - speaker: `${namespace}:speaker`, - text: `${namespace}:intro_dialogue`, + spriteKey: butterfreeKeys.spriteKey, + fileRoot: butterfreeKeys.fileRoot, + hasShadow: true, + repeat: true, + isPokemon: true, + x: 30, + tint: 0.15, + y: -4, + yShadow: -4, }, - ]) - .withOnInit(() => { + { + spriteKey: spriteKey, + fileRoot: "trainer", + hasShadow: true, + x: 4, + y: 7, + yShadow: 7, + }, + ]; + + const requiredItems = [ + generateModifierType(modifierTypes.QUICK_CLAW), + generateModifierType(modifierTypes.GRIP_CLAW), + generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [PokemonType.BUG]), + ]; + + const requiredItemString = requiredItems.map(m => m?.name ?? "unknown").join("/"); + encounter.setDialogueToken("requiredBugItems", requiredItemString); + + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + speaker: `${namespace}:speaker`, + text: `${namespace}:option.1.selected`, + }, + ], + }, + async () => { + // Select battle the bug trainer const encounter = globalScene.currentBattle.mysteryEncounter!; - // Calculates what trainers are available for battle in the encounter + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; - // Bug type superfan trainer config - const config = getTrainerConfigForWave(globalScene.currentBattle.waveIndex); - const spriteKey = config.getSpriteKey(); - encounter.enemyPartyConfigs.push({ - trainerConfig: config, - female: true, - }); + // Init the moves available for tutor + const moveTutorOptions: PokemonMove[] = []; + moveTutorOptions.push(new PokemonMove(PHYSICAL_TUTOR_MOVES[randSeedInt(PHYSICAL_TUTOR_MOVES.length)])); + moveTutorOptions.push(new PokemonMove(SPECIAL_TUTOR_MOVES[randSeedInt(SPECIAL_TUTOR_MOVES.length)])); + moveTutorOptions.push(new PokemonMove(STATUS_TUTOR_MOVES[randSeedInt(STATUS_TUTOR_MOVES.length)])); + moveTutorOptions.push(new PokemonMove(MISC_TUTOR_MOVES[randSeedInt(MISC_TUTOR_MOVES.length)])); + encounter.misc = { + moveTutorOptions, + }; - let beedrillKeys: { spriteKey: string, fileRoot: string }, butterfreeKeys: { spriteKey: string, fileRoot: string }; - if (globalScene.currentBattle.waveIndex < WAVE_LEVEL_BREAKPOINTS[3]) { - beedrillKeys = getSpriteKeysFromSpecies(Species.BEEDRILL, false); - butterfreeKeys = getSpriteKeysFromSpecies(Species.BUTTERFREE, false); - } else { - // Mega Beedrill/Gmax Butterfree - beedrillKeys = getSpriteKeysFromSpecies(Species.BEEDRILL, false, 1); - butterfreeKeys = getSpriteKeysFromSpecies(Species.BUTTERFREE, false, 1); - } + // Assigns callback that teaches move before continuing to rewards + encounter.onRewards = doBugTypeMoveTutor; - encounter.spriteConfigs = [ - { - spriteKey: beedrillKeys.spriteKey, - fileRoot: beedrillKeys.fileRoot, - hasShadow: true, - repeat: true, - isPokemon: true, - x: -30, - tint: 0.15, - y: -4, - yShadow: -4 - }, - { - spriteKey: butterfreeKeys.spriteKey, - fileRoot: butterfreeKeys.fileRoot, - hasShadow: true, - repeat: true, - isPokemon: true, - x: 30, - tint: 0.15, - y: -4, - yShadow: -4 - }, - { - spriteKey: spriteKey, - fileRoot: "trainer", - hasShadow: true, - x: 4, - y: 7, - yShadow: 7 - }, - ]; - - const requiredItems = [ - generateModifierType(modifierTypes.QUICK_CLAW), - generateModifierType(modifierTypes.GRIP_CLAW), - generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.BUG ]), - ]; - - const requiredItemString = requiredItems.map(m => m?.name ?? "unknown").join("/"); - encounter.setDialogueToken("requiredBugItems", requiredItemString); - - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - speaker: `${namespace}:speaker`, - text: `${namespace}:option.1.selected`, - }, - ], - }, - async () => { - // Select battle the bug trainer - const encounter = globalScene.currentBattle.mysteryEncounter!; - const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; - - // Init the moves available for tutor - const moveTutorOptions: PokemonMove[] = []; - moveTutorOptions.push(new PokemonMove(PHYSICAL_TUTOR_MOVES[randSeedInt(PHYSICAL_TUTOR_MOVES.length)])); - moveTutorOptions.push(new PokemonMove(SPECIAL_TUTOR_MOVES[randSeedInt(SPECIAL_TUTOR_MOVES.length)])); - moveTutorOptions.push(new PokemonMove(STATUS_TUTOR_MOVES[randSeedInt(STATUS_TUTOR_MOVES.length)])); - moveTutorOptions.push(new PokemonMove(MISC_TUTOR_MOVES[randSeedInt(MISC_TUTOR_MOVES.length)])); - encounter.misc = { - moveTutorOptions - }; - - // Assigns callback that teaches move before continuing to rewards - encounter.onRewards = doBugTypeMoveTutor; - - setEncounterRewards({ fillRemaining: true }); - await transitionMysteryEncounterIntroVisuals(true, true); - await initBattleWithEnemyConfig(config); - } - ) - .withOption(MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) - .withPrimaryPokemonRequirement(new TypeRequirement(Type.BUG, false, 1)) // Must have 1 Bug type on team + setEncounterRewards({ fillRemaining: true }); + await transitionMysteryEncounterIntroVisuals(true, true); + await initBattleWithEnemyConfig(config); + }, + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + .withPrimaryPokemonRequirement(new TypeRequirement(PokemonType.BUG, false, 1)) // Must have 1 Bug type on team .withDialogue({ buttonLabel: `${namespace}:option.2.label`, buttonTooltip: `${namespace}:option.2.tooltip`, - disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip` + disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`, }) .withPreOptionPhase(async () => { // Player shows off their bug types const encounter = globalScene.currentBattle.mysteryEncounter!; // Player gets different rewards depending on the number of bug types they have - const numBugTypes = globalScene.getPlayerParty().filter(p => p.isOfType(Type.BUG, true)).length; - const numBugTypesText = i18next.t(`${namespace}:numBugTypes`, { count: numBugTypes }); + const numBugTypes = globalScene.getPlayerParty().filter(p => p.isOfType(PokemonType.BUG, true)).length; + const numBugTypesText = i18next.t(`${namespace}:numBugTypes`, { + count: numBugTypes, + }); encounter.setDialogueToken("numBugTypes", numBugTypesText); if (numBugTypes < 2) { - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.SUPER_LURE, modifierTypes.GREAT_BALL ], fillRemaining: false }); + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.SUPER_LURE, modifierTypes.GREAT_BALL], + fillRemaining: false, + }); encounter.selectedOption!.dialogue!.selected = [ { speaker: `${namespace}:speaker`, @@ -352,7 +339,10 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = }, ]; } else if (numBugTypes < 4) { - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.QUICK_CLAW, modifierTypes.MAX_LURE, modifierTypes.ULTRA_BALL ], fillRemaining: false }); + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.QUICK_CLAW, modifierTypes.MAX_LURE, modifierTypes.ULTRA_BALL], + fillRemaining: false, + }); encounter.selectedOption!.dialogue!.selected = [ { speaker: `${namespace}:speaker`, @@ -360,7 +350,10 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = }, ]; } else if (numBugTypes < 6) { - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.GRIP_CLAW, modifierTypes.MAX_LURE, modifierTypes.ROGUE_BALL ], fillRemaining: false }); + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.GRIP_CLAW, modifierTypes.MAX_LURE, modifierTypes.ROGUE_BALL], + fillRemaining: false, + }); encounter.selectedOption!.dialogue!.selected = [ { speaker: `${namespace}:speaker`, @@ -370,7 +363,7 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = } else { // If the player has any evolution/form change items that are valid for their party, // spawn one of those items in addition to Dynamax Band, Mega Band, and Master Ball - const modifierOptions: ModifierTypeOption[] = [ generateModifierTypeOption(modifierTypes.MASTER_BALL)! ]; + const modifierOptions: ModifierTypeOption[] = [generateModifierTypeOption(modifierTypes.MASTER_BALL)!]; const specialOptions: ModifierTypeOption[] = []; if (!globalScene.findModifier(m => m instanceof MegaEvolutionAccessModifier)) { @@ -399,7 +392,10 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = modifierOptions.push(specialOptions[randSeedInt(specialOptions.length)]); } - setEncounterRewards({ guaranteedModifierTypeOptions: modifierOptions, fillRemaining: false }); + setEncounterRewards({ + guaranteedModifierTypeOptions: modifierOptions, + fillRemaining: false, + }); encounter.selectedOption!.dialogue!.selected = [ { speaker: `${namespace}:speaker`, @@ -412,15 +408,16 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = // Player shows off their bug types leaveEncounterWithoutBattle(); }) - .build()) - .withOption(MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withPrimaryPokemonRequirement( CombinationPokemonRequirement.Some( // Meets one or both of the below reqs - new HeldItemRequirement([ "BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier" ], 1), - new AttackTypeBoosterHeldItemTypeRequirement(Type.BUG, 1) - ) + new HeldItemRequirement(["BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier"], 1), + new AttackTypeBoosterHeldItemTypeRequirement(PokemonType.BUG, 1), + ), ) .withDialogue({ buttonLabel: `${namespace}:option.3.label`, @@ -443,10 +440,13 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = const onPokemonSelected = (pokemon: PlayerPokemon) => { // Get Pokemon held items and filter for valid ones const validItems = pokemon.getHeldItems().filter(item => { - return (item instanceof BypassSpeedChanceModifier || - item instanceof ContactHeldItemTransferChanceModifier || - (item instanceof AttackTypeBoosterModifier && (item.type as AttackTypeBoosterModifierType).moveType === Type.BUG)) && - item.isTransferable; + return ( + (item instanceof BypassSpeedChanceModifier || + item instanceof ContactHeldItemTransferChanceModifier || + (item instanceof AttackTypeBoosterModifier && + (item.type as AttackTypeBoosterModifierType).moveType === PokemonType.BUG)) && + item.isTransferable + ); }); return validItems.map((modifier: PokemonHeldItemModifier) => { @@ -469,9 +469,12 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = const selectableFilter = (pokemon: Pokemon) => { // If pokemon has valid item, it can be selected const hasValidItem = pokemon.getHeldItems().some(item => { - return item instanceof BypassSpeedChanceModifier || + return ( + item instanceof BypassSpeedChanceModifier || item instanceof ContactHeldItemTransferChanceModifier || - (item instanceof AttackTypeBoosterModifier && (item.type as AttackTypeBoosterModifierType).moveType === Type.BUG); + (item instanceof AttackTypeBoosterModifier && + (item.type as AttackTypeBoosterModifierType).moveType === PokemonType.BUG) + ); }); if (!hasValidItem) { return getEncounterText(`${namespace}:option.3.invalid_selection`) ?? null; @@ -493,16 +496,21 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = const bugNet = generateModifierTypeOption(modifierTypes.MYSTERY_ENCOUNTER_GOLDEN_BUG_NET)!; bugNet.type.tier = ModifierTier.ROGUE; - setEncounterRewards({ guaranteedModifierTypeOptions: [ bugNet ], guaranteedModifierTypeFuncs: [ modifierTypes.REVIVER_SEED ], fillRemaining: false }); + setEncounterRewards({ + guaranteedModifierTypeOptions: [bugNet], + guaranteedModifierTypeFuncs: [modifierTypes.REVIVER_SEED], + fillRemaining: false, + }); leaveEncounterWithoutBattle(true); }) - .build()) - .withOutroDialogue([ - { - text: `${namespace}:outro`, - }, - ]) - .build(); + .build(), + ) + .withOutroDialogue([ + { + text: `${namespace}:outro`, + }, + ]) + .build(); function getTrainerConfigForWave(waveIndex: number) { // Bug type superfan trainer config @@ -516,134 +524,186 @@ function getTrainerConfigForWave(waveIndex: number) { if (waveIndex < WAVE_LEVEL_BREAKPOINTS[0]) { // Use default template (2 AVG) config - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true)); + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true)); } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[1]) { config .setPartyTemplates(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE)) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true)) .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_1_POKEMON, TrainerSlot.TRAINER, true)); } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[2]) { config .setPartyTemplates(new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE)) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true)) .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_1_POKEMON, TrainerSlot.TRAINER, true)) .setPartyMemberFunc(3, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true)); } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[3]) { config .setPartyTemplates(new TrainerPartyTemplate(5, PartyMemberStrength.AVERAGE)) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true)) .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_1_POKEMON, TrainerSlot.TRAINER, true)) .setPartyMemberFunc(3, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true)) .setPartyMemberFunc(4, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true)); } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[4]) { config .setPartyTemplates(new TrainerPartyTemplate(5, PartyMemberStrength.AVERAGE)) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; - p.generateAndPopulateMoveset(); - p.generateName(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; - p.generateAndPopulateMoveset(); - p.generateName(); - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(3, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ pool3Mon.species ], TrainerSlot.TRAINER, true, p => { - if (!isNullOrUndefined(pool3Mon.formIndex)) { - p.formIndex = pool3Mon.formIndex; + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; p.generateAndPopulateMoveset(); p.generateName(); - } - })); + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; + p.generateAndPopulateMoveset(); + p.generateName(); + }), + ) + .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(3, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true)) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([pool3Mon.species], TrainerSlot.TRAINER, true, p => { + if (!isNullOrUndefined(pool3Mon.formIndex)) { + p.formIndex = pool3Mon.formIndex; + p.generateAndPopulateMoveset(); + p.generateName(); + } + }), + ); } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[5]) { pool3Copy = randSeedShuffle(pool3Copy); const pool3Mon2 = pool3Copy.pop()!; config .setPartyTemplates(new TrainerPartyTemplate(5, PartyMemberStrength.AVERAGE)) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; - p.generateAndPopulateMoveset(); - p.generateName(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; - p.generateAndPopulateMoveset(); - p.generateName(); - })) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; + p.generateAndPopulateMoveset(); + p.generateName(); + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; + p.generateAndPopulateMoveset(); + p.generateName(); + }), + ) .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ pool3Mon.species ], TrainerSlot.TRAINER, true, p => { - if (!isNullOrUndefined(pool3Mon.formIndex)) { - p.formIndex = pool3Mon.formIndex; - p.generateAndPopulateMoveset(); - p.generateName(); - } - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ pool3Mon2.species ], TrainerSlot.TRAINER, true, p => { - if (!isNullOrUndefined(pool3Mon2.formIndex)) { - p.formIndex = pool3Mon2.formIndex; - p.generateAndPopulateMoveset(); - p.generateName(); - } - })); + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([pool3Mon.species], TrainerSlot.TRAINER, true, p => { + if (!isNullOrUndefined(pool3Mon.formIndex)) { + p.formIndex = pool3Mon.formIndex; + p.generateAndPopulateMoveset(); + p.generateName(); + } + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([pool3Mon2.species], TrainerSlot.TRAINER, true, p => { + if (!isNullOrUndefined(pool3Mon2.formIndex)) { + p.formIndex = pool3Mon2.formIndex; + p.generateAndPopulateMoveset(); + p.generateName(); + } + }), + ); } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[6]) { config - .setPartyTemplates(new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG))) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; - p.generateAndPopulateMoveset(); - p.generateName(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; - p.generateAndPopulateMoveset(); - p.generateName(); - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ pool3Mon.species ], TrainerSlot.TRAINER, true, p => { - if (!isNullOrUndefined(pool3Mon.formIndex)) { - p.formIndex = pool3Mon.formIndex; + .setPartyTemplates( + new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + ), + ) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; p.generateAndPopulateMoveset(); p.generateName(); - } - })) + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; + p.generateAndPopulateMoveset(); + p.generateName(); + }), + ) + .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true)) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([pool3Mon.species], TrainerSlot.TRAINER, true, p => { + if (!isNullOrUndefined(pool3Mon.formIndex)) { + p.formIndex = pool3Mon.formIndex; + p.generateAndPopulateMoveset(); + p.generateName(); + } + }), + ) .setPartyMemberFunc(4, getRandomPartyMemberFunc(POOL_4_POKEMON, TrainerSlot.TRAINER, true)); } else { pool3Copy = randSeedShuffle(pool3Copy); const pool3Mon2 = pool3Copy.pop()!; config - .setPartyTemplates(new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG))) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.formIndex = 1; - p.generateAndPopulateMoveset(); - p.generateName(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.formIndex = 1; - p.generateAndPopulateMoveset(); - p.generateName(); - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ pool3Mon.species ], TrainerSlot.TRAINER, true, p => { - if (!isNullOrUndefined(pool3Mon.formIndex)) { - p.formIndex = pool3Mon.formIndex; + .setPartyTemplates( + new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + ), + ) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.formIndex = 1; p.generateAndPopulateMoveset(); p.generateName(); - } - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ pool3Mon2.species ], TrainerSlot.TRAINER, true, p => { - if (!isNullOrUndefined(pool3Mon2.formIndex)) { - p.formIndex = pool3Mon2.formIndex; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.formIndex = 1; p.generateAndPopulateMoveset(); p.generateName(); - } - })) + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([pool3Mon.species], TrainerSlot.TRAINER, true, p => { + if (!isNullOrUndefined(pool3Mon.formIndex)) { + p.formIndex = pool3Mon.formIndex; + p.generateAndPopulateMoveset(); + p.generateName(); + } + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([pool3Mon2.species], TrainerSlot.TRAINER, true, p => { + if (!isNullOrUndefined(pool3Mon2.formIndex)) { + p.formIndex = pool3Mon2.formIndex; + p.generateAndPopulateMoveset(); + p.generateName(); + } + }), + ) .setPartyMemberFunc(4, getRandomPartyMemberFunc(POOL_4_POKEMON, TrainerSlot.TRAINER, true)); } @@ -651,6 +711,7 @@ function getTrainerConfigForWave(waveIndex: number) { } function doBugTypeMoveTutor(): Promise { + // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO explain return new Promise(async resolve => { const moveOptions = globalScene.currentBattle.mysteryEncounter!.misc.moveTutorOptions; await showEncounterDialogue(`${namespace}:battle_won`, `${namespace}:speaker`); @@ -663,7 +724,7 @@ function doBugTypeMoveTutor(): Promise { right: true, x: 1, y: -MoveInfoOverlay.getHeight(overlayScale, true) - 1, - width: (globalScene.game.canvas.width / 6) - 2, + width: globalScene.game.canvas.width / 6 - 2, }); globalScene.ui.add(moveInfoOverlay); @@ -688,7 +749,12 @@ function doBugTypeMoveTutor(): Promise { moveInfoOverlay.setVisible(false); }; - const result = await selectOptionThenPokemon(optionSelectItems, `${namespace}:teach_move_prompt`, undefined, onHoverOverCancel); + const result = await selectOptionThenPokemon( + optionSelectItems, + `${namespace}:teach_move_prompt`, + undefined, + onHoverOverCancel, + ); // let forceExit = !!result; if (!result) { moveInfoOverlay.active = false; @@ -699,7 +765,9 @@ function doBugTypeMoveTutor(): Promise { // Option select complete, handle if they are learning a move if (result && result.selectedOptionIndex < moveOptions.length) { - globalScene.unshiftPhase(new LearnMovePhase(result.selectedPokemonIndex, moveOptions[result.selectedOptionIndex].moveId)); + globalScene.unshiftPhase( + new LearnMovePhase(result.selectedPokemonIndex, moveOptions[result.selectedOptionIndex].moveId), + ); } // Complete battle and go to rewards diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts index e660b0b873c..2b499d938cd 100644 --- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts +++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts @@ -1,6 +1,14 @@ import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { trainerConfigs, TrainerPartyCompoundTemplate, TrainerPartyTemplate, } from "#app/data/trainer-config"; +import { + generateModifierType, + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + loadCustomMovesForEncounter, + selectPokemonForOption, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { trainerConfigs, TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#app/data/trainer-config"; import { ModifierTier } from "#app/modifier/modifier-tier"; import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { ModifierPoolType, modifierTypes } from "#app/modifier/modifier-type"; @@ -14,8 +22,11 @@ import { Species } from "#enums/species"; import { TrainerType } from "#enums/trainer-type"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { Abilities } from "#enums/abilities"; -import { applyAbilityOverrideToPokemon, applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { Type } from "#enums/type"; +import { + applyAbilityOverrideToPokemon, + applyModifierTypeToPlayerPokemon, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { PokemonType } from "#enums/pokemon-type"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { randSeedInt, randSeedShuffle } from "#app/utils"; @@ -31,7 +42,7 @@ import { BerryType } from "#enums/berry-type"; import { BattlerIndex } from "#app/battle"; import { Moves } from "#enums/moves"; import { EncounterBattleAnim } from "#app/data/battle-anims"; -import { MoveCategory } from "#app/data/move"; +import { MoveCategory } from "#enums/MoveCategory"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; import { EncounterAnim } from "#enums/encounter-anims"; @@ -55,7 +66,7 @@ const RANDOM_ABILITY_POOL = [ Abilities.MISTY_SURGE, Abilities.MAGICIAN, Abilities.SHEER_FORCE, - Abilities.PRANKSTER + Abilities.PRANKSTER, ]; /** @@ -63,340 +74,363 @@ const RANDOM_ABILITY_POOL = [ * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3807 | GitHub Issue #3807} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const ClowningAroundEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.CLOWNING_AROUND) - .withEncounterTier(MysteryEncounterTier.ULTRA) - .withDisallowedChallenges(Challenges.SINGLE_TYPE) - .withSceneWaveRangeRequirement(80, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) - .withAnimations(EncounterAnim.SMOKESCREEN) - .withAutoHideIntroVisuals(false) - .withIntroSpriteConfigs([ - { - spriteKey: Species.MR_MIME.toString(), - fileRoot: "pokemon", - hasShadow: true, - repeat: true, - x: -25, - tint: 0.3, - y: -3, - yShadow: -3 - }, - { - spriteKey: Species.BLACEPHALON.toString(), - fileRoot: "pokemon/exp", - hasShadow: true, - repeat: true, - x: 25, - tint: 0.3, - y: -3, - yShadow: -3 - }, - { - spriteKey: "harlequin", - fileRoot: "trainer", - hasShadow: true, - x: 0, - y: 2, - yShadow: 2 - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - { - text: `${namespace}:intro_dialogue`, - speaker: `${namespace}:speaker` - }, - ]) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; +export const ClowningAroundEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.CLOWNING_AROUND, +) + .withEncounterTier(MysteryEncounterTier.ULTRA) + .withDisallowedChallenges(Challenges.SINGLE_TYPE) + .withSceneWaveRangeRequirement(80, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) + .withAnimations(EncounterAnim.SMOKESCREEN) + .withAutoHideIntroVisuals(false) + .withIntroSpriteConfigs([ + { + spriteKey: Species.MR_MIME.toString(), + fileRoot: "pokemon", + hasShadow: true, + repeat: true, + x: -25, + tint: 0.3, + y: -3, + yShadow: -3, + }, + { + spriteKey: Species.BLACEPHALON.toString(), + fileRoot: "pokemon/exp", + hasShadow: true, + repeat: true, + x: 25, + tint: 0.3, + y: -3, + yShadow: -3, + }, + { + spriteKey: "harlequin", + fileRoot: "trainer", + hasShadow: true, + x: 0, + y: 2, + yShadow: 2, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + text: `${namespace}:intro_dialogue`, + speaker: `${namespace}:speaker`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; - const clownTrainerType = TrainerType.HARLEQUIN; - const clownConfig = trainerConfigs[clownTrainerType].clone(); - const clownPartyTemplate = new TrainerPartyCompoundTemplate( - new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), - new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)); - clownConfig.setPartyTemplates(clownPartyTemplate); - clownConfig.setDoubleOnly(); - // @ts-ignore - clownConfig.partyTemplateFunc = null; // Overrides party template func if it exists + const clownTrainerType = TrainerType.HARLEQUIN; + const clownConfig = trainerConfigs[clownTrainerType].clone(); + const clownPartyTemplate = new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), + ); + clownConfig.setPartyTemplates(clownPartyTemplate); + clownConfig.setDoubleOnly(); + // @ts-ignore + clownConfig.partyTemplateFunc = null; // Overrides party template func if it exists - // Generate random ability for Blacephalon from pool - const ability = RANDOM_ABILITY_POOL[randSeedInt(RANDOM_ABILITY_POOL.length)]; - encounter.setDialogueToken("ability", new Ability(ability, 3).name); - encounter.misc = { ability }; + // Generate random ability for Blacephalon from pool + const ability = RANDOM_ABILITY_POOL[randSeedInt(RANDOM_ABILITY_POOL.length)]; + encounter.setDialogueToken("ability", new Ability(ability, 3).name); + encounter.misc = { ability }; - // Decide the random types for Blacephalon. They should not be the same. - const firstType: number = randSeedInt(18); - let secondType: number = randSeedInt(17); - if ( secondType >= firstType ) { - secondType++; - } + // Decide the random types for Blacephalon. They should not be the same. + const firstType: number = randSeedInt(18); + let secondType: number = randSeedInt(17); + if (secondType >= firstType) { + secondType++; + } - encounter.enemyPartyConfigs.push({ - trainerConfig: clownConfig, - pokemonConfigs: [ // Overrides first 2 pokemon to be Mr. Mime and Blacephalon + encounter.enemyPartyConfigs.push({ + trainerConfig: clownConfig, + pokemonConfigs: [ + // Overrides first 2 pokemon to be Mr. Mime and Blacephalon + { + species: getPokemonSpecies(Species.MR_MIME), + isBoss: true, + moveSet: [Moves.TEETER_DANCE, Moves.ALLY_SWITCH, Moves.DAZZLING_GLEAM, Moves.PSYCHIC], + }, + { + // Blacephalon has the random ability from pool, and 2 entirely random types to fit with the theme of the encounter + species: getPokemonSpecies(Species.BLACEPHALON), + customPokemonData: new CustomPokemonData({ + ability: ability, + types: [firstType, secondType], + }), + isBoss: true, + moveSet: [Moves.TRICK, Moves.HYPNOSIS, Moves.SHADOW_BALL, Moves.MIND_BLOWN], + }, + ], + doubleBattle: true, + }); + + // Load animations/sfx for start of fight moves + loadCustomMovesForEncounter([Moves.ROLE_PLAY, Moves.TAUNT]); + + encounter.setDialogueToken("blacephalonName", getPokemonSpecies(Species.BLACEPHALON).getName()); + + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ { - species: getPokemonSpecies(Species.MR_MIME), - isBoss: true, - moveSet: [ Moves.TEETER_DANCE, Moves.ALLY_SWITCH, Moves.DAZZLING_GLEAM, Moves.PSYCHIC ] - }, - { // Blacephalon has the random ability from pool, and 2 entirely random types to fit with the theme of the encounter - species: getPokemonSpecies(Species.BLACEPHALON), - customPokemonData: new CustomPokemonData({ ability: ability, types: [ firstType, secondType ]}), - isBoss: true, - moveSet: [ Moves.TRICK, Moves.HYPNOSIS, Moves.SHADOW_BALL, Moves.MIND_BLOWN ] + text: `${namespace}:option.1.selected`, + speaker: `${namespace}:speaker`, }, ], - doubleBattle: true - }); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Spawn battle + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; - // Load animations/sfx for start of fight moves - loadCustomMovesForEncounter([ Moves.ROLE_PLAY, Moves.TAUNT ]); + setEncounterRewards({ fillRemaining: true }); - encounter.setDialogueToken("blacephalonName", getPokemonSpecies(Species.BLACEPHALON).getName()); + // TODO: when Magic Room and Wonder Room are implemented, add those to start of battle + encounter.startOfBattleEffects.push( + { + // Mr. Mime copies the Blacephalon's random ability + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [BattlerIndex.ENEMY_2], + move: new PokemonMove(Moves.ROLE_PLAY), + ignorePp: true, + }, + { + sourceBattlerIndex: BattlerIndex.ENEMY_2, + targets: [BattlerIndex.PLAYER], + move: new PokemonMove(Moves.TAUNT), + ignorePp: true, + }, + { + sourceBattlerIndex: BattlerIndex.ENEMY_2, + targets: [BattlerIndex.PLAYER_2], + move: new PokemonMove(Moves.TAUNT), + ignorePp: true, + }, + ); - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected`, - speaker: `${namespace}:speaker` - }, - ], - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Spawn battle - const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; + await transitionMysteryEncounterIntroVisuals(); + await initBattleWithEnemyConfig(config); + }) + .withPostOptionPhase(async (): Promise => { + // After the battle, offer the player the opportunity to permanently swap ability + const abilityWasSwapped = await handleSwapAbility(); + if (abilityWasSwapped) { + await showEncounterText(`${namespace}:option.1.ability_gained`); + } - setEncounterRewards({ fillRemaining: true }); + // Play animations once ability swap is complete + // Trainer sprite that is shown at end of battle is not the same as mystery encounter intro visuals + globalScene.tweens.add({ + targets: globalScene.currentBattle.trainer, + x: "+=16", + y: "-=16", + alpha: 0, + ease: "Sine.easeInOut", + duration: 250, + }); + const background = new EncounterBattleAnim( + EncounterAnim.SMOKESCREEN, + globalScene.getPlayerPokemon()!, + globalScene.getPlayerPokemon(), + ); + background.playWithoutTargets(230, 40, 2); + return true; + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + speaker: `${namespace}:speaker`, + }, + { + text: `${namespace}:option.2.selected_2`, + }, + { + text: `${namespace}:option.2.selected_3`, + speaker: `${namespace}:speaker`, + }, + ], + }) + .withPreOptionPhase(async () => { + // Swap player's items on pokemon with the most items + // Item comparisons look at whichever Pokemon has the greatest number of TRANSFERABLE, non-berry items + // So Vitamins, form change items, etc. are not included + const encounter = globalScene.currentBattle.mysteryEncounter!; - // TODO: when Magic Room and Wonder Room are implemented, add those to start of battle - encounter.startOfBattleEffects.push( - { // Mr. Mime copies the Blacephalon's random ability - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ BattlerIndex.ENEMY_2 ], - move: new PokemonMove(Moves.ROLE_PLAY), - ignorePp: true - }, - { - sourceBattlerIndex: BattlerIndex.ENEMY_2, - targets: [ BattlerIndex.PLAYER ], - move: new PokemonMove(Moves.TAUNT), - ignorePp: true - }, - { - sourceBattlerIndex: BattlerIndex.ENEMY_2, - targets: [ BattlerIndex.PLAYER_2 ], - move: new PokemonMove(Moves.TAUNT), - ignorePp: true - }); + const party = globalScene.getPlayerParty(); + let mostHeldItemsPokemon = party[0]; + let count = mostHeldItemsPokemon + .getHeldItems() + .filter(m => m.isTransferable && !(m instanceof BerryModifier)) + .reduce((v, m) => v + m.stackCount, 0); - await transitionMysteryEncounterIntroVisuals(); - await initBattleWithEnemyConfig(config); - }) - .withPostOptionPhase(async (): Promise => { - // After the battle, offer the player the opportunity to permanently swap ability - const abilityWasSwapped = await handleSwapAbility(); - if (abilityWasSwapped) { - await showEncounterText(`${namespace}:option.1.ability_gained`); - } - - // Play animations once ability swap is complete - // Trainer sprite that is shown at end of battle is not the same as mystery encounter intro visuals - globalScene.tweens.add({ - targets: globalScene.currentBattle.trainer, - x: "+=16", - y: "-=16", - alpha: 0, - ease: "Sine.easeInOut", - duration: 250 - }); - const background = new EncounterBattleAnim(EncounterAnim.SMOKESCREEN, globalScene.getPlayerPokemon()!, globalScene.getPlayerPokemon()); - background.playWithoutTargets(230, 40, 2); - return true; - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - speaker: `${namespace}:speaker` - }, - { - text: `${namespace}:option.2.selected_2`, - }, - { - text: `${namespace}:option.2.selected_3`, - speaker: `${namespace}:speaker` - }, - ], - }) - .withPreOptionPhase(async () => { - // Swap player's items on pokemon with the most items - // Item comparisons look at whichever Pokemon has the greatest number of TRANSFERABLE, non-berry items - // So Vitamins, form change items, etc. are not included - const encounter = globalScene.currentBattle.mysteryEncounter!; - - const party = globalScene.getPlayerParty(); - let mostHeldItemsPokemon = party[0]; - let count = mostHeldItemsPokemon.getHeldItems() + for (const pokemon of party) { + const nextCount = pokemon + .getHeldItems() .filter(m => m.isTransferable && !(m instanceof BerryModifier)) .reduce((v, m) => v + m.stackCount, 0); + if (nextCount > count) { + mostHeldItemsPokemon = pokemon; + count = nextCount; + } + } - party.forEach(pokemon => { - const nextCount = pokemon.getHeldItems() - .filter(m => m.isTransferable && !(m instanceof BerryModifier)) - .reduce((v, m) => v + m.stackCount, 0); - if (nextCount > count) { - mostHeldItemsPokemon = pokemon; - count = nextCount; - } - }); + encounter.setDialogueToken("switchPokemon", mostHeldItemsPokemon.getNameToRender()); - encounter.setDialogueToken("switchPokemon", mostHeldItemsPokemon.getNameToRender()); + const items = mostHeldItemsPokemon.getHeldItems(); - const items = mostHeldItemsPokemon.getHeldItems(); + // Shuffles Berries (if they have any) + let numBerries = 0; + for (const m of items.filter(m => m instanceof BerryModifier)) { + numBerries += m.stackCount; + globalScene.removeModifier(m); + } - // Shuffles Berries (if they have any) - let numBerries = 0; - items.filter(m => m instanceof BerryModifier) - .forEach(m => { - numBerries += m.stackCount; - globalScene.removeModifier(m); - }); + generateItemsOfTier(mostHeldItemsPokemon, numBerries, "Berries"); - generateItemsOfTier(mostHeldItemsPokemon, numBerries, "Berries"); + // Shuffle Transferable held items in the same tier (only shuffles Ultra and Rogue atm) + // For the purpose of this ME, Soothe Bells and Lucky Eggs are counted as Ultra tier + // And Golden Eggs as Rogue tier + let numUltra = 0; + let numRogue = 0; - // Shuffle Transferable held items in the same tier (only shuffles Ultra and Rogue atm) - // For the purpose of this ME, Soothe Bells and Lucky Eggs are counted as Ultra tier - // And Golden Eggs as Rogue tier - let numUltra = 0; - let numRogue = 0; - items.filter(m => m.isTransferable && !(m instanceof BerryModifier)) - .forEach(m => { - const type = m.type.withTierFromPool(ModifierPoolType.PLAYER, party); - const tier = type.tier ?? ModifierTier.ULTRA; - if (type.id === "GOLDEN_EGG" || tier === ModifierTier.ROGUE) { - numRogue += m.stackCount; - globalScene.removeModifier(m); - } else if (type.id === "LUCKY_EGG" || type.id === "SOOTHE_BELL" || tier === ModifierTier.ULTRA) { - numUltra += m.stackCount; - globalScene.removeModifier(m); - } - }); + for (const m of items.filter(m => m.isTransferable && !(m instanceof BerryModifier))) { + const type = m.type.withTierFromPool(ModifierPoolType.PLAYER, party); + const tier = type.tier ?? ModifierTier.ULTRA; + if (type.id === "GOLDEN_EGG" || tier === ModifierTier.ROGUE) { + numRogue += m.stackCount; + globalScene.removeModifier(m); + } else if (type.id === "LUCKY_EGG" || type.id === "SOOTHE_BELL" || tier === ModifierTier.ULTRA) { + numUltra += m.stackCount; + globalScene.removeModifier(m); + } + } - generateItemsOfTier(mostHeldItemsPokemon, numUltra, ModifierTier.ULTRA); - generateItemsOfTier(mostHeldItemsPokemon, numRogue, ModifierTier.ROGUE); - }) - .withOptionPhase(async () => { - leaveEncounterWithoutBattle(true); - }) - .withPostOptionPhase(async () => { - // Play animations - const background = new EncounterBattleAnim(EncounterAnim.SMOKESCREEN, globalScene.getPlayerPokemon()!, globalScene.getPlayerPokemon()); - background.playWithoutTargets(230, 40, 2); - await transitionMysteryEncounterIntroVisuals(true, true, 200); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - selected: [ - { - text: `${namespace}:option.3.selected`, - speaker: `${namespace}:speaker` - }, - { - text: `${namespace}:option.3.selected_2`, - }, - { - text: `${namespace}:option.3.selected_3`, - speaker: `${namespace}:speaker` - }, - ], - }) - .withPreOptionPhase(async () => { - // Randomize the second type of all player's pokemon - // If the pokemon does not normally have a second type, it will gain 1 - for (const pokemon of globalScene.getPlayerParty()) { - const originalTypes = pokemon.getTypes(false, false, true); + generateItemsOfTier(mostHeldItemsPokemon, numUltra, ModifierTier.ULTRA); + generateItemsOfTier(mostHeldItemsPokemon, numRogue, ModifierTier.ROGUE); + }) + .withOptionPhase(async () => { + leaveEncounterWithoutBattle(true); + }) + .withPostOptionPhase(async () => { + // Play animations + const background = new EncounterBattleAnim( + EncounterAnim.SMOKESCREEN, + globalScene.getPlayerPokemon()!, + globalScene.getPlayerPokemon(), + ); + background.playWithoutTargets(230, 40, 2); + await transitionMysteryEncounterIntroVisuals(true, true, 200); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + selected: [ + { + text: `${namespace}:option.3.selected`, + speaker: `${namespace}:speaker`, + }, + { + text: `${namespace}:option.3.selected_2`, + }, + { + text: `${namespace}:option.3.selected_3`, + speaker: `${namespace}:speaker`, + }, + ], + }) + .withPreOptionPhase(async () => { + // Randomize the second type of all player's pokemon + // If the pokemon does not normally have a second type, it will gain 1 + for (const pokemon of globalScene.getPlayerParty()) { + const originalTypes = pokemon.getTypes(false, false, true); - // If the Pokemon has non-status moves that don't match the Pokemon's type, prioritizes those as the new type - // Makes the "randomness" of the shuffle slightly less punishing - let priorityTypes = pokemon.moveset - .filter(move => move && !originalTypes.includes(move.getMove().type) && move.getMove().category !== MoveCategory.STATUS) - .map(move => move!.getMove().type); - if (priorityTypes?.length > 0) { - priorityTypes = [ ...new Set(priorityTypes) ].sort(); - priorityTypes = randSeedShuffle(priorityTypes); - } + // If the Pokemon has non-status moves that don't match the Pokemon's type, prioritizes those as the new type + // Makes the "randomness" of the shuffle slightly less punishing + let priorityTypes = pokemon.moveset + .filter( + move => + move && !originalTypes.includes(move.getMove().type) && move.getMove().category !== MoveCategory.STATUS, + ) + .map(move => move!.getMove().type); + if (priorityTypes?.length > 0) { + priorityTypes = [...new Set(priorityTypes)].sort(); + priorityTypes = randSeedShuffle(priorityTypes); + } - const newTypes = [ Type.UNKNOWN ]; - let secondType: Type | null = null; - while (secondType === null || secondType === newTypes[0] || originalTypes.includes(secondType)) { - if (priorityTypes.length > 0) { - secondType = priorityTypes.pop() ?? null; - } else { - secondType = randSeedInt(18) as Type; - } - } - newTypes.push(secondType); - - // Apply the type changes (to both base and fusion, if pokemon is fused) - if (!pokemon.customPokemonData) { - pokemon.customPokemonData = new CustomPokemonData(); - } - pokemon.customPokemonData.types = newTypes; - if (pokemon.isFusion()) { - if (!pokemon.fusionCustomPokemonData) { - pokemon.fusionCustomPokemonData = new CustomPokemonData(); - } - pokemon.fusionCustomPokemonData.types = newTypes; + const newTypes = [PokemonType.UNKNOWN]; + let secondType: PokemonType | null = null; + while (secondType === null || secondType === newTypes[0] || originalTypes.includes(secondType)) { + if (priorityTypes.length > 0) { + secondType = priorityTypes.pop() ?? null; + } else { + secondType = randSeedInt(18) as PokemonType; } } - }) - .withOptionPhase(async () => { - leaveEncounterWithoutBattle(true); - }) - .withPostOptionPhase(async () => { - // Play animations - const background = new EncounterBattleAnim(EncounterAnim.SMOKESCREEN, globalScene.getPlayerPokemon()!, globalScene.getPlayerPokemon()); - background.playWithoutTargets(230, 40, 2); - await transitionMysteryEncounterIntroVisuals(true, true, 200); - }) - .build() - ) - .withOutroDialogue([ - { - text: `${namespace}:outro`, - }, - ]) - .build(); + newTypes.push(secondType); + + // Apply the type changes (to both base and fusion, if pokemon is fused) + if (!pokemon.customPokemonData) { + pokemon.customPokemonData = new CustomPokemonData(); + } + pokemon.customPokemonData.types = newTypes; + if (pokemon.isFusion()) { + if (!pokemon.fusionCustomPokemonData) { + pokemon.fusionCustomPokemonData = new CustomPokemonData(); + } + pokemon.fusionCustomPokemonData.types = newTypes; + } + } + }) + .withOptionPhase(async () => { + leaveEncounterWithoutBattle(true); + }) + .withPostOptionPhase(async () => { + // Play animations + const background = new EncounterBattleAnim( + EncounterAnim.SMOKESCREEN, + globalScene.getPlayerPokemon()!, + globalScene.getPlayerPokemon(), + ); + background.playWithoutTargets(230, 40, 2); + await transitionMysteryEncounterIntroVisuals(true, true, 200); + }) + .build(), + ) + .withOutroDialogue([ + { + text: `${namespace}:outro`, + }, + ]) + .build(); async function handleSwapAbility() { + // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO: Consider refactoring to avoid async promise executor return new Promise(async resolve => { await showEncounterDialogue(`${namespace}:option.1.apply_ability_dialogue`, `${namespace}:speaker`); await showEncounterText(`${namespace}:option.1.apply_ability_message`); @@ -415,21 +449,21 @@ function displayYesNoOptions(resolve) { handler: () => { onYesAbilitySwap(resolve); return true; - } + }, }, { label: i18next.t("menu:no"), handler: () => { resolve(false); return true; - } - } + }, + }, ]; const config: OptionSelectConfig = { options: fullOptions, maxOptions: 7, - yOffset: 0 + yOffset: 0, }; globalScene.ui.setModeWithoutClear(Mode.OPTION_SELECT, config, null, true); } @@ -458,36 +492,36 @@ function generateItemsOfTier(pokemon: PlayerPokemon, numItems: number, tier: Mod // Pools have instances of the modifier type equal to the max stacks that modifier can be applied to any one pokemon // This is to prevent "over-generating" a random item of a certain type during item swaps const ultraPool = [ - [ modifierTypes.REVIVER_SEED, 1 ], - [ modifierTypes.GOLDEN_PUNCH, 5 ], - [ modifierTypes.ATTACK_TYPE_BOOSTER, 99 ], - [ modifierTypes.QUICK_CLAW, 3 ], - [ modifierTypes.WIDE_LENS, 3 ] + [modifierTypes.REVIVER_SEED, 1], + [modifierTypes.GOLDEN_PUNCH, 5], + [modifierTypes.ATTACK_TYPE_BOOSTER, 99], + [modifierTypes.QUICK_CLAW, 3], + [modifierTypes.WIDE_LENS, 3], ]; const roguePool = [ - [ modifierTypes.LEFTOVERS, 4 ], - [ modifierTypes.SHELL_BELL, 4 ], - [ modifierTypes.SOUL_DEW, 10 ], - [ modifierTypes.SCOPE_LENS, 1 ], - [ modifierTypes.BATON, 1 ], - [ modifierTypes.FOCUS_BAND, 5 ], - [ modifierTypes.KINGS_ROCK, 3 ], - [ modifierTypes.GRIP_CLAW, 5 ] + [modifierTypes.LEFTOVERS, 4], + [modifierTypes.SHELL_BELL, 4], + [modifierTypes.SOUL_DEW, 10], + [modifierTypes.SCOPE_LENS, 1], + [modifierTypes.BATON, 1], + [modifierTypes.FOCUS_BAND, 5], + [modifierTypes.KINGS_ROCK, 3], + [modifierTypes.GRIP_CLAW, 5], ]; const berryPool = [ - [ BerryType.APICOT, 3 ], - [ BerryType.ENIGMA, 2 ], - [ BerryType.GANLON, 3 ], - [ BerryType.LANSAT, 3 ], - [ BerryType.LEPPA, 2 ], - [ BerryType.LIECHI, 3 ], - [ BerryType.LUM, 2 ], - [ BerryType.PETAYA, 3 ], - [ BerryType.SALAC, 2 ], - [ BerryType.SITRUS, 2 ], - [ BerryType.STARF, 3 ] + [BerryType.APICOT, 3], + [BerryType.ENIGMA, 2], + [BerryType.GANLON, 3], + [BerryType.LANSAT, 3], + [BerryType.LEPPA, 2], + [BerryType.LIECHI, 3], + [BerryType.LUM, 2], + [BerryType.PETAYA, 3], + [BerryType.SALAC, 2], + [BerryType.SITRUS, 2], + [BerryType.STARF, 3], ]; let pool: any[]; @@ -506,7 +540,7 @@ function generateItemsOfTier(pokemon: PlayerPokemon, numItems: number, tier: Mod const newItemType = pool[randIndex]; let newMod: PokemonHeldItemModifierType; if (tier === "Berries") { - newMod = generateModifierType(modifierTypes.BERRY, [ newItemType[0] ]) as PokemonHeldItemModifierType; + newMod = generateModifierType(modifierTypes.BERRY, [newItemType[0]]) as PokemonHeldItemModifierType; } else { newMod = generateModifierType(newItemType[0]) as PokemonHeldItemModifierType; } diff --git a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts index 6dcac277525..91f168371cf 100644 --- a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts +++ b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts @@ -8,8 +8,17 @@ import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter- import { DANCING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; import { getEncounterText, queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { catchPokemon, getEncounterPokemonLevelForWave, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + selectPokemonForOption, + setEncounterRewards, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + catchPokemon, + getEncounterPokemonLevelForWave, + STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { TrainerSlot } from "#app/data/trainer-config"; import type { PlayerPokemon } from "#app/field/pokemon"; @@ -44,7 +53,7 @@ const BAILE_STYLE_BIOMES = [ Biome.WASTELAND, Biome.MOUNTAIN, Biome.BADLANDS, - Biome.DESERT + Biome.DESERT, ]; // Electric form @@ -55,7 +64,7 @@ const POM_POM_STYLE_BIOMES = [ Biome.LABORATORY, Biome.SLUM, Biome.METROPOLIS, - Biome.DOJO + Biome.DOJO, ]; // Psychic form @@ -66,7 +75,7 @@ const PAU_STYLE_BIOMES = [ Biome.PLAINS, Biome.GRASS, Biome.TALL_GRASS, - Biome.FOREST + Biome.FOREST, ]; // Ghost form @@ -77,7 +86,7 @@ const SENSU_STYLE_BIOMES = [ Biome.ABYSS, Biome.GRAVEYARD, Biome.LAKE, - Biome.TEMPLE + Biome.TEMPLE, ]; /** @@ -85,239 +94,259 @@ const SENSU_STYLE_BIOMES = [ * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3823 | GitHub Issue #3823} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const DancingLessonsEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DANCING_LESSONS) - .withEncounterTier(MysteryEncounterTier.GREAT) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withIntroSpriteConfigs([]) // Uses a real Pokemon sprite instead of ME Intro Visuals - .withAnimations(EncounterAnim.DANCE) - .withHideWildIntroMessage(true) - .withAutoHideIntroVisuals(false) - .withCatchAllowed(true) - .withFleeAllowed(false) - .withOnVisualsStart(() => { - const oricorio = globalScene.getEnemyPokemon()!; - const danceAnim = new EncounterBattleAnim(EncounterAnim.DANCE, oricorio, globalScene.getPlayerPokemon()!); - danceAnim.play(false, () => { - if (oricorio.shiny) { - oricorio.sparkle(); - } - }); - return true; - }) - .withIntroDialogue([ - { - text: `${namespace}:intro`, +export const DancingLessonsEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.DANCING_LESSONS, +) + .withEncounterTier(MysteryEncounterTier.GREAT) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withIntroSpriteConfigs([]) // Uses a real Pokemon sprite instead of ME Intro Visuals + .withAnimations(EncounterAnim.DANCE) + .withHideWildIntroMessage(true) + .withAutoHideIntroVisuals(false) + .withCatchAllowed(true) + .withFleeAllowed(false) + .withOnVisualsStart(() => { + const oricorio = globalScene.getEnemyPokemon()!; + const danceAnim = new EncounterBattleAnim(EncounterAnim.DANCE, oricorio, globalScene.getPlayerPokemon()!); + danceAnim.play(false, () => { + if (oricorio.shiny) { + oricorio.sparkle(); } - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; + }); + return true; + }) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; - const species = getPokemonSpecies(Species.ORICORIO); - const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - const enemyPokemon = new EnemyPokemon(species, level, TrainerSlot.NONE, false); - if (!enemyPokemon.moveset.some(m => m && m.getMove().id === Moves.REVELATION_DANCE)) { - if (enemyPokemon.moveset.length < 4) { - enemyPokemon.moveset.push(new PokemonMove(Moves.REVELATION_DANCE)); - } else { - enemyPokemon.moveset[0] = new PokemonMove(Moves.REVELATION_DANCE); - } - } - - // Set the form index based on the biome - // Defaults to Baile style if somehow nothing matches - const currentBiome = globalScene.arena.biomeType; - if (BAILE_STYLE_BIOMES.includes(currentBiome)) { - enemyPokemon.formIndex = 0; - } else if (POM_POM_STYLE_BIOMES.includes(currentBiome)) { - enemyPokemon.formIndex = 1; - } else if (PAU_STYLE_BIOMES.includes(currentBiome)) { - enemyPokemon.formIndex = 2; - } else if (SENSU_STYLE_BIOMES.includes(currentBiome)) { - enemyPokemon.formIndex = 3; + const species = getPokemonSpecies(Species.ORICORIO); + const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); + const enemyPokemon = new EnemyPokemon(species, level, TrainerSlot.NONE, false); + if (!enemyPokemon.moveset.some(m => m && m.getMove().id === Moves.REVELATION_DANCE)) { + if (enemyPokemon.moveset.length < 4) { + enemyPokemon.moveset.push(new PokemonMove(Moves.REVELATION_DANCE)); } else { - enemyPokemon.formIndex = 0; + enemyPokemon.moveset[0] = new PokemonMove(Moves.REVELATION_DANCE); } + } - const oricorioData = new PokemonData(enemyPokemon); - const oricorio = globalScene.addEnemyPokemon(species, level, TrainerSlot.NONE, false, false, oricorioData); + // Set the form index based on the biome + // Defaults to Baile style if somehow nothing matches + const currentBiome = globalScene.arena.biomeType; + if (BAILE_STYLE_BIOMES.includes(currentBiome)) { + enemyPokemon.formIndex = 0; + } else if (POM_POM_STYLE_BIOMES.includes(currentBiome)) { + enemyPokemon.formIndex = 1; + } else if (PAU_STYLE_BIOMES.includes(currentBiome)) { + enemyPokemon.formIndex = 2; + } else if (SENSU_STYLE_BIOMES.includes(currentBiome)) { + enemyPokemon.formIndex = 3; + } else { + enemyPokemon.formIndex = 0; + } - // Adds a real Pokemon sprite to the field (required for the animation) - globalScene.getEnemyParty().forEach(enemyPokemon => { - globalScene.field.remove(enemyPokemon, true); - }); - globalScene.currentBattle.enemyParty = [ oricorio ]; - globalScene.field.add(oricorio); - // Spawns on offscreen field - oricorio.x -= 300; - encounter.loadAssets.push(oricorio.loadAssets()); + const oricorioData = new PokemonData(enemyPokemon); + const oricorio = globalScene.addEnemyPokemon(species, level, TrainerSlot.NONE, false, false, oricorioData); - const config: EnemyPartyConfig = { - pokemonConfigs: [{ + // Adds a real Pokemon sprite to the field (required for the animation) + for (const enemyPokemon of globalScene.getEnemyParty()) { + enemyPokemon.leaveField(true, true, true); + } + globalScene.currentBattle.enemyParty = [oricorio]; + globalScene.field.add(oricorio); + // Spawns on offscreen field + oricorio.x -= 300; + encounter.loadAssets.push(oricorio.loadAssets()); + + const config: EnemyPartyConfig = { + pokemonConfigs: [ + { species: species, dataSource: oricorioData, isBoss: true, // Gets +1 to all stats except SPD on battle start - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], mysteryEncounterBattleEffects: (pokemon: Pokemon) => { queueEncounterMessage(`${namespace}:option.1.boss_enraged`); - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF ], 1)); + globalScene.unshiftPhase( + new StatStageChangePhase( + pokemon.getBattlerIndex(), + true, + [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF], + 1, + ), + ); + }, + }, + ], + }; + encounter.enemyPartyConfigs = [config]; + encounter.misc = { + oricorioData, + }; + + encounter.setDialogueToken("oricorioName", getPokemonSpecies(Species.ORICORIO).getName()); + + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + }, + ], + }) + .withOptionPhase(async () => { + // Pick battle + const encounter = globalScene.currentBattle.mysteryEncounter!; + + encounter.startOfBattleEffects.push({ + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [BattlerIndex.PLAYER], + move: new PokemonMove(Moves.REVELATION_DANCE), + ignorePp: true, + }); + + await hideOricorioPokemon(); + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.BATON], + fillRemaining: true, + }); + await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }) + .withPreOptionPhase(async () => { + // Learn its Dance + const encounter = globalScene.currentBattle.mysteryEncounter!; + + const onPokemonSelected = (pokemon: PlayerPokemon) => { + encounter.setDialogueToken("selectedPokemon", pokemon.getNameToRender()); + globalScene.unshiftPhase( + new LearnMovePhase(globalScene.getPlayerParty().indexOf(pokemon), Moves.REVELATION_DANCE), + ); + + // Play animation again to "learn" the dance + const danceAnim = new EncounterBattleAnim( + EncounterAnim.DANCE, + globalScene.getEnemyPokemon()!, + globalScene.getPlayerPokemon(), + ); + danceAnim.play(); + }; + + return selectPokemonForOption(onPokemonSelected); + }) + .withOptionPhase(async () => { + // Learn its Dance + await hideOricorioPokemon(); + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + .withPrimaryPokemonRequirement(new MoveRequirement(DANCING_MOVES, true)) // Will set option3PrimaryName and option3PrimaryMove dialogue tokens automatically + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, + secondOptionPrompt: `${namespace}:option.3.select_prompt`, + selected: [ + { + text: `${namespace}:option.3.selected`, + }, + ], + }) + .withPreOptionPhase(async () => { + // Open menu for selecting pokemon with a Dancing move + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Return the options for nature selection + return pokemon.moveset + .filter(move => move && DANCING_MOVES.includes(move.getMove().id)) + .map((move: PokemonMove) => { + const option: OptionSelectItem = { + label: move.getName(), + handler: () => { + // Pokemon and second option selected + encounter.setDialogueToken("selectedPokemon", pokemon.getNameToRender()); + encounter.setDialogueToken("selectedMove", move.getName()); + encounter.misc.selectedMove = move; + + return true; + }, + }; + return option; + }); + }; + + // Only challenge legal/unfainted Pokemon that have a Dancing move can be selected + const selectableFilter = (pokemon: Pokemon) => { + // If pokemon meets primary pokemon reqs, it can be selected + if (!pokemon.isAllowedInBattle()) { + return ( + i18next.t("partyUiHandler:cantBeUsed", { + pokemonName: pokemon.getNameToRender(), + }) ?? null + ); } - }], - }; - encounter.enemyPartyConfigs = [ config ]; - encounter.misc = { - oricorioData - }; - - encounter.setDialogueToken("oricorioName", getPokemonSpecies(Species.ORICORIO).getName()); - - return true; - }) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected`, - }, - ], - }) - .withOptionPhase(async () => { - // Pick battle - const encounter = globalScene.currentBattle.mysteryEncounter!; - - encounter.startOfBattleEffects.push({ - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ BattlerIndex.PLAYER ], - move: new PokemonMove(Moves.REVELATION_DANCE), - ignorePp: true - }); - - await hideOricorioPokemon(); - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.BATON ], fillRemaining: true }); - await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - }, - ], - }) - .withPreOptionPhase(async () => { - // Learn its Dance - const encounter = globalScene.currentBattle.mysteryEncounter!; - - const onPokemonSelected = (pokemon: PlayerPokemon) => { - encounter.setDialogueToken("selectedPokemon", pokemon.getNameToRender()); - globalScene.unshiftPhase(new LearnMovePhase(globalScene.getPlayerParty().indexOf(pokemon), Moves.REVELATION_DANCE)); - - // Play animation again to "learn" the dance - const danceAnim = new EncounterBattleAnim(EncounterAnim.DANCE, globalScene.getEnemyPokemon()!, globalScene.getPlayerPokemon()); - danceAnim.play(); - }; - - return selectPokemonForOption(onPokemonSelected); - }) - .withOptionPhase(async () => { - // Learn its Dance - await hideOricorioPokemon(); - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) - .withPrimaryPokemonRequirement(new MoveRequirement(DANCING_MOVES, true)) // Will set option3PrimaryName and option3PrimaryMove dialogue tokens automatically - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, - secondOptionPrompt: `${namespace}:option.3.select_prompt`, - selected: [ - { - text: `${namespace}:option.3.selected`, - }, - ], - }) - .withPreOptionPhase(async () => { - // Open menu for selecting pokemon with a Dancing move - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Return the options for nature selection - return pokemon.moveset - .filter(move => move && DANCING_MOVES.includes(move.getMove().id)) - .map((move: PokemonMove) => { - const option: OptionSelectItem = { - label: move.getName(), - handler: () => { - // Pokemon and second option selected - encounter.setDialogueToken("selectedPokemon", pokemon.getNameToRender()); - encounter.setDialogueToken("selectedMove", move.getName()); - encounter.misc.selectedMove = move; - - return true; - }, - }; - return option; - }); - }; - - // Only challenge legal/unfainted Pokemon that have a Dancing move can be selected - const selectableFilter = (pokemon: Pokemon) => { - // If pokemon meets primary pokemon reqs, it can be selected - if (!pokemon.isAllowedInBattle()) { - return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: pokemon.getNameToRender() }) ?? null; - } - const meetsReqs = encounter.options[2].pokemonMeetsPrimaryRequirements(pokemon); - if (!meetsReqs) { - return getEncounterText(`${namespace}:invalid_selection`) ?? null; - } - - return null; - }; - - return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); - }) - .withOptionPhase(async () => { - // Show the Oricorio a dance, and recruit it - const encounter = globalScene.currentBattle.mysteryEncounter!; - const oricorio = encounter.misc.oricorioData.toPokemon(); - oricorio.passive = true; - - // Ensure the Oricorio's moveset gains the Dance move the player used - const move = encounter.misc.selectedMove?.getMove().id; - if (!oricorio.moveset.some(m => m.getMove().id === move)) { - if (oricorio.moveset.length < 4) { - oricorio.moveset.push(new PokemonMove(move)); - } else { - oricorio.moveset[3] = new PokemonMove(move); - } + const meetsReqs = encounter.options[2].pokemonMeetsPrimaryRequirements(pokemon); + if (!meetsReqs) { + return getEncounterText(`${namespace}:invalid_selection`) ?? null; } - await hideOricorioPokemon(); - await catchPokemon(oricorio, null, PokeballType.POKEBALL, false); - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .build(); + return null; + }; + + return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); + }) + .withOptionPhase(async () => { + // Show the Oricorio a dance, and recruit it + const encounter = globalScene.currentBattle.mysteryEncounter!; + const oricorio = encounter.misc.oricorioData.toPokemon(); + oricorio.passive = true; + + // Ensure the Oricorio's moveset gains the Dance move the player used + const move = encounter.misc.selectedMove?.getMove().id; + if (!oricorio.moveset.some(m => m.getMove().id === move)) { + if (oricorio.moveset.length < 4) { + oricorio.moveset.push(new PokemonMove(move)); + } else { + oricorio.moveset[3] = new PokemonMove(move); + } + } + + await hideOricorioPokemon(); + await catchPokemon(oricorio, null, PokeballType.POKEBALL, false); + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .build(); function hideOricorioPokemon() { return new Promise(resolve => { @@ -332,7 +361,7 @@ function hideOricorioPokemon() { onComplete: () => { globalScene.field.remove(oricorioSprite, true); resolve(); - } + }, }); }); } diff --git a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts index 3b6ab8b0c05..6c4c8f26deb 100644 --- a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts +++ b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts @@ -1,4 +1,4 @@ -import type { Type } from "#enums/type"; +import type { PokemonType } from "#enums/pokemon-type"; import { isNullOrUndefined, randSeedInt } from "#app/utils"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; @@ -9,8 +9,11 @@ import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounte import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import type { EnemyPartyConfig, EnemyPokemonConfig } from "../utils/encounter-phase-utils"; -import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, } from "../utils/encounter-phase-utils"; -import { getRandomPlayerPokemon, getRandomSpeciesByStarterCost } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle } from "../utils/encounter-phase-utils"; +import { + getRandomPlayerPokemon, + getRandomSpeciesByStarterCost, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase"; @@ -93,131 +96,132 @@ const excludedBosses = [ * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3806 | GitHub Issue #3806} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const DarkDealEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DARK_DEAL) - .withEncounterTier(MysteryEncounterTier.ROGUE) - .withIntroSpriteConfigs([ - { - spriteKey: "dark_deal_scientist", - fileRoot: "mystery-encounters", - hasShadow: true, - }, - { - spriteKey: "dark_deal_porygon", - fileRoot: "mystery-encounters", - hasShadow: true, - repeat: true, - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - { - speaker: `${namespace}:speaker`, - text: `${namespace}:intro_dialogue`, - }, - ]) - .withSceneWaveRangeRequirement(30, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) - .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 pokemon in party - .withCatchAllowed(true) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - speaker: `${namespace}:speaker`, - text: `${namespace}:option.1.selected_dialogue`, - }, - { - text: `${namespace}:option.1.selected_message`, - }, - ], - }) - .withPreOptionPhase(async () => { - // Removes random pokemon (including fainted) from party and adds name to dialogue data tokens - // Will never return last battle able mon and instead pick fainted/unable to battle - const removedPokemon = getRandomPlayerPokemon(true, false, true); - - // Get all the pokemon's held items - const modifiers = removedPokemon.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier)); - globalScene.removePokemonFromPlayerParty(removedPokemon); - - const encounter = globalScene.currentBattle.mysteryEncounter!; - encounter.setDialogueToken("pokeName", removedPokemon.getNameToRender()); - - // Store removed pokemon types - encounter.misc = { - removedTypes: removedPokemon.getTypes(), - modifiers - }; - }) - .withOptionPhase(async () => { - // Give the player 5 Rogue Balls - const encounter = globalScene.currentBattle.mysteryEncounter!; - globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.ROGUE_BALL)); - - // Start encounter with random legendary (7-10 starter strength) that has level additive - // If this is a mono-type challenge, always ensure the required type is filtered for - let bossTypes: Type[] = encounter.misc.removedTypes; - const singleTypeChallenges = globalScene.gameMode.challenges.filter(c => c.value && c.id === Challenges.SINGLE_TYPE); - if (globalScene.gameMode.isChallenge && singleTypeChallenges.length > 0) { - bossTypes = singleTypeChallenges.map(c => (c.value - 1) as Type); - } - - const bossModifiers: PokemonHeldItemModifier[] = encounter.misc.modifiers; - // Starter egg tier, 35/50/10/5 %odds for tiers 6/7/8/9+ - const roll = randSeedInt(100); - const starterTier: number | [number, number] = - roll >= 65 ? 6 : roll >= 15 ? 7 : roll >= 5 ? 8 : [ 9, 10 ]; - const bossSpecies = getPokemonSpecies(getRandomSpeciesByStarterCost(starterTier, excludedBosses, bossTypes)); - const pokemonConfig: EnemyPokemonConfig = { - species: bossSpecies, - isBoss: true, - modifierConfigs: bossModifiers.map(m => { - return { - modifier: m, - stackCount: m.getStackCount(), - }; - }) - }; - if (!isNullOrUndefined(bossSpecies.forms) && bossSpecies.forms.length > 0) { - pokemonConfig.formIndex = 0; - } - const config: EnemyPartyConfig = { - pokemonConfigs: [ pokemonConfig ], - }; - await initBattleWithEnemyConfig(config); - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, +export const DarkDealEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.DARK_DEAL, +) + .withEncounterTier(MysteryEncounterTier.ROGUE) + .withIntroSpriteConfigs([ + { + spriteKey: "dark_deal_scientist", + fileRoot: "mystery-encounters", + hasShadow: true, + }, + { + spriteKey: "dark_deal_porygon", + fileRoot: "mystery-encounters", + hasShadow: true, + repeat: true, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + speaker: `${namespace}:speaker`, + text: `${namespace}:intro_dialogue`, + }, + ]) + .withSceneWaveRangeRequirement(30, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) + .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 pokemon in party + .withCatchAllowed(true) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, selected: [ { speaker: `${namespace}:speaker`, - text: `${namespace}:option.2.selected`, + text: `${namespace}:option.1.selected_dialogue`, + }, + { + text: `${namespace}:option.1.selected_message`, }, ], - }, - async () => { - // Leave encounter with no rewards or exp - leaveEncounterWithoutBattle(true); - return true; - } - ) - .withOutroDialogue([ - { - text: `${namespace}:outro` - } - ]) - .build(); + }) + .withPreOptionPhase(async () => { + // Removes random pokemon (including fainted) from party and adds name to dialogue data tokens + // Will never return last battle able mon and instead pick fainted/unable to battle + const removedPokemon = getRandomPlayerPokemon(true, false, true); + + // Get all the pokemon's held items + const modifiers = removedPokemon.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier)); + globalScene.removePokemonFromPlayerParty(removedPokemon); + + const encounter = globalScene.currentBattle.mysteryEncounter!; + encounter.setDialogueToken("pokeName", removedPokemon.getNameToRender()); + + // Store removed pokemon types + encounter.misc = { + removedTypes: removedPokemon.getTypes(), + modifiers, + }; + }) + .withOptionPhase(async () => { + // Give the player 5 Rogue Balls + const encounter = globalScene.currentBattle.mysteryEncounter!; + globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.ROGUE_BALL)); + + // Start encounter with random legendary (7-10 starter strength) that has level additive + // If this is a mono-type challenge, always ensure the required type is filtered for + let bossTypes: PokemonType[] = encounter.misc.removedTypes; + const singleTypeChallenges = globalScene.gameMode.challenges.filter( + c => c.value && c.id === Challenges.SINGLE_TYPE, + ); + if (globalScene.gameMode.isChallenge && singleTypeChallenges.length > 0) { + bossTypes = singleTypeChallenges.map(c => (c.value - 1) as PokemonType); + } + + const bossModifiers: PokemonHeldItemModifier[] = encounter.misc.modifiers; + // Starter egg tier, 35/50/10/5 %odds for tiers 6/7/8/9+ + const roll = randSeedInt(100); + const starterTier: number | [number, number] = roll >= 65 ? 6 : roll >= 15 ? 7 : roll >= 5 ? 8 : [9, 10]; + const bossSpecies = getPokemonSpecies(getRandomSpeciesByStarterCost(starterTier, excludedBosses, bossTypes)); + const pokemonConfig: EnemyPokemonConfig = { + species: bossSpecies, + isBoss: true, + modifierConfigs: bossModifiers.map(m => { + return { + modifier: m, + stackCount: m.getStackCount(), + }; + }), + }; + if (!isNullOrUndefined(bossSpecies.forms) && bossSpecies.forms.length > 0) { + pokemonConfig.formIndex = 0; + } + const config: EnemyPartyConfig = { + pokemonConfigs: [pokemonConfig], + }; + await initBattleWithEnemyConfig(config); + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + speaker: `${namespace}:speaker`, + text: `${namespace}:option.2.selected`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .withOutroDialogue([ + { + text: `${namespace}:outro`, + }, + ]) + .build(); diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts index f382f130540..c1486ff100b 100644 --- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts +++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts @@ -2,16 +2,31 @@ import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { CombinationPokemonRequirement, HeldItemRequirement, MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; +import { + CombinationPokemonRequirement, + HeldItemRequirement, + MoneyRequirement, +} from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + generateModifierType, + leaveEncounterWithoutBattle, + selectPokemonForOption, + updatePlayerMoney, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import type { PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; import type { PokemonHeldItemModifier, PokemonInstantReviveModifier } from "#app/modifier/modifier"; -import { BerryModifier, HealingBoosterModifier, LevelIncrementBoosterModifier, MoneyMultiplierModifier, PreserveBerryModifier } from "#app/modifier/modifier"; +import { + BerryModifier, + HealingBoosterModifier, + LevelIncrementBoosterModifier, + MoneyMultiplierModifier, + PreserveBerryModifier, +} from "#app/modifier/modifier"; import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase"; @@ -27,7 +42,7 @@ import { Species } from "#enums/species"; const namespace = "mysteryEncounters/delibirdy"; /** Berries only */ -const OPTION_2_ALLOWED_MODIFIERS = [ "BerryModifier", "PokemonInstantReviveModifier" ]; +const OPTION_2_ALLOWED_MODIFIERS = ["BerryModifier", "PokemonInstantReviveModifier"]; /** Disallowed items are berries, Reviver Seeds, and Vitamins (form change items and fusion items are not PokemonHeldItemModifiers) */ const OPTION_3_DISALLOWED_MODIFIERS = [ @@ -35,7 +50,7 @@ const OPTION_3_DISALLOWED_MODIFIERS = [ "PokemonInstantReviveModifier", "TerastallizeModifier", "PokemonBaseStatModifier", - "PokemonBaseStatTotalModifier" + "PokemonBaseStatTotalModifier", ]; const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 2; @@ -43,11 +58,11 @@ const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 2; const doEventReward = () => { const event_buff = globalScene.eventManager.getDelibirdyBuff(); if (event_buff.length > 0) { - const candidates = event_buff.filter((c => { + const candidates = event_buff.filter(c => { const mtype = generateModifierType(modifierTypes[c]); const existingCharm = globalScene.findModifier(m => m.type.id === mtype?.id); return !(existingCharm && existingCharm.getStackCount() >= existingCharm.getMaxStackCount()); - })); + }); if (candidates.length > 0) { globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes[randSeedItem(candidates)])); } else { @@ -62,282 +77,308 @@ const doEventReward = () => { * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3804 | GitHub Issue #3804} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const DelibirdyEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DELIBIRDY) - .withEncounterTier(MysteryEncounterTier.GREAT) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withSceneRequirement(new MoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER)) // Must have enough money for it to spawn at the very least - .withPrimaryPokemonRequirement( - CombinationPokemonRequirement.Some( - // Must also have either option 2 or 3 available to spawn - new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS), - new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true) - ) - ) - .withIntroSpriteConfigs([ - { - spriteKey: "", - fileRoot: "", - species: Species.DELIBIRD, - hasShadow: true, - repeat: true, - startFrame: 38, - scale: 0.94 - }, - { - spriteKey: "", - fileRoot: "", - species: Species.DELIBIRD, - hasShadow: true, - repeat: true, - scale: 1.06 - }, - { - spriteKey: "", - fileRoot: "", - species: Species.DELIBIRD, - hasShadow: true, - repeat: true, - startFrame: 65, - x: 1, - y: 5, - yShadow: 5 - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - } - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOutroDialogue([ - { - text: `${namespace}:outro`, - } - ]) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - encounter.setDialogueToken("delibirdName", getPokemonSpecies(Species.DELIBIRD).getName()); +export const DelibirdyEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.DELIBIRDY, +) + .withEncounterTier(MysteryEncounterTier.GREAT) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withSceneRequirement(new MoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER)) // Must have enough money for it to spawn at the very least + .withPrimaryPokemonRequirement( + CombinationPokemonRequirement.Some( + // Must also have either option 2 or 3 available to spawn + new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS), + new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true), + ), + ) + .withIntroSpriteConfigs([ + { + spriteKey: "", + fileRoot: "", + species: Species.DELIBIRD, + hasShadow: true, + repeat: true, + startFrame: 38, + scale: 0.94, + }, + { + spriteKey: "", + fileRoot: "", + species: Species.DELIBIRD, + hasShadow: true, + repeat: true, + scale: 1.06, + }, + { + spriteKey: "", + fileRoot: "", + species: Species.DELIBIRD, + hasShadow: true, + repeat: true, + startFrame: 65, + x: 1, + y: 5, + yShadow: 5, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOutroDialogue([ + { + text: `${namespace}:outro`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + encounter.setDialogueToken("delibirdName", getPokemonSpecies(Species.DELIBIRD).getName()); - globalScene.loadBgm("mystery_encounter_delibirdy", "mystery_encounter_delibirdy.mp3"); - return true; - }) - .withOnVisualsStart(() => { - globalScene.fadeAndSwitchBgm("mystery_encounter_delibirdy"); - return true; - }) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) - .withSceneMoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER) // Must have money to spawn - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected`, - }, - ], - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - updatePlayerMoney(-(encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney, true, false); - return true; - }) - .withOptionPhase(async () => { - // Give the player an Amulet Coin - // Check if the player has max stacks of that item already - const existing = globalScene.findModifier(m => m instanceof MoneyMultiplierModifier) as MoneyMultiplierModifier; + globalScene.loadBgm("mystery_encounter_delibirdy", "mystery_encounter_delibirdy.mp3"); + return true; + }) + .withOnVisualsStart(() => { + globalScene.fadeAndSwitchBgm("mystery_encounter_delibirdy"); + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + .withSceneMoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER) // Must have money to spawn + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + }, + ], + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + updatePlayerMoney(-(encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney, true, false); + return true; + }) + .withOptionPhase(async () => { + // Give the player an Amulet Coin + // Check if the player has max stacks of that item already + const existing = globalScene.findModifier(m => m instanceof MoneyMultiplierModifier) as MoneyMultiplierModifier; + + if (existing && existing.getStackCount() >= existing.getMaxStackCount()) { + // At max stacks, give the first party pokemon a Shell Bell instead + const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; + await applyModifierTypeToPlayerPokemon(globalScene.getPlayerPokemon()!, shellBell); + globalScene.playSound("item_fanfare"); + await showEncounterText( + i18next.t("battle:rewardGain", { modifierName: shellBell.name }), + null, + undefined, + true, + ); + doEventReward(); + } else { + globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.AMULET_COIN)); + doEventReward(); + } + + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + .withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS)) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + secondOptionPrompt: `${namespace}:option.2.select_prompt`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Get Pokemon held items and filter for valid ones + const validItems = pokemon.getHeldItems().filter(it => { + return OPTION_2_ALLOWED_MODIFIERS.some(heldItem => it.constructor.name === heldItem) && it.isTransferable; + }); + + return validItems.map((modifier: PokemonHeldItemModifier) => { + const option: OptionSelectItem = { + label: modifier.type.name, + handler: () => { + // Pokemon and item selected + encounter.setDialogueToken("chosenItem", modifier.type.name); + encounter.misc = { + chosenPokemon: pokemon, + chosenModifier: modifier, + }; + return true; + }, + }; + return option; + }); + }; + + const selectableFilter = (pokemon: Pokemon) => { + // If pokemon has valid item, it can be selected + const meetsReqs = encounter.options[1].pokemonMeetsPrimaryRequirements(pokemon); + if (!meetsReqs) { + return getEncounterText(`${namespace}:invalid_selection`) ?? null; + } + + return null; + }; + + return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const modifier: BerryModifier | PokemonInstantReviveModifier = encounter.misc.chosenModifier; + const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon; + + // Give the player a Candy Jar if they gave a Berry, and a Berry Pouch for Reviver Seed + if (modifier instanceof BerryModifier) { + // Check if the player has max stacks of that Candy Jar already + const existing = globalScene.findModifier( + m => m instanceof LevelIncrementBoosterModifier, + ) as LevelIncrementBoosterModifier; if (existing && existing.getStackCount() >= existing.getMaxStackCount()) { // At max stacks, give the first party pokemon a Shell Bell instead const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; await applyModifierTypeToPlayerPokemon(globalScene.getPlayerPokemon()!, shellBell); globalScene.playSound("item_fanfare"); - await showEncounterText(i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true); + await showEncounterText( + i18next.t("battle:rewardGain", { + modifierName: shellBell.name, + }), + null, + undefined, + true, + ); doEventReward(); } else { - globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.AMULET_COIN)); + globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.CANDY_JAR)); doEventReward(); } - - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) - .withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS)) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - secondOptionPrompt: `${namespace}:option.2.select_prompt`, - selected: [ - { - text: `${namespace}:option.2.selected`, - }, - ], - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Get Pokemon held items and filter for valid ones - const validItems = pokemon.getHeldItems().filter((it) => { - return OPTION_2_ALLOWED_MODIFIERS.some(heldItem => it.constructor.name === heldItem) && it.isTransferable; - }); - - return validItems.map((modifier: PokemonHeldItemModifier) => { - const option: OptionSelectItem = { - label: modifier.type.name, - handler: () => { - // Pokemon and item selected - encounter.setDialogueToken("chosenItem", modifier.type.name); - encounter.misc = { - chosenPokemon: pokemon, - chosenModifier: modifier, - }; - return true; - }, - }; - return option; - }); - }; - - const selectableFilter = (pokemon: Pokemon) => { - // If pokemon has valid item, it can be selected - const meetsReqs = encounter.options[1].pokemonMeetsPrimaryRequirements(pokemon); - if (!meetsReqs) { - return getEncounterText(`${namespace}:invalid_selection`) ?? null; - } - - return null; - }; - - return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const modifier: BerryModifier | PokemonInstantReviveModifier = encounter.misc.chosenModifier; - const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon; - - // Give the player a Candy Jar if they gave a Berry, and a Berry Pouch for Reviver Seed - if (modifier instanceof BerryModifier) { - // Check if the player has max stacks of that Candy Jar already - const existing = globalScene.findModifier(m => m instanceof LevelIncrementBoosterModifier) as LevelIncrementBoosterModifier; - - if (existing && existing.getStackCount() >= existing.getMaxStackCount()) { - // At max stacks, give the first party pokemon a Shell Bell instead - const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; - await applyModifierTypeToPlayerPokemon(globalScene.getPlayerPokemon()!, shellBell); - globalScene.playSound("item_fanfare"); - await showEncounterText(i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true); - doEventReward(); - } else { - globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.CANDY_JAR)); - doEventReward(); - } - } else { - // Check if the player has max stacks of that Berry Pouch already - const existing = globalScene.findModifier(m => m instanceof PreserveBerryModifier) as PreserveBerryModifier; - - if (existing && existing.getStackCount() >= existing.getMaxStackCount()) { - // At max stacks, give the first party pokemon a Shell Bell instead - const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; - await applyModifierTypeToPlayerPokemon(globalScene.getPlayerPokemon()!, shellBell); - globalScene.playSound("item_fanfare"); - await showEncounterText(i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true); - doEventReward(); - } else { - globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.BERRY_POUCH)); - doEventReward(); - } - } - - chosenPokemon.loseHeldItem(modifier, false); - - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) - .withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true)) - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - secondOptionPrompt: `${namespace}:option.3.select_prompt`, - selected: [ - { - text: `${namespace}:option.3.selected`, - }, - ], - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Get Pokemon held items and filter for valid ones - const validItems = pokemon.getHeldItems().filter((it) => { - return !OPTION_3_DISALLOWED_MODIFIERS.some(heldItem => it.constructor.name === heldItem) && it.isTransferable; - }); - - return validItems.map((modifier: PokemonHeldItemModifier) => { - const option: OptionSelectItem = { - label: modifier.type.name, - handler: () => { - // Pokemon and item selected - encounter.setDialogueToken("chosenItem", modifier.type.name); - encounter.misc = { - chosenPokemon: pokemon, - chosenModifier: modifier, - }; - return true; - }, - }; - return option; - }); - }; - - const selectableFilter = (pokemon: Pokemon) => { - // If pokemon has valid item, it can be selected - const meetsReqs = encounter.options[2].pokemonMeetsPrimaryRequirements(pokemon); - if (!meetsReqs) { - return getEncounterText(`${namespace}:invalid_selection`) ?? null; - } - - return null; - }; - - return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const modifier = encounter.misc.chosenModifier; - const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon; - - // Check if the player has max stacks of Healing Charm already - const existing = globalScene.findModifier(m => m instanceof HealingBoosterModifier) as HealingBoosterModifier; + } else { + // Check if the player has max stacks of that Berry Pouch already + const existing = globalScene.findModifier(m => m instanceof PreserveBerryModifier) as PreserveBerryModifier; if (existing && existing.getStackCount() >= existing.getMaxStackCount()) { // At max stacks, give the first party pokemon a Shell Bell instead const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; - await applyModifierTypeToPlayerPokemon(globalScene.getPlayerParty()[0], shellBell); + await applyModifierTypeToPlayerPokemon(globalScene.getPlayerPokemon()!, shellBell); globalScene.playSound("item_fanfare"); - await showEncounterText(i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true); + await showEncounterText( + i18next.t("battle:rewardGain", { + modifierName: shellBell.name, + }), + null, + undefined, + true, + ); doEventReward(); } else { - globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.HEALING_CHARM)); + globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.BERRY_POUCH)); doEventReward(); } + } - chosenPokemon.loseHeldItem(modifier, false); + chosenPokemon.loseHeldItem(modifier, false); - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .build(); + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + .withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true)) + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + secondOptionPrompt: `${namespace}:option.3.select_prompt`, + selected: [ + { + text: `${namespace}:option.3.selected`, + }, + ], + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Get Pokemon held items and filter for valid ones + const validItems = pokemon.getHeldItems().filter(it => { + return ( + !OPTION_3_DISALLOWED_MODIFIERS.some(heldItem => it.constructor.name === heldItem) && it.isTransferable + ); + }); + + return validItems.map((modifier: PokemonHeldItemModifier) => { + const option: OptionSelectItem = { + label: modifier.type.name, + handler: () => { + // Pokemon and item selected + encounter.setDialogueToken("chosenItem", modifier.type.name); + encounter.misc = { + chosenPokemon: pokemon, + chosenModifier: modifier, + }; + return true; + }, + }; + return option; + }); + }; + + const selectableFilter = (pokemon: Pokemon) => { + // If pokemon has valid item, it can be selected + const meetsReqs = encounter.options[2].pokemonMeetsPrimaryRequirements(pokemon); + if (!meetsReqs) { + return getEncounterText(`${namespace}:invalid_selection`) ?? null; + } + + return null; + }; + + return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const modifier = encounter.misc.chosenModifier; + const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon; + + // Check if the player has max stacks of Healing Charm already + const existing = globalScene.findModifier(m => m instanceof HealingBoosterModifier) as HealingBoosterModifier; + + if (existing && existing.getStackCount() >= existing.getMaxStackCount()) { + // At max stacks, give the first party pokemon a Shell Bell instead + const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; + await applyModifierTypeToPlayerPokemon(globalScene.getPlayerParty()[0], shellBell); + globalScene.playSound("item_fanfare"); + await showEncounterText( + i18next.t("battle:rewardGain", { modifierName: shellBell.name }), + null, + undefined, + true, + ); + doEventReward(); + } else { + globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.HEALING_CHARM)); + doEventReward(); + } + + chosenPokemon.loseHeldItem(modifier, false); + + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .build(); diff --git a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts index b2bc13ca744..9b8e2e24d12 100644 --- a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts +++ b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts @@ -8,9 +8,7 @@ import { randSeedInt } from "#app/utils"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { - MysteryEncounterBuilder, -} from "#app/data/mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; @@ -22,145 +20,158 @@ const namespace = "mysteryEncounters/departmentStoreSale"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3797 | GitHub Issue #3797} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const DepartmentStoreSaleEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DEPARTMENT_STORE_SALE) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[0], 100) - .withIntroSpriteConfigs([ - { - spriteKey: "department_store_sale_lady", - fileRoot: "mystery-encounters", - hasShadow: true, - x: -20, - }, - { - spriteKey: "", - fileRoot: "", - species: Species.FURFROU, - hasShadow: true, - repeat: true, - x: 30, - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - { - text: `${namespace}:intro_dialogue`, - speaker: `${namespace}:speaker`, - }, - ]) - .withAutoHideIntroVisuals(false) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - }, - async () => { - // Choose TMs - const modifiers: ModifierTypeFunc[] = []; - let i = 0; - while (i < 5) { - // 2/2/1 weight on TM rarity - const roll = randSeedInt(5); - if (roll < 2) { - modifiers.push(modifierTypes.TM_COMMON); - } else if (roll < 4) { - modifiers.push(modifierTypes.TM_GREAT); - } else { - modifiers.push(modifierTypes.TM_ULTRA); - } - i++; +export const DepartmentStoreSaleEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.DEPARTMENT_STORE_SALE, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[0], 100) + .withIntroSpriteConfigs([ + { + spriteKey: "department_store_sale_lady", + fileRoot: "mystery-encounters", + hasShadow: true, + x: -20, + }, + { + spriteKey: "", + fileRoot: "", + species: Species.FURFROU, + hasShadow: true, + repeat: true, + x: 30, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + text: `${namespace}:intro_dialogue`, + speaker: `${namespace}:speaker`, + }, + ]) + .withAutoHideIntroVisuals(false) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + }, + async () => { + // Choose TMs + const modifiers: ModifierTypeFunc[] = []; + let i = 0; + while (i < 5) { + // 2/2/1 weight on TM rarity + const roll = randSeedInt(5); + if (roll < 2) { + modifiers.push(modifierTypes.TM_COMMON); + } else if (roll < 4) { + modifiers.push(modifierTypes.TM_GREAT); + } else { + modifiers.push(modifierTypes.TM_ULTRA); } - - setEncounterRewards({ guaranteedModifierTypeFuncs: modifiers, fillRemaining: false, }); - leaveEncounterWithoutBattle(); + i++; } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - }, - async () => { - // Choose Vitamins - const modifiers: ModifierTypeFunc[] = []; - let i = 0; - while (i < 3) { - // 2/1 weight on base stat booster vs PP Up - const roll = randSeedInt(3); - if (roll === 0) { - modifiers.push(modifierTypes.PP_UP); - } else { - modifiers.push(modifierTypes.BASE_STAT_BOOSTER); - } - i++; + + setEncounterRewards({ + guaranteedModifierTypeFuncs: modifiers, + fillRemaining: false, + }); + leaveEncounterWithoutBattle(); + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + }, + async () => { + // Choose Vitamins + const modifiers: ModifierTypeFunc[] = []; + let i = 0; + while (i < 3) { + // 2/1 weight on base stat booster vs PP Up + const roll = randSeedInt(3); + if (roll === 0) { + modifiers.push(modifierTypes.PP_UP); + } else { + modifiers.push(modifierTypes.BASE_STAT_BOOSTER); } - - setEncounterRewards({ guaranteedModifierTypeFuncs: modifiers, fillRemaining: false, }); - leaveEncounterWithoutBattle(); + i++; } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - }, - async () => { - // Choose X Items - const modifiers: ModifierTypeFunc[] = []; - let i = 0; - while (i < 5) { - // 4/1 weight on base stat booster vs Dire Hit - const roll = randSeedInt(5); - if (roll === 0) { - modifiers.push(modifierTypes.DIRE_HIT); - } else { - modifiers.push(modifierTypes.TEMP_STAT_STAGE_BOOSTER); - } - i++; + + setEncounterRewards({ + guaranteedModifierTypeFuncs: modifiers, + fillRemaining: false, + }); + leaveEncounterWithoutBattle(); + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + }, + async () => { + // Choose X Items + const modifiers: ModifierTypeFunc[] = []; + let i = 0; + while (i < 5) { + // 4/1 weight on base stat booster vs Dire Hit + const roll = randSeedInt(5); + if (roll === 0) { + modifiers.push(modifierTypes.DIRE_HIT); + } else { + modifiers.push(modifierTypes.TEMP_STAT_STAGE_BOOSTER); } - - setEncounterRewards({ guaranteedModifierTypeFuncs: modifiers, fillRemaining: false, }); - leaveEncounterWithoutBattle(); + i++; } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.4.label`, - buttonTooltip: `${namespace}:option.4.tooltip`, - }, - async () => { - // Choose Pokeballs - const modifiers: ModifierTypeFunc[] = []; - let i = 0; - while (i < 4) { - // 10/30/20/5 weight on pokeballs - const roll = randSeedInt(65); - if (roll < 10) { - modifiers.push(modifierTypes.POKEBALL); - } else if (roll < 40) { - modifiers.push(modifierTypes.GREAT_BALL); - } else if (roll < 60) { - modifiers.push(modifierTypes.ULTRA_BALL); - } else { - modifiers.push(modifierTypes.ROGUE_BALL); - } - i++; + + setEncounterRewards({ + guaranteedModifierTypeFuncs: modifiers, + fillRemaining: false, + }); + leaveEncounterWithoutBattle(); + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.4.label`, + buttonTooltip: `${namespace}:option.4.tooltip`, + }, + async () => { + // Choose Pokeballs + const modifiers: ModifierTypeFunc[] = []; + let i = 0; + while (i < 4) { + // 10/30/20/5 weight on pokeballs + const roll = randSeedInt(65); + if (roll < 10) { + modifiers.push(modifierTypes.POKEBALL); + } else if (roll < 40) { + modifiers.push(modifierTypes.GREAT_BALL); + } else if (roll < 60) { + modifiers.push(modifierTypes.ULTRA_BALL); + } else { + modifiers.push(modifierTypes.ROGUE_BALL); } + i++; + } - setEncounterRewards({ guaranteedModifierTypeFuncs: modifiers, fillRemaining: false, }); - leaveEncounterWithoutBattle(); - } - ) - .withOutroDialogue([ - { - text: `${namespace}:outro`, - } - ]) - .build(); + setEncounterRewards({ + guaranteedModifierTypeFuncs: modifiers, + fillRemaining: false, + }); + leaveEncounterWithoutBattle(); + }, + ) + .withOutroDialogue([ + { + text: `${namespace}:outro`, + }, + ]) + .build(); diff --git a/src/data/mystery-encounters/encounters/field-trip-encounter.ts b/src/data/mystery-encounters/encounters/field-trip-encounter.ts index 8bb5c68eec0..a1964aa5ab4 100644 --- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts +++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts @@ -1,6 +1,12 @@ -import { MoveCategory } from "#app/data/move"; +import { MoveCategory } from "#enums/MoveCategory"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { generateModifierTypeOption, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + generateModifierTypeOption, + leaveEncounterWithoutBattle, + selectPokemonForOption, + setEncounterExp, + setEncounterRewards, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import type { PlayerPokemon, PokemonMove } from "#app/field/pokemon"; import { modifierTypes } from "#app/modifier/modifier-type"; import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; @@ -22,180 +28,187 @@ const namespace = "mysteryEncounters/fieldTrip"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3794 | GitHub Issue #3794} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const FieldTripEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.FIELD_TRIP) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[0], 100) - .withIntroSpriteConfigs([ - { - spriteKey: "preschooler_m", - fileRoot: "trainer", - hasShadow: true, - }, - { - spriteKey: "field_trip_teacher", - fileRoot: "mystery-encounters", - hasShadow: true, - }, - { - spriteKey: "preschooler_f", - fileRoot: "trainer", - hasShadow: true, - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - { - text: `${namespace}:intro_dialogue`, - speaker: `${namespace}:speaker`, - }, - ]) - .withAutoHideIntroVisuals(false) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - secondOptionPrompt: `${namespace}:second_option_prompt`, - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Return the options for Pokemon move valid for this option - return pokemon.moveset.map((move: PokemonMove) => { - const option: OptionSelectItem = { - label: move.getName(), - handler: () => { - // Pokemon and move selected - encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:physical`)); - pokemonAndMoveChosen(pokemon, move, MoveCategory.PHYSICAL); - return true; - }, - }; - return option; - }); - }; +export const FieldTripEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.FIELD_TRIP, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[0], 100) + .withIntroSpriteConfigs([ + { + spriteKey: "preschooler_m", + fileRoot: "trainer", + hasShadow: true, + }, + { + spriteKey: "field_trip_teacher", + fileRoot: "mystery-encounters", + hasShadow: true, + }, + { + spriteKey: "preschooler_f", + fileRoot: "trainer", + hasShadow: true, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + text: `${namespace}:intro_dialogue`, + speaker: `${namespace}:speaker`, + }, + ]) + .withAutoHideIntroVisuals(false) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + secondOptionPrompt: `${namespace}:second_option_prompt`, + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Return the options for Pokemon move valid for this option + return pokemon.moveset.map((move: PokemonMove) => { + const option: OptionSelectItem = { + label: move.getName(), + handler: () => { + // Pokemon and move selected + encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:physical`)); + pokemonAndMoveChosen(pokemon, move, MoveCategory.PHYSICAL); + return true; + }, + }; + return option; + }); + }; - return selectPokemonForOption(onPokemonSelected); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - if (encounter.misc.correctMove) { - const modifiers = [ - generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.ATK ])!, - generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.DEF ])!, - generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.SPD ])!, - generateModifierTypeOption(modifierTypes.DIRE_HIT)!, - generateModifierTypeOption(modifierTypes.RARER_CANDY)!, - ]; + return selectPokemonForOption(onPokemonSelected); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + if (encounter.misc.correctMove) { + const modifiers = [ + generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.ATK])!, + generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.DEF])!, + generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.SPD])!, + generateModifierTypeOption(modifierTypes.DIRE_HIT)!, + generateModifierTypeOption(modifierTypes.RARER_CANDY)!, + ]; - setEncounterRewards({ guaranteedModifierTypeOptions: modifiers, fillRemaining: false }); - } + setEncounterRewards({ + guaranteedModifierTypeOptions: modifiers, + fillRemaining: false, + }); + } - leaveEncounterWithoutBattle(!encounter.misc.correctMove); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - secondOptionPrompt: `${namespace}:second_option_prompt`, - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Return the options for Pokemon move valid for this option - return pokemon.moveset.map((move: PokemonMove) => { - const option: OptionSelectItem = { - label: move.getName(), - handler: () => { - // Pokemon and move selected - encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:special`)); - pokemonAndMoveChosen(pokemon, move, MoveCategory.SPECIAL); - return true; - }, - }; - return option; - }); - }; + leaveEncounterWithoutBattle(!encounter.misc.correctMove); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + secondOptionPrompt: `${namespace}:second_option_prompt`, + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Return the options for Pokemon move valid for this option + return pokemon.moveset.map((move: PokemonMove) => { + const option: OptionSelectItem = { + label: move.getName(), + handler: () => { + // Pokemon and move selected + encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:special`)); + pokemonAndMoveChosen(pokemon, move, MoveCategory.SPECIAL); + return true; + }, + }; + return option; + }); + }; - return selectPokemonForOption(onPokemonSelected); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - if (encounter.misc.correctMove) { - const modifiers = [ - generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.SPATK ])!, - generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.SPDEF ])!, - generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.SPD ])!, - generateModifierTypeOption(modifierTypes.DIRE_HIT)!, - generateModifierTypeOption(modifierTypes.RARER_CANDY)!, - ]; + return selectPokemonForOption(onPokemonSelected); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + if (encounter.misc.correctMove) { + const modifiers = [ + generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.SPATK])!, + generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.SPDEF])!, + generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.SPD])!, + generateModifierTypeOption(modifierTypes.DIRE_HIT)!, + generateModifierTypeOption(modifierTypes.RARER_CANDY)!, + ]; - setEncounterRewards({ guaranteedModifierTypeOptions: modifiers, fillRemaining: false }); - } + setEncounterRewards({ + guaranteedModifierTypeOptions: modifiers, + fillRemaining: false, + }); + } - leaveEncounterWithoutBattle(!encounter.misc.correctMove); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - secondOptionPrompt: `${namespace}:second_option_prompt`, - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Return the options for Pokemon move valid for this option - return pokemon.moveset.map((move: PokemonMove) => { - const option: OptionSelectItem = { - label: move.getName(), - handler: () => { - // Pokemon and move selected - encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:status`)); - pokemonAndMoveChosen(pokemon, move, MoveCategory.STATUS); - return true; - }, - }; - return option; - }); - }; + leaveEncounterWithoutBattle(!encounter.misc.correctMove); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + secondOptionPrompt: `${namespace}:second_option_prompt`, + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Return the options for Pokemon move valid for this option + return pokemon.moveset.map((move: PokemonMove) => { + const option: OptionSelectItem = { + label: move.getName(), + handler: () => { + // Pokemon and move selected + encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:status`)); + pokemonAndMoveChosen(pokemon, move, MoveCategory.STATUS); + return true; + }, + }; + return option; + }); + }; - return selectPokemonForOption(onPokemonSelected); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - if (encounter.misc.correctMove) { - const modifiers = [ - generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.ACC ])!, - generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.SPD ])!, - generateModifierTypeOption(modifierTypes.GREAT_BALL)!, - generateModifierTypeOption(modifierTypes.IV_SCANNER)!, - generateModifierTypeOption(modifierTypes.RARER_CANDY)!, - ]; + return selectPokemonForOption(onPokemonSelected); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + if (encounter.misc.correctMove) { + const modifiers = [ + generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.ACC])!, + generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.SPD])!, + generateModifierTypeOption(modifierTypes.GREAT_BALL)!, + generateModifierTypeOption(modifierTypes.IV_SCANNER)!, + generateModifierTypeOption(modifierTypes.RARER_CANDY)!, + ]; - setEncounterRewards({ guaranteedModifierTypeOptions: modifiers, fillRemaining: false }); - } + setEncounterRewards({ + guaranteedModifierTypeOptions: modifiers, + fillRemaining: false, + }); + } - leaveEncounterWithoutBattle(!encounter.misc.correctMove); - }) - .build() - ) - .build(); + leaveEncounterWithoutBattle(!encounter.misc.correctMove); + }) + .build(), + ) + .build(); function pokemonAndMoveChosen(pokemon: PlayerPokemon, move: PokemonMove, correctMoveCategory: MoveCategory) { const encounter = globalScene.currentBattle.mysteryEncounter!; @@ -215,7 +228,10 @@ function pokemonAndMoveChosen(pokemon: PlayerPokemon, move: PokemonMove, correct text: `${namespace}:incorrect_exp`, }, ]; - setEncounterExp(globalScene.getPlayerParty().map((p) => p.id), 50); + setEncounterExp( + globalScene.getPlayerParty().map(p => p.id), + 50, + ); } else { encounter.selectedOption!.dialogue!.selected = [ { @@ -229,7 +245,7 @@ function pokemonAndMoveChosen(pokemon: PlayerPokemon, move: PokemonMove, correct text: `${namespace}:correct_exp`, }, ]; - setEncounterExp([ pokemon.id ], 100); + setEncounterExp([pokemon.id], 100); } encounter.misc = { correctMove: correctMove, diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts index c52540584b3..d9bd6983d97 100644 --- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts +++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts @@ -1,17 +1,29 @@ import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + initBattleWithEnemyConfig, + loadCustomMovesForEncounter, + leaveEncounterWithoutBattle, + setEncounterExp, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, + generateModifierType, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import type { AttackTypeBoosterModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes, } from "#app/modifier/modifier-type"; +import { modifierTypes } from "#app/modifier/modifier-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { AbilityRequirement, CombinationPokemonRequirement, TypeRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; +import { + AbilityRequirement, + CombinationPokemonRequirement, + TypeRequirement, +} from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { Species } from "#enums/species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { Gender } from "#app/data/gender"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { BattlerIndex } from "#app/battle"; import type Pokemon from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; @@ -21,7 +33,11 @@ import { WeatherType } from "#enums/weather-type"; import { isNullOrUndefined, randSeedInt } from "#app/utils"; import { StatusEffect } from "#enums/status-effect"; import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { applyAbilityOverrideToPokemon, applyDamageToPokemon, applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + applyAbilityOverrideToPokemon, + applyDamageToPokemon, + applyModifierTypeToPlayerPokemon, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { EncounterAnim } from "#enums/encounter-anims"; @@ -48,216 +64,230 @@ const DAMAGE_PERCENTAGE: number = 20; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3814 | GitHub Issue #3814} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const FieryFalloutEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.FIERY_FALLOUT) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(40, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) - .withCatchAllowed(true) - .withIntroSpriteConfigs([]) // Set in onInit() - .withAnimations(EncounterAnim.MAGMA_BG, EncounterAnim.MAGMA_SPOUT) - .withAutoHideIntroVisuals(false) - .withFleeAllowed(false) - .withIntroDialogue([ +export const FieryFalloutEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.FIERY_FALLOUT, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(40, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) + .withCatchAllowed(true) + .withIntroSpriteConfigs([]) // Set in onInit() + .withAnimations(EncounterAnim.MAGMA_BG, EncounterAnim.MAGMA_SPOUT) + .withAutoHideIntroVisuals(false) + .withFleeAllowed(false) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + + // Calculate boss mons + const volcaronaSpecies = getPokemonSpecies(Species.VOLCARONA); + const config: EnemyPartyConfig = { + pokemonConfigs: [ + { + species: volcaronaSpecies, + isBoss: false, + gender: Gender.MALE, + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], + mysteryEncounterBattleEffects: (pokemon: Pokemon) => { + globalScene.unshiftPhase( + new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPDEF, Stat.SPD], 1), + ); + }, + }, + { + species: volcaronaSpecies, + isBoss: false, + gender: Gender.FEMALE, + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], + mysteryEncounterBattleEffects: (pokemon: Pokemon) => { + globalScene.unshiftPhase( + new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPDEF, Stat.SPD], 1), + ); + }, + }, + ], + doubleBattle: true, + disableSwitch: true, + }; + encounter.enemyPartyConfigs = [config]; + + // Load hidden Volcarona sprites + encounter.spriteConfigs = [ { - text: `${namespace}:intro`, + spriteKey: "", + fileRoot: "", + species: Species.VOLCARONA, + repeat: true, + hidden: true, + hasShadow: true, + x: -20, + startFrame: 20, }, - ]) - .withOnInit(() => { + { + spriteKey: "", + fileRoot: "", + species: Species.VOLCARONA, + repeat: true, + hidden: true, + hasShadow: true, + x: 20, + }, + ]; + + // Load animations/sfx for Volcarona moves + loadCustomMovesForEncounter([Moves.FIRE_SPIN, Moves.QUIVER_DANCE]); + + globalScene.arena.trySetWeather(WeatherType.SUNNY, true); + + encounter.setDialogueToken("volcaronaName", getPokemonSpecies(Species.VOLCARONA).getName()); + + return true; + }) + .withOnVisualsStart(() => { + // Play animations + const background = new EncounterBattleAnim( + EncounterAnim.MAGMA_BG, + globalScene.getPlayerPokemon()!, + globalScene.getPlayerPokemon(), + ); + background.playWithoutTargets(200, 70, 2, 3); + const animation = new EncounterBattleAnim( + EncounterAnim.MAGMA_SPOUT, + globalScene.getPlayerPokemon()!, + globalScene.getPlayerPokemon(), + ); + animation.playWithoutTargets(80, 100, 2); + globalScene.time.delayedCall(600, () => { + animation.playWithoutTargets(-20, 100, 2); + }); + globalScene.time.delayedCall(1200, () => { + animation.playWithoutTargets(140, 150, 2); + }); + + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + }, + ], + }, + async () => { + // Pick battle const encounter = globalScene.currentBattle.mysteryEncounter!; + setEncounterRewards({ fillRemaining: true }, undefined, () => giveLeadPokemonAttackTypeBoostItem()); - // Calculate boss mons - const volcaronaSpecies = getPokemonSpecies(Species.VOLCARONA); - const config: EnemyPartyConfig = { - pokemonConfigs: [ - { - species: volcaronaSpecies, - isBoss: false, - gender: Gender.MALE, - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], - mysteryEncounterBattleEffects: (pokemon: Pokemon) => { - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.SPDEF, Stat.SPD ], 1)); - } - }, - { - species: volcaronaSpecies, - isBoss: false, - gender: Gender.FEMALE, - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], - mysteryEncounterBattleEffects: (pokemon: Pokemon) => { - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.SPDEF, Stat.SPD ], 1)); - } - } - ], - doubleBattle: true, - disableSwitch: true, - }; - encounter.enemyPartyConfigs = [ config ]; - - // Load hidden Volcarona sprites - encounter.spriteConfigs = [ + encounter.startOfBattleEffects.push( { - spriteKey: "", - fileRoot: "", - species: Species.VOLCARONA, - repeat: true, - hidden: true, - hasShadow: true, - x: -20, - startFrame: 20 + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [BattlerIndex.PLAYER], + move: new PokemonMove(Moves.FIRE_SPIN), + ignorePp: true, }, { - spriteKey: "", - fileRoot: "", - species: Species.VOLCARONA, - repeat: true, - hidden: true, - hasShadow: true, - x: 20 + sourceBattlerIndex: BattlerIndex.ENEMY_2, + targets: [BattlerIndex.PLAYER_2], + move: new PokemonMove(Moves.FIRE_SPIN), + ignorePp: true, }, - ]; + ); + await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]); + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }, + async () => { + // Damage non-fire types and burn 1 random non-fire type member + give it Heatproof + const encounter = globalScene.currentBattle.mysteryEncounter!; + const nonFireTypes = globalScene + .getPlayerParty() + .filter(p => p.isAllowedInBattle() && !p.getTypes().includes(PokemonType.FIRE)); - // Load animations/sfx for Volcarona moves - loadCustomMovesForEncounter([ Moves.FIRE_SPIN, Moves.QUIVER_DANCE ]); + for (const pkm of nonFireTypes) { + const percentage = DAMAGE_PERCENTAGE / 100; + const damage = Math.floor(pkm.getMaxHp() * percentage); + applyDamageToPokemon(pkm, damage); + } - globalScene.arena.trySetWeather(WeatherType.SUNNY, true); + // Burn random member + const burnable = nonFireTypes.filter( + p => isNullOrUndefined(p.status) || isNullOrUndefined(p.status.effect) || p.status.effect === StatusEffect.NONE, + ); + if (burnable?.length > 0) { + const roll = randSeedInt(burnable.length); + const chosenPokemon = burnable[roll]; + if (chosenPokemon.trySetStatus(StatusEffect.BURN)) { + // Burn applied + encounter.setDialogueToken("burnedPokemon", chosenPokemon.getNameToRender()); + encounter.setDialogueToken("abilityName", new Ability(Abilities.HEATPROOF, 3).name); + queueEncounterMessage(`${namespace}:option.2.target_burned`); - encounter.setDialogueToken("volcaronaName", getPokemonSpecies(Species.VOLCARONA).getName()); + // Also permanently change the burned Pokemon's ability to Heatproof + applyAbilityOverrideToPokemon(chosenPokemon, Abilities.HEATPROOF); + } + } - return true; - }) - .withOnVisualsStart(() => { - // Play animations - const background = new EncounterBattleAnim(EncounterAnim.MAGMA_BG, globalScene.getPlayerPokemon()!, globalScene.getPlayerPokemon()); - background.playWithoutTargets(200, 70, 2, 3); - const animation = new EncounterBattleAnim(EncounterAnim.MAGMA_SPOUT, globalScene.getPlayerPokemon()!, globalScene.getPlayerPokemon()); - animation.playWithoutTargets(80, 100, 2); - globalScene.time.delayedCall(600, () => { - animation.playWithoutTargets(-20, 100, 2); - }); - globalScene.time.delayedCall(1200, () => { - animation.playWithoutTargets(140, 150, 2); - }); - - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, + // No rewards + leaveEncounterWithoutBattle(true); + }, + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + .withPrimaryPokemonRequirement( + CombinationPokemonRequirement.Some( + new TypeRequirement(PokemonType.FIRE, true, 1), + new AbilityRequirement(FIRE_RESISTANT_ABILITIES, true), + ), + ) // Will set option3PrimaryName dialogue token automatically + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, selected: [ { - text: `${namespace}:option.1.selected`, + text: `${namespace}:option.3.selected`, }, ], - }, - async () => { - // Pick battle + }) + .withPreOptionPhase(async () => { + // Do NOT await this, to prevent player from repeatedly pressing options + transitionMysteryEncounterIntroVisuals(false, false, 2000); + }) + .withOptionPhase(async () => { + // Fire types help calm the Volcarona const encounter = globalScene.currentBattle.mysteryEncounter!; - setEncounterRewards({ fillRemaining: true }, undefined, () => giveLeadPokemonAttackTypeBoostItem()); + await transitionMysteryEncounterIntroVisuals(); + setEncounterRewards({ fillRemaining: true }, undefined, () => { + giveLeadPokemonAttackTypeBoostItem(); + }); - encounter.startOfBattleEffects.push( - { - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ BattlerIndex.PLAYER ], - move: new PokemonMove(Moves.FIRE_SPIN), - ignorePp: true - }, - { - sourceBattlerIndex: BattlerIndex.ENEMY_2, - targets: [ BattlerIndex.PLAYER_2 ], - move: new PokemonMove(Moves.FIRE_SPIN), - ignorePp: true - }); - await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]); - } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - }, - ], - }, - async () => { - // Damage non-fire types and burn 1 random non-fire type member + give it Heatproof - const encounter = globalScene.currentBattle.mysteryEncounter!; - const nonFireTypes = globalScene.getPlayerParty().filter((p) => p.isAllowedInBattle() && !p.getTypes().includes(Type.FIRE)); + const primary = encounter.options[2].primaryPokemon!; - for (const pkm of nonFireTypes) { - const percentage = DAMAGE_PERCENTAGE / 100; - const damage = Math.floor(pkm.getMaxHp() * percentage); - applyDamageToPokemon(pkm, damage); - } - - // Burn random member - const burnable = nonFireTypes.filter(p => isNullOrUndefined(p.status) || isNullOrUndefined(p.status.effect) || p.status.effect === StatusEffect.NONE); - if (burnable?.length > 0) { - const roll = randSeedInt(burnable.length); - const chosenPokemon = burnable[roll]; - if (chosenPokemon.trySetStatus(StatusEffect.BURN)) { - // Burn applied - encounter.setDialogueToken("burnedPokemon", chosenPokemon.getNameToRender()); - encounter.setDialogueToken("abilityName", new Ability(Abilities.HEATPROOF, 3).name); - queueEncounterMessage(`${namespace}:option.2.target_burned`); - - // Also permanently change the burned Pokemon's ability to Heatproof - applyAbilityOverrideToPokemon(chosenPokemon, Abilities.HEATPROOF); - } - } - - // No rewards - leaveEncounterWithoutBattle(true); - } - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) - .withPrimaryPokemonRequirement( - CombinationPokemonRequirement.Some( - new TypeRequirement(Type.FIRE, true, 1), - new AbilityRequirement(FIRE_RESISTANT_ABILITIES, true) - ) - ) // Will set option3PrimaryName dialogue token automatically - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, - selected: [ - { - text: `${namespace}:option.3.selected`, - }, - ], - }) - .withPreOptionPhase(async () => { - // Do NOT await this, to prevent player from repeatedly pressing options - transitionMysteryEncounterIntroVisuals(false, false, 2000); - }) - .withOptionPhase(async () => { - // Fire types help calm the Volcarona - const encounter = globalScene.currentBattle.mysteryEncounter!; - await transitionMysteryEncounterIntroVisuals(); - setEncounterRewards( - { fillRemaining: true }, - undefined, - () => { - giveLeadPokemonAttackTypeBoostItem(); - }); - - const primary = encounter.options[2].primaryPokemon!; - - setEncounterExp([ primary.id ], getPokemonSpecies(Species.VOLCARONA).baseExp * 2); - leaveEncounterWithoutBattle(); - }) - .build() - ) - .build(); + setEncounterExp([primary.id], getPokemonSpecies(Species.VOLCARONA).baseExp * 2); + leaveEncounterWithoutBattle(); + }) + .build(), + ) + .build(); function giveLeadPokemonAttackTypeBoostItem() { // Give first party pokemon attack type boost item for free at end of battle @@ -266,7 +296,9 @@ function giveLeadPokemonAttackTypeBoostItem() { // Generate type booster held item, default to Charcoal if item fails to generate let boosterModifierType = generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER) as AttackTypeBoosterModifierType; if (!boosterModifierType) { - boosterModifierType = generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.FIRE ]) as AttackTypeBoosterModifierType; + boosterModifierType = generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ + PokemonType.FIRE, + ]) as AttackTypeBoosterModifierType; } applyModifierTypeToPlayerPokemon(leadPokemon, boosterModifierType); diff --git a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts index 1667a15e7c9..595d13cf727 100644 --- a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts +++ b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts @@ -1,18 +1,16 @@ import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import type { - EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { getRandomEncounterSpecies, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, - setEncounterRewards + setEncounterRewards, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { STEALING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; import type Pokemon from "#app/field/pokemon"; import { ModifierTier } from "#app/modifier/modifier-tier"; -import type { - ModifierTypeOption } from "#app/modifier/modifier-type"; +import type { ModifierTypeOption } from "#app/modifier/modifier-type"; import { getPlayerModifierTypeOptions, ModifierPoolType, @@ -25,7 +23,11 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { getEncounterPokemonLevelForWave, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + getEncounterPokemonLevelForWave, + getSpriteKeysFromPokemon, + STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import PokemonData from "#app/system/pokemon-data"; import { BattlerTagType } from "#enums/battler-tag-type"; import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; @@ -41,152 +43,163 @@ const namespace = "mysteryEncounters/fightOrFlight"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3795 | GitHub Issue #3795} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const FightOrFlightEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.FIGHT_OR_FLIGHT) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withCatchAllowed(true) - .withHideWildIntroMessage(true) - .withFleeAllowed(false) - .withIntroSpriteConfigs([]) // Set in onInit() - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - ]) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; +export const FightOrFlightEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.FIGHT_OR_FLIGHT, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withCatchAllowed(true) + .withHideWildIntroMessage(true) + .withFleeAllowed(false) + .withIntroSpriteConfigs([]) // Set in onInit() + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; - // Calculate boss mon - const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - const bossPokemon = getRandomEncounterSpecies(level, true); - encounter.setDialogueToken("enemyPokemon", bossPokemon.getNameToRender()); - const config: EnemyPartyConfig = { - pokemonConfigs: [{ + // Calculate boss mon + const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); + const bossPokemon = getRandomEncounterSpecies(level, true); + encounter.setDialogueToken("enemyPokemon", bossPokemon.getNameToRender()); + const config: EnemyPartyConfig = { + pokemonConfigs: [ + { level: level, species: bossPokemon.species, dataSource: new PokemonData(bossPokemon), isBoss: true, - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], mysteryEncounterBattleEffects: (pokemon: Pokemon) => { queueEncounterMessage(`${namespace}:option.1.stat_boost`); // Randomly boost 1 stat 2 stages // Cannot boost Spd, Acc, or Evasion - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ randSeedInt(4, 1) ], 2)); - } - }], - }; - encounter.enemyPartyConfigs = [ config ]; - - // Calculate item - // Waves 10-40 GREAT, 60-120 ULTRA, 120-160 ROGUE, 160-180 MASTER - const tier = - globalScene.currentBattle.waveIndex > 160 - ? ModifierTier.MASTER - : globalScene.currentBattle.waveIndex > 120 - ? ModifierTier.ROGUE - : globalScene.currentBattle.waveIndex > 40 - ? ModifierTier.ULTRA - : ModifierTier.GREAT; - regenerateModifierPoolThresholds(globalScene.getPlayerParty(), ModifierPoolType.PLAYER, 0); - let item: ModifierTypeOption | null = null; - // TMs and Candy Jar excluded from possible rewards as they're too swingy in value for a singular item reward - while (!item || item.type.id.includes("TM_") || item.type.id === "CANDY_JAR") { - item = getPlayerModifierTypeOptions(1, globalScene.getPlayerParty(), [], { guaranteedModifierTiers: [ tier ], allowLuckUpgrades: false })[0]; - } - encounter.setDialogueToken("itemName", item.type.name); - encounter.misc = item; - - const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon); - encounter.spriteConfigs = [ - { - spriteKey: item.type.iconImage, - fileRoot: "items", - hasShadow: false, - x: 35, - y: -5, - scale: 0.75, - isItem: true, - disableAnimation: true + globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [randSeedInt(4, 1)], 2)); + }, }, - { - spriteKey: spriteKey, - fileRoot: fileRoot, - hasShadow: true, - tint: 0.25, - x: -5, - repeat: true, - isPokemon: true, - isShiny: bossPokemon.shiny, - variant: bossPokemon.variant - }, - ]; + ], + }; + encounter.enemyPartyConfigs = [config]; - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withSimpleOption( + // Calculate item + // Waves 10-40 GREAT, 60-120 ULTRA, 120-160 ROGUE, 160-180 MASTER + const tier = + globalScene.currentBattle.waveIndex > 160 + ? ModifierTier.MASTER + : globalScene.currentBattle.waveIndex > 120 + ? ModifierTier.ROGUE + : globalScene.currentBattle.waveIndex > 40 + ? ModifierTier.ULTRA + : ModifierTier.GREAT; + regenerateModifierPoolThresholds(globalScene.getPlayerParty(), ModifierPoolType.PLAYER, 0); + let item: ModifierTypeOption | null = null; + // TMs and Candy Jar excluded from possible rewards as they're too swingy in value for a singular item reward + while (!item || item.type.id.includes("TM_") || item.type.id === "CANDY_JAR") { + item = getPlayerModifierTypeOptions(1, globalScene.getPlayerParty(), [], { + guaranteedModifierTiers: [tier], + allowLuckUpgrades: false, + })[0]; + } + encounter.setDialogueToken("itemName", item.type.name); + encounter.misc = item; + + const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon); + encounter.spriteConfigs = [ { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, + spriteKey: item.type.iconImage, + fileRoot: "items", + hasShadow: false, + x: 35, + y: -5, + scale: 0.75, + isItem: true, + disableAnimation: true, + }, + { + spriteKey: spriteKey, + fileRoot: fileRoot, + hasShadow: true, + tint: 0.25, + x: -5, + repeat: true, + isPokemon: true, + isShiny: bossPokemon.shiny, + variant: bossPokemon.variant, + }, + ]; + + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + }, + ], + }, + async () => { + // Pick battle + // Pokemon will randomly boost 1 stat by 2 stages + const item = globalScene.currentBattle.mysteryEncounter!.misc as ModifierTypeOption; + setEncounterRewards({ + guaranteedModifierTypeOptions: [item], + fillRemaining: false, + }); + await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]); + }, + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + .withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES, true)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`, selected: [ { - text: `${namespace}:option.1.selected`, + text: `${namespace}:option.2.selected`, }, ], - }, - async () => { - // Pick battle - // Pokemon will randomly boost 1 stat by 2 stages + }) + .withOptionPhase(async () => { + // Pick steal + const encounter = globalScene.currentBattle.mysteryEncounter!; const item = globalScene.currentBattle.mysteryEncounter!.misc as ModifierTypeOption; - setEncounterRewards({ guaranteedModifierTypeOptions: [ item ], fillRemaining: false }); - await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]); - } - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) - .withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES, true)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected` - } - ] - }) - .withOptionPhase(async () => { - // Pick steal - const encounter = globalScene.currentBattle.mysteryEncounter!; - const item = globalScene.currentBattle.mysteryEncounter!.misc as ModifierTypeOption; - setEncounterRewards({ guaranteedModifierTypeOptions: [ item ], fillRemaining: false }); + setEncounterRewards({ + guaranteedModifierTypeOptions: [item], + fillRemaining: false, + }); - // Use primaryPokemon to execute the thievery - const primaryPokemon = encounter.options[1].primaryPokemon!; - setEncounterExp(primaryPokemon.id, encounter.enemyPartyConfigs[0].pokemonConfigs![0].species.baseExp); - leaveEncounterWithoutBattle(); - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - selected: [ - { - text: `${namespace}:option.3.selected`, - }, - ], - }, - async () => { - // Leave encounter with no rewards or exp - leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + // Use primaryPokemon to execute the thievery + const primaryPokemon = encounter.options[1].primaryPokemon!; + setEncounterExp(primaryPokemon.id, encounter.enemyPartyConfigs[0].pokemonConfigs![0].species.baseExp); + leaveEncounterWithoutBattle(); + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + selected: [ + { + text: `${namespace}:option.3.selected`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); diff --git a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts index 4556c3ab6a0..c95810b94d0 100644 --- a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts +++ b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts @@ -1,4 +1,10 @@ -import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + leaveEncounterWithoutBattle, + selectPokemonForOption, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, + updatePlayerMoney, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; @@ -35,66 +41,65 @@ const namespace = "mysteryEncounters/funAndGames"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3819 | GitHub Issue #3819} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const FunAndGamesEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.FUN_AND_GAMES) - .withEncounterTier(MysteryEncounterTier.GREAT) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withSceneRequirement(new MoneyRequirement(0, 1.5)) // Cost equal to 1 Max Potion to play - .withAutoHideIntroVisuals(false) - // Allows using move without a visible enemy pokemon - .withBattleAnimationsWithoutTargets(true) - // The Wobbuffet won't use moves - .withSkipEnemyBattleTurns(true) - // Will skip COMMAND selection menu and go straight to FIGHT (move select) menu - .withSkipToFightInput(true) - .withFleeAllowed(false) - .withIntroSpriteConfigs([ - { - spriteKey: "fun_and_games_game", - fileRoot: "mystery-encounters", - hasShadow: false, - x: 0, - y: 6, - }, - { - spriteKey: "fun_and_games_wobbuffet", - fileRoot: "mystery-encounters", - hasShadow: true, - x: -28, - y: 6, - yShadow: 6 - }, - { - spriteKey: "fun_and_games_man", - fileRoot: "mystery-encounters", - hasShadow: true, - x: 40, - y: 6, - yShadow: 6 - }, - ]) - .withIntroDialogue([ - { - speaker: `${namespace}:speaker`, - text: `${namespace}:intro_dialogue`, - }, - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - globalScene.loadBgm("mystery_encounter_fun_and_games", "mystery_encounter_fun_and_games.mp3"); - encounter.setDialogueToken("wobbuffetName", getPokemonSpecies(Species.WOBBUFFET).getName()); - return true; - }) - .withOnVisualsStart(() => { - globalScene.fadeAndSwitchBgm("mystery_encounter_fun_and_games"); - return true; - }) - .withOption(MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) +export const FunAndGamesEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.FUN_AND_GAMES, +) + .withEncounterTier(MysteryEncounterTier.GREAT) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withSceneRequirement(new MoneyRequirement(0, 1.5)) // Cost equal to 1 Max Potion to play + .withAutoHideIntroVisuals(false) + // The Wobbuffet won't use moves + .withSkipEnemyBattleTurns(true) + // Will skip COMMAND selection menu and go straight to FIGHT (move select) menu + .withSkipToFightInput(true) + .withFleeAllowed(false) + .withIntroSpriteConfigs([ + { + spriteKey: "fun_and_games_game", + fileRoot: "mystery-encounters", + hasShadow: false, + x: 0, + y: 6, + }, + { + spriteKey: "fun_and_games_wobbuffet", + fileRoot: "mystery-encounters", + hasShadow: true, + x: -28, + y: 6, + yShadow: 6, + }, + { + spriteKey: "fun_and_games_man", + fileRoot: "mystery-encounters", + hasShadow: true, + x: 40, + y: 6, + yShadow: 6, + }, + ]) + .withIntroDialogue([ + { + speaker: `${namespace}:speaker`, + text: `${namespace}:intro_dialogue`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + globalScene.loadBgm("mystery_encounter_fun_and_games", "mystery_encounter_fun_and_games.mp3"); + encounter.setDialogueToken("wobbuffetName", getPokemonSpecies(Species.WOBBUFFET).getName()); + return true; + }) + .withOnVisualsStart(() => { + globalScene.fadeAndSwitchBgm("mystery_encounter_fun_and_games"); + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withSceneRequirement(new MoneyRequirement(0, 1.5)) // Cost equal to 1 Max Potion .withDialogue({ buttonLabel: `${namespace}:option.1.label`, @@ -129,7 +134,11 @@ export const FunAndGamesEncounter: MysteryEncounter = // Update money const moneyCost = (encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney; updatePlayerMoney(-moneyCost, true, false); - await showEncounterText(i18next.t("mysteryEncounterMessages:paid_money", { amount: moneyCost })); + await showEncounterText( + i18next.t("mysteryEncounterMessages:paid_money", { + amount: moneyCost, + }), + ); // Handlers for battle events encounter.onTurnStart = handleNextTurn; // triggered during TurnInitPhase @@ -141,28 +150,29 @@ export const FunAndGamesEncounter: MysteryEncounter = return true; }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - }, - ], - }, - async () => { - // Leave encounter with no rewards or exp - await transitionMysteryEncounterIntroVisuals(true, true); - leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + await transitionMysteryEncounterIntroVisuals(true, true); + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); async function summonPlayerPokemon() { + // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO: Consider refactoring to avoid async promise executor return new Promise(async resolve => { const encounter = globalScene.currentBattle.mysteryEncounter!; @@ -178,9 +188,15 @@ async function summonPlayerPokemon() { // Do trainer summon animation let playerAnimationPromise: Promise | undefined; - globalScene.ui.showText(i18next.t("battle:playerGo", { pokemonName: getPokemonNameWithAffix(playerPokemon) })); + globalScene.ui.showText( + i18next.t("battle:playerGo", { + pokemonName: getPokemonNameWithAffix(playerPokemon), + }), + ); globalScene.pbTray.hide(); - globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`); + globalScene.trainer.setTexture( + `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`, + ); globalScene.time.delayedCall(562, () => { globalScene.trainer.setFrame("2"); globalScene.time.delayedCall(64, () => { @@ -191,7 +207,7 @@ async function summonPlayerPokemon() { targets: globalScene.trainer, x: -36, duration: 1000, - onComplete: () => globalScene.trainer.setVisible(false) + onComplete: () => globalScene.trainer.setVisible(false), }); globalScene.time.delayedCall(750, () => { playerAnimationPromise = summonPlayerPokemonAnimation(playerPokemon); @@ -200,8 +216,14 @@ async function summonPlayerPokemon() { // Also loads Wobbuffet data (cannot be shiny) const enemySpecies = getPokemonSpecies(Species.WOBBUFFET); globalScene.currentBattle.enemyParty = []; - const wobbuffet = globalScene.addEnemyPokemon(enemySpecies, encounter.misc.playerPokemon.level, TrainerSlot.NONE, false, true); - wobbuffet.ivs = [ 0, 0, 0, 0, 0, 0 ]; + const wobbuffet = globalScene.addEnemyPokemon( + enemySpecies, + encounter.misc.playerPokemon.level, + TrainerSlot.NONE, + false, + true, + ); + wobbuffet.ivs = [0, 0, 0, 0, 0, 0]; wobbuffet.setNature(Nature.MILD); wobbuffet.setAlpha(0); wobbuffet.setVisible(false); @@ -221,6 +243,7 @@ async function summonPlayerPokemon() { } function handleLoseMinigame() { + // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO: Consider refactoring to avoid async promise executor return new Promise(async resolve => { // Check Wobbuffet is still alive const wobbuffet = globalScene.getEnemyPokemon(); @@ -229,7 +252,7 @@ function handleLoseMinigame() { // End the battle if (wobbuffet) { wobbuffet.hideInfo(); - globalScene.field.remove(wobbuffet); + wobbuffet.leaveField(); } transitionMysteryEncounterIntroVisuals(true, true); globalScene.currentBattle.enemyParty = []; @@ -260,15 +283,24 @@ function handleNextTurn() { let isHealPhase = false; if (healthRatio < 0.03) { // Grand prize - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.MULTI_LENS ], fillRemaining: false }); + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.MULTI_LENS], + fillRemaining: false, + }); resultMessageKey = `${namespace}:best_result`; } else if (healthRatio < 0.15) { // 2nd prize - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.SCOPE_LENS ], fillRemaining: false }); + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.SCOPE_LENS], + fillRemaining: false, + }); resultMessageKey = `${namespace}:great_result`; } else if (healthRatio < 0.33) { // 3rd prize - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.WIDE_LENS ], fillRemaining: false }); + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.WIDE_LENS], + fillRemaining: false, + }); resultMessageKey = `${namespace}:good_result`; } else { // No prize @@ -278,7 +310,7 @@ function handleNextTurn() { // End the battle wobbuffet.hideInfo(); - globalScene.field.remove(wobbuffet); + wobbuffet.leaveField(); globalScene.currentBattle.enemyParty = []; globalScene.currentBattle.mysteryEncounter!.doContinueEncounter = undefined; leaveEncounterWithoutBattle(isHealPhase); @@ -288,14 +320,13 @@ function handleNextTurn() { // Skip remainder of TurnInitPhase return true; - } else { - if (encounter.misc.turnsRemaining < 3) { - // Display charging messages on turns that aren't the initial turn - queueEncounterMessage(`${namespace}:charging_continue`); - } - queueEncounterMessage(`${namespace}:turn_remaining_${encounter.misc.turnsRemaining}`); - encounter.misc.turnsRemaining--; } + if (encounter.misc.turnsRemaining < 3) { + // Display charging messages on turns that aren't the initial turn + queueEncounterMessage(`${namespace}:charging_continue`); + } + queueEncounterMessage(`${namespace}:turn_remaining_${encounter.misc.turnsRemaining}`); + encounter.misc.turnsRemaining--; // Don't skip remainder of TurnInitPhase return false; @@ -338,7 +369,7 @@ function summonPlayerPokemonAnimation(pokemon: PlayerPokemon): Promise { globalScene.tweens.add({ targets: pokeball, duration: 650, - x: 100 + fpOffset[0] + x: 100 + fpOffset[0], }); globalScene.tweens.add({ @@ -389,11 +420,11 @@ function summonPlayerPokemonAnimation(pokemon: PlayerPokemon): Promise { globalScene.pushPhase(new PostSummonPhase(pokemon.getBattlerIndex())); resolve(); }); - } + }, }); - } + }, }); - } + }, }); }); } @@ -410,14 +441,14 @@ function hideShowmanIntroSprite() { y: "-=16", alpha: 0, ease: "Sine.easeInOut", - duration: 750 + duration: 750, }); // Slide the Wobbuffet and Game over slightly globalScene.tweens.add({ - targets: [ wobbuffet, carnivalGame ], + targets: [wobbuffet, carnivalGame], x: "+=16", ease: "Sine.easeInOut", - duration: 750 + duration: 750, }); } diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts index 65bbab16603..a81392941ba 100644 --- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts +++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts @@ -1,9 +1,17 @@ -import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { TrainerSlot, } from "#app/data/trainer-config"; +import { + leaveEncounterWithoutBattle, + selectPokemonForOption, + setEncounterRewards, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { TrainerSlot } from "#app/data/trainer-config"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { MusicPreference } from "#app/system/settings/settings"; import type { ModifierTypeOption } from "#app/modifier/modifier-type"; -import { getPlayerModifierTypeOptions, ModifierPoolType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; +import { + getPlayerModifierTypeOptions, + ModifierPoolType, + regenerateModifierPoolThresholds, +} from "#app/modifier/modifier-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; @@ -20,7 +28,12 @@ import type { PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { EnemyPokemon, PokemonMove } from "#app/field/pokemon"; import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { HiddenAbilityRateBoosterModifier, PokemonFormChangeItemModifier, ShinyRateBoosterModifier, SpeciesStatBoosterModifier } from "#app/modifier/modifier"; +import { + HiddenAbilityRateBoosterModifier, + PokemonFormChangeItemModifier, + ShinyRateBoosterModifier, + SpeciesStatBoosterModifier, +} from "#app/modifier/modifier"; import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import PokemonData from "#app/system/pokemon-data"; import i18next from "i18next"; @@ -43,15 +56,15 @@ const WONDER_TRADE_SHINY_CHANCE = 512; const MAX_WONDER_TRADE_SHINY_CHANCE = 4096; const LEGENDARY_TRADE_POOLS = { - 1: [ Species.RATTATA, Species.PIDGEY, Species.WEEDLE ], - 2: [ Species.SENTRET, Species.HOOTHOOT, Species.LEDYBA ], - 3: [ Species.POOCHYENA, Species.ZIGZAGOON, Species.TAILLOW ], - 4: [ Species.BIDOOF, Species.STARLY, Species.KRICKETOT ], - 5: [ Species.PATRAT, Species.PURRLOIN, Species.PIDOVE ], - 6: [ Species.BUNNELBY, Species.LITLEO, Species.SCATTERBUG ], - 7: [ Species.PIKIPEK, Species.YUNGOOS, Species.ROCKRUFF ], - 8: [ Species.SKWOVET, Species.WOOLOO, Species.ROOKIDEE ], - 9: [ Species.LECHONK, Species.FIDOUGH, Species.TAROUNTULA ] + 1: [Species.RATTATA, Species.PIDGEY, Species.WEEDLE], + 2: [Species.SENTRET, Species.HOOTHOOT, Species.LEDYBA], + 3: [Species.POOCHYENA, Species.ZIGZAGOON, Species.TAILLOW], + 4: [Species.BIDOOF, Species.STARLY, Species.KRICKETOT], + 5: [Species.PATRAT, Species.PURRLOIN, Species.PIDOVE], + 6: [Species.BUNNELBY, Species.LITLEO, Species.SCATTERBUG], + 7: [Species.PIKIPEK, Species.YUNGOOS, Species.ROCKRUFF], + 8: [Species.SKWOVET, Species.WOOLOO, Species.ROOKIDEE], + 9: [Species.LECHONK, Species.FIDOUGH, Species.TAROUNTULA], }; /** Exclude Paradox mons as they aren't considered legendary/mythical */ @@ -75,7 +88,7 @@ const EXCLUDED_TRADE_SPECIES = [ Species.IRON_VALIANT, Species.IRON_LEAVES, Species.IRON_BOULDER, - Species.IRON_CROWN + Species.IRON_CROWN, ]; /** @@ -83,363 +96,405 @@ const EXCLUDED_TRADE_SPECIES = [ * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3812 | GitHub Issue #3812} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const GlobalTradeSystemEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.GLOBAL_TRADE_SYSTEM) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withAutoHideIntroVisuals(false) - .withIntroSpriteConfigs([ - { - spriteKey: "global_trade_system", - fileRoot: "mystery-encounters", - hasShadow: true, - disableAnimation: true, - x: 3, - y: 5, - yShadow: 1 - } - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - } - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; +export const GlobalTradeSystemEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.GLOBAL_TRADE_SYSTEM, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withAutoHideIntroVisuals(false) + .withIntroSpriteConfigs([ + { + spriteKey: "global_trade_system", + fileRoot: "mystery-encounters", + hasShadow: true, + disableAnimation: true, + x: 3, + y: 5, + yShadow: 1, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; - // Load bgm - let bgmKey: string; - if (globalScene.musicPreference === MusicPreference.GENFIVE) { - bgmKey = "mystery_encounter_gen_5_gts"; - globalScene.loadBgm(bgmKey, `${bgmKey}.mp3`); - } else { - // Mixed option - bgmKey = "mystery_encounter_gen_6_gts"; - globalScene.loadBgm(bgmKey, `${bgmKey}.mp3`); - } + // Load bgm + let bgmKey: string; + if (globalScene.musicPreference === MusicPreference.GENFIVE) { + bgmKey = "mystery_encounter_gen_5_gts"; + globalScene.loadBgm(bgmKey, `${bgmKey}.mp3`); + } else { + // Mixed option + bgmKey = "mystery_encounter_gen_6_gts"; + globalScene.loadBgm(bgmKey, `${bgmKey}.mp3`); + } - // Load possible trade options - // Maps current party member's id to 3 EnemyPokemon objects - // None of the trade options can be the same species - const tradeOptionsMap: Map = getPokemonTradeOptions(); - encounter.misc = { - tradeOptionsMap, - bgmKey - }; + // Load possible trade options + // Maps current party member's id to 3 EnemyPokemon objects + // None of the trade options can be the same species + const tradeOptionsMap: Map = getPokemonTradeOptions(); + encounter.misc = { + tradeOptionsMap, + bgmKey, + }; - return true; - }) - .withOnVisualsStart(() => { - globalScene.fadeAndSwitchBgm(globalScene.currentBattle.mysteryEncounter!.misc.bgmKey); - return true; - }) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withHasDexProgress(true) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - secondOptionPrompt: `${namespace}:option.1.trade_options_prompt`, - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Get the trade species options for the selected pokemon - const tradeOptionsMap: Map = encounter.misc.tradeOptionsMap; - const tradeOptions = tradeOptionsMap.get(pokemon.id); - if (!tradeOptions) { - return []; - } - - return tradeOptions.map((tradePokemon: EnemyPokemon) => { - const option: OptionSelectItem = { - label: tradePokemon.getNameToRender(), - handler: () => { - // Pokemon trade selected - encounter.setDialogueToken("tradedPokemon", pokemon.getNameToRender()); - encounter.setDialogueToken("received", tradePokemon.getNameToRender()); - encounter.misc.tradedPokemon = pokemon; - encounter.misc.receivedPokemon = tradePokemon; - return true; - }, - onHover: () => { - const formName = tradePokemon.species.forms && tradePokemon.species.forms.length > tradePokemon.formIndex ? tradePokemon.species.forms[tradePokemon.formIndex].formName : null; - const line1 = i18next.t("pokemonInfoContainer:ability") + " " + tradePokemon.getAbility().name + (tradePokemon.getGender() !== Gender.GENDERLESS ? " | " + i18next.t("pokemonInfoContainer:gender") + " " + getGenderSymbol(tradePokemon.getGender()) : ""); - const line2 = i18next.t("pokemonInfoContainer:nature") + " " + getNatureName(tradePokemon.getNature()) + (formName ? " | " + i18next.t("pokemonInfoContainer:form") + " " + formName : ""); - showEncounterText(`${line1}\n${line2}`, 0, 0, false); - }, - }; - return option; - }); - }; - - return selectPokemonForOption(onPokemonSelected); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const tradedPokemon: PlayerPokemon = encounter.misc.tradedPokemon; - const receivedPokemonData: EnemyPokemon = encounter.misc.receivedPokemon; - const modifiers = tradedPokemon.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier) && !(m instanceof SpeciesStatBoosterModifier)); - - // Generate a trainer name - const traderName = generateRandomTraderName(); - encounter.setDialogueToken("tradeTrainerName", traderName.trim()); - - // Remove the original party member from party - globalScene.removePokemonFromPlayerParty(tradedPokemon, false); - - // Set data properly, then generate the new Pokemon's assets - receivedPokemonData.passive = tradedPokemon.passive; - // Pokeball to Ultra ball, randomly - receivedPokemonData.pokeball = randInt(4) as PokeballType; - const dataSource = new PokemonData(receivedPokemonData); - const newPlayerPokemon = globalScene.addPlayerPokemon(receivedPokemonData.species, receivedPokemonData.level, dataSource.abilityIndex, dataSource.formIndex, dataSource.gender, dataSource.shiny, dataSource.variant, dataSource.ivs, dataSource.nature, dataSource); - globalScene.getPlayerParty().push(newPlayerPokemon); - await newPlayerPokemon.loadAssets(); - - for (const mod of modifiers) { - mod.pokemonId = newPlayerPokemon.id; - globalScene.addModifier(mod, true, false, false, true); + return true; + }) + .withOnVisualsStart(() => { + globalScene.fadeAndSwitchBgm(globalScene.currentBattle.mysteryEncounter!.misc.bgmKey); + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withHasDexProgress(true) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + secondOptionPrompt: `${namespace}:option.1.trade_options_prompt`, + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Get the trade species options for the selected pokemon + const tradeOptionsMap: Map = encounter.misc.tradeOptionsMap; + const tradeOptions = tradeOptionsMap.get(pokemon.id); + if (!tradeOptions) { + return []; } - // Show the trade animation - await showTradeBackground(); - await doPokemonTradeSequence(tradedPokemon, newPlayerPokemon); - await showEncounterText(`${namespace}:trade_received`, null, 0, true, 4000); - globalScene.playBgm(encounter.misc.bgmKey); - await addPokemonDataToDexAndValidateAchievements(newPlayerPokemon); - await hideTradeBackground(); - tradedPokemon.destroy(); + return tradeOptions.map((tradePokemon: EnemyPokemon) => { + const option: OptionSelectItem = { + label: tradePokemon.getNameToRender(), + handler: () => { + // Pokemon trade selected + encounter.setDialogueToken("tradedPokemon", pokemon.getNameToRender()); + encounter.setDialogueToken("received", tradePokemon.getNameToRender()); + encounter.misc.tradedPokemon = pokemon; + encounter.misc.receivedPokemon = tradePokemon; + return true; + }, + onHover: () => { + const formName = + tradePokemon.species.forms && tradePokemon.species.forms.length > tradePokemon.formIndex + ? tradePokemon.species.forms[tradePokemon.formIndex].formName + : null; + const line1 = `${i18next.t("pokemonInfoContainer:ability")} ${tradePokemon.getAbility().name}${ + tradePokemon.getGender() !== Gender.GENDERLESS + ? ` | ${i18next.t("pokemonInfoContainer:gender")} ${getGenderSymbol(tradePokemon.getGender())}` + : "" + }`; + const line2 = + i18next.t("pokemonInfoContainer:nature") + + " " + + getNatureName(tradePokemon.getNature()) + + (formName ? ` | ${i18next.t("pokemonInfoContainer:form")} ${formName}` : ""); + showEncounterText(`${line1}\n${line2}`, 0, 0, false); + }, + }; + return option; + }); + }; - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withHasDexProgress(true) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Randomly generate a Wonder Trade pokemon - const randomTradeOption = generateTradeOption(globalScene.getPlayerParty().map(p => p.species)); - const tradePokemon = new EnemyPokemon(randomTradeOption, pokemon.level, TrainerSlot.NONE, false); - // Extra shiny roll at 1/128 odds (boosted by events and charms) - if (!tradePokemon.shiny) { - const shinyThreshold = new NumberHolder(WONDER_TRADE_SHINY_CHANCE); - if (globalScene.eventManager.isEventActive()) { - shinyThreshold.value *= globalScene.eventManager.getShinyMultiplier(); - } - globalScene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); + return selectPokemonForOption(onPokemonSelected); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const tradedPokemon: PlayerPokemon = encounter.misc.tradedPokemon; + const receivedPokemonData: EnemyPokemon = encounter.misc.receivedPokemon; + const modifiers = tradedPokemon + .getHeldItems() + .filter(m => !(m instanceof PokemonFormChangeItemModifier) && !(m instanceof SpeciesStatBoosterModifier)); - // Base shiny chance of 512/65536 -> 1/128, affected by events and Shiny Charms - // Maximum shiny chance of 4096/65536 -> 1/16, cannot improve further after that - const shinyChance = Math.min(shinyThreshold.value, MAX_WONDER_TRADE_SHINY_CHANCE); + // Generate a trainer name + const traderName = generateRandomTraderName(); + encounter.setDialogueToken("tradeTrainerName", traderName.trim()); - tradePokemon.trySetShinySeed(shinyChance, false); + // Remove the original party member from party + globalScene.removePokemonFromPlayerParty(tradedPokemon, false); + + // Set data properly, then generate the new Pokemon's assets + receivedPokemonData.passive = tradedPokemon.passive; + // Pokeball to Ultra ball, randomly + receivedPokemonData.pokeball = randInt(4) as PokeballType; + const dataSource = new PokemonData(receivedPokemonData); + const newPlayerPokemon = globalScene.addPlayerPokemon( + receivedPokemonData.species, + receivedPokemonData.level, + dataSource.abilityIndex, + dataSource.formIndex, + dataSource.gender, + dataSource.shiny, + dataSource.variant, + dataSource.ivs, + dataSource.nature, + dataSource, + ); + globalScene.getPlayerParty().push(newPlayerPokemon); + await newPlayerPokemon.loadAssets(); + + for (const mod of modifiers) { + mod.pokemonId = newPlayerPokemon.id; + globalScene.addModifier(mod, true, false, false, true); + } + + // Show the trade animation + await showTradeBackground(); + await doPokemonTradeSequence(tradedPokemon, newPlayerPokemon); + await showEncounterText(`${namespace}:trade_received`, null, 0, true, 4000); + globalScene.playBgm(encounter.misc.bgmKey); + await addPokemonDataToDexAndValidateAchievements(newPlayerPokemon); + await hideTradeBackground(); + tradedPokemon.destroy(); + + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withHasDexProgress(true) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Randomly generate a Wonder Trade pokemon + const randomTradeOption = generateTradeOption(globalScene.getPlayerParty().map(p => p.species)); + const tradePokemon = new EnemyPokemon(randomTradeOption, pokemon.level, TrainerSlot.NONE, false); + // Extra shiny roll at 1/128 odds (boosted by events and charms) + if (!tradePokemon.shiny) { + const shinyThreshold = new NumberHolder(WONDER_TRADE_SHINY_CHANCE); + if (globalScene.eventManager.isEventActive()) { + shinyThreshold.value *= globalScene.eventManager.getShinyMultiplier(); } + globalScene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); - // Extra HA roll at base 1/64 odds (boosted by events and charms) - const hiddenIndex = tradePokemon.species.ability2 ? 2 : 1; - if (tradePokemon.species.abilityHidden) { - if (tradePokemon.abilityIndex < hiddenIndex) { - const hiddenAbilityChance = new NumberHolder(64); - globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance); + // Base shiny chance of 512/65536 -> 1/128, affected by events and Shiny Charms + // Maximum shiny chance of 4096/65536 -> 1/16, cannot improve further after that + const shinyChance = Math.min(shinyThreshold.value, MAX_WONDER_TRADE_SHINY_CHANCE); - const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value); + tradePokemon.trySetShinySeed(shinyChance, false); + } - if (hasHiddenAbility) { - tradePokemon.abilityIndex = hiddenIndex; + // Extra HA roll at base 1/64 odds (boosted by events and charms) + const hiddenIndex = tradePokemon.species.ability2 ? 2 : 1; + if (tradePokemon.species.abilityHidden) { + if (tradePokemon.abilityIndex < hiddenIndex) { + const hiddenAbilityChance = new NumberHolder(64); + globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance); + + const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value); + + if (hasHiddenAbility) { + tradePokemon.abilityIndex = hiddenIndex; + } + } + } + + // If Pokemon is still not shiny or with HA, give the Pokemon a random Common egg move in its moveset + if (!tradePokemon.shiny && (!tradePokemon.species.abilityHidden || tradePokemon.abilityIndex < hiddenIndex)) { + const eggMoves = tradePokemon.getEggMoves(); + if (eggMoves) { + // Cannot gen the rare egg move, only 1 of the first 3 common moves + const eggMove = eggMoves[randSeedInt(3)]; + if (!tradePokemon.moveset.some(m => m?.moveId === eggMove)) { + if (tradePokemon.moveset.length < 4) { + tradePokemon.moveset.push(new PokemonMove(eggMove)); + } else { + const eggMoveIndex = randSeedInt(4); + tradePokemon.moveset[eggMoveIndex] = new PokemonMove(eggMove); } } } - - // If Pokemon is still not shiny or with HA, give the Pokemon a random Common egg move in its moveset - if (!tradePokemon.shiny && (!tradePokemon.species.abilityHidden || tradePokemon.abilityIndex < hiddenIndex)) { - const eggMoves = tradePokemon.getEggMoves(); - if (eggMoves) { - // Cannot gen the rare egg move, only 1 of the first 3 common moves - const eggMove = eggMoves[randSeedInt(3)]; - if (!tradePokemon.moveset.some(m => m?.moveId === eggMove)) { - if (tradePokemon.moveset.length < 4) { - tradePokemon.moveset.push(new PokemonMove(eggMove)); - } else { - const eggMoveIndex = randSeedInt(4); - tradePokemon.moveset[eggMoveIndex] = new PokemonMove(eggMove); - } - } - } - } - - encounter.setDialogueToken("tradedPokemon", pokemon.getNameToRender()); - encounter.setDialogueToken("received", tradePokemon.getNameToRender()); - encounter.misc.tradedPokemon = pokemon; - encounter.misc.receivedPokemon = tradePokemon; - }; - - return selectPokemonForOption(onPokemonSelected); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const tradedPokemon: PlayerPokemon = encounter.misc.tradedPokemon; - const receivedPokemonData: EnemyPokemon = encounter.misc.receivedPokemon; - const modifiers = tradedPokemon.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier) && !(m instanceof SpeciesStatBoosterModifier)); - - // Generate a trainer name - const traderName = generateRandomTraderName(); - encounter.setDialogueToken("tradeTrainerName", traderName.trim()); - - // Remove the original party member from party - globalScene.removePokemonFromPlayerParty(tradedPokemon, false); - - // Set data properly, then generate the new Pokemon's assets - receivedPokemonData.passive = tradedPokemon.passive; - receivedPokemonData.pokeball = randInt(4) as PokeballType; - const dataSource = new PokemonData(receivedPokemonData); - const newPlayerPokemon = globalScene.addPlayerPokemon(receivedPokemonData.species, receivedPokemonData.level, dataSource.abilityIndex, dataSource.formIndex, dataSource.gender, dataSource.shiny, dataSource.variant, dataSource.ivs, dataSource.nature, dataSource); - globalScene.getPlayerParty().push(newPlayerPokemon); - await newPlayerPokemon.loadAssets(); - - for (const mod of modifiers) { - mod.pokemonId = newPlayerPokemon.id; - globalScene.addModifier(mod, true, false, false, true); } - // Show the trade animation - await showTradeBackground(); - await doPokemonTradeSequence(tradedPokemon, newPlayerPokemon); - await showEncounterText(`${namespace}:trade_received`, null, 0, true, 4000); - globalScene.playBgm(encounter.misc.bgmKey); - await addPokemonDataToDexAndValidateAchievements(newPlayerPokemon); - await hideTradeBackground(); - tradedPokemon.destroy(); + encounter.setDialogueToken("tradedPokemon", pokemon.getNameToRender()); + encounter.setDialogueToken("received", tradePokemon.getNameToRender()); + encounter.misc.tradedPokemon = pokemon; + encounter.misc.receivedPokemon = tradePokemon; + }; - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - secondOptionPrompt: `${namespace}:option.3.trade_options_prompt`, - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Get Pokemon held items and filter for valid ones - const validItems = pokemon.getHeldItems().filter((it) => { - return it.isTransferable; - }); + return selectPokemonForOption(onPokemonSelected); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const tradedPokemon: PlayerPokemon = encounter.misc.tradedPokemon; + const receivedPokemonData: EnemyPokemon = encounter.misc.receivedPokemon; + const modifiers = tradedPokemon + .getHeldItems() + .filter(m => !(m instanceof PokemonFormChangeItemModifier) && !(m instanceof SpeciesStatBoosterModifier)); - return validItems.map((modifier: PokemonHeldItemModifier) => { - const option: OptionSelectItem = { - label: modifier.type.name, - handler: () => { - // Pokemon and item selected - encounter.setDialogueToken("chosenItem", modifier.type.name); - encounter.misc.chosenModifier = modifier; - encounter.misc.chosenPokemon = pokemon; - return true; - }, - }; - return option; - }); - }; + // Generate a trainer name + const traderName = generateRandomTraderName(); + encounter.setDialogueToken("tradeTrainerName", traderName.trim()); - const selectableFilter = (pokemon: Pokemon) => { - // If pokemon has items to trade - const meetsReqs = pokemon.getHeldItems().filter((it) => { + // Remove the original party member from party + globalScene.removePokemonFromPlayerParty(tradedPokemon, false); + + // Set data properly, then generate the new Pokemon's assets + receivedPokemonData.passive = tradedPokemon.passive; + receivedPokemonData.pokeball = randInt(4) as PokeballType; + const dataSource = new PokemonData(receivedPokemonData); + const newPlayerPokemon = globalScene.addPlayerPokemon( + receivedPokemonData.species, + receivedPokemonData.level, + dataSource.abilityIndex, + dataSource.formIndex, + dataSource.gender, + dataSource.shiny, + dataSource.variant, + dataSource.ivs, + dataSource.nature, + dataSource, + ); + globalScene.getPlayerParty().push(newPlayerPokemon); + await newPlayerPokemon.loadAssets(); + + for (const mod of modifiers) { + mod.pokemonId = newPlayerPokemon.id; + globalScene.addModifier(mod, true, false, false, true); + } + + // Show the trade animation + await showTradeBackground(); + await doPokemonTradeSequence(tradedPokemon, newPlayerPokemon); + await showEncounterText(`${namespace}:trade_received`, null, 0, true, 4000); + globalScene.playBgm(encounter.misc.bgmKey); + await addPokemonDataToDexAndValidateAchievements(newPlayerPokemon); + await hideTradeBackground(); + tradedPokemon.destroy(); + + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + secondOptionPrompt: `${namespace}:option.3.trade_options_prompt`, + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Get Pokemon held items and filter for valid ones + const validItems = pokemon.getHeldItems().filter(it => { + return it.isTransferable; + }); + + return validItems.map((modifier: PokemonHeldItemModifier) => { + const option: OptionSelectItem = { + label: modifier.type.name, + handler: () => { + // Pokemon and item selected + encounter.setDialogueToken("chosenItem", modifier.type.name); + encounter.misc.chosenModifier = modifier; + encounter.misc.chosenPokemon = pokemon; + return true; + }, + }; + return option; + }); + }; + + const selectableFilter = (pokemon: Pokemon) => { + // If pokemon has items to trade + const meetsReqs = + pokemon.getHeldItems().filter(it => { return it.isTransferable; }).length > 0; - if (!meetsReqs) { - return getEncounterText(`${namespace}:option.3.invalid_selection`) ?? null; - } - - return null; - }; - - return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const modifier = encounter.misc.chosenModifier as PokemonHeldItemModifier; - const party = globalScene.getPlayerParty(); - const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon; - - // Check tier of the traded item, the received item will be one tier up - const type = modifier.type.withTierFromPool(ModifierPoolType.PLAYER, party); - let tier = type.tier ?? ModifierTier.GREAT; - // Eggs and White Herb are not in the pool - if (type.id === "WHITE_HERB") { - tier = ModifierTier.GREAT; - } else if (type.id === "LUCKY_EGG") { - tier = ModifierTier.ULTRA; - } else if (type.id === "GOLDEN_EGG") { - tier = ModifierTier.ROGUE; - } - // Increment tier by 1 - if (tier < ModifierTier.MASTER) { - tier++; + if (!meetsReqs) { + return getEncounterText(`${namespace}:option.3.invalid_selection`) ?? null; } - regenerateModifierPoolThresholds(party, ModifierPoolType.PLAYER, 0); - let item: ModifierTypeOption | null = null; - // TMs excluded from possible rewards - while (!item || item.type.id.includes("TM_")) { - item = getPlayerModifierTypeOptions(1, party, [], { guaranteedModifierTiers: [ tier ], allowLuckUpgrades: false })[0]; - } + return null; + }; - encounter.setDialogueToken("itemName", item.type.name); - setEncounterRewards({ guaranteedModifierTypeOptions: [ item ], fillRemaining: false }); + return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const modifier = encounter.misc.chosenModifier as PokemonHeldItemModifier; + const party = globalScene.getPlayerParty(); + const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon; - chosenPokemon.loseHeldItem(modifier, false); - await globalScene.updateModifiers(true, true); + // Check tier of the traded item, the received item will be one tier up + const type = modifier.type.withTierFromPool(ModifierPoolType.PLAYER, party); + let tier = type.tier ?? ModifierTier.GREAT; + // Eggs and White Herb are not in the pool + if (type.id === "WHITE_HERB") { + tier = ModifierTier.GREAT; + } else if (type.id === "LUCKY_EGG") { + tier = ModifierTier.ULTRA; + } else if (type.id === "GOLDEN_EGG") { + tier = ModifierTier.ROGUE; + } + // Increment tier by 1 + if (tier < ModifierTier.MASTER) { + tier++; + } - // Generate a trainer name - const traderName = generateRandomTraderName(); - encounter.setDialogueToken("tradeTrainerName", traderName.trim()); - await showEncounterText(`${namespace}:item_trade_selected`); - leaveEncounterWithoutBattle(); - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.4.label`, - buttonTooltip: `${namespace}:option.4.tooltip`, - selected: [ - { - text: `${namespace}:option.4.selected`, - }, - ], - }, - async () => { - // Leave encounter with no rewards or exp - leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + regenerateModifierPoolThresholds(party, ModifierPoolType.PLAYER, 0); + let item: ModifierTypeOption | null = null; + // TMs excluded from possible rewards + while (!item || item.type.id.includes("TM_")) { + item = getPlayerModifierTypeOptions(1, party, [], { + guaranteedModifierTiers: [tier], + allowLuckUpgrades: false, + })[0]; + } + + encounter.setDialogueToken("itemName", item.type.name); + setEncounterRewards({ + guaranteedModifierTypeOptions: [item], + fillRemaining: false, + }); + + chosenPokemon.loseHeldItem(modifier, false); + await globalScene.updateModifiers(true, true); + + // Generate a trainer name + const traderName = generateRandomTraderName(); + encounter.setDialogueToken("tradeTrainerName", traderName.trim()); + await showEncounterText(`${namespace}:item_trade_selected`); + leaveEncounterWithoutBattle(); + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.4.label`, + buttonTooltip: `${namespace}:option.4.tooltip`, + selected: [ + { + text: `${namespace}:option.4.selected`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); function getPokemonTradeOptions(): Map { const tradeOptionsMap: Map = new Map(); // Starts by filtering out any current party members as valid resulting species const alreadyUsedSpecies: PokemonSpecies[] = globalScene.getPlayerParty().map(p => p.species); - globalScene.getPlayerParty().forEach(pokemon => { + for (const pokemon of globalScene.getPlayerParty()) { // If the party member is legendary/mythical, the only trade options available are always pulled from generation-specific legendary trade pools if (pokemon.species.legendary || pokemon.species.subLegendary || pokemon.species.mythical) { const generation = pokemon.species.generation; @@ -459,11 +514,14 @@ function getPokemonTradeOptions(): Map { } // Add trade options to map - tradeOptionsMap.set(pokemon.id, tradeOptions.map(s => { - return new EnemyPokemon(s, pokemon.level, TrainerSlot.NONE, false); - })); + tradeOptionsMap.set( + pokemon.id, + tradeOptions.map(s => { + return new EnemyPokemon(s, pokemon.level, TrainerSlot.NONE, false); + }), + ); } - }); + } return tradeOptionsMap; } @@ -478,13 +536,12 @@ function generateTradeOption(alreadyUsedSpecies: PokemonSpecies[], originalBst?: } while (isNullOrUndefined(newSpecies)) { // Get all non-legendary species that fall within the Bst range requirements - let validSpecies = allSpecies - .filter(s => { - const isLegendaryOrMythical = s.legendary || s.subLegendary || s.mythical; - const speciesBst = s.getBaseStatTotal(); - const bstInRange = speciesBst >= bstMin && speciesBst <= bstCap; - return !isLegendaryOrMythical && bstInRange && !EXCLUDED_TRADE_SPECIES.includes(s.speciesId); - }); + let validSpecies = allSpecies.filter(s => { + const isLegendaryOrMythical = s.legendary || s.subLegendary || s.mythical; + const speciesBst = s.getBaseStatTotal(); + const bstInRange = speciesBst >= bstMin && speciesBst <= bstCap; + return !isLegendaryOrMythical && bstInRange && !EXCLUDED_TRADE_SPECIES.includes(s.speciesId); + }); // There must be at least 20 species available before it will choose one if (validSpecies?.length > 20) { @@ -508,7 +565,13 @@ function showTradeBackground() { const tradeContainer = globalScene.add.container(0, -globalScene.game.canvas.height / 6); tradeContainer.setName("Trade Background"); - const flyByStaticBg = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0); + const flyByStaticBg = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6, + 0, + ); flyByStaticBg.setName("Black Background"); flyByStaticBg.setOrigin(0, 0); flyByStaticBg.setVisible(false); @@ -531,7 +594,7 @@ function showTradeBackground() { ease: "Sine.easeInOut", onComplete: () => { resolve(); - } + }, }); }); } @@ -548,7 +611,7 @@ function hideTradeBackground() { onComplete: () => { globalScene.fieldUI.remove(transformationContainer, true); resolve(); - } + }, }); }); } @@ -569,8 +632,16 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P let receivedPokemonTintSprite: Phaser.GameObjects.Sprite; const getPokemonSprite = () => { - const ret = globalScene.addPokemonSprite(tradedPokemon, tradeBaseBg.displayWidth / 2, tradeBaseBg.displayHeight / 2, "pkmn__sub"); - ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true }); + const ret = globalScene.addPokemonSprite( + tradedPokemon, + tradeBaseBg.displayWidth / 2, + tradeBaseBg.displayHeight / 2, + "pkmn__sub", + ); + ret.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + }); return ret; }; @@ -586,7 +657,7 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P receivedPokemonTintSprite.setVisible(false); receivedPokemonTintSprite.setTintFill(getPokeballTintColor(receivedPokemon.pokeball)); - [ tradedPokemonSprite, tradedPokemonTintSprite ].map(sprite => { + [tradedPokemonSprite, tradedPokemonTintSprite].map(sprite => { const spriteKey = tradedPokemon.getSpriteKey(true); try { sprite.play(spriteKey); @@ -594,12 +665,17 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P console.error(`Failed to play animation for ${spriteKey}`, err); } - sprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: false, teraColor: getTypeRgb(tradedPokemon.getTeraType()) }); + sprite.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + hasShadow: false, + teraColor: getTypeRgb(tradedPokemon.getTeraType()), + isTerastallized: tradedPokemon.isTerastallized, + }); sprite.setPipelineData("ignoreTimeTint", true); sprite.setPipelineData("spriteKey", tradedPokemon.getSpriteKey()); sprite.setPipelineData("shiny", tradedPokemon.shiny); sprite.setPipelineData("variant", tradedPokemon.variant); - [ "spriteColors", "fusionSpriteColors" ].map(k => { + ["spriteColors", "fusionSpriteColors"].map(k => { if (tradedPokemon.summonData?.speciesForm) { k += "Base"; } @@ -607,7 +683,7 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P }); }); - [ receivedPokemonSprite, receivedPokemonTintSprite ].map(sprite => { + [receivedPokemonSprite, receivedPokemonTintSprite].map(sprite => { const spriteKey = receivedPokemon.getSpriteKey(true); try { sprite.play(spriteKey); @@ -615,12 +691,17 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P console.error(`Failed to play animation for ${spriteKey}`, err); } - sprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: false, teraColor: getTypeRgb(tradedPokemon.getTeraType()) }); + sprite.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + hasShadow: false, + teraColor: getTypeRgb(tradedPokemon.getTeraType()), + isTerastallized: tradedPokemon.isTerastallized, + }); sprite.setPipelineData("ignoreTimeTint", true); sprite.setPipelineData("spriteKey", receivedPokemon.getSpriteKey()); sprite.setPipelineData("shiny", receivedPokemon.shiny); sprite.setPipelineData("variant", receivedPokemon.variant); - [ "spriteColors", "fusionSpriteColors" ].map(k => { + ["spriteColors", "fusionSpriteColors"].map(k => { if (receivedPokemon.summonData?.speciesForm) { k += "Base"; } @@ -630,13 +711,23 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P // Traded pokemon pokeball const tradedPbAtlasKey = getPokeballAtlasKey(tradedPokemon.pokeball); - const tradedPokeball: Phaser.GameObjects.Sprite = globalScene.add.sprite(tradeBaseBg.displayWidth / 2, tradeBaseBg.displayHeight / 2, "pb", tradedPbAtlasKey); + const tradedPokeball: Phaser.GameObjects.Sprite = globalScene.add.sprite( + tradeBaseBg.displayWidth / 2, + tradeBaseBg.displayHeight / 2, + "pb", + tradedPbAtlasKey, + ); tradedPokeball.setVisible(false); tradeContainer.add(tradedPokeball); // Received pokemon pokeball const receivedPbAtlasKey = getPokeballAtlasKey(receivedPokemon.pokeball); - const receivedPokeball: Phaser.GameObjects.Sprite = globalScene.add.sprite(tradeBaseBg.displayWidth / 2, tradeBaseBg.displayHeight / 2, "pb", receivedPbAtlasKey); + const receivedPokeball: Phaser.GameObjects.Sprite = globalScene.add.sprite( + tradeBaseBg.displayWidth / 2, + tradeBaseBg.displayHeight / 2, + "pb", + receivedPbAtlasKey, + ); receivedPokeball.setVisible(false); tradeContainer.add(receivedPokeball); @@ -669,7 +760,7 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P // addPokeballOpenParticles(tradedPokemon.x, tradedPokemon.y, tradedPokemon.pokeball); globalScene.tweens.add({ - targets: [ tradedPokemonTintSprite, tradedPokemonSprite ], + targets: [tradedPokemonTintSprite, tradedPokemonSprite], duration: 500, ease: "Sine.easeIn", scale: 0.25, @@ -700,22 +791,31 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P }, onComplete: async () => { await doPokemonTradeFlyBySequence(tradedPokemonSprite, receivedPokemonSprite); - await doTradeReceivedSequence(receivedPokemon, receivedPokemonSprite, receivedPokemonTintSprite, receivedPokeball, receivedPbAtlasKey); + await doTradeReceivedSequence( + receivedPokemon, + receivedPokemonSprite, + receivedPokemonTintSprite, + receivedPokeball, + receivedPbAtlasKey, + ); resolve(); - } + }, }); - } + }, }); - } + }, }); - } + }, }); - } + }, }); }); } -function doPokemonTradeFlyBySequence(tradedPokemonSprite: Phaser.GameObjects.Sprite, receivedPokemonSprite: Phaser.GameObjects.Sprite) { +function doPokemonTradeFlyBySequence( + tradedPokemonSprite: Phaser.GameObjects.Sprite, + receivedPokemonSprite: Phaser.GameObjects.Sprite, +) { return new Promise(resolve => { const tradeContainer = globalScene.fieldUI.getByName("Trade Background") as Phaser.GameObjects.Container; const tradeBaseBg = tradeContainer.getByName("Trade Background Image") as Phaser.GameObjects.Image; @@ -728,7 +828,7 @@ function doPokemonTradeFlyBySequence(tradedPokemonSprite: Phaser.GameObjects.Spr tradedPokemonSprite.y = 200; tradedPokemonSprite.scale = 1; tradedPokemonSprite.setVisible(true); - receivedPokemonSprite.x = tradeBaseBg.displayWidth * 3 / 4; + receivedPokemonSprite.x = (tradeBaseBg.displayWidth * 3) / 4; receivedPokemonSprite.y = -200; receivedPokemonSprite.scale = 1; receivedPokemonSprite.setVisible(true); @@ -745,7 +845,7 @@ function doPokemonTradeFlyBySequence(tradedPokemonSprite: Phaser.GameObjects.Spr duration: FADE_DELAY, onComplete: () => { globalScene.tweens.add({ - targets: [ receivedPokemonSprite, tradedPokemonSprite ], + targets: [receivedPokemonSprite, tradedPokemonSprite], y: tradeBaseBg.displayWidth / 2 - 100, ease: "Cubic.easeInOut", duration: BASE_ANIM_DURATION * 3, @@ -755,11 +855,11 @@ function doPokemonTradeFlyBySequence(tradedPokemonSprite: Phaser.GameObjects.Spr x: tradeBaseBg.displayWidth / 4, ease: "Cubic.easeInOut", duration: BASE_ANIM_DURATION / 2, - delay: ANIM_DELAY + delay: ANIM_DELAY, }); globalScene.tweens.add({ targets: tradedPokemonSprite, - x: tradeBaseBg.displayWidth * 3 / 4, + x: (tradeBaseBg.displayWidth * 3) / 4, ease: "Cubic.easeInOut", duration: BASE_ANIM_DURATION / 2, delay: ANIM_DELAY, @@ -785,20 +885,26 @@ function doPokemonTradeFlyBySequence(tradedPokemonSprite: Phaser.GameObjects.Spr duration: FADE_DELAY, onComplete: () => { resolve(); - } + }, }); - } + }, }); - } + }, }); - } + }, }); - } + }, }); }); } -function doTradeReceivedSequence(receivedPokemon: PlayerPokemon, receivedPokemonSprite: Phaser.GameObjects.Sprite, receivedPokemonTintSprite: Phaser.GameObjects.Sprite, receivedPokeballSprite: Phaser.GameObjects.Sprite, receivedPbAtlasKey: string) { +function doTradeReceivedSequence( + receivedPokemon: PlayerPokemon, + receivedPokemonSprite: Phaser.GameObjects.Sprite, + receivedPokemonTintSprite: Phaser.GameObjects.Sprite, + receivedPokeballSprite: Phaser.GameObjects.Sprite, + receivedPbAtlasKey: string, +) { return new Promise(resolve => { const tradeContainer = globalScene.fieldUI.getByName("Trade Background") as Phaser.GameObjects.Container; const tradeBaseBg = tradeContainer.getByName("Trade Background Image") as Phaser.GameObjects.Image; @@ -851,7 +957,7 @@ function doTradeReceivedSequence(receivedPokemon: PlayerPokemon, receivedPokemon targets: receivedPokemonSprite, duration: 250, ease: "Sine.easeOut", - scale: 1 + scale: 1, }); globalScene.tweens.add({ targets: receivedPokemonTintSprite, @@ -867,10 +973,10 @@ function doTradeReceivedSequence(receivedPokemon: PlayerPokemon, receivedPokemon } receivedPokeballSprite.destroy(); globalScene.time.delayedCall(2000, () => resolve()); - } + }, }); }); - } + }, }); }); } @@ -884,7 +990,7 @@ function generateRandomTraderName() { } // Some trainers have 2 gendered pools, some do not const genderedPool = trainerTypePool[randInt(trainerTypePool.length)]; - const trainerNameString = genderedPool instanceof Array ? genderedPool[randInt(genderedPool.length)] : genderedPool; + const trainerNameString = Array.isArray(genderedPool) ? genderedPool[randInt(genderedPool.length)] : genderedPool; // Some names have an '&' symbol and need to be trimmed to a single name instead of a double name const trainerNames = trainerNameString.split(" & "); return trainerNames[randInt(trainerNames.length)]; diff --git a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts index 34c808359b7..97fd5783ebb 100644 --- a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts +++ b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts @@ -29,7 +29,9 @@ const namespace = "mysteryEncounters/lostAtSea"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3793 | GitHub Issue #3793} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.LOST_AT_SEA) +export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.LOST_AT_SEA, +) .withEncounterTier(MysteryEncounterTier.COMMON) .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) .withIntroSpriteConfigs([ @@ -57,8 +59,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with .withQuery(`${namespace}:query`) .withOption( // Option 1: Use a (non fainted) pokemon that can learn Surf to guide you back/ - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withPokemonCanLearnMoveRequirement(OPTION_1_REQUIRED_MOVE) .withDialogue({ buttonLabel: `${namespace}:option.1.label`, @@ -72,12 +73,11 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with ], }) .withOptionPhase(async () => handlePokemonGuidingYouPhase()) - .build() + .build(), ) .withOption( //Option 2: Use a (non fainted) pokemon that can learn fly to guide you back. - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withPokemonCanLearnMoveRequirement(OPTION_2_REQUIRED_MOVE) .withDialogue({ buttonLabel: `${namespace}:option.2.label`, @@ -91,7 +91,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with ], }) .withOptionPhase(async () => handlePokemonGuidingYouPhase()) - .build() + .build(), ) .withSimpleOption( // Option 3: Wander aimlessly @@ -105,7 +105,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with ], }, async () => { - const allowedPokemon = globalScene.getPlayerParty().filter((p) => p.isAllowedInBattle()); + const allowedPokemon = globalScene.getPlayerParty().filter(p => p.isAllowedInBattle()); for (const pkm of allowedPokemon) { const percentage = DAMAGE_PERCENTAGE / 100; @@ -116,7 +116,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with leaveEncounterWithoutBattle(); return true; - } + }, ) .withOutroDialogue([ { diff --git a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts index 36e12b34e10..bf60e982b15 100644 --- a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts +++ b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts @@ -1,5 +1,4 @@ -import type { - EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { initBattleWithEnemyConfig, setEncounterRewards, @@ -29,195 +28,202 @@ const namespace = "mysteryEncounters/mysteriousChallengers"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3801 | GitHub Issue #3801} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const MysteriousChallengersEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.MYSTERIOUS_CHALLENGERS) - .withEncounterTier(MysteryEncounterTier.GREAT) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withIntroSpriteConfigs([]) // These are set in onInit() - .withIntroDialogue([ +export const MysteriousChallengersEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.MYSTERIOUS_CHALLENGERS, +) + .withEncounterTier(MysteryEncounterTier.GREAT) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withIntroSpriteConfigs([]) // These are set in onInit() + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Calculates what trainers are available for battle in the encounter + + // Normal difficulty trainer is randomly pulled from biome + const normalTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex); + const normalConfig = trainerConfigs[normalTrainerType].clone(); + let female = false; + if (normalConfig.hasGenders) { + female = !!Utils.randSeedInt(2); + } + const normalSpriteKey = normalConfig.getSpriteKey(female, normalConfig.doubleOnly); + encounter.enemyPartyConfigs.push({ + trainerConfig: normalConfig, + female: female, + }); + + // Hard difficulty trainer is another random trainer, but with AVERAGE_BALANCED config + // Number of mons is based off wave: 1-20 is 2, 20-40 is 3, etc. capping at 6 after wave 100 + let retries = 0; + let hardTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex); + while (retries < 5 && hardTrainerType === normalTrainerType) { + // Will try to use a different trainer from the normal trainer type + hardTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex); + retries++; + } + const hardTemplate = new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER, false, true), + new TrainerPartyTemplate( + Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 20), 5), + PartyMemberStrength.AVERAGE, + false, + true, + ), + ); + const hardConfig = trainerConfigs[hardTrainerType].clone(); + hardConfig.setPartyTemplates(hardTemplate); + female = false; + if (hardConfig.hasGenders) { + female = !!Utils.randSeedInt(2); + } + const hardSpriteKey = hardConfig.getSpriteKey(female, hardConfig.doubleOnly); + encounter.enemyPartyConfigs.push({ + trainerConfig: hardConfig, + levelAdditiveModifier: 1, + female: female, + }); + + // Brutal trainer is pulled from pool of boss trainers (gym leaders) for the biome + // They are given an E4 template team, so will be stronger than usual boss encounter and always have 6 mons + const brutalTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex, true); + const e4Template = trainerPartyTemplates.ELITE_FOUR; + const brutalConfig = trainerConfigs[brutalTrainerType].clone(); + brutalConfig.title = trainerConfigs[brutalTrainerType].title; + brutalConfig.setPartyTemplates(e4Template); + // @ts-ignore + brutalConfig.partyTemplateFunc = null; // Overrides gym leader party template func + female = false; + if (brutalConfig.hasGenders) { + female = !!Utils.randSeedInt(2); + } + const brutalSpriteKey = brutalConfig.getSpriteKey(female, brutalConfig.doubleOnly); + encounter.enemyPartyConfigs.push({ + trainerConfig: brutalConfig, + levelAdditiveModifier: 1.5, + female: female, + }); + + encounter.spriteConfigs = [ { - text: `${namespace}:intro`, + spriteKey: normalSpriteKey, + fileRoot: "trainer", + hasShadow: true, + tint: 1, }, - ]) - .withOnInit(() => { + { + spriteKey: hardSpriteKey, + fileRoot: "trainer", + hasShadow: true, + tint: 1, + }, + { + spriteKey: brutalSpriteKey, + fileRoot: "trainer", + hasShadow: true, + tint: 1, + }, + ]; + + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.selected`, + }, + ], + }, + async () => { const encounter = globalScene.currentBattle.mysteryEncounter!; - // Calculates what trainers are available for battle in the encounter + // Spawn standard trainer battle with memory mushroom reward + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; - // Normal difficulty trainer is randomly pulled from biome - const normalTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex); - const normalConfig = trainerConfigs[normalTrainerType].clone(); - let female = false; - if (normalConfig.hasGenders) { - female = !!Utils.randSeedInt(2); - } - const normalSpriteKey = normalConfig.getSpriteKey(female, normalConfig.doubleOnly); - encounter.enemyPartyConfigs.push({ - trainerConfig: normalConfig, - female: female, + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.TM_COMMON, modifierTypes.TM_GREAT, modifierTypes.MEMORY_MUSHROOM], + fillRemaining: true, }); - // Hard difficulty trainer is another random trainer, but with AVERAGE_BALANCED config - // Number of mons is based off wave: 1-20 is 2, 20-40 is 3, etc. capping at 6 after wave 100 - let retries = 0; - let hardTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex); - while (retries < 5 && hardTrainerType === normalTrainerType) { - // Will try to use a different trainer from the normal trainer type - hardTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex); - retries++; - } - const hardTemplate = new TrainerPartyCompoundTemplate( - new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER, false, true), - new TrainerPartyTemplate( - Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 20), 5), - PartyMemberStrength.AVERAGE, - false, - true - ) - ); - const hardConfig = trainerConfigs[hardTrainerType].clone(); - hardConfig.setPartyTemplates(hardTemplate); - female = false; - if (hardConfig.hasGenders) { - female = !!Utils.randSeedInt(2); - } - const hardSpriteKey = hardConfig.getSpriteKey(female, hardConfig.doubleOnly); - encounter.enemyPartyConfigs.push({ - trainerConfig: hardConfig, - levelAdditiveModifier: 1, - female: female, + // Seed offsets to remove possibility of different trainers having exact same teams + let initBattlePromise: Promise; + globalScene.executeWithSeedOffset(() => { + initBattlePromise = initBattleWithEnemyConfig(config); + }, globalScene.currentBattle.waveIndex * 10); + await initBattlePromise!; + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.selected`, + }, + ], + }, + async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Spawn hard fight + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[1]; + + setEncounterRewards({ + guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT], + fillRemaining: true, }); - // Brutal trainer is pulled from pool of boss trainers (gym leaders) for the biome - // They are given an E4 template team, so will be stronger than usual boss encounter and always have 6 mons - const brutalTrainerType = globalScene.arena.randomTrainerType( - globalScene.currentBattle.waveIndex, - true - ); - const e4Template = trainerPartyTemplates.ELITE_FOUR; - const brutalConfig = trainerConfigs[brutalTrainerType].clone(); - brutalConfig.title = trainerConfigs[brutalTrainerType].title; - brutalConfig.setPartyTemplates(e4Template); - // @ts-ignore - brutalConfig.partyTemplateFunc = null; // Overrides gym leader party template func - female = false; - if (brutalConfig.hasGenders) { - female = !!Utils.randSeedInt(2); - } - const brutalSpriteKey = brutalConfig.getSpriteKey(female, brutalConfig.doubleOnly); - encounter.enemyPartyConfigs.push({ - trainerConfig: brutalConfig, - levelAdditiveModifier: 1.5, - female: female, + // Seed offsets to remove possibility of different trainers having exact same teams + let initBattlePromise: Promise; + globalScene.executeWithSeedOffset(() => { + initBattlePromise = initBattleWithEnemyConfig(config); + }, globalScene.currentBattle.waveIndex * 100); + await initBattlePromise!; + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + selected: [ + { + text: `${namespace}:option.selected`, + }, + ], + }, + async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Spawn brutal fight + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[2]; + + // To avoid player level snowballing from picking this option + encounter.expMultiplier = 0.9; + + setEncounterRewards({ + guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT], + fillRemaining: true, }); - encounter.spriteConfigs = [ - { - spriteKey: normalSpriteKey, - fileRoot: "trainer", - hasShadow: true, - tint: 1, - }, - { - spriteKey: hardSpriteKey, - fileRoot: "trainer", - hasShadow: true, - tint: 1, - }, - { - spriteKey: brutalSpriteKey, - fileRoot: "trainer", - hasShadow: true, - tint: 1, - }, - ]; - - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.selected`, - }, - ], - }, - async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Spawn standard trainer battle with memory mushroom reward - const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; - - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.TM_COMMON, modifierTypes.TM_GREAT, modifierTypes.MEMORY_MUSHROOM ], fillRemaining: true }); - - // Seed offsets to remove possibility of different trainers having exact same teams - let initBattlePromise: Promise; - globalScene.executeWithSeedOffset(() => { - initBattlePromise = initBattleWithEnemyConfig(config); - }, globalScene.currentBattle.waveIndex * 10); - await initBattlePromise!; - } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.selected`, - }, - ], - }, - async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Spawn hard fight - const config: EnemyPartyConfig = encounter.enemyPartyConfigs[1]; - - setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT ], fillRemaining: true }); - - // Seed offsets to remove possibility of different trainers having exact same teams - let initBattlePromise: Promise; - globalScene.executeWithSeedOffset(() => { - initBattlePromise = initBattleWithEnemyConfig(config); - }, globalScene.currentBattle.waveIndex * 100); - await initBattlePromise!; - } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - selected: [ - { - text: `${namespace}:option.selected`, - }, - ], - }, - async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Spawn brutal fight - const config: EnemyPartyConfig = encounter.enemyPartyConfigs[2]; - - // To avoid player level snowballing from picking this option - encounter.expMultiplier = 0.9; - - setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT ], fillRemaining: true }); - - // Seed offsets to remove possibility of different trainers having exact same teams - let initBattlePromise: Promise; - globalScene.executeWithSeedOffset(() => { - initBattlePromise = initBattleWithEnemyConfig(config); - }, globalScene.currentBattle.waveIndex * 1000); - await initBattlePromise!; - } - ) - .withOutroDialogue([ - { - text: `${namespace}:outro`, - }, - ]) - .build(); + // Seed offsets to remove possibility of different trainers having exact same teams + let initBattlePromise: Promise; + globalScene.executeWithSeedOffset(() => { + initBattlePromise = initBattleWithEnemyConfig(config); + }, globalScene.currentBattle.waveIndex * 1000); + await initBattlePromise!; + }, + ) + .withOutroDialogue([ + { + text: `${namespace}:outro`, + }, + ]) + .build(); diff --git a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts index 9b4999020d0..c295e36749a 100644 --- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts +++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts @@ -4,8 +4,16 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { getHighestLevelPlayerPokemon, koPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + getHighestLevelPlayerPokemon, + koPlayerPokemon, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; import { ModifierTier } from "#app/modifier/modifier-tier"; @@ -32,183 +40,181 @@ const MASTER_REWARDS_PERCENT = 5; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3796 | GitHub Issue #3796} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const MysteriousChestEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.MYSTERIOUS_CHEST) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withScenePartySizeRequirement(2, 6, true) - .withAutoHideIntroVisuals(false) - .withCatchAllowed(true) - .withIntroSpriteConfigs([ - { - spriteKey: "mysterious_chest_blue", - fileRoot: "mystery-encounters", - hasShadow: true, - y: 8, - yShadow: 6, - alpha: 1, - disableAnimation: true, // Re-enabled after option select - }, - { - spriteKey: "mysterious_chest_red", - fileRoot: "mystery-encounters", - hasShadow: false, - y: 8, - yShadow: 6, - alpha: 0, - disableAnimation: true, // Re-enabled after option select - } - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - } - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; +export const MysteriousChestEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.MYSTERIOUS_CHEST, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withScenePartySizeRequirement(2, 6, true) + .withAutoHideIntroVisuals(false) + .withCatchAllowed(true) + .withIntroSpriteConfigs([ + { + spriteKey: "mysterious_chest_blue", + fileRoot: "mystery-encounters", + hasShadow: true, + y: 8, + yShadow: 6, + alpha: 1, + disableAnimation: true, // Re-enabled after option select + }, + { + spriteKey: "mysterious_chest_red", + fileRoot: "mystery-encounters", + hasShadow: false, + y: 8, + yShadow: 6, + alpha: 0, + disableAnimation: true, // Re-enabled after option select + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; - // Calculate boss mon - const config: EnemyPartyConfig = { - levelAdditiveModifier: 0.5, - disableSwitch: true, - pokemonConfigs: [ - { - species: getPokemonSpecies(Species.GIMMIGHOUL), - formIndex: 0, - isBoss: true, - moveSet: [ Moves.NASTY_PLOT, Moves.SHADOW_BALL, Moves.POWER_GEM, Moves.THIEF ] - } - ], - }; + // Calculate boss mon + const config: EnemyPartyConfig = { + levelAdditiveModifier: 0.5, + disableSwitch: true, + pokemonConfigs: [ + { + species: getPokemonSpecies(Species.GIMMIGHOUL), + formIndex: 0, + isBoss: true, + moveSet: [Moves.NASTY_PLOT, Moves.SHADOW_BALL, Moves.POWER_GEM, Moves.THIEF], + }, + ], + }; - encounter.enemyPartyConfigs = [ config ]; + encounter.enemyPartyConfigs = [config]; - encounter.setDialogueToken("gimmighoulName", getPokemonSpecies(Species.GIMMIGHOUL).getName()); - encounter.setDialogueToken("trapPercent", TRAP_PERCENT.toString()); - encounter.setDialogueToken("commonPercent", COMMON_REWARDS_PERCENT.toString()); - encounter.setDialogueToken("ultraPercent", ULTRA_REWARDS_PERCENT.toString()); - encounter.setDialogueToken("roguePercent", ROGUE_REWARDS_PERCENT.toString()); - encounter.setDialogueToken("masterPercent", MASTER_REWARDS_PERCENT.toString()); + encounter.setDialogueToken("gimmighoulName", getPokemonSpecies(Species.GIMMIGHOUL).getName()); + encounter.setDialogueToken("trapPercent", TRAP_PERCENT.toString()); + encounter.setDialogueToken("commonPercent", COMMON_REWARDS_PERCENT.toString()); + encounter.setDialogueToken("ultraPercent", ULTRA_REWARDS_PERCENT.toString()); + encounter.setDialogueToken("roguePercent", ROGUE_REWARDS_PERCENT.toString()); + encounter.setDialogueToken("masterPercent", MASTER_REWARDS_PERCENT.toString()); - return true; - }) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected`, - }, - ], - }) - .withPreOptionPhase(async () => { - // Play animation - const encounter = globalScene.currentBattle.mysteryEncounter!; - const introVisuals = encounter.introVisuals!; - - // Determine roll first - const roll = randSeedInt(RAND_LENGTH); - encounter.misc = { - roll - }; - - if (roll < TRAP_PERCENT) { - // Chest is springing trap, change to red chest sprite - const blueChestSprites = introVisuals.getSpriteAtIndex(0); - const redChestSprites = introVisuals.getSpriteAtIndex(1); - redChestSprites[0].setAlpha(1); - blueChestSprites[0].setAlpha(0.001); - } - introVisuals.spriteConfigs[0].disableAnimation = false; - introVisuals.spriteConfigs[1].disableAnimation = false; - introVisuals.playAnim(); - }) - .withOptionPhase(async () => { - // Open the chest - const encounter = globalScene.currentBattle.mysteryEncounter!; - const roll = encounter.misc.roll; - if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT) { - // Choose between 2 COMMON / 2 GREAT tier items (20%) - setEncounterRewards({ - guaranteedModifierTiers: [ - ModifierTier.COMMON, - ModifierTier.COMMON, - ModifierTier.GREAT, - ModifierTier.GREAT, - ], - }); - // Display result message then proceed to rewards - queueEncounterMessage(`${namespace}:option.1.normal`); - leaveEncounterWithoutBattle(); - } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT) { - // Choose between 3 ULTRA tier items (30%) - setEncounterRewards({ - guaranteedModifierTiers: [ - ModifierTier.ULTRA, - ModifierTier.ULTRA, - ModifierTier.ULTRA, - ], - }); - // Display result message then proceed to rewards - queueEncounterMessage(`${namespace}:option.1.good`); - leaveEncounterWithoutBattle(); - } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT - ROGUE_REWARDS_PERCENT) { - // Choose between 2 ROGUE tier items (10%) - setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE ]}); - // Display result message then proceed to rewards - queueEncounterMessage(`${namespace}:option.1.great`); - leaveEncounterWithoutBattle(); - } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT - ROGUE_REWARDS_PERCENT - MASTER_REWARDS_PERCENT) { - // Choose 1 MASTER tier item (5%) - setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.MASTER ]}); - // Display result message then proceed to rewards - queueEncounterMessage(`${namespace}:option.1.amazing`); - leaveEncounterWithoutBattle(); - } else { - // Your highest level unfainted Pokemon gets OHKO. Start battle against a Gimmighoul (35%) - const highestLevelPokemon = getHighestLevelPlayerPokemon(true, false); - koPlayerPokemon(highestLevelPokemon); - - encounter.setDialogueToken("pokeName", highestLevelPokemon.getNameToRender()); - await showEncounterText(`${namespace}:option.1.bad`); - - // Handle game over edge case - const allowedPokemon = globalScene.getPokemonAllowedInBattle(); - if (allowedPokemon.length === 0) { - // If there are no longer any legal pokemon in the party, game over. - globalScene.clearPhaseQueue(); - globalScene.unshiftPhase(new GameOverPhase()); - } else { - // Show which Pokemon was KOed, then start battle against Gimmighoul - await transitionMysteryEncounterIntroVisuals(true, true, 500); - setEncounterRewards({ fillRemaining: true }); - await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); - } - } - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, selected: [ { - text: `${namespace}:option.2.selected`, + text: `${namespace}:option.1.selected`, }, ], - }, - async () => { - // Leave encounter with no rewards or exp - leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + }) + .withPreOptionPhase(async () => { + // Play animation + const encounter = globalScene.currentBattle.mysteryEncounter!; + const introVisuals = encounter.introVisuals!; + + // Determine roll first + const roll = randSeedInt(RAND_LENGTH); + encounter.misc = { + roll, + }; + + if (roll < TRAP_PERCENT) { + // Chest is springing trap, change to red chest sprite + const blueChestSprites = introVisuals.getSpriteAtIndex(0); + const redChestSprites = introVisuals.getSpriteAtIndex(1); + redChestSprites[0].setAlpha(1); + blueChestSprites[0].setAlpha(0.001); + } + introVisuals.spriteConfigs[0].disableAnimation = false; + introVisuals.spriteConfigs[1].disableAnimation = false; + introVisuals.playAnim(); + }) + .withOptionPhase(async () => { + // Open the chest + const encounter = globalScene.currentBattle.mysteryEncounter!; + const roll = encounter.misc.roll; + if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT) { + // Choose between 2 COMMON / 2 GREAT tier items (20%) + setEncounterRewards({ + guaranteedModifierTiers: [ModifierTier.COMMON, ModifierTier.COMMON, ModifierTier.GREAT, ModifierTier.GREAT], + }); + // Display result message then proceed to rewards + queueEncounterMessage(`${namespace}:option.1.normal`); + leaveEncounterWithoutBattle(); + } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT) { + // Choose between 3 ULTRA tier items (30%) + setEncounterRewards({ + guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA], + }); + // Display result message then proceed to rewards + queueEncounterMessage(`${namespace}:option.1.good`); + leaveEncounterWithoutBattle(); + } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT - ROGUE_REWARDS_PERCENT) { + // Choose between 2 ROGUE tier items (10%) + setEncounterRewards({ + guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE], + }); + // Display result message then proceed to rewards + queueEncounterMessage(`${namespace}:option.1.great`); + leaveEncounterWithoutBattle(); + } else if ( + roll >= + RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT - ROGUE_REWARDS_PERCENT - MASTER_REWARDS_PERCENT + ) { + // Choose 1 MASTER tier item (5%) + setEncounterRewards({ + guaranteedModifierTiers: [ModifierTier.MASTER], + }); + // Display result message then proceed to rewards + queueEncounterMessage(`${namespace}:option.1.amazing`); + leaveEncounterWithoutBattle(); + } else { + // Your highest level unfainted Pokemon gets OHKO. Start battle against a Gimmighoul (35%) + const highestLevelPokemon = getHighestLevelPlayerPokemon(true, false); + koPlayerPokemon(highestLevelPokemon); + + encounter.setDialogueToken("pokeName", highestLevelPokemon.getNameToRender()); + await showEncounterText(`${namespace}:option.1.bad`); + + // Handle game over edge case + const allowedPokemon = globalScene.getPokemonAllowedInBattle(); + if (allowedPokemon.length === 0) { + // If there are no longer any legal pokemon in the party, game over. + globalScene.clearPhaseQueue(); + globalScene.unshiftPhase(new GameOverPhase()); + } else { + // Show which Pokemon was KOed, then start battle against Gimmighoul + await transitionMysteryEncounterIntroVisuals(true, true, 500); + setEncounterRewards({ fillRemaining: true }); + await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); + } + } + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); diff --git a/src/data/mystery-encounters/encounters/part-timer-encounter.ts b/src/data/mystery-encounters/encounters/part-timer-encounter.ts index 4db8e2eb6e8..61b48353997 100644 --- a/src/data/mystery-encounters/encounters/part-timer-encounter.ts +++ b/src/data/mystery-encounters/encounters/part-timer-encounter.ts @@ -1,5 +1,12 @@ import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + leaveEncounterWithoutBattle, + selectPokemonForOption, + setEncounterExp, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, + updatePlayerMoney, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; @@ -24,67 +31,68 @@ const namespace = "mysteryEncounters/partTimer"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3813 | GitHub Issue #3813} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const PartTimerEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.PART_TIMER) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withIntroSpriteConfigs([ - { - spriteKey: "part_timer_crate", - fileRoot: "mystery-encounters", - hasShadow: false, - y: 6, - x: 15 - }, - { - spriteKey: "worker_f", - fileRoot: "trainer", - hasShadow: true, - x: -18, - y: 4 - } - ]) - .withAutoHideIntroVisuals(false) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - { - speaker: `${namespace}:speaker`, - text: `${namespace}:intro_dialogue`, - }, - ]) - .withOnInit(() => { - // Load sfx - globalScene.loadSe("PRSFX- Horn Drill1", "battle_anims", "PRSFX- Horn Drill1.wav"); - globalScene.loadSe("PRSFX- Horn Drill3", "battle_anims", "PRSFX- Horn Drill3.wav"); - globalScene.loadSe("PRSFX- Guillotine2", "battle_anims", "PRSFX- Guillotine2.wav"); - globalScene.loadSe("PRSFX- Heavy Slam2", "battle_anims", "PRSFX- Heavy Slam2.wav"); +export const PartTimerEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.PART_TIMER, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withIntroSpriteConfigs([ + { + spriteKey: "part_timer_crate", + fileRoot: "mystery-encounters", + hasShadow: false, + y: 6, + x: 15, + }, + { + spriteKey: "worker_f", + fileRoot: "trainer", + hasShadow: true, + x: -18, + y: 4, + }, + ]) + .withAutoHideIntroVisuals(false) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + speaker: `${namespace}:speaker`, + text: `${namespace}:intro_dialogue`, + }, + ]) + .withOnInit(() => { + // Load sfx + globalScene.loadSe("PRSFX- Horn Drill1", "battle_anims", "PRSFX- Horn Drill1.wav"); + globalScene.loadSe("PRSFX- Horn Drill3", "battle_anims", "PRSFX- Horn Drill3.wav"); + globalScene.loadSe("PRSFX- Guillotine2", "battle_anims", "PRSFX- Guillotine2.wav"); + globalScene.loadSe("PRSFX- Heavy Slam2", "battle_anims", "PRSFX- Heavy Slam2.wav"); - globalScene.loadSe("PRSFX- Agility", "battle_anims", "PRSFX- Agility.wav"); - globalScene.loadSe("PRSFX- Extremespeed1", "battle_anims", "PRSFX- Extremespeed1.wav"); - globalScene.loadSe("PRSFX- Accelerock1", "battle_anims", "PRSFX- Accelerock1.wav"); + globalScene.loadSe("PRSFX- Agility", "battle_anims", "PRSFX- Agility.wav"); + globalScene.loadSe("PRSFX- Extremespeed1", "battle_anims", "PRSFX- Extremespeed1.wav"); + globalScene.loadSe("PRSFX- Accelerock1", "battle_anims", "PRSFX- Accelerock1.wav"); - globalScene.loadSe("PRSFX- Captivate", "battle_anims", "PRSFX- Captivate.wav"); - globalScene.loadSe("PRSFX- Attract2", "battle_anims", "PRSFX- Attract2.wav"); - globalScene.loadSe("PRSFX- Aurora Veil2", "battle_anims", "PRSFX- Aurora Veil2.wav"); + globalScene.loadSe("PRSFX- Captivate", "battle_anims", "PRSFX- Captivate.wav"); + globalScene.loadSe("PRSFX- Attract2", "battle_anims", "PRSFX- Attract2.wav"); + globalScene.loadSe("PRSFX- Aurora Veil2", "battle_anims", "PRSFX- Aurora Veil2.wav"); - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOption(MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) .withDialogue({ buttonLabel: `${namespace}:option.1.label`, buttonTooltip: `${namespace}:option.1.tooltip`, selected: [ { - text: `${namespace}:option.1.selected` - } - ] + text: `${namespace}:option.1.selected`, + }, + ], }) .withPreOptionPhase(async () => { const encounter = globalScene.currentBattle.mysteryEncounter!; @@ -95,21 +103,21 @@ export const PartTimerEncounter: MysteryEncounter = // Calculate the "baseline" stat value (90 base stat, 16 IVs, neutral nature, same level as pokemon) to compare // Resulting money is 2.5 * (% difference from baseline), with minimum of 1 and maximum of 4. // Calculation from Pokemon.calculateStats - const baselineValue = Math.floor(((2 * 90 + 16) * pokemon.level) * 0.01) + 5; + const baselineValue = Math.floor((2 * 90 + 16) * pokemon.level * 0.01) + 5; const percentDiff = (pokemon.getStat(Stat.SPD) - baselineValue) / baselineValue; const moneyMultiplier = Math.min(Math.max(2.5 * (1 + percentDiff), 1), 4); encounter.misc = { - moneyMultiplier + moneyMultiplier, }; // Reduce all PP to 2 (if they started at greater than 2) - pokemon.moveset.forEach(move => { + for (const move of pokemon.moveset) { if (move) { const newPpUsed = move.getMovePp() - 2; move.ppUsed = move.ppUsed < newPpUsed ? newPpUsed : move.ppUsed; } - }); + } setEncounterExp(pokemon.id, 100); @@ -141,24 +149,28 @@ export const PartTimerEncounter: MysteryEncounter = } const moneyChange = globalScene.getWaveMoneyAmount(moneyMultiplier); updatePlayerMoney(moneyChange, true, false); - await showEncounterText(i18next.t("mysteryEncounterMessages:receive_money", { amount: moneyChange })); + await showEncounterText( + i18next.t("mysteryEncounterMessages:receive_money", { + amount: moneyChange, + }), + ); await showEncounterText(`${namespace}:pokemon_tired`); setEncounterRewards({ fillRemaining: true }); leaveEncounterWithoutBattle(); }) - .build() - ) - .withOption(MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) .withDialogue({ buttonLabel: `${namespace}:option.2.label`, buttonTooltip: `${namespace}:option.2.tooltip`, selected: [ { - text: `${namespace}:option.2.selected` - } - ] + text: `${namespace}:option.2.selected`, + }, + ], }) .withPreOptionPhase(async () => { const encounter = globalScene.currentBattle.mysteryEncounter!; @@ -169,24 +181,25 @@ export const PartTimerEncounter: MysteryEncounter = // Calculate the "baseline" stat value (75 base stat, 16 IVs, neutral nature, same level as pokemon) to compare // Resulting money is 2.5 * (% difference from baseline), with minimum of 1 and maximum of 4. // Calculation from Pokemon.calculateStats - const baselineHp = Math.floor(((2 * 75 + 16) * pokemon.level) * 0.01) + pokemon.level + 10; - const baselineAtkDef = Math.floor(((2 * 75 + 16) * pokemon.level) * 0.01) + 5; + const baselineHp = Math.floor((2 * 75 + 16) * pokemon.level * 0.01) + pokemon.level + 10; + const baselineAtkDef = Math.floor((2 * 75 + 16) * pokemon.level * 0.01) + 5; const baselineValue = baselineHp + 1.5 * (baselineAtkDef * 2); - const strongestValue = pokemon.getStat(Stat.HP) + 1.5 * (pokemon.getStat(Stat.ATK) + pokemon.getStat(Stat.DEF)); + const strongestValue = + pokemon.getStat(Stat.HP) + 1.5 * (pokemon.getStat(Stat.ATK) + pokemon.getStat(Stat.DEF)); const percentDiff = (strongestValue - baselineValue) / baselineValue; const moneyMultiplier = Math.min(Math.max(2.5 * (1 + percentDiff), 1), 4); encounter.misc = { - moneyMultiplier + moneyMultiplier, }; // Reduce all PP to 2 (if they started at greater than 2) - pokemon.moveset.forEach(move => { + for (const move of pokemon.moveset) { if (move) { const newPpUsed = move.getMovePp() - 2; move.ppUsed = move.ppUsed < newPpUsed ? newPpUsed : move.ppUsed; } - }); + } setEncounterExp(pokemon.id, 100); @@ -218,73 +231,80 @@ export const PartTimerEncounter: MysteryEncounter = } const moneyChange = globalScene.getWaveMoneyAmount(moneyMultiplier); updatePlayerMoney(moneyChange, true, false); - await showEncounterText(i18next.t("mysteryEncounterMessages:receive_money", { amount: moneyChange })); + await showEncounterText( + i18next.t("mysteryEncounterMessages:receive_money", { + amount: moneyChange, + }), + ); await showEncounterText(`${namespace}:pokemon_tired`); setEncounterRewards({ fillRemaining: true }); leaveEncounterWithoutBattle(); }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) - .withPrimaryPokemonRequirement(new MoveRequirement(CHARMING_MOVES, true)) // Will set option3PrimaryName and option3PrimaryMove dialogue tokens automatically - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, - selected: [ - { - text: `${namespace}:option.3.selected`, - }, - ], - }) - .withPreOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const selectedPokemon = encounter.selectedOption?.primaryPokemon!; - encounter.setDialogueToken("selectedPokemon", selectedPokemon.getNameToRender()); + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + .withPrimaryPokemonRequirement(new MoveRequirement(CHARMING_MOVES, true)) // Will set option3PrimaryName and option3PrimaryMove dialogue tokens automatically + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, + selected: [ + { + text: `${namespace}:option.3.selected`, + }, + ], + }) + .withPreOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const selectedPokemon = encounter.selectedOption?.primaryPokemon!; + encounter.setDialogueToken("selectedPokemon", selectedPokemon.getNameToRender()); - // Reduce all PP to 2 (if they started at greater than 2) - selectedPokemon.moveset.forEach(move => { - if (move) { - const newPpUsed = move.getMovePp() - 2; - move.ppUsed = move.ppUsed < newPpUsed ? newPpUsed : move.ppUsed; - } - }); + // Reduce all PP to 2 (if they started at greater than 2) + for (const move of selectedPokemon.moveset) { + if (move) { + const newPpUsed = move.getMovePp() - 2; + move.ppUsed = move.ppUsed < newPpUsed ? newPpUsed : move.ppUsed; + } + } - setEncounterExp(selectedPokemon.id, 100); + setEncounterExp(selectedPokemon.id, 100); - // Hide intro visuals - transitionMysteryEncounterIntroVisuals(true, false); - // Play sfx for "working" - doSalesSfx(); - return true; - }) - .withOptionPhase(async () => { - // Assist with Sales - // Bring visuals back in - await transitionMysteryEncounterIntroVisuals(false, false); + // Hide intro visuals + transitionMysteryEncounterIntroVisuals(true, false); + // Play sfx for "working" + doSalesSfx(); + return true; + }) + .withOptionPhase(async () => { + // Assist with Sales + // Bring visuals back in + await transitionMysteryEncounterIntroVisuals(false, false); - // Give money and do dialogue - await showEncounterDialogue(`${namespace}:job_complete_good`, `${namespace}:speaker`); - const moneyChange = globalScene.getWaveMoneyAmount(2.5); - updatePlayerMoney(moneyChange, true, false); - await showEncounterText(i18next.t("mysteryEncounterMessages:receive_money", { amount: moneyChange })); - await showEncounterText(`${namespace}:pokemon_tired`); + // Give money and do dialogue + await showEncounterDialogue(`${namespace}:job_complete_good`, `${namespace}:speaker`); + const moneyChange = globalScene.getWaveMoneyAmount(2.5); + updatePlayerMoney(moneyChange, true, false); + await showEncounterText( + i18next.t("mysteryEncounterMessages:receive_money", { + amount: moneyChange, + }), + ); + await showEncounterText(`${namespace}:pokemon_tired`); - setEncounterRewards({ fillRemaining: true }); - leaveEncounterWithoutBattle(); - }) - .build() - ) - .withOutroDialogue([ - { - speaker: `${namespace}:speaker`, - text: `${namespace}:outro`, - } - ]) - .build(); + setEncounterRewards({ fillRemaining: true }); + leaveEncounterWithoutBattle(); + }) + .build(), + ) + .withOutroDialogue([ + { + speaker: `${namespace}:speaker`, + text: `${namespace}:outro`, + }, + ]) + .build(); function doStrongWorkSfx() { globalScene.playSound("battle_anims/PRSFX- Horn Drill1"); diff --git a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts index fd078e1ffaa..f231e4abdb8 100644 --- a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts +++ b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts @@ -1,4 +1,9 @@ -import { initSubsequentOptionSelect, leaveEncounterWithoutBattle, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + initSubsequentOptionSelect, + leaveEncounterWithoutBattle, + transitionMysteryEncounterIntroVisuals, + updatePlayerMoney, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; @@ -10,11 +15,16 @@ import { HiddenAbilityRateBoosterModifier, IvScannerModifier } from "#app/modifi import type { EnemyPokemon } from "#app/field/pokemon"; import { PokeballType } from "#enums/pokeball"; import { PlayerGender } from "#enums/player-gender"; -import { IntegerHolder, randSeedInt } from "#app/utils"; +import { NumberHolder, randSeedInt } from "#app/utils"; import type PokemonSpecies from "#app/data/pokemon-species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { doPlayerFlee, doPokemonFlee, getRandomSpeciesByStarterCost, trainerThrowPokeball } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + doPlayerFlee, + doPokemonFlee, + getRandomSpeciesByStarterCost, + trainerThrowPokeball, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { getPokemonNameWithAffix } from "#app/messages"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; @@ -27,7 +37,7 @@ import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-gr /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/safariZone"; -const TRAINER_THROW_ANIMATION_TIMES = [ 512, 184, 768 ]; +const TRAINER_THROW_ANIMATION_TIMES = [512, 184, 768]; const SAFARI_MONEY_MULTIPLIER = 2; @@ -38,36 +48,37 @@ const NUM_SAFARI_ENCOUNTERS = 3; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3800 | GitHub Issue #3800} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const SafariZoneEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.SAFARI_ZONE) - .withEncounterTier(MysteryEncounterTier.GREAT) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withSceneRequirement(new MoneyRequirement(0, SAFARI_MONEY_MULTIPLIER)) // Cost equal to 1 Max Revive - .withAutoHideIntroVisuals(false) - .withIntroSpriteConfigs([ - { - spriteKey: "safari_zone", - fileRoot: "mystery-encounters", - hasShadow: false, - x: 4, - y: 6 - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - globalScene.currentBattle.mysteryEncounter?.setDialogueToken("numEncounters", NUM_SAFARI_ENCOUNTERS.toString()); - return true; - }) - .withOption(MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) +export const SafariZoneEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.SAFARI_ZONE, +) + .withEncounterTier(MysteryEncounterTier.GREAT) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withSceneRequirement(new MoneyRequirement(0, SAFARI_MONEY_MULTIPLIER)) // Cost equal to 1 Max Revive + .withAutoHideIntroVisuals(false) + .withIntroSpriteConfigs([ + { + spriteKey: "safari_zone", + fileRoot: "mystery-encounters", + hasShadow: false, + x: 4, + y: 6, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + globalScene.currentBattle.mysteryEncounter?.setDialogueToken("numEncounters", NUM_SAFARI_ENCOUNTERS.toString()); + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withSceneRequirement(new MoneyRequirement(0, SAFARI_MONEY_MULTIPLIER)) // Cost equal to 1 Max Revive .withDialogue({ buttonLabel: `${namespace}:option.1.label`, @@ -83,7 +94,7 @@ export const SafariZoneEncounter: MysteryEncounter = const encounter = globalScene.currentBattle.mysteryEncounter!; encounter.continuousEncounter = true; encounter.misc = { - safariPokemonRemaining: NUM_SAFARI_ENCOUNTERS + safariPokemonRemaining: NUM_SAFARI_ENCOUNTERS, }; updatePlayerMoney(-(encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney); // Load bait/mud assets @@ -96,28 +107,31 @@ export const SafariZoneEncounter: MysteryEncounter = globalScene.currentBattle.enemyParty = []; await transitionMysteryEncounterIntroVisuals(); await summonSafariPokemon(); - initSubsequentOptionSelect({ overrideOptions: safariZoneGameOptions, hideDescription: true }); + initSubsequentOptionSelect({ + overrideOptions: safariZoneGameOptions, + hideDescription: true, + }); return true; }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - }, - ], - }, - async () => { - // Leave encounter with no rewards or exp - leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); /** * SAFARI ZONE MINIGAME OPTIONS @@ -135,15 +149,14 @@ export const SafariZoneEncounter: MysteryEncounter = * Flee chance = fleeRate / 255 */ const safariZoneGameOptions: MysteryEncounterOption[] = [ - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) .withDialogue({ buttonLabel: `${namespace}:safari.1.label`, buttonTooltip: `${namespace}:safari.1.tooltip`, selected: [ { text: `${namespace}:safari.1.selected`, - } + }, ], }) .withOptionPhase(async () => { @@ -157,7 +170,11 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [ // Check how many safari pokemon left if (encounter.misc.safariPokemonRemaining > 0) { await summonSafariPokemon(); - initSubsequentOptionSelect({ overrideOptions: safariZoneGameOptions, startingCursorIndex: 0, hideDescription: true }); + initSubsequentOptionSelect({ + overrideOptions: safariZoneGameOptions, + startingCursorIndex: 0, + hideDescription: true, + }); } else { // End safari mode encounter.continuousEncounter = false; @@ -170,8 +187,7 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [ return true; }) .build(), - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) .withDialogue({ buttonLabel: `${namespace}:safari.2.label`, buttonTooltip: `${namespace}:safari.2.tooltip`, @@ -191,7 +207,7 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [ // 80% chance to increase flee stage +1 const fleeChangeResult = tryChangeFleeStage(1, 8); if (!fleeChangeResult) { - await showEncounterText(getEncounterText(`${namespace}:safari.busy_eating`) ?? "", null, 1000, false ); + await showEncounterText(getEncounterText(`${namespace}:safari.busy_eating`) ?? "", null, 1000, false); } else { await showEncounterText(getEncounterText(`${namespace}:safari.eating`) ?? "", null, 1000, false); } @@ -200,8 +216,7 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [ return true; }) .build(), - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) .withDialogue({ buttonLabel: `${namespace}:safari.3.label`, buttonTooltip: `${namespace}:safari.3.tooltip`, @@ -220,17 +235,16 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [ // 80% chance to decrease catch stage -1 const catchChangeResult = tryChangeCatchStage(-1, 8); if (!catchChangeResult) { - await showEncounterText(getEncounterText(`${namespace}:safari.beside_itself_angry`) ?? "", null, 1000, false ); + await showEncounterText(getEncounterText(`${namespace}:safari.beside_itself_angry`) ?? "", null, 1000, false); } else { - await showEncounterText(getEncounterText(`${namespace}:safari.angry`) ?? "", null, 1000, false ); + await showEncounterText(getEncounterText(`${namespace}:safari.angry`) ?? "", null, 1000, false); } await doEndTurn(2); return true; }) .build(), - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) .withDialogue({ buttonLabel: `${namespace}:safari.4.label`, buttonTooltip: `${namespace}:safari.4.tooltip`, @@ -243,7 +257,11 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [ // Check how many safari pokemon left if (encounter.misc.safariPokemonRemaining > 0) { await summonSafariPokemon(); - initSubsequentOptionSelect({ overrideOptions: safariZoneGameOptions, startingCursorIndex: 3, hideDescription: true }); + initSubsequentOptionSelect({ + overrideOptions: safariZoneGameOptions, + startingCursorIndex: 3, + hideDescription: true, + }); } else { // End safari mode encounter.continuousEncounter = false; @@ -251,7 +269,7 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [ } return true; }) - .build() + .build(), ]; async function summonSafariPokemon() { @@ -262,38 +280,41 @@ async function summonSafariPokemon() { // Generate pokemon using safariPokemonRemaining so they are always the same pokemon no matter how many turns are taken // Safari pokemon roll twice on shiny and HA chances, but are otherwise normal - let enemySpecies; - let pokemon; - globalScene.executeWithSeedOffset(() => { - enemySpecies = getSafariSpeciesSpawn(); - const level = globalScene.currentBattle.getLevelForWave(); - enemySpecies = getPokemonSpecies(enemySpecies.getWildSpeciesForLevel(level, true, false, globalScene.gameMode)); - pokemon = globalScene.addEnemyPokemon(enemySpecies, level, TrainerSlot.NONE, false); + let enemySpecies: PokemonSpecies; + let pokemon: any; + globalScene.executeWithSeedOffset( + () => { + enemySpecies = getSafariSpeciesSpawn(); + const level = globalScene.currentBattle.getLevelForWave(); + enemySpecies = getPokemonSpecies(enemySpecies.getWildSpeciesForLevel(level, true, false, globalScene.gameMode)); + pokemon = globalScene.addEnemyPokemon(enemySpecies, level, TrainerSlot.NONE, false); - // Roll shiny twice - if (!pokemon.shiny) { - pokemon.trySetShinySeed(); - } + // Roll shiny twice + if (!pokemon.shiny) { + pokemon.trySetShinySeed(); + } - // Roll HA twice - if (pokemon.species.abilityHidden) { - const hiddenIndex = pokemon.species.ability2 ? 2 : 1; - if (pokemon.abilityIndex < hiddenIndex) { - const hiddenAbilityChance = new IntegerHolder(256); - globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance); + // Roll HA twice + if (pokemon.species.abilityHidden) { + const hiddenIndex = pokemon.species.ability2 ? 2 : 1; + if (pokemon.abilityIndex < hiddenIndex) { + const hiddenAbilityChance = new NumberHolder(256); + globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance); - const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value); + const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value); - if (hasHiddenAbility) { - pokemon.abilityIndex = hiddenIndex; + if (hasHiddenAbility) { + pokemon.abilityIndex = hiddenIndex; + } } } - } - pokemon.calculateStats(); + pokemon.calculateStats(); - globalScene.currentBattle.enemyParty.unshift(pokemon); - }, globalScene.currentBattle.waveIndex * 1000 * encounter.misc.safariPokemonRemaining); + globalScene.currentBattle.enemyParty.unshift(pokemon); + }, + globalScene.currentBattle.waveIndex * 1000 * encounter.misc.safariPokemonRemaining, + ); globalScene.gameData.setPokemonSeen(pokemon, true); await pokemon.loadAssets(); @@ -315,7 +336,7 @@ async function summonSafariPokemon() { const ivScannerModifier = globalScene.findModifier(m => m instanceof IvScannerModifier); if (ivScannerModifier) { - globalScene.pushPhase(new ScanIvsPhase(pokemon.getBattlerIndex(), Math.min(ivScannerModifier.getStackCount() * 2, 6))); + globalScene.pushPhase(new ScanIvsPhase(pokemon.getBattlerIndex())); } } @@ -324,7 +345,8 @@ function throwPokeball(pokemon: EnemyPokemon): Promise { // Catch stage ranges from -6 to +6 (like stat boost stages) const safariCatchStage = globalScene.currentBattle.mysteryEncounter!.misc.catchStage; // Catch modifier ranges from 2/8 (-6 stage) to 8/2 (+6) - const safariModifier = (2 + Math.min(Math.max(safariCatchStage, 0), 6)) / (2 - Math.max(Math.min(safariCatchStage, 0), -6)); + const safariModifier = + (2 + Math.min(Math.max(safariCatchStage, 0), 6)) / (2 - Math.max(Math.min(safariCatchStage, 0), -6)); // Catch rate same as safari ball const pokeballMultiplier = 1.5; const catchRate = Math.round(baseCatchRate * pokeballMultiplier * safariModifier); @@ -341,7 +363,9 @@ async function throwBait(pokemon: EnemyPokemon): Promise { globalScene.field.add(bait); return new Promise(resolve => { - globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`); + globalScene.trainer.setTexture( + `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`, + ); globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[0], () => { globalScene.playSound("se/pb_throw"); @@ -350,7 +374,9 @@ async function throwBait(pokemon: EnemyPokemon): Promise { globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[1], () => { globalScene.trainer.setFrame("3"); globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[2], () => { - globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`); + globalScene.trainer.setTexture( + `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`, + ); }); }); @@ -361,7 +387,6 @@ async function throwBait(pokemon: EnemyPokemon): Promise { y: { value: 55 + fpOffset[1], ease: "Cubic.easeOut" }, duration: 500, onComplete: () => { - let index = 1; globalScene.time.delayedCall(768, () => { globalScene.tweens.add({ @@ -389,10 +414,10 @@ async function throwBait(pokemon: EnemyPokemon): Promise { bait.destroy(); resolve(true); }); - } + }, }); }); - } + }, }); }); }); @@ -407,7 +432,9 @@ async function throwMud(pokemon: EnemyPokemon): Promise { globalScene.field.add(mud); return new Promise(resolve => { - globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`); + globalScene.trainer.setTexture( + `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`, + ); globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[0], () => { globalScene.playSound("se/pb_throw"); @@ -416,7 +443,9 @@ async function throwMud(pokemon: EnemyPokemon): Promise { globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[1], () => { globalScene.trainer.setFrame("3"); globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[2], () => { - globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`); + globalScene.trainer.setTexture( + `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`, + ); }); }); @@ -461,11 +490,11 @@ async function throwMud(pokemon: EnemyPokemon): Promise { }, onComplete: () => { resolve(true); - } + }, }); - } + }, }); - } + }, }); }); }); @@ -474,7 +503,7 @@ async function throwMud(pokemon: EnemyPokemon): Promise { function isPokemonFlee(pokemon: EnemyPokemon, fleeStage: number): boolean { const speciesCatchRate = pokemon.species.catchRate; const fleeModifier = (2 + Math.min(Math.max(fleeStage, 0), 6)) / (2 - Math.max(Math.min(fleeStage, 0), -6)); - const fleeRate = (255 * 255 - speciesCatchRate * speciesCatchRate) / 255 / 2 * fleeModifier; + const fleeRate = ((255 * 255 - speciesCatchRate * speciesCatchRate) / 255 / 2) * fleeModifier; console.log("Flee rate: " + fleeRate); const roll = randSeedInt(256); console.log("Roll: " + roll); @@ -519,7 +548,11 @@ async function doEndTurn(cursorIndex: number) { // Check how many safari pokemon left if (encounter.misc.safariPokemonRemaining > 0) { await summonSafariPokemon(); - initSubsequentOptionSelect({ overrideOptions: safariZoneGameOptions, startingCursorIndex: cursorIndex, hideDescription: true }); + initSubsequentOptionSelect({ + overrideOptions: safariZoneGameOptions, + startingCursorIndex: cursorIndex, + hideDescription: true, + }); } else { // End safari mode encounter.continuousEncounter = false; @@ -527,7 +560,11 @@ async function doEndTurn(cursorIndex: number) { } } else { globalScene.queueMessage(getEncounterText(`${namespace}:safari.watching`) ?? "", 0, null, 1000); - initSubsequentOptionSelect({ overrideOptions: safariZoneGameOptions, startingCursorIndex: cursorIndex, hideDescription: true }); + initSubsequentOptionSelect({ + overrideOptions: safariZoneGameOptions, + startingCursorIndex: cursorIndex, + hideDescription: true, + }); } } @@ -535,5 +572,7 @@ async function doEndTurn(cursorIndex: number) { * @returns A random species that has at most 5 starter cost and is not Mythical, Paradox, etc. */ export function getSafariSpeciesSpawn(): PokemonSpecies { - return getPokemonSpecies(getRandomSpeciesByStarterCost([ 0, 5 ], NON_LEGEND_PARADOX_POKEMON, undefined, false, false, false)); + return getPokemonSpecies( + getRandomSpeciesByStarterCost([0, 5], NON_LEGEND_PARADOX_POKEMON, undefined, false, false, false), + ); } diff --git a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts index d5362df28e7..b9476d49fec 100644 --- a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts +++ b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts @@ -1,4 +1,10 @@ -import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + generateModifierType, + leaveEncounterWithoutBattle, + selectPokemonForOption, + setEncounterExp, + updatePlayerMoney, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import type { PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { modifierTypes } from "#app/modifier/modifier-type"; @@ -11,7 +17,11 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { getEncounterText, queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { applyDamageToPokemon, applyModifierTypeToPlayerPokemon, isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + applyDamageToPokemon, + applyModifierTypeToPlayerPokemon, + isPokemonValidForEncounterOptionSelection, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import type { Nature } from "#enums/nature"; @@ -30,201 +40,204 @@ const VITAMIN_DEALER_EXPENSIVE_PRICE_MULTIPLIER = 5; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3798 | GitHub Issue #3798} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const ShadyVitaminDealerEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.SHADY_VITAMIN_DEALER) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withSceneRequirement(new MoneyRequirement(0, VITAMIN_DEALER_CHEAP_PRICE_MULTIPLIER)) // Must have the money for at least the cheap deal - .withPrimaryPokemonHealthRatioRequirement([ 0.51, 1 ]) // At least 1 Pokemon must have above half HP - .withIntroSpriteConfigs([ - { - spriteKey: Species.KROOKODILE.toString(), - fileRoot: "pokemon", - hasShadow: true, - repeat: true, - x: 12, - y: -5, - yShadow: -5 - }, - { - spriteKey: "shady_vitamin_dealer", - fileRoot: "mystery-encounters", - hasShadow: true, - x: -12, - y: 3, - yShadow: 3 - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - { - text: `${namespace}:intro_dialogue`, - speaker: `${namespace}:speaker`, - }, - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) - .withSceneMoneyRequirement(0, VITAMIN_DEALER_CHEAP_PRICE_MULTIPLIER) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.selected`, - }, - ], - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Update money - updatePlayerMoney(-(encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney); - // Calculate modifiers and dialogue tokens - const modifiers = [ - generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!, - generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!, - ]; - encounter.setDialogueToken("boost1", modifiers[0].name); - encounter.setDialogueToken("boost2", modifiers[1].name); - encounter.misc = { - chosenPokemon: pokemon, - modifiers: modifiers, - }; - }; - - // Only Pokemon that can gain benefits are above half HP with no status - const selectableFilter = (pokemon: Pokemon) => { - // If pokemon meets primary pokemon reqs, it can be selected - if (!pokemon.isAllowedInChallenge()) { - return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: pokemon.getNameToRender() }) ?? null; - } - if (!encounter.pokemonMeetsPrimaryRequirements(pokemon)) { - return getEncounterText(`${namespace}:invalid_selection`) ?? null; - } - - return null; - }; - - return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); - }) - .withOptionPhase(async () => { - // Choose Cheap Option - const encounter = globalScene.currentBattle.mysteryEncounter!; - const chosenPokemon = encounter.misc.chosenPokemon; - const modifiers = encounter.misc.modifiers; - - for (const modType of modifiers) { - await applyModifierTypeToPlayerPokemon(chosenPokemon, modType); - } - - leaveEncounterWithoutBattle(true); - }) - .withPostOptionPhase(async () => { - // Damage and status applied after dealer leaves (to make thematic sense) - const encounter = globalScene.currentBattle.mysteryEncounter!; - const chosenPokemon = encounter.misc.chosenPokemon as PlayerPokemon; - - // Pokemon takes half max HP damage and nature is randomized (does not update dex) - applyDamageToPokemon(chosenPokemon, Math.floor(chosenPokemon.getMaxHp() / 2)); - - const currentNature = chosenPokemon.nature; - let newNature = randSeedInt(25) as Nature; - while (newNature === currentNature) { - newNature = randSeedInt(25) as Nature; - } - - chosenPokemon.setCustomNature(newNature); - encounter.setDialogueToken("newNature", getNatureName(newNature)); - queueEncounterMessage(`${namespace}:cheap_side_effects`); - setEncounterExp([ chosenPokemon.id ], 100); - await chosenPokemon.updateInfo(); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) - .withSceneMoneyRequirement(0, VITAMIN_DEALER_EXPENSIVE_PRICE_MULTIPLIER) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.selected`, - }, - ], - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Update money - updatePlayerMoney(-(encounter.options[1].requirements[0] as MoneyRequirement).requiredMoney); - // Calculate modifiers and dialogue tokens - const modifiers = [ - generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!, - generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!, - ]; - encounter.setDialogueToken("boost1", modifiers[0].name); - encounter.setDialogueToken("boost2", modifiers[1].name); - encounter.misc = { - chosenPokemon: pokemon, - modifiers: modifiers, - }; - }; - - // Only Pokemon that can gain benefits are unfainted - const selectableFilter = (pokemon: Pokemon) => { - return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`); - }; - - return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); - }) - .withOptionPhase(async () => { - // Choose Expensive Option - const encounter = globalScene.currentBattle.mysteryEncounter!; - const chosenPokemon = encounter.misc.chosenPokemon; - const modifiers = encounter.misc.modifiers; - - for (const modType of modifiers) { - await applyModifierTypeToPlayerPokemon(chosenPokemon, modType); - } - - leaveEncounterWithoutBattle(true); - }) - .withPostOptionPhase(async () => { - // Status applied after dealer leaves (to make thematic sense) - const encounter = globalScene.currentBattle.mysteryEncounter!; - const chosenPokemon = encounter.misc.chosenPokemon; - - queueEncounterMessage(`${namespace}:no_bad_effects`); - setEncounterExp([ chosenPokemon.id ], 100); - - await chosenPokemon.updateInfo(); - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, +export const ShadyVitaminDealerEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.SHADY_VITAMIN_DEALER, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withSceneRequirement(new MoneyRequirement(0, VITAMIN_DEALER_CHEAP_PRICE_MULTIPLIER)) // Must have the money for at least the cheap deal + .withPrimaryPokemonHealthRatioRequirement([0.51, 1]) // At least 1 Pokemon must have above half HP + .withIntroSpriteConfigs([ + { + spriteKey: Species.KROOKODILE.toString(), + fileRoot: "pokemon", + hasShadow: true, + repeat: true, + x: 12, + y: -5, + yShadow: -5, + }, + { + spriteKey: "shady_vitamin_dealer", + fileRoot: "mystery-encounters", + hasShadow: true, + x: -12, + y: 3, + yShadow: 3, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + text: `${namespace}:intro_dialogue`, + speaker: `${namespace}:speaker`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + .withSceneMoneyRequirement(0, VITAMIN_DEALER_CHEAP_PRICE_MULTIPLIER) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, selected: [ { - text: `${namespace}:option.3.selected`, - speaker: `${namespace}:speaker` + text: `${namespace}:option.selected`, + }, + ], + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Update money + updatePlayerMoney(-(encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney); + // Calculate modifiers and dialogue tokens + const modifiers = [ + generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!, + generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!, + ]; + encounter.setDialogueToken("boost1", modifiers[0].name); + encounter.setDialogueToken("boost2", modifiers[1].name); + encounter.misc = { + chosenPokemon: pokemon, + modifiers: modifiers, + }; + }; + + // Only Pokemon that can gain benefits are above half HP with no status + const selectableFilter = (pokemon: Pokemon) => { + // If pokemon meets primary pokemon reqs, it can be selected + if (!pokemon.isAllowedInChallenge()) { + return ( + i18next.t("partyUiHandler:cantBeUsed", { + pokemonName: pokemon.getNameToRender(), + }) ?? null + ); } - ] - }, - async () => { - // Leave encounter with no rewards or exp + if (!encounter.pokemonMeetsPrimaryRequirements(pokemon)) { + return getEncounterText(`${namespace}:invalid_selection`) ?? null; + } + + return null; + }; + + return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); + }) + .withOptionPhase(async () => { + // Choose Cheap Option + const encounter = globalScene.currentBattle.mysteryEncounter!; + const chosenPokemon = encounter.misc.chosenPokemon; + const modifiers = encounter.misc.modifiers; + + for (const modType of modifiers) { + await applyModifierTypeToPlayerPokemon(chosenPokemon, modType); + } + leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + }) + .withPostOptionPhase(async () => { + // Damage and status applied after dealer leaves (to make thematic sense) + const encounter = globalScene.currentBattle.mysteryEncounter!; + const chosenPokemon = encounter.misc.chosenPokemon as PlayerPokemon; + + // Pokemon takes half max HP damage and nature is randomized (does not update dex) + applyDamageToPokemon(chosenPokemon, Math.floor(chosenPokemon.getMaxHp() / 2)); + + const currentNature = chosenPokemon.nature; + let newNature = randSeedInt(25) as Nature; + while (newNature === currentNature) { + newNature = randSeedInt(25) as Nature; + } + + chosenPokemon.setCustomNature(newNature); + encounter.setDialogueToken("newNature", getNatureName(newNature)); + queueEncounterMessage(`${namespace}:cheap_side_effects`); + setEncounterExp([chosenPokemon.id], 100); + await chosenPokemon.updateInfo(); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + .withSceneMoneyRequirement(0, VITAMIN_DEALER_EXPENSIVE_PRICE_MULTIPLIER) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.selected`, + }, + ], + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Update money + updatePlayerMoney(-(encounter.options[1].requirements[0] as MoneyRequirement).requiredMoney); + // Calculate modifiers and dialogue tokens + const modifiers = [ + generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!, + generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!, + ]; + encounter.setDialogueToken("boost1", modifiers[0].name); + encounter.setDialogueToken("boost2", modifiers[1].name); + encounter.misc = { + chosenPokemon: pokemon, + modifiers: modifiers, + }; + }; + + // Only Pokemon that can gain benefits are unfainted + const selectableFilter = (pokemon: Pokemon) => { + return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`); + }; + + return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); + }) + .withOptionPhase(async () => { + // Choose Expensive Option + const encounter = globalScene.currentBattle.mysteryEncounter!; + const chosenPokemon = encounter.misc.chosenPokemon; + const modifiers = encounter.misc.modifiers; + + for (const modType of modifiers) { + await applyModifierTypeToPlayerPokemon(chosenPokemon, modType); + } + + leaveEncounterWithoutBattle(true); + }) + .withPostOptionPhase(async () => { + // Status applied after dealer leaves (to make thematic sense) + const encounter = globalScene.currentBattle.mysteryEncounter!; + const chosenPokemon = encounter.misc.chosenPokemon; + + queueEncounterMessage(`${namespace}:no_bad_effects`); + setEncounterExp([chosenPokemon.id], 100); + + await chosenPokemon.updateInfo(); + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + selected: [ + { + text: `${namespace}:option.3.selected`, + speaker: `${namespace}:speaker`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); diff --git a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts index 923d8f06c23..bfa1204a8ba 100644 --- a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts +++ b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts @@ -10,7 +10,14 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; import type { EnemyPartyConfig, EnemyPokemonConfig } from "../utils/encounter-phase-utils"; -import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, setEncounterExp, setEncounterRewards, } from "../utils/encounter-phase-utils"; +import { + generateModifierType, + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + loadCustomMovesForEncounter, + setEncounterExp, + setEncounterRewards, +} from "../utils/encounter-phase-utils"; import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { Moves } from "#enums/moves"; import { BattlerIndex } from "#app/battle"; @@ -31,141 +38,148 @@ const namespace = "mysteryEncounters/slumberingSnorlax"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3815 | GitHub Issue #3815} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const SlumberingSnorlaxEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.SLUMBERING_SNORLAX) - .withEncounterTier(MysteryEncounterTier.GREAT) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withCatchAllowed(true) - .withHideWildIntroMessage(true) - .withFleeAllowed(false) - .withIntroSpriteConfigs([ - { - spriteKey: Species.SNORLAX.toString(), - fileRoot: "pokemon", - hasShadow: true, - tint: 0.25, - scale: 1.25, - repeat: true, - y: 5, - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - ]) - .withOnInit(() => { +export const SlumberingSnorlaxEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.SLUMBERING_SNORLAX, +) + .withEncounterTier(MysteryEncounterTier.GREAT) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withCatchAllowed(true) + .withHideWildIntroMessage(true) + .withFleeAllowed(false) + .withIntroSpriteConfigs([ + { + spriteKey: Species.SNORLAX.toString(), + fileRoot: "pokemon", + hasShadow: true, + tint: 0.25, + scale: 1.25, + repeat: true, + y: 5, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + console.log(encounter); + + // Calculate boss mon + const bossSpecies = getPokemonSpecies(Species.SNORLAX); + const pokemonConfig: EnemyPokemonConfig = { + species: bossSpecies, + isBoss: true, + shiny: false, // Shiny lock because shiny is rolled only if the battle option is picked + status: [StatusEffect.SLEEP, 5], // Extra turns on timer for Snorlax's start of fight moves + moveSet: [Moves.REST, Moves.SLEEP_TALK, Moves.CRUNCH, Moves.GIGA_IMPACT], + modifierConfigs: [ + { + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS]) as PokemonHeldItemModifierType, + stackCount: 2, + }, + { + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.ENIGMA]) as PokemonHeldItemModifierType, + stackCount: 2, + }, + ], + customPokemonData: new CustomPokemonData({ spriteScale: 1.25 }), + aiType: AiType.SMART, // Required to ensure Snorlax uses Sleep Talk while it is asleep + }; + const config: EnemyPartyConfig = { + levelAdditiveModifier: 0.5, + pokemonConfigs: [pokemonConfig], + }; + encounter.enemyPartyConfigs = [config]; + + // Load animations/sfx for Snorlax fight start moves + loadCustomMovesForEncounter([Moves.SNORE]); + + encounter.setDialogueToken("snorlaxName", getPokemonSpecies(Species.SNORLAX).getName()); + + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + }, + ], + }, + async () => { + // Pick battle const encounter = globalScene.currentBattle.mysteryEncounter!; - console.log(encounter); - - // Calculate boss mon - const bossSpecies = getPokemonSpecies(Species.SNORLAX); - const pokemonConfig: EnemyPokemonConfig = { - species: bossSpecies, - isBoss: true, - shiny: false, // Shiny lock because shiny is rolled only if the battle option is picked - status: [ StatusEffect.SLEEP, 5 ], // Extra turns on timer for Snorlax's start of fight moves - moveSet: [ Moves.REST, Moves.SLEEP_TALK, Moves.CRUNCH, Moves.GIGA_IMPACT ], - modifierConfigs: [ - { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ]) as PokemonHeldItemModifierType, - stackCount: 2 - }, - { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.ENIGMA ]) as PokemonHeldItemModifierType, - stackCount: 2 - }, - ], - customPokemonData: new CustomPokemonData({ spriteScale: 1.25 }), - aiType: AiType.SMART // Required to ensure Snorlax uses Sleep Talk while it is asleep - }; - const config: EnemyPartyConfig = { - levelAdditiveModifier: 0.5, - pokemonConfigs: [ pokemonConfig ], - }; - encounter.enemyPartyConfigs = [ config ]; - - // Load animations/sfx for Snorlax fight start moves - loadCustomMovesForEncounter([ Moves.SNORE ]); - - encounter.setDialogueToken("snorlaxName", getPokemonSpecies(Species.SNORLAX).getName()); - - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.LEFTOVERS], + fillRemaining: true, + }); + encounter.startOfBattleEffects.push( + { + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [BattlerIndex.PLAYER], + move: new PokemonMove(Moves.SNORE), + ignorePp: true, + }, + { + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [BattlerIndex.PLAYER], + move: new PokemonMove(Moves.SNORE), + ignorePp: true, + }, + ); + await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }, + async () => { + // Fall asleep waiting for Snorlax + // Full heal party + globalScene.unshiftPhase(new PartyHealPhase(true)); + queueEncounterMessage(`${namespace}:option.2.rest_result`); + leaveEncounterWithoutBattle(); + }, + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + .withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES, true)) + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, selected: [ { - text: `${namespace}:option.1.selected`, + text: `${namespace}:option.3.selected`, }, ], - }, - async () => { - // Pick battle - const encounter = globalScene.currentBattle.mysteryEncounter!; - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.LEFTOVERS ], fillRemaining: true }); - encounter.startOfBattleEffects.push( - { - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ BattlerIndex.PLAYER ], - move: new PokemonMove(Moves.SNORE), - ignorePp: true - }, - { - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ BattlerIndex.PLAYER ], - move: new PokemonMove(Moves.SNORE), - ignorePp: true - }); - await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); - } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - }, - ], - }, - async () => { - // Fall asleep waiting for Snorlax - // Full heal party - globalScene.unshiftPhase(new PartyHealPhase(true)); - queueEncounterMessage(`${namespace}:option.2.rest_result`); + }) + .withOptionPhase(async () => { + // Steal the Snorlax's Leftovers + const instance = globalScene.currentBattle.mysteryEncounter!; + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.LEFTOVERS], + fillRemaining: false, + }); + // Snorlax exp to Pokemon that did the stealing + setEncounterExp(instance.primaryPokemon!.id, getPokemonSpecies(Species.SNORLAX).baseExp); leaveEncounterWithoutBattle(); - } - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) - .withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES, true)) - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, - selected: [ - { - text: `${namespace}:option.3.selected` - } - ] - }) - .withOptionPhase(async () => { - // Steal the Snorlax's Leftovers - const instance = globalScene.currentBattle.mysteryEncounter!; - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.LEFTOVERS ], fillRemaining: false }); - // Snorlax exp to Pokemon that did the stealing - setEncounterExp(instance.primaryPokemon!.id, getPokemonSpecies(Species.SNORLAX).baseExp); - leaveEncounterWithoutBattle(); - }) - .build() - ) - .build(); + }) + .build(), + ) + .build(); diff --git a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts index 84768519bea..c7220192caa 100644 --- a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts +++ b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts @@ -1,5 +1,12 @@ import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { generateModifierTypeOption, initBattleWithEnemyConfig, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + generateModifierTypeOption, + initBattleWithEnemyConfig, + setEncounterExp, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, + updatePlayerMoney, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { randSeedInt } from "#app/utils"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; @@ -15,7 +22,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { Biome } from "#enums/biome"; import { getBiomeKey } from "#app/field/arena"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { getPartyLuckValue, modifierTypes } from "#app/modifier/modifier-type"; import { TrainerSlot } from "#app/data/trainer-config"; import { BattlerTagType } from "#enums/battler-tag-type"; @@ -23,140 +30,153 @@ import { getPokemonNameWithAffix } from "#app/messages"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { Stat } from "#enums/stat"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; -import { getEncounterPokemonLevelForWave, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + getEncounterPokemonLevelForWave, + STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; /** the i18n namespace for this encounter */ const namespace = "mysteryEncounters/teleportingHijinks"; const MONEY_COST_MULTIPLIER = 1.75; -const BIOME_CANDIDATES = [ Biome.SPACE, Biome.FAIRY_CAVE, Biome.LABORATORY, Biome.ISLAND, Biome.WASTELAND, Biome.DOJO ]; -const MACHINE_INTERFACING_TYPES = [ Type.ELECTRIC, Type.STEEL ]; +const BIOME_CANDIDATES = [Biome.SPACE, Biome.FAIRY_CAVE, Biome.LABORATORY, Biome.ISLAND, Biome.WASTELAND, Biome.DOJO]; +const MACHINE_INTERFACING_TYPES = [PokemonType.ELECTRIC, PokemonType.STEEL]; /** * Teleporting Hijinks encounter. * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3817 | GitHub Issue #3817} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const TeleportingHijinksEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.TELEPORTING_HIJINKS) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withSceneRequirement(new WaveModulusRequirement([ 1, 2, 3 ], 10)) // Must be in first 3 waves after boss wave - .withSceneRequirement(new MoneyRequirement(0, MONEY_COST_MULTIPLIER)) // Must be able to pay teleport cost - .withAutoHideIntroVisuals(false) - .withCatchAllowed(true) - .withFleeAllowed(false) - .withIntroSpriteConfigs([ - { - spriteKey: "teleporting_hijinks_teleporter", - fileRoot: "mystery-encounters", - hasShadow: true, - x: 4, - y: 4, - yShadow: 1 - } - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - } - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const price = globalScene.getWaveMoneyAmount(MONEY_COST_MULTIPLIER); - encounter.setDialogueToken("price", price.toString()); - encounter.misc = { - price - }; +export const TeleportingHijinksEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.TELEPORTING_HIJINKS, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withSceneRequirement(new WaveModulusRequirement([1, 2, 3], 10)) // Must be in first 3 waves after boss wave + .withSceneRequirement(new MoneyRequirement(0, MONEY_COST_MULTIPLIER)) // Must be able to pay teleport cost + .withAutoHideIntroVisuals(false) + .withCatchAllowed(true) + .withFleeAllowed(false) + .withIntroSpriteConfigs([ + { + spriteKey: "teleporting_hijinks_teleporter", + fileRoot: "mystery-encounters", + hasShadow: true, + x: 4, + y: 4, + yShadow: 1, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const price = globalScene.getWaveMoneyAmount(MONEY_COST_MULTIPLIER); + encounter.setDialogueToken("price", price.toString()); + encounter.misc = { + price, + }; - return true; - }) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) - .withSceneMoneyRequirement(0, MONEY_COST_MULTIPLIER) // Must be able to pay teleport cost - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected`, - } - ], - }) - .withPreOptionPhase(async () => { - // Update money - updatePlayerMoney(-globalScene.currentBattle.mysteryEncounter!.misc.price, true, false); - }) - .withOptionPhase(async () => { - const config: EnemyPartyConfig = await doBiomeTransitionDialogueAndBattleInit(); - setEncounterRewards({ fillRemaining: true }); - await initBattleWithEnemyConfig(config); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) - .withPokemonTypeRequirement(MACHINE_INTERFACING_TYPES, true, 1) // Must have Steel or Electric type - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - } - ], - }) - .withOptionPhase(async () => { - const config: EnemyPartyConfig = await doBiomeTransitionDialogueAndBattleInit(); - setEncounterRewards({ fillRemaining: true }); - setEncounterExp(globalScene.currentBattle.mysteryEncounter!.selectedOption!.primaryPokemon!.id, 100); - await initBattleWithEnemyConfig(config); - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + .withSceneMoneyRequirement(0, MONEY_COST_MULTIPLIER) // Must be able to pay teleport cost + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, selected: [ { - text: `${namespace}:option.3.selected`, + text: `${namespace}:option.1.selected`, }, ], - }, - async () => { - // Inspect the Machine - const encounter = globalScene.currentBattle.mysteryEncounter!; + }) + .withPreOptionPhase(async () => { + // Update money + updatePlayerMoney(-globalScene.currentBattle.mysteryEncounter!.misc.price, true, false); + }) + .withOptionPhase(async () => { + const config: EnemyPartyConfig = await doBiomeTransitionDialogueAndBattleInit(); + setEncounterRewards({ fillRemaining: true }); + await initBattleWithEnemyConfig(config); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + .withPokemonTypeRequirement(MACHINE_INTERFACING_TYPES, true, 1) // Must have Steel or Electric type + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }) + .withOptionPhase(async () => { + const config: EnemyPartyConfig = await doBiomeTransitionDialogueAndBattleInit(); + setEncounterRewards({ fillRemaining: true }); + setEncounterExp(globalScene.currentBattle.mysteryEncounter!.selectedOption!.primaryPokemon!.id, 100); + await initBattleWithEnemyConfig(config); + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + selected: [ + { + text: `${namespace}:option.3.selected`, + }, + ], + }, + async () => { + // Inspect the Machine + const encounter = globalScene.currentBattle.mysteryEncounter!; - // Init enemy - const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - const bossSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, level, 0, getPartyLuckValue(globalScene.getPlayerParty()), true); - const bossPokemon = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, true); - encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon)); - const config: EnemyPartyConfig = { - pokemonConfigs: [{ + // Init enemy + const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); + const bossSpecies = globalScene.arena.randomSpecies( + globalScene.currentBattle.waveIndex, + level, + 0, + getPartyLuckValue(globalScene.getPlayerParty()), + true, + ); + const bossPokemon = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, true); + encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon)); + const config: EnemyPartyConfig = { + pokemonConfigs: [ + { level: level, species: bossSpecies, dataSource: new PokemonData(bossPokemon), isBoss: true, - }], - }; + }, + ], + }; - const magnet = generateModifierTypeOption(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.STEEL ])!; - const metalCoat = generateModifierTypeOption(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.ELECTRIC ])!; - setEncounterRewards({ guaranteedModifierTypeOptions: [ magnet, metalCoat ], fillRemaining: true }); - await transitionMysteryEncounterIntroVisuals(true, true); - await initBattleWithEnemyConfig(config); - } - ) - .build(); + const magnet = generateModifierTypeOption(modifierTypes.ATTACK_TYPE_BOOSTER, [PokemonType.STEEL])!; + const metalCoat = generateModifierTypeOption(modifierTypes.ATTACK_TYPE_BOOSTER, [PokemonType.ELECTRIC])!; + setEncounterRewards({ + guaranteedModifierTypeOptions: [magnet, metalCoat], + fillRemaining: true, + }); + await transitionMysteryEncounterIntroVisuals(true, true); + await initBattleWithEnemyConfig(config); + }, + ) + .build(); async function doBiomeTransitionDialogueAndBattleInit() { const encounter = globalScene.currentBattle.mysteryEncounter!; @@ -167,33 +187,43 @@ async function doBiomeTransitionDialogueAndBattleInit() { // Show dialogue and transition biome await showEncounterText(`${namespace}:transport`); - await Promise.all([ animateBiomeChange(newBiome), transitionMysteryEncounterIntroVisuals() ]); + await Promise.all([animateBiomeChange(newBiome), transitionMysteryEncounterIntroVisuals()]); + globalScene.updateBiomeWaveText(); globalScene.playBgm(); await showEncounterText(`${namespace}:attacked`); // Init enemy const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - const bossSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, level, 0, getPartyLuckValue(globalScene.getPlayerParty()), true); + const bossSpecies = globalScene.arena.randomSpecies( + globalScene.currentBattle.waveIndex, + level, + 0, + getPartyLuckValue(globalScene.getPlayerParty()), + true, + ); const bossPokemon = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, true); encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon)); // Defense/Spd buffs below wave 50, +1 to all stats otherwise - const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = globalScene.currentBattle.waveIndex < 50 ? - [ Stat.DEF, Stat.SPDEF, Stat.SPD ] : - [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ]; + const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = + globalScene.currentBattle.waveIndex < 50 + ? [Stat.DEF, Stat.SPDEF, Stat.SPD] + : [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD]; const config: EnemyPartyConfig = { - pokemonConfigs: [{ - level: level, - species: bossSpecies, - dataSource: new PokemonData(bossPokemon), - isBoss: true, - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], - mysteryEncounterBattleEffects: (pokemon: Pokemon) => { - queueEncounterMessage(`${namespace}:boss_enraged`); - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1)); - } - }], + pokemonConfigs: [ + { + level: level, + species: bossSpecies, + dataSource: new PokemonData(bossPokemon), + isBoss: true, + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], + mysteryEncounterBattleEffects: (pokemon: Pokemon) => { + queueEncounterMessage(`${namespace}:boss_enraged`); + globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1)); + }, + }, + ], }; return config; @@ -202,7 +232,7 @@ async function doBiomeTransitionDialogueAndBattleInit() { async function animateBiomeChange(nextBiome: Biome) { return new Promise(resolve => { globalScene.tweens.add({ - targets: [ globalScene.arenaEnemy, globalScene.lastEnemyTrainer ], + targets: [globalScene.arenaEnemy, globalScene.lastEnemyTrainer], x: "+=300", duration: 2000, onComplete: () => { @@ -218,10 +248,10 @@ async function animateBiomeChange(nextBiome: Biome) { globalScene.arenaPlayerTransition.setVisible(true); globalScene.tweens.add({ - targets: [ globalScene.arenaPlayer, globalScene.arenaBgTransition, globalScene.arenaPlayerTransition ], + targets: [globalScene.arenaPlayer, globalScene.arenaBgTransition, globalScene.arenaPlayerTransition], duration: 1000, ease: "Sine.easeInOut", - alpha: (target: any) => target === globalScene.arenaPlayer ? 0 : 1, + alpha: (target: any) => (target === globalScene.arenaPlayer ? 0 : 1), onComplete: () => { globalScene.arenaBg.setTexture(bgTexture); globalScene.arenaPlayer.setBiome(nextBiome); @@ -241,9 +271,9 @@ async function animateBiomeChange(nextBiome: Biome) { targets: globalScene.arenaEnemy, x: "-=300", }); - } + }, }); - } + }, }); }); } diff --git a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts index 5e87a40d952..2b29046f738 100644 --- a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts @@ -1,5 +1,9 @@ import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { generateModifierType, handleMysteryEncounterBattleFailed, initBattleWithEnemyConfig, setEncounterRewards, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + handleMysteryEncounterBattleFailed, + initBattleWithEnemyConfig, + setEncounterRewards, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { trainerConfigs } from "#app/data/trainer-config"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; @@ -23,9 +27,8 @@ import { EggSourceType } from "#enums/egg-source-types"; import { EggTier } from "#enums/egg-type"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { getPokeballTintColor } from "#app/data/pokeball"; import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; @@ -40,7 +43,7 @@ const FINAL_STAGE_EVOLUTION_WAVE = 75; const FRIENDSHIP_ADDED = 20; -class BreederSpeciesEvolution { +class BreederSpeciesEvolution { species: Species; evolution: number; @@ -51,29 +54,65 @@ class BreederSpeciesEvolution { } const POOL_1_POKEMON: (Species | BreederSpeciesEvolution)[][] = [ - [ Species.MUNCHLAX, new BreederSpeciesEvolution(Species.SNORLAX, SECOND_STAGE_EVOLUTION_WAVE) ], - [ Species.HAPPINY, new BreederSpeciesEvolution(Species.CHANSEY, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.BLISSEY, FINAL_STAGE_EVOLUTION_WAVE) ], - [ Species.MAGBY, new BreederSpeciesEvolution(Species.MAGMAR, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.MAGMORTAR, FINAL_STAGE_EVOLUTION_WAVE) ], - [ Species.ELEKID, new BreederSpeciesEvolution(Species.ELECTABUZZ, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.ELECTIVIRE, FINAL_STAGE_EVOLUTION_WAVE) ], - [ Species.RIOLU, new BreederSpeciesEvolution(Species.LUCARIO, SECOND_STAGE_EVOLUTION_WAVE) ], - [ Species.BUDEW, new BreederSpeciesEvolution(Species.ROSELIA, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.ROSERADE, FINAL_STAGE_EVOLUTION_WAVE) ], - [ Species.TOXEL, new BreederSpeciesEvolution(Species.TOXTRICITY, SECOND_STAGE_EVOLUTION_WAVE) ], - [ Species.MIME_JR, new BreederSpeciesEvolution(Species.GALAR_MR_MIME, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.MR_RIME, FINAL_STAGE_EVOLUTION_WAVE) ] + [Species.MUNCHLAX, new BreederSpeciesEvolution(Species.SNORLAX, SECOND_STAGE_EVOLUTION_WAVE)], + [ + Species.HAPPINY, + new BreederSpeciesEvolution(Species.CHANSEY, FIRST_STAGE_EVOLUTION_WAVE), + new BreederSpeciesEvolution(Species.BLISSEY, FINAL_STAGE_EVOLUTION_WAVE), + ], + [ + Species.MAGBY, + new BreederSpeciesEvolution(Species.MAGMAR, FIRST_STAGE_EVOLUTION_WAVE), + new BreederSpeciesEvolution(Species.MAGMORTAR, FINAL_STAGE_EVOLUTION_WAVE), + ], + [ + Species.ELEKID, + new BreederSpeciesEvolution(Species.ELECTABUZZ, FIRST_STAGE_EVOLUTION_WAVE), + new BreederSpeciesEvolution(Species.ELECTIVIRE, FINAL_STAGE_EVOLUTION_WAVE), + ], + [Species.RIOLU, new BreederSpeciesEvolution(Species.LUCARIO, SECOND_STAGE_EVOLUTION_WAVE)], + [ + Species.BUDEW, + new BreederSpeciesEvolution(Species.ROSELIA, FIRST_STAGE_EVOLUTION_WAVE), + new BreederSpeciesEvolution(Species.ROSERADE, FINAL_STAGE_EVOLUTION_WAVE), + ], + [Species.TOXEL, new BreederSpeciesEvolution(Species.TOXTRICITY, SECOND_STAGE_EVOLUTION_WAVE)], + [ + Species.MIME_JR, + new BreederSpeciesEvolution(Species.GALAR_MR_MIME, FIRST_STAGE_EVOLUTION_WAVE), + new BreederSpeciesEvolution(Species.MR_RIME, FINAL_STAGE_EVOLUTION_WAVE), + ], ]; const POOL_2_POKEMON: (Species | BreederSpeciesEvolution)[][] = [ - [ Species.PICHU, new BreederSpeciesEvolution(Species.PIKACHU, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.RAICHU, FINAL_STAGE_EVOLUTION_WAVE) ], - [ Species.PICHU, new BreederSpeciesEvolution(Species.PIKACHU, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.ALOLA_RAICHU, FINAL_STAGE_EVOLUTION_WAVE) ], - [ Species.SMOOCHUM, new BreederSpeciesEvolution(Species.JYNX, SECOND_STAGE_EVOLUTION_WAVE) ], - [ Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONLEE, SECOND_STAGE_EVOLUTION_WAVE) ], - [ Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONCHAN, SECOND_STAGE_EVOLUTION_WAVE) ], - [ Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONTOP, SECOND_STAGE_EVOLUTION_WAVE) ], - [ Species.IGGLYBUFF, new BreederSpeciesEvolution(Species.JIGGLYPUFF, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.WIGGLYTUFF, FINAL_STAGE_EVOLUTION_WAVE) ], - [ Species.AZURILL, new BreederSpeciesEvolution(Species.MARILL, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.AZUMARILL, FINAL_STAGE_EVOLUTION_WAVE) ], - [ Species.WYNAUT, new BreederSpeciesEvolution(Species.WOBBUFFET, SECOND_STAGE_EVOLUTION_WAVE) ], - [ Species.CHINGLING, new BreederSpeciesEvolution(Species.CHIMECHO, SECOND_STAGE_EVOLUTION_WAVE) ], - [ Species.BONSLY, new BreederSpeciesEvolution(Species.SUDOWOODO, SECOND_STAGE_EVOLUTION_WAVE) ], - [ Species.MANTYKE, new BreederSpeciesEvolution(Species.MANTINE, SECOND_STAGE_EVOLUTION_WAVE) ] + [ + Species.PICHU, + new BreederSpeciesEvolution(Species.PIKACHU, FIRST_STAGE_EVOLUTION_WAVE), + new BreederSpeciesEvolution(Species.RAICHU, FINAL_STAGE_EVOLUTION_WAVE), + ], + [ + Species.PICHU, + new BreederSpeciesEvolution(Species.PIKACHU, FIRST_STAGE_EVOLUTION_WAVE), + new BreederSpeciesEvolution(Species.ALOLA_RAICHU, FINAL_STAGE_EVOLUTION_WAVE), + ], + [Species.SMOOCHUM, new BreederSpeciesEvolution(Species.JYNX, SECOND_STAGE_EVOLUTION_WAVE)], + [Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONLEE, SECOND_STAGE_EVOLUTION_WAVE)], + [Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONCHAN, SECOND_STAGE_EVOLUTION_WAVE)], + [Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONTOP, SECOND_STAGE_EVOLUTION_WAVE)], + [ + Species.IGGLYBUFF, + new BreederSpeciesEvolution(Species.JIGGLYPUFF, FIRST_STAGE_EVOLUTION_WAVE), + new BreederSpeciesEvolution(Species.WIGGLYTUFF, FINAL_STAGE_EVOLUTION_WAVE), + ], + [ + Species.AZURILL, + new BreederSpeciesEvolution(Species.MARILL, FIRST_STAGE_EVOLUTION_WAVE), + new BreederSpeciesEvolution(Species.AZUMARILL, FINAL_STAGE_EVOLUTION_WAVE), + ], + [Species.WYNAUT, new BreederSpeciesEvolution(Species.WOBBUFFET, SECOND_STAGE_EVOLUTION_WAVE)], + [Species.CHINGLING, new BreederSpeciesEvolution(Species.CHIMECHO, SECOND_STAGE_EVOLUTION_WAVE)], + [Species.BONSLY, new BreederSpeciesEvolution(Species.SUDOWOODO, SECOND_STAGE_EVOLUTION_WAVE)], + [Species.MANTYKE, new BreederSpeciesEvolution(Species.MANTINE, SECOND_STAGE_EVOLUTION_WAVE)], ]; /** @@ -81,291 +120,344 @@ const POOL_2_POKEMON: (Species | BreederSpeciesEvolution)[][] = [ * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3818 | GitHub Issue #3818} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const TheExpertPokemonBreederEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER) - .withEncounterTier(MysteryEncounterTier.ULTRA) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withScenePartySizeRequirement(4, 6, true) // Must have at least 4 legal pokemon in party - .withIntroSpriteConfigs([]) // These are set in onInit() - .withIntroDialogue([ +export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER, +) + .withEncounterTier(MysteryEncounterTier.ULTRA) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withScenePartySizeRequirement(4, 6, true) // Must have at least 4 legal pokemon in party + .withIntroSpriteConfigs([]) // These are set in onInit() + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + speaker: trainerNameKey, + text: `${namespace}:intro_dialogue`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const waveIndex = globalScene.currentBattle.waveIndex; + // Calculates what trainers are available for battle in the encounter + + // If player is in space biome, uses special "Space" version of the trainer + encounter.enemyPartyConfigs = [getPartyConfig()]; + + const cleffaSpecies = + waveIndex < FIRST_STAGE_EVOLUTION_WAVE + ? Species.CLEFFA + : waveIndex < FINAL_STAGE_EVOLUTION_WAVE + ? Species.CLEFAIRY + : Species.CLEFABLE; + encounter.spriteConfigs = [ { - text: `${namespace}:intro`, + spriteKey: cleffaSpecies.toString(), + fileRoot: "pokemon", + hasShadow: true, + repeat: true, + x: 14, + y: -2, + yShadow: -2, }, { - speaker: trainerNameKey, - text: `${namespace}:intro_dialogue`, + spriteKey: "expert_pokemon_breeder", + fileRoot: "trainer", + hasShadow: true, + x: -14, + y: 4, + yShadow: 2, }, - ]) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const waveIndex = globalScene.currentBattle.waveIndex; - // Calculates what trainers are available for battle in the encounter + ]; - // If player is in space biome, uses special "Space" version of the trainer - encounter.enemyPartyConfigs = [ - getPartyConfig() - ]; + // Determine the 3 pokemon the player can battle with + let partyCopy = globalScene.getPlayerParty().slice(0); + partyCopy = partyCopy.filter(p => p.isAllowedInBattle()).sort((a, b) => a.friendship - b.friendship); - const cleffaSpecies = waveIndex < FIRST_STAGE_EVOLUTION_WAVE ? Species.CLEFFA : waveIndex < FINAL_STAGE_EVOLUTION_WAVE ? Species.CLEFAIRY : Species.CLEFABLE; - encounter.spriteConfigs = [ - { - spriteKey: cleffaSpecies.toString(), - fileRoot: "pokemon", - hasShadow: true, - repeat: true, - x: 14, - y: -2, - yShadow: -2 - }, - { - spriteKey: "expert_pokemon_breeder", - fileRoot: "trainer", - hasShadow: true, - x: -14, - y: 4, - yShadow: 2 - }, - ]; + const pokemon1 = partyCopy[0]; + const pokemon2 = partyCopy[1]; + const pokemon3 = partyCopy[2]; + encounter.setDialogueToken("pokemon1Name", pokemon1.getNameToRender()); + encounter.setDialogueToken("pokemon2Name", pokemon2.getNameToRender()); + encounter.setDialogueToken("pokemon3Name", pokemon3.getNameToRender()); - // Determine the 3 pokemon the player can battle with - let partyCopy = globalScene.getPlayerParty().slice(0); - partyCopy = partyCopy - .filter(p => p.isAllowedInBattle()) - .sort((a, b) => a.friendship - b.friendship); + // Dialogue and egg calcs for Pokemon 1 + const [pokemon1CommonEggs, pokemon1RareEggs] = calculateEggRewardsForPokemon(pokemon1); + let pokemon1Tooltip = getEncounterText(`${namespace}:option.1.tooltip_base`)!; + if (pokemon1RareEggs > 0) { + const eggsText = i18next.t(`${namespace}:numEggs`, { + count: pokemon1RareEggs, + rarity: i18next.t("egg:greatTier"), + }); + pokemon1Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + eggs: eggsText, + }); + encounter.setDialogueToken("pokemon1RareEggs", eggsText); + } + if (pokemon1CommonEggs > 0) { + const eggsText = i18next.t(`${namespace}:numEggs`, { + count: pokemon1CommonEggs, + rarity: i18next.t("egg:defaultTier"), + }); + pokemon1Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + eggs: eggsText, + }); + encounter.setDialogueToken("pokemon1CommonEggs", eggsText); + } + encounter.options[0].dialogue!.buttonTooltip = pokemon1Tooltip; - const pokemon1 = partyCopy[0]; - const pokemon2 = partyCopy[1]; - const pokemon3 = partyCopy[2]; - encounter.setDialogueToken("pokemon1Name", pokemon1.getNameToRender()); - encounter.setDialogueToken("pokemon2Name", pokemon2.getNameToRender()); - encounter.setDialogueToken("pokemon3Name", pokemon3.getNameToRender()); + // Dialogue and egg calcs for Pokemon 2 + const [pokemon2CommonEggs, pokemon2RareEggs] = calculateEggRewardsForPokemon(pokemon2); + let pokemon2Tooltip = getEncounterText(`${namespace}:option.2.tooltip_base`)!; + if (pokemon2RareEggs > 0) { + const eggsText = i18next.t(`${namespace}:numEggs`, { + count: pokemon2RareEggs, + rarity: i18next.t("egg:greatTier"), + }); + pokemon2Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + eggs: eggsText, + }); + encounter.setDialogueToken("pokemon2RareEggs", eggsText); + } + if (pokemon2CommonEggs > 0) { + const eggsText = i18next.t(`${namespace}:numEggs`, { + count: pokemon2CommonEggs, + rarity: i18next.t("egg:defaultTier"), + }); + pokemon2Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + eggs: eggsText, + }); + encounter.setDialogueToken("pokemon2CommonEggs", eggsText); + } + encounter.options[1].dialogue!.buttonTooltip = pokemon2Tooltip; - // Dialogue and egg calcs for Pokemon 1 - const [ pokemon1CommonEggs, pokemon1RareEggs ] = calculateEggRewardsForPokemon(pokemon1); - let pokemon1Tooltip = getEncounterText(`${namespace}:option.1.tooltip_base`)!; - if (pokemon1RareEggs > 0) { - const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon1RareEggs, rarity: i18next.t("egg:greatTier") }); - pokemon1Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText }); - encounter.setDialogueToken("pokemon1RareEggs", eggsText); - } - if (pokemon1CommonEggs > 0) { - const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon1CommonEggs, rarity: i18next.t("egg:defaultTier") }); - pokemon1Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText }); - encounter.setDialogueToken("pokemon1CommonEggs", eggsText); - } - encounter.options[0].dialogue!.buttonTooltip = pokemon1Tooltip; + // Dialogue and egg calcs for Pokemon 3 + const [pokemon3CommonEggs, pokemon3RareEggs] = calculateEggRewardsForPokemon(pokemon3); + let pokemon3Tooltip = getEncounterText(`${namespace}:option.3.tooltip_base`)!; + if (pokemon3RareEggs > 0) { + const eggsText = i18next.t(`${namespace}:numEggs`, { + count: pokemon3RareEggs, + rarity: i18next.t("egg:greatTier"), + }); + pokemon3Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + eggs: eggsText, + }); + encounter.setDialogueToken("pokemon3RareEggs", eggsText); + } + if (pokemon3CommonEggs > 0) { + const eggsText = i18next.t(`${namespace}:numEggs`, { + count: pokemon3CommonEggs, + rarity: i18next.t("egg:defaultTier"), + }); + pokemon3Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + eggs: eggsText, + }); + encounter.setDialogueToken("pokemon3CommonEggs", eggsText); + } + encounter.options[2].dialogue!.buttonTooltip = pokemon3Tooltip; - // Dialogue and egg calcs for Pokemon 2 - const [ pokemon2CommonEggs, pokemon2RareEggs ] = calculateEggRewardsForPokemon(pokemon2); - let pokemon2Tooltip = getEncounterText(`${namespace}:option.2.tooltip_base`)!; - if (pokemon2RareEggs > 0) { - const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon2RareEggs, rarity: i18next.t("egg:greatTier") }); - pokemon2Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText }); - encounter.setDialogueToken("pokemon2RareEggs", eggsText); - } - if (pokemon2CommonEggs > 0) { - const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon2CommonEggs, rarity: i18next.t("egg:defaultTier") }); - pokemon2Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText }); - encounter.setDialogueToken("pokemon2CommonEggs", eggsText); - } - encounter.options[1].dialogue!.buttonTooltip = pokemon2Tooltip; + encounter.misc = { + pokemon1, + pokemon1CommonEggs, + pokemon1RareEggs, + pokemon2, + pokemon2CommonEggs, + pokemon2RareEggs, + pokemon3, + pokemon3CommonEggs, + pokemon3RareEggs, + }; - // Dialogue and egg calcs for Pokemon 3 - const [ pokemon3CommonEggs, pokemon3RareEggs ] = calculateEggRewardsForPokemon(pokemon3); - let pokemon3Tooltip = getEncounterText(`${namespace}:option.3.tooltip_base`)!; - if (pokemon3RareEggs > 0) { - const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon3RareEggs, rarity: i18next.t("egg:greatTier") }); - pokemon3Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText }); - encounter.setDialogueToken("pokemon3RareEggs", eggsText); - } - if (pokemon3CommonEggs > 0) { - const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon3CommonEggs, rarity: i18next.t("egg:defaultTier") }); - pokemon3Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText }); - encounter.setDialogueToken("pokemon3CommonEggs", eggsText); - } - encounter.options[2].dialogue!.buttonTooltip = pokemon3Tooltip; + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + selected: [ + { + speaker: trainerNameKey, + text: `${namespace}:option.selected`, + }, + ], + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Spawn battle with first pokemon + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; - encounter.misc = { - pokemon1, - pokemon1CommonEggs, - pokemon1RareEggs, - pokemon2, - pokemon2CommonEggs, - pokemon2RareEggs, - pokemon3, - pokemon3CommonEggs, - pokemon3RareEggs - }; + const { pokemon1, pokemon1CommonEggs, pokemon1RareEggs } = encounter.misc; + encounter.misc.chosenPokemon = pokemon1; + encounter.setDialogueToken("chosenPokemon", pokemon1.getNameToRender()); + const eggOptions = getEggOptions(pokemon1CommonEggs, pokemon1RareEggs); + setEncounterRewards( + { + guaranteedModifierTypeFuncs: [modifierTypes.SOOTHE_BELL], + fillRemaining: true, + }, + eggOptions, + () => doPostEncounterCleanup(), + ); - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - selected: [ - { - speaker: trainerNameKey, - text: `${namespace}:option.selected`, - }, - ], - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Spawn battle with first pokemon - const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; + // Remove all Pokemon from the party except the chosen Pokemon + removePokemonFromPartyAndStoreHeldItems(encounter, pokemon1); - const { pokemon1, pokemon1CommonEggs, pokemon1RareEggs } = encounter.misc; - encounter.misc.chosenPokemon = pokemon1; - encounter.setDialogueToken("chosenPokemon", pokemon1.getNameToRender()); - const eggOptions = getEggOptions(pokemon1CommonEggs, pokemon1RareEggs); - setEncounterRewards( - { guaranteedModifierTypeFuncs: [ modifierTypes.SOOTHE_BELL ], fillRemaining: true }, - eggOptions, - () => doPostEncounterCleanup()); + // Configure outro dialogue for egg rewards + encounter.dialogue.outro = [ + { + speaker: trainerNameKey, + text: `${namespace}:outro`, + }, + ]; + if (encounter.dialogueTokens.hasOwnProperty("pokemon1CommonEggs")) { + encounter.dialogue.outro.push({ + text: i18next.t(`${namespace}:gained_eggs`, { + numEggs: encounter.dialogueTokens["pokemon1CommonEggs"], + }), + }); + } + if (encounter.dialogueTokens.hasOwnProperty("pokemon1RareEggs")) { + encounter.dialogue.outro.push({ + text: i18next.t(`${namespace}:gained_eggs`, { + numEggs: encounter.dialogueTokens["pokemon1RareEggs"], + }), + }); + } - // Remove all Pokemon from the party except the chosen Pokemon - removePokemonFromPartyAndStoreHeldItems(encounter, pokemon1); + encounter.onGameOver = onGameOver; + await initBattleWithEnemyConfig(config); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + selected: [ + { + speaker: trainerNameKey, + text: `${namespace}:option.selected`, + }, + ], + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Spawn battle with second pokemon + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; - // Configure outro dialogue for egg rewards - encounter.dialogue.outro = [ - { - speaker: trainerNameKey, - text: `${namespace}:outro`, - }, - ]; - if (encounter.dialogueTokens.hasOwnProperty("pokemon1CommonEggs")) { - encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon1CommonEggs"] }), - }); - } - if (encounter.dialogueTokens.hasOwnProperty("pokemon1RareEggs")) { - encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon1RareEggs"] }), - }); - } + const { pokemon2, pokemon2CommonEggs, pokemon2RareEggs } = encounter.misc; + encounter.misc.chosenPokemon = pokemon2; + encounter.setDialogueToken("chosenPokemon", pokemon2.getNameToRender()); + const eggOptions = getEggOptions(pokemon2CommonEggs, pokemon2RareEggs); + setEncounterRewards( + { + guaranteedModifierTypeFuncs: [modifierTypes.SOOTHE_BELL], + fillRemaining: true, + }, + eggOptions, + () => doPostEncounterCleanup(), + ); - encounter.onGameOver = onGameOver; - await initBattleWithEnemyConfig(config); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - selected: [ - { - speaker: trainerNameKey, - text: `${namespace}:option.selected`, - }, - ], - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Spawn battle with second pokemon - const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; + // Remove all Pokemon from the party except the chosen Pokemon + removePokemonFromPartyAndStoreHeldItems(encounter, pokemon2); - const { pokemon2, pokemon2CommonEggs, pokemon2RareEggs } = encounter.misc; - encounter.misc.chosenPokemon = pokemon2; - encounter.setDialogueToken("chosenPokemon", pokemon2.getNameToRender()); - const eggOptions = getEggOptions(pokemon2CommonEggs, pokemon2RareEggs); - setEncounterRewards( - { guaranteedModifierTypeFuncs: [ modifierTypes.SOOTHE_BELL ], fillRemaining: true }, - eggOptions, - () => doPostEncounterCleanup()); + // Configure outro dialogue for egg rewards + encounter.dialogue.outro = [ + { + speaker: trainerNameKey, + text: `${namespace}:outro`, + }, + ]; + if (encounter.dialogueTokens.hasOwnProperty("pokemon2CommonEggs")) { + encounter.dialogue.outro.push({ + text: i18next.t(`${namespace}:gained_eggs`, { + numEggs: encounter.dialogueTokens["pokemon2CommonEggs"], + }), + }); + } + if (encounter.dialogueTokens.hasOwnProperty("pokemon2RareEggs")) { + encounter.dialogue.outro.push({ + text: i18next.t(`${namespace}:gained_eggs`, { + numEggs: encounter.dialogueTokens["pokemon2RareEggs"], + }), + }); + } - // Remove all Pokemon from the party except the chosen Pokemon - removePokemonFromPartyAndStoreHeldItems(encounter, pokemon2); + encounter.onGameOver = onGameOver; + await initBattleWithEnemyConfig(config); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + selected: [ + { + speaker: trainerNameKey, + text: `${namespace}:option.selected`, + }, + ], + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + // Spawn battle with third pokemon + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; - // Configure outro dialogue for egg rewards - encounter.dialogue.outro = [ - { - speaker: trainerNameKey, - text: `${namespace}:outro`, - }, - ]; - if (encounter.dialogueTokens.hasOwnProperty("pokemon2CommonEggs")) { - encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon2CommonEggs"] }), - }); - } - if (encounter.dialogueTokens.hasOwnProperty("pokemon2RareEggs")) { - encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon2RareEggs"] }), - }); - } + const { pokemon3, pokemon3CommonEggs, pokemon3RareEggs } = encounter.misc; + encounter.misc.chosenPokemon = pokemon3; + encounter.setDialogueToken("chosenPokemon", pokemon3.getNameToRender()); + const eggOptions = getEggOptions(pokemon3CommonEggs, pokemon3RareEggs); + setEncounterRewards( + { + guaranteedModifierTypeFuncs: [modifierTypes.SOOTHE_BELL], + fillRemaining: true, + }, + eggOptions, + () => doPostEncounterCleanup(), + ); - encounter.onGameOver = onGameOver; - await initBattleWithEnemyConfig(config); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - selected: [ - { - speaker: trainerNameKey, - text: `${namespace}:option.selected`, - }, - ], - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Spawn battle with third pokemon - const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; + // Remove all Pokemon from the party except the chosen Pokemon + removePokemonFromPartyAndStoreHeldItems(encounter, pokemon3); - const { pokemon3, pokemon3CommonEggs, pokemon3RareEggs } = encounter.misc; - encounter.misc.chosenPokemon = pokemon3; - encounter.setDialogueToken("chosenPokemon", pokemon3.getNameToRender()); - const eggOptions = getEggOptions(pokemon3CommonEggs, pokemon3RareEggs); - setEncounterRewards( - { guaranteedModifierTypeFuncs: [ modifierTypes.SOOTHE_BELL ], fillRemaining: true }, - eggOptions, - () => doPostEncounterCleanup()); + // Configure outro dialogue for egg rewards + encounter.dialogue.outro = [ + { + speaker: trainerNameKey, + text: `${namespace}:outro`, + }, + ]; + if (encounter.dialogueTokens.hasOwnProperty("pokemon3CommonEggs")) { + encounter.dialogue.outro.push({ + text: i18next.t(`${namespace}:gained_eggs`, { + numEggs: encounter.dialogueTokens["pokemon3CommonEggs"], + }), + }); + } + if (encounter.dialogueTokens.hasOwnProperty("pokemon3RareEggs")) { + encounter.dialogue.outro.push({ + text: i18next.t(`${namespace}:gained_eggs`, { + numEggs: encounter.dialogueTokens["pokemon3RareEggs"], + }), + }); + } - // Remove all Pokemon from the party except the chosen Pokemon - removePokemonFromPartyAndStoreHeldItems(encounter, pokemon3); - - // Configure outro dialogue for egg rewards - encounter.dialogue.outro = [ - { - speaker: trainerNameKey, - text: `${namespace}:outro`, - }, - ]; - if (encounter.dialogueTokens.hasOwnProperty("pokemon3CommonEggs")) { - encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon3CommonEggs"] }), - }); - } - if (encounter.dialogueTokens.hasOwnProperty("pokemon3RareEggs")) { - encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon3RareEggs"] }), - }); - } - - encounter.onGameOver = onGameOver; - await initBattleWithEnemyConfig(config); - }) - .build() - ) - .withOutroDialogue([ - { - speaker: trainerNameKey, - text: `${namespace}:outro`, - }, - ]) - .build(); + encounter.onGameOver = onGameOver; + await initBattleWithEnemyConfig(config); + }) + .build(), + ) + .withOutroDialogue([ + { + speaker: trainerNameKey, + text: `${namespace}:outro`, + }, + ]) + .build(); function getPartyConfig(): EnemyPartyConfig { // Bug type superfan trainer config @@ -374,68 +466,79 @@ function getPartyConfig(): EnemyPartyConfig { breederConfig.name = i18next.t(trainerNameKey); // First mon is *always* this special cleffa - const cleffaSpecies = waveIndex < FIRST_STAGE_EVOLUTION_WAVE ? Species.CLEFFA : waveIndex < FINAL_STAGE_EVOLUTION_WAVE ? Species.CLEFAIRY : Species.CLEFABLE; + const cleffaSpecies = + waveIndex < FIRST_STAGE_EVOLUTION_WAVE + ? Species.CLEFFA + : waveIndex < FINAL_STAGE_EVOLUTION_WAVE + ? Species.CLEFAIRY + : Species.CLEFABLE; const baseConfig: EnemyPartyConfig = { trainerType: TrainerType.EXPERT_POKEMON_BREEDER, pokemonConfigs: [ { - nickname: i18next.t(`${namespace}:cleffa_1_nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName() }), + nickname: i18next.t(`${namespace}:cleffa_1_nickname`, { + speciesName: getPokemonSpecies(cleffaSpecies).getName(), + }), species: getPokemonSpecies(cleffaSpecies), isBoss: false, abilityIndex: 1, // Magic Guard shiny: false, nature: Nature.ADAMANT, - moveSet: [ Moves.METEOR_MASH, Moves.FIRE_PUNCH, Moves.ICE_PUNCH, Moves.THUNDER_PUNCH ], - ivs: [ 31, 31, 31, 31, 31, 31 ], - modifierConfigs: [ - { - modifier: generateModifierType(modifierTypes.TERA_SHARD, [ Type.STEEL ]) as PokemonHeldItemModifierType, - } - ] - } - ] + moveSet: [Moves.METEOR_MASH, Moves.FIRE_PUNCH, Moves.ICE_PUNCH, Moves.THUNDER_PUNCH], + ivs: [31, 31, 31, 31, 31, 31], + tera: PokemonType.STEEL, + }, + ], }; if (globalScene.arena.biomeType === Biome.SPACE) { // All 3 members always Cleffa line, but different configs - baseConfig.pokemonConfigs!.push({ - nickname: i18next.t(`${namespace}:cleffa_2_nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName() }), - species: getPokemonSpecies(cleffaSpecies), - isBoss: false, - abilityIndex: 1, // Magic Guard - shiny: true, - variant: 1, - nature: Nature.MODEST, - moveSet: [ Moves.MOONBLAST, Moves.MYSTICAL_FIRE, Moves.ICE_BEAM, Moves.THUNDERBOLT ], - ivs: [ 31, 31, 31, 31, 31, 31 ] - }, - { - nickname: i18next.t(`${namespace}:cleffa_3_nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName() }), - species: getPokemonSpecies(cleffaSpecies), - isBoss: false, - abilityIndex: 2, // Friend Guard / Unaware - shiny: true, - variant: 2, - nature: Nature.BOLD, - moveSet: [ Moves.TRI_ATTACK, Moves.STORED_POWER, Moves.TAKE_HEART, Moves.MOONLIGHT ], - ivs: [ 31, 31, 31, 31, 31, 31 ] - }); + baseConfig.pokemonConfigs!.push( + { + nickname: i18next.t(`${namespace}:cleffa_2_nickname`, { + speciesName: getPokemonSpecies(cleffaSpecies).getName(), + }), + species: getPokemonSpecies(cleffaSpecies), + isBoss: false, + abilityIndex: 1, // Magic Guard + shiny: true, + variant: 1, + nature: Nature.MODEST, + moveSet: [Moves.MOONBLAST, Moves.MYSTICAL_FIRE, Moves.ICE_BEAM, Moves.THUNDERBOLT], + ivs: [31, 31, 31, 31, 31, 31], + }, + { + nickname: i18next.t(`${namespace}:cleffa_3_nickname`, { + speciesName: getPokemonSpecies(cleffaSpecies).getName(), + }), + species: getPokemonSpecies(cleffaSpecies), + isBoss: false, + abilityIndex: 2, // Friend Guard / Unaware + shiny: true, + variant: 2, + nature: Nature.BOLD, + moveSet: [Moves.TRI_ATTACK, Moves.STORED_POWER, Moves.TAKE_HEART, Moves.MOONLIGHT], + ivs: [31, 31, 31, 31, 31, 31], + }, + ); } else { // Second member from pool 1 const pool1Species = getSpeciesFromPool(POOL_1_POKEMON, waveIndex); // Third member from pool 2 const pool2Species = getSpeciesFromPool(POOL_2_POKEMON, waveIndex); - baseConfig.pokemonConfigs!.push({ - species: getPokemonSpecies(pool1Species), - isBoss: false, - ivs: [ 31, 31, 31, 31, 31, 31 ] - }, - { - species: getPokemonSpecies(pool2Species), - isBoss: false, - ivs: [ 31, 31, 31, 31, 31, 31 ] - }); + baseConfig.pokemonConfigs!.push( + { + species: getPokemonSpecies(pool1Species), + isBoss: false, + ivs: [31, 31, 31, 31, 31, 31], + }, + { + species: getPokemonSpecies(pool2Species), + isBoss: false, + ivs: [31, 31, 31, 31, 31, 31], + }, + ); } return baseConfig; @@ -476,7 +579,7 @@ function calculateEggRewardsForPokemon(pokemon: PlayerPokemon): [number, number] // 1 Common egg for every point leftover numCommons += totalPoints % 4; - return [ numCommons, numRares ]; + return [numCommons, numRares]; } function getEggOptions(commonEggs: number, rareEggs: number) { @@ -489,7 +592,7 @@ function getEggOptions(commonEggs: number, rareEggs: number) { pulled: false, sourceType: EggSourceType.EVENT, eggDescriptor: eggDescription, - tier: EggTier.COMMON + tier: EggTier.COMMON, }); } } @@ -499,7 +602,7 @@ function getEggOptions(commonEggs: number, rareEggs: number) { pulled: false, sourceType: EggSourceType.EVENT, eggDescriptor: eggDescription, - tier: EggTier.RARE + tier: EggTier.RARE, }); } } @@ -513,11 +616,8 @@ function removePokemonFromPartyAndStoreHeldItems(encounter: MysteryEncounter, ch party[chosenIndex] = party[0]; party[0] = chosenPokemon; encounter.misc.originalParty = globalScene.getPlayerParty().slice(1); - encounter.misc.originalPartyHeldItems = encounter.misc.originalParty - .map(p => p.getHeldItems()); - globalScene["party"] = [ - chosenPokemon - ]; + encounter.misc.originalPartyHeldItems = encounter.misc.originalParty.map(p => p.getHeldItems()); + globalScene["party"] = [chosenPokemon]; } function restorePartyAndHeldItems() { @@ -527,11 +627,11 @@ function restorePartyAndHeldItems() { // Restore held items const originalHeldItems = encounter.misc.originalPartyHeldItems; - originalHeldItems.forEach((pokemonHeldItemsList: PokemonHeldItemModifier[]) => { - pokemonHeldItemsList.forEach(heldItem => { + for (const pokemonHeldItemsList of originalHeldItems) { + for (const heldItem of pokemonHeldItemsList) { globalScene.addModifier(heldItem, true, false, false, true); - }); - }); + } + } globalScene.updateModifiers(true); } @@ -547,7 +647,7 @@ function onGameOver() { // Restore original party, player loses all friendship with chosen mon (it remains fainted) restorePartyAndHeldItems(); - const chosenPokemon = encounter.misc.chosenPokemon; + const chosenPokemon = encounter.misc.chosenPokemon; chosenPokemon.friendship = 0; // Clear all rewards that would have been earned @@ -575,8 +675,8 @@ function onGameOver() { ease: "Sine.easeIn", scale: 0.5, onComplete: () => { - globalScene.field.remove(pokemon, true); - } + pokemon.leaveField(true, true, true); + }, }); } @@ -598,11 +698,10 @@ function onGameOver() { y: "+=16", alpha: 1, ease: "Sine.easeInOut", - duration: 750 + duration: 750, }); }); - handleMysteryEncounterBattleFailed(true); return false; diff --git a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts index ff4dd9750c9..fb55c55a1a3 100644 --- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts @@ -1,11 +1,19 @@ -import { leaveEncounterWithoutBattle, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + leaveEncounterWithoutBattle, + transitionMysteryEncounterIntroVisuals, + updatePlayerMoney, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { isNullOrUndefined, randSeedInt } from "#app/utils"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { catchPokemon, getRandomSpeciesByStarterCost, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + catchPokemon, + getRandomSpeciesByStarterCost, + getSpriteKeysFromPokemon, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import type PokemonSpecies from "#app/data/pokemon-species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { speciesStarterCosts } from "#app/data/balance/starters"; @@ -35,143 +43,149 @@ const SHINY_MAGIKARP_WEIGHT = 100; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3799 | GitHub Issue #3799} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const ThePokemonSalesmanEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.THE_POKEMON_SALESMAN) - .withEncounterTier(MysteryEncounterTier.ULTRA) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withSceneRequirement(new MoneyRequirement(0, MAX_POKEMON_PRICE_MULTIPLIER)) // Some costs may not be as significant, this is the max you'd pay - .withAutoHideIntroVisuals(false) - .withIntroSpriteConfigs([ - { - spriteKey: "pokemon_salesman", - fileRoot: "mystery-encounters", - hasShadow: true - } - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - { - text: `${namespace}:intro_dialogue`, - speaker: `${namespace}:speaker`, - }, - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; +export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.THE_POKEMON_SALESMAN, +) + .withEncounterTier(MysteryEncounterTier.ULTRA) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withSceneRequirement(new MoneyRequirement(0, MAX_POKEMON_PRICE_MULTIPLIER)) // Some costs may not be as significant, this is the max you'd pay + .withAutoHideIntroVisuals(false) + .withIntroSpriteConfigs([ + { + spriteKey: "pokemon_salesman", + fileRoot: "mystery-encounters", + hasShadow: true, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + text: `${namespace}:intro_dialogue`, + speaker: `${namespace}:speaker`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; - let species = getSalesmanSpeciesOffer(); - let tries = 0; + let species = getSalesmanSpeciesOffer(); + let tries = 0; - // Reroll any species that don't have HAs - while ((isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE) && tries < 5) { - species = getSalesmanSpeciesOffer(); - tries++; - } + // Reroll any species that don't have HAs + while ((isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE) && tries < 5) { + species = getSalesmanSpeciesOffer(); + tries++; + } - let pokemon: PlayerPokemon; - if (randSeedInt(SHINY_MAGIKARP_WEIGHT) === 0 || isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE) { - // If no HA mon found or you roll 1%, give shiny Magikarp with random variant - species = getPokemonSpecies(Species.MAGIKARP); - pokemon = new PlayerPokemon(species, 5, 2, species.formIndex, undefined, true); - } else { - pokemon = new PlayerPokemon(species, 5, 2, species.formIndex); - } - pokemon.generateAndPopulateMoveset(); + let pokemon: PlayerPokemon; + if ( + randSeedInt(SHINY_MAGIKARP_WEIGHT) === 0 || + isNullOrUndefined(species.abilityHidden) || + species.abilityHidden === Abilities.NONE + ) { + // If no HA mon found or you roll 1%, give shiny Magikarp with random variant + species = getPokemonSpecies(Species.MAGIKARP); + pokemon = new PlayerPokemon(species, 5, 2, species.formIndex, undefined, true); + } else { + pokemon = new PlayerPokemon(species, 5, 2, species.formIndex); + } + pokemon.generateAndPopulateMoveset(); - const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon); - encounter.spriteConfigs.push({ - spriteKey: spriteKey, - fileRoot: fileRoot, - hasShadow: true, - repeat: true, - isPokemon: true, - isShiny: pokemon.shiny, - variant: pokemon.variant - }); + const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon); + encounter.spriteConfigs.push({ + spriteKey: spriteKey, + fileRoot: fileRoot, + hasShadow: true, + repeat: true, + isPokemon: true, + isShiny: pokemon.shiny, + variant: pokemon.variant, + }); - const starterTier = speciesStarterCosts[species.speciesId]; - // Prices decrease by starter tier less than 5, but only reduces cost by half at max - let priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER * (Math.max(starterTier, 2.5) / 5); - if (pokemon.shiny) { - // Always max price for shiny (flip HA back to normal), and add special messaging - priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER; - pokemon.abilityIndex = 0; - encounter.dialogue.encounterOptionsDialogue!.description = `${namespace}:description_shiny`; - encounter.options[0].dialogue!.buttonTooltip = `${namespace}:option.1.tooltip_shiny`; - } - const price = globalScene.getWaveMoneyAmount(priceMultiplier); - encounter.setDialogueToken("purchasePokemon", pokemon.getNameToRender()); - encounter.setDialogueToken("price", price.toString()); - encounter.misc = { - price: price, - pokemon: pokemon - }; + const starterTier = speciesStarterCosts[species.speciesId]; + // Prices decrease by starter tier less than 5, but only reduces cost by half at max + let priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER * (Math.max(starterTier, 2.5) / 5); + if (pokemon.shiny) { + // Always max price for shiny (flip HA back to normal), and add special messaging + priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER; + pokemon.abilityIndex = 0; + encounter.dialogue.encounterOptionsDialogue!.description = `${namespace}:description_shiny`; + encounter.options[0].dialogue!.buttonTooltip = `${namespace}:option.1.tooltip_shiny`; + } + const price = globalScene.getWaveMoneyAmount(priceMultiplier); + encounter.setDialogueToken("purchasePokemon", pokemon.getNameToRender()); + encounter.setDialogueToken("price", price.toString()); + encounter.misc = { + price: price, + pokemon: pokemon, + }; - pokemon.calculateStats(); + pokemon.calculateStats(); - return true; - }) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) - .withHasDexProgress(true) - .withSceneMoneyRequirement(0, MAX_POKEMON_PRICE_MULTIPLIER) // Wave scaling money multiplier of 2 - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected_message`, - } - ], - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const price = encounter.misc.price; - const purchasedPokemon = encounter.misc.pokemon as PlayerPokemon; - - // Update money - updatePlayerMoney(-price, true, false); - - // Show dialogue - await showEncounterDialogue(`${namespace}:option.1.selected_dialogue`, `${namespace}:speaker`); - await transitionMysteryEncounterIntroVisuals(); - - // "Catch" purchased pokemon - const data = new PokemonData(purchasedPokemon); - data.player = false; - await catchPokemon(data.toPokemon() as EnemyPokemon, null, PokeballType.POKEBALL, true, true); - - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) + .withHasDexProgress(true) + .withSceneMoneyRequirement(0, MAX_POKEMON_PRICE_MULTIPLIER) // Wave scaling money multiplier of 2 + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, selected: [ { - text: `${namespace}:option.2.selected`, + text: `${namespace}:option.1.selected_message`, }, ], - }, - async () => { - // Leave encounter with no rewards or exp + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const price = encounter.misc.price; + const purchasedPokemon = encounter.misc.pokemon as PlayerPokemon; + + // Update money + updatePlayerMoney(-price, true, false); + + // Show dialogue + await showEncounterDialogue(`${namespace}:option.1.selected_dialogue`, `${namespace}:speaker`); + await transitionMysteryEncounterIntroVisuals(); + + // "Catch" purchased pokemon + const data = new PokemonData(purchasedPokemon); + data.player = false; + await catchPokemon(data.toPokemon() as EnemyPokemon, null, PokeballType.POKEBALL, true, true); + leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); /** * @returns A random species that has at most 5 starter cost and is not Mythical, Paradox, etc. */ export function getSalesmanSpeciesOffer(): PokemonSpecies { - return getPokemonSpecies(getRandomSpeciesByStarterCost([ 0, 5 ], NON_LEGEND_PARADOX_POKEMON, undefined, false, false, false)); + return getPokemonSpecies( + getRandomSpeciesByStarterCost([0, 5], NON_LEGEND_PARADOX_POKEMON, undefined, false, false, false), + ); } diff --git a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts index 9e94e87938e..e54df048430 100644 --- a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts @@ -1,5 +1,12 @@ import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + initBattleWithEnemyConfig, + loadCustomMovesForEncounter, + leaveEncounterWithoutBattle, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, + generateModifierType, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; @@ -35,179 +42,188 @@ const BST_INCREASE_VALUE = 10; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3803 | GitHub Issue #3803} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const TheStrongStuffEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.THE_STRONG_STUFF) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withScenePartySizeRequirement(3, 6) // Must have at least 3 pokemon in party - .withMaxAllowedEncounters(1) - .withHideWildIntroMessage(true) - .withAutoHideIntroVisuals(false) - .withFleeAllowed(false) - .withIntroSpriteConfigs([ - { - spriteKey: "berry_juice", - fileRoot: "items", - hasShadow: true, - isItem: true, - scale: 1.25, - x: -15, - y: 3, - disableAnimation: true - }, - { - spriteKey: Species.SHUCKLE.toString(), - fileRoot: "pokemon", - hasShadow: true, - repeat: true, - scale: 1.25, - x: 20, - y: 10, - yShadow: 7 - }, - ]) // Set in onInit() - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - ]) - .withOnInit(() => { +export const TheStrongStuffEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.THE_STRONG_STUFF, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withScenePartySizeRequirement(3, 6) // Must have at least 3 pokemon in party + .withMaxAllowedEncounters(1) + .withHideWildIntroMessage(true) + .withAutoHideIntroVisuals(false) + .withFleeAllowed(false) + .withIntroSpriteConfigs([ + { + spriteKey: "berry_juice", + fileRoot: "items", + hasShadow: true, + isItem: true, + scale: 1.25, + x: -15, + y: 3, + disableAnimation: true, + }, + { + spriteKey: Species.SHUCKLE.toString(), + fileRoot: "pokemon", + hasShadow: true, + repeat: true, + scale: 1.25, + x: 20, + y: 10, + yShadow: 7, + }, + ]) // Set in onInit() + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + + // Calculate boss mon + const config: EnemyPartyConfig = { + levelAdditiveModifier: 1, + disableSwitch: true, + pokemonConfigs: [ + { + species: getPokemonSpecies(Species.SHUCKLE), + isBoss: true, + bossSegments: 5, + shiny: false, // Shiny lock because shiny is rolled only if the battle option is picked + customPokemonData: new CustomPokemonData({ spriteScale: 1.25 }), + nature: Nature.BOLD, + moveSet: [Moves.INFESTATION, Moves.SALT_CURE, Moves.GASTRO_ACID, Moves.HEAL_ORDER], + modifierConfigs: [ + { + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS]) as PokemonHeldItemModifierType, + }, + { + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.ENIGMA]) as PokemonHeldItemModifierType, + }, + { + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.APICOT]) as PokemonHeldItemModifierType, + }, + { + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.GANLON]) as PokemonHeldItemModifierType, + }, + { + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LUM]) as PokemonHeldItemModifierType, + stackCount: 2, + }, + ], + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], + mysteryEncounterBattleEffects: (pokemon: Pokemon) => { + queueEncounterMessage(`${namespace}:option.2.stat_boost`); + globalScene.unshiftPhase( + new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.DEF, Stat.SPDEF], 2), + ); + }, + }, + ], + }; + + encounter.enemyPartyConfigs = [config]; + + loadCustomMovesForEncounter([Moves.GASTRO_ACID, Moves.STEALTH_ROCK]); + + encounter.setDialogueToken("shuckleName", getPokemonSpecies(Species.SHUCKLE).getName()); + + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + }, + ], + }, + async () => { const encounter = globalScene.currentBattle.mysteryEncounter!; + // Do blackout and hide intro visuals during blackout + globalScene.time.delayedCall(750, () => { + transitionMysteryEncounterIntroVisuals(true, true, 50); + }); - // Calculate boss mon - const config: EnemyPartyConfig = { - levelAdditiveModifier: 1, - disableSwitch: true, - pokemonConfigs: [ - { - species: getPokemonSpecies(Species.SHUCKLE), - isBoss: true, - bossSegments: 5, - shiny: false, // Shiny lock because shiny is rolled only if the battle option is picked - customPokemonData: new CustomPokemonData({ spriteScale: 1.25 }), - nature: Nature.BOLD, - moveSet: [ Moves.INFESTATION, Moves.SALT_CURE, Moves.GASTRO_ACID, Moves.HEAL_ORDER ], - modifierConfigs: [ - { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ]) as PokemonHeldItemModifierType - }, - { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.ENIGMA ]) as PokemonHeldItemModifierType - }, - { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.APICOT ]) as PokemonHeldItemModifierType - }, - { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.GANLON ]) as PokemonHeldItemModifierType - }, - { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LUM ]) as PokemonHeldItemModifierType, - stackCount: 2 - } - ], - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], - mysteryEncounterBattleEffects: (pokemon: Pokemon) => { - queueEncounterMessage(`${namespace}:option.2.stat_boost`); - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.DEF, Stat.SPDEF ], 2)); - } - } - ], - }; + // -15 to all base stats of highest BST (halved for HP), +10 to all base stats of rest of party (halved for HP) + // Sort party by bst + const sortedParty = globalScene + .getPlayerParty() + .slice(0) + .sort((pokemon1, pokemon2) => { + const pokemon1Bst = pokemon1.getSpeciesForm().getBaseStatTotal(); + const pokemon2Bst = pokemon2.getSpeciesForm().getBaseStatTotal(); + return pokemon2Bst - pokemon1Bst; + }); - encounter.enemyPartyConfigs = [ config ]; + sortedParty.forEach((pokemon, index) => { + if (index < 2) { + // -15 to the two highest BST mons + modifyPlayerPokemonBST(pokemon, -HIGH_BST_REDUCTION_VALUE); + encounter.setDialogueToken("highBstPokemon" + (index + 1), pokemon.getNameToRender()); + } else { + // +10 for the rest + modifyPlayerPokemonBST(pokemon, BST_INCREASE_VALUE); + } + }); - loadCustomMovesForEncounter([ Moves.GASTRO_ACID, Moves.STEALTH_ROCK ]); - - encounter.setDialogueToken("shuckleName", getPokemonSpecies(Species.SHUCKLE).getName()); + encounter.setDialogueToken("reductionValue", HIGH_BST_REDUCTION_VALUE.toString()); + encounter.setDialogueToken("increaseValue", BST_INCREASE_VALUE.toString()); + await showEncounterText(`${namespace}:option.1.selected_2`, null, undefined, true); + encounter.dialogue.outro = [ + { + text: `${namespace}:outro`, + }, + ]; + setEncounterRewards({ fillRemaining: true }); + leaveEncounterWithoutBattle(true); return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected` - } - ] - }, - async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - // Do blackout and hide intro visuals during blackout - globalScene.time.delayedCall(750, () => { - transitionMysteryEncounterIntroVisuals(true, true, 50); - }); + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }, + async () => { + // Pick battle + const encounter = globalScene.currentBattle.mysteryEncounter!; + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.SOUL_DEW], + fillRemaining: true, + }); + encounter.startOfBattleEffects.push( + { + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [BattlerIndex.PLAYER], + move: new PokemonMove(Moves.GASTRO_ACID), + ignorePp: true, + }, + { + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [BattlerIndex.PLAYER], + move: new PokemonMove(Moves.STEALTH_ROCK), + ignorePp: true, + }, + ); - // -15 to all base stats of highest BST (halved for HP), +10 to all base stats of rest of party (halved for HP) - // Sort party by bst - const sortedParty = globalScene.getPlayerParty().slice(0) - .sort((pokemon1, pokemon2) => { - const pokemon1Bst = pokemon1.getSpeciesForm().getBaseStatTotal(); - const pokemon2Bst = pokemon2.getSpeciesForm().getBaseStatTotal(); - return pokemon2Bst - pokemon1Bst; - }); - - sortedParty.forEach((pokemon, index) => { - if (index < 2) { - // -15 to the two highest BST mons - modifyPlayerPokemonBST(pokemon, -HIGH_BST_REDUCTION_VALUE); - encounter.setDialogueToken("highBstPokemon" + (index + 1), pokemon.getNameToRender()); - } else { - // +10 for the rest - modifyPlayerPokemonBST(pokemon, BST_INCREASE_VALUE); - } - }); - - encounter.setDialogueToken("reductionValue", HIGH_BST_REDUCTION_VALUE.toString()); - encounter.setDialogueToken("increaseValue", BST_INCREASE_VALUE.toString()); - await showEncounterText(`${namespace}:option.1.selected_2`, null, undefined, true); - - encounter.dialogue.outro = [ - { - text: `${namespace}:outro`, - } - ]; - setEncounterRewards({ fillRemaining: true }); - leaveEncounterWithoutBattle(true); - return true; - } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - }, - ], - }, - async () => { - // Pick battle - const encounter = globalScene.currentBattle.mysteryEncounter!; - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.SOUL_DEW ], fillRemaining: true }); - encounter.startOfBattleEffects.push( - { - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ BattlerIndex.PLAYER ], - move: new PokemonMove(Moves.GASTRO_ACID), - ignorePp: true - }, - { - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ BattlerIndex.PLAYER ], - move: new PokemonMove(Moves.STEALTH_ROCK), - ignorePp: true - }); - - encounter.dialogue.outro = []; - await transitionMysteryEncounterIntroVisuals(true, true, 500); - await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); - } - ) - .build(); + encounter.dialogue.outro = []; + await transitionMysteryEncounterIntroVisuals(true, true, 500); + await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); + }, + ) + .build(); diff --git a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts index ca6b384cfbb..aca04ad50ed 100644 --- a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts @@ -1,5 +1,12 @@ import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { generateModifierType, generateModifierTypeOption, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + generateModifierType, + generateModifierTypeOption, + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; @@ -13,7 +20,7 @@ import { Abilities } from "#enums/abilities"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { Moves } from "#enums/moves"; import { Nature } from "#enums/nature"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { BerryType } from "#enums/berry-type"; import { Stat } from "#enums/stat"; import { SpeciesFormChangeAbilityTrigger } from "#app/data/pokemon-forms"; @@ -36,111 +43,115 @@ const namespace = "mysteryEncounters/theWinstrateChallenge"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3821 | GitHub Issue #3821} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const TheWinstrateChallengeEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.THE_WINSTRATE_CHALLENGE) - .withEncounterTier(MysteryEncounterTier.ROGUE) - .withSceneWaveRangeRequirement(100, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) - .withIntroSpriteConfigs([ - { - spriteKey: "vito", - fileRoot: "trainer", - hasShadow: false, - x: 16, - y: -4 - }, - { - spriteKey: "vivi", - fileRoot: "trainer", - hasShadow: false, - x: -14, - y: -4 - }, - { - spriteKey: "victor", - fileRoot: "trainer", - hasShadow: true, - x: -32 - }, - { - spriteKey: "victoria", - fileRoot: "trainer", - hasShadow: true, - x: 40, - }, - { - spriteKey: "vicky", - fileRoot: "trainer", - hasShadow: true, - x: 3, - y: 5, - yShadow: 5 - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - { - speaker: `${namespace}:speaker`, - text: `${namespace}:intro_dialogue`, - }, - ]) - .withAutoHideIntroVisuals(false) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; +export const TheWinstrateChallengeEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.THE_WINSTRATE_CHALLENGE, +) + .withEncounterTier(MysteryEncounterTier.ROGUE) + .withSceneWaveRangeRequirement(100, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) + .withIntroSpriteConfigs([ + { + spriteKey: "vito", + fileRoot: "trainer", + hasShadow: false, + x: 16, + y: -4, + }, + { + spriteKey: "vivi", + fileRoot: "trainer", + hasShadow: false, + x: -14, + y: -4, + }, + { + spriteKey: "victor", + fileRoot: "trainer", + hasShadow: true, + x: -32, + }, + { + spriteKey: "victoria", + fileRoot: "trainer", + hasShadow: true, + x: 40, + }, + { + spriteKey: "vicky", + fileRoot: "trainer", + hasShadow: true, + x: 3, + y: 5, + yShadow: 5, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + speaker: `${namespace}:speaker`, + text: `${namespace}:intro_dialogue`, + }, + ]) + .withAutoHideIntroVisuals(false) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; - // Loaded back to front for pop() operations - encounter.enemyPartyConfigs.push(getVitoTrainerConfig()); - encounter.enemyPartyConfigs.push(getVickyTrainerConfig()); - encounter.enemyPartyConfigs.push(getViviTrainerConfig()); - encounter.enemyPartyConfigs.push(getVictoriaTrainerConfig()); - encounter.enemyPartyConfigs.push(getVictorTrainerConfig()); + // Loaded back to front for pop() operations + encounter.enemyPartyConfigs.push(getVitoTrainerConfig()); + encounter.enemyPartyConfigs.push(getVickyTrainerConfig()); + encounter.enemyPartyConfigs.push(getViviTrainerConfig()); + encounter.enemyPartyConfigs.push(getVictoriaTrainerConfig()); + encounter.enemyPartyConfigs.push(getVictorTrainerConfig()); - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - speaker: `${namespace}:speaker`, - text: `${namespace}:option.1.selected`, - }, - ], - }, - async () => { - // Spawn 5 trainer battles back to back with Macho Brace in rewards - globalScene.currentBattle.mysteryEncounter!.doContinueEncounter = async () => { - await endTrainerBattleAndShowDialogue(); - }; - await transitionMysteryEncounterIntroVisuals(true, false); - await spawnNextTrainerOrEndEncounter(); - } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - speaker: `${namespace}:speaker`, - text: `${namespace}:option.2.selected`, - }, - ], - }, - async () => { - // Refuse the challenge, they full heal the party and give the player a Rarer Candy - globalScene.unshiftPhase(new PartyHealPhase(true)); - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.RARER_CANDY ], fillRemaining: false }); - leaveEncounterWithoutBattle(); - } - ) - .build(); + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + speaker: `${namespace}:speaker`, + text: `${namespace}:option.1.selected`, + }, + ], + }, + async () => { + // Spawn 5 trainer battles back to back with Macho Brace in rewards + globalScene.currentBattle.mysteryEncounter!.doContinueEncounter = async () => { + await endTrainerBattleAndShowDialogue(); + }; + await transitionMysteryEncounterIntroVisuals(true, false); + await spawnNextTrainerOrEndEncounter(); + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + speaker: `${namespace}:speaker`, + text: `${namespace}:option.2.selected`, + }, + ], + }, + async () => { + // Refuse the challenge, they full heal the party and give the player a Rarer Candy + globalScene.unshiftPhase(new PartyHealPhase(true)); + setEncounterRewards({ + guaranteedModifierTypeFuncs: [modifierTypes.RARER_CANDY], + fillRemaining: false, + }); + leaveEncounterWithoutBattle(); + }, + ) + .build(); async function spawnNextTrainerOrEndEncounter() { const encounter = globalScene.currentBattle.mysteryEncounter!; @@ -151,7 +162,7 @@ async function spawnNextTrainerOrEndEncounter() { // Give 10x Voucher const newModifier = modifierTypes.VOUCHER_PREMIUM().newModifier(); - await globalScene.addModifier(newModifier); + globalScene.addModifier(newModifier); globalScene.playSound("item_fanfare"); await showEncounterText(i18next.t("battle:rewardGain", { modifierName: newModifier?.type.name })); @@ -159,7 +170,10 @@ async function spawnNextTrainerOrEndEncounter() { globalScene.ui.clearText(); // Clears "Winstrate" title from screen as rewards get animated in const machoBrace = generateModifierTypeOption(modifierTypes.MYSTERY_ENCOUNTER_MACHO_BRACE)!; machoBrace.type.tier = ModifierTier.MASTER; - setEncounterRewards({ guaranteedModifierTypeOptions: [ machoBrace ], fillRemaining: false }); + setEncounterRewards({ + guaranteedModifierTypeOptions: [machoBrace], + fillRemaining: false, + }); encounter.doContinueEncounter = undefined; leaveEncounterWithoutBattle(false, MysteryEncounterMode.NO_BATTLE); } else { @@ -168,6 +182,7 @@ async function spawnNextTrainerOrEndEncounter() { } function endTrainerBattleAndShowDialogue(): Promise { + // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO: Consider refactoring to avoid async promise executor return new Promise(async resolve => { if (globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs.length === 0) { // Battle is over @@ -182,7 +197,7 @@ function endTrainerBattleAndShowDialogue(): Promise { duration: 750, onComplete: () => { globalScene.field.remove(trainer, true); - } + }, }); } @@ -191,13 +206,19 @@ function endTrainerBattleAndShowDialogue(): Promise { } else { globalScene.arena.resetArenaEffects(); const playerField = globalScene.getPlayerField(); - playerField.forEach((pokemon) => pokemon.lapseTag(BattlerTagType.COMMANDED)); + for (const pokemon of playerField) { + pokemon.lapseTag(BattlerTagType.COMMANDED); + } playerField.forEach((_, p) => globalScene.unshiftPhase(new ReturnPhase(p))); for (const pokemon of globalScene.getPlayerParty()) { // Only trigger form change when Eiscue is in Noice form // Hardcoded Eiscue for now in case it is fused with another pokemon - if (pokemon.species.speciesId === Species.EISCUE && pokemon.hasAbility(Abilities.ICE_FACE) && pokemon.formIndex === 1) { + if ( + pokemon.species.speciesId === Species.EISCUE && + pokemon.hasAbility(Abilities.ICE_FACE) && + pokemon.formIndex === 1 + ) { globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger); } @@ -222,7 +243,7 @@ function endTrainerBattleAndShowDialogue(): Promise { onComplete: () => { globalScene.field.remove(trainer, true); resolve(); - } + }, }); } } @@ -238,38 +259,38 @@ function getVictorTrainerConfig(): EnemyPartyConfig { isBoss: false, abilityIndex: 0, // Guts nature: Nature.ADAMANT, - moveSet: [ Moves.FACADE, Moves.BRAVE_BIRD, Moves.PROTECT, Moves.QUICK_ATTACK ], + moveSet: [Moves.FACADE, Moves.BRAVE_BIRD, Moves.PROTECT, Moves.QUICK_ATTACK], modifierConfigs: [ { modifier: generateModifierType(modifierTypes.FLAME_ORB) as PokemonHeldItemModifierType, - isTransferable: false + isTransferable: false, }, { modifier: generateModifierType(modifierTypes.FOCUS_BAND) as PokemonHeldItemModifierType, stackCount: 2, - isTransferable: false + isTransferable: false, }, - ] + ], }, { species: getPokemonSpecies(Species.OBSTAGOON), isBoss: false, abilityIndex: 1, // Guts nature: Nature.ADAMANT, - moveSet: [ Moves.FACADE, Moves.OBSTRUCT, Moves.NIGHT_SLASH, Moves.FIRE_PUNCH ], + moveSet: [Moves.FACADE, Moves.OBSTRUCT, Moves.NIGHT_SLASH, Moves.FIRE_PUNCH], modifierConfigs: [ { modifier: generateModifierType(modifierTypes.FLAME_ORB) as PokemonHeldItemModifierType, - isTransferable: false + isTransferable: false, }, { modifier: generateModifierType(modifierTypes.LEFTOVERS) as PokemonHeldItemModifierType, stackCount: 2, - isTransferable: false - } - ] - } - ] + isTransferable: false, + }, + ], + }, + ], }; } @@ -282,39 +303,43 @@ function getVictoriaTrainerConfig(): EnemyPartyConfig { isBoss: false, abilityIndex: 0, // Natural Cure nature: Nature.CALM, - moveSet: [ Moves.SYNTHESIS, Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.SLEEP_POWDER ], + moveSet: [Moves.SYNTHESIS, Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.SLEEP_POWDER], modifierConfigs: [ { modifier: generateModifierType(modifierTypes.SOUL_DEW) as PokemonHeldItemModifierType, - isTransferable: false + isTransferable: false, }, { modifier: generateModifierType(modifierTypes.QUICK_CLAW) as PokemonHeldItemModifierType, stackCount: 2, - isTransferable: false - } - ] + isTransferable: false, + }, + ], }, { species: getPokemonSpecies(Species.GARDEVOIR), isBoss: false, formIndex: 1, nature: Nature.TIMID, - moveSet: [ Moves.PSYSHOCK, Moves.MOONBLAST, Moves.SHADOW_BALL, Moves.WILL_O_WISP ], + moveSet: [Moves.PSYSHOCK, Moves.MOONBLAST, Moves.SHADOW_BALL, Moves.WILL_O_WISP], modifierConfigs: [ { - modifier: generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.PSYCHIC ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ + PokemonType.PSYCHIC, + ]) as PokemonHeldItemModifierType, stackCount: 1, - isTransferable: false + isTransferable: false, }, { - modifier: generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.FAIRY ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ + PokemonType.FAIRY, + ]) as PokemonHeldItemModifierType, stackCount: 1, - isTransferable: false - } - ] - } - ] + isTransferable: false, + }, + ], + }, + ], }; } @@ -327,53 +352,53 @@ function getViviTrainerConfig(): EnemyPartyConfig { isBoss: false, abilityIndex: 3, // Lightning Rod nature: Nature.ADAMANT, - moveSet: [ Moves.WATERFALL, Moves.MEGAHORN, Moves.KNOCK_OFF, Moves.REST ], + moveSet: [Moves.WATERFALL, Moves.MEGAHORN, Moves.KNOCK_OFF, Moves.REST], modifierConfigs: [ { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LUM ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LUM]) as PokemonHeldItemModifierType, stackCount: 2, - isTransferable: false + isTransferable: false, }, { - modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [ Stat.HP ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [Stat.HP]) as PokemonHeldItemModifierType, stackCount: 4, - isTransferable: false - } - ] + isTransferable: false, + }, + ], }, { species: getPokemonSpecies(Species.BRELOOM), isBoss: false, abilityIndex: 1, // Poison Heal nature: Nature.JOLLY, - moveSet: [ Moves.SPORE, Moves.SWORDS_DANCE, Moves.SEED_BOMB, Moves.DRAIN_PUNCH ], + moveSet: [Moves.SPORE, Moves.SWORDS_DANCE, Moves.SEED_BOMB, Moves.DRAIN_PUNCH], modifierConfigs: [ { - modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [ Stat.HP ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [Stat.HP]) as PokemonHeldItemModifierType, stackCount: 4, - isTransferable: false + isTransferable: false, }, { modifier: generateModifierType(modifierTypes.TOXIC_ORB) as PokemonHeldItemModifierType, - isTransferable: false - } - ] + isTransferable: false, + }, + ], }, { species: getPokemonSpecies(Species.CAMERUPT), isBoss: false, formIndex: 1, nature: Nature.CALM, - moveSet: [ Moves.EARTH_POWER, Moves.FIRE_BLAST, Moves.YAWN, Moves.PROTECT ], + moveSet: [Moves.EARTH_POWER, Moves.FIRE_BLAST, Moves.YAWN, Moves.PROTECT], modifierConfigs: [ { modifier: generateModifierType(modifierTypes.QUICK_CLAW) as PokemonHeldItemModifierType, stackCount: 3, - isTransferable: false + isTransferable: false, }, - ] - } - ] + ], + }, + ], }; } @@ -386,15 +411,15 @@ function getVickyTrainerConfig(): EnemyPartyConfig { isBoss: false, formIndex: 1, nature: Nature.IMPISH, - moveSet: [ Moves.AXE_KICK, Moves.ICE_PUNCH, Moves.ZEN_HEADBUTT, Moves.BULLET_PUNCH ], + moveSet: [Moves.AXE_KICK, Moves.ICE_PUNCH, Moves.ZEN_HEADBUTT, Moves.BULLET_PUNCH], modifierConfigs: [ { modifier: generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType, - isTransferable: false - } - ] - } - ] + isTransferable: false, + }, + ], + }, + ], }; } @@ -407,110 +432,110 @@ function getVitoTrainerConfig(): EnemyPartyConfig { isBoss: false, abilityIndex: 0, // Soundproof nature: Nature.MODEST, - moveSet: [ Moves.THUNDERBOLT, Moves.GIGA_DRAIN, Moves.FOUL_PLAY, Moves.THUNDER_WAVE ], + moveSet: [Moves.THUNDERBOLT, Moves.GIGA_DRAIN, Moves.FOUL_PLAY, Moves.THUNDER_WAVE], modifierConfigs: [ { - modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [ Stat.SPD ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [Stat.SPD]) as PokemonHeldItemModifierType, stackCount: 2, - isTransferable: false - } - ] + isTransferable: false, + }, + ], }, { species: getPokemonSpecies(Species.SWALOT), isBoss: false, abilityIndex: 2, // Gluttony nature: Nature.QUIET, - moveSet: [ Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.ICE_BEAM, Moves.EARTHQUAKE ], + moveSet: [Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.ICE_BEAM, Moves.EARTHQUAKE], modifierConfigs: [ { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS]) as PokemonHeldItemModifierType, stackCount: 2, }, { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.APICOT ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.APICOT]) as PokemonHeldItemModifierType, stackCount: 2, }, { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.GANLON ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.GANLON]) as PokemonHeldItemModifierType, stackCount: 2, }, { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.STARF ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.STARF]) as PokemonHeldItemModifierType, stackCount: 2, }, { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.SALAC ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.SALAC]) as PokemonHeldItemModifierType, stackCount: 2, }, { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LUM ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LUM]) as PokemonHeldItemModifierType, stackCount: 2, }, { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LANSAT ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LANSAT]) as PokemonHeldItemModifierType, stackCount: 2, }, { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LIECHI ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LIECHI]) as PokemonHeldItemModifierType, stackCount: 2, }, { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.PETAYA ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.PETAYA]) as PokemonHeldItemModifierType, stackCount: 2, }, { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.ENIGMA ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.ENIGMA]) as PokemonHeldItemModifierType, stackCount: 2, }, { - modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LEPPA ]) as PokemonHeldItemModifierType, + modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LEPPA]) as PokemonHeldItemModifierType, stackCount: 2, - } - ] + }, + ], }, { species: getPokemonSpecies(Species.DODRIO), isBoss: false, abilityIndex: 2, // Tangled Feet nature: Nature.JOLLY, - moveSet: [ Moves.DRILL_PECK, Moves.QUICK_ATTACK, Moves.THRASH, Moves.KNOCK_OFF ], + moveSet: [Moves.DRILL_PECK, Moves.QUICK_ATTACK, Moves.THRASH, Moves.KNOCK_OFF], modifierConfigs: [ { modifier: generateModifierType(modifierTypes.KINGS_ROCK) as PokemonHeldItemModifierType, stackCount: 2, - isTransferable: false - } - ] + isTransferable: false, + }, + ], }, { species: getPokemonSpecies(Species.ALAKAZAM), isBoss: false, formIndex: 1, nature: Nature.BOLD, - moveSet: [ Moves.PSYCHIC, Moves.SHADOW_BALL, Moves.FOCUS_BLAST, Moves.THUNDERBOLT ], + moveSet: [Moves.PSYCHIC, Moves.SHADOW_BALL, Moves.FOCUS_BLAST, Moves.THUNDERBOLT], modifierConfigs: [ { modifier: generateModifierType(modifierTypes.WIDE_LENS) as PokemonHeldItemModifierType, stackCount: 2, - isTransferable: false + isTransferable: false, }, - ] + ], }, { species: getPokemonSpecies(Species.DARMANITAN), isBoss: false, abilityIndex: 0, // Sheer Force nature: Nature.IMPISH, - moveSet: [ Moves.EARTHQUAKE, Moves.U_TURN, Moves.FLARE_BLITZ, Moves.ROCK_SLIDE ], + moveSet: [Moves.EARTHQUAKE, Moves.U_TURN, Moves.FLARE_BLITZ, Moves.ROCK_SLIDE], modifierConfigs: [ { modifier: generateModifierType(modifierTypes.QUICK_CLAW) as PokemonHeldItemModifierType, stackCount: 2, - isTransferable: false + isTransferable: false, }, - ] - } - ] + ], + }, + ], }; } diff --git a/src/data/mystery-encounters/encounters/training-session-encounter.ts b/src/data/mystery-encounters/encounters/training-session-encounter.ts index 9cb388e343c..cc56f3efa42 100644 --- a/src/data/mystery-encounters/encounters/training-session-encounter.ts +++ b/src/data/mystery-encounters/encounters/training-session-encounter.ts @@ -1,7 +1,12 @@ import type { Ability } from "#app/data/ability"; import { allAbilities } from "#app/data/ability"; import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + selectPokemonForOption, + setEncounterRewards, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { getNatureName } from "#app/data/nature"; import { speciesStarterCosts } from "#app/data/balance/starters"; import type { PlayerPokemon } from "#app/field/pokemon"; @@ -35,360 +40,350 @@ const namespace = "mysteryEncounters/trainingSession"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3802 | GitHub Issue #3802} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const TrainingSessionEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.TRAINING_SESSION) - .withEncounterTier(MysteryEncounterTier.ULTRA) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 unfainted pokemon in party - .withFleeAllowed(false) - .withHideWildIntroMessage(true) - .withPreventGameStatsUpdates(true) // Do not count the Pokemon as seen or defeated since it is ours - .withIntroSpriteConfigs([ - { - spriteKey: "training_session_gear", - fileRoot: "mystery-encounters", - hasShadow: true, - y: 6, - x: 5, - yShadow: -2 - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - } - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withHasDexProgress(true) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.selected`, - }, - ], - }) - .withPreOptionPhase(async (): Promise => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - encounter.misc = { - playerPokemon: pokemon, +export const TrainingSessionEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.TRAINING_SESSION, +) + .withEncounterTier(MysteryEncounterTier.ULTRA) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 unfainted pokemon in party + .withFleeAllowed(false) + .withHideWildIntroMessage(true) + .withPreventGameStatsUpdates(true) // Do not count the Pokemon as seen or defeated since it is ours + .withIntroSpriteConfigs([ + { + spriteKey: "training_session_gear", + fileRoot: "mystery-encounters", + hasShadow: true, + y: 6, + x: 5, + yShadow: -2, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withHasDexProgress(true) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.selected`, + }, + ], + }) + .withPreOptionPhase(async (): Promise => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + encounter.misc = { + playerPokemon: pokemon, + }; + }; + + // Only Pokemon that are not KOed/legal can be trained + const selectableFilter = (pokemon: Pokemon) => { + return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`); + }; + + return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon; + + // Spawn light training session with chosen pokemon + // Every 50 waves, add +1 boss segment, capping at 5 + const segments = Math.min(2 + Math.floor(globalScene.currentBattle.waveIndex / 50), 5); + const modifiers = new ModifiersHolder(); + const config = getEnemyConfig(playerPokemon, segments, modifiers); + globalScene.removePokemonFromPlayerParty(playerPokemon, false); + + const onBeforeRewardsPhase = () => { + encounter.setDialogueToken("stat1", "-"); + encounter.setDialogueToken("stat2", "-"); + // Add the pokemon back to party with IV boost + let ivIndexes: any[] = []; + playerPokemon.ivs.forEach((iv, index) => { + if (iv < 31) { + ivIndexes.push({ iv: iv, index: index }); + } + }); + + // Improves 2 random non-maxed IVs + // +10 if IV is < 10, +5 if between 10-20, and +3 if > 20 + // A 0-4 starting IV will cap in 6 encounters (assuming you always rolled that IV) + // 5-14 starting IV caps in 5 encounters + // 15-19 starting IV caps in 4 encounters + // 20-24 starting IV caps in 3 encounters + // 25-27 starting IV caps in 2 encounters + let improvedCount = 0; + while (ivIndexes.length > 0 && improvedCount < 2) { + ivIndexes = randSeedShuffle(ivIndexes); + const ivToChange = ivIndexes.pop(); + let newVal = ivToChange.iv; + if (improvedCount === 0) { + encounter.setDialogueToken("stat1", i18next.t(getStatKey(ivToChange.index)) ?? ""); + } else { + encounter.setDialogueToken("stat2", i18next.t(getStatKey(ivToChange.index)) ?? ""); + } + + // Corrects required encounter breakpoints to be continuous for all IV values + if (ivToChange.iv <= 21 && ivToChange.iv - (1 % 5) === 0) { + newVal += 1; + } + + newVal += ivToChange.iv <= 10 ? 10 : ivToChange.iv <= 20 ? 5 : 3; + newVal = Math.min(newVal, 31); + playerPokemon.ivs[ivToChange.index] = newVal; + improvedCount++; + } + + if (improvedCount > 0) { + playerPokemon.calculateStats(); + globalScene.gameData.updateSpeciesDexIvs(playerPokemon.species.getRootSpeciesId(true), playerPokemon.ivs); + globalScene.gameData.setPokemonCaught(playerPokemon, false); + } + + // Add pokemon and mods back + globalScene.getPlayerParty().push(playerPokemon); + for (const mod of modifiers.value) { + mod.pokemonId = playerPokemon.id; + globalScene.addModifier(mod, true, false, false, true); + } + globalScene.updateModifiers(true); + queueEncounterMessage(`${namespace}:option.1.finished`); + }; + + setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase); + + await initBattleWithEnemyConfig(config); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withHasDexProgress(true) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + secondOptionPrompt: `${namespace}:option.2.select_prompt`, + selected: [ + { + text: `${namespace}:option.selected`, + }, + ], + }) + .withPreOptionPhase(async (): Promise => { + // Open menu for selecting pokemon and Nature + const encounter = globalScene.currentBattle.mysteryEncounter!; + const natures = new Array(25).fill(null).map((_val, i) => i as Nature); + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Return the options for nature selection + return natures.map((nature: Nature) => { + const option: OptionSelectItem = { + label: getNatureName(nature, true, true, true, globalScene.uiTheme), + handler: () => { + // Pokemon and second option selected + encounter.setDialogueToken("nature", getNatureName(nature)); + encounter.misc = { + playerPokemon: pokemon, + chosenNature: nature, + }; + return true; + }, }; - }; + return option; + }); + }; - // Only Pokemon that are not KOed/legal can be trained - const selectableFilter = (pokemon: Pokemon) => { - return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`); - }; + // Only Pokemon that are not KOed/legal can be trained + const selectableFilter = (pokemon: Pokemon) => { + return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`); + }; - return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon; + return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon; - // Spawn light training session with chosen pokemon - // Every 50 waves, add +1 boss segment, capping at 5 - const segments = Math.min( - 2 + Math.floor(globalScene.currentBattle.waveIndex / 50), - 5 - ); - const modifiers = new ModifiersHolder(); - const config = getEnemyConfig(playerPokemon, segments, modifiers); - globalScene.removePokemonFromPlayerParty(playerPokemon, false); + // Spawn medium training session with chosen pokemon + // Every 40 waves, add +1 boss segment, capping at 6 + const segments = Math.min(2 + Math.floor(globalScene.currentBattle.waveIndex / 40), 6); + const modifiers = new ModifiersHolder(); + const config = getEnemyConfig(playerPokemon, segments, modifiers); + globalScene.removePokemonFromPlayerParty(playerPokemon, false); - const onBeforeRewardsPhase = () => { - encounter.setDialogueToken("stat1", "-"); - encounter.setDialogueToken("stat2", "-"); - // Add the pokemon back to party with IV boost - let ivIndexes: any[] = []; - playerPokemon.ivs.forEach((iv, index) => { - if (iv < 31) { - ivIndexes.push({ iv: iv, index: index }); - } - }); + const onBeforeRewardsPhase = () => { + queueEncounterMessage(`${namespace}:option.2.finished`); + // Add the pokemon back to party with Nature change + playerPokemon.setCustomNature(encounter.misc.chosenNature); + globalScene.gameData.unlockSpeciesNature(playerPokemon.species, encounter.misc.chosenNature); - // Improves 2 random non-maxed IVs - // +10 if IV is < 10, +5 if between 10-20, and +3 if > 20 - // A 0-4 starting IV will cap in 6 encounters (assuming you always rolled that IV) - // 5-14 starting IV caps in 5 encounters - // 15-19 starting IV caps in 4 encounters - // 20-24 starting IV caps in 3 encounters - // 25-27 starting IV caps in 2 encounters - let improvedCount = 0; - while (ivIndexes.length > 0 && improvedCount < 2) { - ivIndexes = randSeedShuffle(ivIndexes); - const ivToChange = ivIndexes.pop(); - let newVal = ivToChange.iv; - if (improvedCount === 0) { - encounter.setDialogueToken( - "stat1", - i18next.t(getStatKey(ivToChange.index)) ?? "" - ); - } else { - encounter.setDialogueToken( - "stat2", - i18next.t(getStatKey(ivToChange.index)) ?? "" - ); - } + // Add pokemon and modifiers back + globalScene.getPlayerParty().push(playerPokemon); + for (const mod of modifiers.value) { + mod.pokemonId = playerPokemon.id; + globalScene.addModifier(mod, true, false, false, true); + } + globalScene.updateModifiers(true); + }; - // Corrects required encounter breakpoints to be continuous for all IV values - if (ivToChange.iv <= 21 && ivToChange.iv - (1 % 5) === 0) { - newVal += 1; - } + setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase); - newVal += ivToChange.iv <= 10 ? 10 : ivToChange.iv <= 20 ? 5 : 3; - newVal = Math.min(newVal, 31); - playerPokemon.ivs[ivToChange.index] = newVal; - improvedCount++; - } + await initBattleWithEnemyConfig(config); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withHasDexProgress(true) + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + secondOptionPrompt: `${namespace}:option.3.select_prompt`, + selected: [ + { + text: `${namespace}:option.selected`, + }, + ], + }) + .withPreOptionPhase(async (): Promise => { + // Open menu for selecting pokemon and ability to learn + const encounter = globalScene.currentBattle.mysteryEncounter!; + const onPokemonSelected = (pokemon: PlayerPokemon) => { + // Return the options for ability selection + const speciesForm = pokemon.getFusionSpeciesForm() + ? pokemon.getFusionSpeciesForm() + : pokemon.getSpeciesForm(); + const abilityCount = speciesForm.getAbilityCount(); + const abilities: Ability[] = new Array(abilityCount) + .fill(null) + .map((_val, i) => allAbilities[speciesForm.getAbility(i)]); - if (improvedCount > 0) { - playerPokemon.calculateStats(); - globalScene.gameData.updateSpeciesDexIvs(playerPokemon.species.getRootSpeciesId(true), playerPokemon.ivs); - globalScene.gameData.setPokemonCaught(playerPokemon, false); - } - - // Add pokemon and mods back - globalScene.getPlayerParty().push(playerPokemon); - for (const mod of modifiers.value) { - mod.pokemonId = playerPokemon.id; - globalScene.addModifier(mod, true, false, false, true); - } - globalScene.updateModifiers(true); - queueEncounterMessage(`${namespace}:option.1.finished`); - }; - - setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase); - - await initBattleWithEnemyConfig(config); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withHasDexProgress(true) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - secondOptionPrompt: `${namespace}:option.2.select_prompt`, - selected: [ - { - text: `${namespace}:option.selected`, - }, - ], - }) - .withPreOptionPhase(async (): Promise => { - // Open menu for selecting pokemon and Nature - const encounter = globalScene.currentBattle.mysteryEncounter!; - const natures = new Array(25).fill(null).map((val, i) => i as Nature); - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Return the options for nature selection - return natures.map((nature: Nature) => { + const optionSelectItems: OptionSelectItem[] = []; + abilities.forEach((ability: Ability, index) => { + if (!optionSelectItems.some(o => o.label === ability.name)) { const option: OptionSelectItem = { - label: getNatureName(nature, true, true, true, globalScene.uiTheme), + label: ability.name, handler: () => { - // Pokemon and second option selected - encounter.setDialogueToken("nature", getNatureName(nature)); + // Pokemon and ability selected + encounter.setDialogueToken("ability", ability.name); encounter.misc = { playerPokemon: pokemon, - chosenNature: nature, + abilityIndex: index, }; return true; }, + onHover: () => { + showEncounterText(ability.description, 0, 0, false); + }, }; - return option; - }); - }; - - // Only Pokemon that are not KOed/legal can be trained - const selectableFilter = (pokemon: Pokemon) => { - return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`); - }; - - return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon; - - // Spawn medium training session with chosen pokemon - // Every 40 waves, add +1 boss segment, capping at 6 - const segments = Math.min(2 + Math.floor(globalScene.currentBattle.waveIndex / 40), 6); - const modifiers = new ModifiersHolder(); - const config = getEnemyConfig(playerPokemon, segments, modifiers); - globalScene.removePokemonFromPlayerParty(playerPokemon, false); - - const onBeforeRewardsPhase = () => { - queueEncounterMessage(`${namespace}:option.2.finished`); - // Add the pokemon back to party with Nature change - playerPokemon.setCustomNature(encounter.misc.chosenNature); - globalScene.gameData.unlockSpeciesNature(playerPokemon.species, encounter.misc.chosenNature); - - // Add pokemon and modifiers back - globalScene.getPlayerParty().push(playerPokemon); - for (const mod of modifiers.value) { - mod.pokemonId = playerPokemon.id; - globalScene.addModifier(mod, true, false, false, true); + optionSelectItems.push(option); } - globalScene.updateModifiers(true); - }; + }); - setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase); + return optionSelectItems; + }; - await initBattleWithEnemyConfig(config); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withHasDexProgress(true) - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - secondOptionPrompt: `${namespace}:option.3.select_prompt`, - selected: [ - { - text: `${namespace}:option.selected`, - }, - ], - }) - .withPreOptionPhase(async (): Promise => { - // Open menu for selecting pokemon and ability to learn - const encounter = globalScene.currentBattle.mysteryEncounter!; - const onPokemonSelected = (pokemon: PlayerPokemon) => { - // Return the options for ability selection - const speciesForm = !!pokemon.getFusionSpeciesForm() - ? pokemon.getFusionSpeciesForm() - : pokemon.getSpeciesForm(); - const abilityCount = speciesForm.getAbilityCount(); - const abilities: Ability[] = new Array(abilityCount) - .fill(null) - .map((val, i) => allAbilities[speciesForm.getAbility(i)]); + // Only Pokemon that are not KOed/legal can be trained + const selectableFilter = (pokemon: Pokemon) => { + return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`); + }; - const optionSelectItems: OptionSelectItem[] = []; - abilities.forEach((ability: Ability, index) => { - if (!optionSelectItems.some(o => o.label === ability.name)) { - const option: OptionSelectItem = { - label: ability.name, - handler: () => { - // Pokemon and ability selected - encounter.setDialogueToken("ability", ability.name); - encounter.misc = { - playerPokemon: pokemon, - abilityIndex: index, - }; - return true; - }, - onHover: () => { - showEncounterText(ability.description, 0, 0, false); - }, - }; - optionSelectItems.push(option); - } - }); + return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); + }) + .withOptionPhase(async () => { + const encounter = globalScene.currentBattle.mysteryEncounter!; + const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon; - return optionSelectItems; - }; + // Spawn hard training session with chosen pokemon + // Every 30 waves, add +1 boss segment, capping at 6 + // Also starts with +1 to all stats + const segments = Math.min(2 + Math.floor(globalScene.currentBattle.waveIndex / 30), 6); + const modifiers = new ModifiersHolder(); + const config = getEnemyConfig(playerPokemon, segments, modifiers); + config.pokemonConfigs![0].tags = [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON]; + globalScene.removePokemonFromPlayerParty(playerPokemon, false); - // Only Pokemon that are not KOed/legal can be trained - const selectableFilter = (pokemon: Pokemon) => { - return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`); - }; + const onBeforeRewardsPhase = () => { + queueEncounterMessage(`${namespace}:option.3.finished`); + // Add the pokemon back to party with ability change + const abilityIndex = encounter.misc.abilityIndex; - return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter); - }) - .withOptionPhase(async () => { - const encounter = globalScene.currentBattle.mysteryEncounter!; - const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon; + if (playerPokemon.getFusionSpeciesForm()) { + playerPokemon.fusionAbilityIndex = abilityIndex; - // Spawn hard training session with chosen pokemon - // Every 30 waves, add +1 boss segment, capping at 6 - // Also starts with +1 to all stats - const segments = Math.min(2 + Math.floor(globalScene.currentBattle.waveIndex / 30), 6); - const modifiers = new ModifiersHolder(); - const config = getEnemyConfig(playerPokemon, segments, modifiers); - config.pokemonConfigs![0].tags = [ - BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON, - ]; - globalScene.removePokemonFromPlayerParty(playerPokemon, false); - - const onBeforeRewardsPhase = () => { - queueEncounterMessage(`${namespace}:option.3.finished`); - // Add the pokemon back to party with ability change - const abilityIndex = encounter.misc.abilityIndex; - - if (!!playerPokemon.getFusionSpeciesForm()) { - playerPokemon.fusionAbilityIndex = abilityIndex; - - // Only update the fusion's dex data if the Pokemon is already caught in dex (ignore rentals) - const rootFusionSpecies = playerPokemon.fusionSpecies?.getRootSpeciesId(); - if (!isNullOrUndefined(rootFusionSpecies) - && speciesStarterCosts.hasOwnProperty(rootFusionSpecies) - && !!globalScene.gameData.dexData[rootFusionSpecies].caughtAttr) { - globalScene.gameData.starterData[rootFusionSpecies].abilityAttr |= playerPokemon.fusionAbilityIndex !== 1 || playerPokemon.fusionSpecies?.ability2 + // Only update the fusion's dex data if the Pokemon is already caught in dex (ignore rentals) + const rootFusionSpecies = playerPokemon.fusionSpecies?.getRootSpeciesId(); + if ( + !isNullOrUndefined(rootFusionSpecies) && + speciesStarterCosts.hasOwnProperty(rootFusionSpecies) && + !!globalScene.gameData.dexData[rootFusionSpecies].caughtAttr + ) { + globalScene.gameData.starterData[rootFusionSpecies].abilityAttr |= + playerPokemon.fusionAbilityIndex !== 1 || playerPokemon.fusionSpecies?.ability2 ? 1 << playerPokemon.fusionAbilityIndex : AbilityAttr.ABILITY_HIDDEN; - } - } else { - playerPokemon.abilityIndex = abilityIndex; } + } else { + playerPokemon.abilityIndex = abilityIndex; + } - playerPokemon.calculateStats(); - globalScene.gameData.setPokemonCaught(playerPokemon, false); + playerPokemon.calculateStats(); + globalScene.gameData.setPokemonCaught(playerPokemon, false); - // Add pokemon and mods back - globalScene.getPlayerParty().push(playerPokemon); - for (const mod of modifiers.value) { - mod.pokemonId = playerPokemon.id; - globalScene.addModifier(mod, true, false, false, true); - } - globalScene.updateModifiers(true); - }; + // Add pokemon and mods back + globalScene.getPlayerParty().push(playerPokemon); + for (const mod of modifiers.value) { + mod.pokemonId = playerPokemon.id; + globalScene.addModifier(mod, true, false, false, true); + } + globalScene.updateModifiers(true); + }; - setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase); + setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase); - await initBattleWithEnemyConfig(config); - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.4.label`, - buttonTooltip: `${namespace}:option.4.tooltip`, - selected: [ - { - text: `${namespace}:option.4.selected`, - }, - ], - }, - async () => { - // Leave encounter with no rewards or exp - leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + await initBattleWithEnemyConfig(config); + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.4.label`, + buttonTooltip: `${namespace}:option.4.tooltip`, + selected: [ + { + text: `${namespace}:option.4.selected`, + }, + ], + }, + async () => { + // Leave encounter with no rewards or exp + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); function getEnemyConfig(playerPokemon: PlayerPokemon, segments: number, modifiers: ModifiersHolder): EnemyPartyConfig { playerPokemon.resetSummonData(); // Passes modifiers by reference modifiers.value = playerPokemon.getHeldItems(); - const modifierConfigs = modifiers.value.map((mod) => { + const modifierConfigs = modifiers.value.map(mod => { return { modifier: mod.clone(), isTransferable: false, - stackCount: mod.stackCount + stackCount: mod.stackCount, }; }) as HeldModifierConfig[]; @@ -410,6 +405,4 @@ function getEnemyConfig(playerPokemon: PlayerPokemon, segments: number, modifier class ModifiersHolder { public value: PokemonHeldItemModifier[] = []; - - constructor() {} } diff --git a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts index a17b05c4e33..1c617aa2c7f 100644 --- a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts +++ b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts @@ -1,5 +1,12 @@ import type { EnemyPartyConfig, EnemyPokemonConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + generateModifierType, + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + loadCustomMovesForEncounter, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; @@ -34,135 +41,149 @@ const SHOP_ITEM_COST_MULTIPLIER = 2.5; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3809 | GitHub Issue #3809} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const TrashToTreasureEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.TRASH_TO_TREASURE) - .withEncounterTier(MysteryEncounterTier.ULTRA) - .withSceneWaveRangeRequirement(60, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) - .withMaxAllowedEncounters(1) - .withFleeAllowed(false) - .withIntroSpriteConfigs([ - { - spriteKey: Species.GARBODOR.toString() + "-gigantamax", - fileRoot: "pokemon", - hasShadow: false, - disableAnimation: true, - scale: 1.5, - y: 8, - tint: 0.4 - } - ]) - .withAutoHideIntroVisuals(false) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; +export const TrashToTreasureEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.TRASH_TO_TREASURE, +) + .withEncounterTier(MysteryEncounterTier.ULTRA) + .withSceneWaveRangeRequirement(60, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1]) + .withMaxAllowedEncounters(1) + .withFleeAllowed(false) + .withIntroSpriteConfigs([ + { + spriteKey: Species.GARBODOR.toString() + "-gigantamax", + fileRoot: "pokemon", + hasShadow: false, + disableAnimation: true, + scale: 1.5, + y: 8, + tint: 0.4, + }, + ]) + .withAutoHideIntroVisuals(false) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; - // Calculate boss mon (shiny locked) - const bossSpecies = getPokemonSpecies(Species.GARBODOR); - const pokemonConfig: EnemyPokemonConfig = { - species: bossSpecies, - isBoss: true, - shiny: false, // Shiny lock because of custom intro sprite - formIndex: 1, // Gmax - bossSegmentModifier: 1, // +1 Segment from normal - moveSet: [ Moves.PAYBACK, Moves.GUNK_SHOT, Moves.STOMPING_TANTRUM, Moves.DRAIN_PUNCH ] - }; - const config: EnemyPartyConfig = { - levelAdditiveModifier: 0.5, - pokemonConfigs: [ pokemonConfig ], - disableSwitch: true - }; - encounter.enemyPartyConfigs = [ config ]; + // Calculate boss mon (shiny locked) + const bossSpecies = getPokemonSpecies(Species.GARBODOR); + const pokemonConfig: EnemyPokemonConfig = { + species: bossSpecies, + isBoss: true, + shiny: false, // Shiny lock because of custom intro sprite + formIndex: 1, // Gmax + bossSegmentModifier: 1, // +1 Segment from normal + moveSet: [Moves.PAYBACK, Moves.GUNK_SHOT, Moves.STOMPING_TANTRUM, Moves.DRAIN_PUNCH], + }; + const config: EnemyPartyConfig = { + levelAdditiveModifier: 0.5, + pokemonConfigs: [pokemonConfig], + disableSwitch: true, + }; + encounter.enemyPartyConfigs = [config]; - // Load animations/sfx for Garbodor fight start moves - loadCustomMovesForEncounter([ Moves.TOXIC, Moves.AMNESIA ]); + // Load animations/sfx for Garbodor fight start moves + loadCustomMovesForEncounter([Moves.TOXIC, Moves.AMNESIA]); - globalScene.loadSe("PRSFX- Dig2", "battle_anims", "PRSFX- Dig2.wav"); - globalScene.loadSe("PRSFX- Venom Drench", "battle_anims", "PRSFX- Venom Drench.wav"); + globalScene.loadSe("PRSFX- Dig2", "battle_anims", "PRSFX- Dig2.wav"); + globalScene.loadSe("PRSFX- Venom Drench", "battle_anims", "PRSFX- Venom Drench.wav"); - encounter.setDialogueToken("costMultiplier", SHOP_ITEM_COST_MULTIPLIER.toString()); + encounter.setDialogueToken("costMultiplier", SHOP_ITEM_COST_MULTIPLIER.toString()); - return true; - }) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected`, - }, - ], - }) - .withPreOptionPhase(async () => { - // Play Dig2 and then Venom Drench sfx - doGarbageDig(); - }) - .withOptionPhase(async () => { - // Gain 2 Leftovers and 2 Shell Bell - await transitionMysteryEncounterIntroVisuals(); - await tryApplyDigRewardItems(); + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + }, + ], + }) + .withPreOptionPhase(async () => { + // Play Dig2 and then Venom Drench sfx + doGarbageDig(); + }) + .withOptionPhase(async () => { + // Gain 2 Leftovers and 2 Shell Bell + await transitionMysteryEncounterIntroVisuals(); + await tryApplyDigRewardItems(); - const blackSludge = generateModifierType(modifierTypes.MYSTERY_ENCOUNTER_BLACK_SLUDGE, [ SHOP_ITEM_COST_MULTIPLIER ]); - const modifier = blackSludge?.newModifier(); - if (modifier) { - await globalScene.addModifier(modifier, false, false, false, true); - globalScene.playSound("battle_anims/PRSFX- Venom Drench", { volume: 2 }); - await showEncounterText(i18next.t("battle:rewardGain", { modifierName: modifier.type.name }), null, undefined, true); - } + const blackSludge = generateModifierType(modifierTypes.MYSTERY_ENCOUNTER_BLACK_SLUDGE, [ + SHOP_ITEM_COST_MULTIPLIER, + ]); + const modifier = blackSludge?.newModifier(); + if (modifier) { + await globalScene.addModifier(modifier, false, false, false, true); + globalScene.playSound("battle_anims/PRSFX- Venom Drench", { + volume: 2, + }); + await showEncounterText( + i18next.t("battle:rewardGain", { + modifierName: modifier.type.name, + }), + null, + undefined, + true, + ); + } - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - }, - ], - }) - .withOptionPhase(async () => { - // Investigate garbage, battle Gmax Garbodor - globalScene.setFieldScale(0.75); - await showEncounterText(`${namespace}:option.2.selected_2`); - await transitionMysteryEncounterIntroVisuals(); + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }) + .withOptionPhase(async () => { + // Investigate garbage, battle Gmax Garbodor + globalScene.setFieldScale(0.75); + await showEncounterText(`${namespace}:option.2.selected_2`); + await transitionMysteryEncounterIntroVisuals(); - const encounter = globalScene.currentBattle.mysteryEncounter!; + const encounter = globalScene.currentBattle.mysteryEncounter!; - setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT ], fillRemaining: true }); - encounter.startOfBattleEffects.push( - { - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ BattlerIndex.PLAYER ], - move: new PokemonMove(Moves.TOXIC), - ignorePp: true - }, - { - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ BattlerIndex.ENEMY ], - move: new PokemonMove(Moves.AMNESIA), - ignorePp: true - }); - await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); - }) - .build() - ) - .build(); + setEncounterRewards({ + guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT], + fillRemaining: true, + }); + encounter.startOfBattleEffects.push( + { + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [BattlerIndex.PLAYER], + move: new PokemonMove(Moves.TOXIC), + ignorePp: true, + }, + { + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [BattlerIndex.ENEMY], + move: new PokemonMove(Moves.AMNESIA), + ignorePp: true, + }, + ); + await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); + }) + .build(), + ) + .build(); async function tryApplyDigRewardItems() { const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; @@ -173,8 +194,10 @@ async function tryApplyDigRewardItems() { // Iterate over the party until an item was successfully given // First leftovers for (const pokemon of party) { - const heldItems = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.pokemonId === pokemon.id, true) as PokemonHeldItemModifier[]; + const heldItems = globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id, + true, + ) as PokemonHeldItemModifier[]; const existingLeftovers = heldItems.find(m => m instanceof TurnHealModifier) as TurnHealModifier; if (!existingLeftovers || existingLeftovers.getStackCount() < existingLeftovers.getMaxStackCount()) { @@ -185,8 +208,10 @@ async function tryApplyDigRewardItems() { // Second leftovers for (const pokemon of party) { - const heldItems = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.pokemonId === pokemon.id, true) as PokemonHeldItemModifier[]; + const heldItems = globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id, + true, + ) as PokemonHeldItemModifier[]; const existingLeftovers = heldItems.find(m => m instanceof TurnHealModifier) as TurnHealModifier; if (!existingLeftovers || existingLeftovers.getStackCount() < existingLeftovers.getMaxStackCount()) { @@ -196,12 +221,22 @@ async function tryApplyDigRewardItems() { } globalScene.playSound("item_fanfare"); - await showEncounterText(i18next.t("battle:rewardGainCount", { modifierName: leftovers.name, count: 2 }), null, undefined, true); + await showEncounterText( + i18next.t("battle:rewardGainCount", { + modifierName: leftovers.name, + count: 2, + }), + null, + undefined, + true, + ); // First Shell bell for (const pokemon of party) { - const heldItems = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.pokemonId === pokemon.id, true) as PokemonHeldItemModifier[]; + const heldItems = globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id, + true, + ) as PokemonHeldItemModifier[]; const existingShellBell = heldItems.find(m => m instanceof HitHealModifier) as HitHealModifier; if (!existingShellBell || existingShellBell.getStackCount() < existingShellBell.getMaxStackCount()) { @@ -212,8 +247,10 @@ async function tryApplyDigRewardItems() { // Second Shell bell for (const pokemon of party) { - const heldItems = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.pokemonId === pokemon.id, true) as PokemonHeldItemModifier[]; + const heldItems = globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id, + true, + ) as PokemonHeldItemModifier[]; const existingShellBell = heldItems.find(m => m instanceof HitHealModifier) as HitHealModifier; if (!existingShellBell || existingShellBell.getStackCount() < existingShellBell.getMaxStackCount()) { @@ -223,7 +260,15 @@ async function tryApplyDigRewardItems() { } globalScene.playSound("item_fanfare"); - await showEncounterText(i18next.t("battle:rewardGainCount", { modifierName: shellBell.name, count: 2 }), null, undefined, true); + await showEncounterText( + i18next.t("battle:rewardGainCount", { + modifierName: shellBell.name, + count: 2, + }), + null, + undefined, + true, + ); } function doGarbageDig() { diff --git a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts index 6e6381888f1..ed1866c7a1b 100644 --- a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts +++ b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts @@ -1,6 +1,12 @@ import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { getRandomEncounterSpecies, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + getRandomEncounterSpecies, + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + setEncounterExp, + setEncounterRewards, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { CHARMING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; import type Pokemon from "#app/field/pokemon"; import type { EnemyPokemon } from "#app/field/pokemon"; @@ -9,15 +15,22 @@ import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MoveRequirement, PersistentModifierRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; +import { + MoveRequirement, + PersistentModifierRequirement, +} from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { catchPokemon, getHighestLevelPlayerPokemon, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + catchPokemon, + getHighestLevelPlayerPokemon, + getSpriteKeysFromPokemon, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import PokemonData from "#app/system/pokemon-data"; import { isNullOrUndefined, randSeedInt } from "#app/utils"; import type { Moves } from "#enums/moves"; import { BattlerIndex } from "#app/battle"; -import { SelfStatusMove } from "#app/data/move"; +import { SelfStatusMove } from "#app/data/moves/move"; import { PokeballType } from "#enums/pokeball"; import { BattlerTagType } from "#enums/battler-tag-type"; import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; @@ -34,223 +47,228 @@ const namespace = "mysteryEncounters/uncommonBreed"; * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3811 | GitHub Issue #3811} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const UncommonBreedEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.UNCOMMON_BREED) - .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) - .withCatchAllowed(true) - .withHideWildIntroMessage(true) - .withFleeAllowed(false) - .withIntroSpriteConfigs([]) // Set in onInit() - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - ]) - .withOnInit(() => { - const encounter = globalScene.currentBattle.mysteryEncounter!; +export const UncommonBreedEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.UNCOMMON_BREED, +) + .withEncounterTier(MysteryEncounterTier.COMMON) + .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) + .withCatchAllowed(true) + .withHideWildIntroMessage(true) + .withFleeAllowed(false) + .withIntroSpriteConfigs([]) // Set in onInit() + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + ]) + .withOnInit(() => { + const encounter = globalScene.currentBattle.mysteryEncounter!; - // Calculate boss mon - // Level equal to 2 below highest party member - const level = getHighestLevelPlayerPokemon(false, true).level - 2; - const pokemon = getRandomEncounterSpecies(level, true, true); + // Calculate boss mon + // Level equal to 2 below highest party member + const level = getHighestLevelPlayerPokemon(false, true).level - 2; + const pokemon = getRandomEncounterSpecies(level, true, true); - // Pokemon will always have one of its egg moves in its moveset - const eggMoves = pokemon.getEggMoves(); - if (eggMoves) { - const eggMoveIndex = randSeedInt(4); - const randomEggMove: Moves = eggMoves[eggMoveIndex]; - encounter.misc = { - eggMove: randomEggMove, - pokemon: pokemon - }; - if (pokemon.moveset.length < 4) { - pokemon.moveset.push(new PokemonMove(randomEggMove)); - } else { - pokemon.moveset[0] = new PokemonMove(randomEggMove); - } + // Pokemon will always have one of its egg moves in its moveset + const eggMoves = pokemon.getEggMoves(); + if (eggMoves) { + const eggMoveIndex = randSeedInt(4); + const randomEggMove: Moves = eggMoves[eggMoveIndex]; + encounter.misc = { + eggMove: randomEggMove, + pokemon: pokemon, + }; + if (pokemon.moveset.length < 4) { + pokemon.moveset.push(new PokemonMove(randomEggMove)); } else { - encounter.misc.pokemon = pokemon; + pokemon.moveset[0] = new PokemonMove(randomEggMove); } + } else { + encounter.misc.pokemon = pokemon; + } - // Defense/Spd buffs below wave 50, +1 to all stats otherwise - const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = globalScene.currentBattle.waveIndex < 50 ? - [ Stat.DEF, Stat.SPDEF, Stat.SPD ] : - [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ]; + // Defense/Spd buffs below wave 50, +1 to all stats otherwise + const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = + globalScene.currentBattle.waveIndex < 50 + ? [Stat.DEF, Stat.SPDEF, Stat.SPD] + : [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD]; - const config: EnemyPartyConfig = { - pokemonConfigs: [{ + const config: EnemyPartyConfig = { + pokemonConfigs: [ + { level: level, species: pokemon.species, dataSource: new PokemonData(pokemon), isBoss: false, - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], mysteryEncounterBattleEffects: (pokemon: Pokemon) => { queueEncounterMessage(`${namespace}:option.1.stat_boost`); - globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1)); - } - }], - }; - encounter.enemyPartyConfigs = [ config ]; - - const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon); - encounter.spriteConfigs = [ - { - spriteKey: spriteKey, - fileRoot: fileRoot, - hasShadow: true, - x: -5, - repeat: true, - isPokemon: true, - isShiny: pokemon.shiny, - variant: pokemon.variant + globalScene.unshiftPhase( + new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1), + ); + }, }, - ]; + ], + }; + encounter.enemyPartyConfigs = [config]; - encounter.setDialogueToken("enemyPokemon", pokemon.getNameToRender()); - globalScene.loadSe("PRSFX- Spotlight2", "battle_anims", "PRSFX- Spotlight2.wav"); - return true; - }) - .withOnVisualsStart(() => { - // Animate the pokemon - const encounter = globalScene.currentBattle.mysteryEncounter!; - const pokemonSprite = encounter.introVisuals!.getSprites(); - - // Bounce at the end, then shiny sparkle if the Pokemon is shiny - globalScene.tweens.add({ - targets: pokemonSprite, - duration: 300, - ease: "Cubic.easeOut", - yoyo: true, - y: "-=20", - loop: 1, - onComplete: () => encounter.introVisuals?.playShinySparkles() - }); - - globalScene.time.delayedCall(500, () => globalScene.playSound("battle_anims/PRSFX- Spotlight2")); - return true; - }) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withSimpleOption( + const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon); + encounter.spriteConfigs = [ { - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, + spriteKey: spriteKey, + fileRoot: fileRoot, + hasShadow: true, + x: -5, + repeat: true, + isPokemon: true, + isShiny: pokemon.shiny, + variant: pokemon.variant, + }, + ]; + + encounter.setDialogueToken("enemyPokemon", pokemon.getNameToRender()); + globalScene.loadSe("PRSFX- Spotlight2", "battle_anims", "PRSFX- Spotlight2.wav"); + return true; + }) + .withOnVisualsStart(() => { + // Animate the pokemon + const encounter = globalScene.currentBattle.mysteryEncounter!; + const pokemonSprite = encounter.introVisuals!.getSprites(); + + // Bounce at the end, then shiny sparkle if the Pokemon is shiny + globalScene.tweens.add({ + targets: pokemonSprite, + duration: 300, + ease: "Cubic.easeOut", + yoyo: true, + y: "-=20", + loop: 1, + onComplete: () => encounter.introVisuals?.playShinySparkles(), + }); + + globalScene.time.delayedCall(500, () => globalScene.playSound("battle_anims/PRSFX- Spotlight2")); + return true; + }) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + }, + ], + }, + async () => { + // Pick battle + const encounter = globalScene.currentBattle.mysteryEncounter!; + + const eggMove = encounter.misc.eggMove; + if (!isNullOrUndefined(eggMove)) { + // Check what type of move the egg move is to determine target + const pokemonMove = new PokemonMove(eggMove); + const move = pokemonMove.getMove(); + const target = move instanceof SelfStatusMove ? BattlerIndex.ENEMY : BattlerIndex.PLAYER; + + encounter.startOfBattleEffects.push({ + sourceBattlerIndex: BattlerIndex.ENEMY, + targets: [target], + move: pokemonMove, + ignorePp: true, + }); + } + + setEncounterRewards({ fillRemaining: true }); + await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); + }, + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + .withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 4)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically + .withDialogue({ + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`, selected: [ { - text: `${namespace}:option.1.selected`, + text: `${namespace}:option.2.selected`, }, ], - }, - async () => { - // Pick battle - const encounter = globalScene.currentBattle.mysteryEncounter!; + }) + .withOptionPhase(async () => { + // Give it some food - const eggMove = encounter.misc.eggMove; - if (!isNullOrUndefined(eggMove)) { - // Check what type of move the egg move is to determine target - const pokemonMove = new PokemonMove(eggMove); - const move = pokemonMove.getMove(); - const target = move instanceof SelfStatusMove ? BattlerIndex.ENEMY : BattlerIndex.PLAYER; - - encounter.startOfBattleEffects.push( - { - sourceBattlerIndex: BattlerIndex.ENEMY, - targets: [ target ], - move: pokemonMove, - ignorePp: true - }); + // Remove 4 random berries from player's party + // Get all player berry items, remove from party, and store reference + const berryItems: BerryModifier[] = globalScene.findModifiers( + m => m instanceof BerryModifier, + ) as BerryModifier[]; + for (let i = 0; i < 4; i++) { + const index = randSeedInt(berryItems.length); + const randBerry = berryItems[index]; + randBerry.stackCount--; + if (randBerry.stackCount === 0) { + globalScene.removeModifier(randBerry); + berryItems.splice(index, 1); + } } + await globalScene.updateModifiers(true, true); + // Pokemon joins the team, with 2 egg moves + const encounter = globalScene.currentBattle.mysteryEncounter!; + const pokemon = encounter.misc.pokemon; + + // Give 1 additional egg move + givePokemonExtraEggMove(pokemon, encounter.misc.eggMove); + + await catchPokemon(pokemon, null, PokeballType.POKEBALL, false); setEncounterRewards({ fillRemaining: true }); - await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]); - } - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) - .withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 4)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically - .withDialogue({ - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected` - } - ] - }) - .withOptionPhase(async () => { - // Give it some food + leaveEncounterWithoutBattle(); + }) + .build(), + ) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + .withPrimaryPokemonRequirement(new MoveRequirement(CHARMING_MOVES, true)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically + .withDialogue({ + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, + selected: [ + { + text: `${namespace}:option.3.selected`, + }, + ], + }) + .withOptionPhase(async () => { + // Attract the pokemon with a move + // Pokemon joins the team, with 2 egg moves and IVs rolled an additional time + const encounter = globalScene.currentBattle.mysteryEncounter!; + const pokemon = encounter.misc.pokemon; - // Remove 4 random berries from player's party - // Get all player berry items, remove from party, and store reference - const berryItems: BerryModifier[] = globalScene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[]; - for (let i = 0; i < 4; i++) { - const index = randSeedInt(berryItems.length); - const randBerry = berryItems[index]; - randBerry.stackCount--; - if (randBerry.stackCount === 0) { - globalScene.removeModifier(randBerry); - berryItems.splice(index, 1); - } - } - await globalScene.updateModifiers(true, true); + // Give 1 additional egg move + givePokemonExtraEggMove(pokemon, encounter.misc.eggMove); - // Pokemon joins the team, with 2 egg moves - const encounter = globalScene.currentBattle.mysteryEncounter!; - const pokemon = encounter.misc.pokemon; + // Roll IVs a second time + pokemon.ivs = pokemon.ivs.map(iv => { + const newValue = randSeedInt(31); + return newValue > iv ? newValue : iv; + }); - // Give 1 additional egg move - givePokemonExtraEggMove(pokemon, encounter.misc.eggMove); - - await catchPokemon(pokemon, null, PokeballType.POKEBALL, false); - setEncounterRewards({ fillRemaining: true }); - leaveEncounterWithoutBattle(); - }) - .build() - ) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) - .withPrimaryPokemonRequirement(new MoveRequirement(CHARMING_MOVES, true)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically - .withDialogue({ - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, - selected: [ - { - text: `${namespace}:option.3.selected` - } - ] - }) - .withOptionPhase(async () => { - // Attract the pokemon with a move - // Pokemon joins the team, with 2 egg moves and IVs rolled an additional time - const encounter = globalScene.currentBattle.mysteryEncounter!; - const pokemon = encounter.misc.pokemon; - - // Give 1 additional egg move - givePokemonExtraEggMove(pokemon, encounter.misc.eggMove); - - // Roll IVs a second time - pokemon.ivs = pokemon.ivs.map(iv => { - const newValue = randSeedInt(31); - return newValue > iv ? newValue : iv; - }); - - await catchPokemon(pokemon, null, PokeballType.POKEBALL, false); - if (encounter.selectedOption?.primaryPokemon?.id) { - setEncounterExp(encounter.selectedOption.primaryPokemon.id, pokemon.getExpValue(), false); - } - setEncounterRewards({ fillRemaining: true }); - leaveEncounterWithoutBattle(); - }) - .build() - ) - .build(); + await catchPokemon(pokemon, null, PokeballType.POKEBALL, false); + if (encounter.selectedOption?.primaryPokemon?.id) { + setEncounterExp(encounter.selectedOption.primaryPokemon.id, pokemon.getExpValue(), false); + } + setEncounterRewards({ fillRemaining: true }); + leaveEncounterWithoutBattle(); + }) + .build(), + ) + .build(); function givePokemonExtraEggMove(pokemon: EnemyPokemon, previousEggMove: Moves) { const eggMoves = pokemon.getEggMoves(); diff --git a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts index e047a7a4f01..758e3fabd76 100644 --- a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts +++ b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts @@ -1,4 +1,4 @@ -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; import { globalScene } from "#app/global-scene"; @@ -6,13 +6,18 @@ import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounte import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import type { EnemyPartyConfig, EnemyPokemonConfig } from "../utils/encounter-phase-utils"; -import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, } from "../utils/encounter-phase-utils"; +import { + generateModifierType, + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + setEncounterRewards, +} from "../utils/encounter-phase-utils"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import type { PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; -import { IntegerHolder, isNullOrUndefined, randSeedInt, randSeedShuffle } from "#app/utils"; +import { NumberHolder, isNullOrUndefined, randSeedInt, randSeedShuffle } from "#app/utils"; import type PokemonSpecies from "#app/data/pokemon-species"; import { allSpecies, getPokemonSpecies } from "#app/data/pokemon-species"; import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; @@ -23,7 +28,10 @@ import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter- import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; import i18next from "#app/plugins/i18n"; -import { doPokemonTransformationSequence, TransformationScreenPosition } from "#app/data/mystery-encounters/utils/encounter-transformation-sequence"; +import { + doPokemonTransformationSequence, + TransformationScreenPosition, +} from "#app/data/mystery-encounters/utils/encounter-transformation-sequence"; import { getLevelTotalExp } from "#app/data/exp"; import { Stat } from "#enums/stat"; import { Challenges } from "#enums/challenges"; @@ -104,230 +112,260 @@ const PERCENT_LEVEL_LOSS_ON_REFUSE = 10; * Value ranges of the resulting species BST transformations after adding values to original species * 2 Pokemon in the party use this range */ -const HIGH_BST_TRANSFORM_BASE_VALUES: [number, number] = [ 90, 110 ]; +const HIGH_BST_TRANSFORM_BASE_VALUES: [number, number] = [90, 110]; /** * Value ranges of the resulting species BST transformations after adding values to original species * All remaining Pokemon in the party use this range */ -const STANDARD_BST_TRANSFORM_BASE_VALUES: [number, number] = [ 40, 50 ]; +const STANDARD_BST_TRANSFORM_BASE_VALUES: [number, number] = [40, 50]; /** * Weird Dream encounter. * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3822 | GitHub Issue #3822} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ -export const WeirdDreamEncounter: MysteryEncounter = - MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.WEIRD_DREAM) - .withEncounterTier(MysteryEncounterTier.ROGUE) - .withDisallowedChallenges(Challenges.SINGLE_TYPE, Challenges.SINGLE_GENERATION) - // TODO: should reset minimum wave to 10 when there are more Rogue tiers in pool. Matching Dark Deal minimum for now. - .withSceneWaveRangeRequirement(30, 140) - .withIntroSpriteConfigs([ - { - spriteKey: "weird_dream_woman", - fileRoot: "mystery-encounters", - hasShadow: true, - y: 11, - yShadow: 6, - x: 4 - }, - ]) - .withIntroDialogue([ - { - text: `${namespace}:intro`, - }, - { - speaker: `${namespace}:speaker`, - text: `${namespace}:intro_dialogue`, - }, - ]) - .setLocalizationKey(`${namespace}`) - .withTitle(`${namespace}:title`) - .withDescription(`${namespace}:description`) - .withQuery(`${namespace}:query`) - .withOnInit(() => { - globalScene.loadBgm("mystery_encounter_weird_dream", "mystery_encounter_weird_dream.mp3"); +export const WeirdDreamEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType( + MysteryEncounterType.WEIRD_DREAM, +) + .withEncounterTier(MysteryEncounterTier.ROGUE) + .withDisallowedChallenges(Challenges.SINGLE_TYPE, Challenges.SINGLE_GENERATION) + // TODO: should reset minimum wave to 10 when there are more Rogue tiers in pool. Matching Dark Deal minimum for now. + .withSceneWaveRangeRequirement(30, 140) + .withIntroSpriteConfigs([ + { + spriteKey: "weird_dream_woman", + fileRoot: "mystery-encounters", + hasShadow: true, + y: 11, + yShadow: 6, + x: 4, + }, + ]) + .withIntroDialogue([ + { + text: `${namespace}:intro`, + }, + { + speaker: `${namespace}:speaker`, + text: `${namespace}:intro_dialogue`, + }, + ]) + .setLocalizationKey(`${namespace}`) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withOnInit(() => { + globalScene.loadBgm("mystery_encounter_weird_dream", "mystery_encounter_weird_dream.mp3"); - // Calculate all the newly transformed Pokemon and begin asset load - const teamTransformations = getTeamTransformations(); - const loadAssets = teamTransformations.map(t => (t.newPokemon as PlayerPokemon).loadAssets()); - globalScene.currentBattle.mysteryEncounter!.misc = { - teamTransformations, - loadAssets + // Calculate all the newly transformed Pokemon and begin asset load + const teamTransformations = getTeamTransformations(); + const loadAssets = teamTransformations.map(t => (t.newPokemon as PlayerPokemon).loadAssets()); + globalScene.currentBattle.mysteryEncounter!.misc = { + teamTransformations, + loadAssets, + }; + + return true; + }) + .withOnVisualsStart(() => { + globalScene.fadeAndSwitchBgm("mystery_encounter_weird_dream"); + return true; + }) + .withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withHasDexProgress(true) + .withDialogue({ + buttonLabel: `${namespace}:option.1.label`, + buttonTooltip: `${namespace}:option.1.tooltip`, + selected: [ + { + text: `${namespace}:option.1.selected`, + }, + ], + }) + .withPreOptionPhase(async () => { + // Play the animation as the player goes through the dialogue + globalScene.time.delayedCall(1000, () => { + doShowDreamBackground(); + }); + + for (const transformation of globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations) { + globalScene.removePokemonFromPlayerParty(transformation.previousPokemon, false); + globalScene.getPlayerParty().push(transformation.newPokemon); + } + }) + .withOptionPhase(async () => { + // Starts cutscene dialogue, but does not await so that cutscene plays as player goes through dialogue + const cutsceneDialoguePromise = showEncounterText(`${namespace}:option.1.cutscene`); + + // Change the entire player's party + // Wait for all new Pokemon assets to be loaded before showing transformation animations + await Promise.all(globalScene.currentBattle.mysteryEncounter!.misc.loadAssets); + const transformations = globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations; + + // If there are 1-3 transformations, do them centered back to back + // Otherwise, the first 3 transformations are executed side-by-side, then any remaining 1-3 transformations occur in those same respective positions + if (transformations.length <= 3) { + for (const transformation of transformations) { + const pokemon1 = transformation.previousPokemon; + const pokemon2 = transformation.newPokemon; + + await doPokemonTransformationSequence(pokemon1, pokemon2, TransformationScreenPosition.CENTER); + } + } else { + await doSideBySideTransformations(transformations); + } + + // Make sure player has finished cutscene dialogue + await cutsceneDialoguePromise; + + doHideDreamBackground(); + await showEncounterText(`${namespace}:option.1.dream_complete`); + + await doNewTeamPostProcess(transformations); + setEncounterRewards({ + guaranteedModifierTypeFuncs: [ + modifierTypes.MEMORY_MUSHROOM, + modifierTypes.ROGUE_BALL, + modifierTypes.MINT, + modifierTypes.MINT, + modifierTypes.MINT, + ], + fillRemaining: false, + }); + leaveEncounterWithoutBattle(true); + }) + .build(), + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.2.label`, + buttonTooltip: `${namespace}:option.2.tooltip`, + selected: [ + { + text: `${namespace}:option.2.selected`, + }, + ], + }, + async () => { + // Battle your "future" team for some item rewards + const transformations: PokemonTransformation[] = + globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations; + + // Uses the pokemon that player's party would have transformed into + const enemyPokemonConfigs: EnemyPokemonConfig[] = []; + for (const transformation of transformations) { + const newPokemon = transformation.newPokemon; + const previousPokemon = transformation.previousPokemon; + + await postProcessTransformedPokemon(previousPokemon, newPokemon, newPokemon.species.getRootSpeciesId(), true); + + const dataSource = new PokemonData(newPokemon); + dataSource.player = false; + + // Copy held items to new pokemon + const newPokemonHeldItemConfigs: HeldModifierConfig[] = []; + for (const item of transformation.heldItems) { + newPokemonHeldItemConfigs.push({ + modifier: item.clone() as PokemonHeldItemModifier, + stackCount: item.getStackCount(), + isTransferable: false, + }); + } + // Any pokemon that is below 570 BST gets +20 permanent BST to 3 stats + if (shouldGetOldGateau(newPokemon)) { + const stats = getOldGateauBoostedStats(newPokemon); + newPokemonHeldItemConfigs.push({ + modifier: generateModifierType(modifierTypes.MYSTERY_ENCOUNTER_OLD_GATEAU, [ + OLD_GATEAU_STATS_UP, + stats, + ]) as PokemonHeldItemModifierType, + stackCount: 1, + isTransferable: false, + }); + } + + const enemyConfig: EnemyPokemonConfig = { + species: transformation.newSpecies, + isBoss: newPokemon.getSpeciesForm().getBaseStatTotal() > NON_LEGENDARY_BST_THRESHOLD, + level: previousPokemon.level, + dataSource: dataSource, + modifierConfigs: newPokemonHeldItemConfigs, + }; + + enemyPokemonConfigs.push(enemyConfig); + } + + const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET; + const trainerConfig = + trainerConfigs[ + genderIndex === PlayerGender.FEMALE ? TrainerType.FUTURE_SELF_F : TrainerType.FUTURE_SELF_M + ].clone(); + trainerConfig.setPartyTemplates(new TrainerPartyTemplate(transformations.length, PartyMemberStrength.STRONG)); + const enemyPartyConfig: EnemyPartyConfig = { + trainerConfig: trainerConfig, + pokemonConfigs: enemyPokemonConfigs, + female: genderIndex === PlayerGender.FEMALE, }; - return true; - }) - .withOnVisualsStart(() => { - globalScene.fadeAndSwitchBgm("mystery_encounter_weird_dream"); - return true; - }) - .withOption( - MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withHasDexProgress(true) - .withDialogue({ - buttonLabel: `${namespace}:option.1.label`, - buttonTooltip: `${namespace}:option.1.tooltip`, - selected: [ - { - text: `${namespace}:option.1.selected`, - } + const onBeforeRewards = () => { + // Before battle rewards, unlock the passive on a pokemon in the player's team for the rest of the run (not permanently) + // One random pokemon will get its passive unlocked + const passiveDisabledPokemon = globalScene.getPlayerParty().filter(p => !p.passive); + if (passiveDisabledPokemon?.length > 0) { + const enablePassiveMon = passiveDisabledPokemon[randSeedInt(passiveDisabledPokemon.length)]; + enablePassiveMon.passive = true; + enablePassiveMon.updateInfo(true); + } + }; + + setEncounterRewards( + { + guaranteedModifierTiers: [ + ModifierTier.ROGUE, + ModifierTier.ROGUE, + ModifierTier.ULTRA, + ModifierTier.ULTRA, + ModifierTier.GREAT, + ModifierTier.GREAT, ], - }) - .withPreOptionPhase(async () => { - // Play the animation as the player goes through the dialogue - globalScene.time.delayedCall(1000, () => { - doShowDreamBackground(); - }); + fillRemaining: false, + }, + undefined, + onBeforeRewards, + ); - for (const transformation of globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations) { - globalScene.removePokemonFromPlayerParty(transformation.previousPokemon, false); - globalScene.getPlayerParty().push(transformation.newPokemon); - } - }) - .withOptionPhase(async () => { - // Starts cutscene dialogue, but does not await so that cutscene plays as player goes through dialogue - const cutsceneDialoguePromise = showEncounterText(`${namespace}:option.1.cutscene`); + await showEncounterText(`${namespace}:option.2.selected_2`, null, undefined, true); + await initBattleWithEnemyConfig(enemyPartyConfig); + }, + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option.3.label`, + buttonTooltip: `${namespace}:option.3.tooltip`, + selected: [ + { + text: `${namespace}:option.3.selected`, + }, + ], + }, + async () => { + // Leave, reduce party levels by 10% + for (const pokemon of globalScene.getPlayerParty()) { + pokemon.level = Math.max(Math.ceil(((100 - PERCENT_LEVEL_LOSS_ON_REFUSE) / 100) * pokemon.level), 1); + pokemon.exp = getLevelTotalExp(pokemon.level, pokemon.species.growthRate); + pokemon.levelExp = 0; - // Change the entire player's party - // Wait for all new Pokemon assets to be loaded before showing transformation animations - await Promise.all(globalScene.currentBattle.mysteryEncounter!.misc.loadAssets); - const transformations = globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations; - - // If there are 1-3 transformations, do them centered back to back - // Otherwise, the first 3 transformations are executed side-by-side, then any remaining 1-3 transformations occur in those same respective positions - if (transformations.length <= 3) { - for (const transformation of transformations) { - const pokemon1 = transformation.previousPokemon; - const pokemon2 = transformation.newPokemon; - - await doPokemonTransformationSequence(pokemon1, pokemon2, TransformationScreenPosition.CENTER); - } - } else { - await doSideBySideTransformations(transformations); - } - - // Make sure player has finished cutscene dialogue - await cutsceneDialoguePromise; - - doHideDreamBackground(); - await showEncounterText(`${namespace}:option.1.dream_complete`); - - await doNewTeamPostProcess(transformations); - setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.MEMORY_MUSHROOM, modifierTypes.ROGUE_BALL, modifierTypes.MINT, modifierTypes.MINT, modifierTypes.MINT ], fillRemaining: false }); - leaveEncounterWithoutBattle(true); - }) - .build() - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip`, - selected: [ - { - text: `${namespace}:option.2.selected`, - }, - ], - }, - async () => { - // Battle your "future" team for some item rewards - const transformations: PokemonTransformation[] = globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations; - - // Uses the pokemon that player's party would have transformed into - const enemyPokemonConfigs: EnemyPokemonConfig[] = []; - for (const transformation of transformations) { - const newPokemon = transformation.newPokemon; - const previousPokemon = transformation.previousPokemon; - - await postProcessTransformedPokemon(previousPokemon, newPokemon, newPokemon.species.getRootSpeciesId(), true); - - const dataSource = new PokemonData(newPokemon); - dataSource.player = false; - - // Copy held items to new pokemon - const newPokemonHeldItemConfigs: HeldModifierConfig[] = []; - for (const item of transformation.heldItems) { - newPokemonHeldItemConfigs.push({ - modifier: item.clone() as PokemonHeldItemModifier, - stackCount: item.getStackCount(), - isTransferable: false - }); - } - // Any pokemon that is below 570 BST gets +20 permanent BST to 3 stats - if (shouldGetOldGateau(newPokemon)) { - const stats = getOldGateauBoostedStats(newPokemon); - newPokemonHeldItemConfigs.push({ - modifier: generateModifierType(modifierTypes.MYSTERY_ENCOUNTER_OLD_GATEAU, [ OLD_GATEAU_STATS_UP, stats ]) as PokemonHeldItemModifierType, - stackCount: 1, - isTransferable: false - }); - } - - const enemyConfig: EnemyPokemonConfig = { - species: transformation.newSpecies, - isBoss: newPokemon.getSpeciesForm().getBaseStatTotal() > NON_LEGENDARY_BST_THRESHOLD, - level: previousPokemon.level, - dataSource: dataSource, - modifierConfigs: newPokemonHeldItemConfigs - }; - - enemyPokemonConfigs.push(enemyConfig); - } - - const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET; - const trainerConfig = trainerConfigs[genderIndex === PlayerGender.FEMALE ? TrainerType.FUTURE_SELF_F : TrainerType.FUTURE_SELF_M].clone(); - trainerConfig.setPartyTemplates(new TrainerPartyTemplate(transformations.length, PartyMemberStrength.STRONG)); - const enemyPartyConfig: EnemyPartyConfig = { - trainerConfig: trainerConfig, - pokemonConfigs: enemyPokemonConfigs, - female: genderIndex === PlayerGender.FEMALE - }; - - const onBeforeRewards = () => { - // Before battle rewards, unlock the passive on a pokemon in the player's team for the rest of the run (not permanently) - // One random pokemon will get its passive unlocked - const passiveDisabledPokemon = globalScene.getPlayerParty().filter(p => !p.passive); - if (passiveDisabledPokemon?.length > 0) { - const enablePassiveMon = passiveDisabledPokemon[randSeedInt(passiveDisabledPokemon.length)]; - enablePassiveMon.passive = true; - enablePassiveMon.updateInfo(true); - } - }; - - setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT ], fillRemaining: false }, undefined, onBeforeRewards); - - await showEncounterText(`${namespace}:option.2.selected_2`, null, undefined, true); - await initBattleWithEnemyConfig(enemyPartyConfig); + pokemon.calculateStats(); + pokemon.getBattleInfo().setLevel(pokemon.level); + await pokemon.updateInfo(); } - ) - .withSimpleOption( - { - buttonLabel: `${namespace}:option.3.label`, - buttonTooltip: `${namespace}:option.3.tooltip`, - selected: [ - { - text: `${namespace}:option.3.selected`, - }, - ], - }, - async () => { - // Leave, reduce party levels by 10% - for (const pokemon of globalScene.getPlayerParty()) { - pokemon.level = Math.max(Math.ceil((100 - PERCENT_LEVEL_LOSS_ON_REFUSE) / 100 * pokemon.level), 1); - pokemon.exp = getLevelTotalExp(pokemon.level, pokemon.species.growthRate); - pokemon.levelExp = 0; - pokemon.calculateStats(); - pokemon.getBattleInfo().setLevel(pokemon.level); - await pokemon.updateInfo(); - } - - leaveEncounterWithoutBattle(true); - return true; - } - ) - .build(); + leaveEncounterWithoutBattle(true); + return true; + }, + ) + .build(); interface PokemonTransformation { previousPokemon: PlayerPokemon; @@ -342,7 +380,7 @@ function getTeamTransformations(): PokemonTransformation[] { const alreadyUsedSpecies: PokemonSpecies[] = party.map(p => p.species); const pokemonTransformations: PokemonTransformation[] = party.map(p => { return { - previousPokemon: p + previousPokemon: p, } as PokemonTransformation; }); @@ -358,7 +396,9 @@ function getTeamTransformations(): PokemonTransformation[] { for (let i = 0; i < numPokemon; i++) { const removed = removedPokemon[i]; const index = pokemonTransformations.findIndex(p => p.previousPokemon.id === removed.id); - pokemonTransformations[index].heldItems = removed.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier)); + pokemonTransformations[index].heldItems = removed + .getHeldItems() + .filter(m => !(m instanceof PokemonFormChangeItemModifier)); const bst = removed.getSpeciesForm().getBaseStatTotal(); let newBstRange: [number, number]; @@ -368,7 +408,13 @@ function getTeamTransformations(): PokemonTransformation[] { newBstRange = STANDARD_BST_TRANSFORM_BASE_VALUES; } - const newSpecies = getTransformedSpecies(bst, newBstRange, hasPokemonInSuperLegendaryBstThreshold, hasPokemonInLegendaryBstThreshold, alreadyUsedSpecies); + const newSpecies = getTransformedSpecies( + bst, + newBstRange, + hasPokemonInSuperLegendaryBstThreshold, + hasPokemonInLegendaryBstThreshold, + alreadyUsedSpecies, + ); const newSpeciesBst = newSpecies.getBaseStatTotal(); if (newSpeciesBst > SUPER_LEGENDARY_BST_THRESHOLD) { @@ -378,7 +424,6 @@ function getTeamTransformations(): PokemonTransformation[] { hasPokemonInLegendaryBstThreshold = true; } - pokemonTransformations[index].newSpecies = newSpecies; console.log("New species: " + JSON.stringify(newSpecies)); alreadyUsedSpecies.push(newSpecies); @@ -386,7 +431,12 @@ function getTeamTransformations(): PokemonTransformation[] { for (const transformation of pokemonTransformations) { const newAbilityIndex = randSeedInt(transformation.newSpecies.getAbilityCount()); - transformation.newPokemon = globalScene.addPlayerPokemon(transformation.newSpecies, transformation.previousPokemon.level, newAbilityIndex, undefined); + transformation.newPokemon = globalScene.addPlayerPokemon( + transformation.newSpecies, + transformation.previousPokemon.level, + newAbilityIndex, + undefined, + ); } return pokemonTransformations; @@ -406,17 +456,18 @@ async function doNewTeamPostProcess(transformations: PokemonTransformation[]) { // Copy old items to new pokemon for (const item of transformation.heldItems) { item.pokemonId = newPokemon.id; - await globalScene.addModifier(item, false, false, false, true); + globalScene.addModifier(item, false, false, false, true); } // Any pokemon that is below 570 BST gets +20 permanent BST to 3 stats if (shouldGetOldGateau(newPokemon)) { const stats = getOldGateauBoostedStats(newPokemon); - const modType = modifierTypes.MYSTERY_ENCOUNTER_OLD_GATEAU() - .generateType(globalScene.getPlayerParty(), [ OLD_GATEAU_STATS_UP, stats ]) + const modType = modifierTypes + .MYSTERY_ENCOUNTER_OLD_GATEAU() + .generateType(globalScene.getPlayerParty(), [OLD_GATEAU_STATS_UP, stats]) ?.withIdFromFunc(modifierTypes.MYSTERY_ENCOUNTER_OLD_GATEAU); const modifier = modType?.newModifier(newPokemon); if (modifier) { - await globalScene.addModifier(modifier, false, false, false, true); + globalScene.addModifier(modifier, false, false, false, true); } } @@ -446,13 +497,18 @@ async function doNewTeamPostProcess(transformations: PokemonTransformation[]) { * @param speciesRootForm * @param forBattle Default `false`. If false, will perform achievements and dex unlocks for the player. */ -async function postProcessTransformedPokemon(previousPokemon: PlayerPokemon, newPokemon: PlayerPokemon, speciesRootForm: Species, forBattle: boolean = false): Promise { +async function postProcessTransformedPokemon( + previousPokemon: PlayerPokemon, + newPokemon: PlayerPokemon, + speciesRootForm: Species, + forBattle = false, +): Promise { let isNewStarter = false; // Roll HA a second time if (newPokemon.species.abilityHidden) { const hiddenIndex = newPokemon.species.ability2 ? 2 : 1; if (newPokemon.abilityIndex < hiddenIndex) { - const hiddenAbilityChance = new IntegerHolder(256); + const hiddenAbilityChance = new NumberHolder(256); globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance); const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value); @@ -470,11 +526,17 @@ async function postProcessTransformedPokemon(previousPokemon: PlayerPokemon, new }); // Roll a neutral nature - newPokemon.nature = [ Nature.HARDY, Nature.DOCILE, Nature.BASHFUL, Nature.QUIRKY, Nature.SERIOUS ][randSeedInt(5)]; + newPokemon.nature = [Nature.HARDY, Nature.DOCILE, Nature.BASHFUL, Nature.QUIRKY, Nature.SERIOUS][randSeedInt(5)]; // For pokemon at/below 570 BST or any shiny pokemon, unlock it permanently as if you had caught it - if (!forBattle && (newPokemon.getSpeciesForm().getBaseStatTotal() <= NON_LEGENDARY_BST_THRESHOLD || newPokemon.isShiny())) { - if (newPokemon.getSpeciesForm().abilityHidden && newPokemon.abilityIndex === newPokemon.getSpeciesForm().getAbilityCount() - 1) { + if ( + !forBattle && + (newPokemon.getSpeciesForm().getBaseStatTotal() <= NON_LEGENDARY_BST_THRESHOLD || newPokemon.isShiny()) + ) { + if ( + newPokemon.getSpeciesForm().abilityHidden && + newPokemon.abilityIndex === newPokemon.getSpeciesForm().getAbilityCount() - 1 + ) { globalScene.validateAchv(achvs.HIDDEN_ABILITY); } @@ -494,7 +556,11 @@ async function postProcessTransformedPokemon(previousPokemon: PlayerPokemon, new const newStarterUnlocked = await globalScene.gameData.setPokemonCaught(newPokemon, true, false, false); if (newStarterUnlocked) { isNewStarter = true; - await showEncounterText(i18next.t("battle:addedAsAStarter", { pokemonName: getPokemonSpecies(speciesRootForm).getName() })); + await showEncounterText( + i18next.t("battle:addedAsAStarter", { + pokemonName: getPokemonSpecies(speciesRootForm).getName(), + }), + ); } } @@ -528,10 +594,10 @@ async function postProcessTransformedPokemon(previousPokemon: PlayerPokemon, new // Randomize the second type of the pokemon // If the pokemon does not normally have a second type, it will gain 1 - const newTypes = [ Type.UNKNOWN ]; - let newType = randSeedInt(18) as Type; + const newTypes = [PokemonType.UNKNOWN]; + let newType = randSeedInt(18) as PokemonType; while (newType === newTypes[0]) { - newType = randSeedInt(18) as Type; + newType = randSeedInt(18) as PokemonType; } newTypes.push(newType); if (!newPokemon.customPokemonData) { @@ -568,23 +634,30 @@ function getOldGateauBoostedStats(pokemon: Pokemon): Stat[] { return stats; } - -function getTransformedSpecies(originalBst: number, bstSearchRange: [number, number], hasPokemonBstHigherThan600: boolean, hasPokemonBstBetween570And600: boolean, alreadyUsedSpecies: PokemonSpecies[]): PokemonSpecies { +function getTransformedSpecies( + originalBst: number, + bstSearchRange: [number, number], + hasPokemonBstHigherThan600: boolean, + hasPokemonBstBetween570And600: boolean, + alreadyUsedSpecies: PokemonSpecies[], +): PokemonSpecies { let newSpecies: PokemonSpecies | undefined; while (isNullOrUndefined(newSpecies)) { const bstCap = originalBst + bstSearchRange[1]; const bstMin = Math.max(originalBst + bstSearchRange[0], 0); // Get any/all species that fall within the Bst range requirements - let validSpecies = allSpecies - .filter(s => { - const speciesBst = s.getBaseStatTotal(); - const bstInRange = speciesBst >= bstMin && speciesBst <= bstCap; - // Checks that a Pokemon has not already been added in the +600 or 570-600 slots; - const validBst = (!hasPokemonBstBetween570And600 || (speciesBst < NON_LEGENDARY_BST_THRESHOLD || speciesBst > SUPER_LEGENDARY_BST_THRESHOLD)) && - (!hasPokemonBstHigherThan600 || speciesBst <= SUPER_LEGENDARY_BST_THRESHOLD); - return bstInRange && validBst && !EXCLUDED_TRANSFORMATION_SPECIES.includes(s.speciesId); - }); + let validSpecies = allSpecies.filter(s => { + const speciesBst = s.getBaseStatTotal(); + const bstInRange = speciesBst >= bstMin && speciesBst <= bstCap; + // Checks that a Pokemon has not already been added in the +600 or 570-600 slots; + const validBst = + (!hasPokemonBstBetween570And600 || + speciesBst < NON_LEGENDARY_BST_THRESHOLD || + speciesBst > SUPER_LEGENDARY_BST_THRESHOLD) && + (!hasPokemonBstHigherThan600 || speciesBst <= SUPER_LEGENDARY_BST_THRESHOLD); + return bstInRange && validBst && !EXCLUDED_TRANSFORMATION_SPECIES.includes(s.speciesId); + }); // There must be at least 20 species available before it will choose one if (validSpecies?.length > 20) { @@ -608,7 +681,13 @@ function doShowDreamBackground() { transformationContainer.name = "Dream Background"; // In case it takes a bit for video to load - const transformationStaticBg = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0); + const transformationStaticBg = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6, + 0, + ); transformationStaticBg.setName("Black Background"); transformationStaticBg.setOrigin(0, 0); transformationContainer.add(transformationStaticBg); @@ -631,7 +710,7 @@ function doShowDreamBackground() { targets: transformationContainer, alpha: 1, duration: 3000, - ease: "Sine.easeInOut" + ease: "Sine.easeInOut", }); } @@ -645,7 +724,7 @@ function doHideDreamBackground() { ease: "Sine.easeInOut", onComplete: () => { globalScene.fieldUI.remove(transformationContainer, true); - } + }, }); } @@ -660,16 +739,15 @@ function doSideBySideTransformations(transformations: PokemonTransformation[]) { const pokemon2 = transformation.newPokemon; const screenPosition = i as TransformationScreenPosition; - const transformationPromise = doPokemonTransformationSequence(pokemon1, pokemon2, screenPosition) - .then(() => { - if (transformations.length > i + 3) { - const nextTransformationAtPosition = transformations[i + 3]; - const nextPokemon1 = nextTransformationAtPosition.previousPokemon; - const nextPokemon2 = nextTransformationAtPosition.newPokemon; + const transformationPromise = doPokemonTransformationSequence(pokemon1, pokemon2, screenPosition).then(() => { + if (transformations.length > i + 3) { + const nextTransformationAtPosition = transformations[i + 3]; + const nextPokemon1 = nextTransformationAtPosition.previousPokemon; + const nextPokemon2 = nextTransformationAtPosition.newPokemon; - allTransformationPromises.push(doPokemonTransformationSequence(nextPokemon1, nextPokemon2, screenPosition)); - } - }); + allTransformationPromises.push(doPokemonTransformationSequence(nextPokemon1, nextPokemon2, screenPosition)); + } + }); allTransformationPromises.push(transformationPromise); }); } @@ -691,11 +769,15 @@ function doSideBySideTransformations(transformations: PokemonTransformation[]) { * @param newPokemon * @param speciesRootForm */ -async function addEggMoveToNewPokemonMoveset(newPokemon: PlayerPokemon, speciesRootForm: Species, forBattle: boolean = false): Promise { +async function addEggMoveToNewPokemonMoveset( + newPokemon: PlayerPokemon, + speciesRootForm: Species, + forBattle = false, +): Promise { let eggMoveIndex: null | number = null; const eggMoves = newPokemon.getEggMoves()?.slice(0); if (eggMoves) { - const eggMoveIndices = randSeedShuffle([ 0, 1, 2, 3 ]); + const eggMoveIndices = randSeedShuffle([0, 1, 2, 3]); let randomEggMoveIndex = eggMoveIndices.pop(); let randomEggMove = !isNullOrUndefined(randomEggMoveIndex) ? eggMoves[randomEggMoveIndex] : null; let retries = 0; @@ -717,7 +799,11 @@ async function addEggMoveToNewPokemonMoveset(newPokemon: PlayerPokemon, speciesR } // For pokemon that the player owns (including ones just caught), unlock the egg move - if (!forBattle && !isNullOrUndefined(randomEggMoveIndex) && !!globalScene.gameData.dexData[speciesRootForm].caughtAttr) { + if ( + !forBattle && + !isNullOrUndefined(randomEggMoveIndex) && + !!globalScene.gameData.dexData[speciesRootForm].caughtAttr + ) { await globalScene.gameData.setEggMoveUnlocked(getPokemonSpecies(speciesRootForm), randomEggMoveIndex, true); } } @@ -732,11 +818,18 @@ async function addEggMoveToNewPokemonMoveset(newPokemon: PlayerPokemon, speciesR * @param newPokemonGeneratedMoveset * @param newEggMoveIndex */ -function addFavoredMoveToNewPokemonMoveset(newPokemon: PlayerPokemon, newPokemonGeneratedMoveset: (PokemonMove | null)[], newEggMoveIndex: number | null) { +function addFavoredMoveToNewPokemonMoveset( + newPokemon: PlayerPokemon, + newPokemonGeneratedMoveset: (PokemonMove | null)[], + newEggMoveIndex: number | null, +) { let favoredMove: PokemonMove | null = null; for (const move of newPokemonGeneratedMoveset) { // Needs to match first type, second type will be replaced - if (move?.getMove().type === newPokemon.getTypes()[0] && !newPokemon.moveset.some(m => m?.moveId === move?.moveId)) { + if ( + move?.getMove().type === newPokemon.getTypes()[0] && + !newPokemon.moveset.some(m => m?.moveId === move?.moveId) + ) { favoredMove = move; break; } diff --git a/src/data/mystery-encounters/mystery-encounter-dialogue.ts b/src/data/mystery-encounters/mystery-encounter-dialogue.ts index 39db3d58690..71e1b382f61 100644 --- a/src/data/mystery-encounters/mystery-encounter-dialogue.ts +++ b/src/data/mystery-encounters/mystery-encounter-dialogue.ts @@ -72,4 +72,3 @@ export default class MysteryEncounterDialogue { encounterOptionsDialogue?: EncounterOptionsDialogue; outro?: TextDisplay[]; } - diff --git a/src/data/mystery-encounters/mystery-encounter-option.ts b/src/data/mystery-encounters/mystery-encounter-option.ts index d0078b3686e..f360658c2dc 100644 --- a/src/data/mystery-encounters/mystery-encounter-option.ts +++ b/src/data/mystery-encounters/mystery-encounter-option.ts @@ -3,14 +3,19 @@ import type { Moves } from "#app/enums/moves"; import type { PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; -import type { Type } from "#enums/type"; -import { EncounterPokemonRequirement, EncounterSceneRequirement, MoneyRequirement, TypeRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; +import type { PokemonType } from "#enums/pokemon-type"; +import { + EncounterPokemonRequirement, + EncounterSceneRequirement, + MoneyRequirement, + TypeRequirement, +} from "#app/data/mystery-encounters/mystery-encounter-requirements"; import type { CanLearnMoveRequirementOptions } from "./requirements/can-learn-move-requirement"; import { CanLearnMoveRequirement } from "./requirements/can-learn-move-requirement"; import { isNullOrUndefined, randSeedInt } from "#app/utils"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; - +// biome-ignore lint/suspicious/noConfusingVoidType: void unions in callbacks are OK export type OptionPhaseCallback = () => Promise; /** @@ -71,16 +76,22 @@ export default class MysteryEncounterOption implements IMysteryEncounterOption { * Returns true if option contains any {@linkcode EncounterRequirement}s, false otherwise. */ hasRequirements(): boolean { - return this.requirements.length > 0 || this.primaryPokemonRequirements.length > 0 || this.secondaryPokemonRequirements.length > 0; + return ( + this.requirements.length > 0 || + this.primaryPokemonRequirements.length > 0 || + this.secondaryPokemonRequirements.length > 0 + ); } /** * Returns true if all {@linkcode EncounterRequirement}s for the option are met */ meetsRequirements(): boolean { - return !this.requirements.some(requirement => !requirement.meetsRequirement()) - && this.meetsSupportingRequirementAndSupportingPokemonSelected() - && this.meetsPrimaryRequirementAndPrimaryPokemonSelected(); + return ( + !this.requirements.some(requirement => !requirement.meetsRequirement()) && + this.meetsSupportingRequirementAndSupportingPokemonSelected() && + this.meetsPrimaryRequirementAndPrimaryPokemonSelected() + ); } /** @@ -88,7 +99,13 @@ export default class MysteryEncounterOption implements IMysteryEncounterOption { * @param pokemon */ pokemonMeetsPrimaryRequirements(pokemon: Pokemon): boolean { - return !this.primaryPokemonRequirements.some(req => !req.queryParty(globalScene.getPlayerParty()).map(p => p.id).includes(pokemon.id)); + return !this.primaryPokemonRequirements.some( + req => + !req + .queryParty(globalScene.getPlayerParty()) + .map(p => p.id) + .includes(pokemon.id), + ); } /** @@ -125,27 +142,26 @@ export default class MysteryEncounterOption implements IMysteryEncounterOption { } else { overlap.push(qp); } - } if (truePrimaryPool.length > 0) { // always choose from the non-overlapping pokemon first this.primaryPokemon = truePrimaryPool[randSeedInt(truePrimaryPool.length)]; return true; - } else { - // if there are multiple overlapping pokemon, we're okay - just choose one and take it out of the supporting pokemon pool - if (overlap.length > 1 || (this.secondaryPokemon.length - overlap.length >= 1)) { - this.primaryPokemon = overlap[randSeedInt(overlap.length)]; - this.secondaryPokemon = this.secondaryPokemon.filter((supp) => supp !== this.primaryPokemon); - return true; - } - console.log("Mystery Encounter Edge Case: Requirement not met due to primay pokemon overlapping with support pokemon. There's no valid primary pokemon left."); - return false; } - } else { - // Just pick the first qualifying Pokemon - this.primaryPokemon = qualified[0]; - return true; + // if there are multiple overlapping pokemon, we're okay - just choose one and take it out of the supporting pokemon pool + if (overlap.length > 1 || this.secondaryPokemon.length - overlap.length >= 1) { + this.primaryPokemon = overlap[randSeedInt(overlap.length)]; + this.secondaryPokemon = this.secondaryPokemon.filter(supp => supp !== this.primaryPokemon); + return true; + } + console.log( + "Mystery Encounter Edge Case: Requirement not met due to primay pokemon overlapping with support pokemon. There's no valid primary pokemon left.", + ); + return false; } + // Just pick the first qualifying Pokemon + this.primaryPokemon = qualified[0]; + return true; } /** @@ -180,12 +196,14 @@ export class MysteryEncounterOptionBuilder implements Partial { + static newOptionWithMode( + optionMode: MysteryEncounterOptionMode, + ): MysteryEncounterOptionBuilder & Pick { return Object.assign(new MysteryEncounterOptionBuilder(), { optionMode }); } @@ -197,7 +215,9 @@ export class MysteryEncounterOptionBuilder implements Partial> { + withSceneRequirement( + requirement: EncounterSceneRequirement, + ): this & Required> { if (requirement instanceof EncounterPokemonRequirement) { Error("Incorrectly added pokemon requirement as scene requirement."); } @@ -216,7 +236,9 @@ export class MysteryEncounterOptionBuilder implements Partial> { + withPreOptionPhase( + onPreOptionPhase: OptionPhaseCallback, + ): this & Required> { return Object.assign(this, { onPreOptionPhase: onPreOptionPhase }); } @@ -228,7 +250,9 @@ export class MysteryEncounterOptionBuilder implements Partial> { + withPostOptionPhase( + onPostOptionPhase: OptionPhaseCallback, + ): this & Required> { return Object.assign(this, { onPostOptionPhase: onPostOptionPhase }); } @@ -236,13 +260,17 @@ export class MysteryEncounterOptionBuilder implements Partial> { + withPrimaryPokemonRequirement( + requirement: EncounterPokemonRequirement, + ): this & Required> { if (requirement instanceof EncounterSceneRequirement) { Error("Incorrectly added scene requirement as pokemon requirement."); } this.primaryPokemonRequirements.push(requirement); - return Object.assign(this, { primaryPokemonRequirements: this.primaryPokemonRequirements }); + return Object.assign(this, { + primaryPokemonRequirements: this.primaryPokemonRequirements, + }); } /** @@ -254,8 +282,15 @@ export class MysteryEncounterOptionBuilder implements Partial> { + withSecondaryPokemonRequirement( + requirement: EncounterPokemonRequirement, + excludePrimaryFromSecondaryRequirements = true, + ): this & Required> { if (requirement instanceof EncounterSceneRequirement) { Error("Incorrectly added scene requirement as pokemon requirement."); } this.secondaryPokemonRequirements.push(requirement); this.excludePrimaryFromSecondaryRequirements = excludePrimaryFromSecondaryRequirements; - return Object.assign(this, { secondaryPokemonRequirements: this.secondaryPokemonRequirements }); + return Object.assign(this, { + secondaryPokemonRequirements: this.secondaryPokemonRequirements, + }); } /** diff --git a/src/data/mystery-encounters/mystery-encounter-requirements.ts b/src/data/mystery-encounters/mystery-encounter-requirements.ts index 63fb0cc5380..e9398547740 100644 --- a/src/data/mystery-encounters/mystery-encounter-requirements.ts +++ b/src/data/mystery-encounters/mystery-encounter-requirements.ts @@ -4,7 +4,7 @@ import { EvolutionItem, pokemonEvolutions } from "#app/data/balance/pokemon-evol import { Nature } from "#enums/nature"; import { FormChangeItem, pokemonFormChanges, SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms"; import { StatusEffect } from "#enums/status-effect"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { WeatherType } from "#enums/weather-type"; import type { PlayerPokemon } from "#app/field/pokemon"; import { AttackTypeBoosterModifier } from "#app/modifier/modifier"; @@ -76,15 +76,14 @@ export class CombinationSceneRequirement extends EncounterSceneRequirement { override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { if (this.isAnd) { throw new Error("Not implemented (Sorry)"); - } else { - for (const req of this.requirements) { - if (req.meetsRequirement()) { - return req.getDialogueToken(pokemon); - } - } - - return this.requirements[0].getDialogueToken(pokemon); } + for (const req of this.requirements) { + if (req.meetsRequirement()) { + return req.getDialogueToken(pokemon); + } + } + + return this.requirements[0].getDialogueToken(pokemon); } } @@ -153,10 +152,9 @@ export class CombinationPokemonRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (this.isAnd) { return this.requirements.reduce((relevantPokemon, req) => req.queryParty(relevantPokemon), partyPokemon); - } else { - const matchingRequirement = this.requirements.find(req => req.queryParty(partyPokemon).length > 0); - return matchingRequirement ? matchingRequirement.queryParty(partyPokemon) : []; } + const matchingRequirement = this.requirements.find(req => req.queryParty(partyPokemon).length > 0); + return matchingRequirement ? matchingRequirement.queryParty(partyPokemon) : []; } /** @@ -168,15 +166,14 @@ export class CombinationPokemonRequirement extends EncounterPokemonRequirement { override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { if (this.isAnd) { throw new Error("Not implemented (Sorry)"); - } else { - for (const req of this.requirements) { - if (req.meetsRequirement()) { - return req.getDialogueToken(pokemon); - } - } - - return this.requirements[0].getDialogueToken(pokemon); } + for (const req of this.requirements) { + if (req.meetsRequirement()) { + return req.getDialogueToken(pokemon); + } + } + + return this.requirements[0].getDialogueToken(pokemon); } } @@ -193,11 +190,18 @@ export class PreviousEncounterRequirement extends EncounterSceneRequirement { } override meetsRequirement(): boolean { - return globalScene.mysteryEncounterSaveData.encounteredEvents.some(e => e.type === this.previousEncounterRequirement); + return globalScene.mysteryEncounterSaveData.encounteredEvents.some( + e => e.type === this.previousEncounterRequirement, + ); } - override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - return [ "previousEncounter", globalScene.mysteryEncounterSaveData.encounteredEvents.find(e => e.type === this.previousEncounterRequirement)?.[0].toString() ?? "" ]; + override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] { + return [ + "previousEncounter", + globalScene.mysteryEncounterSaveData.encounteredEvents + .find(e => e.type === this.previousEncounterRequirement)?.[0] + .toString() ?? "", + ]; } } @@ -217,15 +221,18 @@ export class WaveRangeRequirement extends EncounterSceneRequirement { override meetsRequirement(): boolean { if (!isNullOrUndefined(this.waveRange) && this.waveRange[0] <= this.waveRange[1]) { const waveIndex = globalScene.currentBattle.waveIndex; - if (waveIndex >= 0 && (this.waveRange[0] >= 0 && this.waveRange[0] > waveIndex) || (this.waveRange[1] >= 0 && this.waveRange[1] < waveIndex)) { + if ( + (waveIndex >= 0 && this.waveRange[0] >= 0 && this.waveRange[0] > waveIndex) || + (this.waveRange[1] >= 0 && this.waveRange[1] < waveIndex) + ) { return false; } } return true; } - override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - return [ "waveIndex", globalScene.currentBattle.waveIndex.toString() ]; + override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] { + return ["waveIndex", globalScene.currentBattle.waveIndex.toString()]; } } @@ -253,8 +260,8 @@ export class WaveModulusRequirement extends EncounterSceneRequirement { return this.waveModuli.includes(globalScene.currentBattle.waveIndex % this.modulusValue); } - override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - return [ "waveIndex", globalScene.currentBattle.waveIndex.toString() ]; + override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] { + return ["waveIndex", globalScene.currentBattle.waveIndex.toString()]; } } @@ -263,20 +270,24 @@ export class TimeOfDayRequirement extends EncounterSceneRequirement { constructor(timeOfDay: TimeOfDay | TimeOfDay[]) { super(); - this.requiredTimeOfDay = Array.isArray(timeOfDay) ? timeOfDay : [ timeOfDay ]; + this.requiredTimeOfDay = Array.isArray(timeOfDay) ? timeOfDay : [timeOfDay]; } override meetsRequirement(): boolean { const timeOfDay = globalScene.arena?.getTimeOfDay(); - if (!isNullOrUndefined(timeOfDay) && this.requiredTimeOfDay?.length > 0 && !this.requiredTimeOfDay.includes(timeOfDay)) { + if ( + !isNullOrUndefined(timeOfDay) && + this.requiredTimeOfDay?.length > 0 && + !this.requiredTimeOfDay.includes(timeOfDay) + ) { return false; } return true; } - override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - return [ "timeOfDay", TimeOfDay[globalScene.arena.getTimeOfDay()].toLocaleLowerCase() ]; + override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] { + return ["timeOfDay", TimeOfDay[globalScene.arena.getTimeOfDay()].toLocaleLowerCase()]; } } @@ -285,25 +296,29 @@ export class WeatherRequirement extends EncounterSceneRequirement { constructor(weather: WeatherType | WeatherType[]) { super(); - this.requiredWeather = Array.isArray(weather) ? weather : [ weather ]; + this.requiredWeather = Array.isArray(weather) ? weather : [weather]; } override meetsRequirement(): boolean { const currentWeather = globalScene.arena.weather?.weatherType; - if (!isNullOrUndefined(currentWeather) && this.requiredWeather?.length > 0 && !this.requiredWeather.includes(currentWeather!)) { + if ( + !isNullOrUndefined(currentWeather) && + this.requiredWeather?.length > 0 && + !this.requiredWeather.includes(currentWeather!) + ) { return false; } return true; } - override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { + override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] { const currentWeather = globalScene.arena.weather?.weatherType; let token = ""; if (!isNullOrUndefined(currentWeather)) { token = WeatherType[currentWeather].replace("_", " ").toLocaleLowerCase(); } - return [ "weather", token ]; + return ["weather", token]; } } @@ -325,8 +340,13 @@ export class PartySizeRequirement extends EncounterSceneRequirement { override meetsRequirement(): boolean { if (!isNullOrUndefined(this.partySizeRange) && this.partySizeRange[0] <= this.partySizeRange[1]) { - const partySize = this.excludeDisallowedPokemon ? globalScene.getPokemonAllowedInBattle().length : globalScene.getPlayerParty().length; - if (partySize >= 0 && (this.partySizeRange[0] >= 0 && this.partySizeRange[0] > partySize) || (this.partySizeRange[1] >= 0 && this.partySizeRange[1] < partySize)) { + const partySize = this.excludeDisallowedPokemon + ? globalScene.getPokemonAllowedInBattle().length + : globalScene.getPlayerParty().length; + if ( + (partySize >= 0 && this.partySizeRange[0] >= 0 && this.partySizeRange[0] > partySize) || + (this.partySizeRange[1] >= 0 && this.partySizeRange[1] < partySize) + ) { return false; } } @@ -334,8 +354,8 @@ export class PartySizeRequirement extends EncounterSceneRequirement { return true; } - override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - return [ "partySize", globalScene.getPlayerParty().length.toString() ]; + override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] { + return ["partySize", globalScene.getPlayerParty().length.toString()]; } } @@ -343,10 +363,10 @@ export class PersistentModifierRequirement extends EncounterSceneRequirement { requiredHeldItemModifiers: string[]; minNumberOfItems: number; - constructor(heldItem: string | string[], minNumberOfItems: number = 1) { + constructor(heldItem: string | string[], minNumberOfItems = 1) { super(); this.minNumberOfItems = minNumberOfItems; - this.requiredHeldItemModifiers = Array.isArray(heldItem) ? heldItem : [ heldItem ]; + this.requiredHeldItemModifiers = Array.isArray(heldItem) ? heldItem : [heldItem]; } override meetsRequirement(): boolean { @@ -355,20 +375,20 @@ export class PersistentModifierRequirement extends EncounterSceneRequirement { return false; } let modifierCount = 0; - this.requiredHeldItemModifiers.forEach(modifier => { + for (const modifier of this.requiredHeldItemModifiers) { const matchingMods = globalScene.findModifiers(m => m.constructor.name === modifier); if (matchingMods?.length > 0) { - matchingMods.forEach(matchingMod => { + for (const matchingMod of matchingMods) { modifierCount += matchingMod.stackCount; - }); + } } - }); + } return modifierCount >= this.minNumberOfItems; } - override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - return [ "requiredItem", this.requiredHeldItemModifiers[0] ]; + override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] { + return ["requiredItem", this.requiredHeldItemModifiers[0]]; } } @@ -394,9 +414,12 @@ export class MoneyRequirement extends EncounterSceneRequirement { return !(this.requiredMoney > 0 && this.requiredMoney > money); } - override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - const value = this.scalingMultiplier > 0 ? globalScene.getWaveMoneyAmount(this.scalingMultiplier).toString() : this.requiredMoney.toString(); - return [ "money", value ]; + override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] { + const value = + this.scalingMultiplier > 0 + ? globalScene.getWaveMoneyAmount(this.scalingMultiplier).toString() + : this.requiredMoney.toString(); + return ["money", value]; } } @@ -405,11 +428,11 @@ export class SpeciesRequirement extends EncounterPokemonRequirement { minNumberOfPokemon: number; invertQuery: boolean; - constructor(species: Species | Species[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(species: Species | Species[], minNumberOfPokemon = 1, invertQuery = false) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredSpecies = Array.isArray(species) ? species : [ species ]; + this.requiredSpecies = Array.isArray(species) ? species : [species]; } override meetsRequirement(): boolean { @@ -422,32 +445,34 @@ export class SpeciesRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => this.requiredSpecies.filter((species) => pokemon.species.speciesId === species).length > 0); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed speciess - return partyPokemon.filter((pokemon) => this.requiredSpecies.filter((species) => pokemon.species.speciesId === species).length === 0); + return partyPokemon.filter( + pokemon => this.requiredSpecies.filter(species => pokemon.species.speciesId === species).length > 0, + ); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed speciess + return partyPokemon.filter( + pokemon => this.requiredSpecies.filter(species => pokemon.species.speciesId === species).length === 0, + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { if (pokemon?.species.speciesId && this.requiredSpecies.includes(pokemon.species.speciesId)) { - return [ "species", Species[pokemon.species.speciesId] ]; + return ["species", Species[pokemon.species.speciesId]]; } - return [ "species", "" ]; + return ["species", ""]; } } - export class NatureRequirement extends EncounterPokemonRequirement { requiredNature: Nature[]; minNumberOfPokemon: number; invertQuery: boolean; - constructor(nature: Nature | Nature[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(nature: Nature | Nature[], minNumberOfPokemon = 1, invertQuery = false) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredNature = Array.isArray(nature) ? nature : [ nature ]; + this.requiredNature = Array.isArray(nature) ? nature : [nature]; } override meetsRequirement(): boolean { @@ -460,33 +485,32 @@ export class NatureRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => this.requiredNature.filter((nature) => pokemon.nature === nature).length > 0); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed natures - return partyPokemon.filter((pokemon) => this.requiredNature.filter((nature) => pokemon.nature === nature).length === 0); + return partyPokemon.filter(pokemon => this.requiredNature.filter(nature => pokemon.nature === nature).length > 0); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed natures + return partyPokemon.filter(pokemon => this.requiredNature.filter(nature => pokemon.nature === nature).length === 0); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { if (!isNullOrUndefined(pokemon?.nature) && this.requiredNature.includes(pokemon.nature)) { - return [ "nature", Nature[pokemon.nature] ]; + return ["nature", Nature[pokemon.nature]]; } - return [ "nature", "" ]; + return ["nature", ""]; } } export class TypeRequirement extends EncounterPokemonRequirement { - requiredType: Type[]; + requiredType: PokemonType[]; excludeFainted: boolean; minNumberOfPokemon: number; invertQuery: boolean; - constructor(type: Type | Type[], excludeFainted: boolean = true, minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(type: PokemonType | PokemonType[], excludeFainted = true, minNumberOfPokemon = 1, invertQuery = false) { super(); this.excludeFainted = excludeFainted; this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredType = Array.isArray(type) ? type : [ type ]; + this.requiredType = Array.isArray(type) ? type : [type]; } override meetsRequirement(): boolean { @@ -497,7 +521,7 @@ export class TypeRequirement extends EncounterPokemonRequirement { } if (this.excludeFainted) { - partyPokemon = partyPokemon.filter((pokemon) => !pokemon.isFainted()); + partyPokemon = partyPokemon.filter(pokemon => !pokemon.isFainted()); } return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon; @@ -505,35 +529,37 @@ export class TypeRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => this.requiredType.filter((type) => pokemon.getTypes().includes(type)).length > 0); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed types - return partyPokemon.filter((pokemon) => this.requiredType.filter((type) => pokemon.getTypes().includes(type)).length === 0); + return partyPokemon.filter( + pokemon => this.requiredType.filter(type => pokemon.getTypes().includes(type)).length > 0, + ); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed types + return partyPokemon.filter( + pokemon => this.requiredType.filter(type => pokemon.getTypes().includes(type)).length === 0, + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - const includedTypes = this.requiredType.filter((ty) => pokemon?.getTypes().includes(ty)); + const includedTypes = this.requiredType.filter(ty => pokemon?.getTypes().includes(ty)); if (includedTypes.length > 0) { - return [ "type", Type[includedTypes[0]] ]; + return ["type", PokemonType[includedTypes[0]]]; } - return [ "type", "" ]; + return ["type", ""]; } } - export class MoveRequirement extends EncounterPokemonRequirement { requiredMoves: Moves[] = []; minNumberOfPokemon: number; invertQuery: boolean; excludeDisallowedPokemon: boolean; - constructor(moves: Moves | Moves[], excludeDisallowedPokemon: boolean, minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(moves: Moves | Moves[], excludeDisallowedPokemon: boolean, minNumberOfPokemon = 1, invertQuery = false) { super(); this.excludeDisallowedPokemon = excludeDisallowedPokemon; this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredMoves = Array.isArray(moves) ? moves : [ moves ]; + this.requiredMoves = Array.isArray(moves) ? moves : [moves]; } override meetsRequirement(): boolean { @@ -547,25 +573,27 @@ export class MoveRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { // get the Pokemon with at least one move in the required moves list - return partyPokemon.filter((pokemon) => - (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) - && pokemon.moveset.some((move) => move?.moveId && this.requiredMoves.includes(move.moveId))); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed moves - return partyPokemon.filter((pokemon) => - (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) - && !pokemon.moveset.some((move) => move?.moveId && this.requiredMoves.includes(move.moveId))); + return partyPokemon.filter( + pokemon => + (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) && + pokemon.moveset.some(move => move?.moveId && this.requiredMoves.includes(move.moveId)), + ); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed moves + return partyPokemon.filter( + pokemon => + (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) && + !pokemon.moveset.some(move => move?.moveId && this.requiredMoves.includes(move.moveId)), + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - const includedMoves = pokemon?.moveset.filter((move) => move?.moveId && this.requiredMoves.includes(move.moveId)); + const includedMoves = pokemon?.moveset.filter(move => move?.moveId && this.requiredMoves.includes(move.moveId)); if (includedMoves && includedMoves.length > 0 && includedMoves[0]) { - return [ "move", includedMoves[0].getName() ]; + return ["move", includedMoves[0].getName()]; } - return [ "move", "" ]; + return ["move", ""]; } - } /** @@ -578,11 +606,11 @@ export class CompatibleMoveRequirement extends EncounterPokemonRequirement { minNumberOfPokemon: number; invertQuery: boolean; - constructor(learnableMove: Moves | Moves[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(learnableMove: Moves | Moves[], minNumberOfPokemon = 1, invertQuery = false) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredMoves = Array.isArray(learnableMove) ? learnableMove : [ learnableMove ]; + this.requiredMoves = Array.isArray(learnableMove) ? learnableMove : [learnableMove]; } override meetsRequirement(): boolean { @@ -595,21 +623,31 @@ export class CompatibleMoveRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => this.requiredMoves.filter((learnableMove) => pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m?.moveId === tm)).includes(learnableMove)).length > 0); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed learnableMoves - return partyPokemon.filter((pokemon) => this.requiredMoves.filter((learnableMove) => pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m?.moveId === tm)).includes(learnableMove)).length === 0); + return partyPokemon.filter( + pokemon => + this.requiredMoves.filter(learnableMove => + pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m?.moveId === tm)).includes(learnableMove), + ).length > 0, + ); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed learnableMoves + return partyPokemon.filter( + pokemon => + this.requiredMoves.filter(learnableMove => + pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m?.moveId === tm)).includes(learnableMove), + ).length === 0, + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - const includedCompatMoves = this.requiredMoves.filter((reqMove) => pokemon?.compatibleTms.filter((tm) => !pokemon.moveset.find(m => m?.moveId === tm)).includes(reqMove)); + const includedCompatMoves = this.requiredMoves.filter(reqMove => + pokemon?.compatibleTms.filter(tm => !pokemon.moveset.find(m => m?.moveId === tm)).includes(reqMove), + ); if (includedCompatMoves.length > 0) { - return [ "compatibleMove", Moves[includedCompatMoves[0]] ]; + return ["compatibleMove", Moves[includedCompatMoves[0]]]; } - return [ "compatibleMove", "" ]; + return ["compatibleMove", ""]; } - } export class AbilityRequirement extends EncounterPokemonRequirement { @@ -618,12 +656,17 @@ export class AbilityRequirement extends EncounterPokemonRequirement { invertQuery: boolean; excludeDisallowedPokemon: boolean; - constructor(abilities: Abilities | Abilities[], excludeDisallowedPokemon: boolean, minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor( + abilities: Abilities | Abilities[], + excludeDisallowedPokemon: boolean, + minNumberOfPokemon = 1, + invertQuery = false, + ) { super(); this.excludeDisallowedPokemon = excludeDisallowedPokemon; this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredAbilities = Array.isArray(abilities) ? abilities : [ abilities ]; + this.requiredAbilities = Array.isArray(abilities) ? abilities : [abilities]; } override meetsRequirement(): boolean { @@ -636,23 +679,26 @@ export class AbilityRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => - (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) - && this.requiredAbilities.some((ability) => pokemon.hasAbility(ability, false))); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed abilities - return partyPokemon.filter((pokemon) => - (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) - && this.requiredAbilities.filter((ability) => pokemon.hasAbility(ability, false)).length === 0); + return partyPokemon.filter( + pokemon => + (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) && + this.requiredAbilities.some(ability => pokemon.hasAbility(ability, false)), + ); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed abilities + return partyPokemon.filter( + pokemon => + (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) && + this.requiredAbilities.filter(ability => pokemon.hasAbility(ability, false)).length === 0, + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { const matchingAbility = this.requiredAbilities.find(a => pokemon?.hasAbility(a, false)); if (!isNullOrUndefined(matchingAbility)) { - return [ "ability", allAbilities[matchingAbility].name ]; + return ["ability", allAbilities[matchingAbility].name]; } - return [ "ability", "" ]; + return ["ability", ""]; } } @@ -661,11 +707,11 @@ export class StatusEffectRequirement extends EncounterPokemonRequirement { minNumberOfPokemon: number; invertQuery: boolean; - constructor(statusEffect: StatusEffect | StatusEffect[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(statusEffect: StatusEffect | StatusEffect[], minNumberOfPokemon = 1, invertQuery = false) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredStatusEffect = Array.isArray(statusEffect) ? statusEffect : [ statusEffect ]; + this.requiredStatusEffect = Array.isArray(statusEffect) ? statusEffect : [statusEffect]; } override meetsRequirement(): boolean { @@ -680,44 +726,50 @@ export class StatusEffectRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => { - return this.requiredStatusEffect.some((statusEffect) => { + return partyPokemon.filter(pokemon => { + return this.requiredStatusEffect.some(statusEffect => { if (statusEffect === StatusEffect.NONE) { // StatusEffect.NONE also checks for null or undefined status - return isNullOrUndefined(pokemon.status) || isNullOrUndefined(pokemon.status.effect) || pokemon.status.effect === statusEffect; - } else { - return pokemon.status?.effect === statusEffect; - } - }); - }); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed StatusEffects - return partyPokemon.filter((pokemon) => { - return !this.requiredStatusEffect.some((statusEffect) => { - if (statusEffect === StatusEffect.NONE) { - // StatusEffect.NONE also checks for null or undefined status - return isNullOrUndefined(pokemon.status) || isNullOrUndefined(pokemon.status.effect) || pokemon.status.effect === statusEffect; - } else { - return pokemon.status?.effect === statusEffect; + return ( + isNullOrUndefined(pokemon.status) || + isNullOrUndefined(pokemon.status.effect) || + pokemon.status.effect === statusEffect + ); } + return pokemon.status?.effect === statusEffect; }); }); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed StatusEffects + return partyPokemon.filter(pokemon => { + return !this.requiredStatusEffect.some(statusEffect => { + if (statusEffect === StatusEffect.NONE) { + // StatusEffect.NONE also checks for null or undefined status + return ( + isNullOrUndefined(pokemon.status) || + isNullOrUndefined(pokemon.status.effect) || + pokemon.status.effect === statusEffect + ); + } + return pokemon.status?.effect === statusEffect; + }); + }); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - const reqStatus = this.requiredStatusEffect.filter((a) => { + const reqStatus = this.requiredStatusEffect.filter(a => { if (a === StatusEffect.NONE) { - return isNullOrUndefined(pokemon?.status) || isNullOrUndefined(pokemon.status.effect) || pokemon.status.effect === a; + return ( + isNullOrUndefined(pokemon?.status) || isNullOrUndefined(pokemon.status.effect) || pokemon.status.effect === a + ); } return pokemon!.status?.effect === a; }); if (reqStatus.length > 0) { - return [ "status", StatusEffect[reqStatus[0]] ]; + return ["status", StatusEffect[reqStatus[0]]]; } - return [ "status", "" ]; + return ["status", ""]; } - } /** @@ -730,11 +782,11 @@ export class CanFormChangeWithItemRequirement extends EncounterPokemonRequiremen minNumberOfPokemon: number; invertQuery: boolean; - constructor(formChangeItem: FormChangeItem | FormChangeItem[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(formChangeItem: FormChangeItem | FormChangeItem[], minNumberOfPokemon = 1, invertQuery = false) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredFormChangeItem = Array.isArray(formChangeItem) ? formChangeItem : [ formChangeItem ]; + this.requiredFormChangeItem = Array.isArray(formChangeItem) ? formChangeItem : [formChangeItem]; } override meetsRequirement(): boolean { @@ -746,35 +798,44 @@ export class CanFormChangeWithItemRequirement extends EncounterPokemonRequiremen } filterByForm(pokemon, formChangeItem) { - if (pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId) + if ( + pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId) && // Get all form changes for this species with an item trigger, including any compound triggers - && pokemonFormChanges[pokemon.species.speciesId].filter(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger)) + pokemonFormChanges[pokemon.species.speciesId] + .filter(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger)) // Returns true if any form changes match this item - .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger) - .flat().flatMap(fc => fc.item).includes(formChangeItem)) { + .flatMap(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger) + .flatMap(fc => fc.item) + .includes(formChangeItem) + ) { return true; - } else { - return false; } + return false; } override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => this.requiredFormChangeItem.filter((formChangeItem) => this.filterByForm(pokemon, formChangeItem)).length > 0); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed formChangeItems - return partyPokemon.filter((pokemon) => this.requiredFormChangeItem.filter((formChangeItem) => this.filterByForm(pokemon, formChangeItem)).length === 0); + return partyPokemon.filter( + pokemon => + this.requiredFormChangeItem.filter(formChangeItem => this.filterByForm(pokemon, formChangeItem)).length > 0, + ); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed formChangeItems + return partyPokemon.filter( + pokemon => + this.requiredFormChangeItem.filter(formChangeItem => this.filterByForm(pokemon, formChangeItem)).length === 0, + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - const requiredItems = this.requiredFormChangeItem.filter((formChangeItem) => this.filterByForm(pokemon, formChangeItem)); + const requiredItems = this.requiredFormChangeItem.filter(formChangeItem => + this.filterByForm(pokemon, formChangeItem), + ); if (requiredItems.length > 0) { - return [ "formChangeItem", FormChangeItem[requiredItems[0]] ]; + return ["formChangeItem", FormChangeItem[requiredItems[0]]]; } - return [ "formChangeItem", "" ]; + return ["formChangeItem", ""]; } - } export class CanEvolveWithItemRequirement extends EncounterPokemonRequirement { @@ -782,11 +843,11 @@ export class CanEvolveWithItemRequirement extends EncounterPokemonRequirement { minNumberOfPokemon: number; invertQuery: boolean; - constructor(evolutionItems: EvolutionItem | EvolutionItem[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(evolutionItems: EvolutionItem | EvolutionItem[], minNumberOfPokemon = 1, invertQuery = false) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredEvolutionItem = Array.isArray(evolutionItems) ? evolutionItems : [ evolutionItems ]; + this.requiredEvolutionItem = Array.isArray(evolutionItems) ? evolutionItems : [evolutionItems]; } override meetsRequirement(): boolean { @@ -798,11 +859,23 @@ export class CanEvolveWithItemRequirement extends EncounterPokemonRequirement { } filterByEvo(pokemon, evolutionItem) { - if (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && pokemonEvolutions[pokemon.species.speciesId].filter(e => e.item === evolutionItem - && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX)) { + if ( + pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && + pokemonEvolutions[pokemon.species.speciesId].filter( + e => e.item === evolutionItem && (!e.condition || e.condition.predicate(pokemon)), + ).length && + pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX + ) { return true; - } else if (pokemon.isFusion() && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => e.item === evolutionItem - && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX)) { + } + if ( + pokemon.isFusion() && + pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && + pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter( + e => e.item === evolutionItem && (!e.condition || e.condition.predicate(pokemon)), + ).length && + pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX + ) { return true; } return false; @@ -810,19 +883,24 @@ export class CanEvolveWithItemRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => this.requiredEvolutionItem.filter((evolutionItem) => this.filterByEvo(pokemon, evolutionItem)).length > 0); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed evolutionItemss - return partyPokemon.filter((pokemon) => this.requiredEvolutionItem.filter((evolutionItems) => this.filterByEvo(pokemon, evolutionItems)).length === 0); + return partyPokemon.filter( + pokemon => + this.requiredEvolutionItem.filter(evolutionItem => this.filterByEvo(pokemon, evolutionItem)).length > 0, + ); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed evolutionItemss + return partyPokemon.filter( + pokemon => + this.requiredEvolutionItem.filter(evolutionItems => this.filterByEvo(pokemon, evolutionItems)).length === 0, + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - const requiredItems = this.requiredEvolutionItem.filter((evoItem) => this.filterByEvo(pokemon, evoItem)); + const requiredItems = this.requiredEvolutionItem.filter(evoItem => this.filterByEvo(pokemon, evoItem)); if (requiredItems.length > 0) { - return [ "evolutionItem", EvolutionItem[requiredItems[0]] ]; + return ["evolutionItem", EvolutionItem[requiredItems[0]]]; } - return [ "evolutionItem", "" ]; + return ["evolutionItem", ""]; } } @@ -832,11 +910,11 @@ export class HeldItemRequirement extends EncounterPokemonRequirement { invertQuery: boolean; requireTransferable: boolean; - constructor(heldItem: string | string[], minNumberOfPokemon: number = 1, invertQuery: boolean = false, requireTransferable: boolean = true) { + constructor(heldItem: string | string[], minNumberOfPokemon = 1, invertQuery = false, requireTransferable = true) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredHeldItemModifiers = Array.isArray(heldItem) ? heldItem : [ heldItem ]; + this.requiredHeldItemModifiers = Array.isArray(heldItem) ? heldItem : [heldItem]; this.requireTransferable = requireTransferable; } @@ -850,44 +928,57 @@ export class HeldItemRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => this.requiredHeldItemModifiers.some((heldItem) => { - return pokemon.getHeldItems().some((it) => { - return it.constructor.name === heldItem && (!this.requireTransferable || it.isTransferable); - }); - })); - } else { - // for an inverted query, we only want to get the pokemon that have any held items that are NOT in requiredHeldItemModifiers - // E.g. functions as a blacklist - return partyPokemon.filter((pokemon) => pokemon.getHeldItems().filter((it) => { - return !this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem) - && (!this.requireTransferable || it.isTransferable); - }).length > 0); + return partyPokemon.filter(pokemon => + this.requiredHeldItemModifiers.some(heldItem => { + return pokemon.getHeldItems().some(it => { + return it.constructor.name === heldItem && (!this.requireTransferable || it.isTransferable); + }); + }), + ); } + // for an inverted query, we only want to get the pokemon that have any held items that are NOT in requiredHeldItemModifiers + // E.g. functions as a blacklist + return partyPokemon.filter( + pokemon => + pokemon.getHeldItems().filter(it => { + return ( + !this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem) && + (!this.requireTransferable || it.isTransferable) + ); + }).length > 0, + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - const requiredItems = pokemon?.getHeldItems().filter((it) => { - return this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem) - && (!this.requireTransferable || it.isTransferable); + const requiredItems = pokemon?.getHeldItems().filter(it => { + return ( + this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem) && + (!this.requireTransferable || it.isTransferable) + ); }); if (requiredItems && requiredItems.length > 0) { - return [ "heldItem", requiredItems[0].type.name ]; + return ["heldItem", requiredItems[0].type.name]; } - return [ "heldItem", "" ]; + return ["heldItem", ""]; } } export class AttackTypeBoosterHeldItemTypeRequirement extends EncounterPokemonRequirement { - requiredHeldItemTypes: Type[]; + requiredHeldItemTypes: PokemonType[]; minNumberOfPokemon: number; invertQuery: boolean; requireTransferable: boolean; - constructor(heldItemTypes: Type | Type[], minNumberOfPokemon: number = 1, invertQuery: boolean = false, requireTransferable: boolean = true) { + constructor( + heldItemTypes: PokemonType | PokemonType[], + minNumberOfPokemon = 1, + invertQuery = false, + requireTransferable = true, + ) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; - this.requiredHeldItemTypes = Array.isArray(heldItemTypes) ? heldItemTypes : [ heldItemTypes ]; + this.requiredHeldItemTypes = Array.isArray(heldItemTypes) ? heldItemTypes : [heldItemTypes]; this.requireTransferable = requireTransferable; } @@ -901,36 +992,48 @@ export class AttackTypeBoosterHeldItemTypeRequirement extends EncounterPokemonRe override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => this.requiredHeldItemTypes.some((heldItemType) => { - return pokemon.getHeldItems().some((it) => { - return it instanceof AttackTypeBoosterModifier - && (it.type as AttackTypeBoosterModifierType).moveType === heldItemType - && (!this.requireTransferable || it.isTransferable); - }); - })); - } else { - // for an inverted query, we only want to get the pokemon that have any held items that are NOT in requiredHeldItemModifiers - // E.g. functions as a blacklist - return partyPokemon.filter((pokemon) => pokemon.getHeldItems().filter((it) => { - return !this.requiredHeldItemTypes.some(heldItemType => - it instanceof AttackTypeBoosterModifier - && (it.type as AttackTypeBoosterModifierType).moveType === heldItemType - && (!this.requireTransferable || it.isTransferable)); - }).length > 0); + return partyPokemon.filter(pokemon => + this.requiredHeldItemTypes.some(heldItemType => { + return pokemon.getHeldItems().some(it => { + return ( + it instanceof AttackTypeBoosterModifier && + (it.type as AttackTypeBoosterModifierType).moveType === heldItemType && + (!this.requireTransferable || it.isTransferable) + ); + }); + }), + ); } + // for an inverted query, we only want to get the pokemon that have any held items that are NOT in requiredHeldItemModifiers + // E.g. functions as a blacklist + return partyPokemon.filter( + pokemon => + pokemon.getHeldItems().filter(it => { + return !this.requiredHeldItemTypes.some( + heldItemType => + it instanceof AttackTypeBoosterModifier && + (it.type as AttackTypeBoosterModifierType).moveType === heldItemType && + (!this.requireTransferable || it.isTransferable), + ); + }).length > 0, + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - const requiredItems = pokemon?.getHeldItems().filter((it) => { - return this.requiredHeldItemTypes.some(heldItemType => - it instanceof AttackTypeBoosterModifier - && (it.type as AttackTypeBoosterModifierType).moveType === heldItemType) - && (!this.requireTransferable || it.isTransferable); + const requiredItems = pokemon?.getHeldItems().filter(it => { + return ( + this.requiredHeldItemTypes.some( + heldItemType => + it instanceof AttackTypeBoosterModifier && + (it.type as AttackTypeBoosterModifierType).moveType === heldItemType, + ) && + (!this.requireTransferable || it.isTransferable) + ); }); if (requiredItems && requiredItems.length > 0) { - return [ "heldItem", requiredItems[0].type.name ]; + return ["heldItem", requiredItems[0].type.name]; } - return [ "heldItem", "" ]; + return ["heldItem", ""]; } } @@ -939,7 +1042,7 @@ export class LevelRequirement extends EncounterPokemonRequirement { minNumberOfPokemon: number; invertQuery: boolean; - constructor(requiredLevelRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(requiredLevelRange: [number, number], minNumberOfPokemon = 1, invertQuery = false) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; @@ -960,15 +1063,18 @@ export class LevelRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => pokemon.level >= this.requiredLevelRange[0] && pokemon.level <= this.requiredLevelRange[1]); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredLevelRanges - return partyPokemon.filter((pokemon) => pokemon.level < this.requiredLevelRange[0] || pokemon.level > this.requiredLevelRange[1]); + return partyPokemon.filter( + pokemon => pokemon.level >= this.requiredLevelRange[0] && pokemon.level <= this.requiredLevelRange[1], + ); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredLevelRanges + return partyPokemon.filter( + pokemon => pokemon.level < this.requiredLevelRange[0] || pokemon.level > this.requiredLevelRange[1], + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - return [ "level", pokemon?.level.toString() ?? "" ]; + return ["level", pokemon?.level.toString() ?? ""]; } } @@ -977,7 +1083,7 @@ export class FriendshipRequirement extends EncounterPokemonRequirement { minNumberOfPokemon: number; invertQuery: boolean; - constructor(requiredFriendshipRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(requiredFriendshipRange: [number, number], minNumberOfPokemon = 1, invertQuery = false) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; @@ -986,7 +1092,10 @@ export class FriendshipRequirement extends EncounterPokemonRequirement { override meetsRequirement(): boolean { // Party Pokemon inside required friendship range - if (!isNullOrUndefined(this.requiredFriendshipRange) && this.requiredFriendshipRange[0] <= this.requiredFriendshipRange[1]) { + if ( + !isNullOrUndefined(this.requiredFriendshipRange) && + this.requiredFriendshipRange[0] <= this.requiredFriendshipRange[1] + ) { const partyPokemon = globalScene.getPlayerParty(); const pokemonInRange = this.queryParty(partyPokemon); if (pokemonInRange.length < this.minNumberOfPokemon) { @@ -998,15 +1107,21 @@ export class FriendshipRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => pokemon.friendship >= this.requiredFriendshipRange[0] && pokemon.friendship <= this.requiredFriendshipRange[1]); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredFriendshipRanges - return partyPokemon.filter((pokemon) => pokemon.friendship < this.requiredFriendshipRange[0] || pokemon.friendship > this.requiredFriendshipRange[1]); + return partyPokemon.filter( + pokemon => + pokemon.friendship >= this.requiredFriendshipRange[0] && + pokemon.friendship <= this.requiredFriendshipRange[1], + ); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredFriendshipRanges + return partyPokemon.filter( + pokemon => + pokemon.friendship < this.requiredFriendshipRange[0] || pokemon.friendship > this.requiredFriendshipRange[1], + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - return [ "friendship", pokemon?.friendship.toString() ?? "" ]; + return ["friendship", pokemon?.friendship.toString() ?? ""]; } } @@ -1020,7 +1135,7 @@ export class HealthRatioRequirement extends EncounterPokemonRequirement { minNumberOfPokemon: number; invertQuery: boolean; - constructor(requiredHealthRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(requiredHealthRange: [number, number], minNumberOfPokemon = 1, invertQuery = false) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; @@ -1041,21 +1156,25 @@ export class HealthRatioRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => { - return pokemon.getHpRatio() >= this.requiredHealthRange[0] && pokemon.getHpRatio() <= this.requiredHealthRange[1]; + return partyPokemon.filter(pokemon => { + return ( + pokemon.getHpRatio() >= this.requiredHealthRange[0] && pokemon.getHpRatio() <= this.requiredHealthRange[1] + ); }); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredHealthRanges - return partyPokemon.filter((pokemon) => pokemon.getHpRatio() < this.requiredHealthRange[0] || pokemon.getHpRatio() > this.requiredHealthRange[1]); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredHealthRanges + return partyPokemon.filter( + pokemon => + pokemon.getHpRatio() < this.requiredHealthRange[0] || pokemon.getHpRatio() > this.requiredHealthRange[1], + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { const hpRatio = pokemon?.getHpRatio(); if (!isNullOrUndefined(hpRatio)) { - return [ "healthRatio", Math.floor(hpRatio * 100).toString() + "%" ]; + return ["healthRatio", Math.floor(hpRatio * 100).toString() + "%"]; } - return [ "healthRatio", "" ]; + return ["healthRatio", ""]; } } @@ -1064,7 +1183,7 @@ export class WeightRequirement extends EncounterPokemonRequirement { minNumberOfPokemon: number; invertQuery: boolean; - constructor(requiredWeightRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) { + constructor(requiredWeightRange: [number, number], minNumberOfPokemon = 1, invertQuery = false) { super(); this.minNumberOfPokemon = minNumberOfPokemon; this.invertQuery = invertQuery; @@ -1085,15 +1204,18 @@ export class WeightRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => pokemon.getWeight() >= this.requiredWeightRange[0] && pokemon.getWeight() <= this.requiredWeightRange[1]); - } else { - // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredWeightRanges - return partyPokemon.filter((pokemon) => pokemon.getWeight() < this.requiredWeightRange[0] || pokemon.getWeight() > this.requiredWeightRange[1]); + return partyPokemon.filter( + pokemon => + pokemon.getWeight() >= this.requiredWeightRange[0] && pokemon.getWeight() <= this.requiredWeightRange[1], + ); } + // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredWeightRanges + return partyPokemon.filter( + pokemon => pokemon.getWeight() < this.requiredWeightRange[0] || pokemon.getWeight() > this.requiredWeightRange[1], + ); } override getDialogueToken(pokemon?: PlayerPokemon): [string, string] { - return [ "weight", pokemon?.getWeight().toString() ?? "" ]; + return ["weight", pokemon?.getWeight().toString() ?? ""]; } } - diff --git a/src/data/mystery-encounters/mystery-encounter.ts b/src/data/mystery-encounters/mystery-encounter.ts index c90649e551d..53e976cda8a 100644 --- a/src/data/mystery-encounters/mystery-encounter.ts +++ b/src/data/mystery-encounters/mystery-encounter.ts @@ -12,7 +12,14 @@ import type MysteryEncounterDialogue from "./mystery-encounter-dialogue"; import type { OptionPhaseCallback } from "./mystery-encounter-option"; import type MysteryEncounterOption from "./mystery-encounter-option"; import { MysteryEncounterOptionBuilder } from "./mystery-encounter-option"; -import { EncounterPokemonRequirement, EncounterSceneRequirement, HealthRatioRequirement, PartySizeRequirement, StatusEffectRequirement, WaveRangeRequirement } from "./mystery-encounter-requirements"; +import { + EncounterPokemonRequirement, + EncounterSceneRequirement, + HealthRatioRequirement, + PartySizeRequirement, + StatusEffectRequirement, + WaveRangeRequirement, +} from "./mystery-encounter-requirements"; import type { BattlerIndex } from "#app/battle"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; @@ -276,9 +283,12 @@ export default class MysteryEncounter implements IMysteryEncounter { this.encounterTier = this.encounterTier ?? MysteryEncounterTier.COMMON; this.localizationKey = this.localizationKey ?? ""; this.dialogue = this.dialogue ?? {}; - this.spriteConfigs = this.spriteConfigs ? [ ...this.spriteConfigs ] : []; + this.spriteConfigs = this.spriteConfigs ? [...this.spriteConfigs] : []; // Default max is 1 for ROGUE encounters, 2 for others - this.maxAllowedEncounters = this.maxAllowedEncounters ?? this.encounterTier === MysteryEncounterTier.ROGUE ? DEFAULT_MAX_ALLOWED_ROGUE_ENCOUNTERS : DEFAULT_MAX_ALLOWED_ENCOUNTERS; + this.maxAllowedEncounters = + (this.maxAllowedEncounters ?? this.encounterTier === MysteryEncounterTier.ROGUE) + ? DEFAULT_MAX_ALLOWED_ROGUE_ENCOUNTERS + : DEFAULT_MAX_ALLOWED_ENCOUNTERS; this.encounterMode = MysteryEncounterMode.DEFAULT; this.requirements = this.requirements ? this.requirements : []; this.hideBattleIntroMessage = this.hideBattleIntroMessage ?? false; @@ -317,7 +327,13 @@ export default class MysteryEncounter implements IMysteryEncounter { * @param pokemon */ pokemonMeetsPrimaryRequirements(pokemon: Pokemon): boolean { - return !this.primaryPokemonRequirements.some(req => !req.queryParty(globalScene.getPlayerParty()).map(p => p.id).includes(pokemon.id)); + return !this.primaryPokemonRequirements.some( + req => + !req + .queryParty(globalScene.getPlayerParty()) + .map(p => p.id) + .includes(pokemon.id), + ); } /** @@ -359,28 +375,27 @@ export default class MysteryEncounter implements IMysteryEncounter { } else { overlap.push(qp); } - } if (truePrimaryPool.length > 0) { // Always choose from the non-overlapping pokemon first this.primaryPokemon = truePrimaryPool[Utils.randSeedInt(truePrimaryPool.length, 0)]; return true; - } else { - // If there are multiple overlapping pokemon, we're okay - just choose one and take it out of the primary pokemon pool - if (overlap.length > 1 || (this.secondaryPokemon.length - overlap.length >= 1)) { - // is this working? - this.primaryPokemon = overlap[Utils.randSeedInt(overlap.length, 0)]; - this.secondaryPokemon = this.secondaryPokemon.filter((supp) => supp !== this.primaryPokemon); - return true; - } - console.log("Mystery Encounter Edge Case: Requirement not met due to primary pokemon overlapping with secondary pokemon. There's no valid primary pokemon left."); - return false; } - } else { - // this means we CAN have the same pokemon be a primary and secondary pokemon, so just choose any qualifying one randomly. - this.primaryPokemon = qualified[Utils.randSeedInt(qualified.length, 0)]; - return true; + // If there are multiple overlapping pokemon, we're okay - just choose one and take it out of the primary pokemon pool + if (overlap.length > 1 || this.secondaryPokemon.length - overlap.length >= 1) { + // is this working? + this.primaryPokemon = overlap[Utils.randSeedInt(overlap.length, 0)]; + this.secondaryPokemon = this.secondaryPokemon.filter(supp => supp !== this.primaryPokemon); + return true; + } + console.log( + "Mystery Encounter Edge Case: Requirement not met due to primary pokemon overlapping with secondary pokemon. There's no valid primary pokemon left.", + ); + return false; } + // this means we CAN have the same pokemon be a primary and secondary pokemon, so just choose any qualifying one randomly. + this.primaryPokemon = qualified[Utils.randSeedInt(qualified.length, 0)]; + return true; } /** @@ -533,28 +548,28 @@ export class MysteryEncounterBuilder implements Partial { options: [MysteryEncounterOption, MysteryEncounterOption, ...MysteryEncounterOption[]]; enemyPartyConfigs: EnemyPartyConfig[] = []; - localizationKey: string = ""; + localizationKey = ""; dialogue: MysteryEncounterDialogue = {}; requirements: EncounterSceneRequirement[] = []; primaryPokemonRequirements: EncounterPokemonRequirement[] = []; secondaryPokemonRequirements: EncounterPokemonRequirement[] = []; - excludePrimaryFromSupportRequirements: boolean = true; + excludePrimaryFromSupportRequirements = true; dialogueTokens: Record = {}; - hideBattleIntroMessage: boolean = false; - autoHideIntroVisuals: boolean = true; - enterIntroVisualsFromRight: boolean = false; - continuousEncounter: boolean = false; - catchAllowed: boolean = false; - fleeAllowed: boolean = true; - lockEncounterRewardTiers: boolean = false; - startOfBattleEffectsComplete: boolean = false; - hasBattleAnimationsWithoutTargets: boolean = false; - skipEnemyBattleTurns: boolean = false; - skipToFightInput: boolean = false; - preventGameStatsUpdates: boolean = false; - maxAllowedEncounters: number = 3; - expMultiplier: number = 1; + hideBattleIntroMessage = false; + autoHideIntroVisuals = true; + enterIntroVisualsFromRight = false; + continuousEncounter = false; + catchAllowed = false; + fleeAllowed = true; + lockEncounterRewardTiers = false; + startOfBattleEffectsComplete = false; + hasBattleAnimationsWithoutTargets = false; + skipEnemyBattleTurns = false; + skipToFightInput = false; + preventGameStatsUpdates = false; + maxAllowedEncounters = 3; + expMultiplier = 1; /** * REQUIRED @@ -566,7 +581,9 @@ export class MysteryEncounterBuilder implements Partial { * @param encounterType * @returns this */ - static withEncounterType(encounterType: MysteryEncounterType): MysteryEncounterBuilder & Pick { + static withEncounterType( + encounterType: MysteryEncounterType, + ): MysteryEncounterBuilder & Pick { return Object.assign(new MysteryEncounterBuilder(), { encounterType }); } @@ -580,12 +597,11 @@ export class MysteryEncounterBuilder implements Partial { */ withOption(option: MysteryEncounterOption): this & Pick { if (!this.options) { - const options = [ option ]; + const options = [option]; return Object.assign(this, { options }); - } else { - this.options.push(option); - return this; } + this.options.push(option); + return this; } /** @@ -598,8 +614,16 @@ export class MysteryEncounterBuilder implements Partial { * @param callback {@linkcode OptionPhaseCallback} * @returns */ - withSimpleOption(dialogue: OptionTextDisplay, callback: OptionPhaseCallback): this & Pick { - return this.withOption(MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT).withDialogue(dialogue).withOptionPhase(callback).build()); + withSimpleOption( + dialogue: OptionTextDisplay, + callback: OptionPhaseCallback, + ): this & Pick { + return this.withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withDialogue(dialogue) + .withOptionPhase(callback) + .build(), + ); } /** @@ -612,12 +636,17 @@ export class MysteryEncounterBuilder implements Partial { * @param callback {@linkcode OptionPhaseCallback} * @returns */ - withSimpleDexProgressOption(dialogue: OptionTextDisplay, callback: OptionPhaseCallback): this & Pick { - return this.withOption(MysteryEncounterOptionBuilder - .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) - .withHasDexProgress(true) - .withDialogue(dialogue) - .withOptionPhase(callback).build()); + withSimpleDexProgressOption( + dialogue: OptionTextDisplay, + callback: OptionPhaseCallback, + ): this & Pick { + return this.withOption( + MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT) + .withHasDexProgress(true) + .withDialogue(dialogue) + .withOptionPhase(callback) + .build(), + ); } /** @@ -626,7 +655,9 @@ export class MysteryEncounterBuilder implements Partial { * @param spriteConfigs * @returns */ - withIntroSpriteConfigs(spriteConfigs: MysteryEncounterSpriteConfig[]): this & Pick { + withIntroSpriteConfigs( + spriteConfigs: MysteryEncounterSpriteConfig[], + ): this & Pick { return Object.assign(this, { spriteConfigs: spriteConfigs }); } @@ -635,7 +666,13 @@ export class MysteryEncounterBuilder implements Partial { return this; } - withIntro({ spriteConfigs, dialogue } : {spriteConfigs: MysteryEncounterSpriteConfig[], dialogue?: MysteryEncounterDialogue["intro"]}) { + withIntro({ + spriteConfigs, + dialogue, + }: { + spriteConfigs: MysteryEncounterSpriteConfig[]; + dialogue?: MysteryEncounterDialogue["intro"]; + }) { return this.withIntroSpriteConfigs(spriteConfigs).withIntroDialogue(dialogue); } @@ -676,8 +713,10 @@ export class MysteryEncounterBuilder implements Partial { * @param encounterAnimations * @returns */ - withAnimations(...encounterAnimations: EncounterAnim[]): this & Required> { - const animations = Array.isArray(encounterAnimations) ? encounterAnimations : [ encounterAnimations ]; + withAnimations( + ...encounterAnimations: EncounterAnim[] + ): this & Required> { + const animations = Array.isArray(encounterAnimations) ? encounterAnimations : [encounterAnimations]; return Object.assign(this, { encounterAnimations: animations }); } @@ -686,8 +725,10 @@ export class MysteryEncounterBuilder implements Partial { * @returns * @param disallowedGameModes */ - withDisallowedGameModes(...disallowedGameModes: GameModes[]): this & Required> { - const gameModes = Array.isArray(disallowedGameModes) ? disallowedGameModes : [ disallowedGameModes ]; + withDisallowedGameModes( + ...disallowedGameModes: GameModes[] + ): this & Required> { + const gameModes = Array.isArray(disallowedGameModes) ? disallowedGameModes : [disallowedGameModes]; return Object.assign(this, { disallowedGameModes: gameModes }); } @@ -696,8 +737,10 @@ export class MysteryEncounterBuilder implements Partial { * @returns * @param disallowedChallenges */ - withDisallowedChallenges(...disallowedChallenges: Challenges[]): this & Required> { - const challenges = Array.isArray(disallowedChallenges) ? disallowedChallenges : [ disallowedChallenges ]; + withDisallowedChallenges( + ...disallowedChallenges: Challenges[] + ): this & Required> { + const challenges = Array.isArray(disallowedChallenges) ? disallowedChallenges : [disallowedChallenges]; return Object.assign(this, { disallowedChallenges: challenges }); } @@ -707,7 +750,9 @@ export class MysteryEncounterBuilder implements Partial { * Default false * @param continuousEncounter */ - withContinuousEncounter(continuousEncounter: boolean): this & Required> { + withContinuousEncounter( + continuousEncounter: boolean, + ): this & Required> { return Object.assign(this, { continuousEncounter: continuousEncounter }); } @@ -717,7 +762,9 @@ export class MysteryEncounterBuilder implements Partial { * Default false * @param hasBattleAnimationsWithoutTargets */ - withBattleAnimationsWithoutTargets(hasBattleAnimationsWithoutTargets: boolean): this & Required> { + withBattleAnimationsWithoutTargets( + hasBattleAnimationsWithoutTargets: boolean, + ): this & Required> { return Object.assign(this, { hasBattleAnimationsWithoutTargets }); } @@ -727,7 +774,9 @@ export class MysteryEncounterBuilder implements Partial { * Default false * @param skipEnemyBattleTurns */ - withSkipEnemyBattleTurns(skipEnemyBattleTurns: boolean): this & Required> { + withSkipEnemyBattleTurns( + skipEnemyBattleTurns: boolean, + ): this & Required> { return Object.assign(this, { skipEnemyBattleTurns }); } @@ -744,7 +793,9 @@ export class MysteryEncounterBuilder implements Partial { * If true, will prevent updating {@linkcode GameStats} for encountering and/or defeating Pokemon * Default `false` */ - withPreventGameStatsUpdates(preventGameStatsUpdates: boolean): this & Required> { + withPreventGameStatsUpdates( + preventGameStatsUpdates: boolean, + ): this & Required> { return Object.assign(this, { preventGameStatsUpdates }); } @@ -753,7 +804,9 @@ export class MysteryEncounterBuilder implements Partial { * @param maxAllowedEncounters * @returns */ - withMaxAllowedEncounters(maxAllowedEncounters: number): this & Required> { + withMaxAllowedEncounters( + maxAllowedEncounters: number, + ): this & Required> { return Object.assign(this, { maxAllowedEncounters: maxAllowedEncounters }); } @@ -764,7 +817,9 @@ export class MysteryEncounterBuilder implements Partial { * @param requirement * @returns */ - withSceneRequirement(requirement: EncounterSceneRequirement): this & Required> { + withSceneRequirement( + requirement: EncounterSceneRequirement, + ): this & Required> { if (requirement instanceof EncounterPokemonRequirement) { Error("Incorrectly added pokemon requirement as scene requirement."); } @@ -780,7 +835,7 @@ export class MysteryEncounterBuilder implements Partial { * @returns */ withSceneWaveRangeRequirement(min: number, max?: number): this & Required> { - return this.withSceneRequirement(new WaveRangeRequirement([ min, max ?? min ])); + return this.withSceneRequirement(new WaveRangeRequirement([min, max ?? min])); } /** @@ -791,8 +846,12 @@ export class MysteryEncounterBuilder implements Partial { * @param excludeDisallowedPokemon if true, only counts allowed (legal in Challenge/unfainted) mons * @returns */ - withScenePartySizeRequirement(min: number, max?: number, excludeDisallowedPokemon: boolean = false): this & Required> { - return this.withSceneRequirement(new PartySizeRequirement([ min, max ?? min ], excludeDisallowedPokemon)); + withScenePartySizeRequirement( + min: number, + max?: number, + excludeDisallowedPokemon = false, + ): this & Required> { + return this.withSceneRequirement(new PartySizeRequirement([min, max ?? min], excludeDisallowedPokemon)); } /** @@ -801,13 +860,17 @@ export class MysteryEncounterBuilder implements Partial { * @param requirement {@linkcode EncounterPokemonRequirement} * @returns */ - withPrimaryPokemonRequirement(requirement: EncounterPokemonRequirement): this & Required> { + withPrimaryPokemonRequirement( + requirement: EncounterPokemonRequirement, + ): this & Required> { if (requirement instanceof EncounterSceneRequirement) { Error("Incorrectly added scene requirement as pokemon requirement."); } this.primaryPokemonRequirements.push(requirement); - return Object.assign(this, { primaryPokemonRequirements: this.primaryPokemonRequirements }); + return Object.assign(this, { + primaryPokemonRequirements: this.primaryPokemonRequirements, + }); } /** @@ -818,8 +881,14 @@ export class MysteryEncounterBuilder implements Partial { * @param invertQuery if true will invert the query * @returns */ - withPrimaryPokemonStatusEffectRequirement(statusEffect: StatusEffect | StatusEffect[], minNumberOfPokemon: number = 1, invertQuery: boolean = false): this & Required> { - return this.withPrimaryPokemonRequirement(new StatusEffectRequirement(statusEffect, minNumberOfPokemon, invertQuery)); + withPrimaryPokemonStatusEffectRequirement( + statusEffect: StatusEffect | StatusEffect[], + minNumberOfPokemon = 1, + invertQuery = false, + ): this & Required> { + return this.withPrimaryPokemonRequirement( + new StatusEffectRequirement(statusEffect, minNumberOfPokemon, invertQuery), + ); } /** @@ -830,21 +899,33 @@ export class MysteryEncounterBuilder implements Partial { * @param invertQuery if true will invert the query * @returns */ - withPrimaryPokemonHealthRatioRequirement(requiredHealthRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false): this & Required> { - return this.withPrimaryPokemonRequirement(new HealthRatioRequirement(requiredHealthRange, minNumberOfPokemon, invertQuery)); + withPrimaryPokemonHealthRatioRequirement( + requiredHealthRange: [number, number], + minNumberOfPokemon = 1, + invertQuery = false, + ): this & Required> { + return this.withPrimaryPokemonRequirement( + new HealthRatioRequirement(requiredHealthRange, minNumberOfPokemon, invertQuery), + ); } // TODO: Maybe add an optional parameter for excluding primary pokemon from the support cast? // ex. if your only grass type pokemon, a snivy, is chosen as primary, if the support pokemon requires a grass type, the event won't trigger because // it's already been - withSecondaryPokemonRequirement(requirement: EncounterPokemonRequirement, excludePrimaryFromSecondaryRequirements: boolean = false): this & Required> { + withSecondaryPokemonRequirement( + requirement: EncounterPokemonRequirement, + excludePrimaryFromSecondaryRequirements = false, + ): this & Required> { if (requirement instanceof EncounterSceneRequirement) { Error("Incorrectly added scene requirement as pokemon requirement."); } this.secondaryPokemonRequirements.push(requirement); this.excludePrimaryFromSupportRequirements = excludePrimaryFromSecondaryRequirements; - return Object.assign(this, { excludePrimaryFromSecondaryRequirements: this.excludePrimaryFromSupportRequirements, secondaryPokemonRequirements: this.secondaryPokemonRequirements }); + return Object.assign(this, { + excludePrimaryFromSecondaryRequirements: this.excludePrimaryFromSupportRequirements, + secondaryPokemonRequirements: this.secondaryPokemonRequirements, + }); } /** @@ -919,15 +1000,21 @@ export class MysteryEncounterBuilder implements Partial { * @param hideBattleIntroMessage If `true`, will not show the trainerAppeared/wildAppeared/bossAppeared message for an encounter * @returns */ - withHideWildIntroMessage(hideBattleIntroMessage: boolean): this & Required> { - return Object.assign(this, { hideBattleIntroMessage: hideBattleIntroMessage }); + withHideWildIntroMessage( + hideBattleIntroMessage: boolean, + ): this & Required> { + return Object.assign(this, { + hideBattleIntroMessage: hideBattleIntroMessage, + }); } /** * @param autoHideIntroVisuals If `false`, will not hide the intro visuals that are displayed at the beginning of encounter * @returns */ - withAutoHideIntroVisuals(autoHideIntroVisuals: boolean): this & Required> { + withAutoHideIntroVisuals( + autoHideIntroVisuals: boolean, + ): this & Required> { return Object.assign(this, { autoHideIntroVisuals: autoHideIntroVisuals }); } @@ -936,8 +1023,12 @@ export class MysteryEncounterBuilder implements Partial { * Default false * @returns */ - withEnterIntroVisualsFromRight(enterIntroVisualsFromRight: boolean): this & Required> { - return Object.assign(this, { enterIntroVisualsFromRight: enterIntroVisualsFromRight }); + withEnterIntroVisualsFromRight( + enterIntroVisualsFromRight: boolean, + ): this & Required> { + return Object.assign(this, { + enterIntroVisualsFromRight: enterIntroVisualsFromRight, + }); } /** @@ -954,7 +1045,7 @@ export class MysteryEncounterBuilder implements Partial { encounterOptionsDialogue: { ...encounterOptionsDialogue, title, - } + }, }; return this; @@ -974,7 +1065,7 @@ export class MysteryEncounterBuilder implements Partial { encounterOptionsDialogue: { ...encounterOptionsDialogue, description, - } + }, }; return this; @@ -994,7 +1085,7 @@ export class MysteryEncounterBuilder implements Partial { encounterOptionsDialogue: { ...encounterOptionsDialogue, query, - } + }, }; return this; diff --git a/src/data/mystery-encounters/mystery-encounters.ts b/src/data/mystery-encounters/mystery-encounters.ts index 3219640e4e5..354f69d0ca3 100644 --- a/src/data/mystery-encounters/mystery-encounters.ts +++ b/src/data/mystery-encounters/mystery-encounters.ts @@ -80,7 +80,7 @@ export const EXTREME_ENCOUNTER_BIOMES = [ Biome.WASTELAND, Biome.ABYSS, Biome.SPACE, - Biome.END + Biome.END, ]; export const NON_EXTREME_ENCOUNTER_BIOMES = [ @@ -108,7 +108,7 @@ export const NON_EXTREME_ENCOUNTER_BIOMES = [ Biome.SLUM, Biome.SNOWY_FOREST, Biome.ISLAND, - Biome.LABORATORY + Biome.LABORATORY, ]; /** @@ -147,7 +147,7 @@ export const HUMAN_TRANSITABLE_BIOMES = [ Biome.SLUM, Biome.SNOWY_FOREST, Biome.ISLAND, - Biome.LABORATORY + Biome.LABORATORY, ]; /** @@ -168,11 +168,12 @@ export const CIVILIZATION_ENCOUNTER_BIOMES = [ Biome.FACTORY, Biome.CONSTRUCTION_SITE, Biome.SLUM, - Biome.ISLAND + Biome.ISLAND, ]; -export const allMysteryEncounters: { [encounterType: number]: MysteryEncounter } = {}; - +export const allMysteryEncounters: { + [encounterType: number]: MysteryEncounter; +} = {}; const extremeBiomeEncounters: MysteryEncounterType[] = []; @@ -187,14 +188,14 @@ const humanTransitableBiomeEncounters: MysteryEncounterType[] = [ MysteryEncounterType.THE_POKEMON_SALESMAN, // MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, Disabled MysteryEncounterType.THE_WINSTRATE_CHALLENGE, - MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER + MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER, ]; const civilizationBiomeEncounters: MysteryEncounterType[] = [ MysteryEncounterType.DEPARTMENT_STORE_SALE, MysteryEncounterType.PART_TIMER, MysteryEncounterType.FUN_AND_GAMES, - MysteryEncounterType.GLOBAL_TRADE_SYSTEM + MysteryEncounterType.GLOBAL_TRADE_SYSTEM, ]; /** @@ -213,7 +214,7 @@ const anyBiomeEncounters: MysteryEncounterType[] = [ MysteryEncounterType.WEIRD_DREAM, MysteryEncounterType.TELEPORTING_HIJINKS, MysteryEncounterType.BUG_TYPE_SUPERFAN, - MysteryEncounterType.UNCOMMON_BREED + MysteryEncounterType.UNCOMMON_BREED, ]; /** @@ -224,72 +225,40 @@ const anyBiomeEncounters: MysteryEncounterType[] = [ * that biome groups do not cover */ export const mysteryEncountersByBiome = new Map([ - [ Biome.TOWN, []], - [ Biome.PLAINS, [ - MysteryEncounterType.SLUMBERING_SNORLAX, - MysteryEncounterType.ABSOLUTE_AVARICE - ]], - [ Biome.GRASS, [ - MysteryEncounterType.SLUMBERING_SNORLAX, - MysteryEncounterType.ABSOLUTE_AVARICE - ]], - [ Biome.TALL_GRASS, [ - MysteryEncounterType.ABSOLUTE_AVARICE - ]], - [ Biome.METROPOLIS, []], - [ Biome.FOREST, [ - MysteryEncounterType.SAFARI_ZONE, - MysteryEncounterType.ABSOLUTE_AVARICE - ]], - [ Biome.SEA, [ - MysteryEncounterType.LOST_AT_SEA - ]], - [ Biome.SWAMP, [ - MysteryEncounterType.SAFARI_ZONE - ]], - [ Biome.BEACH, []], - [ Biome.LAKE, []], - [ Biome.SEABED, []], - [ Biome.MOUNTAIN, []], - [ Biome.BADLANDS, [ - MysteryEncounterType.DANCING_LESSONS - ]], - [ Biome.CAVE, [ - MysteryEncounterType.THE_STRONG_STUFF - ]], - [ Biome.DESERT, [ - MysteryEncounterType.DANCING_LESSONS - ]], - [ Biome.ICE_CAVE, []], - [ Biome.MEADOW, []], - [ Biome.POWER_PLANT, []], - [ Biome.VOLCANO, [ - MysteryEncounterType.FIERY_FALLOUT, - MysteryEncounterType.DANCING_LESSONS - ]], - [ Biome.GRAVEYARD, []], - [ Biome.DOJO, []], - [ Biome.FACTORY, []], - [ Biome.RUINS, []], - [ Biome.WASTELAND, [ - MysteryEncounterType.DANCING_LESSONS - ]], - [ Biome.ABYSS, [ - MysteryEncounterType.DANCING_LESSONS - ]], - [ Biome.SPACE, [ - MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER - ]], - [ Biome.CONSTRUCTION_SITE, []], - [ Biome.JUNGLE, [ - MysteryEncounterType.SAFARI_ZONE - ]], - [ Biome.FAIRY_CAVE, []], - [ Biome.TEMPLE, []], - [ Biome.SLUM, []], - [ Biome.SNOWY_FOREST, []], - [ Biome.ISLAND, []], - [ Biome.LABORATORY, []] + [Biome.TOWN, []], + [Biome.PLAINS, [MysteryEncounterType.SLUMBERING_SNORLAX, MysteryEncounterType.ABSOLUTE_AVARICE]], + [Biome.GRASS, [MysteryEncounterType.SLUMBERING_SNORLAX, MysteryEncounterType.ABSOLUTE_AVARICE]], + [Biome.TALL_GRASS, [MysteryEncounterType.ABSOLUTE_AVARICE]], + [Biome.METROPOLIS, []], + [Biome.FOREST, [MysteryEncounterType.SAFARI_ZONE, MysteryEncounterType.ABSOLUTE_AVARICE]], + [Biome.SEA, [MysteryEncounterType.LOST_AT_SEA]], + [Biome.SWAMP, [MysteryEncounterType.SAFARI_ZONE]], + [Biome.BEACH, []], + [Biome.LAKE, []], + [Biome.SEABED, []], + [Biome.MOUNTAIN, []], + [Biome.BADLANDS, [MysteryEncounterType.DANCING_LESSONS]], + [Biome.CAVE, [MysteryEncounterType.THE_STRONG_STUFF]], + [Biome.DESERT, [MysteryEncounterType.DANCING_LESSONS]], + [Biome.ICE_CAVE, []], + [Biome.MEADOW, []], + [Biome.POWER_PLANT, []], + [Biome.VOLCANO, [MysteryEncounterType.FIERY_FALLOUT, MysteryEncounterType.DANCING_LESSONS]], + [Biome.GRAVEYARD, []], + [Biome.DOJO, []], + [Biome.FACTORY, []], + [Biome.RUINS, []], + [Biome.WASTELAND, [MysteryEncounterType.DANCING_LESSONS]], + [Biome.ABYSS, [MysteryEncounterType.DANCING_LESSONS]], + [Biome.SPACE, [MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER]], + [Biome.CONSTRUCTION_SITE, []], + [Biome.JUNGLE, [MysteryEncounterType.SAFARI_ZONE]], + [Biome.FAIRY_CAVE, []], + [Biome.TEMPLE, []], + [Biome.SLUM, []], + [Biome.SNOWY_FOREST, []], + [Biome.ISLAND, []], + [Biome.LABORATORY, []], ]); export function initMysteryEncounters() { @@ -364,7 +333,7 @@ export function initMysteryEncounters() { // Add ANY biome encounters to biome map // eslint-disable-next-line - let encounterBiomeTableLog = ""; + let _encounterBiomeTableLog = ""; mysteryEncountersByBiome.forEach((biomeEncounters, biome) => { anyBiomeEncounters.forEach(encounter => { if (!biomeEncounters.includes(encounter)) { @@ -372,7 +341,10 @@ export function initMysteryEncounters() { } }); - encounterBiomeTableLog += `${getBiomeName(biome).toUpperCase()}: [${biomeEncounters.map(type => MysteryEncounterType[type].toString().toLowerCase()).sort().join(", ")}]\n`; + _encounterBiomeTableLog += `${getBiomeName(biome).toUpperCase()}: [${biomeEncounters + .map(type => MysteryEncounterType[type].toString().toLowerCase()) + .sort() + .join(", ")}]\n`; }); //console.debug("All Mystery Encounters by Biome:\n" + encounterBiomeTableLog); diff --git a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts index 3d454269204..a7ffe3e26ca 100644 --- a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts +++ b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts @@ -29,7 +29,7 @@ export class CanLearnMoveRequirement extends EncounterPokemonRequirement { constructor(requiredMoves: Moves | Moves[], options: CanLearnMoveRequirementOptions = {}) { super(); - this.requiredMoves = Array.isArray(requiredMoves) ? requiredMoves : [ requiredMoves ]; + this.requiredMoves = Array.isArray(requiredMoves) ? requiredMoves : [requiredMoves]; this.excludeLevelMoves = options.excludeLevelMoves ?? false; this.excludeTmMoves = options.excludeTmMoves ?? false; @@ -40,7 +40,9 @@ export class CanLearnMoveRequirement extends EncounterPokemonRequirement { } override meetsRequirement(): boolean { - const partyPokemon = globalScene.getPlayerParty().filter((pkm) => (this.includeFainted ? pkm.isAllowedInChallenge() : pkm.isAllowedInBattle())); + const partyPokemon = globalScene + .getPlayerParty() + .filter(pkm => (this.includeFainted ? pkm.isAllowedInChallenge() : pkm.isAllowedInBattle())); if (isNullOrUndefined(partyPokemon) || this.requiredMoves?.length < 0) { return false; @@ -51,25 +53,24 @@ export class CanLearnMoveRequirement extends EncounterPokemonRequirement { override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] { if (!this.invertQuery) { - return partyPokemon.filter((pokemon) => + return partyPokemon.filter(pokemon => // every required move should be included - this.requiredMoves.every((requiredMove) => this.getAllPokemonMoves(pokemon).includes(requiredMove)) - ); - } else { - return partyPokemon.filter( - (pokemon) => - // none of the "required" moves should be included - !this.requiredMoves.some((requiredMove) => this.getAllPokemonMoves(pokemon).includes(requiredMove)) + this.requiredMoves.every(requiredMove => this.getAllPokemonMoves(pokemon).includes(requiredMove)), ); } + return partyPokemon.filter( + pokemon => + // none of the "required" moves should be included + !this.requiredMoves.some(requiredMove => this.getAllPokemonMoves(pokemon).includes(requiredMove)), + ); } override getDialogueToken(__pokemon?: PlayerPokemon): [string, string] { - return [ "requiredMoves", this.requiredMoves.map(m => new PokemonMove(m).getName()).join(", ") ]; + return ["requiredMoves", this.requiredMoves.map(m => new PokemonMove(m).getName()).join(", ")]; } private getPokemonLevelMoves(pkm: PlayerPokemon): Moves[] { - return pkm.getLevelMoves().map(([ _level, move ]) => move); + return pkm.getLevelMoves().map(([_level, move]) => move); } private getAllPokemonMoves(pkm: PlayerPokemon): Moves[] { diff --git a/src/data/mystery-encounters/requirements/requirement-groups.ts b/src/data/mystery-encounters/requirements/requirement-groups.ts index 76bbb8f03a7..d9d62819fa6 100644 --- a/src/data/mystery-encounters/requirements/requirement-groups.ts +++ b/src/data/mystery-encounters/requirements/requirement-groups.ts @@ -4,14 +4,7 @@ import { Abilities } from "#enums/abilities"; /** * Moves that "steal" things */ -export const STEALING_MOVES = [ - Moves.PLUCK, - Moves.COVET, - Moves.KNOCK_OFF, - Moves.THIEF, - Moves.TRICK, - Moves.SWITCHEROO -]; +export const STEALING_MOVES = [Moves.PLUCK, Moves.COVET, Moves.KNOCK_OFF, Moves.THIEF, Moves.TRICK, Moves.SWITCHEROO]; /** * Moves that "charm" someone @@ -24,7 +17,7 @@ export const CHARMING_MOVES = [ Moves.ATTRACT, Moves.SWEET_SCENT, Moves.CAPTIVATE, - Moves.AROMATIC_MIST + Moves.AROMATIC_MIST, ]; /** @@ -42,7 +35,7 @@ export const DANCING_MOVES = [ Moves.QUIVER_DANCE, Moves.SWORDS_DANCE, Moves.TEETER_DANCE, - Moves.VICTORY_DANCE + Moves.VICTORY_DANCE, ]; /** @@ -60,7 +53,7 @@ export const DISTRACTION_MOVES = [ Moves.CAPTIVATE, Moves.RAGE_POWDER, Moves.SUBSTITUTE, - Moves.SHED_TAIL + Moves.SHED_TAIL, ]; /** @@ -79,7 +72,7 @@ export const PROTECTING_MOVES = [ Moves.CRAFTY_SHIELD, Moves.SPIKY_SHIELD, Moves.OBSTRUCT, - Moves.DETECT + Moves.DETECT, ]; /** @@ -116,7 +109,7 @@ export const EXTORTION_ABILITIES = [ Abilities.ARENA_TRAP, Abilities.SHADOW_TAG, Abilities.SUCTION_CUPS, - Abilities.STICKY_HOLD + Abilities.STICKY_HOLD, ]; /** @@ -133,5 +126,5 @@ export const FIRE_RESISTANT_ABILITIES = [ Abilities.MAGMA_ARMOR, Abilities.WATER_VEIL, Abilities.STEAM_ENGINE, - Abilities.PRIMORDIAL_SEA + Abilities.PRIMORDIAL_SEA, ]; diff --git a/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts b/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts index df9b6355017..94790145687 100644 --- a/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts @@ -63,7 +63,13 @@ export function queueEncounterMessage(contentKey: string): void { * @param callbackDelay * @param promptDelay */ -export function showEncounterText(contentKey: string, delay: number | null = null, callbackDelay: number = 0, prompt: boolean = true, promptDelay: number | null = null): Promise { +export function showEncounterText( + contentKey: string, + delay: number | null = null, + callbackDelay = 0, + prompt = true, + promptDelay: number | null = null, +): Promise { return new Promise(resolve => { const text: string | null = getEncounterText(contentKey); globalScene.ui.showText(text ?? "", delay, () => resolve(), callbackDelay, prompt, promptDelay); @@ -78,7 +84,12 @@ export function showEncounterText(contentKey: string, delay: number | null = nul * @param speakerContentKey * @param callbackDelay */ -export function showEncounterDialogue(textContentKey: string, speakerContentKey: string, delay: number | null = null, callbackDelay: number = 0): Promise { +export function showEncounterDialogue( + textContentKey: string, + speakerContentKey: string, + delay: number | null = null, + callbackDelay = 0, +): Promise { return new Promise(resolve => { const text: string | null = getEncounterText(textContentKey); const speaker: string | null = getEncounterText(speakerContentKey); diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts index 8e7c67fae84..d37ac340a7c 100644 --- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts @@ -2,14 +2,29 @@ import type Battle from "#app/battle"; import { BattlerIndex, BattleType } from "#app/battle"; import { biomeLinks, BiomePoolTier } from "#app/data/balance/biomes"; import type MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option"; -import { AVERAGE_ENCOUNTERS_PER_RUN_TARGET, WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters"; +import { + AVERAGE_ENCOUNTERS_PER_RUN_TARGET, + WEIGHT_INCREMENT_ON_SPAWN_MISS, +} from "#app/data/mystery-encounters/mystery-encounters"; import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import type { AiType, PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { EnemyPokemon, FieldPosition, PokemonMove, PokemonSummonData } from "#app/field/pokemon"; import type { CustomModifierSettings, ModifierType } from "#app/modifier/modifier-type"; -import { getPartyLuckValue, ModifierPoolType, ModifierTypeGenerator, ModifierTypeOption, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; -import { MysteryEncounterBattlePhase, MysteryEncounterBattleStartCleanupPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases"; +import { + getPartyLuckValue, + ModifierPoolType, + ModifierTypeGenerator, + ModifierTypeOption, + modifierTypes, + regenerateModifierPoolThresholds, +} from "#app/modifier/modifier-type"; +import { + MysteryEncounterBattlePhase, + MysteryEncounterBattleStartCleanupPhase, + MysteryEncounterPhase, + MysteryEncounterRewardsPhase, +} from "#app/phases/mystery-encounter-phases"; import type PokemonData from "#app/system/pokemon-data"; import type { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import type { PartyOption, PokemonSelectFilter } from "#app/ui/party-ui-handler"; @@ -46,6 +61,9 @@ import type { Variant } from "#app/data/variant"; import { StatusEffect } from "#enums/status-effect"; import { globalScene } from "#app/global-scene"; import { getPokemonSpecies } from "#app/data/pokemon-species"; +import { PokemonType } from "#enums/pokemon-type"; +import { getNatureName } from "#app/data/nature"; +import { getPokemonNameWithAffix } from "#app/messages"; /** * Animates exclamation sprite over trainer's head at start of encounter @@ -68,7 +86,7 @@ export function doTrainerExclamation() { globalScene.time.delayedCall(800, () => { globalScene.field.remove(exclamationSprite, true); }); - } + }, }); globalScene.playSound("battle_anims/GEN8- Exclaim", { volume: 0.7 }); @@ -98,6 +116,7 @@ export interface EnemyPokemonConfig { modifierConfigs?: HeldModifierConfig[]; tags?: BattlerTagType[]; dataSource?: PokemonData; + tera?: PokemonType; aiType?: AiType; } @@ -147,8 +166,15 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): const doubleTrainer = trainerConfig.doubleOnly || (trainerConfig.hasDouble && !!partyConfig.doubleBattle); doubleBattle = doubleTrainer; - const trainerFemale = isNullOrUndefined(partyConfig.female) ? !!(Utils.randSeedInt(2)) : partyConfig.female; - const newTrainer = new Trainer(trainerConfig.trainerType, doubleTrainer ? TrainerVariant.DOUBLE : trainerFemale ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, undefined, undefined, undefined, trainerConfig); + const trainerFemale = isNullOrUndefined(partyConfig.female) ? !!Utils.randSeedInt(2) : partyConfig.female; + const newTrainer = new Trainer( + trainerConfig.trainerType, + doubleTrainer ? TrainerVariant.DOUBLE : trainerFemale ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, + undefined, + undefined, + undefined, + trainerConfig, + ); newTrainer.x += 300; newTrainer.setVisible(false); globalScene.field.add(newTrainer); @@ -159,12 +185,17 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): } else { // Wild globalScene.currentBattle.mysteryEncounter!.encounterMode = MysteryEncounterMode.WILD_BATTLE; - const numEnemies = partyConfig?.pokemonConfigs && partyConfig.pokemonConfigs.length > 0 ? partyConfig?.pokemonConfigs?.length : doubleBattle ? 2 : 1; + const numEnemies = + partyConfig?.pokemonConfigs && partyConfig.pokemonConfigs.length > 0 + ? partyConfig?.pokemonConfigs?.length + : doubleBattle + ? 2 + : 1; battle.enemyLevels = new Array(numEnemies).fill(null).map(() => globalScene.currentBattle.getLevelForWave()); } globalScene.getEnemyParty().forEach(enemyPokemon => { - globalScene.field.remove(enemyPokemon, true); + enemyPokemon.leaveField(true, true, true); }); battle.enemyParty = []; battle.double = doubleBattle; @@ -179,8 +210,8 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): battle.enemyLevels = battle.enemyLevels.map(level => level + additive); battle.enemyLevels.forEach((level, e) => { - let enemySpecies; - let dataSource; + let enemySpecies: PokemonSpecies | undefined; + let dataSource: PokemonData | undefined; let isBoss = false; if (!loaded) { if ((!isNullOrUndefined(trainerType) || trainerConfig) && battle.trainer) { @@ -191,7 +222,14 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): dataSource = config.dataSource; enemySpecies = config.species; isBoss = config.isBoss; - battle.enemyParty[e] = globalScene.addEnemyPokemon(enemySpecies, level, TrainerSlot.TRAINER, isBoss, false, dataSource); + battle.enemyParty[e] = globalScene.addEnemyPokemon( + enemySpecies, + level, + TrainerSlot.TRAINER, + isBoss, + false, + dataSource, + ); } else { battle.enemyParty[e] = battle.trainer.genPartyMember(e); } @@ -209,7 +247,14 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): enemySpecies = globalScene.randomSpecies(battle.waveIndex, level, true); } - battle.enemyParty[e] = globalScene.addEnemyPokemon(enemySpecies, level, TrainerSlot.NONE, isBoss, false, dataSource); + battle.enemyParty[e] = globalScene.addEnemyPokemon( + enemySpecies, + level, + TrainerSlot.NONE, + isBoss, + false, + dataSource, + ); } } @@ -225,7 +270,7 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): enemyPokemon.resetSummonData(); } - if (!loaded && isNullOrUndefined(partyConfig.countAsSeen) || partyConfig.countAsSeen) { + if ((!loaded && isNullOrUndefined(partyConfig.countAsSeen)) || partyConfig.countAsSeen) { globalScene.gameData.setPokemonSeen(enemyPokemon, true, !!(trainerType || trainerConfig)); } @@ -264,7 +309,9 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): // Set Boss if (config.isBoss) { - let segments = !isNullOrUndefined(config.bossSegments) ? config.bossSegments! : globalScene.getEncounterBossSegments(globalScene.currentBattle.waveIndex, level, enemySpecies, true); + let segments = !isNullOrUndefined(config.bossSegments) + ? config.bossSegments! + : globalScene.getEncounterBossSegments(globalScene.currentBattle.waveIndex, level, enemySpecies, true); if (!isNullOrUndefined(config.bossSegmentModifier)) { segments += config.bossSegmentModifier; } @@ -291,7 +338,11 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): if (statusEffects) { // Default to cureturn 3 for sleep const status = Array.isArray(statusEffects) ? statusEffects[0] : statusEffects; - const cureTurn = Array.isArray(statusEffects) ? statusEffects[1] : statusEffects === StatusEffect.SLEEP ? 3 : undefined; + const cureTurn = Array.isArray(statusEffects) + ? statusEffects[1] + : statusEffects === StatusEffect.SLEEP + ? 3 + : undefined; enemyPokemon.status = new Status(status, 0, cureTurn); } @@ -329,6 +380,14 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): tags.forEach(tag => enemyPokemon.addTag(tag)); } + // Set tera + if (config.tera && config.tera !== PokemonType.UNKNOWN) { + enemyPokemon.teraType = config.tera; + if (battle.trainer) { + battle.trainer.config.setInstantTera(e); + } + } + // mysteryEncounterBattleEffects will only be used IFF MYSTERY_ENCOUNTER_POST_SUMMON tag is applied if (config.mysteryEncounterBattleEffects) { enemyPokemon.mysteryEncounterBattleEffects = config.mysteryEncounterBattleEffects; @@ -347,7 +406,31 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): loadEnemyAssets.push(enemyPokemon.loadAssets()); - console.log(`Pokemon: ${enemyPokemon.name}`, `Species ID: ${enemyPokemon.species.speciesId}`, `Stats: ${enemyPokemon.stats}`, `Ability: ${enemyPokemon.getAbility().name}`, `Passive Ability: ${enemyPokemon.getPassiveAbility().name}`); + const stats: string[] = [ + `HP: ${enemyPokemon.stats[0]} (${enemyPokemon.ivs[0]})`, + ` Atk: ${enemyPokemon.stats[1]} (${enemyPokemon.ivs[1]})`, + ` Def: ${enemyPokemon.stats[2]} (${enemyPokemon.ivs[2]})`, + ` Spatk: ${enemyPokemon.stats[3]} (${enemyPokemon.ivs[3]})`, + ` Spdef: ${enemyPokemon.stats[4]} (${enemyPokemon.ivs[4]})`, + ` Spd: ${enemyPokemon.stats[5]} (${enemyPokemon.ivs[5]})`, + ]; + const moveset: string[] = []; + enemyPokemon.getMoveset().forEach(move => { + moveset.push(move!.getName()); // TODO: remove `!` after moveset-null removal PR + }); + + console.log( + `Pokemon: ${getPokemonNameWithAffix(enemyPokemon)}`, + `| Species ID: ${enemyPokemon.species.speciesId}`, + `| Nature: ${getNatureName(enemyPokemon.nature, true, true, true)}`, + ); + console.log(`Stats (IVs): ${stats}`); + console.log( + `Ability: ${enemyPokemon.getAbility().name}`, + `| Passive Ability${enemyPokemon.hasPassive() ? "" : " (inactive)"}: ${enemyPokemon.getPassiveAbility().name}`, + `${enemyPokemon.isBoss() ? `| Boss Bars: ${enemyPokemon.bossSegments}` : ""}`, + ); + console.log("Moveset:", moveset); }); globalScene.pushPhase(new MysteryEncounterBattlePhase(partyConfig.disableSwitch)); @@ -364,7 +447,10 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): } }); if (!loaded) { - regenerateModifierPoolThresholds(globalScene.getEnemyField(), battle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD); + regenerateModifierPoolThresholds( + globalScene.getEnemyField(), + battle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD, + ); const customModifierTypes = partyConfig?.pokemonConfigs ?.filter(config => config?.modifierConfigs) .map(config => config.modifierConfigs!); @@ -380,9 +466,8 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): * @param moves */ export function loadCustomMovesForEncounter(moves: Moves | Moves[]) { - moves = Array.isArray(moves) ? moves : [ moves ]; - return Promise.all(moves.map(move => initMoveAnim(move))) - .then(() => loadMoveAnimAssets(moves)); + moves = Array.isArray(moves) ? moves : [moves]; + return Promise.all(moves.map(move => initMoveAnim(move))).then(() => loadMoveAnimAssets(moves)); } /** @@ -391,7 +476,7 @@ export function loadCustomMovesForEncounter(moves: Moves | Moves[]) { * @param playSound * @param showMessage */ -export function updatePlayerMoney(changeValue: number, playSound: boolean = true, showMessage: boolean = true) { +export function updatePlayerMoney(changeValue: number, playSound = true, showMessage = true) { globalScene.money = Math.min(Math.max(globalScene.money + changeValue, 0), Number.MAX_SAFE_INTEGER); globalScene.updateMoneyText(); globalScene.animateMoneyChanged(false); @@ -400,9 +485,21 @@ export function updatePlayerMoney(changeValue: number, playSound: boolean = true } if (showMessage) { if (changeValue < 0) { - globalScene.queueMessage(i18next.t("mysteryEncounterMessages:paid_money", { amount: -changeValue }), null, true); + globalScene.queueMessage( + i18next.t("mysteryEncounterMessages:paid_money", { + amount: -changeValue, + }), + null, + true, + ); } else { - globalScene.queueMessage(i18next.t("mysteryEncounterMessages:receive_money", { amount: changeValue }), null, true); + globalScene.queueMessage( + i18next.t("mysteryEncounterMessages:receive_money", { + amount: changeValue, + }), + null, + true, + ); } } } @@ -425,7 +522,9 @@ export function generateModifierType(modifier: () => ModifierType, pregenArgs?: .withIdFromFunc(modifierTypes[modifierId]) .withTierFromPool(ModifierPoolType.PLAYER, globalScene.getPlayerParty()); - return result instanceof ModifierTypeGenerator ? result.generateType(globalScene.getPlayerParty(), pregenArgs) : result; + return result instanceof ModifierTypeGenerator + ? result.generateType(globalScene.getPlayerParty(), pregenArgs) + : result; } /** @@ -433,7 +532,10 @@ export function generateModifierType(modifier: () => ModifierType, pregenArgs?: * @param modifier * @param pregenArgs - can specify BerryType for berries, TM for TMs, AttackBoostType for item, etc. */ -export function generateModifierTypeOption(modifier: () => ModifierType, pregenArgs?: any[]): ModifierTypeOption | null { +export function generateModifierTypeOption( + modifier: () => ModifierType, + pregenArgs?: any[], +): ModifierTypeOption | null { const result = generateModifierType(modifier, pregenArgs); if (result) { return new ModifierTypeOption(result, 0); @@ -448,80 +550,100 @@ export function generateModifierTypeOption(modifier: () => ModifierType, pregenA * @param onPokemonNotSelected - Any logic that needs to be performed if no Pokemon is chosen * @param selectablePokemonFilter */ -export function selectPokemonForOption(onPokemonSelected: (pokemon: PlayerPokemon) => void | OptionSelectItem[], onPokemonNotSelected?: () => void, selectablePokemonFilter?: PokemonSelectFilter): Promise { +export function selectPokemonForOption( + // biome-ignore lint/suspicious/noConfusingVoidType: Takes a function that either returns void or an array of OptionSelectItem + onPokemonSelected: (pokemon: PlayerPokemon) => void | OptionSelectItem[], + onPokemonNotSelected?: () => void, + selectablePokemonFilter?: PokemonSelectFilter, +): Promise { return new Promise(resolve => { const modeToSetOnExit = globalScene.ui.getMode(); // Open party screen to choose pokemon - globalScene.ui.setMode(Mode.PARTY, PartyUiMode.SELECT, -1, (slotIndex: number, option: PartyOption) => { - if (slotIndex < globalScene.getPlayerParty().length) { - globalScene.ui.setMode(modeToSetOnExit).then(() => { - const pokemon = globalScene.getPlayerParty()[slotIndex]; - const secondaryOptions = onPokemonSelected(pokemon); - if (!secondaryOptions) { - globalScene.currentBattle.mysteryEncounter!.setDialogueToken("selectedPokemon", pokemon.getNameToRender()); - resolve(true); - return; - } + globalScene.ui.setMode( + Mode.PARTY, + PartyUiMode.SELECT, + -1, + (slotIndex: number, _option: PartyOption) => { + if (slotIndex < globalScene.getPlayerParty().length) { + globalScene.ui.setMode(modeToSetOnExit).then(() => { + const pokemon = globalScene.getPlayerParty()[slotIndex]; + const secondaryOptions = onPokemonSelected(pokemon); + if (!secondaryOptions) { + globalScene.currentBattle.mysteryEncounter!.setDialogueToken( + "selectedPokemon", + pokemon.getNameToRender(), + ); + resolve(true); + return; + } - // There is a second option to choose after selecting the Pokemon - globalScene.ui.setMode(Mode.MESSAGE).then(() => { - const displayOptions = () => { - // Always appends a cancel option to bottom of options - const fullOptions = secondaryOptions.map(option => { - // Update handler to resolve promise - const onSelect = option.handler; - option.handler = () => { - onSelect(); - globalScene.currentBattle.mysteryEncounter!.setDialogueToken("selectedPokemon", pokemon.getNameToRender()); - resolve(true); - return true; + // There is a second option to choose after selecting the Pokemon + globalScene.ui.setMode(Mode.MESSAGE).then(() => { + const displayOptions = () => { + // Always appends a cancel option to bottom of options + const fullOptions = secondaryOptions + .map(option => { + // Update handler to resolve promise + const onSelect = option.handler; + option.handler = () => { + onSelect(); + globalScene.currentBattle.mysteryEncounter!.setDialogueToken( + "selectedPokemon", + pokemon.getNameToRender(), + ); + resolve(true); + return true; + }; + return option; + }) + .concat({ + label: i18next.t("menu:cancel"), + handler: () => { + globalScene.ui.clearText(); + globalScene.ui.setMode(modeToSetOnExit); + resolve(false); + return true; + }, + onHover: () => { + showEncounterText(i18next.t("mysteryEncounterMessages:cancel_option"), 0, 0, false); + }, + }); + + const config: OptionSelectConfig = { + options: fullOptions, + maxOptions: 7, + yOffset: 0, + supportHover: true, }; - return option; - }).concat({ - label: i18next.t("menu:cancel"), - handler: () => { - globalScene.ui.clearText(); - globalScene.ui.setMode(modeToSetOnExit); - resolve(false); - return true; - }, - onHover: () => { - showEncounterText(i18next.t("mysteryEncounterMessages:cancel_option"), 0, 0, false); - } - }); - const config: OptionSelectConfig = { - options: fullOptions, - maxOptions: 7, - yOffset: 0, - supportHover: true + // Do hover over the starting selection option + if (fullOptions[0].onHover) { + fullOptions[0].onHover(); + } + globalScene.ui.setModeWithoutClear(Mode.OPTION_SELECT, config, null, true); }; - // Do hover over the starting selection option - if (fullOptions[0].onHover) { - fullOptions[0].onHover(); + const textPromptKey = + globalScene.currentBattle.mysteryEncounter?.selectedOption?.dialogue?.secondOptionPrompt; + if (!textPromptKey) { + displayOptions(); + } else { + showEncounterText(textPromptKey).then(() => displayOptions()); } - globalScene.ui.setModeWithoutClear(Mode.OPTION_SELECT, config, null, true); - }; - - const textPromptKey = globalScene.currentBattle.mysteryEncounter?.selectedOption?.dialogue?.secondOptionPrompt; - if (!textPromptKey) { - displayOptions(); - } else { - showEncounterText(textPromptKey).then(() => displayOptions()); - } + }); }); - }); - } else { - globalScene.ui.setMode(modeToSetOnExit).then(() => { - if (onPokemonNotSelected) { - onPokemonNotSelected(); - } - resolve(false); - }); - } - }, selectablePokemonFilter); + } else { + globalScene.ui.setMode(modeToSetOnExit).then(() => { + if (onPokemonNotSelected) { + onPokemonNotSelected(); + } + resolve(false); + }); + } + }, + selectablePokemonFilter, + ); }); } @@ -539,7 +661,12 @@ interface PokemonAndOptionSelected { * @param selectablePokemonFilter * @param onHoverOverCancelOption */ -export function selectOptionThenPokemon(options: OptionSelectItem[], optionSelectPromptKey: string, selectablePokemonFilter?: PokemonSelectFilter, onHoverOverCancelOption?: () => void): Promise { +export function selectOptionThenPokemon( + options: OptionSelectItem[], + optionSelectPromptKey: string, + selectablePokemonFilter?: PokemonSelectFilter, + onHoverOverCancelOption?: () => void, +): Promise { return new Promise(resolve => { const modeToSetOnExit = globalScene.ui.getMode(); @@ -565,51 +692,62 @@ export function selectOptionThenPokemon(options: OptionSelectItem[], optionSelec const selectPokemonAfterOption = (selectedOptionIndex: number) => { // Open party screen to choose a Pokemon - globalScene.ui.setMode(Mode.PARTY, PartyUiMode.SELECT, -1, (slotIndex: number, option: PartyOption) => { - if (slotIndex < globalScene.getPlayerParty().length) { - // Pokemon and option selected - globalScene.ui.setMode(modeToSetOnExit).then(() => { - const result: PokemonAndOptionSelected = { selectedPokemonIndex: slotIndex, selectedOptionIndex: selectedOptionIndex }; - resolve(result); - }); - } else { - // Back to first option select screen - displayOptions(config); - } - }, selectablePokemonFilter); + globalScene.ui.setMode( + Mode.PARTY, + PartyUiMode.SELECT, + -1, + (slotIndex: number, _option: PartyOption) => { + if (slotIndex < globalScene.getPlayerParty().length) { + // Pokemon and option selected + globalScene.ui.setMode(modeToSetOnExit).then(() => { + const result: PokemonAndOptionSelected = { + selectedPokemonIndex: slotIndex, + selectedOptionIndex: selectedOptionIndex, + }; + resolve(result); + }); + } else { + // Back to first option select screen + displayOptions(config); + } + }, + selectablePokemonFilter, + ); }; // Always appends a cancel option to bottom of options - const fullOptions = options.map((option, index) => { - // Update handler to resolve promise - const onSelect = option.handler; - option.handler = () => { - onSelect(); - selectPokemonAfterOption(index); - return true; - }; - return option; - }).concat({ - label: i18next.t("menu:cancel"), - handler: () => { - globalScene.ui.clearText(); - globalScene.ui.setMode(modeToSetOnExit); - resolve(null); - return true; - }, - onHover: () => { - if (onHoverOverCancelOption) { - onHoverOverCancelOption(); - } - showEncounterText(i18next.t("mysteryEncounterMessages:cancel_option"), 0, 0, false); - } - }); + const fullOptions = options + .map((option, index) => { + // Update handler to resolve promise + const onSelect = option.handler; + option.handler = () => { + onSelect(); + selectPokemonAfterOption(index); + return true; + }; + return option; + }) + .concat({ + label: i18next.t("menu:cancel"), + handler: () => { + globalScene.ui.clearText(); + globalScene.ui.setMode(modeToSetOnExit); + resolve(null); + return true; + }, + onHover: () => { + if (onHoverOverCancelOption) { + onHoverOverCancelOption(); + } + showEncounterText(i18next.t("mysteryEncounterMessages:cancel_option"), 0, 0, false); + }, + }); const config: OptionSelectConfig = { options: fullOptions, maxOptions: 7, yOffset: 0, - supportHover: true + supportHover: true, }; displayOptions(config); @@ -623,7 +761,11 @@ export function selectOptionThenPokemon(options: OptionSelectItem[], optionSelec * @param eggRewards * @param preRewardsCallback - can execute an arbitrary callback before the new phases if necessary (useful for updating items/party/injecting new phases before {@linkcode MysteryEncounterRewardsPhase}) */ -export function setEncounterRewards(customShopRewards?: CustomModifierSettings, eggRewards?: IEggOptions[], preRewardsCallback?: Function) { +export function setEncounterRewards( + customShopRewards?: CustomModifierSettings, + eggRewards?: IEggOptions[], + preRewardsCallback?: Function, +) { globalScene.currentBattle.mysteryEncounter!.doEncounterRewards = () => { if (preRewardsCallback) { preRewardsCallback(); @@ -666,8 +808,8 @@ export function setEncounterRewards(customShopRewards?: CustomModifierSettings, * https://bulbapedia.bulbagarden.net/wiki/List_of_Pok%C3%A9mon_by_effort_value_yield_(Generation_IX) * @param useWaveIndex - set to false when directly passing the the full exp value instead of baseExpValue */ -export function setEncounterExp(participantId: number | number[], baseExpValue: number, useWaveIndex: boolean = true) { - const participantIds = Array.isArray(participantId) ? participantId : [ participantId ]; +export function setEncounterExp(participantId: number | number[], baseExpValue: number, useWaveIndex = true) { + const participantIds = Array.isArray(participantId) ? participantId : [participantId]; globalScene.currentBattle.mysteryEncounter!.doEncounterExp = () => { globalScene.unshiftPhase(new PartyExpPhase(baseExpValue, useWaveIndex, new Set(participantIds))); @@ -701,7 +843,10 @@ export function initSubsequentOptionSelect(optionSelectSettings: OptionSelectSet * @param addHealPhase - when true, will add a shop phase to end of encounter with 0 rewards but healing items are available * @param encounterMode - Can set custom encounter mode if necessary (may be required for forcing Pokemon to return before next phase) */ -export function leaveEncounterWithoutBattle(addHealPhase: boolean = false, encounterMode: MysteryEncounterMode = MysteryEncounterMode.NO_BATTLE) { +export function leaveEncounterWithoutBattle( + addHealPhase = false, + encounterMode: MysteryEncounterMode = MysteryEncounterMode.NO_BATTLE, +) { globalScene.currentBattle.mysteryEncounter!.encounterMode = encounterMode; globalScene.clearPhaseQueue(); globalScene.clearPhaseQueueSplice(); @@ -713,8 +858,8 @@ export function leaveEncounterWithoutBattle(addHealPhase: boolean = false, encou * @param addHealPhase - Adds an empty shop phase to allow player to purchase healing items * @param doNotContinue - default `false`. If set to true, will not end the battle and continue to next wave */ -export function handleMysteryEncounterVictory(addHealPhase: boolean = false, doNotContinue: boolean = false) { - const allowedPkm = globalScene.getPlayerParty().filter((pkm) => pkm.isAllowedInBattle()); +export function handleMysteryEncounterVictory(addHealPhase = false, doNotContinue = false) { + const allowedPkm = globalScene.getPlayerParty().filter(pkm => pkm.isAllowedInBattle()); if (allowedPkm.length === 0) { globalScene.clearPhaseQueue(); @@ -727,10 +872,17 @@ export function handleMysteryEncounterVictory(addHealPhase: boolean = false, doN const encounter = globalScene.currentBattle.mysteryEncounter!; if (encounter.continuousEncounter || doNotContinue) { return; - } else if (encounter.encounterMode === MysteryEncounterMode.NO_BATTLE) { + } + if (encounter.encounterMode === MysteryEncounterMode.NO_BATTLE) { globalScene.pushPhase(new MysteryEncounterRewardsPhase(addHealPhase)); globalScene.pushPhase(new EggLapsePhase()); - } else if (!globalScene.getEnemyParty().find(p => encounter.encounterMode !== MysteryEncounterMode.TRAINER_BATTLE ? p.isOnField() : !p?.isFainted(true))) { + } else if ( + !globalScene + .getEnemyParty() + .find(p => + encounter.encounterMode !== MysteryEncounterMode.TRAINER_BATTLE ? p.isOnField() : !p?.isFainted(true), + ) + ) { globalScene.pushPhase(new BattleEndPhase(true)); if (encounter.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) { globalScene.pushPhase(new TrainerVictoryPhase()); @@ -749,8 +901,8 @@ export function handleMysteryEncounterVictory(addHealPhase: boolean = false, doN * Similar to {@linkcode handleMysteryEncounterVictory}, but for cases where the player lost a battle or failed a challenge * @param addHealPhase */ -export function handleMysteryEncounterBattleFailed(addHealPhase: boolean = false, doNotContinue: boolean = false) { - const allowedPkm = globalScene.getPlayerParty().filter((pkm) => pkm.isAllowedInBattle()); +export function handleMysteryEncounterBattleFailed(addHealPhase = false, doNotContinue = false) { + const allowedPkm = globalScene.getPlayerParty().filter(pkm => pkm.isAllowedInBattle()); if (allowedPkm.length === 0) { globalScene.clearPhaseQueue(); @@ -763,7 +915,8 @@ export function handleMysteryEncounterBattleFailed(addHealPhase: boolean = false const encounter = globalScene.currentBattle.mysteryEncounter!; if (encounter.continuousEncounter || doNotContinue) { return; - } else if (encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE) { + } + if (encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE) { globalScene.pushPhase(new BattleEndPhase(false)); } @@ -781,7 +934,7 @@ export function handleMysteryEncounterBattleFailed(addHealPhase: boolean = false * @param destroy - If true, will destroy visuals ONLY ON HIDE TRANSITION. Does nothing on show. Defaults to true * @param duration */ -export function transitionMysteryEncounterIntroVisuals(hide: boolean = true, destroy: boolean = true, duration: number = 750): Promise { +export function transitionMysteryEncounterIntroVisuals(hide = true, destroy = true, duration = 750): Promise { return new Promise(resolve => { const introVisuals = globalScene.currentBattle.mysteryEncounter!.introVisuals; const enemyPokemon = globalScene.getEnemyField(); @@ -799,7 +952,7 @@ export function transitionMysteryEncounterIntroVisuals(hide: boolean = true, des // Transition globalScene.tweens.add({ - targets: [ introVisuals, enemyPokemon ], + targets: [introVisuals, enemyPokemon], x: `${hide ? "+" : "-"}=16`, y: `${hide ? "-" : "+"}=16`, alpha: hide ? 0 : 1, @@ -810,13 +963,13 @@ export function transitionMysteryEncounterIntroVisuals(hide: boolean = true, des globalScene.field.remove(introVisuals, true); enemyPokemon.forEach(pokemon => { - globalScene.field.remove(pokemon, true); + pokemon.leaveField(true, true, true); }); globalScene.currentBattle.mysteryEncounter!.introVisuals = undefined; } resolve(true); - } + }, }); } else { resolve(true); @@ -830,10 +983,15 @@ export function transitionMysteryEncounterIntroVisuals(hide: boolean = true, des */ export function handleMysteryEncounterBattleStartEffects() { const encounter = globalScene.currentBattle.mysteryEncounter; - if (globalScene.currentBattle.isBattleMysteryEncounter() && encounter && encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE && !encounter.startOfBattleEffectsComplete) { + if ( + globalScene.currentBattle.isBattleMysteryEncounter() && + encounter && + encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE && + !encounter.startOfBattleEffectsComplete + ) { const effects = encounter.startOfBattleEffects; effects.forEach(effect => { - let source; + let source: EnemyPokemon | Pokemon; if (effect.sourcePokemon) { source = effect.sourcePokemon; } else if (!isNullOrUndefined(effect.sourceBattlerIndex)) { @@ -851,6 +1009,7 @@ export function handleMysteryEncounterBattleStartEffects() { } else { source = globalScene.getEnemyField()[0]; } + // @ts-ignore: source cannot be undefined globalScene.pushPhase(new MovePhase(source, effect.targets, effect.move, effect.followUp, effect.ignorePp)); }); @@ -883,20 +1042,36 @@ export function handleMysteryEncounterTurnStartEffects(): boolean { * @param rerollHidden whether the mon should get an extra roll for Hidden Ability * @returns {@linkcode EnemyPokemon} for the requested encounter */ -export function getRandomEncounterSpecies(level: number, isBoss: boolean = false, rerollHidden: boolean = false): EnemyPokemon { +export function getRandomEncounterSpecies(level: number, isBoss = false, rerollHidden = false): EnemyPokemon { let bossSpecies: PokemonSpecies; let isEventEncounter = false; const eventEncounters = globalScene.eventManager.getEventEncounters(); + let formIndex: number | undefined; if (eventEncounters.length > 0 && randSeedInt(2) === 1) { const eventEncounter = randSeedItem(eventEncounters); - const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, !eventEncounter.blockEvolution, isBoss, globalScene.gameMode); + const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel( + level, + !eventEncounter.blockEvolution, + isBoss, + globalScene.gameMode, + ); isEventEncounter = true; bossSpecies = getPokemonSpecies(levelSpecies); + formIndex = eventEncounter.formIndex; } else { - bossSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, level, 0, getPartyLuckValue(globalScene.getPlayerParty()), isBoss); + bossSpecies = globalScene.arena.randomSpecies( + globalScene.currentBattle.waveIndex, + level, + 0, + getPartyLuckValue(globalScene.getPlayerParty()), + isBoss, + ); } const ret = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, isBoss); + if (formIndex) { + ret.formIndex = formIndex; + } //Reroll shiny for event encounters if (isEventEncounter && !ret.shiny) { @@ -918,15 +1093,24 @@ export function getRandomEncounterSpecies(level: number, isBoss: boolean = false export function calculateMEAggregateStats(baseSpawnWeight: number) { const numRuns = 1000; let run = 0; - const biomes = Object.keys(Biome).filter(key => isNaN(Number(key))); - const alwaysPickTheseBiomes = [ Biome.ISLAND, Biome.ABYSS, Biome.WASTELAND, Biome.FAIRY_CAVE, Biome.TEMPLE, Biome.LABORATORY, Biome.SPACE, Biome.WASTELAND ]; + const biomes = Object.keys(Biome).filter(key => Number.isNaN(Number(key))); + const alwaysPickTheseBiomes = [ + Biome.ISLAND, + Biome.ABYSS, + Biome.WASTELAND, + Biome.FAIRY_CAVE, + Biome.TEMPLE, + Biome.LABORATORY, + Biome.SPACE, + Biome.WASTELAND, + ]; const calculateNumEncounters = (): any[] => { let encounterRate = baseSpawnWeight; // BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT - const numEncounters = [ 0, 0, 0, 0 ]; + const numEncounters = [0, 0, 0, 0]; let mostRecentEncounterWave = 0; - const encountersByBiome = new Map(biomes.map(b => [ b, 0 ])); - const validMEfloorsByBiome = new Map(biomes.map(b => [ b, 0 ])); + const encountersByBiome = new Map(biomes.map(b => [b, 0])); + const validMEfloorsByBiome = new Map(biomes.map(b => [b, 0])); let currentBiome = Biome.TOWN; let currentArena = globalScene.newArena(currentBiome); globalScene.setSeed(Utils.randomString(24)); @@ -946,7 +1130,7 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) { .filter(b => { return !Array.isArray(b) || !Utils.randSeedInt(b[1]); }) - .map(b => !Array.isArray(b) ? b : b[0]); + .map(b => (!Array.isArray(b) ? b : b[0])); }, i * 100); if (biomes! && biomes.length > 0) { const specialBiomes = biomes.filter(b => alwaysPickTheseBiomes.includes(b)); @@ -957,7 +1141,7 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) { } } } else if (biomeLinks.hasOwnProperty(currentBiome)) { - currentBiome = (biomeLinks[currentBiome] as Biome); + currentBiome = biomeLinks[currentBiome] as Biome; } else { if (!(i % 50)) { currentBiome = Biome.END; @@ -986,12 +1170,12 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) { // If total number of encounters is lower than expected for the run, slightly favor a new encounter // Do the reverse as well - const expectedEncountersByFloor = AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (180 - 10) * (i - 10); + const expectedEncountersByFloor = (AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (180 - 10)) * (i - 10); const currentRunDiffFromAvg = expectedEncountersByFloor - numEncounters.reduce((a, b) => a + b); const favoredEncounterRate = encounterRate + currentRunDiffFromAvg * 15; // If the most recent ME was 3 or fewer waves ago, can never spawn a ME - const canSpawn = (i - mostRecentEncounterWave) > 3; + const canSpawn = i - mostRecentEncounterWave > 3; if (canSpawn && roll < favoredEncounterRate) { mostRecentEncounterWave = i; @@ -999,7 +1183,7 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) { // Calculate encounter rarity // Common / Uncommon / Rare / Super Rare (base is out of 128) - const tierWeights = [ 66, 40, 19, 3 ]; + const tierWeights = [66, 40, 19, 3]; // Adjust tier weights by currently encountered events (pity system that lowers odds of multiple Common/Great) tierWeights[0] = tierWeights[0] - 6 * numEncounters[0]; @@ -1011,14 +1195,20 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) { const uncommonThreshold = totalWeight - tierWeights[0] - tierWeights[1]; // 64 - 32 - 16 = 16 const rareThreshold = totalWeight - tierWeights[0] - tierWeights[1] - tierWeights[2]; // 64 - 32 - 16 - 10 = 6 - tierValue > commonThreshold ? ++numEncounters[0] : tierValue > uncommonThreshold ? ++numEncounters[1] : tierValue > rareThreshold ? ++numEncounters[2] : ++numEncounters[3]; + tierValue > commonThreshold + ? ++numEncounters[0] + : tierValue > uncommonThreshold + ? ++numEncounters[1] + : tierValue > rareThreshold + ? ++numEncounters[2] + : ++numEncounters[3]; encountersByBiome.set(Biome[currentBiome], (encountersByBiome.get(Biome[currentBiome]) ?? 0) + 1); } else { encounterRate += WEIGHT_INCREMENT_ON_SPAWN_MISS; } } - return [ numEncounters, encountersByBiome, validMEfloorsByBiome ]; + return [numEncounters, encountersByBiome, validMEfloorsByBiome]; }; const encounterRuns: number[][] = []; @@ -1026,7 +1216,7 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) { const validFloorsByBiome: Map[] = []; while (run < numRuns) { globalScene.executeWithSeedOffset(() => { - const [ numEncounters, encountersByBiome, validMEfloorsByBiome ] = calculateNumEncounters(); + const [numEncounters, encountersByBiome, validMEfloorsByBiome] = calculateNumEncounters(); encounterRuns.push(numEncounters); encountersByBiomeRuns.push(encountersByBiome); validFloorsByBiome.push(validMEfloorsByBiome); @@ -1067,13 +1257,17 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) { let stats = `Starting weight: ${baseSpawnWeight}\nAverage MEs per run: ${totalMean}\nStandard Deviation: ${totalStd}\nAvg Commons: ${commonMean}\nAvg Greats: ${uncommonMean}\nAvg Ultras: ${rareMean}\nAvg Rogues: ${superRareMean}\n`; - const meanEncountersPerRunPerBiomeSorted = [ ...meanEncountersPerRunPerBiome.entries() ].sort((e1, e2) => e2[1] - e1[1]); - meanEncountersPerRunPerBiomeSorted.forEach(value => stats = stats + `${value[0]}: avg valid floors ${meanMEFloorsPerRunPerBiome.get(value[0])}, avg MEs ${value[1]},\n`); + const meanEncountersPerRunPerBiomeSorted = [...meanEncountersPerRunPerBiome.entries()].sort( + (e1, e2) => e2[1] - e1[1], + ); + + for (const value of meanEncountersPerRunPerBiomeSorted) { + stats += value[0] + "avg valid floors " + meanMEFloorsPerRunPerBiome.get(value[0]) + ", avg MEs ${value[1]},\n"; + } console.log(stats); } - /** * TODO: remove once encounter spawn rate is finalized * Just a helper function to calculate aggregate stats for MEs in a Classic run @@ -1084,7 +1278,7 @@ export function calculateRareSpawnAggregateStats(luckValue: number) { let run = 0; const calculateNumRareEncounters = (): any[] => { - const bossEncountersByRarity = [ 0, 0, 0, 0 ]; + const bossEncountersByRarity = [0, 0, 0, 0]; globalScene.setSeed(Utils.randomString(24)); globalScene.resetSeed(); // There are 12 wild boss floors @@ -1092,17 +1286,20 @@ export function calculateRareSpawnAggregateStats(luckValue: number) { // Roll boss tier // luck influences encounter rarity let luckModifier = 0; - if (!isNaN(luckValue)) { + if (!Number.isNaN(luckValue)) { luckModifier = luckValue * 0.5; } const tierValue = Utils.randSeedInt(64 - luckModifier); - const tier = tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE; + const tier = + tierValue >= 20 + ? BiomePoolTier.BOSS + : tierValue >= 6 + ? BiomePoolTier.BOSS_RARE + : tierValue >= 1 + ? BiomePoolTier.BOSS_SUPER_RARE + : BiomePoolTier.BOSS_ULTRA_RARE; switch (tier) { - default: - case BiomePoolTier.BOSS: - ++bossEncountersByRarity[0]; - break; case BiomePoolTier.BOSS_RARE: ++bossEncountersByRarity[1]; break; @@ -1112,6 +1309,10 @@ export function calculateRareSpawnAggregateStats(luckValue: number) { case BiomePoolTier.BOSS_ULTRA_RARE: ++bossEncountersByRarity[3]; break; + case BiomePoolTier.BOSS: + default: + ++bossEncountersByRarity[0]; + break; } } diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts index bcce2ad1349..275078dbace 100644 --- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts @@ -4,7 +4,12 @@ import { isNullOrUndefined, randSeedInt } from "#app/utils"; import { PokemonHeldItemModifier } from "#app/modifier/modifier"; import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; -import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor } from "#app/data/pokeball"; +import { + doPokeballBounceAnim, + getPokeballAtlasKey, + getPokeballCatchMultiplier, + getPokeballTintColor, +} from "#app/data/pokeball"; import { PlayerGender } from "#enums/player-gender"; import { addPokeballCaptureStars, addPokeballOpenParticles } from "#app/field/anims"; import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect"; @@ -13,11 +18,15 @@ import { Mode } from "#app/ui/ui"; import type { PartyOption } from "#app/ui/party-ui-handler"; import { PartyUiMode } from "#app/ui/party-ui-handler"; import { Species } from "#enums/species"; -import type { Type } from "#enums/type"; +import type { PokemonType } from "#enums/pokemon-type"; import type PokemonSpecies from "#app/data/pokemon-species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { speciesStarterCosts } from "#app/data/balance/starters"; -import { getEncounterText, queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +import { + getEncounterText, + queueEncounterMessage, + showEncounterText, +} from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { getPokemonNameWithAffix } from "#app/messages"; import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; @@ -41,18 +50,41 @@ export const STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER = 1; * @param shiny * @param variant */ -export function getSpriteKeysFromSpecies(species: Species, female?: boolean, formIndex?: number, shiny?: boolean, variant?: number): { spriteKey: string, fileRoot: string } { - const spriteKey = getPokemonSpecies(species).getSpriteKey(female ?? false, formIndex ?? 0, shiny ?? false, variant ?? 0); - const fileRoot = getPokemonSpecies(species).getSpriteAtlasPath(female ?? false, formIndex ?? 0, shiny ?? false, variant ?? 0); +export function getSpriteKeysFromSpecies( + species: Species, + female?: boolean, + formIndex?: number, + shiny?: boolean, + variant?: number, +): { spriteKey: string; fileRoot: string } { + const spriteKey = getPokemonSpecies(species).getSpriteKey( + female ?? false, + formIndex ?? 0, + shiny ?? false, + variant ?? 0, + ); + const fileRoot = getPokemonSpecies(species).getSpriteAtlasPath( + female ?? false, + formIndex ?? 0, + shiny ?? false, + variant ?? 0, + ); return { spriteKey, fileRoot }; } /** * Gets the sprite key and file root for a given Pokemon (accounts for gender, shiny, variants, forms, and experimental) */ -export function getSpriteKeysFromPokemon(pokemon: Pokemon): { spriteKey: string, fileRoot: string } { - const spriteKey = pokemon.getSpeciesForm().getSpriteKey(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant); - const fileRoot = pokemon.getSpeciesForm().getSpriteAtlasPath(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant); +export function getSpriteKeysFromPokemon(pokemon: Pokemon): { + spriteKey: string; + fileRoot: string; +} { + const spriteKey = pokemon + .getSpeciesForm() + .getSpriteKey(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant); + const fileRoot = pokemon + .getSpeciesForm() + .getSpriteAtlasPath(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant); return { spriteKey, fileRoot }; } @@ -65,7 +97,11 @@ export function getSpriteKeysFromPokemon(pokemon: Pokemon): { spriteKey: string, * @param doNotReturnLastAllowedMon Default `false`. If `true`, will never return the last unfainted pokemon in the party. Useful when this function is being used to determine what Pokemon to remove from the party (Don't want to remove last unfainted) * @returns */ -export function getRandomPlayerPokemon(isAllowed: boolean = false, isFainted: boolean = false, doNotReturnLastAllowedMon: boolean = false): PlayerPokemon { +export function getRandomPlayerPokemon( + isAllowed = false, + isFainted = false, + doNotReturnLastAllowedMon = false, +): PlayerPokemon { const party = globalScene.getPlayerParty(); let chosenIndex: number; let chosenPokemon: PlayerPokemon | null = null; @@ -104,7 +140,7 @@ export function getRandomPlayerPokemon(isAllowed: boolean = false, isFainted: bo * @param isFainted Default false. If true, includes fainted mons. * @returns */ -export function getHighestLevelPlayerPokemon(isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon { +export function getHighestLevelPlayerPokemon(isAllowed = false, isFainted = false): PlayerPokemon { const party = globalScene.getPlayerParty(); let pokemon: PlayerPokemon | null = null; @@ -116,7 +152,7 @@ export function getHighestLevelPlayerPokemon(isAllowed: boolean = false, isFaint continue; } - pokemon = pokemon ? pokemon?.level < p?.level ? p : pokemon : p; + pokemon = pokemon ? (pokemon?.level < p?.level ? p : pokemon) : p; } return pokemon!; @@ -130,7 +166,7 @@ export function getHighestLevelPlayerPokemon(isAllowed: boolean = false, isFaint * @param isFainted Default false. If true, includes fainted mons. * @returns */ -export function getHighestStatPlayerPokemon(stat: PermanentStat, isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon { +export function getHighestStatPlayerPokemon(stat: PermanentStat, isAllowed = false, isFainted = false): PlayerPokemon { const party = globalScene.getPlayerParty(); let pokemon: PlayerPokemon | null = null; @@ -142,7 +178,7 @@ export function getHighestStatPlayerPokemon(stat: PermanentStat, isAllowed: bool continue; } - pokemon = pokemon ? pokemon.getStat(stat) < p?.getStat(stat) ? p : pokemon : p; + pokemon = pokemon ? (pokemon.getStat(stat) < p?.getStat(stat) ? p : pokemon) : p; } return pokemon!; @@ -155,7 +191,7 @@ export function getHighestStatPlayerPokemon(stat: PermanentStat, isAllowed: bool * @param isFainted Default false. If true, includes fainted mons. * @returns */ -export function getLowestLevelPlayerPokemon(isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon { +export function getLowestLevelPlayerPokemon(isAllowed = false, isFainted = false): PlayerPokemon { const party = globalScene.getPlayerParty(); let pokemon: PlayerPokemon | null = null; @@ -167,7 +203,7 @@ export function getLowestLevelPlayerPokemon(isAllowed: boolean = false, isFainte continue; } - pokemon = pokemon ? pokemon?.level > p?.level ? p : pokemon : p; + pokemon = pokemon ? (pokemon?.level > p?.level ? p : pokemon) : p; } return pokemon!; @@ -180,7 +216,7 @@ export function getLowestLevelPlayerPokemon(isAllowed: boolean = false, isFainte * @param isFainted Default false. If true, includes fainted mons. * @returns */ -export function getHighestStatTotalPlayerPokemon(isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon { +export function getHighestStatTotalPlayerPokemon(isAllowed = false, isFainted = false): PlayerPokemon { const party = globalScene.getPlayerParty(); let pokemon: PlayerPokemon | null = null; @@ -192,7 +228,7 @@ export function getHighestStatTotalPlayerPokemon(isAllowed: boolean = false, isF continue; } - pokemon = pokemon ? pokemon?.stats.reduce((a, b) => a + b) < p?.stats.reduce((a, b) => a + b) ? p : pokemon : p; + pokemon = pokemon ? (pokemon?.stats.reduce((a, b) => a + b) < p?.stats.reduce((a, b) => a + b) ? p : pokemon) : p; } return pokemon!; @@ -209,28 +245,40 @@ export function getHighestStatTotalPlayerPokemon(isAllowed: boolean = false, isF * @param allowMythical * @returns */ -export function getRandomSpeciesByStarterCost(starterTiers: number | [number, number], excludedSpecies?: Species[], types?: Type[], allowSubLegendary: boolean = true, allowLegendary: boolean = true, allowMythical: boolean = true): Species { +export function getRandomSpeciesByStarterCost( + starterTiers: number | [number, number], + excludedSpecies?: Species[], + types?: PokemonType[], + allowSubLegendary = true, + allowLegendary = true, + allowMythical = true, +): Species { let min = Array.isArray(starterTiers) ? starterTiers[0] : starterTiers; let max = Array.isArray(starterTiers) ? starterTiers[1] : starterTiers; let filteredSpecies: [PokemonSpecies, number][] = Object.keys(speciesStarterCosts) - .map(s => [ parseInt(s) as Species, speciesStarterCosts[s] as number ]) + .map(s => [Number.parseInt(s) as Species, speciesStarterCosts[s] as number]) .filter(s => { const pokemonSpecies = getPokemonSpecies(s[0]); - return pokemonSpecies && (!excludedSpecies || !excludedSpecies.includes(s[0])) - && (allowSubLegendary || !pokemonSpecies.subLegendary) - && (allowLegendary || !pokemonSpecies.legendary) - && (allowMythical || !pokemonSpecies.mythical); + return ( + pokemonSpecies && + (!excludedSpecies || !excludedSpecies.includes(s[0])) && + (allowSubLegendary || !pokemonSpecies.subLegendary) && + (allowLegendary || !pokemonSpecies.legendary) && + (allowMythical || !pokemonSpecies.mythical) + ); }) - .map(s => [ getPokemonSpecies(s[0]), s[1] ]); + .map(s => [getPokemonSpecies(s[0]), s[1]]); if (types && types.length > 0) { - filteredSpecies = filteredSpecies.filter(s => types.includes(s[0].type1) || (!isNullOrUndefined(s[0].type2) && types.includes(s[0].type2))); + filteredSpecies = filteredSpecies.filter( + s => types.includes(s[0].type1) || (!isNullOrUndefined(s[0].type2) && types.includes(s[0].type2)), + ); } // If no filtered mons exist at specified starter tiers, will expand starter search range until there are // Starts by decrementing starter tier min until it is 0, then increments tier max up to 10 - let tryFilterStarterTiers: [PokemonSpecies, number][] = filteredSpecies.filter(s => (s[1] >= min && s[1] <= max)); + let tryFilterStarterTiers: [PokemonSpecies, number][] = filteredSpecies.filter(s => s[1] >= min && s[1] <= max); while (tryFilterStarterTiers.length === 0 && !(min === 0 && max === 10)) { if (min > 0) { min--; @@ -259,7 +307,11 @@ export function koPlayerPokemon(pokemon: PlayerPokemon) { pokemon.hp = 0; pokemon.trySetStatus(StatusEffect.FAINT); pokemon.updateInfo(); - queueEncounterMessage(i18next.t("battle:fainted", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + queueEncounterMessage( + i18next.t("battle:fainted", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } /** @@ -290,7 +342,9 @@ function applyHpChangeToPokemon(pokemon: PlayerPokemon, value: number) { */ export function applyDamageToPokemon(pokemon: PlayerPokemon, damage: number) { if (damage <= 0) { - console.warn("Healing pokemon with `applyDamageToPokemon` is not recommended! Please use `applyHealToPokemon` instead."); + console.warn( + "Healing pokemon with `applyDamageToPokemon` is not recommended! Please use `applyHealToPokemon` instead.", + ); } // If a Pokemon would faint from the damage applied, its HP is instead set to 1. if (pokemon.isAllowedInBattle() && pokemon.hp - damage <= 0) { @@ -308,7 +362,9 @@ export function applyDamageToPokemon(pokemon: PlayerPokemon, damage: number) { */ export function applyHealToPokemon(pokemon: PlayerPokemon, heal: number) { if (heal <= 0) { - console.warn("Damaging pokemon with `applyHealToPokemon` is not recommended! Please use `applyDamageToPokemon` instead."); + console.warn( + "Damaging pokemon with `applyHealToPokemon` is not recommended! Please use `applyDamageToPokemon` instead.", + ); } applyHpChangeToPokemon(pokemon, heal); @@ -321,12 +377,13 @@ export function applyHealToPokemon(pokemon: PlayerPokemon, heal: number) { * @param value */ export async function modifyPlayerPokemonBST(pokemon: PlayerPokemon, value: number) { - const modType = modifierTypes.MYSTERY_ENCOUNTER_SHUCKLE_JUICE() - .generateType(globalScene.getPlayerParty(), [ value ]) + const modType = modifierTypes + .MYSTERY_ENCOUNTER_SHUCKLE_JUICE() + .generateType(globalScene.getPlayerParty(), [value]) ?.withIdFromFunc(modifierTypes.MYSTERY_ENCOUNTER_SHUCKLE_JUICE); const modifier = modType?.newModifier(pokemon); if (modifier) { - await globalScene.addModifier(modifier, false, false, false, true); + globalScene.addModifier(modifier, false, false, false, true); pokemon.calculateStats(); } } @@ -339,15 +396,20 @@ export async function modifyPlayerPokemonBST(pokemon: PlayerPokemon, value: numb * @param modType * @param fallbackModifierType */ -export async function applyModifierTypeToPlayerPokemon(pokemon: PlayerPokemon, modType: PokemonHeldItemModifierType, fallbackModifierType?: PokemonHeldItemModifierType) { +export async function applyModifierTypeToPlayerPokemon( + pokemon: PlayerPokemon, + modType: PokemonHeldItemModifierType, + fallbackModifierType?: PokemonHeldItemModifierType, +) { // Check if the Pokemon has max stacks of that item already const modifier = modType.newModifier(pokemon); - const existing = globalScene.findModifier(m => ( - m instanceof PokemonHeldItemModifier && - m.type.id === modType.id && - m.pokemonId === pokemon.id && - m.matchType(modifier) - )) as PokemonHeldItemModifier; + const existing = globalScene.findModifier( + m => + m instanceof PokemonHeldItemModifier && + m.type.id === modType.id && + m.pokemonId === pokemon.id && + m.matchType(modifier), + ) as PokemonHeldItemModifier; // At max stacks if (existing && existing.getStackCount() >= existing.getMaxStackCount()) { @@ -359,7 +421,7 @@ export async function applyModifierTypeToPlayerPokemon(pokemon: PlayerPokemon, m return applyModifierTypeToPlayerPokemon(pokemon, fallbackModifierType); } - await globalScene.addModifier(modifier, false, false, false, true); + globalScene.addModifier(modifier, false, false, false, true); } /** @@ -373,7 +435,11 @@ export async function applyModifierTypeToPlayerPokemon(pokemon: PlayerPokemon, m * @param pokeballType * @param ballTwitchRate - can pass custom ball catch rates (for special events, like safari) */ -export function trainerThrowPokeball(pokemon: EnemyPokemon, pokeballType: PokeballType, ballTwitchRate?: number): Promise { +export function trainerThrowPokeball( + pokemon: EnemyPokemon, + pokeballType: PokeballType, + ballTwitchRate?: number, +): Promise { const originalY: number = pokemon.y; if (!ballTwitchRate) { @@ -397,7 +463,9 @@ export function trainerThrowPokeball(pokemon: EnemyPokemon, pokeballType: Pokeba }); return new Promise(resolve => { - globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`); + globalScene.trainer.setTexture( + `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`, + ); globalScene.time.delayedCall(512, () => { globalScene.playSound("se/pb_throw"); @@ -406,7 +474,9 @@ export function trainerThrowPokeball(pokemon: EnemyPokemon, pokeballType: Pokeba globalScene.time.delayedCall(256, () => { globalScene.trainer.setFrame("3"); globalScene.time.delayedCall(768, () => { - globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`); + globalScene.trainer.setTexture( + `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`, + ); }); }); @@ -486,22 +556,22 @@ export function trainerThrowPokeball(pokemon: EnemyPokemon, pokeballType: Pokeba alpha: 0, duration: 200, easing: "Sine.easeIn", - onComplete: () => pbTint.destroy() + onComplete: () => pbTint.destroy(), }); - } + }, }); } }, onComplete: () => { catchPokemon(pokemon, pokeball, pokeballType).then(() => resolve(true)); - } + }, }); }; globalScene.time.delayedCall(250, () => doPokeballBounceAnim(pokeball, 16, 72, 350, doShake)); - } + }, }); - } + }, }); }); }); @@ -515,7 +585,12 @@ export function trainerThrowPokeball(pokemon: EnemyPokemon, pokeballType: Pokeba * @param pokeball * @param pokeballType */ -function failCatch(pokemon: EnemyPokemon, originalY: number, pokeball: Phaser.GameObjects.Sprite, pokeballType: PokeballType) { +function failCatch( + pokemon: EnemyPokemon, + originalY: number, + pokeball: Phaser.GameObjects.Sprite, + pokeballType: PokeballType, +) { return new Promise(resolve => { globalScene.playSound("se/pb_rel"); pokemon.setY(originalY); @@ -534,13 +609,21 @@ function failCatch(pokemon: EnemyPokemon, originalY: number, pokeball: Phaser.Ga targets: pokemon, duration: 250, ease: "Sine.easeOut", - scale: 1 + scale: 1, }); globalScene.currentBattle.lastUsedPokeball = pokeballType; removePb(pokeball); - globalScene.ui.showText(i18next.t("battle:pokemonBrokeFree", { pokemonName: pokemon.getNameToRender() }), null, () => resolve(), null, true); + globalScene.ui.showText( + i18next.t("battle:pokemonBrokeFree", { + pokemonName: pokemon.getNameToRender(), + }), + null, + () => resolve(), + null, + true, + ); }); } @@ -553,10 +636,19 @@ function failCatch(pokemon: EnemyPokemon, originalY: number, pokeball: Phaser.Ga * @param showCatchObtainMessage * @param isObtain */ -export async function catchPokemon(pokemon: EnemyPokemon, pokeball: Phaser.GameObjects.Sprite | null, pokeballType: PokeballType, showCatchObtainMessage: boolean = true, isObtain: boolean = false): Promise { +export async function catchPokemon( + pokemon: EnemyPokemon, + pokeball: Phaser.GameObjects.Sprite | null, + pokeballType: PokeballType, + showCatchObtainMessage = true, + isObtain = false, +): Promise { const speciesForm = !pokemon.fusionSpecies ? pokemon.getSpeciesForm() : pokemon.getFusionSpeciesForm(); - if (speciesForm.abilityHidden && (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1) { + if ( + speciesForm.abilityHidden && + (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1 + ) { globalScene.validateAchv(achvs.HIDDEN_ABILITY); } @@ -592,7 +684,7 @@ export async function catchPokemon(pokemon: EnemyPokemon, pokeball: Phaser.GameO }; const removePokemon = () => { if (pokemon) { - globalScene.field.remove(pokemon, true); + pokemon.leaveField(false, true, true); } }; const addToParty = (slotIndex?: number) => { @@ -611,35 +703,70 @@ export async function catchPokemon(pokemon: EnemyPokemon, pokeball: Phaser.GameO } }); }; - Promise.all([ pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon) ]).then(() => { + Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => { if (globalScene.getPlayerParty().length === 6) { const promptRelease = () => { - globalScene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.getNameToRender() }), null, () => { - globalScene.pokemonInfoContainer.makeRoomForConfirmUi(1, true); - globalScene.ui.setMode(Mode.CONFIRM, () => { - const newPokemon = globalScene.addPlayerPokemon(pokemon.species, pokemon.level, pokemon.abilityIndex, pokemon.formIndex, pokemon.gender, pokemon.shiny, pokemon.variant, pokemon.ivs, pokemon.nature, pokemon); - globalScene.ui.setMode(Mode.SUMMARY, newPokemon, 0, SummaryUiMode.DEFAULT, () => { - globalScene.ui.setMode(Mode.MESSAGE).then(() => { - promptRelease(); - }); - }, false); - }, () => { - globalScene.ui.setMode(Mode.PARTY, PartyUiMode.RELEASE, 0, (slotIndex: integer, _option: PartyOption) => { - globalScene.ui.setMode(Mode.MESSAGE).then(() => { - if (slotIndex < 6) { - addToParty(slotIndex); - } else { - promptRelease(); - } - }); - }); - }, () => { - globalScene.ui.setMode(Mode.MESSAGE).then(() => { - removePokemon(); - end(); - }); - }, "fullParty"); - }); + globalScene.ui.showText( + i18next.t("battle:partyFull", { + pokemonName: pokemon.getNameToRender(), + }), + null, + () => { + globalScene.pokemonInfoContainer.makeRoomForConfirmUi(1, true); + globalScene.ui.setMode( + Mode.CONFIRM, + () => { + const newPokemon = globalScene.addPlayerPokemon( + pokemon.species, + pokemon.level, + pokemon.abilityIndex, + pokemon.formIndex, + pokemon.gender, + pokemon.shiny, + pokemon.variant, + pokemon.ivs, + pokemon.nature, + pokemon, + ); + globalScene.ui.setMode( + Mode.SUMMARY, + newPokemon, + 0, + SummaryUiMode.DEFAULT, + () => { + globalScene.ui.setMode(Mode.MESSAGE).then(() => { + promptRelease(); + }); + }, + false, + ); + }, + () => { + globalScene.ui.setMode( + Mode.PARTY, + PartyUiMode.RELEASE, + 0, + (slotIndex: number, _option: PartyOption) => { + globalScene.ui.setMode(Mode.MESSAGE).then(() => { + if (slotIndex < 6) { + addToParty(slotIndex); + } else { + promptRelease(); + } + }); + }, + ); + }, + () => { + globalScene.ui.setMode(Mode.MESSAGE).then(() => { + removePokemon(); + end(); + }); + }, + "fullParty", + ); + }, + ); }; promptRelease(); } else { @@ -649,7 +776,15 @@ export async function catchPokemon(pokemon: EnemyPokemon, pokeball: Phaser.GameO }; if (showCatchObtainMessage) { - globalScene.ui.showText(i18next.t(isObtain ? "battle:pokemonObtained" : "battle:pokemonCaught", { pokemonName: pokemon.getNameToRender() }), null, doPokemonCatchMenu, 0, true); + globalScene.ui.showText( + i18next.t(isObtain ? "battle:pokemonObtained" : "battle:pokemonCaught", { + pokemonName: pokemon.getNameToRender(), + }), + null, + doPokemonCatchMenu, + 0, + true, + ); } else { doPokemonCatchMenu(); } @@ -671,7 +806,7 @@ function removePb(pokeball: Phaser.GameObjects.Sprite) { alpha: 0, onComplete: () => { pokeball.destroy(); - } + }, }); } } @@ -695,12 +830,18 @@ export async function doPokemonFlee(pokemon: EnemyPokemon): Promise { scale: pokemon.getSpriteScale(), onComplete: () => { pokemon.setVisible(false); - globalScene.field.remove(pokemon, true); - showEncounterText(i18next.t("battle:pokemonFled", { pokemonName: pokemon.getNameToRender() }), null, 600, false) - .then(() => { - resolve(); - }); - } + pokemon.leaveField(true, true, true); + showEncounterText( + i18next.t("battle:pokemonFled", { + pokemonName: pokemon.getNameToRender(), + }), + null, + 600, + false, + ).then(() => { + resolve(); + }); + }, }); }); } @@ -723,12 +864,18 @@ export function doPlayerFlee(pokemon: EnemyPokemon): Promise { scale: pokemon.getSpriteScale(), onComplete: () => { pokemon.setVisible(false); - globalScene.field.remove(pokemon, true); - showEncounterText(i18next.t("battle:playerFled", { pokemonName: pokemon.getNameToRender() }), null, 600, false) - .then(() => { - resolve(); - }); - } + pokemon.leaveField(true, true, true); + showEncounterText( + i18next.t("battle:playerFled", { + pokemonName: pokemon.getNameToRender(), + }), + null, + 600, + false, + ).then(() => { + resolve(); + }); + }, }); }); } @@ -737,33 +884,33 @@ export function doPlayerFlee(pokemon: EnemyPokemon): Promise { * Bug Species and their corresponding weights */ const GOLDEN_BUG_NET_SPECIES_POOL: [Species, number][] = [ - [ Species.SCYTHER, 40 ], - [ Species.SCIZOR, 40 ], - [ Species.KLEAVOR, 40 ], - [ Species.PINSIR, 40 ], - [ Species.HERACROSS, 40 ], - [ Species.YANMA, 40 ], - [ Species.YANMEGA, 40 ], - [ Species.SHUCKLE, 40 ], - [ Species.ANORITH, 40 ], - [ Species.ARMALDO, 40 ], - [ Species.ESCAVALIER, 40 ], - [ Species.ACCELGOR, 40 ], - [ Species.JOLTIK, 40 ], - [ Species.GALVANTULA, 40 ], - [ Species.DURANT, 40 ], - [ Species.LARVESTA, 40 ], - [ Species.VOLCARONA, 40 ], - [ Species.DEWPIDER, 40 ], - [ Species.ARAQUANID, 40 ], - [ Species.WIMPOD, 40 ], - [ Species.GOLISOPOD, 40 ], - [ Species.SIZZLIPEDE, 40 ], - [ Species.CENTISKORCH, 40 ], - [ Species.NYMBLE, 40 ], - [ Species.LOKIX, 40 ], - [ Species.BUZZWOLE, 1 ], - [ Species.PHEROMOSA, 1 ], + [Species.SCYTHER, 40], + [Species.SCIZOR, 40], + [Species.KLEAVOR, 40], + [Species.PINSIR, 40], + [Species.HERACROSS, 40], + [Species.YANMA, 40], + [Species.YANMEGA, 40], + [Species.SHUCKLE, 40], + [Species.ANORITH, 40], + [Species.ARMALDO, 40], + [Species.ESCAVALIER, 40], + [Species.ACCELGOR, 40], + [Species.JOLTIK, 40], + [Species.GALVANTULA, 40], + [Species.DURANT, 40], + [Species.LARVESTA, 40], + [Species.VOLCARONA, 40], + [Species.DEWPIDER, 40], + [Species.ARAQUANID, 40], + [Species.WIMPOD, 40], + [Species.GOLISOPOD, 40], + [Species.SIZZLIPEDE, 40], + [Species.CENTISKORCH, 40], + [Species.NYMBLE, 40], + [Species.LOKIX, 40], + [Species.BUZZWOLE, 1], + [Species.PHEROMOSA, 1], ]; /** @@ -792,7 +939,7 @@ export function getGoldenBugNetSpecies(level: number): PokemonSpecies { * @param scene * @param levelAdditiveModifier Default 0. will add +(1 level / 10 waves * levelAdditiveModifier) to the level calculation */ -export function getEncounterPokemonLevelForWave(levelAdditiveModifier: number = 0) { +export function getEncounterPokemonLevelForWave(levelAdditiveModifier = 0) { const currentBattle = globalScene.currentBattle; const baseLevel = currentBattle.getLevelForWave(); @@ -803,7 +950,10 @@ export function getEncounterPokemonLevelForWave(levelAdditiveModifier: number = export async function addPokemonDataToDexAndValidateAchievements(pokemon: PlayerPokemon) { const speciesForm = !pokemon.fusionSpecies ? pokemon.getSpeciesForm() : pokemon.getFusionSpeciesForm(); - if (speciesForm.abilityHidden && (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1) { + if ( + speciesForm.abilityHidden && + (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1 + ) { globalScene.validateAchv(achvs.HIDDEN_ABILITY); } @@ -832,9 +982,16 @@ export async function addPokemonDataToDexAndValidateAchievements(pokemon: Player * @param scene * @param invalidSelectionKey */ -export function isPokemonValidForEncounterOptionSelection(pokemon: Pokemon, invalidSelectionKey: string): string | null { +export function isPokemonValidForEncounterOptionSelection( + pokemon: Pokemon, + invalidSelectionKey: string, +): string | null { if (!pokemon.isAllowedInChallenge()) { - return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: pokemon.getNameToRender() }) ?? null; + return ( + i18next.t("partyUiHandler:cantBeUsed", { + pokemonName: pokemon.getNameToRender(), + }) ?? null + ); } if (!pokemon.isAllowedInBattle()) { return getEncounterText(invalidSelectionKey) ?? null; diff --git a/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts b/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts index d4ae3496b0c..15085bb2bf8 100644 --- a/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts +++ b/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts @@ -7,7 +7,7 @@ import { globalScene } from "#app/global-scene"; export enum TransformationScreenPosition { CENTER, LEFT, - RIGHT + RIGHT, } /** @@ -17,7 +17,11 @@ export enum TransformationScreenPosition { * @param transformPokemon * @param screenPosition */ -export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon, transformPokemon: PlayerPokemon, screenPosition: TransformationScreenPosition) { +export function doPokemonTransformationSequence( + previousPokemon: PlayerPokemon, + transformPokemon: PlayerPokemon, + screenPosition: TransformationScreenPosition, +) { return new Promise(resolve => { const transformationContainer = globalScene.fieldUI.getByName("Dream Background") as Phaser.GameObjects.Container; const transformationBaseBg = globalScene.add.image(0, 0, "default_bg"); @@ -30,14 +34,26 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon, let pokemonEvoSprite: Phaser.GameObjects.Sprite; let pokemonEvoTintSprite: Phaser.GameObjects.Sprite; - const xOffset = screenPosition === TransformationScreenPosition.CENTER ? 0 : - screenPosition === TransformationScreenPosition.RIGHT ? 100 : -100; + const xOffset = + screenPosition === TransformationScreenPosition.CENTER + ? 0 + : screenPosition === TransformationScreenPosition.RIGHT + ? 100 + : -100; // Centered transformations occur at a lower y Position const yOffset = screenPosition !== TransformationScreenPosition.CENTER ? -15 : 0; const getPokemonSprite = () => { - const ret = globalScene.addPokemonSprite(previousPokemon, transformationBaseBg.displayWidth / 2 + xOffset, transformationBaseBg.displayHeight / 2 + yOffset, "pkmn__sub"); - ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true }); + const ret = globalScene.addPokemonSprite( + previousPokemon, + transformationBaseBg.displayWidth / 2 + xOffset, + transformationBaseBg.displayHeight / 2 + yOffset, + "pkmn__sub", + ); + ret.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + }); return ret; }; @@ -48,12 +64,12 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon, pokemonSprite.setAlpha(0); pokemonTintSprite.setAlpha(0); - pokemonTintSprite.setTintFill(0xFFFFFF); + pokemonTintSprite.setTintFill(0xffffff); pokemonEvoSprite.setVisible(false); pokemonEvoTintSprite.setVisible(false); - pokemonEvoTintSprite.setTintFill(0xFFFFFF); + pokemonEvoTintSprite.setTintFill(0xffffff); - [ pokemonSprite, pokemonTintSprite, pokemonEvoSprite, pokemonEvoTintSprite ].map(sprite => { + [pokemonSprite, pokemonTintSprite, pokemonEvoSprite, pokemonEvoTintSprite].map(sprite => { const spriteKey = previousPokemon.getSpriteKey(true); try { sprite.play(spriteKey); @@ -61,12 +77,17 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon, console.error(`Failed to play animation for ${spriteKey}`, err); } - sprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: false, teraColor: getTypeRgb(previousPokemon.getTeraType()) }); + sprite.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + hasShadow: false, + teraColor: getTypeRgb(previousPokemon.getTeraType()), + isTerastallized: previousPokemon.isTerastallized, + }); sprite.setPipelineData("ignoreTimeTint", true); sprite.setPipelineData("spriteKey", previousPokemon.getSpriteKey()); sprite.setPipelineData("shiny", previousPokemon.shiny); sprite.setPipelineData("variant", previousPokemon.variant); - [ "spriteColors", "fusionSpriteColors" ].map(k => { + ["spriteColors", "fusionSpriteColors"].map(k => { if (previousPokemon.summonData?.speciesForm) { k += "Base"; } @@ -74,7 +95,7 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon, }); }); - [ pokemonEvoSprite, pokemonEvoTintSprite ].map(sprite => { + [pokemonEvoSprite, pokemonEvoTintSprite].map(sprite => { const spriteKey = transformPokemon.getSpriteKey(true); try { sprite.play(spriteKey); @@ -86,7 +107,7 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon, sprite.setPipelineData("spriteKey", transformPokemon.getSpriteKey()); sprite.setPipelineData("shiny", transformPokemon.shiny); sprite.setPipelineData("variant", transformPokemon.variant); - [ "spriteColors", "fusionSpriteColors" ].map(k => { + ["spriteColors", "fusionSpriteColors"].map(k => { if (transformPokemon.summonData?.speciesForm) { k += "Base"; } @@ -139,18 +160,18 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon, previousPokemon.destroy(); transformPokemon.setVisible(false); transformPokemon.setAlpha(1); - } + }, }); }); - } + }, }); }); }); }); }); - } + }, }); - } + }, }); }); } @@ -163,7 +184,12 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon, * @param xOffset * @param yOffset */ -function doSpiralUpward(transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) { +function doSpiralUpward( + transformationBaseBg: Phaser.GameObjects.Image, + transformationContainer: Phaser.GameObjects.Container, + xOffset: number, + yOffset: number, +) { let f = 0; globalScene.tweens.addCounter({ @@ -173,12 +199,18 @@ function doSpiralUpward(transformationBaseBg: Phaser.GameObjects.Image, transfor if (f < 64) { if (!(f & 7)) { for (let i = 0; i < 4; i++) { - doSpiralUpwardParticle((f & 120) * 2 + i * 64, transformationBaseBg, transformationContainer, xOffset, yOffset); + doSpiralUpwardParticle( + (f & 120) * 2 + i * 64, + transformationBaseBg, + transformationContainer, + xOffset, + yOffset, + ); } } f++; } - } + }, }); } @@ -190,7 +222,12 @@ function doSpiralUpward(transformationBaseBg: Phaser.GameObjects.Image, transfor * @param xOffset * @param yOffset */ -function doArcDownward(transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) { +function doArcDownward( + transformationBaseBg: Phaser.GameObjects.Image, + transformationContainer: Phaser.GameObjects.Container, + xOffset: number, + yOffset: number, +) { let f = 0; globalScene.tweens.addCounter({ @@ -205,7 +242,7 @@ function doArcDownward(transformationBaseBg: Phaser.GameObjects.Image, transform } f++; } - } + }, }); } @@ -217,7 +254,12 @@ function doArcDownward(transformationBaseBg: Phaser.GameObjects.Image, transform * @param pokemonTintSprite * @param pokemonEvoTintSprite */ -function doCycle(l: number, lastCycle: number, pokemonTintSprite: Phaser.GameObjects.Sprite, pokemonEvoTintSprite: Phaser.GameObjects.Sprite): Promise { +function doCycle( + l: number, + lastCycle: number, + pokemonTintSprite: Phaser.GameObjects.Sprite, + pokemonEvoTintSprite: Phaser.GameObjects.Sprite, +): Promise { return new Promise(resolve => { const isLastCycle = l === lastCycle; globalScene.tweens.add({ @@ -225,7 +267,7 @@ function doCycle(l: number, lastCycle: number, pokemonTintSprite: Phaser.GameObj scale: 0.25, ease: "Cubic.easeInOut", duration: 500 / l, - yoyo: !isLastCycle + yoyo: !isLastCycle, }); globalScene.tweens.add({ targets: pokemonEvoTintSprite, @@ -240,7 +282,7 @@ function doCycle(l: number, lastCycle: number, pokemonTintSprite: Phaser.GameObj pokemonTintSprite.setVisible(false); resolve(true); } - } + }, }); }); } @@ -253,7 +295,12 @@ function doCycle(l: number, lastCycle: number, pokemonTintSprite: Phaser.GameObj * @param xOffset * @param yOffset */ -function doCircleInward(transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) { +function doCircleInward( + transformationBaseBg: Phaser.GameObjects.Image, + transformationContainer: Phaser.GameObjects.Container, + xOffset: number, + yOffset: number, +) { let f = 0; globalScene.tweens.addCounter({ @@ -270,7 +317,7 @@ function doCircleInward(transformationBaseBg: Phaser.GameObjects.Image, transfor } } f++; - } + }, }); } @@ -283,7 +330,13 @@ function doCircleInward(transformationBaseBg: Phaser.GameObjects.Image, transfor * @param xOffset * @param yOffset */ -function doSpiralUpwardParticle(trigIndex: number, transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) { +function doSpiralUpwardParticle( + trigIndex: number, + transformationBaseBg: Phaser.GameObjects.Image, + transformationContainer: Phaser.GameObjects.Container, + xOffset: number, + yOffset: number, +) { const initialX = transformationBaseBg.displayWidth / 2 + xOffset; const particle = globalScene.add.image(initialX, 0, "evo_sparkle"); transformationContainer.add(particle); @@ -296,7 +349,7 @@ function doSpiralUpwardParticle(trigIndex: number, transformationBaseBg: Phaser. duration: getFrameMs(1), onRepeat: () => { updateParticle(); - } + }, }); const updateParticle = () => { @@ -304,7 +357,7 @@ function doSpiralUpwardParticle(trigIndex: number, transformationBaseBg: Phaser. particle.setPosition(initialX, 88 - (f * f) / 80 + yOffset); particle.y += sin(trigIndex, amp) / 4; particle.x += cos(trigIndex, amp); - particle.setScale(1 - (f / 80)); + particle.setScale(1 - f / 80); trigIndex += 4; if (f & 1) { amp--; @@ -328,7 +381,13 @@ function doSpiralUpwardParticle(trigIndex: number, transformationBaseBg: Phaser. * @param xOffset * @param yOffset */ -function doArcDownParticle(trigIndex: number, transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) { +function doArcDownParticle( + trigIndex: number, + transformationBaseBg: Phaser.GameObjects.Image, + transformationContainer: Phaser.GameObjects.Container, + xOffset: number, + yOffset: number, +) { const initialX = transformationBaseBg.displayWidth / 2 + xOffset; const particle = globalScene.add.image(initialX, 0, "evo_sparkle"); particle.setScale(0.5); @@ -342,7 +401,7 @@ function doArcDownParticle(trigIndex: number, transformationBaseBg: Phaser.GameO duration: getFrameMs(1), onRepeat: () => { updateParticle(); - } + }, }); const updateParticle = () => { @@ -371,7 +430,14 @@ function doArcDownParticle(trigIndex: number, transformationBaseBg: Phaser.GameO * @param xOffset * @param yOffset */ -function doCircleInwardParticle(trigIndex: number, speed: number, transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) { +function doCircleInwardParticle( + trigIndex: number, + speed: number, + transformationBaseBg: Phaser.GameObjects.Image, + transformationContainer: Phaser.GameObjects.Container, + xOffset: number, + yOffset: number, +) { const initialX = transformationBaseBg.displayWidth / 2 + xOffset; const initialY = transformationBaseBg.displayHeight / 2 + yOffset; const particle = globalScene.add.image(initialX, initialY, "evo_sparkle"); @@ -384,7 +450,7 @@ function doCircleInwardParticle(trigIndex: number, speed: number, transformation duration: getFrameMs(1), onRepeat: () => { updateParticle(); - } + }, }); const updateParticle = () => { diff --git a/src/data/nature.ts b/src/data/nature.ts index b90047ce6f0..e23d92c14b0 100644 --- a/src/data/nature.ts +++ b/src/data/nature.ts @@ -5,11 +5,17 @@ import { UiTheme } from "#enums/ui-theme"; import i18next from "i18next"; import { Stat, EFFECTIVE_STATS, getShortenedStatKey } from "#enums/stat"; -export function getNatureName(nature: Nature, includeStatEffects: boolean = false, forStarterSelect: boolean = false, ignoreBBCode: boolean = false, uiTheme: UiTheme = UiTheme.DEFAULT): string { +export function getNatureName( + nature: Nature, + includeStatEffects = false, + forStarterSelect = false, + ignoreBBCode = false, + uiTheme: UiTheme = UiTheme.DEFAULT, +): string { let ret = Utils.toReadableString(Nature[nature]); //Translating nature - if (i18next.exists("nature:" + ret)) { - ret = i18next.t("nature:" + ret as any); + if (i18next.exists(`nature:${ret}`)) { + ret = i18next.t(`nature:${ret}` as any); } if (includeStatEffects) { let increasedStat: Stat | null = null; @@ -23,7 +29,9 @@ export function getNatureName(nature: Nature, includeStatEffects: boolean = fals } } const textStyle = forStarterSelect ? TextStyle.SUMMARY_ALT : TextStyle.WINDOW; - const getTextFrag = !ignoreBBCode ? (text: string, style: TextStyle) => getBBCodeFrag(text, style, uiTheme) : (text: string, style: TextStyle) => text; + const getTextFrag = !ignoreBBCode + ? (text: string, style: TextStyle) => getBBCodeFrag(text, style, uiTheme) + : (text: string, _style: TextStyle) => text; if (increasedStat && decreasedStat) { ret = `${getTextFrag(`${ret}${!forStarterSelect ? "\n" : " "}(`, textStyle)}${getTextFrag(`+${i18next.t(getShortenedStatKey(increasedStat))}`, TextStyle.SUMMARY_PINK)}${getTextFrag("/", textStyle)}${getTextFrag(`-${i18next.t(getShortenedStatKey(decreasedStat))}`, TextStyle.SUMMARY_BLUE)}${getTextFrag(")", textStyle)}`; } else { diff --git a/src/data/pokeball.ts b/src/data/pokeball.ts index 049baf11f3d..b0744237755 100644 --- a/src/data/pokeball.ts +++ b/src/data/pokeball.ts @@ -4,7 +4,7 @@ import { NumberHolder } from "#app/utils"; import { PokeballType } from "#enums/pokeball"; import i18next from "i18next"; -export const MAX_PER_TYPE_POKEBALLS: integer = 99; +export const MAX_PER_TYPE_POKEBALLS: number = 99; export function getPokeballAtlasKey(type: PokeballType): string { switch (type) { @@ -95,16 +95,31 @@ export function getCriticalCaptureChance(modifiedCatchRate: number): number { const dexCount = globalScene.gameData.getSpeciesCount(d => !!d.caughtAttr); const catchingCharmMultiplier = new NumberHolder(1); globalScene.findModifier(m => m instanceof CriticalCatchChanceBoosterModifier)?.apply(catchingCharmMultiplier); - const dexMultiplier = globalScene.gameMode.isDaily || dexCount > 800 ? 2.5 - : dexCount > 600 ? 2 - : dexCount > 400 ? 1.5 - : dexCount > 200 ? 1 - : dexCount > 100 ? 0.5 - : 0; - return Math.floor(catchingCharmMultiplier.value * dexMultiplier * Math.min(255, modifiedCatchRate) / 6); + const dexMultiplier = + globalScene.gameMode.isDaily || dexCount > 800 + ? 2.5 + : dexCount > 600 + ? 2 + : dexCount > 400 + ? 1.5 + : dexCount > 200 + ? 1 + : dexCount > 100 + ? 0.5 + : 0; + return Math.floor((catchingCharmMultiplier.value * dexMultiplier * Math.min(255, modifiedCatchRate)) / 6); } -export function doPokeballBounceAnim(pokeball: Phaser.GameObjects.Sprite, y1: number, y2: number, baseBounceDuration: number, callback: Function, isCritical: boolean = false) { +// TODO: fix Function annotations +export function doPokeballBounceAnim( + pokeball: Phaser.GameObjects.Sprite, + y1: number, + y2: number, + baseBounceDuration: number, + // biome-ignore lint/complexity/noBannedTypes: TODO + callback: Function, + isCritical = false, +) { let bouncePower = 1; let bounceYOffset = y1; let bounceY = y2; @@ -134,12 +149,12 @@ export function doPokeballBounceAnim(pokeball: Phaser.GameObjects.Sprite, y1: nu y: bounceY, duration: bouncePower * baseBounceDuration, ease: "Cubic.easeOut", - onComplete: () => doBounce() + onComplete: () => doBounce(), }); } else if (callback) { callback(); } - } + }, }); }; @@ -165,12 +180,12 @@ export function doPokeballBounceAnim(pokeball: Phaser.GameObjects.Sprite, y1: nu x: x0, duration: 60, ease: "Linear", - onComplete: () => globalScene.time.delayedCall(500, doBounce) + onComplete: () => globalScene.time.delayedCall(500, doBounce), }); } - } + }, }); - } + }, }); }; diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index 035cd6f1369..4636e68d6d6 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -1,8 +1,8 @@ -import { PokemonFormChangeItemModifier, TerastallizeModifier } from "../modifier/modifier"; +import { PokemonFormChangeItemModifier } from "../modifier/modifier"; import type Pokemon from "../field/pokemon"; import { StatusEffect } from "#enums/status-effect"; -import { MoveCategory, allMoves } from "./move"; -import { Type } from "#enums/type"; +import { allMoves } from "./moves/move"; +import { MoveCategory } from "#enums/MoveCategory"; import type { Constructor, nil } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; @@ -113,7 +113,7 @@ export enum FormChangeItem { DRACO_PLATE, DREAD_PLATE, PIXIE_PLATE, - BLANK_PLATE, // TODO: Find a potential use for this + BLANK_PLATE, // TODO: Find a potential use for this LEGEND_PLATE, // TODO: Find a potential use for this FIGHTING_MEMORY, FLYING_MEMORY, @@ -132,7 +132,7 @@ export enum FormChangeItem { DRAGON_MEMORY, DARK_MEMORY, FAIRY_MEMORY, - NORMAL_MEMORY // TODO: Find a potential use for this + NORMAL_MEMORY, // TODO: Find a potential use for this } export type SpeciesFormChangeConditionPredicate = (p: Pokemon) => boolean; @@ -146,7 +146,14 @@ export class SpeciesFormChange { public quiet: boolean; public readonly conditions: SpeciesFormChangeCondition[]; - constructor(speciesId: Species, preFormKey: string, evoFormKey: string, trigger: SpeciesFormChangeTrigger, quiet: boolean = false, ...conditions: SpeciesFormChangeCondition[]) { + constructor( + speciesId: Species, + preFormKey: string, + evoFormKey: string, + trigger: SpeciesFormChangeTrigger, + quiet = false, + ...conditions: SpeciesFormChangeCondition[] + ) { this.speciesId = speciesId; this.preFormKey = preFormKey; this.formKey = evoFormKey; @@ -212,9 +219,9 @@ export class SpeciesFormChangeCondition { } export abstract class SpeciesFormChangeTrigger { - public description: string = ""; + public description = ""; - canChange(pokemon: Pokemon): boolean { + canChange(_pokemon: Pokemon): boolean { return true; } @@ -223,20 +230,22 @@ export abstract class SpeciesFormChangeTrigger { } } -export class SpeciesFormChangeManualTrigger extends SpeciesFormChangeTrigger { -} +export class SpeciesFormChangeManualTrigger extends SpeciesFormChangeTrigger {} export class SpeciesFormChangeAbilityTrigger extends SpeciesFormChangeTrigger { public description: string = i18next.t("pokemonEvolutions:Forms.ability"); } export class SpeciesFormChangeCompoundTrigger { - public description: string = ""; + public description = ""; public triggers: SpeciesFormChangeTrigger[]; constructor(...triggers: SpeciesFormChangeTrigger[]) { this.triggers = triggers; - this.description = this.triggers.filter(trigger => trigger?.description?.length > 0).map(trigger => trigger.description).join(", "); + this.description = this.triggers + .filter(trigger => trigger?.description?.length > 0) + .map(trigger => trigger.description) + .join(", "); } canChange(pokemon: Pokemon): boolean { @@ -258,17 +267,27 @@ export class SpeciesFormChangeItemTrigger extends SpeciesFormChangeTrigger { public item: FormChangeItem; public active: boolean; - constructor(item: FormChangeItem, active: boolean = true) { + constructor(item: FormChangeItem, active = true) { super(); this.item = item; this.active = active; - this.description = this.active ? - i18next.t("pokemonEvolutions:Forms.item", { item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`) }) : - i18next.t("pokemonEvolutions:Forms.deactivateItem", { item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`) }); + this.description = this.active + ? i18next.t("pokemonEvolutions:Forms.item", { + item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`), + }) + : i18next.t("pokemonEvolutions:Forms.deactivateItem", { + item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`), + }); } canChange(pokemon: Pokemon): boolean { - return !!globalScene.findModifier(m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id && m.formChangeItem === this.item && m.active === this.active); + return !!globalScene.findModifier( + m => + m instanceof PokemonFormChangeItemModifier && + m.pokemonId === pokemon.id && + m.formChangeItem === this.item && + m.active === this.active, + ); } } @@ -281,7 +300,7 @@ export class SpeciesFormChangeTimeOfDayTrigger extends SpeciesFormChangeTrigger this.description = i18next.t("pokemonEvolutions:Forms.timeOfDay"); } - canChange(pokemon: Pokemon): boolean { + canChange(_pokemon: Pokemon): boolean { return this.timesOfDay.indexOf(globalScene.arena.getTimeOfDay()) > -1; } } @@ -289,10 +308,12 @@ export class SpeciesFormChangeTimeOfDayTrigger extends SpeciesFormChangeTrigger export class SpeciesFormChangeActiveTrigger extends SpeciesFormChangeTrigger { public active: boolean; - constructor(active: boolean = false) { + constructor(active = false) { super(); this.active = active; - this.description = this.active ? i18next.t("pokemonEvolutions:Forms.enter") : i18next.t("pokemonEvolutions:Forms.leave"); + this.description = this.active + ? i18next.t("pokemonEvolutions:Forms.enter") + : i18next.t("pokemonEvolutions:Forms.leave"); } canChange(pokemon: Pokemon): boolean { @@ -304,10 +325,10 @@ export class SpeciesFormChangeStatusEffectTrigger extends SpeciesFormChangeTrigg public statusEffects: StatusEffect[]; public invert: boolean; - constructor(statusEffects: StatusEffect | StatusEffect[], invert: boolean = false) { + constructor(statusEffects: StatusEffect | StatusEffect[], invert = false) { super(); if (!Array.isArray(statusEffects)) { - statusEffects = [ statusEffects ]; + statusEffects = [statusEffects]; } this.statusEffects = statusEffects; this.invert = invert; @@ -315,7 +336,7 @@ export class SpeciesFormChangeStatusEffectTrigger extends SpeciesFormChangeTrigg } canChange(pokemon: Pokemon): boolean { - return (this.statusEffects.indexOf(pokemon.status?.effect || StatusEffect.NONE) > -1) !== this.invert; + return this.statusEffects.indexOf(pokemon.status?.effect || StatusEffect.NONE) > -1 !== this.invert; } } @@ -323,16 +344,26 @@ export class SpeciesFormChangeMoveLearnedTrigger extends SpeciesFormChangeTrigge public move: Moves; public known: boolean; - constructor(move: Moves, known: boolean = true) { + constructor(move: Moves, known = true) { super(); this.move = move; this.known = known; - const moveKey = Moves[this.move].split("_").filter(f => f).map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("") as unknown as string; - this.description = i18next.t("pokemonEvolutions:Forms.moveLearned", { move: i18next.t(`move:${moveKey}.name`) }); + const moveKey = Moves[this.move] + .split("_") + .filter(f => f) + .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase())) + .join("") as unknown as string; + this.description = known + ? i18next.t("pokemonEvolutions:Forms.moveLearned", { + move: i18next.t(`move:${moveKey}.name`), + }) + : i18next.t("pokemonEvolutions:Forms.moveForgotten", { + move: i18next.t(`move:${moveKey}.name`), + }); } canChange(pokemon: Pokemon): boolean { - return (!!pokemon.moveset.filter(m => m?.moveId === this.move).length) === this.known; + return !!pokemon.moveset.filter(m => m?.moveId === this.move).length === this.known; } } @@ -340,7 +371,7 @@ export abstract class SpeciesFormChangeMoveTrigger extends SpeciesFormChangeTrig public movePredicate: (m: Moves) => boolean; public used: boolean; - constructor(move: Moves | ((m: Moves) => boolean), used: boolean = true) { + constructor(move: Moves | ((m: Moves) => boolean), used = true) { super(); this.movePredicate = typeof move === "function" ? move : (m: Moves) => m === move; this.used = used; @@ -360,7 +391,9 @@ export class SpeciesFormChangePostMoveTrigger extends SpeciesFormChangeMoveTrigg description = i18next.t("pokemonEvolutions:Forms.postMove"); canChange(pokemon: Pokemon): boolean { - return pokemon.summonData && !!pokemon.getLastXMoves(1).filter(m => this.movePredicate(m.move)).length === this.used; + return ( + pokemon.summonData && !!pokemon.getLastXMoves(1).filter(m => this.movePredicate(m.move)).length === this.used + ); } } @@ -368,13 +401,12 @@ export class MeloettaFormChangePostMoveTrigger extends SpeciesFormChangePostMove override canChange(pokemon: Pokemon): boolean { if (globalScene.gameMode.hasChallenge(Challenges.SINGLE_TYPE)) { return false; - } else { - // Meloetta will not transform if it has the ability Sheer Force when using Relic Song - if (pokemon.hasAbility(Abilities.SHEER_FORCE)) { - return false; - } - return super.canChange(pokemon); } + // Meloetta will not transform if it has the ability Sheer Force when using Relic Song + if (pokemon.hasAbility(Abilities.SHEER_FORCE)) { + return false; + } + return super.canChange(pokemon); } } @@ -388,7 +420,11 @@ export class SpeciesDefaultFormMatchTrigger extends SpeciesFormChangeTrigger { } canChange(pokemon: Pokemon): boolean { - return this.formKey === pokemon.species.forms[globalScene.getSpeciesFormIndex(pokemon.species, pokemon.gender, pokemon.getNature(), true)].formKey; + return ( + this.formKey === + pokemon.species.forms[globalScene.getSpeciesFormIndex(pokemon.species, pokemon.gender, pokemon.getNature(), true)] + .formKey + ); } } @@ -398,23 +434,7 @@ export class SpeciesDefaultFormMatchTrigger extends SpeciesFormChangeTrigger { * @extends SpeciesFormChangeTrigger */ export class SpeciesFormChangeTeraTrigger extends SpeciesFormChangeTrigger { - /** The Tera type that triggers the form change */ - private teraType: Type; - - constructor(teraType: Type) { - super(); - this.teraType = teraType; - this.description = i18next.t("pokemonEvolutions:Forms.tera", { teraType: i18next.t(`pokemonInfo:Type.${Type[this.teraType]}`) }); - } - - /** - * Checks if the associated Pokémon has the required Tera Shard that matches with the associated Tera type. - * @param {Pokemon} pokemon the Pokémon that is trying to do the form change - * @returns `true` if the Pokémon can change forms, `false` otherwise - */ - canChange(pokemon: Pokemon): boolean { - return !!globalScene.findModifier(m => m instanceof TerastallizeModifier && m.pokemonId === pokemon.id && m.teraType === this.teraType); - } + description = i18next.t("pokemonEvolutions:Forms.tera"); } /** @@ -424,10 +444,6 @@ export class SpeciesFormChangeTeraTrigger extends SpeciesFormChangeTrigger { */ export class SpeciesFormChangeLapseTeraTrigger extends SpeciesFormChangeTrigger { description = i18next.t("pokemonEvolutions:Forms.teraLapse"); - - canChange(pokemon: Pokemon): boolean { - return !!globalScene.findModifier(m => m instanceof TerastallizeModifier && m.pokemonId === pokemon.id); - } } /** @@ -459,7 +475,12 @@ export class SpeciesFormChangeWeatherTrigger extends SpeciesFormChangeTrigger { const isWeatherSuppressed = globalScene.arena.weather?.isEffectSuppressed(); const isAbilitySuppressed = pokemon.summonData.abilitySuppressed; - return !isAbilitySuppressed && !isWeatherSuppressed && (pokemon.hasAbility(this.ability) && this.weathers.includes(currentWeather)); + return ( + !isAbilitySuppressed && + !isWeatherSuppressed && + pokemon.hasAbility(this.ability) && + this.weathers.includes(currentWeather) + ); } } @@ -510,16 +531,27 @@ export function getSpeciesFormChangeMessage(pokemon: Pokemon, formChange: Specie const isEmax = formChange.formKey.indexOf(SpeciesFormKey.ETERNAMAX) > -1; const isRevert = !isMega && formChange.formKey === pokemon.species.forms[0].formKey; if (isMega) { - return i18next.t("battlePokemonForm:megaChange", { preName, pokemonName: pokemon.name }); + return i18next.t("battlePokemonForm:megaChange", { + preName, + pokemonName: pokemon.name, + }); } if (isGmax) { - return i18next.t("battlePokemonForm:gigantamaxChange", { preName, pokemonName: pokemon.name }); + return i18next.t("battlePokemonForm:gigantamaxChange", { + preName, + pokemonName: pokemon.name, + }); } if (isEmax) { - return i18next.t("battlePokemonForm:eternamaxChange", { preName, pokemonName: pokemon.name }); + return i18next.t("battlePokemonForm:eternamaxChange", { + preName, + pokemonName: pokemon.name, + }); } if (isRevert) { - return i18next.t("battlePokemonForm:revertChange", { pokemonName: getPokemonNameWithAffix(pokemon) }); + return i18next.t("battlePokemonForm:revertChange", { + pokemonName: getPokemonNameWithAffix(pokemon), + }); } if (pokemon.getAbility().id === Abilities.DISGUISE) { return i18next.t("battlePokemonForm:disguiseChange"); @@ -534,13 +566,14 @@ export function getSpeciesFormChangeMessage(pokemon: Pokemon, formChange: Specie * @returns A {@linkcode SpeciesFormChangeCondition} checking if that species is registered as caught */ function getSpeciesDependentFormChangeCondition(species: Species): SpeciesFormChangeCondition { - return new SpeciesFormChangeCondition(p => !!globalScene.gameData.dexData[species].caughtAttr); + return new SpeciesFormChangeCondition(_p => !!globalScene.gameData.dexData[species].caughtAttr); } interface PokemonFormChanges { - [key: string]: SpeciesFormChange[] + [key: string]: SpeciesFormChange[]; } +// biome-ignore format: manually formatted export const pokemonFormChanges: PokemonFormChanges = { [Species.VENUSAUR]: [ new SpeciesFormChange(Species.VENUSAUR, "", SpeciesFormKey.MEGA, new SpeciesFormChangeItemTrigger(FormChangeItem.VENUSAURITE)), @@ -755,23 +788,23 @@ export const pokemonFormChanges: PokemonFormChanges = { new SpeciesFormChange(Species.SHAYMIN, "land", "sky", new SpeciesFormChangeItemTrigger(FormChangeItem.GRACIDEA)), ], [Species.ARCEUS]: [ - new SpeciesFormChange(Species.ARCEUS, "normal", "fighting", new SpeciesFormChangeItemTrigger(FormChangeItem.FIST_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "flying", new SpeciesFormChangeItemTrigger(FormChangeItem.SKY_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "poison", new SpeciesFormChangeItemTrigger(FormChangeItem.TOXIC_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "ground", new SpeciesFormChangeItemTrigger(FormChangeItem.EARTH_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "rock", new SpeciesFormChangeItemTrigger(FormChangeItem.STONE_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "bug", new SpeciesFormChangeItemTrigger(FormChangeItem.INSECT_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "ghost", new SpeciesFormChangeItemTrigger(FormChangeItem.SPOOKY_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "steel", new SpeciesFormChangeItemTrigger(FormChangeItem.IRON_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "fire", new SpeciesFormChangeItemTrigger(FormChangeItem.FLAME_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "water", new SpeciesFormChangeItemTrigger(FormChangeItem.SPLASH_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "grass", new SpeciesFormChangeItemTrigger(FormChangeItem.MEADOW_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "electric", new SpeciesFormChangeItemTrigger(FormChangeItem.ZAP_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "psychic", new SpeciesFormChangeItemTrigger(FormChangeItem.MIND_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "ice", new SpeciesFormChangeItemTrigger(FormChangeItem.ICICLE_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "dragon", new SpeciesFormChangeItemTrigger(FormChangeItem.DRACO_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "dark", new SpeciesFormChangeItemTrigger(FormChangeItem.DREAD_PLATE)), - new SpeciesFormChange(Species.ARCEUS, "normal", "fairy", new SpeciesFormChangeItemTrigger(FormChangeItem.PIXIE_PLATE)) + new SpeciesFormChange(Species.ARCEUS, "normal", "fighting", new SpeciesFormChangeItemTrigger(FormChangeItem.FIST_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "flying", new SpeciesFormChangeItemTrigger(FormChangeItem.SKY_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "poison", new SpeciesFormChangeItemTrigger(FormChangeItem.TOXIC_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "ground", new SpeciesFormChangeItemTrigger(FormChangeItem.EARTH_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "rock", new SpeciesFormChangeItemTrigger(FormChangeItem.STONE_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "bug", new SpeciesFormChangeItemTrigger(FormChangeItem.INSECT_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "ghost", new SpeciesFormChangeItemTrigger(FormChangeItem.SPOOKY_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "steel", new SpeciesFormChangeItemTrigger(FormChangeItem.IRON_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "fire", new SpeciesFormChangeItemTrigger(FormChangeItem.FLAME_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "water", new SpeciesFormChangeItemTrigger(FormChangeItem.SPLASH_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "grass", new SpeciesFormChangeItemTrigger(FormChangeItem.MEADOW_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "electric", new SpeciesFormChangeItemTrigger(FormChangeItem.ZAP_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "psychic", new SpeciesFormChangeItemTrigger(FormChangeItem.MIND_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "ice", new SpeciesFormChangeItemTrigger(FormChangeItem.ICICLE_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "dragon", new SpeciesFormChangeItemTrigger(FormChangeItem.DRACO_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "dark", new SpeciesFormChangeItemTrigger(FormChangeItem.DREAD_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), + new SpeciesFormChange(Species.ARCEUS, "normal", "fairy", new SpeciesFormChangeItemTrigger(FormChangeItem.PIXIE_PLATE), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.MULTITYPE))), ], [Species.DARMANITAN]: [ new SpeciesFormChange(Species.DARMANITAN, "", "zen", new SpeciesFormChangeAbilityTrigger(), true), @@ -841,23 +874,23 @@ export const pokemonFormChanges: PokemonFormChanges = { new SpeciesFormChange(Species.WISHIWASHI, "school", "", new SpeciesFormChangeAbilityTrigger(), true) ], [Species.SILVALLY]: [ - new SpeciesFormChange(Species.SILVALLY, "normal", "fighting", new SpeciesFormChangeItemTrigger(FormChangeItem.FIGHTING_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "flying", new SpeciesFormChangeItemTrigger(FormChangeItem.FLYING_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "poison", new SpeciesFormChangeItemTrigger(FormChangeItem.POISON_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "ground", new SpeciesFormChangeItemTrigger(FormChangeItem.GROUND_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "rock", new SpeciesFormChangeItemTrigger(FormChangeItem.ROCK_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "bug", new SpeciesFormChangeItemTrigger(FormChangeItem.BUG_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "ghost", new SpeciesFormChangeItemTrigger(FormChangeItem.GHOST_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "steel", new SpeciesFormChangeItemTrigger(FormChangeItem.STEEL_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "fire", new SpeciesFormChangeItemTrigger(FormChangeItem.FIRE_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "water", new SpeciesFormChangeItemTrigger(FormChangeItem.WATER_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "grass", new SpeciesFormChangeItemTrigger(FormChangeItem.GRASS_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "electric", new SpeciesFormChangeItemTrigger(FormChangeItem.ELECTRIC_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "psychic", new SpeciesFormChangeItemTrigger(FormChangeItem.PSYCHIC_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "ice", new SpeciesFormChangeItemTrigger(FormChangeItem.ICE_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "dragon", new SpeciesFormChangeItemTrigger(FormChangeItem.DRAGON_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "dark", new SpeciesFormChangeItemTrigger(FormChangeItem.DARK_MEMORY)), - new SpeciesFormChange(Species.SILVALLY, "normal", "fairy", new SpeciesFormChangeItemTrigger(FormChangeItem.FAIRY_MEMORY)) + new SpeciesFormChange(Species.SILVALLY, "normal", "fighting", new SpeciesFormChangeItemTrigger(FormChangeItem.FIGHTING_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "flying", new SpeciesFormChangeItemTrigger(FormChangeItem.FLYING_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "poison", new SpeciesFormChangeItemTrigger(FormChangeItem.POISON_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "ground", new SpeciesFormChangeItemTrigger(FormChangeItem.GROUND_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "rock", new SpeciesFormChangeItemTrigger(FormChangeItem.ROCK_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "bug", new SpeciesFormChangeItemTrigger(FormChangeItem.BUG_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "ghost", new SpeciesFormChangeItemTrigger(FormChangeItem.GHOST_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "steel", new SpeciesFormChangeItemTrigger(FormChangeItem.STEEL_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "fire", new SpeciesFormChangeItemTrigger(FormChangeItem.FIRE_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "water", new SpeciesFormChangeItemTrigger(FormChangeItem.WATER_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "grass", new SpeciesFormChangeItemTrigger(FormChangeItem.GRASS_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "electric", new SpeciesFormChangeItemTrigger(FormChangeItem.ELECTRIC_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "psychic", new SpeciesFormChangeItemTrigger(FormChangeItem.PSYCHIC_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "ice", new SpeciesFormChangeItemTrigger(FormChangeItem.ICE_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "dragon", new SpeciesFormChangeItemTrigger(FormChangeItem.DRAGON_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "dark", new SpeciesFormChangeItemTrigger(FormChangeItem.DARK_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))), + new SpeciesFormChange(Species.SILVALLY, "normal", "fairy", new SpeciesFormChangeItemTrigger(FormChangeItem.FAIRY_MEMORY), true, new SpeciesFormChangeCondition((p) => p.hasAbility(Abilities.RKS_SYSTEM))) ], [Species.MINIOR]: [ new SpeciesFormChange(Species.MINIOR, "red-meteor", "red", new SpeciesFormChangeAbilityTrigger(), true), @@ -991,19 +1024,19 @@ export const pokemonFormChanges: PokemonFormChanges = { new SpeciesFormChange(Species.OGERPON, "teal-mask", "wellspring-mask", new SpeciesFormChangeItemTrigger(FormChangeItem.WELLSPRING_MASK)), new SpeciesFormChange(Species.OGERPON, "teal-mask", "hearthflame-mask", new SpeciesFormChangeItemTrigger(FormChangeItem.HEARTHFLAME_MASK)), new SpeciesFormChange(Species.OGERPON, "teal-mask", "cornerstone-mask", new SpeciesFormChangeItemTrigger(FormChangeItem.CORNERSTONE_MASK)), - new SpeciesFormChange(Species.OGERPON, "teal-mask", "teal-mask-tera", new SpeciesFormChangeTeraTrigger(Type.GRASS)), - new SpeciesFormChange(Species.OGERPON, "teal-mask-tera", "teal-mask", new SpeciesFormChangeLapseTeraTrigger(), true, new SpeciesFormChangeCondition(p => p.getTeraType() !== Type.GRASS)), - new SpeciesFormChange(Species.OGERPON, "wellspring-mask", "wellspring-mask-tera", new SpeciesFormChangeTeraTrigger(Type.WATER)), - new SpeciesFormChange(Species.OGERPON, "wellspring-mask-tera", "wellspring-mask", new SpeciesFormChangeLapseTeraTrigger(), true, new SpeciesFormChangeCondition(p => p.getTeraType() !== Type.WATER)), - new SpeciesFormChange(Species.OGERPON, "hearthflame-mask", "hearthflame-mask-tera", new SpeciesFormChangeTeraTrigger(Type.FIRE)), - new SpeciesFormChange(Species.OGERPON, "hearthflame-mask-tera", "hearthflame-mask", new SpeciesFormChangeLapseTeraTrigger(), true, new SpeciesFormChangeCondition(p => p.getTeraType() !== Type.FIRE)), - new SpeciesFormChange(Species.OGERPON, "cornerstone-mask", "cornerstone-mask-tera", new SpeciesFormChangeTeraTrigger(Type.ROCK)), - new SpeciesFormChange(Species.OGERPON, "cornerstone-mask-tera", "cornerstone-mask", new SpeciesFormChangeLapseTeraTrigger(), true, new SpeciesFormChangeCondition(p => p.getTeraType() !== Type.ROCK)) + new SpeciesFormChange(Species.OGERPON, "teal-mask", "teal-mask-tera", new SpeciesFormChangeTeraTrigger(), true), + new SpeciesFormChange(Species.OGERPON, "teal-mask-tera", "teal-mask", new SpeciesFormChangeLapseTeraTrigger(), true), + new SpeciesFormChange(Species.OGERPON, "wellspring-mask", "wellspring-mask-tera", new SpeciesFormChangeTeraTrigger(), true), + new SpeciesFormChange(Species.OGERPON, "wellspring-mask-tera", "wellspring-mask", new SpeciesFormChangeLapseTeraTrigger(), true), + new SpeciesFormChange(Species.OGERPON, "hearthflame-mask", "hearthflame-mask-tera", new SpeciesFormChangeTeraTrigger(), true), + new SpeciesFormChange(Species.OGERPON, "hearthflame-mask-tera", "hearthflame-mask", new SpeciesFormChangeLapseTeraTrigger(), true), + new SpeciesFormChange(Species.OGERPON, "cornerstone-mask", "cornerstone-mask-tera", new SpeciesFormChangeTeraTrigger(), true), + new SpeciesFormChange(Species.OGERPON, "cornerstone-mask-tera", "cornerstone-mask", new SpeciesFormChangeLapseTeraTrigger(), true) ], [Species.TERAPAGOS]: [ new SpeciesFormChange(Species.TERAPAGOS, "", "terastal", new SpeciesFormChangeAbilityTrigger(), true), - new SpeciesFormChange(Species.TERAPAGOS, "terastal", "stellar", new SpeciesFormChangeTeraTrigger(Type.STELLAR)), - new SpeciesFormChange(Species.TERAPAGOS, "stellar", "terastal", new SpeciesFormChangeLapseTeraTrigger(), true, new SpeciesFormChangeCondition(p => p.getTeraType() !== Type.STELLAR)) + new SpeciesFormChange(Species.TERAPAGOS, "terastal", "stellar", new SpeciesFormChangeTeraTrigger(), true), + new SpeciesFormChange(Species.TERAPAGOS, "stellar", "terastal", new SpeciesFormChangeLapseTeraTrigger(), true) ], [Species.GALAR_DARMANITAN]: [ new SpeciesFormChange(Species.GALAR_DARMANITAN, "", "zen", new SpeciesFormChangeAbilityTrigger(), true), @@ -1013,16 +1046,22 @@ export const pokemonFormChanges: PokemonFormChanges = { export function initPokemonForms() { const formChangeKeys = Object.keys(pokemonFormChanges); - formChangeKeys.forEach(pk => { + for (const pk of formChangeKeys) { const formChanges = pokemonFormChanges[pk]; const newFormChanges: SpeciesFormChange[] = []; for (const fc of formChanges) { const itemTrigger = fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger; if (itemTrigger && !formChanges.find(c => fc.formKey === c.preFormKey && fc.preFormKey === c.formKey)) { - newFormChanges.push(new SpeciesFormChange(fc.speciesId, fc.formKey, fc.preFormKey, new SpeciesFormChangeItemTrigger(itemTrigger.item, false))); + newFormChanges.push( + new SpeciesFormChange( + fc.speciesId, + fc.formKey, + fc.preFormKey, + new SpeciesFormChangeItemTrigger(itemTrigger.item, false), + ), + ); } } formChanges.push(...newFormChanges); - }); + } } - diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 6abdfe43470..d172173e9df 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -7,16 +7,24 @@ import i18next from "i18next"; import type { AnySound } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; import type { GameMode } from "#app/game-mode"; -import type { StarterMoveset } from "#app/system/game-data"; +import { DexAttr, type StarterMoveset } from "#app/system/game-data"; import * as Utils from "#app/utils"; import { uncatchableSpecies } from "#app/data/balance/biomes"; import { speciesEggMoves } from "#app/data/balance/egg-moves"; import { GrowthRate } from "#app/data/exp"; import type { EvolutionLevel } from "#app/data/balance/pokemon-evolutions"; -import { SpeciesWildEvolutionDelay, pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions"; -import { Type } from "#enums/type"; +import { + SpeciesWildEvolutionDelay, + pokemonEvolutions, + pokemonPrevolutions, +} from "#app/data/balance/pokemon-evolutions"; +import { PokemonType } from "#enums/pokemon-type"; import type { LevelMoves } from "#app/data/balance/pokemon-level-moves"; -import { pokemonFormLevelMoves, pokemonFormLevelMoves as pokemonSpeciesFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves"; +import { + pokemonFormLevelMoves, + pokemonFormLevelMoves as pokemonSpeciesFormLevelMoves, + pokemonSpeciesLevelMoves, +} from "#app/data/balance/pokemon-level-moves"; import type { Stat } from "#enums/stat"; import type { Variant, VariantSet } from "#app/data/variant"; import { variantData } from "#app/data/variant"; @@ -29,18 +37,46 @@ export enum Region { ALOLA, GALAR, HISUI, - PALDEA + PALDEA, } +// TODO: this is horrible and will need to be removed once a refactor/cleanup of forms is executed. +export const normalForm: Species[] = [ + Species.PIKACHU, + Species.RAICHU, + Species.EEVEE, + Species.JOLTEON, + Species.FLAREON, + Species.VAPOREON, + Species.ESPEON, + Species.UMBREON, + Species.LEAFEON, + Species.GLACEON, + Species.SYLVEON, + Species.PICHU, + Species.ROTOM, + Species.DIALGA, + Species.PALKIA, + Species.KYUREM, + Species.GENESECT, + Species.FROAKIE, + Species.FROGADIER, + Species.GRENINJA, + Species.ROCKRUFF, + Species.NECROZMA, + Species.MAGEARNA, + Species.MARSHADOW, + Species.CRAMORANT, + Species.ZARUDE, + Species.CALYREX, +]; + /** * Gets the {@linkcode PokemonSpecies} object associated with the {@linkcode Species} enum given * @param species The species to fetch * @returns The associated {@linkcode PokemonSpecies} object */ -export function getPokemonSpecies(species: Species | Species[] | undefined): PokemonSpecies { - if (!species) { - throw new Error("`species` must not be undefined in `getPokemonSpecies()`"); - } +export function getPokemonSpecies(species: Species | Species[]): PokemonSpecies { // If a special pool (named trainers) is used here it CAN happen that they have a array as species (which means choose one of those two). So we catch that with this code block if (Array.isArray(species)) { // Pick a random species from the list @@ -53,9 +89,10 @@ export function getPokemonSpecies(species: Species | Species[] | undefined): Pok } export function getPokemonSpeciesForm(species: Species, formIndex: number): PokemonSpeciesForm { - const retSpecies: PokemonSpecies = species >= 2000 - ? allSpecies.find(s => s.speciesId === species)! // TODO: is the bang correct? - : allSpecies[species - 1]; + const retSpecies: PokemonSpecies = + species >= 2000 + ? allSpecies.find(s => s.speciesId === species)! // TODO: is the bang correct? + : allSpecies[species - 1]; if (formIndex < retSpecies.forms?.length) { return retSpecies.forms[formIndex]; } @@ -66,8 +103,8 @@ export function getFusedSpeciesName(speciesAName: string, speciesBName: string): const fragAPattern = /([a-z]{2}.*?[aeiou(?:y$)\-\']+)(.*?)$/i; const fragBPattern = /([a-z]{2}.*?[aeiou(?:y$)\-\'])(.*?)$/i; - const [ speciesAPrefixMatch, speciesBPrefixMatch ] = [ speciesAName, speciesBName ].map(n => /^(?:[^ ]+) /.exec(n)); - const [ speciesAPrefix, speciesBPrefix ] = [ speciesAPrefixMatch, speciesBPrefixMatch ].map(m => m ? m[0] : ""); + const [speciesAPrefixMatch, speciesBPrefixMatch] = [speciesAName, speciesBName].map(n => /^(?:[^ ]+) /.exec(n)); + const [speciesAPrefix, speciesBPrefix] = [speciesAPrefixMatch, speciesBPrefixMatch].map(m => (m ? m[0] : "")); if (speciesAPrefix) { speciesAName = speciesAName.slice(speciesAPrefix.length); @@ -76,8 +113,8 @@ export function getFusedSpeciesName(speciesAName: string, speciesBName: string): speciesBName = speciesBName.slice(speciesBPrefix.length); } - const [ speciesASuffixMatch, speciesBSuffixMatch ] = [ speciesAName, speciesBName ].map(n => / (?:[^ ]+)$/.exec(n)); - const [ speciesASuffix, speciesBSuffix ] = [ speciesASuffixMatch, speciesBSuffixMatch ].map(m => m ? m[0] : ""); + const [speciesASuffixMatch, speciesBSuffixMatch] = [speciesAName, speciesBName].map(n => / (?:[^ ]+)$/.exec(n)); + const [speciesASuffix, speciesBSuffix] = [speciesASuffixMatch, speciesBSuffixMatch].map(m => (m ? m[0] : "")); if (speciesASuffix) { speciesAName = speciesAName.slice(0, -speciesASuffix.length); @@ -95,9 +132,7 @@ export function getFusedSpeciesName(speciesAName: string, speciesBName: string): let fragA: string; let fragB: string; - fragA = splitNameA.length === 1 - ? fragAMatch ? fragAMatch[1] : speciesAName - : splitNameA[splitNameA.length - 1]; + fragA = splitNameA.length === 1 ? (fragAMatch ? fragAMatch[1] : speciesAName) : splitNameA[splitNameA.length - 1]; if (splitNameB.length === 1) { if (fragBMatch) { @@ -136,8 +171,8 @@ export abstract class PokemonSpeciesForm { public speciesId: Species; protected _formIndex: number; protected _generation: number; - readonly type1: Type; - readonly type2: Type | null; + readonly type1: PokemonType; + readonly type2: PokemonType | null; readonly height: number; readonly weight: number; readonly ability1: Abilities; @@ -151,9 +186,26 @@ export abstract class PokemonSpeciesForm { readonly genderDiffs: boolean; readonly isStarterSelectable: boolean; - constructor(type1: Type, type2: Type | null, height: number, weight: number, ability1: Abilities, ability2: Abilities, abilityHidden: Abilities, - baseTotal: number, baseHp: number, baseAtk: number, baseDef: number, baseSpatk: number, baseSpdef: number, baseSpd: number, - catchRate: number, baseFriendship: number, baseExp: number, genderDiffs: boolean, isStarterSelectable: boolean + constructor( + type1: PokemonType, + type2: PokemonType | null, + height: number, + weight: number, + ability1: Abilities, + ability2: Abilities, + abilityHidden: Abilities, + baseTotal: number, + baseHp: number, + baseAtk: number, + baseDef: number, + baseSpatk: number, + baseSpdef: number, + baseSpd: number, + catchRate: number, + baseFriendship: number, + baseExp: number, + genderDiffs: boolean, + isStarterSelectable: boolean, ) { this.type1 = type1; this.type2 = type2; @@ -163,7 +215,7 @@ export abstract class PokemonSpeciesForm { this.ability2 = ability2 === Abilities.NONE ? ability1 : ability2; this.abilityHidden = abilityHidden; this.baseTotal = baseTotal; - this.baseStats = [ baseHp, baseAtk, baseDef, baseSpatk, baseSpdef, baseSpd ]; + this.baseStats = [baseHp, baseAtk, baseDef, baseSpatk, baseSpdef, baseSpd]; this.catchRate = catchRate; this.baseFriendship = baseFriendship; this.baseExp = baseExp; @@ -178,7 +230,7 @@ export abstract class PokemonSpeciesForm { * @param forStarter boolean to get the nonbaby form of a starter * @returns The species */ - getRootSpeciesId(forStarter: boolean = false): Species { + getRootSpeciesId(forStarter = false): Species { let ret = this.speciesId; while (pokemonPrevolutions.hasOwnProperty(ret) && (!forStarter || !speciesStarterCosts.hasOwnProperty(ret))) { ret = pokemonPrevolutions[ret]; @@ -241,23 +293,29 @@ export abstract class PokemonSpeciesForm { formIndex = this.formIndex; } let starterSpeciesId = this.speciesId; - while (!(starterSpeciesId in starterPassiveAbilities) || !(formIndex in starterPassiveAbilities[starterSpeciesId])) { + while ( + !(starterSpeciesId in starterPassiveAbilities) || + !(formIndex in starterPassiveAbilities[starterSpeciesId]) + ) { if (pokemonPrevolutions.hasOwnProperty(starterSpeciesId)) { starterSpeciesId = pokemonPrevolutions[starterSpeciesId]; - } else { // If we've reached the base species and still haven't found a matching ability, use form 0 if possible + } else { + // If we've reached the base species and still haven't found a matching ability, use form 0 if possible if (0 in starterPassiveAbilities[starterSpeciesId]) { return starterPassiveAbilities[starterSpeciesId][0]; - } else { - console.log("No passive ability found for %s, using run away", this.speciesId); - return Abilities.RUN_AWAY; } + console.log("No passive ability found for %s, using run away", this.speciesId); + return Abilities.RUN_AWAY; } } return starterPassiveAbilities[starterSpeciesId][formIndex]; } getLevelMoves(): LevelMoves { - if (pokemonSpeciesFormLevelMoves.hasOwnProperty(this.speciesId) && pokemonSpeciesFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex)) { + if ( + pokemonSpeciesFormLevelMoves.hasOwnProperty(this.speciesId) && + pokemonSpeciesFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex) + ) { return pokemonSpeciesFormLevelMoves[this.speciesId][this.formIndex].slice(0); } return pokemonSpeciesLevelMoves[this.speciesId].slice(0); @@ -268,7 +326,7 @@ export abstract class PokemonSpeciesForm { } isObtainable(): boolean { - return (this.generation <= 9 || pokemonPrevolutions.hasOwnProperty(this.speciesId)); + return this.generation <= 9 || pokemonPrevolutions.hasOwnProperty(this.speciesId); } isCatchable(): boolean { @@ -280,7 +338,7 @@ export abstract class PokemonSpeciesForm { } isTrainerForbidden(): boolean { - return [ Species.ETERNAL_FLOETTE, Species.BLOODMOON_URSALUNA ].includes(this.speciesId); + return [Species.ETERNAL_FLOETTE, Species.BLOODMOON_URSALUNA].includes(this.speciesId); } isRareRegional(): boolean { @@ -324,35 +382,35 @@ export abstract class PokemonSpeciesForm { return ret; } - getSpriteAtlasPath(female: boolean, formIndex?: number, shiny?: boolean, variant?: number): string { - const spriteId = this.getSpriteId(female, formIndex, shiny, variant).replace(/\_{2}/g, "/"); + getSpriteAtlasPath(female: boolean, formIndex?: number, shiny?: boolean, variant?: number, back?: boolean): string { + const spriteId = this.getSpriteId(female, formIndex, shiny, variant, back).replace(/\_{2}/g, "/"); return `${/_[1-3]$/.test(spriteId) ? "variant/" : ""}${spriteId}`; } - getSpriteId(female: boolean, formIndex?: number, shiny?: boolean, variant: number = 0, back?: boolean): string { + getSpriteId(female: boolean, formIndex?: number, shiny?: boolean, variant = 0, back?: boolean): string { if (formIndex === undefined || this instanceof PokemonForm) { formIndex = this.formIndex; } const formSpriteKey = this.getFormSpriteKey(formIndex); - const showGenderDiffs = this.genderDiffs && female && ![ SpeciesFormKey.MEGA, SpeciesFormKey.GIGANTAMAX ].find(k => formSpriteKey === k); + const showGenderDiffs = + this.genderDiffs && female && ![SpeciesFormKey.MEGA, SpeciesFormKey.GIGANTAMAX].find(k => formSpriteKey === k); const baseSpriteKey = `${showGenderDiffs ? "female__" : ""}${this.speciesId}${formSpriteKey ? `-${formSpriteKey}` : ""}`; let config = variantData; - `${back ? "back__" : ""}${baseSpriteKey}`.split("__").map(p => config ? config = config[p] : null); + `${back ? "back__" : ""}${baseSpriteKey}`.split("__").map(p => (config ? (config = config[p]) : null)); const variantSet = config as VariantSet; return `${back ? "back__" : ""}${shiny && (!variantSet || (!variant && !variantSet[variant || 0])) ? "shiny__" : ""}${baseSpriteKey}${shiny && variantSet && variantSet[variant] === 2 ? `_${variant + 1}` : ""}`; } - getSpriteKey(female: boolean, formIndex?: number, shiny?: boolean, variant?: number): string { - return `pkmn__${this.getSpriteId(female, formIndex, shiny, variant)}`; + getSpriteKey(female: boolean, formIndex?: number, shiny?: boolean, variant?: number, back?: boolean): string { + return `pkmn__${this.getSpriteId(female, formIndex, shiny, variant, back)}`; } abstract getFormSpriteKey(formIndex?: number): string; - /** * Variant Data key/index is either species id or species id followed by -formkey * @param formIndex optional form index for pokemon with different forms @@ -373,7 +431,8 @@ export abstract class PokemonSpeciesForm { getIconAtlasKey(formIndex?: number, shiny?: boolean, variant?: number): string { const variantDataIndex = this.getVariantDataIndex(formIndex); - const isVariant = shiny && variantData[variantDataIndex] && (variant !== undefined && variantData[variantDataIndex][variant]); + const isVariant = + shiny && variantData[variantDataIndex] && variant !== undefined && variantData[variantDataIndex][variant]; return `pokemon_icons_${this.generation}${isVariant ? "v" : ""}`; } @@ -386,7 +445,8 @@ export abstract class PokemonSpeciesForm { let ret = this.speciesId.toString(); - const isVariant = shiny && variantData[variantDataIndex] && (variant !== undefined && variantData[variantDataIndex][variant]); + const isVariant = + shiny && variantData[variantDataIndex] && variant !== undefined && variantData[variantDataIndex][variant]; if (shiny && !isVariant) { ret += "s"; @@ -451,7 +511,9 @@ export abstract class PokemonSpeciesForm { const forms = getPokemonSpecies(speciesId).forms; if (forms.length) { if (formIndex !== undefined && formIndex >= forms.length) { - console.warn(`Attempted accessing form with index ${formIndex} of species ${getPokemonSpecies(speciesId).getName()} with only ${forms.length || 0} forms`); + console.warn( + `Attempted accessing form with index ${formIndex} of species ${getPokemonSpecies(speciesId).getName()} with only ${forms.length || 0} forms`, + ); formIndex = Math.min(formIndex, forms.length - 1); } const formKey = forms[formIndex || 0].formKey; @@ -504,11 +566,14 @@ export abstract class PokemonSpeciesForm { for (const moveId of moveset) { if (speciesEggMoves.hasOwnProperty(rootSpeciesId)) { const eggMoveIndex = speciesEggMoves[rootSpeciesId].findIndex(m => m === moveId); - if (eggMoveIndex > -1 && (eggMoves & (1 << eggMoveIndex))) { + if (eggMoveIndex > -1 && eggMoves & (1 << eggMoveIndex)) { continue; } } - if (pokemonFormLevelMoves.hasOwnProperty(this.speciesId) && pokemonFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex)) { + if ( + pokemonFormLevelMoves.hasOwnProperty(this.speciesId) && + pokemonFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex) + ) { if (!pokemonFormLevelMoves[this.speciesId][this.formIndex].find(lm => lm[0] <= 5 && lm[1] === moveId)) { return false; } @@ -520,28 +585,42 @@ export abstract class PokemonSpeciesForm { return true; } - loadAssets(female: boolean, formIndex?: number, shiny?: boolean, variant?: Variant, startLoad?: boolean): Promise { + loadAssets( + female: boolean, + formIndex?: number, + shiny?: boolean, + variant?: Variant, + startLoad?: boolean, + back?: boolean, + ): Promise { return new Promise(resolve => { - const spriteKey = this.getSpriteKey(female, formIndex, shiny, variant); - globalScene.loadPokemonAtlas(spriteKey, this.getSpriteAtlasPath(female, formIndex, shiny, variant)); + const spriteKey = this.getSpriteKey(female, formIndex, shiny, variant, back); + globalScene.loadPokemonAtlas(spriteKey, this.getSpriteAtlasPath(female, formIndex, shiny, variant, back)); globalScene.load.audio(`${this.getCryKey(formIndex)}`, `audio/${this.getCryKey(formIndex)}.m4a`); globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => { const originalWarn = console.warn; // Ignore warnings for missing frames, because there will be a lot console.warn = () => {}; - const frameNames = globalScene.anims.generateFrameNames(spriteKey, { zeroPad: 4, suffix: ".png", start: 1, end: 400 }); + const frameNames = globalScene.anims.generateFrameNames(spriteKey, { + zeroPad: 4, + suffix: ".png", + start: 1, + end: 400, + }); console.warn = originalWarn; - if (!(globalScene.anims.exists(spriteKey))) { + if (!globalScene.anims.exists(spriteKey)) { globalScene.anims.create({ - key: this.getSpriteKey(female, formIndex, shiny, variant), + key: this.getSpriteKey(female, formIndex, shiny, variant, back), frames: frameNames, frameRate: 10, - repeat: -1 + repeat: -1, }); } else { globalScene.anims.get(spriteKey).frameRate = 10; } - const spritePath = this.getSpriteAtlasPath(female, formIndex, shiny, variant).replace("variant/", "").replace(/_[1-3]$/, ""); + const spritePath = this.getSpriteAtlasPath(female, formIndex, shiny, variant, back) + .replace("variant/", "") + .replace(/_[1-3]$/, ""); globalScene.loadPokemonVariantAssets(spriteKey, spritePath, variant).then(() => resolve()); }); if (startLoad) { @@ -590,9 +669,9 @@ export abstract class PokemonSpeciesForm { for (let i = 0; i < pixelData.length; i += 4) { if (pixelData[i + 3]) { const pixel = pixelData.slice(i, i + 4); - const [ r, g, b, a ] = pixel; + const [r, g, b, a] = pixel; if (!spriteColors.find(c => c[0] === r && c[1] === g && c[2] === b)) { - spriteColors.push([ r, g, b, a ]); + spriteColors.push([r, g, b, a]); } } } @@ -602,7 +681,14 @@ export abstract class PokemonSpeciesForm { if (!total) { continue; } - pixelColors.push(argbFromRgba({ r: pixelData[i], g: pixelData[i + 1], b: pixelData[i + 2], a: pixelData[i + 3] })); + pixelColors.push( + argbFromRgba({ + r: pixelData[i], + g: pixelData[i + 1], + b: pixelData[i + 2], + a: pixelData[i + 3], + }), + ); } } @@ -611,9 +697,13 @@ export abstract class PokemonSpeciesForm { const originalRandom = Math.random; Math.random = () => Phaser.Math.RND.realInRange(0, 1); - globalScene.executeWithSeedOffset(() => { - paletteColors = QuantizerCelebi.quantize(pixelColors, 2); - }, 0, "This result should not vary"); + globalScene.executeWithSeedOffset( + () => { + paletteColors = QuantizerCelebi.quantize(pixelColors, 2); + }, + 0, + "This result should not vary", + ); Math.random = originalRandom; @@ -633,14 +723,57 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali readonly canChangeForm: boolean; readonly forms: PokemonForm[]; - constructor(id: Species, generation: number, subLegendary: boolean, legendary: boolean, mythical: boolean, species: string, - type1: Type, type2: Type | null, height: number, weight: number, ability1: Abilities, ability2: Abilities, abilityHidden: Abilities, - baseTotal: number, baseHp: number, baseAtk: number, baseDef: number, baseSpatk: number, baseSpdef: number, baseSpd: number, - catchRate: number, baseFriendship: number, baseExp: number, growthRate: GrowthRate, malePercent: number | null, - genderDiffs: boolean, canChangeForm?: boolean, ...forms: PokemonForm[] + constructor( + id: Species, + generation: number, + subLegendary: boolean, + legendary: boolean, + mythical: boolean, + species: string, + type1: PokemonType, + type2: PokemonType | null, + height: number, + weight: number, + ability1: Abilities, + ability2: Abilities, + abilityHidden: Abilities, + baseTotal: number, + baseHp: number, + baseAtk: number, + baseDef: number, + baseSpatk: number, + baseSpdef: number, + baseSpd: number, + catchRate: number, + baseFriendship: number, + baseExp: number, + growthRate: GrowthRate, + malePercent: number | null, + genderDiffs: boolean, + canChangeForm?: boolean, + ...forms: PokemonForm[] ) { - super(type1, type2, height, weight, ability1, ability2, abilityHidden, baseTotal, baseHp, baseAtk, baseDef, baseSpatk, baseSpdef, baseSpd, - catchRate, baseFriendship, baseExp, genderDiffs, false); + super( + type1, + type2, + height, + weight, + ability1, + ability2, + abilityHidden, + baseTotal, + baseHp, + baseAtk, + baseDef, + baseSpatk, + baseSpdef, + baseSpd, + catchRate, + baseFriendship, + baseExp, + genderDiffs, + false, + ); this.speciesId = id; this.formIndex = 0; this.generation = generation; @@ -684,21 +817,110 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali } if (key) { - return i18next.t(`battlePokemonForm:${key}`, { pokemonName: this.name }); + return i18next.t(`battlePokemonForm:${key}`, { + pokemonName: this.name, + }); } } return this.name; } + /** + * Find the name of species with proper attachments for regionals and separate starter forms (Floette, Ursaluna) + * @returns a string with the region name or other form name attached + */ + getExpandedSpeciesName(): string { + if (this.speciesId < 2000) { + return this.name; // Other special cases could be put here too + } + // Everything beyond this point essentially follows the pattern of FORMNAME_SPECIES + return i18next.t(`pokemonForm:appendForm.${Species[this.speciesId].split("_")[0]}`, { pokemonName: this.name }); + } + + /** + * Find the form name for species with just one form (regional variants, Floette, Ursaluna) + * @param formIndex The form index to check (defaults to 0) + * @param append Whether to append the species name to the end (defaults to false) + * @returns the pokemon-form locale key for the single form name ("Alolan Form", "Eternal Flower" etc) + */ + getFormNameToDisplay(formIndex = 0, append = false): string { + const formKey = this.forms?.[formIndex!]?.formKey; + const formText = Utils.capitalizeString(formKey, "-", false, false) || ""; + const speciesName = Utils.capitalizeString(Species[this.speciesId], "_", true, false); + let ret = ""; + + const region = this.getRegion(); + if (this.speciesId === Species.ARCEUS) { + ret = i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`); + } else if ( + [ + SpeciesFormKey.MEGA, + SpeciesFormKey.MEGA_X, + SpeciesFormKey.MEGA_Y, + SpeciesFormKey.PRIMAL, + SpeciesFormKey.GIGANTAMAX, + SpeciesFormKey.GIGANTAMAX_RAPID, + SpeciesFormKey.GIGANTAMAX_SINGLE, + SpeciesFormKey.ETERNAMAX, + ].includes(formKey as SpeciesFormKey) + ) { + return append + ? i18next.t(`battlePokemonForm:${formKey}`, { pokemonName: this.name }) + : i18next.t(`pokemonForm:battleForm.${formKey}`); + } else if ( + region === Region.NORMAL || + (this.speciesId === Species.GALAR_DARMANITAN && formIndex > 0) || + this.speciesId === Species.PALDEA_TAUROS + ) { + // More special cases can be added here + const i18key = `pokemonForm:${speciesName}${formText}`; + if (i18next.exists(i18key)) { + ret = i18next.t(i18key); + } else { + const rootSpeciesName = Utils.capitalizeString(Species[this.getRootSpeciesId()], "_", true, false); + const i18RootKey = `pokemonForm:${rootSpeciesName}${formText}`; + ret = i18next.exists(i18RootKey) ? i18next.t(i18RootKey) : formText; + } + } else if (append) { + // Everything beyond this has an expanded name + return this.getExpandedSpeciesName(); + } else if (this.speciesId === Species.ETERNAL_FLOETTE) { + // Not a real form, so the key is made up + return i18next.t("pokemonForm:floetteEternalFlower"); + } else if (this.speciesId === Species.BLOODMOON_URSALUNA) { + // Not a real form, so the key is made up + return i18next.t("pokemonForm:ursalunaBloodmoon"); + } else { + // Only regional forms should be left at this point + return i18next.t(`pokemonForm:regionalForm.${Region[region]}`); + } + return append + ? i18next.t("pokemonForm:appendForm.GENERIC", { + pokemonName: this.name, + formName: ret, + }) + : ret; + } + localize(): void { this.name = i18next.t(`pokemon:${Species[this.speciesId].toLowerCase()}`); } getWildSpeciesForLevel(level: number, allowEvolving: boolean, isBoss: boolean, gameMode: GameMode): Species { - return this.getSpeciesForLevel(level, allowEvolving, false, (isBoss ? PartyMemberStrength.WEAKER : PartyMemberStrength.AVERAGE) + (gameMode?.isEndless ? 1 : 0)); + return this.getSpeciesForLevel( + level, + allowEvolving, + false, + (isBoss ? PartyMemberStrength.WEAKER : PartyMemberStrength.AVERAGE) + (gameMode?.isEndless ? 1 : 0), + ); } - getTrainerSpeciesForLevel(level: number, allowEvolving: boolean = false, strength: PartyMemberStrength, currentWave: number = 0): Species { + getTrainerSpeciesForLevel( + level: number, + allowEvolving = false, + strength: PartyMemberStrength, + currentWave = 0, + ): Species { return this.getSpeciesForLevel(level, allowEvolving, true, strength, currentWave); } @@ -718,7 +940,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali * The calculation with evolution delay is a weighted average of the easeIn and easeOut functions where preferredMinLevel is the denominator. * This also means a lower value of x will lead to a higher evolution chance. * @param strength {@linkcode PartyMemberStrength} The strength of the party member in question - * @returns {@linkcode integer} The level difference from expected evolution level tolerated for a mon to be unevolved. Lower value = higher evolution chance. + * @returns {@linkcode number} The level difference from expected evolution level tolerated for a mon to be unevolved. Lower value = higher evolution chance. */ private getStrengthLevelDiff(strength: PartyMemberStrength): number { switch (Math.min(strength, PartyMemberStrength.STRONGER)) { @@ -737,7 +959,13 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali } } - getSpeciesForLevel(level: number, allowEvolving: boolean = false, forTrainer: boolean = false, strength: PartyMemberStrength = PartyMemberStrength.WEAKER, currentWave: number = 0): Species { + getSpeciesForLevel( + level: number, + allowEvolving = false, + forTrainer = false, + strength: PartyMemberStrength = PartyMemberStrength.WEAKER, + currentWave = 0, + ): Species { const prevolutionLevels = this.getPrevolutionLevels(); if (prevolutionLevels.length) { @@ -749,7 +977,14 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali } } - if (!allowEvolving || !pokemonEvolutions.hasOwnProperty(this.speciesId)) { + if ( + // If evolutions shouldn't happen, add more cases here :) + !allowEvolving || + !pokemonEvolutions.hasOwnProperty(this.speciesId) || + (globalScene.currentBattle?.waveIndex === 20 && + globalScene.gameMode.isClassic && + globalScene.currentBattle.trainer) + ) { return this.speciesId; } @@ -782,20 +1017,32 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali const maxLevelDiff = this.getStrengthLevelDiff(strength); //The maximum distance from the evolution level tolerated for the mon to not evolve const minChance: number = 0.875 - 0.125 * strength; - evolutionChance = Math.min(minChance + easeInFunc(Math.min(level - ev.level, maxLevelDiff) / maxLevelDiff) * (1 - minChance), 1); + evolutionChance = Math.min( + minChance + easeInFunc(Math.min(level - ev.level, maxLevelDiff) / maxLevelDiff) * (1 - minChance), + 1, + ); } } else { - const preferredMinLevel = Math.max((ev.level - 1) + (ev.wildDelay!) * this.getStrengthLevelDiff(strength), 1); // TODO: is the bang correct? + const preferredMinLevel = Math.max(ev.level - 1 + ev.wildDelay! * this.getStrengthLevelDiff(strength), 1); // TODO: is the bang correct? let evolutionLevel = Math.max(ev.level > 1 ? ev.level : Math.floor(preferredMinLevel / 2), 1); if (ev.level <= 1 && pokemonPrevolutions.hasOwnProperty(this.speciesId)) { - const prevolutionLevel = pokemonEvolutions[pokemonPrevolutions[this.speciesId]].find(ev => ev.speciesId === this.speciesId)!.level; // TODO: is the bang correct? + const prevolutionLevel = pokemonEvolutions[pokemonPrevolutions[this.speciesId]].find( + ev => ev.speciesId === this.speciesId, + )!.level; // TODO: is the bang correct? if (prevolutionLevel > 1) { evolutionLevel = prevolutionLevel; } } - evolutionChance = Math.min(0.65 * easeInFunc(Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel) / preferredMinLevel) + 0.35 * easeOutFunc(Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel * 2.5) / (preferredMinLevel * 2.5)), 1); + evolutionChance = Math.min( + 0.65 * easeInFunc(Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel) / preferredMinLevel) + + 0.35 * + easeOutFunc( + Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel * 2.5) / (preferredMinLevel * 2.5), + ), + 1, + ); } } @@ -808,14 +1055,14 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali if (evolutionChance > 0) { if (isRegionalEvolution) { - evolutionChance /= (evolutionSpecies.isRareRegional() ? 16 : 4); + evolutionChance /= evolutionSpecies.isRareRegional() ? 16 : 4; } totalWeight += evolutionChance; evolutionPool.set(totalWeight, ev.speciesId); - if ((1 - evolutionChance) < noEvolutionChance) { + if (1 - evolutionChance < noEvolutionChance) { noEvolutionChance = 1 - evolutionChance; } } @@ -829,7 +1076,14 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali for (const weight of evolutionPool.keys()) { if (randValue < weight) { - return getPokemonSpecies(evolutionPool.get(weight)).getSpeciesForLevel(level, true, forTrainer, strength, currentWave); + // TODO: this entire function is dumb and should be changed, adding a `!` here for now until then + return getPokemonSpecies(evolutionPool.get(weight)!).getSpeciesForLevel( + level, + true, + forTrainer, + strength, + currentWave, + ); } } @@ -845,7 +1099,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali for (const e of pokemonEvolutions[this.speciesId]) { const speciesId = e.speciesId; const level = e.level; - evolutionLevels.push([ speciesId, level ]); + evolutionLevels.push([speciesId, level]); //console.log(Species[speciesId], getPokemonSpecies(speciesId), getPokemonSpecies(speciesId).getEvolutionLevels()); const nextEvolutionLevels = getPokemonSpecies(speciesId).getEvolutionLevels(); for (const npl of nextEvolutionLevels) { @@ -863,10 +1117,14 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali const allEvolvingPokemon = Object.keys(pokemonEvolutions); for (const p of allEvolvingPokemon) { for (const e of pokemonEvolutions[p]) { - if (e.speciesId === this.speciesId && (!this.forms.length || !e.evoFormKey || e.evoFormKey === this.forms[this.formIndex].formKey) && prevolutionLevels.every(pe => pe[0] !== parseInt(p))) { - const speciesId = parseInt(p) as Species; + if ( + e.speciesId === this.speciesId && + (!this.forms.length || !e.evoFormKey || e.evoFormKey === this.forms[this.formIndex].formKey) && + prevolutionLevels.every(pe => pe[0] !== Number.parseInt(p)) + ) { + const speciesId = Number.parseInt(p) as Species; const level = e.level; - prevolutionLevels.push([ speciesId, level ]); + prevolutionLevels.push([speciesId, level]); const subPrevolutionLevels = getPokemonSpecies(speciesId).getPrevolutionLevels(); for (const spl of subPrevolutionLevels) { prevolutionLevels.push(spl); @@ -879,21 +1137,53 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali } // This could definitely be written better and more accurate to the getSpeciesForLevel logic, but it is only for generating movesets for evolved Pokemon - getSimulatedEvolutionChain(currentLevel: number, forTrainer: boolean = false, isBoss: boolean = false, player: boolean = false): EvolutionLevel[] { + getSimulatedEvolutionChain( + currentLevel: number, + forTrainer = false, + isBoss = false, + player = false, + ): EvolutionLevel[] { const ret: EvolutionLevel[] = []; if (pokemonPrevolutions.hasOwnProperty(this.speciesId)) { const prevolutionLevels = this.getPrevolutionLevels().reverse(); - const levelDiff = player ? 0 : forTrainer || isBoss ? forTrainer && isBoss ? 2.5 : 5 : 10; - ret.push([ prevolutionLevels[0][0], 1 ]); + const levelDiff = player ? 0 : forTrainer || isBoss ? (forTrainer && isBoss ? 2.5 : 5) : 10; + ret.push([prevolutionLevels[0][0], 1]); for (let l = 1; l < prevolutionLevels.length; l++) { - const evolution = pokemonEvolutions[prevolutionLevels[l - 1][0]].find(e => e.speciesId === prevolutionLevels[l][0]); - ret.push([ prevolutionLevels[l][0], Math.min(Math.max((evolution?.level!) + Math.round(Utils.randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max((evolution?.wildDelay!), 0.5) * 5) - 1, 2, (evolution?.level!)), currentLevel - 1) ]); // TODO: are those bangs correct? + const evolution = pokemonEvolutions[prevolutionLevels[l - 1][0]].find( + e => e.speciesId === prevolutionLevels[l][0], + ); + ret.push([ + prevolutionLevels[l][0], + Math.min( + Math.max( + evolution?.level! + + Math.round(Utils.randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max(evolution?.wildDelay!, 0.5) * 5) - + 1, + 2, + evolution?.level!, + ), + currentLevel - 1, + ), + ]); // TODO: are those bangs correct? } const lastPrevolutionLevel = ret[prevolutionLevels.length - 1][1]; - const evolution = pokemonEvolutions[prevolutionLevels[prevolutionLevels.length - 1][0]].find(e => e.speciesId === this.speciesId); - ret.push([ this.speciesId, Math.min(Math.max(lastPrevolutionLevel + Math.round(Utils.randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max((evolution?.wildDelay!), 0.5) * 5), lastPrevolutionLevel + 1, (evolution?.level!)), currentLevel) ]); // TODO: are those bangs correct? + const evolution = pokemonEvolutions[prevolutionLevels[prevolutionLevels.length - 1][0]].find( + e => e.speciesId === this.speciesId, + ); + ret.push([ + this.speciesId, + Math.min( + Math.max( + lastPrevolutionLevel + + Math.round(Utils.randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max(evolution?.wildDelay!, 0.5) * 5), + lastPrevolutionLevel + 1, + evolution?.level!, + ), + currentLevel, + ), + ]); // TODO: are those bangs correct? } else { - ret.push([ this.speciesId, 1 ]); + ret.push([this.speciesId, 1]); } return ret; @@ -907,19 +1197,17 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali const mythical = this.mythical; return species => { return ( - subLegendary - || legendary - || mythical - || ( - pokemonEvolutions.hasOwnProperty(species.speciesId) === hasEvolution - && pokemonPrevolutions.hasOwnProperty(species.speciesId) === hasPrevolution - ) - ) - && species.subLegendary === subLegendary - && species.legendary === legendary - && species.mythical === mythical - && (this.isTrainerForbidden() || !species.isTrainerForbidden()) - && species.speciesId !== Species.DITTO; + (subLegendary || + legendary || + mythical || + (pokemonEvolutions.hasOwnProperty(species.speciesId) === hasEvolution && + pokemonPrevolutions.hasOwnProperty(species.speciesId) === hasPrevolution)) && + species.subLegendary === subLegendary && + species.legendary === legendary && + species.mythical === mythical && + (this.isTrainerForbidden() || !species.isTrainerForbidden()) && + species.speciesId !== Species.DITTO + ); }; } @@ -939,13 +1227,47 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali } getFormSpriteKey(formIndex?: number) { - if (this.forms.length && (formIndex !== undefined && formIndex >= this.forms.length)) { - console.warn(`Attempted accessing form with index ${formIndex} of species ${this.getName()} with only ${this.forms.length || 0} forms`); + if (this.forms.length && formIndex !== undefined && formIndex >= this.forms.length) { + console.warn( + `Attempted accessing form with index ${formIndex} of species ${this.getName()} with only ${this.forms.length || 0} forms`, + ); formIndex = Math.min(formIndex, this.forms.length - 1); } - return this.forms?.length - ? this.forms[formIndex || 0].getFormSpriteKey() - : ""; + return this.forms?.length ? this.forms[formIndex || 0].getFormSpriteKey() : ""; + } + + /** + * Generates a {@linkcode bigint} corresponding to the maximum unlocks possible for this species, + * taking into account if the species has a male/female gender, and which variants are implemented. + * @returns {@linkcode bigint} Maximum unlocks, can be compared with {@linkcode DexEntry.caughtAttr}. + */ + getFullUnlocksData(): bigint { + let caughtAttr = 0n; + caughtAttr += DexAttr.NON_SHINY; + caughtAttr += DexAttr.SHINY; + if (this.malePercent !== null) { + if (this.malePercent > 0) { + caughtAttr += DexAttr.MALE; + } + if (this.malePercent < 100) { + caughtAttr += DexAttr.FEMALE; + } + } + caughtAttr += DexAttr.DEFAULT_VARIANT; + if (this.hasVariants()) { + caughtAttr += DexAttr.VARIANT_2; + caughtAttr += DexAttr.VARIANT_3; + } + + // Summing successive bigints for each obtainable form + caughtAttr += + this?.forms?.length > 1 + ? this.forms + .map((f, index) => (f.isUnobtainable ? 0n : 128n * 2n ** BigInt(index))) + .reduce((acc, val) => acc + val, 0n) + : DexAttr.DEFAULT_FORM; + + return caughtAttr; } } @@ -953,19 +1275,73 @@ export class PokemonForm extends PokemonSpeciesForm { public formName: string; public formKey: string; public formSpriteKey: string | null; + public isUnobtainable: boolean; // This is a collection of form keys that have in-run form changes, but should still be separately selectable from the start screen - private starterSelectableKeys: string[] = [ "10", "50", "10-pc", "50-pc", "red", "orange", "yellow", "green", "blue", "indigo", "violet" ]; + private starterSelectableKeys: string[] = [ + "10", + "50", + "10-pc", + "50-pc", + "red", + "orange", + "yellow", + "green", + "blue", + "indigo", + "violet", + ]; - constructor(formName: string, formKey: string, type1: Type, type2: Type | null, height: number, weight: number, ability1: Abilities, ability2: Abilities, abilityHidden: Abilities, - baseTotal: number, baseHp: number, baseAtk: number, baseDef: number, baseSpatk: number, baseSpdef: number, baseSpd: number, - catchRate: number, baseFriendship: number, baseExp: number, genderDiffs: boolean = false, formSpriteKey: string | null = null, isStarterSelectable: boolean = false + constructor( + formName: string, + formKey: string, + type1: PokemonType, + type2: PokemonType | null, + height: number, + weight: number, + ability1: Abilities, + ability2: Abilities, + abilityHidden: Abilities, + baseTotal: number, + baseHp: number, + baseAtk: number, + baseDef: number, + baseSpatk: number, + baseSpdef: number, + baseSpd: number, + catchRate: number, + baseFriendship: number, + baseExp: number, + genderDiffs = false, + formSpriteKey: string | null = null, + isStarterSelectable = false, + isUnobtainable = false, ) { - super(type1, type2, height, weight, ability1, ability2, abilityHidden, baseTotal, baseHp, baseAtk, baseDef, baseSpatk, baseSpdef, baseSpd, - catchRate, baseFriendship, baseExp, genderDiffs, (isStarterSelectable || !formKey)); + super( + type1, + type2, + height, + weight, + ability1, + ability2, + abilityHidden, + baseTotal, + baseHp, + baseAtk, + baseDef, + baseSpatk, + baseSpdef, + baseSpd, + catchRate, + baseFriendship, + baseExp, + genderDiffs, + isStarterSelectable || !formKey, + ); this.formName = formName; this.formKey = formKey; this.formSpriteKey = formSpriteKey; + this.isUnobtainable = isUnobtainable; } getFormSpriteKey(_formIndex?: number) { @@ -974,1819 +1350,1804 @@ export class PokemonForm extends PokemonSpeciesForm { } /** -* Method to get the daily list of starters with Pokerus. -* @returns A list of starters with Pokerus -*/ + * Method to get the daily list of starters with Pokerus. + * @returns A list of starters with Pokerus + */ export function getPokerusStarters(): PokemonSpecies[] { const pokerusStarters: PokemonSpecies[] = []; const date = new Date(); date.setUTCHours(0, 0, 0, 0); - globalScene.executeWithSeedOffset(() => { - while (pokerusStarters.length < POKERUS_STARTER_COUNT) { - const randomSpeciesId = parseInt(Utils.randSeedItem(Object.keys(speciesStarterCosts)), 10); - const species = getPokemonSpecies(randomSpeciesId); - if (!pokerusStarters.includes(species)) { - pokerusStarters.push(species); + globalScene.executeWithSeedOffset( + () => { + while (pokerusStarters.length < POKERUS_STARTER_COUNT) { + const randomSpeciesId = Number.parseInt(Utils.randSeedItem(Object.keys(speciesStarterCosts)), 10); + const species = getPokemonSpecies(randomSpeciesId); + if (!pokerusStarters.includes(species)) { + pokerusStarters.push(species); + } } - } - }, 0, date.getTime().toString()); + }, + 0, + date.getTime().toString(), + ); return pokerusStarters; } export const allSpecies: PokemonSpecies[] = []; +// biome-ignore format: manually formatted export function initSpecies() { allSpecies.push( - new PokemonSpecies(Species.BULBASAUR, 1, false, false, false, "Seed Pokémon", Type.GRASS, Type.POISON, 0.7, 6.9, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 318, 45, 49, 49, 65, 65, 45, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.IVYSAUR, 1, false, false, false, "Seed Pokémon", Type.GRASS, Type.POISON, 1, 13, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 405, 60, 62, 63, 80, 80, 60, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.VENUSAUR, 1, false, false, false, "Seed Pokémon", Type.GRASS, Type.POISON, 2, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 80, 82, 83, 100, 100, 80, 45, 50, 263, GrowthRate.MEDIUM_SLOW, 87.5, true, true, - new PokemonForm("Normal", "", Type.GRASS, Type.POISON, 2, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 80, 82, 83, 100, 100, 80, 45, 50, 263, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GRASS, Type.POISON, 2.4, 155.5, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 625, 80, 100, 123, 122, 120, 80, 45, 50, 263, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.POISON, 24, 999.9, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.EFFECT_SPORE, 625, 120, 82, 98, 130, 115, 80, 45, 50, 263, true), - ), - new PokemonSpecies(Species.CHARMANDER, 1, false, false, false, "Lizard Pokémon", Type.FIRE, null, 0.6, 8.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 309, 39, 52, 43, 60, 50, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.CHARMELEON, 1, false, false, false, "Flame Pokémon", Type.FIRE, null, 1.1, 19, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 405, 58, 64, 58, 80, 65, 80, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.CHARIZARD, 1, false, false, false, "Flame Pokémon", Type.FIRE, Type.FLYING, 1.7, 90.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 534, 78, 84, 78, 109, 85, 100, 45, 50, 267, GrowthRate.MEDIUM_SLOW, 87.5, false, true, - new PokemonForm("Normal", "", Type.FIRE, Type.FLYING, 1.7, 90.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 534, 78, 84, 78, 109, 85, 100, 45, 50, 267, false, null, true), - new PokemonForm("Mega X", SpeciesFormKey.MEGA_X, Type.FIRE, Type.DRAGON, 1.7, 110.5, Abilities.TOUGH_CLAWS, Abilities.NONE, Abilities.TOUGH_CLAWS, 634, 78, 130, 111, 130, 85, 100, 45, 50, 267), - new PokemonForm("Mega Y", SpeciesFormKey.MEGA_Y, Type.FIRE, Type.FLYING, 1.7, 100.5, Abilities.DROUGHT, Abilities.NONE, Abilities.DROUGHT, 634, 78, 104, 78, 159, 115, 100, 45, 50, 267), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, Type.FLYING, 28, 999.9, Abilities.BERSERK, Abilities.NONE, Abilities.BERSERK, 634, 118, 84, 93, 139, 100, 100, 45, 50, 267), - ), - new PokemonSpecies(Species.SQUIRTLE, 1, false, false, false, "Tiny Turtle Pokémon", Type.WATER, null, 0.5, 9, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 314, 44, 48, 65, 50, 64, 43, 45, 50, 63, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.WARTORTLE, 1, false, false, false, "Turtle Pokémon", Type.WATER, null, 1, 22.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 405, 59, 63, 80, 65, 80, 58, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.BLASTOISE, 1, false, false, false, "Shellfish Pokémon", Type.WATER, null, 1.6, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 530, 79, 83, 100, 85, 105, 78, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true, - new PokemonForm("Normal", "", Type.WATER, null, 1.6, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 530, 79, 83, 100, 85, 105, 78, 45, 50, 265, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, null, 1.6, 101.1, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.MEGA_LAUNCHER, 630, 79, 103, 120, 135, 115, 78, 45, 50, 265), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.STEEL, 25, 999.9, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.SHELL_ARMOR, 630, 119, 83, 135, 115, 110, 68, 45, 50, 265), - ), - new PokemonSpecies(Species.CATERPIE, 1, false, false, false, "Worm Pokémon", Type.BUG, null, 0.3, 2.9, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 30, 35, 20, 20, 45, 255, 50, 39, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.METAPOD, 1, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.7, 9.9, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 20, 55, 25, 25, 30, 120, 50, 72, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BUTTERFREE, 1, false, false, false, "Butterfly Pokémon", Type.BUG, Type.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, GrowthRate.MEDIUM_FAST, 50, true, true, - new PokemonForm("Normal", "", Type.BUG, Type.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, true, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.BUG, Type.FLYING, 17, 999.9, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.COMPOUND_EYES, 495, 85, 35, 80, 120, 90, 85, 45, 50, 198, true), - ), - new PokemonSpecies(Species.WEEDLE, 1, false, false, false, "Hairy Bug Pokémon", Type.BUG, Type.POISON, 0.3, 3.2, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 40, 35, 30, 20, 20, 50, 255, 70, 39, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.KAKUNA, 1, false, false, false, "Cocoon Pokémon", Type.BUG, Type.POISON, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 45, 25, 50, 25, 25, 35, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BEEDRILL, 1, false, false, false, "Poison Bee Pokémon", Type.BUG, Type.POISON, 1, 29.5, Abilities.SWARM, Abilities.NONE, Abilities.SNIPER, 395, 65, 90, 40, 45, 80, 75, 45, 70, 178, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.BUG, Type.POISON, 1, 29.5, Abilities.SWARM, Abilities.NONE, Abilities.SNIPER, 395, 65, 90, 40, 45, 80, 75, 45, 70, 178, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.BUG, Type.POISON, 1.4, 40.5, Abilities.ADAPTABILITY, Abilities.NONE, Abilities.ADAPTABILITY, 495, 65, 150, 40, 15, 80, 145, 45, 70, 178), - ), - new PokemonSpecies(Species.PIDGEY, 1, false, false, false, "Tiny Bird Pokémon", Type.NORMAL, Type.FLYING, 0.3, 1.8, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 251, 40, 45, 40, 35, 35, 56, 255, 70, 50, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.PIDGEOTTO, 1, false, false, false, "Bird Pokémon", Type.NORMAL, Type.FLYING, 1.1, 30, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 349, 63, 60, 55, 50, 50, 71, 120, 70, 122, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.PIDGEOT, 1, false, false, false, "Bird Pokémon", Type.NORMAL, Type.FLYING, 1.5, 39.5, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 479, 83, 80, 75, 70, 70, 101, 45, 70, 216, GrowthRate.MEDIUM_SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.NORMAL, Type.FLYING, 1.5, 39.5, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 479, 83, 80, 75, 70, 70, 101, 45, 70, 216, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.NORMAL, Type.FLYING, 2.2, 50.5, Abilities.NO_GUARD, Abilities.NO_GUARD, Abilities.NO_GUARD, 579, 83, 80, 80, 135, 80, 121, 45, 70, 216), - ), - new PokemonSpecies(Species.RATTATA, 1, false, false, false, "Mouse Pokémon", Type.NORMAL, null, 0.3, 3.5, Abilities.RUN_AWAY, Abilities.GUTS, Abilities.HUSTLE, 253, 30, 56, 35, 25, 35, 72, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.RATICATE, 1, false, false, false, "Mouse Pokémon", Type.NORMAL, null, 0.7, 18.5, Abilities.RUN_AWAY, Abilities.GUTS, Abilities.HUSTLE, 413, 55, 81, 60, 50, 70, 97, 127, 70, 145, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.SPEAROW, 1, false, false, false, "Tiny Bird Pokémon", Type.NORMAL, Type.FLYING, 0.3, 2, Abilities.KEEN_EYE, Abilities.NONE, Abilities.SNIPER, 262, 40, 60, 30, 31, 31, 70, 255, 70, 52, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FEAROW, 1, false, false, false, "Beak Pokémon", Type.NORMAL, Type.FLYING, 1.2, 38, Abilities.KEEN_EYE, Abilities.NONE, Abilities.SNIPER, 442, 65, 90, 65, 61, 61, 100, 90, 70, 155, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.EKANS, 1, false, false, false, "Snake Pokémon", Type.POISON, null, 2, 6.9, Abilities.INTIMIDATE, Abilities.SHED_SKIN, Abilities.UNNERVE, 288, 35, 60, 44, 40, 54, 55, 255, 70, 58, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ARBOK, 1, false, false, false, "Cobra Pokémon", Type.POISON, null, 3.5, 65, Abilities.INTIMIDATE, Abilities.SHED_SKIN, Abilities.UNNERVE, 448, 60, 95, 69, 65, 79, 80, 90, 70, 157, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PIKACHU, 1, false, false, false, "Mouse Pokémon", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 320, 35, 55, 40, 50, 50, 90, 190, 50, 112, GrowthRate.MEDIUM_FAST, 50, true, true, - new PokemonForm("Normal", "", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 320, 35, 55, 40, 50, 50, 90, 190, 50, 112, true, null, true), - new PokemonForm("Partner", "partner", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), - new PokemonForm("Cosplay", "cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom - new PokemonForm("Cool Cosplay", "cool-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom - new PokemonForm("Beauty Cosplay", "beauty-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom - new PokemonForm("Cute Cosplay", "cute-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom - new PokemonForm("Smart Cosplay", "smart-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom - new PokemonForm("Tough Cosplay", "tough-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ELECTRIC, null, 21, 999.9, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.LIGHTNING_ROD, 530, 125, 95, 60, 90, 70, 90, 190, 50, 112), //+100 BST from Partner Form - ), - new PokemonSpecies(Species.RAICHU, 1, false, false, false, "Mouse Pokémon", Type.ELECTRIC, null, 0.8, 30, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 485, 60, 90, 55, 90, 80, 110, 75, 50, 243, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.SANDSHREW, 1, false, false, false, "Mouse Pokémon", Type.GROUND, null, 0.6, 12, Abilities.SAND_VEIL, Abilities.NONE, Abilities.SAND_RUSH, 300, 50, 75, 85, 20, 30, 40, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SANDSLASH, 1, false, false, false, "Mouse Pokémon", Type.GROUND, null, 1, 29.5, Abilities.SAND_VEIL, Abilities.NONE, Abilities.SAND_RUSH, 450, 75, 100, 110, 45, 55, 65, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.NIDORAN_F, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.4, 7, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 275, 55, 47, 52, 40, 40, 41, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.NIDORINA, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.8, 20, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 365, 70, 62, 67, 55, 55, 56, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.NIDOQUEEN, 1, false, false, false, "Drill Pokémon", Type.POISON, Type.GROUND, 1.3, 60, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.SHEER_FORCE, 505, 90, 92, 87, 75, 85, 76, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.NIDORAN_M, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.5, 9, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 273, 46, 57, 40, 40, 40, 50, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 100, false), - new PokemonSpecies(Species.NIDORINO, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.9, 19.5, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 365, 61, 72, 57, 55, 55, 65, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 100, false), - new PokemonSpecies(Species.NIDOKING, 1, false, false, false, "Drill Pokémon", Type.POISON, Type.GROUND, 1.4, 62, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.SHEER_FORCE, 505, 81, 102, 77, 85, 75, 85, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 100, false), - new PokemonSpecies(Species.CLEFAIRY, 1, false, false, false, "Fairy Pokémon", Type.FAIRY, null, 0.6, 7.5, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 323, 70, 45, 48, 60, 65, 35, 150, 140, 113, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.CLEFABLE, 1, false, false, false, "Fairy Pokémon", Type.FAIRY, null, 1.3, 40, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.UNAWARE, 483, 95, 70, 73, 95, 90, 60, 25, 140, 242, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.VULPIX, 1, false, false, false, "Fox Pokémon", Type.FIRE, null, 0.6, 9.9, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.DROUGHT, 299, 38, 41, 40, 50, 65, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 25, false), - new PokemonSpecies(Species.NINETALES, 1, false, false, false, "Fox Pokémon", Type.FIRE, null, 1.1, 19.9, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.DROUGHT, 505, 73, 76, 75, 81, 100, 100, 75, 50, 177, GrowthRate.MEDIUM_FAST, 25, false), - new PokemonSpecies(Species.JIGGLYPUFF, 1, false, false, false, "Balloon Pokémon", Type.NORMAL, Type.FAIRY, 0.5, 5.5, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 270, 115, 45, 20, 45, 25, 20, 170, 50, 95, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.WIGGLYTUFF, 1, false, false, false, "Balloon Pokémon", Type.NORMAL, Type.FAIRY, 1, 12, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRISK, 435, 140, 70, 45, 85, 50, 45, 50, 50, 218, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.ZUBAT, 1, false, false, false, "Bat Pokémon", Type.POISON, Type.FLYING, 0.8, 7.5, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 245, 40, 45, 35, 30, 40, 55, 255, 50, 49, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.GOLBAT, 1, false, false, false, "Bat Pokémon", Type.POISON, Type.FLYING, 1.6, 55, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 455, 75, 80, 70, 65, 75, 90, 90, 50, 159, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.ODDISH, 1, false, false, false, "Weed Pokémon", Type.GRASS, Type.POISON, 0.5, 5.4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.RUN_AWAY, 320, 45, 50, 55, 75, 65, 30, 255, 50, 64, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GLOOM, 1, false, false, false, "Weed Pokémon", Type.GRASS, Type.POISON, 0.8, 8.6, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.STENCH, 395, 60, 65, 70, 85, 75, 40, 120, 50, 138, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.VILEPLUME, 1, false, false, false, "Flower Pokémon", Type.GRASS, Type.POISON, 1.2, 18.6, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.EFFECT_SPORE, 490, 75, 80, 85, 110, 90, 50, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.PARAS, 1, false, false, false, "Mushroom Pokémon", Type.BUG, Type.GRASS, 0.3, 5.4, Abilities.EFFECT_SPORE, Abilities.DRY_SKIN, Abilities.DAMP, 285, 35, 70, 55, 45, 55, 25, 190, 70, 57, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PARASECT, 1, false, false, false, "Mushroom Pokémon", Type.BUG, Type.GRASS, 1, 29.5, Abilities.EFFECT_SPORE, Abilities.DRY_SKIN, Abilities.DAMP, 405, 60, 95, 80, 60, 80, 30, 75, 70, 142, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.VENONAT, 1, false, false, false, "Insect Pokémon", Type.BUG, Type.POISON, 1, 30, Abilities.COMPOUND_EYES, Abilities.TINTED_LENS, Abilities.RUN_AWAY, 305, 60, 55, 50, 40, 55, 45, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.VENOMOTH, 1, false, false, false, "Poison Moth Pokémon", Type.BUG, Type.POISON, 1.5, 12.5, Abilities.SHIELD_DUST, Abilities.TINTED_LENS, Abilities.WONDER_SKIN, 450, 70, 65, 60, 90, 75, 90, 75, 70, 158, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DIGLETT, 1, false, false, false, "Mole Pokémon", Type.GROUND, null, 0.2, 0.8, Abilities.SAND_VEIL, Abilities.ARENA_TRAP, Abilities.SAND_FORCE, 265, 10, 55, 25, 35, 45, 95, 255, 50, 53, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DUGTRIO, 1, false, false, false, "Mole Pokémon", Type.GROUND, null, 0.7, 33.3, Abilities.SAND_VEIL, Abilities.ARENA_TRAP, Abilities.SAND_FORCE, 425, 35, 100, 50, 50, 70, 120, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MEOWTH, 1, false, false, false, "Scratch Cat Pokémon", Type.NORMAL, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 290, 40, 45, 35, 40, 40, 90, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.NORMAL, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 290, 40, 45, 35, 40, 40, 90, 255, 50, 58, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 33, 999.9, Abilities.TECHNICIAN, Abilities.TECHNICIAN, Abilities.TECHNICIAN, 540, 115, 110, 65, 65, 70, 115, 255, 50, 58), //+100 BST from Persian - ), - new PokemonSpecies(Species.PERSIAN, 1, false, false, false, "Classy Cat Pokémon", Type.NORMAL, null, 1, 32, Abilities.LIMBER, Abilities.TECHNICIAN, Abilities.UNNERVE, 440, 65, 70, 60, 65, 65, 115, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PSYDUCK, 1, false, false, false, "Duck Pokémon", Type.WATER, null, 0.8, 19.6, Abilities.DAMP, Abilities.CLOUD_NINE, Abilities.SWIFT_SWIM, 320, 50, 52, 48, 65, 50, 55, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GOLDUCK, 1, false, false, false, "Duck Pokémon", Type.WATER, null, 1.7, 76.6, Abilities.DAMP, Abilities.CLOUD_NINE, Abilities.SWIFT_SWIM, 500, 80, 82, 78, 95, 80, 85, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MANKEY, 1, false, false, false, "Pig Monkey Pokémon", Type.FIGHTING, null, 0.5, 28, Abilities.VITAL_SPIRIT, Abilities.ANGER_POINT, Abilities.DEFIANT, 305, 40, 80, 35, 35, 45, 70, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PRIMEAPE, 1, false, false, false, "Pig Monkey Pokémon", Type.FIGHTING, null, 1, 32, Abilities.VITAL_SPIRIT, Abilities.ANGER_POINT, Abilities.DEFIANT, 455, 65, 105, 60, 60, 70, 95, 75, 70, 159, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GROWLITHE, 1, false, false, false, "Puppy Pokémon", Type.FIRE, null, 0.7, 19, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.JUSTIFIED, 350, 55, 70, 45, 70, 50, 60, 190, 50, 70, GrowthRate.SLOW, 75, false), - new PokemonSpecies(Species.ARCANINE, 1, false, false, false, "Legendary Pokémon", Type.FIRE, null, 1.9, 155, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.JUSTIFIED, 555, 90, 110, 80, 100, 80, 95, 75, 50, 194, GrowthRate.SLOW, 75, false), - new PokemonSpecies(Species.POLIWAG, 1, false, false, false, "Tadpole Pokémon", Type.WATER, null, 0.6, 12.4, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 300, 40, 50, 40, 40, 40, 90, 255, 50, 60, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.POLIWHIRL, 1, false, false, false, "Tadpole Pokémon", Type.WATER, null, 1, 20, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 385, 65, 65, 65, 50, 50, 90, 120, 50, 135, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.POLIWRATH, 1, false, false, false, "Tadpole Pokémon", Type.WATER, Type.FIGHTING, 1.3, 54, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 510, 90, 95, 95, 70, 90, 70, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.ABRA, 1, false, false, false, "Psi Pokémon", Type.PSYCHIC, null, 0.9, 19.5, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 310, 25, 20, 15, 105, 55, 90, 200, 50, 62, GrowthRate.MEDIUM_SLOW, 75, false), - new PokemonSpecies(Species.KADABRA, 1, false, false, false, "Psi Pokémon", Type.PSYCHIC, null, 1.3, 56.5, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 400, 40, 35, 30, 120, 70, 105, 100, 50, 140, GrowthRate.MEDIUM_SLOW, 75, true), - new PokemonSpecies(Species.ALAKAZAM, 1, false, false, false, "Psi Pokémon", Type.PSYCHIC, null, 1.5, 48, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 500, 55, 50, 45, 135, 95, 120, 50, 50, 250, GrowthRate.MEDIUM_SLOW, 75, true, true, - new PokemonForm("Normal", "", Type.PSYCHIC, null, 1.5, 48, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 500, 55, 50, 45, 135, 95, 120, 50, 50, 250, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.PSYCHIC, null, 1.2, 48, Abilities.TRACE, Abilities.TRACE, Abilities.TRACE, 600, 55, 50, 65, 175, 105, 150, 50, 50, 250, true), - ), - new PokemonSpecies(Species.MACHOP, 1, false, false, false, "Superpower Pokémon", Type.FIGHTING, null, 0.8, 19.5, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 305, 70, 80, 50, 35, 35, 35, 180, 50, 61, GrowthRate.MEDIUM_SLOW, 75, false), - new PokemonSpecies(Species.MACHOKE, 1, false, false, false, "Superpower Pokémon", Type.FIGHTING, null, 1.5, 70.5, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 405, 80, 100, 70, 50, 60, 45, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 75, false), - new PokemonSpecies(Species.MACHAMP, 1, false, false, false, "Superpower Pokémon", Type.FIGHTING, null, 1.6, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 505, 90, 130, 80, 65, 85, 55, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 75, false, true, - new PokemonForm("Normal", "", Type.FIGHTING, null, 1.6, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 505, 90, 130, 80, 65, 85, 55, 45, 50, 253, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIGHTING, null, 25, 999.9, Abilities.GUTS, Abilities.GUTS, Abilities.GUTS, 605, 115, 170, 95, 65, 95, 65, 45, 50, 253), - ), - new PokemonSpecies(Species.BELLSPROUT, 1, false, false, false, "Flower Pokémon", Type.GRASS, Type.POISON, 0.7, 4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 300, 50, 75, 35, 70, 30, 40, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.WEEPINBELL, 1, false, false, false, "Flycatcher Pokémon", Type.GRASS, Type.POISON, 1, 6.4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 390, 65, 90, 50, 85, 45, 55, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.VICTREEBEL, 1, false, false, false, "Flycatcher Pokémon", Type.GRASS, Type.POISON, 1.7, 15.5, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 490, 80, 105, 65, 100, 70, 70, 45, 70, 221, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.TENTACOOL, 1, false, false, false, "Jellyfish Pokémon", Type.WATER, Type.POISON, 0.9, 45.5, Abilities.CLEAR_BODY, Abilities.LIQUID_OOZE, Abilities.RAIN_DISH, 335, 40, 40, 35, 50, 100, 70, 190, 50, 67, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.TENTACRUEL, 1, false, false, false, "Jellyfish Pokémon", Type.WATER, Type.POISON, 1.6, 55, Abilities.CLEAR_BODY, Abilities.LIQUID_OOZE, Abilities.RAIN_DISH, 515, 80, 70, 65, 80, 120, 100, 60, 50, 180, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.GEODUDE, 1, false, false, false, "Rock Pokémon", Type.ROCK, Type.GROUND, 0.4, 20, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 300, 40, 80, 100, 30, 30, 20, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GRAVELER, 1, false, false, false, "Rock Pokémon", Type.ROCK, Type.GROUND, 1, 105, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 390, 55, 95, 115, 45, 45, 35, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GOLEM, 1, false, false, false, "Megaton Pokémon", Type.ROCK, Type.GROUND, 1.4, 300, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 495, 80, 120, 130, 55, 65, 45, 45, 70, 223, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.PONYTA, 1, false, false, false, "Fire Horse Pokémon", Type.FIRE, null, 1, 30, Abilities.RUN_AWAY, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.RAPIDASH, 1, false, false, false, "Fire Horse Pokémon", Type.FIRE, null, 1.7, 95, Abilities.RUN_AWAY, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SLOWPOKE, 1, false, false, false, "Dopey Pokémon", Type.WATER, Type.PSYCHIC, 1.2, 36, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 315, 90, 65, 65, 40, 40, 15, 190, 50, 63, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SLOWBRO, 1, false, false, false, "Hermit Crab Pokémon", Type.WATER, Type.PSYCHIC, 1.6, 78.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 110, 100, 80, 30, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.WATER, Type.PSYCHIC, 1.6, 78.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 110, 100, 80, 30, 75, 50, 172, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, Type.PSYCHIC, 2, 120, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, 590, 95, 75, 180, 130, 80, 30, 75, 50, 172), - ), - new PokemonSpecies(Species.MAGNEMITE, 1, false, false, false, "Magnet Pokémon", Type.ELECTRIC, Type.STEEL, 0.3, 6, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 325, 25, 35, 70, 95, 55, 45, 190, 50, 65, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.MAGNETON, 1, false, false, false, "Magnet Pokémon", Type.ELECTRIC, Type.STEEL, 1, 60, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 465, 50, 60, 95, 120, 70, 70, 60, 50, 163, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.FARFETCHD, 1, false, false, false, "Wild Duck Pokémon", Type.NORMAL, Type.FLYING, 0.8, 15, Abilities.KEEN_EYE, Abilities.INNER_FOCUS, Abilities.DEFIANT, 377, 52, 90, 55, 58, 62, 60, 45, 50, 132, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DODUO, 1, false, false, false, "Twin Bird Pokémon", Type.NORMAL, Type.FLYING, 1.4, 39.2, Abilities.RUN_AWAY, Abilities.EARLY_BIRD, Abilities.TANGLED_FEET, 310, 35, 85, 45, 35, 35, 75, 190, 70, 62, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.DODRIO, 1, false, false, false, "Triple Bird Pokémon", Type.NORMAL, Type.FLYING, 1.8, 85.2, Abilities.RUN_AWAY, Abilities.EARLY_BIRD, Abilities.TANGLED_FEET, 470, 60, 110, 70, 60, 60, 110, 45, 70, 165, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.SEEL, 1, false, false, false, "Sea Lion Pokémon", Type.WATER, null, 1.1, 90, Abilities.THICK_FAT, Abilities.HYDRATION, Abilities.ICE_BODY, 325, 65, 45, 55, 45, 70, 45, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DEWGONG, 1, false, false, false, "Sea Lion Pokémon", Type.WATER, Type.ICE, 1.7, 120, Abilities.THICK_FAT, Abilities.HYDRATION, Abilities.ICE_BODY, 475, 90, 70, 80, 70, 95, 70, 75, 70, 166, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GRIMER, 1, false, false, false, "Sludge Pokémon", Type.POISON, null, 0.9, 30, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.POISON_TOUCH, 325, 80, 80, 50, 40, 50, 25, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MUK, 1, false, false, false, "Sludge Pokémon", Type.POISON, null, 1.2, 30, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.POISON_TOUCH, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SHELLDER, 1, false, false, false, "Bivalve Pokémon", Type.WATER, null, 0.3, 4, Abilities.SHELL_ARMOR, Abilities.SKILL_LINK, Abilities.OVERCOAT, 305, 30, 65, 100, 45, 25, 40, 190, 50, 61, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.CLOYSTER, 1, false, false, false, "Bivalve Pokémon", Type.WATER, Type.ICE, 1.5, 132.5, Abilities.SHELL_ARMOR, Abilities.SKILL_LINK, Abilities.OVERCOAT, 525, 50, 95, 180, 85, 45, 70, 60, 50, 184, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.GASTLY, 1, false, false, false, "Gas Pokémon", Type.GHOST, Type.POISON, 1.3, 0.1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 310, 30, 35, 30, 100, 35, 80, 190, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.HAUNTER, 1, false, false, false, "Gas Pokémon", Type.GHOST, Type.POISON, 1.6, 0.1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 405, 45, 50, 45, 115, 55, 95, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GENGAR, 1, false, false, false, "Shadow Pokémon", Type.GHOST, Type.POISON, 1.5, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 500, 60, 65, 60, 130, 75, 110, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.GHOST, Type.POISON, 1.5, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 500, 60, 65, 60, 130, 75, 110, 45, 50, 250, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GHOST, Type.POISON, 1.4, 40.5, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.NONE, 600, 60, 65, 80, 170, 95, 130, 45, 50, 250), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GHOST, Type.POISON, 20, 999.9, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 600, 140, 65, 70, 140, 85, 100, 45, 50, 250), - ), - new PokemonSpecies(Species.ONIX, 1, false, false, false, "Rock Snake Pokémon", Type.ROCK, Type.GROUND, 8.8, 210, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.WEAK_ARMOR, 385, 35, 45, 160, 30, 45, 70, 45, 50, 77, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DROWZEE, 1, false, false, false, "Hypnosis Pokémon", Type.PSYCHIC, null, 1, 32.4, Abilities.INSOMNIA, Abilities.FOREWARN, Abilities.INNER_FOCUS, 328, 60, 48, 45, 43, 90, 42, 190, 70, 66, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.HYPNO, 1, false, false, false, "Hypnosis Pokémon", Type.PSYCHIC, null, 1.6, 75.6, Abilities.INSOMNIA, Abilities.FOREWARN, Abilities.INNER_FOCUS, 483, 85, 73, 70, 73, 115, 67, 75, 70, 169, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.KRABBY, 1, false, false, false, "River Crab Pokémon", Type.WATER, null, 0.4, 6.5, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 325, 30, 105, 90, 25, 25, 50, 225, 50, 65, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.KINGLER, 1, false, false, false, "Pincer Pokémon", Type.WATER, null, 1.3, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 475, 55, 130, 115, 50, 50, 75, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.WATER, null, 1.3, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 475, 55, 130, 115, 50, 50, 75, 60, 50, 166, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, null, 19, 999.9, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 575, 90, 155, 140, 50, 70, 70, 60, 50, 166), - ), - new PokemonSpecies(Species.VOLTORB, 1, false, false, false, "Ball Pokémon", Type.ELECTRIC, null, 0.5, 10.4, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 330, 40, 30, 50, 55, 55, 100, 190, 70, 66, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.ELECTRODE, 1, false, false, false, "Ball Pokémon", Type.ELECTRIC, null, 1.2, 66.6, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 490, 60, 50, 70, 80, 80, 150, 60, 70, 172, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.EXEGGCUTE, 1, false, false, false, "Egg Pokémon", Type.GRASS, Type.PSYCHIC, 0.4, 2.5, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HARVEST, 325, 60, 40, 80, 60, 45, 40, 90, 50, 65, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.EXEGGUTOR, 1, false, false, false, "Coconut Pokémon", Type.GRASS, Type.PSYCHIC, 2, 120, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HARVEST, 530, 95, 95, 85, 125, 75, 55, 45, 50, 186, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.CUBONE, 1, false, false, false, "Lonely Pokémon", Type.GROUND, null, 0.4, 6.5, Abilities.ROCK_HEAD, Abilities.LIGHTNING_ROD, Abilities.BATTLE_ARMOR, 320, 50, 50, 95, 40, 50, 35, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MAROWAK, 1, false, false, false, "Bone Keeper Pokémon", Type.GROUND, null, 1, 45, Abilities.ROCK_HEAD, Abilities.LIGHTNING_ROD, Abilities.BATTLE_ARMOR, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.HITMONLEE, 1, false, false, false, "Kicking Pokémon", Type.FIGHTING, null, 1.5, 49.8, Abilities.LIMBER, Abilities.RECKLESS, Abilities.UNBURDEN, 455, 50, 120, 53, 35, 110, 87, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false), - new PokemonSpecies(Species.HITMONCHAN, 1, false, false, false, "Punching Pokémon", Type.FIGHTING, null, 1.4, 50.2, Abilities.KEEN_EYE, Abilities.IRON_FIST, Abilities.INNER_FOCUS, 455, 50, 105, 79, 35, 110, 76, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false), - new PokemonSpecies(Species.LICKITUNG, 1, false, false, false, "Licking Pokémon", Type.NORMAL, null, 1.2, 65.5, Abilities.OWN_TEMPO, Abilities.OBLIVIOUS, Abilities.CLOUD_NINE, 385, 90, 55, 75, 60, 75, 30, 45, 50, 77, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.KOFFING, 1, false, false, false, "Poison Gas Pokémon", Type.POISON, null, 0.6, 1, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.STENCH, 340, 40, 65, 95, 60, 45, 35, 190, 50, 68, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.WEEZING, 1, false, false, false, "Poison Gas Pokémon", Type.POISON, null, 1.2, 9.5, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.STENCH, 490, 65, 90, 120, 85, 70, 60, 60, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.RHYHORN, 1, false, false, false, "Spikes Pokémon", Type.GROUND, Type.ROCK, 1, 115, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, Abilities.RECKLESS, 345, 80, 85, 95, 30, 30, 25, 120, 50, 69, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.RHYDON, 1, false, false, false, "Drill Pokémon", Type.GROUND, Type.ROCK, 1.9, 120, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, Abilities.RECKLESS, 485, 105, 130, 120, 45, 45, 40, 60, 50, 170, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.CHANSEY, 1, false, false, false, "Egg Pokémon", Type.NORMAL, null, 1.1, 34.6, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.HEALER, 450, 250, 5, 5, 35, 105, 50, 30, 140, 395, GrowthRate.FAST, 0, false), - new PokemonSpecies(Species.TANGELA, 1, false, false, false, "Vine Pokémon", Type.GRASS, null, 1, 35, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.REGENERATOR, 435, 65, 55, 115, 100, 40, 60, 45, 50, 87, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.KANGASKHAN, 1, false, false, false, "Parent Pokémon", Type.NORMAL, null, 2.2, 80, Abilities.EARLY_BIRD, Abilities.SCRAPPY, Abilities.INNER_FOCUS, 490, 105, 95, 80, 40, 80, 90, 45, 50, 172, GrowthRate.MEDIUM_FAST, 0, false, true, - new PokemonForm("Normal", "", Type.NORMAL, null, 2.2, 80, Abilities.EARLY_BIRD, Abilities.SCRAPPY, Abilities.INNER_FOCUS, 490, 105, 95, 80, 40, 80, 90, 45, 50, 172, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.NORMAL, null, 2.2, 100, Abilities.PARENTAL_BOND, Abilities.PARENTAL_BOND, Abilities.PARENTAL_BOND, 590, 105, 125, 100, 60, 100, 100, 45, 50, 172), - ), - new PokemonSpecies(Species.HORSEA, 1, false, false, false, "Dragon Pokémon", Type.WATER, null, 0.4, 8, Abilities.SWIFT_SWIM, Abilities.SNIPER, Abilities.DAMP, 295, 30, 40, 70, 70, 25, 60, 225, 50, 59, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SEADRA, 1, false, false, false, "Dragon Pokémon", Type.WATER, null, 1.2, 25, Abilities.POISON_POINT, Abilities.SNIPER, Abilities.DAMP, 440, 55, 65, 95, 95, 45, 85, 75, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GOLDEEN, 1, false, false, false, "Goldfish Pokémon", Type.WATER, null, 0.6, 15, Abilities.SWIFT_SWIM, Abilities.WATER_VEIL, Abilities.LIGHTNING_ROD, 320, 45, 67, 60, 35, 50, 63, 225, 50, 64, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.SEAKING, 1, false, false, false, "Goldfish Pokémon", Type.WATER, null, 1.3, 39, Abilities.SWIFT_SWIM, Abilities.WATER_VEIL, Abilities.LIGHTNING_ROD, 450, 80, 92, 65, 65, 80, 68, 60, 50, 158, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.STARYU, 1, false, false, false, "Star Shape Pokémon", Type.WATER, null, 0.8, 34.5, Abilities.ILLUMINATE, Abilities.NATURAL_CURE, Abilities.ANALYTIC, 340, 30, 45, 55, 70, 55, 85, 225, 50, 68, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.STARMIE, 1, false, false, false, "Mysterious Pokémon", Type.WATER, Type.PSYCHIC, 1.1, 80, Abilities.ILLUMINATE, Abilities.NATURAL_CURE, Abilities.ANALYTIC, 520, 60, 75, 85, 100, 85, 115, 60, 50, 182, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.MR_MIME, 1, false, false, false, "Barrier Pokémon", Type.PSYCHIC, Type.FAIRY, 1.3, 54.5, Abilities.SOUNDPROOF, Abilities.FILTER, Abilities.TECHNICIAN, 460, 40, 45, 65, 100, 120, 90, 45, 50, 161, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SCYTHER, 1, false, false, false, "Mantis Pokémon", Type.BUG, Type.FLYING, 1.5, 56, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.STEADFAST, 500, 70, 110, 80, 55, 80, 105, 45, 50, 100, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.JYNX, 1, false, false, false, "Human Shape Pokémon", Type.ICE, Type.PSYCHIC, 1.4, 40.6, Abilities.OBLIVIOUS, Abilities.FOREWARN, Abilities.DRY_SKIN, 455, 65, 50, 35, 115, 95, 95, 45, 50, 159, GrowthRate.MEDIUM_FAST, 0, false), - new PokemonSpecies(Species.ELECTABUZZ, 1, false, false, false, "Electric Pokémon", Type.ELECTRIC, null, 1.1, 30, Abilities.STATIC, Abilities.NONE, Abilities.VITAL_SPIRIT, 490, 65, 83, 57, 95, 85, 105, 45, 50, 172, GrowthRate.MEDIUM_FAST, 75, false), - new PokemonSpecies(Species.MAGMAR, 1, false, false, false, "Spitfire Pokémon", Type.FIRE, null, 1.3, 44.5, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 495, 65, 95, 57, 100, 85, 93, 45, 50, 173, GrowthRate.MEDIUM_FAST, 75, false), - new PokemonSpecies(Species.PINSIR, 1, false, false, false, "Stag Beetle Pokémon", Type.BUG, null, 1.5, 55, Abilities.HYPER_CUTTER, Abilities.MOLD_BREAKER, Abilities.MOXIE, 500, 65, 125, 100, 55, 70, 85, 45, 50, 175, GrowthRate.SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.BUG, null, 1.5, 55, Abilities.HYPER_CUTTER, Abilities.MOLD_BREAKER, Abilities.MOXIE, 500, 65, 125, 100, 55, 70, 85, 45, 50, 175, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.BUG, Type.FLYING, 1.7, 59, Abilities.AERILATE, Abilities.AERILATE, Abilities.AERILATE, 600, 65, 155, 120, 65, 90, 105, 45, 50, 175), - ), - new PokemonSpecies(Species.TAUROS, 1, false, false, false, "Wild Bull Pokémon", Type.NORMAL, null, 1.4, 88.4, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.SHEER_FORCE, 490, 75, 100, 95, 40, 70, 110, 45, 50, 172, GrowthRate.SLOW, 100, false), - new PokemonSpecies(Species.MAGIKARP, 1, false, false, false, "Fish Pokémon", Type.WATER, null, 0.9, 10, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.RATTLED, 200, 20, 10, 55, 15, 20, 80, 255, 50, 40, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.GYARADOS, 1, false, false, false, "Atrocious Pokémon", Type.WATER, Type.FLYING, 6.5, 235, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 540, 95, 125, 79, 60, 100, 81, 45, 50, 189, GrowthRate.SLOW, 50, true, true, - new PokemonForm("Normal", "", Type.WATER, Type.FLYING, 6.5, 235, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 540, 95, 125, 79, 60, 100, 81, 45, 50, 189, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, Type.DARK, 6.5, 305, Abilities.MOLD_BREAKER, Abilities.MOLD_BREAKER, Abilities.MOLD_BREAKER, 640, 95, 155, 109, 70, 130, 81, 45, 50, 189, true), - ), - new PokemonSpecies(Species.LAPRAS, 1, false, false, false, "Transport Pokémon", Type.WATER, Type.ICE, 2.5, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 535, 130, 85, 80, 85, 95, 60, 45, 50, 187, GrowthRate.SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.WATER, Type.ICE, 2.5, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 535, 130, 85, 80, 85, 95, 60, 45, 50, 187, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.ICE, 24, 999.9, Abilities.SHIELD_DUST, Abilities.SHIELD_DUST, Abilities.SHIELD_DUST, 635, 170, 85, 85, 105, 130, 60, 45, 50, 187), - ), - new PokemonSpecies(Species.DITTO, 1, false, false, false, "Transform Pokémon", Type.NORMAL, null, 0.3, 4, Abilities.LIMBER, Abilities.NONE, Abilities.IMPOSTER, 288, 48, 48, 48, 48, 48, 48, 35, 50, 101, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.EEVEE, 1, false, false, false, "Evolution Pokémon", Type.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 325, 55, 55, 50, 45, 65, 55, 45, 50, 65, GrowthRate.MEDIUM_FAST, 87.5, false, true, - new PokemonForm("Normal", "", Type.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 325, 55, 55, 50, 45, 65, 55, 45, 50, 65, false, null, true), - new PokemonForm("Partner", "partner", Type.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 435, 65, 75, 70, 65, 85, 75, 45, 50, 65, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 18, 999.9, Abilities.PROTEAN, Abilities.PROTEAN, Abilities.PROTEAN, 535, 110, 90, 70, 95, 85, 85, 45, 50, 65), //+100 BST from Partner Form - ), - new PokemonSpecies(Species.VAPOREON, 1, false, false, false, "Bubble Jet Pokémon", Type.WATER, null, 1, 29, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.HYDRATION, 525, 130, 65, 60, 110, 95, 65, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.JOLTEON, 1, false, false, false, "Lightning Pokémon", Type.ELECTRIC, null, 0.8, 24.5, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.QUICK_FEET, 525, 65, 65, 60, 110, 95, 130, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.FLAREON, 1, false, false, false, "Flame Pokémon", Type.FIRE, null, 0.9, 25, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.GUTS, 525, 65, 130, 60, 95, 110, 65, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.PORYGON, 1, false, false, false, "Virtual Pokémon", Type.NORMAL, null, 0.8, 36.5, Abilities.TRACE, Abilities.DOWNLOAD, Abilities.ANALYTIC, 395, 65, 60, 70, 85, 75, 40, 45, 50, 79, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.OMANYTE, 1, false, false, false, "Spiral Pokémon", Type.ROCK, Type.WATER, 0.4, 7.5, Abilities.SWIFT_SWIM, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 355, 35, 40, 100, 90, 55, 35, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.OMASTAR, 1, false, false, false, "Spiral Pokémon", Type.ROCK, Type.WATER, 1, 35, Abilities.SWIFT_SWIM, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 495, 70, 60, 125, 115, 70, 55, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.KABUTO, 1, false, false, false, "Shellfish Pokémon", Type.ROCK, Type.WATER, 0.5, 11.5, Abilities.SWIFT_SWIM, Abilities.BATTLE_ARMOR, Abilities.WEAK_ARMOR, 355, 30, 80, 90, 55, 45, 55, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.KABUTOPS, 1, false, false, false, "Shellfish Pokémon", Type.ROCK, Type.WATER, 1.3, 40.5, Abilities.SWIFT_SWIM, Abilities.BATTLE_ARMOR, Abilities.WEAK_ARMOR, 495, 60, 115, 105, 65, 70, 80, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.AERODACTYL, 1, false, false, false, "Fossil Pokémon", Type.ROCK, Type.FLYING, 1.8, 59, Abilities.ROCK_HEAD, Abilities.PRESSURE, Abilities.UNNERVE, 515, 80, 105, 65, 60, 75, 130, 45, 50, 180, GrowthRate.SLOW, 87.5, false, true, - new PokemonForm("Normal", "", Type.ROCK, Type.FLYING, 1.8, 59, Abilities.ROCK_HEAD, Abilities.PRESSURE, Abilities.UNNERVE, 515, 80, 105, 65, 60, 75, 130, 45, 50, 180, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ROCK, Type.FLYING, 2.1, 79, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 615, 80, 135, 85, 70, 95, 150, 45, 50, 180), - ), - new PokemonSpecies(Species.SNORLAX, 1, false, false, false, "Sleeping Pokémon", Type.NORMAL, null, 2.1, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 540, 160, 110, 65, 65, 110, 30, 25, 50, 189, GrowthRate.SLOW, 87.5, false, true, - new PokemonForm("Normal", "", Type.NORMAL, null, 2.1, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 540, 160, 110, 65, 65, 110, 30, 25, 50, 189, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 35, 999.9, Abilities.HARVEST, Abilities.HARVEST, Abilities.HARVEST, 640, 200, 135, 80, 80, 125, 20, 25, 50, 189), - ), - new PokemonSpecies(Species.ARTICUNO, 1, true, false, false, "Freeze Pokémon", Type.ICE, Type.FLYING, 1.7, 55.4, Abilities.PRESSURE, Abilities.NONE, Abilities.SNOW_CLOAK, 580, 90, 85, 100, 95, 125, 85, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.ZAPDOS, 1, true, false, false, "Electric Pokémon", Type.ELECTRIC, Type.FLYING, 1.6, 52.6, Abilities.PRESSURE, Abilities.NONE, Abilities.STATIC, 580, 90, 90, 85, 125, 90, 100, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.MOLTRES, 1, true, false, false, "Flame Pokémon", Type.FIRE, Type.FLYING, 2, 60, Abilities.PRESSURE, Abilities.NONE, Abilities.FLAME_BODY, 580, 90, 100, 90, 125, 85, 90, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.DRATINI, 1, false, false, false, "Dragon Pokémon", Type.DRAGON, null, 1.8, 3.3, Abilities.SHED_SKIN, Abilities.NONE, Abilities.MARVEL_SCALE, 300, 41, 64, 45, 50, 50, 50, 45, 35, 60, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.DRAGONAIR, 1, false, false, false, "Dragon Pokémon", Type.DRAGON, null, 4, 16.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.MARVEL_SCALE, 420, 61, 84, 65, 70, 70, 70, 45, 35, 147, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.DRAGONITE, 1, false, false, false, "Dragon Pokémon", Type.DRAGON, Type.FLYING, 2.2, 210, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.MULTISCALE, 600, 91, 134, 95, 100, 100, 80, 45, 35, 300, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.MEWTWO, 1, false, true, false, "Genetic Pokémon", Type.PSYCHIC, null, 2, 122, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 680, 106, 110, 90, 154, 90, 130, 3, 0, 340, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.PSYCHIC, null, 2, 122, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 680, 106, 110, 90, 154, 90, 130, 3, 0, 340, false, null, true), - new PokemonForm("Mega X", SpeciesFormKey.MEGA_X, Type.PSYCHIC, Type.FIGHTING, 2.3, 127, Abilities.STEADFAST, Abilities.NONE, Abilities.STEADFAST, 780, 106, 190, 100, 154, 100, 130, 3, 0, 340), - new PokemonForm("Mega Y", SpeciesFormKey.MEGA_Y, Type.PSYCHIC, null, 1.5, 33, Abilities.INSOMNIA, Abilities.NONE, Abilities.INSOMNIA, 780, 106, 150, 70, 194, 120, 140, 3, 0, 340), - ), - new PokemonSpecies(Species.MEW, 1, false, false, true, "New Species Pokémon", Type.PSYCHIC, null, 0.4, 4, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false), - new PokemonSpecies(Species.CHIKORITA, 2, false, false, false, "Leaf Pokémon", Type.GRASS, null, 0.9, 6.4, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 318, 45, 49, 65, 49, 65, 45, 45, 70, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.BAYLEEF, 2, false, false, false, "Leaf Pokémon", Type.GRASS, null, 1.2, 15.8, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 405, 60, 62, 80, 63, 80, 60, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.MEGANIUM, 2, false, false, false, "Herb Pokémon", Type.GRASS, null, 1.8, 100.5, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 525, 80, 82, 100, 83, 100, 80, 45, 70, 236, GrowthRate.MEDIUM_SLOW, 87.5, true), - new PokemonSpecies(Species.CYNDAQUIL, 2, false, false, false, "Fire Mouse Pokémon", Type.FIRE, null, 0.5, 7.9, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 309, 39, 52, 43, 60, 50, 65, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.QUILAVA, 2, false, false, false, "Volcano Pokémon", Type.FIRE, null, 0.9, 19, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 405, 58, 64, 58, 80, 65, 80, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.TYPHLOSION, 2, false, false, false, "Volcano Pokémon", Type.FIRE, null, 1.7, 79.5, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 534, 78, 84, 78, 109, 85, 100, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.TOTODILE, 2, false, false, false, "Big Jaw Pokémon", Type.WATER, null, 0.6, 9.5, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 314, 50, 65, 64, 44, 48, 43, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.CROCONAW, 2, false, false, false, "Big Jaw Pokémon", Type.WATER, null, 1.1, 25, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 405, 65, 80, 80, 59, 63, 58, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.FERALIGATR, 2, false, false, false, "Big Jaw Pokémon", Type.WATER, null, 2.3, 88.8, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 530, 85, 105, 100, 79, 83, 78, 45, 70, 239, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.SENTRET, 2, false, false, false, "Scout Pokémon", Type.NORMAL, null, 0.8, 6, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.FRISK, 215, 35, 46, 34, 35, 45, 20, 255, 70, 43, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FURRET, 2, false, false, false, "Long Body Pokémon", Type.NORMAL, null, 1.8, 32.5, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.FRISK, 415, 85, 76, 64, 45, 55, 90, 90, 70, 145, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.HOOTHOOT, 2, false, false, false, "Owl Pokémon", Type.NORMAL, Type.FLYING, 0.7, 21.2, Abilities.INSOMNIA, Abilities.KEEN_EYE, Abilities.TINTED_LENS, 262, 60, 30, 30, 36, 56, 50, 255, 50, 52, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.NOCTOWL, 2, false, false, false, "Owl Pokémon", Type.NORMAL, Type.FLYING, 1.6, 40.8, Abilities.INSOMNIA, Abilities.KEEN_EYE, Abilities.TINTED_LENS, 452, 100, 50, 50, 86, 96, 70, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.LEDYBA, 2, false, false, false, "Five Star Pokémon", Type.BUG, Type.FLYING, 1, 10.8, Abilities.SWARM, Abilities.EARLY_BIRD, Abilities.RATTLED, 265, 40, 20, 30, 40, 80, 55, 255, 70, 53, GrowthRate.FAST, 50, true), - new PokemonSpecies(Species.LEDIAN, 2, false, false, false, "Five Star Pokémon", Type.BUG, Type.FLYING, 1.4, 35.6, Abilities.SWARM, Abilities.EARLY_BIRD, Abilities.IRON_FIST, 390, 55, 35, 50, 55, 110, 85, 90, 70, 137, GrowthRate.FAST, 50, true), - new PokemonSpecies(Species.SPINARAK, 2, false, false, false, "String Spit Pokémon", Type.BUG, Type.POISON, 0.5, 8.5, Abilities.SWARM, Abilities.INSOMNIA, Abilities.SNIPER, 250, 40, 60, 40, 40, 40, 30, 255, 70, 50, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.ARIADOS, 2, false, false, false, "Long Leg Pokémon", Type.BUG, Type.POISON, 1.1, 33.5, Abilities.SWARM, Abilities.INSOMNIA, Abilities.SNIPER, 400, 70, 90, 70, 60, 70, 40, 90, 70, 140, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.CROBAT, 2, false, false, false, "Bat Pokémon", Type.POISON, Type.FLYING, 1.8, 75, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 535, 85, 90, 80, 70, 80, 130, 90, 50, 268, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CHINCHOU, 2, false, false, false, "Angler Pokémon", Type.WATER, Type.ELECTRIC, 0.5, 12, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 330, 75, 38, 38, 56, 56, 67, 190, 50, 66, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.LANTURN, 2, false, false, false, "Light Pokémon", Type.WATER, Type.ELECTRIC, 1.2, 22.5, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 460, 125, 58, 58, 76, 76, 67, 75, 50, 161, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.PICHU, 2, false, false, false, "Tiny Mouse Pokémon", Type.ELECTRIC, null, 0.3, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Normal", "", Type.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true), - new PokemonForm("Spiky-Eared", "spiky", Type.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true), - ), - new PokemonSpecies(Species.CLEFFA, 2, false, false, false, "Star Shape Pokémon", Type.FAIRY, null, 0.3, 3, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 218, 50, 25, 28, 45, 55, 15, 150, 140, 44, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.IGGLYBUFF, 2, false, false, false, "Balloon Pokémon", Type.NORMAL, Type.FAIRY, 0.3, 1, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 210, 90, 30, 15, 40, 20, 15, 170, 50, 42, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.TOGEPI, 2, false, false, false, "Spike Ball Pokémon", Type.FAIRY, null, 0.3, 1.5, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 245, 35, 20, 65, 40, 65, 20, 190, 50, 49, GrowthRate.FAST, 87.5, false), - new PokemonSpecies(Species.TOGETIC, 2, false, false, false, "Happiness Pokémon", Type.FAIRY, Type.FLYING, 0.6, 3.2, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 405, 55, 40, 85, 80, 105, 40, 75, 50, 142, GrowthRate.FAST, 87.5, false), - new PokemonSpecies(Species.NATU, 2, false, false, false, "Tiny Bird Pokémon", Type.PSYCHIC, Type.FLYING, 0.2, 2, Abilities.SYNCHRONIZE, Abilities.EARLY_BIRD, Abilities.MAGIC_BOUNCE, 320, 40, 50, 45, 70, 45, 70, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.XATU, 2, false, false, false, "Mystic Pokémon", Type.PSYCHIC, Type.FLYING, 1.5, 15, Abilities.SYNCHRONIZE, Abilities.EARLY_BIRD, Abilities.MAGIC_BOUNCE, 470, 65, 75, 70, 95, 70, 95, 75, 50, 165, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.MAREEP, 2, false, false, false, "Wool Pokémon", Type.ELECTRIC, null, 0.6, 7.8, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 280, 55, 40, 40, 65, 45, 35, 235, 70, 56, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.FLAAFFY, 2, false, false, false, "Wool Pokémon", Type.ELECTRIC, null, 0.8, 13.3, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 365, 70, 55, 55, 80, 60, 45, 120, 70, 128, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.AMPHAROS, 2, false, false, false, "Light Pokémon", Type.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 510, 90, 75, 85, 115, 90, 55, 45, 70, 230, GrowthRate.MEDIUM_SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 510, 90, 75, 85, 115, 90, 55, 45, 70, 230, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ELECTRIC, Type.DRAGON, 1.4, 61.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.MOLD_BREAKER, 610, 90, 95, 105, 165, 110, 45, 45, 70, 230), - ), - new PokemonSpecies(Species.BELLOSSOM, 2, false, false, false, "Flower Pokémon", Type.GRASS, null, 0.4, 5.8, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HEALER, 490, 75, 80, 95, 90, 100, 50, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.MARILL, 2, false, false, false, "Aqua Mouse Pokémon", Type.WATER, Type.FAIRY, 0.4, 8.5, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 250, 70, 20, 50, 20, 50, 40, 190, 50, 88, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.AZUMARILL, 2, false, false, false, "Aqua Rabbit Pokémon", Type.WATER, Type.FAIRY, 0.8, 28.5, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 420, 100, 50, 80, 60, 80, 50, 75, 50, 210, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.SUDOWOODO, 2, false, false, false, "Imitation Pokémon", Type.ROCK, null, 1.2, 38, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.RATTLED, 410, 70, 100, 115, 30, 65, 30, 65, 50, 144, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.POLITOED, 2, false, false, false, "Frog Pokémon", Type.WATER, null, 1.1, 33.9, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.DRIZZLE, 500, 90, 75, 75, 90, 100, 70, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.HOPPIP, 2, false, false, false, "Cottonweed Pokémon", Type.GRASS, Type.FLYING, 0.4, 0.5, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 250, 35, 35, 40, 35, 55, 50, 255, 70, 50, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SKIPLOOM, 2, false, false, false, "Cottonweed Pokémon", Type.GRASS, Type.FLYING, 0.6, 1, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 340, 55, 45, 50, 45, 65, 80, 120, 70, 119, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.JUMPLUFF, 2, false, false, false, "Cottonweed Pokémon", Type.GRASS, Type.FLYING, 0.8, 3, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 460, 75, 55, 70, 55, 95, 110, 45, 70, 207, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.AIPOM, 2, false, false, false, "Long Tail Pokémon", Type.NORMAL, null, 0.8, 11.5, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.SKILL_LINK, 360, 55, 70, 55, 40, 55, 85, 45, 70, 72, GrowthRate.FAST, 50, true), - new PokemonSpecies(Species.SUNKERN, 2, false, false, false, "Seed Pokémon", Type.GRASS, null, 0.3, 1.8, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.EARLY_BIRD, 180, 30, 30, 30, 30, 30, 30, 235, 70, 36, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SUNFLORA, 2, false, false, false, "Sun Pokémon", Type.GRASS, null, 0.8, 8.5, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.EARLY_BIRD, 425, 75, 75, 55, 105, 85, 30, 120, 70, 149, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.YANMA, 2, false, false, false, "Clear Wing Pokémon", Type.BUG, Type.FLYING, 1.2, 38, Abilities.SPEED_BOOST, Abilities.COMPOUND_EYES, Abilities.FRISK, 390, 65, 65, 45, 75, 45, 95, 75, 70, 78, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.WOOPER, 2, false, false, false, "Water Fish Pokémon", Type.WATER, Type.GROUND, 0.4, 8.5, Abilities.DAMP, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.QUAGSIRE, 2, false, false, false, "Water Fish Pokémon", Type.WATER, Type.GROUND, 1.4, 75, Abilities.DAMP, Abilities.WATER_ABSORB, Abilities.UNAWARE, 430, 95, 85, 85, 65, 65, 35, 90, 50, 151, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.ESPEON, 2, false, false, false, "Sun Pokémon", Type.PSYCHIC, null, 0.9, 26.5, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.MAGIC_BOUNCE, 525, 65, 65, 60, 130, 95, 110, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.UMBREON, 2, false, false, false, "Moonlight Pokémon", Type.DARK, null, 1, 27, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.INNER_FOCUS, 525, 95, 65, 110, 60, 130, 65, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.MURKROW, 2, false, false, false, "Darkness Pokémon", Type.DARK, Type.FLYING, 0.5, 2.1, Abilities.INSOMNIA, Abilities.SUPER_LUCK, Abilities.PRANKSTER, 405, 60, 85, 42, 85, 42, 91, 30, 35, 81, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.SLOWKING, 2, false, false, false, "Royal Pokémon", Type.WATER, Type.PSYCHIC, 2, 79.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 80, 100, 110, 30, 70, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MISDREAVUS, 2, false, false, false, "Screech Pokémon", Type.GHOST, null, 0.7, 1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 435, 60, 60, 60, 85, 85, 85, 45, 35, 87, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.UNOWN, 2, false, false, false, "Symbol Pokémon", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, GrowthRate.MEDIUM_FAST, null, false, false, - new PokemonForm("A", "a", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("B", "b", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("C", "c", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("D", "d", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("E", "e", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("F", "f", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("G", "g", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("H", "h", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("I", "i", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("J", "j", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("K", "k", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("L", "l", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("M", "m", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("N", "n", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("O", "o", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("P", "p", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("Q", "q", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("R", "r", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("S", "s", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("T", "t", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("U", "u", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("V", "v", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("W", "w", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("X", "x", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("Y", "y", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("Z", "z", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("!", "exclamation", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - new PokemonForm("?", "question", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), - ), - new PokemonSpecies(Species.WOBBUFFET, 2, false, false, false, "Patient Pokémon", Type.PSYCHIC, null, 1.3, 28.5, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.TELEPATHY, 405, 190, 33, 58, 33, 58, 33, 45, 50, 142, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.GIRAFARIG, 2, false, false, false, "Long Neck Pokémon", Type.NORMAL, Type.PSYCHIC, 1.5, 41.5, Abilities.INNER_FOCUS, Abilities.EARLY_BIRD, Abilities.SAP_SIPPER, 455, 70, 80, 65, 90, 65, 85, 60, 70, 159, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.PINECO, 2, false, false, false, "Bagworm Pokémon", Type.BUG, null, 0.6, 7.2, Abilities.STURDY, Abilities.NONE, Abilities.OVERCOAT, 290, 50, 65, 90, 35, 35, 15, 190, 70, 58, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FORRETRESS, 2, false, false, false, "Bagworm Pokémon", Type.BUG, Type.STEEL, 1.2, 125.8, Abilities.STURDY, Abilities.NONE, Abilities.OVERCOAT, 465, 75, 90, 140, 60, 60, 40, 75, 70, 163, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DUNSPARCE, 2, false, false, false, "Land Snake Pokémon", Type.NORMAL, null, 1.5, 14, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 415, 100, 70, 70, 65, 65, 45, 190, 50, 145, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GLIGAR, 2, false, false, false, "Fly Scorpion Pokémon", Type.GROUND, Type.FLYING, 1.1, 64.8, Abilities.HYPER_CUTTER, Abilities.SAND_VEIL, Abilities.IMMUNITY, 430, 65, 75, 105, 35, 65, 85, 60, 70, 86, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.STEELIX, 2, false, false, false, "Iron Snake Pokémon", Type.STEEL, Type.GROUND, 9.2, 400, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SHEER_FORCE, 510, 75, 85, 200, 55, 65, 30, 25, 50, 179, GrowthRate.MEDIUM_FAST, 50, true, true, - new PokemonForm("Normal", "", Type.STEEL, Type.GROUND, 9.2, 400, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SHEER_FORCE, 510, 75, 85, 200, 55, 65, 30, 25, 50, 179, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.STEEL, Type.GROUND, 10.5, 740, Abilities.SAND_FORCE, Abilities.SAND_FORCE, Abilities.SAND_FORCE, 610, 75, 125, 230, 55, 95, 30, 25, 50, 179, true), - ), - new PokemonSpecies(Species.SNUBBULL, 2, false, false, false, "Fairy Pokémon", Type.FAIRY, null, 0.6, 7.8, Abilities.INTIMIDATE, Abilities.RUN_AWAY, Abilities.RATTLED, 300, 60, 80, 50, 40, 40, 30, 190, 70, 60, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.GRANBULL, 2, false, false, false, "Fairy Pokémon", Type.FAIRY, null, 1.4, 48.7, Abilities.INTIMIDATE, Abilities.QUICK_FEET, Abilities.RATTLED, 450, 90, 120, 75, 60, 60, 45, 75, 70, 158, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.QWILFISH, 2, false, false, false, "Balloon Pokémon", Type.WATER, Type.POISON, 0.5, 3.9, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 440, 65, 95, 85, 55, 55, 85, 45, 50, 88, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SCIZOR, 2, false, false, false, "Pincer Pokémon", Type.BUG, Type.STEEL, 1.8, 118, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.LIGHT_METAL, 500, 70, 130, 100, 55, 80, 65, 25, 50, 175, GrowthRate.MEDIUM_FAST, 50, true, true, - new PokemonForm("Normal", "", Type.BUG, Type.STEEL, 1.8, 118, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.LIGHT_METAL, 500, 70, 130, 100, 55, 80, 65, 25, 50, 175, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.BUG, Type.STEEL, 2, 125, Abilities.TECHNICIAN, Abilities.TECHNICIAN, Abilities.TECHNICIAN, 600, 70, 150, 140, 65, 100, 75, 25, 50, 175, true), - ), - new PokemonSpecies(Species.SHUCKLE, 2, false, false, false, "Mold Pokémon", Type.BUG, Type.ROCK, 0.6, 20.5, Abilities.STURDY, Abilities.GLUTTONY, Abilities.CONTRARY, 505, 20, 10, 230, 10, 230, 5, 190, 50, 177, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.HERACROSS, 2, false, false, false, "Single Horn Pokémon", Type.BUG, Type.FIGHTING, 1.5, 54, Abilities.SWARM, Abilities.GUTS, Abilities.MOXIE, 500, 80, 125, 75, 40, 95, 85, 45, 50, 175, GrowthRate.SLOW, 50, true, true, - new PokemonForm("Normal", "", Type.BUG, Type.FIGHTING, 1.5, 54, Abilities.SWARM, Abilities.GUTS, Abilities.MOXIE, 500, 80, 125, 75, 40, 95, 85, 45, 50, 175, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.BUG, Type.FIGHTING, 1.7, 62.5, Abilities.SKILL_LINK, Abilities.SKILL_LINK, Abilities.SKILL_LINK, 600, 80, 185, 115, 40, 105, 75, 45, 50, 175, true), - ), - new PokemonSpecies(Species.SNEASEL, 2, false, false, false, "Sharp Claw Pokémon", Type.DARK, Type.ICE, 0.9, 28, Abilities.INNER_FOCUS, Abilities.KEEN_EYE, Abilities.PICKPOCKET, 430, 55, 95, 55, 35, 75, 115, 60, 35, 86, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.TEDDIURSA, 2, false, false, false, "Little Bear Pokémon", Type.NORMAL, null, 0.6, 8.8, Abilities.PICKUP, Abilities.QUICK_FEET, Abilities.HONEY_GATHER, 330, 60, 80, 50, 50, 50, 40, 120, 70, 66, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.URSARING, 2, false, false, false, "Hibernator Pokémon", Type.NORMAL, null, 1.8, 125.8, Abilities.GUTS, Abilities.QUICK_FEET, Abilities.UNNERVE, 500, 90, 130, 75, 75, 75, 55, 60, 70, 175, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.SLUGMA, 2, false, false, false, "Lava Pokémon", Type.FIRE, null, 0.7, 35, Abilities.MAGMA_ARMOR, Abilities.FLAME_BODY, Abilities.WEAK_ARMOR, 250, 40, 40, 40, 70, 40, 20, 190, 70, 50, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MAGCARGO, 2, false, false, false, "Lava Pokémon", Type.FIRE, Type.ROCK, 0.8, 55, Abilities.MAGMA_ARMOR, Abilities.FLAME_BODY, Abilities.WEAK_ARMOR, 430, 60, 50, 120, 90, 80, 30, 75, 70, 151, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SWINUB, 2, false, false, false, "Pig Pokémon", Type.ICE, Type.GROUND, 0.4, 6.5, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 250, 50, 50, 40, 30, 30, 50, 225, 50, 50, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.PILOSWINE, 2, false, false, false, "Swine Pokémon", Type.ICE, Type.GROUND, 1.1, 55.8, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 450, 100, 100, 80, 60, 60, 50, 75, 50, 158, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.CORSOLA, 2, false, false, false, "Coral Pokémon", Type.WATER, Type.ROCK, 0.6, 5, Abilities.HUSTLE, Abilities.NATURAL_CURE, Abilities.REGENERATOR, 410, 65, 55, 95, 65, 95, 35, 60, 50, 144, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.REMORAID, 2, false, false, false, "Jet Pokémon", Type.WATER, null, 0.6, 12, Abilities.HUSTLE, Abilities.SNIPER, Abilities.MOODY, 300, 35, 65, 35, 65, 35, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.OCTILLERY, 2, false, false, false, "Jet Pokémon", Type.WATER, null, 0.9, 28.5, Abilities.SUCTION_CUPS, Abilities.SNIPER, Abilities.MOODY, 480, 75, 105, 75, 105, 75, 45, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.DELIBIRD, 2, false, false, false, "Delivery Pokémon", Type.ICE, Type.FLYING, 0.9, 16, Abilities.VITAL_SPIRIT, Abilities.HUSTLE, Abilities.INSOMNIA, 330, 45, 55, 45, 65, 45, 75, 45, 50, 116, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.MANTINE, 2, false, false, false, "Kite Pokémon", Type.WATER, Type.FLYING, 2.1, 220, Abilities.SWIFT_SWIM, Abilities.WATER_ABSORB, Abilities.WATER_VEIL, 485, 85, 40, 70, 80, 140, 70, 25, 50, 170, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.SKARMORY, 2, false, false, false, "Armor Bird Pokémon", Type.STEEL, Type.FLYING, 1.7, 50.5, Abilities.KEEN_EYE, Abilities.STURDY, Abilities.WEAK_ARMOR, 465, 65, 80, 140, 40, 70, 70, 25, 50, 163, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.HOUNDOUR, 2, false, false, false, "Dark Pokémon", Type.DARK, Type.FIRE, 0.6, 10.8, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 330, 45, 60, 30, 80, 50, 65, 120, 35, 66, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.HOUNDOOM, 2, false, false, false, "Dark Pokémon", Type.DARK, Type.FIRE, 1.4, 35, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 500, 75, 90, 50, 110, 80, 95, 45, 35, 175, GrowthRate.SLOW, 50, true, true, - new PokemonForm("Normal", "", Type.DARK, Type.FIRE, 1.4, 35, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 500, 75, 90, 50, 110, 80, 95, 45, 35, 175, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DARK, Type.FIRE, 1.9, 49.5, Abilities.SOLAR_POWER, Abilities.SOLAR_POWER, Abilities.SOLAR_POWER, 600, 75, 90, 90, 140, 90, 115, 45, 35, 175, true), - ), - new PokemonSpecies(Species.KINGDRA, 2, false, false, false, "Dragon Pokémon", Type.WATER, Type.DRAGON, 1.8, 152, Abilities.SWIFT_SWIM, Abilities.SNIPER, Abilities.DAMP, 540, 75, 95, 95, 95, 95, 85, 45, 50, 270, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PHANPY, 2, false, false, false, "Long Nose Pokémon", Type.GROUND, null, 0.5, 33.5, Abilities.PICKUP, Abilities.NONE, Abilities.SAND_VEIL, 330, 90, 60, 60, 40, 40, 40, 120, 70, 66, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DONPHAN, 2, false, false, false, "Armor Pokémon", Type.GROUND, null, 1.1, 120, Abilities.STURDY, Abilities.NONE, Abilities.SAND_VEIL, 500, 90, 120, 120, 60, 60, 50, 60, 70, 175, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.PORYGON2, 2, false, false, false, "Virtual Pokémon", Type.NORMAL, null, 0.6, 32.5, Abilities.TRACE, Abilities.DOWNLOAD, Abilities.ANALYTIC, 515, 85, 80, 90, 105, 95, 60, 45, 50, 180, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.STANTLER, 2, false, false, false, "Big Horn Pokémon", Type.NORMAL, null, 1.4, 71.2, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 465, 73, 95, 62, 85, 65, 85, 45, 70, 163, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.SMEARGLE, 2, false, false, false, "Painter Pokémon", Type.NORMAL, null, 1.2, 58, Abilities.OWN_TEMPO, Abilities.TECHNICIAN, Abilities.MOODY, 250, 55, 20, 35, 20, 45, 75, 45, 70, 88, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.TYROGUE, 2, false, false, false, "Scuffle Pokémon", Type.FIGHTING, null, 0.7, 21, Abilities.GUTS, Abilities.STEADFAST, Abilities.VITAL_SPIRIT, 210, 35, 35, 35, 35, 35, 35, 75, 50, 42, GrowthRate.MEDIUM_FAST, 100, false), - new PokemonSpecies(Species.HITMONTOP, 2, false, false, false, "Handstand Pokémon", Type.FIGHTING, null, 1.4, 48, Abilities.INTIMIDATE, Abilities.TECHNICIAN, Abilities.STEADFAST, 455, 50, 95, 95, 35, 110, 70, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false), - new PokemonSpecies(Species.SMOOCHUM, 2, false, false, false, "Kiss Pokémon", Type.ICE, Type.PSYCHIC, 0.4, 6, Abilities.OBLIVIOUS, Abilities.FOREWARN, Abilities.HYDRATION, 305, 45, 30, 15, 85, 65, 65, 45, 50, 61, GrowthRate.MEDIUM_FAST, 0, false), - new PokemonSpecies(Species.ELEKID, 2, false, false, false, "Electric Pokémon", Type.ELECTRIC, null, 0.6, 23.5, Abilities.STATIC, Abilities.NONE, Abilities.VITAL_SPIRIT, 360, 45, 63, 37, 65, 55, 95, 45, 50, 72, GrowthRate.MEDIUM_FAST, 75, false), - new PokemonSpecies(Species.MAGBY, 2, false, false, false, "Live Coal Pokémon", Type.FIRE, null, 0.7, 21.4, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 365, 45, 75, 37, 70, 55, 83, 45, 50, 73, GrowthRate.MEDIUM_FAST, 75, false), - new PokemonSpecies(Species.MILTANK, 2, false, false, false, "Milk Cow Pokémon", Type.NORMAL, null, 1.2, 75.5, Abilities.THICK_FAT, Abilities.SCRAPPY, Abilities.SAP_SIPPER, 490, 95, 80, 105, 40, 70, 100, 45, 50, 172, GrowthRate.SLOW, 0, false), - new PokemonSpecies(Species.BLISSEY, 2, false, false, false, "Happiness Pokémon", Type.NORMAL, null, 1.5, 46.8, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.HEALER, 540, 255, 10, 10, 75, 135, 55, 30, 140, 635, GrowthRate.FAST, 0, false), - new PokemonSpecies(Species.RAIKOU, 2, true, false, false, "Thunder Pokémon", Type.ELECTRIC, null, 1.9, 178, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 90, 85, 75, 115, 100, 115, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.ENTEI, 2, true, false, false, "Volcano Pokémon", Type.FIRE, null, 2.1, 198, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 115, 115, 85, 90, 75, 100, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SUICUNE, 2, true, false, false, "Aurora Pokémon", Type.WATER, null, 2, 187, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 100, 75, 115, 90, 115, 85, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.LARVITAR, 2, false, false, false, "Rock Skin Pokémon", Type.ROCK, Type.GROUND, 0.6, 72, Abilities.GUTS, Abilities.NONE, Abilities.SAND_VEIL, 300, 50, 64, 50, 45, 50, 41, 45, 35, 60, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.PUPITAR, 2, false, false, false, "Hard Shell Pokémon", Type.ROCK, Type.GROUND, 1.2, 152, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 410, 70, 84, 70, 65, 70, 51, 45, 35, 144, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.TYRANITAR, 2, false, false, false, "Armor Pokémon", Type.ROCK, Type.DARK, 2, 202, Abilities.SAND_STREAM, Abilities.NONE, Abilities.UNNERVE, 600, 100, 134, 110, 95, 100, 61, 45, 35, 300, GrowthRate.SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.ROCK, Type.DARK, 2, 202, Abilities.SAND_STREAM, Abilities.NONE, Abilities.UNNERVE, 600, 100, 134, 110, 95, 100, 61, 45, 35, 300, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ROCK, Type.DARK, 2.5, 255, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_STREAM, 700, 100, 164, 150, 95, 120, 71, 45, 35, 300), - ), - new PokemonSpecies(Species.LUGIA, 2, false, true, false, "Diving Pokémon", Type.PSYCHIC, Type.FLYING, 5.2, 216, Abilities.PRESSURE, Abilities.NONE, Abilities.MULTISCALE, 680, 106, 90, 130, 90, 154, 110, 3, 0, 340, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.HO_OH, 2, false, true, false, "Rainbow Pokémon", Type.FIRE, Type.FLYING, 3.8, 199, Abilities.PRESSURE, Abilities.NONE, Abilities.REGENERATOR, 680, 106, 130, 90, 110, 154, 90, 3, 0, 340, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.CELEBI, 2, false, false, true, "Time Travel Pokémon", Type.PSYCHIC, Type.GRASS, 0.6, 5, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false), - new PokemonSpecies(Species.TREECKO, 3, false, false, false, "Wood Gecko Pokémon", Type.GRASS, null, 0.5, 5, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 310, 40, 45, 35, 65, 55, 70, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.GROVYLE, 3, false, false, false, "Wood Gecko Pokémon", Type.GRASS, null, 0.9, 21.6, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 405, 50, 65, 45, 85, 65, 95, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.SCEPTILE, 3, false, false, false, "Forest Pokémon", Type.GRASS, null, 1.7, 52.2, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 530, 70, 85, 65, 105, 85, 120, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true, - new PokemonForm("Normal", "", Type.GRASS, null, 1.7, 52.2, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 530, 70, 85, 65, 105, 85, 120, 45, 50, 265, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GRASS, Type.DRAGON, 1.9, 55.2, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.LIGHTNING_ROD, 630, 70, 110, 75, 145, 85, 145, 45, 50, 265), - ), - new PokemonSpecies(Species.TORCHIC, 3, false, false, false, "Chick Pokémon", Type.FIRE, null, 0.4, 2.5, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 310, 45, 60, 40, 70, 50, 45, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, true), - new PokemonSpecies(Species.COMBUSKEN, 3, false, false, false, "Young Fowl Pokémon", Type.FIRE, Type.FIGHTING, 0.9, 19.5, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 405, 60, 85, 60, 85, 60, 55, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, true), - new PokemonSpecies(Species.BLAZIKEN, 3, false, false, false, "Blaze Pokémon", Type.FIRE, Type.FIGHTING, 1.9, 52, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 530, 80, 120, 70, 110, 70, 80, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, true, true, - new PokemonForm("Normal", "", Type.FIRE, Type.FIGHTING, 1.9, 52, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 530, 80, 120, 70, 110, 70, 80, 45, 50, 265, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.FIRE, Type.FIGHTING, 1.9, 52, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.SPEED_BOOST, 630, 80, 160, 80, 130, 80, 100, 45, 50, 265, true), - ), - new PokemonSpecies(Species.MUDKIP, 3, false, false, false, "Mud Fish Pokémon", Type.WATER, null, 0.4, 7.6, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 310, 50, 70, 50, 50, 50, 40, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.MARSHTOMP, 3, false, false, false, "Mud Fish Pokémon", Type.WATER, Type.GROUND, 0.7, 28, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 405, 70, 85, 70, 60, 70, 50, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.SWAMPERT, 3, false, false, false, "Mud Fish Pokémon", Type.WATER, Type.GROUND, 1.5, 81.9, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 535, 100, 110, 90, 85, 90, 60, 45, 50, 268, GrowthRate.MEDIUM_SLOW, 87.5, false, true, - new PokemonForm("Normal", "", Type.WATER, Type.GROUND, 1.5, 81.9, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 535, 100, 110, 90, 85, 90, 60, 45, 50, 268, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, Type.GROUND, 1.9, 102, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.SWIFT_SWIM, 635, 100, 150, 110, 95, 110, 70, 45, 50, 268), - ), - new PokemonSpecies(Species.POOCHYENA, 3, false, false, false, "Bite Pokémon", Type.DARK, null, 0.5, 13.6, Abilities.RUN_AWAY, Abilities.QUICK_FEET, Abilities.RATTLED, 220, 35, 55, 35, 30, 30, 35, 255, 70, 56, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MIGHTYENA, 3, false, false, false, "Bite Pokémon", Type.DARK, null, 1, 37, Abilities.INTIMIDATE, Abilities.QUICK_FEET, Abilities.MOXIE, 420, 70, 90, 70, 60, 60, 70, 127, 70, 147, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ZIGZAGOON, 3, false, false, false, "Tiny Raccoon Pokémon", Type.NORMAL, null, 0.4, 17.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 240, 38, 30, 41, 30, 41, 60, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.LINOONE, 3, false, false, false, "Rushing Pokémon", Type.NORMAL, null, 0.5, 32.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 420, 78, 70, 61, 50, 61, 100, 90, 50, 147, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.WURMPLE, 3, false, false, false, "Worm Pokémon", Type.BUG, null, 0.3, 3.6, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 45, 35, 20, 30, 20, 255, 70, 56, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SILCOON, 3, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BEAUTIFLY, 3, false, false, false, "Butterfly Pokémon", Type.BUG, Type.FLYING, 1, 28.4, Abilities.SWARM, Abilities.NONE, Abilities.RIVALRY, 395, 60, 70, 50, 100, 50, 65, 45, 70, 178, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.CASCOON, 3, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.7, 11.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DUSTOX, 3, false, false, false, "Poison Moth Pokémon", Type.BUG, Type.POISON, 1.2, 31.6, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.COMPOUND_EYES, 385, 60, 50, 70, 50, 90, 65, 45, 70, 173, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.LOTAD, 3, false, false, false, "Water Weed Pokémon", Type.WATER, Type.GRASS, 0.5, 2.6, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 220, 40, 30, 30, 40, 50, 30, 255, 50, 44, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.LOMBRE, 3, false, false, false, "Jolly Pokémon", Type.WATER, Type.GRASS, 1.2, 32.5, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 340, 60, 50, 50, 60, 70, 50, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.LUDICOLO, 3, false, false, false, "Carefree Pokémon", Type.WATER, Type.GRASS, 1.5, 55, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 480, 80, 70, 70, 90, 100, 70, 45, 50, 240, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.SEEDOT, 3, false, false, false, "Acorn Pokémon", Type.GRASS, null, 0.5, 4, Abilities.CHLOROPHYLL, Abilities.EARLY_BIRD, Abilities.PICKPOCKET, 220, 40, 40, 50, 30, 30, 30, 255, 50, 44, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.NUZLEAF, 3, false, false, false, "Wily Pokémon", Type.GRASS, Type.DARK, 1, 28, Abilities.CHLOROPHYLL, Abilities.EARLY_BIRD, Abilities.PICKPOCKET, 340, 70, 70, 40, 60, 40, 60, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.SHIFTRY, 3, false, false, false, "Wicked Pokémon", Type.GRASS, Type.DARK, 1.3, 59.6, Abilities.CHLOROPHYLL, Abilities.WIND_RIDER, Abilities.PICKPOCKET, 480, 90, 100, 60, 90, 60, 80, 45, 50, 240, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.TAILLOW, 3, false, false, false, "Tiny Swallow Pokémon", Type.NORMAL, Type.FLYING, 0.3, 2.3, Abilities.GUTS, Abilities.NONE, Abilities.SCRAPPY, 270, 40, 55, 30, 30, 30, 85, 200, 70, 54, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SWELLOW, 3, false, false, false, "Swallow Pokémon", Type.NORMAL, Type.FLYING, 0.7, 19.8, Abilities.GUTS, Abilities.NONE, Abilities.SCRAPPY, 455, 60, 85, 60, 75, 50, 125, 45, 70, 159, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.WINGULL, 3, false, false, false, "Seagull Pokémon", Type.WATER, Type.FLYING, 0.6, 9.5, Abilities.KEEN_EYE, Abilities.HYDRATION, Abilities.RAIN_DISH, 270, 40, 30, 30, 55, 30, 85, 190, 50, 54, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PELIPPER, 3, false, false, false, "Water Bird Pokémon", Type.WATER, Type.FLYING, 1.2, 28, Abilities.KEEN_EYE, Abilities.DRIZZLE, Abilities.RAIN_DISH, 440, 60, 50, 100, 95, 70, 65, 45, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.RALTS, 3, false, false, false, "Feeling Pokémon", Type.PSYCHIC, Type.FAIRY, 0.4, 6.6, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 198, 28, 25, 25, 45, 35, 40, 235, 35, 40, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.KIRLIA, 3, false, false, false, "Emotion Pokémon", Type.PSYCHIC, Type.FAIRY, 0.8, 20.2, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 278, 38, 35, 35, 65, 55, 50, 120, 35, 97, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.GARDEVOIR, 3, false, false, false, "Embrace Pokémon", Type.PSYCHIC, Type.FAIRY, 1.6, 48.4, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 518, 68, 65, 65, 125, 115, 80, 45, 35, 259, GrowthRate.SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.PSYCHIC, Type.FAIRY, 1.6, 48.4, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 518, 68, 65, 65, 125, 115, 80, 45, 35, 259, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.PSYCHIC, Type.FAIRY, 1.6, 48.4, Abilities.PIXILATE, Abilities.PIXILATE, Abilities.PIXILATE, 618, 68, 85, 65, 165, 135, 100, 45, 35, 259), - ), - new PokemonSpecies(Species.SURSKIT, 3, false, false, false, "Pond Skater Pokémon", Type.BUG, Type.WATER, 0.5, 1.7, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.RAIN_DISH, 269, 40, 30, 32, 50, 52, 65, 200, 70, 54, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MASQUERAIN, 3, false, false, false, "Eyeball Pokémon", Type.BUG, Type.FLYING, 0.8, 3.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.UNNERVE, 454, 70, 60, 62, 100, 82, 80, 75, 70, 159, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SHROOMISH, 3, false, false, false, "Mushroom Pokémon", Type.GRASS, null, 0.4, 4.5, Abilities.EFFECT_SPORE, Abilities.POISON_HEAL, Abilities.QUICK_FEET, 295, 60, 40, 60, 40, 60, 35, 255, 70, 59, GrowthRate.FLUCTUATING, 50, false), - new PokemonSpecies(Species.BRELOOM, 3, false, false, false, "Mushroom Pokémon", Type.GRASS, Type.FIGHTING, 1.2, 39.2, Abilities.EFFECT_SPORE, Abilities.POISON_HEAL, Abilities.TECHNICIAN, 460, 60, 130, 80, 60, 60, 70, 90, 70, 161, GrowthRate.FLUCTUATING, 50, false), - new PokemonSpecies(Species.SLAKOTH, 3, false, false, false, "Slacker Pokémon", Type.NORMAL, null, 0.8, 24, Abilities.TRUANT, Abilities.NONE, Abilities.STALL, 280, 60, 60, 60, 35, 35, 30, 255, 70, 56, GrowthRate.SLOW, 50, false), //Custom Hidden - new PokemonSpecies(Species.VIGOROTH, 3, false, false, false, "Wild Monkey Pokémon", Type.NORMAL, null, 1.4, 46.5, Abilities.VITAL_SPIRIT, Abilities.NONE, Abilities.INSOMNIA, 440, 80, 80, 80, 55, 55, 90, 120, 70, 154, GrowthRate.SLOW, 50, false), //Custom Hidden - new PokemonSpecies(Species.SLAKING, 3, false, false, false, "Lazy Pokémon", Type.NORMAL, null, 2, 130.5, Abilities.TRUANT, Abilities.NONE, Abilities.STALL, 670, 150, 160, 100, 95, 65, 100, 45, 70, 252, GrowthRate.SLOW, 50, false), //Custom Hidden - new PokemonSpecies(Species.NINCADA, 3, false, false, false, "Trainee Pokémon", Type.BUG, Type.GROUND, 0.5, 5.5, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.RUN_AWAY, 266, 31, 45, 90, 30, 30, 40, 255, 50, 53, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.NINJASK, 3, false, false, false, "Ninja Pokémon", Type.BUG, Type.FLYING, 0.8, 12, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.INFILTRATOR, 456, 61, 90, 45, 50, 50, 160, 120, 50, 160, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.SHEDINJA, 3, false, false, false, "Shed Pokémon", Type.BUG, Type.GHOST, 0.8, 1.2, Abilities.WONDER_GUARD, Abilities.NONE, Abilities.NONE, 236, 1, 90, 45, 30, 30, 40, 45, 50, 83, GrowthRate.ERRATIC, null, false), - new PokemonSpecies(Species.WHISMUR, 3, false, false, false, "Whisper Pokémon", Type.NORMAL, null, 0.6, 16.3, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.RATTLED, 240, 64, 51, 23, 51, 23, 28, 190, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.LOUDRED, 3, false, false, false, "Big Voice Pokémon", Type.NORMAL, null, 1, 40.5, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.SCRAPPY, 360, 84, 71, 43, 71, 43, 48, 120, 50, 126, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.EXPLOUD, 3, false, false, false, "Loud Noise Pokémon", Type.NORMAL, null, 1.5, 84, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.SCRAPPY, 490, 104, 91, 63, 91, 73, 68, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.MAKUHITA, 3, false, false, false, "Guts Pokémon", Type.FIGHTING, null, 1, 86.4, Abilities.THICK_FAT, Abilities.GUTS, Abilities.SHEER_FORCE, 237, 72, 60, 30, 20, 30, 25, 180, 70, 47, GrowthRate.FLUCTUATING, 75, false), - new PokemonSpecies(Species.HARIYAMA, 3, false, false, false, "Arm Thrust Pokémon", Type.FIGHTING, null, 2.3, 253.8, Abilities.THICK_FAT, Abilities.GUTS, Abilities.SHEER_FORCE, 474, 144, 120, 60, 40, 60, 50, 200, 70, 166, GrowthRate.FLUCTUATING, 75, false), - new PokemonSpecies(Species.AZURILL, 3, false, false, false, "Polka Dot Pokémon", Type.NORMAL, Type.FAIRY, 0.2, 2, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 190, 50, 20, 40, 20, 40, 20, 150, 50, 38, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.NOSEPASS, 3, false, false, false, "Compass Pokémon", Type.ROCK, null, 1, 97, Abilities.STURDY, Abilities.MAGNET_PULL, Abilities.SAND_FORCE, 375, 30, 45, 135, 45, 90, 30, 255, 70, 75, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SKITTY, 3, false, false, false, "Kitten Pokémon", Type.NORMAL, null, 0.6, 11, Abilities.CUTE_CHARM, Abilities.NORMALIZE, Abilities.WONDER_SKIN, 260, 50, 45, 45, 35, 35, 50, 255, 70, 52, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.DELCATTY, 3, false, false, false, "Prim Pokémon", Type.NORMAL, null, 1.1, 32.6, Abilities.CUTE_CHARM, Abilities.NORMALIZE, Abilities.WONDER_SKIN, 400, 70, 65, 65, 55, 55, 90, 60, 70, 140, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.SABLEYE, 3, false, false, false, "Darkness Pokémon", Type.DARK, Type.GHOST, 0.5, 11, Abilities.KEEN_EYE, Abilities.STALL, Abilities.PRANKSTER, 380, 50, 75, 75, 65, 65, 50, 45, 35, 133, GrowthRate.MEDIUM_SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.DARK, Type.GHOST, 0.5, 11, Abilities.KEEN_EYE, Abilities.STALL, Abilities.PRANKSTER, 380, 50, 75, 75, 65, 65, 50, 45, 35, 133, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DARK, Type.GHOST, 0.5, 161, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 480, 50, 85, 125, 85, 115, 20, 45, 35, 133), - ), - new PokemonSpecies(Species.MAWILE, 3, false, false, false, "Deceiver Pokémon", Type.STEEL, Type.FAIRY, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.INTIMIDATE, Abilities.SHEER_FORCE, 380, 50, 85, 85, 55, 55, 50, 45, 50, 133, GrowthRate.FAST, 50, false, true, - new PokemonForm("Normal", "", Type.STEEL, Type.FAIRY, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.INTIMIDATE, Abilities.SHEER_FORCE, 380, 50, 85, 85, 55, 55, 50, 45, 50, 133, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.STEEL, Type.FAIRY, 1, 23.5, Abilities.HUGE_POWER, Abilities.HUGE_POWER, Abilities.HUGE_POWER, 480, 50, 105, 125, 55, 95, 50, 45, 50, 133), - ), - new PokemonSpecies(Species.ARON, 3, false, false, false, "Iron Armor Pokémon", Type.STEEL, Type.ROCK, 0.4, 60, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 330, 50, 70, 100, 40, 40, 30, 180, 35, 66, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.LAIRON, 3, false, false, false, "Iron Armor Pokémon", Type.STEEL, Type.ROCK, 0.9, 120, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 430, 60, 90, 140, 50, 50, 40, 90, 35, 151, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.AGGRON, 3, false, false, false, "Iron Armor Pokémon", Type.STEEL, Type.ROCK, 2.1, 360, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 530, 70, 110, 180, 60, 60, 50, 45, 35, 265, GrowthRate.SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.STEEL, Type.ROCK, 2.1, 360, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 530, 70, 110, 180, 60, 60, 50, 45, 35, 265, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.STEEL, null, 2.2, 395, Abilities.FILTER, Abilities.FILTER, Abilities.FILTER, 630, 70, 140, 230, 60, 80, 50, 45, 35, 265), - ), - new PokemonSpecies(Species.MEDITITE, 3, false, false, false, "Meditate Pokémon", Type.FIGHTING, Type.PSYCHIC, 0.6, 11.2, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 280, 30, 40, 55, 40, 55, 60, 180, 70, 56, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.MEDICHAM, 3, false, false, false, "Meditate Pokémon", Type.FIGHTING, Type.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 410, 60, 60, 75, 60, 75, 80, 90, 70, 144, GrowthRate.MEDIUM_FAST, 50, true, true, - new PokemonForm("Normal", "", Type.FIGHTING, Type.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 410, 60, 60, 75, 60, 75, 80, 90, 70, 144, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.FIGHTING, Type.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.PURE_POWER, 510, 60, 100, 85, 80, 85, 100, 90, 70, 144, true), - ), - new PokemonSpecies(Species.ELECTRIKE, 3, false, false, false, "Lightning Pokémon", Type.ELECTRIC, null, 0.6, 15.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 295, 40, 45, 40, 65, 40, 65, 120, 50, 59, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.MANECTRIC, 3, false, false, false, "Discharge Pokémon", Type.ELECTRIC, null, 1.5, 40.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 475, 70, 75, 60, 105, 60, 105, 45, 50, 166, GrowthRate.SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.ELECTRIC, null, 1.5, 40.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 475, 70, 75, 60, 105, 60, 105, 45, 50, 166, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ELECTRIC, null, 1.8, 44, Abilities.INTIMIDATE, Abilities.INTIMIDATE, Abilities.INTIMIDATE, 575, 70, 75, 80, 135, 80, 135, 45, 50, 166), - ), - new PokemonSpecies(Species.PLUSLE, 3, false, false, false, "Cheering Pokémon", Type.ELECTRIC, null, 0.4, 4.2, Abilities.PLUS, Abilities.NONE, Abilities.LIGHTNING_ROD, 405, 60, 50, 40, 85, 75, 95, 200, 70, 142, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MINUN, 3, false, false, false, "Cheering Pokémon", Type.ELECTRIC, null, 0.4, 4.2, Abilities.MINUS, Abilities.NONE, Abilities.VOLT_ABSORB, 405, 60, 40, 50, 75, 85, 95, 200, 70, 142, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.VOLBEAT, 3, false, false, false, "Firefly Pokémon", Type.BUG, null, 0.7, 17.7, Abilities.ILLUMINATE, Abilities.SWARM, Abilities.PRANKSTER, 430, 65, 73, 75, 47, 85, 85, 150, 70, 151, GrowthRate.ERRATIC, 100, false), - new PokemonSpecies(Species.ILLUMISE, 3, false, false, false, "Firefly Pokémon", Type.BUG, null, 0.6, 17.7, Abilities.OBLIVIOUS, Abilities.TINTED_LENS, Abilities.PRANKSTER, 430, 65, 47, 75, 73, 85, 85, 150, 70, 151, GrowthRate.FLUCTUATING, 0, false), - new PokemonSpecies(Species.ROSELIA, 3, false, false, false, "Thorn Pokémon", Type.GRASS, Type.POISON, 0.3, 2, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.LEAF_GUARD, 400, 50, 60, 45, 100, 80, 65, 150, 50, 140, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.GULPIN, 3, false, false, false, "Stomach Pokémon", Type.POISON, null, 0.4, 10.3, Abilities.LIQUID_OOZE, Abilities.STICKY_HOLD, Abilities.GLUTTONY, 302, 70, 43, 53, 43, 53, 40, 225, 70, 60, GrowthRate.FLUCTUATING, 50, true), - new PokemonSpecies(Species.SWALOT, 3, false, false, false, "Poison Bag Pokémon", Type.POISON, null, 1.7, 80, Abilities.LIQUID_OOZE, Abilities.STICKY_HOLD, Abilities.GLUTTONY, 467, 100, 73, 83, 73, 83, 55, 75, 70, 163, GrowthRate.FLUCTUATING, 50, true), - new PokemonSpecies(Species.CARVANHA, 3, false, false, false, "Savage Pokémon", Type.WATER, Type.DARK, 0.8, 20.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 305, 45, 90, 20, 65, 20, 65, 225, 35, 61, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.SHARPEDO, 3, false, false, false, "Brutal Pokémon", Type.WATER, Type.DARK, 1.8, 88.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 460, 70, 120, 40, 95, 40, 95, 60, 35, 161, GrowthRate.SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.WATER, Type.DARK, 1.8, 88.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 460, 70, 120, 40, 95, 40, 95, 60, 35, 161, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, Type.DARK, 2.5, 130.3, Abilities.STRONG_JAW, Abilities.NONE, Abilities.STRONG_JAW, 560, 70, 140, 70, 110, 65, 105, 60, 35, 161), - ), - new PokemonSpecies(Species.WAILMER, 3, false, false, false, "Ball Whale Pokémon", Type.WATER, null, 2, 130, Abilities.WATER_VEIL, Abilities.OBLIVIOUS, Abilities.PRESSURE, 400, 130, 70, 35, 70, 35, 60, 125, 50, 80, GrowthRate.FLUCTUATING, 50, false), - new PokemonSpecies(Species.WAILORD, 3, false, false, false, "Float Whale Pokémon", Type.WATER, null, 14.5, 398, Abilities.WATER_VEIL, Abilities.OBLIVIOUS, Abilities.PRESSURE, 500, 170, 90, 45, 90, 45, 60, 60, 50, 175, GrowthRate.FLUCTUATING, 50, false), - new PokemonSpecies(Species.NUMEL, 3, false, false, false, "Numb Pokémon", Type.FIRE, Type.GROUND, 0.7, 24, Abilities.OBLIVIOUS, Abilities.SIMPLE, Abilities.OWN_TEMPO, 305, 60, 60, 40, 65, 45, 35, 255, 70, 61, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.CAMERUPT, 3, false, false, false, "Eruption Pokémon", Type.FIRE, Type.GROUND, 1.9, 220, Abilities.MAGMA_ARMOR, Abilities.SOLID_ROCK, Abilities.ANGER_POINT, 460, 70, 100, 70, 105, 75, 40, 150, 70, 161, GrowthRate.MEDIUM_FAST, 50, true, true, - new PokemonForm("Normal", "", Type.FIRE, Type.GROUND, 1.9, 220, Abilities.MAGMA_ARMOR, Abilities.SOLID_ROCK, Abilities.ANGER_POINT, 460, 70, 100, 70, 105, 75, 40, 150, 70, 161, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.FIRE, Type.GROUND, 2.5, 320.5, Abilities.SHEER_FORCE, Abilities.SHEER_FORCE, Abilities.SHEER_FORCE, 560, 70, 120, 100, 145, 105, 20, 150, 70, 161), - ), - new PokemonSpecies(Species.TORKOAL, 3, false, false, false, "Coal Pokémon", Type.FIRE, null, 0.5, 80.4, Abilities.WHITE_SMOKE, Abilities.DROUGHT, Abilities.SHELL_ARMOR, 470, 70, 85, 140, 85, 70, 20, 90, 50, 165, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SPOINK, 3, false, false, false, "Bounce Pokémon", Type.PSYCHIC, null, 0.7, 30.6, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.GLUTTONY, 330, 60, 25, 35, 70, 80, 60, 255, 70, 66, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.GRUMPIG, 3, false, false, false, "Manipulate Pokémon", Type.PSYCHIC, null, 0.9, 71.5, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.GLUTTONY, 470, 80, 45, 65, 90, 110, 80, 60, 70, 165, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.SPINDA, 3, false, false, false, "Spot Panda Pokémon", Type.NORMAL, null, 1.1, 5, Abilities.OWN_TEMPO, Abilities.TANGLED_FEET, Abilities.CONTRARY, 360, 60, 60, 60, 60, 60, 60, 255, 70, 126, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.TRAPINCH, 3, false, false, false, "Ant Pit Pokémon", Type.GROUND, null, 0.7, 15, Abilities.HYPER_CUTTER, Abilities.ARENA_TRAP, Abilities.SHEER_FORCE, 290, 45, 100, 45, 45, 45, 10, 255, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.VIBRAVA, 3, false, false, false, "Vibration Pokémon", Type.GROUND, Type.DRAGON, 1.1, 15.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 340, 50, 70, 50, 50, 50, 70, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.FLYGON, 3, false, false, false, "Mystic Pokémon", Type.GROUND, Type.DRAGON, 2, 82, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 80, 100, 80, 80, 80, 100, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.CACNEA, 3, false, false, false, "Cactus Pokémon", Type.GRASS, null, 0.4, 51.3, Abilities.SAND_VEIL, Abilities.NONE, Abilities.WATER_ABSORB, 335, 50, 85, 40, 85, 40, 35, 190, 35, 67, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.CACTURNE, 3, false, false, false, "Scarecrow Pokémon", Type.GRASS, Type.DARK, 1.3, 77.4, Abilities.SAND_VEIL, Abilities.NONE, Abilities.WATER_ABSORB, 475, 70, 115, 60, 115, 60, 55, 60, 35, 166, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.SWABLU, 3, false, false, false, "Cotton Bird Pokémon", Type.NORMAL, Type.FLYING, 0.4, 1.2, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 310, 45, 40, 60, 40, 75, 50, 255, 50, 62, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.ALTARIA, 3, false, false, false, "Humming Pokémon", Type.DRAGON, Type.FLYING, 1.1, 20.6, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 490, 75, 70, 90, 70, 105, 80, 45, 50, 172, GrowthRate.ERRATIC, 50, false, true, - new PokemonForm("Normal", "", Type.DRAGON, Type.FLYING, 1.1, 20.6, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 490, 75, 70, 90, 70, 105, 80, 45, 50, 172, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.FAIRY, 1.5, 20.6, Abilities.PIXILATE, Abilities.NONE, Abilities.PIXILATE, 590, 75, 110, 110, 110, 105, 80, 45, 50, 172), - ), - new PokemonSpecies(Species.ZANGOOSE, 3, false, false, false, "Cat Ferret Pokémon", Type.NORMAL, null, 1.3, 40.3, Abilities.IMMUNITY, Abilities.NONE, Abilities.TOXIC_BOOST, 458, 73, 115, 60, 60, 60, 90, 90, 70, 160, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.SEVIPER, 3, false, false, false, "Fang Snake Pokémon", Type.POISON, null, 2.7, 52.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.INFILTRATOR, 458, 73, 100, 60, 100, 60, 65, 90, 70, 160, GrowthRate.FLUCTUATING, 50, false), - new PokemonSpecies(Species.LUNATONE, 3, false, false, false, "Meteorite Pokémon", Type.ROCK, Type.PSYCHIC, 1, 168, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 460, 90, 55, 65, 95, 85, 70, 45, 50, 161, GrowthRate.FAST, null, false), - new PokemonSpecies(Species.SOLROCK, 3, false, false, false, "Meteorite Pokémon", Type.ROCK, Type.PSYCHIC, 1.2, 154, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 460, 90, 95, 85, 55, 65, 70, 45, 50, 161, GrowthRate.FAST, null, false), - new PokemonSpecies(Species.BARBOACH, 3, false, false, false, "Whiskers Pokémon", Type.WATER, Type.GROUND, 0.4, 1.9, Abilities.OBLIVIOUS, Abilities.ANTICIPATION, Abilities.HYDRATION, 288, 50, 48, 43, 46, 41, 60, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.WHISCASH, 3, false, false, false, "Whiskers Pokémon", Type.WATER, Type.GROUND, 0.9, 23.6, Abilities.OBLIVIOUS, Abilities.ANTICIPATION, Abilities.HYDRATION, 468, 110, 78, 73, 76, 71, 60, 75, 50, 164, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CORPHISH, 3, false, false, false, "Ruffian Pokémon", Type.WATER, null, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.ADAPTABILITY, 308, 43, 80, 65, 50, 35, 35, 205, 50, 62, GrowthRate.FLUCTUATING, 50, false), - new PokemonSpecies(Species.CRAWDAUNT, 3, false, false, false, "Rogue Pokémon", Type.WATER, Type.DARK, 1.1, 32.8, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.ADAPTABILITY, 468, 63, 120, 85, 90, 55, 55, 155, 50, 164, GrowthRate.FLUCTUATING, 50, false), - new PokemonSpecies(Species.BALTOY, 3, false, false, false, "Clay Doll Pokémon", Type.GROUND, Type.PSYCHIC, 0.5, 21.5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 300, 40, 40, 55, 40, 70, 55, 255, 50, 60, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.CLAYDOL, 3, false, false, false, "Clay Doll Pokémon", Type.GROUND, Type.PSYCHIC, 1.5, 108, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 500, 60, 70, 105, 70, 120, 75, 90, 50, 175, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.LILEEP, 3, false, false, false, "Sea Lily Pokémon", Type.ROCK, Type.GRASS, 1, 23.8, Abilities.SUCTION_CUPS, Abilities.NONE, Abilities.STORM_DRAIN, 355, 66, 41, 77, 61, 87, 23, 45, 50, 71, GrowthRate.ERRATIC, 87.5, false), - new PokemonSpecies(Species.CRADILY, 3, false, false, false, "Barnacle Pokémon", Type.ROCK, Type.GRASS, 1.5, 60.4, Abilities.SUCTION_CUPS, Abilities.NONE, Abilities.STORM_DRAIN, 495, 86, 81, 97, 81, 107, 43, 45, 50, 173, GrowthRate.ERRATIC, 87.5, false), - new PokemonSpecies(Species.ANORITH, 3, false, false, false, "Old Shrimp Pokémon", Type.ROCK, Type.BUG, 0.7, 12.5, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.SWIFT_SWIM, 355, 45, 95, 50, 40, 50, 75, 45, 50, 71, GrowthRate.ERRATIC, 87.5, false), - new PokemonSpecies(Species.ARMALDO, 3, false, false, false, "Plate Pokémon", Type.ROCK, Type.BUG, 1.5, 68.2, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.SWIFT_SWIM, 495, 75, 125, 100, 70, 80, 45, 45, 50, 173, GrowthRate.ERRATIC, 87.5, false), - new PokemonSpecies(Species.FEEBAS, 3, false, false, false, "Fish Pokémon", Type.WATER, null, 0.6, 7.4, Abilities.SWIFT_SWIM, Abilities.OBLIVIOUS, Abilities.ADAPTABILITY, 200, 20, 15, 20, 10, 55, 80, 255, 50, 40, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.MILOTIC, 3, false, false, false, "Tender Pokémon", Type.WATER, null, 6.2, 162, Abilities.MARVEL_SCALE, Abilities.COMPETITIVE, Abilities.CUTE_CHARM, 540, 95, 60, 79, 100, 125, 81, 60, 50, 189, GrowthRate.ERRATIC, 50, true), - new PokemonSpecies(Species.CASTFORM, 3, false, false, false, "Weather Pokémon", Type.NORMAL, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal Form", "", Type.NORMAL, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147, false, null, true), - new PokemonForm("Sunny Form", "sunny", Type.FIRE, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147), - new PokemonForm("Rainy Form", "rainy", Type.WATER, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147), - new PokemonForm("Snowy Form", "snowy", Type.ICE, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147), - ), - new PokemonSpecies(Species.KECLEON, 3, false, false, false, "Color Swap Pokémon", Type.NORMAL, null, 1, 22, Abilities.COLOR_CHANGE, Abilities.NONE, Abilities.PROTEAN, 440, 60, 90, 70, 60, 120, 40, 200, 70, 154, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SHUPPET, 3, false, false, false, "Puppet Pokémon", Type.GHOST, null, 0.6, 2.3, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 295, 44, 75, 35, 63, 33, 45, 225, 35, 59, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.BANETTE, 3, false, false, false, "Marionette Pokémon", Type.GHOST, null, 1.1, 12.5, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 455, 64, 115, 65, 83, 63, 65, 45, 35, 159, GrowthRate.FAST, 50, false, true, - new PokemonForm("Normal", "", Type.GHOST, null, 1.1, 12.5, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 455, 64, 115, 65, 83, 63, 65, 45, 35, 159, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GHOST, null, 1.2, 13, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 555, 64, 165, 75, 93, 83, 75, 45, 35, 159), - ), - new PokemonSpecies(Species.DUSKULL, 3, false, false, false, "Requiem Pokémon", Type.GHOST, null, 0.8, 15, Abilities.LEVITATE, Abilities.NONE, Abilities.FRISK, 295, 20, 40, 90, 30, 90, 25, 190, 35, 59, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.DUSCLOPS, 3, false, false, false, "Beckon Pokémon", Type.GHOST, null, 1.6, 30.6, Abilities.PRESSURE, Abilities.NONE, Abilities.FRISK, 455, 40, 70, 130, 60, 130, 25, 90, 35, 159, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.TROPIUS, 3, false, false, false, "Fruit Pokémon", Type.GRASS, Type.FLYING, 2, 100, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.HARVEST, 460, 99, 68, 83, 72, 87, 51, 200, 70, 161, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.CHIMECHO, 3, false, false, false, "Wind Chime Pokémon", Type.PSYCHIC, null, 0.6, 1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 455, 75, 50, 80, 95, 90, 65, 45, 70, 159, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.ABSOL, 3, false, false, false, "Disaster Pokémon", Type.DARK, null, 1.2, 47, Abilities.PRESSURE, Abilities.SUPER_LUCK, Abilities.JUSTIFIED, 465, 65, 130, 60, 75, 60, 75, 30, 35, 163, GrowthRate.MEDIUM_SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.DARK, null, 1.2, 47, Abilities.PRESSURE, Abilities.SUPER_LUCK, Abilities.JUSTIFIED, 465, 65, 130, 60, 75, 60, 75, 30, 35, 163, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DARK, null, 1.2, 49, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 565, 65, 150, 60, 115, 60, 115, 30, 35, 163), - ), - new PokemonSpecies(Species.WYNAUT, 3, false, false, false, "Bright Pokémon", Type.PSYCHIC, null, 0.6, 14, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.TELEPATHY, 260, 95, 23, 48, 23, 48, 23, 125, 50, 52, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SNORUNT, 3, false, false, false, "Snow Hat Pokémon", Type.ICE, null, 0.7, 16.8, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 300, 50, 50, 50, 50, 50, 50, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GLALIE, 3, false, false, false, "Face Pokémon", Type.ICE, null, 1.5, 256.5, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 480, 80, 80, 80, 80, 80, 80, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.ICE, null, 1.5, 256.5, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 480, 80, 80, 80, 80, 80, 80, 75, 50, 168, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ICE, null, 2.1, 350.2, Abilities.REFRIGERATE, Abilities.REFRIGERATE, Abilities.REFRIGERATE, 580, 80, 120, 80, 120, 80, 100, 75, 50, 168), - ), - new PokemonSpecies(Species.SPHEAL, 3, false, false, false, "Clap Pokémon", Type.ICE, Type.WATER, 0.8, 39.5, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 290, 70, 40, 50, 55, 50, 25, 255, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SEALEO, 3, false, false, false, "Ball Roll Pokémon", Type.ICE, Type.WATER, 1.1, 87.6, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 410, 90, 60, 70, 75, 70, 45, 120, 50, 144, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.WALREIN, 3, false, false, false, "Ice Break Pokémon", Type.ICE, Type.WATER, 1.4, 150.6, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 530, 110, 80, 90, 95, 90, 65, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.CLAMPERL, 3, false, false, false, "Bivalve Pokémon", Type.WATER, null, 0.4, 52.5, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.RATTLED, 345, 35, 64, 85, 74, 55, 32, 255, 70, 69, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.HUNTAIL, 3, false, false, false, "Deep Sea Pokémon", Type.WATER, null, 1.7, 27, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 485, 55, 104, 105, 94, 75, 52, 60, 70, 170, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.GOREBYSS, 3, false, false, false, "South Sea Pokémon", Type.WATER, null, 1.8, 22.6, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.HYDRATION, 485, 55, 84, 105, 114, 75, 52, 60, 70, 170, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.RELICANTH, 3, false, false, false, "Longevity Pokémon", Type.WATER, Type.ROCK, 1, 23.4, Abilities.SWIFT_SWIM, Abilities.ROCK_HEAD, Abilities.STURDY, 485, 100, 90, 130, 45, 65, 55, 25, 50, 170, GrowthRate.SLOW, 87.5, true), - new PokemonSpecies(Species.LUVDISC, 3, false, false, false, "Rendezvous Pokémon", Type.WATER, null, 0.6, 8.7, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.HYDRATION, 330, 43, 30, 55, 40, 65, 97, 225, 70, 116, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.BAGON, 3, false, false, false, "Rock Head Pokémon", Type.DRAGON, null, 0.6, 42.1, Abilities.ROCK_HEAD, Abilities.NONE, Abilities.SHEER_FORCE, 300, 45, 75, 60, 40, 30, 50, 45, 35, 60, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.SHELGON, 3, false, false, false, "Endurance Pokémon", Type.DRAGON, null, 1.1, 110.5, Abilities.ROCK_HEAD, Abilities.NONE, Abilities.OVERCOAT, 420, 65, 95, 100, 60, 50, 50, 45, 35, 147, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.SALAMENCE, 3, false, false, false, "Dragon Pokémon", Type.DRAGON, Type.FLYING, 1.5, 102.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 600, 95, 135, 80, 110, 80, 100, 45, 35, 300, GrowthRate.SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.DRAGON, Type.FLYING, 1.5, 102.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 600, 95, 135, 80, 110, 80, 100, 45, 35, 300, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.FLYING, 1.8, 112.6, Abilities.AERILATE, Abilities.NONE, Abilities.AERILATE, 700, 95, 145, 130, 120, 90, 120, 45, 35, 300), - ), - new PokemonSpecies(Species.BELDUM, 3, false, false, false, "Iron Ball Pokémon", Type.STEEL, Type.PSYCHIC, 0.6, 95.2, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 300, 40, 55, 80, 35, 60, 30, 45, 35, 60, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Frigibax - new PokemonSpecies(Species.METANG, 3, false, false, false, "Iron Claw Pokémon", Type.STEEL, Type.PSYCHIC, 1.2, 202.5, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 420, 60, 75, 100, 55, 80, 50, 25, 35, 147, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Arctibax - new PokemonSpecies(Species.METAGROSS, 3, false, false, false, "Iron Leg Pokémon", Type.STEEL, Type.PSYCHIC, 1.6, 550, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 600, 80, 135, 130, 95, 90, 70, 10, 35, 300, GrowthRate.SLOW, null, false, true, //Custom Catchrate, matching Baxcalibur - new PokemonForm("Normal", "", Type.STEEL, Type.PSYCHIC, 1.6, 550, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 600, 80, 135, 130, 95, 90, 70, 3, 35, 300, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.STEEL, Type.PSYCHIC, 2.5, 942.9, Abilities.TOUGH_CLAWS, Abilities.NONE, Abilities.TOUGH_CLAWS, 700, 80, 145, 150, 105, 110, 110, 3, 35, 300), - ), - new PokemonSpecies(Species.REGIROCK, 3, true, false, false, "Rock Peak Pokémon", Type.ROCK, null, 1.7, 230, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.STURDY, 580, 80, 100, 200, 50, 100, 50, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.REGICE, 3, true, false, false, "Iceberg Pokémon", Type.ICE, null, 1.8, 175, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.ICE_BODY, 580, 80, 50, 100, 100, 200, 50, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.REGISTEEL, 3, true, false, false, "Iron Pokémon", Type.STEEL, null, 1.9, 205, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 580, 80, 75, 150, 75, 150, 50, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.LATIAS, 3, true, false, false, "Eon Pokémon", Type.DRAGON, Type.PSYCHIC, 1.4, 40, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 80, 90, 110, 130, 110, 3, 90, 300, GrowthRate.SLOW, 0, false, true, - new PokemonForm("Normal", "", Type.DRAGON, Type.PSYCHIC, 1.4, 40, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 80, 90, 110, 130, 110, 3, 90, 300, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.PSYCHIC, 1.8, 52, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 700, 80, 100, 120, 140, 150, 110, 3, 90, 300), - ), - new PokemonSpecies(Species.LATIOS, 3, true, false, false, "Eon Pokémon", Type.DRAGON, Type.PSYCHIC, 2, 60, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 90, 80, 130, 110, 110, 3, 90, 300, GrowthRate.SLOW, 100, false, true, - new PokemonForm("Normal", "", Type.DRAGON, Type.PSYCHIC, 2, 60, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 90, 80, 130, 110, 110, 3, 90, 300, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.PSYCHIC, 2.3, 70, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 700, 80, 130, 100, 160, 120, 110, 3, 90, 300), - ), - new PokemonSpecies(Species.KYOGRE, 3, false, true, false, "Sea Basin Pokémon", Type.WATER, null, 4.5, 352, Abilities.DRIZZLE, Abilities.NONE, Abilities.NONE, 670, 100, 100, 90, 150, 140, 90, 3, 0, 335, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.WATER, null, 4.5, 352, Abilities.DRIZZLE, Abilities.NONE, Abilities.NONE, 670, 100, 100, 90, 150, 140, 90, 3, 0, 335, false, null, true), - new PokemonForm("Primal", "primal", Type.WATER, null, 9.8, 430, Abilities.PRIMORDIAL_SEA, Abilities.NONE, Abilities.NONE, 770, 100, 150, 90, 180, 160, 90, 3, 0, 335), - ), - new PokemonSpecies(Species.GROUDON, 3, false, true, false, "Continent Pokémon", Type.GROUND, null, 3.5, 950, Abilities.DROUGHT, Abilities.NONE, Abilities.NONE, 670, 100, 150, 140, 100, 90, 90, 3, 0, 335, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.GROUND, null, 3.5, 950, Abilities.DROUGHT, Abilities.NONE, Abilities.NONE, 670, 100, 150, 140, 100, 90, 90, 3, 0, 335, false, null, true), - new PokemonForm("Primal", "primal", Type.GROUND, Type.FIRE, 5, 999.7, Abilities.DESOLATE_LAND, Abilities.NONE, Abilities.NONE, 770, 100, 180, 160, 150, 90, 90, 3, 0, 335), - ), - new PokemonSpecies(Species.RAYQUAZA, 3, false, true, false, "Sky High Pokémon", Type.DRAGON, Type.FLYING, 7, 206.5, Abilities.AIR_LOCK, Abilities.NONE, Abilities.NONE, 680, 105, 150, 90, 150, 90, 95, 45, 0, 340, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.DRAGON, Type.FLYING, 7, 206.5, Abilities.AIR_LOCK, Abilities.NONE, Abilities.NONE, 680, 105, 150, 90, 150, 90, 95, 45, 0, 340, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.FLYING, 10.8, 392, Abilities.DELTA_STREAM, Abilities.NONE, Abilities.NONE, 780, 105, 180, 100, 180, 100, 115, 45, 0, 340), - ), - new PokemonSpecies(Species.JIRACHI, 3, false, false, true, "Wish Pokémon", Type.STEEL, Type.PSYCHIC, 0.3, 1.1, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 100, 300, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.DEOXYS, 3, false, false, true, "DNA Pokémon", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 270, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal Forme", "normal", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 270, false, "", true), - new PokemonForm("Attack Forme", "attack", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 180, 20, 180, 20, 150, 3, 0, 270), - new PokemonForm("Defense Forme", "defense", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 70, 160, 70, 160, 90, 3, 0, 270), - new PokemonForm("Speed Forme", "speed", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 95, 90, 95, 90, 180, 3, 0, 270), - ), - new PokemonSpecies(Species.TURTWIG, 4, false, false, false, "Tiny Leaf Pokémon", Type.GRASS, null, 0.4, 10.2, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 318, 55, 68, 64, 45, 55, 31, 45, 70, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.GROTLE, 4, false, false, false, "Grove Pokémon", Type.GRASS, null, 1.1, 97, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 405, 75, 89, 85, 55, 65, 36, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.TORTERRA, 4, false, false, false, "Continent Pokémon", Type.GRASS, Type.GROUND, 2.2, 310, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 525, 95, 109, 105, 75, 85, 56, 45, 70, 236, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.CHIMCHAR, 4, false, false, false, "Chimp Pokémon", Type.FIRE, null, 0.5, 6.2, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 309, 44, 58, 44, 58, 44, 61, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.MONFERNO, 4, false, false, false, "Playful Pokémon", Type.FIRE, Type.FIGHTING, 0.9, 22, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 405, 64, 78, 52, 78, 52, 81, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.INFERNAPE, 4, false, false, false, "Flame Pokémon", Type.FIRE, Type.FIGHTING, 1.2, 55, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 534, 76, 104, 71, 104, 71, 108, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.PIPLUP, 4, false, false, false, "Penguin Pokémon", Type.WATER, null, 0.4, 5.2, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 314, 53, 51, 53, 61, 56, 40, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.PRINPLUP, 4, false, false, false, "Penguin Pokémon", Type.WATER, null, 0.8, 23, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 405, 64, 66, 68, 81, 76, 50, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.EMPOLEON, 4, false, false, false, "Emperor Pokémon", Type.WATER, Type.STEEL, 1.7, 84.5, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 530, 84, 86, 88, 111, 101, 60, 45, 70, 239, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.STARLY, 4, false, false, false, "Starling Pokémon", Type.NORMAL, Type.FLYING, 0.3, 2, Abilities.KEEN_EYE, Abilities.NONE, Abilities.RECKLESS, 245, 40, 55, 30, 30, 30, 60, 255, 70, 49, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.STARAVIA, 4, false, false, false, "Starling Pokémon", Type.NORMAL, Type.FLYING, 0.6, 15.5, Abilities.INTIMIDATE, Abilities.NONE, Abilities.RECKLESS, 340, 55, 75, 50, 40, 40, 80, 120, 70, 119, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.STARAPTOR, 4, false, false, false, "Predator Pokémon", Type.NORMAL, Type.FLYING, 1.2, 24.9, Abilities.INTIMIDATE, Abilities.NONE, Abilities.RECKLESS, 485, 85, 120, 70, 50, 60, 100, 45, 70, 218, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.BIDOOF, 4, false, false, false, "Plump Mouse Pokémon", Type.NORMAL, null, 0.5, 20, Abilities.SIMPLE, Abilities.UNAWARE, Abilities.MOODY, 250, 59, 45, 40, 35, 40, 31, 255, 70, 50, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.BIBAREL, 4, false, false, false, "Beaver Pokémon", Type.NORMAL, Type.WATER, 1, 31.5, Abilities.SIMPLE, Abilities.UNAWARE, Abilities.MOODY, 410, 79, 85, 60, 55, 60, 71, 127, 70, 144, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.KRICKETOT, 4, false, false, false, "Cricket Pokémon", Type.BUG, null, 0.3, 2.2, Abilities.SHED_SKIN, Abilities.NONE, Abilities.RUN_AWAY, 194, 37, 25, 41, 25, 41, 25, 255, 70, 39, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.KRICKETUNE, 4, false, false, false, "Cricket Pokémon", Type.BUG, null, 1, 25.5, Abilities.SWARM, Abilities.NONE, Abilities.TECHNICIAN, 384, 77, 85, 51, 55, 51, 65, 45, 70, 134, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.SHINX, 4, false, false, false, "Flash Pokémon", Type.ELECTRIC, null, 0.5, 9.5, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 263, 45, 65, 34, 40, 34, 45, 235, 50, 53, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.LUXIO, 4, false, false, false, "Spark Pokémon", Type.ELECTRIC, null, 0.9, 30.5, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 363, 60, 85, 49, 60, 49, 60, 120, 100, 127, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.LUXRAY, 4, false, false, false, "Gleam Eyes Pokémon", Type.ELECTRIC, null, 1.4, 42, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 523, 80, 120, 79, 95, 79, 70, 45, 50, 262, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.BUDEW, 4, false, false, false, "Bud Pokémon", Type.GRASS, Type.POISON, 0.2, 1.2, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.LEAF_GUARD, 280, 40, 30, 35, 50, 70, 55, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.ROSERADE, 4, false, false, false, "Bouquet Pokémon", Type.GRASS, Type.POISON, 0.9, 14.5, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.TECHNICIAN, 515, 60, 70, 65, 125, 105, 90, 75, 50, 258, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.CRANIDOS, 4, false, false, false, "Head Butt Pokémon", Type.ROCK, null, 0.9, 31.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHEER_FORCE, 350, 67, 125, 40, 30, 30, 58, 45, 70, 70, GrowthRate.ERRATIC, 87.5, false), - new PokemonSpecies(Species.RAMPARDOS, 4, false, false, false, "Head Butt Pokémon", Type.ROCK, null, 1.6, 102.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHEER_FORCE, 495, 97, 165, 60, 65, 50, 58, 45, 70, 173, GrowthRate.ERRATIC, 87.5, false), - new PokemonSpecies(Species.SHIELDON, 4, false, false, false, "Shield Pokémon", Type.ROCK, Type.STEEL, 0.5, 57, Abilities.STURDY, Abilities.NONE, Abilities.SOUNDPROOF, 350, 30, 42, 118, 42, 88, 30, 45, 70, 70, GrowthRate.ERRATIC, 87.5, false), - new PokemonSpecies(Species.BASTIODON, 4, false, false, false, "Shield Pokémon", Type.ROCK, Type.STEEL, 1.3, 149.5, Abilities.STURDY, Abilities.NONE, Abilities.SOUNDPROOF, 495, 60, 52, 168, 47, 138, 30, 45, 70, 173, GrowthRate.ERRATIC, 87.5, false), - new PokemonSpecies(Species.BURMY, 4, false, false, false, "Bagworm Pokémon", Type.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Plant Cloak", "plant", Type.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true), - new PokemonForm("Sandy Cloak", "sandy", Type.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true), - new PokemonForm("Trash Cloak", "trash", Type.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true), - ), - new PokemonSpecies(Species.WORMADAM, 4, false, false, false, "Bagworm Pokémon", Type.BUG, Type.GRASS, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 59, 85, 79, 105, 36, 45, 70, 148, GrowthRate.MEDIUM_FAST, 0, false, false, - new PokemonForm("Plant Cloak", "plant", Type.BUG, Type.GRASS, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 59, 85, 79, 105, 36, 45, 70, 148, false, null, true), - new PokemonForm("Sandy Cloak", "sandy", Type.BUG, Type.GROUND, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 79, 105, 59, 85, 36, 45, 70, 148, false, null, true), - new PokemonForm("Trash Cloak", "trash", Type.BUG, Type.STEEL, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 69, 95, 69, 95, 36, 45, 70, 148, false, null, true), - ), - new PokemonSpecies(Species.MOTHIM, 4, false, false, false, "Moth Pokémon", Type.BUG, Type.FLYING, 0.9, 23.3, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 424, 70, 94, 50, 94, 50, 66, 45, 70, 148, GrowthRate.MEDIUM_FAST, 100, false), - new PokemonSpecies(Species.COMBEE, 4, false, false, false, "Tiny Bee Pokémon", Type.BUG, Type.FLYING, 0.3, 5.5, Abilities.HONEY_GATHER, Abilities.NONE, Abilities.HUSTLE, 244, 30, 30, 42, 30, 42, 70, 120, 50, 49, GrowthRate.MEDIUM_SLOW, 87.5, true), - new PokemonSpecies(Species.VESPIQUEN, 4, false, false, false, "Beehive Pokémon", Type.BUG, Type.FLYING, 1.2, 38.5, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 474, 70, 80, 102, 80, 102, 40, 45, 50, 166, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.PACHIRISU, 4, false, false, false, "EleSquirrel Pokémon", Type.ELECTRIC, null, 0.4, 3.9, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.VOLT_ABSORB, 405, 60, 45, 70, 45, 90, 95, 200, 100, 142, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.BUIZEL, 4, false, false, false, "Sea Weasel Pokémon", Type.WATER, null, 0.7, 29.5, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 330, 55, 65, 35, 60, 30, 85, 190, 70, 66, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.FLOATZEL, 4, false, false, false, "Sea Weasel Pokémon", Type.WATER, null, 1.1, 33.5, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 495, 85, 105, 55, 85, 50, 115, 75, 70, 173, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.CHERUBI, 4, false, false, false, "Cherry Pokémon", Type.GRASS, null, 0.4, 3.3, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.NONE, 275, 45, 35, 45, 62, 53, 35, 190, 50, 55, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CHERRIM, 4, false, false, false, "Blossom Pokémon", Type.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Overcast Form", "overcast", Type.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158, false, null, true), - new PokemonForm("Sunshine Form", "sunshine", Type.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158), - ), - new PokemonSpecies(Species.SHELLOS, 4, false, false, false, "Sea Slug Pokémon", Type.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("East Sea", "east", Type.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, false, null, true), - new PokemonForm("West Sea", "west", Type.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, false, null, true), - ), - new PokemonSpecies(Species.GASTRODON, 4, false, false, false, "Sea Slug Pokémon", Type.WATER, Type.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("East Sea", "east", Type.WATER, Type.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, false, null, true), - new PokemonForm("West Sea", "west", Type.WATER, Type.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, false, null, true), - ), - new PokemonSpecies(Species.AMBIPOM, 4, false, false, false, "Long Tail Pokémon", Type.NORMAL, null, 1.2, 20.3, Abilities.TECHNICIAN, Abilities.PICKUP, Abilities.SKILL_LINK, 482, 75, 100, 66, 60, 66, 115, 45, 100, 169, GrowthRate.FAST, 50, true), - new PokemonSpecies(Species.DRIFLOON, 4, false, false, false, "Balloon Pokémon", Type.GHOST, Type.FLYING, 0.4, 1.2, Abilities.AFTERMATH, Abilities.UNBURDEN, Abilities.FLARE_BOOST, 348, 90, 50, 34, 60, 44, 70, 125, 50, 70, GrowthRate.FLUCTUATING, 50, false), - new PokemonSpecies(Species.DRIFBLIM, 4, false, false, false, "Blimp Pokémon", Type.GHOST, Type.FLYING, 1.2, 15, Abilities.AFTERMATH, Abilities.UNBURDEN, Abilities.FLARE_BOOST, 498, 150, 80, 44, 90, 54, 80, 60, 50, 174, GrowthRate.FLUCTUATING, 50, false), - new PokemonSpecies(Species.BUNEARY, 4, false, false, false, "Rabbit Pokémon", Type.NORMAL, null, 0.4, 5.5, Abilities.RUN_AWAY, Abilities.KLUTZ, Abilities.LIMBER, 350, 55, 66, 44, 44, 56, 85, 190, 0, 70, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.LOPUNNY, 4, false, false, false, "Rabbit Pokémon", Type.NORMAL, null, 1.2, 33.3, Abilities.CUTE_CHARM, Abilities.KLUTZ, Abilities.LIMBER, 480, 65, 76, 84, 54, 96, 105, 60, 140, 168, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.NORMAL, null, 1.2, 33.3, Abilities.CUTE_CHARM, Abilities.KLUTZ, Abilities.LIMBER, 480, 65, 76, 84, 54, 96, 105, 60, 140, 168, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.NORMAL, Type.FIGHTING, 1.3, 28.3, Abilities.SCRAPPY, Abilities.SCRAPPY, Abilities.SCRAPPY, 580, 65, 136, 94, 54, 96, 135, 60, 140, 168), - ), - new PokemonSpecies(Species.MISMAGIUS, 4, false, false, false, "Magical Pokémon", Type.GHOST, null, 0.9, 4.4, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 495, 60, 60, 60, 105, 105, 105, 45, 35, 173, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.HONCHKROW, 4, false, false, false, "Big Boss Pokémon", Type.DARK, Type.FLYING, 0.9, 27.3, Abilities.INSOMNIA, Abilities.SUPER_LUCK, Abilities.MOXIE, 505, 100, 125, 52, 105, 52, 71, 30, 35, 177, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GLAMEOW, 4, false, false, false, "Catty Pokémon", Type.NORMAL, null, 0.5, 3.9, Abilities.LIMBER, Abilities.OWN_TEMPO, Abilities.KEEN_EYE, 310, 49, 55, 42, 42, 37, 85, 190, 70, 62, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.PURUGLY, 4, false, false, false, "Tiger Cat Pokémon", Type.NORMAL, null, 1, 43.8, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.DEFIANT, 452, 71, 82, 64, 64, 59, 112, 75, 70, 158, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.CHINGLING, 4, false, false, false, "Bell Pokémon", Type.PSYCHIC, null, 0.2, 0.6, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 285, 45, 30, 50, 65, 50, 45, 120, 70, 57, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.STUNKY, 4, false, false, false, "Skunk Pokémon", Type.POISON, Type.DARK, 0.4, 19.2, Abilities.STENCH, Abilities.AFTERMATH, Abilities.KEEN_EYE, 329, 63, 63, 47, 41, 41, 74, 225, 50, 66, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SKUNTANK, 4, false, false, false, "Skunk Pokémon", Type.POISON, Type.DARK, 1, 38, Abilities.STENCH, Abilities.AFTERMATH, Abilities.KEEN_EYE, 479, 103, 93, 67, 71, 61, 84, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BRONZOR, 4, false, false, false, "Bronze Pokémon", Type.STEEL, Type.PSYCHIC, 0.5, 60.5, Abilities.LEVITATE, Abilities.HEATPROOF, Abilities.HEAVY_METAL, 300, 57, 24, 86, 24, 86, 23, 255, 50, 60, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.BRONZONG, 4, false, false, false, "Bronze Bell Pokémon", Type.STEEL, Type.PSYCHIC, 1.3, 187, Abilities.LEVITATE, Abilities.HEATPROOF, Abilities.HEAVY_METAL, 500, 67, 89, 116, 79, 116, 33, 90, 50, 175, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.BONSLY, 4, false, false, false, "Bonsai Pokémon", Type.ROCK, null, 0.5, 15, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.RATTLED, 290, 50, 80, 95, 10, 45, 10, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MIME_JR, 4, false, false, false, "Mime Pokémon", Type.PSYCHIC, Type.FAIRY, 0.6, 13, Abilities.SOUNDPROOF, Abilities.FILTER, Abilities.TECHNICIAN, 310, 20, 25, 45, 70, 90, 60, 145, 50, 62, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.HAPPINY, 4, false, false, false, "Playhouse Pokémon", Type.NORMAL, null, 0.6, 24.4, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.FRIEND_GUARD, 220, 100, 5, 5, 15, 65, 30, 130, 140, 110, GrowthRate.FAST, 0, false), - new PokemonSpecies(Species.CHATOT, 4, false, false, false, "Music Note Pokémon", Type.NORMAL, Type.FLYING, 0.5, 1.9, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 411, 76, 65, 45, 92, 42, 91, 30, 35, 144, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SPIRITOMB, 4, false, false, false, "Forbidden Pokémon", Type.GHOST, Type.DARK, 1, 108, Abilities.PRESSURE, Abilities.NONE, Abilities.INFILTRATOR, 485, 50, 92, 108, 92, 108, 35, 100, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GIBLE, 4, false, false, false, "Land Shark Pokémon", Type.DRAGON, Type.GROUND, 0.7, 20.5, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 300, 58, 70, 45, 40, 45, 42, 45, 50, 60, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.GABITE, 4, false, false, false, "Cave Pokémon", Type.DRAGON, Type.GROUND, 1.4, 56, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 410, 68, 90, 65, 50, 55, 82, 45, 50, 144, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.GARCHOMP, 4, false, false, false, "Mach Pokémon", Type.DRAGON, Type.GROUND, 1.9, 95, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 600, 108, 130, 95, 80, 85, 102, 45, 50, 300, GrowthRate.SLOW, 50, true, true, - new PokemonForm("Normal", "", Type.DRAGON, Type.GROUND, 1.9, 95, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 600, 108, 130, 95, 80, 85, 102, 45, 50, 300, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.GROUND, 1.9, 95, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SAND_FORCE, 700, 108, 170, 115, 120, 95, 92, 45, 50, 300, true), - ), - new PokemonSpecies(Species.MUNCHLAX, 4, false, false, false, "Big Eater Pokémon", Type.NORMAL, null, 0.6, 105, Abilities.PICKUP, Abilities.THICK_FAT, Abilities.GLUTTONY, 390, 135, 85, 40, 40, 85, 5, 50, 50, 78, GrowthRate.SLOW, 87.5, false), - new PokemonSpecies(Species.RIOLU, 4, false, false, false, "Emanation Pokémon", Type.FIGHTING, null, 0.7, 20.2, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.PRANKSTER, 285, 40, 70, 40, 35, 40, 60, 75, 50, 57, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.LUCARIO, 4, false, false, false, "Aura Pokémon", Type.FIGHTING, Type.STEEL, 1.2, 54, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.JUSTIFIED, 525, 70, 110, 70, 115, 70, 90, 45, 50, 184, GrowthRate.MEDIUM_SLOW, 87.5, false, true, - new PokemonForm("Normal", "", Type.FIGHTING, Type.STEEL, 1.2, 54, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.JUSTIFIED, 525, 70, 110, 70, 115, 70, 90, 45, 50, 184, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.FIGHTING, Type.STEEL, 1.3, 57.5, Abilities.ADAPTABILITY, Abilities.ADAPTABILITY, Abilities.ADAPTABILITY, 625, 70, 145, 88, 140, 70, 112, 45, 50, 184), - ), - new PokemonSpecies(Species.HIPPOPOTAS, 4, false, false, false, "Hippo Pokémon", Type.GROUND, null, 0.8, 49.5, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_FORCE, 330, 68, 72, 78, 38, 42, 32, 140, 50, 66, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.HIPPOWDON, 4, false, false, false, "Heavyweight Pokémon", Type.GROUND, null, 2, 300, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_FORCE, 525, 108, 112, 118, 68, 72, 47, 60, 50, 184, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.SKORUPI, 4, false, false, false, "Scorpion Pokémon", Type.POISON, Type.BUG, 0.8, 12, Abilities.BATTLE_ARMOR, Abilities.SNIPER, Abilities.KEEN_EYE, 330, 40, 50, 90, 30, 55, 65, 120, 50, 66, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.DRAPION, 4, false, false, false, "Ogre Scorpion Pokémon", Type.POISON, Type.DARK, 1.3, 61.5, Abilities.BATTLE_ARMOR, Abilities.SNIPER, Abilities.KEEN_EYE, 500, 70, 90, 110, 60, 75, 95, 45, 50, 175, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.CROAGUNK, 4, false, false, false, "Toxic Mouth Pokémon", Type.POISON, Type.FIGHTING, 0.7, 23, Abilities.ANTICIPATION, Abilities.DRY_SKIN, Abilities.POISON_TOUCH, 300, 48, 61, 40, 61, 40, 50, 140, 100, 60, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.TOXICROAK, 4, false, false, false, "Toxic Mouth Pokémon", Type.POISON, Type.FIGHTING, 1.3, 44.4, Abilities.ANTICIPATION, Abilities.DRY_SKIN, Abilities.POISON_TOUCH, 490, 83, 106, 65, 86, 65, 85, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.CARNIVINE, 4, false, false, false, "Bug Catcher Pokémon", Type.GRASS, null, 1.4, 27, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 454, 74, 100, 72, 90, 72, 46, 200, 70, 159, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.FINNEON, 4, false, false, false, "Wing Fish Pokémon", Type.WATER, null, 0.4, 7, Abilities.SWIFT_SWIM, Abilities.STORM_DRAIN, Abilities.WATER_VEIL, 330, 49, 49, 56, 49, 61, 66, 190, 70, 66, GrowthRate.ERRATIC, 50, true), - new PokemonSpecies(Species.LUMINEON, 4, false, false, false, "Neon Pokémon", Type.WATER, null, 1.2, 24, Abilities.SWIFT_SWIM, Abilities.STORM_DRAIN, Abilities.WATER_VEIL, 460, 69, 69, 76, 69, 86, 91, 75, 70, 161, GrowthRate.ERRATIC, 50, true), - new PokemonSpecies(Species.MANTYKE, 4, false, false, false, "Kite Pokémon", Type.WATER, Type.FLYING, 1, 65, Abilities.SWIFT_SWIM, Abilities.WATER_ABSORB, Abilities.WATER_VEIL, 345, 45, 20, 50, 60, 120, 50, 25, 50, 69, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.SNOVER, 4, false, false, false, "Frost Tree Pokémon", Type.GRASS, Type.ICE, 1, 50.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 334, 60, 62, 50, 62, 60, 40, 120, 50, 67, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.ABOMASNOW, 4, false, false, false, "Frost Tree Pokémon", Type.GRASS, Type.ICE, 2.2, 135.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 494, 90, 92, 75, 92, 85, 60, 60, 50, 173, GrowthRate.SLOW, 50, true, true, - new PokemonForm("Normal", "", Type.GRASS, Type.ICE, 2.2, 135.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 494, 90, 92, 75, 92, 85, 60, 60, 50, 173, true, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GRASS, Type.ICE, 2.7, 185, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SNOW_WARNING, 594, 90, 132, 105, 132, 105, 30, 60, 50, 173, true), - ), - new PokemonSpecies(Species.WEAVILE, 4, false, false, false, "Sharp Claw Pokémon", Type.DARK, Type.ICE, 1.1, 34, Abilities.PRESSURE, Abilities.NONE, Abilities.PICKPOCKET, 510, 70, 120, 65, 45, 85, 125, 45, 35, 179, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.MAGNEZONE, 4, false, false, false, "Magnet Area Pokémon", Type.ELECTRIC, Type.STEEL, 1.2, 180, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 535, 70, 70, 115, 130, 90, 60, 30, 50, 268, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.LICKILICKY, 4, false, false, false, "Licking Pokémon", Type.NORMAL, null, 1.7, 140, Abilities.OWN_TEMPO, Abilities.OBLIVIOUS, Abilities.CLOUD_NINE, 515, 110, 85, 95, 80, 95, 50, 30, 50, 180, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.RHYPERIOR, 4, false, false, false, "Drill Pokémon", Type.GROUND, Type.ROCK, 2.4, 282.8, Abilities.LIGHTNING_ROD, Abilities.SOLID_ROCK, Abilities.RECKLESS, 535, 115, 140, 130, 55, 55, 40, 30, 50, 268, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.TANGROWTH, 4, false, false, false, "Vine Pokémon", Type.GRASS, null, 2, 128.6, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.REGENERATOR, 535, 100, 100, 125, 110, 50, 50, 30, 50, 187, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.ELECTIVIRE, 4, false, false, false, "Thunderbolt Pokémon", Type.ELECTRIC, null, 1.8, 138.6, Abilities.MOTOR_DRIVE, Abilities.NONE, Abilities.VITAL_SPIRIT, 540, 75, 123, 67, 95, 85, 95, 30, 50, 270, GrowthRate.MEDIUM_FAST, 75, false), - new PokemonSpecies(Species.MAGMORTAR, 4, false, false, false, "Blast Pokémon", Type.FIRE, null, 1.6, 68, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 540, 75, 95, 67, 125, 95, 83, 30, 50, 270, GrowthRate.MEDIUM_FAST, 75, false), - new PokemonSpecies(Species.TOGEKISS, 4, false, false, false, "Jubilee Pokémon", Type.FAIRY, Type.FLYING, 1.5, 38, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 545, 85, 50, 95, 120, 115, 80, 30, 50, 273, GrowthRate.FAST, 87.5, false), - new PokemonSpecies(Species.YANMEGA, 4, false, false, false, "Ogre Darner Pokémon", Type.BUG, Type.FLYING, 1.9, 51.5, Abilities.SPEED_BOOST, Abilities.TINTED_LENS, Abilities.FRISK, 515, 86, 76, 86, 116, 56, 95, 30, 70, 180, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.LEAFEON, 4, false, false, false, "Verdant Pokémon", Type.GRASS, null, 1, 25.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 65, 110, 130, 60, 65, 95, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.GLACEON, 4, false, false, false, "Fresh Snow Pokémon", Type.ICE, null, 0.8, 25.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.ICE_BODY, 525, 65, 60, 110, 130, 95, 65, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.GLISCOR, 4, false, false, false, "Fang Scorpion Pokémon", Type.GROUND, Type.FLYING, 2, 42.5, Abilities.HYPER_CUTTER, Abilities.SAND_VEIL, Abilities.POISON_HEAL, 510, 75, 95, 125, 45, 75, 95, 30, 70, 179, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.MAMOSWINE, 4, false, false, false, "Twin Tusk Pokémon", Type.ICE, Type.GROUND, 2.5, 291, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 530, 110, 130, 80, 70, 60, 80, 50, 50, 265, GrowthRate.SLOW, 50, true), - new PokemonSpecies(Species.PORYGON_Z, 4, false, false, false, "Virtual Pokémon", Type.NORMAL, null, 0.9, 34, Abilities.ADAPTABILITY, Abilities.DOWNLOAD, Abilities.ANALYTIC, 535, 85, 80, 70, 135, 75, 90, 30, 50, 268, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.GALLADE, 4, false, false, false, "Blade Pokémon", Type.PSYCHIC, Type.FIGHTING, 1.6, 52, Abilities.STEADFAST, Abilities.SHARPNESS, Abilities.JUSTIFIED, 518, 68, 125, 65, 65, 115, 80, 45, 35, 259, GrowthRate.SLOW, 100, false, true, - new PokemonForm("Normal", "", Type.PSYCHIC, Type.FIGHTING, 1.6, 52, Abilities.STEADFAST, Abilities.SHARPNESS, Abilities.JUSTIFIED, 518, 68, 125, 65, 65, 115, 80, 45, 35, 259, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.PSYCHIC, Type.FIGHTING, 1.6, 56.4, Abilities.SHARPNESS, Abilities.SHARPNESS, Abilities.SHARPNESS, 618, 68, 165, 95, 65, 115, 110, 45, 35, 259), - ), - new PokemonSpecies(Species.PROBOPASS, 4, false, false, false, "Compass Pokémon", Type.ROCK, Type.STEEL, 1.4, 340, Abilities.STURDY, Abilities.MAGNET_PULL, Abilities.SAND_FORCE, 525, 60, 55, 145, 75, 150, 40, 60, 70, 184, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DUSKNOIR, 4, false, false, false, "Gripper Pokémon", Type.GHOST, null, 2.2, 106.6, Abilities.PRESSURE, Abilities.NONE, Abilities.FRISK, 525, 45, 100, 135, 65, 135, 45, 45, 35, 263, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.FROSLASS, 4, false, false, false, "Snow Land Pokémon", Type.ICE, Type.GHOST, 1.3, 26.6, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.CURSED_BODY, 480, 70, 80, 70, 80, 70, 110, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false), - new PokemonSpecies(Species.ROTOM, 4, false, false, false, "Plasma Pokémon", Type.ELECTRIC, Type.GHOST, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 440, 50, 50, 77, 95, 77, 91, 45, 50, 154, GrowthRate.MEDIUM_FAST, null, false, false, - new PokemonForm("Normal", "", Type.ELECTRIC, Type.GHOST, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 440, 50, 50, 77, 95, 77, 91, 45, 50, 154, false, null, true), - new PokemonForm("Heat", "heat", Type.ELECTRIC, Type.FIRE, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 154, false, null, true), - new PokemonForm("Wash", "wash", Type.ELECTRIC, Type.WATER, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 154, false, null, true), - new PokemonForm("Frost", "frost", Type.ELECTRIC, Type.ICE, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 154, false, null, true), - new PokemonForm("Fan", "fan", Type.ELECTRIC, Type.FLYING, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 154, false, null, true), - new PokemonForm("Mow", "mow", Type.ELECTRIC, Type.GRASS, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 154, false, null, true), - ), - new PokemonSpecies(Species.UXIE, 4, true, false, false, "Knowledge Pokémon", Type.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 75, 75, 130, 75, 130, 95, 3, 140, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.MESPRIT, 4, true, false, false, "Emotion Pokémon", Type.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 80, 105, 105, 105, 105, 80, 3, 140, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.AZELF, 4, true, false, false, "Willpower Pokémon", Type.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 75, 125, 70, 125, 70, 115, 3, 140, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.DIALGA, 4, false, true, false, "Temporal Pokémon", Type.STEEL, Type.DRAGON, 5.4, 683, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 120, 120, 150, 100, 90, 3, 0, 340, GrowthRate.SLOW, null, false, false, - new PokemonForm("Normal", "", Type.STEEL, Type.DRAGON, 5.4, 683, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 120, 120, 150, 100, 90, 3, 0, 340, false, null, true), - new PokemonForm("Origin Forme", "origin", Type.STEEL, Type.DRAGON, 7, 848.7, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 100, 120, 150, 120, 90, 3, 0, 340), - ), - new PokemonSpecies(Species.PALKIA, 4, false, true, false, "Spatial Pokémon", Type.WATER, Type.DRAGON, 4.2, 336, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 120, 100, 150, 120, 100, 3, 0, 340, GrowthRate.SLOW, null, false, false, - new PokemonForm("Normal", "", Type.WATER, Type.DRAGON, 4.2, 336, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 120, 100, 150, 120, 100, 3, 0, 340, false, null, true), - new PokemonForm("Origin Forme", "origin", Type.WATER, Type.DRAGON, 6.3, 659, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 100, 100, 150, 120, 120, 3, 0, 340), - ), - new PokemonSpecies(Species.HEATRAN, 4, true, false, false, "Lava Dome Pokémon", Type.FIRE, Type.STEEL, 1.7, 430, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.FLAME_BODY, 600, 91, 90, 106, 130, 106, 77, 3, 100, 300, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.REGIGIGAS, 4, true, false, false, "Colossal Pokémon", Type.NORMAL, null, 3.7, 420, Abilities.SLOW_START, Abilities.NONE, Abilities.NORMALIZE, 670, 110, 160, 110, 80, 110, 100, 3, 0, 335, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.GIRATINA, 4, false, true, false, "Renegade Pokémon", Type.GHOST, Type.DRAGON, 4.5, 750, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 150, 100, 120, 100, 120, 90, 3, 0, 340, GrowthRate.SLOW, null, false, true, - new PokemonForm("Altered Forme", "altered", Type.GHOST, Type.DRAGON, 4.5, 750, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 150, 100, 120, 100, 120, 90, 3, 0, 340, false, null, true), - new PokemonForm("Origin Forme", "origin", Type.GHOST, Type.DRAGON, 6.9, 650, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 680, 150, 120, 100, 120, 100, 90, 3, 0, 340), - ), - new PokemonSpecies(Species.CRESSELIA, 4, true, false, false, "Lunar Pokémon", Type.PSYCHIC, null, 1.5, 85.6, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 120, 70, 110, 75, 120, 85, 3, 100, 300, GrowthRate.SLOW, 0, false), - new PokemonSpecies(Species.PHIONE, 4, false, false, true, "Sea Drifter Pokémon", Type.WATER, null, 0.4, 3.1, Abilities.HYDRATION, Abilities.NONE, Abilities.NONE, 480, 80, 80, 80, 80, 80, 80, 30, 70, 216, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.MANAPHY, 4, false, false, true, "Seafaring Pokémon", Type.WATER, null, 0.3, 1.4, Abilities.HYDRATION, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 70, 270, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.DARKRAI, 4, false, false, true, "Pitch-Black Pokémon", Type.DARK, null, 1.5, 50.5, Abilities.BAD_DREAMS, Abilities.NONE, Abilities.NONE, 600, 70, 90, 90, 135, 90, 125, 3, 0, 270, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SHAYMIN, 4, false, false, true, "Gratitude Pokémon", Type.GRASS, null, 0.2, 2.1, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 270, GrowthRate.MEDIUM_SLOW, null, false, true, - new PokemonForm("Land Forme", "land", Type.GRASS, null, 0.2, 2.1, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 270, false, null, true), - new PokemonForm("Sky Forme", "sky", Type.GRASS, Type.FLYING, 0.4, 5.2, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 103, 75, 120, 75, 127, 45, 100, 270), - ), - new PokemonSpecies(Species.ARCEUS, 4, false, false, true, "Alpha Pokémon", Type.NORMAL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "normal", Type.NORMAL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324, false, null, true), - new PokemonForm("Fighting", "fighting", Type.FIGHTING, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Flying", "flying", Type.FLYING, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Poison", "poison", Type.POISON, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Ground", "ground", Type.GROUND, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Rock", "rock", Type.ROCK, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Bug", "bug", Type.BUG, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Ghost", "ghost", Type.GHOST, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Steel", "steel", Type.STEEL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Fire", "fire", Type.FIRE, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Water", "water", Type.WATER, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Grass", "grass", Type.GRASS, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Electric", "electric", Type.ELECTRIC, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Psychic", "psychic", Type.PSYCHIC, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Ice", "ice", Type.ICE, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Dragon", "dragon", Type.DRAGON, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Dark", "dark", Type.DARK, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("Fairy", "fairy", Type.FAIRY, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - new PokemonForm("???", "unknown", Type.UNKNOWN, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 324), - ), - new PokemonSpecies(Species.VICTINI, 5, false, false, true, "Victory Pokémon", Type.PSYCHIC, Type.FIRE, 0.4, 4, Abilities.VICTORY_STAR, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 100, 300, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SNIVY, 5, false, false, false, "Grass Snake Pokémon", Type.GRASS, null, 0.6, 8.1, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 308, 45, 45, 55, 45, 55, 63, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.SERVINE, 5, false, false, false, "Grass Snake Pokémon", Type.GRASS, null, 0.8, 16, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 413, 60, 60, 75, 60, 75, 83, 45, 70, 145, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.SERPERIOR, 5, false, false, false, "Regal Pokémon", Type.GRASS, null, 3.3, 63, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 528, 75, 75, 95, 75, 95, 113, 45, 70, 238, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.TEPIG, 5, false, false, false, "Fire Pig Pokémon", Type.FIRE, null, 0.5, 9.9, Abilities.BLAZE, Abilities.NONE, Abilities.THICK_FAT, 308, 65, 63, 45, 45, 45, 45, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.PIGNITE, 5, false, false, false, "Fire Pig Pokémon", Type.FIRE, Type.FIGHTING, 1, 55.5, Abilities.BLAZE, Abilities.NONE, Abilities.THICK_FAT, 418, 90, 93, 55, 70, 55, 55, 45, 70, 146, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.EMBOAR, 5, false, false, false, "Mega Fire Pig Pokémon", Type.FIRE, Type.FIGHTING, 1.6, 150, Abilities.BLAZE, Abilities.NONE, Abilities.RECKLESS, 528, 110, 123, 65, 100, 65, 65, 45, 70, 238, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.OSHAWOTT, 5, false, false, false, "Sea Otter Pokémon", Type.WATER, null, 0.5, 5.9, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 308, 55, 55, 45, 63, 45, 45, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.DEWOTT, 5, false, false, false, "Discipline Pokémon", Type.WATER, null, 0.8, 24.5, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 413, 75, 75, 60, 83, 60, 60, 45, 70, 145, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.SAMUROTT, 5, false, false, false, "Formidable Pokémon", Type.WATER, null, 1.5, 94.6, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 528, 95, 100, 85, 108, 70, 70, 45, 70, 238, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.PATRAT, 5, false, false, false, "Scout Pokémon", Type.NORMAL, null, 0.5, 11.6, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.ANALYTIC, 255, 45, 55, 39, 35, 39, 42, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.WATCHOG, 5, false, false, false, "Lookout Pokémon", Type.NORMAL, null, 1.1, 27, Abilities.ILLUMINATE, Abilities.KEEN_EYE, Abilities.ANALYTIC, 420, 60, 85, 69, 60, 69, 77, 255, 70, 147, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.LILLIPUP, 5, false, false, false, "Puppy Pokémon", Type.NORMAL, null, 0.4, 4.1, Abilities.VITAL_SPIRIT, Abilities.PICKUP, Abilities.RUN_AWAY, 275, 45, 60, 45, 25, 45, 55, 255, 50, 55, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.HERDIER, 5, false, false, false, "Loyal Dog Pokémon", Type.NORMAL, null, 0.9, 14.7, Abilities.INTIMIDATE, Abilities.SAND_RUSH, Abilities.SCRAPPY, 370, 65, 80, 65, 35, 65, 60, 120, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.STOUTLAND, 5, false, false, false, "Big-Hearted Pokémon", Type.NORMAL, null, 1.2, 61, Abilities.INTIMIDATE, Abilities.SAND_RUSH, Abilities.SCRAPPY, 500, 85, 110, 90, 45, 90, 80, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.PURRLOIN, 5, false, false, false, "Devious Pokémon", Type.DARK, null, 0.4, 10.1, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.PRANKSTER, 281, 41, 50, 37, 50, 37, 66, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.LIEPARD, 5, false, false, false, "Cruel Pokémon", Type.DARK, null, 1.1, 37.5, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.PRANKSTER, 446, 64, 88, 50, 88, 50, 106, 90, 50, 156, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PANSAGE, 5, false, false, false, "Grass Monkey Pokémon", Type.GRASS, null, 0.6, 10.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.OVERGROW, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.SIMISAGE, 5, false, false, false, "Thorn Monkey Pokémon", Type.GRASS, null, 1.1, 30.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.OVERGROW, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.PANSEAR, 5, false, false, false, "High Temp Pokémon", Type.FIRE, null, 0.6, 11, Abilities.GLUTTONY, Abilities.NONE, Abilities.BLAZE, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.SIMISEAR, 5, false, false, false, "Ember Pokémon", Type.FIRE, null, 1, 28, Abilities.GLUTTONY, Abilities.NONE, Abilities.BLAZE, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.PANPOUR, 5, false, false, false, "Spray Pokémon", Type.WATER, null, 0.6, 13.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.TORRENT, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.SIMIPOUR, 5, false, false, false, "Geyser Pokémon", Type.WATER, null, 1, 29, Abilities.GLUTTONY, Abilities.NONE, Abilities.TORRENT, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.MUNNA, 5, false, false, false, "Dream Eater Pokémon", Type.PSYCHIC, null, 0.6, 23.3, Abilities.FOREWARN, Abilities.SYNCHRONIZE, Abilities.TELEPATHY, 292, 76, 25, 45, 67, 55, 24, 190, 50, 58, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.MUSHARNA, 5, false, false, false, "Drowsing Pokémon", Type.PSYCHIC, null, 1.1, 60.5, Abilities.FOREWARN, Abilities.SYNCHRONIZE, Abilities.TELEPATHY, 487, 116, 55, 85, 107, 95, 29, 75, 50, 170, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.PIDOVE, 5, false, false, false, "Tiny Pigeon Pokémon", Type.NORMAL, Type.FLYING, 0.3, 2.1, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 264, 50, 55, 50, 36, 30, 43, 255, 50, 53, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.TRANQUILL, 5, false, false, false, "Wild Pigeon Pokémon", Type.NORMAL, Type.FLYING, 0.6, 15, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 358, 62, 77, 62, 50, 42, 65, 120, 50, 125, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.UNFEZANT, 5, false, false, false, "Proud Pokémon", Type.NORMAL, Type.FLYING, 1.2, 29, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 488, 80, 115, 80, 65, 55, 93, 45, 50, 244, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.BLITZLE, 5, false, false, false, "Electrified Pokémon", Type.ELECTRIC, null, 0.8, 29.8, Abilities.LIGHTNING_ROD, Abilities.MOTOR_DRIVE, Abilities.SAP_SIPPER, 295, 45, 60, 32, 50, 32, 76, 190, 70, 59, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ZEBSTRIKA, 5, false, false, false, "Thunderbolt Pokémon", Type.ELECTRIC, null, 1.6, 79.5, Abilities.LIGHTNING_ROD, Abilities.MOTOR_DRIVE, Abilities.SAP_SIPPER, 497, 75, 100, 63, 80, 63, 116, 75, 70, 174, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ROGGENROLA, 5, false, false, false, "Mantle Pokémon", Type.ROCK, null, 0.4, 18, Abilities.STURDY, Abilities.WEAK_ARMOR, Abilities.SAND_FORCE, 280, 55, 75, 85, 25, 25, 15, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.BOLDORE, 5, false, false, false, "Ore Pokémon", Type.ROCK, null, 0.9, 102, Abilities.STURDY, Abilities.WEAK_ARMOR, Abilities.SAND_FORCE, 390, 70, 105, 105, 50, 40, 20, 120, 50, 137, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GIGALITH, 5, false, false, false, "Compressed Pokémon", Type.ROCK, null, 1.7, 260, Abilities.STURDY, Abilities.SAND_STREAM, Abilities.SAND_FORCE, 515, 85, 135, 130, 60, 80, 25, 45, 50, 258, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.WOOBAT, 5, false, false, false, "Bat Pokémon", Type.PSYCHIC, Type.FLYING, 0.4, 2.1, Abilities.UNAWARE, Abilities.KLUTZ, Abilities.SIMPLE, 323, 65, 45, 43, 55, 43, 72, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SWOOBAT, 5, false, false, false, "Courting Pokémon", Type.PSYCHIC, Type.FLYING, 0.9, 10.5, Abilities.UNAWARE, Abilities.KLUTZ, Abilities.SIMPLE, 425, 67, 57, 55, 77, 55, 114, 45, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DRILBUR, 5, false, false, false, "Mole Pokémon", Type.GROUND, null, 0.3, 8.5, Abilities.SAND_RUSH, Abilities.SAND_FORCE, Abilities.MOLD_BREAKER, 328, 60, 85, 40, 30, 45, 68, 120, 50, 66, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.EXCADRILL, 5, false, false, false, "Subterrene Pokémon", Type.GROUND, Type.STEEL, 0.7, 40.4, Abilities.SAND_RUSH, Abilities.SAND_FORCE, Abilities.MOLD_BREAKER, 508, 110, 135, 60, 50, 65, 88, 60, 50, 178, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.AUDINO, 5, false, false, false, "Hearing Pokémon", Type.NORMAL, null, 1.1, 31, Abilities.HEALER, Abilities.REGENERATOR, Abilities.KLUTZ, 445, 103, 60, 86, 60, 86, 50, 255, 50, 390, GrowthRate.FAST, 50, false, true, - new PokemonForm("Normal", "", Type.NORMAL, null, 1.1, 31, Abilities.HEALER, Abilities.REGENERATOR, Abilities.KLUTZ, 445, 103, 60, 86, 60, 86, 50, 255, 50, 390, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.NORMAL, Type.FAIRY, 1.5, 32, Abilities.REGENERATOR, Abilities.REGENERATOR, Abilities.REGENERATOR, 545, 103, 60, 126, 80, 126, 50, 255, 50, 390), //Custom Ability, base form Hidden Ability - ), - new PokemonSpecies(Species.TIMBURR, 5, false, false, false, "Muscular Pokémon", Type.FIGHTING, null, 0.6, 12.5, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 305, 75, 80, 55, 25, 35, 35, 180, 70, 61, GrowthRate.MEDIUM_SLOW, 75, false), - new PokemonSpecies(Species.GURDURR, 5, false, false, false, "Muscular Pokémon", Type.FIGHTING, null, 1.2, 40, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 405, 85, 105, 85, 40, 50, 40, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 75, false), - new PokemonSpecies(Species.CONKELDURR, 5, false, false, false, "Muscular Pokémon", Type.FIGHTING, null, 1.4, 87, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 505, 105, 140, 95, 55, 65, 45, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 75, false), - new PokemonSpecies(Species.TYMPOLE, 5, false, false, false, "Tadpole Pokémon", Type.WATER, null, 0.5, 4.5, Abilities.SWIFT_SWIM, Abilities.HYDRATION, Abilities.WATER_ABSORB, 294, 50, 50, 40, 50, 40, 64, 255, 50, 59, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.PALPITOAD, 5, false, false, false, "Vibration Pokémon", Type.WATER, Type.GROUND, 0.8, 17, Abilities.SWIFT_SWIM, Abilities.HYDRATION, Abilities.WATER_ABSORB, 384, 75, 65, 55, 65, 55, 69, 120, 50, 134, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SEISMITOAD, 5, false, false, false, "Vibration Pokémon", Type.WATER, Type.GROUND, 1.5, 62, Abilities.SWIFT_SWIM, Abilities.POISON_TOUCH, Abilities.WATER_ABSORB, 509, 105, 95, 75, 85, 75, 74, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.THROH, 5, false, false, false, "Judo Pokémon", Type.FIGHTING, null, 1.3, 55.5, Abilities.GUTS, Abilities.INNER_FOCUS, Abilities.MOLD_BREAKER, 465, 120, 100, 85, 30, 85, 45, 45, 50, 163, GrowthRate.MEDIUM_FAST, 100, false), - new PokemonSpecies(Species.SAWK, 5, false, false, false, "Karate Pokémon", Type.FIGHTING, null, 1.4, 51, Abilities.STURDY, Abilities.INNER_FOCUS, Abilities.MOLD_BREAKER, 465, 75, 125, 75, 30, 75, 85, 45, 50, 163, GrowthRate.MEDIUM_FAST, 100, false), - new PokemonSpecies(Species.SEWADDLE, 5, false, false, false, "Sewing Pokémon", Type.BUG, Type.GRASS, 0.3, 2.5, Abilities.SWARM, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 310, 45, 53, 70, 40, 60, 42, 255, 70, 62, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SWADLOON, 5, false, false, false, "Leaf-Wrapped Pokémon", Type.BUG, Type.GRASS, 0.5, 7.3, Abilities.LEAF_GUARD, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 380, 55, 63, 90, 50, 80, 42, 120, 70, 133, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.LEAVANNY, 5, false, false, false, "Nurturing Pokémon", Type.BUG, Type.GRASS, 1.2, 20.5, Abilities.SWARM, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 500, 75, 103, 80, 70, 80, 92, 45, 70, 225, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.VENIPEDE, 5, false, false, false, "Centipede Pokémon", Type.BUG, Type.POISON, 0.4, 5.3, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 260, 30, 45, 59, 30, 39, 57, 255, 50, 52, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.WHIRLIPEDE, 5, false, false, false, "Curlipede Pokémon", Type.BUG, Type.POISON, 1.2, 58.5, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 360, 40, 55, 99, 40, 79, 47, 120, 50, 126, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SCOLIPEDE, 5, false, false, false, "Megapede Pokémon", Type.BUG, Type.POISON, 2.5, 200.5, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 485, 60, 100, 89, 55, 69, 112, 45, 50, 243, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.COTTONEE, 5, false, false, false, "Cotton Puff Pokémon", Type.GRASS, Type.FAIRY, 0.3, 0.6, Abilities.PRANKSTER, Abilities.INFILTRATOR, Abilities.CHLOROPHYLL, 280, 40, 27, 60, 37, 50, 66, 190, 50, 56, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.WHIMSICOTT, 5, false, false, false, "Windveiled Pokémon", Type.GRASS, Type.FAIRY, 0.7, 6.6, Abilities.PRANKSTER, Abilities.INFILTRATOR, Abilities.CHLOROPHYLL, 480, 60, 67, 85, 77, 75, 116, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PETILIL, 5, false, false, false, "Bulb Pokémon", Type.GRASS, null, 0.5, 6.6, Abilities.CHLOROPHYLL, Abilities.OWN_TEMPO, Abilities.LEAF_GUARD, 280, 45, 35, 50, 70, 50, 30, 190, 50, 56, GrowthRate.MEDIUM_FAST, 0, false), - new PokemonSpecies(Species.LILLIGANT, 5, false, false, false, "Flowering Pokémon", Type.GRASS, null, 1.1, 16.3, Abilities.CHLOROPHYLL, Abilities.OWN_TEMPO, Abilities.LEAF_GUARD, 480, 70, 60, 75, 110, 75, 90, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false), - new PokemonSpecies(Species.BASCULIN, 5, false, false, false, "Hostile Pokémon", Type.WATER, null, 1, 18, Abilities.RECKLESS, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Red-Striped Form", "red-striped", Type.WATER, null, 1, 18, Abilities.RECKLESS, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true), - new PokemonForm("Blue-Striped Form", "blue-striped", Type.WATER, null, 1, 18, Abilities.ROCK_HEAD, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true), - new PokemonForm("White-Striped Form", "white-striped", Type.WATER, null, 1, 18, Abilities.RATTLED, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true), - ), - new PokemonSpecies(Species.SANDILE, 5, false, false, false, "Desert Croc Pokémon", Type.GROUND, Type.DARK, 0.7, 15.2, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 292, 50, 72, 35, 35, 35, 65, 180, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.KROKOROK, 5, false, false, false, "Desert Croc Pokémon", Type.GROUND, Type.DARK, 1, 33.4, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 351, 60, 82, 45, 45, 45, 74, 90, 50, 123, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.KROOKODILE, 5, false, false, false, "Intimidation Pokémon", Type.GROUND, Type.DARK, 1.5, 96.3, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 519, 95, 117, 80, 65, 70, 92, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.DARUMAKA, 5, false, false, false, "Zen Charm Pokémon", Type.FIRE, null, 0.6, 37.5, Abilities.HUSTLE, Abilities.NONE, Abilities.INNER_FOCUS, 315, 70, 90, 45, 15, 45, 50, 120, 50, 63, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.DARMANITAN, 5, false, false, false, "Blazing Pokémon", Type.FIRE, null, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false, true, - new PokemonForm("Standard Mode", "", Type.FIRE, null, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, false, null, true), - new PokemonForm("Zen Mode", "zen", Type.FIRE, Type.PSYCHIC, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 540, 105, 30, 105, 140, 105, 55, 60, 50, 168), - ), - new PokemonSpecies(Species.MARACTUS, 5, false, false, false, "Cactus Pokémon", Type.GRASS, null, 1, 28, Abilities.WATER_ABSORB, Abilities.CHLOROPHYLL, Abilities.STORM_DRAIN, 461, 75, 86, 67, 106, 67, 60, 255, 50, 161, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DWEBBLE, 5, false, false, false, "Rock Inn Pokémon", Type.BUG, Type.ROCK, 0.3, 14.5, Abilities.STURDY, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 325, 50, 65, 85, 35, 35, 55, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CRUSTLE, 5, false, false, false, "Stone Home Pokémon", Type.BUG, Type.ROCK, 1.4, 200, Abilities.STURDY, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 485, 70, 105, 125, 65, 75, 45, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SCRAGGY, 5, false, false, false, "Shedding Pokémon", Type.DARK, Type.FIGHTING, 0.6, 11.8, Abilities.SHED_SKIN, Abilities.MOXIE, Abilities.INTIMIDATE, 348, 50, 75, 70, 35, 70, 48, 180, 35, 70, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SCRAFTY, 5, false, false, false, "Hoodlum Pokémon", Type.DARK, Type.FIGHTING, 1.1, 30, Abilities.SHED_SKIN, Abilities.MOXIE, Abilities.INTIMIDATE, 488, 65, 90, 115, 45, 115, 58, 90, 50, 171, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SIGILYPH, 5, false, false, false, "Avianoid Pokémon", Type.PSYCHIC, Type.FLYING, 1.4, 14, Abilities.WONDER_SKIN, Abilities.MAGIC_GUARD, Abilities.TINTED_LENS, 490, 72, 58, 80, 103, 80, 97, 45, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.YAMASK, 5, false, false, false, "Spirit Pokémon", Type.GHOST, null, 0.5, 1.5, Abilities.MUMMY, Abilities.NONE, Abilities.NONE, 303, 38, 30, 85, 55, 65, 30, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.COFAGRIGUS, 5, false, false, false, "Coffin Pokémon", Type.GHOST, null, 1.7, 76.5, Abilities.MUMMY, Abilities.NONE, Abilities.NONE, 483, 58, 50, 145, 95, 105, 30, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.TIRTOUGA, 5, false, false, false, "Prototurtle Pokémon", Type.WATER, Type.ROCK, 0.7, 16.5, Abilities.SOLID_ROCK, Abilities.STURDY, Abilities.SWIFT_SWIM, 355, 54, 78, 103, 53, 45, 22, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.CARRACOSTA, 5, false, false, false, "Prototurtle Pokémon", Type.WATER, Type.ROCK, 1.2, 81, Abilities.SOLID_ROCK, Abilities.STURDY, Abilities.SWIFT_SWIM, 495, 74, 108, 133, 83, 65, 32, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.ARCHEN, 5, false, false, false, "First Bird Pokémon", Type.ROCK, Type.FLYING, 0.5, 9.5, Abilities.DEFEATIST, Abilities.NONE, Abilities.WIMP_OUT, 401, 55, 112, 45, 74, 45, 70, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false), //Custom Hidden - new PokemonSpecies(Species.ARCHEOPS, 5, false, false, false, "First Bird Pokémon", Type.ROCK, Type.FLYING, 1.4, 32, Abilities.DEFEATIST, Abilities.NONE, Abilities.EMERGENCY_EXIT, 567, 75, 140, 65, 112, 65, 110, 45, 50, 177, GrowthRate.MEDIUM_FAST, 87.5, false), //Custom Hidden - new PokemonSpecies(Species.TRUBBISH, 5, false, false, false, "Trash Bag Pokémon", Type.POISON, null, 0.6, 31, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.AFTERMATH, 329, 50, 50, 62, 40, 62, 65, 190, 50, 66, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GARBODOR, 5, false, false, false, "Trash Heap Pokémon", Type.POISON, null, 1.9, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 474, 80, 95, 82, 60, 82, 75, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.POISON, null, 1.9, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 474, 80, 95, 82, 60, 82, 75, 60, 50, 166, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.POISON, Type.STEEL, 21, 999.9, Abilities.TOXIC_DEBRIS, Abilities.TOXIC_DEBRIS, Abilities.TOXIC_DEBRIS, 574, 135, 125, 102, 57, 102, 53, 60, 50, 166), - ), - new PokemonSpecies(Species.ZORUA, 5, false, false, false, "Tricky Fox Pokémon", Type.DARK, null, 0.7, 12.5, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 330, 40, 65, 40, 80, 40, 65, 75, 50, 66, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.ZOROARK, 5, false, false, false, "Illusion Fox Pokémon", Type.DARK, null, 1.6, 81.1, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 510, 60, 105, 60, 120, 60, 105, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.MINCCINO, 5, false, false, false, "Chinchilla Pokémon", Type.NORMAL, null, 0.4, 5.8, Abilities.CUTE_CHARM, Abilities.TECHNICIAN, Abilities.SKILL_LINK, 300, 55, 50, 40, 40, 40, 75, 255, 50, 60, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.CINCCINO, 5, false, false, false, "Scarf Pokémon", Type.NORMAL, null, 0.5, 7.5, Abilities.CUTE_CHARM, Abilities.TECHNICIAN, Abilities.SKILL_LINK, 470, 75, 95, 60, 65, 60, 115, 60, 50, 165, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.GOTHITA, 5, false, false, false, "Fixation Pokémon", Type.PSYCHIC, null, 0.4, 5.8, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 290, 45, 30, 50, 55, 65, 45, 200, 50, 58, GrowthRate.MEDIUM_SLOW, 25, false), - new PokemonSpecies(Species.GOTHORITA, 5, false, false, false, "Manipulate Pokémon", Type.PSYCHIC, null, 0.7, 18, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 390, 60, 45, 70, 75, 85, 55, 100, 50, 137, GrowthRate.MEDIUM_SLOW, 25, false), - new PokemonSpecies(Species.GOTHITELLE, 5, false, false, false, "Astral Body Pokémon", Type.PSYCHIC, null, 1.5, 44, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 490, 70, 55, 95, 95, 110, 65, 50, 50, 245, GrowthRate.MEDIUM_SLOW, 25, false), - new PokemonSpecies(Species.SOLOSIS, 5, false, false, false, "Cell Pokémon", Type.PSYCHIC, null, 0.3, 1, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 290, 45, 30, 40, 105, 50, 20, 200, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.DUOSION, 5, false, false, false, "Mitosis Pokémon", Type.PSYCHIC, null, 0.6, 8, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 370, 65, 40, 50, 125, 60, 30, 100, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.REUNICLUS, 5, false, false, false, "Multiplying Pokémon", Type.PSYCHIC, null, 1, 20.1, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 490, 110, 65, 75, 125, 85, 30, 50, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.DUCKLETT, 5, false, false, false, "Water Bird Pokémon", Type.WATER, Type.FLYING, 0.5, 5.5, Abilities.KEEN_EYE, Abilities.BIG_PECKS, Abilities.HYDRATION, 305, 62, 44, 50, 44, 50, 55, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SWANNA, 5, false, false, false, "White Bird Pokémon", Type.WATER, Type.FLYING, 1.3, 24.2, Abilities.KEEN_EYE, Abilities.BIG_PECKS, Abilities.HYDRATION, 473, 75, 87, 63, 87, 63, 98, 45, 70, 166, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.VANILLITE, 5, false, false, false, "Fresh Snow Pokémon", Type.ICE, null, 0.4, 5.7, Abilities.ICE_BODY, Abilities.SNOW_CLOAK, Abilities.WEAK_ARMOR, 305, 36, 50, 50, 65, 60, 44, 255, 50, 61, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.VANILLISH, 5, false, false, false, "Icy Snow Pokémon", Type.ICE, null, 1.1, 41, Abilities.ICE_BODY, Abilities.SNOW_CLOAK, Abilities.WEAK_ARMOR, 395, 51, 65, 65, 80, 75, 59, 120, 50, 138, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.VANILLUXE, 5, false, false, false, "Snowstorm Pokémon", Type.ICE, null, 1.3, 57.5, Abilities.ICE_BODY, Abilities.SNOW_WARNING, Abilities.WEAK_ARMOR, 535, 71, 95, 85, 110, 95, 79, 45, 50, 268, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.DEERLING, 5, false, false, false, "Season Pokémon", Type.NORMAL, Type.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Spring Form", "spring", Type.NORMAL, Type.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true), - new PokemonForm("Summer Form", "summer", Type.NORMAL, Type.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true), - new PokemonForm("Autumn Form", "autumn", Type.NORMAL, Type.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true), - new PokemonForm("Winter Form", "winter", Type.NORMAL, Type.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true), - ), - new PokemonSpecies(Species.SAWSBUCK, 5, false, false, false, "Season Pokémon", Type.NORMAL, Type.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Spring Form", "spring", Type.NORMAL, Type.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true), - new PokemonForm("Summer Form", "summer", Type.NORMAL, Type.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true), - new PokemonForm("Autumn Form", "autumn", Type.NORMAL, Type.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true), - new PokemonForm("Winter Form", "winter", Type.NORMAL, Type.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true), - ), - new PokemonSpecies(Species.EMOLGA, 5, false, false, false, "Sky Squirrel Pokémon", Type.ELECTRIC, Type.FLYING, 0.4, 5, Abilities.STATIC, Abilities.NONE, Abilities.MOTOR_DRIVE, 428, 55, 75, 60, 75, 60, 103, 200, 50, 150, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.KARRABLAST, 5, false, false, false, "Clamping Pokémon", Type.BUG, null, 0.5, 5.9, Abilities.SWARM, Abilities.SHED_SKIN, Abilities.NO_GUARD, 315, 50, 75, 45, 40, 45, 60, 200, 50, 63, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ESCAVALIER, 5, false, false, false, "Cavalry Pokémon", Type.BUG, Type.STEEL, 1, 33, Abilities.SWARM, Abilities.SHELL_ARMOR, Abilities.OVERCOAT, 495, 70, 135, 105, 60, 105, 20, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FOONGUS, 5, false, false, false, "Mushroom Pokémon", Type.GRASS, Type.POISON, 0.2, 1, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.REGENERATOR, 294, 69, 55, 45, 55, 55, 15, 190, 50, 59, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.AMOONGUSS, 5, false, false, false, "Mushroom Pokémon", Type.GRASS, Type.POISON, 0.6, 10.5, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.REGENERATOR, 464, 114, 85, 70, 85, 80, 30, 75, 50, 162, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FRILLISH, 5, false, false, false, "Floating Pokémon", Type.WATER, Type.GHOST, 1.2, 33, Abilities.WATER_ABSORB, Abilities.CURSED_BODY, Abilities.DAMP, 335, 55, 40, 50, 65, 85, 40, 190, 50, 67, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.JELLICENT, 5, false, false, false, "Floating Pokémon", Type.WATER, Type.GHOST, 2.2, 135, Abilities.WATER_ABSORB, Abilities.CURSED_BODY, Abilities.DAMP, 480, 100, 60, 70, 85, 105, 60, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, true), - new PokemonSpecies(Species.ALOMOMOLA, 5, false, false, false, "Caring Pokémon", Type.WATER, null, 1.2, 31.6, Abilities.HEALER, Abilities.HYDRATION, Abilities.REGENERATOR, 470, 165, 75, 80, 40, 45, 65, 75, 70, 165, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.JOLTIK, 5, false, false, false, "Attaching Pokémon", Type.BUG, Type.ELECTRIC, 0.1, 0.6, Abilities.COMPOUND_EYES, Abilities.UNNERVE, Abilities.SWARM, 319, 50, 47, 50, 57, 50, 65, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALVANTULA, 5, false, false, false, "EleSpider Pokémon", Type.BUG, Type.ELECTRIC, 0.8, 14.3, Abilities.COMPOUND_EYES, Abilities.UNNERVE, Abilities.SWARM, 472, 70, 77, 60, 97, 60, 108, 75, 50, 165, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FERROSEED, 5, false, false, false, "Thorn Seed Pokémon", Type.GRASS, Type.STEEL, 0.6, 18.8, Abilities.IRON_BARBS, Abilities.NONE, Abilities.ANTICIPATION, 305, 44, 50, 91, 24, 86, 10, 255, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FERROTHORN, 5, false, false, false, "Thorn Pod Pokémon", Type.GRASS, Type.STEEL, 1, 110, Abilities.IRON_BARBS, Abilities.NONE, Abilities.ANTICIPATION, 489, 74, 94, 131, 54, 116, 20, 90, 50, 171, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.KLINK, 5, false, false, false, "Gear Pokémon", Type.STEEL, null, 0.3, 21, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 300, 40, 55, 70, 45, 60, 30, 130, 50, 60, GrowthRate.MEDIUM_SLOW, null, false), - new PokemonSpecies(Species.KLANG, 5, false, false, false, "Gear Pokémon", Type.STEEL, null, 0.6, 51, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 440, 60, 80, 95, 70, 85, 50, 60, 50, 154, GrowthRate.MEDIUM_SLOW, null, false), - new PokemonSpecies(Species.KLINKLANG, 5, false, false, false, "Gear Pokémon", Type.STEEL, null, 0.6, 81, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 520, 60, 100, 115, 70, 85, 90, 30, 50, 260, GrowthRate.MEDIUM_SLOW, null, false), - new PokemonSpecies(Species.TYNAMO, 5, false, false, false, "EleFish Pokémon", Type.ELECTRIC, null, 0.2, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 275, 35, 55, 40, 45, 40, 60, 190, 70, 55, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.EELEKTRIK, 5, false, false, false, "EleFish Pokémon", Type.ELECTRIC, null, 1.2, 22, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 405, 65, 85, 70, 75, 70, 40, 60, 70, 142, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.EELEKTROSS, 5, false, false, false, "EleFish Pokémon", Type.ELECTRIC, null, 2.1, 80.5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 515, 85, 115, 80, 105, 80, 50, 30, 70, 232, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.ELGYEM, 5, false, false, false, "Cerebral Pokémon", Type.PSYCHIC, null, 0.5, 9, Abilities.TELEPATHY, Abilities.SYNCHRONIZE, Abilities.ANALYTIC, 335, 55, 55, 55, 85, 55, 30, 255, 50, 67, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BEHEEYEM, 5, false, false, false, "Cerebral Pokémon", Type.PSYCHIC, null, 1, 34.5, Abilities.TELEPATHY, Abilities.SYNCHRONIZE, Abilities.ANALYTIC, 485, 75, 75, 75, 125, 95, 40, 90, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.LITWICK, 5, false, false, false, "Candle Pokémon", Type.GHOST, Type.FIRE, 0.3, 3.1, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 275, 50, 30, 55, 65, 55, 20, 190, 50, 55, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.LAMPENT, 5, false, false, false, "Lamp Pokémon", Type.GHOST, Type.FIRE, 0.6, 13, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 370, 60, 40, 60, 95, 60, 55, 90, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.CHANDELURE, 5, false, false, false, "Luring Pokémon", Type.GHOST, Type.FIRE, 1, 34.3, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 520, 60, 55, 90, 145, 90, 80, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.AXEW, 5, false, false, false, "Tusk Pokémon", Type.DRAGON, null, 0.6, 18, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 320, 46, 87, 60, 30, 40, 57, 75, 35, 64, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.FRAXURE, 5, false, false, false, "Axe Jaw Pokémon", Type.DRAGON, null, 1, 36, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 410, 66, 117, 70, 40, 50, 67, 60, 35, 144, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.HAXORUS, 5, false, false, false, "Axe Jaw Pokémon", Type.DRAGON, null, 1.8, 105.5, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 540, 76, 147, 90, 60, 70, 97, 45, 35, 270, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.CUBCHOO, 5, false, false, false, "Chill Pokémon", Type.ICE, null, 0.5, 8.5, Abilities.SNOW_CLOAK, Abilities.SLUSH_RUSH, Abilities.RATTLED, 305, 55, 70, 40, 60, 40, 40, 120, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BEARTIC, 5, false, false, false, "Freezing Pokémon", Type.ICE, null, 2.6, 260, Abilities.SNOW_CLOAK, Abilities.SLUSH_RUSH, Abilities.SWIFT_SWIM, 505, 95, 130, 80, 70, 80, 50, 60, 50, 177, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CRYOGONAL, 5, false, false, false, "Crystallizing Pokémon", Type.ICE, null, 1.1, 148, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 515, 80, 50, 50, 95, 135, 105, 25, 50, 180, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.SHELMET, 5, false, false, false, "Snail Pokémon", Type.BUG, null, 0.4, 7.7, Abilities.HYDRATION, Abilities.SHELL_ARMOR, Abilities.OVERCOAT, 305, 50, 40, 85, 40, 65, 25, 200, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ACCELGOR, 5, false, false, false, "Shell Out Pokémon", Type.BUG, null, 0.8, 25.3, Abilities.HYDRATION, Abilities.STICKY_HOLD, Abilities.UNBURDEN, 495, 80, 70, 40, 100, 60, 145, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.STUNFISK, 5, false, false, false, "Trap Pokémon", Type.GROUND, Type.ELECTRIC, 0.7, 11, Abilities.STATIC, Abilities.LIMBER, Abilities.SAND_VEIL, 471, 109, 66, 84, 81, 99, 32, 75, 70, 165, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MIENFOO, 5, false, false, false, "Martial Arts Pokémon", Type.FIGHTING, null, 0.9, 20, Abilities.INNER_FOCUS, Abilities.REGENERATOR, Abilities.RECKLESS, 350, 45, 85, 50, 55, 50, 65, 180, 50, 70, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.MIENSHAO, 5, false, false, false, "Martial Arts Pokémon", Type.FIGHTING, null, 1.4, 35.5, Abilities.INNER_FOCUS, Abilities.REGENERATOR, Abilities.RECKLESS, 510, 65, 125, 60, 95, 60, 105, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.DRUDDIGON, 5, false, false, false, "Cave Pokémon", Type.DRAGON, null, 1.6, 139, Abilities.ROUGH_SKIN, Abilities.SHEER_FORCE, Abilities.MOLD_BREAKER, 485, 77, 120, 90, 60, 90, 48, 45, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GOLETT, 5, false, false, false, "Automaton Pokémon", Type.GROUND, Type.GHOST, 1, 92, Abilities.IRON_FIST, Abilities.KLUTZ, Abilities.NO_GUARD, 303, 59, 74, 50, 35, 50, 35, 190, 50, 61, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.GOLURK, 5, false, false, false, "Automaton Pokémon", Type.GROUND, Type.GHOST, 2.8, 330, Abilities.IRON_FIST, Abilities.KLUTZ, Abilities.NO_GUARD, 483, 89, 124, 80, 55, 80, 55, 90, 50, 169, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.PAWNIARD, 5, false, false, false, "Sharp Blade Pokémon", Type.DARK, Type.STEEL, 0.5, 10.2, Abilities.DEFIANT, Abilities.INNER_FOCUS, Abilities.PRESSURE, 340, 45, 85, 70, 40, 40, 60, 120, 35, 68, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BISHARP, 5, false, false, false, "Sword Blade Pokémon", Type.DARK, Type.STEEL, 1.6, 70, Abilities.DEFIANT, Abilities.INNER_FOCUS, Abilities.PRESSURE, 490, 65, 125, 100, 60, 70, 70, 45, 35, 172, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BOUFFALANT, 5, false, false, false, "Bash Buffalo Pokémon", Type.NORMAL, null, 1.6, 94.6, Abilities.RECKLESS, Abilities.SAP_SIPPER, Abilities.SOUNDPROOF, 490, 95, 110, 95, 40, 95, 55, 45, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.RUFFLET, 5, false, false, false, "Eaglet Pokémon", Type.NORMAL, Type.FLYING, 0.5, 10.5, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.HUSTLE, 350, 70, 83, 50, 37, 50, 60, 190, 50, 70, GrowthRate.SLOW, 100, false), - new PokemonSpecies(Species.BRAVIARY, 5, false, false, false, "Valiant Pokémon", Type.NORMAL, Type.FLYING, 1.5, 41, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.DEFIANT, 510, 100, 123, 75, 57, 75, 80, 60, 50, 179, GrowthRate.SLOW, 100, false), - new PokemonSpecies(Species.VULLABY, 5, false, false, false, "Diapered Pokémon", Type.DARK, Type.FLYING, 0.5, 9, Abilities.BIG_PECKS, Abilities.OVERCOAT, Abilities.WEAK_ARMOR, 370, 70, 55, 75, 45, 65, 60, 190, 35, 74, GrowthRate.SLOW, 0, false), - new PokemonSpecies(Species.MANDIBUZZ, 5, false, false, false, "Bone Vulture Pokémon", Type.DARK, Type.FLYING, 1.2, 39.5, Abilities.BIG_PECKS, Abilities.OVERCOAT, Abilities.WEAK_ARMOR, 510, 110, 65, 105, 55, 95, 80, 60, 35, 179, GrowthRate.SLOW, 0, false), - new PokemonSpecies(Species.HEATMOR, 5, false, false, false, "Anteater Pokémon", Type.FIRE, null, 1.4, 58, Abilities.GLUTTONY, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, 484, 85, 97, 66, 105, 66, 65, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DURANT, 5, false, false, false, "Iron Ant Pokémon", Type.BUG, Type.STEEL, 0.3, 33, Abilities.SWARM, Abilities.HUSTLE, Abilities.TRUANT, 484, 58, 109, 112, 48, 48, 109, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DEINO, 5, false, false, false, "Irate Pokémon", Type.DARK, Type.DRAGON, 0.8, 17.3, Abilities.HUSTLE, Abilities.NONE, Abilities.NONE, 300, 52, 65, 50, 45, 50, 38, 45, 35, 60, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.ZWEILOUS, 5, false, false, false, "Hostile Pokémon", Type.DARK, Type.DRAGON, 1.4, 50, Abilities.HUSTLE, Abilities.NONE, Abilities.NONE, 420, 72, 85, 70, 65, 70, 58, 45, 35, 147, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.HYDREIGON, 5, false, false, false, "Brutal Pokémon", Type.DARK, Type.DRAGON, 1.8, 160, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 92, 105, 90, 125, 90, 98, 45, 35, 300, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.LARVESTA, 5, false, false, false, "Torch Pokémon", Type.BUG, Type.FIRE, 1.1, 28.8, Abilities.FLAME_BODY, Abilities.NONE, Abilities.SWARM, 360, 55, 85, 55, 50, 55, 60, 45, 50, 72, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.VOLCARONA, 5, false, false, false, "Sun Pokémon", Type.BUG, Type.FIRE, 1.6, 46, Abilities.FLAME_BODY, Abilities.NONE, Abilities.SWARM, 550, 85, 60, 65, 135, 105, 100, 15, 50, 275, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.COBALION, 5, true, false, false, "Iron Will Pokémon", Type.STEEL, Type.FIGHTING, 2.1, 250, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 90, 129, 90, 72, 108, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.TERRAKION, 5, true, false, false, "Cavern Pokémon", Type.ROCK, Type.FIGHTING, 1.9, 260, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 129, 90, 72, 90, 108, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.VIRIZION, 5, true, false, false, "Grassland Pokémon", Type.GRASS, Type.FIGHTING, 2, 200, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 90, 72, 90, 129, 108, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.TORNADUS, 5, true, false, false, "Cyclone Pokémon", Type.FLYING, null, 1.5, 63, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, GrowthRate.SLOW, 100, false, true, - new PokemonForm("Incarnate Forme", "incarnate", Type.FLYING, null, 1.5, 63, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, false, null, true), - new PokemonForm("Therian Forme", "therian", Type.FLYING, null, 1.4, 63, Abilities.REGENERATOR, Abilities.NONE, Abilities.REGENERATOR, 580, 79, 100, 80, 110, 90, 121, 3, 90, 290), - ), - new PokemonSpecies(Species.THUNDURUS, 5, true, false, false, "Bolt Strike Pokémon", Type.ELECTRIC, Type.FLYING, 1.5, 61, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, GrowthRate.SLOW, 100, false, true, - new PokemonForm("Incarnate Forme", "incarnate", Type.ELECTRIC, Type.FLYING, 1.5, 61, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, false, null, true), - new PokemonForm("Therian Forme", "therian", Type.ELECTRIC, Type.FLYING, 3, 61, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.VOLT_ABSORB, 580, 79, 105, 70, 145, 80, 101, 3, 90, 290), - ), - new PokemonSpecies(Species.RESHIRAM, 5, false, true, false, "Vast White Pokémon", Type.DRAGON, Type.FIRE, 3.2, 330, Abilities.TURBOBLAZE, Abilities.NONE, Abilities.NONE, 680, 100, 120, 100, 150, 120, 90, 3, 0, 340, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.ZEKROM, 5, false, true, false, "Deep Black Pokémon", Type.DRAGON, Type.ELECTRIC, 2.9, 345, Abilities.TERAVOLT, Abilities.NONE, Abilities.NONE, 680, 100, 150, 120, 120, 100, 90, 3, 0, 340, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.LANDORUS, 5, true, false, false, "Abundance Pokémon", Type.GROUND, Type.FLYING, 1.5, 68, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SHEER_FORCE, 600, 89, 125, 90, 115, 80, 101, 3, 90, 300, GrowthRate.SLOW, 100, false, true, - new PokemonForm("Incarnate Forme", "incarnate", Type.GROUND, Type.FLYING, 1.5, 68, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SHEER_FORCE, 600, 89, 125, 90, 115, 80, 101, 3, 90, 300, false, null, true), - new PokemonForm("Therian Forme", "therian", Type.GROUND, Type.FLYING, 1.3, 68, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 89, 145, 90, 105, 80, 91, 3, 90, 300), - ), - new PokemonSpecies(Species.KYUREM, 5, false, true, false, "Boundary Pokémon", Type.DRAGON, Type.ICE, 3, 325, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 660, 125, 130, 90, 130, 90, 95, 3, 0, 330, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.DRAGON, Type.ICE, 3, 325, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 660, 125, 130, 90, 130, 90, 95, 3, 0, 330, false, null, true), - new PokemonForm("Black", "black", Type.DRAGON, Type.ICE, 3.3, 325, Abilities.TERAVOLT, Abilities.NONE, Abilities.NONE, 700, 125, 170, 100, 120, 90, 95, 3, 0, 330), - new PokemonForm("White", "white", Type.DRAGON, Type.ICE, 3.6, 325, Abilities.TURBOBLAZE, Abilities.NONE, Abilities.NONE, 700, 125, 120, 90, 170, 100, 95, 3, 0, 330), - ), - new PokemonSpecies(Species.KELDEO, 5, false, false, true, "Colt Pokémon", Type.WATER, Type.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290, GrowthRate.SLOW, null, false, true, - new PokemonForm("Ordinary Form", "ordinary", Type.WATER, Type.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290, false, null, true), - new PokemonForm("Resolute", "resolute", Type.WATER, Type.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290), - ), - new PokemonSpecies(Species.MELOETTA, 5, false, false, true, "Melody Pokémon", Type.NORMAL, Type.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 270, GrowthRate.SLOW, null, false, true, - new PokemonForm("Aria Forme", "aria", Type.NORMAL, Type.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 270, false, null, true), - new PokemonForm("Pirouette Forme", "pirouette", Type.NORMAL, Type.FIGHTING, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 128, 90, 77, 77, 128, 3, 100, 270, false, null, true), - ), - new PokemonSpecies(Species.GENESECT, 5, false, false, true, "Paleozoic Pokémon", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, false, null, true), - new PokemonForm("Shock Drive", "shock", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300), - new PokemonForm("Burn Drive", "burn", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300), - new PokemonForm("Chill Drive", "chill", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300), - new PokemonForm("Douse Drive", "douse", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300), - ), - new PokemonSpecies(Species.CHESPIN, 6, false, false, false, "Spiny Nut Pokémon", Type.GRASS, null, 0.4, 9, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 313, 56, 61, 65, 48, 45, 38, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.QUILLADIN, 6, false, false, false, "Spiny Armor Pokémon", Type.GRASS, null, 0.7, 29, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 405, 61, 78, 95, 56, 58, 57, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.CHESNAUGHT, 6, false, false, false, "Spiny Armor Pokémon", Type.GRASS, Type.FIGHTING, 1.6, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 530, 88, 107, 122, 74, 75, 64, 45, 70, 239, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.FENNEKIN, 6, false, false, false, "Fox Pokémon", Type.FIRE, null, 0.4, 9.4, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 307, 40, 45, 40, 62, 60, 60, 45, 70, 61, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.BRAIXEN, 6, false, false, false, "Fox Pokémon", Type.FIRE, null, 1, 14.5, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 409, 59, 59, 58, 90, 70, 73, 45, 70, 143, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.DELPHOX, 6, false, false, false, "Fox Pokémon", Type.FIRE, Type.PSYCHIC, 1.5, 39, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 534, 75, 69, 72, 114, 100, 104, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.FROAKIE, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false, false, - new PokemonForm("Normal", "", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, null, true), - new PokemonForm("Battle Bond", "battle-bond", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, "", true), - ), - new PokemonSpecies(Species.FROGADIER, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false, false, - new PokemonForm("Normal", "", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, null, true), - new PokemonForm("Battle Bond", "battle-bond", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, "", true), - ), - new PokemonSpecies(Species.GRENINJA, 6, false, false, false, "Ninja Pokémon", Type.WATER, Type.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239, GrowthRate.MEDIUM_SLOW, 87.5, false, false, - new PokemonForm("Normal", "", Type.WATER, Type.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239, false, null, true), - new PokemonForm("Battle Bond", "battle-bond", Type.WATER, Type.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239, false, "", true), - new PokemonForm("Ash", "ash", Type.WATER, Type.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 640, 72, 145, 67, 153, 71, 132, 45, 70, 239), - ), - new PokemonSpecies(Species.BUNNELBY, 6, false, false, false, "Digging Pokémon", Type.NORMAL, null, 0.4, 5, Abilities.PICKUP, Abilities.CHEEK_POUCH, Abilities.HUGE_POWER, 237, 38, 36, 38, 32, 36, 57, 255, 50, 47, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DIGGERSBY, 6, false, false, false, "Digging Pokémon", Type.NORMAL, Type.GROUND, 1, 42.4, Abilities.PICKUP, Abilities.CHEEK_POUCH, Abilities.HUGE_POWER, 423, 85, 56, 77, 50, 77, 78, 127, 50, 148, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FLETCHLING, 6, false, false, false, "Tiny Robin Pokémon", Type.NORMAL, Type.FLYING, 0.3, 1.7, Abilities.BIG_PECKS, Abilities.NONE, Abilities.GALE_WINGS, 278, 45, 50, 43, 40, 38, 62, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.FLETCHINDER, 6, false, false, false, "Ember Pokémon", Type.FIRE, Type.FLYING, 0.7, 16, Abilities.FLAME_BODY, Abilities.NONE, Abilities.GALE_WINGS, 382, 62, 73, 55, 56, 52, 84, 120, 50, 134, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.TALONFLAME, 6, false, false, false, "Scorching Pokémon", Type.FIRE, Type.FLYING, 1.2, 24.5, Abilities.FLAME_BODY, Abilities.NONE, Abilities.GALE_WINGS, 499, 78, 81, 71, 74, 69, 126, 45, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SCATTERBUG, 6, false, false, false, "Scatterdust Pokémon", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Meadow Pattern", "meadow", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Icy Snow Pattern", "icy-snow", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Polar Pattern", "polar", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Tundra Pattern", "tundra", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Continental Pattern", "continental", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Garden Pattern", "garden", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Elegant Pattern", "elegant", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Modern Pattern", "modern", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Marine Pattern", "marine", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Archipelago Pattern", "archipelago", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("High Plains Pattern", "high-plains", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Sandstorm Pattern", "sandstorm", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("River Pattern", "river", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Monsoon Pattern", "monsoon", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Savanna Pattern", "savanna", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Sun Pattern", "sun", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Ocean Pattern", "ocean", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Jungle Pattern", "jungle", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Fancy Pattern", "fancy", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - new PokemonForm("Poké Ball Pattern", "poke-ball", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), - ), - new PokemonSpecies(Species.SPEWPA, 6, false, false, false, "Scatterdust Pokémon", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.SHED_SKIN, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Meadow Pattern", "meadow", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Icy Snow Pattern", "icy-snow", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Polar Pattern", "polar", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Tundra Pattern", "tundra", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Continental Pattern", "continental", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Garden Pattern", "garden", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Elegant Pattern", "elegant", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Modern Pattern", "modern", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Marine Pattern", "marine", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Archipelago Pattern", "archipelago", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("High Plains Pattern", "high-plains", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Sandstorm Pattern", "sandstorm", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("River Pattern", "river", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Monsoon Pattern", "monsoon", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Savanna Pattern", "savanna", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Sun Pattern", "sun", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Ocean Pattern", "ocean", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Jungle Pattern", "jungle", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Fancy Pattern", "fancy", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - new PokemonForm("Poké Ball Pattern", "poke-ball", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), - ), - new PokemonSpecies(Species.VIVILLON, 6, false, false, false, "Scale Pokémon", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Meadow Pattern", "meadow", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Icy Snow Pattern", "icy-snow", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Polar Pattern", "polar", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Tundra Pattern", "tundra", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Continental Pattern", "continental", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Garden Pattern", "garden", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Elegant Pattern", "elegant", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Modern Pattern", "modern", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Marine Pattern", "marine", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Archipelago Pattern", "archipelago", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("High Plains Pattern", "high-plains", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Sandstorm Pattern", "sandstorm", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("River Pattern", "river", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Monsoon Pattern", "monsoon", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Savanna Pattern", "savanna", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Sun Pattern", "sun", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Ocean Pattern", "ocean", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Jungle Pattern", "jungle", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Fancy Pattern", "fancy", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - new PokemonForm("Poké Ball Pattern", "poke-ball", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 185, false, null, true), - ), - new PokemonSpecies(Species.LITLEO, 6, false, false, false, "Lion Cub Pokémon", Type.FIRE, Type.NORMAL, 0.6, 13.5, Abilities.RIVALRY, Abilities.UNNERVE, Abilities.MOXIE, 369, 62, 50, 58, 73, 54, 72, 220, 70, 74, GrowthRate.MEDIUM_SLOW, 12.5, false), - new PokemonSpecies(Species.PYROAR, 6, false, false, false, "Royal Pokémon", Type.FIRE, Type.NORMAL, 1.5, 81.5, Abilities.RIVALRY, Abilities.UNNERVE, Abilities.MOXIE, 507, 86, 68, 72, 109, 66, 106, 65, 70, 177, GrowthRate.MEDIUM_SLOW, 12.5, true), - new PokemonSpecies(Species.FLABEBE, 6, false, false, false, "Single Bloom Pokémon", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, GrowthRate.MEDIUM_FAST, 0, false, false, - new PokemonForm("Red Flower", "red", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true), - new PokemonForm("Yellow Flower", "yellow", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true), - new PokemonForm("Orange Flower", "orange", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true), - new PokemonForm("Blue Flower", "blue", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true), - new PokemonForm("White Flower", "white", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true), - ), - new PokemonSpecies(Species.FLOETTE, 6, false, false, false, "Single Bloom Pokémon", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, GrowthRate.MEDIUM_FAST, 0, false, false, - new PokemonForm("Red Flower", "red", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true), - new PokemonForm("Yellow Flower", "yellow", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true), - new PokemonForm("Orange Flower", "orange", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true), - new PokemonForm("Blue Flower", "blue", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true), - new PokemonForm("White Flower", "white", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true), - ), - new PokemonSpecies(Species.FLORGES, 6, false, false, false, "Garden Pokémon", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248, GrowthRate.MEDIUM_FAST, 0, false, false, - new PokemonForm("Red Flower", "red", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248, false, null, true), - new PokemonForm("Yellow Flower", "yellow", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248, false, null, true), - new PokemonForm("Orange Flower", "orange", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248, false, null, true), - new PokemonForm("Blue Flower", "blue", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248, false, null, true), - new PokemonForm("White Flower", "white", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248, false, null, true), - ), - new PokemonSpecies(Species.SKIDDO, 6, false, false, false, "Mount Pokémon", Type.GRASS, null, 0.9, 31, Abilities.SAP_SIPPER, Abilities.NONE, Abilities.GRASS_PELT, 350, 66, 65, 48, 62, 57, 52, 200, 70, 70, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GOGOAT, 6, false, false, false, "Mount Pokémon", Type.GRASS, null, 1.7, 91, Abilities.SAP_SIPPER, Abilities.NONE, Abilities.GRASS_PELT, 531, 123, 100, 62, 97, 81, 68, 45, 70, 186, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PANCHAM, 6, false, false, false, "Playful Pokémon", Type.FIGHTING, null, 0.6, 8, Abilities.IRON_FIST, Abilities.MOLD_BREAKER, Abilities.SCRAPPY, 348, 67, 82, 62, 46, 48, 43, 220, 50, 70, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PANGORO, 6, false, false, false, "Daunting Pokémon", Type.FIGHTING, Type.DARK, 2.1, 136, Abilities.IRON_FIST, Abilities.MOLD_BREAKER, Abilities.SCRAPPY, 495, 95, 124, 78, 69, 71, 58, 65, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FURFROU, 6, false, false, false, "Poodle Pokémon", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Natural Form", "", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), - new PokemonForm("Heart Trim", "heart", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), - new PokemonForm("Star Trim", "star", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), - new PokemonForm("Diamond Trim", "diamond", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), - new PokemonForm("Debutante Trim", "debutante", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), - new PokemonForm("Matron Trim", "matron", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), - new PokemonForm("Dandy Trim", "dandy", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), - new PokemonForm("La Reine Trim", "la-reine", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), - new PokemonForm("Kabuki Trim", "kabuki", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), - new PokemonForm("Pharaoh Trim", "pharaoh", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), - ), - new PokemonSpecies(Species.ESPURR, 6, false, false, false, "Restraint Pokémon", Type.PSYCHIC, null, 0.3, 3.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.OWN_TEMPO, 355, 62, 48, 54, 63, 60, 68, 190, 50, 71, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MEOWSTIC, 6, false, false, false, "Constraint Pokémon", Type.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.PRANKSTER, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Male", "male", Type.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.PRANKSTER, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, false, "", true), - new PokemonForm("Female", "female", Type.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.COMPETITIVE, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, false, null, true), - ), - new PokemonSpecies(Species.HONEDGE, 6, false, false, false, "Sword Pokémon", Type.STEEL, Type.GHOST, 0.8, 2, Abilities.NO_GUARD, Abilities.NONE, Abilities.NONE, 325, 45, 80, 100, 35, 37, 28, 180, 50, 65, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DOUBLADE, 6, false, false, false, "Sword Pokémon", Type.STEEL, Type.GHOST, 0.8, 4.5, Abilities.NO_GUARD, Abilities.NONE, Abilities.NONE, 448, 59, 110, 150, 45, 49, 35, 90, 50, 157, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.AEGISLASH, 6, false, false, false, "Royal Sword Pokémon", Type.STEEL, Type.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 50, 140, 50, 140, 60, 45, 50, 250, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Shield Forme", "shield", Type.STEEL, Type.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 50, 140, 50, 140, 60, 45, 50, 250, false, "", true), - new PokemonForm("Blade Forme", "blade", Type.STEEL, Type.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 140, 50, 140, 50, 60, 45, 50, 250), - ), - new PokemonSpecies(Species.SPRITZEE, 6, false, false, false, "Perfume Pokémon", Type.FAIRY, null, 0.2, 0.5, Abilities.HEALER, Abilities.NONE, Abilities.AROMA_VEIL, 341, 78, 52, 60, 63, 65, 23, 200, 50, 68, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.AROMATISSE, 6, false, false, false, "Fragrance Pokémon", Type.FAIRY, null, 0.8, 15.5, Abilities.HEALER, Abilities.NONE, Abilities.AROMA_VEIL, 462, 101, 72, 72, 99, 89, 29, 140, 50, 162, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SWIRLIX, 6, false, false, false, "Cotton Candy Pokémon", Type.FAIRY, null, 0.4, 3.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.UNBURDEN, 341, 62, 48, 66, 59, 57, 49, 200, 50, 68, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SLURPUFF, 6, false, false, false, "Meringue Pokémon", Type.FAIRY, null, 0.8, 5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.UNBURDEN, 480, 82, 80, 86, 85, 75, 72, 140, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.INKAY, 6, false, false, false, "Revolving Pokémon", Type.DARK, Type.PSYCHIC, 0.4, 3.5, Abilities.CONTRARY, Abilities.SUCTION_CUPS, Abilities.INFILTRATOR, 288, 53, 54, 53, 37, 46, 45, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MALAMAR, 6, false, false, false, "Overturning Pokémon", Type.DARK, Type.PSYCHIC, 1.5, 47, Abilities.CONTRARY, Abilities.SUCTION_CUPS, Abilities.INFILTRATOR, 482, 86, 92, 88, 68, 75, 73, 80, 50, 169, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BINACLE, 6, false, false, false, "Two-Handed Pokémon", Type.ROCK, Type.WATER, 0.5, 31, Abilities.TOUGH_CLAWS, Abilities.SNIPER, Abilities.PICKPOCKET, 306, 42, 52, 67, 39, 56, 50, 120, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BARBARACLE, 6, false, false, false, "Collective Pokémon", Type.ROCK, Type.WATER, 1.3, 96, Abilities.TOUGH_CLAWS, Abilities.SNIPER, Abilities.PICKPOCKET, 500, 72, 105, 115, 54, 86, 68, 45, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SKRELP, 6, false, false, false, "Mock Kelp Pokémon", Type.POISON, Type.WATER, 0.5, 7.3, Abilities.POISON_POINT, Abilities.POISON_TOUCH, Abilities.ADAPTABILITY, 320, 50, 60, 60, 60, 60, 30, 225, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DRAGALGE, 6, false, false, false, "Mock Kelp Pokémon", Type.POISON, Type.DRAGON, 1.8, 81.5, Abilities.POISON_POINT, Abilities.POISON_TOUCH, Abilities.ADAPTABILITY, 494, 65, 75, 90, 97, 123, 44, 55, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CLAUNCHER, 6, false, false, false, "Water Gun Pokémon", Type.WATER, null, 0.5, 8.3, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.NONE, 330, 50, 53, 62, 58, 63, 44, 225, 50, 66, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.CLAWITZER, 6, false, false, false, "Howitzer Pokémon", Type.WATER, null, 1.3, 35.3, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.NONE, 500, 71, 73, 88, 120, 89, 59, 55, 50, 100, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.HELIOPTILE, 6, false, false, false, "Generator Pokémon", Type.ELECTRIC, Type.NORMAL, 0.5, 6, Abilities.DRY_SKIN, Abilities.SAND_VEIL, Abilities.SOLAR_POWER, 289, 44, 38, 33, 61, 43, 70, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.HELIOLISK, 6, false, false, false, "Generator Pokémon", Type.ELECTRIC, Type.NORMAL, 1, 21, Abilities.DRY_SKIN, Abilities.SAND_VEIL, Abilities.SOLAR_POWER, 481, 62, 55, 52, 109, 94, 109, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.TYRUNT, 6, false, false, false, "Royal Heir Pokémon", Type.ROCK, Type.DRAGON, 0.8, 26, Abilities.STRONG_JAW, Abilities.NONE, Abilities.STURDY, 362, 58, 89, 77, 45, 45, 48, 45, 50, 72, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.TYRANTRUM, 6, false, false, false, "Despot Pokémon", Type.ROCK, Type.DRAGON, 2.5, 270, Abilities.STRONG_JAW, Abilities.NONE, Abilities.ROCK_HEAD, 521, 82, 121, 119, 69, 59, 71, 45, 50, 182, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.AMAURA, 6, false, false, false, "Tundra Pokémon", Type.ROCK, Type.ICE, 1.3, 25.2, Abilities.REFRIGERATE, Abilities.NONE, Abilities.SNOW_WARNING, 362, 77, 59, 50, 67, 63, 46, 45, 50, 72, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.AURORUS, 6, false, false, false, "Tundra Pokémon", Type.ROCK, Type.ICE, 2.7, 225, Abilities.REFRIGERATE, Abilities.NONE, Abilities.SNOW_WARNING, 521, 123, 77, 72, 99, 92, 58, 45, 50, 104, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.SYLVEON, 6, false, false, false, "Intertwining Pokémon", Type.FAIRY, null, 1, 23.5, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.PIXILATE, 525, 95, 65, 65, 110, 130, 60, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.HAWLUCHA, 6, false, false, false, "Wrestling Pokémon", Type.FIGHTING, Type.FLYING, 0.8, 21.5, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.MOLD_BREAKER, 500, 78, 92, 75, 74, 63, 118, 100, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DEDENNE, 6, false, false, false, "Antenna Pokémon", Type.ELECTRIC, Type.FAIRY, 0.2, 2.2, Abilities.CHEEK_POUCH, Abilities.PICKUP, Abilities.PLUS, 431, 67, 58, 57, 81, 67, 101, 180, 50, 151, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CARBINK, 6, false, false, false, "Jewel Pokémon", Type.ROCK, Type.FAIRY, 0.3, 5.7, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.STURDY, 500, 50, 50, 150, 50, 150, 50, 60, 50, 100, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.GOOMY, 6, false, false, false, "Soft Tissue Pokémon", Type.DRAGON, null, 0.3, 2.8, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 300, 45, 50, 35, 55, 75, 40, 45, 35, 60, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.SLIGGOO, 6, false, false, false, "Soft Tissue Pokémon", Type.DRAGON, null, 0.8, 17.5, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 452, 68, 75, 53, 83, 113, 60, 45, 35, 158, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.GOODRA, 6, false, false, false, "Dragon Pokémon", Type.DRAGON, null, 2, 150.5, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 600, 90, 100, 70, 110, 150, 80, 45, 35, 300, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.KLEFKI, 6, false, false, false, "Key Ring Pokémon", Type.STEEL, Type.FAIRY, 0.2, 3, Abilities.PRANKSTER, Abilities.NONE, Abilities.MAGICIAN, 470, 57, 80, 91, 80, 87, 75, 75, 50, 165, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.PHANTUMP, 6, false, false, false, "Stump Pokémon", Type.GHOST, Type.GRASS, 0.4, 7, Abilities.NATURAL_CURE, Abilities.FRISK, Abilities.HARVEST, 309, 43, 70, 48, 50, 60, 38, 120, 50, 62, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.TREVENANT, 6, false, false, false, "Elder Tree Pokémon", Type.GHOST, Type.GRASS, 1.5, 71, Abilities.NATURAL_CURE, Abilities.FRISK, Abilities.HARVEST, 474, 85, 110, 76, 65, 82, 56, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PUMPKABOO, 6, false, false, false, "Pumpkin Pokémon", Type.GHOST, Type.GRASS, 0.4, 5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 49, 66, 70, 44, 55, 51, 120, 50, 67, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Average Size", "", Type.GHOST, Type.GRASS, 0.4, 5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 49, 66, 70, 44, 55, 51, 120, 50, 67, false, null, true), - new PokemonForm("Small Size", "small", Type.GHOST, Type.GRASS, 0.3, 3.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 44, 66, 70, 44, 55, 56, 120, 50, 67, false, "", true), - new PokemonForm("Large Size", "large", Type.GHOST, Type.GRASS, 0.5, 7.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 54, 66, 70, 44, 55, 46, 120, 50, 67, false, "", true), - new PokemonForm("Super Size", "super", Type.GHOST, Type.GRASS, 0.8, 15, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 59, 66, 70, 44, 55, 41, 120, 50, 67, false, "", true), - ), - new PokemonSpecies(Species.GOURGEIST, 6, false, false, false, "Pumpkin Pokémon", Type.GHOST, Type.GRASS, 0.9, 12.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 65, 90, 122, 58, 75, 84, 60, 50, 173, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Average Size", "", Type.GHOST, Type.GRASS, 0.9, 12.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 65, 90, 122, 58, 75, 84, 60, 50, 173, false, null, true), - new PokemonForm("Small Size", "small", Type.GHOST, Type.GRASS, 0.7, 9.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 55, 85, 122, 58, 75, 99, 60, 50, 173, false, "", true), - new PokemonForm("Large Size", "large", Type.GHOST, Type.GRASS, 1.1, 14, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 75, 95, 122, 58, 75, 69, 60, 50, 173, false, "", true), - new PokemonForm("Super Size", "super", Type.GHOST, Type.GRASS, 1.7, 39, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 85, 100, 122, 58, 75, 54, 60, 50, 173, false, "", true), - ), - new PokemonSpecies(Species.BERGMITE, 6, false, false, false, "Ice Chunk Pokémon", Type.ICE, null, 1, 99.5, Abilities.OWN_TEMPO, Abilities.ICE_BODY, Abilities.STURDY, 304, 55, 69, 85, 32, 35, 28, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.AVALUGG, 6, false, false, false, "Iceberg Pokémon", Type.ICE, null, 2, 505, Abilities.OWN_TEMPO, Abilities.ICE_BODY, Abilities.STURDY, 514, 95, 117, 184, 44, 46, 28, 55, 50, 180, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.NOIBAT, 6, false, false, false, "Sound Wave Pokémon", Type.FLYING, Type.DRAGON, 0.5, 8, Abilities.FRISK, Abilities.INFILTRATOR, Abilities.TELEPATHY, 245, 40, 30, 35, 45, 40, 55, 190, 50, 49, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.NOIVERN, 6, false, false, false, "Sound Wave Pokémon", Type.FLYING, Type.DRAGON, 1.5, 85, Abilities.FRISK, Abilities.INFILTRATOR, Abilities.TELEPATHY, 535, 85, 70, 80, 97, 80, 123, 45, 50, 187, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.XERNEAS, 6, false, true, false, "Life Pokémon", Type.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, GrowthRate.SLOW, null, false, true, - new PokemonForm("Neutral Mode", "neutral", Type.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, false, null, true), - new PokemonForm("Active Mode", "active", Type.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340) - ), - new PokemonSpecies(Species.YVELTAL, 6, false, true, false, "Destruction Pokémon", Type.DARK, Type.FLYING, 5.8, 203, Abilities.DARK_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.ZYGARDE, 6, false, true, false, "Order Pokémon", Type.DRAGON, Type.GROUND, 5, 305, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, GrowthRate.SLOW, null, false, false, - new PokemonForm("50% Forme", "50", Type.DRAGON, Type.GROUND, 5, 305, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, false, "", true), - new PokemonForm("10% Forme", "10", Type.DRAGON, Type.GROUND, 1.2, 33.5, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 486, 54, 100, 71, 61, 85, 115, 3, 0, 300, false, null, true), - new PokemonForm("50% Forme Power Construct", "50-pc", Type.DRAGON, Type.GROUND, 5, 305, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, false, "", true), - new PokemonForm("10% Forme Power Construct", "10-pc", Type.DRAGON, Type.GROUND, 1.2, 33.5, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 486, 54, 100, 71, 61, 85, 115, 3, 0, 300, false, "10", true), - new PokemonForm("Complete Forme (50% PC)", "complete", Type.DRAGON, Type.GROUND, 4.5, 610, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 708, 216, 100, 121, 91, 95, 85, 3, 0, 300), - new PokemonForm("Complete Forme (10% PC)", "10-complete", Type.DRAGON, Type.GROUND, 4.5, 610, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 708, 216, 100, 121, 91, 95, 85, 3, 0, 300, false, "complete"), - ), - new PokemonSpecies(Species.DIANCIE, 6, false, false, true, "Jewel Pokémon", Type.ROCK, Type.FAIRY, 0.7, 8.8, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.NONE, 600, 50, 100, 150, 100, 150, 50, 3, 50, 300, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.ROCK, Type.FAIRY, 0.7, 8.8, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.NONE, 600, 50, 100, 150, 100, 150, 50, 3, 50, 300, false, null, true), - new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ROCK, Type.FAIRY, 1.1, 27.8, Abilities.MAGIC_BOUNCE, Abilities.NONE, Abilities.NONE, 700, 50, 160, 110, 160, 110, 110, 3, 50, 300), - ), - new PokemonSpecies(Species.HOOPA, 6, false, false, true, "Mischief Pokémon", Type.PSYCHIC, Type.GHOST, 0.5, 9, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 600, 80, 110, 60, 150, 130, 70, 3, 100, 270, GrowthRate.SLOW, null, false, false, - new PokemonForm("Hoopa Confined", "", Type.PSYCHIC, Type.GHOST, 0.5, 9, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 600, 80, 110, 60, 150, 130, 70, 3, 100, 270, false, null, true), - new PokemonForm("Hoopa Unbound", "unbound", Type.PSYCHIC, Type.DARK, 6.5, 490, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 680, 80, 160, 60, 170, 130, 80, 3, 100, 270), - ), - new PokemonSpecies(Species.VOLCANION, 6, false, false, true, "Steam Pokémon", Type.FIRE, Type.WATER, 1.7, 195, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.NONE, 600, 80, 110, 120, 130, 90, 70, 3, 100, 300, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.ROWLET, 7, false, false, false, "Grass Quill Pokémon", Type.GRASS, Type.FLYING, 0.3, 1.5, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 320, 68, 55, 55, 50, 50, 42, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.DARTRIX, 7, false, false, false, "Blade Quill Pokémon", Type.GRASS, Type.FLYING, 0.7, 16, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 420, 78, 75, 75, 70, 70, 52, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.DECIDUEYE, 7, false, false, false, "Arrow Quill Pokémon", Type.GRASS, Type.GHOST, 1.6, 36.6, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 530, 78, 107, 75, 100, 100, 70, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.LITTEN, 7, false, false, false, "Fire Cat Pokémon", Type.FIRE, null, 0.4, 4.3, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 320, 45, 65, 40, 60, 40, 70, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.TORRACAT, 7, false, false, false, "Fire Cat Pokémon", Type.FIRE, null, 0.7, 25, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 420, 65, 85, 50, 80, 50, 90, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.INCINEROAR, 7, false, false, false, "Heel Pokémon", Type.FIRE, Type.DARK, 1.8, 83, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 530, 95, 115, 90, 80, 90, 60, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.POPPLIO, 7, false, false, false, "Sea Lion Pokémon", Type.WATER, null, 0.4, 7.5, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 320, 50, 54, 54, 66, 56, 40, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.BRIONNE, 7, false, false, false, "Pop Star Pokémon", Type.WATER, null, 0.6, 17.5, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 420, 60, 69, 69, 91, 81, 50, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.PRIMARINA, 7, false, false, false, "Soloist Pokémon", Type.WATER, Type.FAIRY, 1.8, 44, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 530, 80, 74, 74, 126, 116, 60, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.PIKIPEK, 7, false, false, false, "Woodpecker Pokémon", Type.NORMAL, Type.FLYING, 0.3, 1.2, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.PICKUP, 265, 35, 75, 30, 30, 30, 65, 255, 70, 53, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.TRUMBEAK, 7, false, false, false, "Bugle Beak Pokémon", Type.NORMAL, Type.FLYING, 0.6, 14.8, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.PICKUP, 355, 55, 85, 50, 40, 50, 75, 120, 70, 124, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.TOUCANNON, 7, false, false, false, "Cannon Pokémon", Type.NORMAL, Type.FLYING, 1.1, 26, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.SHEER_FORCE, 485, 80, 120, 75, 75, 75, 60, 45, 70, 218, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.YUNGOOS, 7, false, false, false, "Loitering Pokémon", Type.NORMAL, null, 0.4, 6, Abilities.STAKEOUT, Abilities.STRONG_JAW, Abilities.ADAPTABILITY, 253, 48, 70, 30, 30, 30, 45, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GUMSHOOS, 7, false, false, false, "Stakeout Pokémon", Type.NORMAL, null, 0.7, 14.2, Abilities.STAKEOUT, Abilities.STRONG_JAW, Abilities.ADAPTABILITY, 418, 88, 110, 60, 55, 60, 45, 127, 70, 146, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GRUBBIN, 7, false, false, false, "Larva Pokémon", Type.BUG, null, 0.4, 4.4, Abilities.SWARM, Abilities.NONE, Abilities.NONE, 300, 47, 62, 45, 55, 45, 46, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CHARJABUG, 7, false, false, false, "Battery Pokémon", Type.BUG, Type.ELECTRIC, 0.5, 10.5, Abilities.BATTERY, Abilities.NONE, Abilities.NONE, 400, 57, 82, 95, 55, 75, 36, 120, 50, 140, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.VIKAVOLT, 7, false, false, false, "Stag Beetle Pokémon", Type.BUG, Type.ELECTRIC, 1.5, 45, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 500, 77, 70, 90, 145, 75, 43, 45, 50, 250, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CRABRAWLER, 7, false, false, false, "Boxing Pokémon", Type.FIGHTING, null, 0.6, 7, Abilities.HYPER_CUTTER, Abilities.IRON_FIST, Abilities.ANGER_POINT, 338, 47, 82, 57, 42, 47, 63, 225, 70, 68, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CRABOMINABLE, 7, false, false, false, "Woolly Crab Pokémon", Type.FIGHTING, Type.ICE, 1.7, 180, Abilities.HYPER_CUTTER, Abilities.IRON_FIST, Abilities.ANGER_POINT, 478, 97, 132, 77, 62, 67, 43, 60, 70, 167, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ORICORIO, 7, false, false, false, "Dancing Pokémon", Type.FIRE, Type.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, GrowthRate.MEDIUM_FAST, 25, false, false, - new PokemonForm("Baile Style", "baile", Type.FIRE, Type.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, "", true), - new PokemonForm("Pom-Pom Style", "pompom", Type.ELECTRIC, Type.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true), - new PokemonForm("Pau Style", "pau", Type.PSYCHIC, Type.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true), - new PokemonForm("Sensu Style", "sensu", Type.GHOST, Type.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true), - ), - new PokemonSpecies(Species.CUTIEFLY, 7, false, false, false, "Bee Fly Pokémon", Type.BUG, Type.FAIRY, 0.1, 0.2, Abilities.HONEY_GATHER, Abilities.SHIELD_DUST, Abilities.SWEET_VEIL, 304, 40, 45, 40, 55, 40, 84, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.RIBOMBEE, 7, false, false, false, "Bee Fly Pokémon", Type.BUG, Type.FAIRY, 0.2, 0.5, Abilities.HONEY_GATHER, Abilities.SHIELD_DUST, Abilities.SWEET_VEIL, 464, 60, 55, 60, 95, 70, 124, 75, 50, 162, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ROCKRUFF, 7, false, false, false, "Puppy Pokémon", Type.ROCK, null, 0.5, 9.2, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.STEADFAST, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Normal", "", Type.ROCK, null, 0.5, 9.2, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.STEADFAST, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, false, null, true), - new PokemonForm("Own Tempo", "own-tempo", Type.ROCK, null, 0.5, 9.2, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.OWN_TEMPO, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, false, "", true), - ), - new PokemonSpecies(Species.LYCANROC, 7, false, false, false, "Wolf Pokémon", Type.ROCK, null, 0.8, 25, Abilities.KEEN_EYE, Abilities.SAND_RUSH, Abilities.STEADFAST, 487, 75, 115, 65, 55, 65, 112, 90, 50, 170, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Midday Form", "midday", Type.ROCK, null, 0.8, 25, Abilities.KEEN_EYE, Abilities.SAND_RUSH, Abilities.STEADFAST, 487, 75, 115, 65, 55, 65, 112, 90, 50, 170, false, "", true), - new PokemonForm("Midnight Form", "midnight", Type.ROCK, null, 1.1, 25, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.NO_GUARD, 487, 85, 115, 75, 55, 75, 82, 90, 50, 170, false, null, true), - new PokemonForm("Dusk Form", "dusk", Type.ROCK, null, 0.8, 25, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 487, 75, 117, 65, 55, 65, 110, 90, 50, 170, false, null, true), - ), - new PokemonSpecies(Species.WISHIWASHI, 7, false, false, false, "Small Fry Pokémon", Type.WATER, null, 0.2, 0.3, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 175, 45, 20, 20, 25, 25, 40, 60, 50, 61, GrowthRate.FAST, 50, false, false, - new PokemonForm("Solo Form", "", Type.WATER, null, 0.2, 0.3, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 175, 45, 20, 20, 25, 25, 40, 60, 50, 61, false, null, true), - new PokemonForm("School", "school", Type.WATER, null, 8.2, 78.6, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 620, 45, 140, 130, 140, 135, 30, 60, 50, 61), - ), - new PokemonSpecies(Species.MAREANIE, 7, false, false, false, "Brutal Star Pokémon", Type.POISON, Type.WATER, 0.4, 8, Abilities.MERCILESS, Abilities.LIMBER, Abilities.REGENERATOR, 305, 50, 53, 62, 43, 52, 45, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.TOXAPEX, 7, false, false, false, "Brutal Star Pokémon", Type.POISON, Type.WATER, 0.7, 14.5, Abilities.MERCILESS, Abilities.LIMBER, Abilities.REGENERATOR, 495, 50, 63, 152, 53, 142, 35, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MUDBRAY, 7, false, false, false, "Donkey Pokémon", Type.GROUND, null, 1, 110, Abilities.OWN_TEMPO, Abilities.STAMINA, Abilities.INNER_FOCUS, 385, 70, 100, 70, 45, 55, 45, 190, 50, 77, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MUDSDALE, 7, false, false, false, "Draft Horse Pokémon", Type.GROUND, null, 2.5, 920, Abilities.OWN_TEMPO, Abilities.STAMINA, Abilities.INNER_FOCUS, 500, 100, 125, 100, 55, 85, 35, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DEWPIDER, 7, false, false, false, "Water Bubble Pokémon", Type.WATER, Type.BUG, 0.3, 4, Abilities.WATER_BUBBLE, Abilities.NONE, Abilities.WATER_ABSORB, 269, 38, 40, 52, 40, 72, 27, 200, 50, 54, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ARAQUANID, 7, false, false, false, "Water Bubble Pokémon", Type.WATER, Type.BUG, 1.8, 82, Abilities.WATER_BUBBLE, Abilities.NONE, Abilities.WATER_ABSORB, 454, 68, 70, 92, 50, 132, 42, 100, 50, 159, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FOMANTIS, 7, false, false, false, "Sickle Grass Pokémon", Type.GRASS, null, 0.3, 1.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CONTRARY, 250, 40, 55, 35, 50, 35, 35, 190, 50, 50, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.LURANTIS, 7, false, false, false, "Bloom Sickle Pokémon", Type.GRASS, null, 0.9, 18.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CONTRARY, 480, 70, 105, 90, 80, 90, 45, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MORELULL, 7, false, false, false, "Illuminating Pokémon", Type.GRASS, Type.FAIRY, 0.2, 1.5, Abilities.ILLUMINATE, Abilities.EFFECT_SPORE, Abilities.RAIN_DISH, 285, 40, 35, 55, 65, 75, 15, 190, 50, 57, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SHIINOTIC, 7, false, false, false, "Illuminating Pokémon", Type.GRASS, Type.FAIRY, 1, 11.5, Abilities.ILLUMINATE, Abilities.EFFECT_SPORE, Abilities.RAIN_DISH, 405, 60, 45, 80, 90, 100, 30, 75, 50, 142, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SALANDIT, 7, false, false, false, "Toxic Lizard Pokémon", Type.POISON, Type.FIRE, 0.6, 4.8, Abilities.CORROSION, Abilities.NONE, Abilities.OBLIVIOUS, 320, 48, 44, 40, 71, 40, 77, 120, 50, 64, GrowthRate.MEDIUM_FAST, 87.5, false), - new PokemonSpecies(Species.SALAZZLE, 7, false, false, false, "Toxic Lizard Pokémon", Type.POISON, Type.FIRE, 1.2, 22.2, Abilities.CORROSION, Abilities.NONE, Abilities.OBLIVIOUS, 480, 68, 64, 60, 111, 60, 117, 45, 50, 168, GrowthRate.MEDIUM_FAST, 0, false), - new PokemonSpecies(Species.STUFFUL, 7, false, false, false, "Flailing Pokémon", Type.NORMAL, Type.FIGHTING, 0.5, 6.8, Abilities.FLUFFY, Abilities.KLUTZ, Abilities.CUTE_CHARM, 340, 70, 75, 50, 45, 50, 50, 140, 50, 68, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BEWEAR, 7, false, false, false, "Strong Arm Pokémon", Type.NORMAL, Type.FIGHTING, 2.1, 135, Abilities.FLUFFY, Abilities.KLUTZ, Abilities.UNNERVE, 500, 120, 125, 80, 55, 60, 60, 70, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BOUNSWEET, 7, false, false, false, "Fruit Pokémon", Type.GRASS, null, 0.3, 3.2, Abilities.LEAF_GUARD, Abilities.OBLIVIOUS, Abilities.SWEET_VEIL, 210, 42, 30, 38, 30, 38, 32, 235, 50, 42, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.STEENEE, 7, false, false, false, "Fruit Pokémon", Type.GRASS, null, 0.7, 8.2, Abilities.LEAF_GUARD, Abilities.OBLIVIOUS, Abilities.SWEET_VEIL, 290, 52, 40, 48, 40, 48, 62, 120, 50, 102, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.TSAREENA, 7, false, false, false, "Fruit Pokémon", Type.GRASS, null, 1.2, 21.4, Abilities.LEAF_GUARD, Abilities.QUEENLY_MAJESTY, Abilities.SWEET_VEIL, 510, 72, 120, 98, 50, 98, 72, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.COMFEY, 7, false, false, false, "Posy Picker Pokémon", Type.FAIRY, null, 0.1, 0.3, Abilities.FLOWER_VEIL, Abilities.TRIAGE, Abilities.NATURAL_CURE, 485, 51, 52, 90, 82, 110, 100, 60, 50, 170, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.ORANGURU, 7, false, false, false, "Sage Pokémon", Type.NORMAL, Type.PSYCHIC, 1.5, 76, Abilities.INNER_FOCUS, Abilities.TELEPATHY, Abilities.SYMBIOSIS, 490, 90, 60, 80, 90, 110, 60, 45, 50, 172, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.PASSIMIAN, 7, false, false, false, "Teamwork Pokémon", Type.FIGHTING, null, 2, 82.8, Abilities.RECEIVER, Abilities.NONE, Abilities.DEFIANT, 490, 100, 120, 90, 40, 60, 80, 45, 50, 172, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.WIMPOD, 7, false, false, false, "Turn Tail Pokémon", Type.BUG, Type.WATER, 0.5, 12, Abilities.WIMP_OUT, Abilities.NONE, Abilities.RUN_AWAY, 230, 25, 35, 40, 20, 30, 80, 90, 50, 46, GrowthRate.MEDIUM_FAST, 50, false), //Custom Hidden - new PokemonSpecies(Species.GOLISOPOD, 7, false, false, false, "Hard Scale Pokémon", Type.BUG, Type.WATER, 2, 108, Abilities.EMERGENCY_EXIT, Abilities.NONE, Abilities.ANTICIPATION, 530, 75, 125, 140, 60, 90, 40, 45, 50, 186, GrowthRate.MEDIUM_FAST, 50, false), //Custom Hidden - new PokemonSpecies(Species.SANDYGAST, 7, false, false, false, "Sand Heap Pokémon", Type.GHOST, Type.GROUND, 0.5, 70, Abilities.WATER_COMPACTION, Abilities.NONE, Abilities.SAND_VEIL, 320, 55, 55, 80, 70, 45, 15, 140, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PALOSSAND, 7, false, false, false, "Sand Castle Pokémon", Type.GHOST, Type.GROUND, 1.3, 250, Abilities.WATER_COMPACTION, Abilities.NONE, Abilities.SAND_VEIL, 480, 85, 75, 110, 100, 75, 35, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PYUKUMUKU, 7, false, false, false, "Sea Cucumber Pokémon", Type.WATER, null, 0.3, 1.2, Abilities.INNARDS_OUT, Abilities.NONE, Abilities.UNAWARE, 410, 55, 60, 130, 30, 130, 5, 60, 50, 144, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.TYPE_NULL, 7, true, false, false, "Synthetic Pokémon", Type.NORMAL, null, 1.9, 120.5, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.NONE, 534, 95, 95, 95, 95, 95, 59, 3, 0, 107, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SILVALLY, 7, true, false, false, "Synthetic Pokémon", Type.NORMAL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285, GrowthRate.SLOW, null, false, false, - new PokemonForm("Type: Normal", "normal", Type.NORMAL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285, false, "", true), - new PokemonForm("Type: Fighting", "fighting", Type.FIGHTING, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Flying", "flying", Type.FLYING, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Poison", "poison", Type.POISON, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Ground", "ground", Type.GROUND, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Rock", "rock", Type.ROCK, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Bug", "bug", Type.BUG, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Ghost", "ghost", Type.GHOST, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Steel", "steel", Type.STEEL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Fire", "fire", Type.FIRE, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Water", "water", Type.WATER, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Grass", "grass", Type.GRASS, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Electric", "electric", Type.ELECTRIC, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Psychic", "psychic", Type.PSYCHIC, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Ice", "ice", Type.ICE, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Dragon", "dragon", Type.DRAGON, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Dark", "dark", Type.DARK, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - new PokemonForm("Type: Fairy", "fairy", Type.FAIRY, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), - ), - new PokemonSpecies(Species.MINIOR, 7, false, false, false, "Meteor Pokémon", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, GrowthRate.MEDIUM_SLOW, null, false, false, - new PokemonForm("Red Meteor Form", "red-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), - new PokemonForm("Orange Meteor Form", "orange-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), - new PokemonForm("Yellow Meteor Form", "yellow-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), - new PokemonForm("Green Meteor Form", "green-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), - new PokemonForm("Blue Meteor Form", "blue-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), - new PokemonForm("Indigo Meteor Form", "indigo-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), - new PokemonForm("Violet Meteor Form", "violet-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), - new PokemonForm("Red Core Form", "red", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 154, false, null, true), - new PokemonForm("Orange Core Form", "orange", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 154, false, null, true), - new PokemonForm("Yellow Core Form", "yellow", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 154, false, null, true), - new PokemonForm("Green Core Form", "green", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 154, false, null, true), - new PokemonForm("Blue Core Form", "blue", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 154, false, null, true), - new PokemonForm("Indigo Core Form", "indigo", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 154, false, null, true), - new PokemonForm("Violet Core Form", "violet", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 154, false, null, true), - ), - new PokemonSpecies(Species.KOMALA, 7, false, false, false, "Drowsing Pokémon", Type.NORMAL, null, 0.4, 19.9, Abilities.COMATOSE, Abilities.NONE, Abilities.NONE, 480, 65, 115, 65, 75, 95, 65, 45, 70, 168, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.TURTONATOR, 7, false, false, false, "Blast Turtle Pokémon", Type.FIRE, Type.DRAGON, 2, 212, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.NONE, 485, 60, 78, 135, 91, 85, 36, 70, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.TOGEDEMARU, 7, false, false, false, "Roly-Poly Pokémon", Type.ELECTRIC, Type.STEEL, 0.3, 3.3, Abilities.IRON_BARBS, Abilities.LIGHTNING_ROD, Abilities.STURDY, 435, 65, 98, 63, 40, 73, 96, 180, 50, 152, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MIMIKYU, 7, false, false, false, "Disguise Pokémon", Type.GHOST, Type.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Disguised Form", "disguised", Type.GHOST, Type.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, false, null, true), - new PokemonForm("Busted Form", "busted", Type.GHOST, Type.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167), - ), - new PokemonSpecies(Species.BRUXISH, 7, false, false, false, "Gnash Teeth Pokémon", Type.WATER, Type.PSYCHIC, 0.9, 19, Abilities.DAZZLING, Abilities.STRONG_JAW, Abilities.WONDER_SKIN, 475, 68, 105, 70, 70, 70, 92, 80, 70, 166, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DRAMPA, 7, false, false, false, "Placid Pokémon", Type.NORMAL, Type.DRAGON, 3, 185, Abilities.BERSERK, Abilities.SAP_SIPPER, Abilities.CLOUD_NINE, 485, 78, 60, 85, 135, 91, 36, 70, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DHELMISE, 7, false, false, false, "Sea Creeper Pokémon", Type.GHOST, Type.GRASS, 3.9, 210, Abilities.STEELWORKER, Abilities.NONE, Abilities.NONE, 517, 70, 131, 100, 86, 90, 40, 25, 50, 181, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.JANGMO_O, 7, false, false, false, "Scaly Pokémon", Type.DRAGON, null, 0.6, 29.7, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 300, 45, 55, 65, 45, 45, 45, 45, 50, 60, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.HAKAMO_O, 7, false, false, false, "Scaly Pokémon", Type.DRAGON, Type.FIGHTING, 1.2, 47, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 420, 55, 75, 90, 65, 70, 65, 45, 50, 147, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.KOMMO_O, 7, false, false, false, "Scaly Pokémon", Type.DRAGON, Type.FIGHTING, 1.6, 78.2, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 600, 75, 110, 125, 100, 105, 85, 45, 50, 300, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.TAPU_KOKO, 7, true, false, false, "Land Spirit Pokémon", Type.ELECTRIC, Type.FAIRY, 1.8, 20.5, Abilities.ELECTRIC_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 115, 85, 95, 75, 130, 3, 50, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.TAPU_LELE, 7, true, false, false, "Land Spirit Pokémon", Type.PSYCHIC, Type.FAIRY, 1.2, 18.6, Abilities.PSYCHIC_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 85, 75, 130, 115, 95, 3, 50, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.TAPU_BULU, 7, true, false, false, "Land Spirit Pokémon", Type.GRASS, Type.FAIRY, 1.9, 45.5, Abilities.GRASSY_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 130, 115, 85, 95, 75, 3, 50, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.TAPU_FINI, 7, true, false, false, "Land Spirit Pokémon", Type.WATER, Type.FAIRY, 1.3, 21.2, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 75, 115, 95, 130, 85, 3, 50, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.COSMOG, 7, true, false, false, "Nebula Pokémon", Type.PSYCHIC, null, 0.2, 0.1, Abilities.UNAWARE, Abilities.NONE, Abilities.NONE, 200, 43, 29, 31, 29, 31, 37, 45, 0, 40, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.COSMOEM, 7, true, false, false, "Protostar Pokémon", Type.PSYCHIC, null, 0.1, 999.9, Abilities.STURDY, Abilities.NONE, Abilities.NONE, 400, 43, 29, 131, 29, 131, 37, 45, 0, 140, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SOLGALEO, 7, false, true, false, "Sunne Pokémon", Type.PSYCHIC, Type.STEEL, 3.4, 230, Abilities.FULL_METAL_BODY, Abilities.NONE, Abilities.NONE, 680, 137, 137, 107, 113, 89, 97, 45, 0, 340, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.LUNALA, 7, false, true, false, "Moone Pokémon", Type.PSYCHIC, Type.GHOST, 4, 120, Abilities.SHADOW_SHIELD, Abilities.NONE, Abilities.NONE, 680, 137, 113, 89, 137, 107, 97, 45, 0, 340, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.NIHILEGO, 7, true, false, false, "Parasite Pokémon", Type.ROCK, Type.POISON, 1.2, 55.5, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 109, 53, 47, 127, 131, 103, 45, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.BUZZWOLE, 7, true, false, false, "Swollen Pokémon", Type.BUG, Type.FIGHTING, 2.4, 333.6, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 107, 139, 139, 53, 53, 79, 45, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.PHEROMOSA, 7, true, false, false, "Lissome Pokémon", Type.BUG, Type.FIGHTING, 1.8, 25, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 71, 137, 37, 137, 37, 151, 45, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.XURKITREE, 7, true, false, false, "Glowing Pokémon", Type.ELECTRIC, null, 3.8, 100, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 83, 89, 71, 173, 71, 83, 45, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.CELESTEELA, 7, true, false, false, "Launch Pokémon", Type.STEEL, Type.FLYING, 9.2, 999.9, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 97, 101, 103, 107, 101, 61, 45, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.KARTANA, 7, true, false, false, "Drawn Sword Pokémon", Type.GRASS, Type.STEEL, 0.3, 0.1, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 59, 181, 131, 59, 31, 109, 45, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.GUZZLORD, 7, true, false, false, "Junkivore Pokémon", Type.DARK, Type.DRAGON, 5.5, 888, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 223, 101, 53, 97, 53, 43, 45, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.NECROZMA, 7, false, true, false, "Prism Pokémon", Type.PSYCHIC, null, 2.4, 230, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 600, 97, 107, 101, 127, 89, 79, 255, 0, 300, GrowthRate.SLOW, null, false, false, - new PokemonForm("Normal", "", Type.PSYCHIC, null, 2.4, 230, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 600, 97, 107, 101, 127, 89, 79, 255, 0, 300, false, null, true), - new PokemonForm("Dusk Mane", "dusk-mane", Type.PSYCHIC, Type.STEEL, 3.8, 460, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 680, 97, 157, 127, 113, 109, 77, 255, 0, 300), - new PokemonForm("Dawn Wings", "dawn-wings", Type.PSYCHIC, Type.GHOST, 4.2, 350, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 680, 97, 113, 109, 157, 127, 77, 255, 0, 300), - new PokemonForm("Ultra", "ultra", Type.PSYCHIC, Type.DRAGON, 7.5, 230, Abilities.NEUROFORCE, Abilities.NONE, Abilities.NONE, 754, 97, 167, 97, 167, 97, 129, 255, 0, 300), - ), - new PokemonSpecies(Species.MAGEARNA, 7, false, false, true, "Artificial Pokémon", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, GrowthRate.SLOW, null, false, false, - new PokemonForm("Normal", "", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, false, null, true), - new PokemonForm("Original", "original", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, false, null, true), - ), - new PokemonSpecies(Species.MARSHADOW, 7, false, false, true, "Gloomdweller Pokémon", Type.FIGHTING, Type.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.FIGHTING, Type.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, false, null, true), - new PokemonForm("Zenith", "zenith", Type.FIGHTING, Type.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300) - ), - new PokemonSpecies(Species.POIPOLE, 7, true, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.6, 1.8, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 420, 67, 73, 67, 73, 67, 73, 45, 0, 210, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.NAGANADEL, 7, true, false, false, "Poison Pin Pokémon", Type.POISON, Type.DRAGON, 3.6, 150, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 540, 73, 73, 73, 127, 73, 121, 45, 0, 270, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.STAKATAKA, 7, true, false, false, "Rampart Pokémon", Type.ROCK, Type.STEEL, 5.5, 820, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 61, 131, 211, 53, 101, 13, 30, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.BLACEPHALON, 7, true, false, false, "Fireworks Pokémon", Type.FIRE, Type.GHOST, 1.8, 13, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 53, 127, 53, 151, 79, 107, 30, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.ZERAORA, 7, false, false, true, "Thunderclap Pokémon", Type.ELECTRIC, null, 1.5, 44.5, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.NONE, 600, 88, 112, 75, 102, 80, 143, 3, 0, 300, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.MELTAN, 7, false, false, true, "Hex Nut Pokémon", Type.STEEL, null, 0.2, 8, Abilities.MAGNET_PULL, Abilities.NONE, Abilities.NONE, 300, 46, 65, 65, 55, 35, 34, 3, 0, 150, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.MELMETAL, 7, false, false, true, "Hex Nut Pokémon", Type.STEEL, null, 2.5, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 600, 135, 143, 143, 80, 65, 34, 3, 0, 300, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.STEEL, null, 2.5, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 600, 135, 143, 143, 80, 65, 34, 3, 0, 300, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, null, 25, 999.9, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 700, 175, 165, 155, 85, 75, 45, 3, 0, 300), - ), - new PokemonSpecies(Species.GROOKEY, 8, false, false, false, "Chimp Pokémon", Type.GRASS, null, 0.3, 5, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 310, 50, 65, 50, 40, 40, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.THWACKEY, 8, false, false, false, "Beat Pokémon", Type.GRASS, null, 0.7, 14, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 420, 70, 85, 70, 55, 60, 80, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.RILLABOOM, 8, false, false, false, "Drummer Pokémon", Type.GRASS, null, 2.1, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 530, 100, 125, 90, 60, 70, 85, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true, - new PokemonForm("Normal", "", Type.GRASS, null, 2.1, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 530, 100, 125, 90, 60, 70, 85, 45, 50, 265, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, null, 28, 999.9, Abilities.GRASSY_SURGE, Abilities.NONE, Abilities.GRASSY_SURGE, 630, 125, 150, 105, 85, 85, 80, 45, 50, 265), - ), - new PokemonSpecies(Species.SCORBUNNY, 8, false, false, false, "Rabbit Pokémon", Type.FIRE, null, 0.3, 4.5, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 310, 50, 71, 40, 40, 40, 69, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.RABOOT, 8, false, false, false, "Rabbit Pokémon", Type.FIRE, null, 0.6, 9, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 420, 65, 86, 60, 55, 60, 94, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.CINDERACE, 8, false, false, false, "Striker Pokémon", Type.FIRE, null, 1.4, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 530, 80, 116, 75, 65, 75, 119, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true, - new PokemonForm("Normal", "", Type.FIRE, null, 1.4, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 530, 80, 116, 75, 65, 75, 119, 45, 50, 265, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, null, 27, 999.9, Abilities.LIBERO, Abilities.NONE, Abilities.LIBERO, 630, 100, 146, 80, 90, 80, 134, 45, 50, 265), - ), - new PokemonSpecies(Species.SOBBLE, 8, false, false, false, "Water Lizard Pokémon", Type.WATER, null, 0.3, 4, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 310, 50, 40, 40, 70, 40, 70, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.DRIZZILE, 8, false, false, false, "Water Lizard Pokémon", Type.WATER, null, 0.7, 11.5, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 420, 65, 60, 55, 95, 55, 90, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.INTELEON, 8, false, false, false, "Secret Agent Pokémon", Type.WATER, null, 1.9, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 530, 70, 85, 65, 125, 65, 120, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true, - new PokemonForm("Normal", "", Type.WATER, null, 1.9, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 530, 70, 85, 65, 125, 65, 120, 45, 50, 265, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, null, 40, 999.9, Abilities.SNIPER, Abilities.NONE, Abilities.SNIPER, 630, 95, 97, 77, 147, 77, 137, 45, 50, 265), - ), - new PokemonSpecies(Species.SKWOVET, 8, false, false, false, "Cheeky Pokémon", Type.NORMAL, null, 0.3, 2.5, Abilities.CHEEK_POUCH, Abilities.NONE, Abilities.GLUTTONY, 275, 70, 55, 55, 35, 35, 25, 255, 50, 55, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GREEDENT, 8, false, false, false, "Greedy Pokémon", Type.NORMAL, null, 0.6, 6, Abilities.CHEEK_POUCH, Abilities.NONE, Abilities.GLUTTONY, 460, 120, 95, 95, 55, 75, 20, 90, 50, 161, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ROOKIDEE, 8, false, false, false, "Tiny Bird Pokémon", Type.FLYING, null, 0.2, 1.8, Abilities.KEEN_EYE, Abilities.UNNERVE, Abilities.BIG_PECKS, 245, 38, 47, 35, 33, 35, 57, 255, 50, 49, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.CORVISQUIRE, 8, false, false, false, "Raven Pokémon", Type.FLYING, null, 0.8, 16, Abilities.KEEN_EYE, Abilities.UNNERVE, Abilities.BIG_PECKS, 365, 68, 67, 55, 43, 55, 77, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.CORVIKNIGHT, 8, false, false, false, "Raven Pokémon", Type.FLYING, Type.STEEL, 2.2, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 495, 98, 87, 105, 53, 85, 67, 45, 50, 248, GrowthRate.MEDIUM_SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.FLYING, Type.STEEL, 2.2, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 495, 98, 87, 105, 53, 85, 67, 45, 50, 248, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FLYING, Type.STEEL, 14, 999.9, Abilities.MIRROR_ARMOR, Abilities.MIRROR_ARMOR, Abilities.MIRROR_ARMOR, 595, 128, 102, 140, 53, 95, 77, 45, 50, 248), - ), - new PokemonSpecies(Species.BLIPBUG, 8, false, false, false, "Larva Pokémon", Type.BUG, null, 0.4, 8, Abilities.SWARM, Abilities.COMPOUND_EYES, Abilities.TELEPATHY, 180, 25, 20, 20, 25, 45, 45, 255, 50, 36, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DOTTLER, 8, false, false, false, "Radome Pokémon", Type.BUG, Type.PSYCHIC, 0.4, 19.5, Abilities.SWARM, Abilities.COMPOUND_EYES, Abilities.TELEPATHY, 335, 50, 35, 80, 50, 90, 30, 120, 50, 117, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ORBEETLE, 8, false, false, false, "Seven Spot Pokémon", Type.BUG, Type.PSYCHIC, 0.4, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 505, 60, 45, 110, 80, 120, 90, 45, 50, 253, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.BUG, Type.PSYCHIC, 0.4, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 505, 60, 45, 110, 80, 120, 90, 45, 50, 253, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.BUG, Type.PSYCHIC, 14, 999.9, Abilities.TRACE, Abilities.TRACE, Abilities.TRACE, 605, 90, 45, 130, 110, 140, 90, 45, 50, 253), - ), - new PokemonSpecies(Species.NICKIT, 8, false, false, false, "Fox Pokémon", Type.DARK, null, 0.6, 8.9, Abilities.RUN_AWAY, Abilities.UNBURDEN, Abilities.STAKEOUT, 245, 40, 28, 28, 47, 52, 50, 255, 50, 49, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.THIEVUL, 8, false, false, false, "Fox Pokémon", Type.DARK, null, 1.2, 19.9, Abilities.RUN_AWAY, Abilities.UNBURDEN, Abilities.STAKEOUT, 455, 70, 58, 58, 87, 92, 90, 127, 50, 159, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.GOSSIFLEUR, 8, false, false, false, "Flowering Pokémon", Type.GRASS, null, 0.4, 2.2, Abilities.COTTON_DOWN, Abilities.REGENERATOR, Abilities.EFFECT_SPORE, 250, 40, 40, 60, 40, 60, 10, 190, 50, 50, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ELDEGOSS, 8, false, false, false, "Cotton Bloom Pokémon", Type.GRASS, null, 0.5, 2.5, Abilities.COTTON_DOWN, Abilities.REGENERATOR, Abilities.EFFECT_SPORE, 460, 60, 50, 90, 80, 120, 60, 75, 50, 161, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.WOOLOO, 8, false, false, false, "Sheep Pokémon", Type.NORMAL, null, 0.6, 6, Abilities.FLUFFY, Abilities.RUN_AWAY, Abilities.BULLETPROOF, 270, 42, 40, 55, 40, 45, 48, 255, 50, 122, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DUBWOOL, 8, false, false, false, "Sheep Pokémon", Type.NORMAL, null, 1.3, 43, Abilities.FLUFFY, Abilities.STEADFAST, Abilities.BULLETPROOF, 490, 72, 80, 100, 60, 90, 88, 127, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CHEWTLE, 8, false, false, false, "Snapping Pokémon", Type.WATER, null, 0.3, 8.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 284, 50, 64, 50, 38, 38, 44, 255, 50, 57, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DREDNAW, 8, false, false, false, "Bite Pokémon", Type.WATER, Type.ROCK, 1, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 485, 90, 115, 90, 48, 68, 74, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.WATER, Type.ROCK, 1, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 485, 90, 115, 90, 48, 68, 74, 75, 50, 170, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.ROCK, 24, 999.9, Abilities.STRONG_JAW, Abilities.STRONG_JAW, Abilities.STRONG_JAW, 585, 115, 145, 115, 43, 83, 84, 75, 50, 170), - ), - new PokemonSpecies(Species.YAMPER, 8, false, false, false, "Puppy Pokémon", Type.ELECTRIC, null, 0.3, 13.5, Abilities.BALL_FETCH, Abilities.NONE, Abilities.RATTLED, 270, 59, 45, 50, 40, 50, 26, 255, 50, 54, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.BOLTUND, 8, false, false, false, "Dog Pokémon", Type.ELECTRIC, null, 1, 34, Abilities.STRONG_JAW, Abilities.NONE, Abilities.COMPETITIVE, 490, 69, 90, 60, 90, 60, 121, 45, 50, 172, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.ROLYCOLY, 8, false, false, false, "Coal Pokémon", Type.ROCK, null, 0.3, 12, Abilities.STEAM_ENGINE, Abilities.HEATPROOF, Abilities.FLASH_FIRE, 240, 30, 40, 50, 40, 50, 30, 255, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.CARKOL, 8, false, false, false, "Coal Pokémon", Type.ROCK, Type.FIRE, 1.1, 78, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 410, 80, 60, 90, 60, 70, 50, 120, 50, 144, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.COALOSSAL, 8, false, false, false, "Coal Pokémon", Type.ROCK, Type.FIRE, 2.8, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 510, 110, 80, 120, 80, 90, 30, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false, true, - new PokemonForm("Normal", "", Type.ROCK, Type.FIRE, 2.8, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 510, 110, 80, 120, 80, 90, 30, 45, 50, 255, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ROCK, Type.FIRE, 42, 999.9, Abilities.STEAM_ENGINE, Abilities.STEAM_ENGINE, Abilities.STEAM_ENGINE, 610, 140, 95, 130, 95, 110, 40, 45, 50, 255), - ), - new PokemonSpecies(Species.APPLIN, 8, false, false, false, "Apple Core Pokémon", Type.GRASS, Type.DRAGON, 0.2, 0.5, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.BULLETPROOF, 260, 40, 40, 80, 40, 40, 20, 255, 50, 52, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.FLAPPLE, 8, false, false, false, "Apple Wing Pokémon", Type.GRASS, Type.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true, - new PokemonForm("Normal", "", Type.GRASS, Type.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.DRAGON, 24, 999.9, Abilities.HUSTLE, Abilities.HUSTLE, Abilities.HUSTLE, 585, 90, 130, 100, 85, 80, 100, 45, 50, 170), - ), - new PokemonSpecies(Species.APPLETUN, 8, false, false, false, "Apple Nectar Pokémon", Type.GRASS, Type.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true, - new PokemonForm("Normal", "", Type.GRASS, Type.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.DRAGON, 24, 999.9, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 585, 130, 75, 115, 125, 115, 25, 45, 50, 170), - ), - new PokemonSpecies(Species.SILICOBRA, 8, false, false, false, "Sand Snake Pokémon", Type.GROUND, null, 2.2, 7.6, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 315, 52, 57, 75, 35, 50, 46, 255, 50, 63, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SANDACONDA, 8, false, false, false, "Sand Snake Pokémon", Type.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GROUND, null, 22, 999.9, Abilities.SAND_SPIT, Abilities.SAND_SPIT, Abilities.SAND_SPIT, 610, 117, 137, 140, 55, 80, 81, 120, 50, 179), - ), - new PokemonSpecies(Species.CRAMORANT, 8, false, false, false, "Gulp Pokémon", Type.FLYING, Type.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Normal", "", Type.FLYING, Type.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166, false, null, true), - new PokemonForm("Gulping Form", "gulping", Type.FLYING, Type.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166), - new PokemonForm("Gorging Form", "gorging", Type.FLYING, Type.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166), - ), - new PokemonSpecies(Species.ARROKUDA, 8, false, false, false, "Rush Pokémon", Type.WATER, null, 0.5, 1, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.PROPELLER_TAIL, 280, 41, 63, 40, 40, 30, 66, 255, 50, 56, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.BARRASKEWDA, 8, false, false, false, "Skewer Pokémon", Type.WATER, null, 1.3, 30, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.PROPELLER_TAIL, 490, 61, 123, 60, 60, 50, 136, 60, 50, 172, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.TOXEL, 8, false, false, false, "Baby Pokémon", Type.ELECTRIC, Type.POISON, 0.4, 11, Abilities.RATTLED, Abilities.STATIC, Abilities.KLUTZ, 242, 40, 38, 35, 54, 35, 40, 75, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.TOXTRICITY, 8, false, false, false, "Punk Pokémon", Type.ELECTRIC, Type.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, GrowthRate.MEDIUM_SLOW, 50, false, true, - new PokemonForm("Amped Form", "amped", Type.ELECTRIC, Type.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "", true), - new PokemonForm("Low-Key Form", "lowkey", Type.ELECTRIC, Type.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.MINUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "lowkey", true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ELECTRIC, Type.POISON, 24, 999.9, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, 602, 114, 98, 82, 144, 82, 82, 45, 50, 176), - ), - new PokemonSpecies(Species.SIZZLIPEDE, 8, false, false, false, "Radiator Pokémon", Type.FIRE, Type.BUG, 0.7, 1, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 305, 50, 65, 45, 50, 50, 45, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CENTISKORCH, 8, false, false, false, "Radiator Pokémon", Type.FIRE, Type.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.FIRE, Type.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, Type.BUG, 75, 999.9, Abilities.FLASH_FIRE, Abilities.FLASH_FIRE, Abilities.FLASH_FIRE, 625, 140, 145, 75, 90, 100, 75, 75, 50, 184), - ), - new PokemonSpecies(Species.CLOBBOPUS, 8, false, false, false, "Tantrum Pokémon", Type.FIGHTING, null, 0.6, 4, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 310, 50, 68, 60, 50, 50, 32, 180, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GRAPPLOCT, 8, false, false, false, "Jujitsu Pokémon", Type.FIGHTING, null, 1.6, 39, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 480, 80, 118, 90, 70, 80, 42, 45, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SINISTEA, 8, false, false, false, "Black Tea Pokémon", Type.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.MEDIUM_FAST, null, false, false, - new PokemonForm("Phony Form", "phony", Type.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, "", true), - new PokemonForm("Antique Form", "antique", Type.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, "", true), - ), - new PokemonSpecies(Species.POLTEAGEIST, 8, false, false, false, "Black Tea Pokémon", Type.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, GrowthRate.MEDIUM_FAST, null, false, false, - new PokemonForm("Phony Form", "phony", Type.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, false, "", true), - new PokemonForm("Antique Form", "antique", Type.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, false, "", true), - ), - new PokemonSpecies(Species.HATENNA, 8, false, false, false, "Calm Pokémon", Type.PSYCHIC, null, 0.4, 3.4, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 265, 42, 30, 45, 56, 53, 39, 235, 50, 53, GrowthRate.SLOW, 0, false), - new PokemonSpecies(Species.HATTREM, 8, false, false, false, "Serene Pokémon", Type.PSYCHIC, null, 0.6, 4.8, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 370, 57, 40, 65, 86, 73, 49, 120, 50, 130, GrowthRate.SLOW, 0, false), - new PokemonSpecies(Species.HATTERENE, 8, false, false, false, "Silent Pokémon", Type.PSYCHIC, Type.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, GrowthRate.SLOW, 0, false, true, - new PokemonForm("Normal", "", Type.PSYCHIC, Type.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.PSYCHIC, Type.FAIRY, 26, 999.9, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 610, 97, 90, 105, 146, 122, 50, 45, 50, 255), - ), - new PokemonSpecies(Species.IMPIDIMP, 8, false, false, false, "Wily Pokémon", Type.DARK, Type.FAIRY, 0.4, 5.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 265, 45, 45, 30, 55, 40, 50, 255, 50, 53, GrowthRate.MEDIUM_FAST, 100, false), - new PokemonSpecies(Species.MORGREM, 8, false, false, false, "Devious Pokémon", Type.DARK, Type.FAIRY, 0.8, 12.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 370, 65, 60, 45, 75, 55, 70, 120, 50, 130, GrowthRate.MEDIUM_FAST, 100, false), - new PokemonSpecies(Species.GRIMMSNARL, 8, false, false, false, "Bulk Up Pokémon", Type.DARK, Type.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, GrowthRate.MEDIUM_FAST, 100, false, true, - new PokemonForm("Normal", "", Type.DARK, Type.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.DARK, Type.FAIRY, 32, 999.9, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 610, 135, 138, 77, 110, 85, 65, 45, 50, 255), - ), - new PokemonSpecies(Species.OBSTAGOON, 8, false, false, false, "Blocking Pokémon", Type.DARK, Type.NORMAL, 1.6, 46, Abilities.RECKLESS, Abilities.GUTS, Abilities.DEFIANT, 520, 93, 90, 101, 60, 81, 95, 45, 50, 260, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PERRSERKER, 8, false, false, false, "Viking Pokémon", Type.STEEL, null, 0.8, 28, Abilities.BATTLE_ARMOR, Abilities.TOUGH_CLAWS, Abilities.STEELY_SPIRIT, 440, 70, 110, 100, 50, 60, 50, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CURSOLA, 8, false, false, false, "Coral Pokémon", Type.GHOST, null, 1, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.PERISH_BODY, 510, 60, 95, 50, 145, 130, 30, 30, 50, 179, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.SIRFETCHD, 8, false, false, false, "Wild Duck Pokémon", Type.FIGHTING, null, 0.8, 117, Abilities.STEADFAST, Abilities.NONE, Abilities.SCRAPPY, 507, 62, 135, 95, 68, 82, 65, 45, 50, 177, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MR_RIME, 8, false, false, false, "Comedian Pokémon", Type.ICE, Type.PSYCHIC, 1.5, 58.2, Abilities.TANGLED_FEET, Abilities.SCREEN_CLEANER, Abilities.ICE_BODY, 520, 80, 85, 75, 110, 100, 70, 45, 50, 182, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.RUNERIGUS, 8, false, false, false, "Grudge Pokémon", Type.GROUND, Type.GHOST, 1.6, 66.6, Abilities.WANDERING_SPIRIT, Abilities.NONE, Abilities.NONE, 483, 58, 95, 145, 50, 105, 30, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.MILCERY, 8, false, false, false, "Cream Pokémon", Type.FAIRY, null, 0.2, 0.3, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 270, 45, 40, 40, 50, 61, 34, 200, 50, 54, GrowthRate.MEDIUM_FAST, 0, false), - new PokemonSpecies(Species.ALCREMIE, 8, false, false, false, "Cream Pokémon", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, GrowthRate.MEDIUM_FAST, 0, false, true, - new PokemonForm("Vanilla Cream", "vanilla-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, "", true), - new PokemonForm("Ruby Cream", "ruby-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), - new PokemonForm("Matcha Cream", "matcha-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), - new PokemonForm("Mint Cream", "mint-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), - new PokemonForm("Lemon Cream", "lemon-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), - new PokemonForm("Salted Cream", "salted-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), - new PokemonForm("Ruby Swirl", "ruby-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), - new PokemonForm("Caramel Swirl", "caramel-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), - new PokemonForm("Rainbow Swirl", "rainbow-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FAIRY, null, 30, 999.9, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 595, 135, 60, 75, 130, 131, 64, 100, 50, 173), - ), - new PokemonSpecies(Species.FALINKS, 8, false, false, false, "Formation Pokémon", Type.FIGHTING, null, 3, 62, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.DEFIANT, 470, 65, 100, 100, 70, 60, 75, 45, 50, 165, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.PINCURCHIN, 8, false, false, false, "Sea Urchin Pokémon", Type.ELECTRIC, null, 0.3, 1, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.ELECTRIC_SURGE, 435, 48, 101, 95, 91, 85, 15, 75, 50, 152, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SNOM, 8, false, false, false, "Worm Pokémon", Type.ICE, Type.BUG, 0.3, 3.8, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.ICE_SCALES, 185, 30, 25, 35, 45, 30, 20, 190, 50, 37, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FROSMOTH, 8, false, false, false, "Frost Moth Pokémon", Type.ICE, Type.BUG, 1.3, 42, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.ICE_SCALES, 475, 70, 65, 60, 125, 90, 65, 75, 50, 166, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.STONJOURNER, 8, false, false, false, "Big Rock Pokémon", Type.ROCK, null, 2.5, 520, Abilities.POWER_SPOT, Abilities.NONE, Abilities.NONE, 470, 100, 125, 135, 20, 20, 70, 60, 50, 165, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.EISCUE, 8, false, false, false, "Penguin Pokémon", Type.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 110, 65, 90, 50, 60, 50, 165, GrowthRate.SLOW, 50, false, false, - new PokemonForm("Ice Face", "", Type.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 110, 65, 90, 50, 60, 50, 165, false, null, true), - new PokemonForm("No Ice", "no-ice", Type.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 70, 65, 50, 130, 60, 50, 165), - ), - new PokemonSpecies(Species.INDEEDEE, 8, false, false, false, "Emotion Pokémon", Type.PSYCHIC, Type.NORMAL, 0.9, 28, Abilities.INNER_FOCUS, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 60, 65, 55, 105, 95, 95, 30, 140, 166, GrowthRate.FAST, 50, false, false, - new PokemonForm("Male", "male", Type.PSYCHIC, Type.NORMAL, 0.9, 28, Abilities.INNER_FOCUS, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 60, 65, 55, 105, 95, 95, 30, 140, 166, false, "", true), - new PokemonForm("Female", "female", Type.PSYCHIC, Type.NORMAL, 0.9, 28, Abilities.OWN_TEMPO, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 70, 55, 65, 95, 105, 85, 30, 140, 166, false, null, true), - ), - new PokemonSpecies(Species.MORPEKO, 8, false, false, false, "Two-Sided Pokémon", Type.ELECTRIC, Type.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Full Belly Mode", "full-belly", Type.ELECTRIC, Type.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153, false, "", true), - new PokemonForm("Hangry Mode", "hangry", Type.ELECTRIC, Type.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153), - ), - new PokemonSpecies(Species.CUFANT, 8, false, false, false, "Copperderm Pokémon", Type.STEEL, null, 1.2, 100, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 330, 72, 80, 49, 40, 49, 40, 190, 50, 66, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.COPPERAJAH, 8, false, false, false, "Copperderm Pokémon", Type.STEEL, null, 3, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 500, 122, 130, 69, 80, 69, 30, 90, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.STEEL, null, 3, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 500, 122, 130, 69, 80, 69, 30, 90, 50, 175, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, Type.GROUND, 23, 999.9, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.MOLD_BREAKER, 600, 167, 155, 89, 80, 89, 20, 90, 50, 175), - ), - new PokemonSpecies(Species.DRACOZOLT, 8, false, false, false, "Fossil Pokémon", Type.ELECTRIC, Type.DRAGON, 1.8, 190, Abilities.VOLT_ABSORB, Abilities.HUSTLE, Abilities.SAND_RUSH, 505, 90, 100, 90, 80, 70, 75, 45, 50, 177, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.ARCTOZOLT, 8, false, false, false, "Fossil Pokémon", Type.ELECTRIC, Type.ICE, 2.3, 150, Abilities.VOLT_ABSORB, Abilities.STATIC, Abilities.SLUSH_RUSH, 505, 90, 100, 90, 90, 80, 55, 45, 50, 177, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.DRACOVISH, 8, false, false, false, "Fossil Pokémon", Type.WATER, Type.DRAGON, 2.3, 215, Abilities.WATER_ABSORB, Abilities.STRONG_JAW, Abilities.SAND_RUSH, 505, 90, 90, 100, 70, 80, 75, 45, 50, 177, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.ARCTOVISH, 8, false, false, false, "Fossil Pokémon", Type.WATER, Type.ICE, 2, 175, Abilities.WATER_ABSORB, Abilities.ICE_BODY, Abilities.SLUSH_RUSH, 505, 90, 90, 100, 80, 90, 55, 45, 50, 177, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.DURALUDON, 8, false, false, false, "Alloy Pokémon", Type.STEEL, Type.DRAGON, 1.8, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 535, 70, 95, 115, 120, 50, 85, 45, 50, 187, GrowthRate.MEDIUM_FAST, 50, false, true, - new PokemonForm("Normal", "", Type.STEEL, Type.DRAGON, 1.8, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 535, 70, 95, 115, 120, 50, 85, 45, 50, 187, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, Type.DRAGON, 43, 999.9, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, 635, 100, 110, 120, 175, 60, 70, 45, 50, 187), - ), - new PokemonSpecies(Species.DREEPY, 8, false, false, false, "Lingering Pokémon", Type.DRAGON, Type.GHOST, 0.5, 2, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 270, 28, 60, 30, 40, 30, 82, 45, 50, 54, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.DRAKLOAK, 8, false, false, false, "Caretaker Pokémon", Type.DRAGON, Type.GHOST, 1.4, 11, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 410, 68, 80, 50, 60, 50, 102, 45, 50, 144, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.DRAGAPULT, 8, false, false, false, "Stealth Pokémon", Type.DRAGON, Type.GHOST, 3, 50, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 600, 88, 120, 75, 100, 75, 142, 45, 50, 300, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.ZACIAN, 8, false, true, false, "Warrior Pokémon", Type.FAIRY, null, 2.8, 110, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, GrowthRate.SLOW, null, false, false, - new PokemonForm("Hero of Many Battles", "hero-of-many-battles", Type.FAIRY, null, 2.8, 110, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, false, "", true), - new PokemonForm("Crowned", "crowned", Type.FAIRY, Type.STEEL, 2.8, 355, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 700, 92, 150, 115, 80, 115, 148, 10, 0, 335), - ), - new PokemonSpecies(Species.ZAMAZENTA, 8, false, true, false, "Warrior Pokémon", Type.FIGHTING, null, 2.9, 210, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, GrowthRate.SLOW, null, false, false, - new PokemonForm("Hero of Many Battles", "hero-of-many-battles", Type.FIGHTING, null, 2.9, 210, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, false, "", true), - new PokemonForm("Crowned", "crowned", Type.FIGHTING, Type.STEEL, 2.9, 785, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 700, 92, 120, 140, 80, 140, 128, 10, 0, 335), - ), - new PokemonSpecies(Species.ETERNATUS, 8, false, true, false, "Gigantic Pokémon", Type.POISON, Type.DRAGON, 20, 950, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 690, 140, 85, 95, 145, 95, 130, 255, 0, 345, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.POISON, Type.DRAGON, 20, 950, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 690, 140, 85, 95, 145, 95, 130, 255, 0, 345, false, null, true), - new PokemonForm("E-Max", "eternamax", Type.POISON, Type.DRAGON, 100, 999.9, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 1125, 255, 115, 250, 125, 250, 130, 255, 0, 345), - ), - new PokemonSpecies(Species.KUBFU, 8, true, false, false, "Wushu Pokémon", Type.FIGHTING, null, 0.6, 12, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.NONE, 385, 60, 90, 60, 53, 50, 72, 3, 50, 77, GrowthRate.SLOW, 87.5, false), - new PokemonSpecies(Species.URSHIFU, 8, true, false, false, "Wushu Pokémon", Type.FIGHTING, Type.DARK, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, GrowthRate.SLOW, 87.5, false, true, - new PokemonForm("Single Strike Style", "single-strike", Type.FIGHTING, Type.DARK, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, false, "", true), - new PokemonForm("Rapid Strike Style", "rapid-strike", Type.FIGHTING, Type.WATER, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, false, null, true), - new PokemonForm("G-Max Single Strike Style", SpeciesFormKey.GIGANTAMAX_SINGLE, Type.FIGHTING, Type.DARK, 29, 999.9, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 150, 115, 73, 70, 117, 3, 50, 275), - new PokemonForm("G-Max Rapid Strike Style", SpeciesFormKey.GIGANTAMAX_RAPID, Type.FIGHTING, Type.WATER, 26, 999.9, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 150, 115, 73, 70, 117, 3, 50, 275), - ), - new PokemonSpecies(Species.ZARUDE, 8, false, false, true, "Rogue Monkey Pokémon", Type.DARK, Type.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, GrowthRate.SLOW, null, false, false, - new PokemonForm("Normal", "", Type.DARK, Type.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, false, null, true), - new PokemonForm("Dada", "dada", Type.DARK, Type.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, false, null, true), - ), - new PokemonSpecies(Species.REGIELEKI, 8, true, false, false, "Electron Pokémon", Type.ELECTRIC, null, 1.2, 145, Abilities.TRANSISTOR, Abilities.NONE, Abilities.NONE, 580, 80, 100, 50, 100, 50, 200, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.REGIDRAGO, 8, true, false, false, "Dragon Orb Pokémon", Type.DRAGON, null, 2.1, 200, Abilities.DRAGONS_MAW, Abilities.NONE, Abilities.NONE, 580, 200, 100, 50, 100, 50, 80, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.GLASTRIER, 8, true, false, false, "Wild Horse Pokémon", Type.ICE, null, 2.2, 800, Abilities.CHILLING_NEIGH, Abilities.NONE, Abilities.NONE, 580, 100, 145, 130, 65, 110, 30, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SPECTRIER, 8, true, false, false, "Swift Horse Pokémon", Type.GHOST, null, 2, 44.5, Abilities.GRIM_NEIGH, Abilities.NONE, Abilities.NONE, 580, 100, 65, 60, 145, 80, 130, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.CALYREX, 8, false, true, false, "King Pokémon", Type.PSYCHIC, Type.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", Type.PSYCHIC, Type.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250, false, null, true), - new PokemonForm("Ice", "ice", Type.PSYCHIC, Type.ICE, 2.4, 809.1, Abilities.AS_ONE_GLASTRIER, Abilities.NONE, Abilities.NONE, 680, 100, 165, 150, 85, 130, 50, 3, 100, 250), - new PokemonForm("Shadow", "shadow", Type.PSYCHIC, Type.GHOST, 2.4, 53.6, Abilities.AS_ONE_SPECTRIER, Abilities.NONE, Abilities.NONE, 680, 100, 85, 80, 165, 100, 150, 3, 100, 250), - ), - new PokemonSpecies(Species.WYRDEER, 8, false, false, false, "Big Horn Pokémon", Type.NORMAL, Type.PSYCHIC, 1.8, 95.1, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 525, 103, 105, 72, 105, 75, 65, 135, 50, 263, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.KLEAVOR, 8, false, false, false, "Axe Pokémon", Type.BUG, Type.ROCK, 1.8, 89, Abilities.SWARM, Abilities.SHEER_FORCE, Abilities.SHARPNESS, 500, 70, 135, 95, 45, 70, 85, 115, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.URSALUNA, 8, false, false, false, "Peat Pokémon", Type.GROUND, Type.NORMAL, 2.4, 290, Abilities.GUTS, Abilities.BULLETPROOF, Abilities.UNNERVE, 550, 130, 140, 105, 45, 80, 50, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BASCULEGION, 8, false, false, false, "Big Fish Pokémon", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Male", "male", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, false, "", true), - new PokemonForm("Female", "female", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 92, 65, 100, 75, 78, 135, 50, 265, false, null, true), - ), - new PokemonSpecies(Species.SNEASLER, 8, false, false, false, "Free Climb Pokémon", Type.FIGHTING, Type.POISON, 1.3, 43, Abilities.PRESSURE, Abilities.UNBURDEN, Abilities.POISON_TOUCH, 510, 80, 130, 60, 40, 80, 120, 135, 50, 102, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.OVERQWIL, 8, false, false, false, "Pin Cluster Pokémon", Type.DARK, Type.POISON, 2.5, 60.5, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 510, 85, 115, 95, 65, 65, 85, 135, 50, 179, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ENAMORUS, 8, true, false, false, "Love-Hate Pokémon", Type.FAIRY, Type.FLYING, 1.6, 48, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.CONTRARY, 580, 74, 115, 70, 135, 80, 106, 3, 50, 116, GrowthRate.SLOW, 0, false, true, - new PokemonForm("Incarnate Forme", "incarnate", Type.FAIRY, Type.FLYING, 1.6, 48, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.CONTRARY, 580, 74, 115, 70, 135, 80, 106, 3, 50, 116, false, null, true), - new PokemonForm("Therian Forme", "therian", Type.FAIRY, Type.FLYING, 1.6, 48, Abilities.OVERCOAT, Abilities.NONE, Abilities.OVERCOAT, 580, 74, 115, 110, 135, 100, 46, 3, 50, 116), - ), - new PokemonSpecies(Species.SPRIGATITO, 9, false, false, false, "Grass Cat Pokémon", Type.GRASS, null, 0.4, 4.1, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 310, 40, 61, 54, 45, 45, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.FLORAGATO, 9, false, false, false, "Grass Cat Pokémon", Type.GRASS, null, 0.9, 12.2, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 410, 61, 80, 63, 60, 63, 83, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.MEOWSCARADA, 9, false, false, false, "Magician Pokémon", Type.GRASS, Type.DARK, 1.5, 31.2, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 530, 76, 110, 70, 81, 70, 123, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.FUECOCO, 9, false, false, false, "Fire Croc Pokémon", Type.FIRE, null, 0.4, 9.8, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 310, 67, 45, 59, 63, 40, 36, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.CROCALOR, 9, false, false, false, "Fire Croc Pokémon", Type.FIRE, null, 1, 30.7, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 411, 81, 55, 78, 90, 58, 49, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.SKELEDIRGE, 9, false, false, false, "Singer Pokémon", Type.FIRE, Type.GHOST, 1.6, 326.5, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 530, 104, 75, 100, 110, 75, 66, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.QUAXLY, 9, false, false, false, "Duckling Pokémon", Type.WATER, null, 0.5, 6.1, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 310, 55, 65, 45, 50, 45, 50, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.QUAXWELL, 9, false, false, false, "Practicing Pokémon", Type.WATER, null, 1.2, 21.5, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 410, 70, 85, 65, 65, 60, 65, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.QUAQUAVAL, 9, false, false, false, "Dancer Pokémon", Type.WATER, Type.FIGHTING, 1.8, 61.9, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 530, 85, 120, 80, 85, 75, 85, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.LECHONK, 9, false, false, false, "Hog Pokémon", Type.NORMAL, null, 0.5, 10.2, Abilities.AROMA_VEIL, Abilities.GLUTTONY, Abilities.THICK_FAT, 254, 54, 45, 40, 35, 45, 35, 255, 50, 51, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.OINKOLOGNE, 9, false, false, false, "Hog Pokémon", Type.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Male", "male", Type.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, false, "", true), - new PokemonForm("Female", "female", Type.NORMAL, null, 1, 120, Abilities.AROMA_VEIL, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 115, 90, 70, 59, 90, 65, 100, 50, 171, false, null, true), - ), - new PokemonSpecies(Species.TAROUNTULA, 9, false, false, false, "String Ball Pokémon", Type.BUG, null, 0.3, 4, Abilities.INSOMNIA, Abilities.NONE, Abilities.STAKEOUT, 210, 35, 41, 45, 29, 40, 20, 255, 50, 42, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.SPIDOPS, 9, false, false, false, "Trap Pokémon", Type.BUG, null, 1, 16.5, Abilities.INSOMNIA, Abilities.NONE, Abilities.STAKEOUT, 404, 60, 79, 92, 52, 86, 35, 120, 50, 141, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.NYMBLE, 9, false, false, false, "Grasshopper Pokémon", Type.BUG, null, 0.2, 1, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 210, 33, 46, 40, 21, 25, 45, 190, 20, 42, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.LOKIX, 9, false, false, false, "Grasshopper Pokémon", Type.BUG, Type.DARK, 1, 17.5, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 450, 71, 102, 78, 52, 55, 92, 30, 0, 158, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PAWMI, 9, false, false, false, "Mouse Pokémon", Type.ELECTRIC, null, 0.3, 2.5, Abilities.STATIC, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 240, 45, 50, 20, 40, 25, 60, 190, 50, 48, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PAWMO, 9, false, false, false, "Mouse Pokémon", Type.ELECTRIC, Type.FIGHTING, 0.4, 6.5, Abilities.VOLT_ABSORB, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 350, 60, 75, 40, 50, 40, 85, 80, 50, 123, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.PAWMOT, 9, false, false, false, "Hands-On Pokémon", Type.ELECTRIC, Type.FIGHTING, 0.9, 41, Abilities.VOLT_ABSORB, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 490, 70, 115, 70, 70, 60, 105, 45, 50, 245, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.TANDEMAUS, 9, false, false, false, "Couple Pokémon", Type.NORMAL, null, 0.3, 1.8, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.OWN_TEMPO, 305, 50, 50, 45, 40, 45, 75, 150, 50, 61, GrowthRate.FAST, null, false), - new PokemonSpecies(Species.MAUSHOLD, 9, false, false, false, "Family Pokémon", Type.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165, GrowthRate.FAST, null, false, false, - new PokemonForm("Family of Four", "four", Type.NORMAL, null, 0.3, 2.8, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165), - new PokemonForm("Family of Three", "three", Type.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165), - ), - new PokemonSpecies(Species.FIDOUGH, 9, false, false, false, "Puppy Pokémon", Type.FAIRY, null, 0.3, 10.9, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.KLUTZ, 312, 37, 55, 70, 30, 55, 65, 190, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.DACHSBUN, 9, false, false, false, "Dog Pokémon", Type.FAIRY, null, 0.5, 14.9, Abilities.WELL_BAKED_BODY, Abilities.NONE, Abilities.AROMA_VEIL, 477, 57, 80, 115, 50, 80, 95, 90, 50, 167, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SMOLIV, 9, false, false, false, "Olive Pokémon", Type.GRASS, Type.NORMAL, 0.3, 6.5, Abilities.EARLY_BIRD, Abilities.NONE, Abilities.HARVEST, 260, 41, 35, 45, 58, 51, 30, 255, 50, 52, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.DOLLIV, 9, false, false, false, "Olive Pokémon", Type.GRASS, Type.NORMAL, 0.6, 11.9, Abilities.EARLY_BIRD, Abilities.NONE, Abilities.HARVEST, 354, 52, 53, 60, 78, 78, 33, 120, 50, 124, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.ARBOLIVA, 9, false, false, false, "Olive Pokémon", Type.GRASS, Type.NORMAL, 1.4, 48.2, Abilities.SEED_SOWER, Abilities.NONE, Abilities.HARVEST, 510, 78, 69, 90, 125, 109, 39, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SQUAWKABILLY, 9, false, false, false, "Parrot Pokémon", Type.NORMAL, Type.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, GrowthRate.ERRATIC, 50, false, false, - new PokemonForm("Green Plumage", "green-plumage", Type.NORMAL, Type.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true), - new PokemonForm("Blue Plumage", "blue-plumage", Type.NORMAL, Type.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true), - new PokemonForm("Yellow Plumage", "yellow-plumage", Type.NORMAL, Type.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.SHEER_FORCE, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true), - new PokemonForm("White Plumage", "white-plumage", Type.NORMAL, Type.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.SHEER_FORCE, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true), - ), - new PokemonSpecies(Species.NACLI, 9, false, false, false, "Rock Salt Pokémon", Type.ROCK, null, 0.4, 16, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 280, 55, 55, 75, 35, 35, 25, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.NACLSTACK, 9, false, false, false, "Rock Salt Pokémon", Type.ROCK, null, 0.6, 105, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 355, 60, 60, 100, 35, 65, 35, 120, 50, 124, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GARGANACL, 9, false, false, false, "Rock Salt Pokémon", Type.ROCK, null, 2.3, 240, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 500, 100, 100, 130, 45, 90, 35, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.CHARCADET, 9, false, false, false, "Fire Child Pokémon", Type.FIRE, null, 0.6, 10.5, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.FLAME_BODY, 255, 40, 50, 40, 50, 40, 35, 90, 50, 51, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.ARMAROUGE, 9, false, false, false, "Fire Warrior Pokémon", Type.FIRE, Type.PSYCHIC, 1.5, 85, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.WEAK_ARMOR, 525, 85, 60, 100, 125, 80, 75, 25, 20, 263, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.CERULEDGE, 9, false, false, false, "Fire Blades Pokémon", Type.FIRE, Type.GHOST, 1.6, 62, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.WEAK_ARMOR, 525, 75, 125, 80, 60, 100, 85, 25, 20, 263, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.TADBULB, 9, false, false, false, "EleTadpole Pokémon", Type.ELECTRIC, null, 0.3, 0.4, Abilities.OWN_TEMPO, Abilities.STATIC, Abilities.DAMP, 272, 61, 31, 41, 59, 35, 45, 190, 50, 54, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BELLIBOLT, 9, false, false, false, "EleFrog Pokémon", Type.ELECTRIC, null, 1.2, 113, Abilities.ELECTROMORPHOSIS, Abilities.STATIC, Abilities.DAMP, 495, 109, 64, 91, 103, 83, 45, 50, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.WATTREL, 9, false, false, false, "Storm Petrel Pokémon", Type.ELECTRIC, Type.FLYING, 0.4, 3.6, Abilities.WIND_POWER, Abilities.VOLT_ABSORB, Abilities.COMPETITIVE, 280, 40, 40, 35, 55, 40, 70, 180, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.KILOWATTREL, 9, false, false, false, "Frigatebird Pokémon", Type.ELECTRIC, Type.FLYING, 1.4, 38.6, Abilities.WIND_POWER, Abilities.VOLT_ABSORB, Abilities.COMPETITIVE, 490, 70, 70, 60, 105, 60, 125, 90, 50, 172, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.MASCHIFF, 9, false, false, false, "Rascal Pokémon", Type.DARK, null, 0.5, 16, Abilities.INTIMIDATE, Abilities.RUN_AWAY, Abilities.STAKEOUT, 340, 60, 78, 60, 40, 51, 51, 150, 50, 68, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.MABOSSTIFF, 9, false, false, false, "Boss Pokémon", Type.DARK, null, 1.1, 61, Abilities.INTIMIDATE, Abilities.GUARD_DOG, Abilities.STAKEOUT, 505, 80, 120, 90, 60, 70, 85, 75, 50, 177, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.SHROODLE, 9, false, false, false, "Toxic Mouse Pokémon", Type.POISON, Type.NORMAL, 0.2, 0.7, Abilities.UNBURDEN, Abilities.PICKPOCKET, Abilities.PRANKSTER, 290, 40, 65, 35, 40, 35, 75, 190, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GRAFAIAI, 9, false, false, false, "Toxic Monkey Pokémon", Type.POISON, Type.NORMAL, 0.7, 27.2, Abilities.UNBURDEN, Abilities.POISON_TOUCH, Abilities.PRANKSTER, 485, 63, 95, 65, 80, 72, 110, 90, 50, 170, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.BRAMBLIN, 9, false, false, false, "Tumbleweed Pokémon", Type.GRASS, Type.GHOST, 0.6, 0.6, Abilities.WIND_RIDER, Abilities.NONE, Abilities.INFILTRATOR, 275, 40, 65, 30, 45, 35, 60, 190, 50, 55, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BRAMBLEGHAST, 9, false, false, false, "Tumbleweed Pokémon", Type.GRASS, Type.GHOST, 1.2, 6, Abilities.WIND_RIDER, Abilities.NONE, Abilities.INFILTRATOR, 480, 55, 115, 70, 80, 70, 90, 45, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.TOEDSCOOL, 9, false, false, false, "Woodear Pokémon", Type.GROUND, Type.GRASS, 0.9, 33, Abilities.MYCELIUM_MIGHT, Abilities.NONE, Abilities.NONE, 335, 40, 40, 35, 50, 100, 70, 190, 50, 67, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.TOEDSCRUEL, 9, false, false, false, "Woodear Pokémon", Type.GROUND, Type.GRASS, 1.9, 58, Abilities.MYCELIUM_MIGHT, Abilities.NONE, Abilities.NONE, 515, 80, 70, 65, 80, 120, 100, 90, 50, 180, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.KLAWF, 9, false, false, false, "Ambush Pokémon", Type.ROCK, null, 1.3, 79, Abilities.ANGER_SHELL, Abilities.SHELL_ARMOR, Abilities.REGENERATOR, 450, 70, 100, 115, 35, 55, 75, 120, 50, 158, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CAPSAKID, 9, false, false, false, "Spicy Pepper Pokémon", Type.GRASS, null, 0.3, 3, Abilities.CHLOROPHYLL, Abilities.INSOMNIA, Abilities.KLUTZ, 304, 50, 62, 40, 62, 40, 50, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.SCOVILLAIN, 9, false, false, false, "Spicy Pepper Pokémon", Type.GRASS, Type.FIRE, 0.9, 15, Abilities.CHLOROPHYLL, Abilities.INSOMNIA, Abilities.MOODY, 486, 65, 108, 65, 108, 65, 75, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.RELLOR, 9, false, false, false, "Rolling Pokémon", Type.BUG, null, 0.2, 1, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.SHED_SKIN, 270, 41, 50, 60, 31, 58, 30, 190, 50, 54, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.RABSCA, 9, false, false, false, "Rolling Pokémon", Type.BUG, Type.PSYCHIC, 0.3, 3.5, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.TELEPATHY, 470, 75, 50, 85, 115, 100, 45, 45, 50, 165, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.FLITTLE, 9, false, false, false, "Frill Pokémon", Type.PSYCHIC, null, 0.2, 1.5, Abilities.ANTICIPATION, Abilities.FRISK, Abilities.SPEED_BOOST, 255, 30, 35, 30, 55, 30, 75, 120, 50, 51, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.ESPATHRA, 9, false, false, false, "Ostrich Pokémon", Type.PSYCHIC, null, 1.9, 90, Abilities.OPPORTUNIST, Abilities.FRISK, Abilities.SPEED_BOOST, 481, 95, 60, 60, 101, 60, 105, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.TINKATINK, 9, false, false, false, "Metalsmith Pokémon", Type.FAIRY, Type.STEEL, 0.4, 8.9, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 297, 50, 45, 45, 35, 64, 58, 190, 50, 59, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.TINKATUFF, 9, false, false, false, "Hammer Pokémon", Type.FAIRY, Type.STEEL, 0.7, 59.1, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 380, 65, 55, 55, 45, 82, 78, 90, 50, 133, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.TINKATON, 9, false, false, false, "Hammer Pokémon", Type.FAIRY, Type.STEEL, 0.7, 112.8, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 506, 85, 75, 77, 70, 105, 94, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.WIGLETT, 9, false, false, false, "Garden Eel Pokémon", Type.WATER, null, 1.2, 1.8, Abilities.GOOEY, Abilities.RATTLED, Abilities.SAND_VEIL, 245, 10, 55, 25, 35, 25, 95, 255, 50, 49, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.WUGTRIO, 9, false, false, false, "Garden Eel Pokémon", Type.WATER, null, 1.2, 5.4, Abilities.GOOEY, Abilities.RATTLED, Abilities.SAND_VEIL, 425, 35, 100, 50, 50, 70, 120, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BOMBIRDIER, 9, false, false, false, "Item Drop Pokémon", Type.FLYING, Type.DARK, 1.5, 42.9, Abilities.BIG_PECKS, Abilities.KEEN_EYE, Abilities.ROCKY_PAYLOAD, 485, 70, 103, 85, 60, 85, 82, 25, 50, 243, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.FINIZEN, 9, false, false, false, "Dolphin Pokémon", Type.WATER, null, 1.3, 60.2, Abilities.WATER_VEIL, Abilities.NONE, Abilities.NONE, 315, 70, 45, 40, 45, 40, 75, 200, 50, 63, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.PALAFIN, 9, false, false, false, "Dolphin Pokémon", Type.WATER, null, 1.3, 60.2, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.NONE, 457, 100, 70, 72, 53, 62, 100, 45, 50, 160, GrowthRate.SLOW, 50, false, true, - new PokemonForm("Zero Form", "zero", Type.WATER, null, 1.3, 60.2, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.ZERO_TO_HERO, 457, 100, 70, 72, 53, 62, 100, 45, 50, 160, false, null, true), - new PokemonForm("Hero Form", "hero", Type.WATER, null, 1.8, 97.4, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.ZERO_TO_HERO, 650, 100, 160, 97, 106, 87, 100, 45, 50, 160), - ), - new PokemonSpecies(Species.VAROOM, 9, false, false, false, "Single-Cyl Pokémon", Type.STEEL, Type.POISON, 1, 35, Abilities.OVERCOAT, Abilities.NONE, Abilities.SLOW_START, 300, 45, 70, 63, 30, 45, 47, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.REVAVROOM, 9, false, false, false, "Multi-Cyl Pokémon", Type.STEEL, Type.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Normal", "", Type.STEEL, Type.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, false, null, true), - new PokemonForm("Segin Starmobile", "segin-starmobile", Type.STEEL, Type.DARK, 1.8, 240, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175), - new PokemonForm("Schedar Starmobile", "schedar-starmobile", Type.STEEL, Type.FIRE, 1.8, 240, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.SPEED_BOOST, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175), - new PokemonForm("Navi Starmobile", "navi-starmobile", Type.STEEL, Type.POISON, 1.8, 240, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.TOXIC_DEBRIS, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175), - new PokemonForm("Ruchbah Starmobile", "ruchbah-starmobile", Type.STEEL, Type.FAIRY, 1.8, 240, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175), - new PokemonForm("Caph Starmobile", "caph-starmobile", Type.STEEL, Type.FIGHTING, 1.8, 240, Abilities.STAMINA, Abilities.NONE, Abilities.STAMINA, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175), - ), - new PokemonSpecies(Species.CYCLIZAR, 9, false, false, false, "Mount Pokémon", Type.DRAGON, Type.NORMAL, 1.6, 63, Abilities.SHED_SKIN, Abilities.NONE, Abilities.REGENERATOR, 501, 70, 95, 65, 85, 65, 121, 190, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.ORTHWORM, 9, false, false, false, "Earthworm Pokémon", Type.STEEL, null, 2.5, 310, Abilities.EARTH_EATER, Abilities.NONE, Abilities.SAND_VEIL, 480, 70, 85, 145, 60, 55, 65, 25, 50, 240, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.GLIMMET, 9, false, false, false, "Ore Pokémon", Type.ROCK, Type.POISON, 0.7, 8, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.CORROSION, 350, 48, 35, 42, 105, 60, 60, 70, 50, 70, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GLIMMORA, 9, false, false, false, "Ore Pokémon", Type.ROCK, Type.POISON, 1.5, 45, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.CORROSION, 525, 83, 55, 90, 130, 81, 86, 25, 50, 184, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GREAVARD, 9, false, false, false, "Ghost Dog Pokémon", Type.GHOST, null, 0.6, 35, Abilities.PICKUP, Abilities.NONE, Abilities.FLUFFY, 290, 50, 61, 60, 30, 55, 34, 120, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.HOUNDSTONE, 9, false, false, false, "Ghost Dog Pokémon", Type.GHOST, null, 2, 15, Abilities.SAND_RUSH, Abilities.NONE, Abilities.FLUFFY, 488, 72, 101, 100, 50, 97, 68, 60, 50, 171, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.FLAMIGO, 9, false, false, false, "Synchronize Pokémon", Type.FLYING, Type.FIGHTING, 1.6, 37, Abilities.SCRAPPY, Abilities.TANGLED_FEET, Abilities.COSTAR, 500, 82, 115, 74, 75, 64, 90, 100, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.CETODDLE, 9, false, false, false, "Terra Whale Pokémon", Type.ICE, null, 1.2, 45, Abilities.THICK_FAT, Abilities.SNOW_CLOAK, Abilities.SHEER_FORCE, 334, 108, 68, 45, 30, 40, 43, 150, 50, 67, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.CETITAN, 9, false, false, false, "Terra Whale Pokémon", Type.ICE, null, 4.5, 700, Abilities.THICK_FAT, Abilities.SLUSH_RUSH, Abilities.SHEER_FORCE, 521, 170, 113, 65, 45, 55, 73, 50, 50, 182, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.VELUZA, 9, false, false, false, "Jettison Pokémon", Type.WATER, Type.PSYCHIC, 2.5, 90, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHARPNESS, 478, 90, 102, 73, 78, 65, 70, 100, 50, 167, GrowthRate.FAST, 50, false), - new PokemonSpecies(Species.DONDOZO, 9, false, false, false, "Big Catfish Pokémon", Type.WATER, null, 12, 220, Abilities.UNAWARE, Abilities.OBLIVIOUS, Abilities.WATER_VEIL, 530, 150, 100, 115, 65, 65, 35, 25, 50, 265, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.TATSUGIRI, 9, false, false, false, "Mimicry Pokémon", Type.DRAGON, Type.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, GrowthRate.MEDIUM_SLOW, 50, false, false, - new PokemonForm("Curly Form", "curly", Type.DRAGON, Type.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true), - new PokemonForm("Droopy Form", "droopy", Type.DRAGON, Type.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true), - new PokemonForm("Stretchy Form", "stretchy", Type.DRAGON, Type.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true), - ), - new PokemonSpecies(Species.ANNIHILAPE, 9, false, false, false, "Rage Monkey Pokémon", Type.FIGHTING, Type.GHOST, 1.2, 56, Abilities.VITAL_SPIRIT, Abilities.INNER_FOCUS, Abilities.DEFIANT, 535, 110, 115, 80, 50, 90, 90, 45, 50, 268, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.CLODSIRE, 9, false, false, false, "Spiny Fish Pokémon", Type.POISON, Type.GROUND, 1.8, 223, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 430, 130, 75, 60, 45, 100, 20, 90, 50, 151, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.FARIGIRAF, 9, false, false, false, "Long Neck Pokémon", Type.NORMAL, Type.PSYCHIC, 3.2, 160, Abilities.CUD_CHEW, Abilities.ARMOR_TAIL, Abilities.SAP_SIPPER, 520, 120, 90, 70, 110, 70, 60, 45, 50, 260, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.DUDUNSPARCE, 9, false, false, false, "Land Snake Pokémon", Type.NORMAL, null, 3.6, 39.2, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Two-Segment Form", "two-segment", Type.NORMAL, null, 3.6, 39.2, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182, false, ""), - new PokemonForm("Three-Segment Form", "three-segment", Type.NORMAL, null, 4.5, 47.4, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182), - ), - new PokemonSpecies(Species.KINGAMBIT, 9, false, false, false, "Big Blade Pokémon", Type.DARK, Type.STEEL, 2, 120, Abilities.DEFIANT, Abilities.SUPREME_OVERLORD, Abilities.PRESSURE, 550, 100, 135, 120, 60, 85, 50, 25, 50, 275, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GREAT_TUSK, 9, false, false, false, "Paradox Pokémon", Type.GROUND, Type.FIGHTING, 2.2, 320, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 115, 131, 131, 53, 53, 87, 30, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SCREAM_TAIL, 9, false, false, false, "Paradox Pokémon", Type.FAIRY, Type.PSYCHIC, 1.2, 8, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 115, 65, 99, 65, 115, 111, 50, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.BRUTE_BONNET, 9, false, false, false, "Paradox Pokémon", Type.GRASS, Type.DARK, 1.2, 21, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 111, 127, 99, 79, 99, 55, 50, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.FLUTTER_MANE, 9, false, false, false, "Paradox Pokémon", Type.GHOST, Type.FAIRY, 1.4, 4, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 55, 55, 55, 135, 135, 135, 30, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SLITHER_WING, 9, false, false, false, "Paradox Pokémon", Type.BUG, Type.FIGHTING, 3.2, 92, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 85, 135, 79, 85, 105, 81, 30, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SANDY_SHOCKS, 9, false, false, false, "Paradox Pokémon", Type.ELECTRIC, Type.GROUND, 2.3, 60, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 85, 81, 97, 121, 85, 101, 30, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.IRON_TREADS, 9, false, false, false, "Paradox Pokémon", Type.GROUND, Type.STEEL, 0.9, 240, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 90, 112, 120, 72, 70, 106, 30, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.IRON_BUNDLE, 9, false, false, false, "Paradox Pokémon", Type.ICE, Type.WATER, 0.6, 11, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 56, 80, 114, 124, 60, 136, 50, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.IRON_HANDS, 9, false, false, false, "Paradox Pokémon", Type.FIGHTING, Type.ELECTRIC, 1.8, 380.7, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 154, 140, 108, 50, 68, 50, 50, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.IRON_JUGULIS, 9, false, false, false, "Paradox Pokémon", Type.DARK, Type.FLYING, 1.3, 111, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 94, 80, 86, 122, 80, 108, 30, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.IRON_MOTH, 9, false, false, false, "Paradox Pokémon", Type.FIRE, Type.POISON, 1.2, 36, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 80, 70, 60, 140, 110, 110, 30, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.IRON_THORNS, 9, false, false, false, "Paradox Pokémon", Type.ROCK, Type.ELECTRIC, 1.6, 303, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 100, 134, 110, 70, 84, 72, 30, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.FRIGIBAX, 9, false, false, false, "Ice Fin Pokémon", Type.DRAGON, Type.ICE, 0.5, 17, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 320, 65, 75, 45, 35, 45, 55, 45, 50, 64, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.ARCTIBAX, 9, false, false, false, "Ice Fin Pokémon", Type.DRAGON, Type.ICE, 0.8, 30, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 423, 90, 95, 66, 45, 65, 62, 25, 50, 148, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.BAXCALIBUR, 9, false, false, false, "Ice Dragon Pokémon", Type.DRAGON, Type.ICE, 2.1, 210, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 600, 115, 145, 92, 75, 86, 87, 10, 50, 300, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.GIMMIGHOUL, 9, false, false, false, "Coin Chest Pokémon", Type.GHOST, null, 0.3, 5, Abilities.RATTLED, Abilities.NONE, Abilities.NONE, 300, 45, 30, 70, 75, 70, 10, 45, 50, 60, GrowthRate.SLOW, null, false, false, - new PokemonForm("Chest Form", "chest", Type.GHOST, null, 0.3, 5, Abilities.RATTLED, Abilities.NONE, Abilities.NONE, 300, 45, 30, 70, 75, 70, 10, 45, 50, 60, false, "", true), - new PokemonForm("Roaming Form", "roaming", Type.GHOST, null, 0.1, 1, Abilities.RUN_AWAY, Abilities.NONE, Abilities.NONE, 300, 45, 30, 25, 75, 45, 80, 45, 50, 60, false, null, true), - ), - new PokemonSpecies(Species.GHOLDENGO, 9, false, false, false, "Coin Entity Pokémon", Type.STEEL, Type.GHOST, 1.2, 30, Abilities.GOOD_AS_GOLD, Abilities.NONE, Abilities.NONE, 550, 87, 60, 95, 133, 91, 84, 45, 50, 275, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.WO_CHIEN, 9, true, false, false, "Ruinous Pokémon", Type.DARK, Type.GRASS, 1.5, 74.2, Abilities.TABLETS_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 85, 85, 100, 95, 135, 70, 6, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.CHIEN_PAO, 9, true, false, false, "Ruinous Pokémon", Type.DARK, Type.ICE, 1.9, 152.2, Abilities.SWORD_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 80, 120, 80, 90, 65, 135, 6, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.TING_LU, 9, true, false, false, "Ruinous Pokémon", Type.DARK, Type.GROUND, 2.7, 699.7, Abilities.VESSEL_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 155, 110, 125, 55, 80, 45, 6, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.CHI_YU, 9, true, false, false, "Ruinous Pokémon", Type.DARK, Type.FIRE, 0.4, 4.9, Abilities.BEADS_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 55, 80, 80, 135, 120, 100, 6, 0, 285, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.ROARING_MOON, 9, false, false, false, "Paradox Pokémon", Type.DRAGON, Type.DARK, 2, 380, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 105, 139, 71, 55, 101, 119, 10, 0, 295, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.IRON_VALIANT, 9, false, false, false, "Paradox Pokémon", Type.FAIRY, Type.FIGHTING, 1.4, 35, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 74, 130, 90, 120, 60, 116, 10, 0, 295, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.KORAIDON, 9, false, true, false, "Paradox Pokémon", Type.FIGHTING, Type.DRAGON, 2.5, 303, Abilities.ORICHALCUM_PULSE, Abilities.NONE, Abilities.NONE, 670, 100, 135, 115, 85, 100, 135, 3, 0, 335, GrowthRate.SLOW, null, false, false, - new PokemonForm("Apex Build", "apex-build", Type.FIGHTING, Type.DRAGON, 2.5, 303, Abilities.ORICHALCUM_PULSE, Abilities.NONE, Abilities.NONE, 670, 100, 135, 115, 85, 100, 135, 3, 0, 335, false, null, true), - ), - new PokemonSpecies(Species.MIRAIDON, 9, false, true, false, "Paradox Pokémon", Type.ELECTRIC, Type.DRAGON, 3.5, 240, Abilities.HADRON_ENGINE, Abilities.NONE, Abilities.NONE, 670, 100, 85, 100, 135, 115, 135, 3, 0, 335, GrowthRate.SLOW, null, false, false, - new PokemonForm("Ultimate Mode", "ultimate-mode", Type.ELECTRIC, Type.DRAGON, 3.5, 240, Abilities.HADRON_ENGINE, Abilities.NONE, Abilities.NONE, 670, 100, 85, 100, 135, 115, 135, 3, 0, 335, false, null, true), - ), - new PokemonSpecies(Species.WALKING_WAKE, 9, false, false, false, "Paradox Pokémon", Type.WATER, Type.DRAGON, 3.5, 280, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 99, 83, 91, 125, 83, 109, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Gouging Fire and Raging Bolt - new PokemonSpecies(Species.IRON_LEAVES, 9, false, false, false, "Paradox Pokémon", Type.GRASS, Type.PSYCHIC, 1.5, 125, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 130, 88, 70, 108, 104, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Iron Boulder and Iron Crown - new PokemonSpecies(Species.DIPPLIN, 9, false, false, false, "Candy Apple Pokémon", Type.GRASS, Type.DRAGON, 0.4, 9.7, Abilities.SUPERSWEET_SYRUP, Abilities.GLUTTONY, Abilities.STICKY_HOLD, 485, 80, 80, 110, 95, 80, 40, 45, 50, 170, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.POLTCHAGEIST, 9, false, false, false, "Matcha Pokémon", Type.GRASS, Type.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.SLOW, null, false, false, - new PokemonForm("Counterfeit Form", "counterfeit", Type.GRASS, Type.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, true), - new PokemonForm("Artisan Form", "artisan", Type.GRASS, Type.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, true), - ), - new PokemonSpecies(Species.SINISTCHA, 9, false, false, false, "Matcha Pokémon", Type.GRASS, Type.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178, GrowthRate.SLOW, null, false, false, - new PokemonForm("Unremarkable Form", "unremarkable", Type.GRASS, Type.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178), - new PokemonForm("Masterpiece Form", "masterpiece", Type.GRASS, Type.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178), - ), - new PokemonSpecies(Species.OKIDOGI, 9, true, false, false, "Retainer Pokémon", Type.POISON, Type.FIGHTING, 1.8, 92.2, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.GUARD_DOG, 555, 88, 128, 115, 58, 86, 80, 3, 0, 276, GrowthRate.SLOW, 100, false), - new PokemonSpecies(Species.MUNKIDORI, 9, true, false, false, "Retainer Pokémon", Type.POISON, Type.PSYCHIC, 1, 12.2, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.FRISK, 555, 88, 75, 66, 130, 90, 106, 3, 0, 276, GrowthRate.SLOW, 100, false), - new PokemonSpecies(Species.FEZANDIPITI, 9, true, false, false, "Retainer Pokémon", Type.POISON, Type.FAIRY, 1.4, 30.1, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.TECHNICIAN, 555, 88, 91, 82, 70, 125, 99, 3, 0, 276, GrowthRate.SLOW, 100, false), - new PokemonSpecies(Species.OGERPON, 9, true, false, false, "Mask Pokémon", Type.GRASS, null, 1.2, 39.8, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275, GrowthRate.SLOW, 0, false, false, - new PokemonForm("Teal Mask", "teal-mask", Type.GRASS, null, 1.2, 39.8, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275, false, null, true), - new PokemonForm("Wellspring Mask", "wellspring-mask", Type.GRASS, Type.WATER, 1.2, 39.8, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), - new PokemonForm("Hearthflame Mask", "hearthflame-mask", Type.GRASS, Type.FIRE, 1.2, 39.8, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), - new PokemonForm("Cornerstone Mask", "cornerstone-mask", Type.GRASS, Type.ROCK, 1.2, 39.8, Abilities.STURDY, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), - new PokemonForm("Teal Mask Terastallized", "teal-mask-tera", Type.GRASS, null, 1.2, 39.8, Abilities.EMBODY_ASPECT_TEAL, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), - new PokemonForm("Wellspring Mask Terastallized", "wellspring-mask-tera", Type.GRASS, Type.WATER, 1.2, 39.8, Abilities.EMBODY_ASPECT_WELLSPRING, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), - new PokemonForm("Hearthflame Mask Terastallized", "hearthflame-mask-tera", Type.GRASS, Type.FIRE, 1.2, 39.8, Abilities.EMBODY_ASPECT_HEARTHFLAME, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), - new PokemonForm("Cornerstone Mask Terastallized", "cornerstone-mask-tera", Type.GRASS, Type.ROCK, 1.2, 39.8, Abilities.EMBODY_ASPECT_CORNERSTONE, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), - ), - new PokemonSpecies(Species.ARCHALUDON, 9, false, false, false, "Alloy Pokémon", Type.STEEL, Type.DRAGON, 2, 60, Abilities.STAMINA, Abilities.STURDY, Abilities.STALWART, 600, 90, 105, 130, 125, 65, 85, 10, 50, 300, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.HYDRAPPLE, 9, false, false, false, "Apple Hydra Pokémon", Type.GRASS, Type.DRAGON, 1.8, 93, Abilities.SUPERSWEET_SYRUP, Abilities.REGENERATOR, Abilities.STICKY_HOLD, 540, 106, 80, 110, 120, 80, 44, 10, 50, 270, GrowthRate.ERRATIC, 50, false), - new PokemonSpecies(Species.GOUGING_FIRE, 9, false, false, false, "Paradox Pokémon", Type.FIRE, Type.DRAGON, 3.5, 590, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 105, 115, 121, 65, 93, 91, 10, 0, 295, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.RAGING_BOLT, 9, false, false, false, "Paradox Pokémon", Type.ELECTRIC, Type.DRAGON, 5.2, 480, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 125, 73, 91, 137, 89, 75, 10, 0, 295, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.IRON_BOULDER, 9, false, false, false, "Paradox Pokémon", Type.ROCK, Type.PSYCHIC, 1.5, 162.5, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 120, 80, 68, 108, 124, 10, 0, 295, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.IRON_CROWN, 9, false, false, false, "Paradox Pokémon", Type.STEEL, Type.PSYCHIC, 1.6, 156, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 72, 100, 122, 108, 98, 10, 0, 295, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.TERAPAGOS, 9, false, true, false, "Tera Pokémon", Type.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, 90, GrowthRate.SLOW, 50, false, false, - new PokemonForm("Normal Form", "", Type.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, 90, false, null, true), - new PokemonForm("Terastal Form", "terastal", Type.NORMAL, null, 0.3, 16, Abilities.TERA_SHELL, Abilities.NONE, Abilities.NONE, 600, 95, 95, 110, 105, 110, 85, 5, 50, 90), - new PokemonForm("Stellar Form", "stellar", Type.NORMAL, null, 1.7, 77, Abilities.TERAFORM_ZERO, Abilities.NONE, Abilities.NONE, 700, 160, 105, 110, 130, 110, 85, 5, 50, 90), - ), - new PokemonSpecies(Species.PECHARUNT, 9, false, false, true, "Subjugation Pokémon", Type.POISON, Type.GHOST, 0.3, 0.3, Abilities.POISON_PUPPETEER, Abilities.NONE, Abilities.NONE, 600, 88, 88, 160, 88, 88, 88, 3, 0, 300, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.ALOLA_RATTATA, 7, false, false, false, "Mouse Pokémon", Type.DARK, Type.NORMAL, 0.3, 3.8, Abilities.GLUTTONY, Abilities.HUSTLE, Abilities.THICK_FAT, 253, 30, 56, 35, 25, 35, 72, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_RATICATE, 7, false, false, false, "Mouse Pokémon", Type.DARK, Type.NORMAL, 0.7, 25.5, Abilities.GLUTTONY, Abilities.HUSTLE, Abilities.THICK_FAT, 413, 75, 71, 70, 40, 80, 77, 127, 70, 145, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_RAICHU, 7, false, false, false, "Mouse Pokémon", Type.ELECTRIC, Type.PSYCHIC, 0.7, 21, Abilities.SURGE_SURFER, Abilities.NONE, Abilities.NONE, 485, 60, 85, 50, 95, 85, 110, 75, 50, 243, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_SANDSHREW, 7, false, false, false, "Mouse Pokémon", Type.ICE, Type.STEEL, 0.7, 40, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SLUSH_RUSH, 300, 50, 75, 90, 10, 35, 40, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_SANDSLASH, 7, false, false, false, "Mouse Pokémon", Type.ICE, Type.STEEL, 1.2, 55, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SLUSH_RUSH, 450, 75, 100, 120, 25, 65, 65, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_VULPIX, 7, false, false, false, "Fox Pokémon", Type.ICE, null, 0.6, 9.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SNOW_WARNING, 299, 38, 41, 40, 50, 65, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 25, false), - new PokemonSpecies(Species.ALOLA_NINETALES, 7, false, false, false, "Fox Pokémon", Type.ICE, Type.FAIRY, 1.1, 19.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SNOW_WARNING, 505, 73, 67, 75, 81, 100, 109, 75, 50, 177, GrowthRate.MEDIUM_FAST, 25, false), - new PokemonSpecies(Species.ALOLA_DIGLETT, 7, false, false, false, "Mole Pokémon", Type.GROUND, Type.STEEL, 0.2, 1, Abilities.SAND_VEIL, Abilities.TANGLING_HAIR, Abilities.SAND_FORCE, 265, 10, 55, 30, 35, 45, 90, 255, 50, 53, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_DUGTRIO, 7, false, false, false, "Mole Pokémon", Type.GROUND, Type.STEEL, 0.7, 66.6, Abilities.SAND_VEIL, Abilities.TANGLING_HAIR, Abilities.SAND_FORCE, 425, 35, 100, 60, 50, 70, 110, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_MEOWTH, 7, false, false, false, "Scratch Cat Pokémon", Type.DARK, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.RATTLED, 290, 40, 35, 35, 50, 40, 90, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_PERSIAN, 7, false, false, false, "Classy Cat Pokémon", Type.DARK, null, 1.1, 33, Abilities.FUR_COAT, Abilities.TECHNICIAN, Abilities.RATTLED, 440, 65, 60, 60, 75, 65, 115, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_GEODUDE, 7, false, false, false, "Rock Pokémon", Type.ROCK, Type.ELECTRIC, 0.4, 20.3, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 300, 40, 80, 100, 30, 30, 20, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.ALOLA_GRAVELER, 7, false, false, false, "Rock Pokémon", Type.ROCK, Type.ELECTRIC, 1, 110, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 390, 55, 95, 115, 45, 45, 35, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.ALOLA_GOLEM, 7, false, false, false, "Megaton Pokémon", Type.ROCK, Type.ELECTRIC, 1.7, 316, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 495, 80, 120, 130, 55, 65, 45, 45, 70, 223, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.ALOLA_GRIMER, 7, false, false, false, "Sludge Pokémon", Type.POISON, Type.DARK, 0.7, 42, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 325, 80, 80, 50, 40, 50, 25, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_MUK, 7, false, false, false, "Sludge Pokémon", Type.POISON, Type.DARK, 1, 52, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ALOLA_EXEGGUTOR, 7, false, false, false, "Coconut Pokémon", Type.GRASS, Type.DRAGON, 10.9, 415.6, Abilities.FRISK, Abilities.NONE, Abilities.HARVEST, 530, 95, 105, 85, 125, 75, 45, 45, 50, 186, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.ALOLA_MAROWAK, 7, false, false, false, "Bone Keeper Pokémon", Type.FIRE, Type.GHOST, 1, 34, Abilities.CURSED_BODY, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.ETERNAL_FLOETTE, 6, true, false, false, "Single Bloom Pokémon", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 551, 74, 65, 67, 125, 128, 92, 120, 70, 130, GrowthRate.MEDIUM_FAST, 0, false), //Marked as Sub-Legend, for casing purposes - new PokemonSpecies(Species.GALAR_MEOWTH, 8, false, false, false, "Scratch Cat Pokémon", Type.STEEL, null, 0.4, 7.5, Abilities.PICKUP, Abilities.TOUGH_CLAWS, Abilities.UNNERVE, 290, 50, 65, 55, 40, 40, 40, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_PONYTA, 8, false, false, false, "Fire Horse Pokémon", Type.PSYCHIC, null, 0.8, 24, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_RAPIDASH, 8, false, false, false, "Fire Horse Pokémon", Type.PSYCHIC, Type.FAIRY, 1.7, 80, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_SLOWPOKE, 8, false, false, false, "Dopey Pokémon", Type.PSYCHIC, null, 1.2, 36, Abilities.GLUTTONY, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 315, 90, 65, 65, 40, 40, 15, 190, 50, 63, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_SLOWBRO, 8, false, false, false, "Hermit Crab Pokémon", Type.POISON, Type.PSYCHIC, 1.6, 70.5, Abilities.QUICK_DRAW, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 100, 95, 100, 70, 30, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_FARFETCHD, 8, false, false, false, "Wild Duck Pokémon", Type.FIGHTING, null, 0.8, 42, Abilities.STEADFAST, Abilities.NONE, Abilities.SCRAPPY, 377, 52, 95, 55, 58, 62, 55, 45, 50, 132, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_WEEZING, 8, false, false, false, "Poison Gas Pokémon", Type.POISON, Type.FAIRY, 3, 16, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.MISTY_SURGE, 490, 65, 90, 120, 85, 70, 60, 60, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_MR_MIME, 8, false, false, false, "Barrier Pokémon", Type.ICE, Type.PSYCHIC, 1.4, 56.8, Abilities.VITAL_SPIRIT, Abilities.SCREEN_CLEANER, Abilities.ICE_BODY, 460, 50, 65, 65, 90, 90, 100, 45, 50, 161, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_ARTICUNO, 8, true, false, false, "Freeze Pokémon", Type.PSYCHIC, Type.FLYING, 1.7, 50.9, Abilities.COMPETITIVE, Abilities.NONE, Abilities.NONE, 580, 90, 85, 85, 125, 100, 95, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.GALAR_ZAPDOS, 8, true, false, false, "Electric Pokémon", Type.FIGHTING, Type.FLYING, 1.6, 58.2, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 580, 90, 125, 90, 85, 90, 100, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.GALAR_MOLTRES, 8, true, false, false, "Flame Pokémon", Type.DARK, Type.FLYING, 2, 66, Abilities.BERSERK, Abilities.NONE, Abilities.NONE, 580, 90, 85, 90, 100, 125, 90, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.GALAR_SLOWKING, 8, false, false, false, "Royal Pokémon", Type.POISON, Type.PSYCHIC, 1.8, 79.5, Abilities.CURIOUS_MEDICINE, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 65, 80, 110, 110, 30, 70, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_CORSOLA, 8, false, false, false, "Coral Pokémon", Type.GHOST, null, 0.6, 0.5, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 410, 60, 55, 100, 65, 100, 30, 60, 50, 144, GrowthRate.FAST, 25, false), - new PokemonSpecies(Species.GALAR_ZIGZAGOON, 8, false, false, false, "Tiny Raccoon Pokémon", Type.DARK, Type.NORMAL, 0.4, 17.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 240, 38, 30, 41, 30, 41, 60, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_LINOONE, 8, false, false, false, "Rushing Pokémon", Type.DARK, Type.NORMAL, 0.5, 32.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 420, 78, 70, 61, 50, 61, 100, 90, 50, 147, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_DARUMAKA, 8, false, false, false, "Zen Charm Pokémon", Type.ICE, null, 0.7, 40, Abilities.HUSTLE, Abilities.NONE, Abilities.INNER_FOCUS, 315, 70, 90, 45, 15, 45, 50, 120, 50, 63, GrowthRate.MEDIUM_SLOW, 50, false), - new PokemonSpecies(Species.GALAR_DARMANITAN, 8, false, false, false, "Blazing Pokémon", Type.ICE, null, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false, true, - new PokemonForm("Standard Mode", "", Type.ICE, null, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, false, null, true), - new PokemonForm("Zen Mode", "zen", Type.ICE, Type.FIRE, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 540, 105, 160, 55, 30, 55, 135, 60, 50, 189), - ), - new PokemonSpecies(Species.GALAR_YAMASK, 8, false, false, false, "Spirit Pokémon", Type.GROUND, Type.GHOST, 0.5, 1.5, Abilities.WANDERING_SPIRIT, Abilities.NONE, Abilities.NONE, 303, 38, 55, 85, 30, 65, 30, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.GALAR_STUNFISK, 8, false, false, false, "Trap Pokémon", Type.GROUND, Type.STEEL, 0.7, 20.5, Abilities.MIMICRY, Abilities.NONE, Abilities.NONE, 471, 109, 81, 99, 66, 84, 32, 75, 70, 165, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.HISUI_GROWLITHE, 8, false, false, false, "Puppy Pokémon", Type.FIRE, Type.ROCK, 0.8, 22.7, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.ROCK_HEAD, 350, 60, 75, 45, 65, 50, 55, 190, 50, 70, GrowthRate.SLOW, 75, false), - new PokemonSpecies(Species.HISUI_ARCANINE, 8, false, false, false, "Legendary Pokémon", Type.FIRE, Type.ROCK, 2, 168, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.ROCK_HEAD, 555, 95, 115, 80, 95, 80, 90, 85, 50, 194, GrowthRate.SLOW, 75, false), - new PokemonSpecies(Species.HISUI_VOLTORB, 8, false, false, false, "Ball Pokémon", Type.ELECTRIC, Type.GRASS, 0.5, 13, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 330, 40, 30, 50, 55, 55, 100, 190, 80, 66, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.HISUI_ELECTRODE, 8, false, false, false, "Ball Pokémon", Type.ELECTRIC, Type.GRASS, 1.2, 81, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 490, 60, 50, 70, 80, 80, 150, 60, 70, 172, GrowthRate.MEDIUM_FAST, null, false), - new PokemonSpecies(Species.HISUI_TYPHLOSION, 8, false, false, false, "Volcano Pokémon", Type.FIRE, Type.GHOST, 1.6, 69.8, Abilities.BLAZE, Abilities.NONE, Abilities.FRISK, 534, 73, 84, 78, 119, 85, 95, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.HISUI_QWILFISH, 8, false, false, false, "Balloon Pokémon", Type.DARK, Type.POISON, 0.5, 3.9, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 440, 65, 95, 85, 55, 55, 85, 45, 50, 88, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.HISUI_SNEASEL, 8, false, false, false, "Sharp Claw Pokémon", Type.FIGHTING, Type.POISON, 0.9, 27, Abilities.INNER_FOCUS, Abilities.KEEN_EYE, Abilities.PICKPOCKET, 430, 55, 95, 55, 35, 75, 115, 60, 35, 86, GrowthRate.MEDIUM_SLOW, 50, true), - new PokemonSpecies(Species.HISUI_SAMUROTT, 8, false, false, false, "Formidable Pokémon", Type.WATER, Type.DARK, 1.5, 58.2, Abilities.TORRENT, Abilities.NONE, Abilities.SHARPNESS, 528, 90, 108, 80, 100, 65, 85, 45, 80, 238, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.HISUI_LILLIGANT, 8, false, false, false, "Flowering Pokémon", Type.GRASS, Type.FIGHTING, 1.2, 19.2, Abilities.CHLOROPHYLL, Abilities.HUSTLE, Abilities.LEAF_GUARD, 480, 70, 105, 75, 50, 75, 105, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false), - new PokemonSpecies(Species.HISUI_ZORUA, 8, false, false, false, "Tricky Fox Pokémon", Type.NORMAL, Type.GHOST, 0.7, 12.5, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 330, 35, 60, 40, 85, 40, 70, 75, 50, 66, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.HISUI_ZOROARK, 8, false, false, false, "Illusion Fox Pokémon", Type.NORMAL, Type.GHOST, 1.6, 83, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 510, 55, 100, 60, 125, 60, 110, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.HISUI_BRAVIARY, 8, false, false, false, "Valiant Pokémon", Type.PSYCHIC, Type.FLYING, 1.7, 43.4, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.TINTED_LENS, 510, 110, 83, 70, 112, 70, 65, 60, 50, 179, GrowthRate.SLOW, 100, false), - new PokemonSpecies(Species.HISUI_SLIGGOO, 8, false, false, false, "Soft Tissue Pokémon", Type.STEEL, Type.DRAGON, 0.7, 68.5, Abilities.SAP_SIPPER, Abilities.SHELL_ARMOR, Abilities.GOOEY, 452, 58, 75, 83, 83, 113, 40, 45, 35, 158, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.HISUI_GOODRA, 8, false, false, false, "Dragon Pokémon", Type.STEEL, Type.DRAGON, 1.7, 334.1, Abilities.SAP_SIPPER, Abilities.SHELL_ARMOR, Abilities.GOOEY, 600, 80, 100, 100, 110, 150, 60, 45, 35, 270, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.HISUI_AVALUGG, 8, false, false, false, "Iceberg Pokémon", Type.ICE, Type.ROCK, 1.4, 262.4, Abilities.STRONG_JAW, Abilities.ICE_BODY, Abilities.STURDY, 514, 95, 127, 184, 34, 36, 38, 55, 50, 180, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.HISUI_DECIDUEYE, 8, false, false, false, "Arrow Quill Pokémon", Type.GRASS, Type.FIGHTING, 1.6, 37, Abilities.OVERGROW, Abilities.NONE, Abilities.SCRAPPY, 530, 88, 112, 80, 95, 95, 60, 45, 50, 239, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.PALDEA_TAUROS, 9, false, false, false, "Wild Bull Pokémon", Type.FIGHTING, null, 1.4, 115, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, GrowthRate.SLOW, 100, false, false, - new PokemonForm("Combat Breed", "combat", Type.FIGHTING, null, 1.4, 115, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, "", true), - new PokemonForm("Blaze Breed", "blaze", Type.FIGHTING, Type.FIRE, 1.4, 85, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, null, true), - new PokemonForm("Aqua Breed", "aqua", Type.FIGHTING, Type.WATER, 1.4, 110, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, null, true), - ), - new PokemonSpecies(Species.PALDEA_WOOPER, 9, false, false, false, "Water Fish Pokémon", Type.POISON, Type.GROUND, 0.4, 11, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.BLOODMOON_URSALUNA, 9, true, false, false, "Peat Pokémon", Type.GROUND, Type.NORMAL, 2.7, 333, Abilities.MINDS_EYE, Abilities.NONE, Abilities.NONE, 555, 113, 70, 120, 135, 65, 52, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false), //Marked as Sub-Legend, for casing purposes + new PokemonSpecies(Species.BULBASAUR, 1, false, false, false, "Seed Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.7, 6.9, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 318, 45, 49, 49, 65, 65, 45, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.IVYSAUR, 1, false, false, false, "Seed Pokémon", PokemonType.GRASS, PokemonType.POISON, 1, 13, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 405, 60, 62, 63, 80, 80, 60, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.VENUSAUR, 1, false, false, false, "Seed Pokémon", PokemonType.GRASS, PokemonType.POISON, 2, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 80, 82, 83, 100, 100, 80, 45, 50, 263, GrowthRate.MEDIUM_SLOW, 87.5, true, true, + new PokemonForm("Normal", "", PokemonType.GRASS, PokemonType.POISON, 2, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 80, 82, 83, 100, 100, 80, 45, 50, 263, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.GRASS, PokemonType.POISON, 2.4, 155.5, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 625, 80, 100, 123, 122, 120, 80, 45, 50, 263, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, PokemonType.POISON, 24, 999.9, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.EFFECT_SPORE, 625, 120, 82, 98, 130, 115, 80, 45, 50, 263, true), + ), + new PokemonSpecies(Species.CHARMANDER, 1, false, false, false, "Lizard Pokémon", PokemonType.FIRE, null, 0.6, 8.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 309, 39, 52, 43, 60, 50, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.CHARMELEON, 1, false, false, false, "Flame Pokémon", PokemonType.FIRE, null, 1.1, 19, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 405, 58, 64, 58, 80, 65, 80, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.CHARIZARD, 1, false, false, false, "Flame Pokémon", PokemonType.FIRE, PokemonType.FLYING, 1.7, 90.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 534, 78, 84, 78, 109, 85, 100, 45, 50, 267, GrowthRate.MEDIUM_SLOW, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.FIRE, PokemonType.FLYING, 1.7, 90.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 534, 78, 84, 78, 109, 85, 100, 45, 50, 267, false, null, true), + new PokemonForm("Mega X", SpeciesFormKey.MEGA_X, PokemonType.FIRE, PokemonType.DRAGON, 1.7, 110.5, Abilities.TOUGH_CLAWS, Abilities.NONE, Abilities.TOUGH_CLAWS, 634, 78, 130, 111, 130, 85, 100, 45, 50, 267), + new PokemonForm("Mega Y", SpeciesFormKey.MEGA_Y, PokemonType.FIRE, PokemonType.FLYING, 1.7, 100.5, Abilities.DROUGHT, Abilities.NONE, Abilities.DROUGHT, 634, 78, 104, 78, 159, 115, 100, 45, 50, 267), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FIRE, PokemonType.FLYING, 28, 999.9, Abilities.BERSERK, Abilities.NONE, Abilities.BERSERK, 634, 118, 84, 93, 139, 100, 100, 45, 50, 267), + ), + new PokemonSpecies(Species.SQUIRTLE, 1, false, false, false, "Tiny Turtle Pokémon", PokemonType.WATER, null, 0.5, 9, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 314, 44, 48, 65, 50, 64, 43, 45, 50, 63, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.WARTORTLE, 1, false, false, false, "Turtle Pokémon", PokemonType.WATER, null, 1, 22.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 405, 59, 63, 80, 65, 80, 58, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.BLASTOISE, 1, false, false, false, "Shellfish Pokémon", PokemonType.WATER, null, 1.6, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 530, 79, 83, 100, 85, 105, 78, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.WATER, null, 1.6, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 530, 79, 83, 100, 85, 105, 78, 45, 50, 265, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.WATER, null, 1.6, 101.1, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.MEGA_LAUNCHER, 630, 79, 103, 120, 135, 115, 78, 45, 50, 265), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.WATER, PokemonType.STEEL, 25, 999.9, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.SHELL_ARMOR, 630, 119, 83, 135, 115, 110, 68, 45, 50, 265), + ), + new PokemonSpecies(Species.CATERPIE, 1, false, false, false, "Worm Pokémon", PokemonType.BUG, null, 0.3, 2.9, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 30, 35, 20, 20, 45, 255, 50, 39, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.METAPOD, 1, false, false, false, "Cocoon Pokémon", PokemonType.BUG, null, 0.7, 9.9, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 20, 55, 25, 25, 30, 120, 50, 72, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BUTTERFREE, 1, false, false, false, "Butterfly Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, GrowthRate.MEDIUM_FAST, 50, true, true, + new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, true, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.BUG, PokemonType.FLYING, 17, 999.9, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.COMPOUND_EYES, 495, 85, 35, 80, 120, 90, 85, 45, 50, 198, true), + ), + new PokemonSpecies(Species.WEEDLE, 1, false, false, false, "Hairy Bug Pokémon", PokemonType.BUG, PokemonType.POISON, 0.3, 3.2, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 40, 35, 30, 20, 20, 50, 255, 70, 39, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.KAKUNA, 1, false, false, false, "Cocoon Pokémon", PokemonType.BUG, PokemonType.POISON, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 45, 25, 50, 25, 25, 35, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BEEDRILL, 1, false, false, false, "Poison Bee Pokémon", PokemonType.BUG, PokemonType.POISON, 1, 29.5, Abilities.SWARM, Abilities.NONE, Abilities.SNIPER, 395, 65, 90, 40, 45, 80, 75, 45, 70, 198, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.POISON, 1, 29.5, Abilities.SWARM, Abilities.NONE, Abilities.SNIPER, 395, 65, 90, 40, 45, 80, 75, 45, 70, 198, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.BUG, PokemonType.POISON, 1.4, 40.5, Abilities.ADAPTABILITY, Abilities.NONE, Abilities.ADAPTABILITY, 495, 65, 150, 40, 15, 80, 145, 45, 70, 198), + ), + new PokemonSpecies(Species.PIDGEY, 1, false, false, false, "Tiny Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 1.8, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 251, 40, 45, 40, 35, 35, 56, 255, 70, 50, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.PIDGEOTTO, 1, false, false, false, "Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.1, 30, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 349, 63, 60, 55, 50, 50, 71, 120, 70, 122, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.PIDGEOT, 1, false, false, false, "Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.5, 39.5, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 479, 83, 80, 75, 70, 70, 101, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.NORMAL, PokemonType.FLYING, 1.5, 39.5, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 479, 83, 80, 75, 70, 70, 101, 45, 70, 240, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.NORMAL, PokemonType.FLYING, 2.2, 50.5, Abilities.NO_GUARD, Abilities.NO_GUARD, Abilities.NO_GUARD, 579, 83, 80, 80, 135, 80, 121, 45, 70, 240), + ), + new PokemonSpecies(Species.RATTATA, 1, false, false, false, "Mouse Pokémon", PokemonType.NORMAL, null, 0.3, 3.5, Abilities.RUN_AWAY, Abilities.GUTS, Abilities.HUSTLE, 253, 30, 56, 35, 25, 35, 72, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.RATICATE, 1, false, false, false, "Mouse Pokémon", PokemonType.NORMAL, null, 0.7, 18.5, Abilities.RUN_AWAY, Abilities.GUTS, Abilities.HUSTLE, 413, 55, 81, 60, 50, 70, 97, 127, 70, 145, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.SPEAROW, 1, false, false, false, "Tiny Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 2, Abilities.KEEN_EYE, Abilities.NONE, Abilities.SNIPER, 262, 40, 60, 30, 31, 31, 70, 255, 70, 52, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FEAROW, 1, false, false, false, "Beak Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.2, 38, Abilities.KEEN_EYE, Abilities.NONE, Abilities.SNIPER, 442, 65, 90, 65, 61, 61, 100, 90, 70, 155, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.EKANS, 1, false, false, false, "Snake Pokémon", PokemonType.POISON, null, 2, 6.9, Abilities.INTIMIDATE, Abilities.SHED_SKIN, Abilities.UNNERVE, 288, 35, 60, 44, 40, 54, 55, 255, 70, 58, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ARBOK, 1, false, false, false, "Cobra Pokémon", PokemonType.POISON, null, 3.5, 65, Abilities.INTIMIDATE, Abilities.SHED_SKIN, Abilities.UNNERVE, 448, 60, 95, 69, 65, 79, 80, 90, 70, 157, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PIKACHU, 1, false, false, false, "Mouse Pokémon", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 320, 35, 55, 40, 50, 50, 90, 190, 50, 112, GrowthRate.MEDIUM_FAST, 50, true, true, + new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 320, 35, 55, 40, 50, 50, 90, 190, 50, 112, true, null, true), + new PokemonForm("Partner", "partner", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), + new PokemonForm("Cosplay", "cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom + new PokemonForm("Cool Cosplay", "cool-cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom + new PokemonForm("Beauty Cosplay", "beauty-cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom + new PokemonForm("Cute Cosplay", "cute-cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom + new PokemonForm("Smart Cosplay", "smart-cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom + new PokemonForm("Tough Cosplay", "tough-cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.ELECTRIC, null, 21, 999.9, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.LIGHTNING_ROD, 530, 125, 95, 60, 90, 70, 90, 190, 50, 112), //+100 BST from Partner Form + ), + new PokemonSpecies(Species.RAICHU, 1, false, false, false, "Mouse Pokémon", PokemonType.ELECTRIC, null, 0.8, 30, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 485, 60, 90, 55, 90, 80, 110, 75, 50, 243, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.SANDSHREW, 1, false, false, false, "Mouse Pokémon", PokemonType.GROUND, null, 0.6, 12, Abilities.SAND_VEIL, Abilities.NONE, Abilities.SAND_RUSH, 300, 50, 75, 85, 20, 30, 40, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SANDSLASH, 1, false, false, false, "Mouse Pokémon", PokemonType.GROUND, null, 1, 29.5, Abilities.SAND_VEIL, Abilities.NONE, Abilities.SAND_RUSH, 450, 75, 100, 110, 45, 55, 65, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.NIDORAN_F, 1, false, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.4, 7, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 275, 55, 47, 52, 40, 40, 41, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 0, false), + new PokemonSpecies(Species.NIDORINA, 1, false, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.8, 20, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 365, 70, 62, 67, 55, 55, 56, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 0, false), + new PokemonSpecies(Species.NIDOQUEEN, 1, false, false, false, "Drill Pokémon", PokemonType.POISON, PokemonType.GROUND, 1.3, 60, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.SHEER_FORCE, 505, 90, 92, 87, 75, 85, 76, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 0, false), + new PokemonSpecies(Species.NIDORAN_M, 1, false, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.5, 9, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 273, 46, 57, 40, 40, 40, 50, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 100, false), + new PokemonSpecies(Species.NIDORINO, 1, false, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.9, 19.5, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 365, 61, 72, 57, 55, 55, 65, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 100, false), + new PokemonSpecies(Species.NIDOKING, 1, false, false, false, "Drill Pokémon", PokemonType.POISON, PokemonType.GROUND, 1.4, 62, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.SHEER_FORCE, 505, 81, 102, 77, 85, 75, 85, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 100, false), + new PokemonSpecies(Species.CLEFAIRY, 1, false, false, false, "Fairy Pokémon", PokemonType.FAIRY, null, 0.6, 7.5, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 323, 70, 45, 48, 60, 65, 35, 150, 140, 113, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.CLEFABLE, 1, false, false, false, "Fairy Pokémon", PokemonType.FAIRY, null, 1.3, 40, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.UNAWARE, 483, 95, 70, 73, 95, 90, 60, 25, 140, 242, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.VULPIX, 1, false, false, false, "Fox Pokémon", PokemonType.FIRE, null, 0.6, 9.9, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.DROUGHT, 299, 38, 41, 40, 50, 65, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 25, false), + new PokemonSpecies(Species.NINETALES, 1, false, false, false, "Fox Pokémon", PokemonType.FIRE, null, 1.1, 19.9, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.DROUGHT, 505, 73, 76, 75, 81, 100, 100, 75, 50, 177, GrowthRate.MEDIUM_FAST, 25, false), + new PokemonSpecies(Species.JIGGLYPUFF, 1, false, false, false, "Balloon Pokémon", PokemonType.NORMAL, PokemonType.FAIRY, 0.5, 5.5, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 270, 115, 45, 20, 45, 25, 20, 170, 50, 95, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.WIGGLYTUFF, 1, false, false, false, "Balloon Pokémon", PokemonType.NORMAL, PokemonType.FAIRY, 1, 12, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRISK, 435, 140, 70, 45, 85, 50, 45, 50, 50, 218, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.ZUBAT, 1, false, false, false, "Bat Pokémon", PokemonType.POISON, PokemonType.FLYING, 0.8, 7.5, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 245, 40, 45, 35, 30, 40, 55, 255, 50, 49, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.GOLBAT, 1, false, false, false, "Bat Pokémon", PokemonType.POISON, PokemonType.FLYING, 1.6, 55, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 455, 75, 80, 70, 65, 75, 90, 90, 50, 159, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.ODDISH, 1, false, false, false, "Weed Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.5, 5.4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.RUN_AWAY, 320, 45, 50, 55, 75, 65, 30, 255, 50, 64, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GLOOM, 1, false, false, false, "Weed Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.8, 8.6, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.STENCH, 395, 60, 65, 70, 85, 75, 40, 120, 50, 138, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.VILEPLUME, 1, false, false, false, "Flower Pokémon", PokemonType.GRASS, PokemonType.POISON, 1.2, 18.6, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.EFFECT_SPORE, 490, 75, 80, 85, 110, 90, 50, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.PARAS, 1, false, false, false, "Mushroom Pokémon", PokemonType.BUG, PokemonType.GRASS, 0.3, 5.4, Abilities.EFFECT_SPORE, Abilities.DRY_SKIN, Abilities.DAMP, 285, 35, 70, 55, 45, 55, 25, 190, 70, 57, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PARASECT, 1, false, false, false, "Mushroom Pokémon", PokemonType.BUG, PokemonType.GRASS, 1, 29.5, Abilities.EFFECT_SPORE, Abilities.DRY_SKIN, Abilities.DAMP, 405, 60, 95, 80, 60, 80, 30, 75, 70, 142, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.VENONAT, 1, false, false, false, "Insect Pokémon", PokemonType.BUG, PokemonType.POISON, 1, 30, Abilities.COMPOUND_EYES, Abilities.TINTED_LENS, Abilities.RUN_AWAY, 305, 60, 55, 50, 40, 55, 45, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.VENOMOTH, 1, false, false, false, "Poison Moth Pokémon", PokemonType.BUG, PokemonType.POISON, 1.5, 12.5, Abilities.SHIELD_DUST, Abilities.TINTED_LENS, Abilities.WONDER_SKIN, 450, 70, 65, 60, 90, 75, 90, 75, 70, 158, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DIGLETT, 1, false, false, false, "Mole Pokémon", PokemonType.GROUND, null, 0.2, 0.8, Abilities.SAND_VEIL, Abilities.ARENA_TRAP, Abilities.SAND_FORCE, 265, 10, 55, 25, 35, 45, 95, 255, 50, 53, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DUGTRIO, 1, false, false, false, "Mole Pokémon", PokemonType.GROUND, null, 0.7, 33.3, Abilities.SAND_VEIL, Abilities.ARENA_TRAP, Abilities.SAND_FORCE, 425, 35, 100, 50, 50, 70, 120, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MEOWTH, 1, false, false, false, "Scratch Cat Pokémon", PokemonType.NORMAL, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 290, 40, 45, 35, 40, 40, 90, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.NORMAL, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 290, 40, 45, 35, 40, 40, 90, 255, 50, 58, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.NORMAL, null, 33, 999.9, Abilities.TECHNICIAN, Abilities.TECHNICIAN, Abilities.TECHNICIAN, 540, 115, 110, 65, 65, 70, 115, 255, 50, 58), //+100 BST from Persian + ), + new PokemonSpecies(Species.PERSIAN, 1, false, false, false, "Classy Cat Pokémon", PokemonType.NORMAL, null, 1, 32, Abilities.LIMBER, Abilities.TECHNICIAN, Abilities.UNNERVE, 440, 65, 70, 60, 65, 65, 115, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PSYDUCK, 1, false, false, false, "Duck Pokémon", PokemonType.WATER, null, 0.8, 19.6, Abilities.DAMP, Abilities.CLOUD_NINE, Abilities.SWIFT_SWIM, 320, 50, 52, 48, 65, 50, 55, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GOLDUCK, 1, false, false, false, "Duck Pokémon", PokemonType.WATER, null, 1.7, 76.6, Abilities.DAMP, Abilities.CLOUD_NINE, Abilities.SWIFT_SWIM, 500, 80, 82, 78, 95, 80, 85, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MANKEY, 1, false, false, false, "Pig Monkey Pokémon", PokemonType.FIGHTING, null, 0.5, 28, Abilities.VITAL_SPIRIT, Abilities.ANGER_POINT, Abilities.DEFIANT, 305, 40, 80, 35, 35, 45, 70, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PRIMEAPE, 1, false, false, false, "Pig Monkey Pokémon", PokemonType.FIGHTING, null, 1, 32, Abilities.VITAL_SPIRIT, Abilities.ANGER_POINT, Abilities.DEFIANT, 455, 65, 105, 60, 60, 70, 95, 75, 70, 159, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GROWLITHE, 1, false, false, false, "Puppy Pokémon", PokemonType.FIRE, null, 0.7, 19, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.JUSTIFIED, 350, 55, 70, 45, 70, 50, 60, 190, 50, 70, GrowthRate.SLOW, 75, false), + new PokemonSpecies(Species.ARCANINE, 1, false, false, false, "Legendary Pokémon", PokemonType.FIRE, null, 1.9, 155, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.JUSTIFIED, 555, 90, 110, 80, 100, 80, 95, 75, 50, 194, GrowthRate.SLOW, 75, false), + new PokemonSpecies(Species.POLIWAG, 1, false, false, false, "Tadpole Pokémon", PokemonType.WATER, null, 0.6, 12.4, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 300, 40, 50, 40, 40, 40, 90, 255, 50, 60, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.POLIWHIRL, 1, false, false, false, "Tadpole Pokémon", PokemonType.WATER, null, 1, 20, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 385, 65, 65, 65, 50, 50, 90, 120, 50, 135, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.POLIWRATH, 1, false, false, false, "Tadpole Pokémon", PokemonType.WATER, PokemonType.FIGHTING, 1.3, 54, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 510, 90, 95, 95, 70, 90, 70, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.ABRA, 1, false, false, false, "Psi Pokémon", PokemonType.PSYCHIC, null, 0.9, 19.5, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 310, 25, 20, 15, 105, 55, 90, 200, 50, 62, GrowthRate.MEDIUM_SLOW, 75, false), + new PokemonSpecies(Species.KADABRA, 1, false, false, false, "Psi Pokémon", PokemonType.PSYCHIC, null, 1.3, 56.5, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 400, 40, 35, 30, 120, 70, 105, 100, 50, 140, GrowthRate.MEDIUM_SLOW, 75, true), + new PokemonSpecies(Species.ALAKAZAM, 1, false, false, false, "Psi Pokémon", PokemonType.PSYCHIC, null, 1.5, 48, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 500, 55, 50, 45, 135, 95, 120, 50, 50, 250, GrowthRate.MEDIUM_SLOW, 75, true, true, + new PokemonForm("Normal", "", PokemonType.PSYCHIC, null, 1.5, 48, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 500, 55, 50, 45, 135, 95, 120, 50, 50, 250, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.PSYCHIC, null, 1.2, 48, Abilities.TRACE, Abilities.TRACE, Abilities.TRACE, 600, 55, 50, 65, 175, 105, 150, 50, 50, 250, true), + ), + new PokemonSpecies(Species.MACHOP, 1, false, false, false, "Superpower Pokémon", PokemonType.FIGHTING, null, 0.8, 19.5, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 305, 70, 80, 50, 35, 35, 35, 180, 50, 61, GrowthRate.MEDIUM_SLOW, 75, false), + new PokemonSpecies(Species.MACHOKE, 1, false, false, false, "Superpower Pokémon", PokemonType.FIGHTING, null, 1.5, 70.5, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 405, 80, 100, 70, 50, 60, 45, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 75, false), + new PokemonSpecies(Species.MACHAMP, 1, false, false, false, "Superpower Pokémon", PokemonType.FIGHTING, null, 1.6, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 505, 90, 130, 80, 65, 85, 55, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 75, false, true, + new PokemonForm("Normal", "", PokemonType.FIGHTING, null, 1.6, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 505, 90, 130, 80, 65, 85, 55, 45, 50, 253, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FIGHTING, null, 25, 999.9, Abilities.GUTS, Abilities.GUTS, Abilities.GUTS, 605, 115, 170, 95, 65, 95, 65, 45, 50, 253), + ), + new PokemonSpecies(Species.BELLSPROUT, 1, false, false, false, "Flower Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.7, 4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 300, 50, 75, 35, 70, 30, 40, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.WEEPINBELL, 1, false, false, false, "Flycatcher Pokémon", PokemonType.GRASS, PokemonType.POISON, 1, 6.4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 390, 65, 90, 50, 85, 45, 55, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.VICTREEBEL, 1, false, false, false, "Flycatcher Pokémon", PokemonType.GRASS, PokemonType.POISON, 1.7, 15.5, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 490, 80, 105, 65, 100, 70, 70, 45, 70, 245, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.TENTACOOL, 1, false, false, false, "Jellyfish Pokémon", PokemonType.WATER, PokemonType.POISON, 0.9, 45.5, Abilities.CLEAR_BODY, Abilities.LIQUID_OOZE, Abilities.RAIN_DISH, 335, 40, 40, 35, 50, 100, 70, 190, 50, 67, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.TENTACRUEL, 1, false, false, false, "Jellyfish Pokémon", PokemonType.WATER, PokemonType.POISON, 1.6, 55, Abilities.CLEAR_BODY, Abilities.LIQUID_OOZE, Abilities.RAIN_DISH, 515, 80, 70, 65, 80, 120, 100, 60, 50, 180, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.GEODUDE, 1, false, false, false, "Rock Pokémon", PokemonType.ROCK, PokemonType.GROUND, 0.4, 20, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 300, 40, 80, 100, 30, 30, 20, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GRAVELER, 1, false, false, false, "Rock Pokémon", PokemonType.ROCK, PokemonType.GROUND, 1, 105, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 390, 55, 95, 115, 45, 45, 35, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GOLEM, 1, false, false, false, "Megaton Pokémon", PokemonType.ROCK, PokemonType.GROUND, 1.4, 300, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 495, 80, 120, 130, 55, 65, 45, 45, 70, 248, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.PONYTA, 1, false, false, false, "Fire Horse Pokémon", PokemonType.FIRE, null, 1, 30, Abilities.RUN_AWAY, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.RAPIDASH, 1, false, false, false, "Fire Horse Pokémon", PokemonType.FIRE, null, 1.7, 95, Abilities.RUN_AWAY, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SLOWPOKE, 1, false, false, false, "Dopey Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 1.2, 36, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 315, 90, 65, 65, 40, 40, 15, 190, 50, 63, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SLOWBRO, 1, false, false, false, "Hermit Crab Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 1.6, 78.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 110, 100, 80, 30, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.PSYCHIC, 1.6, 78.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 110, 100, 80, 30, 75, 50, 172, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.WATER, PokemonType.PSYCHIC, 2, 120, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, 590, 95, 75, 180, 130, 80, 30, 75, 50, 172), + ), + new PokemonSpecies(Species.MAGNEMITE, 1, false, false, false, "Magnet Pokémon", PokemonType.ELECTRIC, PokemonType.STEEL, 0.3, 6, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 325, 25, 35, 70, 95, 55, 45, 190, 50, 65, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.MAGNETON, 1, false, false, false, "Magnet Pokémon", PokemonType.ELECTRIC, PokemonType.STEEL, 1, 60, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 465, 50, 60, 95, 120, 70, 70, 60, 50, 163, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.FARFETCHD, 1, false, false, false, "Wild Duck Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.8, 15, Abilities.KEEN_EYE, Abilities.INNER_FOCUS, Abilities.DEFIANT, 377, 52, 90, 55, 58, 62, 60, 45, 50, 132, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DODUO, 1, false, false, false, "Twin Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.4, 39.2, Abilities.RUN_AWAY, Abilities.EARLY_BIRD, Abilities.TANGLED_FEET, 310, 35, 85, 45, 35, 35, 75, 190, 70, 62, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.DODRIO, 1, false, false, false, "Triple Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.8, 85.2, Abilities.RUN_AWAY, Abilities.EARLY_BIRD, Abilities.TANGLED_FEET, 470, 60, 110, 70, 60, 60, 110, 45, 70, 165, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.SEEL, 1, false, false, false, "Sea Lion Pokémon", PokemonType.WATER, null, 1.1, 90, Abilities.THICK_FAT, Abilities.HYDRATION, Abilities.ICE_BODY, 325, 65, 45, 55, 45, 70, 45, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DEWGONG, 1, false, false, false, "Sea Lion Pokémon", PokemonType.WATER, PokemonType.ICE, 1.7, 120, Abilities.THICK_FAT, Abilities.HYDRATION, Abilities.ICE_BODY, 475, 90, 70, 80, 70, 95, 70, 75, 70, 166, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GRIMER, 1, false, false, false, "Sludge Pokémon", PokemonType.POISON, null, 0.9, 30, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.POISON_TOUCH, 325, 80, 80, 50, 40, 50, 25, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MUK, 1, false, false, false, "Sludge Pokémon", PokemonType.POISON, null, 1.2, 30, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.POISON_TOUCH, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SHELLDER, 1, false, false, false, "Bivalve Pokémon", PokemonType.WATER, null, 0.3, 4, Abilities.SHELL_ARMOR, Abilities.SKILL_LINK, Abilities.OVERCOAT, 305, 30, 65, 100, 45, 25, 40, 190, 50, 61, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.CLOYSTER, 1, false, false, false, "Bivalve Pokémon", PokemonType.WATER, PokemonType.ICE, 1.5, 132.5, Abilities.SHELL_ARMOR, Abilities.SKILL_LINK, Abilities.OVERCOAT, 525, 50, 95, 180, 85, 45, 70, 60, 50, 184, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.GASTLY, 1, false, false, false, "Gas Pokémon", PokemonType.GHOST, PokemonType.POISON, 1.3, 0.1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 310, 30, 35, 30, 100, 35, 80, 190, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.HAUNTER, 1, false, false, false, "Gas Pokémon", PokemonType.GHOST, PokemonType.POISON, 1.6, 0.1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 405, 45, 50, 45, 115, 55, 95, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GENGAR, 1, false, false, false, "Shadow Pokémon", PokemonType.GHOST, PokemonType.POISON, 1.5, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 500, 60, 65, 60, 130, 75, 110, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.GHOST, PokemonType.POISON, 1.5, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 500, 60, 65, 60, 130, 75, 110, 45, 50, 250, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.GHOST, PokemonType.POISON, 1.4, 40.5, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.NONE, 600, 60, 65, 80, 170, 95, 130, 45, 50, 250), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GHOST, PokemonType.POISON, 20, 999.9, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 600, 140, 65, 70, 140, 85, 100, 45, 50, 250), + ), + new PokemonSpecies(Species.ONIX, 1, false, false, false, "Rock Snake Pokémon", PokemonType.ROCK, PokemonType.GROUND, 8.8, 210, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.WEAK_ARMOR, 385, 35, 45, 160, 30, 45, 70, 45, 50, 77, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DROWZEE, 1, false, false, false, "Hypnosis Pokémon", PokemonType.PSYCHIC, null, 1, 32.4, Abilities.INSOMNIA, Abilities.FOREWARN, Abilities.INNER_FOCUS, 328, 60, 48, 45, 43, 90, 42, 190, 70, 66, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.HYPNO, 1, false, false, false, "Hypnosis Pokémon", PokemonType.PSYCHIC, null, 1.6, 75.6, Abilities.INSOMNIA, Abilities.FOREWARN, Abilities.INNER_FOCUS, 483, 85, 73, 70, 73, 115, 67, 75, 70, 169, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.KRABBY, 1, false, false, false, "River Crab Pokémon", PokemonType.WATER, null, 0.4, 6.5, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 325, 30, 105, 90, 25, 25, 50, 225, 50, 65, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.KINGLER, 1, false, false, false, "Pincer Pokémon", PokemonType.WATER, null, 1.3, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 475, 55, 130, 115, 50, 50, 75, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.WATER, null, 1.3, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 475, 55, 130, 115, 50, 50, 75, 60, 50, 166, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.WATER, null, 19, 999.9, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 575, 90, 155, 140, 50, 70, 70, 60, 50, 166), + ), + new PokemonSpecies(Species.VOLTORB, 1, false, false, false, "Ball Pokémon", PokemonType.ELECTRIC, null, 0.5, 10.4, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 330, 40, 30, 50, 55, 55, 100, 190, 70, 66, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.ELECTRODE, 1, false, false, false, "Ball Pokémon", PokemonType.ELECTRIC, null, 1.2, 66.6, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 490, 60, 50, 70, 80, 80, 150, 60, 70, 172, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.EXEGGCUTE, 1, false, false, false, "Egg Pokémon", PokemonType.GRASS, PokemonType.PSYCHIC, 0.4, 2.5, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HARVEST, 325, 60, 40, 80, 60, 45, 40, 90, 50, 65, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.EXEGGUTOR, 1, false, false, false, "Coconut Pokémon", PokemonType.GRASS, PokemonType.PSYCHIC, 2, 120, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HARVEST, 530, 95, 95, 85, 125, 75, 55, 45, 50, 186, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.CUBONE, 1, false, false, false, "Lonely Pokémon", PokemonType.GROUND, null, 0.4, 6.5, Abilities.ROCK_HEAD, Abilities.LIGHTNING_ROD, Abilities.BATTLE_ARMOR, 320, 50, 50, 95, 40, 50, 35, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MAROWAK, 1, false, false, false, "Bone Keeper Pokémon", PokemonType.GROUND, null, 1, 45, Abilities.ROCK_HEAD, Abilities.LIGHTNING_ROD, Abilities.BATTLE_ARMOR, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.HITMONLEE, 1, false, false, false, "Kicking Pokémon", PokemonType.FIGHTING, null, 1.5, 49.8, Abilities.LIMBER, Abilities.RECKLESS, Abilities.UNBURDEN, 455, 50, 120, 53, 35, 110, 87, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false), + new PokemonSpecies(Species.HITMONCHAN, 1, false, false, false, "Punching Pokémon", PokemonType.FIGHTING, null, 1.4, 50.2, Abilities.KEEN_EYE, Abilities.IRON_FIST, Abilities.INNER_FOCUS, 455, 50, 105, 79, 35, 110, 76, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false), + new PokemonSpecies(Species.LICKITUNG, 1, false, false, false, "Licking Pokémon", PokemonType.NORMAL, null, 1.2, 65.5, Abilities.OWN_TEMPO, Abilities.OBLIVIOUS, Abilities.CLOUD_NINE, 385, 90, 55, 75, 60, 75, 30, 45, 50, 77, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.KOFFING, 1, false, false, false, "Poison Gas Pokémon", PokemonType.POISON, null, 0.6, 1, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.STENCH, 340, 40, 65, 95, 60, 45, 35, 190, 50, 68, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.WEEZING, 1, false, false, false, "Poison Gas Pokémon", PokemonType.POISON, null, 1.2, 9.5, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.STENCH, 490, 65, 90, 120, 85, 70, 60, 60, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.RHYHORN, 1, false, false, false, "Spikes Pokémon", PokemonType.GROUND, PokemonType.ROCK, 1, 115, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, Abilities.RECKLESS, 345, 80, 85, 95, 30, 30, 25, 120, 50, 69, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.RHYDON, 1, false, false, false, "Drill Pokémon", PokemonType.GROUND, PokemonType.ROCK, 1.9, 120, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, Abilities.RECKLESS, 485, 105, 130, 120, 45, 45, 40, 60, 50, 170, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.CHANSEY, 1, false, false, false, "Egg Pokémon", PokemonType.NORMAL, null, 1.1, 34.6, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.HEALER, 450, 250, 5, 5, 35, 105, 50, 30, 140, 395, GrowthRate.FAST, 0, false), + new PokemonSpecies(Species.TANGELA, 1, false, false, false, "Vine Pokémon", PokemonType.GRASS, null, 1, 35, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.REGENERATOR, 435, 65, 55, 115, 100, 40, 60, 45, 50, 87, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.KANGASKHAN, 1, false, false, false, "Parent Pokémon", PokemonType.NORMAL, null, 2.2, 80, Abilities.EARLY_BIRD, Abilities.SCRAPPY, Abilities.INNER_FOCUS, 490, 105, 95, 80, 40, 80, 90, 45, 50, 172, GrowthRate.MEDIUM_FAST, 0, false, true, + new PokemonForm("Normal", "", PokemonType.NORMAL, null, 2.2, 80, Abilities.EARLY_BIRD, Abilities.SCRAPPY, Abilities.INNER_FOCUS, 490, 105, 95, 80, 40, 80, 90, 45, 50, 172, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.NORMAL, null, 2.2, 100, Abilities.PARENTAL_BOND, Abilities.PARENTAL_BOND, Abilities.PARENTAL_BOND, 590, 105, 125, 100, 60, 100, 100, 45, 50, 172), + ), + new PokemonSpecies(Species.HORSEA, 1, false, false, false, "Dragon Pokémon", PokemonType.WATER, null, 0.4, 8, Abilities.SWIFT_SWIM, Abilities.SNIPER, Abilities.DAMP, 295, 30, 40, 70, 70, 25, 60, 225, 50, 59, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SEADRA, 1, false, false, false, "Dragon Pokémon", PokemonType.WATER, null, 1.2, 25, Abilities.POISON_POINT, Abilities.SNIPER, Abilities.DAMP, 440, 55, 65, 95, 95, 45, 85, 75, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GOLDEEN, 1, false, false, false, "Goldfish Pokémon", PokemonType.WATER, null, 0.6, 15, Abilities.SWIFT_SWIM, Abilities.WATER_VEIL, Abilities.LIGHTNING_ROD, 320, 45, 67, 60, 35, 50, 63, 225, 50, 64, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.SEAKING, 1, false, false, false, "Goldfish Pokémon", PokemonType.WATER, null, 1.3, 39, Abilities.SWIFT_SWIM, Abilities.WATER_VEIL, Abilities.LIGHTNING_ROD, 450, 80, 92, 65, 65, 80, 68, 60, 50, 158, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.STARYU, 1, false, false, false, "Star Shape Pokémon", PokemonType.WATER, null, 0.8, 34.5, Abilities.ILLUMINATE, Abilities.NATURAL_CURE, Abilities.ANALYTIC, 340, 30, 45, 55, 70, 55, 85, 225, 50, 68, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.STARMIE, 1, false, false, false, "Mysterious Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 1.1, 80, Abilities.ILLUMINATE, Abilities.NATURAL_CURE, Abilities.ANALYTIC, 520, 60, 75, 85, 100, 85, 115, 60, 50, 182, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.MR_MIME, 1, false, false, false, "Barrier Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 1.3, 54.5, Abilities.SOUNDPROOF, Abilities.FILTER, Abilities.TECHNICIAN, 460, 40, 45, 65, 100, 120, 90, 45, 50, 161, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SCYTHER, 1, false, false, false, "Mantis Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.5, 56, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.STEADFAST, 500, 70, 110, 80, 55, 80, 105, 45, 50, 100, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.JYNX, 1, false, false, false, "Human Shape Pokémon", PokemonType.ICE, PokemonType.PSYCHIC, 1.4, 40.6, Abilities.OBLIVIOUS, Abilities.FOREWARN, Abilities.DRY_SKIN, 455, 65, 50, 35, 115, 95, 95, 45, 50, 159, GrowthRate.MEDIUM_FAST, 0, false), + new PokemonSpecies(Species.ELECTABUZZ, 1, false, false, false, "Electric Pokémon", PokemonType.ELECTRIC, null, 1.1, 30, Abilities.STATIC, Abilities.NONE, Abilities.VITAL_SPIRIT, 490, 65, 83, 57, 95, 85, 105, 45, 50, 172, GrowthRate.MEDIUM_FAST, 75, false), + new PokemonSpecies(Species.MAGMAR, 1, false, false, false, "Spitfire Pokémon", PokemonType.FIRE, null, 1.3, 44.5, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 495, 65, 95, 57, 100, 85, 93, 45, 50, 173, GrowthRate.MEDIUM_FAST, 75, false), + new PokemonSpecies(Species.PINSIR, 1, false, false, false, "Stag Beetle Pokémon", PokemonType.BUG, null, 1.5, 55, Abilities.HYPER_CUTTER, Abilities.MOLD_BREAKER, Abilities.MOXIE, 500, 65, 125, 100, 55, 70, 85, 45, 50, 175, GrowthRate.SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.BUG, null, 1.5, 55, Abilities.HYPER_CUTTER, Abilities.MOLD_BREAKER, Abilities.MOXIE, 500, 65, 125, 100, 55, 70, 85, 45, 50, 175, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.BUG, PokemonType.FLYING, 1.7, 59, Abilities.AERILATE, Abilities.AERILATE, Abilities.AERILATE, 600, 65, 155, 120, 65, 90, 105, 45, 50, 175), + ), + new PokemonSpecies(Species.TAUROS, 1, false, false, false, "Wild Bull Pokémon", PokemonType.NORMAL, null, 1.4, 88.4, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.SHEER_FORCE, 490, 75, 100, 95, 40, 70, 110, 45, 50, 172, GrowthRate.SLOW, 100, false), + new PokemonSpecies(Species.MAGIKARP, 1, false, false, false, "Fish Pokémon", PokemonType.WATER, null, 0.9, 10, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.RATTLED, 200, 20, 10, 55, 15, 20, 80, 255, 50, 40, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.GYARADOS, 1, false, false, false, "Atrocious Pokémon", PokemonType.WATER, PokemonType.FLYING, 6.5, 235, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 540, 95, 125, 79, 60, 100, 81, 45, 50, 189, GrowthRate.SLOW, 50, true, true, + new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.FLYING, 6.5, 235, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 540, 95, 125, 79, 60, 100, 81, 45, 50, 189, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.WATER, PokemonType.DARK, 6.5, 305, Abilities.MOLD_BREAKER, Abilities.MOLD_BREAKER, Abilities.MOLD_BREAKER, 640, 95, 155, 109, 70, 130, 81, 45, 50, 189, true), + ), + new PokemonSpecies(Species.LAPRAS, 1, false, false, false, "Transport Pokémon", PokemonType.WATER, PokemonType.ICE, 2.5, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 535, 130, 85, 80, 85, 95, 60, 45, 50, 187, GrowthRate.SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.ICE, 2.5, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 535, 130, 85, 80, 85, 95, 60, 45, 50, 187, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.WATER, PokemonType.ICE, 24, 999.9, Abilities.SHIELD_DUST, Abilities.SHIELD_DUST, Abilities.SHIELD_DUST, 635, 170, 85, 85, 105, 130, 60, 45, 50, 187), + ), + new PokemonSpecies(Species.DITTO, 1, false, false, false, "Transform Pokémon", PokemonType.NORMAL, null, 0.3, 4, Abilities.LIMBER, Abilities.NONE, Abilities.IMPOSTER, 288, 48, 48, 48, 48, 48, 48, 35, 50, 101, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.EEVEE, 1, false, false, false, "Evolution Pokémon", PokemonType.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 325, 55, 55, 50, 45, 65, 55, 45, 50, 65, GrowthRate.MEDIUM_FAST, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 325, 55, 55, 50, 45, 65, 55, 45, 50, 65, false, null, true), + new PokemonForm("Partner", "partner", PokemonType.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 435, 65, 75, 70, 65, 85, 75, 45, 50, 65, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.NORMAL, null, 18, 999.9, Abilities.PROTEAN, Abilities.PROTEAN, Abilities.PROTEAN, 535, 110, 90, 70, 95, 85, 85, 45, 50, 65), //+100 BST from Partner Form + ), + new PokemonSpecies(Species.VAPOREON, 1, false, false, false, "Bubble Jet Pokémon", PokemonType.WATER, null, 1, 29, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.HYDRATION, 525, 130, 65, 60, 110, 95, 65, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.JOLTEON, 1, false, false, false, "Lightning Pokémon", PokemonType.ELECTRIC, null, 0.8, 24.5, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.QUICK_FEET, 525, 65, 65, 60, 110, 95, 130, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.FLAREON, 1, false, false, false, "Flame Pokémon", PokemonType.FIRE, null, 0.9, 25, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.GUTS, 525, 65, 130, 60, 95, 110, 65, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.PORYGON, 1, false, false, false, "Virtual Pokémon", PokemonType.NORMAL, null, 0.8, 36.5, Abilities.TRACE, Abilities.DOWNLOAD, Abilities.ANALYTIC, 395, 65, 60, 70, 85, 75, 40, 45, 50, 79, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.OMANYTE, 1, false, false, false, "Spiral Pokémon", PokemonType.ROCK, PokemonType.WATER, 0.4, 7.5, Abilities.SWIFT_SWIM, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 355, 35, 40, 100, 90, 55, 35, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.OMASTAR, 1, false, false, false, "Spiral Pokémon", PokemonType.ROCK, PokemonType.WATER, 1, 35, Abilities.SWIFT_SWIM, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 495, 70, 60, 125, 115, 70, 55, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.KABUTO, 1, false, false, false, "Shellfish Pokémon", PokemonType.ROCK, PokemonType.WATER, 0.5, 11.5, Abilities.SWIFT_SWIM, Abilities.BATTLE_ARMOR, Abilities.WEAK_ARMOR, 355, 30, 80, 90, 55, 45, 55, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.KABUTOPS, 1, false, false, false, "Shellfish Pokémon", PokemonType.ROCK, PokemonType.WATER, 1.3, 40.5, Abilities.SWIFT_SWIM, Abilities.BATTLE_ARMOR, Abilities.WEAK_ARMOR, 495, 60, 115, 105, 65, 70, 80, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.AERODACTYL, 1, false, false, false, "Fossil Pokémon", PokemonType.ROCK, PokemonType.FLYING, 1.8, 59, Abilities.ROCK_HEAD, Abilities.PRESSURE, Abilities.UNNERVE, 515, 80, 105, 65, 60, 75, 130, 45, 50, 180, GrowthRate.SLOW, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.ROCK, PokemonType.FLYING, 1.8, 59, Abilities.ROCK_HEAD, Abilities.PRESSURE, Abilities.UNNERVE, 515, 80, 105, 65, 60, 75, 130, 45, 50, 180, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ROCK, PokemonType.FLYING, 2.1, 79, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 615, 80, 135, 85, 70, 95, 150, 45, 50, 180), + ), + new PokemonSpecies(Species.SNORLAX, 1, false, false, false, "Sleeping Pokémon", PokemonType.NORMAL, null, 2.1, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 540, 160, 110, 65, 65, 110, 30, 25, 50, 189, GrowthRate.SLOW, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.NORMAL, null, 2.1, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 540, 160, 110, 65, 65, 110, 30, 25, 50, 189, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.NORMAL, null, 35, 999.9, Abilities.HARVEST, Abilities.HARVEST, Abilities.HARVEST, 640, 200, 135, 80, 80, 125, 20, 25, 50, 189), + ), + new PokemonSpecies(Species.ARTICUNO, 1, true, false, false, "Freeze Pokémon", PokemonType.ICE, PokemonType.FLYING, 1.7, 55.4, Abilities.PRESSURE, Abilities.NONE, Abilities.SNOW_CLOAK, 580, 90, 85, 100, 95, 125, 85, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.ZAPDOS, 1, true, false, false, "Electric Pokémon", PokemonType.ELECTRIC, PokemonType.FLYING, 1.6, 52.6, Abilities.PRESSURE, Abilities.NONE, Abilities.STATIC, 580, 90, 90, 85, 125, 90, 100, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.MOLTRES, 1, true, false, false, "Flame Pokémon", PokemonType.FIRE, PokemonType.FLYING, 2, 60, Abilities.PRESSURE, Abilities.NONE, Abilities.FLAME_BODY, 580, 90, 100, 90, 125, 85, 90, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.DRATINI, 1, false, false, false, "Dragon Pokémon", PokemonType.DRAGON, null, 1.8, 3.3, Abilities.SHED_SKIN, Abilities.NONE, Abilities.MARVEL_SCALE, 300, 41, 64, 45, 50, 50, 50, 45, 35, 60, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.DRAGONAIR, 1, false, false, false, "Dragon Pokémon", PokemonType.DRAGON, null, 4, 16.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.MARVEL_SCALE, 420, 61, 84, 65, 70, 70, 70, 45, 35, 147, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.DRAGONITE, 1, false, false, false, "Dragon Pokémon", PokemonType.DRAGON, PokemonType.FLYING, 2.2, 210, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.MULTISCALE, 600, 91, 134, 95, 100, 100, 80, 45, 35, 300, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.MEWTWO, 1, false, true, false, "Genetic Pokémon", PokemonType.PSYCHIC, null, 2, 122, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 680, 106, 110, 90, 154, 90, 130, 3, 0, 340, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.PSYCHIC, null, 2, 122, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 680, 106, 110, 90, 154, 90, 130, 3, 0, 340, false, null, true), + new PokemonForm("Mega X", SpeciesFormKey.MEGA_X, PokemonType.PSYCHIC, PokemonType.FIGHTING, 2.3, 127, Abilities.STEADFAST, Abilities.NONE, Abilities.STEADFAST, 780, 106, 190, 100, 154, 100, 130, 3, 0, 340), + new PokemonForm("Mega Y", SpeciesFormKey.MEGA_Y, PokemonType.PSYCHIC, null, 1.5, 33, Abilities.INSOMNIA, Abilities.NONE, Abilities.INSOMNIA, 780, 106, 150, 70, 194, 120, 140, 3, 0, 340), + ), + new PokemonSpecies(Species.MEW, 1, false, false, true, "New Species Pokémon", PokemonType.PSYCHIC, null, 0.4, 4, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false), + new PokemonSpecies(Species.CHIKORITA, 2, false, false, false, "Leaf Pokémon", PokemonType.GRASS, null, 0.9, 6.4, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 318, 45, 49, 65, 49, 65, 45, 45, 70, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.BAYLEEF, 2, false, false, false, "Leaf Pokémon", PokemonType.GRASS, null, 1.2, 15.8, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 405, 60, 62, 80, 63, 80, 60, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.MEGANIUM, 2, false, false, false, "Herb Pokémon", PokemonType.GRASS, null, 1.8, 100.5, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 525, 80, 82, 100, 83, 100, 80, 45, 70, 263, GrowthRate.MEDIUM_SLOW, 87.5, true), + new PokemonSpecies(Species.CYNDAQUIL, 2, false, false, false, "Fire Mouse Pokémon", PokemonType.FIRE, null, 0.5, 7.9, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 309, 39, 52, 43, 60, 50, 65, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.QUILAVA, 2, false, false, false, "Volcano Pokémon", PokemonType.FIRE, null, 0.9, 19, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 405, 58, 64, 58, 80, 65, 80, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.TYPHLOSION, 2, false, false, false, "Volcano Pokémon", PokemonType.FIRE, null, 1.7, 79.5, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 534, 78, 84, 78, 109, 85, 100, 45, 70, 267, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.TOTODILE, 2, false, false, false, "Big Jaw Pokémon", PokemonType.WATER, null, 0.6, 9.5, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 314, 50, 65, 64, 44, 48, 43, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.CROCONAW, 2, false, false, false, "Big Jaw Pokémon", PokemonType.WATER, null, 1.1, 25, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 405, 65, 80, 80, 59, 63, 58, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.FERALIGATR, 2, false, false, false, "Big Jaw Pokémon", PokemonType.WATER, null, 2.3, 88.8, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 530, 85, 105, 100, 79, 83, 78, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.SENTRET, 2, false, false, false, "Scout Pokémon", PokemonType.NORMAL, null, 0.8, 6, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.FRISK, 215, 35, 46, 34, 35, 45, 20, 255, 70, 43, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FURRET, 2, false, false, false, "Long Body Pokémon", PokemonType.NORMAL, null, 1.8, 32.5, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.FRISK, 415, 85, 76, 64, 45, 55, 90, 90, 70, 145, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.HOOTHOOT, 2, false, false, false, "Owl Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.7, 21.2, Abilities.INSOMNIA, Abilities.KEEN_EYE, Abilities.TINTED_LENS, 262, 60, 30, 30, 36, 56, 50, 255, 50, 52, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.NOCTOWL, 2, false, false, false, "Owl Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.6, 40.8, Abilities.INSOMNIA, Abilities.KEEN_EYE, Abilities.TINTED_LENS, 452, 100, 50, 50, 86, 96, 70, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.LEDYBA, 2, false, false, false, "Five Star Pokémon", PokemonType.BUG, PokemonType.FLYING, 1, 10.8, Abilities.SWARM, Abilities.EARLY_BIRD, Abilities.RATTLED, 265, 40, 20, 30, 40, 80, 55, 255, 70, 53, GrowthRate.FAST, 50, true), + new PokemonSpecies(Species.LEDIAN, 2, false, false, false, "Five Star Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.4, 35.6, Abilities.SWARM, Abilities.EARLY_BIRD, Abilities.IRON_FIST, 390, 55, 35, 50, 55, 110, 85, 90, 70, 137, GrowthRate.FAST, 50, true), + new PokemonSpecies(Species.SPINARAK, 2, false, false, false, "String Spit Pokémon", PokemonType.BUG, PokemonType.POISON, 0.5, 8.5, Abilities.SWARM, Abilities.INSOMNIA, Abilities.SNIPER, 250, 40, 60, 40, 40, 40, 30, 255, 70, 50, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.ARIADOS, 2, false, false, false, "Long Leg Pokémon", PokemonType.BUG, PokemonType.POISON, 1.1, 33.5, Abilities.SWARM, Abilities.INSOMNIA, Abilities.SNIPER, 400, 70, 90, 70, 60, 70, 40, 90, 70, 140, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.CROBAT, 2, false, false, false, "Bat Pokémon", PokemonType.POISON, PokemonType.FLYING, 1.8, 75, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 535, 85, 90, 80, 70, 80, 130, 90, 50, 268, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CHINCHOU, 2, false, false, false, "Angler Pokémon", PokemonType.WATER, PokemonType.ELECTRIC, 0.5, 12, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 330, 75, 38, 38, 56, 56, 67, 190, 50, 66, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.LANTURN, 2, false, false, false, "Light Pokémon", PokemonType.WATER, PokemonType.ELECTRIC, 1.2, 22.5, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 460, 125, 58, 58, 76, 76, 67, 75, 50, 161, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.PICHU, 2, false, false, false, "Tiny Mouse Pokémon", PokemonType.ELECTRIC, null, 0.3, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true), + new PokemonForm("Spiky-Eared", "spiky", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true), + ), + new PokemonSpecies(Species.CLEFFA, 2, false, false, false, "Star Shape Pokémon", PokemonType.FAIRY, null, 0.3, 3, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 218, 50, 25, 28, 45, 55, 15, 150, 140, 44, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.IGGLYBUFF, 2, false, false, false, "Balloon Pokémon", PokemonType.NORMAL, PokemonType.FAIRY, 0.3, 1, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 210, 90, 30, 15, 40, 20, 15, 170, 50, 42, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.TOGEPI, 2, false, false, false, "Spike Ball Pokémon", PokemonType.FAIRY, null, 0.3, 1.5, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 245, 35, 20, 65, 40, 65, 20, 190, 50, 49, GrowthRate.FAST, 87.5, false), + new PokemonSpecies(Species.TOGETIC, 2, false, false, false, "Happiness Pokémon", PokemonType.FAIRY, PokemonType.FLYING, 0.6, 3.2, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 405, 55, 40, 85, 80, 105, 40, 75, 50, 142, GrowthRate.FAST, 87.5, false), + new PokemonSpecies(Species.NATU, 2, false, false, false, "Tiny Bird Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 0.2, 2, Abilities.SYNCHRONIZE, Abilities.EARLY_BIRD, Abilities.MAGIC_BOUNCE, 320, 40, 50, 45, 70, 45, 70, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.XATU, 2, false, false, false, "Mystic Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 1.5, 15, Abilities.SYNCHRONIZE, Abilities.EARLY_BIRD, Abilities.MAGIC_BOUNCE, 470, 65, 75, 70, 95, 70, 95, 75, 50, 165, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.MAREEP, 2, false, false, false, "Wool Pokémon", PokemonType.ELECTRIC, null, 0.6, 7.8, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 280, 55, 40, 40, 65, 45, 35, 235, 70, 56, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.FLAAFFY, 2, false, false, false, "Wool Pokémon", PokemonType.ELECTRIC, null, 0.8, 13.3, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 365, 70, 55, 55, 80, 60, 45, 120, 70, 128, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.AMPHAROS, 2, false, false, false, "Light Pokémon", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 510, 90, 75, 85, 115, 90, 55, 45, 70, 255, GrowthRate.MEDIUM_SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 510, 90, 75, 85, 115, 90, 55, 45, 70, 255, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ELECTRIC, PokemonType.DRAGON, 1.4, 61.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.MOLD_BREAKER, 610, 90, 95, 105, 165, 110, 45, 45, 70, 255), + ), + new PokemonSpecies(Species.BELLOSSOM, 2, false, false, false, "Flower Pokémon", PokemonType.GRASS, null, 0.4, 5.8, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HEALER, 490, 75, 80, 95, 90, 100, 50, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.MARILL, 2, false, false, false, "Aqua Mouse Pokémon", PokemonType.WATER, PokemonType.FAIRY, 0.4, 8.5, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 250, 70, 20, 50, 20, 50, 40, 190, 50, 88, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.AZUMARILL, 2, false, false, false, "Aqua Rabbit Pokémon", PokemonType.WATER, PokemonType.FAIRY, 0.8, 28.5, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 420, 100, 50, 80, 60, 80, 50, 75, 50, 210, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.SUDOWOODO, 2, false, false, false, "Imitation Pokémon", PokemonType.ROCK, null, 1.2, 38, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.RATTLED, 410, 70, 100, 115, 30, 65, 30, 65, 50, 144, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.POLITOED, 2, false, false, false, "Frog Pokémon", PokemonType.WATER, null, 1.1, 33.9, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.DRIZZLE, 500, 90, 75, 75, 90, 100, 70, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.HOPPIP, 2, false, false, false, "Cottonweed Pokémon", PokemonType.GRASS, PokemonType.FLYING, 0.4, 0.5, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 250, 35, 35, 40, 35, 55, 50, 255, 70, 50, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SKIPLOOM, 2, false, false, false, "Cottonweed Pokémon", PokemonType.GRASS, PokemonType.FLYING, 0.6, 1, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 340, 55, 45, 50, 45, 65, 80, 120, 70, 119, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.JUMPLUFF, 2, false, false, false, "Cottonweed Pokémon", PokemonType.GRASS, PokemonType.FLYING, 0.8, 3, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 460, 75, 55, 70, 55, 95, 110, 45, 70, 230, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.AIPOM, 2, false, false, false, "Long Tail Pokémon", PokemonType.NORMAL, null, 0.8, 11.5, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.SKILL_LINK, 360, 55, 70, 55, 40, 55, 85, 45, 70, 72, GrowthRate.FAST, 50, true), + new PokemonSpecies(Species.SUNKERN, 2, false, false, false, "Seed Pokémon", PokemonType.GRASS, null, 0.3, 1.8, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.EARLY_BIRD, 180, 30, 30, 30, 30, 30, 30, 235, 70, 36, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SUNFLORA, 2, false, false, false, "Sun Pokémon", PokemonType.GRASS, null, 0.8, 8.5, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.EARLY_BIRD, 425, 75, 75, 55, 105, 85, 30, 120, 70, 149, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.YANMA, 2, false, false, false, "Clear Wing Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.2, 38, Abilities.SPEED_BOOST, Abilities.COMPOUND_EYES, Abilities.FRISK, 390, 65, 65, 45, 75, 45, 95, 75, 70, 78, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.WOOPER, 2, false, false, false, "Water Fish Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.4, 8.5, Abilities.DAMP, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.QUAGSIRE, 2, false, false, false, "Water Fish Pokémon", PokemonType.WATER, PokemonType.GROUND, 1.4, 75, Abilities.DAMP, Abilities.WATER_ABSORB, Abilities.UNAWARE, 430, 95, 85, 85, 65, 65, 35, 90, 50, 151, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.ESPEON, 2, false, false, false, "Sun Pokémon", PokemonType.PSYCHIC, null, 0.9, 26.5, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.MAGIC_BOUNCE, 525, 65, 65, 60, 130, 95, 110, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.UMBREON, 2, false, false, false, "Moonlight Pokémon", PokemonType.DARK, null, 1, 27, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.INNER_FOCUS, 525, 95, 65, 110, 60, 130, 65, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.MURKROW, 2, false, false, false, "Darkness Pokémon", PokemonType.DARK, PokemonType.FLYING, 0.5, 2.1, Abilities.INSOMNIA, Abilities.SUPER_LUCK, Abilities.PRANKSTER, 405, 60, 85, 42, 85, 42, 91, 30, 35, 81, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.SLOWKING, 2, false, false, false, "Royal Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 2, 79.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 80, 100, 110, 30, 70, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MISDREAVUS, 2, false, false, false, "Screech Pokémon", PokemonType.GHOST, null, 0.7, 1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 435, 60, 60, 60, 85, 85, 85, 45, 35, 87, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.UNOWN, 2, false, false, false, "Symbol Pokémon", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, GrowthRate.MEDIUM_FAST, null, false, false, + new PokemonForm("A", "a", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("B", "b", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("C", "c", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("D", "d", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("E", "e", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("F", "f", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("G", "g", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("H", "h", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("I", "i", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("J", "j", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("K", "k", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("L", "l", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("M", "m", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("N", "n", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("O", "o", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("P", "p", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("Q", "q", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("R", "r", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("S", "s", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("T", "t", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("U", "u", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("V", "v", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("W", "w", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("X", "x", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("Y", "y", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("Z", "z", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("!", "exclamation", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + new PokemonForm("?", "question", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true), + ), + new PokemonSpecies(Species.WOBBUFFET, 2, false, false, false, "Patient Pokémon", PokemonType.PSYCHIC, null, 1.3, 28.5, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.TELEPATHY, 405, 190, 33, 58, 33, 58, 33, 45, 50, 142, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.GIRAFARIG, 2, false, false, false, "Long Neck Pokémon", PokemonType.NORMAL, PokemonType.PSYCHIC, 1.5, 41.5, Abilities.INNER_FOCUS, Abilities.EARLY_BIRD, Abilities.SAP_SIPPER, 455, 70, 80, 65, 90, 65, 85, 60, 70, 159, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.PINECO, 2, false, false, false, "Bagworm Pokémon", PokemonType.BUG, null, 0.6, 7.2, Abilities.STURDY, Abilities.NONE, Abilities.OVERCOAT, 290, 50, 65, 90, 35, 35, 15, 190, 70, 58, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FORRETRESS, 2, false, false, false, "Bagworm Pokémon", PokemonType.BUG, PokemonType.STEEL, 1.2, 125.8, Abilities.STURDY, Abilities.NONE, Abilities.OVERCOAT, 465, 75, 90, 140, 60, 60, 40, 75, 70, 163, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DUNSPARCE, 2, false, false, false, "Land Snake Pokémon", PokemonType.NORMAL, null, 1.5, 14, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 415, 100, 70, 70, 65, 65, 45, 190, 50, 145, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GLIGAR, 2, false, false, false, "Fly Scorpion Pokémon", PokemonType.GROUND, PokemonType.FLYING, 1.1, 64.8, Abilities.HYPER_CUTTER, Abilities.SAND_VEIL, Abilities.IMMUNITY, 430, 65, 75, 105, 35, 65, 85, 60, 70, 86, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.STEELIX, 2, false, false, false, "Iron Snake Pokémon", PokemonType.STEEL, PokemonType.GROUND, 9.2, 400, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SHEER_FORCE, 510, 75, 85, 200, 55, 65, 30, 25, 50, 179, GrowthRate.MEDIUM_FAST, 50, true, true, + new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.GROUND, 9.2, 400, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SHEER_FORCE, 510, 75, 85, 200, 55, 65, 30, 25, 50, 179, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.STEEL, PokemonType.GROUND, 10.5, 740, Abilities.SAND_FORCE, Abilities.SAND_FORCE, Abilities.SAND_FORCE, 610, 75, 125, 230, 55, 95, 30, 25, 50, 179, true), + ), + new PokemonSpecies(Species.SNUBBULL, 2, false, false, false, "Fairy Pokémon", PokemonType.FAIRY, null, 0.6, 7.8, Abilities.INTIMIDATE, Abilities.RUN_AWAY, Abilities.RATTLED, 300, 60, 80, 50, 40, 40, 30, 190, 70, 60, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.GRANBULL, 2, false, false, false, "Fairy Pokémon", PokemonType.FAIRY, null, 1.4, 48.7, Abilities.INTIMIDATE, Abilities.QUICK_FEET, Abilities.RATTLED, 450, 90, 120, 75, 60, 60, 45, 75, 70, 158, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.QWILFISH, 2, false, false, false, "Balloon Pokémon", PokemonType.WATER, PokemonType.POISON, 0.5, 3.9, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 440, 65, 95, 85, 55, 55, 85, 45, 50, 88, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SCIZOR, 2, false, false, false, "Pincer Pokémon", PokemonType.BUG, PokemonType.STEEL, 1.8, 118, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.LIGHT_METAL, 500, 70, 130, 100, 55, 80, 65, 25, 50, 175, GrowthRate.MEDIUM_FAST, 50, true, true, + new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.STEEL, 1.8, 118, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.LIGHT_METAL, 500, 70, 130, 100, 55, 80, 65, 25, 50, 175, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.BUG, PokemonType.STEEL, 2, 125, Abilities.TECHNICIAN, Abilities.TECHNICIAN, Abilities.TECHNICIAN, 600, 70, 150, 140, 65, 100, 75, 25, 50, 175, true), + ), + new PokemonSpecies(Species.SHUCKLE, 2, false, false, false, "Mold Pokémon", PokemonType.BUG, PokemonType.ROCK, 0.6, 20.5, Abilities.STURDY, Abilities.GLUTTONY, Abilities.CONTRARY, 505, 20, 10, 230, 10, 230, 5, 190, 50, 177, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.HERACROSS, 2, false, false, false, "Single Horn Pokémon", PokemonType.BUG, PokemonType.FIGHTING, 1.5, 54, Abilities.SWARM, Abilities.GUTS, Abilities.MOXIE, 500, 80, 125, 75, 40, 95, 85, 45, 50, 175, GrowthRate.SLOW, 50, true, true, + new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.FIGHTING, 1.5, 54, Abilities.SWARM, Abilities.GUTS, Abilities.MOXIE, 500, 80, 125, 75, 40, 95, 85, 45, 50, 175, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.BUG, PokemonType.FIGHTING, 1.7, 62.5, Abilities.SKILL_LINK, Abilities.SKILL_LINK, Abilities.SKILL_LINK, 600, 80, 185, 115, 40, 105, 75, 45, 50, 175, true), + ), + new PokemonSpecies(Species.SNEASEL, 2, false, false, false, "Sharp Claw Pokémon", PokemonType.DARK, PokemonType.ICE, 0.9, 28, Abilities.INNER_FOCUS, Abilities.KEEN_EYE, Abilities.PICKPOCKET, 430, 55, 95, 55, 35, 75, 115, 60, 35, 86, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.TEDDIURSA, 2, false, false, false, "Little Bear Pokémon", PokemonType.NORMAL, null, 0.6, 8.8, Abilities.PICKUP, Abilities.QUICK_FEET, Abilities.HONEY_GATHER, 330, 60, 80, 50, 50, 50, 40, 120, 70, 66, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.URSARING, 2, false, false, false, "Hibernator Pokémon", PokemonType.NORMAL, null, 1.8, 125.8, Abilities.GUTS, Abilities.QUICK_FEET, Abilities.UNNERVE, 500, 90, 130, 75, 75, 75, 55, 60, 70, 175, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.SLUGMA, 2, false, false, false, "Lava Pokémon", PokemonType.FIRE, null, 0.7, 35, Abilities.MAGMA_ARMOR, Abilities.FLAME_BODY, Abilities.WEAK_ARMOR, 250, 40, 40, 40, 70, 40, 20, 190, 70, 50, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MAGCARGO, 2, false, false, false, "Lava Pokémon", PokemonType.FIRE, PokemonType.ROCK, 0.8, 55, Abilities.MAGMA_ARMOR, Abilities.FLAME_BODY, Abilities.WEAK_ARMOR, 430, 60, 50, 120, 90, 80, 30, 75, 70, 151, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SWINUB, 2, false, false, false, "Pig Pokémon", PokemonType.ICE, PokemonType.GROUND, 0.4, 6.5, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 250, 50, 50, 40, 30, 30, 50, 225, 50, 50, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.PILOSWINE, 2, false, false, false, "Swine Pokémon", PokemonType.ICE, PokemonType.GROUND, 1.1, 55.8, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 450, 100, 100, 80, 60, 60, 50, 75, 50, 158, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.CORSOLA, 2, false, false, false, "Coral Pokémon", PokemonType.WATER, PokemonType.ROCK, 0.6, 5, Abilities.HUSTLE, Abilities.NATURAL_CURE, Abilities.REGENERATOR, 410, 65, 55, 95, 65, 95, 35, 60, 50, 144, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.REMORAID, 2, false, false, false, "Jet Pokémon", PokemonType.WATER, null, 0.6, 12, Abilities.HUSTLE, Abilities.SNIPER, Abilities.MOODY, 300, 35, 65, 35, 65, 35, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.OCTILLERY, 2, false, false, false, "Jet Pokémon", PokemonType.WATER, null, 0.9, 28.5, Abilities.SUCTION_CUPS, Abilities.SNIPER, Abilities.MOODY, 480, 75, 105, 75, 105, 75, 45, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.DELIBIRD, 2, false, false, false, "Delivery Pokémon", PokemonType.ICE, PokemonType.FLYING, 0.9, 16, Abilities.VITAL_SPIRIT, Abilities.HUSTLE, Abilities.INSOMNIA, 330, 45, 55, 45, 65, 45, 75, 45, 50, 116, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.MANTINE, 2, false, false, false, "Kite Pokémon", PokemonType.WATER, PokemonType.FLYING, 2.1, 220, Abilities.SWIFT_SWIM, Abilities.WATER_ABSORB, Abilities.WATER_VEIL, 485, 85, 40, 70, 80, 140, 70, 25, 50, 170, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.SKARMORY, 2, false, false, false, "Armor Bird Pokémon", PokemonType.STEEL, PokemonType.FLYING, 1.7, 50.5, Abilities.KEEN_EYE, Abilities.STURDY, Abilities.WEAK_ARMOR, 465, 65, 80, 140, 40, 70, 70, 25, 50, 163, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.HOUNDOUR, 2, false, false, false, "Dark Pokémon", PokemonType.DARK, PokemonType.FIRE, 0.6, 10.8, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 330, 45, 60, 30, 80, 50, 65, 120, 35, 66, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.HOUNDOOM, 2, false, false, false, "Dark Pokémon", PokemonType.DARK, PokemonType.FIRE, 1.4, 35, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 500, 75, 90, 50, 110, 80, 95, 45, 35, 175, GrowthRate.SLOW, 50, true, true, + new PokemonForm("Normal", "", PokemonType.DARK, PokemonType.FIRE, 1.4, 35, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 500, 75, 90, 50, 110, 80, 95, 45, 35, 175, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DARK, PokemonType.FIRE, 1.9, 49.5, Abilities.SOLAR_POWER, Abilities.SOLAR_POWER, Abilities.SOLAR_POWER, 600, 75, 90, 90, 140, 90, 115, 45, 35, 175, true), + ), + new PokemonSpecies(Species.KINGDRA, 2, false, false, false, "Dragon Pokémon", PokemonType.WATER, PokemonType.DRAGON, 1.8, 152, Abilities.SWIFT_SWIM, Abilities.SNIPER, Abilities.DAMP, 540, 75, 95, 95, 95, 95, 85, 45, 50, 270, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PHANPY, 2, false, false, false, "Long Nose Pokémon", PokemonType.GROUND, null, 0.5, 33.5, Abilities.PICKUP, Abilities.NONE, Abilities.SAND_VEIL, 330, 90, 60, 60, 40, 40, 40, 120, 70, 66, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DONPHAN, 2, false, false, false, "Armor Pokémon", PokemonType.GROUND, null, 1.1, 120, Abilities.STURDY, Abilities.NONE, Abilities.SAND_VEIL, 500, 90, 120, 120, 60, 60, 50, 60, 70, 175, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.PORYGON2, 2, false, false, false, "Virtual Pokémon", PokemonType.NORMAL, null, 0.6, 32.5, Abilities.TRACE, Abilities.DOWNLOAD, Abilities.ANALYTIC, 515, 85, 80, 90, 105, 95, 60, 45, 50, 180, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.STANTLER, 2, false, false, false, "Big Horn Pokémon", PokemonType.NORMAL, null, 1.4, 71.2, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 465, 73, 95, 62, 85, 65, 85, 45, 70, 163, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.SMEARGLE, 2, false, false, false, "Painter Pokémon", PokemonType.NORMAL, null, 1.2, 58, Abilities.OWN_TEMPO, Abilities.TECHNICIAN, Abilities.MOODY, 250, 55, 20, 35, 20, 45, 75, 45, 70, 88, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.TYROGUE, 2, false, false, false, "Scuffle Pokémon", PokemonType.FIGHTING, null, 0.7, 21, Abilities.GUTS, Abilities.STEADFAST, Abilities.VITAL_SPIRIT, 210, 35, 35, 35, 35, 35, 35, 75, 50, 42, GrowthRate.MEDIUM_FAST, 100, false), + new PokemonSpecies(Species.HITMONTOP, 2, false, false, false, "Handstand Pokémon", PokemonType.FIGHTING, null, 1.4, 48, Abilities.INTIMIDATE, Abilities.TECHNICIAN, Abilities.STEADFAST, 455, 50, 95, 95, 35, 110, 70, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false), + new PokemonSpecies(Species.SMOOCHUM, 2, false, false, false, "Kiss Pokémon", PokemonType.ICE, PokemonType.PSYCHIC, 0.4, 6, Abilities.OBLIVIOUS, Abilities.FOREWARN, Abilities.HYDRATION, 305, 45, 30, 15, 85, 65, 65, 45, 50, 61, GrowthRate.MEDIUM_FAST, 0, false), + new PokemonSpecies(Species.ELEKID, 2, false, false, false, "Electric Pokémon", PokemonType.ELECTRIC, null, 0.6, 23.5, Abilities.STATIC, Abilities.NONE, Abilities.VITAL_SPIRIT, 360, 45, 63, 37, 65, 55, 95, 45, 50, 72, GrowthRate.MEDIUM_FAST, 75, false), + new PokemonSpecies(Species.MAGBY, 2, false, false, false, "Live Coal Pokémon", PokemonType.FIRE, null, 0.7, 21.4, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 365, 45, 75, 37, 70, 55, 83, 45, 50, 73, GrowthRate.MEDIUM_FAST, 75, false), + new PokemonSpecies(Species.MILTANK, 2, false, false, false, "Milk Cow Pokémon", PokemonType.NORMAL, null, 1.2, 75.5, Abilities.THICK_FAT, Abilities.SCRAPPY, Abilities.SAP_SIPPER, 490, 95, 80, 105, 40, 70, 100, 45, 50, 172, GrowthRate.SLOW, 0, false), + new PokemonSpecies(Species.BLISSEY, 2, false, false, false, "Happiness Pokémon", PokemonType.NORMAL, null, 1.5, 46.8, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.HEALER, 540, 255, 10, 10, 75, 135, 55, 30, 140, 608, GrowthRate.FAST, 0, false), + new PokemonSpecies(Species.RAIKOU, 2, true, false, false, "Thunder Pokémon", PokemonType.ELECTRIC, null, 1.9, 178, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 90, 85, 75, 115, 100, 115, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.ENTEI, 2, true, false, false, "Volcano Pokémon", PokemonType.FIRE, null, 2.1, 198, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 115, 115, 85, 90, 75, 100, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.SUICUNE, 2, true, false, false, "Aurora Pokémon", PokemonType.WATER, null, 2, 187, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 100, 75, 115, 90, 115, 85, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.LARVITAR, 2, false, false, false, "Rock Skin Pokémon", PokemonType.ROCK, PokemonType.GROUND, 0.6, 72, Abilities.GUTS, Abilities.NONE, Abilities.SAND_VEIL, 300, 50, 64, 50, 45, 50, 41, 45, 35, 60, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.PUPITAR, 2, false, false, false, "Hard Shell Pokémon", PokemonType.ROCK, PokemonType.GROUND, 1.2, 152, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 410, 70, 84, 70, 65, 70, 51, 45, 35, 144, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.TYRANITAR, 2, false, false, false, "Armor Pokémon", PokemonType.ROCK, PokemonType.DARK, 2, 202, Abilities.SAND_STREAM, Abilities.NONE, Abilities.UNNERVE, 600, 100, 134, 110, 95, 100, 61, 45, 35, 300, GrowthRate.SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.ROCK, PokemonType.DARK, 2, 202, Abilities.SAND_STREAM, Abilities.NONE, Abilities.UNNERVE, 600, 100, 134, 110, 95, 100, 61, 45, 35, 300, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ROCK, PokemonType.DARK, 2.5, 255, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_STREAM, 700, 100, 164, 150, 95, 120, 71, 45, 35, 300), + ), + new PokemonSpecies(Species.LUGIA, 2, false, true, false, "Diving Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 5.2, 216, Abilities.PRESSURE, Abilities.NONE, Abilities.MULTISCALE, 680, 106, 90, 130, 90, 154, 110, 3, 0, 340, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.HO_OH, 2, false, true, false, "Rainbow Pokémon", PokemonType.FIRE, PokemonType.FLYING, 3.8, 199, Abilities.PRESSURE, Abilities.NONE, Abilities.REGENERATOR, 680, 106, 130, 90, 110, 154, 90, 3, 0, 340, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.CELEBI, 2, false, false, true, "Time Travel Pokémon", PokemonType.PSYCHIC, PokemonType.GRASS, 0.6, 5, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false), + new PokemonSpecies(Species.TREECKO, 3, false, false, false, "Wood Gecko Pokémon", PokemonType.GRASS, null, 0.5, 5, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 310, 40, 45, 35, 65, 55, 70, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.GROVYLE, 3, false, false, false, "Wood Gecko Pokémon", PokemonType.GRASS, null, 0.9, 21.6, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 405, 50, 65, 45, 85, 65, 95, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.SCEPTILE, 3, false, false, false, "Forest Pokémon", PokemonType.GRASS, null, 1.7, 52.2, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 530, 70, 85, 65, 105, 85, 120, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.GRASS, null, 1.7, 52.2, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 530, 70, 85, 65, 105, 85, 120, 45, 50, 265, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.GRASS, PokemonType.DRAGON, 1.9, 55.2, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.LIGHTNING_ROD, 630, 70, 110, 75, 145, 85, 145, 45, 50, 265), + ), + new PokemonSpecies(Species.TORCHIC, 3, false, false, false, "Chick Pokémon", PokemonType.FIRE, null, 0.4, 2.5, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 310, 45, 60, 40, 70, 50, 45, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, true), + new PokemonSpecies(Species.COMBUSKEN, 3, false, false, false, "Young Fowl Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 0.9, 19.5, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 405, 60, 85, 60, 85, 60, 55, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, true), + new PokemonSpecies(Species.BLAZIKEN, 3, false, false, false, "Blaze Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 1.9, 52, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 530, 80, 120, 70, 110, 70, 80, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, true, true, + new PokemonForm("Normal", "", PokemonType.FIRE, PokemonType.FIGHTING, 1.9, 52, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 530, 80, 120, 70, 110, 70, 80, 45, 50, 265, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.FIRE, PokemonType.FIGHTING, 1.9, 52, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.SPEED_BOOST, 630, 80, 160, 80, 130, 80, 100, 45, 50, 265, true), + ), + new PokemonSpecies(Species.MUDKIP, 3, false, false, false, "Mud Fish Pokémon", PokemonType.WATER, null, 0.4, 7.6, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 310, 50, 70, 50, 50, 50, 40, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.MARSHTOMP, 3, false, false, false, "Mud Fish Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.7, 28, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 405, 70, 85, 70, 60, 70, 50, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.SWAMPERT, 3, false, false, false, "Mud Fish Pokémon", PokemonType.WATER, PokemonType.GROUND, 1.5, 81.9, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 535, 100, 110, 90, 85, 90, 60, 45, 50, 268, GrowthRate.MEDIUM_SLOW, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.GROUND, 1.5, 81.9, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 535, 100, 110, 90, 85, 90, 60, 45, 50, 268, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.WATER, PokemonType.GROUND, 1.9, 102, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.SWIFT_SWIM, 635, 100, 150, 110, 95, 110, 70, 45, 50, 268), + ), + new PokemonSpecies(Species.POOCHYENA, 3, false, false, false, "Bite Pokémon", PokemonType.DARK, null, 0.5, 13.6, Abilities.RUN_AWAY, Abilities.QUICK_FEET, Abilities.RATTLED, 220, 35, 55, 35, 30, 30, 35, 255, 70, 56, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MIGHTYENA, 3, false, false, false, "Bite Pokémon", PokemonType.DARK, null, 1, 37, Abilities.INTIMIDATE, Abilities.QUICK_FEET, Abilities.MOXIE, 420, 70, 90, 70, 60, 60, 70, 127, 70, 147, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ZIGZAGOON, 3, false, false, false, "Tiny Raccoon Pokémon", PokemonType.NORMAL, null, 0.4, 17.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 240, 38, 30, 41, 30, 41, 60, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.LINOONE, 3, false, false, false, "Rushing Pokémon", PokemonType.NORMAL, null, 0.5, 32.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 420, 78, 70, 61, 50, 61, 100, 90, 50, 147, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.WURMPLE, 3, false, false, false, "Worm Pokémon", PokemonType.BUG, null, 0.3, 3.6, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 45, 35, 20, 30, 20, 255, 70, 56, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SILCOON, 3, false, false, false, "Cocoon Pokémon", PokemonType.BUG, null, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BEAUTIFLY, 3, false, false, false, "Butterfly Pokémon", PokemonType.BUG, PokemonType.FLYING, 1, 28.4, Abilities.SWARM, Abilities.NONE, Abilities.RIVALRY, 395, 60, 70, 50, 100, 50, 65, 45, 70, 198, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.CASCOON, 3, false, false, false, "Cocoon Pokémon", PokemonType.BUG, null, 0.7, 11.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DUSTOX, 3, false, false, false, "Poison Moth Pokémon", PokemonType.BUG, PokemonType.POISON, 1.2, 31.6, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.COMPOUND_EYES, 385, 60, 50, 70, 50, 90, 65, 45, 70, 193, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.LOTAD, 3, false, false, false, "Water Weed Pokémon", PokemonType.WATER, PokemonType.GRASS, 0.5, 2.6, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 220, 40, 30, 30, 40, 50, 30, 255, 50, 44, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.LOMBRE, 3, false, false, false, "Jolly Pokémon", PokemonType.WATER, PokemonType.GRASS, 1.2, 32.5, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 340, 60, 50, 50, 60, 70, 50, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.LUDICOLO, 3, false, false, false, "Carefree Pokémon", PokemonType.WATER, PokemonType.GRASS, 1.5, 55, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 480, 80, 70, 70, 90, 100, 70, 45, 50, 240, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.SEEDOT, 3, false, false, false, "Acorn Pokémon", PokemonType.GRASS, null, 0.5, 4, Abilities.CHLOROPHYLL, Abilities.EARLY_BIRD, Abilities.PICKPOCKET, 220, 40, 40, 50, 30, 30, 30, 255, 50, 44, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.NUZLEAF, 3, false, false, false, "Wily Pokémon", PokemonType.GRASS, PokemonType.DARK, 1, 28, Abilities.CHLOROPHYLL, Abilities.EARLY_BIRD, Abilities.PICKPOCKET, 340, 70, 70, 40, 60, 40, 60, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.SHIFTRY, 3, false, false, false, "Wicked Pokémon", PokemonType.GRASS, PokemonType.DARK, 1.3, 59.6, Abilities.CHLOROPHYLL, Abilities.WIND_RIDER, Abilities.PICKPOCKET, 480, 90, 100, 60, 90, 60, 80, 45, 50, 240, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.TAILLOW, 3, false, false, false, "Tiny Swallow Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 2.3, Abilities.GUTS, Abilities.NONE, Abilities.SCRAPPY, 270, 40, 55, 30, 30, 30, 85, 200, 70, 54, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SWELLOW, 3, false, false, false, "Swallow Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.7, 19.8, Abilities.GUTS, Abilities.NONE, Abilities.SCRAPPY, 455, 60, 85, 60, 75, 50, 125, 45, 70, 159, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.WINGULL, 3, false, false, false, "Seagull Pokémon", PokemonType.WATER, PokemonType.FLYING, 0.6, 9.5, Abilities.KEEN_EYE, Abilities.HYDRATION, Abilities.RAIN_DISH, 270, 40, 30, 30, 55, 30, 85, 190, 50, 54, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PELIPPER, 3, false, false, false, "Water Bird Pokémon", PokemonType.WATER, PokemonType.FLYING, 1.2, 28, Abilities.KEEN_EYE, Abilities.DRIZZLE, Abilities.RAIN_DISH, 440, 60, 50, 100, 95, 70, 65, 45, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.RALTS, 3, false, false, false, "Feeling Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 0.4, 6.6, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 198, 28, 25, 25, 45, 35, 40, 235, 35, 40, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.KIRLIA, 3, false, false, false, "Emotion Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 0.8, 20.2, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 278, 38, 35, 35, 65, 55, 50, 120, 35, 97, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.GARDEVOIR, 3, false, false, false, "Embrace Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 1.6, 48.4, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 518, 68, 65, 65, 125, 115, 80, 45, 35, 259, GrowthRate.SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.FAIRY, 1.6, 48.4, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 518, 68, 65, 65, 125, 115, 80, 45, 35, 259, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.PSYCHIC, PokemonType.FAIRY, 1.6, 48.4, Abilities.PIXILATE, Abilities.PIXILATE, Abilities.PIXILATE, 618, 68, 85, 65, 165, 135, 100, 45, 35, 259), + ), + new PokemonSpecies(Species.SURSKIT, 3, false, false, false, "Pond Skater Pokémon", PokemonType.BUG, PokemonType.WATER, 0.5, 1.7, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.RAIN_DISH, 269, 40, 30, 32, 50, 52, 65, 200, 70, 54, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MASQUERAIN, 3, false, false, false, "Eyeball Pokémon", PokemonType.BUG, PokemonType.FLYING, 0.8, 3.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.UNNERVE, 454, 70, 60, 62, 100, 82, 80, 75, 70, 159, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SHROOMISH, 3, false, false, false, "Mushroom Pokémon", PokemonType.GRASS, null, 0.4, 4.5, Abilities.EFFECT_SPORE, Abilities.POISON_HEAL, Abilities.QUICK_FEET, 295, 60, 40, 60, 40, 60, 35, 255, 70, 59, GrowthRate.FLUCTUATING, 50, false), + new PokemonSpecies(Species.BRELOOM, 3, false, false, false, "Mushroom Pokémon", PokemonType.GRASS, PokemonType.FIGHTING, 1.2, 39.2, Abilities.EFFECT_SPORE, Abilities.POISON_HEAL, Abilities.TECHNICIAN, 460, 60, 130, 80, 60, 60, 70, 90, 70, 161, GrowthRate.FLUCTUATING, 50, false), + new PokemonSpecies(Species.SLAKOTH, 3, false, false, false, "Slacker Pokémon", PokemonType.NORMAL, null, 0.8, 24, Abilities.TRUANT, Abilities.NONE, Abilities.STALL, 280, 60, 60, 60, 35, 35, 30, 255, 70, 56, GrowthRate.SLOW, 50, false), //Custom Hidden + new PokemonSpecies(Species.VIGOROTH, 3, false, false, false, "Wild Monkey Pokémon", PokemonType.NORMAL, null, 1.4, 46.5, Abilities.VITAL_SPIRIT, Abilities.NONE, Abilities.INSOMNIA, 440, 80, 80, 80, 55, 55, 90, 120, 70, 154, GrowthRate.SLOW, 50, false), //Custom Hidden + new PokemonSpecies(Species.SLAKING, 3, false, false, false, "Lazy Pokémon", PokemonType.NORMAL, null, 2, 130.5, Abilities.TRUANT, Abilities.NONE, Abilities.STALL, 670, 150, 160, 100, 95, 65, 100, 45, 70, 285, GrowthRate.SLOW, 50, false), //Custom Hidden + new PokemonSpecies(Species.NINCADA, 3, false, false, false, "Trainee Pokémon", PokemonType.BUG, PokemonType.GROUND, 0.5, 5.5, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.RUN_AWAY, 266, 31, 45, 90, 30, 30, 40, 255, 50, 53, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.NINJASK, 3, false, false, false, "Ninja Pokémon", PokemonType.BUG, PokemonType.FLYING, 0.8, 12, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.INFILTRATOR, 456, 61, 90, 45, 50, 50, 160, 120, 50, 160, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.SHEDINJA, 3, false, false, false, "Shed Pokémon", PokemonType.BUG, PokemonType.GHOST, 0.8, 1.2, Abilities.WONDER_GUARD, Abilities.NONE, Abilities.NONE, 236, 1, 90, 45, 30, 30, 40, 45, 50, 83, GrowthRate.ERRATIC, null, false), + new PokemonSpecies(Species.WHISMUR, 3, false, false, false, "Whisper Pokémon", PokemonType.NORMAL, null, 0.6, 16.3, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.RATTLED, 240, 64, 51, 23, 51, 23, 28, 190, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.LOUDRED, 3, false, false, false, "Big Voice Pokémon", PokemonType.NORMAL, null, 1, 40.5, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.SCRAPPY, 360, 84, 71, 43, 71, 43, 48, 120, 50, 126, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.EXPLOUD, 3, false, false, false, "Loud Noise Pokémon", PokemonType.NORMAL, null, 1.5, 84, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.SCRAPPY, 490, 104, 91, 63, 91, 73, 68, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.MAKUHITA, 3, false, false, false, "Guts Pokémon", PokemonType.FIGHTING, null, 1, 86.4, Abilities.THICK_FAT, Abilities.GUTS, Abilities.SHEER_FORCE, 237, 72, 60, 30, 20, 30, 25, 180, 70, 47, GrowthRate.FLUCTUATING, 75, false), + new PokemonSpecies(Species.HARIYAMA, 3, false, false, false, "Arm Thrust Pokémon", PokemonType.FIGHTING, null, 2.3, 253.8, Abilities.THICK_FAT, Abilities.GUTS, Abilities.SHEER_FORCE, 474, 144, 120, 60, 40, 60, 50, 200, 70, 166, GrowthRate.FLUCTUATING, 75, false), + new PokemonSpecies(Species.AZURILL, 3, false, false, false, "Polka Dot Pokémon", PokemonType.NORMAL, PokemonType.FAIRY, 0.2, 2, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 190, 50, 20, 40, 20, 40, 20, 150, 50, 38, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.NOSEPASS, 3, false, false, false, "Compass Pokémon", PokemonType.ROCK, null, 1, 97, Abilities.STURDY, Abilities.MAGNET_PULL, Abilities.SAND_FORCE, 375, 30, 45, 135, 45, 90, 30, 255, 70, 75, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SKITTY, 3, false, false, false, "Kitten Pokémon", PokemonType.NORMAL, null, 0.6, 11, Abilities.CUTE_CHARM, Abilities.NORMALIZE, Abilities.WONDER_SKIN, 260, 50, 45, 45, 35, 35, 50, 255, 70, 52, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.DELCATTY, 3, false, false, false, "Prim Pokémon", PokemonType.NORMAL, null, 1.1, 32.6, Abilities.CUTE_CHARM, Abilities.NORMALIZE, Abilities.WONDER_SKIN, 400, 70, 65, 65, 55, 55, 90, 60, 70, 140, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.SABLEYE, 3, false, false, false, "Darkness Pokémon", PokemonType.DARK, PokemonType.GHOST, 0.5, 11, Abilities.KEEN_EYE, Abilities.STALL, Abilities.PRANKSTER, 380, 50, 75, 75, 65, 65, 50, 45, 35, 133, GrowthRate.MEDIUM_SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.DARK, PokemonType.GHOST, 0.5, 11, Abilities.KEEN_EYE, Abilities.STALL, Abilities.PRANKSTER, 380, 50, 75, 75, 65, 65, 50, 45, 35, 133, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DARK, PokemonType.GHOST, 0.5, 161, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 480, 50, 85, 125, 85, 115, 20, 45, 35, 133), + ), + new PokemonSpecies(Species.MAWILE, 3, false, false, false, "Deceiver Pokémon", PokemonType.STEEL, PokemonType.FAIRY, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.INTIMIDATE, Abilities.SHEER_FORCE, 380, 50, 85, 85, 55, 55, 50, 45, 50, 133, GrowthRate.FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.FAIRY, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.INTIMIDATE, Abilities.SHEER_FORCE, 380, 50, 85, 85, 55, 55, 50, 45, 50, 133, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.STEEL, PokemonType.FAIRY, 1, 23.5, Abilities.HUGE_POWER, Abilities.HUGE_POWER, Abilities.HUGE_POWER, 480, 50, 105, 125, 55, 95, 50, 45, 50, 133), + ), + new PokemonSpecies(Species.ARON, 3, false, false, false, "Iron Armor Pokémon", PokemonType.STEEL, PokemonType.ROCK, 0.4, 60, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 330, 50, 70, 100, 40, 40, 30, 180, 35, 66, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.LAIRON, 3, false, false, false, "Iron Armor Pokémon", PokemonType.STEEL, PokemonType.ROCK, 0.9, 120, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 430, 60, 90, 140, 50, 50, 40, 90, 35, 151, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.AGGRON, 3, false, false, false, "Iron Armor Pokémon", PokemonType.STEEL, PokemonType.ROCK, 2.1, 360, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 530, 70, 110, 180, 60, 60, 50, 45, 35, 265, GrowthRate.SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.ROCK, 2.1, 360, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 530, 70, 110, 180, 60, 60, 50, 45, 35, 265, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.STEEL, null, 2.2, 395, Abilities.FILTER, Abilities.FILTER, Abilities.FILTER, 630, 70, 140, 230, 60, 80, 50, 45, 35, 265), + ), + new PokemonSpecies(Species.MEDITITE, 3, false, false, false, "Meditate Pokémon", PokemonType.FIGHTING, PokemonType.PSYCHIC, 0.6, 11.2, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 280, 30, 40, 55, 40, 55, 60, 180, 70, 56, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.MEDICHAM, 3, false, false, false, "Meditate Pokémon", PokemonType.FIGHTING, PokemonType.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 410, 60, 60, 75, 60, 75, 80, 90, 70, 144, GrowthRate.MEDIUM_FAST, 50, true, true, + new PokemonForm("Normal", "", PokemonType.FIGHTING, PokemonType.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 410, 60, 60, 75, 60, 75, 80, 90, 70, 144, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.FIGHTING, PokemonType.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.PURE_POWER, 510, 60, 100, 85, 80, 85, 100, 90, 70, 144, true), + ), + new PokemonSpecies(Species.ELECTRIKE, 3, false, false, false, "Lightning Pokémon", PokemonType.ELECTRIC, null, 0.6, 15.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 295, 40, 45, 40, 65, 40, 65, 120, 50, 59, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.MANECTRIC, 3, false, false, false, "Discharge Pokémon", PokemonType.ELECTRIC, null, 1.5, 40.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 475, 70, 75, 60, 105, 60, 105, 45, 50, 166, GrowthRate.SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 1.5, 40.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 475, 70, 75, 60, 105, 60, 105, 45, 50, 166, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ELECTRIC, null, 1.8, 44, Abilities.INTIMIDATE, Abilities.INTIMIDATE, Abilities.INTIMIDATE, 575, 70, 75, 80, 135, 80, 135, 45, 50, 166), + ), + new PokemonSpecies(Species.PLUSLE, 3, false, false, false, "Cheering Pokémon", PokemonType.ELECTRIC, null, 0.4, 4.2, Abilities.PLUS, Abilities.NONE, Abilities.LIGHTNING_ROD, 405, 60, 50, 40, 85, 75, 95, 200, 70, 142, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MINUN, 3, false, false, false, "Cheering Pokémon", PokemonType.ELECTRIC, null, 0.4, 4.2, Abilities.MINUS, Abilities.NONE, Abilities.VOLT_ABSORB, 405, 60, 40, 50, 75, 85, 95, 200, 70, 142, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.VOLBEAT, 3, false, false, false, "Firefly Pokémon", PokemonType.BUG, null, 0.7, 17.7, Abilities.ILLUMINATE, Abilities.SWARM, Abilities.PRANKSTER, 430, 65, 73, 75, 47, 85, 85, 150, 70, 151, GrowthRate.ERRATIC, 100, false), + new PokemonSpecies(Species.ILLUMISE, 3, false, false, false, "Firefly Pokémon", PokemonType.BUG, null, 0.6, 17.7, Abilities.OBLIVIOUS, Abilities.TINTED_LENS, Abilities.PRANKSTER, 430, 65, 47, 75, 73, 85, 85, 150, 70, 151, GrowthRate.FLUCTUATING, 0, false), + new PokemonSpecies(Species.ROSELIA, 3, false, false, false, "Thorn Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.3, 2, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.LEAF_GUARD, 400, 50, 60, 45, 100, 80, 65, 150, 50, 140, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.GULPIN, 3, false, false, false, "Stomach Pokémon", PokemonType.POISON, null, 0.4, 10.3, Abilities.LIQUID_OOZE, Abilities.STICKY_HOLD, Abilities.GLUTTONY, 302, 70, 43, 53, 43, 53, 40, 225, 70, 60, GrowthRate.FLUCTUATING, 50, true), + new PokemonSpecies(Species.SWALOT, 3, false, false, false, "Poison Bag Pokémon", PokemonType.POISON, null, 1.7, 80, Abilities.LIQUID_OOZE, Abilities.STICKY_HOLD, Abilities.GLUTTONY, 467, 100, 73, 83, 73, 83, 55, 75, 70, 163, GrowthRate.FLUCTUATING, 50, true), + new PokemonSpecies(Species.CARVANHA, 3, false, false, false, "Savage Pokémon", PokemonType.WATER, PokemonType.DARK, 0.8, 20.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 305, 45, 90, 20, 65, 20, 65, 225, 35, 61, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.SHARPEDO, 3, false, false, false, "Brutal Pokémon", PokemonType.WATER, PokemonType.DARK, 1.8, 88.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 460, 70, 120, 40, 95, 40, 95, 60, 35, 161, GrowthRate.SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.DARK, 1.8, 88.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 460, 70, 120, 40, 95, 40, 95, 60, 35, 161, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.WATER, PokemonType.DARK, 2.5, 130.3, Abilities.STRONG_JAW, Abilities.NONE, Abilities.STRONG_JAW, 560, 70, 140, 70, 110, 65, 105, 60, 35, 161), + ), + new PokemonSpecies(Species.WAILMER, 3, false, false, false, "Ball Whale Pokémon", PokemonType.WATER, null, 2, 130, Abilities.WATER_VEIL, Abilities.OBLIVIOUS, Abilities.PRESSURE, 400, 130, 70, 35, 70, 35, 60, 125, 50, 80, GrowthRate.FLUCTUATING, 50, false), + new PokemonSpecies(Species.WAILORD, 3, false, false, false, "Float Whale Pokémon", PokemonType.WATER, null, 14.5, 398, Abilities.WATER_VEIL, Abilities.OBLIVIOUS, Abilities.PRESSURE, 500, 170, 90, 45, 90, 45, 60, 60, 50, 175, GrowthRate.FLUCTUATING, 50, false), + new PokemonSpecies(Species.NUMEL, 3, false, false, false, "Numb Pokémon", PokemonType.FIRE, PokemonType.GROUND, 0.7, 24, Abilities.OBLIVIOUS, Abilities.SIMPLE, Abilities.OWN_TEMPO, 305, 60, 60, 40, 65, 45, 35, 255, 70, 61, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.CAMERUPT, 3, false, false, false, "Eruption Pokémon", PokemonType.FIRE, PokemonType.GROUND, 1.9, 220, Abilities.MAGMA_ARMOR, Abilities.SOLID_ROCK, Abilities.ANGER_POINT, 460, 70, 100, 70, 105, 75, 40, 150, 70, 161, GrowthRate.MEDIUM_FAST, 50, true, true, + new PokemonForm("Normal", "", PokemonType.FIRE, PokemonType.GROUND, 1.9, 220, Abilities.MAGMA_ARMOR, Abilities.SOLID_ROCK, Abilities.ANGER_POINT, 460, 70, 100, 70, 105, 75, 40, 150, 70, 161, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.FIRE, PokemonType.GROUND, 2.5, 320.5, Abilities.SHEER_FORCE, Abilities.SHEER_FORCE, Abilities.SHEER_FORCE, 560, 70, 120, 100, 145, 105, 20, 150, 70, 161), + ), + new PokemonSpecies(Species.TORKOAL, 3, false, false, false, "Coal Pokémon", PokemonType.FIRE, null, 0.5, 80.4, Abilities.WHITE_SMOKE, Abilities.DROUGHT, Abilities.SHELL_ARMOR, 470, 70, 85, 140, 85, 70, 20, 90, 50, 165, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SPOINK, 3, false, false, false, "Bounce Pokémon", PokemonType.PSYCHIC, null, 0.7, 30.6, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.GLUTTONY, 330, 60, 25, 35, 70, 80, 60, 255, 70, 66, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.GRUMPIG, 3, false, false, false, "Manipulate Pokémon", PokemonType.PSYCHIC, null, 0.9, 71.5, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.GLUTTONY, 470, 80, 45, 65, 90, 110, 80, 60, 70, 165, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.SPINDA, 3, false, false, false, "Spot Panda Pokémon", PokemonType.NORMAL, null, 1.1, 5, Abilities.OWN_TEMPO, Abilities.TANGLED_FEET, Abilities.CONTRARY, 360, 60, 60, 60, 60, 60, 60, 255, 70, 126, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.TRAPINCH, 3, false, false, false, "Ant Pit Pokémon", PokemonType.GROUND, null, 0.7, 15, Abilities.HYPER_CUTTER, Abilities.ARENA_TRAP, Abilities.SHEER_FORCE, 290, 45, 100, 45, 45, 45, 10, 255, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.VIBRAVA, 3, false, false, false, "Vibration Pokémon", PokemonType.GROUND, PokemonType.DRAGON, 1.1, 15.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 340, 50, 70, 50, 50, 50, 70, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.FLYGON, 3, false, false, false, "Mystic Pokémon", PokemonType.GROUND, PokemonType.DRAGON, 2, 82, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 80, 100, 80, 80, 80, 100, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.CACNEA, 3, false, false, false, "Cactus Pokémon", PokemonType.GRASS, null, 0.4, 51.3, Abilities.SAND_VEIL, Abilities.NONE, Abilities.WATER_ABSORB, 335, 50, 85, 40, 85, 40, 35, 190, 35, 67, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.CACTURNE, 3, false, false, false, "Scarecrow Pokémon", PokemonType.GRASS, PokemonType.DARK, 1.3, 77.4, Abilities.SAND_VEIL, Abilities.NONE, Abilities.WATER_ABSORB, 475, 70, 115, 60, 115, 60, 55, 60, 35, 166, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.SWABLU, 3, false, false, false, "Cotton Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.4, 1.2, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 310, 45, 40, 60, 40, 75, 50, 255, 50, 62, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.ALTARIA, 3, false, false, false, "Humming Pokémon", PokemonType.DRAGON, PokemonType.FLYING, 1.1, 20.6, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 490, 75, 70, 90, 70, 105, 80, 45, 50, 172, GrowthRate.ERRATIC, 50, false, true, + new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.FLYING, 1.1, 20.6, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 490, 75, 70, 90, 70, 105, 80, 45, 50, 172, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.FAIRY, 1.5, 20.6, Abilities.PIXILATE, Abilities.NONE, Abilities.PIXILATE, 590, 75, 110, 110, 110, 105, 80, 45, 50, 172), + ), + new PokemonSpecies(Species.ZANGOOSE, 3, false, false, false, "Cat Ferret Pokémon", PokemonType.NORMAL, null, 1.3, 40.3, Abilities.IMMUNITY, Abilities.NONE, Abilities.TOXIC_BOOST, 458, 73, 115, 60, 60, 60, 90, 90, 70, 160, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.SEVIPER, 3, false, false, false, "Fang Snake Pokémon", PokemonType.POISON, null, 2.7, 52.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.INFILTRATOR, 458, 73, 100, 60, 100, 60, 65, 90, 70, 160, GrowthRate.FLUCTUATING, 50, false), + new PokemonSpecies(Species.LUNATONE, 3, false, false, false, "Meteorite Pokémon", PokemonType.ROCK, PokemonType.PSYCHIC, 1, 168, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 460, 90, 55, 65, 95, 85, 70, 45, 50, 161, GrowthRate.FAST, null, false), + new PokemonSpecies(Species.SOLROCK, 3, false, false, false, "Meteorite Pokémon", PokemonType.ROCK, PokemonType.PSYCHIC, 1.2, 154, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 460, 90, 95, 85, 55, 65, 70, 45, 50, 161, GrowthRate.FAST, null, false), + new PokemonSpecies(Species.BARBOACH, 3, false, false, false, "Whiskers Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.4, 1.9, Abilities.OBLIVIOUS, Abilities.ANTICIPATION, Abilities.HYDRATION, 288, 50, 48, 43, 46, 41, 60, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.WHISCASH, 3, false, false, false, "Whiskers Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.9, 23.6, Abilities.OBLIVIOUS, Abilities.ANTICIPATION, Abilities.HYDRATION, 468, 110, 78, 73, 76, 71, 60, 75, 50, 164, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CORPHISH, 3, false, false, false, "Ruffian Pokémon", PokemonType.WATER, null, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.ADAPTABILITY, 308, 43, 80, 65, 50, 35, 35, 205, 50, 62, GrowthRate.FLUCTUATING, 50, false), + new PokemonSpecies(Species.CRAWDAUNT, 3, false, false, false, "Rogue Pokémon", PokemonType.WATER, PokemonType.DARK, 1.1, 32.8, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.ADAPTABILITY, 468, 63, 120, 85, 90, 55, 55, 155, 50, 164, GrowthRate.FLUCTUATING, 50, false), + new PokemonSpecies(Species.BALTOY, 3, false, false, false, "Clay Doll Pokémon", PokemonType.GROUND, PokemonType.PSYCHIC, 0.5, 21.5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 300, 40, 40, 55, 40, 70, 55, 255, 50, 60, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.CLAYDOL, 3, false, false, false, "Clay Doll Pokémon", PokemonType.GROUND, PokemonType.PSYCHIC, 1.5, 108, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 500, 60, 70, 105, 70, 120, 75, 90, 50, 175, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.LILEEP, 3, false, false, false, "Sea Lily Pokémon", PokemonType.ROCK, PokemonType.GRASS, 1, 23.8, Abilities.SUCTION_CUPS, Abilities.NONE, Abilities.STORM_DRAIN, 355, 66, 41, 77, 61, 87, 23, 45, 50, 71, GrowthRate.ERRATIC, 87.5, false), + new PokemonSpecies(Species.CRADILY, 3, false, false, false, "Barnacle Pokémon", PokemonType.ROCK, PokemonType.GRASS, 1.5, 60.4, Abilities.SUCTION_CUPS, Abilities.NONE, Abilities.STORM_DRAIN, 495, 86, 81, 97, 81, 107, 43, 45, 50, 173, GrowthRate.ERRATIC, 87.5, false), + new PokemonSpecies(Species.ANORITH, 3, false, false, false, "Old Shrimp Pokémon", PokemonType.ROCK, PokemonType.BUG, 0.7, 12.5, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.SWIFT_SWIM, 355, 45, 95, 50, 40, 50, 75, 45, 50, 71, GrowthRate.ERRATIC, 87.5, false), + new PokemonSpecies(Species.ARMALDO, 3, false, false, false, "Plate Pokémon", PokemonType.ROCK, PokemonType.BUG, 1.5, 68.2, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.SWIFT_SWIM, 495, 75, 125, 100, 70, 80, 45, 45, 50, 173, GrowthRate.ERRATIC, 87.5, false), + new PokemonSpecies(Species.FEEBAS, 3, false, false, false, "Fish Pokémon", PokemonType.WATER, null, 0.6, 7.4, Abilities.SWIFT_SWIM, Abilities.OBLIVIOUS, Abilities.ADAPTABILITY, 200, 20, 15, 20, 10, 55, 80, 255, 50, 40, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.MILOTIC, 3, false, false, false, "Tender Pokémon", PokemonType.WATER, null, 6.2, 162, Abilities.MARVEL_SCALE, Abilities.COMPETITIVE, Abilities.CUTE_CHARM, 540, 95, 60, 79, 100, 125, 81, 60, 50, 189, GrowthRate.ERRATIC, 50, true), + new PokemonSpecies(Species.CASTFORM, 3, false, false, false, "Weather Pokémon", PokemonType.NORMAL, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal Form", "", PokemonType.NORMAL, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147, false, null, true), + new PokemonForm("Sunny Form", "sunny", PokemonType.FIRE, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147), + new PokemonForm("Rainy Form", "rainy", PokemonType.WATER, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147), + new PokemonForm("Snowy Form", "snowy", PokemonType.ICE, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147), + ), + new PokemonSpecies(Species.KECLEON, 3, false, false, false, "Color Swap Pokémon", PokemonType.NORMAL, null, 1, 22, Abilities.COLOR_CHANGE, Abilities.NONE, Abilities.PROTEAN, 440, 60, 90, 70, 60, 120, 40, 200, 70, 154, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SHUPPET, 3, false, false, false, "Puppet Pokémon", PokemonType.GHOST, null, 0.6, 2.3, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 295, 44, 75, 35, 63, 33, 45, 225, 35, 59, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.BANETTE, 3, false, false, false, "Marionette Pokémon", PokemonType.GHOST, null, 1.1, 12.5, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 455, 64, 115, 65, 83, 63, 65, 45, 35, 159, GrowthRate.FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.GHOST, null, 1.1, 12.5, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 455, 64, 115, 65, 83, 63, 65, 45, 35, 159, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.GHOST, null, 1.2, 13, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 555, 64, 165, 75, 93, 83, 75, 45, 35, 159), + ), + new PokemonSpecies(Species.DUSKULL, 3, false, false, false, "Requiem Pokémon", PokemonType.GHOST, null, 0.8, 15, Abilities.LEVITATE, Abilities.NONE, Abilities.FRISK, 295, 20, 40, 90, 30, 90, 25, 190, 35, 59, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.DUSCLOPS, 3, false, false, false, "Beckon Pokémon", PokemonType.GHOST, null, 1.6, 30.6, Abilities.PRESSURE, Abilities.NONE, Abilities.FRISK, 455, 40, 70, 130, 60, 130, 25, 90, 35, 159, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.TROPIUS, 3, false, false, false, "Fruit Pokémon", PokemonType.GRASS, PokemonType.FLYING, 2, 100, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.HARVEST, 460, 99, 68, 83, 72, 87, 51, 200, 70, 161, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.CHIMECHO, 3, false, false, false, "Wind Chime Pokémon", PokemonType.PSYCHIC, null, 0.6, 1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 455, 75, 50, 80, 95, 90, 65, 45, 70, 159, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.ABSOL, 3, false, false, false, "Disaster Pokémon", PokemonType.DARK, null, 1.2, 47, Abilities.PRESSURE, Abilities.SUPER_LUCK, Abilities.JUSTIFIED, 465, 65, 130, 60, 75, 60, 75, 30, 35, 163, GrowthRate.MEDIUM_SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.DARK, null, 1.2, 47, Abilities.PRESSURE, Abilities.SUPER_LUCK, Abilities.JUSTIFIED, 465, 65, 130, 60, 75, 60, 75, 30, 35, 163, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DARK, null, 1.2, 49, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 565, 65, 150, 60, 115, 60, 115, 30, 35, 163), + ), + new PokemonSpecies(Species.WYNAUT, 3, false, false, false, "Bright Pokémon", PokemonType.PSYCHIC, null, 0.6, 14, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.TELEPATHY, 260, 95, 23, 48, 23, 48, 23, 125, 50, 52, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SNORUNT, 3, false, false, false, "Snow Hat Pokémon", PokemonType.ICE, null, 0.7, 16.8, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 300, 50, 50, 50, 50, 50, 50, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GLALIE, 3, false, false, false, "Face Pokémon", PokemonType.ICE, null, 1.5, 256.5, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 480, 80, 80, 80, 80, 80, 80, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.ICE, null, 1.5, 256.5, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 480, 80, 80, 80, 80, 80, 80, 75, 50, 168, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ICE, null, 2.1, 350.2, Abilities.REFRIGERATE, Abilities.REFRIGERATE, Abilities.REFRIGERATE, 580, 80, 120, 80, 120, 80, 100, 75, 50, 168), + ), + new PokemonSpecies(Species.SPHEAL, 3, false, false, false, "Clap Pokémon", PokemonType.ICE, PokemonType.WATER, 0.8, 39.5, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 290, 70, 40, 50, 55, 50, 25, 255, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SEALEO, 3, false, false, false, "Ball Roll Pokémon", PokemonType.ICE, PokemonType.WATER, 1.1, 87.6, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 410, 90, 60, 70, 75, 70, 45, 120, 50, 144, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.WALREIN, 3, false, false, false, "Ice Break Pokémon", PokemonType.ICE, PokemonType.WATER, 1.4, 150.6, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 530, 110, 80, 90, 95, 90, 65, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.CLAMPERL, 3, false, false, false, "Bivalve Pokémon", PokemonType.WATER, null, 0.4, 52.5, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.RATTLED, 345, 35, 64, 85, 74, 55, 32, 255, 70, 69, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.HUNTAIL, 3, false, false, false, "Deep Sea Pokémon", PokemonType.WATER, null, 1.7, 27, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 485, 55, 104, 105, 94, 75, 52, 60, 70, 170, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.GOREBYSS, 3, false, false, false, "South Sea Pokémon", PokemonType.WATER, null, 1.8, 22.6, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.HYDRATION, 485, 55, 84, 105, 114, 75, 52, 60, 70, 170, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.RELICANTH, 3, false, false, false, "Longevity Pokémon", PokemonType.WATER, PokemonType.ROCK, 1, 23.4, Abilities.SWIFT_SWIM, Abilities.ROCK_HEAD, Abilities.STURDY, 485, 100, 90, 130, 45, 65, 55, 25, 50, 170, GrowthRate.SLOW, 87.5, true), + new PokemonSpecies(Species.LUVDISC, 3, false, false, false, "Rendezvous Pokémon", PokemonType.WATER, null, 0.6, 8.7, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.HYDRATION, 330, 43, 30, 55, 40, 65, 97, 225, 70, 116, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.BAGON, 3, false, false, false, "Rock Head Pokémon", PokemonType.DRAGON, null, 0.6, 42.1, Abilities.ROCK_HEAD, Abilities.NONE, Abilities.SHEER_FORCE, 300, 45, 75, 60, 40, 30, 50, 45, 35, 60, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.SHELGON, 3, false, false, false, "Endurance Pokémon", PokemonType.DRAGON, null, 1.1, 110.5, Abilities.ROCK_HEAD, Abilities.NONE, Abilities.OVERCOAT, 420, 65, 95, 100, 60, 50, 50, 45, 35, 147, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.SALAMENCE, 3, false, false, false, "Dragon Pokémon", PokemonType.DRAGON, PokemonType.FLYING, 1.5, 102.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 600, 95, 135, 80, 110, 80, 100, 45, 35, 300, GrowthRate.SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.FLYING, 1.5, 102.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 600, 95, 135, 80, 110, 80, 100, 45, 35, 300, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.FLYING, 1.8, 112.6, Abilities.AERILATE, Abilities.NONE, Abilities.AERILATE, 700, 95, 145, 130, 120, 90, 120, 45, 35, 300), + ), + new PokemonSpecies(Species.BELDUM, 3, false, false, false, "Iron Ball Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 0.6, 95.2, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 300, 40, 55, 80, 35, 60, 30, 45, 35, 60, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Frigibax + new PokemonSpecies(Species.METANG, 3, false, false, false, "Iron Claw Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 1.2, 202.5, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 420, 60, 75, 100, 55, 80, 50, 25, 35, 147, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Arctibax + new PokemonSpecies(Species.METAGROSS, 3, false, false, false, "Iron Leg Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 1.6, 550, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 600, 80, 135, 130, 95, 90, 70, 10, 35, 300, GrowthRate.SLOW, null, false, true, //Custom Catchrate, matching Baxcalibur + new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.PSYCHIC, 1.6, 550, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 600, 80, 135, 130, 95, 90, 70, 3, 35, 300, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.STEEL, PokemonType.PSYCHIC, 2.5, 942.9, Abilities.TOUGH_CLAWS, Abilities.NONE, Abilities.TOUGH_CLAWS, 700, 80, 145, 150, 105, 110, 110, 3, 35, 300), + ), + new PokemonSpecies(Species.REGIROCK, 3, true, false, false, "Rock Peak Pokémon", PokemonType.ROCK, null, 1.7, 230, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.STURDY, 580, 80, 100, 200, 50, 100, 50, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.REGICE, 3, true, false, false, "Iceberg Pokémon", PokemonType.ICE, null, 1.8, 175, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.ICE_BODY, 580, 80, 50, 100, 100, 200, 50, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.REGISTEEL, 3, true, false, false, "Iron Pokémon", PokemonType.STEEL, null, 1.9, 205, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 580, 80, 75, 150, 75, 150, 50, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.LATIAS, 3, true, false, false, "Eon Pokémon", PokemonType.DRAGON, PokemonType.PSYCHIC, 1.4, 40, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 80, 90, 110, 130, 110, 3, 90, 300, GrowthRate.SLOW, 0, false, true, + new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.PSYCHIC, 1.4, 40, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 80, 90, 110, 130, 110, 3, 90, 300, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.PSYCHIC, 1.8, 52, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 700, 80, 100, 120, 140, 150, 110, 3, 90, 300), + ), + new PokemonSpecies(Species.LATIOS, 3, true, false, false, "Eon Pokémon", PokemonType.DRAGON, PokemonType.PSYCHIC, 2, 60, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 90, 80, 130, 110, 110, 3, 90, 300, GrowthRate.SLOW, 100, false, true, + new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.PSYCHIC, 2, 60, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 90, 80, 130, 110, 110, 3, 90, 300, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.PSYCHIC, 2.3, 70, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 700, 80, 130, 100, 160, 120, 110, 3, 90, 300), + ), + new PokemonSpecies(Species.KYOGRE, 3, false, true, false, "Sea Basin Pokémon", PokemonType.WATER, null, 4.5, 352, Abilities.DRIZZLE, Abilities.NONE, Abilities.NONE, 670, 100, 100, 90, 150, 140, 90, 3, 0, 335, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.WATER, null, 4.5, 352, Abilities.DRIZZLE, Abilities.NONE, Abilities.NONE, 670, 100, 100, 90, 150, 140, 90, 3, 0, 335, false, null, true), + new PokemonForm("Primal", "primal", PokemonType.WATER, null, 9.8, 430, Abilities.PRIMORDIAL_SEA, Abilities.NONE, Abilities.NONE, 770, 100, 150, 90, 180, 160, 90, 3, 0, 335), + ), + new PokemonSpecies(Species.GROUDON, 3, false, true, false, "Continent Pokémon", PokemonType.GROUND, null, 3.5, 950, Abilities.DROUGHT, Abilities.NONE, Abilities.NONE, 670, 100, 150, 140, 100, 90, 90, 3, 0, 335, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.GROUND, null, 3.5, 950, Abilities.DROUGHT, Abilities.NONE, Abilities.NONE, 670, 100, 150, 140, 100, 90, 90, 3, 0, 335, false, null, true), + new PokemonForm("Primal", "primal", PokemonType.GROUND, PokemonType.FIRE, 5, 999.7, Abilities.DESOLATE_LAND, Abilities.NONE, Abilities.NONE, 770, 100, 180, 160, 150, 90, 90, 3, 0, 335), + ), + new PokemonSpecies(Species.RAYQUAZA, 3, false, true, false, "Sky High Pokémon", PokemonType.DRAGON, PokemonType.FLYING, 7, 206.5, Abilities.AIR_LOCK, Abilities.NONE, Abilities.NONE, 680, 105, 150, 90, 150, 90, 95, 45, 0, 340, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.FLYING, 7, 206.5, Abilities.AIR_LOCK, Abilities.NONE, Abilities.NONE, 680, 105, 150, 90, 150, 90, 95, 45, 0, 340, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.FLYING, 10.8, 392, Abilities.DELTA_STREAM, Abilities.NONE, Abilities.NONE, 780, 105, 180, 100, 180, 100, 115, 45, 0, 340), + ), + new PokemonSpecies(Species.JIRACHI, 3, false, false, true, "Wish Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 0.3, 1.1, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 100, 300, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.DEOXYS, 3, false, false, true, "DNA Pokémon", PokemonType.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 300, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal Forme", "normal", PokemonType.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 300, false, "", true), + new PokemonForm("Attack Forme", "attack", PokemonType.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 180, 20, 180, 20, 150, 3, 0, 300), + new PokemonForm("Defense Forme", "defense", PokemonType.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 70, 160, 70, 160, 90, 3, 0, 300), + new PokemonForm("Speed Forme", "speed", PokemonType.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 95, 90, 95, 90, 180, 3, 0, 300), + ), + new PokemonSpecies(Species.TURTWIG, 4, false, false, false, "Tiny Leaf Pokémon", PokemonType.GRASS, null, 0.4, 10.2, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 318, 55, 68, 64, 45, 55, 31, 45, 70, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.GROTLE, 4, false, false, false, "Grove Pokémon", PokemonType.GRASS, null, 1.1, 97, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 405, 75, 89, 85, 55, 65, 36, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.TORTERRA, 4, false, false, false, "Continent Pokémon", PokemonType.GRASS, PokemonType.GROUND, 2.2, 310, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 525, 95, 109, 105, 75, 85, 56, 45, 70, 263, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.CHIMCHAR, 4, false, false, false, "Chimp Pokémon", PokemonType.FIRE, null, 0.5, 6.2, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 309, 44, 58, 44, 58, 44, 61, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.MONFERNO, 4, false, false, false, "Playful Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 0.9, 22, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 405, 64, 78, 52, 78, 52, 81, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.INFERNAPE, 4, false, false, false, "Flame Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 1.2, 55, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 534, 76, 104, 71, 104, 71, 108, 45, 70, 267, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.PIPLUP, 4, false, false, false, "Penguin Pokémon", PokemonType.WATER, null, 0.4, 5.2, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 314, 53, 51, 53, 61, 56, 40, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.PRINPLUP, 4, false, false, false, "Penguin Pokémon", PokemonType.WATER, null, 0.8, 23, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 405, 64, 66, 68, 81, 76, 50, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.EMPOLEON, 4, false, false, false, "Emperor Pokémon", PokemonType.WATER, PokemonType.STEEL, 1.7, 84.5, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 530, 84, 86, 88, 111, 101, 60, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.STARLY, 4, false, false, false, "Starling Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 2, Abilities.KEEN_EYE, Abilities.NONE, Abilities.RECKLESS, 245, 40, 55, 30, 30, 30, 60, 255, 70, 49, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.STARAVIA, 4, false, false, false, "Starling Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 15.5, Abilities.INTIMIDATE, Abilities.NONE, Abilities.RECKLESS, 340, 55, 75, 50, 40, 40, 80, 120, 70, 119, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.STARAPTOR, 4, false, false, false, "Predator Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.2, 24.9, Abilities.INTIMIDATE, Abilities.NONE, Abilities.RECKLESS, 485, 85, 120, 70, 50, 60, 100, 45, 70, 243, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.BIDOOF, 4, false, false, false, "Plump Mouse Pokémon", PokemonType.NORMAL, null, 0.5, 20, Abilities.SIMPLE, Abilities.UNAWARE, Abilities.MOODY, 250, 59, 45, 40, 35, 40, 31, 255, 70, 50, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.BIBAREL, 4, false, false, false, "Beaver Pokémon", PokemonType.NORMAL, PokemonType.WATER, 1, 31.5, Abilities.SIMPLE, Abilities.UNAWARE, Abilities.MOODY, 410, 79, 85, 60, 55, 60, 71, 127, 70, 144, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.KRICKETOT, 4, false, false, false, "Cricket Pokémon", PokemonType.BUG, null, 0.3, 2.2, Abilities.SHED_SKIN, Abilities.NONE, Abilities.RUN_AWAY, 194, 37, 25, 41, 25, 41, 25, 255, 70, 39, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.KRICKETUNE, 4, false, false, false, "Cricket Pokémon", PokemonType.BUG, null, 1, 25.5, Abilities.SWARM, Abilities.NONE, Abilities.TECHNICIAN, 384, 77, 85, 51, 55, 51, 65, 45, 70, 134, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.SHINX, 4, false, false, false, "Flash Pokémon", PokemonType.ELECTRIC, null, 0.5, 9.5, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 263, 45, 65, 34, 40, 34, 45, 235, 50, 53, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.LUXIO, 4, false, false, false, "Spark Pokémon", PokemonType.ELECTRIC, null, 0.9, 30.5, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 363, 60, 85, 49, 60, 49, 60, 120, 100, 127, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.LUXRAY, 4, false, false, false, "Gleam Eyes Pokémon", PokemonType.ELECTRIC, null, 1.4, 42, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 523, 80, 120, 79, 95, 79, 70, 45, 50, 262, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.BUDEW, 4, false, false, false, "Bud Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.2, 1.2, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.LEAF_GUARD, 280, 40, 30, 35, 50, 70, 55, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.ROSERADE, 4, false, false, false, "Bouquet Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.9, 14.5, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.TECHNICIAN, 515, 60, 70, 65, 125, 105, 90, 75, 50, 258, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.CRANIDOS, 4, false, false, false, "Head Butt Pokémon", PokemonType.ROCK, null, 0.9, 31.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHEER_FORCE, 350, 67, 125, 40, 30, 30, 58, 45, 70, 70, GrowthRate.ERRATIC, 87.5, false), + new PokemonSpecies(Species.RAMPARDOS, 4, false, false, false, "Head Butt Pokémon", PokemonType.ROCK, null, 1.6, 102.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHEER_FORCE, 495, 97, 165, 60, 65, 50, 58, 45, 70, 173, GrowthRate.ERRATIC, 87.5, false), + new PokemonSpecies(Species.SHIELDON, 4, false, false, false, "Shield Pokémon", PokemonType.ROCK, PokemonType.STEEL, 0.5, 57, Abilities.STURDY, Abilities.NONE, Abilities.SOUNDPROOF, 350, 30, 42, 118, 42, 88, 30, 45, 70, 70, GrowthRate.ERRATIC, 87.5, false), + new PokemonSpecies(Species.BASTIODON, 4, false, false, false, "Shield Pokémon", PokemonType.ROCK, PokemonType.STEEL, 1.3, 149.5, Abilities.STURDY, Abilities.NONE, Abilities.SOUNDPROOF, 495, 60, 52, 168, 47, 138, 30, 45, 70, 173, GrowthRate.ERRATIC, 87.5, false), + new PokemonSpecies(Species.BURMY, 4, false, false, false, "Bagworm Pokémon", PokemonType.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Plant Cloak", "plant", PokemonType.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true), + new PokemonForm("Sandy Cloak", "sandy", PokemonType.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true), + new PokemonForm("Trash Cloak", "trash", PokemonType.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true), + ), + new PokemonSpecies(Species.WORMADAM, 4, false, false, false, "Bagworm Pokémon", PokemonType.BUG, PokemonType.GRASS, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 59, 85, 79, 105, 36, 45, 70, 148, GrowthRate.MEDIUM_FAST, 0, false, false, + new PokemonForm("Plant Cloak", "plant", PokemonType.BUG, PokemonType.GRASS, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 59, 85, 79, 105, 36, 45, 70, 148, false, null, true), + new PokemonForm("Sandy Cloak", "sandy", PokemonType.BUG, PokemonType.GROUND, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 79, 105, 59, 85, 36, 45, 70, 148, false, null, true), + new PokemonForm("Trash Cloak", "trash", PokemonType.BUG, PokemonType.STEEL, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 69, 95, 69, 95, 36, 45, 70, 148, false, null, true), + ), + new PokemonSpecies(Species.MOTHIM, 4, false, false, false, "Moth Pokémon", PokemonType.BUG, PokemonType.FLYING, 0.9, 23.3, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 424, 70, 94, 50, 94, 50, 66, 45, 70, 148, GrowthRate.MEDIUM_FAST, 100, false), + new PokemonSpecies(Species.COMBEE, 4, false, false, false, "Tiny Bee Pokémon", PokemonType.BUG, PokemonType.FLYING, 0.3, 5.5, Abilities.HONEY_GATHER, Abilities.NONE, Abilities.HUSTLE, 244, 30, 30, 42, 30, 42, 70, 120, 50, 49, GrowthRate.MEDIUM_SLOW, 87.5, true), + new PokemonSpecies(Species.VESPIQUEN, 4, false, false, false, "Beehive Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.2, 38.5, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 474, 70, 80, 102, 80, 102, 40, 45, 50, 166, GrowthRate.MEDIUM_SLOW, 0, false), + new PokemonSpecies(Species.PACHIRISU, 4, false, false, false, "EleSquirrel Pokémon", PokemonType.ELECTRIC, null, 0.4, 3.9, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.VOLT_ABSORB, 405, 60, 45, 70, 45, 90, 95, 200, 100, 142, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.BUIZEL, 4, false, false, false, "Sea Weasel Pokémon", PokemonType.WATER, null, 0.7, 29.5, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 330, 55, 65, 35, 60, 30, 85, 190, 70, 66, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.FLOATZEL, 4, false, false, false, "Sea Weasel Pokémon", PokemonType.WATER, null, 1.1, 33.5, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 495, 85, 105, 55, 85, 50, 115, 75, 70, 173, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.CHERUBI, 4, false, false, false, "Cherry Pokémon", PokemonType.GRASS, null, 0.4, 3.3, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.NONE, 275, 45, 35, 45, 62, 53, 35, 190, 50, 55, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CHERRIM, 4, false, false, false, "Blossom Pokémon", PokemonType.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Overcast Form", "overcast", PokemonType.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158, false, null, true), + new PokemonForm("Sunshine Form", "sunshine", PokemonType.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158), + ), + new PokemonSpecies(Species.SHELLOS, 4, false, false, false, "Sea Slug Pokémon", PokemonType.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("East Sea", "east", PokemonType.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, false, null, true), + new PokemonForm("West Sea", "west", PokemonType.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, false, null, true), + ), + new PokemonSpecies(Species.GASTRODON, 4, false, false, false, "Sea Slug Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("East Sea", "east", PokemonType.WATER, PokemonType.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, false, null, true), + new PokemonForm("West Sea", "west", PokemonType.WATER, PokemonType.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, false, null, true), + ), + new PokemonSpecies(Species.AMBIPOM, 4, false, false, false, "Long Tail Pokémon", PokemonType.NORMAL, null, 1.2, 20.3, Abilities.TECHNICIAN, Abilities.PICKUP, Abilities.SKILL_LINK, 482, 75, 100, 66, 60, 66, 115, 45, 100, 169, GrowthRate.FAST, 50, true), + new PokemonSpecies(Species.DRIFLOON, 4, false, false, false, "Balloon Pokémon", PokemonType.GHOST, PokemonType.FLYING, 0.4, 1.2, Abilities.AFTERMATH, Abilities.UNBURDEN, Abilities.FLARE_BOOST, 348, 90, 50, 34, 60, 44, 70, 125, 50, 70, GrowthRate.FLUCTUATING, 50, false), + new PokemonSpecies(Species.DRIFBLIM, 4, false, false, false, "Blimp Pokémon", PokemonType.GHOST, PokemonType.FLYING, 1.2, 15, Abilities.AFTERMATH, Abilities.UNBURDEN, Abilities.FLARE_BOOST, 498, 150, 80, 44, 90, 54, 80, 60, 50, 174, GrowthRate.FLUCTUATING, 50, false), + new PokemonSpecies(Species.BUNEARY, 4, false, false, false, "Rabbit Pokémon", PokemonType.NORMAL, null, 0.4, 5.5, Abilities.RUN_AWAY, Abilities.KLUTZ, Abilities.LIMBER, 350, 55, 66, 44, 44, 56, 85, 190, 0, 70, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.LOPUNNY, 4, false, false, false, "Rabbit Pokémon", PokemonType.NORMAL, null, 1.2, 33.3, Abilities.CUTE_CHARM, Abilities.KLUTZ, Abilities.LIMBER, 480, 65, 76, 84, 54, 96, 105, 60, 140, 168, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.NORMAL, null, 1.2, 33.3, Abilities.CUTE_CHARM, Abilities.KLUTZ, Abilities.LIMBER, 480, 65, 76, 84, 54, 96, 105, 60, 140, 168, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.NORMAL, PokemonType.FIGHTING, 1.3, 28.3, Abilities.SCRAPPY, Abilities.SCRAPPY, Abilities.SCRAPPY, 580, 65, 136, 94, 54, 96, 135, 60, 140, 168), + ), + new PokemonSpecies(Species.MISMAGIUS, 4, false, false, false, "Magical Pokémon", PokemonType.GHOST, null, 0.9, 4.4, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 495, 60, 60, 60, 105, 105, 105, 45, 35, 173, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.HONCHKROW, 4, false, false, false, "Big Boss Pokémon", PokemonType.DARK, PokemonType.FLYING, 0.9, 27.3, Abilities.INSOMNIA, Abilities.SUPER_LUCK, Abilities.MOXIE, 505, 100, 125, 52, 105, 52, 71, 30, 35, 177, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GLAMEOW, 4, false, false, false, "Catty Pokémon", PokemonType.NORMAL, null, 0.5, 3.9, Abilities.LIMBER, Abilities.OWN_TEMPO, Abilities.KEEN_EYE, 310, 49, 55, 42, 42, 37, 85, 190, 70, 62, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.PURUGLY, 4, false, false, false, "Tiger Cat Pokémon", PokemonType.NORMAL, null, 1, 43.8, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.DEFIANT, 452, 71, 82, 64, 64, 59, 112, 75, 70, 158, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.CHINGLING, 4, false, false, false, "Bell Pokémon", PokemonType.PSYCHIC, null, 0.2, 0.6, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 285, 45, 30, 50, 65, 50, 45, 120, 70, 57, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.STUNKY, 4, false, false, false, "Skunk Pokémon", PokemonType.POISON, PokemonType.DARK, 0.4, 19.2, Abilities.STENCH, Abilities.AFTERMATH, Abilities.KEEN_EYE, 329, 63, 63, 47, 41, 41, 74, 225, 50, 66, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SKUNTANK, 4, false, false, false, "Skunk Pokémon", PokemonType.POISON, PokemonType.DARK, 1, 38, Abilities.STENCH, Abilities.AFTERMATH, Abilities.KEEN_EYE, 479, 103, 93, 67, 71, 61, 84, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BRONZOR, 4, false, false, false, "Bronze Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 0.5, 60.5, Abilities.LEVITATE, Abilities.HEATPROOF, Abilities.HEAVY_METAL, 300, 57, 24, 86, 24, 86, 23, 255, 50, 60, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.BRONZONG, 4, false, false, false, "Bronze Bell Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 1.3, 187, Abilities.LEVITATE, Abilities.HEATPROOF, Abilities.HEAVY_METAL, 500, 67, 89, 116, 79, 116, 33, 90, 50, 175, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.BONSLY, 4, false, false, false, "Bonsai Pokémon", PokemonType.ROCK, null, 0.5, 15, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.RATTLED, 290, 50, 80, 95, 10, 45, 10, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MIME_JR, 4, false, false, false, "Mime Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 0.6, 13, Abilities.SOUNDPROOF, Abilities.FILTER, Abilities.TECHNICIAN, 310, 20, 25, 45, 70, 90, 60, 145, 50, 62, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.HAPPINY, 4, false, false, false, "Playhouse Pokémon", PokemonType.NORMAL, null, 0.6, 24.4, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.FRIEND_GUARD, 220, 100, 5, 5, 15, 65, 30, 130, 140, 110, GrowthRate.FAST, 0, false), + new PokemonSpecies(Species.CHATOT, 4, false, false, false, "Music Note Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.5, 1.9, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 411, 76, 65, 45, 92, 42, 91, 30, 35, 144, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SPIRITOMB, 4, false, false, false, "Forbidden Pokémon", PokemonType.GHOST, PokemonType.DARK, 1, 108, Abilities.PRESSURE, Abilities.NONE, Abilities.INFILTRATOR, 485, 50, 92, 108, 92, 108, 35, 100, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GIBLE, 4, false, false, false, "Land Shark Pokémon", PokemonType.DRAGON, PokemonType.GROUND, 0.7, 20.5, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 300, 58, 70, 45, 40, 45, 42, 45, 50, 60, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.GABITE, 4, false, false, false, "Cave Pokémon", PokemonType.DRAGON, PokemonType.GROUND, 1.4, 56, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 410, 68, 90, 65, 50, 55, 82, 45, 50, 144, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.GARCHOMP, 4, false, false, false, "Mach Pokémon", PokemonType.DRAGON, PokemonType.GROUND, 1.9, 95, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 600, 108, 130, 95, 80, 85, 102, 45, 50, 300, GrowthRate.SLOW, 50, true, true, + new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.GROUND, 1.9, 95, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 600, 108, 130, 95, 80, 85, 102, 45, 50, 300, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.GROUND, 1.9, 95, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SAND_FORCE, 700, 108, 170, 115, 120, 95, 92, 45, 50, 300, true), + ), + new PokemonSpecies(Species.MUNCHLAX, 4, false, false, false, "Big Eater Pokémon", PokemonType.NORMAL, null, 0.6, 105, Abilities.PICKUP, Abilities.THICK_FAT, Abilities.GLUTTONY, 390, 135, 85, 40, 40, 85, 5, 50, 50, 78, GrowthRate.SLOW, 87.5, false), + new PokemonSpecies(Species.RIOLU, 4, false, false, false, "Emanation Pokémon", PokemonType.FIGHTING, null, 0.7, 20.2, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.PRANKSTER, 285, 40, 70, 40, 35, 40, 60, 75, 50, 57, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.LUCARIO, 4, false, false, false, "Aura Pokémon", PokemonType.FIGHTING, PokemonType.STEEL, 1.2, 54, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.JUSTIFIED, 525, 70, 110, 70, 115, 70, 90, 45, 50, 184, GrowthRate.MEDIUM_SLOW, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.FIGHTING, PokemonType.STEEL, 1.2, 54, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.JUSTIFIED, 525, 70, 110, 70, 115, 70, 90, 45, 50, 184, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.FIGHTING, PokemonType.STEEL, 1.3, 57.5, Abilities.ADAPTABILITY, Abilities.ADAPTABILITY, Abilities.ADAPTABILITY, 625, 70, 145, 88, 140, 70, 112, 45, 50, 184), + ), + new PokemonSpecies(Species.HIPPOPOTAS, 4, false, false, false, "Hippo Pokémon", PokemonType.GROUND, null, 0.8, 49.5, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_FORCE, 330, 68, 72, 78, 38, 42, 32, 140, 50, 66, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.HIPPOWDON, 4, false, false, false, "Heavyweight Pokémon", PokemonType.GROUND, null, 2, 300, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_FORCE, 525, 108, 112, 118, 68, 72, 47, 60, 50, 184, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.SKORUPI, 4, false, false, false, "Scorpion Pokémon", PokemonType.POISON, PokemonType.BUG, 0.8, 12, Abilities.BATTLE_ARMOR, Abilities.SNIPER, Abilities.KEEN_EYE, 330, 40, 50, 90, 30, 55, 65, 120, 50, 66, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.DRAPION, 4, false, false, false, "Ogre Scorpion Pokémon", PokemonType.POISON, PokemonType.DARK, 1.3, 61.5, Abilities.BATTLE_ARMOR, Abilities.SNIPER, Abilities.KEEN_EYE, 500, 70, 90, 110, 60, 75, 95, 45, 50, 175, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.CROAGUNK, 4, false, false, false, "Toxic Mouth Pokémon", PokemonType.POISON, PokemonType.FIGHTING, 0.7, 23, Abilities.ANTICIPATION, Abilities.DRY_SKIN, Abilities.POISON_TOUCH, 300, 48, 61, 40, 61, 40, 50, 140, 100, 60, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.TOXICROAK, 4, false, false, false, "Toxic Mouth Pokémon", PokemonType.POISON, PokemonType.FIGHTING, 1.3, 44.4, Abilities.ANTICIPATION, Abilities.DRY_SKIN, Abilities.POISON_TOUCH, 490, 83, 106, 65, 86, 65, 85, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.CARNIVINE, 4, false, false, false, "Bug Catcher Pokémon", PokemonType.GRASS, null, 1.4, 27, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 454, 74, 100, 72, 90, 72, 46, 200, 70, 159, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.FINNEON, 4, false, false, false, "Wing Fish Pokémon", PokemonType.WATER, null, 0.4, 7, Abilities.SWIFT_SWIM, Abilities.STORM_DRAIN, Abilities.WATER_VEIL, 330, 49, 49, 56, 49, 61, 66, 190, 70, 66, GrowthRate.ERRATIC, 50, true), + new PokemonSpecies(Species.LUMINEON, 4, false, false, false, "Neon Pokémon", PokemonType.WATER, null, 1.2, 24, Abilities.SWIFT_SWIM, Abilities.STORM_DRAIN, Abilities.WATER_VEIL, 460, 69, 69, 76, 69, 86, 91, 75, 70, 161, GrowthRate.ERRATIC, 50, true), + new PokemonSpecies(Species.MANTYKE, 4, false, false, false, "Kite Pokémon", PokemonType.WATER, PokemonType.FLYING, 1, 65, Abilities.SWIFT_SWIM, Abilities.WATER_ABSORB, Abilities.WATER_VEIL, 345, 45, 20, 50, 60, 120, 50, 25, 50, 69, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.SNOVER, 4, false, false, false, "Frost Tree Pokémon", PokemonType.GRASS, PokemonType.ICE, 1, 50.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 334, 60, 62, 50, 62, 60, 40, 120, 50, 67, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.ABOMASNOW, 4, false, false, false, "Frost Tree Pokémon", PokemonType.GRASS, PokemonType.ICE, 2.2, 135.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 494, 90, 92, 75, 92, 85, 60, 60, 50, 173, GrowthRate.SLOW, 50, true, true, + new PokemonForm("Normal", "", PokemonType.GRASS, PokemonType.ICE, 2.2, 135.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 494, 90, 92, 75, 92, 85, 60, 60, 50, 173, true, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.GRASS, PokemonType.ICE, 2.7, 185, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SNOW_WARNING, 594, 90, 132, 105, 132, 105, 30, 60, 50, 173, true), + ), + new PokemonSpecies(Species.WEAVILE, 4, false, false, false, "Sharp Claw Pokémon", PokemonType.DARK, PokemonType.ICE, 1.1, 34, Abilities.PRESSURE, Abilities.NONE, Abilities.PICKPOCKET, 510, 70, 120, 65, 45, 85, 125, 45, 35, 179, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.MAGNEZONE, 4, false, false, false, "Magnet Area Pokémon", PokemonType.ELECTRIC, PokemonType.STEEL, 1.2, 180, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 535, 70, 70, 115, 130, 90, 60, 30, 50, 268, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.LICKILICKY, 4, false, false, false, "Licking Pokémon", PokemonType.NORMAL, null, 1.7, 140, Abilities.OWN_TEMPO, Abilities.OBLIVIOUS, Abilities.CLOUD_NINE, 515, 110, 85, 95, 80, 95, 50, 30, 50, 180, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.RHYPERIOR, 4, false, false, false, "Drill Pokémon", PokemonType.GROUND, PokemonType.ROCK, 2.4, 282.8, Abilities.LIGHTNING_ROD, Abilities.SOLID_ROCK, Abilities.RECKLESS, 535, 115, 140, 130, 55, 55, 40, 30, 50, 268, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.TANGROWTH, 4, false, false, false, "Vine Pokémon", PokemonType.GRASS, null, 2, 128.6, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.REGENERATOR, 535, 100, 100, 125, 110, 50, 50, 30, 50, 187, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.ELECTIVIRE, 4, false, false, false, "Thunderbolt Pokémon", PokemonType.ELECTRIC, null, 1.8, 138.6, Abilities.MOTOR_DRIVE, Abilities.NONE, Abilities.VITAL_SPIRIT, 540, 75, 123, 67, 95, 85, 95, 30, 50, 270, GrowthRate.MEDIUM_FAST, 75, false), + new PokemonSpecies(Species.MAGMORTAR, 4, false, false, false, "Blast Pokémon", PokemonType.FIRE, null, 1.6, 68, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 540, 75, 95, 67, 125, 95, 83, 30, 50, 270, GrowthRate.MEDIUM_FAST, 75, false), + new PokemonSpecies(Species.TOGEKISS, 4, false, false, false, "Jubilee Pokémon", PokemonType.FAIRY, PokemonType.FLYING, 1.5, 38, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 545, 85, 50, 95, 120, 115, 80, 30, 50, 273, GrowthRate.FAST, 87.5, false), + new PokemonSpecies(Species.YANMEGA, 4, false, false, false, "Ogre Darner Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.9, 51.5, Abilities.SPEED_BOOST, Abilities.TINTED_LENS, Abilities.FRISK, 515, 86, 76, 86, 116, 56, 95, 30, 70, 180, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.LEAFEON, 4, false, false, false, "Verdant Pokémon", PokemonType.GRASS, null, 1, 25.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 65, 110, 130, 60, 65, 95, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.GLACEON, 4, false, false, false, "Fresh Snow Pokémon", PokemonType.ICE, null, 0.8, 25.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.ICE_BODY, 525, 65, 60, 110, 130, 95, 65, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.GLISCOR, 4, false, false, false, "Fang Scorpion Pokémon", PokemonType.GROUND, PokemonType.FLYING, 2, 42.5, Abilities.HYPER_CUTTER, Abilities.SAND_VEIL, Abilities.POISON_HEAL, 510, 75, 95, 125, 45, 75, 95, 30, 70, 179, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.MAMOSWINE, 4, false, false, false, "Twin Tusk Pokémon", PokemonType.ICE, PokemonType.GROUND, 2.5, 291, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 530, 110, 130, 80, 70, 60, 80, 50, 50, 265, GrowthRate.SLOW, 50, true), + new PokemonSpecies(Species.PORYGON_Z, 4, false, false, false, "Virtual Pokémon", PokemonType.NORMAL, null, 0.9, 34, Abilities.ADAPTABILITY, Abilities.DOWNLOAD, Abilities.ANALYTIC, 535, 85, 80, 70, 135, 75, 90, 30, 50, 268, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.GALLADE, 4, false, false, false, "Blade Pokémon", PokemonType.PSYCHIC, PokemonType.FIGHTING, 1.6, 52, Abilities.STEADFAST, Abilities.SHARPNESS, Abilities.JUSTIFIED, 518, 68, 125, 65, 65, 115, 80, 45, 35, 259, GrowthRate.SLOW, 100, false, true, + new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.FIGHTING, 1.6, 52, Abilities.STEADFAST, Abilities.SHARPNESS, Abilities.JUSTIFIED, 518, 68, 125, 65, 65, 115, 80, 45, 35, 259, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.PSYCHIC, PokemonType.FIGHTING, 1.6, 56.4, Abilities.SHARPNESS, Abilities.SHARPNESS, Abilities.SHARPNESS, 618, 68, 165, 95, 65, 115, 110, 45, 35, 259), + ), + new PokemonSpecies(Species.PROBOPASS, 4, false, false, false, "Compass Pokémon", PokemonType.ROCK, PokemonType.STEEL, 1.4, 340, Abilities.STURDY, Abilities.MAGNET_PULL, Abilities.SAND_FORCE, 525, 60, 55, 145, 75, 150, 40, 60, 70, 184, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DUSKNOIR, 4, false, false, false, "Gripper Pokémon", PokemonType.GHOST, null, 2.2, 106.6, Abilities.PRESSURE, Abilities.NONE, Abilities.FRISK, 525, 45, 100, 135, 65, 135, 45, 45, 35, 263, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.FROSLASS, 4, false, false, false, "Snow Land Pokémon", PokemonType.ICE, PokemonType.GHOST, 1.3, 26.6, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.CURSED_BODY, 480, 70, 80, 70, 80, 70, 110, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false), + new PokemonSpecies(Species.ROTOM, 4, false, false, false, "Plasma Pokémon", PokemonType.ELECTRIC, PokemonType.GHOST, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 440, 50, 50, 77, 95, 77, 91, 45, 50, 154, GrowthRate.MEDIUM_FAST, null, false, false, + new PokemonForm("Normal", "", PokemonType.ELECTRIC, PokemonType.GHOST, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 440, 50, 50, 77, 95, 77, 91, 45, 50, 154, false, null, true), + new PokemonForm("Heat", "heat", PokemonType.ELECTRIC, PokemonType.FIRE, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true), + new PokemonForm("Wash", "wash", PokemonType.ELECTRIC, PokemonType.WATER, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true), + new PokemonForm("Frost", "frost", PokemonType.ELECTRIC, PokemonType.ICE, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true), + new PokemonForm("Fan", "fan", PokemonType.ELECTRIC, PokemonType.FLYING, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true), + new PokemonForm("Mow", "mow", PokemonType.ELECTRIC, PokemonType.GRASS, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true), + ), + new PokemonSpecies(Species.UXIE, 4, true, false, false, "Knowledge Pokémon", PokemonType.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 75, 75, 130, 75, 130, 95, 3, 140, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.MESPRIT, 4, true, false, false, "Emotion Pokémon", PokemonType.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 80, 105, 105, 105, 105, 80, 3, 140, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.AZELF, 4, true, false, false, "Willpower Pokémon", PokemonType.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 75, 125, 70, 125, 70, 115, 3, 140, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.DIALGA, 4, false, true, false, "Temporal Pokémon", PokemonType.STEEL, PokemonType.DRAGON, 5.4, 683, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 120, 120, 150, 100, 90, 3, 0, 340, GrowthRate.SLOW, null, false, false, + new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.DRAGON, 5.4, 683, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 120, 120, 150, 100, 90, 3, 0, 340, false, null, true), + new PokemonForm("Origin Forme", "origin", PokemonType.STEEL, PokemonType.DRAGON, 7, 848.7, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 100, 120, 150, 120, 90, 3, 0, 340), + ), + new PokemonSpecies(Species.PALKIA, 4, false, true, false, "Spatial Pokémon", PokemonType.WATER, PokemonType.DRAGON, 4.2, 336, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 120, 100, 150, 120, 100, 3, 0, 340, GrowthRate.SLOW, null, false, false, + new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.DRAGON, 4.2, 336, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 120, 100, 150, 120, 100, 3, 0, 340, false, null, true), + new PokemonForm("Origin Forme", "origin", PokemonType.WATER, PokemonType.DRAGON, 6.3, 659, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 100, 100, 150, 120, 120, 3, 0, 340), + ), + new PokemonSpecies(Species.HEATRAN, 4, true, false, false, "Lava Dome Pokémon", PokemonType.FIRE, PokemonType.STEEL, 1.7, 430, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.FLAME_BODY, 600, 91, 90, 106, 130, 106, 77, 3, 100, 300, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.REGIGIGAS, 4, true, false, false, "Colossal Pokémon", PokemonType.NORMAL, null, 3.7, 420, Abilities.SLOW_START, Abilities.NONE, Abilities.NORMALIZE, 670, 110, 160, 110, 80, 110, 100, 3, 0, 335, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.GIRATINA, 4, false, true, false, "Renegade Pokémon", PokemonType.GHOST, PokemonType.DRAGON, 4.5, 750, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 150, 100, 120, 100, 120, 90, 3, 0, 340, GrowthRate.SLOW, null, false, true, + new PokemonForm("Altered Forme", "altered", PokemonType.GHOST, PokemonType.DRAGON, 4.5, 750, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 150, 100, 120, 100, 120, 90, 3, 0, 340, false, null, true), + new PokemonForm("Origin Forme", "origin", PokemonType.GHOST, PokemonType.DRAGON, 6.9, 650, Abilities.LEVITATE, Abilities.NONE, Abilities.LEVITATE, 680, 150, 120, 100, 120, 100, 90, 3, 0, 340), + ), + new PokemonSpecies(Species.CRESSELIA, 4, true, false, false, "Lunar Pokémon", PokemonType.PSYCHIC, null, 1.5, 85.6, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 120, 70, 110, 75, 120, 85, 3, 100, 300, GrowthRate.SLOW, 0, false), + new PokemonSpecies(Species.PHIONE, 4, false, false, true, "Sea Drifter Pokémon", PokemonType.WATER, null, 0.4, 3.1, Abilities.HYDRATION, Abilities.NONE, Abilities.NONE, 480, 80, 80, 80, 80, 80, 80, 30, 70, 240, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.MANAPHY, 4, false, false, true, "Seafaring Pokémon", PokemonType.WATER, null, 0.3, 1.4, Abilities.HYDRATION, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 70, 300, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.DARKRAI, 4, false, false, true, "Pitch-Black Pokémon", PokemonType.DARK, null, 1.5, 50.5, Abilities.BAD_DREAMS, Abilities.NONE, Abilities.NONE, 600, 70, 90, 90, 135, 90, 125, 3, 0, 300, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.SHAYMIN, 4, false, false, true, "Gratitude Pokémon", PokemonType.GRASS, null, 0.2, 2.1, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false, true, + new PokemonForm("Land Forme", "land", PokemonType.GRASS, null, 0.2, 2.1, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, false, null, true), + new PokemonForm("Sky Forme", "sky", PokemonType.GRASS, PokemonType.FLYING, 0.4, 5.2, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 103, 75, 120, 75, 127, 45, 100, 300), + ), + new PokemonSpecies(Species.ARCEUS, 4, false, false, true, "Alpha Pokémon", PokemonType.NORMAL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "normal", PokemonType.NORMAL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360, false, null, true), + new PokemonForm("Fighting", "fighting", PokemonType.FIGHTING, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Flying", "flying", PokemonType.FLYING, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Poison", "poison", PokemonType.POISON, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Ground", "ground", PokemonType.GROUND, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Rock", "rock", PokemonType.ROCK, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Bug", "bug", PokemonType.BUG, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Ghost", "ghost", PokemonType.GHOST, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Steel", "steel", PokemonType.STEEL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Fire", "fire", PokemonType.FIRE, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Water", "water", PokemonType.WATER, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Grass", "grass", PokemonType.GRASS, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Electric", "electric", PokemonType.ELECTRIC, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Psychic", "psychic", PokemonType.PSYCHIC, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Ice", "ice", PokemonType.ICE, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Dragon", "dragon", PokemonType.DRAGON, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Dark", "dark", PokemonType.DARK, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("Fairy", "fairy", PokemonType.FAIRY, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360), + new PokemonForm("???", "unknown", PokemonType.UNKNOWN, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360, false, null, false, true), + ), + new PokemonSpecies(Species.VICTINI, 5, false, false, true, "Victory Pokémon", PokemonType.PSYCHIC, PokemonType.FIRE, 0.4, 4, Abilities.VICTORY_STAR, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 100, 300, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.SNIVY, 5, false, false, false, "Grass Snake Pokémon", PokemonType.GRASS, null, 0.6, 8.1, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 308, 45, 45, 55, 45, 55, 63, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.SERVINE, 5, false, false, false, "Grass Snake Pokémon", PokemonType.GRASS, null, 0.8, 16, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 413, 60, 60, 75, 60, 75, 83, 45, 70, 145, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.SERPERIOR, 5, false, false, false, "Regal Pokémon", PokemonType.GRASS, null, 3.3, 63, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 528, 75, 75, 95, 75, 95, 113, 45, 70, 264, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.TEPIG, 5, false, false, false, "Fire Pig Pokémon", PokemonType.FIRE, null, 0.5, 9.9, Abilities.BLAZE, Abilities.NONE, Abilities.THICK_FAT, 308, 65, 63, 45, 45, 45, 45, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.PIGNITE, 5, false, false, false, "Fire Pig Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 1, 55.5, Abilities.BLAZE, Abilities.NONE, Abilities.THICK_FAT, 418, 90, 93, 55, 70, 55, 55, 45, 70, 146, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.EMBOAR, 5, false, false, false, "Mega Fire Pig Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 1.6, 150, Abilities.BLAZE, Abilities.NONE, Abilities.RECKLESS, 528, 110, 123, 65, 100, 65, 65, 45, 70, 264, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.OSHAWOTT, 5, false, false, false, "Sea Otter Pokémon", PokemonType.WATER, null, 0.5, 5.9, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 308, 55, 55, 45, 63, 45, 45, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.DEWOTT, 5, false, false, false, "Discipline Pokémon", PokemonType.WATER, null, 0.8, 24.5, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 413, 75, 75, 60, 83, 60, 60, 45, 70, 145, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.SAMUROTT, 5, false, false, false, "Formidable Pokémon", PokemonType.WATER, null, 1.5, 94.6, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 528, 95, 100, 85, 108, 70, 70, 45, 70, 264, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.PATRAT, 5, false, false, false, "Scout Pokémon", PokemonType.NORMAL, null, 0.5, 11.6, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.ANALYTIC, 255, 45, 55, 39, 35, 39, 42, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.WATCHOG, 5, false, false, false, "Lookout Pokémon", PokemonType.NORMAL, null, 1.1, 27, Abilities.ILLUMINATE, Abilities.KEEN_EYE, Abilities.ANALYTIC, 420, 60, 85, 69, 60, 69, 77, 255, 70, 147, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.LILLIPUP, 5, false, false, false, "Puppy Pokémon", PokemonType.NORMAL, null, 0.4, 4.1, Abilities.VITAL_SPIRIT, Abilities.PICKUP, Abilities.RUN_AWAY, 275, 45, 60, 45, 25, 45, 55, 255, 50, 55, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.HERDIER, 5, false, false, false, "Loyal Dog Pokémon", PokemonType.NORMAL, null, 0.9, 14.7, Abilities.INTIMIDATE, Abilities.SAND_RUSH, Abilities.SCRAPPY, 370, 65, 80, 65, 35, 65, 60, 120, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.STOUTLAND, 5, false, false, false, "Big-Hearted Pokémon", PokemonType.NORMAL, null, 1.2, 61, Abilities.INTIMIDATE, Abilities.SAND_RUSH, Abilities.SCRAPPY, 500, 85, 110, 90, 45, 90, 80, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.PURRLOIN, 5, false, false, false, "Devious Pokémon", PokemonType.DARK, null, 0.4, 10.1, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.PRANKSTER, 281, 41, 50, 37, 50, 37, 66, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.LIEPARD, 5, false, false, false, "Cruel Pokémon", PokemonType.DARK, null, 1.1, 37.5, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.PRANKSTER, 446, 64, 88, 50, 88, 50, 106, 90, 50, 156, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PANSAGE, 5, false, false, false, "Grass Monkey Pokémon", PokemonType.GRASS, null, 0.6, 10.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.OVERGROW, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.SIMISAGE, 5, false, false, false, "Thorn Monkey Pokémon", PokemonType.GRASS, null, 1.1, 30.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.OVERGROW, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.PANSEAR, 5, false, false, false, "High Temp Pokémon", PokemonType.FIRE, null, 0.6, 11, Abilities.GLUTTONY, Abilities.NONE, Abilities.BLAZE, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.SIMISEAR, 5, false, false, false, "Ember Pokémon", PokemonType.FIRE, null, 1, 28, Abilities.GLUTTONY, Abilities.NONE, Abilities.BLAZE, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.PANPOUR, 5, false, false, false, "Spray Pokémon", PokemonType.WATER, null, 0.6, 13.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.TORRENT, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.SIMIPOUR, 5, false, false, false, "Geyser Pokémon", PokemonType.WATER, null, 1, 29, Abilities.GLUTTONY, Abilities.NONE, Abilities.TORRENT, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.MUNNA, 5, false, false, false, "Dream Eater Pokémon", PokemonType.PSYCHIC, null, 0.6, 23.3, Abilities.FOREWARN, Abilities.SYNCHRONIZE, Abilities.TELEPATHY, 292, 76, 25, 45, 67, 55, 24, 190, 50, 58, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.MUSHARNA, 5, false, false, false, "Drowsing Pokémon", PokemonType.PSYCHIC, null, 1.1, 60.5, Abilities.FOREWARN, Abilities.SYNCHRONIZE, Abilities.TELEPATHY, 487, 116, 55, 85, 107, 95, 29, 75, 50, 170, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.PIDOVE, 5, false, false, false, "Tiny Pigeon Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 2.1, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 264, 50, 55, 50, 36, 30, 43, 255, 50, 53, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.TRANQUILL, 5, false, false, false, "Wild Pigeon Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 15, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 358, 62, 77, 62, 50, 42, 65, 120, 50, 125, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.UNFEZANT, 5, false, false, false, "Proud Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.2, 29, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 488, 80, 115, 80, 65, 55, 93, 45, 50, 244, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.BLITZLE, 5, false, false, false, "Electrified Pokémon", PokemonType.ELECTRIC, null, 0.8, 29.8, Abilities.LIGHTNING_ROD, Abilities.MOTOR_DRIVE, Abilities.SAP_SIPPER, 295, 45, 60, 32, 50, 32, 76, 190, 70, 59, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ZEBSTRIKA, 5, false, false, false, "Thunderbolt Pokémon", PokemonType.ELECTRIC, null, 1.6, 79.5, Abilities.LIGHTNING_ROD, Abilities.MOTOR_DRIVE, Abilities.SAP_SIPPER, 497, 75, 100, 63, 80, 63, 116, 75, 70, 174, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ROGGENROLA, 5, false, false, false, "Mantle Pokémon", PokemonType.ROCK, null, 0.4, 18, Abilities.STURDY, Abilities.WEAK_ARMOR, Abilities.SAND_FORCE, 280, 55, 75, 85, 25, 25, 15, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.BOLDORE, 5, false, false, false, "Ore Pokémon", PokemonType.ROCK, null, 0.9, 102, Abilities.STURDY, Abilities.WEAK_ARMOR, Abilities.SAND_FORCE, 390, 70, 105, 105, 50, 40, 20, 120, 50, 137, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GIGALITH, 5, false, false, false, "Compressed Pokémon", PokemonType.ROCK, null, 1.7, 260, Abilities.STURDY, Abilities.SAND_STREAM, Abilities.SAND_FORCE, 515, 85, 135, 130, 60, 80, 25, 45, 50, 258, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.WOOBAT, 5, false, false, false, "Bat Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 0.4, 2.1, Abilities.UNAWARE, Abilities.KLUTZ, Abilities.SIMPLE, 323, 65, 45, 43, 55, 43, 72, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SWOOBAT, 5, false, false, false, "Courting Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 0.9, 10.5, Abilities.UNAWARE, Abilities.KLUTZ, Abilities.SIMPLE, 425, 67, 57, 55, 77, 55, 114, 45, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DRILBUR, 5, false, false, false, "Mole Pokémon", PokemonType.GROUND, null, 0.3, 8.5, Abilities.SAND_RUSH, Abilities.SAND_FORCE, Abilities.MOLD_BREAKER, 328, 60, 85, 40, 30, 45, 68, 120, 50, 66, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.EXCADRILL, 5, false, false, false, "Subterrene Pokémon", PokemonType.GROUND, PokemonType.STEEL, 0.7, 40.4, Abilities.SAND_RUSH, Abilities.SAND_FORCE, Abilities.MOLD_BREAKER, 508, 110, 135, 60, 50, 65, 88, 60, 50, 178, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.AUDINO, 5, false, false, false, "Hearing Pokémon", PokemonType.NORMAL, null, 1.1, 31, Abilities.HEALER, Abilities.REGENERATOR, Abilities.KLUTZ, 445, 103, 60, 86, 60, 86, 50, 255, 50, 390, GrowthRate.FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.NORMAL, null, 1.1, 31, Abilities.HEALER, Abilities.REGENERATOR, Abilities.KLUTZ, 445, 103, 60, 86, 60, 86, 50, 255, 50, 390, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.NORMAL, PokemonType.FAIRY, 1.5, 32, Abilities.REGENERATOR, Abilities.REGENERATOR, Abilities.REGENERATOR, 545, 103, 60, 126, 80, 126, 50, 255, 50, 390), //Custom Ability, base form Hidden Ability + ), + new PokemonSpecies(Species.TIMBURR, 5, false, false, false, "Muscular Pokémon", PokemonType.FIGHTING, null, 0.6, 12.5, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 305, 75, 80, 55, 25, 35, 35, 180, 70, 61, GrowthRate.MEDIUM_SLOW, 75, false), + new PokemonSpecies(Species.GURDURR, 5, false, false, false, "Muscular Pokémon", PokemonType.FIGHTING, null, 1.2, 40, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 405, 85, 105, 85, 40, 50, 40, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 75, false), + new PokemonSpecies(Species.CONKELDURR, 5, false, false, false, "Muscular Pokémon", PokemonType.FIGHTING, null, 1.4, 87, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 505, 105, 140, 95, 55, 65, 45, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 75, false), + new PokemonSpecies(Species.TYMPOLE, 5, false, false, false, "Tadpole Pokémon", PokemonType.WATER, null, 0.5, 4.5, Abilities.SWIFT_SWIM, Abilities.HYDRATION, Abilities.WATER_ABSORB, 294, 50, 50, 40, 50, 40, 64, 255, 50, 59, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.PALPITOAD, 5, false, false, false, "Vibration Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.8, 17, Abilities.SWIFT_SWIM, Abilities.HYDRATION, Abilities.WATER_ABSORB, 384, 75, 65, 55, 65, 55, 69, 120, 50, 134, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SEISMITOAD, 5, false, false, false, "Vibration Pokémon", PokemonType.WATER, PokemonType.GROUND, 1.5, 62, Abilities.SWIFT_SWIM, Abilities.POISON_TOUCH, Abilities.WATER_ABSORB, 509, 105, 95, 75, 85, 75, 74, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.THROH, 5, false, false, false, "Judo Pokémon", PokemonType.FIGHTING, null, 1.3, 55.5, Abilities.GUTS, Abilities.INNER_FOCUS, Abilities.MOLD_BREAKER, 465, 120, 100, 85, 30, 85, 45, 45, 50, 163, GrowthRate.MEDIUM_FAST, 100, false), + new PokemonSpecies(Species.SAWK, 5, false, false, false, "Karate Pokémon", PokemonType.FIGHTING, null, 1.4, 51, Abilities.STURDY, Abilities.INNER_FOCUS, Abilities.MOLD_BREAKER, 465, 75, 125, 75, 30, 75, 85, 45, 50, 163, GrowthRate.MEDIUM_FAST, 100, false), + new PokemonSpecies(Species.SEWADDLE, 5, false, false, false, "Sewing Pokémon", PokemonType.BUG, PokemonType.GRASS, 0.3, 2.5, Abilities.SWARM, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 310, 45, 53, 70, 40, 60, 42, 255, 70, 62, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SWADLOON, 5, false, false, false, "Leaf-Wrapped Pokémon", PokemonType.BUG, PokemonType.GRASS, 0.5, 7.3, Abilities.LEAF_GUARD, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 380, 55, 63, 90, 50, 80, 42, 120, 70, 133, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.LEAVANNY, 5, false, false, false, "Nurturing Pokémon", PokemonType.BUG, PokemonType.GRASS, 1.2, 20.5, Abilities.SWARM, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 500, 75, 103, 80, 70, 80, 92, 45, 70, 250, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.VENIPEDE, 5, false, false, false, "Centipede Pokémon", PokemonType.BUG, PokemonType.POISON, 0.4, 5.3, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 260, 30, 45, 59, 30, 39, 57, 255, 50, 52, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.WHIRLIPEDE, 5, false, false, false, "Curlipede Pokémon", PokemonType.BUG, PokemonType.POISON, 1.2, 58.5, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 360, 40, 55, 99, 40, 79, 47, 120, 50, 126, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SCOLIPEDE, 5, false, false, false, "Megapede Pokémon", PokemonType.BUG, PokemonType.POISON, 2.5, 200.5, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 485, 60, 100, 89, 55, 69, 112, 45, 50, 243, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.COTTONEE, 5, false, false, false, "Cotton Puff Pokémon", PokemonType.GRASS, PokemonType.FAIRY, 0.3, 0.6, Abilities.PRANKSTER, Abilities.INFILTRATOR, Abilities.CHLOROPHYLL, 280, 40, 27, 60, 37, 50, 66, 190, 50, 56, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.WHIMSICOTT, 5, false, false, false, "Windveiled Pokémon", PokemonType.GRASS, PokemonType.FAIRY, 0.7, 6.6, Abilities.PRANKSTER, Abilities.INFILTRATOR, Abilities.CHLOROPHYLL, 480, 60, 67, 85, 77, 75, 116, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PETILIL, 5, false, false, false, "Bulb Pokémon", PokemonType.GRASS, null, 0.5, 6.6, Abilities.CHLOROPHYLL, Abilities.OWN_TEMPO, Abilities.LEAF_GUARD, 280, 45, 35, 50, 70, 50, 30, 190, 50, 56, GrowthRate.MEDIUM_FAST, 0, false), + new PokemonSpecies(Species.LILLIGANT, 5, false, false, false, "Flowering Pokémon", PokemonType.GRASS, null, 1.1, 16.3, Abilities.CHLOROPHYLL, Abilities.OWN_TEMPO, Abilities.LEAF_GUARD, 480, 70, 60, 75, 110, 75, 90, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false), + new PokemonSpecies(Species.BASCULIN, 5, false, false, false, "Hostile Pokémon", PokemonType.WATER, null, 1, 18, Abilities.RECKLESS, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Red-Striped Form", "red-striped", PokemonType.WATER, null, 1, 18, Abilities.RECKLESS, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true), + new PokemonForm("Blue-Striped Form", "blue-striped", PokemonType.WATER, null, 1, 18, Abilities.ROCK_HEAD, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true), + new PokemonForm("White-Striped Form", "white-striped", PokemonType.WATER, null, 1, 18, Abilities.RATTLED, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true), + ), + new PokemonSpecies(Species.SANDILE, 5, false, false, false, "Desert Croc Pokémon", PokemonType.GROUND, PokemonType.DARK, 0.7, 15.2, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 292, 50, 72, 35, 35, 35, 65, 180, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.KROKOROK, 5, false, false, false, "Desert Croc Pokémon", PokemonType.GROUND, PokemonType.DARK, 1, 33.4, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 351, 60, 82, 45, 45, 45, 74, 90, 50, 123, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.KROOKODILE, 5, false, false, false, "Intimidation Pokémon", PokemonType.GROUND, PokemonType.DARK, 1.5, 96.3, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 519, 95, 117, 80, 65, 70, 92, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.DARUMAKA, 5, false, false, false, "Zen Charm Pokémon", PokemonType.FIRE, null, 0.6, 37.5, Abilities.HUSTLE, Abilities.NONE, Abilities.INNER_FOCUS, 315, 70, 90, 45, 15, 45, 50, 120, 50, 63, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.DARMANITAN, 5, false, false, false, "Blazing Pokémon", PokemonType.FIRE, null, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false, true, + new PokemonForm("Standard Mode", "", PokemonType.FIRE, null, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, false, null, true), + new PokemonForm("Zen Mode", "zen", PokemonType.FIRE, PokemonType.PSYCHIC, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 540, 105, 30, 105, 140, 105, 55, 60, 50, 189), + ), + new PokemonSpecies(Species.MARACTUS, 5, false, false, false, "Cactus Pokémon", PokemonType.GRASS, null, 1, 28, Abilities.WATER_ABSORB, Abilities.CHLOROPHYLL, Abilities.STORM_DRAIN, 461, 75, 86, 67, 106, 67, 60, 255, 50, 161, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DWEBBLE, 5, false, false, false, "Rock Inn Pokémon", PokemonType.BUG, PokemonType.ROCK, 0.3, 14.5, Abilities.STURDY, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 325, 50, 65, 85, 35, 35, 55, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CRUSTLE, 5, false, false, false, "Stone Home Pokémon", PokemonType.BUG, PokemonType.ROCK, 1.4, 200, Abilities.STURDY, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 485, 70, 105, 125, 65, 75, 45, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SCRAGGY, 5, false, false, false, "Shedding Pokémon", PokemonType.DARK, PokemonType.FIGHTING, 0.6, 11.8, Abilities.SHED_SKIN, Abilities.MOXIE, Abilities.INTIMIDATE, 348, 50, 75, 70, 35, 70, 48, 180, 35, 70, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SCRAFTY, 5, false, false, false, "Hoodlum Pokémon", PokemonType.DARK, PokemonType.FIGHTING, 1.1, 30, Abilities.SHED_SKIN, Abilities.MOXIE, Abilities.INTIMIDATE, 488, 65, 90, 115, 45, 115, 58, 90, 50, 171, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SIGILYPH, 5, false, false, false, "Avianoid Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 1.4, 14, Abilities.WONDER_SKIN, Abilities.MAGIC_GUARD, Abilities.TINTED_LENS, 490, 72, 58, 80, 103, 80, 97, 45, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.YAMASK, 5, false, false, false, "Spirit Pokémon", PokemonType.GHOST, null, 0.5, 1.5, Abilities.MUMMY, Abilities.NONE, Abilities.NONE, 303, 38, 30, 85, 55, 65, 30, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.COFAGRIGUS, 5, false, false, false, "Coffin Pokémon", PokemonType.GHOST, null, 1.7, 76.5, Abilities.MUMMY, Abilities.NONE, Abilities.NONE, 483, 58, 50, 145, 95, 105, 30, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.TIRTOUGA, 5, false, false, false, "Prototurtle Pokémon", PokemonType.WATER, PokemonType.ROCK, 0.7, 16.5, Abilities.SOLID_ROCK, Abilities.STURDY, Abilities.SWIFT_SWIM, 355, 54, 78, 103, 53, 45, 22, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.CARRACOSTA, 5, false, false, false, "Prototurtle Pokémon", PokemonType.WATER, PokemonType.ROCK, 1.2, 81, Abilities.SOLID_ROCK, Abilities.STURDY, Abilities.SWIFT_SWIM, 495, 74, 108, 133, 83, 65, 32, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.ARCHEN, 5, false, false, false, "First Bird Pokémon", PokemonType.ROCK, PokemonType.FLYING, 0.5, 9.5, Abilities.DEFEATIST, Abilities.NONE, Abilities.WIMP_OUT, 401, 55, 112, 45, 74, 45, 70, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false), //Custom Hidden + new PokemonSpecies(Species.ARCHEOPS, 5, false, false, false, "First Bird Pokémon", PokemonType.ROCK, PokemonType.FLYING, 1.4, 32, Abilities.DEFEATIST, Abilities.NONE, Abilities.EMERGENCY_EXIT, 567, 75, 140, 65, 112, 65, 110, 45, 50, 177, GrowthRate.MEDIUM_FAST, 87.5, false), //Custom Hidden + new PokemonSpecies(Species.TRUBBISH, 5, false, false, false, "Trash Bag Pokémon", PokemonType.POISON, null, 0.6, 31, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.AFTERMATH, 329, 50, 50, 62, 40, 62, 65, 190, 50, 66, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GARBODOR, 5, false, false, false, "Trash Heap Pokémon", PokemonType.POISON, null, 1.9, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 474, 80, 95, 82, 60, 82, 75, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.POISON, null, 1.9, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 474, 80, 95, 82, 60, 82, 75, 60, 50, 166, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.POISON, PokemonType.STEEL, 21, 999.9, Abilities.TOXIC_DEBRIS, Abilities.TOXIC_DEBRIS, Abilities.TOXIC_DEBRIS, 574, 135, 125, 102, 57, 102, 53, 60, 50, 166), + ), + new PokemonSpecies(Species.ZORUA, 5, false, false, false, "Tricky Fox Pokémon", PokemonType.DARK, null, 0.7, 12.5, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 330, 40, 65, 40, 80, 40, 65, 75, 50, 66, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.ZOROARK, 5, false, false, false, "Illusion Fox Pokémon", PokemonType.DARK, null, 1.6, 81.1, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 510, 60, 105, 60, 120, 60, 105, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.MINCCINO, 5, false, false, false, "Chinchilla Pokémon", PokemonType.NORMAL, null, 0.4, 5.8, Abilities.CUTE_CHARM, Abilities.TECHNICIAN, Abilities.SKILL_LINK, 300, 55, 50, 40, 40, 40, 75, 255, 50, 60, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.CINCCINO, 5, false, false, false, "Scarf Pokémon", PokemonType.NORMAL, null, 0.5, 7.5, Abilities.CUTE_CHARM, Abilities.TECHNICIAN, Abilities.SKILL_LINK, 470, 75, 95, 60, 65, 60, 115, 60, 50, 165, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.GOTHITA, 5, false, false, false, "Fixation Pokémon", PokemonType.PSYCHIC, null, 0.4, 5.8, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 290, 45, 30, 50, 55, 65, 45, 200, 50, 58, GrowthRate.MEDIUM_SLOW, 25, false), + new PokemonSpecies(Species.GOTHORITA, 5, false, false, false, "Manipulate Pokémon", PokemonType.PSYCHIC, null, 0.7, 18, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 390, 60, 45, 70, 75, 85, 55, 100, 50, 137, GrowthRate.MEDIUM_SLOW, 25, false), + new PokemonSpecies(Species.GOTHITELLE, 5, false, false, false, "Astral Body Pokémon", PokemonType.PSYCHIC, null, 1.5, 44, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 490, 70, 55, 95, 95, 110, 65, 50, 50, 245, GrowthRate.MEDIUM_SLOW, 25, false), + new PokemonSpecies(Species.SOLOSIS, 5, false, false, false, "Cell Pokémon", PokemonType.PSYCHIC, null, 0.3, 1, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 290, 45, 30, 40, 105, 50, 20, 200, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.DUOSION, 5, false, false, false, "Mitosis Pokémon", PokemonType.PSYCHIC, null, 0.6, 8, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 370, 65, 40, 50, 125, 60, 30, 100, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.REUNICLUS, 5, false, false, false, "Multiplying Pokémon", PokemonType.PSYCHIC, null, 1, 20.1, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 490, 110, 65, 75, 125, 85, 30, 50, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.DUCKLETT, 5, false, false, false, "Water Bird Pokémon", PokemonType.WATER, PokemonType.FLYING, 0.5, 5.5, Abilities.KEEN_EYE, Abilities.BIG_PECKS, Abilities.HYDRATION, 305, 62, 44, 50, 44, 50, 55, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SWANNA, 5, false, false, false, "White Bird Pokémon", PokemonType.WATER, PokemonType.FLYING, 1.3, 24.2, Abilities.KEEN_EYE, Abilities.BIG_PECKS, Abilities.HYDRATION, 473, 75, 87, 63, 87, 63, 98, 45, 70, 166, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.VANILLITE, 5, false, false, false, "Fresh Snow Pokémon", PokemonType.ICE, null, 0.4, 5.7, Abilities.ICE_BODY, Abilities.SNOW_CLOAK, Abilities.WEAK_ARMOR, 305, 36, 50, 50, 65, 60, 44, 255, 50, 61, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.VANILLISH, 5, false, false, false, "Icy Snow Pokémon", PokemonType.ICE, null, 1.1, 41, Abilities.ICE_BODY, Abilities.SNOW_CLOAK, Abilities.WEAK_ARMOR, 395, 51, 65, 65, 80, 75, 59, 120, 50, 138, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.VANILLUXE, 5, false, false, false, "Snowstorm Pokémon", PokemonType.ICE, null, 1.3, 57.5, Abilities.ICE_BODY, Abilities.SNOW_WARNING, Abilities.WEAK_ARMOR, 535, 71, 95, 85, 110, 95, 79, 45, 50, 268, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.DEERLING, 5, false, false, false, "Season Pokémon", PokemonType.NORMAL, PokemonType.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Spring Form", "spring", PokemonType.NORMAL, PokemonType.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true), + new PokemonForm("Summer Form", "summer", PokemonType.NORMAL, PokemonType.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true), + new PokemonForm("Autumn Form", "autumn", PokemonType.NORMAL, PokemonType.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true), + new PokemonForm("Winter Form", "winter", PokemonType.NORMAL, PokemonType.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true), + ), + new PokemonSpecies(Species.SAWSBUCK, 5, false, false, false, "Season Pokémon", PokemonType.NORMAL, PokemonType.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Spring Form", "spring", PokemonType.NORMAL, PokemonType.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true), + new PokemonForm("Summer Form", "summer", PokemonType.NORMAL, PokemonType.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true), + new PokemonForm("Autumn Form", "autumn", PokemonType.NORMAL, PokemonType.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true), + new PokemonForm("Winter Form", "winter", PokemonType.NORMAL, PokemonType.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true), + ), + new PokemonSpecies(Species.EMOLGA, 5, false, false, false, "Sky Squirrel Pokémon", PokemonType.ELECTRIC, PokemonType.FLYING, 0.4, 5, Abilities.STATIC, Abilities.NONE, Abilities.MOTOR_DRIVE, 428, 55, 75, 60, 75, 60, 103, 200, 50, 150, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.KARRABLAST, 5, false, false, false, "Clamping Pokémon", PokemonType.BUG, null, 0.5, 5.9, Abilities.SWARM, Abilities.SHED_SKIN, Abilities.NO_GUARD, 315, 50, 75, 45, 40, 45, 60, 200, 50, 63, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ESCAVALIER, 5, false, false, false, "Cavalry Pokémon", PokemonType.BUG, PokemonType.STEEL, 1, 33, Abilities.SWARM, Abilities.SHELL_ARMOR, Abilities.OVERCOAT, 495, 70, 135, 105, 60, 105, 20, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FOONGUS, 5, false, false, false, "Mushroom Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.2, 1, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.REGENERATOR, 294, 69, 55, 45, 55, 55, 15, 190, 50, 59, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.AMOONGUSS, 5, false, false, false, "Mushroom Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.6, 10.5, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.REGENERATOR, 464, 114, 85, 70, 85, 80, 30, 75, 50, 162, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FRILLISH, 5, false, false, false, "Floating Pokémon", PokemonType.WATER, PokemonType.GHOST, 1.2, 33, Abilities.WATER_ABSORB, Abilities.CURSED_BODY, Abilities.DAMP, 335, 55, 40, 50, 65, 85, 40, 190, 50, 67, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.JELLICENT, 5, false, false, false, "Floating Pokémon", PokemonType.WATER, PokemonType.GHOST, 2.2, 135, Abilities.WATER_ABSORB, Abilities.CURSED_BODY, Abilities.DAMP, 480, 100, 60, 70, 85, 105, 60, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.ALOMOMOLA, 5, false, false, false, "Caring Pokémon", PokemonType.WATER, null, 1.2, 31.6, Abilities.HEALER, Abilities.HYDRATION, Abilities.REGENERATOR, 470, 165, 75, 80, 40, 45, 65, 75, 70, 165, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.JOLTIK, 5, false, false, false, "Attaching Pokémon", PokemonType.BUG, PokemonType.ELECTRIC, 0.1, 0.6, Abilities.COMPOUND_EYES, Abilities.UNNERVE, Abilities.SWARM, 319, 50, 47, 50, 57, 50, 65, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALVANTULA, 5, false, false, false, "EleSpider Pokémon", PokemonType.BUG, PokemonType.ELECTRIC, 0.8, 14.3, Abilities.COMPOUND_EYES, Abilities.UNNERVE, Abilities.SWARM, 472, 70, 77, 60, 97, 60, 108, 75, 50, 165, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FERROSEED, 5, false, false, false, "Thorn Seed Pokémon", PokemonType.GRASS, PokemonType.STEEL, 0.6, 18.8, Abilities.IRON_BARBS, Abilities.NONE, Abilities.ANTICIPATION, 305, 44, 50, 91, 24, 86, 10, 255, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FERROTHORN, 5, false, false, false, "Thorn Pod Pokémon", PokemonType.GRASS, PokemonType.STEEL, 1, 110, Abilities.IRON_BARBS, Abilities.NONE, Abilities.ANTICIPATION, 489, 74, 94, 131, 54, 116, 20, 90, 50, 171, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.KLINK, 5, false, false, false, "Gear Pokémon", PokemonType.STEEL, null, 0.3, 21, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 300, 40, 55, 70, 45, 60, 30, 130, 50, 60, GrowthRate.MEDIUM_SLOW, null, false), + new PokemonSpecies(Species.KLANG, 5, false, false, false, "Gear Pokémon", PokemonType.STEEL, null, 0.6, 51, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 440, 60, 80, 95, 70, 85, 50, 60, 50, 154, GrowthRate.MEDIUM_SLOW, null, false), + new PokemonSpecies(Species.KLINKLANG, 5, false, false, false, "Gear Pokémon", PokemonType.STEEL, null, 0.6, 81, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 520, 60, 100, 115, 70, 85, 90, 30, 50, 260, GrowthRate.MEDIUM_SLOW, null, false), + new PokemonSpecies(Species.TYNAMO, 5, false, false, false, "EleFish Pokémon", PokemonType.ELECTRIC, null, 0.2, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 275, 35, 55, 40, 45, 40, 60, 190, 70, 55, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.EELEKTRIK, 5, false, false, false, "EleFish Pokémon", PokemonType.ELECTRIC, null, 1.2, 22, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 405, 65, 85, 70, 75, 70, 40, 60, 70, 142, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.EELEKTROSS, 5, false, false, false, "EleFish Pokémon", PokemonType.ELECTRIC, null, 2.1, 80.5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 515, 85, 115, 80, 105, 80, 50, 30, 70, 258, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.ELGYEM, 5, false, false, false, "Cerebral Pokémon", PokemonType.PSYCHIC, null, 0.5, 9, Abilities.TELEPATHY, Abilities.SYNCHRONIZE, Abilities.ANALYTIC, 335, 55, 55, 55, 85, 55, 30, 255, 50, 67, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BEHEEYEM, 5, false, false, false, "Cerebral Pokémon", PokemonType.PSYCHIC, null, 1, 34.5, Abilities.TELEPATHY, Abilities.SYNCHRONIZE, Abilities.ANALYTIC, 485, 75, 75, 75, 125, 95, 40, 90, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.LITWICK, 5, false, false, false, "Candle Pokémon", PokemonType.GHOST, PokemonType.FIRE, 0.3, 3.1, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 275, 50, 30, 55, 65, 55, 20, 190, 50, 55, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.LAMPENT, 5, false, false, false, "Lamp Pokémon", PokemonType.GHOST, PokemonType.FIRE, 0.6, 13, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 370, 60, 40, 60, 95, 60, 55, 90, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.CHANDELURE, 5, false, false, false, "Luring Pokémon", PokemonType.GHOST, PokemonType.FIRE, 1, 34.3, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 520, 60, 55, 90, 145, 90, 80, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.AXEW, 5, false, false, false, "Tusk Pokémon", PokemonType.DRAGON, null, 0.6, 18, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 320, 46, 87, 60, 30, 40, 57, 75, 35, 64, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.FRAXURE, 5, false, false, false, "Axe Jaw Pokémon", PokemonType.DRAGON, null, 1, 36, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 410, 66, 117, 70, 40, 50, 67, 60, 35, 144, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.HAXORUS, 5, false, false, false, "Axe Jaw Pokémon", PokemonType.DRAGON, null, 1.8, 105.5, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 540, 76, 147, 90, 60, 70, 97, 45, 35, 270, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.CUBCHOO, 5, false, false, false, "Chill Pokémon", PokemonType.ICE, null, 0.5, 8.5, Abilities.SNOW_CLOAK, Abilities.SLUSH_RUSH, Abilities.RATTLED, 305, 55, 70, 40, 60, 40, 40, 120, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BEARTIC, 5, false, false, false, "Freezing Pokémon", PokemonType.ICE, null, 2.6, 260, Abilities.SNOW_CLOAK, Abilities.SLUSH_RUSH, Abilities.SWIFT_SWIM, 505, 95, 130, 80, 70, 80, 50, 60, 50, 177, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CRYOGONAL, 5, false, false, false, "Crystallizing Pokémon", PokemonType.ICE, null, 1.1, 148, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 515, 80, 50, 50, 95, 135, 105, 25, 50, 180, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.SHELMET, 5, false, false, false, "Snail Pokémon", PokemonType.BUG, null, 0.4, 7.7, Abilities.HYDRATION, Abilities.SHELL_ARMOR, Abilities.OVERCOAT, 305, 50, 40, 85, 40, 65, 25, 200, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ACCELGOR, 5, false, false, false, "Shell Out Pokémon", PokemonType.BUG, null, 0.8, 25.3, Abilities.HYDRATION, Abilities.STICKY_HOLD, Abilities.UNBURDEN, 495, 80, 70, 40, 100, 60, 145, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.STUNFISK, 5, false, false, false, "Trap Pokémon", PokemonType.GROUND, PokemonType.ELECTRIC, 0.7, 11, Abilities.STATIC, Abilities.LIMBER, Abilities.SAND_VEIL, 471, 109, 66, 84, 81, 99, 32, 75, 70, 165, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MIENFOO, 5, false, false, false, "Martial Arts Pokémon", PokemonType.FIGHTING, null, 0.9, 20, Abilities.INNER_FOCUS, Abilities.REGENERATOR, Abilities.RECKLESS, 350, 45, 85, 50, 55, 50, 65, 180, 50, 70, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.MIENSHAO, 5, false, false, false, "Martial Arts Pokémon", PokemonType.FIGHTING, null, 1.4, 35.5, Abilities.INNER_FOCUS, Abilities.REGENERATOR, Abilities.RECKLESS, 510, 65, 125, 60, 95, 60, 105, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.DRUDDIGON, 5, false, false, false, "Cave Pokémon", PokemonType.DRAGON, null, 1.6, 139, Abilities.ROUGH_SKIN, Abilities.SHEER_FORCE, Abilities.MOLD_BREAKER, 485, 77, 120, 90, 60, 90, 48, 45, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GOLETT, 5, false, false, false, "Automaton Pokémon", PokemonType.GROUND, PokemonType.GHOST, 1, 92, Abilities.IRON_FIST, Abilities.KLUTZ, Abilities.NO_GUARD, 303, 59, 74, 50, 35, 50, 35, 190, 50, 61, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.GOLURK, 5, false, false, false, "Automaton Pokémon", PokemonType.GROUND, PokemonType.GHOST, 2.8, 330, Abilities.IRON_FIST, Abilities.KLUTZ, Abilities.NO_GUARD, 483, 89, 124, 80, 55, 80, 55, 90, 50, 169, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.PAWNIARD, 5, false, false, false, "Sharp Blade Pokémon", PokemonType.DARK, PokemonType.STEEL, 0.5, 10.2, Abilities.DEFIANT, Abilities.INNER_FOCUS, Abilities.PRESSURE, 340, 45, 85, 70, 40, 40, 60, 120, 35, 68, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BISHARP, 5, false, false, false, "Sword Blade Pokémon", PokemonType.DARK, PokemonType.STEEL, 1.6, 70, Abilities.DEFIANT, Abilities.INNER_FOCUS, Abilities.PRESSURE, 490, 65, 125, 100, 60, 70, 70, 45, 35, 172, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BOUFFALANT, 5, false, false, false, "Bash Buffalo Pokémon", PokemonType.NORMAL, null, 1.6, 94.6, Abilities.RECKLESS, Abilities.SAP_SIPPER, Abilities.SOUNDPROOF, 490, 95, 110, 95, 40, 95, 55, 45, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.RUFFLET, 5, false, false, false, "Eaglet Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.5, 10.5, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.HUSTLE, 350, 70, 83, 50, 37, 50, 60, 190, 50, 70, GrowthRate.SLOW, 100, false), + new PokemonSpecies(Species.BRAVIARY, 5, false, false, false, "Valiant Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.5, 41, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.DEFIANT, 510, 100, 123, 75, 57, 75, 80, 60, 50, 179, GrowthRate.SLOW, 100, false), + new PokemonSpecies(Species.VULLABY, 5, false, false, false, "Diapered Pokémon", PokemonType.DARK, PokemonType.FLYING, 0.5, 9, Abilities.BIG_PECKS, Abilities.OVERCOAT, Abilities.WEAK_ARMOR, 370, 70, 55, 75, 45, 65, 60, 190, 35, 74, GrowthRate.SLOW, 0, false), + new PokemonSpecies(Species.MANDIBUZZ, 5, false, false, false, "Bone Vulture Pokémon", PokemonType.DARK, PokemonType.FLYING, 1.2, 39.5, Abilities.BIG_PECKS, Abilities.OVERCOAT, Abilities.WEAK_ARMOR, 510, 110, 65, 105, 55, 95, 80, 60, 35, 179, GrowthRate.SLOW, 0, false), + new PokemonSpecies(Species.HEATMOR, 5, false, false, false, "Anteater Pokémon", PokemonType.FIRE, null, 1.4, 58, Abilities.GLUTTONY, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, 484, 85, 97, 66, 105, 66, 65, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DURANT, 5, false, false, false, "Iron Ant Pokémon", PokemonType.BUG, PokemonType.STEEL, 0.3, 33, Abilities.SWARM, Abilities.HUSTLE, Abilities.TRUANT, 484, 58, 109, 112, 48, 48, 109, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DEINO, 5, false, false, false, "Irate Pokémon", PokemonType.DARK, PokemonType.DRAGON, 0.8, 17.3, Abilities.HUSTLE, Abilities.NONE, Abilities.NONE, 300, 52, 65, 50, 45, 50, 38, 45, 35, 60, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.ZWEILOUS, 5, false, false, false, "Hostile Pokémon", PokemonType.DARK, PokemonType.DRAGON, 1.4, 50, Abilities.HUSTLE, Abilities.NONE, Abilities.NONE, 420, 72, 85, 70, 65, 70, 58, 45, 35, 147, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.HYDREIGON, 5, false, false, false, "Brutal Pokémon", PokemonType.DARK, PokemonType.DRAGON, 1.8, 160, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 92, 105, 90, 125, 90, 98, 45, 35, 300, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.LARVESTA, 5, false, false, false, "Torch Pokémon", PokemonType.BUG, PokemonType.FIRE, 1.1, 28.8, Abilities.FLAME_BODY, Abilities.NONE, Abilities.SWARM, 360, 55, 85, 55, 50, 55, 60, 45, 50, 72, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.VOLCARONA, 5, false, false, false, "Sun Pokémon", PokemonType.BUG, PokemonType.FIRE, 1.6, 46, Abilities.FLAME_BODY, Abilities.NONE, Abilities.SWARM, 550, 85, 60, 65, 135, 105, 100, 15, 50, 275, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.COBALION, 5, true, false, false, "Iron Will Pokémon", PokemonType.STEEL, PokemonType.FIGHTING, 2.1, 250, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 90, 129, 90, 72, 108, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.TERRAKION, 5, true, false, false, "Cavern Pokémon", PokemonType.ROCK, PokemonType.FIGHTING, 1.9, 260, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 129, 90, 72, 90, 108, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.VIRIZION, 5, true, false, false, "Grassland Pokémon", PokemonType.GRASS, PokemonType.FIGHTING, 2, 200, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 90, 72, 90, 129, 108, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.TORNADUS, 5, true, false, false, "Cyclone Pokémon", PokemonType.FLYING, null, 1.5, 63, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, GrowthRate.SLOW, 100, false, true, + new PokemonForm("Incarnate Forme", "incarnate", PokemonType.FLYING, null, 1.5, 63, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, false, null, true), + new PokemonForm("Therian Forme", "therian", PokemonType.FLYING, null, 1.4, 63, Abilities.REGENERATOR, Abilities.NONE, Abilities.REGENERATOR, 580, 79, 100, 80, 110, 90, 121, 3, 90, 290), + ), + new PokemonSpecies(Species.THUNDURUS, 5, true, false, false, "Bolt Strike Pokémon", PokemonType.ELECTRIC, PokemonType.FLYING, 1.5, 61, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, GrowthRate.SLOW, 100, false, true, + new PokemonForm("Incarnate Forme", "incarnate", PokemonType.ELECTRIC, PokemonType.FLYING, 1.5, 61, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, false, null, true), + new PokemonForm("Therian Forme", "therian", PokemonType.ELECTRIC, PokemonType.FLYING, 3, 61, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.VOLT_ABSORB, 580, 79, 105, 70, 145, 80, 101, 3, 90, 290), + ), + new PokemonSpecies(Species.RESHIRAM, 5, false, true, false, "Vast White Pokémon", PokemonType.DRAGON, PokemonType.FIRE, 3.2, 330, Abilities.TURBOBLAZE, Abilities.NONE, Abilities.NONE, 680, 100, 120, 100, 150, 120, 90, 3, 0, 340, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.ZEKROM, 5, false, true, false, "Deep Black Pokémon", PokemonType.DRAGON, PokemonType.ELECTRIC, 2.9, 345, Abilities.TERAVOLT, Abilities.NONE, Abilities.NONE, 680, 100, 150, 120, 120, 100, 90, 3, 0, 340, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.LANDORUS, 5, true, false, false, "Abundance Pokémon", PokemonType.GROUND, PokemonType.FLYING, 1.5, 68, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SHEER_FORCE, 600, 89, 125, 90, 115, 80, 101, 3, 90, 300, GrowthRate.SLOW, 100, false, true, + new PokemonForm("Incarnate Forme", "incarnate", PokemonType.GROUND, PokemonType.FLYING, 1.5, 68, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SHEER_FORCE, 600, 89, 125, 90, 115, 80, 101, 3, 90, 300, false, null, true), + new PokemonForm("Therian Forme", "therian", PokemonType.GROUND, PokemonType.FLYING, 1.3, 68, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 89, 145, 90, 105, 80, 91, 3, 90, 300), + ), + new PokemonSpecies(Species.KYUREM, 5, false, true, false, "Boundary Pokémon", PokemonType.DRAGON, PokemonType.ICE, 3, 325, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 660, 125, 130, 90, 130, 90, 95, 3, 0, 330, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.ICE, 3, 325, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 660, 125, 130, 90, 130, 90, 95, 3, 0, 330, false, null, true), + new PokemonForm("Black", "black", PokemonType.DRAGON, PokemonType.ICE, 3.3, 325, Abilities.TERAVOLT, Abilities.NONE, Abilities.NONE, 700, 125, 170, 100, 120, 90, 95, 3, 0, 350), + new PokemonForm("White", "white", PokemonType.DRAGON, PokemonType.ICE, 3.6, 325, Abilities.TURBOBLAZE, Abilities.NONE, Abilities.NONE, 700, 125, 120, 90, 170, 100, 95, 3, 0, 350), + ), + new PokemonSpecies(Species.KELDEO, 5, false, false, true, "Colt Pokémon", PokemonType.WATER, PokemonType.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290, GrowthRate.SLOW, null, false, true, + new PokemonForm("Ordinary Form", "ordinary", PokemonType.WATER, PokemonType.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290, false, null, true), + new PokemonForm("Resolute", "resolute", PokemonType.WATER, PokemonType.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290), + ), + new PokemonSpecies(Species.MELOETTA, 5, false, false, true, "Melody Pokémon", PokemonType.NORMAL, PokemonType.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 300, GrowthRate.SLOW, null, false, true, + new PokemonForm("Aria Forme", "aria", PokemonType.NORMAL, PokemonType.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 300, false, null, true), + new PokemonForm("Pirouette Forme", "pirouette", PokemonType.NORMAL, PokemonType.FIGHTING, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 128, 90, 77, 77, 128, 3, 100, 300, false, null, true), + ), + new PokemonSpecies(Species.GENESECT, 5, false, false, true, "Paleozoic Pokémon", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, false, null, true), + new PokemonForm("Shock Drive", "shock", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300), + new PokemonForm("Burn Drive", "burn", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300), + new PokemonForm("Chill Drive", "chill", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300), + new PokemonForm("Douse Drive", "douse", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300), + ), + new PokemonSpecies(Species.CHESPIN, 6, false, false, false, "Spiny Nut Pokémon", PokemonType.GRASS, null, 0.4, 9, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 313, 56, 61, 65, 48, 45, 38, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.QUILLADIN, 6, false, false, false, "Spiny Armor Pokémon", PokemonType.GRASS, null, 0.7, 29, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 405, 61, 78, 95, 56, 58, 57, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.CHESNAUGHT, 6, false, false, false, "Spiny Armor Pokémon", PokemonType.GRASS, PokemonType.FIGHTING, 1.6, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 530, 88, 107, 122, 74, 75, 64, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.FENNEKIN, 6, false, false, false, "Fox Pokémon", PokemonType.FIRE, null, 0.4, 9.4, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 307, 40, 45, 40, 62, 60, 60, 45, 70, 61, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.BRAIXEN, 6, false, false, false, "Fox Pokémon", PokemonType.FIRE, null, 1, 14.5, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 409, 59, 59, 58, 90, 70, 73, 45, 70, 143, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.DELPHOX, 6, false, false, false, "Fox Pokémon", PokemonType.FIRE, PokemonType.PSYCHIC, 1.5, 39, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 534, 75, 69, 72, 114, 100, 104, 45, 70, 267, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.FROAKIE, 6, false, false, false, "Bubble Frog Pokémon", PokemonType.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false, false, + new PokemonForm("Normal", "", PokemonType.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, null, true), + new PokemonForm("Battle Bond", "battle-bond", PokemonType.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, "", true), + ), + new PokemonSpecies(Species.FROGADIER, 6, false, false, false, "Bubble Frog Pokémon", PokemonType.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false, false, + new PokemonForm("Normal", "", PokemonType.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, null, true), + new PokemonForm("Battle Bond", "battle-bond", PokemonType.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, "", true), + ), + new PokemonSpecies(Species.GRENINJA, 6, false, false, false, "Ninja Pokémon", PokemonType.WATER, PokemonType.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, false, + new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 265, false, null, true), + new PokemonForm("Battle Bond", "battle-bond", PokemonType.WATER, PokemonType.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 530, 72, 95, 67, 103, 71, 122, 45, 70, 265, false, "", true), + new PokemonForm("Ash", "ash", PokemonType.WATER, PokemonType.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 640, 72, 145, 67, 153, 71, 132, 45, 70, 265), + ), + new PokemonSpecies(Species.BUNNELBY, 6, false, false, false, "Digging Pokémon", PokemonType.NORMAL, null, 0.4, 5, Abilities.PICKUP, Abilities.CHEEK_POUCH, Abilities.HUGE_POWER, 237, 38, 36, 38, 32, 36, 57, 255, 50, 47, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DIGGERSBY, 6, false, false, false, "Digging Pokémon", PokemonType.NORMAL, PokemonType.GROUND, 1, 42.4, Abilities.PICKUP, Abilities.CHEEK_POUCH, Abilities.HUGE_POWER, 423, 85, 56, 77, 50, 77, 78, 127, 50, 148, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FLETCHLING, 6, false, false, false, "Tiny Robin Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 1.7, Abilities.BIG_PECKS, Abilities.NONE, Abilities.GALE_WINGS, 278, 45, 50, 43, 40, 38, 62, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.FLETCHINDER, 6, false, false, false, "Ember Pokémon", PokemonType.FIRE, PokemonType.FLYING, 0.7, 16, Abilities.FLAME_BODY, Abilities.NONE, Abilities.GALE_WINGS, 382, 62, 73, 55, 56, 52, 84, 120, 50, 134, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.TALONFLAME, 6, false, false, false, "Scorching Pokémon", PokemonType.FIRE, PokemonType.FLYING, 1.2, 24.5, Abilities.FLAME_BODY, Abilities.NONE, Abilities.GALE_WINGS, 499, 78, 81, 71, 74, 69, 126, 45, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SCATTERBUG, 6, false, false, false, "Scatterdust Pokémon", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Meadow Pattern", "meadow", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Icy Snow Pattern", "icy-snow", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Polar Pattern", "polar", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Tundra Pattern", "tundra", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Continental Pattern", "continental", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Garden Pattern", "garden", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Elegant Pattern", "elegant", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Modern Pattern", "modern", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Marine Pattern", "marine", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Archipelago Pattern", "archipelago", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("High Plains Pattern", "high-plains", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Sandstorm Pattern", "sandstorm", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("River Pattern", "river", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Monsoon Pattern", "monsoon", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Savanna Pattern", "savanna", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Sun Pattern", "sun", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Ocean Pattern", "ocean", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Jungle Pattern", "jungle", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Fancy Pattern", "fancy", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + new PokemonForm("Poké Ball Pattern", "poke-ball", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true), + ), + new PokemonSpecies(Species.SPEWPA, 6, false, false, false, "Scatterdust Pokémon", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.SHED_SKIN, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Meadow Pattern", "meadow", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Icy Snow Pattern", "icy-snow", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Polar Pattern", "polar", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Tundra Pattern", "tundra", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Continental Pattern", "continental", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Garden Pattern", "garden", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Elegant Pattern", "elegant", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Modern Pattern", "modern", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Marine Pattern", "marine", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Archipelago Pattern", "archipelago", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("High Plains Pattern", "high-plains", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Sandstorm Pattern", "sandstorm", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("River Pattern", "river", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Monsoon Pattern", "monsoon", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Savanna Pattern", "savanna", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Sun Pattern", "sun", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Ocean Pattern", "ocean", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Jungle Pattern", "jungle", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Fancy Pattern", "fancy", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + new PokemonForm("Poké Ball Pattern", "poke-ball", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true), + ), + new PokemonSpecies(Species.VIVILLON, 6, false, false, false, "Scale Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Meadow Pattern", "meadow", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Icy Snow Pattern", "icy-snow", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Polar Pattern", "polar", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Tundra Pattern", "tundra", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Continental Pattern", "continental", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Garden Pattern", "garden", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Elegant Pattern", "elegant", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Modern Pattern", "modern", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Marine Pattern", "marine", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Archipelago Pattern", "archipelago", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("High Plains Pattern", "high-plains", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Sandstorm Pattern", "sandstorm", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("River Pattern", "river", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Monsoon Pattern", "monsoon", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Savanna Pattern", "savanna", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Sun Pattern", "sun", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Ocean Pattern", "ocean", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Jungle Pattern", "jungle", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Fancy Pattern", "fancy", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + new PokemonForm("Poké Ball Pattern", "poke-ball", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true), + ), + new PokemonSpecies(Species.LITLEO, 6, false, false, false, "Lion Cub Pokémon", PokemonType.FIRE, PokemonType.NORMAL, 0.6, 13.5, Abilities.RIVALRY, Abilities.UNNERVE, Abilities.MOXIE, 369, 62, 50, 58, 73, 54, 72, 220, 70, 74, GrowthRate.MEDIUM_SLOW, 12.5, false), + new PokemonSpecies(Species.PYROAR, 6, false, false, false, "Royal Pokémon", PokemonType.FIRE, PokemonType.NORMAL, 1.5, 81.5, Abilities.RIVALRY, Abilities.UNNERVE, Abilities.MOXIE, 507, 86, 68, 72, 109, 66, 106, 65, 70, 177, GrowthRate.MEDIUM_SLOW, 12.5, true), + new PokemonSpecies(Species.FLABEBE, 6, false, false, false, "Single Bloom Pokémon", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, GrowthRate.MEDIUM_FAST, 0, false, false, + new PokemonForm("Red Flower", "red", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true), + new PokemonForm("Yellow Flower", "yellow", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true), + new PokemonForm("Orange Flower", "orange", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true), + new PokemonForm("Blue Flower", "blue", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true), + new PokemonForm("White Flower", "white", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true), + ), + new PokemonSpecies(Species.FLOETTE, 6, false, false, false, "Single Bloom Pokémon", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, GrowthRate.MEDIUM_FAST, 0, false, false, + new PokemonForm("Red Flower", "red", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true), + new PokemonForm("Yellow Flower", "yellow", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true), + new PokemonForm("Orange Flower", "orange", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true), + new PokemonForm("Blue Flower", "blue", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true), + new PokemonForm("White Flower", "white", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true), + ), + new PokemonSpecies(Species.FLORGES, 6, false, false, false, "Garden Pokémon", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, GrowthRate.MEDIUM_FAST, 0, false, false, + new PokemonForm("Red Flower", "red", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true), + new PokemonForm("Yellow Flower", "yellow", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true), + new PokemonForm("Orange Flower", "orange", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true), + new PokemonForm("Blue Flower", "blue", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true), + new PokemonForm("White Flower", "white", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true), + ), + new PokemonSpecies(Species.SKIDDO, 6, false, false, false, "Mount Pokémon", PokemonType.GRASS, null, 0.9, 31, Abilities.SAP_SIPPER, Abilities.NONE, Abilities.GRASS_PELT, 350, 66, 65, 48, 62, 57, 52, 200, 70, 70, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GOGOAT, 6, false, false, false, "Mount Pokémon", PokemonType.GRASS, null, 1.7, 91, Abilities.SAP_SIPPER, Abilities.NONE, Abilities.GRASS_PELT, 531, 123, 100, 62, 97, 81, 68, 45, 70, 186, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PANCHAM, 6, false, false, false, "Playful Pokémon", PokemonType.FIGHTING, null, 0.6, 8, Abilities.IRON_FIST, Abilities.MOLD_BREAKER, Abilities.SCRAPPY, 348, 67, 82, 62, 46, 48, 43, 220, 50, 70, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PANGORO, 6, false, false, false, "Daunting Pokémon", PokemonType.FIGHTING, PokemonType.DARK, 2.1, 136, Abilities.IRON_FIST, Abilities.MOLD_BREAKER, Abilities.SCRAPPY, 495, 95, 124, 78, 69, 71, 58, 65, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FURFROU, 6, false, false, false, "Poodle Pokémon", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Natural Form", "", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), + new PokemonForm("Heart Trim", "heart", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), + new PokemonForm("Star Trim", "star", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), + new PokemonForm("Diamond Trim", "diamond", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), + new PokemonForm("Debutante Trim", "debutante", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), + new PokemonForm("Matron Trim", "matron", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), + new PokemonForm("Dandy Trim", "dandy", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), + new PokemonForm("La Reine Trim", "la-reine", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), + new PokemonForm("Kabuki Trim", "kabuki", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), + new PokemonForm("Pharaoh Trim", "pharaoh", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true), + ), + new PokemonSpecies(Species.ESPURR, 6, false, false, false, "Restraint Pokémon", PokemonType.PSYCHIC, null, 0.3, 3.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.OWN_TEMPO, 355, 62, 48, 54, 63, 60, 68, 190, 50, 71, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MEOWSTIC, 6, false, false, false, "Constraint Pokémon", PokemonType.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.PRANKSTER, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Male", "male", PokemonType.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.PRANKSTER, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, false, "", true), + new PokemonForm("Female", "female", PokemonType.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.COMPETITIVE, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, false, null, true), + ), + new PokemonSpecies(Species.HONEDGE, 6, false, false, false, "Sword Pokémon", PokemonType.STEEL, PokemonType.GHOST, 0.8, 2, Abilities.NO_GUARD, Abilities.NONE, Abilities.NONE, 325, 45, 80, 100, 35, 37, 28, 180, 50, 65, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DOUBLADE, 6, false, false, false, "Sword Pokémon", PokemonType.STEEL, PokemonType.GHOST, 0.8, 4.5, Abilities.NO_GUARD, Abilities.NONE, Abilities.NONE, 448, 59, 110, 150, 45, 49, 35, 90, 50, 157, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.AEGISLASH, 6, false, false, false, "Royal Sword Pokémon", PokemonType.STEEL, PokemonType.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 50, 140, 50, 140, 60, 45, 50, 250, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Shield Forme", "shield", PokemonType.STEEL, PokemonType.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 50, 140, 50, 140, 60, 45, 50, 250, false, "", true), + new PokemonForm("Blade Forme", "blade", PokemonType.STEEL, PokemonType.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 140, 50, 140, 50, 60, 45, 50, 250), + ), + new PokemonSpecies(Species.SPRITZEE, 6, false, false, false, "Perfume Pokémon", PokemonType.FAIRY, null, 0.2, 0.5, Abilities.HEALER, Abilities.NONE, Abilities.AROMA_VEIL, 341, 78, 52, 60, 63, 65, 23, 200, 50, 68, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.AROMATISSE, 6, false, false, false, "Fragrance Pokémon", PokemonType.FAIRY, null, 0.8, 15.5, Abilities.HEALER, Abilities.NONE, Abilities.AROMA_VEIL, 462, 101, 72, 72, 99, 89, 29, 140, 50, 162, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SWIRLIX, 6, false, false, false, "Cotton Candy Pokémon", PokemonType.FAIRY, null, 0.4, 3.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.UNBURDEN, 341, 62, 48, 66, 59, 57, 49, 200, 50, 68, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SLURPUFF, 6, false, false, false, "Meringue Pokémon", PokemonType.FAIRY, null, 0.8, 5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.UNBURDEN, 480, 82, 80, 86, 85, 75, 72, 140, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.INKAY, 6, false, false, false, "Revolving Pokémon", PokemonType.DARK, PokemonType.PSYCHIC, 0.4, 3.5, Abilities.CONTRARY, Abilities.SUCTION_CUPS, Abilities.INFILTRATOR, 288, 53, 54, 53, 37, 46, 45, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MALAMAR, 6, false, false, false, "Overturning Pokémon", PokemonType.DARK, PokemonType.PSYCHIC, 1.5, 47, Abilities.CONTRARY, Abilities.SUCTION_CUPS, Abilities.INFILTRATOR, 482, 86, 92, 88, 68, 75, 73, 80, 50, 169, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BINACLE, 6, false, false, false, "Two-Handed Pokémon", PokemonType.ROCK, PokemonType.WATER, 0.5, 31, Abilities.TOUGH_CLAWS, Abilities.SNIPER, Abilities.PICKPOCKET, 306, 42, 52, 67, 39, 56, 50, 120, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BARBARACLE, 6, false, false, false, "Collective Pokémon", PokemonType.ROCK, PokemonType.WATER, 1.3, 96, Abilities.TOUGH_CLAWS, Abilities.SNIPER, Abilities.PICKPOCKET, 500, 72, 105, 115, 54, 86, 68, 45, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SKRELP, 6, false, false, false, "Mock Kelp Pokémon", PokemonType.POISON, PokemonType.WATER, 0.5, 7.3, Abilities.POISON_POINT, Abilities.POISON_TOUCH, Abilities.ADAPTABILITY, 320, 50, 60, 60, 60, 60, 30, 225, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DRAGALGE, 6, false, false, false, "Mock Kelp Pokémon", PokemonType.POISON, PokemonType.DRAGON, 1.8, 81.5, Abilities.POISON_POINT, Abilities.POISON_TOUCH, Abilities.ADAPTABILITY, 494, 65, 75, 90, 97, 123, 44, 55, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CLAUNCHER, 6, false, false, false, "Water Gun Pokémon", PokemonType.WATER, null, 0.5, 8.3, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.NONE, 330, 50, 53, 62, 58, 63, 44, 225, 50, 66, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.CLAWITZER, 6, false, false, false, "Howitzer Pokémon", PokemonType.WATER, null, 1.3, 35.3, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.NONE, 500, 71, 73, 88, 120, 89, 59, 55, 50, 100, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.HELIOPTILE, 6, false, false, false, "Generator Pokémon", PokemonType.ELECTRIC, PokemonType.NORMAL, 0.5, 6, Abilities.DRY_SKIN, Abilities.SAND_VEIL, Abilities.SOLAR_POWER, 289, 44, 38, 33, 61, 43, 70, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.HELIOLISK, 6, false, false, false, "Generator Pokémon", PokemonType.ELECTRIC, PokemonType.NORMAL, 1, 21, Abilities.DRY_SKIN, Abilities.SAND_VEIL, Abilities.SOLAR_POWER, 481, 62, 55, 52, 109, 94, 109, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.TYRUNT, 6, false, false, false, "Royal Heir Pokémon", PokemonType.ROCK, PokemonType.DRAGON, 0.8, 26, Abilities.STRONG_JAW, Abilities.NONE, Abilities.STURDY, 362, 58, 89, 77, 45, 45, 48, 45, 50, 72, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.TYRANTRUM, 6, false, false, false, "Despot Pokémon", PokemonType.ROCK, PokemonType.DRAGON, 2.5, 270, Abilities.STRONG_JAW, Abilities.NONE, Abilities.ROCK_HEAD, 521, 82, 121, 119, 69, 59, 71, 45, 50, 182, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.AMAURA, 6, false, false, false, "Tundra Pokémon", PokemonType.ROCK, PokemonType.ICE, 1.3, 25.2, Abilities.REFRIGERATE, Abilities.NONE, Abilities.SNOW_WARNING, 362, 77, 59, 50, 67, 63, 46, 45, 50, 72, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.AURORUS, 6, false, false, false, "Tundra Pokémon", PokemonType.ROCK, PokemonType.ICE, 2.7, 225, Abilities.REFRIGERATE, Abilities.NONE, Abilities.SNOW_WARNING, 521, 123, 77, 72, 99, 92, 58, 45, 50, 104, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.SYLVEON, 6, false, false, false, "Intertwining Pokémon", PokemonType.FAIRY, null, 1, 23.5, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.PIXILATE, 525, 95, 65, 65, 110, 130, 60, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.HAWLUCHA, 6, false, false, false, "Wrestling Pokémon", PokemonType.FIGHTING, PokemonType.FLYING, 0.8, 21.5, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.MOLD_BREAKER, 500, 78, 92, 75, 74, 63, 118, 100, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DEDENNE, 6, false, false, false, "Antenna Pokémon", PokemonType.ELECTRIC, PokemonType.FAIRY, 0.2, 2.2, Abilities.CHEEK_POUCH, Abilities.PICKUP, Abilities.PLUS, 431, 67, 58, 57, 81, 67, 101, 180, 50, 151, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CARBINK, 6, false, false, false, "Jewel Pokémon", PokemonType.ROCK, PokemonType.FAIRY, 0.3, 5.7, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.STURDY, 500, 50, 50, 150, 50, 150, 50, 60, 50, 100, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.GOOMY, 6, false, false, false, "Soft Tissue Pokémon", PokemonType.DRAGON, null, 0.3, 2.8, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 300, 45, 50, 35, 55, 75, 40, 45, 35, 60, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.SLIGGOO, 6, false, false, false, "Soft Tissue Pokémon", PokemonType.DRAGON, null, 0.8, 17.5, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 452, 68, 75, 53, 83, 113, 60, 45, 35, 158, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.GOODRA, 6, false, false, false, "Dragon Pokémon", PokemonType.DRAGON, null, 2, 150.5, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 600, 90, 100, 70, 110, 150, 80, 45, 35, 300, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.KLEFKI, 6, false, false, false, "Key Ring Pokémon", PokemonType.STEEL, PokemonType.FAIRY, 0.2, 3, Abilities.PRANKSTER, Abilities.NONE, Abilities.MAGICIAN, 470, 57, 80, 91, 80, 87, 75, 75, 50, 165, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.PHANTUMP, 6, false, false, false, "Stump Pokémon", PokemonType.GHOST, PokemonType.GRASS, 0.4, 7, Abilities.NATURAL_CURE, Abilities.FRISK, Abilities.HARVEST, 309, 43, 70, 48, 50, 60, 38, 120, 50, 62, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.TREVENANT, 6, false, false, false, "Elder Tree Pokémon", PokemonType.GHOST, PokemonType.GRASS, 1.5, 71, Abilities.NATURAL_CURE, Abilities.FRISK, Abilities.HARVEST, 474, 85, 110, 76, 65, 82, 56, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PUMPKABOO, 6, false, false, false, "Pumpkin Pokémon", PokemonType.GHOST, PokemonType.GRASS, 0.4, 5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 49, 66, 70, 44, 55, 51, 120, 50, 67, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Average Size", "", PokemonType.GHOST, PokemonType.GRASS, 0.4, 5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 49, 66, 70, 44, 55, 51, 120, 50, 67, false, null, true), + new PokemonForm("Small Size", "small", PokemonType.GHOST, PokemonType.GRASS, 0.3, 3.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 44, 66, 70, 44, 55, 56, 120, 50, 67, false, "", true), + new PokemonForm("Large Size", "large", PokemonType.GHOST, PokemonType.GRASS, 0.5, 7.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 54, 66, 70, 44, 55, 46, 120, 50, 67, false, "", true), + new PokemonForm("Super Size", "super", PokemonType.GHOST, PokemonType.GRASS, 0.8, 15, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 59, 66, 70, 44, 55, 41, 120, 50, 67, false, "", true), + ), + new PokemonSpecies(Species.GOURGEIST, 6, false, false, false, "Pumpkin Pokémon", PokemonType.GHOST, PokemonType.GRASS, 0.9, 12.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 65, 90, 122, 58, 75, 84, 60, 50, 173, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Average Size", "", PokemonType.GHOST, PokemonType.GRASS, 0.9, 12.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 65, 90, 122, 58, 75, 84, 60, 50, 173, false, null, true), + new PokemonForm("Small Size", "small", PokemonType.GHOST, PokemonType.GRASS, 0.7, 9.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 55, 85, 122, 58, 75, 99, 60, 50, 173, false, "", true), + new PokemonForm("Large Size", "large", PokemonType.GHOST, PokemonType.GRASS, 1.1, 14, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 75, 95, 122, 58, 75, 69, 60, 50, 173, false, "", true), + new PokemonForm("Super Size", "super", PokemonType.GHOST, PokemonType.GRASS, 1.7, 39, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 85, 100, 122, 58, 75, 54, 60, 50, 173, false, "", true), + ), + new PokemonSpecies(Species.BERGMITE, 6, false, false, false, "Ice Chunk Pokémon", PokemonType.ICE, null, 1, 99.5, Abilities.OWN_TEMPO, Abilities.ICE_BODY, Abilities.STURDY, 304, 55, 69, 85, 32, 35, 28, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.AVALUGG, 6, false, false, false, "Iceberg Pokémon", PokemonType.ICE, null, 2, 505, Abilities.OWN_TEMPO, Abilities.ICE_BODY, Abilities.STURDY, 514, 95, 117, 184, 44, 46, 28, 55, 50, 180, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.NOIBAT, 6, false, false, false, "Sound Wave Pokémon", PokemonType.FLYING, PokemonType.DRAGON, 0.5, 8, Abilities.FRISK, Abilities.INFILTRATOR, Abilities.TELEPATHY, 245, 40, 30, 35, 45, 40, 55, 190, 50, 49, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.NOIVERN, 6, false, false, false, "Sound Wave Pokémon", PokemonType.FLYING, PokemonType.DRAGON, 1.5, 85, Abilities.FRISK, Abilities.INFILTRATOR, Abilities.TELEPATHY, 535, 85, 70, 80, 97, 80, 123, 45, 50, 187, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.XERNEAS, 6, false, true, false, "Life Pokémon", PokemonType.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, GrowthRate.SLOW, null, false, true, + new PokemonForm("Neutral Mode", "neutral", PokemonType.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, false, null, true), + new PokemonForm("Active Mode", "active", PokemonType.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340) + ), + new PokemonSpecies(Species.YVELTAL, 6, false, true, false, "Destruction Pokémon", PokemonType.DARK, PokemonType.FLYING, 5.8, 203, Abilities.DARK_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.ZYGARDE, 6, false, true, false, "Order Pokémon", PokemonType.DRAGON, PokemonType.GROUND, 5, 305, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, GrowthRate.SLOW, null, false, false, + new PokemonForm("50% Forme", "50", PokemonType.DRAGON, PokemonType.GROUND, 5, 305, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, false, "", true), + new PokemonForm("10% Forme", "10", PokemonType.DRAGON, PokemonType.GROUND, 1.2, 33.5, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 486, 54, 100, 71, 61, 85, 115, 3, 0, 243, false, null, true), + new PokemonForm("50% Forme Power Construct", "50-pc", PokemonType.DRAGON, PokemonType.GROUND, 5, 305, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, false, "", true), + new PokemonForm("10% Forme Power Construct", "10-pc", PokemonType.DRAGON, PokemonType.GROUND, 1.2, 33.5, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 486, 54, 100, 71, 61, 85, 115, 3, 0, 243, false, "10", true), + new PokemonForm("Complete Forme (50% PC)", "complete", PokemonType.DRAGON, PokemonType.GROUND, 4.5, 610, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 708, 216, 100, 121, 91, 95, 85, 3, 0, 354), + new PokemonForm("Complete Forme (10% PC)", "10-complete", PokemonType.DRAGON, PokemonType.GROUND, 4.5, 610, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 708, 216, 100, 121, 91, 95, 85, 3, 0, 354, false, "complete"), + ), + new PokemonSpecies(Species.DIANCIE, 6, false, false, true, "Jewel Pokémon", PokemonType.ROCK, PokemonType.FAIRY, 0.7, 8.8, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.NONE, 600, 50, 100, 150, 100, 150, 50, 3, 50, 300, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.ROCK, PokemonType.FAIRY, 0.7, 8.8, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.NONE, 600, 50, 100, 150, 100, 150, 50, 3, 50, 300, false, null, true), + new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ROCK, PokemonType.FAIRY, 1.1, 27.8, Abilities.MAGIC_BOUNCE, Abilities.NONE, Abilities.NONE, 700, 50, 160, 110, 160, 110, 110, 3, 50, 300), + ), + new PokemonSpecies(Species.HOOPA, 6, false, false, true, "Mischief Pokémon", PokemonType.PSYCHIC, PokemonType.GHOST, 0.5, 9, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 600, 80, 110, 60, 150, 130, 70, 3, 100, 300, GrowthRate.SLOW, null, false, false, + new PokemonForm("Hoopa Confined", "", PokemonType.PSYCHIC, PokemonType.GHOST, 0.5, 9, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 600, 80, 110, 60, 150, 130, 70, 3, 100, 300, false, null, true), + new PokemonForm("Hoopa Unbound", "unbound", PokemonType.PSYCHIC, PokemonType.DARK, 6.5, 490, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 680, 80, 160, 60, 170, 130, 80, 3, 100, 340), + ), + new PokemonSpecies(Species.VOLCANION, 6, false, false, true, "Steam Pokémon", PokemonType.FIRE, PokemonType.WATER, 1.7, 195, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.NONE, 600, 80, 110, 120, 130, 90, 70, 3, 100, 300, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.ROWLET, 7, false, false, false, "Grass Quill Pokémon", PokemonType.GRASS, PokemonType.FLYING, 0.3, 1.5, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 320, 68, 55, 55, 50, 50, 42, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.DARTRIX, 7, false, false, false, "Blade Quill Pokémon", PokemonType.GRASS, PokemonType.FLYING, 0.7, 16, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 420, 78, 75, 75, 70, 70, 52, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.DECIDUEYE, 7, false, false, false, "Arrow Quill Pokémon", PokemonType.GRASS, PokemonType.GHOST, 1.6, 36.6, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 530, 78, 107, 75, 100, 100, 70, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.LITTEN, 7, false, false, false, "Fire Cat Pokémon", PokemonType.FIRE, null, 0.4, 4.3, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 320, 45, 65, 40, 60, 40, 70, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.TORRACAT, 7, false, false, false, "Fire Cat Pokémon", PokemonType.FIRE, null, 0.7, 25, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 420, 65, 85, 50, 80, 50, 90, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.INCINEROAR, 7, false, false, false, "Heel Pokémon", PokemonType.FIRE, PokemonType.DARK, 1.8, 83, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 530, 95, 115, 90, 80, 90, 60, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.POPPLIO, 7, false, false, false, "Sea Lion Pokémon", PokemonType.WATER, null, 0.4, 7.5, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 320, 50, 54, 54, 66, 56, 40, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.BRIONNE, 7, false, false, false, "Pop Star Pokémon", PokemonType.WATER, null, 0.6, 17.5, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 420, 60, 69, 69, 91, 81, 50, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.PRIMARINA, 7, false, false, false, "Soloist Pokémon", PokemonType.WATER, PokemonType.FAIRY, 1.8, 44, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 530, 80, 74, 74, 126, 116, 60, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.PIKIPEK, 7, false, false, false, "Woodpecker Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 1.2, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.PICKUP, 265, 35, 75, 30, 30, 30, 65, 255, 70, 53, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.TRUMBEAK, 7, false, false, false, "Bugle Beak Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 14.8, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.PICKUP, 355, 55, 85, 50, 40, 50, 75, 120, 70, 124, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.TOUCANNON, 7, false, false, false, "Cannon Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.1, 26, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.SHEER_FORCE, 485, 80, 120, 75, 75, 75, 60, 45, 70, 243, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.YUNGOOS, 7, false, false, false, "Loitering Pokémon", PokemonType.NORMAL, null, 0.4, 6, Abilities.STAKEOUT, Abilities.STRONG_JAW, Abilities.ADAPTABILITY, 253, 48, 70, 30, 30, 30, 45, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GUMSHOOS, 7, false, false, false, "Stakeout Pokémon", PokemonType.NORMAL, null, 0.7, 14.2, Abilities.STAKEOUT, Abilities.STRONG_JAW, Abilities.ADAPTABILITY, 418, 88, 110, 60, 55, 60, 45, 127, 70, 146, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GRUBBIN, 7, false, false, false, "Larva Pokémon", PokemonType.BUG, null, 0.4, 4.4, Abilities.SWARM, Abilities.NONE, Abilities.NONE, 300, 47, 62, 45, 55, 45, 46, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CHARJABUG, 7, false, false, false, "Battery Pokémon", PokemonType.BUG, PokemonType.ELECTRIC, 0.5, 10.5, Abilities.BATTERY, Abilities.NONE, Abilities.NONE, 400, 57, 82, 95, 55, 75, 36, 120, 50, 140, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.VIKAVOLT, 7, false, false, false, "Stag Beetle Pokémon", PokemonType.BUG, PokemonType.ELECTRIC, 1.5, 45, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 500, 77, 70, 90, 145, 75, 43, 45, 50, 250, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CRABRAWLER, 7, false, false, false, "Boxing Pokémon", PokemonType.FIGHTING, null, 0.6, 7, Abilities.HYPER_CUTTER, Abilities.IRON_FIST, Abilities.ANGER_POINT, 338, 47, 82, 57, 42, 47, 63, 225, 70, 68, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CRABOMINABLE, 7, false, false, false, "Woolly Crab Pokémon", PokemonType.FIGHTING, PokemonType.ICE, 1.7, 180, Abilities.HYPER_CUTTER, Abilities.IRON_FIST, Abilities.ANGER_POINT, 478, 97, 132, 77, 62, 67, 43, 60, 70, 167, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ORICORIO, 7, false, false, false, "Dancing Pokémon", PokemonType.FIRE, PokemonType.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, GrowthRate.MEDIUM_FAST, 25, false, false, + new PokemonForm("Baile Style", "baile", PokemonType.FIRE, PokemonType.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, "", true), + new PokemonForm("Pom-Pom Style", "pompom", PokemonType.ELECTRIC, PokemonType.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true), + new PokemonForm("Pau Style", "pau", PokemonType.PSYCHIC, PokemonType.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true), + new PokemonForm("Sensu Style", "sensu", PokemonType.GHOST, PokemonType.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true), + ), + new PokemonSpecies(Species.CUTIEFLY, 7, false, false, false, "Bee Fly Pokémon", PokemonType.BUG, PokemonType.FAIRY, 0.1, 0.2, Abilities.HONEY_GATHER, Abilities.SHIELD_DUST, Abilities.SWEET_VEIL, 304, 40, 45, 40, 55, 40, 84, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.RIBOMBEE, 7, false, false, false, "Bee Fly Pokémon", PokemonType.BUG, PokemonType.FAIRY, 0.2, 0.5, Abilities.HONEY_GATHER, Abilities.SHIELD_DUST, Abilities.SWEET_VEIL, 464, 60, 55, 60, 95, 70, 124, 75, 50, 162, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ROCKRUFF, 7, false, false, false, "Puppy Pokémon", PokemonType.ROCK, null, 0.5, 9.2, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.STEADFAST, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Normal", "", PokemonType.ROCK, null, 0.5, 9.2, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.STEADFAST, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, false, null, true), + new PokemonForm("Own Tempo", "own-tempo", PokemonType.ROCK, null, 0.5, 9.2, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.OWN_TEMPO, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, false, "", true), + ), + new PokemonSpecies(Species.LYCANROC, 7, false, false, false, "Wolf Pokémon", PokemonType.ROCK, null, 0.8, 25, Abilities.KEEN_EYE, Abilities.SAND_RUSH, Abilities.STEADFAST, 487, 75, 115, 65, 55, 65, 112, 90, 50, 170, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Midday Form", "midday", PokemonType.ROCK, null, 0.8, 25, Abilities.KEEN_EYE, Abilities.SAND_RUSH, Abilities.STEADFAST, 487, 75, 115, 65, 55, 65, 112, 90, 50, 170, false, "", true), + new PokemonForm("Midnight Form", "midnight", PokemonType.ROCK, null, 1.1, 25, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.NO_GUARD, 487, 85, 115, 75, 55, 75, 82, 90, 50, 170, false, null, true), + new PokemonForm("Dusk Form", "dusk", PokemonType.ROCK, null, 0.8, 25, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 487, 75, 117, 65, 55, 65, 110, 90, 50, 170, false, null, true), + ), + new PokemonSpecies(Species.WISHIWASHI, 7, false, false, false, "Small Fry Pokémon", PokemonType.WATER, null, 0.2, 0.3, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 175, 45, 20, 20, 25, 25, 40, 60, 50, 61, GrowthRate.FAST, 50, false, false, + new PokemonForm("Solo Form", "", PokemonType.WATER, null, 0.2, 0.3, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 175, 45, 20, 20, 25, 25, 40, 60, 50, 61, false, null, true), + new PokemonForm("School", "school", PokemonType.WATER, null, 8.2, 78.6, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 620, 45, 140, 130, 140, 135, 30, 60, 50, 217), + ), + new PokemonSpecies(Species.MAREANIE, 7, false, false, false, "Brutal Star Pokémon", PokemonType.POISON, PokemonType.WATER, 0.4, 8, Abilities.MERCILESS, Abilities.LIMBER, Abilities.REGENERATOR, 305, 50, 53, 62, 43, 52, 45, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.TOXAPEX, 7, false, false, false, "Brutal Star Pokémon", PokemonType.POISON, PokemonType.WATER, 0.7, 14.5, Abilities.MERCILESS, Abilities.LIMBER, Abilities.REGENERATOR, 495, 50, 63, 152, 53, 142, 35, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MUDBRAY, 7, false, false, false, "Donkey Pokémon", PokemonType.GROUND, null, 1, 110, Abilities.OWN_TEMPO, Abilities.STAMINA, Abilities.INNER_FOCUS, 385, 70, 100, 70, 45, 55, 45, 190, 50, 77, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MUDSDALE, 7, false, false, false, "Draft Horse Pokémon", PokemonType.GROUND, null, 2.5, 920, Abilities.OWN_TEMPO, Abilities.STAMINA, Abilities.INNER_FOCUS, 500, 100, 125, 100, 55, 85, 35, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DEWPIDER, 7, false, false, false, "Water Bubble Pokémon", PokemonType.WATER, PokemonType.BUG, 0.3, 4, Abilities.WATER_BUBBLE, Abilities.NONE, Abilities.WATER_ABSORB, 269, 38, 40, 52, 40, 72, 27, 200, 50, 54, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ARAQUANID, 7, false, false, false, "Water Bubble Pokémon", PokemonType.WATER, PokemonType.BUG, 1.8, 82, Abilities.WATER_BUBBLE, Abilities.NONE, Abilities.WATER_ABSORB, 454, 68, 70, 92, 50, 132, 42, 100, 50, 159, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FOMANTIS, 7, false, false, false, "Sickle Grass Pokémon", PokemonType.GRASS, null, 0.3, 1.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CONTRARY, 250, 40, 55, 35, 50, 35, 35, 190, 50, 50, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.LURANTIS, 7, false, false, false, "Bloom Sickle Pokémon", PokemonType.GRASS, null, 0.9, 18.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CONTRARY, 480, 70, 105, 90, 80, 90, 45, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MORELULL, 7, false, false, false, "Illuminating Pokémon", PokemonType.GRASS, PokemonType.FAIRY, 0.2, 1.5, Abilities.ILLUMINATE, Abilities.EFFECT_SPORE, Abilities.RAIN_DISH, 285, 40, 35, 55, 65, 75, 15, 190, 50, 57, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SHIINOTIC, 7, false, false, false, "Illuminating Pokémon", PokemonType.GRASS, PokemonType.FAIRY, 1, 11.5, Abilities.ILLUMINATE, Abilities.EFFECT_SPORE, Abilities.RAIN_DISH, 405, 60, 45, 80, 90, 100, 30, 75, 50, 142, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SALANDIT, 7, false, false, false, "Toxic Lizard Pokémon", PokemonType.POISON, PokemonType.FIRE, 0.6, 4.8, Abilities.CORROSION, Abilities.NONE, Abilities.OBLIVIOUS, 320, 48, 44, 40, 71, 40, 77, 120, 50, 64, GrowthRate.MEDIUM_FAST, 87.5, false), + new PokemonSpecies(Species.SALAZZLE, 7, false, false, false, "Toxic Lizard Pokémon", PokemonType.POISON, PokemonType.FIRE, 1.2, 22.2, Abilities.CORROSION, Abilities.NONE, Abilities.OBLIVIOUS, 480, 68, 64, 60, 111, 60, 117, 45, 50, 168, GrowthRate.MEDIUM_FAST, 0, false), + new PokemonSpecies(Species.STUFFUL, 7, false, false, false, "Flailing Pokémon", PokemonType.NORMAL, PokemonType.FIGHTING, 0.5, 6.8, Abilities.FLUFFY, Abilities.KLUTZ, Abilities.CUTE_CHARM, 340, 70, 75, 50, 45, 50, 50, 140, 50, 68, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BEWEAR, 7, false, false, false, "Strong Arm Pokémon", PokemonType.NORMAL, PokemonType.FIGHTING, 2.1, 135, Abilities.FLUFFY, Abilities.KLUTZ, Abilities.UNNERVE, 500, 120, 125, 80, 55, 60, 60, 70, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BOUNSWEET, 7, false, false, false, "Fruit Pokémon", PokemonType.GRASS, null, 0.3, 3.2, Abilities.LEAF_GUARD, Abilities.OBLIVIOUS, Abilities.SWEET_VEIL, 210, 42, 30, 38, 30, 38, 32, 235, 50, 42, GrowthRate.MEDIUM_SLOW, 0, false), + new PokemonSpecies(Species.STEENEE, 7, false, false, false, "Fruit Pokémon", PokemonType.GRASS, null, 0.7, 8.2, Abilities.LEAF_GUARD, Abilities.OBLIVIOUS, Abilities.SWEET_VEIL, 290, 52, 40, 48, 40, 48, 62, 120, 50, 102, GrowthRate.MEDIUM_SLOW, 0, false), + new PokemonSpecies(Species.TSAREENA, 7, false, false, false, "Fruit Pokémon", PokemonType.GRASS, null, 1.2, 21.4, Abilities.LEAF_GUARD, Abilities.QUEENLY_MAJESTY, Abilities.SWEET_VEIL, 510, 72, 120, 98, 50, 98, 72, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 0, false), + new PokemonSpecies(Species.COMFEY, 7, false, false, false, "Posy Picker Pokémon", PokemonType.FAIRY, null, 0.1, 0.3, Abilities.FLOWER_VEIL, Abilities.TRIAGE, Abilities.NATURAL_CURE, 485, 51, 52, 90, 82, 110, 100, 60, 50, 170, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.ORANGURU, 7, false, false, false, "Sage Pokémon", PokemonType.NORMAL, PokemonType.PSYCHIC, 1.5, 76, Abilities.INNER_FOCUS, Abilities.TELEPATHY, Abilities.SYMBIOSIS, 490, 90, 60, 80, 90, 110, 60, 45, 50, 172, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.PASSIMIAN, 7, false, false, false, "Teamwork Pokémon", PokemonType.FIGHTING, null, 2, 82.8, Abilities.RECEIVER, Abilities.NONE, Abilities.DEFIANT, 490, 100, 120, 90, 40, 60, 80, 45, 50, 172, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.WIMPOD, 7, false, false, false, "Turn Tail Pokémon", PokemonType.BUG, PokemonType.WATER, 0.5, 12, Abilities.WIMP_OUT, Abilities.NONE, Abilities.RUN_AWAY, 230, 25, 35, 40, 20, 30, 80, 90, 50, 46, GrowthRate.MEDIUM_FAST, 50, false), //Custom Hidden + new PokemonSpecies(Species.GOLISOPOD, 7, false, false, false, "Hard Scale Pokémon", PokemonType.BUG, PokemonType.WATER, 2, 108, Abilities.EMERGENCY_EXIT, Abilities.NONE, Abilities.ANTICIPATION, 530, 75, 125, 140, 60, 90, 40, 45, 50, 186, GrowthRate.MEDIUM_FAST, 50, false), //Custom Hidden + new PokemonSpecies(Species.SANDYGAST, 7, false, false, false, "Sand Heap Pokémon", PokemonType.GHOST, PokemonType.GROUND, 0.5, 70, Abilities.WATER_COMPACTION, Abilities.NONE, Abilities.SAND_VEIL, 320, 55, 55, 80, 70, 45, 15, 140, 50, 64, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PALOSSAND, 7, false, false, false, "Sand Castle Pokémon", PokemonType.GHOST, PokemonType.GROUND, 1.3, 250, Abilities.WATER_COMPACTION, Abilities.NONE, Abilities.SAND_VEIL, 480, 85, 75, 110, 100, 75, 35, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PYUKUMUKU, 7, false, false, false, "Sea Cucumber Pokémon", PokemonType.WATER, null, 0.3, 1.2, Abilities.INNARDS_OUT, Abilities.NONE, Abilities.UNAWARE, 410, 55, 60, 130, 30, 130, 5, 60, 50, 144, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.TYPE_NULL, 7, true, false, false, "Synthetic Pokémon", PokemonType.NORMAL, null, 1.9, 120.5, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.NONE, 534, 95, 95, 95, 95, 95, 59, 3, 0, 107, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.SILVALLY, 7, true, false, false, "Synthetic Pokémon", PokemonType.NORMAL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285, GrowthRate.SLOW, null, false, false, + new PokemonForm("Type: Normal", "normal", PokemonType.NORMAL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285, false, "", true), + new PokemonForm("Type: Fighting", "fighting", PokemonType.FIGHTING, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Flying", "flying", PokemonType.FLYING, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Poison", "poison", PokemonType.POISON, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Ground", "ground", PokemonType.GROUND, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Rock", "rock", PokemonType.ROCK, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Bug", "bug", PokemonType.BUG, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Ghost", "ghost", PokemonType.GHOST, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Steel", "steel", PokemonType.STEEL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Fire", "fire", PokemonType.FIRE, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Water", "water", PokemonType.WATER, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Grass", "grass", PokemonType.GRASS, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Electric", "electric", PokemonType.ELECTRIC, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Psychic", "psychic", PokemonType.PSYCHIC, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Ice", "ice", PokemonType.ICE, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Dragon", "dragon", PokemonType.DRAGON, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Dark", "dark", PokemonType.DARK, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + new PokemonForm("Type: Fairy", "fairy", PokemonType.FAIRY, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285), + ), + new PokemonSpecies(Species.MINIOR, 7, false, false, false, "Meteor Pokémon", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, GrowthRate.MEDIUM_SLOW, null, false, false, + new PokemonForm("Red Meteor Form", "red-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), + new PokemonForm("Orange Meteor Form", "orange-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), + new PokemonForm("Yellow Meteor Form", "yellow-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), + new PokemonForm("Green Meteor Form", "green-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), + new PokemonForm("Blue Meteor Form", "blue-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), + new PokemonForm("Indigo Meteor Form", "indigo-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), + new PokemonForm("Violet Meteor Form", "violet-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true), + new PokemonForm("Red Core Form", "red", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true), + new PokemonForm("Orange Core Form", "orange", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true), + new PokemonForm("Yellow Core Form", "yellow", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true), + new PokemonForm("Green Core Form", "green", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true), + new PokemonForm("Blue Core Form", "blue", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true), + new PokemonForm("Indigo Core Form", "indigo", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true), + new PokemonForm("Violet Core Form", "violet", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true), + ), + new PokemonSpecies(Species.KOMALA, 7, false, false, false, "Drowsing Pokémon", PokemonType.NORMAL, null, 0.4, 19.9, Abilities.COMATOSE, Abilities.NONE, Abilities.NONE, 480, 65, 115, 65, 75, 95, 65, 45, 70, 168, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.TURTONATOR, 7, false, false, false, "Blast Turtle Pokémon", PokemonType.FIRE, PokemonType.DRAGON, 2, 212, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.NONE, 485, 60, 78, 135, 91, 85, 36, 70, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.TOGEDEMARU, 7, false, false, false, "Roly-Poly Pokémon", PokemonType.ELECTRIC, PokemonType.STEEL, 0.3, 3.3, Abilities.IRON_BARBS, Abilities.LIGHTNING_ROD, Abilities.STURDY, 435, 65, 98, 63, 40, 73, 96, 180, 50, 152, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MIMIKYU, 7, false, false, false, "Disguise Pokémon", PokemonType.GHOST, PokemonType.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Disguised Form", "disguised", PokemonType.GHOST, PokemonType.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, false, null, true), + new PokemonForm("Busted Form", "busted", PokemonType.GHOST, PokemonType.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167), + ), + new PokemonSpecies(Species.BRUXISH, 7, false, false, false, "Gnash Teeth Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 0.9, 19, Abilities.DAZZLING, Abilities.STRONG_JAW, Abilities.WONDER_SKIN, 475, 68, 105, 70, 70, 70, 92, 80, 70, 166, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DRAMPA, 7, false, false, false, "Placid Pokémon", PokemonType.NORMAL, PokemonType.DRAGON, 3, 185, Abilities.BERSERK, Abilities.SAP_SIPPER, Abilities.CLOUD_NINE, 485, 78, 60, 85, 135, 91, 36, 70, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DHELMISE, 7, false, false, false, "Sea Creeper Pokémon", PokemonType.GHOST, PokemonType.GRASS, 3.9, 210, Abilities.STEELWORKER, Abilities.NONE, Abilities.NONE, 517, 70, 131, 100, 86, 90, 40, 25, 50, 181, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.JANGMO_O, 7, false, false, false, "Scaly Pokémon", PokemonType.DRAGON, null, 0.6, 29.7, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 300, 45, 55, 65, 45, 45, 45, 45, 50, 60, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.HAKAMO_O, 7, false, false, false, "Scaly Pokémon", PokemonType.DRAGON, PokemonType.FIGHTING, 1.2, 47, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 420, 55, 75, 90, 65, 70, 65, 45, 50, 147, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.KOMMO_O, 7, false, false, false, "Scaly Pokémon", PokemonType.DRAGON, PokemonType.FIGHTING, 1.6, 78.2, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 600, 75, 110, 125, 100, 105, 85, 45, 50, 300, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.TAPU_KOKO, 7, true, false, false, "Land Spirit Pokémon", PokemonType.ELECTRIC, PokemonType.FAIRY, 1.8, 20.5, Abilities.ELECTRIC_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 115, 85, 95, 75, 130, 3, 50, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.TAPU_LELE, 7, true, false, false, "Land Spirit Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 1.2, 18.6, Abilities.PSYCHIC_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 85, 75, 130, 115, 95, 3, 50, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.TAPU_BULU, 7, true, false, false, "Land Spirit Pokémon", PokemonType.GRASS, PokemonType.FAIRY, 1.9, 45.5, Abilities.GRASSY_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 130, 115, 85, 95, 75, 3, 50, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.TAPU_FINI, 7, true, false, false, "Land Spirit Pokémon", PokemonType.WATER, PokemonType.FAIRY, 1.3, 21.2, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 75, 115, 95, 130, 85, 3, 50, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.COSMOG, 7, true, false, false, "Nebula Pokémon", PokemonType.PSYCHIC, null, 0.2, 0.1, Abilities.UNAWARE, Abilities.NONE, Abilities.NONE, 200, 43, 29, 31, 29, 31, 37, 45, 0, 40, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.COSMOEM, 7, true, false, false, "Protostar Pokémon", PokemonType.PSYCHIC, null, 0.1, 999.9, Abilities.STURDY, Abilities.NONE, Abilities.NONE, 400, 43, 29, 131, 29, 131, 37, 45, 0, 140, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.SOLGALEO, 7, false, true, false, "Sunne Pokémon", PokemonType.PSYCHIC, PokemonType.STEEL, 3.4, 230, Abilities.FULL_METAL_BODY, Abilities.NONE, Abilities.NONE, 680, 137, 137, 107, 113, 89, 97, 45, 0, 340, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.LUNALA, 7, false, true, false, "Moone Pokémon", PokemonType.PSYCHIC, PokemonType.GHOST, 4, 120, Abilities.SHADOW_SHIELD, Abilities.NONE, Abilities.NONE, 680, 137, 113, 89, 137, 107, 97, 45, 0, 340, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.NIHILEGO, 7, true, false, false, "Parasite Pokémon", PokemonType.ROCK, PokemonType.POISON, 1.2, 55.5, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 109, 53, 47, 127, 131, 103, 45, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.BUZZWOLE, 7, true, false, false, "Swollen Pokémon", PokemonType.BUG, PokemonType.FIGHTING, 2.4, 333.6, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 107, 139, 139, 53, 53, 79, 45, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.PHEROMOSA, 7, true, false, false, "Lissome Pokémon", PokemonType.BUG, PokemonType.FIGHTING, 1.8, 25, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 71, 137, 37, 137, 37, 151, 45, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.XURKITREE, 7, true, false, false, "Glowing Pokémon", PokemonType.ELECTRIC, null, 3.8, 100, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 83, 89, 71, 173, 71, 83, 45, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.CELESTEELA, 7, true, false, false, "Launch Pokémon", PokemonType.STEEL, PokemonType.FLYING, 9.2, 999.9, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 97, 101, 103, 107, 101, 61, 45, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.KARTANA, 7, true, false, false, "Drawn Sword Pokémon", PokemonType.GRASS, PokemonType.STEEL, 0.3, 0.1, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 59, 181, 131, 59, 31, 109, 45, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.GUZZLORD, 7, true, false, false, "Junkivore Pokémon", PokemonType.DARK, PokemonType.DRAGON, 5.5, 888, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 223, 101, 53, 97, 53, 43, 45, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.NECROZMA, 7, false, true, false, "Prism Pokémon", PokemonType.PSYCHIC, null, 2.4, 230, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 600, 97, 107, 101, 127, 89, 79, 255, 0, 300, GrowthRate.SLOW, null, false, false, + new PokemonForm("Normal", "", PokemonType.PSYCHIC, null, 2.4, 230, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 600, 97, 107, 101, 127, 89, 79, 255, 0, 300, false, null, true), + new PokemonForm("Dusk Mane", "dusk-mane", PokemonType.PSYCHIC, PokemonType.STEEL, 3.8, 460, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 680, 97, 157, 127, 113, 109, 77, 255, 0, 340), + new PokemonForm("Dawn Wings", "dawn-wings", PokemonType.PSYCHIC, PokemonType.GHOST, 4.2, 350, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 680, 97, 113, 109, 157, 127, 77, 255, 0, 340), + new PokemonForm("Ultra", "ultra", PokemonType.PSYCHIC, PokemonType.DRAGON, 7.5, 230, Abilities.NEUROFORCE, Abilities.NONE, Abilities.NONE, 754, 97, 167, 97, 167, 97, 129, 255, 0, 377), + ), + new PokemonSpecies(Species.MAGEARNA, 7, false, false, true, "Artificial Pokémon", PokemonType.STEEL, PokemonType.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, GrowthRate.SLOW, null, false, false, + new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, false, null, true), + new PokemonForm("Original", "original", PokemonType.STEEL, PokemonType.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, false, null, true), + ), + new PokemonSpecies(Species.MARSHADOW, 7, false, false, true, "Gloomdweller Pokémon", PokemonType.FIGHTING, PokemonType.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.FIGHTING, PokemonType.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, false, null, true), + new PokemonForm("Zenith", "zenith", PokemonType.FIGHTING, PokemonType.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, false, null, false, true) + ), + new PokemonSpecies(Species.POIPOLE, 7, true, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.6, 1.8, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 420, 67, 73, 67, 73, 67, 73, 45, 0, 210, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.NAGANADEL, 7, true, false, false, "Poison Pin Pokémon", PokemonType.POISON, PokemonType.DRAGON, 3.6, 150, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 540, 73, 73, 73, 127, 73, 121, 45, 0, 270, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.STAKATAKA, 7, true, false, false, "Rampart Pokémon", PokemonType.ROCK, PokemonType.STEEL, 5.5, 820, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 61, 131, 211, 53, 101, 13, 30, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.BLACEPHALON, 7, true, false, false, "Fireworks Pokémon", PokemonType.FIRE, PokemonType.GHOST, 1.8, 13, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 53, 127, 53, 151, 79, 107, 30, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.ZERAORA, 7, false, false, true, "Thunderclap Pokémon", PokemonType.ELECTRIC, null, 1.5, 44.5, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.NONE, 600, 88, 112, 75, 102, 80, 143, 3, 0, 300, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.MELTAN, 7, false, false, true, "Hex Nut Pokémon", PokemonType.STEEL, null, 0.2, 8, Abilities.MAGNET_PULL, Abilities.NONE, Abilities.NONE, 300, 46, 65, 65, 55, 35, 34, 3, 0, 150, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.MELMETAL, 7, false, false, true, "Hex Nut Pokémon", PokemonType.STEEL, null, 2.5, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 600, 135, 143, 143, 80, 65, 34, 3, 0, 300, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.STEEL, null, 2.5, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 600, 135, 143, 143, 80, 65, 34, 3, 0, 300, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.STEEL, null, 25, 999.9, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 700, 175, 165, 155, 85, 75, 45, 3, 0, 300), + ), + new PokemonSpecies(Species.GROOKEY, 8, false, false, false, "Chimp Pokémon", PokemonType.GRASS, null, 0.3, 5, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 310, 50, 65, 50, 40, 40, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.THWACKEY, 8, false, false, false, "Beat Pokémon", PokemonType.GRASS, null, 0.7, 14, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 420, 70, 85, 70, 55, 60, 80, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.RILLABOOM, 8, false, false, false, "Drummer Pokémon", PokemonType.GRASS, null, 2.1, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 530, 100, 125, 90, 60, 70, 85, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.GRASS, null, 2.1, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 530, 100, 125, 90, 60, 70, 85, 45, 50, 265, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, null, 28, 999.9, Abilities.GRASSY_SURGE, Abilities.NONE, Abilities.GRASSY_SURGE, 630, 125, 150, 105, 85, 85, 80, 45, 50, 265), + ), + new PokemonSpecies(Species.SCORBUNNY, 8, false, false, false, "Rabbit Pokémon", PokemonType.FIRE, null, 0.3, 4.5, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 310, 50, 71, 40, 40, 40, 69, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.RABOOT, 8, false, false, false, "Rabbit Pokémon", PokemonType.FIRE, null, 0.6, 9, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 420, 65, 86, 60, 55, 60, 94, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.CINDERACE, 8, false, false, false, "Striker Pokémon", PokemonType.FIRE, null, 1.4, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 530, 80, 116, 75, 65, 75, 119, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.FIRE, null, 1.4, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 530, 80, 116, 75, 65, 75, 119, 45, 50, 265, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FIRE, null, 27, 999.9, Abilities.LIBERO, Abilities.NONE, Abilities.LIBERO, 630, 100, 146, 80, 90, 80, 134, 45, 50, 265), + ), + new PokemonSpecies(Species.SOBBLE, 8, false, false, false, "Water Lizard Pokémon", PokemonType.WATER, null, 0.3, 4, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 310, 50, 40, 40, 70, 40, 70, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.DRIZZILE, 8, false, false, false, "Water Lizard Pokémon", PokemonType.WATER, null, 0.7, 11.5, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 420, 65, 60, 55, 95, 55, 90, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.INTELEON, 8, false, false, false, "Secret Agent Pokémon", PokemonType.WATER, null, 1.9, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 530, 70, 85, 65, 125, 65, 120, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true, + new PokemonForm("Normal", "", PokemonType.WATER, null, 1.9, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 530, 70, 85, 65, 125, 65, 120, 45, 50, 265, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.WATER, null, 40, 999.9, Abilities.SNIPER, Abilities.NONE, Abilities.SNIPER, 630, 95, 97, 77, 147, 77, 137, 45, 50, 265), + ), + new PokemonSpecies(Species.SKWOVET, 8, false, false, false, "Cheeky Pokémon", PokemonType.NORMAL, null, 0.3, 2.5, Abilities.CHEEK_POUCH, Abilities.NONE, Abilities.GLUTTONY, 275, 70, 55, 55, 35, 35, 25, 255, 50, 55, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GREEDENT, 8, false, false, false, "Greedy Pokémon", PokemonType.NORMAL, null, 0.6, 6, Abilities.CHEEK_POUCH, Abilities.NONE, Abilities.GLUTTONY, 460, 120, 95, 95, 55, 75, 20, 90, 50, 161, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ROOKIDEE, 8, false, false, false, "Tiny Bird Pokémon", PokemonType.FLYING, null, 0.2, 1.8, Abilities.KEEN_EYE, Abilities.UNNERVE, Abilities.BIG_PECKS, 245, 38, 47, 35, 33, 35, 57, 255, 50, 49, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.CORVISQUIRE, 8, false, false, false, "Raven Pokémon", PokemonType.FLYING, null, 0.8, 16, Abilities.KEEN_EYE, Abilities.UNNERVE, Abilities.BIG_PECKS, 365, 68, 67, 55, 43, 55, 77, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.CORVIKNIGHT, 8, false, false, false, "Raven Pokémon", PokemonType.FLYING, PokemonType.STEEL, 2.2, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 495, 98, 87, 105, 53, 85, 67, 45, 50, 248, GrowthRate.MEDIUM_SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.FLYING, PokemonType.STEEL, 2.2, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 495, 98, 87, 105, 53, 85, 67, 45, 50, 248, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FLYING, PokemonType.STEEL, 14, 999.9, Abilities.MIRROR_ARMOR, Abilities.MIRROR_ARMOR, Abilities.MIRROR_ARMOR, 595, 128, 102, 140, 53, 95, 77, 45, 50, 248), + ), + new PokemonSpecies(Species.BLIPBUG, 8, false, false, false, "Larva Pokémon", PokemonType.BUG, null, 0.4, 8, Abilities.SWARM, Abilities.COMPOUND_EYES, Abilities.TELEPATHY, 180, 25, 20, 20, 25, 45, 45, 255, 50, 36, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DOTTLER, 8, false, false, false, "Radome Pokémon", PokemonType.BUG, PokemonType.PSYCHIC, 0.4, 19.5, Abilities.SWARM, Abilities.COMPOUND_EYES, Abilities.TELEPATHY, 335, 50, 35, 80, 50, 90, 30, 120, 50, 117, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ORBEETLE, 8, false, false, false, "Seven Spot Pokémon", PokemonType.BUG, PokemonType.PSYCHIC, 0.4, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 505, 60, 45, 110, 80, 120, 90, 45, 50, 253, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.PSYCHIC, 0.4, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 505, 60, 45, 110, 80, 120, 90, 45, 50, 253, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.BUG, PokemonType.PSYCHIC, 14, 999.9, Abilities.TRACE, Abilities.TRACE, Abilities.TRACE, 605, 90, 45, 130, 110, 140, 90, 45, 50, 253), + ), + new PokemonSpecies(Species.NICKIT, 8, false, false, false, "Fox Pokémon", PokemonType.DARK, null, 0.6, 8.9, Abilities.RUN_AWAY, Abilities.UNBURDEN, Abilities.STAKEOUT, 245, 40, 28, 28, 47, 52, 50, 255, 50, 49, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.THIEVUL, 8, false, false, false, "Fox Pokémon", PokemonType.DARK, null, 1.2, 19.9, Abilities.RUN_AWAY, Abilities.UNBURDEN, Abilities.STAKEOUT, 455, 70, 58, 58, 87, 92, 90, 127, 50, 159, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.GOSSIFLEUR, 8, false, false, false, "Flowering Pokémon", PokemonType.GRASS, null, 0.4, 2.2, Abilities.COTTON_DOWN, Abilities.REGENERATOR, Abilities.EFFECT_SPORE, 250, 40, 40, 60, 40, 60, 10, 190, 50, 50, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ELDEGOSS, 8, false, false, false, "Cotton Bloom Pokémon", PokemonType.GRASS, null, 0.5, 2.5, Abilities.COTTON_DOWN, Abilities.REGENERATOR, Abilities.EFFECT_SPORE, 460, 60, 50, 90, 80, 120, 60, 75, 50, 161, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.WOOLOO, 8, false, false, false, "Sheep Pokémon", PokemonType.NORMAL, null, 0.6, 6, Abilities.FLUFFY, Abilities.RUN_AWAY, Abilities.BULLETPROOF, 270, 42, 40, 55, 40, 45, 48, 255, 50, 122, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DUBWOOL, 8, false, false, false, "Sheep Pokémon", PokemonType.NORMAL, null, 1.3, 43, Abilities.FLUFFY, Abilities.STEADFAST, Abilities.BULLETPROOF, 490, 72, 80, 100, 60, 90, 88, 127, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CHEWTLE, 8, false, false, false, "Snapping Pokémon", PokemonType.WATER, null, 0.3, 8.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 284, 50, 64, 50, 38, 38, 44, 255, 50, 57, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DREDNAW, 8, false, false, false, "Bite Pokémon", PokemonType.WATER, PokemonType.ROCK, 1, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 485, 90, 115, 90, 48, 68, 74, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.ROCK, 1, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 485, 90, 115, 90, 48, 68, 74, 75, 50, 170, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.WATER, PokemonType.ROCK, 24, 999.9, Abilities.STRONG_JAW, Abilities.STRONG_JAW, Abilities.STRONG_JAW, 585, 115, 145, 115, 43, 83, 84, 75, 50, 170), + ), + new PokemonSpecies(Species.YAMPER, 8, false, false, false, "Puppy Pokémon", PokemonType.ELECTRIC, null, 0.3, 13.5, Abilities.BALL_FETCH, Abilities.NONE, Abilities.RATTLED, 270, 59, 45, 50, 40, 50, 26, 255, 50, 54, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.BOLTUND, 8, false, false, false, "Dog Pokémon", PokemonType.ELECTRIC, null, 1, 34, Abilities.STRONG_JAW, Abilities.NONE, Abilities.COMPETITIVE, 490, 69, 90, 60, 90, 60, 121, 45, 50, 172, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.ROLYCOLY, 8, false, false, false, "Coal Pokémon", PokemonType.ROCK, null, 0.3, 12, Abilities.STEAM_ENGINE, Abilities.HEATPROOF, Abilities.FLASH_FIRE, 240, 30, 40, 50, 40, 50, 30, 255, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.CARKOL, 8, false, false, false, "Coal Pokémon", PokemonType.ROCK, PokemonType.FIRE, 1.1, 78, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 410, 80, 60, 90, 60, 70, 50, 120, 50, 144, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.COALOSSAL, 8, false, false, false, "Coal Pokémon", PokemonType.ROCK, PokemonType.FIRE, 2.8, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 510, 110, 80, 120, 80, 90, 30, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false, true, + new PokemonForm("Normal", "", PokemonType.ROCK, PokemonType.FIRE, 2.8, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 510, 110, 80, 120, 80, 90, 30, 45, 50, 255, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.ROCK, PokemonType.FIRE, 42, 999.9, Abilities.STEAM_ENGINE, Abilities.STEAM_ENGINE, Abilities.STEAM_ENGINE, 610, 140, 95, 130, 95, 110, 40, 45, 50, 255), + ), + new PokemonSpecies(Species.APPLIN, 8, false, false, false, "Apple Core Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.2, 0.5, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.BULLETPROOF, 260, 40, 40, 80, 40, 40, 20, 255, 50, 52, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.FLAPPLE, 8, false, false, false, "Apple Wing Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true, + new PokemonForm("Normal", "", PokemonType.GRASS, PokemonType.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, PokemonType.DRAGON, 24, 999.9, Abilities.HUSTLE, Abilities.HUSTLE, Abilities.HUSTLE, 585, 90, 130, 100, 85, 80, 100, 45, 50, 170), + ), + new PokemonSpecies(Species.APPLETUN, 8, false, false, false, "Apple Nectar Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true, + new PokemonForm("Normal", "", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, PokemonType.DRAGON, 24, 999.9, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 585, 130, 75, 115, 125, 115, 25, 45, 50, 170), + ), + new PokemonSpecies(Species.SILICOBRA, 8, false, false, false, "Sand Snake Pokémon", PokemonType.GROUND, null, 2.2, 7.6, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 315, 52, 57, 75, 35, 50, 46, 255, 50, 63, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SANDACONDA, 8, false, false, false, "Sand Snake Pokémon", PokemonType.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GROUND, null, 22, 999.9, Abilities.SAND_SPIT, Abilities.SAND_SPIT, Abilities.SAND_SPIT, 610, 117, 137, 140, 55, 80, 81, 120, 50, 179), + ), + new PokemonSpecies(Species.CRAMORANT, 8, false, false, false, "Gulp Pokémon", PokemonType.FLYING, PokemonType.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Normal", "", PokemonType.FLYING, PokemonType.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166, false, null, true), + new PokemonForm("Gulping Form", "gulping", PokemonType.FLYING, PokemonType.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166), + new PokemonForm("Gorging Form", "gorging", PokemonType.FLYING, PokemonType.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166), + ), + new PokemonSpecies(Species.ARROKUDA, 8, false, false, false, "Rush Pokémon", PokemonType.WATER, null, 0.5, 1, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.PROPELLER_TAIL, 280, 41, 63, 40, 40, 30, 66, 255, 50, 56, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.BARRASKEWDA, 8, false, false, false, "Skewer Pokémon", PokemonType.WATER, null, 1.3, 30, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.PROPELLER_TAIL, 490, 61, 123, 60, 60, 50, 136, 60, 50, 172, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.TOXEL, 8, false, false, false, "Baby Pokémon", PokemonType.ELECTRIC, PokemonType.POISON, 0.4, 11, Abilities.RATTLED, Abilities.STATIC, Abilities.KLUTZ, 242, 40, 38, 35, 54, 35, 40, 75, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.TOXTRICITY, 8, false, false, false, "Punk Pokémon", PokemonType.ELECTRIC, PokemonType.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, GrowthRate.MEDIUM_SLOW, 50, false, true, + new PokemonForm("Amped Form", "amped", PokemonType.ELECTRIC, PokemonType.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "", true), + new PokemonForm("Low-Key Form", "lowkey", PokemonType.ELECTRIC, PokemonType.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.MINUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "lowkey", true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.ELECTRIC, PokemonType.POISON, 24, 999.9, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, 602, 114, 98, 82, 144, 82, 82, 45, 50, 176), + ), + new PokemonSpecies(Species.SIZZLIPEDE, 8, false, false, false, "Radiator Pokémon", PokemonType.FIRE, PokemonType.BUG, 0.7, 1, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 305, 50, 65, 45, 50, 50, 45, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CENTISKORCH, 8, false, false, false, "Radiator Pokémon", PokemonType.FIRE, PokemonType.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.FIRE, PokemonType.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FIRE, PokemonType.BUG, 75, 999.9, Abilities.FLASH_FIRE, Abilities.FLASH_FIRE, Abilities.FLASH_FIRE, 625, 140, 145, 75, 90, 100, 75, 75, 50, 184), + ), + new PokemonSpecies(Species.CLOBBOPUS, 8, false, false, false, "Tantrum Pokémon", PokemonType.FIGHTING, null, 0.6, 4, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 310, 50, 68, 60, 50, 50, 32, 180, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GRAPPLOCT, 8, false, false, false, "Jujitsu Pokémon", PokemonType.FIGHTING, null, 1.6, 39, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 480, 80, 118, 90, 70, 80, 42, 45, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SINISTEA, 8, false, false, false, "Black Tea Pokémon", PokemonType.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.MEDIUM_FAST, null, false, false, + new PokemonForm("Phony Form", "phony", PokemonType.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, "", true), + new PokemonForm("Antique Form", "antique", PokemonType.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, "", true, true), + ), + new PokemonSpecies(Species.POLTEAGEIST, 8, false, false, false, "Black Tea Pokémon", PokemonType.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, GrowthRate.MEDIUM_FAST, null, false, false, + new PokemonForm("Phony Form", "phony", PokemonType.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, false, "", true), + new PokemonForm("Antique Form", "antique", PokemonType.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, false, "", true, true), + ), + new PokemonSpecies(Species.HATENNA, 8, false, false, false, "Calm Pokémon", PokemonType.PSYCHIC, null, 0.4, 3.4, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 265, 42, 30, 45, 56, 53, 39, 235, 50, 53, GrowthRate.SLOW, 0, false), + new PokemonSpecies(Species.HATTREM, 8, false, false, false, "Serene Pokémon", PokemonType.PSYCHIC, null, 0.6, 4.8, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 370, 57, 40, 65, 86, 73, 49, 120, 50, 130, GrowthRate.SLOW, 0, false), + new PokemonSpecies(Species.HATTERENE, 8, false, false, false, "Silent Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, GrowthRate.SLOW, 0, false, true, + new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.PSYCHIC, PokemonType.FAIRY, 26, 999.9, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 610, 97, 90, 105, 146, 122, 50, 45, 50, 255), + ), + new PokemonSpecies(Species.IMPIDIMP, 8, false, false, false, "Wily Pokémon", PokemonType.DARK, PokemonType.FAIRY, 0.4, 5.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 265, 45, 45, 30, 55, 40, 50, 255, 50, 53, GrowthRate.MEDIUM_FAST, 100, false), + new PokemonSpecies(Species.MORGREM, 8, false, false, false, "Devious Pokémon", PokemonType.DARK, PokemonType.FAIRY, 0.8, 12.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 370, 65, 60, 45, 75, 55, 70, 120, 50, 130, GrowthRate.MEDIUM_FAST, 100, false), + new PokemonSpecies(Species.GRIMMSNARL, 8, false, false, false, "Bulk Up Pokémon", PokemonType.DARK, PokemonType.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, GrowthRate.MEDIUM_FAST, 100, false, true, + new PokemonForm("Normal", "", PokemonType.DARK, PokemonType.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.DARK, PokemonType.FAIRY, 32, 999.9, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 610, 135, 138, 77, 110, 85, 65, 45, 50, 255), + ), + new PokemonSpecies(Species.OBSTAGOON, 8, false, false, false, "Blocking Pokémon", PokemonType.DARK, PokemonType.NORMAL, 1.6, 46, Abilities.RECKLESS, Abilities.GUTS, Abilities.DEFIANT, 520, 93, 90, 101, 60, 81, 95, 45, 50, 260, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PERRSERKER, 8, false, false, false, "Viking Pokémon", PokemonType.STEEL, null, 0.8, 28, Abilities.BATTLE_ARMOR, Abilities.TOUGH_CLAWS, Abilities.STEELY_SPIRIT, 440, 70, 110, 100, 50, 60, 50, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CURSOLA, 8, false, false, false, "Coral Pokémon", PokemonType.GHOST, null, 1, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.PERISH_BODY, 510, 60, 95, 50, 145, 130, 30, 30, 50, 179, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.SIRFETCHD, 8, false, false, false, "Wild Duck Pokémon", PokemonType.FIGHTING, null, 0.8, 117, Abilities.STEADFAST, Abilities.NONE, Abilities.SCRAPPY, 507, 62, 135, 95, 68, 82, 65, 45, 50, 177, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MR_RIME, 8, false, false, false, "Comedian Pokémon", PokemonType.ICE, PokemonType.PSYCHIC, 1.5, 58.2, Abilities.TANGLED_FEET, Abilities.SCREEN_CLEANER, Abilities.ICE_BODY, 520, 80, 85, 75, 110, 100, 70, 45, 50, 182, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.RUNERIGUS, 8, false, false, false, "Grudge Pokémon", PokemonType.GROUND, PokemonType.GHOST, 1.6, 66.6, Abilities.WANDERING_SPIRIT, Abilities.NONE, Abilities.NONE, 483, 58, 95, 145, 50, 105, 30, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.MILCERY, 8, false, false, false, "Cream Pokémon", PokemonType.FAIRY, null, 0.2, 0.3, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 270, 45, 40, 40, 50, 61, 34, 200, 50, 54, GrowthRate.MEDIUM_FAST, 0, false), + new PokemonSpecies(Species.ALCREMIE, 8, false, false, false, "Cream Pokémon", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, GrowthRate.MEDIUM_FAST, 0, false, true, + new PokemonForm("Vanilla Cream", "vanilla-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, "", true), + new PokemonForm("Ruby Cream", "ruby-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), + new PokemonForm("Matcha Cream", "matcha-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), + new PokemonForm("Mint Cream", "mint-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), + new PokemonForm("Lemon Cream", "lemon-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), + new PokemonForm("Salted Cream", "salted-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), + new PokemonForm("Ruby Swirl", "ruby-swirl", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), + new PokemonForm("Caramel Swirl", "caramel-swirl", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), + new PokemonForm("Rainbow Swirl", "rainbow-swirl", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FAIRY, null, 30, 999.9, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 595, 135, 60, 75, 130, 131, 64, 100, 50, 173), + ), + new PokemonSpecies(Species.FALINKS, 8, false, false, false, "Formation Pokémon", PokemonType.FIGHTING, null, 3, 62, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.DEFIANT, 470, 65, 100, 100, 70, 60, 75, 45, 50, 165, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.PINCURCHIN, 8, false, false, false, "Sea Urchin Pokémon", PokemonType.ELECTRIC, null, 0.3, 1, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.ELECTRIC_SURGE, 435, 48, 101, 95, 91, 85, 15, 75, 50, 152, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SNOM, 8, false, false, false, "Worm Pokémon", PokemonType.ICE, PokemonType.BUG, 0.3, 3.8, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.ICE_SCALES, 185, 30, 25, 35, 45, 30, 20, 190, 50, 37, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FROSMOTH, 8, false, false, false, "Frost Moth Pokémon", PokemonType.ICE, PokemonType.BUG, 1.3, 42, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.ICE_SCALES, 475, 70, 65, 60, 125, 90, 65, 75, 50, 166, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.STONJOURNER, 8, false, false, false, "Big Rock Pokémon", PokemonType.ROCK, null, 2.5, 520, Abilities.POWER_SPOT, Abilities.NONE, Abilities.NONE, 470, 100, 125, 135, 20, 20, 70, 60, 50, 165, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.EISCUE, 8, false, false, false, "Penguin Pokémon", PokemonType.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 110, 65, 90, 50, 60, 50, 165, GrowthRate.SLOW, 50, false, false, + new PokemonForm("Ice Face", "", PokemonType.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 110, 65, 90, 50, 60, 50, 165, false, null, true), + new PokemonForm("No Ice", "no-ice", PokemonType.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 70, 65, 50, 130, 60, 50, 165), + ), + new PokemonSpecies(Species.INDEEDEE, 8, false, false, false, "Emotion Pokémon", PokemonType.PSYCHIC, PokemonType.NORMAL, 0.9, 28, Abilities.INNER_FOCUS, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 60, 65, 55, 105, 95, 95, 30, 140, 166, GrowthRate.FAST, 50, false, false, + new PokemonForm("Male", "male", PokemonType.PSYCHIC, PokemonType.NORMAL, 0.9, 28, Abilities.INNER_FOCUS, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 60, 65, 55, 105, 95, 95, 30, 140, 166, false, "", true), + new PokemonForm("Female", "female", PokemonType.PSYCHIC, PokemonType.NORMAL, 0.9, 28, Abilities.OWN_TEMPO, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 70, 55, 65, 95, 105, 85, 30, 140, 166, false, null, true), + ), + new PokemonSpecies(Species.MORPEKO, 8, false, false, false, "Two-Sided Pokémon", PokemonType.ELECTRIC, PokemonType.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Full Belly Mode", "full-belly", PokemonType.ELECTRIC, PokemonType.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153, false, "", true), + new PokemonForm("Hangry Mode", "hangry", PokemonType.ELECTRIC, PokemonType.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153), + ), + new PokemonSpecies(Species.CUFANT, 8, false, false, false, "Copperderm Pokémon", PokemonType.STEEL, null, 1.2, 100, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 330, 72, 80, 49, 40, 49, 40, 190, 50, 66, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.COPPERAJAH, 8, false, false, false, "Copperderm Pokémon", PokemonType.STEEL, null, 3, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 500, 122, 130, 69, 80, 69, 30, 90, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.STEEL, null, 3, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 500, 122, 130, 69, 80, 69, 30, 90, 50, 175, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.STEEL, PokemonType.GROUND, 23, 999.9, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.MOLD_BREAKER, 600, 167, 155, 89, 80, 89, 20, 90, 50, 175), + ), + new PokemonSpecies(Species.DRACOZOLT, 8, false, false, false, "Fossil Pokémon", PokemonType.ELECTRIC, PokemonType.DRAGON, 1.8, 190, Abilities.VOLT_ABSORB, Abilities.HUSTLE, Abilities.SAND_RUSH, 505, 90, 100, 90, 80, 70, 75, 45, 50, 177, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.ARCTOZOLT, 8, false, false, false, "Fossil Pokémon", PokemonType.ELECTRIC, PokemonType.ICE, 2.3, 150, Abilities.VOLT_ABSORB, Abilities.STATIC, Abilities.SLUSH_RUSH, 505, 90, 100, 90, 90, 80, 55, 45, 50, 177, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.DRACOVISH, 8, false, false, false, "Fossil Pokémon", PokemonType.WATER, PokemonType.DRAGON, 2.3, 215, Abilities.WATER_ABSORB, Abilities.STRONG_JAW, Abilities.SAND_RUSH, 505, 90, 90, 100, 70, 80, 75, 45, 50, 177, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.ARCTOVISH, 8, false, false, false, "Fossil Pokémon", PokemonType.WATER, PokemonType.ICE, 2, 175, Abilities.WATER_ABSORB, Abilities.ICE_BODY, Abilities.SLUSH_RUSH, 505, 90, 90, 100, 80, 90, 55, 45, 50, 177, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.DURALUDON, 8, false, false, false, "Alloy Pokémon", PokemonType.STEEL, PokemonType.DRAGON, 1.8, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 535, 70, 95, 115, 120, 50, 85, 45, 50, 187, GrowthRate.MEDIUM_FAST, 50, false, true, + new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.DRAGON, 1.8, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 535, 70, 95, 115, 120, 50, 85, 45, 50, 187, false, null, true), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.STEEL, PokemonType.DRAGON, 43, 999.9, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, 635, 100, 110, 120, 175, 60, 70, 45, 50, 187), + ), + new PokemonSpecies(Species.DREEPY, 8, false, false, false, "Lingering Pokémon", PokemonType.DRAGON, PokemonType.GHOST, 0.5, 2, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 270, 28, 60, 30, 40, 30, 82, 45, 50, 54, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.DRAKLOAK, 8, false, false, false, "Caretaker Pokémon", PokemonType.DRAGON, PokemonType.GHOST, 1.4, 11, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 410, 68, 80, 50, 60, 50, 102, 45, 50, 144, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.DRAGAPULT, 8, false, false, false, "Stealth Pokémon", PokemonType.DRAGON, PokemonType.GHOST, 3, 50, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 600, 88, 120, 75, 100, 75, 142, 45, 50, 300, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.ZACIAN, 8, false, true, false, "Warrior Pokémon", PokemonType.FAIRY, null, 2.8, 110, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, GrowthRate.SLOW, null, false, false, + new PokemonForm("Hero of Many Battles", "hero-of-many-battles", PokemonType.FAIRY, null, 2.8, 110, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, false, "", true), + new PokemonForm("Crowned", "crowned", PokemonType.FAIRY, PokemonType.STEEL, 2.8, 355, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 700, 92, 150, 115, 80, 115, 148, 10, 0, 360), + ), + new PokemonSpecies(Species.ZAMAZENTA, 8, false, true, false, "Warrior Pokémon", PokemonType.FIGHTING, null, 2.9, 210, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, GrowthRate.SLOW, null, false, false, + new PokemonForm("Hero of Many Battles", "hero-of-many-battles", PokemonType.FIGHTING, null, 2.9, 210, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, false, "", true), + new PokemonForm("Crowned", "crowned", PokemonType.FIGHTING, PokemonType.STEEL, 2.9, 785, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 700, 92, 120, 140, 80, 140, 128, 10, 0, 360), + ), + new PokemonSpecies(Species.ETERNATUS, 8, false, true, false, "Gigantic Pokémon", PokemonType.POISON, PokemonType.DRAGON, 20, 950, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 690, 140, 85, 95, 145, 95, 130, 255, 0, 345, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.POISON, PokemonType.DRAGON, 20, 950, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 690, 140, 85, 95, 145, 95, 130, 255, 0, 345, false, null, true), + new PokemonForm("E-Max", "eternamax", PokemonType.POISON, PokemonType.DRAGON, 100, 999.9, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 1125, 255, 115, 250, 125, 250, 130, 255, 0, 345), + ), + new PokemonSpecies(Species.KUBFU, 8, true, false, false, "Wushu Pokémon", PokemonType.FIGHTING, null, 0.6, 12, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.NONE, 385, 60, 90, 60, 53, 50, 72, 3, 50, 77, GrowthRate.SLOW, 87.5, false), + new PokemonSpecies(Species.URSHIFU, 8, true, false, false, "Wushu Pokémon", PokemonType.FIGHTING, PokemonType.DARK, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, GrowthRate.SLOW, 87.5, false, true, + new PokemonForm("Single Strike Style", "single-strike", PokemonType.FIGHTING, PokemonType.DARK, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, false, "", true), + new PokemonForm("Rapid Strike Style", "rapid-strike", PokemonType.FIGHTING, PokemonType.WATER, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, false, null, true), + new PokemonForm("G-Max Single Strike Style", SpeciesFormKey.GIGANTAMAX_SINGLE, PokemonType.FIGHTING, PokemonType.DARK, 29, 999.9, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 150, 115, 73, 70, 117, 3, 50, 275), + new PokemonForm("G-Max Rapid Strike Style", SpeciesFormKey.GIGANTAMAX_RAPID, PokemonType.FIGHTING, PokemonType.WATER, 26, 999.9, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 150, 115, 73, 70, 117, 3, 50, 275), + ), + new PokemonSpecies(Species.ZARUDE, 8, false, false, true, "Rogue Monkey Pokémon", PokemonType.DARK, PokemonType.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, GrowthRate.SLOW, null, false, false, + new PokemonForm("Normal", "", PokemonType.DARK, PokemonType.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, false, null, true), + new PokemonForm("Dada", "dada", PokemonType.DARK, PokemonType.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, false, null, true), + ), + new PokemonSpecies(Species.REGIELEKI, 8, true, false, false, "Electron Pokémon", PokemonType.ELECTRIC, null, 1.2, 145, Abilities.TRANSISTOR, Abilities.NONE, Abilities.NONE, 580, 80, 100, 50, 100, 50, 200, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.REGIDRAGO, 8, true, false, false, "Dragon Orb Pokémon", PokemonType.DRAGON, null, 2.1, 200, Abilities.DRAGONS_MAW, Abilities.NONE, Abilities.NONE, 580, 200, 100, 50, 100, 50, 80, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.GLASTRIER, 8, true, false, false, "Wild Horse Pokémon", PokemonType.ICE, null, 2.2, 800, Abilities.CHILLING_NEIGH, Abilities.NONE, Abilities.NONE, 580, 100, 145, 130, 65, 110, 30, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.SPECTRIER, 8, true, false, false, "Swift Horse Pokémon", PokemonType.GHOST, null, 2, 44.5, Abilities.GRIM_NEIGH, Abilities.NONE, Abilities.NONE, 580, 100, 65, 60, 145, 80, 130, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.CALYREX, 8, false, true, false, "King Pokémon", PokemonType.PSYCHIC, PokemonType.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250, GrowthRate.SLOW, null, false, true, + new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250, false, null, true), + new PokemonForm("Ice", "ice", PokemonType.PSYCHIC, PokemonType.ICE, 2.4, 809.1, Abilities.AS_ONE_GLASTRIER, Abilities.NONE, Abilities.NONE, 680, 100, 165, 150, 85, 130, 50, 3, 100, 340), + new PokemonForm("Shadow", "shadow", PokemonType.PSYCHIC, PokemonType.GHOST, 2.4, 53.6, Abilities.AS_ONE_SPECTRIER, Abilities.NONE, Abilities.NONE, 680, 100, 85, 80, 165, 100, 150, 3, 100, 340), + ), + new PokemonSpecies(Species.WYRDEER, 8, false, false, false, "Big Horn Pokémon", PokemonType.NORMAL, PokemonType.PSYCHIC, 1.8, 95.1, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 525, 103, 105, 72, 105, 75, 65, 135, 50, 263, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.KLEAVOR, 8, false, false, false, "Axe Pokémon", PokemonType.BUG, PokemonType.ROCK, 1.8, 89, Abilities.SWARM, Abilities.SHEER_FORCE, Abilities.SHARPNESS, 500, 70, 135, 95, 45, 70, 85, 115, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.URSALUNA, 8, false, false, false, "Peat Pokémon", PokemonType.GROUND, PokemonType.NORMAL, 2.4, 290, Abilities.GUTS, Abilities.BULLETPROOF, Abilities.UNNERVE, 550, 130, 140, 105, 45, 80, 50, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BASCULEGION, 8, false, false, false, "Big Fish Pokémon", PokemonType.WATER, PokemonType.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Male", "male", PokemonType.WATER, PokemonType.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, false, "", true), + new PokemonForm("Female", "female", PokemonType.WATER, PokemonType.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 92, 65, 100, 75, 78, 135, 50, 265, false, null, true), + ), + new PokemonSpecies(Species.SNEASLER, 8, false, false, false, "Free Climb Pokémon", PokemonType.FIGHTING, PokemonType.POISON, 1.3, 43, Abilities.PRESSURE, Abilities.UNBURDEN, Abilities.POISON_TOUCH, 510, 80, 130, 60, 40, 80, 120, 135, 50, 102, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.OVERQWIL, 8, false, false, false, "Pin Cluster Pokémon", PokemonType.DARK, PokemonType.POISON, 2.5, 60.5, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 510, 85, 115, 95, 65, 65, 85, 135, 50, 179, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ENAMORUS, 8, true, false, false, "Love-Hate Pokémon", PokemonType.FAIRY, PokemonType.FLYING, 1.6, 48, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.CONTRARY, 580, 74, 115, 70, 135, 80, 106, 3, 50, 116, GrowthRate.SLOW, 0, false, true, + new PokemonForm("Incarnate Forme", "incarnate", PokemonType.FAIRY, PokemonType.FLYING, 1.6, 48, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.CONTRARY, 580, 74, 115, 70, 135, 80, 106, 3, 50, 116, false, null, true), + new PokemonForm("Therian Forme", "therian", PokemonType.FAIRY, PokemonType.FLYING, 1.6, 48, Abilities.OVERCOAT, Abilities.NONE, Abilities.OVERCOAT, 580, 74, 115, 110, 135, 100, 46, 3, 50, 116), + ), + new PokemonSpecies(Species.SPRIGATITO, 9, false, false, false, "Grass Cat Pokémon", PokemonType.GRASS, null, 0.4, 4.1, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 310, 40, 61, 54, 45, 45, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.FLORAGATO, 9, false, false, false, "Grass Cat Pokémon", PokemonType.GRASS, null, 0.9, 12.2, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 410, 61, 80, 63, 60, 63, 83, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.MEOWSCARADA, 9, false, false, false, "Magician Pokémon", PokemonType.GRASS, PokemonType.DARK, 1.5, 31.2, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 530, 76, 110, 70, 81, 70, 123, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.FUECOCO, 9, false, false, false, "Fire Croc Pokémon", PokemonType.FIRE, null, 0.4, 9.8, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 310, 67, 45, 59, 63, 40, 36, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.CROCALOR, 9, false, false, false, "Fire Croc Pokémon", PokemonType.FIRE, null, 1, 30.7, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 411, 81, 55, 78, 90, 58, 49, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.SKELEDIRGE, 9, false, false, false, "Singer Pokémon", PokemonType.FIRE, PokemonType.GHOST, 1.6, 326.5, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 530, 104, 75, 100, 110, 75, 66, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.QUAXLY, 9, false, false, false, "Duckling Pokémon", PokemonType.WATER, null, 0.5, 6.1, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 310, 55, 65, 45, 50, 45, 50, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.QUAXWELL, 9, false, false, false, "Practicing Pokémon", PokemonType.WATER, null, 1.2, 21.5, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 410, 70, 85, 65, 65, 60, 65, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.QUAQUAVAL, 9, false, false, false, "Dancer Pokémon", PokemonType.WATER, PokemonType.FIGHTING, 1.8, 61.9, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 530, 85, 120, 80, 85, 75, 85, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.LECHONK, 9, false, false, false, "Hog Pokémon", PokemonType.NORMAL, null, 0.5, 10.2, Abilities.AROMA_VEIL, Abilities.GLUTTONY, Abilities.THICK_FAT, 254, 54, 45, 40, 35, 45, 35, 255, 50, 51, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.OINKOLOGNE, 9, false, false, false, "Hog Pokémon", PokemonType.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Male", "male", PokemonType.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, false, "", true), + new PokemonForm("Female", "female", PokemonType.NORMAL, null, 1, 120, Abilities.AROMA_VEIL, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 115, 90, 70, 59, 90, 65, 100, 50, 171, false, null, true), + ), + new PokemonSpecies(Species.TAROUNTULA, 9, false, false, false, "String Ball Pokémon", PokemonType.BUG, null, 0.3, 4, Abilities.INSOMNIA, Abilities.NONE, Abilities.STAKEOUT, 210, 35, 41, 45, 29, 40, 20, 255, 50, 42, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.SPIDOPS, 9, false, false, false, "Trap Pokémon", PokemonType.BUG, null, 1, 16.5, Abilities.INSOMNIA, Abilities.NONE, Abilities.STAKEOUT, 404, 60, 79, 92, 52, 86, 35, 120, 50, 141, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.NYMBLE, 9, false, false, false, "Grasshopper Pokémon", PokemonType.BUG, null, 0.2, 1, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 210, 33, 46, 40, 21, 25, 45, 190, 20, 42, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.LOKIX, 9, false, false, false, "Grasshopper Pokémon", PokemonType.BUG, PokemonType.DARK, 1, 17.5, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 450, 71, 102, 78, 52, 55, 92, 30, 0, 158, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PAWMI, 9, false, false, false, "Mouse Pokémon", PokemonType.ELECTRIC, null, 0.3, 2.5, Abilities.STATIC, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 240, 45, 50, 20, 40, 25, 60, 190, 50, 48, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PAWMO, 9, false, false, false, "Mouse Pokémon", PokemonType.ELECTRIC, PokemonType.FIGHTING, 0.4, 6.5, Abilities.VOLT_ABSORB, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 350, 60, 75, 40, 50, 40, 85, 80, 50, 123, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PAWMOT, 9, false, false, false, "Hands-On Pokémon", PokemonType.ELECTRIC, PokemonType.FIGHTING, 0.9, 41, Abilities.VOLT_ABSORB, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 490, 70, 115, 70, 70, 60, 105, 45, 50, 245, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.TANDEMAUS, 9, false, false, false, "Couple Pokémon", PokemonType.NORMAL, null, 0.3, 1.8, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.OWN_TEMPO, 305, 50, 50, 45, 40, 45, 75, 150, 50, 61, GrowthRate.FAST, null, false), + new PokemonSpecies(Species.MAUSHOLD, 9, false, false, false, "Family Pokémon", PokemonType.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165, GrowthRate.FAST, null, false, false, + new PokemonForm("Family of Four", "four", PokemonType.NORMAL, null, 0.3, 2.8, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165), + new PokemonForm("Family of Three", "three", PokemonType.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165), + ), + new PokemonSpecies(Species.FIDOUGH, 9, false, false, false, "Puppy Pokémon", PokemonType.FAIRY, null, 0.3, 10.9, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.KLUTZ, 312, 37, 55, 70, 30, 55, 65, 190, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.DACHSBUN, 9, false, false, false, "Dog Pokémon", PokemonType.FAIRY, null, 0.5, 14.9, Abilities.WELL_BAKED_BODY, Abilities.NONE, Abilities.AROMA_VEIL, 477, 57, 80, 115, 50, 80, 95, 90, 50, 167, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SMOLIV, 9, false, false, false, "Olive Pokémon", PokemonType.GRASS, PokemonType.NORMAL, 0.3, 6.5, Abilities.EARLY_BIRD, Abilities.NONE, Abilities.HARVEST, 260, 41, 35, 45, 58, 51, 30, 255, 50, 52, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.DOLLIV, 9, false, false, false, "Olive Pokémon", PokemonType.GRASS, PokemonType.NORMAL, 0.6, 11.9, Abilities.EARLY_BIRD, Abilities.NONE, Abilities.HARVEST, 354, 52, 53, 60, 78, 78, 33, 120, 50, 124, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.ARBOLIVA, 9, false, false, false, "Olive Pokémon", PokemonType.GRASS, PokemonType.NORMAL, 1.4, 48.2, Abilities.SEED_SOWER, Abilities.NONE, Abilities.HARVEST, 510, 78, 69, 90, 125, 109, 39, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SQUAWKABILLY, 9, false, false, false, "Parrot Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, GrowthRate.ERRATIC, 50, false, false, + new PokemonForm("Green Plumage", "green-plumage", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true), + new PokemonForm("Blue Plumage", "blue-plumage", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true), + new PokemonForm("Yellow Plumage", "yellow-plumage", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.SHEER_FORCE, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true), + new PokemonForm("White Plumage", "white-plumage", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.SHEER_FORCE, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true), + ), + new PokemonSpecies(Species.NACLI, 9, false, false, false, "Rock Salt Pokémon", PokemonType.ROCK, null, 0.4, 16, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 280, 55, 55, 75, 35, 35, 25, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.NACLSTACK, 9, false, false, false, "Rock Salt Pokémon", PokemonType.ROCK, null, 0.6, 105, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 355, 60, 60, 100, 35, 65, 35, 120, 50, 124, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GARGANACL, 9, false, false, false, "Rock Salt Pokémon", PokemonType.ROCK, null, 2.3, 240, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 500, 100, 100, 130, 45, 90, 35, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.CHARCADET, 9, false, false, false, "Fire Child Pokémon", PokemonType.FIRE, null, 0.6, 10.5, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.FLAME_BODY, 255, 40, 50, 40, 50, 40, 35, 90, 50, 51, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.ARMAROUGE, 9, false, false, false, "Fire Warrior Pokémon", PokemonType.FIRE, PokemonType.PSYCHIC, 1.5, 85, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.WEAK_ARMOR, 525, 85, 60, 100, 125, 80, 75, 25, 20, 263, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.CERULEDGE, 9, false, false, false, "Fire Blades Pokémon", PokemonType.FIRE, PokemonType.GHOST, 1.6, 62, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.WEAK_ARMOR, 525, 75, 125, 80, 60, 100, 85, 25, 20, 263, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.TADBULB, 9, false, false, false, "EleTadpole Pokémon", PokemonType.ELECTRIC, null, 0.3, 0.4, Abilities.OWN_TEMPO, Abilities.STATIC, Abilities.DAMP, 272, 61, 31, 41, 59, 35, 45, 190, 50, 54, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BELLIBOLT, 9, false, false, false, "EleFrog Pokémon", PokemonType.ELECTRIC, null, 1.2, 113, Abilities.ELECTROMORPHOSIS, Abilities.STATIC, Abilities.DAMP, 495, 109, 64, 91, 103, 83, 45, 50, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.WATTREL, 9, false, false, false, "Storm Petrel Pokémon", PokemonType.ELECTRIC, PokemonType.FLYING, 0.4, 3.6, Abilities.WIND_POWER, Abilities.VOLT_ABSORB, Abilities.COMPETITIVE, 280, 40, 40, 35, 55, 40, 70, 180, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.KILOWATTREL, 9, false, false, false, "Frigatebird Pokémon", PokemonType.ELECTRIC, PokemonType.FLYING, 1.4, 38.6, Abilities.WIND_POWER, Abilities.VOLT_ABSORB, Abilities.COMPETITIVE, 490, 70, 70, 60, 105, 60, 125, 90, 50, 172, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.MASCHIFF, 9, false, false, false, "Rascal Pokémon", PokemonType.DARK, null, 0.5, 16, Abilities.INTIMIDATE, Abilities.RUN_AWAY, Abilities.STAKEOUT, 340, 60, 78, 60, 40, 51, 51, 150, 50, 68, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.MABOSSTIFF, 9, false, false, false, "Boss Pokémon", PokemonType.DARK, null, 1.1, 61, Abilities.INTIMIDATE, Abilities.GUARD_DOG, Abilities.STAKEOUT, 505, 80, 120, 90, 60, 70, 85, 75, 50, 177, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.SHROODLE, 9, false, false, false, "Toxic Mouse Pokémon", PokemonType.POISON, PokemonType.NORMAL, 0.2, 0.7, Abilities.UNBURDEN, Abilities.PICKPOCKET, Abilities.PRANKSTER, 290, 40, 65, 35, 40, 35, 75, 190, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GRAFAIAI, 9, false, false, false, "Toxic Monkey Pokémon", PokemonType.POISON, PokemonType.NORMAL, 0.7, 27.2, Abilities.UNBURDEN, Abilities.POISON_TOUCH, Abilities.PRANKSTER, 485, 63, 95, 65, 80, 72, 110, 90, 50, 170, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.BRAMBLIN, 9, false, false, false, "Tumbleweed Pokémon", PokemonType.GRASS, PokemonType.GHOST, 0.6, 0.6, Abilities.WIND_RIDER, Abilities.NONE, Abilities.INFILTRATOR, 275, 40, 65, 30, 45, 35, 60, 190, 50, 55, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BRAMBLEGHAST, 9, false, false, false, "Tumbleweed Pokémon", PokemonType.GRASS, PokemonType.GHOST, 1.2, 6, Abilities.WIND_RIDER, Abilities.NONE, Abilities.INFILTRATOR, 480, 55, 115, 70, 80, 70, 90, 45, 50, 168, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.TOEDSCOOL, 9, false, false, false, "Woodear Pokémon", PokemonType.GROUND, PokemonType.GRASS, 0.9, 33, Abilities.MYCELIUM_MIGHT, Abilities.NONE, Abilities.NONE, 335, 40, 40, 35, 50, 100, 70, 190, 50, 67, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.TOEDSCRUEL, 9, false, false, false, "Woodear Pokémon", PokemonType.GROUND, PokemonType.GRASS, 1.9, 58, Abilities.MYCELIUM_MIGHT, Abilities.NONE, Abilities.NONE, 515, 80, 70, 65, 80, 120, 100, 90, 50, 180, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.KLAWF, 9, false, false, false, "Ambush Pokémon", PokemonType.ROCK, null, 1.3, 79, Abilities.ANGER_SHELL, Abilities.SHELL_ARMOR, Abilities.REGENERATOR, 450, 70, 100, 115, 35, 55, 75, 120, 50, 158, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CAPSAKID, 9, false, false, false, "Spicy Pepper Pokémon", PokemonType.GRASS, null, 0.3, 3, Abilities.CHLOROPHYLL, Abilities.INSOMNIA, Abilities.KLUTZ, 304, 50, 62, 40, 62, 40, 50, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.SCOVILLAIN, 9, false, false, false, "Spicy Pepper Pokémon", PokemonType.GRASS, PokemonType.FIRE, 0.9, 15, Abilities.CHLOROPHYLL, Abilities.INSOMNIA, Abilities.MOODY, 486, 65, 108, 65, 108, 65, 75, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.RELLOR, 9, false, false, false, "Rolling Pokémon", PokemonType.BUG, null, 0.2, 1, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.SHED_SKIN, 270, 41, 50, 60, 31, 58, 30, 190, 50, 54, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.RABSCA, 9, false, false, false, "Rolling Pokémon", PokemonType.BUG, PokemonType.PSYCHIC, 0.3, 3.5, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.TELEPATHY, 470, 75, 50, 85, 115, 100, 45, 45, 50, 165, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.FLITTLE, 9, false, false, false, "Frill Pokémon", PokemonType.PSYCHIC, null, 0.2, 1.5, Abilities.ANTICIPATION, Abilities.FRISK, Abilities.SPEED_BOOST, 255, 30, 35, 30, 55, 30, 75, 120, 50, 51, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.ESPATHRA, 9, false, false, false, "Ostrich Pokémon", PokemonType.PSYCHIC, null, 1.9, 90, Abilities.OPPORTUNIST, Abilities.FRISK, Abilities.SPEED_BOOST, 481, 95, 60, 60, 101, 60, 105, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.TINKATINK, 9, false, false, false, "Metalsmith Pokémon", PokemonType.FAIRY, PokemonType.STEEL, 0.4, 8.9, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 297, 50, 45, 45, 35, 64, 58, 190, 50, 59, GrowthRate.MEDIUM_SLOW, 0, false), + new PokemonSpecies(Species.TINKATUFF, 9, false, false, false, "Hammer Pokémon", PokemonType.FAIRY, PokemonType.STEEL, 0.7, 59.1, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 380, 65, 55, 55, 45, 82, 78, 90, 50, 133, GrowthRate.MEDIUM_SLOW, 0, false), + new PokemonSpecies(Species.TINKATON, 9, false, false, false, "Hammer Pokémon", PokemonType.FAIRY, PokemonType.STEEL, 0.7, 112.8, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 506, 85, 75, 77, 70, 105, 94, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 0, false), + new PokemonSpecies(Species.WIGLETT, 9, false, false, false, "Garden Eel Pokémon", PokemonType.WATER, null, 1.2, 1.8, Abilities.GOOEY, Abilities.RATTLED, Abilities.SAND_VEIL, 245, 10, 55, 25, 35, 25, 95, 255, 50, 49, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.WUGTRIO, 9, false, false, false, "Garden Eel Pokémon", PokemonType.WATER, null, 1.2, 5.4, Abilities.GOOEY, Abilities.RATTLED, Abilities.SAND_VEIL, 425, 35, 100, 50, 50, 70, 120, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BOMBIRDIER, 9, false, false, false, "Item Drop Pokémon", PokemonType.FLYING, PokemonType.DARK, 1.5, 42.9, Abilities.BIG_PECKS, Abilities.KEEN_EYE, Abilities.ROCKY_PAYLOAD, 485, 70, 103, 85, 60, 85, 82, 25, 50, 243, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.FINIZEN, 9, false, false, false, "Dolphin Pokémon", PokemonType.WATER, null, 1.3, 60.2, Abilities.WATER_VEIL, Abilities.NONE, Abilities.NONE, 315, 70, 45, 40, 45, 40, 75, 200, 50, 63, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.PALAFIN, 9, false, false, false, "Dolphin Pokémon", PokemonType.WATER, null, 1.3, 60.2, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.NONE, 457, 100, 70, 72, 53, 62, 100, 45, 50, 160, GrowthRate.SLOW, 50, false, true, + new PokemonForm("Zero Form", "zero", PokemonType.WATER, null, 1.3, 60.2, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.ZERO_TO_HERO, 457, 100, 70, 72, 53, 62, 100, 45, 50, 160, false, null, true), + new PokemonForm("Hero Form", "hero", PokemonType.WATER, null, 1.8, 97.4, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.ZERO_TO_HERO, 650, 100, 160, 97, 106, 87, 100, 45, 50, 160), + ), + new PokemonSpecies(Species.VAROOM, 9, false, false, false, "Single-Cyl Pokémon", PokemonType.STEEL, PokemonType.POISON, 1, 35, Abilities.OVERCOAT, Abilities.NONE, Abilities.SLOW_START, 300, 45, 70, 63, 30, 45, 47, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.REVAVROOM, 9, false, false, false, "Multi-Cyl Pokémon", PokemonType.STEEL, PokemonType.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, false, null, true), + new PokemonForm("Segin Starmobile", "segin-starmobile", PokemonType.STEEL, PokemonType.DARK, 1.8, 240, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true), + new PokemonForm("Schedar Starmobile", "schedar-starmobile", PokemonType.STEEL, PokemonType.FIRE, 1.8, 240, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.SPEED_BOOST, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true), + new PokemonForm("Navi Starmobile", "navi-starmobile", PokemonType.STEEL, PokemonType.POISON, 1.8, 240, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.TOXIC_DEBRIS, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true), + new PokemonForm("Ruchbah Starmobile", "ruchbah-starmobile", PokemonType.STEEL, PokemonType.FAIRY, 1.8, 240, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true), + new PokemonForm("Caph Starmobile", "caph-starmobile", PokemonType.STEEL, PokemonType.FIGHTING, 1.8, 240, Abilities.STAMINA, Abilities.NONE, Abilities.STAMINA, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true), + ), + new PokemonSpecies(Species.CYCLIZAR, 9, false, false, false, "Mount Pokémon", PokemonType.DRAGON, PokemonType.NORMAL, 1.6, 63, Abilities.SHED_SKIN, Abilities.NONE, Abilities.REGENERATOR, 501, 70, 95, 65, 85, 65, 121, 190, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.ORTHWORM, 9, false, false, false, "Earthworm Pokémon", PokemonType.STEEL, null, 2.5, 310, Abilities.EARTH_EATER, Abilities.NONE, Abilities.SAND_VEIL, 480, 70, 85, 145, 60, 55, 65, 25, 50, 240, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.GLIMMET, 9, false, false, false, "Ore Pokémon", PokemonType.ROCK, PokemonType.POISON, 0.7, 8, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.CORROSION, 350, 48, 35, 42, 105, 60, 60, 70, 50, 70, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GLIMMORA, 9, false, false, false, "Ore Pokémon", PokemonType.ROCK, PokemonType.POISON, 1.5, 45, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.CORROSION, 525, 83, 55, 90, 130, 81, 86, 25, 50, 184, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GREAVARD, 9, false, false, false, "Ghost Dog Pokémon", PokemonType.GHOST, null, 0.6, 35, Abilities.PICKUP, Abilities.NONE, Abilities.FLUFFY, 290, 50, 61, 60, 30, 55, 34, 120, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.HOUNDSTONE, 9, false, false, false, "Ghost Dog Pokémon", PokemonType.GHOST, null, 2, 15, Abilities.SAND_RUSH, Abilities.NONE, Abilities.FLUFFY, 488, 72, 101, 100, 50, 97, 68, 60, 50, 171, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.FLAMIGO, 9, false, false, false, "Synchronize Pokémon", PokemonType.FLYING, PokemonType.FIGHTING, 1.6, 37, Abilities.SCRAPPY, Abilities.TANGLED_FEET, Abilities.COSTAR, 500, 82, 115, 74, 75, 64, 90, 100, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.CETODDLE, 9, false, false, false, "Terra Whale Pokémon", PokemonType.ICE, null, 1.2, 45, Abilities.THICK_FAT, Abilities.SNOW_CLOAK, Abilities.SHEER_FORCE, 334, 108, 68, 45, 30, 40, 43, 150, 50, 67, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.CETITAN, 9, false, false, false, "Terra Whale Pokémon", PokemonType.ICE, null, 4.5, 700, Abilities.THICK_FAT, Abilities.SLUSH_RUSH, Abilities.SHEER_FORCE, 521, 170, 113, 65, 45, 55, 73, 50, 50, 182, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.VELUZA, 9, false, false, false, "Jettison Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 2.5, 90, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHARPNESS, 478, 90, 102, 73, 78, 65, 70, 100, 50, 167, GrowthRate.FAST, 50, false), + new PokemonSpecies(Species.DONDOZO, 9, false, false, false, "Big Catfish Pokémon", PokemonType.WATER, null, 12, 220, Abilities.UNAWARE, Abilities.OBLIVIOUS, Abilities.WATER_VEIL, 530, 150, 100, 115, 65, 65, 35, 25, 50, 265, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.TATSUGIRI, 9, false, false, false, "Mimicry Pokémon", PokemonType.DRAGON, PokemonType.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, GrowthRate.MEDIUM_SLOW, 50, false, false, + new PokemonForm("Curly Form", "curly", PokemonType.DRAGON, PokemonType.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true), + new PokemonForm("Droopy Form", "droopy", PokemonType.DRAGON, PokemonType.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true), + new PokemonForm("Stretchy Form", "stretchy", PokemonType.DRAGON, PokemonType.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true), + ), + new PokemonSpecies(Species.ANNIHILAPE, 9, false, false, false, "Rage Monkey Pokémon", PokemonType.FIGHTING, PokemonType.GHOST, 1.2, 56, Abilities.VITAL_SPIRIT, Abilities.INNER_FOCUS, Abilities.DEFIANT, 535, 110, 115, 80, 50, 90, 90, 45, 50, 268, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.CLODSIRE, 9, false, false, false, "Spiny Fish Pokémon", PokemonType.POISON, PokemonType.GROUND, 1.8, 223, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 430, 130, 75, 60, 45, 100, 20, 90, 50, 151, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.FARIGIRAF, 9, false, false, false, "Long Neck Pokémon", PokemonType.NORMAL, PokemonType.PSYCHIC, 3.2, 160, Abilities.CUD_CHEW, Abilities.ARMOR_TAIL, Abilities.SAP_SIPPER, 520, 120, 90, 70, 110, 70, 60, 45, 50, 260, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.DUDUNSPARCE, 9, false, false, false, "Land Snake Pokémon", PokemonType.NORMAL, null, 3.6, 39.2, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Two-Segment Form", "two-segment", PokemonType.NORMAL, null, 3.6, 39.2, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182, false, ""), + new PokemonForm("Three-Segment Form", "three-segment", PokemonType.NORMAL, null, 4.5, 47.4, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182), + ), + new PokemonSpecies(Species.KINGAMBIT, 9, false, false, false, "Big Blade Pokémon", PokemonType.DARK, PokemonType.STEEL, 2, 120, Abilities.DEFIANT, Abilities.SUPREME_OVERLORD, Abilities.PRESSURE, 550, 100, 135, 120, 60, 85, 50, 25, 50, 275, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GREAT_TUSK, 9, false, false, false, "Paradox Pokémon", PokemonType.GROUND, PokemonType.FIGHTING, 2.2, 320, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 115, 131, 131, 53, 53, 87, 30, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.SCREAM_TAIL, 9, false, false, false, "Paradox Pokémon", PokemonType.FAIRY, PokemonType.PSYCHIC, 1.2, 8, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 115, 65, 99, 65, 115, 111, 50, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.BRUTE_BONNET, 9, false, false, false, "Paradox Pokémon", PokemonType.GRASS, PokemonType.DARK, 1.2, 21, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 111, 127, 99, 79, 99, 55, 50, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.FLUTTER_MANE, 9, false, false, false, "Paradox Pokémon", PokemonType.GHOST, PokemonType.FAIRY, 1.4, 4, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 55, 55, 55, 135, 135, 135, 30, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.SLITHER_WING, 9, false, false, false, "Paradox Pokémon", PokemonType.BUG, PokemonType.FIGHTING, 3.2, 92, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 85, 135, 79, 85, 105, 81, 30, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.SANDY_SHOCKS, 9, false, false, false, "Paradox Pokémon", PokemonType.ELECTRIC, PokemonType.GROUND, 2.3, 60, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 85, 81, 97, 121, 85, 101, 30, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.IRON_TREADS, 9, false, false, false, "Paradox Pokémon", PokemonType.GROUND, PokemonType.STEEL, 0.9, 240, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 90, 112, 120, 72, 70, 106, 30, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.IRON_BUNDLE, 9, false, false, false, "Paradox Pokémon", PokemonType.ICE, PokemonType.WATER, 0.6, 11, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 56, 80, 114, 124, 60, 136, 50, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.IRON_HANDS, 9, false, false, false, "Paradox Pokémon", PokemonType.FIGHTING, PokemonType.ELECTRIC, 1.8, 380.7, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 154, 140, 108, 50, 68, 50, 50, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.IRON_JUGULIS, 9, false, false, false, "Paradox Pokémon", PokemonType.DARK, PokemonType.FLYING, 1.3, 111, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 94, 80, 86, 122, 80, 108, 30, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.IRON_MOTH, 9, false, false, false, "Paradox Pokémon", PokemonType.FIRE, PokemonType.POISON, 1.2, 36, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 80, 70, 60, 140, 110, 110, 30, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.IRON_THORNS, 9, false, false, false, "Paradox Pokémon", PokemonType.ROCK, PokemonType.ELECTRIC, 1.6, 303, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 100, 134, 110, 70, 84, 72, 30, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.FRIGIBAX, 9, false, false, false, "Ice Fin Pokémon", PokemonType.DRAGON, PokemonType.ICE, 0.5, 17, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 320, 65, 75, 45, 35, 45, 55, 45, 50, 64, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.ARCTIBAX, 9, false, false, false, "Ice Fin Pokémon", PokemonType.DRAGON, PokemonType.ICE, 0.8, 30, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 423, 90, 95, 66, 45, 65, 62, 25, 50, 148, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.BAXCALIBUR, 9, false, false, false, "Ice Dragon Pokémon", PokemonType.DRAGON, PokemonType.ICE, 2.1, 210, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 600, 115, 145, 92, 75, 86, 87, 10, 50, 300, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.GIMMIGHOUL, 9, false, false, false, "Coin Chest Pokémon", PokemonType.GHOST, null, 0.3, 5, Abilities.RATTLED, Abilities.NONE, Abilities.NONE, 300, 45, 30, 70, 75, 70, 10, 45, 50, 60, GrowthRate.SLOW, null, false, false, + new PokemonForm("Chest Form", "chest", PokemonType.GHOST, null, 0.3, 5, Abilities.RATTLED, Abilities.NONE, Abilities.NONE, 300, 45, 30, 70, 75, 70, 10, 45, 50, 60, false, "", true), + new PokemonForm("Roaming Form", "roaming", PokemonType.GHOST, null, 0.1, 1, Abilities.RUN_AWAY, Abilities.NONE, Abilities.NONE, 300, 45, 30, 25, 75, 45, 80, 45, 50, 60, false, null, true), + ), + new PokemonSpecies(Species.GHOLDENGO, 9, false, false, false, "Coin Entity Pokémon", PokemonType.STEEL, PokemonType.GHOST, 1.2, 30, Abilities.GOOD_AS_GOLD, Abilities.NONE, Abilities.NONE, 550, 87, 60, 95, 133, 91, 84, 45, 50, 275, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.WO_CHIEN, 9, true, false, false, "Ruinous Pokémon", PokemonType.DARK, PokemonType.GRASS, 1.5, 74.2, Abilities.TABLETS_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 85, 85, 100, 95, 135, 70, 6, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.CHIEN_PAO, 9, true, false, false, "Ruinous Pokémon", PokemonType.DARK, PokemonType.ICE, 1.9, 152.2, Abilities.SWORD_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 80, 120, 80, 90, 65, 135, 6, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.TING_LU, 9, true, false, false, "Ruinous Pokémon", PokemonType.DARK, PokemonType.GROUND, 2.7, 699.7, Abilities.VESSEL_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 155, 110, 125, 55, 80, 45, 6, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.CHI_YU, 9, true, false, false, "Ruinous Pokémon", PokemonType.DARK, PokemonType.FIRE, 0.4, 4.9, Abilities.BEADS_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 55, 80, 80, 135, 120, 100, 6, 0, 285, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.ROARING_MOON, 9, false, false, false, "Paradox Pokémon", PokemonType.DRAGON, PokemonType.DARK, 2, 380, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 105, 139, 71, 55, 101, 119, 10, 0, 295, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.IRON_VALIANT, 9, false, false, false, "Paradox Pokémon", PokemonType.FAIRY, PokemonType.FIGHTING, 1.4, 35, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 74, 130, 90, 120, 60, 116, 10, 0, 295, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.KORAIDON, 9, false, true, false, "Paradox Pokémon", PokemonType.FIGHTING, PokemonType.DRAGON, 2.5, 303, Abilities.ORICHALCUM_PULSE, Abilities.NONE, Abilities.NONE, 670, 100, 135, 115, 85, 100, 135, 3, 0, 335, GrowthRate.SLOW, null, false, false, + new PokemonForm("Apex Build", "apex-build", PokemonType.FIGHTING, PokemonType.DRAGON, 2.5, 303, Abilities.ORICHALCUM_PULSE, Abilities.NONE, Abilities.NONE, 670, 100, 135, 115, 85, 100, 135, 3, 0, 335, false, null, true), + ), + new PokemonSpecies(Species.MIRAIDON, 9, false, true, false, "Paradox Pokémon", PokemonType.ELECTRIC, PokemonType.DRAGON, 3.5, 240, Abilities.HADRON_ENGINE, Abilities.NONE, Abilities.NONE, 670, 100, 85, 100, 135, 115, 135, 3, 0, 335, GrowthRate.SLOW, null, false, false, + new PokemonForm("Ultimate Mode", "ultimate-mode", PokemonType.ELECTRIC, PokemonType.DRAGON, 3.5, 240, Abilities.HADRON_ENGINE, Abilities.NONE, Abilities.NONE, 670, 100, 85, 100, 135, 115, 135, 3, 0, 335, false, null, true), + ), + new PokemonSpecies(Species.WALKING_WAKE, 9, false, false, false, "Paradox Pokémon", PokemonType.WATER, PokemonType.DRAGON, 3.5, 280, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 99, 83, 91, 125, 83, 109, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Gouging Fire and Raging Bolt + new PokemonSpecies(Species.IRON_LEAVES, 9, false, false, false, "Paradox Pokémon", PokemonType.GRASS, PokemonType.PSYCHIC, 1.5, 125, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 130, 88, 70, 108, 104, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Iron Boulder and Iron Crown + new PokemonSpecies(Species.DIPPLIN, 9, false, false, false, "Candy Apple Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 9.7, Abilities.SUPERSWEET_SYRUP, Abilities.GLUTTONY, Abilities.STICKY_HOLD, 485, 80, 80, 110, 95, 80, 40, 45, 50, 170, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.POLTCHAGEIST, 9, false, false, false, "Matcha Pokémon", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.SLOW, null, false, false, + new PokemonForm("Counterfeit Form", "counterfeit", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, true), + new PokemonForm("Artisan Form", "artisan", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, true), + ), + new PokemonSpecies(Species.SINISTCHA, 9, false, false, false, "Matcha Pokémon", PokemonType.GRASS, PokemonType.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178, GrowthRate.SLOW, null, false, false, + new PokemonForm("Unremarkable Form", "unremarkable", PokemonType.GRASS, PokemonType.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178), + new PokemonForm("Masterpiece Form", "masterpiece", PokemonType.GRASS, PokemonType.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178), + ), + new PokemonSpecies(Species.OKIDOGI, 9, true, false, false, "Retainer Pokémon", PokemonType.POISON, PokemonType.FIGHTING, 1.8, 92.2, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.GUARD_DOG, 555, 88, 128, 115, 58, 86, 80, 3, 0, 276, GrowthRate.SLOW, 100, false), + new PokemonSpecies(Species.MUNKIDORI, 9, true, false, false, "Retainer Pokémon", PokemonType.POISON, PokemonType.PSYCHIC, 1, 12.2, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.FRISK, 555, 88, 75, 66, 130, 90, 106, 3, 0, 276, GrowthRate.SLOW, 100, false), + new PokemonSpecies(Species.FEZANDIPITI, 9, true, false, false, "Retainer Pokémon", PokemonType.POISON, PokemonType.FAIRY, 1.4, 30.1, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.TECHNICIAN, 555, 88, 91, 82, 70, 125, 99, 3, 0, 276, GrowthRate.SLOW, 100, false), + new PokemonSpecies(Species.OGERPON, 9, true, false, false, "Mask Pokémon", PokemonType.GRASS, null, 1.2, 39.8, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275, GrowthRate.SLOW, 0, false, false, + new PokemonForm("Teal Mask", "teal-mask", PokemonType.GRASS, null, 1.2, 39.8, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275, false, null, true), + new PokemonForm("Wellspring Mask", "wellspring-mask", PokemonType.GRASS, PokemonType.WATER, 1.2, 39.8, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), + new PokemonForm("Hearthflame Mask", "hearthflame-mask", PokemonType.GRASS, PokemonType.FIRE, 1.2, 39.8, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), + new PokemonForm("Cornerstone Mask", "cornerstone-mask", PokemonType.GRASS, PokemonType.ROCK, 1.2, 39.8, Abilities.STURDY, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), + new PokemonForm("Teal Mask Terastallized", "teal-mask-tera", PokemonType.GRASS, null, 1.2, 39.8, Abilities.EMBODY_ASPECT_TEAL, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), + new PokemonForm("Wellspring Mask Terastallized", "wellspring-mask-tera", PokemonType.GRASS, PokemonType.WATER, 1.2, 39.8, Abilities.EMBODY_ASPECT_WELLSPRING, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), + new PokemonForm("Hearthflame Mask Terastallized", "hearthflame-mask-tera", PokemonType.GRASS, PokemonType.FIRE, 1.2, 39.8, Abilities.EMBODY_ASPECT_HEARTHFLAME, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), + new PokemonForm("Cornerstone Mask Terastallized", "cornerstone-mask-tera", PokemonType.GRASS, PokemonType.ROCK, 1.2, 39.8, Abilities.EMBODY_ASPECT_CORNERSTONE, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275), + ), + new PokemonSpecies(Species.ARCHALUDON, 9, false, false, false, "Alloy Pokémon", PokemonType.STEEL, PokemonType.DRAGON, 2, 60, Abilities.STAMINA, Abilities.STURDY, Abilities.STALWART, 600, 90, 105, 130, 125, 65, 85, 10, 50, 300, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.HYDRAPPLE, 9, false, false, false, "Apple Hydra Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 1.8, 93, Abilities.SUPERSWEET_SYRUP, Abilities.REGENERATOR, Abilities.STICKY_HOLD, 540, 106, 80, 110, 120, 80, 44, 10, 50, 270, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.GOUGING_FIRE, 9, false, false, false, "Paradox Pokémon", PokemonType.FIRE, PokemonType.DRAGON, 3.5, 590, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 105, 115, 121, 65, 93, 91, 10, 0, 295, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.RAGING_BOLT, 9, false, false, false, "Paradox Pokémon", PokemonType.ELECTRIC, PokemonType.DRAGON, 5.2, 480, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 125, 73, 91, 137, 89, 75, 10, 0, 295, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.IRON_BOULDER, 9, false, false, false, "Paradox Pokémon", PokemonType.ROCK, PokemonType.PSYCHIC, 1.5, 162.5, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 120, 80, 68, 108, 124, 10, 0, 295, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.IRON_CROWN, 9, false, false, false, "Paradox Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 1.6, 156, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 72, 100, 122, 108, 98, 10, 0, 295, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.TERAPAGOS, 9, false, true, false, "Tera Pokémon", PokemonType.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, 90, GrowthRate.SLOW, 50, false, false, + new PokemonForm("Normal Form", "", PokemonType.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, 90, false, null, true), + new PokemonForm("Terastal Form", "terastal", PokemonType.NORMAL, null, 0.3, 16, Abilities.TERA_SHELL, Abilities.NONE, Abilities.NONE, 600, 95, 95, 110, 105, 110, 85, 5, 50, 120), + new PokemonForm("Stellar Form", "stellar", PokemonType.NORMAL, null, 1.7, 77, Abilities.TERAFORM_ZERO, Abilities.NONE, Abilities.NONE, 700, 160, 105, 110, 130, 110, 85, 5, 50, 140), + ), + new PokemonSpecies(Species.PECHARUNT, 9, false, false, true, "Subjugation Pokémon", PokemonType.POISON, PokemonType.GHOST, 0.3, 0.3, Abilities.POISON_PUPPETEER, Abilities.NONE, Abilities.NONE, 600, 88, 88, 160, 88, 88, 88, 3, 0, 300, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.ALOLA_RATTATA, 7, false, false, false, "Mouse Pokémon", PokemonType.DARK, PokemonType.NORMAL, 0.3, 3.8, Abilities.GLUTTONY, Abilities.HUSTLE, Abilities.THICK_FAT, 253, 30, 56, 35, 25, 35, 72, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_RATICATE, 7, false, false, false, "Mouse Pokémon", PokemonType.DARK, PokemonType.NORMAL, 0.7, 25.5, Abilities.GLUTTONY, Abilities.HUSTLE, Abilities.THICK_FAT, 413, 75, 71, 70, 40, 80, 77, 127, 70, 145, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_RAICHU, 7, false, false, false, "Mouse Pokémon", PokemonType.ELECTRIC, PokemonType.PSYCHIC, 0.7, 21, Abilities.SURGE_SURFER, Abilities.NONE, Abilities.NONE, 485, 60, 85, 50, 95, 85, 110, 75, 50, 243, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_SANDSHREW, 7, false, false, false, "Mouse Pokémon", PokemonType.ICE, PokemonType.STEEL, 0.7, 40, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SLUSH_RUSH, 300, 50, 75, 90, 10, 35, 40, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_SANDSLASH, 7, false, false, false, "Mouse Pokémon", PokemonType.ICE, PokemonType.STEEL, 1.2, 55, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SLUSH_RUSH, 450, 75, 100, 120, 25, 65, 65, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_VULPIX, 7, false, false, false, "Fox Pokémon", PokemonType.ICE, null, 0.6, 9.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SNOW_WARNING, 299, 38, 41, 40, 50, 65, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 25, false), + new PokemonSpecies(Species.ALOLA_NINETALES, 7, false, false, false, "Fox Pokémon", PokemonType.ICE, PokemonType.FAIRY, 1.1, 19.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SNOW_WARNING, 505, 73, 67, 75, 81, 100, 109, 75, 50, 177, GrowthRate.MEDIUM_FAST, 25, false), + new PokemonSpecies(Species.ALOLA_DIGLETT, 7, false, false, false, "Mole Pokémon", PokemonType.GROUND, PokemonType.STEEL, 0.2, 1, Abilities.SAND_VEIL, Abilities.TANGLING_HAIR, Abilities.SAND_FORCE, 265, 10, 55, 30, 35, 45, 90, 255, 50, 53, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_DUGTRIO, 7, false, false, false, "Mole Pokémon", PokemonType.GROUND, PokemonType.STEEL, 0.7, 66.6, Abilities.SAND_VEIL, Abilities.TANGLING_HAIR, Abilities.SAND_FORCE, 425, 35, 100, 60, 50, 70, 110, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_MEOWTH, 7, false, false, false, "Scratch Cat Pokémon", PokemonType.DARK, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.RATTLED, 290, 40, 35, 35, 50, 40, 90, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_PERSIAN, 7, false, false, false, "Classy Cat Pokémon", PokemonType.DARK, null, 1.1, 33, Abilities.FUR_COAT, Abilities.TECHNICIAN, Abilities.RATTLED, 440, 65, 60, 60, 75, 65, 115, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_GEODUDE, 7, false, false, false, "Rock Pokémon", PokemonType.ROCK, PokemonType.ELECTRIC, 0.4, 20.3, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 300, 40, 80, 100, 30, 30, 20, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.ALOLA_GRAVELER, 7, false, false, false, "Rock Pokémon", PokemonType.ROCK, PokemonType.ELECTRIC, 1, 110, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 390, 55, 95, 115, 45, 45, 35, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.ALOLA_GOLEM, 7, false, false, false, "Megaton Pokémon", PokemonType.ROCK, PokemonType.ELECTRIC, 1.7, 316, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 495, 80, 120, 130, 55, 65, 45, 45, 70, 223, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.ALOLA_GRIMER, 7, false, false, false, "Sludge Pokémon", PokemonType.POISON, PokemonType.DARK, 0.7, 42, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 325, 80, 80, 50, 40, 50, 25, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_MUK, 7, false, false, false, "Sludge Pokémon", PokemonType.POISON, PokemonType.DARK, 1, 52, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ALOLA_EXEGGUTOR, 7, false, false, false, "Coconut Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 10.9, 415.6, Abilities.FRISK, Abilities.NONE, Abilities.HARVEST, 530, 95, 105, 85, 125, 75, 45, 45, 50, 186, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.ALOLA_MAROWAK, 7, false, false, false, "Bone Keeper Pokémon", PokemonType.FIRE, PokemonType.GHOST, 1, 34, Abilities.CURSED_BODY, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ETERNAL_FLOETTE, 6, true, false, false, "Single Bloom Pokémon", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 551, 74, 65, 67, 125, 128, 92, 120, 70, 243, GrowthRate.MEDIUM_FAST, 0, false), //Marked as Sub-Legend, for casing purposes + new PokemonSpecies(Species.GALAR_MEOWTH, 8, false, false, false, "Scratch Cat Pokémon", PokemonType.STEEL, null, 0.4, 7.5, Abilities.PICKUP, Abilities.TOUGH_CLAWS, Abilities.UNNERVE, 290, 50, 65, 55, 40, 40, 40, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_PONYTA, 8, false, false, false, "Fire Horse Pokémon", PokemonType.PSYCHIC, null, 0.8, 24, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_RAPIDASH, 8, false, false, false, "Fire Horse Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 1.7, 80, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_SLOWPOKE, 8, false, false, false, "Dopey Pokémon", PokemonType.PSYCHIC, null, 1.2, 36, Abilities.GLUTTONY, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 315, 90, 65, 65, 40, 40, 15, 190, 50, 63, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_SLOWBRO, 8, false, false, false, "Hermit Crab Pokémon", PokemonType.POISON, PokemonType.PSYCHIC, 1.6, 70.5, Abilities.QUICK_DRAW, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 100, 95, 100, 70, 30, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_FARFETCHD, 8, false, false, false, "Wild Duck Pokémon", PokemonType.FIGHTING, null, 0.8, 42, Abilities.STEADFAST, Abilities.NONE, Abilities.SCRAPPY, 377, 52, 95, 55, 58, 62, 55, 45, 50, 132, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_WEEZING, 8, false, false, false, "Poison Gas Pokémon", PokemonType.POISON, PokemonType.FAIRY, 3, 16, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.MISTY_SURGE, 490, 65, 90, 120, 85, 70, 60, 60, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_MR_MIME, 8, false, false, false, "Barrier Pokémon", PokemonType.ICE, PokemonType.PSYCHIC, 1.4, 56.8, Abilities.VITAL_SPIRIT, Abilities.SCREEN_CLEANER, Abilities.ICE_BODY, 460, 50, 65, 65, 90, 90, 100, 45, 50, 161, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_ARTICUNO, 8, true, false, false, "Freeze Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 1.7, 50.9, Abilities.COMPETITIVE, Abilities.NONE, Abilities.NONE, 580, 90, 85, 85, 125, 100, 95, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.GALAR_ZAPDOS, 8, true, false, false, "Electric Pokémon", PokemonType.FIGHTING, PokemonType.FLYING, 1.6, 58.2, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 580, 90, 125, 90, 85, 90, 100, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.GALAR_MOLTRES, 8, true, false, false, "Flame Pokémon", PokemonType.DARK, PokemonType.FLYING, 2, 66, Abilities.BERSERK, Abilities.NONE, Abilities.NONE, 580, 90, 85, 90, 100, 125, 90, 3, 35, 290, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.GALAR_SLOWKING, 8, false, false, false, "Royal Pokémon", PokemonType.POISON, PokemonType.PSYCHIC, 1.8, 79.5, Abilities.CURIOUS_MEDICINE, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 65, 80, 110, 110, 30, 70, 50, 172, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_CORSOLA, 8, false, false, false, "Coral Pokémon", PokemonType.GHOST, null, 0.6, 0.5, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 410, 60, 55, 100, 65, 100, 30, 60, 50, 144, GrowthRate.FAST, 25, false), + new PokemonSpecies(Species.GALAR_ZIGZAGOON, 8, false, false, false, "Tiny Raccoon Pokémon", PokemonType.DARK, PokemonType.NORMAL, 0.4, 17.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 240, 38, 30, 41, 30, 41, 60, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_LINOONE, 8, false, false, false, "Rushing Pokémon", PokemonType.DARK, PokemonType.NORMAL, 0.5, 32.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 420, 78, 70, 61, 50, 61, 100, 90, 50, 147, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_DARUMAKA, 8, false, false, false, "Zen Charm Pokémon", PokemonType.ICE, null, 0.7, 40, Abilities.HUSTLE, Abilities.NONE, Abilities.INNER_FOCUS, 315, 70, 90, 45, 15, 45, 50, 120, 50, 63, GrowthRate.MEDIUM_SLOW, 50, false), + new PokemonSpecies(Species.GALAR_DARMANITAN, 8, false, false, false, "Blazing Pokémon", PokemonType.ICE, null, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false, true, + new PokemonForm("Standard Mode", "", PokemonType.ICE, null, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, false, null, true), + new PokemonForm("Zen Mode", "zen", PokemonType.ICE, PokemonType.FIRE, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 540, 105, 160, 55, 30, 55, 135, 60, 50, 189), + ), + new PokemonSpecies(Species.GALAR_YAMASK, 8, false, false, false, "Spirit Pokémon", PokemonType.GROUND, PokemonType.GHOST, 0.5, 1.5, Abilities.WANDERING_SPIRIT, Abilities.NONE, Abilities.NONE, 303, 38, 55, 85, 30, 65, 30, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.GALAR_STUNFISK, 8, false, false, false, "Trap Pokémon", PokemonType.GROUND, PokemonType.STEEL, 0.7, 20.5, Abilities.MIMICRY, Abilities.NONE, Abilities.NONE, 471, 109, 81, 99, 66, 84, 32, 75, 70, 165, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.HISUI_GROWLITHE, 8, false, false, false, "Puppy Pokémon", PokemonType.FIRE, PokemonType.ROCK, 0.8, 22.7, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.ROCK_HEAD, 350, 60, 75, 45, 65, 50, 55, 190, 50, 70, GrowthRate.SLOW, 75, false), + new PokemonSpecies(Species.HISUI_ARCANINE, 8, false, false, false, "Legendary Pokémon", PokemonType.FIRE, PokemonType.ROCK, 2, 168, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.ROCK_HEAD, 555, 95, 115, 80, 95, 80, 90, 85, 50, 194, GrowthRate.SLOW, 75, false), + new PokemonSpecies(Species.HISUI_VOLTORB, 8, false, false, false, "Ball Pokémon", PokemonType.ELECTRIC, PokemonType.GRASS, 0.5, 13, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 330, 40, 30, 50, 55, 55, 100, 190, 80, 66, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.HISUI_ELECTRODE, 8, false, false, false, "Ball Pokémon", PokemonType.ELECTRIC, PokemonType.GRASS, 1.2, 81, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 490, 60, 50, 70, 80, 80, 150, 60, 70, 172, GrowthRate.MEDIUM_FAST, null, false), + new PokemonSpecies(Species.HISUI_TYPHLOSION, 8, false, false, false, "Volcano Pokémon", PokemonType.FIRE, PokemonType.GHOST, 1.6, 69.8, Abilities.BLAZE, Abilities.NONE, Abilities.FRISK, 534, 73, 84, 78, 119, 85, 95, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.HISUI_QWILFISH, 8, false, false, false, "Balloon Pokémon", PokemonType.DARK, PokemonType.POISON, 0.5, 3.9, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 440, 65, 95, 85, 55, 55, 85, 45, 50, 88, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.HISUI_SNEASEL, 8, false, false, false, "Sharp Claw Pokémon", PokemonType.FIGHTING, PokemonType.POISON, 0.9, 27, Abilities.INNER_FOCUS, Abilities.KEEN_EYE, Abilities.PICKPOCKET, 430, 55, 95, 55, 35, 75, 115, 60, 35, 86, GrowthRate.MEDIUM_SLOW, 50, true), + new PokemonSpecies(Species.HISUI_SAMUROTT, 8, false, false, false, "Formidable Pokémon", PokemonType.WATER, PokemonType.DARK, 1.5, 58.2, Abilities.TORRENT, Abilities.NONE, Abilities.SHARPNESS, 528, 90, 108, 80, 100, 65, 85, 45, 80, 238, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.HISUI_LILLIGANT, 8, false, false, false, "Flowering Pokémon", PokemonType.GRASS, PokemonType.FIGHTING, 1.2, 19.2, Abilities.CHLOROPHYLL, Abilities.HUSTLE, Abilities.LEAF_GUARD, 480, 70, 105, 75, 50, 75, 105, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false), + new PokemonSpecies(Species.HISUI_ZORUA, 8, false, false, false, "Tricky Fox Pokémon", PokemonType.NORMAL, PokemonType.GHOST, 0.7, 12.5, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 330, 35, 60, 40, 85, 40, 70, 75, 50, 66, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.HISUI_ZOROARK, 8, false, false, false, "Illusion Fox Pokémon", PokemonType.NORMAL, PokemonType.GHOST, 1.6, 83, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 510, 55, 100, 60, 125, 60, 110, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.HISUI_BRAVIARY, 8, false, false, false, "Valiant Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 1.7, 43.4, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.TINTED_LENS, 510, 110, 83, 70, 112, 70, 65, 60, 50, 179, GrowthRate.SLOW, 100, false), + new PokemonSpecies(Species.HISUI_SLIGGOO, 8, false, false, false, "Soft Tissue Pokémon", PokemonType.STEEL, PokemonType.DRAGON, 0.7, 68.5, Abilities.SAP_SIPPER, Abilities.SHELL_ARMOR, Abilities.GOOEY, 452, 58, 75, 83, 83, 113, 40, 45, 35, 158, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.HISUI_GOODRA, 8, false, false, false, "Dragon Pokémon", PokemonType.STEEL, PokemonType.DRAGON, 1.7, 334.1, Abilities.SAP_SIPPER, Abilities.SHELL_ARMOR, Abilities.GOOEY, 600, 80, 100, 100, 110, 150, 60, 45, 35, 270, GrowthRate.SLOW, 50, false), + new PokemonSpecies(Species.HISUI_AVALUGG, 8, false, false, false, "Iceberg Pokémon", PokemonType.ICE, PokemonType.ROCK, 1.4, 262.4, Abilities.STRONG_JAW, Abilities.ICE_BODY, Abilities.STURDY, 514, 95, 127, 184, 34, 36, 38, 55, 50, 180, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.HISUI_DECIDUEYE, 8, false, false, false, "Arrow Quill Pokémon", PokemonType.GRASS, PokemonType.FIGHTING, 1.6, 37, Abilities.OVERGROW, Abilities.NONE, Abilities.SCRAPPY, 530, 88, 112, 80, 95, 95, 60, 45, 50, 239, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.PALDEA_TAUROS, 9, false, false, false, "Wild Bull Pokémon", PokemonType.FIGHTING, null, 1.4, 115, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, GrowthRate.SLOW, 100, false, false, + new PokemonForm("Combat Breed", "combat", PokemonType.FIGHTING, null, 1.4, 115, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, "", true), + new PokemonForm("Blaze Breed", "blaze", PokemonType.FIGHTING, PokemonType.FIRE, 1.4, 85, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, null, true), + new PokemonForm("Aqua Breed", "aqua", PokemonType.FIGHTING, PokemonType.WATER, 1.4, 110, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, null, true), + ), + new PokemonSpecies(Species.PALDEA_WOOPER, 9, false, false, false, "Water Fish Pokémon", PokemonType.POISON, PokemonType.GROUND, 0.4, 11, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.BLOODMOON_URSALUNA, 9, true, false, false, "Peat Pokémon", PokemonType.GROUND, PokemonType.NORMAL, 2.7, 333, Abilities.MINDS_EYE, Abilities.NONE, Abilities.NONE, 555, 113, 70, 120, 135, 65, 52, 75, 50, 278, GrowthRate.MEDIUM_FAST, 50, false), //Marked as Sub-Legend, for casing purposes ); } - -// TODO: Remove -{ - //setTimeout(() => { - /*for (let tc of Object.keys(trainerConfigs)) { - console.log(TrainerType[tc], !trainerConfigs[tc].speciesFilter ? 'all' : [...new Set(allSpecies.filter(s => s.generation <= 9).filter(trainerConfigs[tc].speciesFilter).map(s => { - while (pokemonPrevolutions.hasOwnProperty(s.speciesId)) - s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]); - return s; - }))].map(s => s.name)); - } - - const speciesFilter = (species: PokemonSpecies) => !species.legendary && !species.pseudoLegendary && !species.mythical && species.baseTotal >= 540; - console.log(!speciesFilter ? 'all' : [...new Set(allSpecies.filter(s => s.generation <= 9).filter(speciesFilter).map(s => { - while (pokemonPrevolutions.hasOwnProperty(s.speciesId)) - s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]); - return s; - }))].map(s => s.name));*/ - //}, 1000); -} diff --git a/src/data/splash-messages.ts b/src/data/splash-messages.ts index 1f00ce0d555..9fd71d9d95b 100644 --- a/src/data/splash-messages.ts +++ b/src/data/splash-messages.ts @@ -185,26 +185,38 @@ const seasonalSplashMessages: Season[] = [ name: "Halloween", start: "09-15", end: "10-31", - messages: [ "halloween.pumpkabooAbout", "halloween.mayContainSpiders", "halloween.spookyScarySkeledirge", "halloween.gourgeistUsedTrickOrTreat", "halloween.letsSnuggleForever" ], + messages: [ + "halloween.pumpkabooAbout", + "halloween.mayContainSpiders", + "halloween.spookyScarySkeledirge", + "halloween.gourgeistUsedTrickOrTreat", + "halloween.letsSnuggleForever", + ], }, { name: "XMAS", start: "12-01", end: "12-26", - messages: [ "xmas.happyHolidays", "xmas.unaffilicatedWithDelibirdServices", "xmas.delibirdSeason", "xmas.diamondsFromTheSky", "xmas.holidayStylePikachuNotIncluded" ], + messages: [ + "xmas.happyHolidays", + "xmas.unaffilicatedWithDelibirdServices", + "xmas.delibirdSeason", + "xmas.diamondsFromTheSky", + "xmas.holidayStylePikachuNotIncluded", + ], }, { name: "New Year's", start: "01-01", end: "01-31", - messages: [ "newYears.happyNewYear" ], + messages: ["newYears.happyNewYear"], }, ]; //#endregion export function getSplashMessages(): string[] { - const splashMessages: string[] = [ ...commonSplashMessages ]; + const splashMessages: string[] = [...commonSplashMessages]; console.log("use seasonal splash messages", USE_SEASONAL_SPLASH_MESSAGES); if (USE_SEASONAL_SPLASH_MESSAGES) { // add seasonal splash messages if the season is active @@ -215,13 +227,13 @@ export function getSplashMessages(): string[] { if (now >= startDate && now <= endDate) { console.log(`Adding ${messages.length} ${name} splash messages (weight: x${SEASONAL_WEIGHT_MULTIPLIER})`); - messages.forEach((message) => { + for (const message of messages) { const weightedMessage = Array(SEASONAL_WEIGHT_MULTIPLIER).fill(message); splashMessages.push(...weightedMessage); - }); + } } } } - return splashMessages.map((message) => `splashMessages:${message}`); + return splashMessages.map(message => `splashMessages:${message}`); } diff --git a/src/data/status-effect.ts b/src/data/status-effect.ts index 35a956cbb93..fe4fa380d46 100644 --- a/src/data/status-effect.ts +++ b/src/data/status-effect.ts @@ -6,10 +6,10 @@ import i18next from "i18next"; export class Status { public effect: StatusEffect; /** Toxic damage is `1/16 max HP * toxicTurnCount` */ - public toxicTurnCount: number = 0; + public toxicTurnCount = 0; public sleepTurnsRemaining?: number; - constructor(effect: StatusEffect, toxicTurnCount: number = 0, sleepTurnsRemaining?: number) { + constructor(effect: StatusEffect, toxicTurnCount = 0, sleepTurnsRemaining?: number) { this.effect = effect; this.toxicTurnCount = toxicTurnCount; this.sleepTurnsRemaining = sleepTurnsRemaining; @@ -23,7 +23,9 @@ export class Status { } isPostTurn(): boolean { - return this.effect === StatusEffect.POISON || this.effect === StatusEffect.TOXIC || this.effect === StatusEffect.BURN; + return ( + this.effect === StatusEffect.POISON || this.effect === StatusEffect.TOXIC || this.effect === StatusEffect.BURN + ); } } @@ -46,17 +48,24 @@ function getStatusEffectMessageKey(statusEffect: StatusEffect | undefined): stri } } -export function getStatusEffectObtainText(statusEffect: StatusEffect | undefined, pokemonNameWithAffix: string, sourceText?: string): string { +export function getStatusEffectObtainText( + statusEffect: StatusEffect | undefined, + pokemonNameWithAffix: string, + sourceText?: string, +): string { if (statusEffect === StatusEffect.NONE) { return ""; } if (!sourceText) { - const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtain`as ParseKeys; + const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtain` as ParseKeys; return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix }); } - const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtainSource`as ParseKeys; - return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix, sourceText: sourceText }); + const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtainSource` as ParseKeys; + return i18next.t(i18nKey, { + pokemonNameWithAffix: pokemonNameWithAffix, + sourceText: sourceText, + }); } export function getStatusEffectActivationText(statusEffect: StatusEffect, pokemonNameWithAffix: string): string { @@ -107,17 +116,17 @@ export function getStatusEffectCatchRateMultiplier(statusEffect: StatusEffect): } /** -* Returns a random non-volatile StatusEffect -*/ + * Returns a random non-volatile StatusEffect + */ export function generateRandomStatusEffect(): StatusEffect { return randIntRange(1, 6); } /** -* Returns a random non-volatile StatusEffect between the two provided -* @param statusEffectA The first StatusEffect -* @param statusEffectA The second StatusEffect -*/ + * Returns a random non-volatile StatusEffect between the two provided + * @param statusEffectA The first StatusEffect + * @param statusEffectA The second StatusEffect + */ export function getRandomStatusEffect(statusEffectA: StatusEffect, statusEffectB: StatusEffect): StatusEffect { if (statusEffectA === StatusEffect.NONE || statusEffectA === StatusEffect.FAINT) { return statusEffectB; @@ -130,10 +139,10 @@ export function getRandomStatusEffect(statusEffectA: StatusEffect, statusEffectB } /** -* Returns a random non-volatile StatusEffect between the two provided -* @param statusA The first Status -* @param statusB The second Status -*/ + * Returns a random non-volatile StatusEffect between the two provided + * @param statusA The first Status + * @param statusB The second Status + */ export function getRandomStatus(statusA: Status | null, statusB: Status | null): Status | null { if (!statusA || statusA.effect === StatusEffect.NONE || statusA.effect === StatusEffect.FAINT) { return statusB; @@ -142,7 +151,6 @@ export function getRandomStatus(statusA: Status | null, statusB: Status | null): return statusA; } - return randIntRange(0, 2) ? statusA : statusB; } @@ -150,14 +158,14 @@ export function getRandomStatus(statusA: Status | null, statusB: Status | null): * Gets all non volatile status effects * @returns A list containing all non volatile status effects */ -export function getNonVolatileStatusEffects():Array { +export function getNonVolatileStatusEffects(): Array { return [ StatusEffect.POISON, StatusEffect.TOXIC, StatusEffect.PARALYSIS, StatusEffect.SLEEP, StatusEffect.FREEZE, - StatusEffect.BURN + StatusEffect.BURN, ]; } diff --git a/src/data/terrain.ts b/src/data/terrain.ts index da315a14a86..894fb8a7955 100644 --- a/src/data/terrain.ts +++ b/src/data/terrain.ts @@ -1,7 +1,7 @@ import type Pokemon from "../field/pokemon"; -import type Move from "./move"; -import { Type } from "#enums/type"; -import { ProtectAttr } from "./move"; +import type Move from "./moves/move"; +import { PokemonType } from "#enums/pokemon-type"; +import { ProtectAttr } from "./moves/move"; import type { BattlerIndex } from "#app/battle"; import i18next from "i18next"; @@ -10,14 +10,14 @@ export enum TerrainType { MISTY, ELECTRIC, GRASSY, - PSYCHIC + PSYCHIC, } export class Terrain { public terrainType: TerrainType; - public turnsLeft: integer; + public turnsLeft: number; - constructor(terrainType: TerrainType, turnsLeft?: integer) { + constructor(terrainType: TerrainType, turnsLeft?: number) { this.terrainType = terrainType; this.turnsLeft = turnsLeft || 0; } @@ -30,20 +30,20 @@ export class Terrain { return true; } - getAttackTypeMultiplier(attackType: Type): number { + getAttackTypeMultiplier(attackType: PokemonType): number { switch (this.terrainType) { case TerrainType.ELECTRIC: - if (attackType === Type.ELECTRIC) { + if (attackType === PokemonType.ELECTRIC) { return 1.3; } break; case TerrainType.GRASSY: - if (attackType === Type.GRASS) { + if (attackType === PokemonType.GRASS) { return 1.3; } break; case TerrainType.PSYCHIC: - if (attackType === Type.PSYCHIC) { + if (attackType === PokemonType.PSYCHIC) { return 1.3; } break; @@ -57,7 +57,10 @@ export class Terrain { case TerrainType.PSYCHIC: if (!move.hasAttr(ProtectAttr)) { // Cancels move if the move has positive priority and targets a Pokemon grounded on the Psychic Terrain - return move.getPriority(user) > 0 && user.getOpponents().some(o => targets.includes(o.getBattlerIndex()) && o.isGrounded()); + return ( + move.getPriority(user) > 0 && + user.getOpponents().some(o => targets.includes(o.getBattlerIndex()) && o.isGrounded()) + ); } } @@ -80,18 +83,17 @@ export function getTerrainName(terrainType: TerrainType): string { return ""; } - -export function getTerrainColor(terrainType: TerrainType): [ integer, integer, integer ] { +export function getTerrainColor(terrainType: TerrainType): [number, number, number] { switch (terrainType) { case TerrainType.MISTY: - return [ 232, 136, 200 ]; + return [232, 136, 200]; case TerrainType.ELECTRIC: - return [ 248, 248, 120 ]; + return [248, 248, 120]; case TerrainType.GRASSY: - return [ 120, 200, 80 ]; + return [120, 200, 80]; case TerrainType.PSYCHIC: - return [ 160, 64, 160 ]; + return [160, 64, 160]; } - return [ 0, 0, 0 ]; + return [0, 0, 0]; } diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index 590a8688428..3884aa05b13 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -11,7 +11,7 @@ import type { PokemonSpeciesFilter } from "#app/data/pokemon-species"; import type PokemonSpecies from "#app/data/pokemon-species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { tmSpecies } from "#app/data/balance/tms"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { doubleBattleDialogue } from "#app/data/dialogue"; import type { PersistentModifier } from "#app/modifier/modifier"; import { TrainerVariant } from "#app/field/trainer"; @@ -22,50 +22,54 @@ import { PartyMemberStrength } from "#enums/party-member-strength"; import { Species } from "#enums/species"; import { TrainerType } from "#enums/trainer-type"; import { Gender } from "#app/data/gender"; +import { signatureSpecies } from "./balance/signature-species"; /** Minimum BST for Pokemon generated onto the Elite Four's teams */ const ELITE_FOUR_MINIMUM_BST = 460; +/** The wave at which (non-Paldean) Gym Leaders start having Tera mons*/ +const GYM_LEADER_TERA_WAVE = 100; + export enum TrainerPoolTier { - COMMON, - UNCOMMON, - RARE, - SUPER_RARE, - ULTRA_RARE + COMMON, + UNCOMMON, + RARE, + SUPER_RARE, + ULTRA_RARE, } export interface TrainerTierPools { - [key: integer]: Species[] + [key: number]: Species[]; } export enum TrainerSlot { - NONE, - TRAINER, - TRAINER_PARTNER + NONE, + TRAINER, + TRAINER_PARTNER, } export class TrainerPartyTemplate { - public size: integer; + public size: number; public strength: PartyMemberStrength; public sameSpecies: boolean; public balanced: boolean; - constructor(size: integer, strength: PartyMemberStrength, sameSpecies?: boolean, balanced?: boolean) { + constructor(size: number, strength: PartyMemberStrength, sameSpecies?: boolean, balanced?: boolean) { this.size = size; this.strength = strength; this.sameSpecies = !!sameSpecies; this.balanced = !!balanced; } - getStrength(index: integer): PartyMemberStrength { + getStrength(_index: number): PartyMemberStrength { return this.strength; } - isSameSpecies(index: integer): boolean { + isSameSpecies(_index: number): boolean { return this.sameSpecies; } - isBalanced(index: integer): boolean { + isBalanced(_index: number): boolean { return this.balanced; } } @@ -74,14 +78,17 @@ export class TrainerPartyCompoundTemplate extends TrainerPartyTemplate { public templates: TrainerPartyTemplate[]; constructor(...templates: TrainerPartyTemplate[]) { - super(templates.reduce((total: integer, template: TrainerPartyTemplate) => { - total += template.size; - return total; - }, 0), PartyMemberStrength.AVERAGE); + super( + templates.reduce((total: number, template: TrainerPartyTemplate) => { + total += template.size; + return total; + }, 0), + PartyMemberStrength.AVERAGE, + ); this.templates = templates; } - getStrength(index: integer): PartyMemberStrength { + getStrength(index: number): PartyMemberStrength { let t = 0; for (const template of this.templates) { if (t + template.size > index) { @@ -93,7 +100,7 @@ export class TrainerPartyCompoundTemplate extends TrainerPartyTemplate { return super.getStrength(index); } - isSameSpecies(index: integer): boolean { + isSameSpecies(index: number): boolean { let t = 0; for (const template of this.templates) { if (t + template.size > index) { @@ -105,7 +112,7 @@ export class TrainerPartyCompoundTemplate extends TrainerPartyTemplate { return super.isSameSpecies(index); } - isBalanced(index: integer): boolean { + isBalanced(index: number): boolean { let t = 0; for (const template of this.templates) { if (t + template.size > index) { @@ -119,22 +126,52 @@ export class TrainerPartyCompoundTemplate extends TrainerPartyTemplate { } export const trainerPartyTemplates = { - ONE_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.WEAK), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)), + ONE_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.WEAK), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + ), ONE_AVG: new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), - ONE_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)), + ONE_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + ), ONE_STRONG: new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), ONE_STRONGER: new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), TWO_WEAKER: new TrainerPartyTemplate(2, PartyMemberStrength.WEAKER), TWO_WEAK: new TrainerPartyTemplate(2, PartyMemberStrength.WEAK), - TWO_WEAK_ONE_AVG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.WEAK), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE)), - TWO_WEAK_SAME_ONE_AVG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE)), - TWO_WEAK_SAME_TWO_WEAK_SAME: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true), new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true)), - TWO_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.WEAK), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)), + TWO_WEAK_ONE_AVG: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.WEAK), + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + ), + TWO_WEAK_SAME_ONE_AVG: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true), + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + ), + TWO_WEAK_SAME_TWO_WEAK_SAME: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true), + new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true), + ), + TWO_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.WEAK), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + ), TWO_AVG: new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), - TWO_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)), - TWO_AVG_SAME_ONE_AVG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE)), - TWO_AVG_SAME_ONE_STRONG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)), - TWO_AVG_SAME_TWO_AVG_SAME: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true), new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true)), + TWO_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + ), + TWO_AVG_SAME_ONE_AVG: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true), + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + ), + TWO_AVG_SAME_ONE_STRONG: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + ), + TWO_AVG_SAME_TWO_AVG_SAME: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true), + new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true), + ), TWO_STRONG: new TrainerPartyTemplate(2, PartyMemberStrength.STRONG), THREE_WEAK: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK), THREE_WEAK_SAME: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK, true), @@ -154,30 +191,123 @@ export const trainerPartyTemplates = { SIX_WEAK_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, true), SIX_WEAK_BALANCED: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, false, true), - GYM_LEADER_1: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)), - GYM_LEADER_2: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)), - GYM_LEADER_3: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)), - GYM_LEADER_4: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)), - GYM_LEADER_5: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(2, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)), + GYM_LEADER_1: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + ), + GYM_LEADER_2: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), + ), + GYM_LEADER_3: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), + ), + GYM_LEADER_4: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), + ), + GYM_LEADER_5: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(2, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), + ), - ELITE_FOUR: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(3, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)), + ELITE_FOUR: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(3, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), + ), - CHAMPION: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(4, PartyMemberStrength.STRONG), new TrainerPartyTemplate(2, PartyMemberStrength.STRONGER, false, true)), + CHAMPION: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(4, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(2, PartyMemberStrength.STRONGER, false, true), + ), - RIVAL: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE)), - RIVAL_2: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true)), - RIVAL_3: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE, false, true), new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true)), - RIVAL_4: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, false, true), new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true)), - RIVAL_5: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)), - RIVAL_6: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)) + RIVAL: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + ), + RIVAL_2: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true), + ), + RIVAL_3: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE, false, true), + new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true), + ), + RIVAL_4: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, false, true), + new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true), + ), + RIVAL_5: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + ), + RIVAL_6: new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), + ), }; type PartyTemplateFunc = () => TrainerPartyTemplate; -type PartyMemberFunc = (level: integer, strength: PartyMemberStrength) => EnemyPokemon; +type PartyMemberFunc = (level: number, strength: PartyMemberStrength) => EnemyPokemon; type GenModifiersFunc = (party: EnemyPokemon[]) => PersistentModifier[]; +type GenAIFunc = (party: EnemyPokemon[]) => void; export interface PartyMemberFuncs { - [key: integer]: PartyMemberFunc + [key: number]: PartyMemberFunc; +} + +export enum TeraAIMode { + NO_TERA, + INSTANT_TERA, + SMART_TERA, +} + +/** + * Stores data and helper functions about a trainers AI options. + */ +export class TrainerAI { + public teraMode: TeraAIMode = TeraAIMode.NO_TERA; + public instantTeras: number[]; + + /** + * @param canTerastallize Whether this trainer is allowed to tera + */ + constructor(teraMode: TeraAIMode = TeraAIMode.NO_TERA) { + this.teraMode = teraMode; + this.instantTeras = []; + } + + /** + * Checks if a trainer can tera + * @returns Whether this trainer can currently tera + */ + public canTerastallize() { + return this.teraMode !== TeraAIMode.NO_TERA; + } + + /** + * Sets a pokemon on this AI to just instantly Tera on first move used + * @param index The index of the pokemon to instantly tera. + */ + public setInstantTera(index: number) { + this.teraMode = TeraAIMode.INSTANT_TERA; + this.instantTeras.push(index); + } } export class TrainerConfig { @@ -188,14 +318,14 @@ export class TrainerConfig { public nameDouble: string; public title: string; public titleDouble: string; - public hasGenders: boolean = false; - public hasDouble: boolean = false; - public hasCharSprite: boolean = false; - public doubleOnly: boolean = false; - public moneyMultiplier: number = 1; - public isBoss: boolean = false; - public hasStaticParty: boolean = false; - public useSameSeedForAllMembers: boolean = false; + public hasGenders = false; + public hasDouble = false; + public hasCharSprite = false; + public doubleOnly = false; + public moneyMultiplier = 1; + public isBoss = false; + public hasStaticParty = false; + public useSameSeedForAllMembers = false; public mixedBattleBgm: string; public battleBgm: string; public encounterBgm: string; @@ -203,6 +333,7 @@ export class TrainerConfig { public doubleEncounterBgm: string; public victoryBgm: string; public genModifiersFunc: GenModifiersFunc; + public genAIFuncs: GenAIFunc[] = []; public modifierRewardFuncs: ModifierTypeFunc[] = []; public partyTemplates: TrainerPartyTemplate[]; public partyTemplateFunc: PartyTemplateFunc; @@ -210,8 +341,9 @@ export class TrainerConfig { public partyMemberFuncs: PartyMemberFuncs = {}; public speciesPools: TrainerTierPools; public speciesFilter: PokemonSpeciesFilter; - public specialtyTypes: Type[] = []; - public hasVoucher: boolean = false; + public specialtyType: PokemonType; + public hasVoucher = false; + public trainerAI: TrainerAI; public encounterMessages: string[] = []; public victoryMessages: string[] = []; @@ -227,19 +359,22 @@ export class TrainerConfig { constructor(trainerType: TrainerType, allowLegendaries?: boolean) { this.trainerType = trainerType; + this.trainerAI = new TrainerAI(); this.name = Utils.toReadableString(TrainerType[this.getDerivedType()]); this.battleBgm = "battle_trainer"; this.mixedBattleBgm = "battle_trainer"; this.victoryBgm = "victory_trainer"; - this.partyTemplates = [ trainerPartyTemplates.TWO_AVG ]; - this.speciesFilter = species => (allowLegendaries || (!species.legendary && !species.subLegendary && !species.mythical)) && !species.isTrainerForbidden(); + this.partyTemplates = [trainerPartyTemplates.TWO_AVG]; + this.speciesFilter = species => + (allowLegendaries || (!species.legendary && !species.subLegendary && !species.mythical)) && + !species.isTrainerForbidden(); } getKey(): string { return TrainerType[this.getDerivedType()].toString().toLowerCase(); } - getSpriteKey(female?: boolean, isDouble: boolean = false): string { + getSpriteKey(female?: boolean, isDouble = false): string { let ret = this.getKey(); if (this.hasGenders) { ret += `_${female ? "f" : "m"}`; @@ -290,16 +425,14 @@ export class TrainerConfig { // Get the title from the i18n file this.title = i18next.t(`titles:${title}`); - return this; } - /** - * Returns the derived trainer type for a given trainer type. - * @param trainerTypeToDeriveFrom - The trainer type to derive from. (If null, the this.trainerType property will be used.) - * @returns {TrainerType} - The derived trainer type. - */ + * Returns the derived trainer type for a given trainer type. + * @param trainerTypeToDeriveFrom - The trainer type to derive from. (If null, the this.trainerType property will be used.) + * @returns {TrainerType} - The derived trainer type. + */ getDerivedType(trainerTypeToDeriveFrom: TrainerType | null = null): TrainerType { let trainerType = trainerTypeToDeriveFrom ? trainerTypeToDeriveFrom : this.trainerType; switch (trainerType) { @@ -368,11 +501,11 @@ export class TrainerConfig { } /** - * Sets the configuration for trainers with genders, including the female name and encounter background music (BGM). - * @param {string} [nameFemale] The name of the female trainer. If 'Ivy', a localized name will be assigned. - * @param {TrainerType | string} [femaleEncounterBgm] The encounter BGM for the female trainer, which can be a TrainerType or a string. - * @returns {TrainerConfig} The updated TrainerConfig instance. - **/ + * Sets the configuration for trainers with genders, including the female name and encounter background music (BGM). + * @param {string} [nameFemale] The name of the female trainer. If 'Ivy', a localized name will be assigned. + * @param {TrainerType | string} [femaleEncounterBgm] The encounter BGM for the female trainer, which can be a TrainerType or a string. + * @returns {TrainerConfig} The updated TrainerConfig instance. + **/ setHasGenders(nameFemale?: string, femaleEncounterBgm?: TrainerType | string): TrainerConfig { // If the female name is 'Ivy' (the rival), assign a localized name. if (nameFemale === "Ivy") { @@ -395,9 +528,10 @@ export class TrainerConfig { if (femaleEncounterBgm) { // If the BGM is a TrainerType (number), convert it to a string, replace underscores with spaces, and convert to lowercase. // Otherwise, assign the provided string as the BGM. - this.femaleEncounterBgm = typeof femaleEncounterBgm === "number" - ? TrainerType[femaleEncounterBgm].toString().replace(/_/g, " ").toLowerCase() - : femaleEncounterBgm; + this.femaleEncounterBgm = + typeof femaleEncounterBgm === "number" + ? TrainerType[femaleEncounterBgm].toString().replace(/_/g, " ").toLowerCase() + : femaleEncounterBgm; } // Return the updated TrainerConfig instance. @@ -405,25 +539,28 @@ export class TrainerConfig { } /** - * Sets the configuration for trainers with double battles, including the name of the double trainer and the encounter BGM. - * @param nameDouble The name of the double trainer (e.g., "Ace Duo" for Trainer Class Doubles or "red_blue_double" for NAMED trainer doubles). - * @param doubleEncounterBgm The encounter BGM for the double trainer, which can be a TrainerType or a string. - * @returns {TrainerConfig} The updated TrainerConfig instance. - */ + * Sets the configuration for trainers with double battles, including the name of the double trainer and the encounter BGM. + * @param nameDouble The name of the double trainer (e.g., "Ace Duo" for Trainer Class Doubles or "red_blue_double" for NAMED trainer doubles). + * @param doubleEncounterBgm The encounter BGM for the double trainer, which can be a TrainerType or a string. + * @returns {TrainerConfig} The updated TrainerConfig instance. + */ setHasDouble(nameDouble: string, doubleEncounterBgm?: TrainerType | string): TrainerConfig { this.hasDouble = true; this.nameDouble = nameDouble; if (doubleEncounterBgm) { - this.doubleEncounterBgm = typeof doubleEncounterBgm === "number" ? TrainerType[doubleEncounterBgm].toString().replace(/\_/g, " ").toLowerCase() : doubleEncounterBgm; + this.doubleEncounterBgm = + typeof doubleEncounterBgm === "number" + ? TrainerType[doubleEncounterBgm].toString().replace(/\_/g, " ").toLowerCase() + : doubleEncounterBgm; } return this; } /** - * Sets the trainer type for double battles. - * @param trainerTypeDouble The TrainerType of the partner in a double battle. - * @returns {TrainerConfig} The updated TrainerConfig instance. - */ + * Sets the trainer type for double battles. + * @param trainerTypeDouble The TrainerType of the partner in a double battle. + * @returns {TrainerConfig} The updated TrainerConfig instance. + */ setDoubleTrainerType(trainerTypeDouble: TrainerType): TrainerConfig { this.trainerTypeDouble = trainerTypeDouble; this.setDoubleMessages(this.nameDouble); @@ -431,9 +568,9 @@ export class TrainerConfig { } /** - * Sets the encounter and victory messages for double trainers. - * @param nameDouble - The name of the pair (e.g. "red_blue_double"). - */ + * Sets the encounter and victory messages for double trainers. + * @param nameDouble - The name of the pair (e.g. "red_blue_double"). + */ setDoubleMessages(nameDouble: string) { // Check if there is double battle dialogue for this trainer if (doubleBattleDialogue[nameDouble]) { @@ -445,10 +582,10 @@ export class TrainerConfig { } /** - * Sets the title for double trainers - * @param titleDouble The key for the title in the i18n file. (e.g., "champion_double"). - * @returns {TrainerConfig} The updated TrainerConfig instance. - */ + * Sets the title for double trainers + * @param titleDouble The key for the title in the i18n file. (e.g., "champion_double"). + * @returns {TrainerConfig} The updated TrainerConfig instance. + */ setDoubleTitle(titleDouble: string): TrainerConfig { // First check if i18n is initialized if (!getIsInitialized()) { @@ -505,7 +642,8 @@ export class TrainerConfig { } setEncounterBgm(encounterBgm: TrainerType | string): TrainerConfig { - this.encounterBgm = typeof encounterBgm === "number" ? TrainerType[encounterBgm].toString().toLowerCase() : encounterBgm; + this.encounterBgm = + typeof encounterBgm === "number" ? TrainerType[encounterBgm].toString().toLowerCase() : encounterBgm; return this; } @@ -524,13 +662,15 @@ export class TrainerConfig { return this; } - setPartyMemberFunc(slotIndex: integer, partyMemberFunc: PartyMemberFunc): TrainerConfig { + setPartyMemberFunc(slotIndex: number, partyMemberFunc: PartyMemberFunc): TrainerConfig { this.partyMemberFuncs[slotIndex] = partyMemberFunc; return this; } setSpeciesPools(speciesPools: TrainerTierPools | Species[]): TrainerConfig { - this.speciesPools = (Array.isArray(speciesPools) ? { [TrainerPoolTier.COMMON]: speciesPools } : speciesPools) as unknown as TrainerTierPools; + this.speciesPools = (Array.isArray(speciesPools) + ? { [TrainerPoolTier.COMMON]: speciesPools } + : speciesPools) as unknown as TrainerTierPools; return this; } @@ -540,8 +680,8 @@ export class TrainerConfig { return this; } - setSpecialtyTypes(...specialtyTypes: Type[]): TrainerConfig { - this.specialtyTypes = specialtyTypes; + setSpecialtyType(specialtyType: PokemonType): TrainerConfig { + this.specialtyType = specialtyType; return this; } @@ -550,6 +690,54 @@ export class TrainerConfig { return this; } + /** + * Sets random pokemon from the trainer's team to instant tera. Also sets Tera type to specialty type and checks for Shedinja as appropriate. + * @param count A callback (yucky) to see how many teras should be used + * @param slot Optional, a specified slot that should be terastallized. Wraps to match party size (-1 will get the last slot and so on). + * @returns this + */ + setRandomTeraModifiers(count: () => number, slot?: number): TrainerConfig { + this.genAIFuncs.push((party: EnemyPokemon[]) => { + const shedinjaCanTera = !this.hasSpecialtyType() || this.specialtyType === PokemonType.BUG; // Better to check one time than 6 + const partyMemberIndexes = new Array(party.length) + .fill(null) + .map((_, i) => i) + .filter(i => shedinjaCanTera || party[i].species.speciesId !== Species.SHEDINJA); // Shedinja can only Tera on Bug specialty type (or no specialty type) + const setPartySlot = !Utils.isNullOrUndefined(slot) ? Phaser.Math.Wrap(slot, 0, party.length) : -1; // If we have a tera slot defined, wrap it to party size. + for (let t = 0; t < Math.min(count(), party.length); t++) { + const randomIndex = + partyMemberIndexes.indexOf(setPartySlot) > -1 ? setPartySlot : Utils.randSeedItem(partyMemberIndexes); + partyMemberIndexes.splice(partyMemberIndexes.indexOf(randomIndex), 1); + if (this.hasSpecialtyType()) { + party[randomIndex].teraType = this.specialtyType; + } + this.trainerAI.setInstantTera(randomIndex); + } + }); + return this; + } + + /** + * Sets a specific pokemon to instantly Tera + * @param index The index within the team to have instant Tera. + * @returns this + */ + setInstantTera(index: number): TrainerConfig { + this.trainerAI.setInstantTera(index); + return this; + } + + // function getRandomTeraModifiers(party: EnemyPokemon[], count: integer, types?: Type[]): PersistentModifier[] { + // const ret: PersistentModifier[] = []; + // const partyMemberIndexes = new Array(party.length).fill(null).map((_, i) => i); + // for (let t = 0; t < Math.min(count, party.length); t++) { + // const randomIndex = Utils.randSeedItem(partyMemberIndexes); + // partyMemberIndexes.splice(partyMemberIndexes.indexOf(randomIndex), 1); + // ret.push(modifierTypes.TERA_SHARD().generateType([], [ Utils.randSeedItem(types ? types : party[randomIndex].getTypes()) ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(party[randomIndex]) as PersistentModifier); // TODO: is the bang correct? + // } + // return ret; + // } + setEventModifierRewardFuncs(...modifierTypeFuncs: (() => ModifierTypeFunc)[]): TrainerConfig { this.eventRewardFuncs = modifierTypeFuncs.map(func => () => { const modifierTypeFunc = func(); @@ -560,7 +748,6 @@ export class TrainerConfig { return this; } - setModifierRewardFuncs(...modifierTypeFuncs: (() => ModifierTypeFunc)[]): TrainerConfig { this.modifierRewardFuncs = modifierTypeFuncs.map(func => () => { const modifierTypeFunc = func(); @@ -572,116 +759,421 @@ export class TrainerConfig { } /** - * Returns the pool of species for an evil team admin - * @param team - The evil team the admin belongs to. - * @returns {TrainerTierPools} - */ + * Returns the pool of species for an evil team admin + * @param team - The evil team the admin belongs to. + * @returns {TrainerTierPools} + */ speciesPoolPerEvilTeamAdmin(team): TrainerTierPools { team = team.toLowerCase(); switch (team) { case "rocket": { return { - [TrainerPoolTier.COMMON]: [ Species.RATTATA, Species.KOFFING, Species.EKANS, Species.ZUBAT, Species.MAGIKARP, Species.HOUNDOUR, Species.ONIX, Species.CUBONE, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB, Species.DROWZEE, Species.VILEPLUME ], - [TrainerPoolTier.UNCOMMON]: [ Species.PORYGON, Species.MANKEY, Species.MAGNEMITE, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE, Species.PALDEA_TAUROS, Species.OMANYTE, Species.KABUTO, Species.MAGBY, Species.ELEKID ], - [TrainerPoolTier.RARE]: [ Species.DRATINI, Species.LARVITAR ] + [TrainerPoolTier.COMMON]: [ + Species.RATICATE, + Species.ARBOK, + Species.VILEPLUME, + Species.ARCANINE, + Species.GENGAR, + Species.HYPNO, + Species.ELECTRODE, + Species.EXEGGUTOR, + Species.CUBONE, + Species.KOFFING, + Species.GYARADOS, + Species.CROBAT, + Species.STEELIX, + Species.HOUNDOOM, + Species.HONCHKROW, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.OMASTAR, + Species.KABUTOPS, + Species.MAGNEZONE, + Species.ELECTIVIRE, + Species.MAGMORTAR, + Species.PORYGON_Z, + Species.ANNIHILAPE, + Species.ALOLA_SANDSLASH, + Species.ALOLA_PERSIAN, + Species.ALOLA_GOLEM, + Species.ALOLA_MUK, + Species.PALDEA_TAUROS, + ], + [TrainerPoolTier.RARE]: [Species.DRAGONITE, Species.TYRANITAR], }; } case "magma": { return { - [TrainerPoolTier.COMMON]: [ Species.GROWLITHE, Species.SLUGMA, Species.SOLROCK, Species.HIPPOPOTAS, Species.BALTOY, Species.ROLYCOLY, Species.GLIGAR, Species.TORKOAL, Species.HOUNDOUR, Species.MAGBY ], - [TrainerPoolTier.UNCOMMON]: [ Species.TRAPINCH, Species.SILICOBRA, Species.RHYHORN, Species.ANORITH, Species.LILEEP, Species.HISUI_GROWLITHE, Species.TURTONATOR, Species.ARON, Species.TOEDSCOOL ], - [TrainerPoolTier.RARE]: [ Species.CAPSAKID, Species.CHARCADET ] + [TrainerPoolTier.COMMON]: [ + Species.ARCANINE, + Species.MAGCARGO, + Species.HOUNDOOM, + Species.TORKOAL, + Species.SOLROCK, + Species.CLAYDOL, + Species.HIPPOWDON, + Species.MAGMORTAR, + Species.GLISCOR, + Species.COALOSSAL, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.AGGRON, + Species.FLYGON, + Species.CRADILY, + Species.ARMALDO, + Species.RHYPERIOR, + Species.TURTONATOR, + Species.SANDACONDA, + Species.TOEDSCRUEL, + Species.HISUI_ARCANINE, + ], + [TrainerPoolTier.RARE]: [Species.CHARCADET, Species.SCOVILLAIN], }; } case "aqua": { return { - [TrainerPoolTier.COMMON]: [ Species.CORPHISH, Species.SPHEAL, Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.AZURILL, Species.LOTAD, Species.WAILMER, Species.REMORAID, Species.BARBOACH ], - [TrainerPoolTier.UNCOMMON]: [ Species.MANTYKE, Species.HISUI_QWILFISH, Species.ARROKUDA, Species.DHELMISE, Species.CLOBBOPUS, Species.FEEBAS, Species.PALDEA_WOOPER, Species.HORSEA, Species.SKRELP ], - [TrainerPoolTier.RARE]: [ Species.DONDOZO, Species.BASCULEGION ] + [TrainerPoolTier.COMMON]: [ + Species.TENTACRUEL, + Species.LANTURN, + Species.AZUMARILL, + Species.QUAGSIRE, + Species.OCTILLERY, + Species.LUDICOLO, + Species.PELIPPER, + Species.WAILORD, + Species.WHISCASH, + Species.CRAWDAUNT, + Species.WALREIN, + Species.CLAMPERL, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.QUAGSIRE, + Species.MANTINE, + Species.KINGDRA, + Species.MILOTIC, + Species.DRAGALGE, + Species.DHELMISE, + Species.BARRASKEWDA, + Species.GRAPPLOCT, + Species.OVERQWIL, + ], + [TrainerPoolTier.RARE]: [Species.BASCULEGION, Species.DONDOZO], }; } case "galactic": { return { - [TrainerPoolTier.COMMON]: [ Species.BRONZOR, Species.SWINUB, Species.YANMA, Species.LICKITUNG, Species.TANGELA, Species.MAGBY, Species.ELEKID, Species.SKORUPI, Species.ZUBAT, Species.MURKROW, Species.MAGIKARP, Species.VOLTORB ], - [TrainerPoolTier.UNCOMMON]: [ Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.SNEASEL, Species.DUSKULL, Species.ROTOM, Species.HISUI_VOLTORB, Species.GLIGAR, Species.ABRA ], - [TrainerPoolTier.RARE]: [ Species.URSALUNA, Species.HISUI_LILLIGANT, Species.SPIRITOMB, Species.HISUI_SNEASEL ] + [TrainerPoolTier.COMMON]: [ + Species.ELECTRODE, + Species.GYARADOS, + Species.CROBAT, + Species.HONCHKROW, + Species.BRONZONG, + Species.DRAPION, + Species.LICKILICKY, + Species.TANGROWTH, + Species.ELECTIVIRE, + Species.MAGMORTAR, + Species.YANMEGA, + Species.MAMOSWINE, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.ALAKAZAM, + Species.WEAVILE, + Species.GLISCOR, + Species.DUSKNOIR, + Species.ROTOM, + Species.OVERQWIL, + Species.HISUI_ARCANINE, + Species.HISUI_ELECTRODE, + ], + [TrainerPoolTier.RARE]: [Species.SPIRITOMB, Species.URSALUNA, Species.SNEASLER, Species.HISUI_LILLIGANT], }; } case "plasma": { return { - [TrainerPoolTier.COMMON]: [ Species.YAMASK, Species.ROGGENROLA, Species.JOLTIK, Species.TYMPOLE, Species.FRILLISH, Species.FERROSEED, Species.SANDILE, Species.TIMBURR, Species.DARUMAKA, Species.FOONGUS, Species.CUBCHOO, Species.VANILLITE ], - [TrainerPoolTier.UNCOMMON]: [ Species.PAWNIARD, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.KLINK, Species.TYNAMO, Species.GALAR_DARUMAKA, Species.GOLETT, Species.MIENFOO, Species.DURANT, Species.SIGILYPH ], - [TrainerPoolTier.RARE]: [ Species.HISUI_ZORUA, Species.AXEW, Species.DEINO, Species.HISUI_BRAVIARY ] + [TrainerPoolTier.COMMON]: [ + Species.GIGALITH, + Species.CONKELDURR, + Species.SEISMITOAD, + Species.KROOKODILE, + Species.DARMANITAN, + Species.COFAGRIGUS, + Species.VANILLUXE, + Species.AMOONGUSS, + Species.JELLICENT, + Species.GALVANTULA, + Species.FERROTHORN, + Species.BEARTIC, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.EXCADRILL, + Species.SIGILYPH, + Species.ZOROARK, + Species.KLINKLANG, + Species.EELEKTROSS, + Species.MIENSHAO, + Species.GOLURK, + Species.BISHARP, + Species.MANDIBUZZ, + Species.DURANT, + Species.GALAR_DARMANITAN, + ], + [TrainerPoolTier.RARE]: [Species.HAXORUS, Species.HYDREIGON, Species.HISUI_ZOROARK, Species.HISUI_BRAVIARY], }; } case "plasma_2": { return { - [TrainerPoolTier.COMMON]: [ Species.MAGNEMITE, Species.GRIMER, Species.VOLTORB, Species.PORYGON, Species.BRONZOR, Species.MUNNA, Species.SOLOSIS, Species.JOLTIK, Species.FERROSEED, Species.TYNAMO, Species.ELGYEM ], - [TrainerPoolTier.UNCOMMON]: [ Species.BELDUM, Species.ROTOM, Species.TIRTOUGA, Species.ARCHEN, Species.GOLETT, Species.DURANT, Species.GRUBBIN, Species.BLIPBUG, Species.VAROOM, Species.ALOLA_GRIMER, Species.HISUI_VOLTORB ], - [TrainerPoolTier.RARE]: [ Species.ELEKID, Species.MAGBY, Species.PAWNIARD, Species.DURALUDON ] + [TrainerPoolTier.COMMON]: [ + Species.MUK, + Species.ELECTRODE, + Species.BRONZONG, + Species.MAGNEZONE, + Species.PORYGON_Z, + Species.MUSHARNA, + Species.REUNICLUS, + Species.GALVANTULA, + Species.FERROTHORN, + Species.EELEKTROSS, + Species.BEHEEYEM, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.METAGROSS, + Species.ROTOM, + Species.CARRACOSTA, + Species.ARCHEOPS, + Species.GOLURK, + Species.DURANT, + Species.VIKAVOLT, + Species.ORBEETLE, + Species.REVAVROOM, + Species.ALOLA_MUK, + Species.HISUI_ELECTRODE, + ], + [TrainerPoolTier.RARE]: [Species.ELECTIVIRE, Species.MAGMORTAR, Species.BISHARP, Species.ARCHALUDON], }; } case "flare": { return { - [TrainerPoolTier.COMMON]: [ Species.FLETCHLING, Species.LITLEO, Species.INKAY, Species.FOONGUS, Species.HELIOPTILE, Species.ELECTRIKE, Species.SKORUPI, Species.PURRLOIN, Species.CLAWITZER, Species.PANCHAM, Species.ESPURR, Species.BUNNELBY ], - [TrainerPoolTier.UNCOMMON]: [ Species.LITWICK, Species.SNEASEL, Species.PUMPKABOO, Species.PHANTUMP, Species.HONEDGE, Species.BINACLE, Species.HOUNDOUR, Species.SKRELP, Species.SLIGGOO ], - [TrainerPoolTier.RARE]: [ Species.NOIBAT, Species.HISUI_AVALUGG, Species.HISUI_SLIGGOO ] + [TrainerPoolTier.COMMON]: [ + Species.MANECTRIC, + Species.DRAPION, + Species.LIEPARD, + Species.AMOONGUSS, + Species.DIGGERSBY, + Species.TALONFLAME, + Species.PYROAR, + Species.PANGORO, + Species.MEOWSTIC, + Species.MALAMAR, + Species.CLAWITZER, + Species.HELIOLISK, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.HOUNDOOM, + Species.WEAVILE, + Species.CHANDELURE, + Species.AEGISLASH, + Species.BARBARACLE, + Species.DRAGALGE, + Species.GOODRA, + Species.TREVENANT, + Species.GOURGEIST, + ], + [TrainerPoolTier.RARE]: [Species.NOIVERN, Species.HISUI_GOODRA, Species.HISUI_AVALUGG], }; } case "aether": { return { - [TrainerPoolTier.COMMON]: [ Species.BRUXISH, Species.SLOWPOKE, Species.BALTOY, Species.EXEGGCUTE, Species.ABRA, Species.ALOLA_RAICHU, Species.ELGYEM, Species.NATU, Species.BLIPBUG, Species.GIRAFARIG, Species.ORANGURU ], - [TrainerPoolTier.UNCOMMON]: [ Species.GALAR_SLOWPOKE, Species.MEDITITE, Species.BELDUM, Species.HATENNA, Species.INKAY, Species.RALTS, Species.GALAR_MR_MIME ], - [TrainerPoolTier.RARE]: [ Species.ARMAROUGE, Species.HISUI_BRAVIARY, Species.PORYGON ] + [TrainerPoolTier.COMMON]: [ + Species.ALAKAZAM, + Species.SLOWBRO, + Species.EXEGGUTOR, + Species.XATU, + Species.CLAYDOL, + Species.BEHEEYEM, + Species.ORANGURU, + Species.BRUXISH, + Species.ORBEETLE, + Species.FARIGIRAF, + Species.ALOLA_RAICHU, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.KIRLIA, + Species.MEDICHAM, + Species.METAGROSS, + Species.MALAMAR, + Species.HATTERENE, + Species.MR_RIME, + Species.GALAR_SLOWKING, + ], + [TrainerPoolTier.RARE]: [Species.PORYGON_Z, Species.ARMAROUGE, Species.HISUI_BRAVIARY], }; } case "skull": { return { - [TrainerPoolTier.COMMON]: [ Species.MAREANIE, Species.ALOLA_GRIMER, Species.GASTLY, Species.ZUBAT, Species.FOMANTIS, Species.VENIPEDE, Species.BUDEW, Species.KOFFING, Species.STUNKY, Species.CROAGUNK, Species.NIDORAN_F ], - [TrainerPoolTier.UNCOMMON]: [ Species.GALAR_SLOWPOKE, Species.SKORUPI, Species.PALDEA_WOOPER, Species.VULLABY, Species.HISUI_QWILFISH, Species.GLIMMET ], - [TrainerPoolTier.RARE]: [ Species.SKRELP, Species.HISUI_SNEASEL ] + [TrainerPoolTier.COMMON]: [ + Species.NIDOQUEEN, + Species.GENGAR, + Species.KOFFING, + Species.CROBAT, + Species.ROSERADE, + Species.SKUNTANK, + Species.TOXICROAK, + Species.SCOLIPEDE, + Species.TOXAPEX, + Species.LURANTIS, + Species.ALOLA_MUK, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.DRAPION, + Species.MANDIBUZZ, + Species.OVERQWIL, + Species.GLIMMORA, + Species.CLODSIRE, + Species.GALAR_SLOWBRO, + ], + [TrainerPoolTier.RARE]: [Species.DRAGALGE, Species.SNEASLER], }; } case "macro": { return { - [TrainerPoolTier.COMMON]: [ Species.HATENNA, Species.FEEBAS, Species.BOUNSWEET, Species.SALANDIT, Species.GALAR_PONYTA, Species.GOTHITA, Species.FROSLASS, Species.VULPIX, Species.FRILLISH, Species.ODDISH, Species.SINISTEA ], - [TrainerPoolTier.UNCOMMON]: [ Species.VULLABY, Species.MAREANIE, Species.ALOLA_VULPIX, Species.TOGEPI, Species.GALAR_CORSOLA, Species.APPLIN ], - [TrainerPoolTier.RARE]: [ Species.TINKATINK, Species.HISUI_LILLIGANT ] + [TrainerPoolTier.COMMON]: [ + Species.NINETALES, + Species.BELLOSSOM, + Species.MILOTIC, + Species.FROSLASS, + Species.GOTHITELLE, + Species.JELLICENT, + Species.SALAZZLE, + Species.TSAREENA, + Species.POLTEAGEIST, + Species.HATTERENE, + Species.GALAR_RAPIDASH, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.TOGEKISS, + Species.MANDIBUZZ, + Species.TOXAPEX, + Species.APPLETUN, + Species.CURSOLA, + Species.ALOLA_NINETALES, + ], + [TrainerPoolTier.RARE]: [Species.TINKATON, Species.HISUI_LILLIGANT], }; } case "star_1": { return { - [TrainerPoolTier.COMMON]: [ Species.MURKROW, Species.SEEDOT, Species.CACNEA, Species.STUNKY, Species.SANDILE, Species.NYMBLE, Species.MASCHIFF, Species.GALAR_ZIGZAGOON ], - [TrainerPoolTier.UNCOMMON]: [ Species.UMBREON, Species.SNEASEL, Species.CORPHISH, Species.ZORUA, Species.INKAY, Species.BOMBIRDIER ], - [TrainerPoolTier.RARE]: [ Species.DEINO, Species.SPRIGATITO ] + [TrainerPoolTier.COMMON]: [ + Species.SHIFTRY, + Species.CACTURNE, + Species.HONCHKROW, + Species.SKUNTANK, + Species.KROOKODILE, + Species.OBSTAGOON, + Species.LOKIX, + Species.MABOSSTIFF, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.UMBREON, + Species.CRAWDAUNT, + Species.WEAVILE, + Species.ZOROARK, + Species.MALAMAR, + Species.BOMBIRDIER, + ], + [TrainerPoolTier.RARE]: [Species.HYDREIGON, Species.MEOWSCARADA], }; } case "star_2": { return { - [TrainerPoolTier.COMMON]: [ Species.GROWLITHE, Species.HOUNDOUR, Species.NUMEL, Species.LITWICK, Species.FLETCHLING, Species.LITLEO, Species.ROLYCOLY, Species.CAPSAKID ], - [TrainerPoolTier.UNCOMMON]: [ Species.PONYTA, Species.FLAREON, Species.MAGBY, Species.TORKOAL, Species.SALANDIT, Species.TURTONATOR ], - [TrainerPoolTier.RARE]: [ Species.LARVESTA, Species.FUECOCO ] + [TrainerPoolTier.COMMON]: [ + Species.ARCANINE, + Species.HOUNDOOM, + Species.CAMERUPT, + Species.CHANDELURE, + Species.TALONFLAME, + Species.PYROAR, + Species.COALOSSAL, + Species.SCOVILLAIN, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.RAPIDASH, + Species.FLAREON, + Species.TORKOAL, + Species.MAGMORTAR, + Species.SALAZZLE, + Species.TURTONATOR, + ], + [TrainerPoolTier.RARE]: [Species.VOLCARONA, Species.SKELEDIRGE], }; } case "star_3": { return { - [TrainerPoolTier.COMMON]: [ Species.ZUBAT, Species.GRIMER, Species.STUNKY, Species.FOONGUS, Species.MAREANIE, Species.TOXEL, Species.SHROODLE, Species.PALDEA_WOOPER ], - [TrainerPoolTier.UNCOMMON]: [ Species.GASTLY, Species.SEVIPER, Species.SKRELP, Species.ALOLA_GRIMER, Species.GALAR_SLOWPOKE, Species.HISUI_QWILFISH ], - [TrainerPoolTier.RARE]: [ Species.GLIMMET, Species.BULBASAUR ] + [TrainerPoolTier.COMMON]: [ + Species.MUK, + Species.CROBAT, + Species.SKUNTANK, + Species.AMOONGUSS, + Species.TOXAPEX, + Species.TOXTRICITY, + Species.GRAFAIAI, + Species.CLODSIRE, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.GENGAR, + Species.SEVIPER, + Species.DRAGALGE, + Species.OVERQWIL, + Species.ALOLA_MUK, + Species.GALAR_SLOWBRO, + ], + [TrainerPoolTier.RARE]: [Species.GLIMMORA, Species.VENUSAUR], }; } case "star_4": { return { - [TrainerPoolTier.COMMON]: [ Species.CLEFFA, Species.IGGLYBUFF, Species.AZURILL, Species.COTTONEE, Species.FLABEBE, Species.HATENNA, Species.IMPIDIMP, Species.TINKATINK ], - [TrainerPoolTier.UNCOMMON]: [ Species.TOGEPI, Species.GARDEVOIR, Species.SYLVEON, Species.KLEFKI, Species.MIMIKYU, Species.ALOLA_VULPIX ], - [TrainerPoolTier.RARE]: [ Species.GALAR_PONYTA, Species.POPPLIO ] + [TrainerPoolTier.COMMON]: [ + Species.CLEFABLE, + Species.WIGGLYTUFF, + Species.AZUMARILL, + Species.WHIMSICOTT, + Species.FLORGES, + Species.HATTERENE, + Species.GRIMMSNARL, + Species.TINKATON, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.TOGEKISS, + Species.GARDEVOIR, + Species.SYLVEON, + Species.KLEFKI, + Species.MIMIKYU, + Species.ALOLA_NINETALES, + ], + [TrainerPoolTier.RARE]: [Species.GALAR_RAPIDASH, Species.PRIMARINA], }; } case "star_5": { return { - [TrainerPoolTier.COMMON]: [ Species.SHROOMISH, Species.MAKUHITA, Species.MEDITITE, Species.CROAGUNK, Species.SCRAGGY, Species.MIENFOO, Species.PAWMI, Species.PALDEA_TAUROS ], - [TrainerPoolTier.UNCOMMON]: [ Species.RIOLU, Species.TIMBURR, Species.HAWLUCHA, Species.PASSIMIAN, Species.FALINKS, Species.FLAMIGO ], - [TrainerPoolTier.RARE]: [ Species.JANGMO_O, Species.QUAXLY ] + [TrainerPoolTier.COMMON]: [ + Species.BRELOOM, + Species.HARIYAMA, + Species.MEDICHAM, + Species.TOXICROAK, + Species.SCRAFTY, + Species.MIENSHAO, + Species.PAWMOT, + Species.PALDEA_TAUROS, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.LUCARIO, + Species.CONKELDURR, + Species.HAWLUCHA, + Species.PASSIMIAN, + Species.FALINKS, + Species.FLAMIGO, + ], + [TrainerPoolTier.RARE]: [Species.KOMMO_O, Species.QUAQUAVAL], }; } } @@ -691,16 +1183,27 @@ export class TrainerConfig { } /** - * Initializes the trainer configuration for an evil team admin. - * @param title The title of the evil team admin. - * @param poolName The evil team the admin belongs to. - * @param {Species | Species[]} signatureSpecies The signature species for the evil team leader. - * @returns {TrainerConfig} The updated TrainerConfig instance. - * **/ - initForEvilTeamAdmin(title: string, poolName: string, signatureSpecies: (Species | Species[])[],): TrainerConfig { + * Initializes the trainer configuration for an evil team admin. + * @param title The title of the evil team admin. + * @param poolName The evil team the admin belongs to. + * @param {Species | Species[]} signatureSpecies The signature species for the evil team leader. + * @param specialtyType The specialty Type of the admin, if they have one + * @returns {TrainerConfig} The updated TrainerConfig instance. + * **/ + initForEvilTeamAdmin( + title: string, + poolName: string, + signatureSpecies: (Species | Species[])[], + specialtyType?: PokemonType, + ): TrainerConfig { if (!getIsInitialized()) { initI18n(); } + + if (!Utils.isNullOrUndefined(specialtyType)) { + this.setSpecialtyType(specialtyType); + } + this.setPartyTemplates(trainerPartyTemplates.RIVAL_5); // Set the species pools for the evil team admin. @@ -708,7 +1211,7 @@ export class TrainerConfig { signatureSpecies.forEach((speciesPool, s) => { if (!Array.isArray(speciesPool)) { - speciesPool = [ speciesPool ]; + speciesPool = [speciesPool]; } this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool)); }); @@ -728,28 +1231,16 @@ export class TrainerConfig { /** * Initializes the trainer configuration for a Stat Trainer, as part of the Trainer's Test Mystery Encounter. - * @param {Species | Species[]} signatureSpecies The signature species for the Elite Four member. - * @param {Type[]} specialtyTypes The specialty types for the Stat Trainer. - * @param isMale Whether the Elite Four Member is Male or Female (for localization of the title). + * @param _isMale Whether the stat trainer is Male or Female (for localization of the title). * @returns {TrainerConfig} The updated TrainerConfig instance. **/ - initForStatTrainer(signatureSpecies: (Species | Species[])[], isMale: boolean, ...specialtyTypes: Type[]): TrainerConfig { + initForStatTrainer(_isMale = false): TrainerConfig { if (!getIsInitialized()) { initI18n(); } this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR); - signatureSpecies.forEach((speciesPool, s) => { - if (!Array.isArray(speciesPool)) { - speciesPool = [ speciesPool ]; - } - this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool)); - }); - if (specialtyTypes.length) { - this.setSpeciesFilter(p => specialtyTypes.find(t => p.isOfType(t)) !== undefined); - this.setSpecialtyTypes(...specialtyTypes); - } const nameForCall = this.name.toLowerCase().replace(/\s/g, "_"); this.name = i18next.t(`trainerNames:${nameForCall}`); this.setMoneyMultiplier(2); @@ -764,13 +1255,18 @@ export class TrainerConfig { } /** - * Initializes the trainer configuration for an evil team leader. Temporarily hardcoding evil leader teams though. - * @param {Species | Species[]} signatureSpecies The signature species for the evil team leader. - * @param {Type[]} specialtyTypes The specialty types for the evil team Leader. - * @param boolean Whether or not this is the rematch fight - * @returns {TrainerConfig} The updated TrainerConfig instance. - * **/ - initForEvilTeamLeader(title: string, signatureSpecies: (Species | Species[])[], rematch: boolean = false, ...specialtyTypes: Type[]): TrainerConfig { + * Initializes the trainer configuration for an evil team leader. Temporarily hardcoding evil leader teams though. + * @param {Species | Species[]} signatureSpecies The signature species for the evil team leader. + * @param {PokemonType} specialtyType The specialty type for the evil team Leader. + * @param boolean Whether or not this is the rematch fight + * @returns {TrainerConfig} The updated TrainerConfig instance. + * **/ + initForEvilTeamLeader( + title: string, + signatureSpecies: (Species | Species[])[], + rematch = false, + specialtyType?: PokemonType, + ): TrainerConfig { if (!getIsInitialized()) { initI18n(); } @@ -781,13 +1277,13 @@ export class TrainerConfig { } signatureSpecies.forEach((speciesPool, s) => { if (!Array.isArray(speciesPool)) { - speciesPool = [ speciesPool ]; + speciesPool = [speciesPool]; } this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool)); }); - if (specialtyTypes.length) { - this.setSpeciesFilter(p => specialtyTypes.find(t => p.isOfType(t)) !== undefined); - this.setSpecialtyTypes(...specialtyTypes); + if (!Utils.isNullOrUndefined(specialtyType)) { + this.setSpeciesFilter(p => p.isOfType(specialtyType)); + this.setSpecialtyType(specialtyType); } const nameForCall = this.name.toLowerCase().replace(/\s/g, "_"); this.name = i18next.t(`trainerNames:${nameForCall}`); @@ -803,13 +1299,21 @@ export class TrainerConfig { } /** - * Initializes the trainer configuration for a Gym Leader. - * @param {Species | Species[]} signatureSpecies The signature species for the Gym Leader. - * @param {Type[]} specialtyTypes The specialty types for the Gym Leader. - * @param isMale Whether the Gym Leader is Male or Not (for localization of the title). - * @returns {TrainerConfig} The updated TrainerConfig instance. - * **/ - initForGymLeader(signatureSpecies: (Species | Species[])[], isMale: boolean, ...specialtyTypes: Type[]): TrainerConfig { + * Initializes the trainer configuration for a Gym Leader. + * @param {Species | Species[]} signatureSpecies The signature species for the Gym Leader. Added to party in reverse order. + * @param isMale Whether the Gym Leader is Male or Not (for localization of the title). + * @param {PokemonType} specialtyType The specialty type for the Gym Leader. + * @param ignoreMinTeraWave Whether the Gym Leader always uses Tera (true), or only Teras after {@linkcode GYM_LEADER_TERA_WAVE} (false). Defaults to false. + * @param teraSlot Optional, sets the party member in this slot to Terastallize. Wraps based on party size. + * @returns {TrainerConfig} The updated TrainerConfig instance. + * **/ + initForGymLeader( + signatureSpecies: (Species | Species[])[], + isMale: boolean, + specialtyType: PokemonType, + ignoreMinTeraWave = false, + teraSlot?: number, + ): TrainerConfig { // Check if the internationalization (i18n) system is initialized. if (!getIsInitialized()) { initI18n(); @@ -822,17 +1326,15 @@ export class TrainerConfig { signatureSpecies.forEach((speciesPool, s) => { // Ensure speciesPool is an array. if (!Array.isArray(speciesPool)) { - speciesPool = [ speciesPool ]; + speciesPool = [speciesPool]; } // Set a function to get a random party member from the species pool. this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool)); }); - // If specialty types are provided, set species filter and specialty types. - if (specialtyTypes.length) { - this.setSpeciesFilter(p => specialtyTypes.find(t => p.isOfType(t)) !== undefined); - this.setSpecialtyTypes(...specialtyTypes); - } + // If specialty type is provided, set species filter and specialty type. + this.setSpeciesFilter(p => p.isOfType(specialtyType)); + this.setSpecialtyType(specialtyType); // Localize the trainer's name by converting it to lowercase and replacing spaces with underscores. const nameForCall = this.name.toLowerCase().replace(/\s/g, "_"); @@ -851,22 +1353,28 @@ export class TrainerConfig { this.setHasVoucher(true); this.setBattleBgm("battle_unova_gym"); this.setVictoryBgm("victory_gym"); - this.setGenModifiersFunc(party => { - const waveIndex = globalScene.currentBattle.waveIndex; - return getRandomTeraModifiers(party, waveIndex >= 100 ? 1 : 0, specialtyTypes.length ? specialtyTypes : undefined); - }); + this.setRandomTeraModifiers( + () => (ignoreMinTeraWave || globalScene.currentBattle.waveIndex >= GYM_LEADER_TERA_WAVE ? 1 : 0), + teraSlot, + ); return this; } /** - * Initializes the trainer configuration for an Elite Four member. - * @param {Species | Species[]} signatureSpecies The signature species for the Elite Four member. - * @param {Type[]} specialtyTypes The specialty types for the Elite Four member. - * @param isMale Whether the Elite Four Member is Male or Female (for localization of the title). - * @returns {TrainerConfig} The updated TrainerConfig instance. - **/ - initForEliteFour(signatureSpecies: (Species | Species[])[], isMale: boolean, ...specialtyTypes: Type[]): TrainerConfig { + * Initializes the trainer configuration for an Elite Four member. + * @param {Species | Species[]} signatureSpecies The signature species for the Elite Four member. + * @param isMale Whether the Elite Four Member is Male or Female (for localization of the title). + * @param specialtyType {PokemonType} The specialty type for the Elite Four member. + * @param teraSlot Optional, sets the party member in this slot to Terastallize. + * @returns {TrainerConfig} The updated TrainerConfig instance. + **/ + initForEliteFour( + signatureSpecies: (Species | Species[])[], + isMale: boolean, + specialtyType?: PokemonType, + teraSlot?: number, + ): TrainerConfig { // Check if the internationalization (i18n) system is initialized. if (!getIsInitialized()) { initI18n(); @@ -879,16 +1387,16 @@ export class TrainerConfig { signatureSpecies.forEach((speciesPool, s) => { // Ensure speciesPool is an array. if (!Array.isArray(speciesPool)) { - speciesPool = [ speciesPool ]; + speciesPool = [speciesPool]; } // Set a function to get a random party member from the species pool. this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool)); }); - // Set species filter and specialty types if provided, otherwise filter by base total. - if (specialtyTypes.length) { - this.setSpeciesFilter(p => specialtyTypes.some(t => p.isOfType(t)) && p.baseTotal >= ELITE_FOUR_MINIMUM_BST); - this.setSpecialtyTypes(...specialtyTypes); + // Set species filter and specialty type if provided, otherwise filter by base total. + if (!Utils.isNullOrUndefined(specialtyType)) { + this.setSpeciesFilter(p => p.isOfType(specialtyType) && p.baseTotal >= ELITE_FOUR_MINIMUM_BST); + this.setSpecialtyType(specialtyType); } else { this.setSpeciesFilter(p => p.baseTotal >= ELITE_FOUR_MINIMUM_BST); } @@ -910,17 +1418,17 @@ export class TrainerConfig { this.setHasVoucher(true); this.setBattleBgm("battle_unova_elite"); this.setVictoryBgm("victory_gym"); - this.setGenModifiersFunc(party => getRandomTeraModifiers(party, 1, specialtyTypes.length ? specialtyTypes : undefined)); + this.setRandomTeraModifiers(() => 1, teraSlot); return this; } /** - * Initializes the trainer configuration for a Champion. - * @param {Species | Species[]} signatureSpecies The signature species for the Champion. - * @param isMale Whether the Champion is Male or Female (for localization of the title). - * @returns {TrainerConfig} The updated TrainerConfig instance. - **/ + * Initializes the trainer configuration for a Champion. + * @param {Species | Species[]} signatureSpecies The signature species for the Champion. + * @param isMale Whether the Champion is Male or Female (for localization of the title). + * @returns {TrainerConfig} The updated TrainerConfig instance. + **/ initForChampion(isMale: boolean): TrainerConfig { // Check if the internationalization (i18n) system is initialized. if (!getIsInitialized()) { @@ -940,7 +1448,6 @@ export class TrainerConfig { this.setTitle("champion_female"); } - // Configure various properties for the Champion. this.setMoneyMultiplier(10); this.setBoss(); @@ -967,11 +1474,11 @@ export class TrainerConfig { } /** - * Retrieves the title for the trainer based on the provided trainer slot and variant. - * @param {TrainerSlot} trainerSlot - The slot to determine which title to use. Defaults to TrainerSlot.NONE. - * @param {TrainerVariant} variant - The variant of the trainer to determine the specific title. - * @returns {string} - The title of the trainer. - **/ + * Retrieves the title for the trainer based on the provided trainer slot and variant. + * @param {TrainerSlot} trainerSlot - The slot to determine which title to use. Defaults to TrainerSlot.NONE. + * @param {TrainerVariant} variant - The variant of the trainer to determine the specific title. + * @returns {string} - The title of the trainer. + **/ getTitle(trainerSlot: TrainerSlot = TrainerSlot.NONE, variant: TrainerVariant): string { const ret = this.name; @@ -985,24 +1492,24 @@ export class TrainerConfig { // If the name is already set if (this.nameFemale) { // Check if the variant is either female or this is for the partner in a double battle - if (variant === TrainerVariant.FEMALE || (variant === TrainerVariant.DOUBLE && trainerSlot === TrainerSlot.TRAINER_PARTNER)) { + if ( + variant === TrainerVariant.FEMALE || + (variant === TrainerVariant.DOUBLE && trainerSlot === TrainerSlot.TRAINER_PARTNER) + ) { return this.nameFemale; } - } else + } // Check if !variant is true, if so return the name, else return the name with _female appended - if (variant) { - if (!getIsInitialized()) { - initI18n(); - } - // Check if the female version exists in the i18n file - if (i18next.exists(`trainerClasses:${this.name.toLowerCase()}`)) { - // If it does, return - return ret + "_female"; - } else { - // If it doesn't, we do not do anything and go to the normal return - // This is to prevent the game from displaying an error if a female version of the trainer does not exist in the localization - } + else if (variant) { + if (!getIsInitialized()) { + initI18n(); } + // Check if the female version exists in the i18n file + if (i18next.exists(`trainerClasses:${this.name.toLowerCase()}`)) { + // If it does, return + return ret + "_female"; + } + } } return ret; @@ -1020,37 +1527,36 @@ export class TrainerConfig { globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => { const originalWarn = console.warn; // Ignore warnings for missing frames, because there will be a lot - console.warn = () => { - }; + console.warn = () => {}; const frameNames = globalScene.anims.generateFrameNames(trainerKey, { zeroPad: 4, suffix: ".png", start: 1, - end: 128 + end: 128, }); const partnerFrameNames = isDouble ? globalScene.anims.generateFrameNames(partnerTrainerKey, { - zeroPad: 4, - suffix: ".png", - start: 1, - end: 128 - }) + zeroPad: 4, + suffix: ".png", + start: 1, + end: 128, + }) : ""; console.warn = originalWarn; - if (!(globalScene.anims.exists(trainerKey))) { + if (!globalScene.anims.exists(trainerKey)) { globalScene.anims.create({ key: trainerKey, frames: frameNames, frameRate: 24, - repeat: -1 + repeat: -1, }); } - if (isDouble && !(globalScene.anims.exists(partnerTrainerKey))) { + if (isDouble && !globalScene.anims.exists(partnerTrainerKey)) { globalScene.anims.create({ key: partnerTrainerKey, frames: partnerFrameNames, frameRate: 24, - repeat: -1 + repeat: -1, }); } resolve(); @@ -1061,6 +1567,14 @@ export class TrainerConfig { }); } + /** + * Helper function to check if a specialty type is set + * @returns true if specialtyType is defined and not Type.UNKNOWN + */ + hasSpecialtyType(): boolean { + return !Utils.isNullOrUndefined(this.specialtyType) && this.specialtyType !== PokemonType.UNKNOWN; + } + /** * Creates a shallow copy of a trainer config so that it can be modified without affecting the {@link trainerConfigs} source map */ @@ -1095,16 +1609,14 @@ export class TrainerConfig { clone = this.partyTemplateFunc ? clone.setPartyTemplateFunc(this.partyTemplateFunc) : clone; if (this.partyMemberFuncs) { - Object.keys(this.partyMemberFuncs).forEach((index) => { - clone = clone.setPartyMemberFunc(parseInt(index, 10), this.partyMemberFuncs[index]); + Object.keys(this.partyMemberFuncs).forEach(index => { + clone = clone.setPartyMemberFunc(Number.parseInt(index, 10), this.partyMemberFuncs[index]); }); } clone = this.speciesPools ? clone.setSpeciesPools(this.speciesPools) : clone; clone = this.speciesFilter ? clone.setSpeciesFilter(this.speciesFilter) : clone; - if (this.specialtyTypes) { - clone.specialtyTypes = this.specialtyTypes.slice(0); - } + clone.specialtyType = this.specialtyType; clone.encounterMessages = this.encounterMessages?.slice(0); clone.victoryMessages = this.victoryMessages?.slice(0); @@ -1125,7 +1637,7 @@ export class TrainerConfig { let t = 0; interface TrainerConfigs { - [key: integer]: TrainerConfig + [key: number]: TrainerConfig; } /** @@ -1136,23 +1648,42 @@ function getEvilGruntPartyTemplate(): TrainerPartyTemplate { const waveIndex = globalScene.currentBattle?.waveIndex; if (waveIndex < 40) { return trainerPartyTemplates.TWO_AVG; - } else if (waveIndex < 63) { - return trainerPartyTemplates.THREE_AVG; - } else if (waveIndex < 65) { - return trainerPartyTemplates.TWO_AVG_ONE_STRONG; - } else if (waveIndex < 112) { - return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger - } else { - return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger } + if (waveIndex < 63) { + return trainerPartyTemplates.THREE_AVG; + } + if (waveIndex < 65) { + return trainerPartyTemplates.TWO_AVG_ONE_STRONG; + } + if (waveIndex < 112) { + return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger + } + return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger } function getWavePartyTemplate(...templates: TrainerPartyTemplate[]) { - return templates[Math.min(Math.max(Math.ceil((globalScene.gameMode.getWaveForDifficulty(globalScene.currentBattle?.waveIndex || startingWave, true) - 20) / 30), 0), templates.length - 1)]; + return templates[ + Math.min( + Math.max( + Math.ceil( + (globalScene.gameMode.getWaveForDifficulty(globalScene.currentBattle?.waveIndex || startingWave, true) - 20) / + 30, + ), + 0, + ), + templates.length - 1, + ) + ]; } function getGymLeaderPartyTemplate() { - return getWavePartyTemplate(trainerPartyTemplates.GYM_LEADER_1, trainerPartyTemplates.GYM_LEADER_2, trainerPartyTemplates.GYM_LEADER_3, trainerPartyTemplates.GYM_LEADER_4, trainerPartyTemplates.GYM_LEADER_5); + return getWavePartyTemplate( + trainerPartyTemplates.GYM_LEADER_1, + trainerPartyTemplates.GYM_LEADER_2, + trainerPartyTemplates.GYM_LEADER_3, + trainerPartyTemplates.GYM_LEADER_4, + trainerPartyTemplates.GYM_LEADER_5, + ); } /** @@ -1163,16 +1694,31 @@ function getGymLeaderPartyTemplate() { * @param ignoreEvolution * @param postProcess */ -export function getRandomPartyMemberFunc(speciesPool: Species[], trainerSlot: TrainerSlot = TrainerSlot.TRAINER, ignoreEvolution: boolean = false, postProcess?: (enemyPokemon: EnemyPokemon) => void) { +export function getRandomPartyMemberFunc( + speciesPool: Species[], + trainerSlot: TrainerSlot = TrainerSlot.TRAINER, + ignoreEvolution = false, + postProcess?: (enemyPokemon: EnemyPokemon) => void, +) { return (level: number, strength: PartyMemberStrength) => { let species = Utils.randSeedItem(speciesPool); - if (globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex === 20) { - ignoreEvolution = true; - } if (!ignoreEvolution) { - species = getPokemonSpecies(species).getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex); + species = getPokemonSpecies(species).getTrainerSpeciesForLevel( + level, + true, + strength, + globalScene.currentBattle.waveIndex, + ); } - return globalScene.addEnemyPokemon(getPokemonSpecies(species), level, trainerSlot, undefined, false, undefined, postProcess); + return globalScene.addEnemyPokemon( + getPokemonSpecies(species), + level, + trainerSlot, + undefined, + false, + undefined, + postProcess, + ); }; } @@ -1180,9 +1726,8 @@ function getSpeciesFilterRandomPartyMemberFunc( originalSpeciesFilter: PokemonSpeciesFilter, trainerSlot: TrainerSlot = TrainerSlot.TRAINER, allowLegendaries?: boolean, - postProcess?: (EnemyPokemon: EnemyPokemon) => void + postProcess?: (EnemyPokemon: EnemyPokemon) => void, ): PartyMemberFunc { - const speciesFilter = (species: PokemonSpecies): boolean => { const notLegendary = !species.legendary && !species.subLegendary && !species.mythical; return (allowLegendaries || notLegendary) && !species.isTrainerForbidden() && originalSpeciesFilter(species); @@ -1190,1654 +1735,4101 @@ function getSpeciesFilterRandomPartyMemberFunc( return (level: number, strength: PartyMemberStrength) => { const waveIndex = globalScene.currentBattle.waveIndex; - const species = getPokemonSpecies(globalScene.randomSpecies(waveIndex, level, false, speciesFilter) - .getTrainerSpeciesForLevel(level, true, strength, waveIndex)); + const species = getPokemonSpecies( + globalScene + .randomSpecies(waveIndex, level, false, speciesFilter) + .getTrainerSpeciesForLevel(level, true, strength, waveIndex), + ); return globalScene.addEnemyPokemon(species, level, trainerSlot, undefined, false, undefined, postProcess); }; } -function getRandomTeraModifiers(party: EnemyPokemon[], count: integer, types?: Type[]): PersistentModifier[] { - const ret: PersistentModifier[] = []; - const partyMemberIndexes = new Array(party.length).fill(null).map((_, i) => i); - for (let t = 0; t < Math.min(count, party.length); t++) { - const randomIndex = Utils.randSeedItem(partyMemberIndexes); - partyMemberIndexes.splice(partyMemberIndexes.indexOf(randomIndex), 1); - ret.push(modifierTypes.TERA_SHARD().generateType([], [ Utils.randSeedItem(types ? types : party[randomIndex].getTypes()) ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(party[randomIndex]) as PersistentModifier); // TODO: is the bang correct? - } - return ret; -} - -type SignatureSpecies = { - [key in string]: (Species | Species[])[]; -}; - -/* - * The signature species for each Gym Leader, Elite Four member, and Champion. - * The key is the trainer type, and the value is an array of Species or Species arrays. - * This is in a separate const so it can be accessed from other places and not just the trainerConfigs - */ -export const signatureSpecies: SignatureSpecies = { - BROCK: [ Species.GEODUDE, Species.ONIX ], - MISTY: [ Species.STARYU, Species.PSYDUCK ], - LT_SURGE: [ Species.VOLTORB, Species.PIKACHU, Species.ELECTABUZZ ], - ERIKA: [ Species.ODDISH, Species.BELLSPROUT, Species.TANGELA, Species.HOPPIP ], - JANINE: [ Species.VENONAT, Species.SPINARAK, Species.ZUBAT ], - SABRINA: [ Species.ABRA, Species.MR_MIME, Species.ESPEON ], - BLAINE: [ Species.GROWLITHE, Species.PONYTA, Species.MAGMAR ], - GIOVANNI: [ Species.SANDILE, Species.MURKROW, Species.NIDORAN_M, Species.NIDORAN_F ], - FALKNER: [ Species.PIDGEY, Species.HOOTHOOT, Species.DODUO ], - BUGSY: [ Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR ], - WHITNEY: [ Species.JIGGLYPUFF, Species.MILTANK, Species.AIPOM, Species.GIRAFARIG ], - MORTY: [ Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE ], - CHUCK: [ Species.POLIWRATH, Species.MANKEY ], - JASMINE: [ Species.MAGNEMITE, Species.STEELIX ], - PRYCE: [ Species.SEEL, Species.SWINUB ], - CLAIR: [ Species.DRATINI, Species.HORSEA, Species.GYARADOS ], - ROXANNE: [ Species.GEODUDE, Species.NOSEPASS ], - BRAWLY: [ Species.MACHOP, Species.MAKUHITA ], - WATTSON: [ Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE ], - FLANNERY: [ Species.SLUGMA, Species.TORKOAL, Species.NUMEL ], - NORMAN: [ Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON, Species.KECLEON ], - WINONA: [ Species.SWABLU, Species.WINGULL, Species.TROPIUS, Species.SKARMORY ], - TATE: [ Species.SOLROCK, Species.NATU, Species.CHIMECHO, Species.GALLADE ], - LIZA: [ Species.LUNATONE, Species.SPOINK, Species.BALTOY, Species.GARDEVOIR ], - JUAN: [ Species.HORSEA, Species.BARBOACH, Species.SPHEAL, Species.RELICANTH ], - ROARK: [ Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE ], - GARDENIA: [ Species.ROSELIA, Species.TANGELA, Species.TURTWIG ], - MAYLENE: [ Species.LUCARIO, Species.MEDITITE, Species.CHIMCHAR ], - CRASHER_WAKE: [ Species.BUIZEL, Species.WOOPER, Species.PIPLUP, Species.MAGIKARP ], - FANTINA: [ Species.MISDREAVUS, Species.DRIFLOON, Species.SPIRITOMB ], - BYRON: [ Species.SHIELDON, Species.BRONZOR, Species.AGGRON ], - CANDICE: [ Species.SNEASEL, Species.SNOVER, Species.SNORUNT ], - VOLKNER: [ Species.SHINX, Species.CHINCHOU, Species.ROTOM ], - CILAN: [ Species.PANSAGE, Species.FOONGUS, Species.PETILIL ], - CHILI: [ Species.PANSEAR, Species.DARUMAKA, Species.NUMEL ], - CRESS: [ Species.PANPOUR, Species.TYMPOLE, Species.SLOWPOKE ], - CHEREN: [ Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE ], - LENORA: [ Species.PATRAT, Species.DEERLING, Species.AUDINO ], - ROXIE: [ Species.VENIPEDE, Species.TRUBBISH, Species.SKORUPI ], - BURGH: [ Species.SEWADDLE, Species.SHELMET, Species.KARRABLAST ], - ELESA: [ Species.EMOLGA, Species.BLITZLE, Species.JOLTIK ], - CLAY: [ Species.DRILBUR, Species.SANDILE, Species.GOLETT ], - SKYLA: [ Species.DUCKLETT, Species.WOOBAT, Species.RUFFLET ], - BRYCEN: [ Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO ], - DRAYDEN: [ Species.DRUDDIGON, Species.AXEW, Species.DEINO ], - MARLON: [ Species.WAILMER, Species.FRILLISH, Species.TIRTOUGA ], - VIOLA: [ Species.SURSKIT, Species.SCATTERBUG ], - GRANT: [ Species.AMAURA, Species.TYRUNT ], - KORRINA: [ Species.HAWLUCHA, Species.LUCARIO, Species.MIENFOO ], - RAMOS: [ Species.SKIDDO, Species.HOPPIP, Species.BELLSPROUT ], - CLEMONT: [ Species.HELIOPTILE, Species.MAGNEMITE, Species.EMOLGA ], - VALERIE: [ Species.SYLVEON, Species.MAWILE, Species.MR_MIME ], - OLYMPIA: [ Species.ESPURR, Species.SIGILYPH, Species.SLOWKING ], - WULFRIC: [ Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL ], - MILO: [ Species.GOSSIFLEUR, Species.APPLIN, Species.BOUNSWEET ], - NESSA: [ Species.CHEWTLE, Species.ARROKUDA, Species.WIMPOD ], - KABU: [ Species.SIZZLIPEDE, Species.VULPIX, Species.TORKOAL ], - BEA: [ Species.GALAR_FARFETCHD, Species.MACHOP, Species.CLOBBOPUS ], - ALLISTER: [ Species.GALAR_YAMASK, Species.GALAR_CORSOLA, Species.GASTLY ], - OPAL: [ Species.MILCERY, Species.TOGETIC, Species.GALAR_WEEZING ], - BEDE: [ Species.HATENNA, Species.GALAR_PONYTA, Species.GARDEVOIR ], - GORDIE: [ Species.ROLYCOLY, Species.STONJOURNER, Species.BINACLE ], - MELONY: [ Species.SNOM, Species.GALAR_DARUMAKA, Species.GALAR_MR_MIME ], - PIERS: [ Species.GALAR_ZIGZAGOON, Species.SCRAGGY, Species.INKAY ], - MARNIE: [ Species.IMPIDIMP, Species.PURRLOIN, Species.MORPEKO ], - RAIHAN: [ Species.DURALUDON, Species.TURTONATOR, Species.GOOMY ], - KATY: [ Species.NYMBLE, Species.TAROUNTULA, Species.HERACROSS ], - BRASSIUS: [ Species.SMOLIV, Species.SHROOMISH, Species.ODDISH ], - IONO: [ Species.TADBULB, Species.WATTREL, Species.VOLTORB ], - KOFU: [ Species.VELUZA, Species.WIGLETT, Species.WINGULL ], - LARRY: [ Species.STARLY, Species.DUNSPARCE, Species.LECHONK, Species.KOMALA ], - RYME: [ Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU ], - TULIP: [ Species.GIRAFARIG, Species.FLITTLE, Species.RALTS ], - GRUSHA: [ Species.CETODDLE, Species.ALOLA_VULPIX, Species.CUBCHOO ], - LORELEI: [ Species.JYNX, [ Species.SLOWBRO, Species.GALAR_SLOWBRO ], Species.LAPRAS, [ Species.ALOLA_SANDSLASH, Species.CLOYSTER ]], - BRUNO: [ Species.MACHAMP, Species.HITMONCHAN, Species.HITMONLEE, [ Species.ALOLA_GOLEM, Species.GOLEM ]], - AGATHA: [ Species.GENGAR, [ Species.ARBOK, Species.WEEZING ], Species.CROBAT, Species.ALOLA_MAROWAK ], - LANCE: [ Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR ], - WILL: [ Species.XATU, Species.JYNX, [ Species.SLOWBRO, Species.SLOWKING ], Species.EXEGGUTOR ], - KOGA: [[ Species.WEEZING, Species.MUK ], [ Species.VENOMOTH, Species.ARIADOS ], Species.CROBAT, Species.TENTACRUEL ], - KAREN: [ Species.UMBREON, Species.HONCHKROW, Species.HOUNDOOM, Species.WEAVILE ], - SIDNEY: [[ Species.SHIFTRY, Species.CACTURNE ], [ Species.SHARPEDO, Species.CRAWDAUNT ], Species.ABSOL, Species.MIGHTYENA ], - PHOEBE: [ Species.SABLEYE, Species.DUSKNOIR, Species.BANETTE, [ Species.MISMAGIUS, Species.DRIFBLIM ]], - GLACIA: [ Species.GLALIE, Species.WALREIN, Species.FROSLASS, Species.ABOMASNOW ], - DRAKE: [ Species.ALTARIA, Species.SALAMENCE, Species.FLYGON, Species.KINGDRA ], - AARON: [[ Species.SCIZOR, Species.KLEAVOR ], Species.HERACROSS, [ Species.VESPIQUEN, Species.YANMEGA ], Species.DRAPION ], - BERTHA: [ Species.WHISCASH, Species.HIPPOWDON, Species.GLISCOR, Species.RHYPERIOR ], - FLINT: [[ Species.FLAREON, Species.RAPIDASH ], Species.MAGMORTAR, [ Species.STEELIX, Species.LOPUNNY ], Species.INFERNAPE ], - LUCIAN: [ Species.MR_MIME, Species.GALLADE, Species.BRONZONG, [ Species.ALAKAZAM, Species.ESPEON ]], - SHAUNTAL: [ Species.COFAGRIGUS, Species.CHANDELURE, Species.GOLURK, Species.JELLICENT ], - MARSHAL: [ Species.CONKELDURR, Species.MIENSHAO, Species.THROH, Species.SAWK ], - GRIMSLEY: [ Species.LIEPARD, Species.KINGAMBIT, Species.SCRAFTY, Species.KROOKODILE ], - CAITLIN: [ Species.MUSHARNA, Species.GOTHITELLE, Species.SIGILYPH, Species.REUNICLUS ], - MALVA: [ Species.PYROAR, Species.TORKOAL, Species.CHANDELURE, Species.TALONFLAME ], - SIEBOLD: [ Species.CLAWITZER, Species.GYARADOS, Species.BARBARACLE, Species.STARMIE ], - WIKSTROM: [ Species.KLEFKI, Species.PROBOPASS, Species.SCIZOR, Species.AEGISLASH ], - DRASNA: [ Species.DRAGALGE, Species.DRUDDIGON, Species.ALTARIA, Species.NOIVERN ], - HALA: [ Species.HARIYAMA, Species.BEWEAR, Species.CRABOMINABLE, [ Species.POLIWRATH, Species.ANNIHILAPE ]], - MOLAYNE: [ Species.KLEFKI, Species.MAGNEZONE, Species.METAGROSS, Species.ALOLA_DUGTRIO ], - OLIVIA: [ Species.RELICANTH, Species.CARBINK, Species.ALOLA_GOLEM, Species.LYCANROC ], - ACEROLA: [[ Species.BANETTE, Species.DRIFBLIM ], Species.MIMIKYU, Species.DHELMISE, Species.PALOSSAND ], - KAHILI: [[ Species.BRAVIARY, Species.MANDIBUZZ ], Species.HAWLUCHA, Species.ORICORIO, Species.TOUCANNON ], - MARNIE_ELITE: [ Species.MORPEKO, Species.LIEPARD, [ Species.TOXICROAK, Species.SCRAFTY ], Species.GRIMMSNARL ], - NESSA_ELITE: [ Species.GOLISOPOD, [ Species.PELIPPER, Species.QUAGSIRE ], Species.TOXAPEX, Species.DREDNAW ], - BEA_ELITE: [ Species.HAWLUCHA, [ Species.GRAPPLOCT, Species.SIRFETCHD ], Species.FALINKS, Species.MACHAMP ], - ALLISTER_ELITE: [ Species.DUSKNOIR, [ Species.POLTEAGEIST, Species.RUNERIGUS ], Species.CURSOLA, Species.GENGAR ], - RAIHAN_ELITE: [ Species.GOODRA, [ Species.TORKOAL, Species.TURTONATOR ], Species.FLYGON, Species.ARCHALUDON ], - RIKA: [ Species.WHISCASH, [ Species.DONPHAN, Species.DUGTRIO ], Species.CAMERUPT, Species.CLODSIRE ], - POPPY: [ Species.COPPERAJAH, Species.BRONZONG, Species.CORVIKNIGHT, Species.TINKATON ], - LARRY_ELITE: [ Species.STARAPTOR, Species.FLAMIGO, Species.ALTARIA, Species.TROPIUS ], - HASSEL: [ Species.NOIVERN, [ Species.FLAPPLE, Species.APPLETUN ], Species.DRAGALGE, Species.BAXCALIBUR ], - CRISPIN: [ Species.TALONFLAME, Species.CAMERUPT, Species.MAGMORTAR, Species.BLAZIKEN ], - AMARYS: [ Species.SKARMORY, Species.EMPOLEON, Species.SCIZOR, Species.METAGROSS ], - LACEY: [ Species.EXCADRILL, Species.PRIMARINA, [ Species.ALCREMIE, Species.GRANBULL ], Species.WHIMSICOTT ], - DRAYTON: [ Species.DRAGONITE, Species.ARCHALUDON, Species.HAXORUS, Species.SCEPTILE ], -}; - export const trainerConfigs: TrainerConfigs = { [TrainerType.UNKNOWN]: new TrainerConfig(0).setHasGenders(), - [TrainerType.ACE_TRAINER]: new TrainerConfig(++t).setHasGenders("Ace Trainer Female").setHasDouble("Ace Duo").setMoneyMultiplier(2.25).setEncounterBgm(TrainerType.ACE_TRAINER) - .setPartyTemplateFunc(() => getWavePartyTemplate(trainerPartyTemplates.THREE_WEAK_BALANCED, trainerPartyTemplates.FOUR_WEAK_BALANCED, trainerPartyTemplates.FIVE_WEAK_BALANCED, trainerPartyTemplates.SIX_WEAK_BALANCED)), - [TrainerType.ARTIST]: new TrainerConfig(++t).setEncounterBgm(TrainerType.RICH).setPartyTemplates(trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.THREE_AVG) - .setSpeciesPools([ Species.SMEARGLE ]), - [TrainerType.BACKERS]: new TrainerConfig(++t).setHasGenders("Backers").setDoubleOnly().setEncounterBgm(TrainerType.CYCLIST), - [TrainerType.BACKPACKER]: new TrainerConfig(++t).setHasGenders("Backpacker Female").setHasDouble("Backpackers").setSpeciesFilter(s => s.isOfType(Type.FLYING) || s.isOfType(Type.ROCK)).setEncounterBgm(TrainerType.BACKPACKER) - .setPartyTemplates(trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.ONE_WEAK_ONE_STRONG, trainerPartyTemplates.ONE_AVG_ONE_STRONG) + [TrainerType.ACE_TRAINER]: new TrainerConfig(++t) + .setHasGenders("Ace Trainer Female") + .setHasDouble("Ace Duo") + .setMoneyMultiplier(2.25) + .setEncounterBgm(TrainerType.ACE_TRAINER) + .setPartyTemplateFunc(() => + getWavePartyTemplate( + trainerPartyTemplates.THREE_WEAK_BALANCED, + trainerPartyTemplates.FOUR_WEAK_BALANCED, + trainerPartyTemplates.FIVE_WEAK_BALANCED, + trainerPartyTemplates.SIX_WEAK_BALANCED, + ), + ), + [TrainerType.ARTIST]: new TrainerConfig(++t) + .setEncounterBgm(TrainerType.RICH) + .setPartyTemplates(trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.THREE_AVG) + .setSpeciesPools([Species.SMEARGLE]), + [TrainerType.BACKERS]: new TrainerConfig(++t) + .setHasGenders("Backers") + .setDoubleOnly() + .setEncounterBgm(TrainerType.CYCLIST), + [TrainerType.BACKPACKER]: new TrainerConfig(++t) + .setHasGenders("Backpacker Female") + .setHasDouble("Backpackers") + .setSpeciesFilter(s => s.isOfType(PokemonType.FLYING) || s.isOfType(PokemonType.ROCK)) + .setEncounterBgm(TrainerType.BACKPACKER) + .setPartyTemplates( + trainerPartyTemplates.ONE_STRONG, + trainerPartyTemplates.ONE_WEAK_ONE_STRONG, + trainerPartyTemplates.ONE_AVG_ONE_STRONG, + ) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.RHYHORN, Species.AIPOM, Species.MAKUHITA, Species.MAWILE, Species.NUMEL, Species.LILLIPUP, Species.SANDILE, Species.WOOLOO ], - [TrainerPoolTier.UNCOMMON]: [ Species.GIRAFARIG, Species.ZANGOOSE, Species.SEVIPER, Species.CUBCHOO, Species.PANCHAM, Species.SKIDDO, Species.MUDBRAY ], - [TrainerPoolTier.RARE]: [ Species.TAUROS, Species.STANTLER, Species.DARUMAKA, Species.BOUFFALANT, Species.DEERLING, Species.IMPIDIMP ], - [TrainerPoolTier.SUPER_RARE]: [ Species.GALAR_DARUMAKA, Species.TEDDIURSA ] + [TrainerPoolTier.COMMON]: [ + Species.RHYHORN, + Species.AIPOM, + Species.MAKUHITA, + Species.MAWILE, + Species.NUMEL, + Species.LILLIPUP, + Species.SANDILE, + Species.WOOLOO, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.GIRAFARIG, + Species.ZANGOOSE, + Species.SEVIPER, + Species.CUBCHOO, + Species.PANCHAM, + Species.SKIDDO, + Species.MUDBRAY, + ], + [TrainerPoolTier.RARE]: [ + Species.TAUROS, + Species.STANTLER, + Species.DARUMAKA, + Species.BOUFFALANT, + Species.DEERLING, + Species.IMPIDIMP, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.GALAR_DARUMAKA, Species.TEDDIURSA], }), - [TrainerType.BAKER]: new TrainerConfig(++t).setEncounterBgm(TrainerType.CLERK).setMoneyMultiplier(1.35).setSpeciesFilter(s => s.isOfType(Type.GRASS) || s.isOfType(Type.FIRE)), + [TrainerType.BAKER]: new TrainerConfig(++t) + .setEncounterBgm(TrainerType.CLERK) + .setMoneyMultiplier(1.35) + .setSpeciesFilter(s => s.isOfType(PokemonType.GRASS) || s.isOfType(PokemonType.FIRE)), [TrainerType.BEAUTY]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.PARASOL_LADY), - [TrainerType.BIKER]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.ROUGHNECK).setSpeciesFilter(s => s.isOfType(Type.POISON)), - [TrainerType.BLACK_BELT]: new TrainerConfig(++t).setHasGenders("Battle Girl", TrainerType.PSYCHIC).setHasDouble("Crush Kin").setEncounterBgm(TrainerType.ROUGHNECK).setSpecialtyTypes(Type.FIGHTING) - .setPartyTemplates(trainerPartyTemplates.TWO_WEAK_ONE_AVG, trainerPartyTemplates.TWO_WEAK_ONE_AVG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_ONE_STRONG, trainerPartyTemplates.THREE_AVG, trainerPartyTemplates.TWO_AVG_ONE_STRONG) + [TrainerType.BIKER]: new TrainerConfig(++t) + .setMoneyMultiplier(1.4) + .setEncounterBgm(TrainerType.ROUGHNECK) + .setSpeciesFilter(s => s.isOfType(PokemonType.POISON)), + [TrainerType.BLACK_BELT]: new TrainerConfig(++t) + .setHasGenders("Battle Girl", TrainerType.PSYCHIC) + .setHasDouble("Crush Kin") + .setEncounterBgm(TrainerType.ROUGHNECK) + .setSpecialtyType(PokemonType.FIGHTING) + .setPartyTemplates( + trainerPartyTemplates.TWO_WEAK_ONE_AVG, + trainerPartyTemplates.TWO_WEAK_ONE_AVG, + trainerPartyTemplates.TWO_AVG, + trainerPartyTemplates.TWO_AVG, + trainerPartyTemplates.TWO_WEAK_ONE_STRONG, + trainerPartyTemplates.THREE_AVG, + trainerPartyTemplates.TWO_AVG_ONE_STRONG, + ) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.NIDORAN_F, Species.NIDORAN_M, Species.MACHOP, Species.MAKUHITA, Species.MEDITITE, Species.CROAGUNK, Species.TIMBURR ], - [TrainerPoolTier.UNCOMMON]: [ Species.MANKEY, Species.POLIWRATH, Species.TYROGUE, Species.BRELOOM, Species.SCRAGGY, Species.MIENFOO, Species.PANCHAM, Species.STUFFUL, Species.CRABRAWLER ], - [TrainerPoolTier.RARE]: [ Species.HERACROSS, Species.RIOLU, Species.THROH, Species.SAWK, Species.PASSIMIAN, Species.CLOBBOPUS ], - [TrainerPoolTier.SUPER_RARE]: [ Species.HITMONTOP, Species.INFERNAPE, Species.GALLADE, Species.HAWLUCHA, Species.HAKAMO_O ], - [TrainerPoolTier.ULTRA_RARE]: [ Species.KUBFU ] + [TrainerPoolTier.COMMON]: [ + Species.NIDORAN_F, + Species.NIDORAN_M, + Species.MACHOP, + Species.MAKUHITA, + Species.MEDITITE, + Species.CROAGUNK, + Species.TIMBURR, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.MANKEY, + Species.POLIWRATH, + Species.TYROGUE, + Species.BRELOOM, + Species.SCRAGGY, + Species.MIENFOO, + Species.PANCHAM, + Species.STUFFUL, + Species.CRABRAWLER, + ], + [TrainerPoolTier.RARE]: [ + Species.HERACROSS, + Species.RIOLU, + Species.THROH, + Species.SAWK, + Species.PASSIMIAN, + Species.CLOBBOPUS, + ], + [TrainerPoolTier.SUPER_RARE]: [ + Species.HITMONTOP, + Species.INFERNAPE, + Species.GALLADE, + Species.HAWLUCHA, + Species.HAKAMO_O, + ], + [TrainerPoolTier.ULTRA_RARE]: [Species.KUBFU], }), - [TrainerType.BREEDER]: new TrainerConfig(++t).setMoneyMultiplier(1.325).setEncounterBgm(TrainerType.POKEFAN).setHasGenders("Breeder Female").setHasDouble("Breeders") - .setPartyTemplateFunc(() => getWavePartyTemplate(trainerPartyTemplates.FOUR_WEAKER, trainerPartyTemplates.FIVE_WEAKER, trainerPartyTemplates.SIX_WEAKER)) + [TrainerType.BREEDER]: new TrainerConfig(++t) + .setMoneyMultiplier(1.325) + .setEncounterBgm(TrainerType.POKEFAN) + .setHasGenders("Breeder Female") + .setHasDouble("Breeders") + .setPartyTemplateFunc(() => + getWavePartyTemplate( + trainerPartyTemplates.FOUR_WEAKER, + trainerPartyTemplates.FIVE_WEAKER, + trainerPartyTemplates.SIX_WEAKER, + ), + ) .setSpeciesFilter(s => s.baseTotal < 450), - [TrainerType.CLERK]: new TrainerConfig(++t).setHasGenders("Clerk Female").setHasDouble("Colleagues").setEncounterBgm(TrainerType.CLERK) - .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.THREE_WEAK, trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_ONE_AVG) + [TrainerType.CLERK]: new TrainerConfig(++t) + .setHasGenders("Clerk Female") + .setHasDouble("Colleagues") + .setEncounterBgm(TrainerType.CLERK) + .setPartyTemplates( + trainerPartyTemplates.TWO_WEAK, + trainerPartyTemplates.THREE_WEAK, + trainerPartyTemplates.ONE_AVG, + trainerPartyTemplates.TWO_AVG, + trainerPartyTemplates.TWO_WEAK_ONE_AVG, + ) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.MEOWTH, Species.PSYDUCK, Species.BUDEW, Species.PIDOVE, Species.CINCCINO, Species.LITLEO ], - [TrainerPoolTier.UNCOMMON]: [ Species.JIGGLYPUFF, Species.MAGNEMITE, Species.MARILL, Species.COTTONEE, Species.SKIDDO ], - [TrainerPoolTier.RARE]: [ Species.BUIZEL, Species.SNEASEL, Species.KLEFKI, Species.INDEEDEE ] + [TrainerPoolTier.COMMON]: [ + Species.MEOWTH, + Species.PSYDUCK, + Species.BUDEW, + Species.PIDOVE, + Species.CINCCINO, + Species.LITLEO, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.JIGGLYPUFF, + Species.MAGNEMITE, + Species.MARILL, + Species.COTTONEE, + Species.SKIDDO, + ], + [TrainerPoolTier.RARE]: [Species.BUIZEL, Species.SNEASEL, Species.KLEFKI, Species.INDEEDEE], }), - [TrainerType.CYCLIST]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setHasGenders("Cyclist Female").setHasDouble("Cyclists").setEncounterBgm(TrainerType.CYCLIST) + [TrainerType.CYCLIST]: new TrainerConfig(++t) + .setMoneyMultiplier(1.3) + .setHasGenders("Cyclist Female") + .setHasDouble("Cyclists") + .setEncounterBgm(TrainerType.CYCLIST) .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.ONE_AVG) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.PICHU, Species.STARLY, Species.TAILLOW, Species.BOLTUND ], - [TrainerPoolTier.UNCOMMON]: [ Species.DODUO, Species.ELECTRIKE, Species.BLITZLE, Species.WATTREL ], - [TrainerPoolTier.RARE]: [ Species.YANMA, Species.NINJASK, Species.WHIRLIPEDE, Species.EMOLGA ], - [TrainerPoolTier.SUPER_RARE]: [ Species.ACCELGOR, Species.DREEPY ] + [TrainerPoolTier.COMMON]: [Species.PICHU, Species.STARLY, Species.TAILLOW, Species.BOLTUND], + [TrainerPoolTier.UNCOMMON]: [Species.DODUO, Species.ELECTRIKE, Species.BLITZLE, Species.WATTREL], + [TrainerPoolTier.RARE]: [Species.YANMA, Species.NINJASK, Species.WHIRLIPEDE, Species.EMOLGA], + [TrainerPoolTier.SUPER_RARE]: [Species.ACCELGOR, Species.DREEPY], }), - [TrainerType.DANCER]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.CYCLIST) - .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_TWO_WEAK_SAME) + [TrainerType.DANCER]: new TrainerConfig(++t) + .setMoneyMultiplier(1.55) + .setEncounterBgm(TrainerType.CYCLIST) + .setPartyTemplates( + trainerPartyTemplates.TWO_WEAK, + trainerPartyTemplates.ONE_AVG, + trainerPartyTemplates.TWO_AVG, + trainerPartyTemplates.TWO_WEAK_SAME_TWO_WEAK_SAME, + ) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.RALTS, Species.SPOINK, Species.LOTAD, Species.BUDEW ], - [TrainerPoolTier.UNCOMMON]: [ Species.SPINDA, Species.SWABLU, Species.MARACTUS, ], - [TrainerPoolTier.RARE]: [ Species.BELLOSSOM, Species.HITMONTOP, Species.MIME_JR, Species.ORICORIO ], - [TrainerPoolTier.SUPER_RARE]: [ Species.POPPLIO ] + [TrainerPoolTier.COMMON]: [Species.RALTS, Species.SPOINK, Species.LOTAD, Species.BUDEW], + [TrainerPoolTier.UNCOMMON]: [Species.SPINDA, Species.SWABLU, Species.MARACTUS], + [TrainerPoolTier.RARE]: [Species.BELLOSSOM, Species.HITMONTOP, Species.MIME_JR, Species.ORICORIO], + [TrainerPoolTier.SUPER_RARE]: [Species.POPPLIO], }), [TrainerType.DEPOT_AGENT]: new TrainerConfig(++t).setMoneyMultiplier(1.45).setEncounterBgm(TrainerType.CLERK), - [TrainerType.DOCTOR]: new TrainerConfig(++t).setHasGenders("Nurse", "lass").setHasDouble("Medical Team").setMoneyMultiplier(3).setEncounterBgm(TrainerType.CLERK) + [TrainerType.DOCTOR]: new TrainerConfig(++t) + .setHasGenders("Nurse", "lass") + .setHasDouble("Medical Team") + .setMoneyMultiplier(3) + .setEncounterBgm(TrainerType.CLERK) .setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.HEAL_PULSE)), - [TrainerType.FIREBREATHER]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.ROUGHNECK) - .setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.SMOG) || s.isOfType(Type.FIRE)), - [TrainerType.FISHERMAN]: new TrainerConfig(++t).setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.BACKPACKER).setSpecialtyTypes(Type.WATER) - .setPartyTemplates(trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.THREE_WEAK_SAME, trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.SIX_WEAKER) + [TrainerType.FIREBREATHER]: new TrainerConfig(++t) + .setMoneyMultiplier(1.4) + .setEncounterBgm(TrainerType.ROUGHNECK) + .setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.SMOG) || s.isOfType(PokemonType.FIRE)), + [TrainerType.FISHERMAN]: new TrainerConfig(++t) + .setMoneyMultiplier(1.25) + .setEncounterBgm(TrainerType.BACKPACKER) + .setSpecialtyType(PokemonType.WATER) + .setPartyTemplates( + trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, + trainerPartyTemplates.ONE_AVG, + trainerPartyTemplates.THREE_WEAK_SAME, + trainerPartyTemplates.ONE_STRONG, + trainerPartyTemplates.SIX_WEAKER, + ) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.TENTACOOL, Species.MAGIKARP, Species.GOLDEEN, Species.STARYU, Species.REMORAID, Species.SKRELP, Species.CLAUNCHER, Species.ARROKUDA ], - [TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.SHELLDER, Species.KRABBY, Species.HORSEA, Species.CARVANHA, Species.BARBOACH, Species.CORPHISH, Species.FINNEON, Species.TYMPOLE, Species.BASCULIN, Species.FRILLISH, Species.INKAY ], - [TrainerPoolTier.RARE]: [ Species.CHINCHOU, Species.CORSOLA, Species.WAILMER, Species.BARBOACH, Species.CLAMPERL, Species.LUVDISC, Species.MANTYKE, Species.ALOMOMOLA, Species.TATSUGIRI, Species.VELUZA ], - [TrainerPoolTier.SUPER_RARE]: [ Species.LAPRAS, Species.FEEBAS, Species.RELICANTH, Species.DONDOZO ] + [TrainerPoolTier.COMMON]: [ + Species.TENTACOOL, + Species.MAGIKARP, + Species.GOLDEEN, + Species.STARYU, + Species.REMORAID, + Species.SKRELP, + Species.CLAUNCHER, + Species.ARROKUDA, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.POLIWAG, + Species.SHELLDER, + Species.KRABBY, + Species.HORSEA, + Species.CARVANHA, + Species.BARBOACH, + Species.CORPHISH, + Species.FINNEON, + Species.TYMPOLE, + Species.BASCULIN, + Species.FRILLISH, + Species.INKAY, + ], + [TrainerPoolTier.RARE]: [ + Species.CHINCHOU, + Species.CORSOLA, + Species.WAILMER, + Species.BARBOACH, + Species.CLAMPERL, + Species.LUVDISC, + Species.MANTYKE, + Species.ALOMOMOLA, + Species.TATSUGIRI, + Species.VELUZA, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.LAPRAS, Species.FEEBAS, Species.RELICANTH, Species.DONDOZO], }), - [TrainerType.GUITARIST]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.ROUGHNECK).setSpecialtyTypes(Type.ELECTRIC).setSpeciesFilter(s => s.isOfType(Type.ELECTRIC)), - [TrainerType.HARLEQUIN]: new TrainerConfig(++t).setEncounterBgm(TrainerType.PSYCHIC).setSpeciesFilter(s => tmSpecies[Moves.TRICK_ROOM].indexOf(s.speciesId) > -1), - [TrainerType.HIKER]: new TrainerConfig(++t).setEncounterBgm(TrainerType.BACKPACKER) - .setPartyTemplates(trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG, trainerPartyTemplates.TWO_AVG_SAME_ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.FOUR_WEAK, trainerPartyTemplates.ONE_STRONG) + [TrainerType.GUITARIST]: new TrainerConfig(++t) + .setMoneyMultiplier(1.2) + .setEncounterBgm(TrainerType.ROUGHNECK) + .setSpecialtyType(PokemonType.ELECTRIC) + .setSpeciesFilter(s => s.isOfType(PokemonType.ELECTRIC)), + [TrainerType.HARLEQUIN]: new TrainerConfig(++t) + .setEncounterBgm(TrainerType.PSYCHIC) + .setSpeciesFilter(s => tmSpecies[Moves.TRICK_ROOM].indexOf(s.speciesId) > -1), + [TrainerType.HIKER]: new TrainerConfig(++t) + .setEncounterBgm(TrainerType.BACKPACKER) + .setPartyTemplates( + trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG, + trainerPartyTemplates.TWO_AVG_SAME_ONE_STRONG, + trainerPartyTemplates.TWO_AVG, + trainerPartyTemplates.FOUR_WEAK, + trainerPartyTemplates.ONE_STRONG, + ) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.SANDSHREW, Species.DIGLETT, Species.GEODUDE, Species.MACHOP, Species.ARON, Species.ROGGENROLA, Species.DRILBUR, Species.NACLI ], - [TrainerPoolTier.UNCOMMON]: [ Species.ZUBAT, Species.RHYHORN, Species.ONIX, Species.CUBONE, Species.WOOBAT, Species.SWINUB, Species.NOSEPASS, Species.HIPPOPOTAS, Species.DWEBBLE, Species.KLAWF, Species.TOEDSCOOL ], - [TrainerPoolTier.RARE]: [ Species.TORKOAL, Species.TRAPINCH, Species.BARBOACH, Species.GOLETT, Species.ALOLA_DIGLETT, Species.ALOLA_GEODUDE, Species.GALAR_STUNFISK, Species.PALDEA_WOOPER ], - [TrainerPoolTier.SUPER_RARE]: [ Species.MAGBY, Species.LARVITAR ] + [TrainerPoolTier.COMMON]: [ + Species.SANDSHREW, + Species.DIGLETT, + Species.GEODUDE, + Species.MACHOP, + Species.ARON, + Species.ROGGENROLA, + Species.DRILBUR, + Species.NACLI, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.ZUBAT, + Species.RHYHORN, + Species.ONIX, + Species.CUBONE, + Species.WOOBAT, + Species.SWINUB, + Species.NOSEPASS, + Species.HIPPOPOTAS, + Species.DWEBBLE, + Species.KLAWF, + Species.TOEDSCOOL, + ], + [TrainerPoolTier.RARE]: [ + Species.TORKOAL, + Species.TRAPINCH, + Species.BARBOACH, + Species.GOLETT, + Species.ALOLA_DIGLETT, + Species.ALOLA_GEODUDE, + Species.GALAR_STUNFISK, + Species.PALDEA_WOOPER, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.MAGBY, Species.LARVITAR], }), - [TrainerType.HOOLIGANS]: new TrainerConfig(++t).setDoubleOnly().setEncounterBgm(TrainerType.ROUGHNECK).setSpeciesFilter(s => s.isOfType(Type.POISON) || s.isOfType(Type.DARK)), + [TrainerType.HOOLIGANS]: new TrainerConfig(++t) + .setDoubleOnly() + .setEncounterBgm(TrainerType.ROUGHNECK) + .setSpeciesFilter(s => s.isOfType(PokemonType.POISON) || s.isOfType(PokemonType.DARK)), [TrainerType.HOOPSTER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST), [TrainerType.INFIELDER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST), [TrainerType.JANITOR]: new TrainerConfig(++t).setMoneyMultiplier(1.1).setEncounterBgm(TrainerType.CLERK), [TrainerType.LINEBACKER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST), [TrainerType.MAID]: new TrainerConfig(++t).setMoneyMultiplier(1.6).setEncounterBgm(TrainerType.RICH), - [TrainerType.MUSICIAN]: new TrainerConfig(++t).setEncounterBgm(TrainerType.ROUGHNECK).setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.SING)), - [TrainerType.HEX_MANIAC]: new TrainerConfig(++t).setMoneyMultiplier(1.5).setEncounterBgm(TrainerType.PSYCHIC) - .setPartyTemplates(trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.ONE_AVG_ONE_STRONG, trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG, trainerPartyTemplates.THREE_AVG, trainerPartyTemplates.TWO_STRONG) - .setSpeciesFilter(s => s.isOfType(Type.GHOST)), + [TrainerType.MUSICIAN]: new TrainerConfig(++t) + .setEncounterBgm(TrainerType.ROUGHNECK) + .setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.SING)), + [TrainerType.HEX_MANIAC]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .setEncounterBgm(TrainerType.PSYCHIC) + .setPartyTemplates( + trainerPartyTemplates.TWO_AVG, + trainerPartyTemplates.ONE_AVG_ONE_STRONG, + trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG, + trainerPartyTemplates.THREE_AVG, + trainerPartyTemplates.TWO_STRONG, + ) + .setSpeciesFilter(s => s.isOfType(PokemonType.GHOST)), [TrainerType.NURSERY_AIDE]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setEncounterBgm("lass"), - [TrainerType.OFFICER]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.CLERK) - .setPartyTemplates(trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG) + [TrainerType.OFFICER]: new TrainerConfig(++t) + .setMoneyMultiplier(1.55) + .setEncounterBgm(TrainerType.CLERK) + .setPartyTemplates( + trainerPartyTemplates.ONE_AVG, + trainerPartyTemplates.ONE_STRONG, + trainerPartyTemplates.TWO_AVG, + trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, + ) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.VULPIX, Species.GROWLITHE, Species.SNUBBULL, Species.POOCHYENA, Species.ELECTRIKE, Species.LILLIPUP, Species.YAMPER, Species.FIDOUGH ], - [TrainerPoolTier.UNCOMMON]: [ Species.HOUNDOUR, Species.ROCKRUFF, Species.MASCHIFF ], - [TrainerPoolTier.RARE]: [ Species.JOLTEON, Species.RIOLU ], + [TrainerPoolTier.COMMON]: [ + Species.VULPIX, + Species.GROWLITHE, + Species.SNUBBULL, + Species.POOCHYENA, + Species.ELECTRIKE, + Species.LILLIPUP, + Species.YAMPER, + Species.FIDOUGH, + ], + [TrainerPoolTier.UNCOMMON]: [Species.HOUNDOUR, Species.ROCKRUFF, Species.MASCHIFF], + [TrainerPoolTier.RARE]: [Species.JOLTEON, Species.RIOLU], [TrainerPoolTier.SUPER_RARE]: [], - [TrainerPoolTier.ULTRA_RARE]: [ Species.ENTEI, Species.SUICUNE, Species.RAIKOU ] + [TrainerPoolTier.ULTRA_RARE]: [Species.ENTEI, Species.SUICUNE, Species.RAIKOU], }), - [TrainerType.PARASOL_LADY]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.PARASOL_LADY).setSpeciesFilter(s => s.isOfType(Type.WATER)), - [TrainerType.PILOT]: new TrainerConfig(++t).setEncounterBgm(TrainerType.CLERK).setSpeciesFilter(s => tmSpecies[Moves.FLY].indexOf(s.speciesId) > -1), - [TrainerType.POKEFAN]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setName("PokéFan").setHasGenders("PokéFan Female").setHasDouble("PokéFan Family").setEncounterBgm(TrainerType.POKEFAN) - .setPartyTemplates(trainerPartyTemplates.SIX_WEAKER, trainerPartyTemplates.FOUR_WEAK, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.FOUR_WEAK_SAME, trainerPartyTemplates.FIVE_WEAK, trainerPartyTemplates.SIX_WEAKER_SAME), - [TrainerType.PRESCHOOLER]: new TrainerConfig(++t).setMoneyMultiplier(0.2).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders("Preschooler Female", "lass").setHasDouble("Preschoolers") - .setPartyTemplates(trainerPartyTemplates.THREE_WEAK, trainerPartyTemplates.FOUR_WEAKER, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, trainerPartyTemplates.FIVE_WEAKER) + [TrainerType.PARASOL_LADY]: new TrainerConfig(++t) + .setMoneyMultiplier(1.55) + .setEncounterBgm(TrainerType.PARASOL_LADY) + .setSpeciesFilter(s => s.isOfType(PokemonType.WATER)), + [TrainerType.PILOT]: new TrainerConfig(++t) + .setEncounterBgm(TrainerType.CLERK) + .setSpeciesFilter(s => tmSpecies[Moves.FLY].indexOf(s.speciesId) > -1), + [TrainerType.POKEFAN]: new TrainerConfig(++t) + .setMoneyMultiplier(1.4) + .setName("PokéFan") + .setHasGenders("PokéFan Female") + .setHasDouble("PokéFan Family") + .setEncounterBgm(TrainerType.POKEFAN) + .setPartyTemplates( + trainerPartyTemplates.SIX_WEAKER, + trainerPartyTemplates.FOUR_WEAK, + trainerPartyTemplates.TWO_AVG, + trainerPartyTemplates.ONE_STRONG, + trainerPartyTemplates.FOUR_WEAK_SAME, + trainerPartyTemplates.FIVE_WEAK, + trainerPartyTemplates.SIX_WEAKER_SAME, + ), + [TrainerType.PRESCHOOLER]: new TrainerConfig(++t) + .setMoneyMultiplier(0.2) + .setEncounterBgm(TrainerType.YOUNGSTER) + .setHasGenders("Preschooler Female", "lass") + .setHasDouble("Preschoolers") + .setPartyTemplates( + trainerPartyTemplates.THREE_WEAK, + trainerPartyTemplates.FOUR_WEAKER, + trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, + trainerPartyTemplates.FIVE_WEAKER, + ) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.CATERPIE, Species.PICHU, Species.SANDSHREW, Species.LEDYBA, Species.BUDEW, Species.BURMY, Species.WOOLOO, Species.PAWMI, Species.SMOLIV ], - [TrainerPoolTier.UNCOMMON]: [ Species.EEVEE, Species.CLEFFA, Species.IGGLYBUFF, Species.SWINUB, Species.WOOPER, Species.DRIFLOON, Species.DEDENNE, Species.STUFFUL ], - [TrainerPoolTier.RARE]: [ Species.RALTS, Species.RIOLU, Species.JOLTIK, Species.TANDEMAUS ], - [TrainerPoolTier.SUPER_RARE]: [ Species.DARUMAKA, Species.TINKATINK ], + [TrainerPoolTier.COMMON]: [ + Species.CATERPIE, + Species.PICHU, + Species.SANDSHREW, + Species.LEDYBA, + Species.BUDEW, + Species.BURMY, + Species.WOOLOO, + Species.PAWMI, + Species.SMOLIV, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.EEVEE, + Species.CLEFFA, + Species.IGGLYBUFF, + Species.SWINUB, + Species.WOOPER, + Species.DRIFLOON, + Species.DEDENNE, + Species.STUFFUL, + ], + [TrainerPoolTier.RARE]: [Species.RALTS, Species.RIOLU, Species.JOLTIK, Species.TANDEMAUS], + [TrainerPoolTier.SUPER_RARE]: [Species.DARUMAKA, Species.TINKATINK], }), - [TrainerType.PSYCHIC]: new TrainerConfig(++t).setHasGenders("Psychic Female").setHasDouble("Psychics").setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.PSYCHIC) - .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, trainerPartyTemplates.TWO_WEAK_SAME_TWO_WEAK_SAME, trainerPartyTemplates.ONE_STRONGER) + [TrainerType.PSYCHIC]: new TrainerConfig(++t) + .setHasGenders("Psychic Female") + .setHasDouble("Psychics") + .setMoneyMultiplier(1.4) + .setEncounterBgm(TrainerType.PSYCHIC) + .setPartyTemplates( + trainerPartyTemplates.TWO_WEAK, + trainerPartyTemplates.TWO_AVG, + trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, + trainerPartyTemplates.TWO_WEAK_SAME_TWO_WEAK_SAME, + trainerPartyTemplates.ONE_STRONGER, + ) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.ABRA, Species.DROWZEE, Species.RALTS, Species.SPOINK, Species.GOTHITA, Species.SOLOSIS, Species.BLIPBUG, Species.ESPURR, Species.HATENNA ], - [TrainerPoolTier.UNCOMMON]: [ Species.MIME_JR, Species.EXEGGCUTE, Species.MEDITITE, Species.NATU, Species.EXEGGCUTE, Species.WOOBAT, Species.INKAY, Species.ORANGURU ], - [TrainerPoolTier.RARE]: [ Species.ELGYEM, Species.SIGILYPH, Species.BALTOY, Species.GIRAFARIG, Species.MEOWSTIC ], - [TrainerPoolTier.SUPER_RARE]: [ Species.BELDUM, Species.ESPEON, Species.STANTLER ], + [TrainerPoolTier.COMMON]: [ + Species.ABRA, + Species.DROWZEE, + Species.RALTS, + Species.SPOINK, + Species.GOTHITA, + Species.SOLOSIS, + Species.BLIPBUG, + Species.ESPURR, + Species.HATENNA, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.MIME_JR, + Species.EXEGGCUTE, + Species.MEDITITE, + Species.NATU, + Species.EXEGGCUTE, + Species.WOOBAT, + Species.INKAY, + Species.ORANGURU, + ], + [TrainerPoolTier.RARE]: [Species.ELGYEM, Species.SIGILYPH, Species.BALTOY, Species.GIRAFARIG, Species.MEOWSTIC], + [TrainerPoolTier.SUPER_RARE]: [Species.BELDUM, Species.ESPEON, Species.STANTLER], }), - [TrainerType.RANGER]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setName("Pokémon Ranger").setEncounterBgm(TrainerType.BACKPACKER).setHasGenders("Pokémon Ranger Female").setHasDouble("Pokémon Rangers") + [TrainerType.RANGER]: new TrainerConfig(++t) + .setMoneyMultiplier(1.4) + .setName("Pokémon Ranger") + .setEncounterBgm(TrainerType.BACKPACKER) + .setHasGenders("Pokémon Ranger Female") + .setHasDouble("Pokémon Rangers") .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.PICHU, Species.GROWLITHE, Species.PONYTA, Species.ZIGZAGOON, Species.SEEDOT, Species.BIDOOF, Species.RIOLU, Species.SEWADDLE, Species.SKIDDO, Species.SALANDIT, Species.YAMPER ], - [TrainerPoolTier.UNCOMMON]: [ Species.AZURILL, Species.TAUROS, Species.MAREEP, Species.FARFETCHD, Species.TEDDIURSA, Species.SHROOMISH, Species.ELECTRIKE, Species.BUDEW, Species.BUIZEL, Species.MUDBRAY, Species.STUFFUL ], - [TrainerPoolTier.RARE]: [ Species.EEVEE, Species.SCYTHER, Species.KANGASKHAN, Species.RALTS, Species.MUNCHLAX, Species.ZORUA, Species.PALDEA_TAUROS, Species.TINKATINK, Species.CYCLIZAR, Species.FLAMIGO ], - [TrainerPoolTier.SUPER_RARE]: [ Species.LARVESTA ], + [TrainerPoolTier.COMMON]: [ + Species.PICHU, + Species.GROWLITHE, + Species.PONYTA, + Species.ZIGZAGOON, + Species.SEEDOT, + Species.BIDOOF, + Species.RIOLU, + Species.SEWADDLE, + Species.SKIDDO, + Species.SALANDIT, + Species.YAMPER, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.AZURILL, + Species.TAUROS, + Species.MAREEP, + Species.FARFETCHD, + Species.TEDDIURSA, + Species.SHROOMISH, + Species.ELECTRIKE, + Species.BUDEW, + Species.BUIZEL, + Species.MUDBRAY, + Species.STUFFUL, + ], + [TrainerPoolTier.RARE]: [ + Species.EEVEE, + Species.SCYTHER, + Species.KANGASKHAN, + Species.RALTS, + Species.MUNCHLAX, + Species.ZORUA, + Species.PALDEA_TAUROS, + Species.TINKATINK, + Species.CYCLIZAR, + Species.FLAMIGO, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.LARVESTA], }), - [TrainerType.RICH]: new TrainerConfig(++t).setMoneyMultiplier(5).setName("Gentleman").setHasGenders("Madame").setHasDouble("Rich Couple"), - [TrainerType.RICH_KID]: new TrainerConfig(++t).setMoneyMultiplier(3.75).setName("Rich Boy").setHasGenders("Lady").setHasDouble("Rich Kids").setEncounterBgm(TrainerType.RICH), - [TrainerType.ROUGHNECK]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.ROUGHNECK).setSpeciesFilter(s => s.isOfType(Type.DARK)), - [TrainerType.SAILOR]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.BACKPACKER).setSpeciesFilter(s => s.isOfType(Type.WATER) || s.isOfType(Type.FIGHTING)), - [TrainerType.SCIENTIST]: new TrainerConfig(++t).setHasGenders("Scientist Female").setHasDouble("Scientists").setMoneyMultiplier(1.7).setEncounterBgm(TrainerType.SCIENTIST) + [TrainerType.RICH]: new TrainerConfig(++t) + .setMoneyMultiplier(5) + .setName("Gentleman") + .setHasGenders("Madame") + .setHasDouble("Rich Couple"), + [TrainerType.RICH_KID]: new TrainerConfig(++t) + .setMoneyMultiplier(3.75) + .setName("Rich Boy") + .setHasGenders("Lady") + .setHasDouble("Rich Kids") + .setEncounterBgm(TrainerType.RICH), + [TrainerType.ROUGHNECK]: new TrainerConfig(++t) + .setMoneyMultiplier(1.4) + .setEncounterBgm(TrainerType.ROUGHNECK) + .setSpeciesFilter(s => s.isOfType(PokemonType.DARK)), + [TrainerType.SAILOR]: new TrainerConfig(++t) + .setMoneyMultiplier(1.4) + .setEncounterBgm(TrainerType.BACKPACKER) + .setSpeciesFilter(s => s.isOfType(PokemonType.WATER) || s.isOfType(PokemonType.FIGHTING)), + [TrainerType.SCIENTIST]: new TrainerConfig(++t) + .setHasGenders("Scientist Female") + .setHasDouble("Scientists") + .setMoneyMultiplier(1.7) + .setEncounterBgm(TrainerType.SCIENTIST) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.MAGNEMITE, Species.GRIMER, Species.DROWZEE, Species.VOLTORB, Species.KOFFING ], - [TrainerPoolTier.UNCOMMON]: [ Species.BALTOY, Species.BRONZOR, Species.FERROSEED, Species.KLINK, Species.CHARJABUG, Species.BLIPBUG, Species.HELIOPTILE ], - [TrainerPoolTier.RARE]: [ Species.ABRA, Species.DITTO, Species.PORYGON, Species.ELEKID, Species.SOLOSIS, Species.GALAR_WEEZING ], - [TrainerPoolTier.SUPER_RARE]: [ Species.OMANYTE, Species.KABUTO, Species.AERODACTYL, Species.LILEEP, Species.ANORITH, Species.CRANIDOS, Species.SHIELDON, Species.TIRTOUGA, Species.ARCHEN, Species.ARCTOVISH, Species.ARCTOZOLT, Species.DRACOVISH, Species.DRACOZOLT ], - [TrainerPoolTier.ULTRA_RARE]: [ Species.ROTOM, Species.MELTAN ] + [TrainerPoolTier.COMMON]: [Species.MAGNEMITE, Species.GRIMER, Species.DROWZEE, Species.VOLTORB, Species.KOFFING], + [TrainerPoolTier.UNCOMMON]: [ + Species.BALTOY, + Species.BRONZOR, + Species.FERROSEED, + Species.KLINK, + Species.CHARJABUG, + Species.BLIPBUG, + Species.HELIOPTILE, + ], + [TrainerPoolTier.RARE]: [ + Species.ABRA, + Species.DITTO, + Species.PORYGON, + Species.ELEKID, + Species.SOLOSIS, + Species.GALAR_WEEZING, + ], + [TrainerPoolTier.SUPER_RARE]: [ + Species.OMANYTE, + Species.KABUTO, + Species.AERODACTYL, + Species.LILEEP, + Species.ANORITH, + Species.CRANIDOS, + Species.SHIELDON, + Species.TIRTOUGA, + Species.ARCHEN, + Species.ARCTOVISH, + Species.ARCTOZOLT, + Species.DRACOVISH, + Species.DRACOZOLT, + ], + [TrainerPoolTier.ULTRA_RARE]: [Species.ROTOM, Species.MELTAN], }), [TrainerType.SMASHER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST), - [TrainerType.SNOW_WORKER]: new TrainerConfig(++t).setName("Worker").setHasDouble("Workers").setMoneyMultiplier(1.7).setEncounterBgm(TrainerType.CLERK).setSpeciesFilter(s => s.isOfType(Type.ICE) || s.isOfType(Type.STEEL)), + [TrainerType.SNOW_WORKER]: new TrainerConfig(++t) + .setName("Worker") + .setHasDouble("Workers") + .setMoneyMultiplier(1.7) + .setEncounterBgm(TrainerType.CLERK) + .setSpeciesFilter(s => s.isOfType(PokemonType.ICE) || s.isOfType(PokemonType.STEEL)), [TrainerType.STRIKER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST), - [TrainerType.SCHOOL_KID]: new TrainerConfig(++t).setMoneyMultiplier(0.75).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders("School Kid Female", "lass").setHasDouble("School Kids") + [TrainerType.SCHOOL_KID]: new TrainerConfig(++t) + .setMoneyMultiplier(0.75) + .setEncounterBgm(TrainerType.YOUNGSTER) + .setHasGenders("School Kid Female", "lass") + .setHasDouble("School Kids") .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.ODDISH, Species.EXEGGCUTE, Species.TEDDIURSA, Species.WURMPLE, Species.RALTS, Species.SHROOMISH, Species.FLETCHLING ], - [TrainerPoolTier.UNCOMMON]: [ Species.VOLTORB, Species.WHISMUR, Species.MEDITITE, Species.MIME_JR, Species.NYMBLE ], - [TrainerPoolTier.RARE]: [ Species.TANGELA, Species.EEVEE, Species.YANMA ], - [TrainerPoolTier.SUPER_RARE]: [ Species.TADBULB ] + [TrainerPoolTier.COMMON]: [ + Species.ODDISH, + Species.EXEGGCUTE, + Species.TEDDIURSA, + Species.WURMPLE, + Species.RALTS, + Species.SHROOMISH, + Species.FLETCHLING, + ], + [TrainerPoolTier.UNCOMMON]: [Species.VOLTORB, Species.WHISMUR, Species.MEDITITE, Species.MIME_JR, Species.NYMBLE], + [TrainerPoolTier.RARE]: [Species.TANGELA, Species.EEVEE, Species.YANMA], + [TrainerPoolTier.SUPER_RARE]: [Species.TADBULB], }), - [TrainerType.SWIMMER]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setEncounterBgm(TrainerType.PARASOL_LADY).setHasGenders("Swimmer Female").setHasDouble("Swimmers").setSpecialtyTypes(Type.WATER).setSpeciesFilter(s => s.isOfType(Type.WATER)), - [TrainerType.TWINS]: new TrainerConfig(++t).setDoubleOnly().setMoneyMultiplier(0.65).setUseSameSeedForAllMembers() - .setPartyTemplateFunc(() => getWavePartyTemplate(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_STRONG)) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PLUSLE, Species.VOLBEAT, Species.PACHIRISU, Species.SILCOON, Species.METAPOD, Species.IGGLYBUFF, Species.PETILIL, Species.EEVEE ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MINUN, Species.ILLUMISE, Species.EMOLGA, Species.CASCOON, Species.KAKUNA, Species.CLEFFA, Species.COTTONEE, Species.EEVEE ], TrainerSlot.TRAINER_PARTNER)) + [TrainerType.SWIMMER]: new TrainerConfig(++t) + .setMoneyMultiplier(1.3) + .setEncounterBgm(TrainerType.PARASOL_LADY) + .setHasGenders("Swimmer Female") + .setHasDouble("Swimmers") + .setSpecialtyType(PokemonType.WATER) + .setSpeciesFilter(s => s.isOfType(PokemonType.WATER)), + [TrainerType.TWINS]: new TrainerConfig(++t) + .setDoubleOnly() + .setMoneyMultiplier(0.65) + .setUseSameSeedForAllMembers() + .setPartyTemplateFunc(() => + getWavePartyTemplate( + trainerPartyTemplates.TWO_WEAK, + trainerPartyTemplates.TWO_AVG, + trainerPartyTemplates.TWO_STRONG, + ), + ) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([ + Species.PLUSLE, + Species.VOLBEAT, + Species.PACHIRISU, + Species.SILCOON, + Species.METAPOD, + Species.IGGLYBUFF, + Species.PETILIL, + Species.EEVEE, + ]), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc( + [ + Species.MINUN, + Species.ILLUMISE, + Species.EMOLGA, + Species.CASCOON, + Species.KAKUNA, + Species.CLEFFA, + Species.COTTONEE, + Species.EEVEE, + ], + TrainerSlot.TRAINER_PARTNER, + ), + ) .setEncounterBgm(TrainerType.TWINS), - [TrainerType.VETERAN]: new TrainerConfig(++t).setHasGenders("Veteran Female").setHasDouble("Veteran Duo").setMoneyMultiplier(2.5).setEncounterBgm(TrainerType.ACE_TRAINER).setSpeciesFilter(s => s.isOfType(Type.DRAGON)), - [TrainerType.WAITER]: new TrainerConfig(++t).setHasGenders("Waitress").setHasDouble("Restaurant Staff").setMoneyMultiplier(1.5).setEncounterBgm(TrainerType.CLERK) + [TrainerType.VETERAN]: new TrainerConfig(++t) + .setHasGenders("Veteran Female") + .setHasDouble("Veteran Duo") + .setMoneyMultiplier(2.5) + .setEncounterBgm(TrainerType.ACE_TRAINER) + .setSpeciesFilter(s => s.isOfType(PokemonType.DRAGON)), + [TrainerType.WAITER]: new TrainerConfig(++t) + .setHasGenders("Waitress") + .setHasDouble("Restaurant Staff") + .setMoneyMultiplier(1.5) + .setEncounterBgm(TrainerType.CLERK) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.CLEFFA, Species.CHATOT, Species.PANSAGE, Species.PANSEAR, Species.PANPOUR, Species.MINCCINO ], - [TrainerPoolTier.UNCOMMON]: [ Species.TROPIUS, Species.PETILIL, Species.BOUNSWEET, Species.INDEEDEE ], - [TrainerPoolTier.RARE]: [ Species.APPLIN, Species.SINISTEA, Species.POLTCHAGEIST ] + [TrainerPoolTier.COMMON]: [ + Species.CLEFFA, + Species.CHATOT, + Species.PANSAGE, + Species.PANSEAR, + Species.PANPOUR, + Species.MINCCINO, + ], + [TrainerPoolTier.UNCOMMON]: [Species.TROPIUS, Species.PETILIL, Species.BOUNSWEET, Species.INDEEDEE], + [TrainerPoolTier.RARE]: [Species.APPLIN, Species.SINISTEA, Species.POLTCHAGEIST], }), - [TrainerType.WORKER]: new TrainerConfig(++t).setHasGenders("Worker Female").setHasDouble("Workers").setEncounterBgm(TrainerType.CLERK).setMoneyMultiplier(1.7).setSpeciesFilter(s => s.isOfType(Type.ROCK) || s.isOfType(Type.STEEL)), - [TrainerType.YOUNGSTER]: new TrainerConfig(++t).setMoneyMultiplier(0.5).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders("Lass", "lass").setHasDouble("Beginners").setPartyTemplates(trainerPartyTemplates.TWO_WEAKER) - .setSpeciesPools( - [ Species.CATERPIE, Species.WEEDLE, Species.RATTATA, Species.SENTRET, Species.POOCHYENA, Species.ZIGZAGOON, Species.WURMPLE, Species.BIDOOF, Species.PATRAT, Species.LILLIPUP ] + [TrainerType.WORKER]: new TrainerConfig(++t) + .setHasGenders("Worker Female") + .setHasDouble("Workers") + .setEncounterBgm(TrainerType.CLERK) + .setMoneyMultiplier(1.7) + .setSpeciesFilter(s => s.isOfType(PokemonType.ROCK) || s.isOfType(PokemonType.STEEL)), + [TrainerType.YOUNGSTER]: new TrainerConfig(++t) + .setMoneyMultiplier(0.5) + .setEncounterBgm(TrainerType.YOUNGSTER) + .setHasGenders("Lass", "lass") + .setHasDouble("Beginners") + .setPartyTemplates(trainerPartyTemplates.TWO_WEAKER) + .setSpeciesPools([ + Species.CATERPIE, + Species.WEEDLE, + Species.RATTATA, + Species.SENTRET, + Species.POOCHYENA, + Species.ZIGZAGOON, + Species.WURMPLE, + Species.BIDOOF, + Species.PATRAT, + Species.LILLIPUP, + ]), + [TrainerType.ROCKET_GRUNT]: new TrainerConfig(++t) + .setHasGenders("Rocket Grunt Female") + .setHasDouble("Rocket Grunts") + .setMoneyMultiplier(1.0) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_rocket_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setSpeciesPools({ + [TrainerPoolTier.COMMON]: [ + Species.WEEDLE, + Species.RATTATA, + Species.EKANS, + Species.SANDSHREW, + Species.ZUBAT, + Species.ODDISH, + Species.GEODUDE, + Species.SLOWPOKE, + Species.GRIMER, + Species.KOFFING, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.MANKEY, + Species.GROWLITHE, + Species.MAGNEMITE, + Species.GASTLY, + Species.VOLTORB, + Species.EXEGGCUTE, + Species.CUBONE, + Species.LICKITUNG, + Species.SCYTHER, + Species.TAUROS, + Species.GYARADOS, + Species.MURKROW, + Species.ELEKID, + Species.MAGBY, + ], + [TrainerPoolTier.RARE]: [ + Species.PORYGON, + Species.OMANYTE, + Species.KABUTO, + Species.ALOLA_RATTATA, + Species.ALOLA_SANDSHREW, + Species.ALOLA_MEOWTH, + Species.ALOLA_GEODUDE, + Species.ALOLA_GRIMER, + Species.PALDEA_TAUROS, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.DRATINI, Species.LARVITAR], + }), + [TrainerType.ARCHER]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("rocket_admin", "rocket", [Species.HOUNDOOM]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_rocket_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.ARIANA]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("rocket_admin_female", "rocket", [Species.ARBOK]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_rocket_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.PROTON]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("rocket_admin", "rocket", [Species.CROBAT]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_rocket_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.PETREL]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("rocket_admin", "rocket", [Species.WEEZING]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_rocket_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.MAGMA_GRUNT]: new TrainerConfig(++t) + .setHasGenders("Magma Grunt Female") + .setHasDouble("Magma Grunts") + .setMoneyMultiplier(1.0) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_aqua_magma_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setSpeciesPools({ + [TrainerPoolTier.COMMON]: [ + Species.DIGLETT, + Species.GROWLITHE, + Species.SLUGMA, + Species.MAGBY, + Species.POOCHYENA, + Species.ZIGZAGOON, + Species.NUMEL, + Species.TORKOAL, + Species.BALTOY, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.RHYHORN, + Species.GLIGAR, + Species.PHANPY, + Species.SOLROCK, + Species.HIPPOPOTAS, + Species.HEATMOR, + Species.ROLYCOLY, + Species.SILICOBRA, + ], + [TrainerPoolTier.RARE]: [ + Species.ARON, + Species.TRAPINCH, + Species.LILEEP, + Species.ANORITH, + Species.TURTONATOR, + Species.TOEDSCOOL, + Species.HISUI_GROWLITHE, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.CHARCADET, Species.CAPSAKID], + }), + [TrainerType.TABITHA]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("magma_admin", "magma", [Species.CAMERUPT]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_aqua_magma_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.COURTNEY]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("magma_admin_female", "magma", [Species.CAMERUPT]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_aqua_magma_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.AQUA_GRUNT]: new TrainerConfig(++t) + .setHasGenders("Aqua Grunt Female") + .setHasDouble("Aqua Grunts") + .setMoneyMultiplier(1.0) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_aqua_magma_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setSpeciesPools({ + [TrainerPoolTier.COMMON]: [ + Species.QWILFISH, + Species.REMORAID, + Species.ZIGZAGOON, + Species.LOTAD, + Species.CARVANHA, + Species.WAILMER, + Species.BARBOACH, + Species.CORPHISH, + Species.SPHEAL, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.TENTACOOL, + Species.HORSEA, + Species.CHINCHOU, + Species.WOOPER, + Species.WINGULL, + Species.AZURILL, + Species.CLAMPERL, + Species.CLOBBOPUS, + ], + [TrainerPoolTier.RARE]: [ + Species.MANTYKE, + Species.SKRELP, + Species.DHELMISE, + Species.ARROKUDA, + Species.HISUI_QWILFISH, + Species.PALDEA_WOOPER, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.BASCULEGION, Species.DONDOZO], + }), + [TrainerType.MATT]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("aqua_admin", "aqua", [Species.SHARPEDO]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_aqua_magma_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.SHELLY]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("aqua_admin_female", "aqua", [Species.SHARPEDO]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_aqua_magma_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.GALACTIC_GRUNT]: new TrainerConfig(++t) + .setHasGenders("Galactic Grunt Female") + .setHasDouble("Galactic Grunts") + .setMoneyMultiplier(1.0) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_galactic_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setSpeciesPools({ + [TrainerPoolTier.COMMON]: [ + Species.WURMPLE, + Species.SHINX, + Species.BURMY, + Species.DRIFLOON, + Species.GLAMEOW, + Species.STUNKY, + Species.BRONZOR, + Species.CROAGUNK, + Species.CARNIVINE, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.ZUBAT, + Species.LICKITUNG, + Species.RHYHORN, + Species.TANGELA, + Species.YANMA, + Species.GLIGAR, + Species.SWINUB, + Species.SKORUPI, + ], + [TrainerPoolTier.RARE]: [ + Species.SNEASEL, + Species.ELEKID, + Species.MAGBY, + Species.DUSKULL, + Species.HISUI_GROWLITHE, + Species.HISUI_QWILFISH, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.SPIRITOMB, Species.ROTOM, Species.HISUI_SNEASEL], + }), + [TrainerType.JUPITER]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.SKUNTANK]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_galactic_admin") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.MARS]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.PURUGLY]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_galactic_admin") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.SATURN]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("galactic_commander", "galactic", [Species.TOXICROAK]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_galactic_admin") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.PLASMA_GRUNT]: new TrainerConfig(++t) + .setHasGenders("Plasma Grunt Female") + .setHasDouble("Plasma Grunts") + .setMoneyMultiplier(1.0) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_plasma_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setSpeciesPools({ + [TrainerPoolTier.COMMON]: [ + Species.PATRAT, + Species.LILLIPUP, + Species.PURRLOIN, + Species.WOOBAT, + Species.TYMPOLE, + Species.SANDILE, + Species.SCRAGGY, + Species.TRUBBISH, + Species.VANILLITE, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.TIMBURR, + Species.VENIPEDE, + Species.DARUMAKA, + Species.FOONGUS, + Species.FRILLISH, + Species.JOLTIK, + Species.KLINK, + Species.CUBCHOO, + Species.GOLETT, + ], + [TrainerPoolTier.RARE]: [ + Species.DRILBUR, + Species.ZORUA, + Species.MIENFOO, + Species.PAWNIARD, + Species.BOUFFALANT, + Species.RUFFLET, + Species.VULLABY, + Species.DURANT, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.AXEW, Species.DRUDDIGON, Species.DEINO, Species.HISUI_ZORUA], + }), + [TrainerType.ZINZOLIN]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("plasma_sage", "plasma", [Species.CRYOGONAL]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_plasma_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.COLRESS]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("plasma_boss", "plasma_2", [Species.KLINKLANG]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_colress") + .setMixedBattleBgm("battle_colress") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.FLARE_GRUNT]: new TrainerConfig(++t) + .setHasGenders("Flare Grunt Female") + .setHasDouble("Flare Grunts") + .setMoneyMultiplier(1.0) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_flare_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setSpeciesPools({ + [TrainerPoolTier.COMMON]: [ + Species.PONYTA, + Species.HOUNDOUR, + Species.SKORUPI, + Species.CROAGUNK, + Species.SCRAGGY, + Species.FLETCHLING, + Species.SCATTERBUG, + Species.LITLEO, + Species.ESPURR, + Species.INKAY, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.POOCHYENA, + Species.ELECTRIKE, + Species.PURRLOIN, + Species.FOONGUS, + Species.PANCHAM, + Species.BINACLE, + Species.SKRELP, + Species.CLAUNCHER, + Species.HELIOPTILE, + Species.PHANTUMP, + Species.PUMPKABOO, + ], + [TrainerPoolTier.RARE]: [Species.SNEASEL, Species.LITWICK, Species.PAWNIARD, Species.SLIGGOO], + [TrainerPoolTier.SUPER_RARE]: [Species.NOIBAT, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG], + }), + [TrainerType.BRYONY]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("flare_admin_female", "flare", [Species.LIEPARD]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_flare_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.XEROSIC]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("flare_admin", "flare", [Species.MALAMAR]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_flare_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.AETHER_GRUNT]: new TrainerConfig(++t) + .setHasGenders("Aether Grunt Female") + .setHasDouble("Aether Grunts") + .setMoneyMultiplier(1.0) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_aether_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setSpeciesPools({ + [TrainerPoolTier.COMMON]: [ + Species.CORSOLA, + Species.LILLIPUP, + Species.PIKIPEK, + Species.YUNGOOS, + Species.ROCKRUFF, + Species.MORELULL, + Species.BOUNSWEET, + Species.COMFEY, + Species.KOMALA, + Species.TOGEDEMARU, + Species.ALOLA_RAICHU, + Species.ALOLA_DIGLETT, + Species.ALOLA_GEODUDE, + Species.ALOLA_EXEGGUTOR, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.POLIWAG, + Species.CRABRAWLER, + Species.ORICORIO, + Species.CUTIEFLY, + Species.WISHIWASHI, + Species.MUDBRAY, + Species.STUFFUL, + Species.ORANGURU, + Species.PASSIMIAN, + Species.PYUKUMUKU, + Species.MINIOR, + Species.BRUXISH, + Species.ALOLA_SANDSHREW, + Species.ALOLA_VULPIX, + Species.ALOLA_MAROWAK, + ], + [TrainerPoolTier.RARE]: [ + Species.MAGNEMITE, + Species.TURTONATOR, + Species.MIMIKYU, + Species.DRAMPA, + Species.GALAR_CORSOLA, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.PORYGON, Species.JANGMO_O], + }), + [TrainerType.FABA]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("aether_admin", "aether", [Species.HYPNO]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_aether_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.SKULL_GRUNT]: new TrainerConfig(++t) + .setHasGenders("Skull Grunt Female") + .setHasDouble("Skull Grunts") + .setMoneyMultiplier(1.0) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_skull_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setSpeciesPools({ + [TrainerPoolTier.COMMON]: [ + Species.EKANS, + Species.DROWZEE, + Species.KOFFING, + Species.SPINARAK, + Species.SCRAGGY, + Species.TRUBBISH, + Species.MAREANIE, + Species.SALANDIT, + Species.ALOLA_RATTATA, + Species.ALOLA_MEOWTH, + Species.ALOLA_GRIMER, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.ZUBAT, + Species.GASTLY, + Species.HOUNDOUR, + Species.SABLEYE, + Species.VENIPEDE, + Species.SANDILE, + Species.VULLABY, + Species.PANCHAM, + Species.FOMANTIS, + Species.ALOLA_MAROWAK, + ], + [TrainerPoolTier.RARE]: [ + Species.PAWNIARD, + Species.WISHIWASHI, + Species.SANDYGAST, + Species.MIMIKYU, + Species.DHELMISE, + Species.NYMBLE, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.GRUBBIN, Species.DEWPIDER], + }), + [TrainerType.PLUMERIA]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("skull_admin", "skull", [Species.SALAZZLE]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_skull_admin") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.MACRO_GRUNT]: new TrainerConfig(++t) + .setHasGenders("Macro Grunt Female") + .setHasDouble("Macro Grunts") + .setMoneyMultiplier(1.0) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_macro_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setSpeciesPools({ + [TrainerPoolTier.COMMON]: [ + Species.STEELIX, + Species.MAWILE, + Species.FERROSEED, + Species.KLINK, + Species.SKWOVET, + Species.ROOKIDEE, + Species.CRAMORANT, + Species.CUFANT, + Species.GALAR_MEOWTH, + Species.GALAR_ZIGZAGOON, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.MAGNEMITE, + Species.RIOLU, + Species.DRILBUR, + Species.APPLIN, + Species.ARROKUDA, + Species.SINISTEA, + Species.HATENNA, + Species.GALAR_PONYTA, + Species.GALAR_YAMASK, + ], + [TrainerPoolTier.RARE]: [ + Species.SCIZOR, + Species.BELDUM, + Species.HONEDGE, + Species.FALINKS, + Species.GALAR_FARFETCHD, + Species.GALAR_MR_MIME, + Species.GALAR_DARUMAKA, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.DURALUDON, Species.DREEPY], + }), + [TrainerType.OLEANA]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("macro_admin", "macro", [Species.GARBODOR]) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_oleana") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), + [TrainerType.STAR_GRUNT]: new TrainerConfig(++t) + .setHasGenders("Star Grunt Female") + .setHasDouble("Star Grunts") + .setMoneyMultiplier(1.0) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_star_grunt") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setSpeciesPools({ + [TrainerPoolTier.COMMON]: [ + Species.DUNSPARCE, + Species.HOUNDOUR, + Species.AZURILL, + Species.GULPIN, + Species.FOONGUS, + Species.FLETCHLING, + Species.LITLEO, + Species.FLABEBE, + Species.CRABRAWLER, + Species.NYMBLE, + Species.PAWMI, + Species.FIDOUGH, + Species.SQUAWKABILLY, + Species.MASCHIFF, + Species.SHROODLE, + Species.KLAWF, + Species.WIGLETT, + Species.PALDEA_WOOPER, + ], + [TrainerPoolTier.UNCOMMON]: [ + Species.KOFFING, + Species.EEVEE, + Species.GIRAFARIG, + Species.RALTS, + Species.TORKOAL, + Species.SEVIPER, + Species.SCRAGGY, + Species.ZORUA, + Species.MIMIKYU, + Species.IMPIDIMP, + Species.FALINKS, + Species.CAPSAKID, + Species.TINKATINK, + Species.BOMBIRDIER, + Species.CYCLIZAR, + Species.FLAMIGO, + Species.PALDEA_TAUROS, + ], + [TrainerPoolTier.RARE]: [ + Species.MANKEY, + Species.PAWNIARD, + Species.CHARCADET, + Species.FLITTLE, + Species.VAROOM, + Species.ORTHWORM, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.DONDOZO, Species.GIMMIGHOUL], + }), + [TrainerType.GIACOMO]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("star_admin", "star_1", [Species.KINGAMBIT], PokemonType.DARK) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_star_admin") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; // Segin Starmobile + p.moveset = [ + new PokemonMove(Moves.WICKED_TORQUE), + new PokemonMove(Moves.SPIN_OUT), + new PokemonMove(Moves.SHIFT_GEAR), + new PokemonMove(Moves.HIGH_HORSEPOWER), + ]; + }), + ), + [TrainerType.MELA]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("star_admin", "star_2", [Species.ARMAROUGE], PokemonType.FIRE) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_star_admin") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => { + p.formIndex = 2; // Schedar Starmobile + p.moveset = [ + new PokemonMove(Moves.BLAZING_TORQUE), + new PokemonMove(Moves.SPIN_OUT), + new PokemonMove(Moves.SHIFT_GEAR), + new PokemonMove(Moves.HIGH_HORSEPOWER), + ]; + }), + ), + [TrainerType.ATTICUS]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("star_admin", "star_3", [Species.REVAVROOM], PokemonType.POISON) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_star_admin") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => { + p.formIndex = 3; // Navi Starmobile + p.moveset = [ + new PokemonMove(Moves.NOXIOUS_TORQUE), + new PokemonMove(Moves.SPIN_OUT), + new PokemonMove(Moves.SHIFT_GEAR), + new PokemonMove(Moves.HIGH_HORSEPOWER), + ]; + }), + ), + [TrainerType.ORTEGA]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("star_admin", "star_4", [Species.DACHSBUN], PokemonType.FAIRY) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_star_admin") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => { + p.formIndex = 4; // Ruchbah Starmobile + p.moveset = [ + new PokemonMove(Moves.MAGICAL_TORQUE), + new PokemonMove(Moves.SPIN_OUT), + new PokemonMove(Moves.SHIFT_GEAR), + new PokemonMove(Moves.HIGH_HORSEPOWER), + ]; + }), + ), + [TrainerType.ERI]: new TrainerConfig(++t) + .setMoneyMultiplier(1.5) + .initForEvilTeamAdmin("star_admin", "star_5", [Species.ANNIHILAPE], PokemonType.FIGHTING) + .setEncounterBgm(TrainerType.PLASMA_GRUNT) + .setBattleBgm("battle_plasma_grunt") + .setMixedBattleBgm("battle_star_admin") + .setVictoryBgm("victory_team_plasma") + .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => { + p.formIndex = 5; // Caph Starmobile + p.moveset = [ + new PokemonMove(Moves.COMBAT_TORQUE), + new PokemonMove(Moves.SPIN_OUT), + new PokemonMove(Moves.SHIFT_GEAR), + new PokemonMove(Moves.HIGH_HORSEPOWER), + ]; + }), ), - [TrainerType.ROCKET_GRUNT]: new TrainerConfig(++t).setHasGenders("Rocket Grunt Female").setHasDouble("Rocket Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.WEEDLE, Species.RATTATA, Species.EKANS, Species.SANDSHREW, Species.ZUBAT, Species.GEODUDE, Species.KOFFING, Species.GRIMER, Species.ODDISH, Species.SLOWPOKE ], - [TrainerPoolTier.UNCOMMON]: [ Species.GYARADOS, Species.LICKITUNG, Species.TAUROS, Species.MANKEY, Species.SCYTHER, Species.ELEKID, Species.MAGBY, Species.CUBONE, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB, Species.MAGNEMITE ], - [TrainerPoolTier.RARE]: [ Species.PORYGON, Species.ALOLA_RATTATA, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE, Species.PALDEA_TAUROS, Species.OMANYTE, Species.KABUTO ], - [TrainerPoolTier.SUPER_RARE]: [ Species.DRATINI, Species.LARVITAR ] - }), - [TrainerType.ARCHER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("rocket_admin", "rocket", [ Species.HOUNDOOM ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.ARIANA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("rocket_admin_female", "rocket", [ Species.ARBOK ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.PROTON]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("rocket_admin", "rocket", [ Species.CROBAT ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.PETREL]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("rocket_admin", "rocket", [ Species.WEEZING ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.MAGMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Magma Grunt Female").setHasDouble("Magma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.SLUGMA, Species.POOCHYENA, Species.NUMEL, Species.ZIGZAGOON, Species.DIGLETT, Species.MAGBY, Species.TORKOAL, Species.GROWLITHE, Species.BALTOY ], - [TrainerPoolTier.UNCOMMON]: [ Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR, Species.RHYHORN, Species.HEATMOR ], - [TrainerPoolTier.RARE]: [ Species.TRAPINCH, Species.LILEEP, Species.ANORITH, Species.HISUI_GROWLITHE, Species.TURTONATOR, Species.ARON, Species.TOEDSCOOL ], - [TrainerPoolTier.SUPER_RARE]: [ Species.CAPSAKID, Species.CHARCADET ] - }), - [TrainerType.TABITHA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("magma_admin", "magma", [ Species.CAMERUPT ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.COURTNEY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("magma_admin_female", "magma", [ Species.CAMERUPT ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.AQUA_GRUNT]: new TrainerConfig(++t).setHasGenders("Aqua Grunt Female").setHasDouble("Aqua Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.CARVANHA, Species.WAILMER, Species.ZIGZAGOON, Species.LOTAD, Species.CORPHISH, Species.SPHEAL, Species.REMORAID, Species.QWILFISH, Species.BARBOACH ], - [TrainerPoolTier.UNCOMMON]: [ Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.AZURILL, Species.CLOBBOPUS, Species.HORSEA ], - [TrainerPoolTier.RARE]: [ Species.MANTYKE, Species.DHELMISE, Species.HISUI_QWILFISH, Species.ARROKUDA, Species.PALDEA_WOOPER, Species.SKRELP ], - [TrainerPoolTier.SUPER_RARE]: [ Species.DONDOZO, Species.BASCULEGION ] - }), - [TrainerType.MATT]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aqua_admin", "aqua", [ Species.SHARPEDO ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.SHELLY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aqua_admin_female", "aqua", [ Species.SHARPEDO ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.GALACTIC_GRUNT]: new TrainerConfig(++t).setHasGenders("Galactic Grunt Female").setHasDouble("Galactic Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.GLAMEOW, Species.STUNKY, Species.CROAGUNK, Species.SHINX, Species.WURMPLE, Species.BRONZOR, Species.DRIFLOON, Species.BURMY, Species.CARNIVINE ], - [TrainerPoolTier.UNCOMMON]: [ Species.LICKITUNG, Species.RHYHORN, Species.TANGELA, Species.ZUBAT, Species.YANMA, Species.SKORUPI, Species.GLIGAR, Species.SWINUB ], - [TrainerPoolTier.RARE]: [ Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.SNEASEL, Species.ELEKID, Species.MAGBY, Species.DUSKULL ], - [TrainerPoolTier.SUPER_RARE]: [ Species.ROTOM, Species.SPIRITOMB, Species.HISUI_SNEASEL ] - }), - [TrainerType.JUPITER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [ Species.SKUNTANK ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.MARS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [ Species.PURUGLY ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.SATURN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander", "galactic", [ Species.TOXICROAK ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.PLASMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Plasma Grunt Female").setHasDouble("Plasma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.PATRAT, Species.LILLIPUP, Species.PURRLOIN, Species.SCRAFTY, Species.WOOBAT, Species.VANILLITE, Species.SANDILE, Species.TRUBBISH, Species.TYMPOLE ], - [TrainerPoolTier.UNCOMMON]: [ Species.FRILLISH, Species.VENIPEDE, Species.GOLETT, Species.TIMBURR, Species.DARUMAKA, Species.FOONGUS, Species.JOLTIK, Species.CUBCHOO, Species.KLINK ], - [TrainerPoolTier.RARE]: [ Species.PAWNIARD, Species.RUFFLET, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.MIENFOO, Species.DURANT, Species.BOUFFALANT ], - [TrainerPoolTier.SUPER_RARE]: [ Species.DRUDDIGON, Species.HISUI_ZORUA, Species.AXEW, Species.DEINO ] - }), - [TrainerType.ZINZOLIN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_sage", "plasma", [ Species.CRYOGONAL ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.COLRESS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_boss", "plasma_2", [ Species.KLINKLANG ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_colress").setMixedBattleBgm("battle_colress").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.FLARE_GRUNT]: new TrainerConfig(++t).setHasGenders("Flare Grunt Female").setHasDouble("Flare Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.FLETCHLING, Species.LITLEO, Species.PONYTA, Species.INKAY, Species.HOUNDOUR, Species.SKORUPI, Species.SCRAFTY, Species.CROAGUNK, Species.SCATTERBUG, Species.ESPURR ], - [TrainerPoolTier.UNCOMMON]: [ Species.HELIOPTILE, Species.ELECTRIKE, Species.SKRELP, Species.PANCHAM, Species.PURRLOIN, Species.POOCHYENA, Species.BINACLE, Species.CLAUNCHER, Species.PUMPKABOO, Species.PHANTUMP, Species.FOONGUS ], - [TrainerPoolTier.RARE]: [ Species.LITWICK, Species.SNEASEL, Species.PAWNIARD, Species.SLIGGOO ], - [TrainerPoolTier.SUPER_RARE]: [ Species.NOIBAT, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG ] - }), - [TrainerType.BRYONY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin_female", "flare", [ Species.LIEPARD ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.XEROSIC]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin", "flare", [ Species.MALAMAR ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.AETHER_GRUNT]: new TrainerConfig(++t).setHasGenders("Aether Grunt Female").setHasDouble("Aether Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.PIKIPEK, Species.ROCKRUFF, Species.ALOLA_DIGLETT, Species.ALOLA_EXEGGUTOR, Species.YUNGOOS, Species.CORSOLA, Species.ALOLA_GEODUDE, Species.ALOLA_RAICHU, Species.BOUNSWEET, Species.LILLIPUP, Species.KOMALA, Species.MORELULL, Species.COMFEY, Species.TOGEDEMARU ], - [TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.STUFFUL, Species.ORANGURU, Species.PASSIMIAN, Species.BRUXISH, Species.MINIOR, Species.WISHIWASHI, Species.ALOLA_SANDSHREW, Species.ALOLA_VULPIX, Species.CRABRAWLER, Species.CUTIEFLY, Species.ORICORIO, Species.MUDBRAY, Species.PYUKUMUKU, Species.ALOLA_MAROWAK ], - [TrainerPoolTier.RARE]: [ Species.GALAR_CORSOLA, Species.TURTONATOR, Species.MIMIKYU, Species.MAGNEMITE, Species.DRAMPA ], - [TrainerPoolTier.SUPER_RARE]: [ Species.JANGMO_O, Species.PORYGON ] - }), - [TrainerType.FABA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aether_admin", "aether", [ Species.HYPNO ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.SKULL_GRUNT]: new TrainerConfig(++t).setHasGenders("Skull Grunt Female").setHasDouble("Skull Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.SALANDIT, Species.ALOLA_RATTATA, Species.EKANS, Species.ALOLA_MEOWTH, Species.SCRAGGY, Species.KOFFING, Species.ALOLA_GRIMER, Species.MAREANIE, Species.SPINARAK, Species.TRUBBISH, Species.DROWZEE ], - [TrainerPoolTier.UNCOMMON]: [ Species.FOMANTIS, Species.SABLEYE, Species.SANDILE, Species.HOUNDOUR, Species.ALOLA_MAROWAK, Species.GASTLY, Species.PANCHAM, Species.ZUBAT, Species.VENIPEDE, Species.VULLABY ], - [TrainerPoolTier.RARE]: [ Species.SANDYGAST, Species.PAWNIARD, Species.MIMIKYU, Species.DHELMISE, Species.WISHIWASHI, Species.NYMBLE ], - [TrainerPoolTier.SUPER_RARE]: [ Species.GRUBBIN, Species.DEWPIDER ] - }), - [TrainerType.PLUMERIA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("skull_admin", "skull", [ Species.SALAZZLE ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.MACRO_GRUNT]: new TrainerConfig(++t).setHasGenders("Macro Grunt Female").setHasDouble("Macro Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_macro_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.CUFANT, Species.GALAR_MEOWTH, Species.KLINK, Species.ROOKIDEE, Species.CRAMORANT, Species.GALAR_ZIGZAGOON, Species.SKWOVET, Species.STEELIX, Species.MAWILE, Species.FERROSEED ], - [TrainerPoolTier.UNCOMMON]: [ Species.DRILBUR, Species.MAGNEMITE, Species.HATENNA, Species.ARROKUDA, Species.APPLIN, Species.GALAR_PONYTA, Species.GALAR_YAMASK, Species.SINISTEA, Species.RIOLU ], - [TrainerPoolTier.RARE]: [ Species.FALINKS, Species.BELDUM, Species.GALAR_FARFETCHD, Species.GALAR_MR_MIME, Species.HONEDGE, Species.SCIZOR, Species.GALAR_DARUMAKA ], - [TrainerPoolTier.SUPER_RARE]: [ Species.DURALUDON, Species.DREEPY ] - }), - [TrainerType.OLEANA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("macro_admin", "macro", [ Species.GARBODOR ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_oleana").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()), - [TrainerType.STAR_GRUNT]: new TrainerConfig(++t).setHasGenders("Star Grunt Female").setHasDouble("Star Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.DUNSPARCE, Species.HOUNDOUR, Species.AZURILL, Species.GULPIN, Species.FOONGUS, Species.FLETCHLING, Species.LITLEO, Species.FLABEBE, Species.CRABRAWLER, Species.NYMBLE, Species.PAWMI, Species.FIDOUGH, Species.SQUAWKABILLY, Species.MASCHIFF, Species.SHROODLE, Species.KLAWF, Species.WIGLETT, Species.PALDEA_WOOPER ], - [TrainerPoolTier.UNCOMMON]: [ Species.KOFFING, Species.EEVEE, Species.GIRAFARIG, Species.RALTS, Species.TORKOAL, Species.SEVIPER, Species.SCRAGGY, Species.ZORUA, Species.MIMIKYU, Species.IMPIDIMP, Species.FALINKS, Species.CAPSAKID, Species.TINKATINK, Species.BOMBIRDIER, Species.CYCLIZAR, Species.FLAMIGO, Species.PALDEA_TAUROS ], - [TrainerPoolTier.RARE]: [ Species.MANKEY, Species.PAWNIARD, Species.CHARCADET, Species.FLITTLE, Species.VAROOM, Species.ORTHWORM ], - [TrainerPoolTier.SUPER_RARE]: [ Species.DONDOZO, Species.GIMMIGHOUL ] - }), - [TrainerType.GIACOMO]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("star_admin", "star_1", [ Species.KINGAMBIT ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // Segin Starmobile - p.moveset = [ new PokemonMove(Moves.WICKED_TORQUE), new PokemonMove(Moves.SPIN_OUT), new PokemonMove(Moves.SHIFT_GEAR), new PokemonMove(Moves.HIGH_HORSEPOWER) ]; - })), - [TrainerType.MELA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("star_admin", "star_2", [ Species.ARMAROUGE ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 2; // Schedar Starmobile - p.moveset = [ new PokemonMove(Moves.BLAZING_TORQUE), new PokemonMove(Moves.SPIN_OUT), new PokemonMove(Moves.SHIFT_GEAR), new PokemonMove(Moves.HIGH_HORSEPOWER) ]; - })), - [TrainerType.ATTICUS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("star_admin", "star_3", [ Species.REVAVROOM ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 3; // Navi Starmobile - p.moveset = [ new PokemonMove(Moves.NOXIOUS_TORQUE), new PokemonMove(Moves.SPIN_OUT), new PokemonMove(Moves.SHIFT_GEAR), new PokemonMove(Moves.HIGH_HORSEPOWER) ]; - })), - [TrainerType.ORTEGA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("star_admin", "star_4", [ Species.DACHSBUN ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 4; // Ruchbah Starmobile - p.moveset = [ new PokemonMove(Moves.MAGICAL_TORQUE), new PokemonMove(Moves.SPIN_OUT), new PokemonMove(Moves.SHIFT_GEAR), new PokemonMove(Moves.HIGH_HORSEPOWER) ]; - })), - [TrainerType.ERI]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("star_admin", "star_5", [ Species.ANNIHILAPE ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 5; // Caph Starmobile - p.moveset = [ new PokemonMove(Moves.COMBAT_TORQUE), new PokemonMove(Moves.SPIN_OUT), new PokemonMove(Moves.SHIFT_GEAR), new PokemonMove(Moves.HIGH_HORSEPOWER) ]; - })), - [TrainerType.BROCK]: new TrainerConfig((t = TrainerType.BROCK)).initForGymLeader(signatureSpecies["BROCK"], true, Type.ROCK).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.MISTY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MISTY"], false, Type.WATER).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.LT_SURGE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["LT_SURGE"], true, Type.ELECTRIC).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.ERIKA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ERIKA"], false, Type.GRASS).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.JANINE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["JANINE"], false, Type.POISON).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.SABRINA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["SABRINA"], false, Type.PSYCHIC).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.BLAINE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BLAINE"], true, Type.FIRE).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.GIOVANNI]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GIOVANNI"], true, Type.DARK).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.FALKNER]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["FALKNER"], true, Type.FLYING).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.BUGSY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BUGSY"], true, Type.BUG).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.WHITNEY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["WHITNEY"], false, Type.NORMAL).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.MORTY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MORTY"], true, Type.GHOST).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.CHUCK]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CHUCK"], true, Type.FIGHTING).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.JASMINE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["JASMINE"], false, Type.STEEL).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.PRYCE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["PRYCE"], true, Type.ICE).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.CLAIR]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CLAIR"], false, Type.DRAGON).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.ROXANNE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ROXANNE"], false, Type.ROCK).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"), - [TrainerType.BRAWLY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BRAWLY"], true, Type.FIGHTING).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"), - [TrainerType.WATTSON]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["WATTSON"], true, Type.ELECTRIC).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"), - [TrainerType.FLANNERY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["FLANNERY"], false, Type.FIRE).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"), - [TrainerType.NORMAN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["NORMAN"], true, Type.NORMAL).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"), - [TrainerType.WINONA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["WINONA"], false, Type.FLYING).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"), - [TrainerType.TATE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["TATE"], true, Type.PSYCHIC).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym").setHasDouble("tate_liza_double").setDoubleTrainerType(TrainerType.LIZA).setDoubleTitle("gym_leader_double"), - [TrainerType.LIZA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["LIZA"], false, Type.PSYCHIC).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym").setHasDouble("liza_tate_double").setDoubleTrainerType(TrainerType.TATE).setDoubleTitle("gym_leader_double"), - [TrainerType.JUAN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["JUAN"], true, Type.WATER).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"), - [TrainerType.ROARK]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ROARK"], true, Type.ROCK).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.GARDENIA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GARDENIA"], false, Type.GRASS).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.MAYLENE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MAYLENE"], false, Type.FIGHTING).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.CRASHER_WAKE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CRASHER_WAKE"], true, Type.WATER).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.FANTINA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["FANTINA"], false, Type.GHOST).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.BYRON]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BYRON"], true, Type.STEEL).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.CANDICE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CANDICE"], false, Type.ICE).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.VOLKNER]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["VOLKNER"], true, Type.ELECTRIC).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.CILAN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CILAN"], true, Type.GRASS).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.CHILI]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CHILI"], true, Type.FIRE).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.CRESS]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CRESS"], true, Type.WATER).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.CHEREN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CHEREN"], true, Type.NORMAL).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.LENORA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["LENORA"], false, Type.NORMAL).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.ROXIE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ROXIE"], false, Type.POISON).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.BURGH]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BURGH"], true, Type.BUG).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.ELESA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ELESA"], false, Type.ELECTRIC).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.CLAY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CLAY"], true, Type.GROUND).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.SKYLA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["SKYLA"], false, Type.FLYING).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.BRYCEN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BRYCEN"], true, Type.ICE).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.DRAYDEN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["DRAYDEN"], true, Type.DRAGON).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.MARLON]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MARLON"], true, Type.WATER).setMixedBattleBgm("battle_unova_gym"), - [TrainerType.VIOLA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["VIOLA"], false, Type.BUG).setMixedBattleBgm("battle_kalos_gym"), - [TrainerType.GRANT]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GRANT"], true, Type.ROCK).setMixedBattleBgm("battle_kalos_gym"), - [TrainerType.KORRINA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["KORRINA"], false, Type.FIGHTING).setMixedBattleBgm("battle_kalos_gym"), - [TrainerType.RAMOS]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["RAMOS"], true, Type.GRASS).setMixedBattleBgm("battle_kalos_gym"), - [TrainerType.CLEMONT]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CLEMONT"], true, Type.ELECTRIC).setMixedBattleBgm("battle_kalos_gym"), - [TrainerType.VALERIE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["VALERIE"], false, Type.FAIRY).setMixedBattleBgm("battle_kalos_gym"), - [TrainerType.OLYMPIA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["OLYMPIA"], false, Type.PSYCHIC).setMixedBattleBgm("battle_kalos_gym"), - [TrainerType.WULFRIC]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["WULFRIC"], true, Type.ICE).setMixedBattleBgm("battle_kalos_gym"), - [TrainerType.MILO]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MILO"], true, Type.GRASS).setMixedBattleBgm("battle_galar_gym"), - [TrainerType.NESSA]: new TrainerConfig(++t).setName("Nessa").initForGymLeader(signatureSpecies["NESSA"], false, Type.WATER).setMixedBattleBgm("battle_galar_gym"), - [TrainerType.KABU]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["KABU"], true, Type.FIRE).setMixedBattleBgm("battle_galar_gym"), - [TrainerType.BEA]: new TrainerConfig(++t).setName("Bea").initForGymLeader(signatureSpecies["BEA"], false, Type.FIGHTING).setMixedBattleBgm("battle_galar_gym"), - [TrainerType.ALLISTER]: new TrainerConfig(++t).setName("Allister").initForGymLeader(signatureSpecies["ALLISTER"], true, Type.GHOST).setMixedBattleBgm("battle_galar_gym"), - [TrainerType.OPAL]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["OPAL"], false, Type.FAIRY).setMixedBattleBgm("battle_galar_gym"), - [TrainerType.BEDE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BEDE"], true, Type.FAIRY).setMixedBattleBgm("battle_galar_gym"), - [TrainerType.GORDIE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GORDIE"], true, Type.ROCK).setMixedBattleBgm("battle_galar_gym"), - [TrainerType.MELONY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MELONY"], false, Type.ICE).setMixedBattleBgm("battle_galar_gym"), - [TrainerType.PIERS]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["PIERS"], true, Type.DARK).setHasDouble("piers_marnie_double").setDoubleTrainerType(TrainerType.MARNIE).setDoubleTitle("gym_leader_double").setMixedBattleBgm("battle_galar_gym"), - [TrainerType.MARNIE]: new TrainerConfig(++t).setName("Marnie").initForGymLeader(signatureSpecies["MARNIE"], false, Type.DARK).setHasDouble("marnie_piers_double").setDoubleTrainerType(TrainerType.PIERS).setDoubleTitle("gym_leader_double").setMixedBattleBgm("battle_galar_gym"), - [TrainerType.RAIHAN]: new TrainerConfig(++t).setName("Raihan").initForGymLeader(signatureSpecies["RAIHAN"], true, Type.DRAGON).setMixedBattleBgm("battle_galar_gym"), - [TrainerType.KATY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["KATY"], false, Type.BUG).setMixedBattleBgm("battle_paldea_gym"), - [TrainerType.BRASSIUS]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BRASSIUS"], true, Type.GRASS).setMixedBattleBgm("battle_paldea_gym"), - [TrainerType.IONO]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["IONO"], false, Type.ELECTRIC).setMixedBattleBgm("battle_paldea_gym"), - [TrainerType.KOFU]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["KOFU"], true, Type.WATER).setMixedBattleBgm("battle_paldea_gym"), - [TrainerType.LARRY]: new TrainerConfig(++t).setName("Larry").initForGymLeader(signatureSpecies["LARRY"], true, Type.NORMAL).setMixedBattleBgm("battle_paldea_gym"), - [TrainerType.RYME]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["RYME"], false, Type.GHOST).setMixedBattleBgm("battle_paldea_gym"), - [TrainerType.TULIP]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["TULIP"], false, Type.PSYCHIC).setMixedBattleBgm("battle_paldea_gym"), - [TrainerType.GRUSHA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GRUSHA"], true, Type.ICE).setMixedBattleBgm("battle_paldea_gym"), + [TrainerType.BROCK]: new TrainerConfig((t = TrainerType.BROCK)) + .initForGymLeader(signatureSpecies["BROCK"], true, PokemonType.ROCK) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.MISTY]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["MISTY"], false, PokemonType.WATER) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.LT_SURGE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["LT_SURGE"], true, PokemonType.ELECTRIC) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.ERIKA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["ERIKA"], false, PokemonType.GRASS) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.JANINE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["JANINE"], false, PokemonType.POISON) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.SABRINA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["SABRINA"], false, PokemonType.PSYCHIC) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.BLAINE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["BLAINE"], true, PokemonType.FIRE) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.GIOVANNI]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["GIOVANNI"], true, PokemonType.DARK) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.FALKNER]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["FALKNER"], true, PokemonType.FLYING) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.BUGSY]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["BUGSY"], true, PokemonType.BUG) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.WHITNEY]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["WHITNEY"], false, PokemonType.NORMAL) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.MORTY]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["MORTY"], true, PokemonType.GHOST) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.CHUCK]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["CHUCK"], true, PokemonType.FIGHTING) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.JASMINE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["JASMINE"], false, PokemonType.STEEL) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.PRYCE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["PRYCE"], true, PokemonType.ICE) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.CLAIR]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["CLAIR"], false, PokemonType.DRAGON) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.ROXANNE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["ROXANNE"], false, PokemonType.ROCK) + .setBattleBgm("battle_hoenn_gym") + .setMixedBattleBgm("battle_hoenn_gym"), + [TrainerType.BRAWLY]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["BRAWLY"], true, PokemonType.FIGHTING) + .setBattleBgm("battle_hoenn_gym") + .setMixedBattleBgm("battle_hoenn_gym"), + [TrainerType.WATTSON]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["WATTSON"], true, PokemonType.ELECTRIC) + .setBattleBgm("battle_hoenn_gym") + .setMixedBattleBgm("battle_hoenn_gym"), + [TrainerType.FLANNERY]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["FLANNERY"], false, PokemonType.FIRE) + .setBattleBgm("battle_hoenn_gym") + .setMixedBattleBgm("battle_hoenn_gym"), + [TrainerType.NORMAN]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["NORMAN"], true, PokemonType.NORMAL) + .setBattleBgm("battle_hoenn_gym") + .setMixedBattleBgm("battle_hoenn_gym"), + [TrainerType.WINONA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["WINONA"], false, PokemonType.FLYING) + .setBattleBgm("battle_hoenn_gym") + .setMixedBattleBgm("battle_hoenn_gym"), + [TrainerType.TATE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["TATE"], true, PokemonType.PSYCHIC) + .setBattleBgm("battle_hoenn_gym") + .setMixedBattleBgm("battle_hoenn_gym") + .setHasDouble("tate_liza_double") + .setDoubleTrainerType(TrainerType.LIZA) + .setDoubleTitle("gym_leader_double"), + [TrainerType.LIZA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["LIZA"], false, PokemonType.PSYCHIC) + .setBattleBgm("battle_hoenn_gym") + .setMixedBattleBgm("battle_hoenn_gym") + .setHasDouble("liza_tate_double") + .setDoubleTrainerType(TrainerType.TATE) + .setDoubleTitle("gym_leader_double"), + [TrainerType.JUAN]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["JUAN"], true, PokemonType.WATER) + .setBattleBgm("battle_hoenn_gym") + .setMixedBattleBgm("battle_hoenn_gym"), + [TrainerType.ROARK]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["ROARK"], true, PokemonType.ROCK) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.GARDENIA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["GARDENIA"], false, PokemonType.GRASS) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.MAYLENE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["MAYLENE"], false, PokemonType.FIGHTING) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.CRASHER_WAKE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["CRASHER_WAKE"], true, PokemonType.WATER) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.FANTINA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["FANTINA"], false, PokemonType.GHOST) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.BYRON]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["BYRON"], true, PokemonType.STEEL) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.CANDICE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["CANDICE"], false, PokemonType.ICE) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.VOLKNER]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["VOLKNER"], true, PokemonType.ELECTRIC) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.CILAN]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["CILAN"], true, PokemonType.GRASS) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.CHILI]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["CHILI"], true, PokemonType.FIRE) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.CRESS]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["CRESS"], true, PokemonType.WATER) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.CHEREN]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["CHEREN"], true, PokemonType.NORMAL) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.LENORA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["LENORA"], false, PokemonType.NORMAL) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.ROXIE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["ROXIE"], false, PokemonType.POISON) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.BURGH]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["BURGH"], true, PokemonType.BUG) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.ELESA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["ELESA"], false, PokemonType.ELECTRIC) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.CLAY]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["CLAY"], true, PokemonType.GROUND) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.SKYLA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["SKYLA"], false, PokemonType.FLYING) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.BRYCEN]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["BRYCEN"], true, PokemonType.ICE) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.DRAYDEN]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["DRAYDEN"], true, PokemonType.DRAGON) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.MARLON]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["MARLON"], true, PokemonType.WATER) + .setMixedBattleBgm("battle_unova_gym"), + [TrainerType.VIOLA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["VIOLA"], false, PokemonType.BUG) + .setMixedBattleBgm("battle_kalos_gym"), + [TrainerType.GRANT]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["GRANT"], true, PokemonType.ROCK) + .setMixedBattleBgm("battle_kalos_gym"), + [TrainerType.KORRINA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["KORRINA"], false, PokemonType.FIGHTING) + .setMixedBattleBgm("battle_kalos_gym"), + [TrainerType.RAMOS]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["RAMOS"], true, PokemonType.GRASS) + .setMixedBattleBgm("battle_kalos_gym"), + [TrainerType.CLEMONT]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["CLEMONT"], true, PokemonType.ELECTRIC) + .setMixedBattleBgm("battle_kalos_gym"), + [TrainerType.VALERIE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["VALERIE"], false, PokemonType.FAIRY) + .setMixedBattleBgm("battle_kalos_gym"), + [TrainerType.OLYMPIA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["OLYMPIA"], false, PokemonType.PSYCHIC) + .setMixedBattleBgm("battle_kalos_gym"), + [TrainerType.WULFRIC]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["WULFRIC"], true, PokemonType.ICE) + .setMixedBattleBgm("battle_kalos_gym"), + [TrainerType.MILO]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["MILO"], true, PokemonType.GRASS) + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.NESSA]: new TrainerConfig(++t) + .setName("Nessa") + .initForGymLeader(signatureSpecies["NESSA"], false, PokemonType.WATER) + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.KABU]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["KABU"], true, PokemonType.FIRE) + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.BEA]: new TrainerConfig(++t) + .setName("Bea") + .initForGymLeader(signatureSpecies["BEA"], false, PokemonType.FIGHTING) + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.ALLISTER]: new TrainerConfig(++t) + .setName("Allister") + .initForGymLeader(signatureSpecies["ALLISTER"], true, PokemonType.GHOST) + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.OPAL]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["OPAL"], false, PokemonType.FAIRY) + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.BEDE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["BEDE"], true, PokemonType.FAIRY) + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.GORDIE]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["GORDIE"], true, PokemonType.ROCK) + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.MELONY]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["MELONY"], false, PokemonType.ICE) + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.PIERS]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["PIERS"], true, PokemonType.DARK) + .setHasDouble("piers_marnie_double") + .setDoubleTrainerType(TrainerType.MARNIE) + .setDoubleTitle("gym_leader_double") + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.MARNIE]: new TrainerConfig(++t) + .setName("Marnie") + .initForGymLeader(signatureSpecies["MARNIE"], false, PokemonType.DARK) + .setHasDouble("marnie_piers_double") + .setDoubleTrainerType(TrainerType.PIERS) + .setDoubleTitle("gym_leader_double") + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.RAIHAN]: new TrainerConfig(++t) + .setName("Raihan") + .initForGymLeader(signatureSpecies["RAIHAN"], true, PokemonType.DRAGON) + .setMixedBattleBgm("battle_galar_gym"), + [TrainerType.KATY]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["KATY"], false, PokemonType.BUG, true, -1) + .setMixedBattleBgm("battle_paldea_gym"), + [TrainerType.BRASSIUS]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["BRASSIUS"], true, PokemonType.GRASS, true, -1) + .setMixedBattleBgm("battle_paldea_gym"), + [TrainerType.IONO]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["IONO"], false, PokemonType.ELECTRIC, true, -1) + .setMixedBattleBgm("battle_paldea_gym"), + [TrainerType.KOFU]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["KOFU"], true, PokemonType.WATER, true, -1) + .setMixedBattleBgm("battle_paldea_gym"), + [TrainerType.LARRY]: new TrainerConfig(++t) + .setName("Larry") + .initForGymLeader(signatureSpecies["LARRY"], true, PokemonType.NORMAL, true, -1) + .setMixedBattleBgm("battle_paldea_gym"), + [TrainerType.RYME]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["RYME"], false, PokemonType.GHOST, true, -1) + .setMixedBattleBgm("battle_paldea_gym"), + [TrainerType.TULIP]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["TULIP"], false, PokemonType.PSYCHIC, true, -1) + .setMixedBattleBgm("battle_paldea_gym"), + [TrainerType.GRUSHA]: new TrainerConfig(++t) + .initForGymLeader(signatureSpecies["GRUSHA"], true, PokemonType.ICE, true, -1) + .setMixedBattleBgm("battle_paldea_gym"), - [TrainerType.LORELEI]: new TrainerConfig((t = TrainerType.LORELEI)).initForEliteFour(signatureSpecies["LORELEI"], false, Type.ICE).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.BRUNO]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["BRUNO"], true, Type.FIGHTING).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.AGATHA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["AGATHA"], false, Type.GHOST).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.LANCE]: new TrainerConfig(++t).setName("Lance").initForEliteFour(signatureSpecies["LANCE"], true, Type.DRAGON).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.WILL]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["WILL"], true, Type.PSYCHIC).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.KOGA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["KOGA"], true, Type.POISON).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.KAREN]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["KAREN"], false, Type.DARK).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), - [TrainerType.SIDNEY]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["SIDNEY"], true, Type.DARK).setMixedBattleBgm("battle_hoenn_elite"), - [TrainerType.PHOEBE]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["PHOEBE"], false, Type.GHOST).setMixedBattleBgm("battle_hoenn_elite"), - [TrainerType.GLACIA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["GLACIA"], false, Type.ICE).setMixedBattleBgm("battle_hoenn_elite"), - [TrainerType.DRAKE]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["DRAKE"], true, Type.DRAGON).setMixedBattleBgm("battle_hoenn_elite"), - [TrainerType.AARON]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["AARON"], true, Type.BUG).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.BERTHA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["BERTHA"], false, Type.GROUND).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.FLINT]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["FLINT"], true, Type.FIRE).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.LUCIAN]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["LUCIAN"], true, Type.PSYCHIC).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"), - [TrainerType.SHAUNTAL]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["SHAUNTAL"], false, Type.GHOST).setMixedBattleBgm("battle_unova_elite"), - [TrainerType.MARSHAL]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["MARSHAL"], true, Type.FIGHTING).setMixedBattleBgm("battle_unova_elite"), - [TrainerType.GRIMSLEY]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["GRIMSLEY"], true, Type.DARK).setMixedBattleBgm("battle_unova_elite"), - [TrainerType.CAITLIN]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["CAITLIN"], false, Type.PSYCHIC).setMixedBattleBgm("battle_unova_elite"), - [TrainerType.MALVA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["MALVA"], false, Type.FIRE).setMixedBattleBgm("battle_kalos_elite"), - [TrainerType.SIEBOLD]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["SIEBOLD"], true, Type.WATER).setMixedBattleBgm("battle_kalos_elite"), - [TrainerType.WIKSTROM]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["WIKSTROM"], true, Type.STEEL).setMixedBattleBgm("battle_kalos_elite"), - [TrainerType.DRASNA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["DRASNA"], false, Type.DRAGON).setMixedBattleBgm("battle_kalos_elite"), - [TrainerType.HALA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["HALA"], true, Type.FIGHTING).setMixedBattleBgm("battle_alola_elite"), - [TrainerType.MOLAYNE]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["MOLAYNE"], true, Type.STEEL).setMixedBattleBgm("battle_alola_elite"), - [TrainerType.OLIVIA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["OLIVIA"], false, Type.ROCK).setMixedBattleBgm("battle_alola_elite"), - [TrainerType.ACEROLA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["ACEROLA"], false, Type.GHOST).setMixedBattleBgm("battle_alola_elite"), - [TrainerType.KAHILI]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["KAHILI"], false, Type.FLYING).setMixedBattleBgm("battle_alola_elite"), - [TrainerType.MARNIE_ELITE]: new TrainerConfig(++t).setName("Marnie").initForEliteFour(signatureSpecies["MARNIE_ELITE"], false, Type.DARK).setMixedBattleBgm("battle_galar_elite"), - [TrainerType.NESSA_ELITE]: new TrainerConfig(++t).setName("Nessa").initForEliteFour(signatureSpecies["NESSA_ELITE"], false, Type.WATER).setMixedBattleBgm("battle_galar_elite"), - [TrainerType.BEA_ELITE]: new TrainerConfig(++t).setName("Bea").initForEliteFour(signatureSpecies["BEA_ELITE"], false, Type.FIGHTING).setMixedBattleBgm("battle_galar_elite"), - [TrainerType.ALLISTER_ELITE]: new TrainerConfig(++t).setName("Allister").initForEliteFour(signatureSpecies["ALLISTER_ELITE"], true, Type.GHOST).setMixedBattleBgm("battle_galar_elite"), - [TrainerType.RAIHAN_ELITE]: new TrainerConfig(++t).setName("Raihan").initForEliteFour(signatureSpecies["RAIHAN_ELITE"], true, Type.DRAGON).setMixedBattleBgm("battle_galar_elite"), - [TrainerType.RIKA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["RIKA"], false, Type.GROUND).setMixedBattleBgm("battle_paldea_elite"), - [TrainerType.POPPY]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["POPPY"], false, Type.STEEL).setMixedBattleBgm("battle_paldea_elite"), - [TrainerType.LARRY_ELITE]: new TrainerConfig(++t).setName("Larry").initForEliteFour(signatureSpecies["LARRY_ELITE"], true, Type.NORMAL, Type.FLYING).setMixedBattleBgm("battle_paldea_elite"), - [TrainerType.HASSEL]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["HASSEL"], true, Type.DRAGON).setMixedBattleBgm("battle_paldea_elite"), - [TrainerType.CRISPIN]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["CRISPIN"], true, Type.FIRE).setMixedBattleBgm("battle_bb_elite"), - [TrainerType.AMARYS]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["AMARYS"], false, Type.STEEL).setMixedBattleBgm("battle_bb_elite"), - [TrainerType.LACEY]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["LACEY"], false, Type.FAIRY).setMixedBattleBgm("battle_bb_elite"), - [TrainerType.DRAYTON]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["DRAYTON"], true, Type.DRAGON).setMixedBattleBgm("battle_bb_elite"), + [TrainerType.LORELEI]: new TrainerConfig((t = TrainerType.LORELEI)) + .initForEliteFour(signatureSpecies["LORELEI"], false, PokemonType.ICE) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.BRUNO]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["BRUNO"], true, PokemonType.FIGHTING) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.AGATHA]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["AGATHA"], false, PokemonType.GHOST) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.LANCE]: new TrainerConfig(++t) + .setName("Lance") + .initForEliteFour(signatureSpecies["LANCE"], true, PokemonType.DRAGON) + .setBattleBgm("battle_kanto_gym") + .setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.WILL]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["WILL"], true, PokemonType.PSYCHIC) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.KOGA]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["KOGA"], true, PokemonType.POISON) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.KAREN]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["KAREN"], false, PokemonType.DARK) + .setBattleBgm("battle_johto_gym") + .setMixedBattleBgm("battle_johto_gym"), + [TrainerType.SIDNEY]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["SIDNEY"], true, PokemonType.DARK) + .setMixedBattleBgm("battle_hoenn_elite"), + [TrainerType.PHOEBE]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["PHOEBE"], false, PokemonType.GHOST) + .setMixedBattleBgm("battle_hoenn_elite"), + [TrainerType.GLACIA]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["GLACIA"], false, PokemonType.ICE) + .setMixedBattleBgm("battle_hoenn_elite"), + [TrainerType.DRAKE]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["DRAKE"], true, PokemonType.DRAGON) + .setMixedBattleBgm("battle_hoenn_elite"), + [TrainerType.AARON]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["AARON"], true, PokemonType.BUG) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.BERTHA]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["BERTHA"], false, PokemonType.GROUND) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.FLINT]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["FLINT"], true, PokemonType.FIRE, 3) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.LUCIAN]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["LUCIAN"], true, PokemonType.PSYCHIC) + .setBattleBgm("battle_sinnoh_gym") + .setMixedBattleBgm("battle_sinnoh_gym"), + [TrainerType.SHAUNTAL]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["SHAUNTAL"], false, PokemonType.GHOST) + .setMixedBattleBgm("battle_unova_elite"), + [TrainerType.MARSHAL]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["MARSHAL"], true, PokemonType.FIGHTING) + .setMixedBattleBgm("battle_unova_elite"), + [TrainerType.GRIMSLEY]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["GRIMSLEY"], true, PokemonType.DARK) + .setMixedBattleBgm("battle_unova_elite"), + [TrainerType.CAITLIN]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["CAITLIN"], false, PokemonType.PSYCHIC) + .setMixedBattleBgm("battle_unova_elite"), + [TrainerType.MALVA]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["MALVA"], false, PokemonType.FIRE) + .setMixedBattleBgm("battle_kalos_elite"), + [TrainerType.SIEBOLD]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["SIEBOLD"], true, PokemonType.WATER) + .setMixedBattleBgm("battle_kalos_elite"), + [TrainerType.WIKSTROM]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["WIKSTROM"], true, PokemonType.STEEL) + .setMixedBattleBgm("battle_kalos_elite"), + [TrainerType.DRASNA]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["DRASNA"], false, PokemonType.DRAGON) + .setMixedBattleBgm("battle_kalos_elite"), + [TrainerType.HALA]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["HALA"], true, PokemonType.FIGHTING) + .setMixedBattleBgm("battle_alola_elite"), + [TrainerType.MOLAYNE]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["MOLAYNE"], true, PokemonType.STEEL) + .setMixedBattleBgm("battle_alola_elite"), + [TrainerType.OLIVIA]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["OLIVIA"], false, PokemonType.ROCK) + .setMixedBattleBgm("battle_alola_elite"), + [TrainerType.ACEROLA]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["ACEROLA"], false, PokemonType.GHOST) + .setMixedBattleBgm("battle_alola_elite"), + [TrainerType.KAHILI]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["KAHILI"], false, PokemonType.FLYING) + .setMixedBattleBgm("battle_alola_elite"), + [TrainerType.MARNIE_ELITE]: new TrainerConfig(++t) + .setName("Marnie") + .initForEliteFour(signatureSpecies["MARNIE_ELITE"], false, PokemonType.DARK) + .setMixedBattleBgm("battle_galar_elite"), + [TrainerType.NESSA_ELITE]: new TrainerConfig(++t) + .setName("Nessa") + .initForEliteFour(signatureSpecies["NESSA_ELITE"], false, PokemonType.WATER) + .setMixedBattleBgm("battle_galar_elite"), + [TrainerType.BEA_ELITE]: new TrainerConfig(++t) + .setName("Bea") + .initForEliteFour(signatureSpecies["BEA_ELITE"], false, PokemonType.FIGHTING) + .setMixedBattleBgm("battle_galar_elite"), + [TrainerType.ALLISTER_ELITE]: new TrainerConfig(++t) + .setName("Allister") + .initForEliteFour(signatureSpecies["ALLISTER_ELITE"], true, PokemonType.GHOST) + .setMixedBattleBgm("battle_galar_elite"), + [TrainerType.RAIHAN_ELITE]: new TrainerConfig(++t) + .setName("Raihan") + .initForEliteFour(signatureSpecies["RAIHAN_ELITE"], true, PokemonType.DRAGON) + .setMixedBattleBgm("battle_galar_elite"), + [TrainerType.RIKA]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["RIKA"], false, PokemonType.GROUND, 5) + .setMixedBattleBgm("battle_paldea_elite"), + [TrainerType.POPPY]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["POPPY"], false, PokemonType.STEEL, 5) + .setMixedBattleBgm("battle_paldea_elite"), + [TrainerType.LARRY_ELITE]: new TrainerConfig(++t) + .setName("Larry") + .initForEliteFour(signatureSpecies["LARRY_ELITE"], true, PokemonType.FLYING, 5) + .setMixedBattleBgm("battle_paldea_elite"), + [TrainerType.HASSEL]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["HASSEL"], true, PokemonType.DRAGON, 5) + .setMixedBattleBgm("battle_paldea_elite"), + [TrainerType.CRISPIN]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["CRISPIN"], true, PokemonType.FIRE, 5) + .setMixedBattleBgm("battle_bb_elite"), + [TrainerType.AMARYS]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["AMARYS"], false, PokemonType.STEEL, 5) + .setMixedBattleBgm("battle_bb_elite"), + [TrainerType.LACEY]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["LACEY"], false, PokemonType.FAIRY, 5) + .setMixedBattleBgm("battle_bb_elite"), + [TrainerType.DRAYTON]: new TrainerConfig(++t) + .initForEliteFour(signatureSpecies["DRAYTON"], true, PokemonType.DRAGON, 5) + .setMixedBattleBgm("battle_bb_elite"), - [TrainerType.BLUE]: new TrainerConfig((t = TrainerType.BLUE)).initForChampion(true).setBattleBgm("battle_kanto_champion").setMixedBattleBgm("battle_kanto_champion").setHasDouble("blue_red_double").setDoubleTrainerType(TrainerType.RED).setDoubleTitle("champion_double") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ALAKAZAM ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MACHAMP ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.HO_OH ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.RHYPERIOR, Species.ELECTIVIRE, Species.MAGMORTAR ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.ARCANINE, Species.EXEGGUTOR, Species.GYARADOS ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.setBoss(true, 2); - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.PIDGEOT ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // Mega Pidgeot - p.generateAndPopulateMoveset(); - p.generateName(); - p.gender = Gender.MALE; - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[3]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.RED]: new TrainerConfig(++t).initForChampion(true).setBattleBgm("battle_johto_champion").setMixedBattleBgm("battle_johto_champion").setHasDouble("red_blue_double").setDoubleTrainerType(TrainerType.BLUE).setDoubleTitle("champion_double") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PIKACHU ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 8; // G-Max Pikachu - p.generateAndPopulateMoveset(); - p.generateName(); - p.gender = Gender.MALE; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.ESPEON, Species.UMBREON, Species.SYLVEON ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.LUGIA ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.SNORLAX ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.setBoss(true, 2); - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // Mega Venusaur, Mega Charizard X, or Mega Blastoise - p.generateAndPopulateMoveset(); - p.generateName(); - p.gender = Gender.MALE; - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[3]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.LANCE_CHAMPION]: new TrainerConfig(++t).setName("Lance").initForChampion(true).setBattleBgm("battle_johto_champion").setMixedBattleBgm("battle_johto_champion") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GYARADOS, Species.KINGDRA ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.AERODACTYL ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SALAMENCE ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // Mega Salamence - p.generateAndPopulateMoveset(); - p.generateName(); - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.CHARIZARD ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.TYRANITAR, Species.GARCHOMP, Species.KOMMO_O ])) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.DRAGONITE ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - p.setBoss(true, 2); - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[4]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.STEVEN]: new TrainerConfig(++t).initForChampion(true).setBattleBgm("battle_hoenn_champion_g5").setMixedBattleBgm("battle_hoenn_champion_g6").setHasDouble("steven_wallace_double").setDoubleTrainerType(TrainerType.WALLACE).setDoubleTitle("champion_double") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.SKARMORY ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.CRADILY, Species.ARMALDO ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AGGRON ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.setBoss(true, 2); - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GOLURK, Species.RUNERIGUS ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.REGIROCK, Species.REGICE, Species.REGISTEEL ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.METAGROSS ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // Mega Metagross - p.generateAndPopulateMoveset(); - p.generateName(); - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[4]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.WALLACE]: new TrainerConfig(++t).initForChampion(true).setBattleBgm("battle_hoenn_champion_g5").setMixedBattleBgm("battle_hoenn_champion_g6").setHasDouble("wallace_steven_double").setDoubleTrainerType(TrainerType.STEVEN).setDoubleTitle("champion_double") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PELIPPER ], TrainerSlot.TRAINER, true, p => { - p.abilityIndex = 1; // Drizzle - p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.LUDICOLO ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.LATIAS, Species.LATIOS ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // Mega Latios or Mega Latias - p.generateAndPopulateMoveset(); - p.generateName(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.SWAMPERT, Species.GASTRODON, Species.SEISMITOAD ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.REGIELEKI, Species.REGIDRAGO ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.MILOTIC ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.FEMALE; - p.setBoss(true, 2); - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[4]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.CYNTHIA]: new TrainerConfig(++t).initForChampion(false).setBattleBgm("battle_sinnoh_champion").setMixedBattleBgm("battle_sinnoh_champion") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.SPIRITOMB ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.LUCARIO ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.GIRATINA ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.MILOTIC, Species.ROSERADE, Species.HISUI_ARCANINE ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.TOGEKISS ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.setBoss(true, 2); - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GARCHOMP ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // Mega Garchomp - p.generateAndPopulateMoveset(); - p.generateName(); - p.gender = Gender.FEMALE; - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[3]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.ALDER]: new TrainerConfig(++t).initForChampion(true).setHasDouble("alder_iris_double").setDoubleTrainerType(TrainerType.IRIS).setDoubleTitle("champion_double").setBattleBgm("battle_champion_alder").setMixedBattleBgm("battle_champion_alder") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BOUFFALANT, Species.BRAVIARY ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HISUI_LILLIGANT, Species.HISUI_ZOROARK, Species.BASCULEGION ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ROGUE_BALL; - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.ZEKROM ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.KELDEO ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.CHANDELURE, Species.KROOKODILE, Species.REUNICLUS, Species.CONKELDURR ])) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.VOLCARONA ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - p.setBoss(true, 2); - })) - .setGenModifiersFunc(party => { - const pokemon = party[4]; - return [ modifierTypes.TERA_SHARD().generateType([], [ pokemon.species.speciesId === Species.KROOKODILE ? pokemon.species.type2 : pokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(pokemon) as PersistentModifier ]; - }), - [TrainerType.IRIS]: new TrainerConfig(++t).initForChampion(false).setBattleBgm("battle_champion_iris").setMixedBattleBgm("battle_champion_iris").setHasDouble("iris_alder_double").setDoubleTrainerType(TrainerType.ALDER).setDoubleTitle("champion_double") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.DRUDDIGON ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.ARCHEOPS ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.RESHIRAM ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.SALAMENCE, Species.HYDREIGON, Species.ARCHALUDON ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.LAPRAS ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // G-Max Lapras - p.generateAndPopulateMoveset(); - p.generateName(); - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.HAXORUS ], TrainerSlot.TRAINER, true, p => { - p.abilityIndex = 1; // Mold Breaker - p.generateAndPopulateMoveset(); - p.gender = Gender.FEMALE; - p.setBoss(true, 2); - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[3]; - return [ modifierTypes.TERA_SHARD().generateType([], [ Type.DRAGON ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.DIANTHA]: new TrainerConfig(++t).initForChampion(false).setMixedBattleBgm("battle_kalos_champion") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.HAWLUCHA ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.TREVENANT, Species.GOURGEIST ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.XERNEAS ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TYRANTRUM, Species.AURORUS ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 2; // Rock Head Tyrantrum, Snow Warning Aurorus - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GOODRA ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.setBoss(true, 2); - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GARDEVOIR ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // Mega Gardevoir - p.generateAndPopulateMoveset(); - p.generateName(); - p.gender = Gender.FEMALE; - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[3]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type2 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.KUKUI]: new TrainerConfig(++t).initForChampion(true).setMixedBattleBgm("battle_champion_kukui") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LYCANROC ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.formIndex = 2; // Dusk Lycanroc - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MAGNEZONE, Species.ALOLA_NINETALES ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.TORNADUS, Species.THUNDURUS, Species.LANDORUS ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // Therian Forms - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TAPU_KOKO, Species.TAPU_FINI ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.setBoss(true, 2); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.SNORLAX ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.formIndex = 1; // G-Max Snorlax - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.INCINEROAR, Species.HISUI_DECIDUEYE ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[5]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type2 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.HAU]: new TrainerConfig(++t).initForChampion(true).setMixedBattleBgm("battle_alola_champion") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ALOLA_RAICHU ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.NOIVERN ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SOLGALEO ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TAPU_LELE, Species.TAPU_BULU ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.ZYGARDE ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 1; // Zygarde 10% forme, Aura Break - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ROGUE_BALL; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.DECIDUEYE, Species.PRIMARINA ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.setBoss(true, 2); - p.gender = p.species.speciesId === Species.PRIMARINA ? Gender.FEMALE : Gender.MALE; - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[3]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.LEON]: new TrainerConfig(++t).initForChampion(true).setMixedBattleBgm("battle_galar_champion") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.AEGISLASH ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.RHYPERIOR, Species.SEISMITOAD, Species.MR_RIME ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.ZACIAN ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.DRAGAPULT ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.RILLABOOM, Species.CINDERACE, Species.INTELEON ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.setBoss(true, 2); - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.CHARIZARD ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 3; // G-Max Charizard - p.generateAndPopulateMoveset(); - p.generateName(); - p.gender = Gender.MALE; - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[3]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.MUSTARD]: new TrainerConfig(++t).initForChampion(true).setMixedBattleBgm("battle_mustard") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CORVIKNIGHT ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.KOMMO_O ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALAR_DARMANITAN ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.BLASTOISE, Species.VENUSAUR ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.setBoss(true, 2); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.URSHIFU ], TrainerSlot.TRAINER, true, p => { - p.formIndex = Utils.randSeedInt(2, 2); // Random G-Max Urshifu - p.generateAndPopulateMoveset(); - p.generateName(); - p.gender = Gender.MALE; - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[2]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type2 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.GEETA]: new TrainerConfig(++t).initForChampion(false).setMixedBattleBgm("battle_champion_geeta") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GLIMMORA ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - p.setBoss(true, 2); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.ESPATHRA, Species.VELUZA ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.MIRAIDON ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.BAXCALIBUR ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA ])) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.KINGAMBIT ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 1; // Supreme Overlord - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[5]; - return [ modifierTypes.TERA_SHARD().generateType([], [ Type.FLYING ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.NEMONA]: new TrainerConfig(++t).initForChampion(false).setMixedBattleBgm("battle_champion_nemona") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LYCANROC ], TrainerSlot.TRAINER, true, p => { - p.formIndex = 0; // Midday form - p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PAWMOT ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.KORAIDON ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GHOLDENGO ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.ARMAROUGE, Species.CERULEDGE ])) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - p.setBoss(true, 2); - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[4]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type2 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; - }), - [TrainerType.KIERAN]: new TrainerConfig(++t).initForChampion(true).setMixedBattleBgm("battle_champion_kieran") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.POLIWRATH, Species.POLITOED ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.INCINEROAR, Species.GRIMMSNARL ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - if (p.species.speciesId === Species.INCINEROAR) { - p.abilityIndex = 2; // Intimidate - } else if (p.species.speciesId === Species.GRIMMSNARL) { - p.abilityIndex = 0; // Prankster - } - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.TERAPAGOS ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.URSALUNA, Species.BLOODMOON_URSALUNA ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.OGERPON ], TrainerSlot.TRAINER, true, p => { - p.formIndex = Utils.randSeedInt(4, 4); // Random Ogerpon Tera Mask - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.IVY_CUDGEL)) { // Check if Ivy Cudgel is in the moveset, if not, replace the first move with Ivy Cudgel. - p.moveset[0] = new PokemonMove(Moves.IVY_CUDGEL); - } - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.HYDRAPPLE ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - p.setBoss(true, 2); - })) - .setGenModifiersFunc(party => { - const starter = party[4]; - let teraShardType: Type; - const pokemonType2 = starter.species.forms[starter.formIndex].type2; - if (starter.formIndex === 4 || Utils.isNullOrUndefined(pokemonType2)) { - teraShardType = starter.species.type1; - } else { - teraShardType = pokemonType2; - } - return [ modifierTypes.TERA_SHARD().generateType([], [ teraShardType ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(starter) as PersistentModifier ]; - }), + [TrainerType.BLUE]: new TrainerConfig((t = TrainerType.BLUE)) + .initForChampion(true) + .setBattleBgm("battle_kanto_champion") + .setMixedBattleBgm("battle_kanto_champion") + .setHasDouble("blue_red_double") + .setDoubleTrainerType(TrainerType.RED) + .setDoubleTitle("champion_double") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ALAKAZAM])) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.MACHAMP])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.HO_OH], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.RHYPERIOR, Species.ELECTIVIRE, Species.MAGMORTAR])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc( + [Species.ARCANINE, Species.EXEGGUTOR, Species.GYARADOS], + TrainerSlot.TRAINER, + true, + p => { + p.generateAndPopulateMoveset(); + p.setBoss(true, 2); + }, + ), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.PIDGEOT], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; // Mega Pidgeot + p.generateAndPopulateMoveset(); + p.generateName(); + p.gender = Gender.MALE; + }), + ) + .setInstantTera(3), // Tera Ground or Rock Rhyperior / Electric Electivire / Fire Magmortar + [TrainerType.RED]: new TrainerConfig(++t) + .initForChampion(true) + .setBattleBgm("battle_johto_champion") + .setMixedBattleBgm("battle_johto_champion") + .setHasDouble("red_blue_double") + .setDoubleTrainerType(TrainerType.BLUE) + .setDoubleTitle("champion_double") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.PIKACHU], TrainerSlot.TRAINER, true, p => { + p.formIndex = 8; // G-Max Pikachu + p.generateAndPopulateMoveset(); + p.generateName(); + p.gender = Gender.MALE; + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.ESPEON, Species.UMBREON, Species.SYLVEON])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.LUGIA], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.SNORLAX], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.setBoss(true, 2); + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc( + [Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE], + TrainerSlot.TRAINER, + true, + p => { + p.formIndex = 1; // Mega Venusaur, Mega Charizard X, or Mega Blastoise + p.generateAndPopulateMoveset(); + p.generateName(); + p.gender = Gender.MALE; + }, + ), + ) + .setInstantTera(3), // Tera Grass Meganium / Fire Typhlosion / Water Feraligatr + [TrainerType.LANCE_CHAMPION]: new TrainerConfig(++t) + .setName("Lance") + .initForChampion(true) + .setBattleBgm("battle_johto_champion") + .setMixedBattleBgm("battle_johto_champion") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GYARADOS, Species.KINGDRA])) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.AERODACTYL])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.SALAMENCE], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; // Mega Salamence + p.generateAndPopulateMoveset(); + p.generateName(); + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.CHARIZARD])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.TYRANITAR, Species.GARCHOMP, Species.KOMMO_O], TrainerSlot.TRAINER, true, p => { + p.teraType = PokemonType.DRAGON; + p.abilityIndex = p.species.speciesId === Species.KOMMO_O ? 1 : 2; // Soundproof Kommo-o, Unnerve Tyranitar, Rough Skin Garchomp + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.DRAGONITE], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + p.setBoss(true, 2); + }), + ) + .setInstantTera(4), // Tera Dragon Tyranitar / Garchomp / Kommo-o + [TrainerType.STEVEN]: new TrainerConfig(++t) + .initForChampion(true) + .setBattleBgm("battle_hoenn_champion_g5") + .setMixedBattleBgm("battle_hoenn_champion_g6") + .setHasDouble("steven_wallace_double") + .setDoubleTrainerType(TrainerType.WALLACE) + .setDoubleTitle("champion_double") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SKARMORY])) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.CRADILY, Species.ARMALDO])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.AGGRON], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.setBoss(true, 2); + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GOLURK, Species.RUNERIGUS])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.REGIROCK, Species.REGICE, Species.REGISTEEL], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.METAGROSS], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; // Mega Metagross + p.generateAndPopulateMoveset(); + p.generateName(); + }), + ) + .setInstantTera(4), // Tera Rock Regirock / Ice Regice / Steel Registeel + [TrainerType.WALLACE]: new TrainerConfig(++t) + .initForChampion(true) + .setBattleBgm("battle_hoenn_champion_g5") + .setMixedBattleBgm("battle_hoenn_champion_g6") + .setHasDouble("wallace_steven_double") + .setDoubleTrainerType(TrainerType.STEVEN) + .setDoubleTitle("champion_double") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => { + p.abilityIndex = 1; // Drizzle + p.generateAndPopulateMoveset(); + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.LUDICOLO])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.LATIAS, Species.LATIOS], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; // Mega Latios or Mega Latias + p.generateAndPopulateMoveset(); + p.generateName(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SWAMPERT, Species.GASTRODON, Species.SEISMITOAD])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.REGIELEKI, Species.REGIDRAGO], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.MILOTIC], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.FEMALE; + p.setBoss(true, 2); + }), + ) + .setInstantTera(4), // Tera Electric Regieleki / Dragon Regidrago + [TrainerType.CYNTHIA]: new TrainerConfig(++t) + .initForChampion(false) + .setBattleBgm("battle_sinnoh_champion") + .setMixedBattleBgm("battle_sinnoh_champion") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.SPIRITOMB], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.LUCARIO])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.GIRATINA], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc( + [Species.MILOTIC, Species.ROSERADE, Species.HISUI_ARCANINE], + TrainerSlot.TRAINER, + true, + p => { + p.teraType = p.species.type1; + }, + ), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.TOGEKISS], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.setBoss(true, 2); + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.GARCHOMP], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; // Mega Garchomp + p.generateAndPopulateMoveset(); + p.generateName(); + p.gender = Gender.FEMALE; + }), + ) + .setInstantTera(3), // Tera Water Milotic / Grass Roserade / Fire Hisuian Arcanine + [TrainerType.ALDER]: new TrainerConfig(++t) + .initForChampion(true) + .setHasDouble("alder_iris_double") + .setDoubleTrainerType(TrainerType.IRIS) + .setDoubleTitle("champion_double") + .setBattleBgm("battle_champion_alder") + .setMixedBattleBgm("battle_champion_alder") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BOUFFALANT, Species.BRAVIARY])) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc( + [Species.HISUI_LILLIGANT, Species.HISUI_ZOROARK, Species.BASCULEGION], + TrainerSlot.TRAINER, + true, + p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }, + ), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.ZEKROM], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.KELDEO], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc( + [Species.CHANDELURE, Species.KROOKODILE, Species.REUNICLUS, Species.CONKELDURR], + TrainerSlot.TRAINER, + true, + p => { + p.teraType = p.species.speciesId === Species.KROOKODILE ? PokemonType.DARK : p.species.type1; + }, + ), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.VOLCARONA], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + p.setBoss(true, 2); + }), + ) + .setInstantTera(4), // Tera Ghost Chandelure / Dark Krookodile / Psychic Reuniclus / Fighting Conkeldurr + [TrainerType.IRIS]: new TrainerConfig(++t) + .initForChampion(false) + .setBattleBgm("battle_champion_iris") + .setMixedBattleBgm("battle_champion_iris") + .setHasDouble("iris_alder_double") + .setDoubleTrainerType(TrainerType.ALDER) + .setDoubleTitle("champion_double") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.DRUDDIGON])) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.ARCHEOPS])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.RESHIRAM], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc( + [Species.SALAMENCE, Species.HYDREIGON, Species.ARCHALUDON], + TrainerSlot.TRAINER, + true, + p => { + p.teraType = PokemonType.DRAGON; + }, + ), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.LAPRAS], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; // G-Max Lapras + p.generateAndPopulateMoveset(); + p.generateName(); + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.HAXORUS], TrainerSlot.TRAINER, true, p => { + p.abilityIndex = 1; // Mold Breaker + p.generateAndPopulateMoveset(); + p.gender = Gender.FEMALE; + p.setBoss(true, 2); + }), + ) + .setInstantTera(3), // Tera Dragon Salamence / Hydreigon / Archaludon + [TrainerType.DIANTHA]: new TrainerConfig(++t) + .initForChampion(false) + .setMixedBattleBgm("battle_kalos_champion") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.HAWLUCHA], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.TREVENANT, Species.GOURGEIST])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.XERNEAS], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.TYRANTRUM, Species.AURORUS], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = 2; // Rock Head Tyrantrum, Snow Warning Aurorus + p.teraType = p.species.type2!; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.GOODRA], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.setBoss(true, 2); + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.GARDEVOIR], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; // Mega Gardevoir + p.generateAndPopulateMoveset(); + p.generateName(); + p.gender = Gender.FEMALE; + }), + ) + .setInstantTera(3), // Tera Dragon Tyrantrum / Ice Aurorus + [TrainerType.KUKUI]: new TrainerConfig(++t) + .initForChampion(true) + .setMixedBattleBgm("battle_champion_kukui") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.formIndex = 2; // Dusk Lycanroc + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.MAGNEZONE, Species.ALOLA_NINETALES])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc( + [Species.TORNADUS, Species.THUNDURUS, Species.LANDORUS], + TrainerSlot.TRAINER, + true, + p => { + p.formIndex = 1; // Therian Formes + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }, + ), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.TAPU_KOKO, Species.TAPU_FINI], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.setBoss(true, 2); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.SNORLAX], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.formIndex = 1; // G-Max Snorlax + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.INCINEROAR, Species.HISUI_DECIDUEYE], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + p.teraType = p.species.type2!; + }), + ) + .setInstantTera(5), // Tera Dark Incineroar / Fighting Hisuian Decidueye + [TrainerType.HAU]: new TrainerConfig(++t) + .initForChampion(true) + .setMixedBattleBgm("battle_alola_champion") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.ALOLA_RAICHU], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.NOIVERN])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.SOLGALEO], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.TAPU_LELE, Species.TAPU_BULU], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.teraType = p.species.type1; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.ZYGARDE], TrainerSlot.TRAINER, true, p => { + p.formIndex = 1; // Zygarde 10% forme, Aura Break + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.DECIDUEYE, Species.PRIMARINA], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.setBoss(true, 2); + p.gender = p.species.speciesId === Species.PRIMARINA ? Gender.FEMALE : Gender.MALE; + }), + ) + .setInstantTera(3), // Tera Psychic Tapu Lele / Grass Tapu Bulu + [TrainerType.LEON]: new TrainerConfig(++t) + .initForChampion(true) + .setMixedBattleBgm("battle_galar_champion") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.AEGISLASH], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.RHYPERIOR, Species.SEISMITOAD, Species.MR_RIME])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.ZACIAN], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DRAGAPULT])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc( + [Species.RILLABOOM, Species.CINDERACE, Species.INTELEON], + TrainerSlot.TRAINER, + true, + p => { + p.generateAndPopulateMoveset(); + p.setBoss(true, 2); + }, + ), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.CHARIZARD], TrainerSlot.TRAINER, true, p => { + p.formIndex = 3; // G-Max Charizard + p.generateAndPopulateMoveset(); + p.generateName(); + p.gender = Gender.MALE; + }), + ) + .setInstantTera(3), // Tera Dragapult to Ghost or Dragon + [TrainerType.MUSTARD]: new TrainerConfig(++t) + .initForChampion(true) + .setMixedBattleBgm("battle_mustard") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.CORVIKNIGHT], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.KOMMO_O], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.teraType = PokemonType.PSYCHIC; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.GALAR_DARMANITAN], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.BLASTOISE, Species.VENUSAUR], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.setBoss(true, 2); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.URSHIFU], TrainerSlot.TRAINER, true, p => { + p.formIndex = Utils.randSeedInt(2, 2); // Random G-Max Urshifu + p.generateAndPopulateMoveset(); + p.generateName(); + p.gender = Gender.MALE; + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setInstantTera(2), // Tera Psychic Galar-Slowbro / Galar-Slowking + [TrainerType.GEETA]: new TrainerConfig(++t) + .initForChampion(false) + .setMixedBattleBgm("battle_champion_geeta") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.GLIMMORA], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + p.setBoss(true, 2); + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.ESPATHRA, Species.VELUZA])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.MIRAIDON], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.BAXCALIBUR])) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA])) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.KINGAMBIT], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = 1; // Supreme Overlord + p.teraType = PokemonType.FLYING; + }), + ) + .setInstantTera(5), // Tera Flying Kingambit + [TrainerType.NEMONA]: new TrainerConfig(++t) + .initForChampion(false) + .setMixedBattleBgm("battle_champion_nemona") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => { + p.formIndex = 0; // Midday form + p.generateAndPopulateMoveset(); + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.PAWMOT])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.KORAIDON], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GHOLDENGO])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.ARMAROUGE, Species.CERULEDGE], TrainerSlot.TRAINER, true, p => { + p.teraType = p.species.type2!; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc( + [Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL], + TrainerSlot.TRAINER, + true, + p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + p.setBoss(true, 2); + }, + ), + ) + .setInstantTera(4), // Tera Psychic Armarouge / Ghost Ceruledge + [TrainerType.KIERAN]: new TrainerConfig(++t) + .initForChampion(true) + .setMixedBattleBgm("battle_champion_kieran") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.POLIWRATH, Species.POLITOED], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.INCINEROAR, Species.GRIMMSNARL], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = p.species.speciesId === Species.INCINEROAR ? 2 : 0; // Intimidate Incineroar, Prankster Grimmsnarl + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.TERAPAGOS], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.URSALUNA, Species.BLOODMOON_URSALUNA], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.OGERPON], TrainerSlot.TRAINER, true, p => { + p.formIndex = Utils.randSeedInt(4); // Random Ogerpon Tera Mask + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.IVY_CUDGEL)) { + // Check if Ivy Cudgel is in the moveset, if not, replace the first move with Ivy Cudgel. + p.moveset[0] = new PokemonMove(Moves.IVY_CUDGEL); + } + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.HYDRAPPLE], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + p.setBoss(true, 2); + }), + ) + .setInstantTera(4), // Tera Ogerpon - [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL) - .setModifierRewardFuncs(() => modifierTypes.SUPER_EXP_CHARM, () => modifierTypes.EXP_SHARE) - .setEventModifierRewardFuncs(() => modifierTypes.SHINY_CHARM, () => modifierTypes.ABILITY_CHARM, () => modifierTypes.CATCHING_CHARM) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT, Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE, Species.ROWLET, Species.LITTEN, Species.POPPLIO, Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE, Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY ], TrainerSlot.TRAINER, true, - (p => p.abilityIndex = 0))) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEY, Species.HOOTHOOT, Species.TAILLOW, Species.STARLY, Species.PIDOVE, Species.FLETCHLING, Species.PIKIPEK, Species.ROOKIDEE, Species.WATTREL ], TrainerSlot.TRAINER, true)), - [TrainerType.RIVAL_2]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL_2) + [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)) + .setName("Finn") + .setHasGenders("Ivy") + .setHasCharSprite() + .setTitle("Rival") + .setStaticParty() + .setEncounterBgm(TrainerType.RIVAL) + .setBattleBgm("battle_rival") + .setMixedBattleBgm("battle_rival") + .setPartyTemplates(trainerPartyTemplates.RIVAL) + .setModifierRewardFuncs( + () => modifierTypes.SUPER_EXP_CHARM, + () => modifierTypes.EXP_SHARE, + ) + .setEventModifierRewardFuncs( + () => modifierTypes.SHINY_CHARM, + () => modifierTypes.ABILITY_CHARM, + () => modifierTypes.CATCHING_CHARM, + ) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc( + [ + Species.BULBASAUR, + Species.CHARMANDER, + Species.SQUIRTLE, + Species.CHIKORITA, + Species.CYNDAQUIL, + Species.TOTODILE, + Species.TREECKO, + Species.TORCHIC, + Species.MUDKIP, + Species.TURTWIG, + Species.CHIMCHAR, + Species.PIPLUP, + Species.SNIVY, + Species.TEPIG, + Species.OSHAWOTT, + Species.CHESPIN, + Species.FENNEKIN, + Species.FROAKIE, + Species.ROWLET, + Species.LITTEN, + Species.POPPLIO, + Species.GROOKEY, + Species.SCORBUNNY, + Species.SOBBLE, + Species.SPRIGATITO, + Species.FUECOCO, + Species.QUAXLY, + ], + TrainerSlot.TRAINER, + true, + p => (p.abilityIndex = 0), + ), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc( + [ + Species.PIDGEY, + Species.HOOTHOOT, + Species.TAILLOW, + Species.STARLY, + Species.PIDOVE, + Species.FLETCHLING, + Species.PIKIPEK, + Species.ROOKIDEE, + Species.WATTREL, + ], + TrainerSlot.TRAINER, + true, + ), + ), + [TrainerType.RIVAL_2]: new TrainerConfig(++t) + .setName("Finn") + .setHasGenders("Ivy") + .setHasCharSprite() + .setTitle("Rival") + .setStaticParty() + .setMoneyMultiplier(1.25) + .setEncounterBgm(TrainerType.RIVAL) + .setBattleBgm("battle_rival") + .setMixedBattleBgm("battle_rival") + .setPartyTemplates(trainerPartyTemplates.RIVAL_2) .setModifierRewardFuncs(() => modifierTypes.EXP_SHARE) .setEventModifierRewardFuncs(() => modifierTypes.SHINY_CHARM) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.IVYSAUR, Species.CHARMELEON, Species.WARTORTLE, Species.BAYLEEF, Species.QUILAVA, Species.CROCONAW, Species.GROVYLE, Species.COMBUSKEN, Species.MARSHTOMP, Species.GROTLE, Species.MONFERNO, Species.PRINPLUP, Species.SERVINE, Species.PIGNITE, Species.DEWOTT, Species.QUILLADIN, Species.BRAIXEN, Species.FROGADIER, Species.DARTRIX, Species.TORRACAT, Species.BRIONNE, Species.THWACKEY, Species.RABOOT, Species.DRIZZILE, Species.FLORAGATO, Species.CROCALOR, Species.QUAXWELL ], TrainerSlot.TRAINER, true, - (p => p.abilityIndex = 0))) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOTTO, Species.HOOTHOOT, Species.TAILLOW, Species.STARAVIA, Species.TRANQUILL, Species.FLETCHINDER, Species.TRUMBEAK, Species.CORVISQUIRE, Species.WATTREL ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450)), - [TrainerType.RIVAL_3]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setMoneyMultiplier(1.5).setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL_3) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ], TrainerSlot.TRAINER, true, - (p => p.abilityIndex = 0))) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450)) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc( + [ + Species.IVYSAUR, + Species.CHARMELEON, + Species.WARTORTLE, + Species.BAYLEEF, + Species.QUILAVA, + Species.CROCONAW, + Species.GROVYLE, + Species.COMBUSKEN, + Species.MARSHTOMP, + Species.GROTLE, + Species.MONFERNO, + Species.PRINPLUP, + Species.SERVINE, + Species.PIGNITE, + Species.DEWOTT, + Species.QUILLADIN, + Species.BRAIXEN, + Species.FROGADIER, + Species.DARTRIX, + Species.TORRACAT, + Species.BRIONNE, + Species.THWACKEY, + Species.RABOOT, + Species.DRIZZILE, + Species.FLORAGATO, + Species.CROCALOR, + Species.QUAXWELL, + ], + TrainerSlot.TRAINER, + true, + p => (p.abilityIndex = 0), + ), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc( + [ + Species.PIDGEOTTO, + Species.HOOTHOOT, + Species.TAILLOW, + Species.STARAVIA, + Species.TRANQUILL, + Species.FLETCHINDER, + Species.TRUMBEAK, + Species.CORVISQUIRE, + Species.WATTREL, + ], + TrainerSlot.TRAINER, + true, + ), + ) + .setPartyMemberFunc( + 2, + getSpeciesFilterRandomPartyMemberFunc( + (species: PokemonSpecies) => + !pokemonEvolutions.hasOwnProperty(species.speciesId) && + !pokemonPrevolutions.hasOwnProperty(species.speciesId) && + species.baseTotal >= 450, + ), + ), + [TrainerType.RIVAL_3]: new TrainerConfig(++t) + .setName("Finn") + .setHasGenders("Ivy") + .setHasCharSprite() + .setTitle("Rival") + .setStaticParty() + .setMoneyMultiplier(1.5) + .setEncounterBgm(TrainerType.RIVAL) + .setBattleBgm("battle_rival") + .setMixedBattleBgm("battle_rival") + .setPartyTemplates(trainerPartyTemplates.RIVAL_3) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc( + [ + Species.VENUSAUR, + Species.CHARIZARD, + Species.BLASTOISE, + Species.MEGANIUM, + Species.TYPHLOSION, + Species.FERALIGATR, + Species.SCEPTILE, + Species.BLAZIKEN, + Species.SWAMPERT, + Species.TORTERRA, + Species.INFERNAPE, + Species.EMPOLEON, + Species.SERPERIOR, + Species.EMBOAR, + Species.SAMUROTT, + Species.CHESNAUGHT, + Species.DELPHOX, + Species.GRENINJA, + Species.DECIDUEYE, + Species.INCINEROAR, + Species.PRIMARINA, + Species.RILLABOOM, + Species.CINDERACE, + Species.INTELEON, + Species.MEOWSCARADA, + Species.SKELEDIRGE, + Species.QUAQUAVAL, + ], + TrainerSlot.TRAINER, + true, + p => (p.abilityIndex = 0), + ), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc( + [ + Species.PIDGEOT, + Species.NOCTOWL, + Species.SWELLOW, + Species.STARAPTOR, + Species.UNFEZANT, + Species.TALONFLAME, + Species.TOUCANNON, + Species.CORVIKNIGHT, + Species.KILOWATTREL, + ], + TrainerSlot.TRAINER, + true, + ), + ) + .setPartyMemberFunc( + 2, + getSpeciesFilterRandomPartyMemberFunc( + (species: PokemonSpecies) => + !pokemonEvolutions.hasOwnProperty(species.speciesId) && + !pokemonPrevolutions.hasOwnProperty(species.speciesId) && + species.baseTotal >= 450, + ), + ) .setSpeciesFilter(species => species.baseTotal >= 540), - [TrainerType.RIVAL_4]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setBoss().setStaticParty().setMoneyMultiplier(1.75).setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival_2").setMixedBattleBgm("battle_rival_2").setPartyTemplates(trainerPartyTemplates.RIVAL_4) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ], TrainerSlot.TRAINER, true, - (p => p.abilityIndex = 0))) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450)) + [TrainerType.RIVAL_4]: new TrainerConfig(++t) + .setName("Finn") + .setHasGenders("Ivy") + .setHasCharSprite() + .setTitle("Rival") + .setBoss() + .setStaticParty() + .setMoneyMultiplier(1.75) + .setEncounterBgm(TrainerType.RIVAL) + .setBattleBgm("battle_rival_2") + .setMixedBattleBgm("battle_rival_2") + .setPartyTemplates(trainerPartyTemplates.RIVAL_4) + .setModifierRewardFuncs(() => modifierTypes.TERA_ORB) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc( + [ + Species.VENUSAUR, + Species.CHARIZARD, + Species.BLASTOISE, + Species.MEGANIUM, + Species.TYPHLOSION, + Species.FERALIGATR, + Species.SCEPTILE, + Species.BLAZIKEN, + Species.SWAMPERT, + Species.TORTERRA, + Species.INFERNAPE, + Species.EMPOLEON, + Species.SERPERIOR, + Species.EMBOAR, + Species.SAMUROTT, + Species.CHESNAUGHT, + Species.DELPHOX, + Species.GRENINJA, + Species.DECIDUEYE, + Species.INCINEROAR, + Species.PRIMARINA, + Species.RILLABOOM, + Species.CINDERACE, + Species.INTELEON, + Species.MEOWSCARADA, + Species.SKELEDIRGE, + Species.QUAQUAVAL, + ], + TrainerSlot.TRAINER, + true, + p => { + p.abilityIndex = 0; + p.teraType = p.species.type1; + }, + ), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc( + [ + Species.PIDGEOT, + Species.NOCTOWL, + Species.SWELLOW, + Species.STARAPTOR, + Species.UNFEZANT, + Species.TALONFLAME, + Species.TOUCANNON, + Species.CORVIKNIGHT, + Species.KILOWATTREL, + ], + TrainerSlot.TRAINER, + true, + ), + ) + .setPartyMemberFunc( + 2, + getSpeciesFilterRandomPartyMemberFunc( + (species: PokemonSpecies) => + !pokemonEvolutions.hasOwnProperty(species.speciesId) && + !pokemonPrevolutions.hasOwnProperty(species.speciesId) && + species.baseTotal >= 450, + ), + ) .setSpeciesFilter(species => species.baseTotal >= 540) - .setGenModifiersFunc(party => { - const starter = party[0]; - return [ modifierTypes.TERA_SHARD().generateType([], [ starter.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(starter) as PersistentModifier ]; // TODO: is the bang correct? - }), - [TrainerType.RIVAL_5]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setBoss().setStaticParty().setMoneyMultiplier(2.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival_3").setMixedBattleBgm("battle_rival_3").setPartyTemplates(trainerPartyTemplates.RIVAL_5) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ], TrainerSlot.TRAINER, true, - p => { - p.setBoss(true, 2); - p.abilityIndex = 0; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450)) + .setInstantTera(0), // Tera starter to primary type + [TrainerType.RIVAL_5]: new TrainerConfig(++t) + .setName("Finn") + .setHasGenders("Ivy") + .setHasCharSprite() + .setTitle("Rival") + .setBoss() + .setStaticParty() + .setMoneyMultiplier(2.25) + .setEncounterBgm(TrainerType.RIVAL) + .setBattleBgm("battle_rival_3") + .setMixedBattleBgm("battle_rival_3") + .setPartyTemplates(trainerPartyTemplates.RIVAL_5) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc( + [ + Species.VENUSAUR, + Species.CHARIZARD, + Species.BLASTOISE, + Species.MEGANIUM, + Species.TYPHLOSION, + Species.FERALIGATR, + Species.SCEPTILE, + Species.BLAZIKEN, + Species.SWAMPERT, + Species.TORTERRA, + Species.INFERNAPE, + Species.EMPOLEON, + Species.SERPERIOR, + Species.EMBOAR, + Species.SAMUROTT, + Species.CHESNAUGHT, + Species.DELPHOX, + Species.GRENINJA, + Species.DECIDUEYE, + Species.INCINEROAR, + Species.PRIMARINA, + Species.RILLABOOM, + Species.CINDERACE, + Species.INTELEON, + Species.MEOWSCARADA, + Species.SKELEDIRGE, + Species.QUAQUAVAL, + ], + TrainerSlot.TRAINER, + true, + p => { + p.setBoss(true, 2); + p.abilityIndex = 0; + p.teraType = p.species.type1; + }, + ), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc( + [ + Species.PIDGEOT, + Species.NOCTOWL, + Species.SWELLOW, + Species.STARAPTOR, + Species.UNFEZANT, + Species.TALONFLAME, + Species.TOUCANNON, + Species.CORVIKNIGHT, + Species.KILOWATTREL, + ], + TrainerSlot.TRAINER, + true, + ), + ) + .setPartyMemberFunc( + 2, + getSpeciesFilterRandomPartyMemberFunc( + (species: PokemonSpecies) => + !pokemonEvolutions.hasOwnProperty(species.speciesId) && + !pokemonPrevolutions.hasOwnProperty(species.speciesId) && + species.baseTotal >= 450, + ), + ) .setSpeciesFilter(species => species.baseTotal >= 540) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.RAYQUAZA ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 3); - p.pokeball = PokeballType.MASTER_BALL; - p.shiny = true; - p.variant = 1; - })) - .setGenModifiersFunc(party => { - const starter = party[0]; - return [ modifierTypes.TERA_SHARD().generateType([], [ starter.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(starter) as PersistentModifier ]; //TODO: is the bang correct? - }), - [TrainerType.RIVAL_6]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setBoss().setStaticParty().setMoneyMultiplier(3).setEncounterBgm("final").setBattleBgm("battle_rival_3").setMixedBattleBgm("battle_rival_3").setPartyTemplates(trainerPartyTemplates.RIVAL_6) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ], TrainerSlot.TRAINER, true, - p => { + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.RAYQUAZA], TrainerSlot.TRAINER, true, p => { p.setBoss(true, 3); - p.abilityIndex = 0; + p.pokeball = PokeballType.MASTER_BALL; + p.shiny = true; + p.variant = 1; + }), + ) + .setInstantTera(0), // Tera starter to primary type + [TrainerType.RIVAL_6]: new TrainerConfig(++t) + .setName("Finn") + .setHasGenders("Ivy") + .setHasCharSprite() + .setTitle("Rival") + .setBoss() + .setStaticParty() + .setMoneyMultiplier(3) + .setEncounterBgm("final") + .setBattleBgm("battle_rival_3") + .setMixedBattleBgm("battle_rival_3") + .setPartyTemplates(trainerPartyTemplates.RIVAL_6) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc( + [ + Species.VENUSAUR, + Species.CHARIZARD, + Species.BLASTOISE, + Species.MEGANIUM, + Species.TYPHLOSION, + Species.FERALIGATR, + Species.SCEPTILE, + Species.BLAZIKEN, + Species.SWAMPERT, + Species.TORTERRA, + Species.INFERNAPE, + Species.EMPOLEON, + Species.SERPERIOR, + Species.EMBOAR, + Species.SAMUROTT, + Species.CHESNAUGHT, + Species.DELPHOX, + Species.GRENINJA, + Species.DECIDUEYE, + Species.INCINEROAR, + Species.PRIMARINA, + Species.RILLABOOM, + Species.CINDERACE, + Species.INTELEON, + Species.MEOWSCARADA, + Species.SKELEDIRGE, + Species.QUAQUAVAL, + ], + TrainerSlot.TRAINER, + true, + p => { + p.setBoss(true, 3); + p.abilityIndex = 0; + p.teraType = p.species.type1; + p.generateAndPopulateMoveset(); + }, + ), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc( + [ + Species.PIDGEOT, + Species.NOCTOWL, + Species.SWELLOW, + Species.STARAPTOR, + Species.UNFEZANT, + Species.TALONFLAME, + Species.TOUCANNON, + Species.CORVIKNIGHT, + Species.KILOWATTREL, + ], + TrainerSlot.TRAINER, + true, + p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + }, + ), + ) + .setPartyMemberFunc( + 2, + getSpeciesFilterRandomPartyMemberFunc( + (species: PokemonSpecies) => + !pokemonEvolutions.hasOwnProperty(species.speciesId) && + !pokemonPrevolutions.hasOwnProperty(species.speciesId) && + species.baseTotal >= 450, + ), + ) + .setSpeciesFilter(species => species.baseTotal >= 540) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.RAYQUAZA], TrainerSlot.TRAINER, true, p => { + p.setBoss(); p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ], TrainerSlot.TRAINER, true, - p => { + p.pokeball = PokeballType.MASTER_BALL; + p.shiny = true; + p.variant = 1; + p.formIndex = 1; // Mega Rayquaza + p.generateName(); + }), + ) + .setInstantTera(0), // Tera starter to primary type + + [TrainerType.ROCKET_BOSS_GIOVANNI_1]: new TrainerConfig((t = TrainerType.ROCKET_BOSS_GIOVANNI_1)) + .setName("Giovanni") + .initForEvilTeamLeader("Rocket Boss", []) + .setMixedBattleBgm("battle_rocket_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.PERSIAN], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.DUGTRIO, Species.ALOLA_DUGTRIO])) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.HONCHKROW])) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.NIDOQUEEN, Species.NIDOKING])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.RHYPERIOR], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.abilityIndex = 1; // Solid Rock + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.KANGASKHAN], TrainerSlot.TRAINER, true, p => { p.setBoss(true, 2); p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450)) - .setSpeciesFilter(species => species.baseTotal >= 540) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.RAYQUAZA ], TrainerSlot.TRAINER, true, p => { - p.setBoss(); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - p.shiny = true; - p.variant = 1; - p.formIndex = 1; // Mega Rayquaza - p.generateName(); - })) - .setGenModifiersFunc(party => { - const starter = party[0]; - return [ modifierTypes.TERA_SHARD().generateType([], [ starter.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(starter) as PersistentModifier ]; // TODO: is the bang correct? - }), - - [TrainerType.ROCKET_BOSS_GIOVANNI_1]: new TrainerConfig(t = TrainerType.ROCKET_BOSS_GIOVANNI_1).setName("Giovanni").initForEvilTeamLeader("Rocket Boss", []).setMixedBattleBgm("battle_rocket_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PERSIAN ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.DUGTRIO, Species.ALOLA_DUGTRIO ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.HONCHKROW ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.NIDOQUEEN, Species.NIDOKING ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.RHYPERIOR ])) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.KANGASKHAN ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = 1; // Mega Kangaskhan - p.generateName(); - })), - [TrainerType.ROCKET_BOSS_GIOVANNI_2]: new TrainerConfig(++t).setName("Giovanni").initForEvilTeamLeader("Rocket Boss", [], true).setMixedBattleBgm("battle_rocket_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.TYRANITAR, Species.IRON_THORNS ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HIPPOWDON ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.GARCHOMP, Species.EXCADRILL ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GASTRODON, Species.SEISMITOAD ], TrainerSlot.TRAINER, true, p => { - if (p.species.speciesId === Species.GASTRODON) { - p.abilityIndex = 0; // Storm Drain - } else if (p.species.speciesId === Species.SEISMITOAD) { - p.abilityIndex = 2; // Water Absorb - } - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.KANGASKHAN ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = 1; // Mega Kangaskhan - p.generateName(); - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.MEWTWO ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.MAXIE]: new TrainerConfig(++t).setName("Maxie").initForEvilTeamLeader("Magma Boss", []).setMixedBattleBgm("battle_aqua_magma_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.SOLROCK ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.TALONFLAME ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.WEEZING, Species.GALAR_WEEZING ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TORKOAL ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 1; // Drought - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.DONPHAN ])) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.CAMERUPT ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = 1; // Mega Camerupt - p.generateName(); - p.gender = Gender.MALE; - })), - [TrainerType.MAXIE_2]: new TrainerConfig(++t).setName("Maxie").initForEvilTeamLeader("Magma Boss", [], true).setMixedBattleBgm("battle_aqua_magma_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.TYPHLOSION, Species.SOLROCK ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.NINETALES, Species.TORKOAL ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - if (p.species.speciesId === Species.NINETALES) { - p.abilityIndex = 2; // Drought - } else if (p.species.speciesId === Species.TORKOAL) { + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = 1; // Mega Kangaskhan + p.generateName(); + }), + ), + [TrainerType.ROCKET_BOSS_GIOVANNI_2]: new TrainerConfig(++t) + .setName("Giovanni") + .initForEvilTeamLeader("Rocket Boss", [], true) + .setMixedBattleBgm("battle_rocket_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.TYRANITAR], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.GASTRODON, Species.SEISMITOAD], TrainerSlot.TRAINER, true, p => { + if (p.species.speciesId === Species.GASTRODON) { + p.abilityIndex = 0; // Storm Drain + } else if (p.species.speciesId === Species.SEISMITOAD) { + p.abilityIndex = 2; // Water Absorb + } + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.GARCHOMP, Species.EXCADRILL], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + if (p.species.speciesId === Species.GARCHOMP) { + p.abilityIndex = 2; // Rough Skin + } else if (p.species.speciesId === Species.EXCADRILL) { + p.abilityIndex = 0; // Sand Rush + } + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.RHYPERIOR], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.abilityIndex = 1; // Solid Rock + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.KANGASKHAN], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = 1; // Mega Kangaskhan + p.generateName(); + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.MEWTWO], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.MAXIE]: new TrainerConfig(++t) + .setName("Maxie") + .initForEvilTeamLeader("Magma Boss", []) + .setMixedBattleBgm("battle_aqua_magma_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SOLROCK])) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.TALONFLAME])) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.WEEZING, Species.GALAR_WEEZING])) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.TORKOAL], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); p.abilityIndex = 1; // Drought - } - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCOVILLAIN ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 0; // Chlorophyll - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GREAT_TUSK ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.CAMERUPT ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = 1; // Mega Camerupt - p.generateName(); - p.gender = Gender.MALE; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GROUDON ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.ARCHIE]: new TrainerConfig(++t).setName("Archie").initForEvilTeamLeader("Aqua Boss", []).setMixedBattleBgm("battle_aqua_magma_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LUDICOLO ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PELIPPER ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 1; // Drizzle - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.MUK, Species.ALOLA_MUK ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.WAILORD ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.QWILFISH ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 1; // Swift Swim - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.SHARPEDO ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = 1; // Mega Sharpedo - p.generateName(); - p.gender = Gender.MALE; - })), - [TrainerType.ARCHIE_2]: new TrainerConfig(++t).setName("Archie").initForEvilTeamLeader("Aqua Boss", [], true).setMixedBattleBgm("battle_aqua_magma_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LUDICOLO, Species.EMPOLEON ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.POLITOED, Species.PELIPPER ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - if (p.species.speciesId === Species.POLITOED) { - p.abilityIndex = 2; // Drizzle - } else if (p.species.speciesId === Species.PELIPPER) { - p.abilityIndex = 1; // Drizzle - } - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.DHELMISE ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.OVERQWIL ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 1; // Swift Swim - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.SHARPEDO ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = 1; // Mega Sharpedo - p.generateName(); - p.gender = Gender.MALE; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.KYOGRE ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.CYRUS]: new TrainerConfig(++t).setName("Cyrus").initForEvilTeamLeader("Galactic Boss", []).setMixedBattleBgm("battle_galactic_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GYARADOS ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HONCHKROW, Species.HISUI_BRAVIARY ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.MAGNEZONE ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.UXIE, Species.MESPRIT, Species.AZELF ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.HOUNDOOM ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = 1; // Mega Houndoom - p.generateName(); - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.WEAVILE ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.gender = Gender.MALE; - })), - [TrainerType.CYRUS_2]: new TrainerConfig(++t).setName("Cyrus").initForEvilTeamLeader("Galactic Boss", [], true).setMixedBattleBgm("battle_galactic_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CROBAT ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MAGNEZONE ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.UXIE, Species.MESPRIT, Species.AZELF ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.HOUNDOOM ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = 1; // Mega Houndoom - p.generateName(); - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.WEAVILE ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.gender = Gender.MALE; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.DIALGA, Species.PALKIA ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.GHETSIS]: new TrainerConfig(++t).setName("Ghetsis").initForEvilTeamLeader("Plasma Boss", []).setMixedBattleBgm("battle_plasma_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.COFAGRIGUS ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.SEISMITOAD ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.GALVANTULA, Species.EELEKTROSS ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.DRAPION, Species.TOXICROAK ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.KINGAMBIT ])) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.HYDREIGON ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.gender = Gender.MALE; - })), - [TrainerType.GHETSIS_2]: new TrainerConfig(++t).setName("Ghetsis").initForEvilTeamLeader("Plasma Boss", [], true).setMixedBattleBgm("battle_plasma_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.RUNERIGUS ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.JELLICENT, Species.BASCULEGION ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - p.formIndex = 0; - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.KINGAMBIT ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.VOLCARONA, Species.IRON_MOTH ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.HYDREIGON, Species.IRON_JUGULIS ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - if (p.species.speciesId === Species.HYDREIGON) { + }), + ) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.DONPHAN])) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.CAMERUPT], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = 1; // Mega Camerupt + p.generateName(); p.gender = Gender.MALE; - } else if (p.species.speciesId === Species.IRON_JUGULIS) { - p.gender = Gender.GENDERLESS; - } - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.KYUREM ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.LYSANDRE]: new TrainerConfig(++t).setName("Lysandre").initForEvilTeamLeader("Flare Boss", []).setMixedBattleBgm("battle_flare_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.MIENSHAO ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HONCHKROW, Species.TALONFLAME ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.PYROAR ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.DRAGALGE, Species.CLAWITZER ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GALLADE ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 1; // Sharpness - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GYARADOS ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = 1; // Mega Gyarados - p.generateName(); - p.gender = Gender.MALE; - })), - [TrainerType.LYSANDRE_2]: new TrainerConfig(++t).setName("Lysandre").initForEvilTeamLeader("Flare Boss", [], true).setMixedBattleBgm("battle_flare_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PYROAR ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.DRAGALGE, Species.CLAWITZER ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AEGISLASH, Species.HISUI_GOODRA ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.IRON_VALIANT ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ROGUE_BALL; - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GYARADOS ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = 1; // Mega Gyardos - p.generateName(); - p.gender = Gender.MALE; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.ZYGARDE ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - p.formIndex = 0; // 50% Forme, Aura Break - })), - [TrainerType.LUSAMINE]: new TrainerConfig(++t).setName("Lusamine").initForEvilTeamLeader("Aether Boss", []).setMixedBattleBgm("battle_aether_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLEFABLE ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.gender = Gender.FEMALE; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.LILLIGANT, Species.HISUI_LILLIGANT ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.MILOTIC, Species.PRIMARINA ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.BEWEAR ])) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.NIHILEGO ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ROGUE_BALL; - })), - [TrainerType.LUSAMINE_2]: new TrainerConfig(++t).setName("Lusamine").initForEvilTeamLeader("Aether Boss", [], true).setMixedBattleBgm("battle_aether_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLEFABLE ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.gender = Gender.FEMALE; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MILOTIC, Species.PRIMARINA ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SILVALLY ], TrainerSlot.TRAINER, true, p => { - p.formIndex = Utils.randSeedInt(18); // Random Silvally Form - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ROGUE_BALL; - if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.MULTI_ATTACK)) { // Check if Multi Attack is in the moveset, if not, replace the first move with Multi Attack. - p.moveset[0] = new PokemonMove(Moves.MULTI_ATTACK); - } - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.PHEROMOSA ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ROGUE_BALL; - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.NIHILEGO ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ROGUE_BALL; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.NECROZMA ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.formIndex = 2; // Dawn Wings - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.GUZMA]: new TrainerConfig(++t).setName("Guzma").initForEvilTeamLeader("Skull Boss", []).setMixedBattleBgm("battle_skull_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.YANMEGA, Species.LOKIX ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - if (p.species.speciesId === Species.YANMEGA) { - p.abilityIndex = 1; // Tinted Lens - } else if (p.species.speciesId === Species.LOKIX) { - p.abilityIndex = 2; // Tinted Lens - } - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HERACROSS ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCIZOR, Species.KLEAVOR ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - if (p.species.speciesId === Species.SCIZOR) { - p.abilityIndex = 1; // Technician - } else if (p.species.speciesId === Species.KLEAVOR) { - p.abilityIndex = 2; // Sharpness - } - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALVANTULA, Species.VIKAVOLT ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.formIndex = 1; // Mega Pinsir - p.pokeball = PokeballType.ULTRA_BALL; - p.generateName(); - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GOLISOPOD ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.gender = Gender.MALE; - })), - [TrainerType.GUZMA_2]: new TrainerConfig(++t).setName("Guzma").initForEvilTeamLeader("Skull Boss", [], true).setMixedBattleBgm("battle_skull_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GOLISOPOD ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.abilityIndex = 2; // Anticipation - p.gender = Gender.MALE; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUZZWOLE ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ROGUE_BALL; - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.CRAWDAUNT, Species.HISUI_SAMUROTT ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 2; // Sharpness Hisui Samurott, Adaptability Crawdaunt - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.XURKITREE ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ROGUE_BALL; - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GENESECT ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - p.formIndex = Utils.randSeedInt(4, 1); // Shock, Burn, Chill, or Douse Drive - if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.TECHNO_BLAST)) { // Check if Techno Blast is in the moveset, if not, replace the first move with Techno Blast. - p.moveset[0] = new PokemonMove(Moves.TECHNO_BLAST); - } - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.formIndex = 1; // Mega Pinsir - p.generateAndPopulateMoveset(); - p.generateName(); - p.pokeball = PokeballType.ULTRA_BALL; - })), - [TrainerType.ROSE]: new TrainerConfig(++t).setName("Rose").initForEvilTeamLeader("Macro Boss", []).setMixedBattleBgm("battle_macro_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCHALUDON ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.ESCAVALIER, Species.FERROTHORN ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SIRFETCHD, Species.MR_RIME ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.CORVIKNIGHT ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.KLINKLANG, Species.PERRSERKER ])) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.COPPERAJAH ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.formIndex = 1; // G-Max Copperajah - p.generateName(); - p.pokeball = PokeballType.ULTRA_BALL; - p.gender = Gender.FEMALE; - })), - [TrainerType.ROSE_2]: new TrainerConfig(++t).setName("Rose").initForEvilTeamLeader("Macro Boss", [], true).setMixedBattleBgm("battle_macro_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCHALUDON ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.AEGISLASH, Species.GHOLDENGO ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.DRACOZOLT, Species.DRACOVISH ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 1; //Strong Jaw Dracovish, Hustle Dracozolt - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.MELMETAL ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GALAR_ARTICUNO, Species.GALAR_ZAPDOS, Species.GALAR_MOLTRES ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.COPPERAJAH ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.formIndex = 1; // G-Max Copperajah - p.generateName(); - p.pokeball = PokeballType.ULTRA_BALL; - p.gender = Gender.FEMALE; - })), - [TrainerType.PENNY]: new TrainerConfig(++t).setName("Cassiopeia").initForEvilTeamLeader("Star Boss", []).setMixedBattleBgm("battle_star_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.JOLTEON, Species.LEAFEON ])) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.VAPOREON, Species.UMBREON ])) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.ESPEON, Species.GLACEON ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.FLAREON ])) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.SYLVEON ], TrainerSlot.TRAINER, true, p => { - p.abilityIndex = 2; // Pixilate - p.generateAndPopulateMoveset(); - p.gender = Gender.FEMALE; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.EEVEE ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.formIndex = 2; // G-Max Eevee - p.pokeball = PokeballType.ULTRA_BALL; - p.generateName(); - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[4]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; //TODO: is the bang correct? - }), - [TrainerType.PENNY_2]: new TrainerConfig(++t).setName("Cassiopeia").initForEvilTeamLeader("Star Boss", [], true).setMixedBattleBgm("battle_star_boss").setVictoryBgm("victory_team_plasma") - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.SYLVEON ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.abilityIndex = 2; // Pixilate - p.generateAndPopulateMoveset(); - p.gender = Gender.FEMALE; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.ROTOM ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.formIndex = Utils.randSeedInt(5, 1); // Heat, Wash, Frost, Fan, or Mow - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.RAIKOU, Species.ENTEI, Species.SUICUNE ])) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => { - p.formIndex = Utils.randSeedInt(5, 1); // Random Starmobile form - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ROGUE_BALL; - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.ZAMAZENTA ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.EEVEE ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.formIndex = 2; - p.generateName(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setGenModifiersFunc(party => { - const teraPokemon = party[0]; - return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; //TODO: is the bang correct? - }), - [TrainerType.BUCK]: new TrainerConfig(++t).setName("Buck").initForStatTrainer([], true) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLAYDOL ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 3); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.COALOSSAL ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.GREAT_BALL; - if (p.species.speciesId === Species.VENUSAUR) { - p.formIndex = 2; // Gmax - p.abilityIndex = 2; // Venusaur gets Chlorophyll - } else { + }), + ), + [TrainerType.MAXIE_2]: new TrainerConfig(++t) + .setName("Maxie") + .initForEvilTeamLeader("Magma Boss", [], true) + .setMixedBattleBgm("battle_aqua_magma_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.TYPHLOSION, Species.SOLROCK], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.NINETALES, Species.TORKOAL], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + if (p.species.speciesId === Species.NINETALES) { + p.abilityIndex = 2; // Drought + } else if (p.species.speciesId === Species.TORKOAL) { + p.abilityIndex = 1; // Drought + } + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.SCOVILLAIN], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = 0; // Chlorophyll + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.GREAT_TUSK], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.CAMERUPT], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = 1; // Mega Camerupt + p.generateName(); + p.gender = Gender.MALE; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.GROUDON], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.ARCHIE]: new TrainerConfig(++t) + .setName("Archie") + .initForEvilTeamLeader("Aqua Boss", []) + .setMixedBattleBgm("battle_aqua_magma_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.LUDICOLO])) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = 1; // Drizzle + }), + ) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MUK, Species.ALOLA_MUK])) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.WAILORD])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.QWILFISH], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = 1; // Swift Swim + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.SHARPEDO], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = 1; // Mega Sharpedo + p.generateName(); + p.gender = Gender.MALE; + }), + ), + [TrainerType.ARCHIE_2]: new TrainerConfig(++t) + .setName("Archie") + .initForEvilTeamLeader("Aqua Boss", [], true) + .setMixedBattleBgm("battle_aqua_magma_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.LUDICOLO, Species.EMPOLEON], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.POLITOED, Species.PELIPPER], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + if (p.species.speciesId === Species.POLITOED) { + p.abilityIndex = 2; // Drizzle + } else if (p.species.speciesId === Species.PELIPPER) { + p.abilityIndex = 1; // Drizzle + } + }), + ) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.DHELMISE])) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.OVERQWIL], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = 1; // Swift Swim + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.SHARPEDO], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = 1; // Mega Sharpedo + p.generateName(); + p.gender = Gender.MALE; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.KYOGRE], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.CYRUS]: new TrainerConfig(++t) + .setName("Cyrus") + .initForEvilTeamLeader("Galactic Boss", []) + .setMixedBattleBgm("battle_galactic_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GYARADOS])) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HONCHKROW, Species.HISUI_BRAVIARY])) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MAGNEZONE])) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.UXIE, Species.MESPRIT, Species.AZELF])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.HOUNDOOM], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = 1; // Mega Houndoom + p.generateName(); + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.WEAVILE], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.gender = Gender.MALE; + }), + ), + [TrainerType.CYRUS_2]: new TrainerConfig(++t) + .setName("Cyrus") + .initForEvilTeamLeader("Galactic Boss", [], true) + .setMixedBattleBgm("battle_galactic_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.CROBAT], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.MAGNEZONE])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.UXIE, Species.MESPRIT, Species.AZELF], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.HOUNDOOM], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = 1; // Mega Houndoom + p.generateName(); + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.WEAVILE], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.gender = Gender.MALE; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.DIALGA, Species.PALKIA], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.GHETSIS]: new TrainerConfig(++t) + .setName("Ghetsis") + .initForEvilTeamLeader("Plasma Boss", []) + .setMixedBattleBgm("battle_plasma_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.COFAGRIGUS])) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.SEISMITOAD])) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GALVANTULA, Species.EELEKTROSS])) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DRAPION, Species.TOXICROAK])) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.KINGAMBIT])) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.HYDREIGON], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.gender = Gender.MALE; + }), + ), + [TrainerType.GHETSIS_2]: new TrainerConfig(++t) + .setName("Ghetsis") + .initForEvilTeamLeader("Plasma Boss", [], true) + .setMixedBattleBgm("battle_plasma_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.RUNERIGUS], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.JELLICENT, Species.BASCULEGION], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + p.formIndex = 0; + }), + ) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.KINGAMBIT])) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.VOLCARONA, Species.IRON_MOTH], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.HYDREIGON, Species.IRON_JUGULIS], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + if (p.species.speciesId === Species.HYDREIGON) { + p.gender = Gender.MALE; + } else if (p.species.speciesId === Species.IRON_JUGULIS) { + p.gender = Gender.GENDERLESS; + } + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.KYUREM], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.LYSANDRE]: new TrainerConfig(++t) + .setName("Lysandre") + .initForEvilTeamLeader("Flare Boss", []) + .setMixedBattleBgm("battle_flare_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.MIENSHAO])) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HONCHKROW, Species.TALONFLAME])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.PYROAR], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.DRAGALGE, Species.CLAWITZER], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + if (p.species.speciesId === Species.DRAGALGE) { + p.abilityIndex = 2; // Adaptability + } else if (p.species.speciesId === Species.CLAWITZER) { + p.abilityIndex = 0; // Mega Launcher + } + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.GALLADE], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = 1; // Sharpness + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.GYARADOS], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = 1; // Mega Gyarados + p.generateName(); + p.gender = Gender.MALE; + }), + ), + [TrainerType.LYSANDRE_2]: new TrainerConfig(++t) + .setName("Lysandre") + .initForEvilTeamLeader("Flare Boss", [], true) + .setMixedBattleBgm("battle_flare_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.PYROAR], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.DRAGALGE, Species.CLAWITZER], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + if (p.species.speciesId === Species.DRAGALGE) { + p.abilityIndex = 2; // Adaptability + } else if (p.species.speciesId === Species.CLAWITZER) { + p.abilityIndex = 0; // Mega Launcher + } + }), + ) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.AEGISLASH, Species.HISUI_GOODRA])) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.IRON_VALIANT], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.GYARADOS], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = 1; // Mega Gyarados + p.generateName(); + p.gender = Gender.MALE; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.ZYGARDE], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + p.formIndex = 0; // 50% Forme, Aura Break + }), + ), + [TrainerType.LUSAMINE]: new TrainerConfig(++t) + .setName("Lusamine") + .initForEvilTeamLeader("Aether Boss", []) + .setMixedBattleBgm("battle_aether_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.CLEFABLE], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.gender = Gender.FEMALE; + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.LILLIGANT, Species.HISUI_LILLIGANT])) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MILOTIC, Species.PRIMARINA])) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING])) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.BEWEAR])) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.NIHILEGO], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ), + [TrainerType.LUSAMINE_2]: new TrainerConfig(++t) + .setName("Lusamine") + .initForEvilTeamLeader("Aether Boss", [], true) + .setMixedBattleBgm("battle_aether_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.CLEFABLE], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.gender = Gender.FEMALE; + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.MILOTIC, Species.PRIMARINA])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.SILVALLY], TrainerSlot.TRAINER, true, p => { + p.formIndex = Utils.randSeedInt(18); // Random Silvally Form + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.MULTI_ATTACK)) { + // Check if Multi Attack is in the moveset, if not, replace the first move with Multi Attack. + p.moveset[0] = new PokemonMove(Moves.MULTI_ATTACK); + } + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.PHEROMOSA], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.NIHILEGO], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.NECROZMA], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.formIndex = 2; // Dawn Wings + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.GUZMA]: new TrainerConfig(++t) + .setName("Guzma") + .initForEvilTeamLeader("Skull Boss", []) + .setMixedBattleBgm("battle_skull_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.YANMEGA, Species.LOKIX], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + if (p.species.speciesId === Species.YANMEGA) { + p.abilityIndex = 1; // Tinted Lens + } else if (p.species.speciesId === Species.LOKIX) { + p.abilityIndex = 2; // Tinted Lens + } + }), + ) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HERACROSS])) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.SCIZOR, Species.KLEAVOR], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + if (p.species.speciesId === Species.SCIZOR) { + p.abilityIndex = 1; // Technician + } else if (p.species.speciesId === Species.KLEAVOR) { + p.abilityIndex = 2; // Sharpness + } + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GALVANTULA, Species.VIKAVOLT])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.PINSIR], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.formIndex = 1; // Mega Pinsir + p.pokeball = PokeballType.ULTRA_BALL; + p.generateName(); + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.GOLISOPOD], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.gender = Gender.MALE; + }), + ), + [TrainerType.GUZMA_2]: new TrainerConfig(++t) + .setName("Guzma") + .initForEvilTeamLeader("Skull Boss", [], true) + .setMixedBattleBgm("battle_skull_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.GOLISOPOD], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.abilityIndex = 2; // Anticipation + p.gender = Gender.MALE; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.BUZZWOLE], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.CRAWDAUNT, Species.HISUI_SAMUROTT], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = 2; // Sharpness Hisuian Samurott, Adaptability Crawdaunt + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.XURKITREE], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.GENESECT], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.formIndex = Utils.randSeedInt(4, 1); // Shock, Burn, Chill, or Douse Drive + if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.TECHNO_BLAST)) { + // Check if Techno Blast is in the moveset, if not, replace the first move with Techno Blast. + p.moveset[0] = new PokemonMove(Moves.TECHNO_BLAST); + } + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.PINSIR], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.formIndex = 1; // Mega Pinsir + p.generateAndPopulateMoveset(); + p.generateName(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ), + [TrainerType.ROSE]: new TrainerConfig(++t) + .setName("Rose") + .initForEvilTeamLeader("Macro Boss", []) + .setMixedBattleBgm("battle_macro_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.ESCAVALIER, Species.FERROTHORN], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.SIRFETCHD, Species.MR_RIME], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.CORVIKNIGHT], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.KLINKLANG, Species.PERRSERKER], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.COPPERAJAH], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.formIndex = 1; // G-Max Copperajah + p.generateName(); + p.pokeball = PokeballType.ULTRA_BALL; + p.gender = Gender.FEMALE; + }), + ), + [TrainerType.ROSE_2]: new TrainerConfig(++t) + .setName("Rose") + .initForEvilTeamLeader("Macro Boss", [], true) + .setMixedBattleBgm("battle_macro_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.AEGISLASH, Species.GHOLDENGO], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.DRACOZOLT, Species.DRACOVISH], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + p.abilityIndex = 1; // Strong Jaw Dracovish, Hustle Dracozolt + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.MELMETAL], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc( + [Species.GALAR_ARTICUNO, Species.GALAR_ZAPDOS, Species.GALAR_MOLTRES], + TrainerSlot.TRAINER, + true, + p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }, + ), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.COPPERAJAH], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.formIndex = 1; // G-Max Copperajah + p.generateName(); + p.pokeball = PokeballType.ULTRA_BALL; + p.gender = Gender.FEMALE; + }), + ), + [TrainerType.PENNY]: new TrainerConfig(++t) + .setName("Cassiopeia") + .initForEvilTeamLeader("Star Boss", []) + .setMixedBattleBgm("battle_star_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.JOLTEON, Species.LEAFEON])) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.VAPOREON, Species.UMBREON])) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.ESPEON, Species.GLACEON])) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.FLAREON])) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.SYLVEON], TrainerSlot.TRAINER, true, p => { + p.abilityIndex = 2; // Pixilate + p.generateAndPopulateMoveset(); + p.gender = Gender.FEMALE; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.EEVEE], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.formIndex = 2; // G-Max Eevee + p.pokeball = PokeballType.ULTRA_BALL; + p.generateName(); + }), + ) + .setInstantTera(4), // Tera Fairy Sylveon + [TrainerType.PENNY_2]: new TrainerConfig(++t) + .setName("Cassiopeia") + .initForEvilTeamLeader("Star Boss", [], true) + .setMixedBattleBgm("battle_star_boss") + .setVictoryBgm("victory_team_plasma") + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.SYLVEON], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.abilityIndex = 2; // Pixilate + p.generateAndPopulateMoveset(); + p.gender = Gender.FEMALE; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.ROTOM], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.formIndex = Utils.randSeedInt(5, 1); // Heat, Wash, Frost, Fan, or Mow + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.RAIKOU, Species.ENTEI, Species.SUICUNE], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => { + p.formIndex = Utils.randSeedInt(5, 1); // Random Starmobile form + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ROGUE_BALL; + }), + ) + .setPartyMemberFunc( + 4, + getRandomPartyMemberFunc([Species.ZAMAZENTA], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.EEVEE], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.formIndex = 2; + p.generateName(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setInstantTera(0), // Tera Fairy Sylveon + [TrainerType.BUCK]: new TrainerConfig(++t) + .setName("Buck") + .initForStatTrainer(true) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.CLAYDOL], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 3); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.VENUSAUR, Species.COALOSSAL], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.GREAT_BALL; + if (p.species.speciesId === Species.VENUSAUR) { + p.formIndex = 2; // Gmax + p.abilityIndex = 2; // Venusaur gets Chlorophyll + } else { + p.formIndex = 1; // Gmax + } + p.generateName(); + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.AGGRON], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.formIndex = 1; // Mega + p.generateName(); + }), + ) + .setPartyMemberFunc( + 3, + getRandomPartyMemberFunc([Species.TORKOAL], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = 1; // Drought + }), + ) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.GREAT_TUSK], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.HEATRAN], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.CHERYL]: new TrainerConfig(++t) + .setName("Cheryl") + .initForStatTrainer() + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.BLISSEY], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 3); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.SNORLAX, Species.LAPRAS], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.GREAT_BALL; p.formIndex = 1; // Gmax - } - p.generateName(); - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AGGRON ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.formIndex = 1; // Mega - p.generateName(); - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TORKOAL ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.abilityIndex = 1; // Drought - })) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GREAT_TUSK ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.HEATRAN ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.CHERYL]: new TrainerConfig(++t).setName("Cheryl").initForStatTrainer([], false) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BLISSEY ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 3); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.SNORLAX, Species.LAPRAS ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.GREAT_BALL; - p.formIndex = 1; // Gmax - p.generateName(); - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AUDINO ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.formIndex = 1; // Mega - p.generateName(); - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GOODRA ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.IRON_HANDS ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.CRESSELIA, Species.ENAMORUS ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - if (p.species.speciesId === Species.ENAMORUS) { - p.formIndex = 1; // Therian p.generateName(); - } - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.MARLEY]: new TrainerConfig(++t).setName("Marley").initForStatTrainer([], false) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCANINE ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 3); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.ULTRA_BALL; - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.CINDERACE, Species.INTELEON ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.GREAT_BALL; - p.formIndex = 1; // Gmax - p.generateName(); - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AERODACTYL ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.formIndex = 1; // Mega - p.generateName(); - })) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.DRAGAPULT ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.IRON_BUNDLE ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.REGIELEKI ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.MIRA]: new TrainerConfig(++t).setName("Mira").initForStatTrainer([], false) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ALAKAZAM ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.formIndex = 1; - p.pokeball = PokeballType.ULTRA_BALL; - p.generateName(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.GENGAR, Species.HATTERENE ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.GREAT_BALL; - p.formIndex = p.species.speciesId === Species.GENGAR ? 2 : 1; // Gmax - p.generateName(); - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.FLUTTER_MANE ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.HYDREIGON ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.MAGNEZONE ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.LATIOS, Species.LATIAS ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.RILEY]: new TrainerConfig(++t).setName("Riley").initForStatTrainer([], true) - .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LUCARIO ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - p.formIndex = 1; - p.pokeball = PokeballType.ULTRA_BALL; - p.generateName(); - })) - .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.RILLABOOM, Species.CENTISKORCH ], TrainerSlot.TRAINER, true, p => { - p.generateAndPopulateMoveset(); - p.pokeball = PokeballType.GREAT_BALL; - p.formIndex = 1; // Gmax - p.generateName(); - })) - .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.TYRANITAR ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.ROARING_MOON ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.URSALUNA ], TrainerSlot.TRAINER, true)) - .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.REGIGIGAS, Species.LANDORUS ], TrainerSlot.TRAINER, true, p => { - p.setBoss(true, 2); - p.generateAndPopulateMoveset(); - if (p.species.speciesId === Species.LANDORUS) { - p.formIndex = 1; // Therian + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.AUDINO], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.formIndex = 1; // Mega p.generateName(); - } - p.pokeball = PokeballType.MASTER_BALL; - })), - [TrainerType.VICTOR]: new TrainerConfig(++t).setTitle("The Winstrates").setLocalizedName("Victor") + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GOODRA], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.IRON_HANDS], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.CRESSELIA, Species.ENAMORUS], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + if (p.species.speciesId === Species.ENAMORUS) { + p.formIndex = 1; // Therian + p.generateName(); + } + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.MARLEY]: new TrainerConfig(++t) + .setName("Marley") + .initForStatTrainer() + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.ARCANINE], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 3); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.CINDERACE, Species.INTELEON], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.GREAT_BALL; + p.formIndex = 1; // Gmax + p.generateName(); + }), + ) + .setPartyMemberFunc( + 2, + getRandomPartyMemberFunc([Species.AERODACTYL], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.formIndex = 1; // Mega + p.generateName(); + }), + ) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DRAGAPULT], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.IRON_BUNDLE], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.REGIELEKI], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.MIRA]: new TrainerConfig(++t) + .setName("Mira") + .initForStatTrainer() + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.ALAKAZAM], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.formIndex = 1; + p.pokeball = PokeballType.ULTRA_BALL; + p.generateName(); + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.GENGAR, Species.HATTERENE], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.GREAT_BALL; + p.formIndex = p.species.speciesId === Species.GENGAR ? 2 : 1; // Gmax + p.generateName(); + }), + ) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.FLUTTER_MANE], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.HYDREIGON], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MAGNEZONE], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.LATIOS, Species.LATIAS], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.RILEY]: new TrainerConfig(++t) + .setName("Riley") + .initForStatTrainer(true) + .setPartyMemberFunc( + 0, + getRandomPartyMemberFunc([Species.LUCARIO], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.formIndex = 1; + p.pokeball = PokeballType.ULTRA_BALL; + p.generateName(); + }), + ) + .setPartyMemberFunc( + 1, + getRandomPartyMemberFunc([Species.RILLABOOM, Species.CENTISKORCH], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.GREAT_BALL; + p.formIndex = 1; // Gmax + p.generateName(); + }), + ) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.TYRANITAR], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.ROARING_MOON], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.URSALUNA], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc( + 5, + getRandomPartyMemberFunc([Species.REGIGIGAS, Species.LANDORUS], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + if (p.species.speciesId === Species.LANDORUS) { + p.formIndex = 1; // Therian + p.generateName(); + } + p.pokeball = PokeballType.MASTER_BALL; + }), + ), + [TrainerType.VICTOR]: new TrainerConfig(++t) + .setTitle("The Winstrates") + .setLocalizedName("Victor") .setMoneyMultiplier(1) // The Winstrate trainers have total money multiplier of 6 .setPartyTemplates(trainerPartyTemplates.ONE_AVG_ONE_STRONG), - [TrainerType.VICTORIA]: new TrainerConfig(++t).setTitle("The Winstrates").setLocalizedName("Victoria") + [TrainerType.VICTORIA]: new TrainerConfig(++t) + .setTitle("The Winstrates") + .setLocalizedName("Victoria") .setMoneyMultiplier(1) .setPartyTemplates(trainerPartyTemplates.ONE_AVG_ONE_STRONG), - [TrainerType.VIVI]: new TrainerConfig(++t).setTitle("The Winstrates").setLocalizedName("Vivi") + [TrainerType.VIVI]: new TrainerConfig(++t) + .setTitle("The Winstrates") + .setLocalizedName("Vivi") .setMoneyMultiplier(1) .setPartyTemplates(trainerPartyTemplates.TWO_AVG_ONE_STRONG), - [TrainerType.VICKY]: new TrainerConfig(++t).setTitle("The Winstrates").setLocalizedName("Vicky") + [TrainerType.VICKY]: new TrainerConfig(++t) + .setTitle("The Winstrates") + .setLocalizedName("Vicky") .setMoneyMultiplier(1) .setPartyTemplates(trainerPartyTemplates.ONE_AVG), - [TrainerType.VITO]: new TrainerConfig(++t).setTitle("The Winstrates").setLocalizedName("Vito") + [TrainerType.VITO]: new TrainerConfig(++t) + .setTitle("The Winstrates") + .setLocalizedName("Vito") .setMoneyMultiplier(2) - .setPartyTemplates(new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(2, PartyMemberStrength.STRONG))), - [TrainerType.BUG_TYPE_SUPERFAN]: new TrainerConfig(++t).setMoneyMultiplier(2.25).setEncounterBgm(TrainerType.ACE_TRAINER) + .setPartyTemplates( + new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(2, PartyMemberStrength.STRONG), + ), + ), + [TrainerType.BUG_TYPE_SUPERFAN]: new TrainerConfig(++t) + .setMoneyMultiplier(2.25) + .setEncounterBgm(TrainerType.ACE_TRAINER) .setPartyTemplates(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE)), - [TrainerType.EXPERT_POKEMON_BREEDER]: new TrainerConfig(++t).setMoneyMultiplier(3).setEncounterBgm(TrainerType.ACE_TRAINER).setLocalizedName("Expert Pokemon Breeder") + [TrainerType.EXPERT_POKEMON_BREEDER]: new TrainerConfig(++t) + .setMoneyMultiplier(3) + .setEncounterBgm(TrainerType.ACE_TRAINER) + .setLocalizedName("Expert Pokemon Breeder") .setPartyTemplates(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE)), [TrainerType.FUTURE_SELF_M]: new TrainerConfig(++t) .setMoneyMultiplier(0) @@ -2854,6 +5846,5 @@ export const trainerConfigs: TrainerConfigs = { .setMixedBattleBgm("mystery_encounter_weird_dream") .setVictoryBgm("mystery_encounter_weird_dream") .setLocalizedName("Future Self F") - .setPartyTemplates(new TrainerPartyTemplate(6, PartyMemberStrength.STRONG)) + .setPartyTemplates(new TrainerPartyTemplate(6, PartyMemberStrength.STRONG)), }; - diff --git a/src/data/trainer-names.ts b/src/data/trainer-names.ts index d075b7121f2..c72356d88ae 100644 --- a/src/data/trainer-names.ts +++ b/src/data/trainer-names.ts @@ -6,7 +6,7 @@ class TrainerNameConfig { public femaleUrls: string[] | null; constructor(type: TrainerType, ...urls: string[]) { - this.urls = urls.length ? urls : [ Utils.toReadableString(TrainerType[type]).replace(/ /g, "_") ]; + this.urls = urls.length ? urls : [Utils.toReadableString(TrainerType[type]).replace(/ /g, "_")]; } hasGenderVariant(...femaleUrls: string[]): TrainerNameConfig { @@ -16,11 +16,11 @@ class TrainerNameConfig { } interface TrainerNameConfigs { - [key: integer]: TrainerNameConfig + [key: number]: TrainerNameConfig; } // used in a commented code -// eslint-disable-next-line @typescript-eslint/no-unused-vars +// biome-ignore lint/correctness/noUnusedVariables: Used by commented code const trainerNameConfigs: TrainerNameConfigs = { [TrainerType.ACE_TRAINER]: new TrainerNameConfig(TrainerType.ACE_TRAINER), [TrainerType.ARTIST]: new TrainerNameConfig(TrainerType.ARTIST), @@ -71,65 +71,2663 @@ const trainerNameConfigs: TrainerNameConfigs = { [TrainerType.VETERAN]: new TrainerNameConfig(TrainerType.VETERAN), [TrainerType.WAITER]: new TrainerNameConfig(TrainerType.WAITER).hasGenderVariant("Waitress"), [TrainerType.WORKER]: new TrainerNameConfig(TrainerType.WORKER), - [TrainerType.YOUNGSTER]: new TrainerNameConfig(TrainerType.YOUNGSTER).hasGenderVariant("Lass") + [TrainerType.YOUNGSTER]: new TrainerNameConfig(TrainerType.YOUNGSTER).hasGenderVariant("Lass"), }; export const trainerNamePools = { - [TrainerType.ACE_TRAINER]: [[ "Aaron", "Allen", "Blake", "Brian", "Gaven", "Jake", "Kevin", "Mike", "Nick", "Paul", "Ryan", "Sean", "Darin", "Albert", "Berke", "Clyde", "Edgar", "George", "Leroy", "Owen", "Parker", "Randall", "Ruben", "Samuel", "Vincent", "Warren", "Wilton", "Zane", "Alfred", "Braxton", "Felix", "Gerald", "Jonathan", "Leonel", "Marcel", "Mitchell", "Quincy", "Roderick", "Colby", "Rolando", "Yuji", "Abel", "Anton", "Arthur", "Cesar", "Dalton", "Dennis", "Ernest", "Garrett", "Graham", "Henry", "Isaiah", "Jonah", "Jose", "Keenan", "Micah", "Omar", "Quinn", "Rodolfo", "Saul", "Sergio", "Skylar", "Stefan", "Zachery", "Alton", "Arabella", "Bonita", "Cal", "Cody", "French", "Kobe", "Paulo", "Shaye", "Austin", "Beckett", "Charlie", "Corky", "David", "Dwayne", "Elmer", "Jesse", "Jared", "Johan", "Jordan", "Kipp", "Lou", "Terry", "Tom", "Webster", "Billy", "Doyle", "Enzio", "Geoff", "Grant", "Kelsey", "Miguel", "Pierce", "Ray", "Santino", "Shel", "Adelbert", "Bence", "Emil", "Evan", "Mathis", "Maxim", "Neil", "Rico", "Robbie", "Theo", "Viktor", "Benedict", "Cornelius", "Hisato", "Leopold", "Neville", "Vito", "Chase", "Cole", "Hiroshi", "Jackson", "Jim", "Kekoa", "Makana", "Yuki", "Elwood", "Seth", "Alvin", "Arjun", "Arnold", "Cameron", "Carl", "Carlton", "Christopher", "Dave", "Dax", "Dominic", "Edmund", "Finn", "Fred", "Garret", "Grayson", "Jace", "Jaxson", "Jay", "Jirard", "Johnson", "Kayden", "Kite", "Louis", "Mac", "Marty", "Percy", "Raymond", "Ronnie", "Satch", "Tim", "Zach", "Conner", "Vince", "Bedro", "Boda", "Botan", "Daras", "Dury", "Herton", "Rewn", "Stum", "Tock", "Trilo", "Berki", "Cruik", "Dazon", "Desid", "Dillot", "Farfin", "Forgon", "Hebel", "Morfon", "Moril", "Shadd", "Vanhub", "Bardo", "Carben", "Degin", "Gorps", "Klept", "Lask", "Malex", "Mopar", "Niled", "Noxon", "Teslor", "Tetil" ], [ "Beth", "Carol", "Cybil", "Emma", "Fran", "Gwen", "Irene", "Jenn", "Joyce", "Kate", "Kelly", "Lois", "Lola", "Megan", "Quinn", "Reena", "Cara", "Alexa", "Brooke", "Caroline", "Elaine", "Hope", "Jennifer", "Jody", "Julie", "Lori", "Mary", "Michelle", "Shannon", "Wendy", "Alexia", "Alicia", "Athena", "Carolina", "Cristin", "Darcy", "Dianne", "Halle", "Jazmyn", "Katelynn", "Keira", "Marley", "Allyson", "Kathleen", "Naomi", "Alyssa", "Ariana", "Brandi", "Breanna", "Brenda", "Brenna", "Catherine", "Clarice", "Dana", "Deanna", "Destiny", "Jamie", "Jasmin", "Kassandra", "Laura", "Maria", "Mariah", "Maya", "Meagan", "Mikayla", "Monique", "Natasha", "Olivia", "Sandra", "Savannah", "Sydney", "Moira", "Piper", "Salma", "Allison", "Beverly", "Cathy", "Cheyenne", "Clara", "Dara", "Eileen", "Glinda", "Junko", "Lena", "Lucille", "Mariana", "Olwen", "Shanta", "Stella", "Angi", "Belle", "Chandra", "Cora", "Eve", "Jacqueline", "Jeanne", "Juliet", "Kathrine", "Layla", "Lucca", "Melina", "Miki", "Nina", "Sable", "Shelly", "Summer", "Trish", "Vicki", "Alanza", "Cordelia", "Hilde", "Imelda", "Michele", "Mireille", "Claudia", "Constance", "Harriet", "Honor", "Melba", "Portia", "Alexis", "Angela", "Karla", "Lindsey", "Tori", "Sheri", "Jada", "Kailee", "Amanda", "Annie", "Kindra", "Kyla", "Sofia", "Yvette", "Becky", "Flora", "Gloria", "Buna", "Ferda", "Lehan", "Liqui", "Lomen", "Neira", "Atilo", "Detta", "Gilly", "Gosney", "Levens", "Moden", "Rask", "Rateis", "Rosno", "Tynan", "Veron", "Zoel", "Cida", "Dibsin", "Dodin", "Ebson", "Equin", "Flostin", "Gabsen", "Halsion", "Hileon", "Quelor", "Rapeel", "Roze", "Tensin" ]], - [TrainerType.ARTIST]: [[ "Ismael", "William", "Horton", "Pierre", "Zach", "Gough", "Salvador", "Vincent", "Duncan" ], [ "Georgia" ]], - [TrainerType.BACKERS]: [[ "Alf & Fred", "Hawk & Dar", "Joe & Ross", "Les & Web", "Masa & Yas", "Stu & Art" ], [ "Ai & Ciel", "Ami & Eira", "Cam & Abby", "Fey & Sue", "Kat & Phae", "Kay & Ali", "Ava & Aya", "Cleo & Rio", "May & Mal" ]], - [TrainerType.BACKPACKER]: [[ "Alexander", "Carlos", "Herman", "Jerome", "Keane", "Kelsey", "Kiyo", "Michael", "Nate", "Peter", "Sam", "Stephen", "Talon", "Terrance", "Toru", "Waylon", "Boone", "Clifford", "Ivan", "Kendall", "Lowell", "Randall", "Reece", "Roland", "Shane", "Walt", "Farid", "Heike", "Joren", "Lane", "Roderick", "Darnell", "Deon", "Emory", "Graeme", "Grayson", "Aitor", "Alex", "Arturo", "Asier", "Jaime", "Jonathan", "Julio", "Kevin", "Kosuke", "Lander", "Markel", "Mateo", "Nil", "Pau", "Samuel" ], [ "Anna", "Corin", "Elaine", "Emi", "Jill", "Kumiko", "Liz", "Lois", "Lora", "Molly", "Patty", "Ruth", "Vicki", "Annie", "Blossom", "Clara", "Eileen", "Mae", "Myra", "Rachel", "Tami", "Ashley", "Mikiko", "Kiana", "Perdy", "Maria", "Yuho", "Peren", "Barbara", "Diane" ]], - [TrainerType.BAKER]: [ "Chris", "Jenn", "Lilly" ], - [TrainerType.BEAUTY]: [ "Cassie", "Julia", "Olivia", "Samantha", "Valerie", "Victoria", "Bridget", "Connie", "Jessica", "Johanna", "Melissa", "Sheila", "Shirley", "Tiffany", "Namiko", "Thalia", "Grace", "Lola", "Lori", "Maura", "Tamia", "Cyndy", "Devon", "Gabriella", "Harley", "Lindsay", "Nicola", "Callie", "Charlotte", "Kassandra", "December", "Fleming", "Nikola", "Aimee", "Anais", "Brigitte", "Cassandra", "Andrea", "Brittney", "Carolyn", "Krystal", "Alexis", "Alice", "Aina", "Anya", "Arianna", "Aubrey", "Beverly", "Camille", "Beauty", "Evette", "Hansol", "Haruka", "Jill", "Jo", "Lana", "Lois", "Lucy", "Mai", "Nickie", "Nicole", "Prita", "Rose", "Shelly", "Suzy", "Tessa", "Anita", "Alissa", "Rita", "Cudsy", "Eloff", "Miru", "Minot", "Nevah", "Niven", "Ogoin" ], - [TrainerType.BIKER]: [ "Charles", "Dwayne", "Glenn", "Harris", "Joel", "Riley", "Zeke", "Alex", "Billy", "Ernest", "Gerald", "Hideo", "Isaac", "Jared", "Jaren", "Jaxon", "Jordy", "Lao", "Lukas", "Malik", "Nikolas", "Ricardo", "Ruben", "Virgil", "William", "Aiden", "Dale", "Dan", "Jacob", "Markey", "Reese", "Teddy", "Theron", "Jeremy", "Morgann", "Phillip", "Philip", "Stanley", "Dillon" ], - [TrainerType.BLACK_BELT]: [[ "Kenji", "Lao", "Lung", "Nob", "Wai", "Yoshi", "Atsushi", "Daisuke", "Hideki", "Hitoshi", "Kiyo", "Koichi", "Koji", "Yuji", "Cristian", "Rhett", "Takao", "Theodore", "Zander", "Aaron", "Hugh", "Mike", "Nicolas", "Shea", "Takashi", "Adam", "Carl", "Colby", "Darren", "David", "Davon", "Derek", "Eddie", "Gregory", "Griffin", "Jarrett", "Jeffery", "Kendal", "Kyle", "Luke", "Miles", "Nathaniel", "Philip", "Rafael", "Ray", "Ricky", "Sean", "Willie", "Ander", "Manford", "Benjamin", "Corey", "Edward", "Grant", "Jay", "Kendrew", "Kentaro", "Ryder", "Teppei", "Thomas", "Tyrone", "Andrey", "Donny", "Drago", "Gordon", "Grigor", "Jeriel", "Kenneth", "Martell", "Mathis", "Rich", "Rocky", "Rodrigo", "Wesley", "Zachery", "Alonzo", "Cadoc", "Gunnar", "Igor", "Killian", "Markus", "Ricardo", "Yanis", "Banting", "Clayton", "Duane", "Earl", "Greg", "Roy", "Terry", "Tracy", "Walter", "Alvaro", "Curtis", "Francis", "Ross", "Brice", "Cheng", "Dudley", "Eric", "Kano", "Masahiro", "Randy", "Ryuji", "Steve", "Tadashi", "Wong", "Yuen", "Brian", "Carter", "Reece", "Nick", "Yang" ], [ "Cora", "Cyndy", "Jill", "Laura", "Sadie", "Tessa", "Vivian", "Aisha", "Callie", "Danielle", "Helene", "Jocelyn", "Lilith", "Paula", "Reyna", "Helen", "Kelsey", "Tyler", "Amy", "Chandra", "Hillary", "Janie", "Lee", "Maggie", "Mikiko", "Miriam", "Sharon", "Susie", "Xiao", "Alize", "Azra", "Brenda", "Chalina", "Chan", "Glinda", "Maki", "Tia", "Tiffany", "Wendy", "Andrea", "Gabrielle", "Gerardine", "Hailey", "Hedvig", "Justine", "Kinsey", "Sigrid", "Veronique", "Tess" ]], - [TrainerType.BREEDER]: [[ "Isaac", "Myles", "Salvadore", "Albert", "Kahlil", "Eustace", "Galen", "Owen", "Addison", "Marcus", "Foster", "Cory", "Glenn", "Jay", "Wesley", "William", "Adrian", "Bradley", "Jaime" ], [ "Allison", "Alize", "Bethany", "Lily", "Lydia", "Gabrielle", "Jayden", "Pat", "Veronica", "Amber", "Jennifer", "Kaylee", "Adelaide", "Brooke", "Ethel", "April", "Irene", "Magnolia", "Amala", "Mercy", "Amanda", "Ikue", "Savannah", "Yuka", "Chloe", "Debra", "Denise", "Elena" ]], - [TrainerType.CLERK]: [[ "Chaz", "Clemens", "Doug", "Fredric", "Ivan", "Isaac", "Nelson", "Wade", "Warren", "Augustin", "Gilligan", "Cody", "Jeremy", "Shane", "Dugal", "Royce", "Ronald" ], [ "Alberta", "Ingrid", "Katie", "Piper", "Trisha", "Wren", "Britney", "Lana", "Jessica", "Kristen", "Michelle", "Gabrielle" ]], - [TrainerType.CYCLIST]: [[ "Axel", "James", "John", "Ryan", "Hector", "Jeremiah" ], [ "Kayla", "Megan", "Nicole", "Rachel", "Krissa", "Adelaide" ]], - [TrainerType.DANCER]: [ "Brian", "Davey", "Dirk", "Edmond", "Mickey", "Raymond", "Cara", "Julia", "Maika", "Mireille", "Ronda", "Zoe" ], - [TrainerType.DEPOT_AGENT]: [ "Josh", "Hank", "Vincent" ], - [TrainerType.DOCTOR]: [[ "Hank", "Jerry", "Jules", "Logan", "Wayne", "Braid", "Derek", "Heath", "Julius", "Kit", "Graham" ], [ "Kirsten", "Sachiko", "Shery", "Carol", "Dixie", "Mariah" ]], - [TrainerType.FIREBREATHER]: [ "Bill", "Burt", "Cliff", "Dick", "Lyle", "Ned", "Otis", "Ray", "Richard", "Walt" ], - [TrainerType.FISHERMAN]: [ "Andre", "Arnold", "Barney", "Chris", "Edgar", "Henry", "Jonah", "Justin", "Kyle", "Martin", "Marvin", "Ralph", "Raymond", "Scott", "Stephen", "Wilton", "Tully", "Andrew", "Barny", "Carter", "Claude", "Dale", "Elliot", "Eugene", "Ivan", "Ned", "Nolan", "Roger", "Ronald", "Wade", "Wayne", "Darian", "Kai", "Chip", "Hank", "Kaden", "Tommy", "Tylor", "Alec", "Brett", "Cameron", "Cody", "Cole", "Cory", "Erick", "George", "Joseph", "Juan", "Kenneth", "Luc", "Miguel", "Travis", "Walter", "Zachary", "Josh", "Gideon", "Kyler", "Liam", "Murphy", "Bruce", "Damon", "Devon", "Hubert", "Jones", "Lydon", "Mick", "Pete", "Sean", "Sid", "Vince", "Bucky", "Dean", "Eustace", "Kenzo", "Leroy", "Mack", "Ryder", "Ewan", "Finn", "Murray", "Seward", "Shad", "Wharton", "Finley", "Fisher", "Fisk", "River", "Sheaffer", "Timin", "Carl", "Ernest", "Hal", "Herbert", "Hisato", "Mike", "Vernon", "Harriet", "Marina", "Chase" ], - [TrainerType.GUITARIST]: [ "Anna", "Beverly", "January", "Tina", "Alicia", "Claudia", "Julia", "Lidia", "Mireia", "Noelia", "Sara", "Sheila", "Tatiana" ], - [TrainerType.HARLEQUIN]: [ "Charley", "Ian", "Jack", "Kerry", "Louis", "Pat", "Paul", "Rick", "Anders", "Clarence", "Gary" ], - [TrainerType.HIKER]: [ "Anthony", "Bailey", "Benjamin", "Daniel", "Erik", "Jim", "Kenny", "Leonard", "Michael", "Parry", "Phillip", "Russell", "Sidney", "Tim", "Timothy", "Alan", "Brice", "Clark", "Eric", "Lenny", "Lucas", "Mike", "Trent", "Devan", "Eli", "Marc", "Sawyer", "Allen", "Daryl", "Dudley", "Earl", "Franklin", "Jeremy", "Marcos", "Nob", "Oliver", "Wayne", "Alexander", "Damon", "Jonathan", "Justin", "Kevin", "Lorenzo", "Louis", "Maurice", "Nicholas", "Reginald", "Robert", "Theodore", "Bruce", "Clarke", "Devin", "Dwight", "Edwin", "Eoin", "Noland", "Russel", "Andy", "Bret", "Darrell", "Gene", "Hardy", "Hugh", "Jebediah", "Jeremiah", "Kit", "Neil", "Terrell", "Don", "Doug", "Hunter", "Jared", "Jerome", "Keith", "Manuel", "Markus", "Otto", "Shelby", "Stephen", "Teppei", "Tobias", "Wade", "Zaiem", "Aaron", "Alain", "Bergin", "Bernard", "Brent", "Corwin", "Craig", "Delmon", "Dunstan", "Orestes", "Ross", "Davian", "Calhoun", "David", "Gabriel", "Ryan", "Thomas", "Travis", "Zachary", "Anuhea", "Barnaby", "Claus", "Collin", "Colson", "Dexter", "Dillan", "Eugine", "Farkas", "Hisato", "Julius", "Kenji", "Irwin", "Lionel", "Paul", "Richter", "Valentino", "Donald", "Douglas", "Kevyn", "Chester" ], //["Angela","Carla","Celia","Daniela","Estela","Fatima","Helena","Leire","Lucia","Luna","Manuela","Mar","Marina","Miyu","Nancy","Nerea","Paula","Rocio","Yanira"] - [TrainerType.HOOLIGANS]: [ "Jim & Cas", "Rob & Sal" ], - [TrainerType.HOOPSTER]: [ "Bobby", "John", "Lamarcus", "Derrick", "Nicolas" ], - [TrainerType.INFIELDER]: [ "Alex", "Connor", "Todd" ], - [TrainerType.JANITOR]: [ "Caleb", "Geoff", "Brady", "Felix", "Orville", "Melvin", "Shawn" ], - [TrainerType.LINEBACKER]: [ "Bob", "Dan", "Jonah" ], - [TrainerType.MAID]: [ "Belinda", "Sophie", "Emily", "Elena", "Clare", "Alica", "Tanya", "Tammy" ], - [TrainerType.MUSICIAN]: [ "Boris", "Preston", "Charles", "Clyde", "Vincent", "Dalton", "Kirk", "Shawn", "Fabian", "Fernando", "Joseph", "Marcos", "Arturo", "Jerry", "Lonnie", "Tony" ], - [TrainerType.NURSERY_AIDE]: [ "Autumn", "Briana", "Leah", "Miho", "Ethel", "Hollie", "Ilse", "June", "Kimya", "Rosalyn" ], - [TrainerType.OFFICER]: [ "Dirk", "Keith", "Alex", "Bobby", "Caleb", "Danny", "Dylan", "Thomas", "Daniel", "Jeff", "Braven", "Dell", "Neagle", "Haruki", "Mitchell", "Raymond" ], - [TrainerType.PARASOL_LADY]: [ "Angelica", "Clarissa", "Madeline", "Akari", "Annabell", "Kayley", "Rachel", "Alexa", "Sabrina", "April", "Gwyneth", "Laura", "Lumi", "Mariah", "Melita", "Nicole", "Tihana", "Ingrid", "Tyra" ], - [TrainerType.PILOT]: [ "Chase", "Leonard", "Ted", "Elron", "Ewing", "Flynn", "Winslow" ], - [TrainerType.POKEFAN]: [[ "Alex", "Allan", "Brandon", "Carter", "Colin", "Derek", "Jeremy", "Joshua", "Rex", "Robert", "Trevor", "William", "Colton", "Miguel", "Francisco", "Kaleb", "Leonard", "Boone", "Elliot", "Jude", "Norbert", "Corey", "Gabe", "Baxter" ], [ "Beverly", "Georgia", "Jaime", "Ruth", "Isabel", "Marissa", "Vanessa", "Annika", "Bethany", "Kimberly", "Meredith", "Rebekah", "Eleanor", "Darcy", "Lydia", "Sachiko", "Abigail", "Agnes", "Lydie", "Roisin", "Tara", "Carmen", "Janet" ]], - [TrainerType.PRESCHOOLER]: [[ "Billy", "Doyle", "Evan", "Homer", "Tully", "Albert", "Buster", "Greg", "Ike", "Jojo", "Tyrone", "Adrian", "Oliver", "Hayden", "Hunter", "Kaleb", "Liam", "Dylan" ], [ "Juliet", "Mia", "Sarah", "Wendy", "Winter", "Chrissy", "Eva", "Lin", "Samantha", "Ella", "Lily", "Natalie", "Ailey", "Hannah", "Malia", "Kindra", "Nancy" ]], - [TrainerType.PSYCHIC]: [[ "Fidel", "Franklin", "Gilbert", "Greg", "Herman", "Jared", "Mark", "Nathan", "Norman", "Phil", "Richard", "Rodney", "Cameron", "Edward", "Fritz", "Joshua", "Preston", "Virgil", "William", "Alvaro", "Blake", "Cedric", "Keenan", "Nicholas", "Dario", "Johan", "Lorenzo", "Tyron", "Bryce", "Corbin", "Deandre", "Elijah", "Kody", "Landon", "Maxwell", "Mitchell", "Sterling", "Eli", "Nelson", "Vernon", "Gaven", "Gerard", "Low", "Micki", "Perry", "Rudolf", "Tommy", "Al", "Nandor", "Tully", "Arthur", "Emanuel", "Franz", "Harry", "Paschal", "Robert", "Sayid", "Angelo", "Anton", "Arin", "Avery", "Danny", "Frasier", "Harrison", "Jaime", "Ross", "Rui", "Vlad", "Mason" ], [ "Alexis", "Hannah", "Jacki", "Jaclyn", "Kayla", "Maura", "Samantha", "Alix", "Brandi", "Edie", "Macey", "Mariella", "Marlene", "Laura", "Rodette", "Abigail", "Brittney", "Chelsey", "Daisy", "Desiree", "Kendra", "Lindsey", "Rachael", "Valencia", "Belle", "Cybil", "Doreen", "Dua", "Future", "Lin", "Madhu", "Alia", "Ena", "Joyce", "Lynette", "Olesia", "Sarah" ]], - [TrainerType.RANGER]: [[ "Carlos", "Jackson", "Sebastian", "Gav", "Lorenzo", "Logan", "Nicolas", "Trenton", "Deshawn", "Dwayne", "Jeffery", "Kyler", "Taylor", "Alain", "Claude", "Crofton", "Forrest", "Harry", "Jaden", "Keith", "Lewis", "Miguel", "Pedro", "Ralph", "Richard", "Bret", "Daryl", "Eddie", "Johan", "Leaf", "Louis", "Maxwell", "Parker", "Rick", "Steve", "Bjorn", "Chaise", "Dean", "Lee", "Maurice", "Nash", "Ralf", "Reed", "Shinobu", "Silas" ], [ "Catherine", "Jenna", "Sophia", "Merdith", "Nora", "Beth", "Chelsea", "Katelyn", "Madeline", "Allison", "Ashlee", "Felicia", "Krista", "Annie", "Audra", "Brenda", "Chloris", "Eliza", "Heidi", "Irene", "Mary", "Mylene", "Shanti", "Shelly", "Thalia", "Anja", "Briana", "Dianna", "Elaine", "Elle", "Hillary", "Katie", "Lena", "Lois", "Malory", "Melita", "Mikiko", "Naoko", "Serenity", "Ambre", "Brooke", "Clementine", "Melina", "Petra", "Twiggy" ]], - [TrainerType.RICH]: [[ "Alfred", "Edward", "Gregory", "Preston", "Thomas", "Tucker", "Walter", "Clifford", "Everett", "Micah", "Nate", "Pierre", "Terrance", "Arthur", "Brooks", "Emanuel", "Lamar", "Jeremy", "Leonardo", "Milton", "Frederic", "Renaud", "Robert", "Yan", "Daniel", "Sheldon", "Stonewall", "Gerald", "Ronald", "Smith", "Stanley", "Reginald", "Orson", "Wilco", "Caden", "Glenn" ], [ "Rebecca", "Reina", "Cassandra", "Emilia", "Grace", "Marian", "Elizabeth", "Kathleen", "Sayuri", "Caroline", "Judy" ]], - [TrainerType.RICH_KID]: [[ "Garret", "Winston", "Dawson", "Enrique", "Jason", "Roman", "Trey", "Liam", "Anthony", "Brad", "Cody", "Manuel", "Martin", "Pierce", "Rolan", "Keenan", "Filbert", "Antoin", "Cyus", "Diek", "Dugo", "Flitz", "Jurek", "Lond", "Perd", "Quint", "Basto", "Benit", "Brot", "Denc", "Guyit", "Marcon", "Perc", "Puros", "Roex", "Sainz", "Symin", "Tark", "Venak" ], [ "Anette", "Brianna", "Cindy", "Colleen", "Daphne", "Elizabeth", "Naomi", "Sarah", "Charlotte", "Gillian", "Jacki", "Lady", "Melissa", "Celeste", "Colette", "Elizandra", "Isabel", "Lynette", "Magnolia", "Sophie", "Lina", "Dulcie", "Auro", "Brin", "Caril", "Eloos", "Gwin", "Illa", "Kowly", "Rima", "Ristin", "Vesey", "Brena", "Deasy", "Denslon", "Kylet", "Nemi", "Rene", "Sanol", "Stouner", "Sturk", "Talmen", "Zoila" ]], - [TrainerType.ROUGHNECK]: [ "Camron", "Corey", "Gabriel", "Isaiah", "Jamal", "Koji", "Luke", "Paxton", "Raul", "Zeek", "Kirby", "Chance", "Dave", "Fletcher", "Johnny", "Reese", "Joey", "Ricky", "Silvester", "Martin" ], - [TrainerType.SAILOR]: [ "Alberto", "Bost", "Brennan", "Brenden", "Claude", "Cory", "Damian", "Dirk", "Duncan", "Dwayne", "Dylan", "Eddie", "Edmond", "Elijah", "Ernest", "Eugene", "Garrett", "Golos", "Gratin", "Grestly", "Harry", "Hols", "Hudson", "Huey", "Jebol", "Jeff", "Leonald", "Luther", "Kelvin", "Kenneth", "Kent", "Knook", "Marc", "Mifis", "Monar", "Morkor", "Ordes", "Oxlin", "Parker", "Paul", "Philip", "Roberto", "Samson", "Skyler", "Stanly", "Tebu", "Terrell", "Trevor", "Yasu", "Zachariah" ], - [TrainerType.SCIENTIST]: [[ "Jed", "Marc", "Mitch", "Rich", "Ross", "Beau", "Braydon", "Connor", "Ed", "Ivan", "Jerry", "Jose", "Joshua", "Parker", "Rodney", "Taylor", "Ted", "Travis", "Zackery", "Darrius", "Emilio", "Fredrick", "Shaun", "Stefano", "Travon", "Daniel", "Garett", "Gregg", "Linden", "Lowell", "Trenton", "Dudley", "Luke", "Markus", "Nathan", "Orville", "Randall", "Ron", "Ronald", "Simon", "Steve", "William", "Franklin", "Clarke", "Jacques", "Terrance", "Ernst", "Justus", "Ikaika", "Jayson", "Kyle", "Reid", "Tyrone", "Adam", "Albert", "Alphonse", "Cory", "Donnie", "Elton", "Francis", "Gordon", "Herbert", "Humphrey", "Jordan", "Julian", "Keaton", "Levi", "Melvin", "Murray", "West", "Craig", "Coren", "Dubik", "Kotan", "Lethco", "Mante", "Mort", "Myron", "Odlow", "Ribek", "Roeck", "Vogi", "Vonder", "Zogo", "Doimo", "Doton", "Durel", "Hildon", "Kukla", "Messa", "Nanot", "Platen", "Raburn", "Reman", "Acrod", "Coffy", "Elrok", "Foss", "Hardig", "Hombol", "Hospel", "Kaller", "Klots", "Krilok", "Limar", "Loket", "Mesak", "Morbit", "Newin", "Orill", "Tabor", "Tekot" ], [ "Blythe", "Chan", "Kathrine", "Marie", "Maria", "Naoko", "Samantha", "Satomi", "Shannon", "Athena", "Caroline", "Lumi", "Lumina", "Marissa", "Sonia" ]], - [TrainerType.SMASHER]: [ "Aspen", "Elena", "Mari", "Amy", "Lizzy" ], - [TrainerType.SNOW_WORKER]: [[ "Braden", "Brendon", "Colin", "Conrad", "Dillan", "Gary", "Gerardo", "Holden", "Jackson", "Mason", "Quentin", "Willy", "Noel", "Arnold", "Brady", "Brand", "Cairn", "Cliff", "Don", "Eddie", "Felix", "Filipe", "Glenn", "Gus", "Heath", "Matthew", "Patton", "Rich", "Rob", "Ryan", "Scott", "Shelby", "Sterling", "Tyler", "Victor", "Zack", "Friedrich", "Herman", "Isaac", "Leo", "Maynard", "Mitchell", "Morgann", "Nathan", "Niel", "Pasqual", "Paul", "Tavarius", "Tibor", "Dimitri", "Narek", "Yusif", "Frank", "Jeff", "Vaclav", "Ovid", "Francis", "Keith", "Russel", "Sangon", "Toway", "Bomber", "Chean", "Demit", "Hubor", "Kebile", "Laber", "Ordo", "Retay", "Ronix", "Wagel", "Dobit", "Kaster", "Lobel", "Releo", "Saken", "Rustix" ], [ "Georgia", "Sandra", "Yvonne" ]], - [TrainerType.STRIKER]: [ "Marco", "Roberto", "Tony" ], - [TrainerType.SCHOOL_KID]: [[ "Alan", "Billy", "Chad", "Danny", "Dudley", "Jack", "Joe", "Johnny", "Kipp", "Nate", "Ricky", "Tommy", "Jerry", "Paul", "Ted", "Chance", "Esteban", "Forrest", "Harrison", "Connor", "Sherman", "Torin", "Travis", "Al", "Carter", "Edgar", "Jem", "Sammy", "Shane", "Shayne", "Alvin", "Keston", "Neil", "Seymour", "William", "Carson", "Clark", "Nolan" ], [ "Georgia", "Karen", "Meiko", "Christine", "Mackenzie", "Tiera", "Ann", "Gina", "Lydia", "Marsha", "Millie", "Sally", "Serena", "Silvia", "Alberta", "Cassie", "Mara", "Rita", "Georgie", "Meena", "Nitzel" ]], - [TrainerType.SWIMMER]: [[ "Berke", "Cameron", "Charlie", "George", "Harold", "Jerome", "Kirk", "Mathew", "Parker", "Randall", "Seth", "Simon", "Tucker", "Austin", "Barry", "Chad", "Cody", "Darrin", "David", "Dean", "Douglas", "Franklin", "Gilbert", "Herman", "Jack", "Luis", "Matthew", "Reed", "Richard", "Rodney", "Roland", "Spencer", "Stan", "Tony", "Clarence", "Declan", "Dominik", "Harrison", "Kevin", "Leonardo", "Nolen", "Pete", "Santiago", "Axle", "Braden", "Finn", "Garrett", "Mymo", "Reece", "Samir", "Toby", "Adrian", "Colton", "Dillon", "Erik", "Evan", "Francisco", "Glenn", "Kurt", "Oscar", "Ricardo", "Sam", "Sheltin", "Troy", "Vincent", "Wade", "Wesley", "Duane", "Elmo", "Esteban", "Frankie", "Ronald", "Tyson", "Bart", "Matt", "Tim", "Wright", "Jeffery", "Kyle", "Alessandro", "Estaban", "Kieran", "Ramses", "Casey", "Dakota", "Jared", "Kalani", "Keoni", "Lawrence", "Logan", "Robert", "Roddy", "Yasu", "Derek", "Jacob", "Bruce", "Clayton" ], [ "Briana", "Dawn", "Denise", "Diana", "Elaine", "Kara", "Kaylee", "Lori", "Nicole", "Nikki", "Paula", "Susie", "Wendy", "Alice", "Beth", "Beverly", "Brenda", "Dana", "Debra", "Grace", "Jenny", "Katie", "Laurel", "Linda", "Missy", "Sharon", "Tanya", "Tara", "Tisha", "Carlee", "Imani", "Isabelle", "Kyla", "Sienna", "Abigail", "Amara", "Anya", "Connie", "Maria", "Melissa", "Nora", "Shirley", "Shania", "Tiffany", "Aubree", "Cassandra", "Claire", "Crystal", "Erica", "Gabrielle", "Haley", "Jessica", "Joanna", "Lydia", "Mallory", "Mary", "Miranda", "Paige", "Sophia", "Vanessa", "Chelan", "Debbie", "Joy", "Kendra", "Leona", "Mina", "Caroline", "Joyce", "Larissa", "Rebecca", "Tyra", "Dara", "Desiree", "Kaoru", "Ruth", "Coral", "Genevieve", "Isla", "Marissa", "Romy", "Sheryl", "Alexandria", "Alicia", "Chelsea", "Jade", "Kelsie", "Laura", "Portia", "Shelby", "Sara", "Tiare", "Kyra", "Natasha", "Layla", "Scarlett", "Cora" ]], - [TrainerType.TWINS]: [ "Amy & May", "Jo & Zoe", "Meg & Peg", "Ann & Anne", "Lea & Pia", "Amy & Liv", "Gina & Mia", "Miu & Yuki", "Tori & Tia", "Eli & Anne", "Jen & Kira", "Joy & Meg", "Kiri & Jan", "Miu & Mia", "Emma & Lil", "Liv & Liz", "Teri & Tia", "Amy & Mimi", "Clea & Gil", "Day & Dani", "Kay & Tia", "Tori & Til", "Saya & Aya", "Emy & Lin", "Kumi & Amy", "Mayo & May", "Ally & Amy", "Lia & Lily", "Rae & Ula", "Sola & Ana", "Tara & Val", "Faith & Joy", "Nana & Nina" ], - [TrainerType.VETERAN]: [[ "Armando", "Brenden", "Brian", "Clayton", "Edgar", "Emanuel", "Grant", "Harlan", "Terrell", "Arlen", "Chester", "Hugo", "Martell", "Ray", "Shaun", "Abraham", "Carter", "Claude", "Jerry", "Lucius", "Murphy", "Rayne", "Ron", "Sinan", "Sterling", "Vincent", "Zach", "Gerard", "Gilles", "Louis", "Timeo", "Akira", "Don", "Eric", "Harry", "Leon", "Roger", "Angus", "Aristo", "Brone", "Johnny" ], [ "Julia", "Karla", "Kim", "Sayuri", "Tiffany", "Cathy", "Cecile", "Chloris", "Denae", "Gina", "Maya", "Oriana", "Portia", "Rhona", "Rosaline", "Catrina", "Inga", "Trisha", "Heather", "Lynn", "Sheri", "Alonsa", "Ella", "Leticia", "Kiara" ]], - [TrainerType.WAITER]: [[ "Bert", "Clint", "Maxwell", "Lou" ], [ "Kati", "Aurora", "Bonita", "Flo", "Tia", "Jan", "Olwen", "Paget", "Paula", "Talia" ]], - [TrainerType.WORKER]: [[ "Braden", "Brendon", "Colin", "Conrad", "Dillan", "Gary", "Gerardo", "Holden", "Jackson", "Mason", "Quentin", "Willy", "Noel", "Arnold", "Brady", "Brand", "Cairn", "Cliff", "Don", "Eddie", "Felix", "Filipe", "Glenn", "Gus", "Heath", "Matthew", "Patton", "Rich", "Rob", "Ryan", "Scott", "Shelby", "Sterling", "Tyler", "Victor", "Zack", "Friedrich", "Herman", "Isaac", "Leo", "Maynard", "Mitchell", "Morgann", "Nathan", "Niel", "Pasqual", "Paul", "Tavarius", "Tibor", "Dimitri", "Narek", "Yusif", "Frank", "Jeff", "Vaclav", "Ovid", "Francis", "Keith", "Russel", "Sangon", "Toway", "Bomber", "Chean", "Demit", "Hubor", "Kebile", "Laber", "Ordo", "Retay", "Ronix", "Wagel", "Dobit", "Kaster", "Lobel", "Releo", "Saken", "Rustix" ], [ "Georgia", "Sandra", "Yvonne" ]], - [TrainerType.YOUNGSTER]: [[ "Albert", "Gordon", "Ian", "Jason", "Jimmy", "Mikey", "Owen", "Samuel", "Warren", "Allen", "Ben", "Billy", "Calvin", "Dillion", "Eddie", "Joey", "Josh", "Neal", "Timmy", "Tommy", "Breyden", "Deandre", "Demetrius", "Dillon", "Jaylen", "Johnson", "Shigenobu", "Chad", "Cole", "Cordell", "Dan", "Dave", "Destin", "Nash", "Tyler", "Yasu", "Austin", "Dallas", "Darius", "Donny", "Jonathon", "Logan", "Michael", "Oliver", "Sebastian", "Tristan", "Wayne", "Norman", "Roland", "Regis", "Abe", "Astor", "Keita", "Kenneth", "Kevin", "Kyle", "Lester", "Masao", "Nicholas", "Parker", "Wes", "Zachary", "Cody", "Henley", "Jaye", "Karl", "Kenny", "Masahiro", "Pedro", "Petey", "Sinclair", "Terrell", "Waylon", "Aidan", "Anthony", "David", "Jacob", "Jayden", "Cutler", "Ham", "Caleb", "Kai", "Honus", "Kenway", "Bret", "Chris", "Cid", "Dennis", "Easton", "Ken", "Robby", "Ronny", "Shawn", "Benjamin", "Jake", "Travis", "Adan", "Aday", "Beltran", "Elian", "Hernan", "Julen", "Luka", "Roi", "Bernie", "Dustin", "Jonathan", "Wyatt" ], [ "Alice", "Bridget", "Carrie", "Connie", "Dana", "Ellen", "Krise", "Laura", "Linda", "Michelle", "Shannon", "Andrea", "Crissy", "Janice", "Robin", "Sally", "Tiana", "Haley", "Ali", "Ann", "Dalia", "Dawn", "Iris", "Joana", "Julia", "Kay", "Lisa", "Megan", "Mikaela", "Miriam", "Paige", "Reli", "Blythe", "Briana", "Caroline", "Cassidy", "Kaitlin", "Madeline", "Molly", "Natalie", "Samantha", "Sarah", "Cathy", "Dye", "Eri", "Eva", "Fey", "Kara", "Lurleen", "Maki", "Mali", "Maya", "Miki", "Sibyl", "Daya", "Diana", "Flo", "Helia", "Henrietta", "Isabel", "Mai", "Persephone", "Serena", "Anna", "Charlotte", "Elin", "Elsa", "Lise", "Sara", "Suzette", "Audrey", "Emmy", "Isabella", "Madison", "Rika", "Rylee", "Salla", "Ellie", "Alexandra", "Amy", "Lass", "Brittany", "Chel", "Cindy", "Dianne", "Emily", "Emma", "Evelyn", "Hana", "Harleen", "Hazel", "Jocelyn", "Katrina", "Kimberly", "Lina", "Marge", "Mila", "Mizuki", "Rena", "Sal", "Satoko", "Summer", "Tomoe", "Vicky", "Yue", "Yumi", "Lauren", "Rei", "Riley", "Lois", "Nancy", "Tammy", "Terry" ]], - [TrainerType.HEX_MANIAC]: [ "Kindra", "Patricia", "Tammy", "Tasha", "Valerie", "Alaina", "Kathleen", "Leah", "Makie", "Sylvia", "Anina", "Arachna", "Carrie", "Desdemona", "Josette", "Luna", "Melanie", "Osanna", "Raziah" ], + [TrainerType.ACE_TRAINER]: [ + [ + "Aaron", + "Allen", + "Blake", + "Brian", + "Gaven", + "Jake", + "Kevin", + "Mike", + "Nick", + "Paul", + "Ryan", + "Sean", + "Darin", + "Albert", + "Berke", + "Clyde", + "Edgar", + "George", + "Leroy", + "Owen", + "Parker", + "Randall", + "Ruben", + "Samuel", + "Vincent", + "Warren", + "Wilton", + "Zane", + "Alfred", + "Braxton", + "Felix", + "Gerald", + "Jonathan", + "Leonel", + "Marcel", + "Mitchell", + "Quincy", + "Roderick", + "Colby", + "Rolando", + "Yuji", + "Abel", + "Anton", + "Arthur", + "Cesar", + "Dalton", + "Dennis", + "Ernest", + "Garrett", + "Graham", + "Henry", + "Isaiah", + "Jonah", + "Jose", + "Keenan", + "Micah", + "Omar", + "Quinn", + "Rodolfo", + "Saul", + "Sergio", + "Skylar", + "Stefan", + "Zachery", + "Alton", + "Arabella", + "Bonita", + "Cal", + "Cody", + "French", + "Kobe", + "Paulo", + "Shaye", + "Austin", + "Beckett", + "Charlie", + "Corky", + "David", + "Dwayne", + "Elmer", + "Jesse", + "Jared", + "Johan", + "Jordan", + "Kipp", + "Lou", + "Terry", + "Tom", + "Webster", + "Billy", + "Doyle", + "Enzio", + "Geoff", + "Grant", + "Kelsey", + "Miguel", + "Pierce", + "Ray", + "Santino", + "Shel", + "Adelbert", + "Bence", + "Emil", + "Evan", + "Mathis", + "Maxim", + "Neil", + "Rico", + "Robbie", + "Theo", + "Viktor", + "Benedict", + "Cornelius", + "Hisato", + "Leopold", + "Neville", + "Vito", + "Chase", + "Cole", + "Hiroshi", + "Jackson", + "Jim", + "Kekoa", + "Makana", + "Yuki", + "Elwood", + "Seth", + "Alvin", + "Arjun", + "Arnold", + "Cameron", + "Carl", + "Carlton", + "Christopher", + "Dave", + "Dax", + "Dominic", + "Edmund", + "Finn", + "Fred", + "Garret", + "Grayson", + "Jace", + "Jaxson", + "Jay", + "Jirard", + "Johnson", + "Kayden", + "Kite", + "Louis", + "Mac", + "Marty", + "Percy", + "Raymond", + "Ronnie", + "Satch", + "Tim", + "Zach", + "Conner", + "Vince", + "Bedro", + "Boda", + "Botan", + "Daras", + "Dury", + "Herton", + "Rewn", + "Stum", + "Tock", + "Trilo", + "Berki", + "Cruik", + "Dazon", + "Desid", + "Dillot", + "Farfin", + "Forgon", + "Hebel", + "Morfon", + "Moril", + "Shadd", + "Vanhub", + "Bardo", + "Carben", + "Degin", + "Gorps", + "Klept", + "Lask", + "Malex", + "Mopar", + "Niled", + "Noxon", + "Teslor", + "Tetil", + ], + [ + "Beth", + "Carol", + "Cybil", + "Emma", + "Fran", + "Gwen", + "Irene", + "Jenn", + "Joyce", + "Kate", + "Kelly", + "Lois", + "Lola", + "Megan", + "Quinn", + "Reena", + "Cara", + "Alexa", + "Brooke", + "Caroline", + "Elaine", + "Hope", + "Jennifer", + "Jody", + "Julie", + "Lori", + "Mary", + "Michelle", + "Shannon", + "Wendy", + "Alexia", + "Alicia", + "Athena", + "Carolina", + "Cristin", + "Darcy", + "Dianne", + "Halle", + "Jazmyn", + "Katelynn", + "Keira", + "Marley", + "Allyson", + "Kathleen", + "Naomi", + "Alyssa", + "Ariana", + "Brandi", + "Breanna", + "Brenda", + "Brenna", + "Catherine", + "Clarice", + "Dana", + "Deanna", + "Destiny", + "Jamie", + "Jasmin", + "Kassandra", + "Laura", + "Maria", + "Mariah", + "Maya", + "Meagan", + "Mikayla", + "Monique", + "Natasha", + "Olivia", + "Sandra", + "Savannah", + "Sydney", + "Moira", + "Piper", + "Salma", + "Allison", + "Beverly", + "Cathy", + "Cheyenne", + "Clara", + "Dara", + "Eileen", + "Glinda", + "Junko", + "Lena", + "Lucille", + "Mariana", + "Olwen", + "Shanta", + "Stella", + "Angi", + "Belle", + "Chandra", + "Cora", + "Eve", + "Jacqueline", + "Jeanne", + "Juliet", + "Kathrine", + "Layla", + "Lucca", + "Melina", + "Miki", + "Nina", + "Sable", + "Shelly", + "Summer", + "Trish", + "Vicki", + "Alanza", + "Cordelia", + "Hilde", + "Imelda", + "Michele", + "Mireille", + "Claudia", + "Constance", + "Harriet", + "Honor", + "Melba", + "Portia", + "Alexis", + "Angela", + "Karla", + "Lindsey", + "Tori", + "Sheri", + "Jada", + "Kailee", + "Amanda", + "Annie", + "Kindra", + "Kyla", + "Sofia", + "Yvette", + "Becky", + "Flora", + "Gloria", + "Buna", + "Ferda", + "Lehan", + "Liqui", + "Lomen", + "Neira", + "Atilo", + "Detta", + "Gilly", + "Gosney", + "Levens", + "Moden", + "Rask", + "Rateis", + "Rosno", + "Tynan", + "Veron", + "Zoel", + "Cida", + "Dibsin", + "Dodin", + "Ebson", + "Equin", + "Flostin", + "Gabsen", + "Halsion", + "Hileon", + "Quelor", + "Rapeel", + "Roze", + "Tensin", + ], + ], + [TrainerType.ARTIST]: [ + ["Ismael", "William", "Horton", "Pierre", "Zach", "Gough", "Salvador", "Vincent", "Duncan"], + ["Georgia"], + ], + [TrainerType.BACKERS]: [ + ["Alf & Fred", "Hawk & Dar", "Joe & Ross", "Les & Web", "Masa & Yas", "Stu & Art"], + [ + "Ai & Ciel", + "Ami & Eira", + "Cam & Abby", + "Fey & Sue", + "Kat & Phae", + "Kay & Ali", + "Ava & Aya", + "Cleo & Rio", + "May & Mal", + ], + ], + [TrainerType.BACKPACKER]: [ + [ + "Alexander", + "Carlos", + "Herman", + "Jerome", + "Keane", + "Kelsey", + "Kiyo", + "Michael", + "Nate", + "Peter", + "Sam", + "Stephen", + "Talon", + "Terrance", + "Toru", + "Waylon", + "Boone", + "Clifford", + "Ivan", + "Kendall", + "Lowell", + "Randall", + "Reece", + "Roland", + "Shane", + "Walt", + "Farid", + "Heike", + "Joren", + "Lane", + "Roderick", + "Darnell", + "Deon", + "Emory", + "Graeme", + "Grayson", + "Aitor", + "Alex", + "Arturo", + "Asier", + "Jaime", + "Jonathan", + "Julio", + "Kevin", + "Kosuke", + "Lander", + "Markel", + "Mateo", + "Nil", + "Pau", + "Samuel", + ], + [ + "Anna", + "Corin", + "Elaine", + "Emi", + "Jill", + "Kumiko", + "Liz", + "Lois", + "Lora", + "Molly", + "Patty", + "Ruth", + "Vicki", + "Annie", + "Blossom", + "Clara", + "Eileen", + "Mae", + "Myra", + "Rachel", + "Tami", + "Ashley", + "Mikiko", + "Kiana", + "Perdy", + "Maria", + "Yuho", + "Peren", + "Barbara", + "Diane", + ], + ], + [TrainerType.BAKER]: ["Chris", "Jenn", "Lilly"], + [TrainerType.BEAUTY]: [ + "Cassie", + "Julia", + "Olivia", + "Samantha", + "Valerie", + "Victoria", + "Bridget", + "Connie", + "Jessica", + "Johanna", + "Melissa", + "Sheila", + "Shirley", + "Tiffany", + "Namiko", + "Thalia", + "Grace", + "Lola", + "Lori", + "Maura", + "Tamia", + "Cyndy", + "Devon", + "Gabriella", + "Harley", + "Lindsay", + "Nicola", + "Callie", + "Charlotte", + "Kassandra", + "December", + "Fleming", + "Nikola", + "Aimee", + "Anais", + "Brigitte", + "Cassandra", + "Andrea", + "Brittney", + "Carolyn", + "Krystal", + "Alexis", + "Alice", + "Aina", + "Anya", + "Arianna", + "Aubrey", + "Beverly", + "Camille", + "Beauty", + "Evette", + "Hansol", + "Haruka", + "Jill", + "Jo", + "Lana", + "Lois", + "Lucy", + "Mai", + "Nickie", + "Nicole", + "Prita", + "Rose", + "Shelly", + "Suzy", + "Tessa", + "Anita", + "Alissa", + "Rita", + "Cudsy", + "Eloff", + "Miru", + "Minot", + "Nevah", + "Niven", + "Ogoin", + ], + [TrainerType.BIKER]: [ + "Charles", + "Dwayne", + "Glenn", + "Harris", + "Joel", + "Riley", + "Zeke", + "Alex", + "Billy", + "Ernest", + "Gerald", + "Hideo", + "Isaac", + "Jared", + "Jaren", + "Jaxon", + "Jordy", + "Lao", + "Lukas", + "Malik", + "Nikolas", + "Ricardo", + "Ruben", + "Virgil", + "William", + "Aiden", + "Dale", + "Dan", + "Jacob", + "Markey", + "Reese", + "Teddy", + "Theron", + "Jeremy", + "Morgann", + "Phillip", + "Philip", + "Stanley", + "Dillon", + ], + [TrainerType.BLACK_BELT]: [ + [ + "Kenji", + "Lao", + "Lung", + "Nob", + "Wai", + "Yoshi", + "Atsushi", + "Daisuke", + "Hideki", + "Hitoshi", + "Kiyo", + "Koichi", + "Koji", + "Yuji", + "Cristian", + "Rhett", + "Takao", + "Theodore", + "Zander", + "Aaron", + "Hugh", + "Mike", + "Nicolas", + "Shea", + "Takashi", + "Adam", + "Carl", + "Colby", + "Darren", + "David", + "Davon", + "Derek", + "Eddie", + "Gregory", + "Griffin", + "Jarrett", + "Jeffery", + "Kendal", + "Kyle", + "Luke", + "Miles", + "Nathaniel", + "Philip", + "Rafael", + "Ray", + "Ricky", + "Sean", + "Willie", + "Ander", + "Manford", + "Benjamin", + "Corey", + "Edward", + "Grant", + "Jay", + "Kendrew", + "Kentaro", + "Ryder", + "Teppei", + "Thomas", + "Tyrone", + "Andrey", + "Donny", + "Drago", + "Gordon", + "Grigor", + "Jeriel", + "Kenneth", + "Martell", + "Mathis", + "Rich", + "Rocky", + "Rodrigo", + "Wesley", + "Zachery", + "Alonzo", + "Cadoc", + "Gunnar", + "Igor", + "Killian", + "Markus", + "Ricardo", + "Yanis", + "Banting", + "Clayton", + "Duane", + "Earl", + "Greg", + "Roy", + "Terry", + "Tracy", + "Walter", + "Alvaro", + "Curtis", + "Francis", + "Ross", + "Brice", + "Cheng", + "Dudley", + "Eric", + "Kano", + "Masahiro", + "Randy", + "Ryuji", + "Steve", + "Tadashi", + "Wong", + "Yuen", + "Brian", + "Carter", + "Reece", + "Nick", + "Yang", + ], + [ + "Cora", + "Cyndy", + "Jill", + "Laura", + "Sadie", + "Tessa", + "Vivian", + "Aisha", + "Callie", + "Danielle", + "Helene", + "Jocelyn", + "Lilith", + "Paula", + "Reyna", + "Helen", + "Kelsey", + "Tyler", + "Amy", + "Chandra", + "Hillary", + "Janie", + "Lee", + "Maggie", + "Mikiko", + "Miriam", + "Sharon", + "Susie", + "Xiao", + "Alize", + "Azra", + "Brenda", + "Chalina", + "Chan", + "Glinda", + "Maki", + "Tia", + "Tiffany", + "Wendy", + "Andrea", + "Gabrielle", + "Gerardine", + "Hailey", + "Hedvig", + "Justine", + "Kinsey", + "Sigrid", + "Veronique", + "Tess", + ], + ], + [TrainerType.BREEDER]: [ + [ + "Isaac", + "Myles", + "Salvadore", + "Albert", + "Kahlil", + "Eustace", + "Galen", + "Owen", + "Addison", + "Marcus", + "Foster", + "Cory", + "Glenn", + "Jay", + "Wesley", + "William", + "Adrian", + "Bradley", + "Jaime", + ], + [ + "Allison", + "Alize", + "Bethany", + "Lily", + "Lydia", + "Gabrielle", + "Jayden", + "Pat", + "Veronica", + "Amber", + "Jennifer", + "Kaylee", + "Adelaide", + "Brooke", + "Ethel", + "April", + "Irene", + "Magnolia", + "Amala", + "Mercy", + "Amanda", + "Ikue", + "Savannah", + "Yuka", + "Chloe", + "Debra", + "Denise", + "Elena", + ], + ], + [TrainerType.CLERK]: [ + [ + "Chaz", + "Clemens", + "Doug", + "Fredric", + "Ivan", + "Isaac", + "Nelson", + "Wade", + "Warren", + "Augustin", + "Gilligan", + "Cody", + "Jeremy", + "Shane", + "Dugal", + "Royce", + "Ronald", + ], + [ + "Alberta", + "Ingrid", + "Katie", + "Piper", + "Trisha", + "Wren", + "Britney", + "Lana", + "Jessica", + "Kristen", + "Michelle", + "Gabrielle", + ], + ], + [TrainerType.CYCLIST]: [ + ["Axel", "James", "John", "Ryan", "Hector", "Jeremiah"], + ["Kayla", "Megan", "Nicole", "Rachel", "Krissa", "Adelaide"], + ], + [TrainerType.DANCER]: [ + "Brian", + "Davey", + "Dirk", + "Edmond", + "Mickey", + "Raymond", + "Cara", + "Julia", + "Maika", + "Mireille", + "Ronda", + "Zoe", + ], + [TrainerType.DEPOT_AGENT]: ["Josh", "Hank", "Vincent"], + [TrainerType.DOCTOR]: [ + ["Hank", "Jerry", "Jules", "Logan", "Wayne", "Braid", "Derek", "Heath", "Julius", "Kit", "Graham"], + ["Kirsten", "Sachiko", "Shery", "Carol", "Dixie", "Mariah"], + ], + [TrainerType.FIREBREATHER]: ["Bill", "Burt", "Cliff", "Dick", "Lyle", "Ned", "Otis", "Ray", "Richard", "Walt"], + [TrainerType.FISHERMAN]: [ + "Andre", + "Arnold", + "Barney", + "Chris", + "Edgar", + "Henry", + "Jonah", + "Justin", + "Kyle", + "Martin", + "Marvin", + "Ralph", + "Raymond", + "Scott", + "Stephen", + "Wilton", + "Tully", + "Andrew", + "Barny", + "Carter", + "Claude", + "Dale", + "Elliot", + "Eugene", + "Ivan", + "Ned", + "Nolan", + "Roger", + "Ronald", + "Wade", + "Wayne", + "Darian", + "Kai", + "Chip", + "Hank", + "Kaden", + "Tommy", + "Tylor", + "Alec", + "Brett", + "Cameron", + "Cody", + "Cole", + "Cory", + "Erick", + "George", + "Joseph", + "Juan", + "Kenneth", + "Luc", + "Miguel", + "Travis", + "Walter", + "Zachary", + "Josh", + "Gideon", + "Kyler", + "Liam", + "Murphy", + "Bruce", + "Damon", + "Devon", + "Hubert", + "Jones", + "Lydon", + "Mick", + "Pete", + "Sean", + "Sid", + "Vince", + "Bucky", + "Dean", + "Eustace", + "Kenzo", + "Leroy", + "Mack", + "Ryder", + "Ewan", + "Finn", + "Murray", + "Seward", + "Shad", + "Wharton", + "Finley", + "Fisher", + "Fisk", + "River", + "Sheaffer", + "Timin", + "Carl", + "Ernest", + "Hal", + "Herbert", + "Hisato", + "Mike", + "Vernon", + "Harriet", + "Marina", + "Chase", + ], + [TrainerType.GUITARIST]: [ + "Anna", + "Beverly", + "January", + "Tina", + "Alicia", + "Claudia", + "Julia", + "Lidia", + "Mireia", + "Noelia", + "Sara", + "Sheila", + "Tatiana", + ], + [TrainerType.HARLEQUIN]: [ + "Charley", + "Ian", + "Jack", + "Kerry", + "Louis", + "Pat", + "Paul", + "Rick", + "Anders", + "Clarence", + "Gary", + ], + [TrainerType.HIKER]: [ + "Anthony", + "Bailey", + "Benjamin", + "Daniel", + "Erik", + "Jim", + "Kenny", + "Leonard", + "Michael", + "Parry", + "Phillip", + "Russell", + "Sidney", + "Tim", + "Timothy", + "Alan", + "Brice", + "Clark", + "Eric", + "Lenny", + "Lucas", + "Mike", + "Trent", + "Devan", + "Eli", + "Marc", + "Sawyer", + "Allen", + "Daryl", + "Dudley", + "Earl", + "Franklin", + "Jeremy", + "Marcos", + "Nob", + "Oliver", + "Wayne", + "Alexander", + "Damon", + "Jonathan", + "Justin", + "Kevin", + "Lorenzo", + "Louis", + "Maurice", + "Nicholas", + "Reginald", + "Robert", + "Theodore", + "Bruce", + "Clarke", + "Devin", + "Dwight", + "Edwin", + "Eoin", + "Noland", + "Russel", + "Andy", + "Bret", + "Darrell", + "Gene", + "Hardy", + "Hugh", + "Jebediah", + "Jeremiah", + "Kit", + "Neil", + "Terrell", + "Don", + "Doug", + "Hunter", + "Jared", + "Jerome", + "Keith", + "Manuel", + "Markus", + "Otto", + "Shelby", + "Stephen", + "Teppei", + "Tobias", + "Wade", + "Zaiem", + "Aaron", + "Alain", + "Bergin", + "Bernard", + "Brent", + "Corwin", + "Craig", + "Delmon", + "Dunstan", + "Orestes", + "Ross", + "Davian", + "Calhoun", + "David", + "Gabriel", + "Ryan", + "Thomas", + "Travis", + "Zachary", + "Anuhea", + "Barnaby", + "Claus", + "Collin", + "Colson", + "Dexter", + "Dillan", + "Eugine", + "Farkas", + "Hisato", + "Julius", + "Kenji", + "Irwin", + "Lionel", + "Paul", + "Richter", + "Valentino", + "Donald", + "Douglas", + "Kevyn", + "Chester", + ], //["Angela","Carla","Celia","Daniela","Estela","Fatima","Helena","Leire","Lucia","Luna","Manuela","Mar","Marina","Miyu","Nancy","Nerea","Paula","Rocio","Yanira"] + [TrainerType.HOOLIGANS]: ["Jim & Cas", "Rob & Sal"], + [TrainerType.HOOPSTER]: ["Bobby", "John", "Lamarcus", "Derrick", "Nicolas"], + [TrainerType.INFIELDER]: ["Alex", "Connor", "Todd"], + [TrainerType.JANITOR]: ["Caleb", "Geoff", "Brady", "Felix", "Orville", "Melvin", "Shawn"], + [TrainerType.LINEBACKER]: ["Bob", "Dan", "Jonah"], + [TrainerType.MAID]: ["Belinda", "Sophie", "Emily", "Elena", "Clare", "Alica", "Tanya", "Tammy"], + [TrainerType.MUSICIAN]: [ + "Boris", + "Preston", + "Charles", + "Clyde", + "Vincent", + "Dalton", + "Kirk", + "Shawn", + "Fabian", + "Fernando", + "Joseph", + "Marcos", + "Arturo", + "Jerry", + "Lonnie", + "Tony", + ], + [TrainerType.NURSERY_AIDE]: [ + "Autumn", + "Briana", + "Leah", + "Miho", + "Ethel", + "Hollie", + "Ilse", + "June", + "Kimya", + "Rosalyn", + ], + [TrainerType.OFFICER]: [ + "Dirk", + "Keith", + "Alex", + "Bobby", + "Caleb", + "Danny", + "Dylan", + "Thomas", + "Daniel", + "Jeff", + "Braven", + "Dell", + "Neagle", + "Haruki", + "Mitchell", + "Raymond", + ], + [TrainerType.PARASOL_LADY]: [ + "Angelica", + "Clarissa", + "Madeline", + "Akari", + "Annabell", + "Kayley", + "Rachel", + "Alexa", + "Sabrina", + "April", + "Gwyneth", + "Laura", + "Lumi", + "Mariah", + "Melita", + "Nicole", + "Tihana", + "Ingrid", + "Tyra", + ], + [TrainerType.PILOT]: ["Chase", "Leonard", "Ted", "Elron", "Ewing", "Flynn", "Winslow"], + [TrainerType.POKEFAN]: [ + [ + "Alex", + "Allan", + "Brandon", + "Carter", + "Colin", + "Derek", + "Jeremy", + "Joshua", + "Rex", + "Robert", + "Trevor", + "William", + "Colton", + "Miguel", + "Francisco", + "Kaleb", + "Leonard", + "Boone", + "Elliot", + "Jude", + "Norbert", + "Corey", + "Gabe", + "Baxter", + ], + [ + "Beverly", + "Georgia", + "Jaime", + "Ruth", + "Isabel", + "Marissa", + "Vanessa", + "Annika", + "Bethany", + "Kimberly", + "Meredith", + "Rebekah", + "Eleanor", + "Darcy", + "Lydia", + "Sachiko", + "Abigail", + "Agnes", + "Lydie", + "Roisin", + "Tara", + "Carmen", + "Janet", + ], + ], + [TrainerType.PRESCHOOLER]: [ + [ + "Billy", + "Doyle", + "Evan", + "Homer", + "Tully", + "Albert", + "Buster", + "Greg", + "Ike", + "Jojo", + "Tyrone", + "Adrian", + "Oliver", + "Hayden", + "Hunter", + "Kaleb", + "Liam", + "Dylan", + ], + [ + "Juliet", + "Mia", + "Sarah", + "Wendy", + "Winter", + "Chrissy", + "Eva", + "Lin", + "Samantha", + "Ella", + "Lily", + "Natalie", + "Ailey", + "Hannah", + "Malia", + "Kindra", + "Nancy", + ], + ], + [TrainerType.PSYCHIC]: [ + [ + "Fidel", + "Franklin", + "Gilbert", + "Greg", + "Herman", + "Jared", + "Mark", + "Nathan", + "Norman", + "Phil", + "Richard", + "Rodney", + "Cameron", + "Edward", + "Fritz", + "Joshua", + "Preston", + "Virgil", + "William", + "Alvaro", + "Blake", + "Cedric", + "Keenan", + "Nicholas", + "Dario", + "Johan", + "Lorenzo", + "Tyron", + "Bryce", + "Corbin", + "Deandre", + "Elijah", + "Kody", + "Landon", + "Maxwell", + "Mitchell", + "Sterling", + "Eli", + "Nelson", + "Vernon", + "Gaven", + "Gerard", + "Low", + "Micki", + "Perry", + "Rudolf", + "Tommy", + "Al", + "Nandor", + "Tully", + "Arthur", + "Emanuel", + "Franz", + "Harry", + "Paschal", + "Robert", + "Sayid", + "Angelo", + "Anton", + "Arin", + "Avery", + "Danny", + "Frasier", + "Harrison", + "Jaime", + "Ross", + "Rui", + "Vlad", + "Mason", + ], + [ + "Alexis", + "Hannah", + "Jacki", + "Jaclyn", + "Kayla", + "Maura", + "Samantha", + "Alix", + "Brandi", + "Edie", + "Macey", + "Mariella", + "Marlene", + "Laura", + "Rodette", + "Abigail", + "Brittney", + "Chelsey", + "Daisy", + "Desiree", + "Kendra", + "Lindsey", + "Rachael", + "Valencia", + "Belle", + "Cybil", + "Doreen", + "Dua", + "Future", + "Lin", + "Madhu", + "Alia", + "Ena", + "Joyce", + "Lynette", + "Olesia", + "Sarah", + ], + ], + [TrainerType.RANGER]: [ + [ + "Carlos", + "Jackson", + "Sebastian", + "Gav", + "Lorenzo", + "Logan", + "Nicolas", + "Trenton", + "Deshawn", + "Dwayne", + "Jeffery", + "Kyler", + "Taylor", + "Alain", + "Claude", + "Crofton", + "Forrest", + "Harry", + "Jaden", + "Keith", + "Lewis", + "Miguel", + "Pedro", + "Ralph", + "Richard", + "Bret", + "Daryl", + "Eddie", + "Johan", + "Leaf", + "Louis", + "Maxwell", + "Parker", + "Rick", + "Steve", + "Bjorn", + "Chaise", + "Dean", + "Lee", + "Maurice", + "Nash", + "Ralf", + "Reed", + "Shinobu", + "Silas", + ], + [ + "Catherine", + "Jenna", + "Sophia", + "Merdith", + "Nora", + "Beth", + "Chelsea", + "Katelyn", + "Madeline", + "Allison", + "Ashlee", + "Felicia", + "Krista", + "Annie", + "Audra", + "Brenda", + "Chloris", + "Eliza", + "Heidi", + "Irene", + "Mary", + "Mylene", + "Shanti", + "Shelly", + "Thalia", + "Anja", + "Briana", + "Dianna", + "Elaine", + "Elle", + "Hillary", + "Katie", + "Lena", + "Lois", + "Malory", + "Melita", + "Mikiko", + "Naoko", + "Serenity", + "Ambre", + "Brooke", + "Clementine", + "Melina", + "Petra", + "Twiggy", + ], + ], + [TrainerType.RICH]: [ + [ + "Alfred", + "Edward", + "Gregory", + "Preston", + "Thomas", + "Tucker", + "Walter", + "Clifford", + "Everett", + "Micah", + "Nate", + "Pierre", + "Terrance", + "Arthur", + "Brooks", + "Emanuel", + "Lamar", + "Jeremy", + "Leonardo", + "Milton", + "Frederic", + "Renaud", + "Robert", + "Yan", + "Daniel", + "Sheldon", + "Stonewall", + "Gerald", + "Ronald", + "Smith", + "Stanley", + "Reginald", + "Orson", + "Wilco", + "Caden", + "Glenn", + ], + [ + "Rebecca", + "Reina", + "Cassandra", + "Emilia", + "Grace", + "Marian", + "Elizabeth", + "Kathleen", + "Sayuri", + "Caroline", + "Judy", + ], + ], + [TrainerType.RICH_KID]: [ + [ + "Garret", + "Winston", + "Dawson", + "Enrique", + "Jason", + "Roman", + "Trey", + "Liam", + "Anthony", + "Brad", + "Cody", + "Manuel", + "Martin", + "Pierce", + "Rolan", + "Keenan", + "Filbert", + "Antoin", + "Cyus", + "Diek", + "Dugo", + "Flitz", + "Jurek", + "Lond", + "Perd", + "Quint", + "Basto", + "Benit", + "Brot", + "Denc", + "Guyit", + "Marcon", + "Perc", + "Puros", + "Roex", + "Sainz", + "Symin", + "Tark", + "Venak", + ], + [ + "Anette", + "Brianna", + "Cindy", + "Colleen", + "Daphne", + "Elizabeth", + "Naomi", + "Sarah", + "Charlotte", + "Gillian", + "Jacki", + "Lady", + "Melissa", + "Celeste", + "Colette", + "Elizandra", + "Isabel", + "Lynette", + "Magnolia", + "Sophie", + "Lina", + "Dulcie", + "Auro", + "Brin", + "Caril", + "Eloos", + "Gwin", + "Illa", + "Kowly", + "Rima", + "Ristin", + "Vesey", + "Brena", + "Deasy", + "Denslon", + "Kylet", + "Nemi", + "Rene", + "Sanol", + "Stouner", + "Sturk", + "Talmen", + "Zoila", + ], + ], + [TrainerType.ROUGHNECK]: [ + "Camron", + "Corey", + "Gabriel", + "Isaiah", + "Jamal", + "Koji", + "Luke", + "Paxton", + "Raul", + "Zeek", + "Kirby", + "Chance", + "Dave", + "Fletcher", + "Johnny", + "Reese", + "Joey", + "Ricky", + "Silvester", + "Martin", + ], + [TrainerType.SAILOR]: [ + "Alberto", + "Bost", + "Brennan", + "Brenden", + "Claude", + "Cory", + "Damian", + "Dirk", + "Duncan", + "Dwayne", + "Dylan", + "Eddie", + "Edmond", + "Elijah", + "Ernest", + "Eugene", + "Garrett", + "Golos", + "Gratin", + "Grestly", + "Harry", + "Hols", + "Hudson", + "Huey", + "Jebol", + "Jeff", + "Leonald", + "Luther", + "Kelvin", + "Kenneth", + "Kent", + "Knook", + "Marc", + "Mifis", + "Monar", + "Morkor", + "Ordes", + "Oxlin", + "Parker", + "Paul", + "Philip", + "Roberto", + "Samson", + "Skyler", + "Stanly", + "Tebu", + "Terrell", + "Trevor", + "Yasu", + "Zachariah", + ], + [TrainerType.SCIENTIST]: [ + [ + "Jed", + "Marc", + "Mitch", + "Rich", + "Ross", + "Beau", + "Braydon", + "Connor", + "Ed", + "Ivan", + "Jerry", + "Jose", + "Joshua", + "Parker", + "Rodney", + "Taylor", + "Ted", + "Travis", + "Zackery", + "Darrius", + "Emilio", + "Fredrick", + "Shaun", + "Stefano", + "Travon", + "Daniel", + "Garett", + "Gregg", + "Linden", + "Lowell", + "Trenton", + "Dudley", + "Luke", + "Markus", + "Nathan", + "Orville", + "Randall", + "Ron", + "Ronald", + "Simon", + "Steve", + "William", + "Franklin", + "Clarke", + "Jacques", + "Terrance", + "Ernst", + "Justus", + "Ikaika", + "Jayson", + "Kyle", + "Reid", + "Tyrone", + "Adam", + "Albert", + "Alphonse", + "Cory", + "Donnie", + "Elton", + "Francis", + "Gordon", + "Herbert", + "Humphrey", + "Jordan", + "Julian", + "Keaton", + "Levi", + "Melvin", + "Murray", + "West", + "Craig", + "Coren", + "Dubik", + "Kotan", + "Lethco", + "Mante", + "Mort", + "Myron", + "Odlow", + "Ribek", + "Roeck", + "Vogi", + "Vonder", + "Zogo", + "Doimo", + "Doton", + "Durel", + "Hildon", + "Kukla", + "Messa", + "Nanot", + "Platen", + "Raburn", + "Reman", + "Acrod", + "Coffy", + "Elrok", + "Foss", + "Hardig", + "Hombol", + "Hospel", + "Kaller", + "Klots", + "Krilok", + "Limar", + "Loket", + "Mesak", + "Morbit", + "Newin", + "Orill", + "Tabor", + "Tekot", + ], + [ + "Blythe", + "Chan", + "Kathrine", + "Marie", + "Maria", + "Naoko", + "Samantha", + "Satomi", + "Shannon", + "Athena", + "Caroline", + "Lumi", + "Lumina", + "Marissa", + "Sonia", + ], + ], + [TrainerType.SMASHER]: ["Aspen", "Elena", "Mari", "Amy", "Lizzy"], + [TrainerType.SNOW_WORKER]: [ + [ + "Braden", + "Brendon", + "Colin", + "Conrad", + "Dillan", + "Gary", + "Gerardo", + "Holden", + "Jackson", + "Mason", + "Quentin", + "Willy", + "Noel", + "Arnold", + "Brady", + "Brand", + "Cairn", + "Cliff", + "Don", + "Eddie", + "Felix", + "Filipe", + "Glenn", + "Gus", + "Heath", + "Matthew", + "Patton", + "Rich", + "Rob", + "Ryan", + "Scott", + "Shelby", + "Sterling", + "Tyler", + "Victor", + "Zack", + "Friedrich", + "Herman", + "Isaac", + "Leo", + "Maynard", + "Mitchell", + "Morgann", + "Nathan", + "Niel", + "Pasqual", + "Paul", + "Tavarius", + "Tibor", + "Dimitri", + "Narek", + "Yusif", + "Frank", + "Jeff", + "Vaclav", + "Ovid", + "Francis", + "Keith", + "Russel", + "Sangon", + "Toway", + "Bomber", + "Chean", + "Demit", + "Hubor", + "Kebile", + "Laber", + "Ordo", + "Retay", + "Ronix", + "Wagel", + "Dobit", + "Kaster", + "Lobel", + "Releo", + "Saken", + "Rustix", + ], + ["Georgia", "Sandra", "Yvonne"], + ], + [TrainerType.STRIKER]: ["Marco", "Roberto", "Tony"], + [TrainerType.SCHOOL_KID]: [ + [ + "Alan", + "Billy", + "Chad", + "Danny", + "Dudley", + "Jack", + "Joe", + "Johnny", + "Kipp", + "Nate", + "Ricky", + "Tommy", + "Jerry", + "Paul", + "Ted", + "Chance", + "Esteban", + "Forrest", + "Harrison", + "Connor", + "Sherman", + "Torin", + "Travis", + "Al", + "Carter", + "Edgar", + "Jem", + "Sammy", + "Shane", + "Shayne", + "Alvin", + "Keston", + "Neil", + "Seymour", + "William", + "Carson", + "Clark", + "Nolan", + ], + [ + "Georgia", + "Karen", + "Meiko", + "Christine", + "Mackenzie", + "Tiera", + "Ann", + "Gina", + "Lydia", + "Marsha", + "Millie", + "Sally", + "Serena", + "Silvia", + "Alberta", + "Cassie", + "Mara", + "Rita", + "Georgie", + "Meena", + "Nitzel", + ], + ], + [TrainerType.SWIMMER]: [ + [ + "Berke", + "Cameron", + "Charlie", + "George", + "Harold", + "Jerome", + "Kirk", + "Mathew", + "Parker", + "Randall", + "Seth", + "Simon", + "Tucker", + "Austin", + "Barry", + "Chad", + "Cody", + "Darrin", + "David", + "Dean", + "Douglas", + "Franklin", + "Gilbert", + "Herman", + "Jack", + "Luis", + "Matthew", + "Reed", + "Richard", + "Rodney", + "Roland", + "Spencer", + "Stan", + "Tony", + "Clarence", + "Declan", + "Dominik", + "Harrison", + "Kevin", + "Leonardo", + "Nolen", + "Pete", + "Santiago", + "Axle", + "Braden", + "Finn", + "Garrett", + "Mymo", + "Reece", + "Samir", + "Toby", + "Adrian", + "Colton", + "Dillon", + "Erik", + "Evan", + "Francisco", + "Glenn", + "Kurt", + "Oscar", + "Ricardo", + "Sam", + "Sheltin", + "Troy", + "Vincent", + "Wade", + "Wesley", + "Duane", + "Elmo", + "Esteban", + "Frankie", + "Ronald", + "Tyson", + "Bart", + "Matt", + "Tim", + "Wright", + "Jeffery", + "Kyle", + "Alessandro", + "Estaban", + "Kieran", + "Ramses", + "Casey", + "Dakota", + "Jared", + "Kalani", + "Keoni", + "Lawrence", + "Logan", + "Robert", + "Roddy", + "Yasu", + "Derek", + "Jacob", + "Bruce", + "Clayton", + ], + [ + "Briana", + "Dawn", + "Denise", + "Diana", + "Elaine", + "Kara", + "Kaylee", + "Lori", + "Nicole", + "Nikki", + "Paula", + "Susie", + "Wendy", + "Alice", + "Beth", + "Beverly", + "Brenda", + "Dana", + "Debra", + "Grace", + "Jenny", + "Katie", + "Laurel", + "Linda", + "Missy", + "Sharon", + "Tanya", + "Tara", + "Tisha", + "Carlee", + "Imani", + "Isabelle", + "Kyla", + "Sienna", + "Abigail", + "Amara", + "Anya", + "Connie", + "Maria", + "Melissa", + "Nora", + "Shirley", + "Shania", + "Tiffany", + "Aubree", + "Cassandra", + "Claire", + "Crystal", + "Erica", + "Gabrielle", + "Haley", + "Jessica", + "Joanna", + "Lydia", + "Mallory", + "Mary", + "Miranda", + "Paige", + "Sophia", + "Vanessa", + "Chelan", + "Debbie", + "Joy", + "Kendra", + "Leona", + "Mina", + "Caroline", + "Joyce", + "Larissa", + "Rebecca", + "Tyra", + "Dara", + "Desiree", + "Kaoru", + "Ruth", + "Coral", + "Genevieve", + "Isla", + "Marissa", + "Romy", + "Sheryl", + "Alexandria", + "Alicia", + "Chelsea", + "Jade", + "Kelsie", + "Laura", + "Portia", + "Shelby", + "Sara", + "Tiare", + "Kyra", + "Natasha", + "Layla", + "Scarlett", + "Cora", + ], + ], + [TrainerType.TWINS]: [ + "Amy & May", + "Jo & Zoe", + "Meg & Peg", + "Ann & Anne", + "Lea & Pia", + "Amy & Liv", + "Gina & Mia", + "Miu & Yuki", + "Tori & Tia", + "Eli & Anne", + "Jen & Kira", + "Joy & Meg", + "Kiri & Jan", + "Miu & Mia", + "Emma & Lil", + "Liv & Liz", + "Teri & Tia", + "Amy & Mimi", + "Clea & Gil", + "Day & Dani", + "Kay & Tia", + "Tori & Til", + "Saya & Aya", + "Emy & Lin", + "Kumi & Amy", + "Mayo & May", + "Ally & Amy", + "Lia & Lily", + "Rae & Ula", + "Sola & Ana", + "Tara & Val", + "Faith & Joy", + "Nana & Nina", + ], + [TrainerType.VETERAN]: [ + [ + "Armando", + "Brenden", + "Brian", + "Clayton", + "Edgar", + "Emanuel", + "Grant", + "Harlan", + "Terrell", + "Arlen", + "Chester", + "Hugo", + "Martell", + "Ray", + "Shaun", + "Abraham", + "Carter", + "Claude", + "Jerry", + "Lucius", + "Murphy", + "Rayne", + "Ron", + "Sinan", + "Sterling", + "Vincent", + "Zach", + "Gerard", + "Gilles", + "Louis", + "Timeo", + "Akira", + "Don", + "Eric", + "Harry", + "Leon", + "Roger", + "Angus", + "Aristo", + "Brone", + "Johnny", + ], + [ + "Julia", + "Karla", + "Kim", + "Sayuri", + "Tiffany", + "Cathy", + "Cecile", + "Chloris", + "Denae", + "Gina", + "Maya", + "Oriana", + "Portia", + "Rhona", + "Rosaline", + "Catrina", + "Inga", + "Trisha", + "Heather", + "Lynn", + "Sheri", + "Alonsa", + "Ella", + "Leticia", + "Kiara", + ], + ], + [TrainerType.WAITER]: [ + ["Bert", "Clint", "Maxwell", "Lou"], + ["Kati", "Aurora", "Bonita", "Flo", "Tia", "Jan", "Olwen", "Paget", "Paula", "Talia"], + ], + [TrainerType.WORKER]: [ + [ + "Braden", + "Brendon", + "Colin", + "Conrad", + "Dillan", + "Gary", + "Gerardo", + "Holden", + "Jackson", + "Mason", + "Quentin", + "Willy", + "Noel", + "Arnold", + "Brady", + "Brand", + "Cairn", + "Cliff", + "Don", + "Eddie", + "Felix", + "Filipe", + "Glenn", + "Gus", + "Heath", + "Matthew", + "Patton", + "Rich", + "Rob", + "Ryan", + "Scott", + "Shelby", + "Sterling", + "Tyler", + "Victor", + "Zack", + "Friedrich", + "Herman", + "Isaac", + "Leo", + "Maynard", + "Mitchell", + "Morgann", + "Nathan", + "Niel", + "Pasqual", + "Paul", + "Tavarius", + "Tibor", + "Dimitri", + "Narek", + "Yusif", + "Frank", + "Jeff", + "Vaclav", + "Ovid", + "Francis", + "Keith", + "Russel", + "Sangon", + "Toway", + "Bomber", + "Chean", + "Demit", + "Hubor", + "Kebile", + "Laber", + "Ordo", + "Retay", + "Ronix", + "Wagel", + "Dobit", + "Kaster", + "Lobel", + "Releo", + "Saken", + "Rustix", + ], + ["Georgia", "Sandra", "Yvonne"], + ], + [TrainerType.YOUNGSTER]: [ + [ + "Albert", + "Gordon", + "Ian", + "Jason", + "Jimmy", + "Mikey", + "Owen", + "Samuel", + "Warren", + "Allen", + "Ben", + "Billy", + "Calvin", + "Dillion", + "Eddie", + "Joey", + "Josh", + "Neal", + "Timmy", + "Tommy", + "Breyden", + "Deandre", + "Demetrius", + "Dillon", + "Jaylen", + "Johnson", + "Shigenobu", + "Chad", + "Cole", + "Cordell", + "Dan", + "Dave", + "Destin", + "Nash", + "Tyler", + "Yasu", + "Austin", + "Dallas", + "Darius", + "Donny", + "Jonathon", + "Logan", + "Michael", + "Oliver", + "Sebastian", + "Tristan", + "Wayne", + "Norman", + "Roland", + "Regis", + "Abe", + "Astor", + "Keita", + "Kenneth", + "Kevin", + "Kyle", + "Lester", + "Masao", + "Nicholas", + "Parker", + "Wes", + "Zachary", + "Cody", + "Henley", + "Jaye", + "Karl", + "Kenny", + "Masahiro", + "Pedro", + "Petey", + "Sinclair", + "Terrell", + "Waylon", + "Aidan", + "Anthony", + "David", + "Jacob", + "Jayden", + "Cutler", + "Ham", + "Caleb", + "Kai", + "Honus", + "Kenway", + "Bret", + "Chris", + "Cid", + "Dennis", + "Easton", + "Ken", + "Robby", + "Ronny", + "Shawn", + "Benjamin", + "Jake", + "Travis", + "Adan", + "Aday", + "Beltran", + "Elian", + "Hernan", + "Julen", + "Luka", + "Roi", + "Bernie", + "Dustin", + "Jonathan", + "Wyatt", + ], + [ + "Alice", + "Bridget", + "Carrie", + "Connie", + "Dana", + "Ellen", + "Krise", + "Laura", + "Linda", + "Michelle", + "Shannon", + "Andrea", + "Crissy", + "Janice", + "Robin", + "Sally", + "Tiana", + "Haley", + "Ali", + "Ann", + "Dalia", + "Dawn", + "Iris", + "Joana", + "Julia", + "Kay", + "Lisa", + "Megan", + "Mikaela", + "Miriam", + "Paige", + "Reli", + "Blythe", + "Briana", + "Caroline", + "Cassidy", + "Kaitlin", + "Madeline", + "Molly", + "Natalie", + "Samantha", + "Sarah", + "Cathy", + "Dye", + "Eri", + "Eva", + "Fey", + "Kara", + "Lurleen", + "Maki", + "Mali", + "Maya", + "Miki", + "Sibyl", + "Daya", + "Diana", + "Flo", + "Helia", + "Henrietta", + "Isabel", + "Mai", + "Persephone", + "Serena", + "Anna", + "Charlotte", + "Elin", + "Elsa", + "Lise", + "Sara", + "Suzette", + "Audrey", + "Emmy", + "Isabella", + "Madison", + "Rika", + "Rylee", + "Salla", + "Ellie", + "Alexandra", + "Amy", + "Lass", + "Brittany", + "Chel", + "Cindy", + "Dianne", + "Emily", + "Emma", + "Evelyn", + "Hana", + "Harleen", + "Hazel", + "Jocelyn", + "Katrina", + "Kimberly", + "Lina", + "Marge", + "Mila", + "Mizuki", + "Rena", + "Sal", + "Satoko", + "Summer", + "Tomoe", + "Vicky", + "Yue", + "Yumi", + "Lauren", + "Rei", + "Riley", + "Lois", + "Nancy", + "Tammy", + "Terry", + ], + ], + [TrainerType.HEX_MANIAC]: [ + "Kindra", + "Patricia", + "Tammy", + "Tasha", + "Valerie", + "Alaina", + "Kathleen", + "Leah", + "Makie", + "Sylvia", + "Anina", + "Arachna", + "Carrie", + "Desdemona", + "Josette", + "Luna", + "Melanie", + "Osanna", + "Raziah", + ], }; // function used in a commented code -// eslint-disable-next-line @typescript-eslint/no-unused-vars -function fetchAndPopulateTrainerNames(url: string, parser: DOMParser, trainerNames: Set, femaleTrainerNames: Set, forceFemale: boolean = false) { +// biome-ignore lint/correctness/noUnusedVariables: TODO make this into a script instead of having it be in src/data... +function fetchAndPopulateTrainerNames( + url: string, + parser: DOMParser, + trainerNames: Set, + femaleTrainerNames: Set, + forceFemale = false, +) { return new Promise(resolve => { fetch(`https://bulbapedia.bulbagarden.net/wiki/${url}_(Trainer_class)`) .then(response => response.text()) @@ -140,19 +2738,21 @@ function fetchAndPopulateTrainerNames(url: string, parser: DOMParser, trainerNam if (!trainerListHeader) { return []; } - const elements = [ ...(trainerListHeader?.parentElement?.childNodes ?? []) ]; + const elements = [...(trainerListHeader?.parentElement?.childNodes ?? [])]; const startChildIndex = elements.indexOf(trainerListHeader); const endChildIndex = elements.findIndex(h => h.nodeName === "H2" && elements.indexOf(h) > startChildIndex); - const tables = elements.filter(t => { - if (t.nodeName !== "TABLE" || t["className"] !== "expandable") { - return false; - } - const childIndex = elements.indexOf(t); - return childIndex > startChildIndex && childIndex < endChildIndex; - }).map(t => t as Element); + const tables = elements + .filter(t => { + if (t.nodeName !== "TABLE" || t["className"] !== "expandable") { + return false; + } + const childIndex = elements.indexOf(t); + return childIndex > startChildIndex && childIndex < endChildIndex; + }) + .map(t => t as Element); console.log(url, tables); for (const table of tables) { - const trainerRows = [ ...table.querySelectorAll("tr:not(:first-child)") ].filter(r => r.children.length === 9); + const trainerRows = [...table.querySelectorAll("tr:not(:first-child)")].filter(r => r.children.length === 9); for (const row of trainerRows) { const nameCell = row.firstElementChild; if (!nameCell) { diff --git a/src/data/type.ts b/src/data/type.ts index 6170eadc91e..c9bf346fb85 100644 --- a/src/data/type.ts +++ b/src/data/type.ts @@ -1,266 +1,266 @@ -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; export type TypeDamageMultiplier = 0 | 0.125 | 0.25 | 0.5 | 1 | 2 | 4 | 8; -export function getTypeDamageMultiplier(attackType: Type, defType: Type): TypeDamageMultiplier { - if (attackType === Type.UNKNOWN || defType === Type.UNKNOWN) { +export function getTypeDamageMultiplier(attackType: PokemonType, defType: PokemonType): TypeDamageMultiplier { + if (attackType === PokemonType.UNKNOWN || defType === PokemonType.UNKNOWN) { return 1; } switch (defType) { - case Type.NORMAL: + case PokemonType.NORMAL: switch (attackType) { - case Type.FIGHTING: + case PokemonType.FIGHTING: return 2; - case Type.GHOST: + case PokemonType.GHOST: return 0; default: return 1; } - case Type.FIGHTING: + case PokemonType.FIGHTING: switch (attackType) { - case Type.FLYING: - case Type.PSYCHIC: - case Type.FAIRY: + case PokemonType.FLYING: + case PokemonType.PSYCHIC: + case PokemonType.FAIRY: return 2; - case Type.ROCK: - case Type.BUG: - case Type.DARK: + case PokemonType.ROCK: + case PokemonType.BUG: + case PokemonType.DARK: return 0.5; default: return 1; } - case Type.FLYING: + case PokemonType.FLYING: switch (attackType) { - case Type.ROCK: - case Type.ELECTRIC: - case Type.ICE: + case PokemonType.ROCK: + case PokemonType.ELECTRIC: + case PokemonType.ICE: return 2; - case Type.FIGHTING: - case Type.BUG: - case Type.GRASS: + case PokemonType.FIGHTING: + case PokemonType.BUG: + case PokemonType.GRASS: return 0.5; - case Type.GROUND: + case PokemonType.GROUND: return 0; default: return 1; } - case Type.POISON: + case PokemonType.POISON: switch (attackType) { - case Type.GROUND: - case Type.PSYCHIC: + case PokemonType.GROUND: + case PokemonType.PSYCHIC: return 2; - case Type.FIGHTING: - case Type.POISON: - case Type.BUG: - case Type.GRASS: - case Type.FAIRY: + case PokemonType.FIGHTING: + case PokemonType.POISON: + case PokemonType.BUG: + case PokemonType.GRASS: + case PokemonType.FAIRY: return 0.5; default: return 1; } - case Type.GROUND: + case PokemonType.GROUND: switch (attackType) { - case Type.WATER: - case Type.GRASS: - case Type.ICE: + case PokemonType.WATER: + case PokemonType.GRASS: + case PokemonType.ICE: return 2; - case Type.POISON: - case Type.ROCK: + case PokemonType.POISON: + case PokemonType.ROCK: return 0.5; - case Type.ELECTRIC: + case PokemonType.ELECTRIC: return 0; default: return 1; } - case Type.ROCK: + case PokemonType.ROCK: switch (attackType) { - case Type.FIGHTING: - case Type.GROUND: - case Type.STEEL: - case Type.WATER: - case Type.GRASS: + case PokemonType.FIGHTING: + case PokemonType.GROUND: + case PokemonType.STEEL: + case PokemonType.WATER: + case PokemonType.GRASS: return 2; - case Type.NORMAL: - case Type.FLYING: - case Type.POISON: - case Type.FIRE: + case PokemonType.NORMAL: + case PokemonType.FLYING: + case PokemonType.POISON: + case PokemonType.FIRE: return 0.5; default: return 1; } - case Type.BUG: + case PokemonType.BUG: switch (attackType) { - case Type.FLYING: - case Type.ROCK: - case Type.FIRE: + case PokemonType.FLYING: + case PokemonType.ROCK: + case PokemonType.FIRE: return 2; - case Type.FIGHTING: - case Type.GROUND: - case Type.GRASS: + case PokemonType.FIGHTING: + case PokemonType.GROUND: + case PokemonType.GRASS: return 0.5; default: return 1; } - case Type.GHOST: + case PokemonType.GHOST: switch (attackType) { - case Type.GHOST: - case Type.DARK: + case PokemonType.GHOST: + case PokemonType.DARK: return 2; - case Type.POISON: - case Type.BUG: + case PokemonType.POISON: + case PokemonType.BUG: return 0.5; - case Type.NORMAL: - case Type.FIGHTING: + case PokemonType.NORMAL: + case PokemonType.FIGHTING: return 0; default: return 1; } - case Type.STEEL: + case PokemonType.STEEL: switch (attackType) { - case Type.FIGHTING: - case Type.GROUND: - case Type.FIRE: + case PokemonType.FIGHTING: + case PokemonType.GROUND: + case PokemonType.FIRE: return 2; - case Type.NORMAL: - case Type.FLYING: - case Type.ROCK: - case Type.BUG: - case Type.STEEL: - case Type.GRASS: - case Type.PSYCHIC: - case Type.ICE: - case Type.DRAGON: - case Type.FAIRY: + case PokemonType.NORMAL: + case PokemonType.FLYING: + case PokemonType.ROCK: + case PokemonType.BUG: + case PokemonType.STEEL: + case PokemonType.GRASS: + case PokemonType.PSYCHIC: + case PokemonType.ICE: + case PokemonType.DRAGON: + case PokemonType.FAIRY: return 0.5; - case Type.POISON: + case PokemonType.POISON: return 0; default: return 1; } - case Type.FIRE: + case PokemonType.FIRE: switch (attackType) { - case Type.GROUND: - case Type.ROCK: - case Type.WATER: + case PokemonType.GROUND: + case PokemonType.ROCK: + case PokemonType.WATER: return 2; - case Type.BUG: - case Type.STEEL: - case Type.FIRE: - case Type.GRASS: - case Type.ICE: - case Type.FAIRY: + case PokemonType.BUG: + case PokemonType.STEEL: + case PokemonType.FIRE: + case PokemonType.GRASS: + case PokemonType.ICE: + case PokemonType.FAIRY: return 0.5; default: return 1; } - case Type.WATER: + case PokemonType.WATER: switch (attackType) { - case Type.GRASS: - case Type.ELECTRIC: + case PokemonType.GRASS: + case PokemonType.ELECTRIC: return 2; - case Type.STEEL: - case Type.FIRE: - case Type.WATER: - case Type.ICE: + case PokemonType.STEEL: + case PokemonType.FIRE: + case PokemonType.WATER: + case PokemonType.ICE: return 0.5; default: return 1; } - case Type.GRASS: + case PokemonType.GRASS: switch (attackType) { - case Type.FLYING: - case Type.POISON: - case Type.BUG: - case Type.FIRE: - case Type.ICE: + case PokemonType.FLYING: + case PokemonType.POISON: + case PokemonType.BUG: + case PokemonType.FIRE: + case PokemonType.ICE: return 2; - case Type.GROUND: - case Type.WATER: - case Type.GRASS: - case Type.ELECTRIC: + case PokemonType.GROUND: + case PokemonType.WATER: + case PokemonType.GRASS: + case PokemonType.ELECTRIC: return 0.5; default: return 1; } - case Type.ELECTRIC: + case PokemonType.ELECTRIC: switch (attackType) { - case Type.GROUND: + case PokemonType.GROUND: return 2; - case Type.FLYING: - case Type.STEEL: - case Type.ELECTRIC: + case PokemonType.FLYING: + case PokemonType.STEEL: + case PokemonType.ELECTRIC: return 0.5; default: return 1; } - case Type.PSYCHIC: + case PokemonType.PSYCHIC: switch (attackType) { - case Type.BUG: - case Type.GHOST: - case Type.DARK: + case PokemonType.BUG: + case PokemonType.GHOST: + case PokemonType.DARK: return 2; - case Type.FIGHTING: - case Type.PSYCHIC: + case PokemonType.FIGHTING: + case PokemonType.PSYCHIC: return 0.5; default: return 1; } - case Type.ICE: + case PokemonType.ICE: switch (attackType) { - case Type.FIGHTING: - case Type.ROCK: - case Type.STEEL: - case Type.FIRE: + case PokemonType.FIGHTING: + case PokemonType.ROCK: + case PokemonType.STEEL: + case PokemonType.FIRE: return 2; - case Type.ICE: + case PokemonType.ICE: return 0.5; default: return 1; } - case Type.DRAGON: + case PokemonType.DRAGON: switch (attackType) { - case Type.ICE: - case Type.DRAGON: - case Type.FAIRY: + case PokemonType.ICE: + case PokemonType.DRAGON: + case PokemonType.FAIRY: return 2; - case Type.FIRE: - case Type.WATER: - case Type.GRASS: - case Type.ELECTRIC: + case PokemonType.FIRE: + case PokemonType.WATER: + case PokemonType.GRASS: + case PokemonType.ELECTRIC: return 0.5; default: return 1; } - case Type.DARK: + case PokemonType.DARK: switch (attackType) { - case Type.FIGHTING: - case Type.BUG: - case Type.FAIRY: + case PokemonType.FIGHTING: + case PokemonType.BUG: + case PokemonType.FAIRY: return 2; - case Type.GHOST: - case Type.DARK: + case PokemonType.GHOST: + case PokemonType.DARK: return 0.5; - case Type.PSYCHIC: + case PokemonType.PSYCHIC: return 0; default: return 1; } - case Type.FAIRY: + case PokemonType.FAIRY: switch (attackType) { - case Type.POISON: - case Type.STEEL: + case PokemonType.POISON: + case PokemonType.STEEL: return 2; - case Type.FIGHTING: - case Type.BUG: - case Type.DARK: + case PokemonType.FIGHTING: + case PokemonType.BUG: + case PokemonType.DARK: return 0.5; - case Type.DRAGON: + case PokemonType.DRAGON: return 0; default: return 1; } - case Type.STELLAR: + case PokemonType.STELLAR: return 1; } @@ -271,7 +271,10 @@ export function getTypeDamageMultiplier(attackType: Type, defType: Type): TypeDa * Retrieve the color corresponding to a specific damage multiplier * @returns A color or undefined if the default color should be used */ -export function getTypeDamageMultiplierColor(multiplier: TypeDamageMultiplier, side: "defense" | "offense"): string | undefined { +export function getTypeDamageMultiplierColor( + multiplier: TypeDamageMultiplier, + side: "defense" | "offense", +): string | undefined { if (side === "offense") { switch (multiplier) { case 0: @@ -291,7 +294,8 @@ export function getTypeDamageMultiplierColor(multiplier: TypeDamageMultiplier, s case 8: return "#52C200"; } - } else if (side === "defense") { + } + if (side === "defense") { switch (multiplier) { case 0: return "#B1B100"; @@ -313,47 +317,47 @@ export function getTypeDamageMultiplierColor(multiplier: TypeDamageMultiplier, s } } -export function getTypeRgb(type: Type): [ integer, integer, integer ] { +export function getTypeRgb(type: PokemonType): [number, number, number] { switch (type) { - case Type.NORMAL: - return [ 168, 168, 120 ]; - case Type.FIGHTING: - return [ 192, 48, 40 ]; - case Type.FLYING: - return [ 168, 144, 240 ]; - case Type.POISON: - return [ 160, 64, 160 ]; - case Type.GROUND: - return [ 224, 192, 104 ]; - case Type.ROCK: - return [ 184, 160, 56 ]; - case Type.BUG: - return [ 168, 184, 32 ]; - case Type.GHOST: - return [ 112, 88, 152 ]; - case Type.STEEL: - return [ 184, 184, 208 ]; - case Type.FIRE: - return [ 240, 128, 48 ]; - case Type.WATER: - return [ 104, 144, 240 ]; - case Type.GRASS: - return [ 120, 200, 80 ]; - case Type.ELECTRIC: - return [ 248, 208, 48 ]; - case Type.PSYCHIC: - return [ 248, 88, 136 ]; - case Type.ICE: - return [ 152, 216, 216 ]; - case Type.DRAGON: - return [ 112, 56, 248 ]; - case Type.DARK: - return [ 112, 88, 72 ]; - case Type.FAIRY: - return [ 232, 136, 200 ]; - case Type.STELLAR: - return [ 255, 255, 255 ]; + case PokemonType.NORMAL: + return [168, 168, 120]; + case PokemonType.FIGHTING: + return [192, 48, 40]; + case PokemonType.FLYING: + return [168, 144, 240]; + case PokemonType.POISON: + return [160, 64, 160]; + case PokemonType.GROUND: + return [224, 192, 104]; + case PokemonType.ROCK: + return [184, 160, 56]; + case PokemonType.BUG: + return [168, 184, 32]; + case PokemonType.GHOST: + return [112, 88, 152]; + case PokemonType.STEEL: + return [184, 184, 208]; + case PokemonType.FIRE: + return [240, 128, 48]; + case PokemonType.WATER: + return [104, 144, 240]; + case PokemonType.GRASS: + return [120, 200, 80]; + case PokemonType.ELECTRIC: + return [248, 208, 48]; + case PokemonType.PSYCHIC: + return [248, 88, 136]; + case PokemonType.ICE: + return [152, 216, 216]; + case PokemonType.DRAGON: + return [112, 56, 248]; + case PokemonType.DARK: + return [112, 88, 72]; + case PokemonType.FAIRY: + return [232, 136, 200]; + case PokemonType.STELLAR: + return [255, 255, 255]; default: - return [ 0, 0, 0 ]; + return [0, 0, 0]; } } diff --git a/src/data/variant.ts b/src/data/variant.ts index 13869635f1e..13c11b0bb40 100644 --- a/src/data/variant.ts +++ b/src/data/variant.ts @@ -8,7 +8,7 @@ export const variantData: any = {}; export const variantColorCache = {}; -export function getVariantTint(variant: Variant): integer { +export function getVariantTint(variant: Variant): number { switch (variant) { case 0: return 0xf8c020; @@ -19,7 +19,7 @@ export function getVariantTint(variant: Variant): integer { } } -export function getVariantIcon(variant: Variant): integer { +export function getVariantIcon(variant: Variant): number { switch (variant) { case 0: return VariantTier.STANDARD; diff --git a/src/data/weather.ts b/src/data/weather.ts index 7bba698f9b4..c2b0263c9f6 100644 --- a/src/data/weather.ts +++ b/src/data/weather.ts @@ -2,9 +2,9 @@ import { Biome } from "#enums/biome"; import { WeatherType } from "#enums/weather-type"; import { getPokemonNameWithAffix } from "../messages"; import type Pokemon from "../field/pokemon"; -import { Type } from "#enums/type"; -import type Move from "./move"; -import { AttackMove } from "./move"; +import { PokemonType } from "#enums/pokemon-type"; +import type Move from "./moves/move"; +import { AttackMove } from "./moves/move"; import * as Utils from "../utils"; import { SuppressWeatherEffectAbAttr } from "./ability"; import { TerrainType, getTerrainName } from "./terrain"; @@ -14,9 +14,9 @@ import type { Arena } from "#app/field/arena"; export class Weather { public weatherType: WeatherType; - public turnsLeft: integer; + public turnsLeft: number; - constructor(weatherType: WeatherType, turnsLeft?: integer) { + constructor(weatherType: WeatherType, turnsLeft?: number) { this.weatherType = weatherType; this.turnsLeft = !this.isImmutable() ? turnsLeft || 0 : 0; } @@ -53,34 +53,34 @@ export class Weather { return false; } - isTypeDamageImmune(type: Type): boolean { + isTypeDamageImmune(type: PokemonType): boolean { switch (this.weatherType) { case WeatherType.SANDSTORM: - return type === Type.GROUND || type === Type.ROCK || type === Type.STEEL; + return type === PokemonType.GROUND || type === PokemonType.ROCK || type === PokemonType.STEEL; case WeatherType.HAIL: - return type === Type.ICE; + return type === PokemonType.ICE; } return false; } - getAttackTypeMultiplier(attackType: Type): number { + getAttackTypeMultiplier(attackType: PokemonType): number { switch (this.weatherType) { case WeatherType.SUNNY: case WeatherType.HARSH_SUN: - if (attackType === Type.FIRE) { + if (attackType === PokemonType.FIRE) { return 1.5; } - if (attackType === Type.WATER) { + if (attackType === PokemonType.WATER) { return 0.5; } break; case WeatherType.RAIN: case WeatherType.HEAVY_RAIN: - if (attackType === Type.FIRE) { + if (attackType === PokemonType.FIRE) { return 0.5; } - if (attackType === Type.WATER) { + if (attackType === PokemonType.WATER) { return 1.5; } break; @@ -94,9 +94,9 @@ export class Weather { switch (this.weatherType) { case WeatherType.HARSH_SUN: - return move instanceof AttackMove && moveType === Type.WATER; + return move instanceof AttackMove && moveType === PokemonType.WATER; case WeatherType.HEAVY_RAIN: - return move instanceof AttackMove && moveType === Type.FIRE; + return move instanceof AttackMove && moveType === PokemonType.FIRE; } return false; @@ -106,9 +106,13 @@ export class Weather { const field = globalScene.getField(true); for (const pokemon of field) { - let suppressWeatherEffectAbAttr: SuppressWeatherEffectAbAttr | null = pokemon.getAbility().getAttrs(SuppressWeatherEffectAbAttr)[0]; + let suppressWeatherEffectAbAttr: SuppressWeatherEffectAbAttr | null = pokemon + .getAbility() + .getAttrs(SuppressWeatherEffectAbAttr)[0]; if (!suppressWeatherEffectAbAttr) { - suppressWeatherEffectAbAttr = pokemon.hasPassive() ? pokemon.getPassiveAbility().getAttrs(SuppressWeatherEffectAbAttr)[0] : null; + suppressWeatherEffectAbAttr = pokemon.hasPassive() + ? pokemon.getPassiveAbility().getAttrs(SuppressWeatherEffectAbAttr)[0] + : null; } if (suppressWeatherEffectAbAttr && (!this.isImmutable() || suppressWeatherEffectAbAttr.affectsImmutable)) { return true; @@ -172,9 +176,13 @@ export function getWeatherLapseMessage(weatherType: WeatherType): string | null export function getWeatherDamageMessage(weatherType: WeatherType, pokemon: Pokemon): string | null { switch (weatherType) { case WeatherType.SANDSTORM: - return i18next.t("weather:sandstormDamageMessage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); + return i18next.t("weather:sandstormDamageMessage", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }); case WeatherType.HAIL: - return i18next.t("weather:hailDamageMessage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); + return i18next.t("weather:hailDamageMessage", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }); } return null; @@ -205,6 +213,28 @@ export function getWeatherClearMessage(weatherType: WeatherType): string | null return null; } +export function getLegendaryWeatherContinuesMessage(weatherType: WeatherType): string | null { + switch (weatherType) { + case WeatherType.HARSH_SUN: + return i18next.t("weather:harshSunContinueMessage"); + case WeatherType.HEAVY_RAIN: + return i18next.t("weather:heavyRainContinueMessage"); + case WeatherType.STRONG_WINDS: + return i18next.t("weather:strongWindsContinueMessage"); + } + return null; +} + +export function getWeatherBlockMessage(weatherType: WeatherType): string { + switch (weatherType) { + case WeatherType.HARSH_SUN: + return i18next.t("weather:harshSunEffectMessage"); + case WeatherType.HEAVY_RAIN: + return i18next.t("weather:heavyRainEffectMessage"); + } + return i18next.t("weather:defaultEffectMessage"); +} + export function getTerrainStartMessage(terrainType: TerrainType): string | null { switch (terrainType) { case TerrainType.MISTY: @@ -239,14 +269,19 @@ export function getTerrainClearMessage(terrainType: TerrainType): string | null export function getTerrainBlockMessage(pokemon: Pokemon, terrainType: TerrainType): string { if (terrainType === TerrainType.MISTY) { - return i18next.t("terrain:mistyBlockMessage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); + return i18next.t("terrain:mistyBlockMessage", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }); } - return i18next.t("terrain:defaultBlockMessage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), terrainName: getTerrainName(terrainType) }); + return i18next.t("terrain:defaultBlockMessage", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + terrainName: getTerrainName(terrainType), + }); } export interface WeatherPoolEntry { weatherType: WeatherType; - weight: integer; + weight: number; } export function getRandomWeatherType(arena: Arena): WeatherType { @@ -254,9 +289,7 @@ export function getRandomWeatherType(arena: Arena): WeatherType { const hasSun = arena.getTimeOfDay() < 2; switch (arena.biomeType) { case Biome.GRASS: - weatherPool = [ - { weatherType: WeatherType.NONE, weight: 7 } - ]; + weatherPool = [{ weatherType: WeatherType.NONE, weight: 7 }]; if (hasSun) { weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 3 }); } @@ -273,26 +306,26 @@ export function getRandomWeatherType(arena: Arena): WeatherType { case Biome.FOREST: weatherPool = [ { weatherType: WeatherType.NONE, weight: 8 }, - { weatherType: WeatherType.RAIN, weight: 5 } + { weatherType: WeatherType.RAIN, weight: 5 }, ]; break; case Biome.SEA: weatherPool = [ { weatherType: WeatherType.NONE, weight: 3 }, - { weatherType: WeatherType.RAIN, weight: 12 } + { weatherType: WeatherType.RAIN, weight: 12 }, ]; break; case Biome.SWAMP: weatherPool = [ { weatherType: WeatherType.NONE, weight: 3 }, { weatherType: WeatherType.RAIN, weight: 4 }, - { weatherType: WeatherType.FOG, weight: 1 } + { weatherType: WeatherType.FOG, weight: 1 }, ]; break; case Biome.BEACH: weatherPool = [ { weatherType: WeatherType.NONE, weight: 8 }, - { weatherType: WeatherType.RAIN, weight: 3 } + { weatherType: WeatherType.RAIN, weight: 3 }, ]; if (hasSun) { weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 5 }); @@ -302,27 +335,23 @@ export function getRandomWeatherType(arena: Arena): WeatherType { weatherPool = [ { weatherType: WeatherType.NONE, weight: 10 }, { weatherType: WeatherType.RAIN, weight: 5 }, - { weatherType: WeatherType.FOG, weight: 1 } + { weatherType: WeatherType.FOG, weight: 1 }, ]; break; case Biome.SEABED: - weatherPool = [ - { weatherType: WeatherType.RAIN, weight: 1 } - ]; + weatherPool = [{ weatherType: WeatherType.RAIN, weight: 1 }]; break; case Biome.BADLANDS: weatherPool = [ { weatherType: WeatherType.NONE, weight: 8 }, - { weatherType: WeatherType.SANDSTORM, weight: 2 } + { weatherType: WeatherType.SANDSTORM, weight: 2 }, ]; if (hasSun) { weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 5 }); } break; case Biome.DESERT: - weatherPool = [ - { weatherType: WeatherType.SANDSTORM, weight: 2 } - ]; + weatherPool = [{ weatherType: WeatherType.SANDSTORM, weight: 2 }]; if (hasSun) { weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 2 }); } @@ -331,37 +360,38 @@ export function getRandomWeatherType(arena: Arena): WeatherType { weatherPool = [ { weatherType: WeatherType.NONE, weight: 3 }, { weatherType: WeatherType.SNOW, weight: 4 }, - { weatherType: WeatherType.HAIL, weight: 1 } + { weatherType: WeatherType.HAIL, weight: 1 }, ]; break; case Biome.MEADOW: - weatherPool = [ - { weatherType: WeatherType.NONE, weight: 2 } - ]; + weatherPool = [{ weatherType: WeatherType.NONE, weight: 2 }]; if (hasSun) { weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 2 }); } case Biome.VOLCANO: weatherPool = [ - { weatherType: hasSun ? WeatherType.SUNNY : WeatherType.NONE, weight: 1 } + { + weatherType: hasSun ? WeatherType.SUNNY : WeatherType.NONE, + weight: 1, + }, ]; break; case Biome.GRAVEYARD: weatherPool = [ { weatherType: WeatherType.NONE, weight: 3 }, - { weatherType: WeatherType.FOG, weight: 1 } + { weatherType: WeatherType.FOG, weight: 1 }, ]; break; case Biome.JUNGLE: weatherPool = [ { weatherType: WeatherType.NONE, weight: 8 }, - { weatherType: WeatherType.RAIN, weight: 2 } + { weatherType: WeatherType.RAIN, weight: 2 }, ]; break; case Biome.SNOWY_FOREST: weatherPool = [ { weatherType: WeatherType.SNOW, weight: 7 }, - { weatherType: WeatherType.HAIL, weight: 1 } + { weatherType: WeatherType.HAIL, weight: 1 }, ]; break; case Biome.ISLAND: @@ -381,7 +411,9 @@ export function getRandomWeatherType(arena: Arena): WeatherType { if (weatherPool.length > 1) { let totalWeight = 0; - weatherPool.forEach(w => totalWeight += w.weight); + for (const w of weatherPool) { + totalWeight += w.weight; + } const rand = Utils.randSeedInt(totalWeight); let w = 0; @@ -393,7 +425,5 @@ export function getRandomWeatherType(arena: Arena): WeatherType { } } - return weatherPool.length - ? weatherPool[0].weatherType - : WeatherType.NONE; + return weatherPool.length ? weatherPool[0].weatherType : WeatherType.NONE; } diff --git a/src/debug.js b/src/debug.js index e0f27332d3d..6ddf6046c7a 100644 --- a/src/debug.js +++ b/src/debug.js @@ -3,7 +3,9 @@ export function getData() { if (!dataStr) { return null; } - return JSON.parse(atob(dataStr), (k, v) => k.endsWith("Attr") && ![ "natureAttr", "abilityAttr", "passiveAttr" ].includes(k) ? BigInt(v) : v); + return JSON.parse(atob(dataStr), (k, v) => + k.endsWith("Attr") && !["natureAttr", "abilityAttr", "passiveAttr"].includes(k) ? BigInt(v) : v, + ); } export function getSession() { diff --git a/src/enums/MoveCategory.ts b/src/enums/MoveCategory.ts new file mode 100644 index 00000000000..0408655e6db --- /dev/null +++ b/src/enums/MoveCategory.ts @@ -0,0 +1,5 @@ +export enum MoveCategory { + PHYSICAL, + SPECIAL, + STATUS +} diff --git a/src/enums/MoveEffectTrigger.ts b/src/enums/MoveEffectTrigger.ts new file mode 100644 index 00000000000..1e7753d94fa --- /dev/null +++ b/src/enums/MoveEffectTrigger.ts @@ -0,0 +1,7 @@ +export enum MoveEffectTrigger { + PRE_APPLY, + POST_APPLY, + HIT, + /** Triggers one time after all target effects have applied */ + POST_TARGET +} diff --git a/src/enums/MoveFlags.ts b/src/enums/MoveFlags.ts new file mode 100644 index 00000000000..0fc85fddec6 --- /dev/null +++ b/src/enums/MoveFlags.ts @@ -0,0 +1,46 @@ +export enum MoveFlags { + NONE = 0, + MAKES_CONTACT = 1 << 0, + IGNORE_PROTECT = 1 << 1, + /** + * Sound-based moves have the following effects: + * - Pokemon with the {@linkcode Abilities.SOUNDPROOF Soundproof Ability} are unaffected by other Pokemon's sound-based moves. + * - Pokemon affected by {@linkcode Moves.THROAT_CHOP Throat Chop} cannot use sound-based moves for two turns. + * - Sound-based moves used by a Pokemon with {@linkcode Abilities.LIQUID_VOICE Liquid Voice} become Water-type moves. + * - Sound-based moves used by a Pokemon with {@linkcode Abilities.PUNK_ROCK Punk Rock} are boosted by 30%. Pokemon with Punk Rock also take half damage from sound-based moves. + * - All sound-based moves (except Howl) can hit Pokemon behind an active {@linkcode Moves.SUBSTITUTE Substitute}. + * + * cf https://bulbapedia.bulbagarden.net/wiki/Sound-based_move + */ + SOUND_BASED = 1 << 2, + HIDE_USER = 1 << 3, + HIDE_TARGET = 1 << 4, + BITING_MOVE = 1 << 5, + PULSE_MOVE = 1 << 6, + PUNCHING_MOVE = 1 << 7, + SLICING_MOVE = 1 << 8, + /** + * Indicates a move should be affected by {@linkcode Abilities.RECKLESS} + * @see {@linkcode Move.recklessMove()} + */ + RECKLESS_MOVE = 1 << 9, + /** Indicates a move should be affected by {@linkcode Abilities.BULLETPROOF} */ + BALLBOMB_MOVE = 1 << 10, + /** Grass types and pokemon with {@linkcode Abilities.OVERCOAT} are immune to powder moves */ + POWDER_MOVE = 1 << 11, + /** Indicates a move should trigger {@linkcode Abilities.DANCER} */ + DANCE_MOVE = 1 << 12, + /** Indicates a move should trigger {@linkcode Abilities.WIND_RIDER} */ + WIND_MOVE = 1 << 13, + /** Indicates a move should trigger {@linkcode Abilities.TRIAGE} */ + TRIAGE_MOVE = 1 << 14, + IGNORE_ABILITIES = 1 << 15, + /** Enables all hits of a multi-hit move to be accuracy checked individually */ + CHECK_ALL_HITS = 1 << 16, + /** Indicates a move is able to bypass its target's Substitute (if the target has one) */ + IGNORE_SUBSTITUTE = 1 << 17, + /** Indicates a move is able to be redirected to allies in a double battle if the attacker faints */ + REDIRECT_COUNTER = 1 << 18, + /** Indicates a move is able to be reflected by {@linkcode Abilities.MAGIC_BOUNCE} and {@linkcode Moves.MAGIC_COAT} */ + REFLECTABLE = 1 << 19 +} diff --git a/src/enums/MoveTarget.ts b/src/enums/MoveTarget.ts new file mode 100644 index 00000000000..615628cf4e8 --- /dev/null +++ b/src/enums/MoveTarget.ts @@ -0,0 +1,29 @@ +export enum MoveTarget { + /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_the_user Moves that target the User} */ + USER, + OTHER, + ALL_OTHERS, + NEAR_OTHER, + /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_adjacent_Pok%C3%A9mon Moves that target all adjacent Pokemon} */ + ALL_NEAR_OTHERS, + NEAR_ENEMY, + /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_adjacent_foes Moves that target all adjacent foes} */ + ALL_NEAR_ENEMIES, + RANDOM_NEAR_ENEMY, + ALL_ENEMIES, + /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Counterattacks Counterattacks} */ + ATTACKER, + /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_one_adjacent_ally Moves that target one adjacent ally} */ + NEAR_ALLY, + ALLY, + USER_OR_NEAR_ALLY, + USER_AND_ALLIES, + /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_Pok%C3%A9mon Moves that target all Pokemon} */ + ALL, + USER_SIDE, + /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Entry_hazard-creating_moves Entry hazard-creating moves} */ + ENEMY_SIDE, + BOTH_SIDES, + PARTY, + CURSE +} diff --git a/src/enums/MultiHitType.ts b/src/enums/MultiHitType.ts new file mode 100644 index 00000000000..27e8214112e --- /dev/null +++ b/src/enums/MultiHitType.ts @@ -0,0 +1,7 @@ +export enum MultiHitType { + _2, + _2_TO_5, + _3, + _10, + BEAT_UP +} diff --git a/src/enums/arena-tag-type.ts b/src/enums/arena-tag-type.ts index 1c62ccb14a6..4180aa00ef5 100644 --- a/src/enums/arena-tag-type.ts +++ b/src/enums/arena-tag-type.ts @@ -29,4 +29,5 @@ export enum ArenaTagType { WATER_FIRE_PLEDGE = "WATER_FIRE_PLEDGE", GRASS_WATER_PLEDGE = "GRASS_WATER_PLEDGE", FAIRY_LOCK = "FAIRY_LOCK", + NEUTRALIZING_GAS = "NEUTRALIZING_GAS" } diff --git a/src/enums/battler-tag-type.ts b/src/enums/battler-tag-type.ts index f28ac37ae27..719b08c5b81 100644 --- a/src/enums/battler-tag-type.ts +++ b/src/enums/battler-tag-type.ts @@ -94,4 +94,5 @@ export enum BattlerTagType { PSYCHO_SHIFT = "PSYCHO_SHIFT", ENDURE_TOKEN = "ENDURE_TOKEN", POWDER = "POWDER", + MAGIC_COAT = "MAGIC_COAT", } diff --git a/src/enums/buttons.ts b/src/enums/buttons.ts index fe26023f8e7..f828b280d45 100644 --- a/src/enums/buttons.ts +++ b/src/enums/buttons.ts @@ -13,7 +13,7 @@ export enum Button { CYCLE_GENDER, CYCLE_ABILITY, CYCLE_NATURE, - V, + CYCLE_TERA, SPEED_UP, - SLOW_DOWN + SLOW_DOWN, } diff --git a/src/enums/type.ts b/src/enums/pokemon-type.ts similarity index 88% rename from src/enums/type.ts rename to src/enums/pokemon-type.ts index a04849c2ca3..eca02bae275 100644 --- a/src/enums/type.ts +++ b/src/enums/pokemon-type.ts @@ -1,4 +1,4 @@ -export enum Type { +export enum PokemonType { UNKNOWN = -1, NORMAL = 0, FIGHTING, diff --git a/src/enums/stat.ts b/src/enums/stat.ts index 6b3f7dc6d79..a2b81b7e64b 100644 --- a/src/enums/stat.ts +++ b/src/enums/stat.ts @@ -48,9 +48,11 @@ export type TempBattleStat = typeof TEMP_BATTLE_STATS[number]; export function getStatStageChangeDescriptionKey(stages: number, isIncrease: boolean) { if (stages === 1) { return isIncrease ? "battle:statRose" : "battle:statFell"; - } else if (stages === 2) { + } + if (stages === 2) { return isIncrease ? "battle:statSharplyRose" : "battle:statHarshlyFell"; - } else if (stages > 2 && stages <= 6) { + } + if (stages > 2 && stages <= 6) { return isIncrease ? "battle:statRoseDrastically" : "battle:statSeverelyFell"; } return isIncrease ? "battle:statWontGoAnyHigher" : "battle:statWontGoAnyLower"; diff --git a/src/events/arena.ts b/src/events/arena.ts index 660a113f96b..ad77289b76b 100644 --- a/src/events/arena.ts +++ b/src/events/arena.ts @@ -32,7 +32,7 @@ export class ArenaEvent extends Event { /** * Container class for {@linkcode ArenaEventType.WEATHER_CHANGED} events * @extends ArenaEvent -*/ + */ export class WeatherChangedEvent extends ArenaEvent { /** The {@linkcode WeatherType} being overridden */ public oldWeatherType: WeatherType; @@ -48,7 +48,7 @@ export class WeatherChangedEvent extends ArenaEvent { /** * Container class for {@linkcode ArenaEventType.TERRAIN_CHANGED} events * @extends ArenaEvent -*/ + */ export class TerrainChangedEvent extends ArenaEvent { /** The {@linkcode TerrainType} being overridden */ public oldTerrainType: TerrainType; @@ -65,7 +65,7 @@ export class TerrainChangedEvent extends ArenaEvent { /** * Container class for {@linkcode ArenaEventType.TAG_ADDED} events * @extends ArenaEvent -*/ + */ export class TagAddedEvent extends ArenaEvent { /** The {@linkcode ArenaTagType} being added */ public arenaTagType: ArenaTagType; @@ -76,7 +76,13 @@ export class TagAddedEvent extends ArenaEvent { /** The maximum amount of layers of the arena trap. */ public arenaTagMaxLayers: number; - constructor(arenaTagType: ArenaTagType, arenaTagSide: ArenaTagSide, duration: number, arenaTagLayers?: number, arenaTagMaxLayers?: number) { + constructor( + arenaTagType: ArenaTagType, + arenaTagSide: ArenaTagSide, + duration: number, + arenaTagLayers?: number, + arenaTagMaxLayers?: number, + ) { super(ArenaEventType.TAG_ADDED, duration); this.arenaTagType = arenaTagType; @@ -88,7 +94,7 @@ export class TagAddedEvent extends ArenaEvent { /** * Container class for {@linkcode ArenaEventType.TAG_REMOVED} events * @extends ArenaEvent -*/ + */ export class TagRemovedEvent extends ArenaEvent { /** The {@linkcode ArenaTagType} being removed */ public arenaTagType: ArenaTagType; diff --git a/src/events/battle-scene.ts b/src/events/battle-scene.ts index 548666c96de..83d260bd7d2 100644 --- a/src/events/battle-scene.ts +++ b/src/events/battle-scene.ts @@ -1,4 +1,4 @@ -import type Move from "../data/move"; +import type Move from "../data/moves/move"; import type { BerryModifier } from "../modifier/modifier"; /** Alias for all {@linkcode BattleScene} events */ @@ -34,7 +34,7 @@ export enum BattleSceneEventType { * Triggers after a turn ends in battle * @see {@linkcode TurnEndEvent} */ - TURN_END = "onTurnEnd", + TURN_END = "onTurnEnd", /** * Triggers when a new {@linkcode Arena} is created during initialization @@ -46,7 +46,7 @@ export enum BattleSceneEventType { /** * Container class for {@linkcode BattleSceneEventType.CANDY_UPGRADE_NOTIFICATION_CHANGED} events * @extends Event -*/ + */ export class CandyUpgradeNotificationChangedEvent extends Event { /** The new value the setting was changed to */ public newValue: number; @@ -60,7 +60,7 @@ export class CandyUpgradeNotificationChangedEvent extends Event { /** * Container class for {@linkcode BattleSceneEventType.MOVE_USED} events * @extends Event -*/ + */ export class MoveUsedEvent extends Event { /** The ID of the {@linkcode Pokemon} that used the {@linkcode Move} */ public pokemonId: number; @@ -79,7 +79,7 @@ export class MoveUsedEvent extends Event { /** * Container class for {@linkcode BattleSceneEventType.BERRY_USED} events * @extends Event -*/ + */ export class BerryUsedEvent extends Event { /** The {@linkcode BerryModifier} being used */ public berryModifier: BerryModifier; @@ -93,7 +93,7 @@ export class BerryUsedEvent extends Event { /** * Container class for {@linkcode BattleSceneEventType.ENCOUNTER_PHASE} events * @extends Event -*/ + */ export class EncounterPhaseEvent extends Event { constructor() { super(BattleSceneEventType.ENCOUNTER_PHASE); @@ -102,7 +102,7 @@ export class EncounterPhaseEvent extends Event { /** * Container class for {@linkcode BattleSceneEventType.TURN_INIT} events * @extends Event -*/ + */ export class TurnInitEvent extends Event { constructor() { super(BattleSceneEventType.TURN_INIT); @@ -111,7 +111,7 @@ export class TurnInitEvent extends Event { /** * Container class for {@linkcode BattleSceneEventType.TURN_END} events * @extends Event -*/ + */ export class TurnEndEvent extends Event { /** The amount of turns in the current battle */ public turnCount: number; @@ -124,7 +124,7 @@ export class TurnEndEvent extends Event { /** * Container class for {@linkcode BattleSceneEventType.NEW_ARENA} events * @extends Event -*/ + */ export class NewArenaEvent extends Event { constructor() { super(BattleSceneEventType.NEW_ARENA); diff --git a/src/events/egg.ts b/src/events/egg.ts index b30c37a25e8..a0c26c82883 100644 --- a/src/events/egg.ts +++ b/src/events/egg.ts @@ -3,16 +3,16 @@ export enum EggEventType { * Triggers when egg count is changed. * @see {@linkcode MoveUsedEvent} */ - EGG_COUNT_CHANGED = "onEggCountChanged" + EGG_COUNT_CHANGED = "onEggCountChanged", } /** * Container class for {@linkcode EggEventType.EGG_COUNT_CHANGED} events * @extends Event -*/ + */ export class EggCountChangedEvent extends Event { /** The updated egg count. */ - public eggCount: integer; + public eggCount: number; constructor(eggCount: number) { super(EggEventType.EGG_COUNT_CHANGED); diff --git a/src/field/anims.ts b/src/field/anims.ts index f96427326b5..cd6209dddff 100644 --- a/src/field/anims.ts +++ b/src/field/anims.ts @@ -24,31 +24,35 @@ export function addPokeballOpenParticles(x: number, y: number, pokeballType: Pok } function doDefaultPbOpenParticles(x: number, y: number, radius: number) { - const pbOpenParticlesFrameNames = globalScene.anims.generateFrameNames("pb_particles", { start: 0, end: 3, suffix: ".png" }); - if (!(globalScene.anims.exists("pb_open_particle"))) { + const pbOpenParticlesFrameNames = globalScene.anims.generateFrameNames("pb_particles", { + start: 0, + end: 3, + suffix: ".png", + }); + if (!globalScene.anims.exists("pb_open_particle")) { globalScene.anims.create({ key: "pb_open_particle", frames: pbOpenParticlesFrameNames, frameRate: 16, - repeat: -1 + repeat: -1, }); } - const addParticle = (index: integer) => { + const addParticle = (index: number) => { const particle = globalScene.add.sprite(x, y, "pb_open_particle"); globalScene.field.add(particle); const angle = index * 45; - const [ xCoord, yCoord ] = [ radius * Math.cos(angle * Math.PI / 180), radius * Math.sin(angle * Math.PI / 180) ]; + const [xCoord, yCoord] = [radius * Math.cos((angle * Math.PI) / 180), radius * Math.sin((angle * Math.PI) / 180)]; globalScene.tweens.add({ targets: particle, x: x + xCoord, y: y + yCoord, - duration: 575 + duration: 575, }); particle.play({ key: "pb_open_particle", startFrame: (index + 3) % 4, - frameRate: Math.floor(16 * globalScene.gameSpeed) + frameRate: Math.floor(16 * globalScene.gameSpeed), }); globalScene.tweens.add({ targets: particle, @@ -56,7 +60,7 @@ function doDefaultPbOpenParticles(x: number, y: number, radius: number) { duration: 75, alpha: 0, ease: "Sine.easeIn", - onComplete: () => particle.destroy() + onComplete: () => particle.destroy(), }); }; @@ -64,11 +68,11 @@ function doDefaultPbOpenParticles(x: number, y: number, radius: number) { globalScene.time.addEvent({ delay: 20, repeat: 16, - callback: () => addParticle(++particleCount) + callback: () => addParticle(++particleCount), }); } -function doUbOpenParticles(x: number, y: number, frameIndex: integer) { +function doUbOpenParticles(x: number, y: number, frameIndex: number) { const particles: Phaser.GameObjects.Image[] = []; for (let i = 0; i < 10; i++) { particles.push(doFanOutParticle(i * 25, x, y, 1, 1, 5, frameIndex)); @@ -84,7 +88,7 @@ function doUbOpenParticles(x: number, y: number, frameIndex: integer) { for (const particle of particles) { particle.destroy(); } - } + }, }); } @@ -105,12 +109,20 @@ function doMbOpenParticles(x: number, y: number) { for (const particle of particles) { particle.destroy(); } - } + }, }); } } -function doFanOutParticle(trigIndex: integer, x: integer, y: integer, xSpeed: integer, ySpeed: integer, angle: integer, frameIndex: integer): Phaser.GameObjects.Image { +function doFanOutParticle( + trigIndex: number, + x: number, + y: number, + xSpeed: number, + ySpeed: number, + angle: number, + frameIndex: number, +): Phaser.GameObjects.Image { let f = 0; const particle = globalScene.add.image(x, y, "pb_particles", `${frameIndex}.png`); @@ -122,7 +134,7 @@ function doFanOutParticle(trigIndex: integer, x: integer, y: integer, xSpeed: in } particle.x = x + sin(trigIndex, f * xSpeed); particle.y = y + cos(trigIndex, f * ySpeed); - trigIndex = (trigIndex + angle); + trigIndex = trigIndex + angle; f++; }; @@ -131,7 +143,7 @@ function doFanOutParticle(trigIndex: integer, x: integer, y: integer, xSpeed: in duration: getFrameMs(1), onRepeat: () => { updateParticle(); - } + }, }); return particle; @@ -155,16 +167,16 @@ export function addPokeballCaptureStars(pokeball: Phaser.GameObjects.Sprite): vo y: pokeball.y, alpha: 0, ease: "Sine.easeIn", - duration: 250 + duration: 250, }); - } + }, }); const dist = randGauss(25); globalScene.tweens.add({ targets: particle, x: pokeball.x + dist, - duration: 500 + duration: 500, }); globalScene.tweens.add({ @@ -172,18 +184,18 @@ export function addPokeballCaptureStars(pokeball: Phaser.GameObjects.Sprite): vo alpha: 0, delay: 425, duration: 75, - onComplete: () => particle.destroy() + onComplete: () => particle.destroy(), }); }; new Array(3).fill(null).map(() => addParticle()); } -export function sin(index: integer, amplitude: integer): number { +export function sin(index: number, amplitude: number): number { return amplitude * Math.sin(index * (Math.PI / 128)); } -export function cos(index: integer, amplitude: integer): number { +export function cos(index: number, amplitude: number): number { return amplitude * Math.cos(index * (Math.PI / 128)); } @@ -200,7 +212,10 @@ export function doShinySparkleAnim(sparkleSprite: Phaser.GameObjects.Sprite, var // Make sure the animation exists, and create it if not if (!globalScene.anims.exists(animationKey)) { - const frameNames = globalScene.anims.generateFrameNames(spriteKey, { suffix: ".png", end: 34 }); + const frameNames = globalScene.anims.generateFrameNames(spriteKey, { + suffix: ".png", + end: 34, + }); globalScene.anims.create({ key: `sparkle${keySuffix}`, frames: frameNames, diff --git a/src/field/arena.ts b/src/field/arena.ts index deeb261a491..997b80b3237 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -5,10 +5,17 @@ import type { Constructor } from "#app/utils"; import * as Utils from "#app/utils"; import type PokemonSpecies from "#app/data/pokemon-species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { getTerrainClearMessage, getTerrainStartMessage, getWeatherClearMessage, getWeatherStartMessage, Weather } from "#app/data/weather"; +import { + getTerrainClearMessage, + getTerrainStartMessage, + getWeatherClearMessage, + getWeatherStartMessage, + getLegendaryWeatherContinuesMessage, + Weather, +} from "#app/data/weather"; import { CommonAnim } from "#app/data/battle-anims"; -import type { Type } from "#enums/type"; -import type Move from "#app/data/move"; +import type { PokemonType } from "#enums/pokemon-type"; +import type Move from "#app/data/moves/move"; import type { ArenaTag } from "#app/data/arena-tag"; import { ArenaTagSide, ArenaTrapTag, getArenaTag } from "#app/data/arena-tag"; import type { BattlerIndex } from "#app/battle"; @@ -19,7 +26,7 @@ import { applyPostWeatherChangeAbAttrs, PostTerrainChangeAbAttr, PostWeatherChangeAbAttr, - TerrainEventTypeChangeAbAttr + TerrainEventTypeChangeAbAttr, } from "#app/data/ability"; import type Pokemon from "#app/field/pokemon"; import Overrides from "#app/overrides"; @@ -44,6 +51,12 @@ export class Arena { public bgm: string; public ignoreAbilities: boolean; public ignoringEffectSource: BattlerIndex | null; + public playerTerasUsed: number; + /** + * Saves the number of times a party pokemon faints during a arena encounter. + * {@linkcode globalScene.currentBattle.enemyFaints} is the corresponding faint counter for the enemy (this resets every wave). + */ + public playerFaints: number; private lastTimeOfDay: TimeOfDay; @@ -52,12 +65,14 @@ export class Arena { public readonly eventTarget: EventTarget = new EventTarget(); - constructor(biome: Biome, bgm: string) { + constructor(biome: Biome, bgm: string, playerFaints = 0) { this.biomeType = biome; this.tags = []; this.bgm = bgm; this.trainerPool = biomeTrainerPools[biome]; this.updatePoolsForTimeOfDay(); + this.playerTerasUsed = 0; + this.playerFaints = playerFaints; } init() { @@ -80,19 +95,29 @@ export class Arena { if (timeOfDay !== this.lastTimeOfDay) { this.pokemonPool = {}; for (const tier of Object.keys(biomePokemonPools[this.biomeType])) { - this.pokemonPool[tier] = Object.assign([], biomePokemonPools[this.biomeType][tier][TimeOfDay.ALL]).concat(biomePokemonPools[this.biomeType][tier][timeOfDay]); + this.pokemonPool[tier] = Object.assign([], biomePokemonPools[this.biomeType][tier][TimeOfDay.ALL]).concat( + biomePokemonPools[this.biomeType][tier][timeOfDay], + ); } this.lastTimeOfDay = timeOfDay; } } - randomSpecies(waveIndex: integer, level: integer, attempt?: integer, luckValue?: integer, isBoss?: boolean): PokemonSpecies { + randomSpecies( + waveIndex: number, + level: number, + attempt?: number, + luckValue?: number, + isBoss?: boolean, + ): PokemonSpecies { const overrideSpecies = globalScene.gameMode.getOverrideSpecies(waveIndex); if (overrideSpecies) { return overrideSpecies; } - const isBossSpecies = !!globalScene.getEncounterBossSegments(waveIndex, level) && !!this.pokemonPool[BiomePoolTier.BOSS].length - && (this.biomeType !== Biome.END || globalScene.gameMode.isClassic || globalScene.gameMode.isWaveFinal(waveIndex)); + const isBossSpecies = + !!globalScene.getEncounterBossSegments(waveIndex, level) && + !!this.pokemonPool[BiomePoolTier.BOSS].length && + (this.biomeType !== Biome.END || globalScene.gameMode.isClassic || globalScene.gameMode.isWaveFinal(waveIndex)); const randVal = isBossSpecies ? 64 : 512; // luck influences encounter rarity let luckModifier = 0; @@ -101,8 +126,22 @@ export class Arena { } const tierValue = Utils.randSeedInt(randVal - luckModifier); let tier = !isBossSpecies - ? tierValue >= 156 ? BiomePoolTier.COMMON : tierValue >= 32 ? BiomePoolTier.UNCOMMON : tierValue >= 6 ? BiomePoolTier.RARE : tierValue >= 1 ? BiomePoolTier.SUPER_RARE : BiomePoolTier.ULTRA_RARE - : tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE; + ? tierValue >= 156 + ? BiomePoolTier.COMMON + : tierValue >= 32 + ? BiomePoolTier.UNCOMMON + : tierValue >= 6 + ? BiomePoolTier.RARE + : tierValue >= 1 + ? BiomePoolTier.SUPER_RARE + : BiomePoolTier.ULTRA_RARE + : tierValue >= 20 + ? BiomePoolTier.BOSS + : tierValue >= 6 + ? BiomePoolTier.BOSS_RARE + : tierValue >= 1 + ? BiomePoolTier.BOSS_SUPER_RARE + : BiomePoolTier.BOSS_ULTRA_RARE; console.log(BiomePoolTier[tier]); while (!this.pokemonPool[tier].length) { console.log(`Downgraded rarity tier from ${BiomePoolTier[tier]} to ${BiomePoolTier[tier - 1]}`); @@ -121,7 +160,7 @@ export class Arena { } else { const levelThresholds = Object.keys(entry); for (let l = levelThresholds.length - 1; l >= 0; l--) { - const levelThreshold = parseInt(levelThresholds[l]); + const levelThreshold = Number.parseInt(levelThresholds[l]); if (level >= levelThreshold) { const speciesIds = entry[levelThreshold]; if (speciesIds.length > 1) { @@ -138,13 +177,13 @@ export class Arena { if (ret.subLegendary || ret.legendary || ret.mythical) { switch (true) { - case (ret.baseTotal >= 720): + case ret.baseTotal >= 720: regen = level < 90; break; - case (ret.baseTotal >= 670): + case ret.baseTotal >= 670: regen = level < 70; break; - case (ret.baseTotal >= 580): + case ret.baseTotal >= 580: regen = level < 50; break; default: @@ -167,14 +206,29 @@ export class Arena { return ret; } - randomTrainerType(waveIndex: integer, isBoss: boolean = false): TrainerType { - const isTrainerBoss = !!this.trainerPool[BiomePoolTier.BOSS].length - && (globalScene.gameMode.isTrainerBoss(waveIndex, this.biomeType, globalScene.offsetGym) || isBoss); + randomTrainerType(waveIndex: number, isBoss = false): TrainerType { + const isTrainerBoss = + !!this.trainerPool[BiomePoolTier.BOSS].length && + (globalScene.gameMode.isTrainerBoss(waveIndex, this.biomeType, globalScene.offsetGym) || isBoss); console.log(isBoss, this.trainerPool); const tierValue = Utils.randSeedInt(!isTrainerBoss ? 512 : 64); let tier = !isTrainerBoss - ? tierValue >= 156 ? BiomePoolTier.COMMON : tierValue >= 32 ? BiomePoolTier.UNCOMMON : tierValue >= 6 ? BiomePoolTier.RARE : tierValue >= 1 ? BiomePoolTier.SUPER_RARE : BiomePoolTier.ULTRA_RARE - : tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE; + ? tierValue >= 156 + ? BiomePoolTier.COMMON + : tierValue >= 32 + ? BiomePoolTier.UNCOMMON + : tierValue >= 6 + ? BiomePoolTier.RARE + : tierValue >= 1 + ? BiomePoolTier.SUPER_RARE + : BiomePoolTier.ULTRA_RARE + : tierValue >= 20 + ? BiomePoolTier.BOSS + : tierValue >= 6 + ? BiomePoolTier.BOSS_RARE + : tierValue >= 1 + ? BiomePoolTier.BOSS_SUPER_RARE + : BiomePoolTier.BOSS_ULTRA_RARE; console.log(BiomePoolTier[tier]); while (tier && !this.trainerPool[tier].length) { console.log(`Downgraded trainer rarity tier from ${BiomePoolTier[tier]} to ${BiomePoolTier[tier - 1]}`); @@ -184,7 +238,7 @@ export class Arena { return !tierPool.length ? TrainerType.BREEDER : tierPool[Utils.randSeedInt(tierPool.length)]; } - getSpeciesFormIndex(species: PokemonSpecies): integer { + getSpeciesFormIndex(species: PokemonSpecies): number { switch (species.speciesId) { case Species.BURMY: case Species.WORMADAM: @@ -249,6 +303,11 @@ export class Arena { return true; } + /** Returns weather or not the weather can be changed to {@linkcode weather} */ + canSetWeather(weather: WeatherType): boolean { + return !(this.weather?.weatherType === (weather || undefined)); + } + /** * Attempts to set a new weather to the battle * @param weather {@linkcode WeatherType} new {@linkcode WeatherType} to set @@ -260,14 +319,27 @@ export class Arena { return this.trySetWeatherOverride(Overrides.WEATHER_OVERRIDE); } - if (this.weather?.weatherType === (weather || undefined)) { + if (!this.canSetWeather(weather)) { return false; } const oldWeatherType = this.weather?.weatherType || WeatherType.NONE; + if ( + this.weather?.isImmutable() && + ![WeatherType.HARSH_SUN, WeatherType.HEAVY_RAIN, WeatherType.STRONG_WINDS, WeatherType.NONE].includes(weather) + ) { + globalScene.unshiftPhase( + new CommonAnimPhase(undefined, undefined, CommonAnim.SUNNY + (oldWeatherType - 1), true), + ); + globalScene.queueMessage(getLegendaryWeatherContinuesMessage(oldWeatherType)!); + return false; + } + this.weather = weather ? new Weather(weather, hasPokemonSource ? 5 : 0) : null; - this.eventTarget.dispatchEvent(new WeatherChangedEvent(oldWeatherType, this.weather?.weatherType!, this.weather?.turnsLeft!)); // TODO: is this bang correct? + this.eventTarget.dispatchEvent( + new WeatherChangedEvent(oldWeatherType, this.weather?.weatherType!, this.weather?.turnsLeft!), + ); // TODO: is this bang correct? if (this.weather) { globalScene.unshiftPhase(new CommonAnimPhase(undefined, undefined, CommonAnim.SUNNY + (weather - 1), true)); @@ -276,10 +348,15 @@ export class Arena { globalScene.queueMessage(getWeatherClearMessage(oldWeatherType)!); // TODO: is this bang correct? } - globalScene.getField(true).filter(p => p.isOnField()).map(pokemon => { - pokemon.findAndRemoveTags(t => "weatherTypes" in t && !(t.weatherTypes as WeatherType[]).find(t => t === weather)); - applyPostWeatherChangeAbAttrs(PostWeatherChangeAbAttr, pokemon, weather); - }); + globalScene + .getField(true) + .filter(p => p.isOnField()) + .map(pokemon => { + pokemon.findAndRemoveTags( + t => "weatherTypes" in t && !(t.weatherTypes as WeatherType[]).find(t => t === weather), + ); + applyPostWeatherChangeAbAttrs(PostWeatherChangeAbAttr, pokemon, weather); + }); return true; } @@ -288,9 +365,9 @@ export class Arena { * Function to trigger all weather based form changes */ triggerWeatherBasedFormChanges(): void { - globalScene.getField(true).forEach( p => { - const isCastformWithForecast = (p.hasAbility(Abilities.FORECAST) && p.species.speciesId === Species.CASTFORM); - const isCherrimWithFlowerGift = (p.hasAbility(Abilities.FLOWER_GIFT) && p.species.speciesId === Species.CHERRIM); + globalScene.getField(true).forEach(p => { + const isCastformWithForecast = p.hasAbility(Abilities.FORECAST) && p.species.speciesId === Species.CASTFORM; + const isCherrimWithFlowerGift = p.hasAbility(Abilities.FLOWER_GIFT) && p.species.speciesId === Species.CHERRIM; if (isCastformWithForecast || isCherrimWithFlowerGift) { new ShowAbilityPhase(p.getBattlerIndex()); @@ -303,9 +380,11 @@ export class Arena { * Function to trigger all weather based form changes back into their normal forms */ triggerWeatherBasedFormChangesToNormal(): void { - globalScene.getField(true).forEach( p => { - const isCastformWithForecast = (p.hasAbility(Abilities.FORECAST, false, true) && p.species.speciesId === Species.CASTFORM); - const isCherrimWithFlowerGift = (p.hasAbility(Abilities.FLOWER_GIFT, false, true) && p.species.speciesId === Species.CHERRIM); + globalScene.getField(true).forEach(p => { + const isCastformWithForecast = + p.hasAbility(Abilities.FORECAST, false, true) && p.species.speciesId === Species.CASTFORM; + const isCherrimWithFlowerGift = + p.hasAbility(Abilities.FLOWER_GIFT, false, true) && p.species.speciesId === Species.CHERRIM; if (isCastformWithForecast || isCherrimWithFlowerGift) { new ShowAbilityPhase(p.getBattlerIndex()); @@ -314,15 +393,22 @@ export class Arena { }); } - trySetTerrain(terrain: TerrainType, hasPokemonSource: boolean, ignoreAnim: boolean = false): boolean { - if (this.terrain?.terrainType === (terrain || undefined)) { + /** Returns whether or not the terrain can be set to {@linkcode terrain} */ + canSetTerrain(terrain: TerrainType): boolean { + return !(this.terrain?.terrainType === (terrain || undefined)); + } + + trySetTerrain(terrain: TerrainType, hasPokemonSource: boolean, ignoreAnim = false): boolean { + if (!this.canSetTerrain(terrain)) { return false; } const oldTerrainType = this.terrain?.terrainType || TerrainType.NONE; this.terrain = terrain ? new Terrain(terrain, hasPokemonSource ? 5 : 0) : null; - this.eventTarget.dispatchEvent(new TerrainChangedEvent(oldTerrainType, this.terrain?.terrainType!, this.terrain?.turnsLeft!)); // TODO: are those bangs correct? + this.eventTarget.dispatchEvent( + new TerrainChangedEvent(oldTerrainType, this.terrain?.terrainType!, this.terrain?.turnsLeft!), + ); // TODO: are those bangs correct? if (this.terrain) { if (!ignoreAnim) { @@ -333,11 +419,16 @@ export class Arena { globalScene.queueMessage(getTerrainClearMessage(oldTerrainType)!); // TODO: is this bang correct? } - globalScene.getField(true).filter(p => p.isOnField()).map(pokemon => { - pokemon.findAndRemoveTags(t => "terrainTypes" in t && !(t.terrainTypes as TerrainType[]).find(t => t === terrain)); - applyPostTerrainChangeAbAttrs(PostTerrainChangeAbAttr, pokemon, terrain); - applyAbAttrs(TerrainEventTypeChangeAbAttr, pokemon, null, false); - }); + globalScene + .getField(true) + .filter(p => p.isOnField()) + .map(pokemon => { + pokemon.findAndRemoveTags( + t => "terrainTypes" in t && !(t.terrainTypes as TerrainType[]).find(t => t === terrain), + ); + applyPostTerrainChangeAbAttrs(PostTerrainChangeAbAttr, pokemon, terrain); + applyAbAttrs(TerrainEventTypeChangeAbAttr, pokemon, null, false); + }); return true; } @@ -350,11 +441,15 @@ export class Arena { return !!this.terrain && this.terrain.isMoveTerrainCancelled(user, targets, move); } + public getWeatherType(): WeatherType { + return this.weather?.weatherType ?? WeatherType.NONE; + } + public getTerrainType(): TerrainType { return this.terrain?.terrainType ?? TerrainType.NONE; } - getAttackTypeMultiplier(attackType: Type, grounded: boolean): number { + getAttackTypeMultiplier(attackType: PokemonType, grounded: boolean): number { let weatherMultiplier = 1; if (this.weather && !this.weather.isEffectSuppressed()) { weatherMultiplier = this.weather.getAttackTypeMultiplier(attackType); @@ -372,7 +467,7 @@ export class Arena { * Gets the denominator for the chance for a trainer spawn * @returns n where 1/n is the chance of a trainer battle */ - getTrainerChance(): integer { + getTrainerChance(): number { switch (this.biomeType) { case Biome.METROPOLIS: return 2; @@ -457,49 +552,46 @@ export class Arena { } } - overrideTint(): [integer, integer, integer] { + overrideTint(): [number, number, number] { switch (Overrides.ARENA_TINT_OVERRIDE) { case TimeOfDay.DUSK: - return [ 98, 48, 73 ].map(c => Math.round((c + 128) / 2)) as [integer, integer, integer]; - break; - case (TimeOfDay.NIGHT): - return [ 64, 64, 64 ]; - break; + return [98, 48, 73].map(c => Math.round((c + 128) / 2)) as [number, number, number]; + case TimeOfDay.NIGHT: + return [64, 64, 64]; case TimeOfDay.DAWN: case TimeOfDay.DAY: default: - return [ 128, 128, 128 ]; - break; + return [128, 128, 128]; } } - getDayTint(): [integer, integer, integer] { + getDayTint(): [number, number, number] { if (Overrides.ARENA_TINT_OVERRIDE !== null) { return this.overrideTint(); } switch (this.biomeType) { case Biome.ABYSS: - return [ 64, 64, 64 ]; + return [64, 64, 64]; default: - return [ 128, 128, 128 ]; + return [128, 128, 128]; } } - getDuskTint(): [integer, integer, integer] { + getDuskTint(): [number, number, number] { if (Overrides.ARENA_TINT_OVERRIDE) { return this.overrideTint(); } if (!this.isOutside()) { - return [ 0, 0, 0 ]; + return [0, 0, 0]; } switch (this.biomeType) { default: - return [ 98, 48, 73 ].map(c => Math.round((c + 128) / 2)) as [integer, integer, integer]; + return [98, 48, 73].map(c => Math.round((c + 128) / 2)) as [number, number, number]; } } - getNightTint(): [integer, integer, integer] { + getNightTint(): [number, number, number] { if (Overrides.ARENA_TINT_OVERRIDE) { return this.overrideTint(); } @@ -511,12 +603,12 @@ export class Arena { } if (!this.isOutside()) { - return [ 64, 64, 64 ]; + return [64, 64, 64]; } switch (this.biomeType) { default: - return [ 48, 48, 98 ]; + return [48, 48, 98]; } } @@ -532,10 +624,16 @@ export class Arena { * @param simulated if `true`, this applies arena tags without changing game state * @param args array of parameters that the called upon tags may need */ - applyTagsForSide(tagType: ArenaTagType | Constructor, side: ArenaTagSide, simulated: boolean, ...args: unknown[]): void { - let tags = typeof tagType === "string" - ? this.tags.filter(t => t.tagType === tagType) - : this.tags.filter(t => t instanceof tagType); + applyTagsForSide( + tagType: ArenaTagType | Constructor, + side: ArenaTagSide, + simulated: boolean, + ...args: unknown[] + ): void { + let tags = + typeof tagType === "string" + ? this.tags.filter(t => t.tagType === tagType) + : this.tags.filter(t => t instanceof tagType); if (side !== ArenaTagSide.BOTH) { tags = tags.filter(t => t.side === side); } @@ -564,7 +662,15 @@ export class Arena { * @param targetIndex The {@linkcode BattlerIndex} of the target pokemon * @returns `false` if there already exists a tag of this type in the Arena */ - addTag(tagType: ArenaTagType, turnCount: number, sourceMove: Moves | undefined, sourceId: number, side: ArenaTagSide = ArenaTagSide.BOTH, quiet: boolean = false, targetIndex?: BattlerIndex): boolean { + addTag( + tagType: ArenaTagType, + turnCount: number, + sourceMove: Moves | undefined, + sourceId: number, + side: ArenaTagSide = ArenaTagSide.BOTH, + quiet = false, + targetIndex?: BattlerIndex, + ): boolean { const existingTag = this.getTagOnSide(tagType, side); if (existingTag) { existingTag.onOverlap(this); @@ -580,12 +686,14 @@ export class Arena { // creates a new tag object const newTag = getArenaTag(tagType, turnCount || 0, sourceMove, sourceId, targetIndex, side); if (newTag) { - this.tags.push(newTag); newTag.onAdd(this, quiet); + this.tags.push(newTag); const { layers = 0, maxLayers = 0 } = newTag instanceof ArenaTrapTag ? newTag : {}; - this.eventTarget.dispatchEvent(new TagAddedEvent(newTag.tagType, newTag.side, newTag.turnCount, layers, maxLayers)); + this.eventTarget.dispatchEvent( + new TagAddedEvent(newTag.tagType, newTag.side, newTag.turnCount, layers, maxLayers), + ); } return true; @@ -600,7 +708,7 @@ export class Arena { return this.getTagOnSide(tagType, ArenaTagSide.BOTH); } - hasTag(tagType: ArenaTagType) : boolean { + hasTag(tagType: ArenaTagType): boolean { return !!this.getTag(tagType); } @@ -613,9 +721,13 @@ export class Arena { * @returns either the {@linkcode ArenaTag}, or `undefined` if it isn't there */ getTagOnSide(tagType: ArenaTagType | Constructor, side: ArenaTagSide): ArenaTag | undefined { - return typeof(tagType) === "string" - ? this.tags.find(t => t.tagType === tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side)) - : this.tags.find(t => t instanceof tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side)); + return typeof tagType === "string" + ? this.tags.find( + t => t.tagType === tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side), + ) + : this.tags.find( + t => t instanceof tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side), + ); } /** @@ -634,16 +746,20 @@ export class Arena { * @returns array of {@linkcode ArenaTag}s from which the Arena's tags return `true` and apply to the given side */ findTagsOnSide(tagPredicate: (t: ArenaTag) => boolean, side: ArenaTagSide): ArenaTag[] { - return this.tags.filter(t => tagPredicate(t) && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side)); + return this.tags.filter( + t => tagPredicate(t) && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side), + ); } lapseTags(): void { - this.tags.filter(t => !(t.lapse(this))).forEach(t => { - t.onRemove(this); - this.tags.splice(this.tags.indexOf(t), 1); + this.tags + .filter(t => !t.lapse(this)) + .forEach(t => { + t.onRemove(this); + this.tags.splice(this.tags.indexOf(t), 1); - this.eventTarget.dispatchEvent(new TagRemovedEvent(t.tagType, t.side, t.turnCount)); - }); + this.eventTarget.dispatchEvent(new TagRemovedEvent(t.tagType, t.side, t.turnCount)); + }); } removeTag(tagType: ArenaTagType): boolean { @@ -658,7 +774,7 @@ export class Arena { return !!tag; } - removeTagOnSide(tagType: ArenaTagType, side: ArenaTagSide, quiet: boolean = false): boolean { + removeTagOnSide(tagType: ArenaTagType, side: ArenaTagSide, quiet = false): boolean { const tag = this.getTagOnSide(tagType, side); if (tag) { tag.onRemove(this, quiet); @@ -669,11 +785,12 @@ export class Arena { return !!tag; } - removeAllTags(): void { while (this.tags.length) { this.tags[0].onRemove(this); - this.eventTarget.dispatchEvent(new TagRemovedEvent(this.tags[0].tagType, this.tags[0].side, this.tags[0].turnCount)); + this.eventTarget.dispatchEvent( + new TagRemovedEvent(this.tags[0].tagType, this.tags[0].side, this.tags[0].turnCount), + ); this.tags.splice(0, 1); } @@ -688,6 +805,7 @@ export class Arena { this.trySetWeather(WeatherType.NONE, false); } this.trySetTerrain(TerrainType.NONE, false, true); + this.resetPlayerFaintCount(); this.removeAllTags(); } @@ -707,7 +825,7 @@ export class Arena { case Biome.TALL_GRASS: return 9.608; case Biome.METROPOLIS: - return 141.470; + return 141.47; case Biome.FOREST: return 0.341; case Biome.SEA: @@ -719,17 +837,17 @@ export class Arena { case Biome.LAKE: return 7.215; case Biome.SEABED: - return 2.600; + return 2.6; case Biome.MOUNTAIN: return 4.018; case Biome.BADLANDS: - return 17.790; + return 17.79; case Biome.CAVE: - return 14.240; + return 14.24; case Biome.DESERT: return 1.143; case Biome.ICE_CAVE: - return 0.000; + return 0.0; case Biome.MEADOW: return 3.891; case Biome.POWER_PLANT: @@ -743,17 +861,17 @@ export class Arena { case Biome.FACTORY: return 4.985; case Biome.RUINS: - return 0.000; + return 0.0; case Biome.WASTELAND: return 6.336; case Biome.ABYSS: - return 5.130; + return 5.13; case Biome.SPACE: return 20.036; case Biome.CONSTRUCTION_SITE: return 1.222; case Biome.JUNGLE: - return 0.000; + return 0.0; case Biome.FAIRY_CAVE: return 4.542; case Biome.TEMPLE: @@ -763,14 +881,20 @@ export class Arena { case Biome.LABORATORY: return 114.862; case Biome.SLUM: - return 0.000; + return 0.0; case Biome.SNOWY_FOREST: return 3.047; + case Biome.END: + return 17.153; default: console.warn(`missing bgm loop-point for biome "${Biome[this.biomeType]}" (=${this.biomeType})`); return 0; } } + + resetPlayerFaintCount(): void { + this.playerFaints = 0; + } } export function getBiomeKey(biome: Biome): string { @@ -813,7 +937,7 @@ export function getBiomeHasProps(biomeType: Biome): boolean { export class ArenaBase extends Phaser.GameObjects.Container { public player: boolean; public biome: Biome; - public propValue: integer; + public propValue: number; public base: Phaser.GameObjects.Sprite; public props: Phaser.GameObjects.Sprite[]; @@ -825,16 +949,17 @@ export class ArenaBase extends Phaser.GameObjects.Container { this.base = globalScene.addFieldSprite(0, 0, "plains_a", undefined, 1); this.base.setOrigin(0, 0); - this.props = !player ? - new Array(3).fill(null).map(() => { - const ret = globalScene.addFieldSprite(0, 0, "plains_b", undefined, 1); - ret.setOrigin(0, 0); - ret.setVisible(false); - return ret; - }) : []; + this.props = !player + ? new Array(3).fill(null).map(() => { + const ret = globalScene.addFieldSprite(0, 0, "plains_b", undefined, 1); + ret.setOrigin(0, 0); + ret.setVisible(false); + return ret; + }) + : []; } - setBiome(biome: Biome, propValue?: integer): void { + setBiome(biome: Biome, propValue?: number): void { const hasProps = getBiomeHasProps(biome); const biomeKey = getBiomeKey(biome); const baseKey = `${biomeKey}_${this.player ? "a" : "b"}`; @@ -843,13 +968,18 @@ export class ArenaBase extends Phaser.GameObjects.Container { this.base.setTexture(baseKey); if (this.base.texture.frameTotal > 1) { - const baseFrameNames = globalScene.anims.generateFrameNames(baseKey, { zeroPad: 4, suffix: ".png", start: 1, end: this.base.texture.frameTotal - 1 }); - if (!(globalScene.anims.exists(baseKey))) { + const baseFrameNames = globalScene.anims.generateFrameNames(baseKey, { + zeroPad: 4, + suffix: ".png", + start: 1, + end: this.base.texture.frameTotal - 1, + }); + if (!globalScene.anims.exists(baseKey)) { globalScene.anims.create({ key: baseKey, frames: baseFrameNames, frameRate: 12, - repeat: -1 + repeat: -1, }); } this.base.play(baseKey); @@ -861,33 +991,40 @@ export class ArenaBase extends Phaser.GameObjects.Container { } if (!this.player) { - globalScene.executeWithSeedOffset(() => { - this.propValue = propValue === undefined - ? hasProps ? Utils.randSeedInt(8) : 0 - : propValue; - this.props.forEach((prop, p) => { - const propKey = `${biomeKey}_b${hasProps ? `_${p + 1}` : ""}`; - prop.setTexture(propKey); + globalScene.executeWithSeedOffset( + () => { + this.propValue = propValue === undefined ? (hasProps ? Utils.randSeedInt(8) : 0) : propValue; + this.props.forEach((prop, p) => { + const propKey = `${biomeKey}_b${hasProps ? `_${p + 1}` : ""}`; + prop.setTexture(propKey); - if (hasProps && prop.texture.frameTotal > 1) { - const propFrameNames = globalScene.anims.generateFrameNames(propKey, { zeroPad: 4, suffix: ".png", start: 1, end: prop.texture.frameTotal - 1 }); - if (!(globalScene.anims.exists(propKey))) { - globalScene.anims.create({ - key: propKey, - frames: propFrameNames, - frameRate: 12, - repeat: -1 + if (hasProps && prop.texture.frameTotal > 1) { + const propFrameNames = globalScene.anims.generateFrameNames(propKey, { + zeroPad: 4, + suffix: ".png", + start: 1, + end: prop.texture.frameTotal - 1, }); + if (!globalScene.anims.exists(propKey)) { + globalScene.anims.create({ + key: propKey, + frames: propFrameNames, + frameRate: 12, + repeat: -1, + }); + } + prop.play(propKey); + } else { + prop.stop(); } - prop.play(propKey); - } else { - prop.stop(); - } - prop.setVisible(hasProps && !!(this.propValue & (1 << p))); - this.add(prop); - }); - }, globalScene.currentBattle?.waveIndex || 0, globalScene.waveSeed); + prop.setVisible(hasProps && !!(this.propValue & (1 << p))); + this.add(prop); + }); + }, + globalScene.currentBattle?.waveIndex || 0, + globalScene.waveSeed, + ); } } } diff --git a/src/field/damage-number-handler.ts b/src/field/damage-number-handler.ts index 57b9d6990ca..63da641a114 100644 --- a/src/field/damage-number-handler.ts +++ b/src/field/damage-number-handler.ts @@ -6,7 +6,7 @@ import * as Utils from "../utils"; import type { BattlerIndex } from "../battle"; import { globalScene } from "#app/global-scene"; -type TextAndShadowArr = [ string | null, string | null ]; +type TextAndShadowArr = [string | null, string | null]; export default class DamageNumberHandler { private damageNumbers: Map; @@ -15,35 +15,45 @@ export default class DamageNumberHandler { this.damageNumbers = new Map(); } - add(target: Pokemon, amount: integer, result: DamageResult | HitResult.HEAL = HitResult.EFFECTIVE, critical: boolean = false): void { + add( + target: Pokemon, + amount: number, + result: DamageResult | HitResult.HEAL = HitResult.EFFECTIVE, + critical = false, + ): void { if (!globalScene?.damageNumbersMode) { return; } const battlerIndex = target.getBattlerIndex(); const baseScale = target.getSpriteScale() / 6; - const damageNumber = addTextObject(target.x, -(globalScene.game.canvas.height / 6) + target.y - target.getSprite().height / 2, Utils.formatStat(amount, true), TextStyle.SUMMARY); + const damageNumber = addTextObject( + target.x, + -(globalScene.game.canvas.height / 6) + target.y - target.getSprite().height / 2, + Utils.formatStat(amount, true), + TextStyle.SUMMARY, + ); damageNumber.setName("text-damage-number"); damageNumber.setOrigin(0.5, 1); damageNumber.setScale(baseScale); - let [ textColor, shadowColor ] : TextAndShadowArr = [ null, null ]; + let [textColor, shadowColor]: TextAndShadowArr = [null, null]; switch (result) { case HitResult.SUPER_EFFECTIVE: - [ textColor, shadowColor ] = [ "#f8d030", "#b8a038" ]; + [textColor, shadowColor] = ["#f8d030", "#b8a038"]; break; case HitResult.NOT_VERY_EFFECTIVE: - [ textColor, shadowColor ] = [ "#f08030", "#c03028" ]; + [textColor, shadowColor] = ["#f08030", "#c03028"]; break; case HitResult.ONE_HIT_KO: - [ textColor, shadowColor ] = [ "#a040a0", "#483850" ]; + [textColor, shadowColor] = ["#a040a0", "#483850"]; break; case HitResult.HEAL: - [ textColor, shadowColor ] = [ "#78c850", "#588040" ]; + [textColor, shadowColor] = ["#78c850", "#588040"]; break; default: - [ textColor, shadowColor ] = [ "#ffffff", "#636363" ]; + [textColor, shadowColor] = ["#ffffff", "#636363"]; break; } @@ -77,7 +87,7 @@ export default class DamageNumberHandler { targets: damageNumber, duration: Utils.fixedInt(750), alpha: 1, - y: "-=32" + y: "-=32", }); globalScene.tweens.add({ delay: 375, @@ -88,7 +98,7 @@ export default class DamageNumberHandler { onComplete: () => { this.damageNumbers.get(battlerIndex)!.splice(this.damageNumbers.get(battlerIndex)!.indexOf(damageNumber), 1); damageNumber.destroy(true); - } + }, }); return; } @@ -104,7 +114,7 @@ export default class DamageNumberHandler { scaleX: 0.75 * baseScale, scaleY: 1.25 * baseScale, y: "-=16", - ease: "Cubic.easeOut" + ease: "Cubic.easeOut", }, { duration: Utils.fixedInt(175), @@ -112,69 +122,71 @@ export default class DamageNumberHandler { scaleX: 0.875 * baseScale, scaleY: 1.125 * baseScale, y: "+=16", - ease: "Cubic.easeIn" + ease: "Cubic.easeIn", }, { duration: Utils.fixedInt(100), scaleX: 1.25 * baseScale, scaleY: 0.75 * baseScale, - ease: "Cubic.easeOut" + ease: "Cubic.easeOut", }, { duration: Utils.fixedInt(175), scaleX: 0.875 * baseScale, scaleY: 1.125 * baseScale, y: "-=8", - ease: "Cubic.easeOut" + ease: "Cubic.easeOut", }, { duration: Utils.fixedInt(50), scaleX: 0.925 * baseScale, scaleY: 1.075 * baseScale, y: "+=8", - ease: "Cubic.easeIn" + ease: "Cubic.easeIn", }, { duration: Utils.fixedInt(100), scaleX: 1.125 * baseScale, scaleY: 0.875 * baseScale, - ease: "Cubic.easeOut" + ease: "Cubic.easeOut", }, { duration: Utils.fixedInt(175), scaleX: 0.925 * baseScale, scaleY: 1.075 * baseScale, y: "-=4", - ease: "Cubic.easeOut" + ease: "Cubic.easeOut", }, { duration: Utils.fixedInt(50), scaleX: 0.975 * baseScale, scaleY: 1.025 * baseScale, y: "+=4", - ease: "Cubic.easeIn" + ease: "Cubic.easeIn", }, { duration: Utils.fixedInt(100), scaleX: 1.075 * baseScale, scaleY: 0.925 * baseScale, - ease: "Cubic.easeOut" + ease: "Cubic.easeOut", }, { duration: Utils.fixedInt(25), scaleX: baseScale, scaleY: baseScale, - ease: "Cubic.easeOut" + ease: "Cubic.easeOut", }, { delay: Utils.fixedInt(500), alpha: 0, onComplete: () => { - this.damageNumbers.get(battlerIndex)!.splice(this.damageNumbers.get(battlerIndex)!.indexOf(damageNumber), 1); + this.damageNumbers + .get(battlerIndex)! + .splice(this.damageNumbers.get(battlerIndex)!.indexOf(damageNumber), 1); damageNumber.destroy(true); - } - } - ] + }, + }, + ], }); } } diff --git a/src/field/mystery-encounter-intro.ts b/src/field/mystery-encounter-intro.ts index 0110dabc7a9..649a969d415 100644 --- a/src/field/mystery-encounter-intro.ts +++ b/src/field/mystery-encounter-intro.ts @@ -36,7 +36,7 @@ export class MysteryEncounterSpriteConfig { /** The sprite key (which is the image file name). e.g. "ace_trainer_f" */ spriteKey: string; /** Refer to [/public/images](../../public/images) directorty for all folder names */ - fileRoot: KnownFileRoot & string | string; + fileRoot: (KnownFileRoot & string) | string; /** Optional replacement for `spriteKey`/`fileRoot`. Just know this defaults to male/genderless, form 0, no shiny */ species?: Species; /** Enable shadow. Defaults to `false` */ @@ -80,7 +80,10 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con public encounter: MysteryEncounter; public spriteConfigs: MysteryEncounterSpriteConfig[]; public enterFromRight: boolean; - private shinySparkleSprites: { sprite: Phaser.GameObjects.Sprite, variant: Variant }[]; + private shinySparkleSprites: { + sprite: Phaser.GameObjects.Sprite; + variant: Variant; + }[]; constructor(encounter: MysteryEncounter) { super(globalScene, -72, 76); @@ -89,7 +92,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con // Shallow copy configs to allow visual config updates at runtime without dirtying master copy of Encounter this.spriteConfigs = encounter.spriteConfigs.map(config => { const result = { - ...config + ...config, }; if (!isNullOrUndefined(result.species)) { @@ -108,14 +111,22 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con const getSprite = (spriteKey: string, hasShadow?: boolean, yShadow?: number) => { const ret = globalScene.addFieldSprite(0, 0, spriteKey); ret.setOrigin(0.5, 1); - ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: !!hasShadow, yShadowOffset: yShadow ?? 0 }); + ret.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + hasShadow: !!hasShadow, + yShadowOffset: yShadow ?? 0, + }); return ret; }; const getItemSprite = (spriteKey: string, hasShadow?: boolean, yShadow?: number) => { const icon = globalScene.add.sprite(-19, 2, "items", spriteKey); icon.setOrigin(0.5, 1); - icon.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: !!hasShadow, yShadowOffset: yShadow ?? 0 }); + icon.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + hasShadow: !!hasShadow, + yShadowOffset: yShadow ?? 0, + }); return icon; }; @@ -129,7 +140,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con this.shinySparkleSprites = []; const shinySparkleSprites = globalScene.add.container(0, 0); - this.spriteConfigs?.forEach((config) => { + this.spriteConfigs?.forEach(config => { const { spriteKey, isItem, hasShadow, scale, x, y, yShadow, alpha, isPokemon, isShiny, variant } = config; let sprite: GameObjects.Sprite; @@ -154,7 +165,10 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con pokemonShinySparkle = globalScene.add.sprite(sprite.x, sprite.y, "shiny"); pokemonShinySparkle.setOrigin(0.5, 1); pokemonShinySparkle.setVisible(false); - this.shinySparkleSprites.push({ sprite: pokemonShinySparkle, variant: variant ?? 0 }); + this.shinySparkleSprites.push({ + sprite: pokemonShinySparkle, + variant: variant ?? 0, + }); shinySparkleSprites.add(pokemonShinySparkle); } } @@ -216,7 +230,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con } const shinyPromises: Promise[] = []; - this.spriteConfigs.forEach((config) => { + this.spriteConfigs.forEach(config => { if (config.isPokemon) { globalScene.loadPokemonAtlas(config.spriteKey, config.fileRoot); if (config.isShiny) { @@ -230,7 +244,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con }); globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => { - this.spriteConfigs.every((config) => { + this.spriteConfigs.every(config => { if (config.isItem) { return true; } @@ -238,17 +252,21 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con const originalWarn = console.warn; // Ignore warnings for missing frames, because there will be a lot - console.warn = () => { - }; - const frameNames = globalScene.anims.generateFrameNames(config.spriteKey, { zeroPad: 4, suffix: ".png", start: 1, end: 128 }); + console.warn = () => {}; + const frameNames = globalScene.anims.generateFrameNames(config.spriteKey, { + zeroPad: 4, + suffix: ".png", + start: 1, + end: 128, + }); console.warn = originalWarn; - if (!(globalScene.anims.exists(config.spriteKey))) { + if (!globalScene.anims.exists(config.spriteKey)) { globalScene.anims.create({ key: config.spriteKey, frames: frameNames, frameRate: 10, - repeat: -1 + repeat: -1, }); } @@ -313,7 +331,11 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con * @param animConfig {@linkcode Phaser.Types.Animations.PlayAnimationConfig} to pass to {@linkcode Phaser.GameObjects.Sprite.play} * @returns true if the sprite was able to be animated */ - tryPlaySprite(sprite: Phaser.GameObjects.Sprite, tintSprite: Phaser.GameObjects.Sprite, animConfig: Phaser.Types.Animations.PlayAnimationConfig): boolean { + tryPlaySprite( + sprite: Phaser.GameObjects.Sprite, + tintSprite: Phaser.GameObjects.Sprite, + animConfig: Phaser.Types.Animations.PlayAnimationConfig, + ): boolean { // Show an error in the console if there isn't a texture loaded if (sprite.texture.key === "__MISSING") { console.error(`No texture found for '${animConfig.key}'!`); @@ -359,7 +381,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con const trainerAnimConfig: PlayAnimationConfig = { key: config.spriteKey, repeat: config?.repeat ? -1 : 0, - startFrame: config?.startFrame ?? 0 + startFrame: config?.startFrame ?? 0, }; this.tryPlaySprite(sprites[i], tintSprites[i], trainerAnimConfig); @@ -392,7 +414,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con } const ret: Phaser.GameObjects.Sprite[] = []; - this.spriteConfigs.forEach((config, i) => { + this.spriteConfigs.forEach((_, i) => { ret.push(this.getAt(i * 2)); }); return ret; @@ -407,7 +429,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con } const ret: Phaser.GameObjects.Sprite[] = []; - this.spriteConfigs.forEach((config, i) => { + this.spriteConfigs.forEach((_, i) => { ret.push(this.getAt(i * 2 + 1)); }); @@ -422,7 +444,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con * @param duration * @param ease */ - private tint(sprite, color: number, alpha?: number, duration?: integer, ease?: string): void { + private tint(sprite, color: number, alpha?: number, duration?: number, ease?: string): void { // const tintSprites = this.getTintSprites(); sprite.setTintFill(color); sprite.setVisible(true); @@ -434,7 +456,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con targets: sprite, alpha: alpha || 1, duration: duration, - ease: ease || "Linear" + ease: ease || "Linear", }); } else { sprite.setAlpha(alpha); @@ -448,7 +470,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con * @param duration * @param ease */ - tintAll(color: number, alpha?: number, duration?: integer, ease?: string): void { + tintAll(color: number, alpha?: number, duration?: number, ease?: string): void { const tintSprites = this.getTintSprites(); tintSprites.map(tintSprite => { this.tint(tintSprite, color, alpha, duration, ease); @@ -461,7 +483,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con * @param duration * @param ease */ - private untint(sprite, duration: integer, ease?: string): void { + private untint(sprite, duration: number, ease?: string): void { if (duration) { globalScene.tweens.add({ targets: sprite, @@ -471,7 +493,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con onComplete: () => { sprite.setVisible(false); sprite.setAlpha(1); - } + }, }); } else { sprite.setVisible(false); @@ -485,7 +507,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con * @param duration * @param ease */ - untintAll(duration: integer, ease?: string): void { + untintAll(duration: number, ease?: string): void { const tintSprites = this.getTintSprites(); tintSprites.map(tintSprite => { this.untint(tintSprite, duration, ease); @@ -497,9 +519,9 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con * @param value - true for visible, false for hidden */ setVisible(value: boolean): this { - this.getSprites().forEach(sprite => { + for (const sprite of this.getSprites()) { sprite.setVisible(value); - }); + } return super.setVisible(value); } } diff --git a/src/field/pokemon-sprite-sparkle-handler.ts b/src/field/pokemon-sprite-sparkle-handler.ts index 074933f0f00..0d5dcca7989 100644 --- a/src/field/pokemon-sprite-sparkle-handler.ts +++ b/src/field/pokemon-sprite-sparkle-handler.ts @@ -14,12 +14,14 @@ export default class PokemonSpriteSparkleHandler { to: 1, yoyo: true, repeat: -1, - onRepeat: () => this.onLapse() + onRepeat: () => this.onLapse(), }); } onLapse(): void { - Array.from(this.sprites.values()).filter(s => !s.scene).map(s => this.sprites.delete(s)); + Array.from(this.sprites.values()) + .filter(s => !s.scene) + .map(s => this.sprites.delete(s)); for (const s of this.sprites.values()) { if (!s.pipelineData["teraColor"] || !(s.pipelineData["teraColor"] as number[]).find(c => c)) { continue; @@ -27,17 +29,24 @@ export default class PokemonSpriteSparkleHandler { if (!s.visible || (s.parentContainer instanceof Pokemon && !s.parentContainer.parentContainer)) { continue; } - const pokemon = s.parentContainer instanceof Pokemon ? s.parentContainer as Pokemon : null; + if (!(s.parentContainer instanceof Pokemon) || !(s.parentContainer as Pokemon).isTerastallized) { + continue; + } + const pokemon = s.parentContainer instanceof Pokemon ? (s.parentContainer as Pokemon) : null; const parent = (pokemon || s).parentContainer; const texture = s.texture; - const [ width, height ] = [ texture.source[0].width, texture.source[0].height ]; - const [ pixelX, pixelY ] = [ Utils.randInt(width), Utils.randInt(height) ]; + const [width, height] = [texture.source[0].width, texture.source[0].height]; + const [pixelX, pixelY] = [Utils.randInt(width), Utils.randInt(height)]; const ratioX = s.width / width; const ratioY = s.height / height; const pixel = texture.manager.getPixel(pixelX, pixelY, texture.key, "__BASE"); if (pixel?.alpha) { - const [ xOffset, yOffset ] = [ -s.originX * s.width, -s.originY * s.height ]; - const sparkle = globalScene.addFieldSprite(((pokemon?.x || 0) + s.x + pixelX * ratioX + xOffset), ((pokemon?.y || 0) + s.y + pixelY * ratioY + yOffset), "tera_sparkle"); + const [xOffset, yOffset] = [-s.originX * s.width, -s.originY * s.height]; + const sparkle = globalScene.addFieldSprite( + (pokemon?.x || 0) + s.x + pixelX * ratioX + xOffset, + (pokemon?.y || 0) + s.y + pixelY * ratioY + yOffset, + "tera_sparkle", + ); sparkle.pipelineData["ignoreTimeTint"] = s.pipelineData["ignoreTimeTint"]; sparkle.setName("sprite-tera-sparkle"); sparkle.play("tera_sparkle"); @@ -49,7 +58,7 @@ export default class PokemonSpriteSparkleHandler { add(sprites: Phaser.GameObjects.Sprite | Phaser.GameObjects.Sprite[]): void { if (!Array.isArray(sprites)) { - sprites = [ sprites ]; + sprites = [sprites]; } for (const s of sprites) { if (this.sprites.has(s)) { @@ -61,7 +70,7 @@ export default class PokemonSpriteSparkleHandler { remove(sprites: Phaser.GameObjects.Sprite | Phaser.GameObjects.Sprite[]): void { if (!Array.isArray(sprites)) { - sprites = [ sprites ]; + sprites = [sprites]; } for (const s of sprites) { this.sprites.delete(s); diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 0458c5471d2..890c6bab0d6 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -5,33 +5,194 @@ import { globalScene } from "#app/global-scene"; import type { Variant, VariantSet } from "#app/data/variant"; import { variantColorCache } from "#app/data/variant"; import { variantData } from "#app/data/variant"; -import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from "#app/ui/battle-info"; -import type Move from "#app/data/move"; -import { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, VariableMoveTypeAttr, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatStagesAttr, SacrificialAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatStageChangeAttr, RechargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr, SacrificialAttrOnHit, OneHitKOAccuracyAttr, RespectAttackTypeImmunityAttr, MoveTarget, CombinedPledgeStabBoostAttr, VariableMoveTypeChartAttr, HpSplitAttr } from "#app/data/move"; +import BattleInfo, { + PlayerBattleInfo, + EnemyBattleInfo, +} from "#app/ui/battle-info"; +import type Move from "#app/data/moves/move"; +import { + HighCritAttr, + StatChangeBeforeDmgCalcAttr, + HitsTagAttr, + applyMoveAttrs, + FixedDamageAttr, + VariableAtkAttr, + allMoves, + TypelessAttr, + CritOnlyAttr, + getMoveTargets, + OneHitKOAttr, + VariableMoveTypeAttr, + VariableDefAttr, + AttackMove, + ModifiedDamageAttr, + VariableMoveTypeMultiplierAttr, + IgnoreOpponentStatStagesAttr, + SacrificialAttr, + VariableMoveCategoryAttr, + CounterDamageAttr, + StatStageChangeAttr, + RechargeAttr, + IgnoreWeatherTypeDebuffAttr, + BypassBurnDamageReductionAttr, + SacrificialAttrOnHit, + OneHitKOAccuracyAttr, + RespectAttackTypeImmunityAttr, + CombinedPledgeStabBoostAttr, + VariableMoveTypeChartAttr, + HpSplitAttr, +} from "#app/data/moves/move"; +import { MoveTarget } from "#enums/MoveTarget"; +import { MoveCategory } from "#enums/MoveCategory"; import type { PokemonSpeciesForm } from "#app/data/pokemon-species"; -import { default as PokemonSpecies, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species"; -import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; +import { + default as PokemonSpecies, + getFusedSpeciesName, + getPokemonSpecies, + getPokemonSpeciesForm, +} from "#app/data/pokemon-species"; +import { + getStarterValueFriendshipCap, + speciesStarterCosts, +} from "#app/data/balance/starters"; import type { Constructor } from "#app/utils"; import { isNullOrUndefined, randSeedInt, type nil } from "#app/utils"; import * as Utils from "#app/utils"; import type { TypeDamageMultiplier } from "#app/data/type"; import { getTypeDamageMultiplier, getTypeRgb } from "#app/data/type"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { getLevelTotalExp } from "#app/data/exp"; -import { Stat, type PermanentStat, type BattleStat, type EffectiveStat, PERMANENT_STATS, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; -import { DamageMoneyRewardModifier, EnemyDamageBoosterModifier, EnemyDamageReducerModifier, EnemyEndureChanceModifier, EnemyFusionChanceModifier, HiddenAbilityRateBoosterModifier, BaseStatModifier, PokemonFriendshipBoosterModifier, PokemonHeldItemModifier, PokemonNatureWeightModifier, ShinyRateBoosterModifier, SurviveDamageModifier, TempStatStageBoosterModifier, TempCritBoosterModifier, StatBoosterModifier, CritBoosterModifier, TerastallizeModifier, PokemonBaseStatFlatModifier, PokemonBaseStatTotalModifier, PokemonIncrementingStatModifier, EvoTrackerModifier, PokemonMultiHitModifier } from "#app/modifier/modifier"; +import { + Stat, + type PermanentStat, + type BattleStat, + type EffectiveStat, + PERMANENT_STATS, + BATTLE_STATS, + EFFECTIVE_STATS, +} from "#enums/stat"; +import { + DamageMoneyRewardModifier, + EnemyDamageBoosterModifier, + EnemyDamageReducerModifier, + EnemyEndureChanceModifier, + EnemyFusionChanceModifier, + HiddenAbilityRateBoosterModifier, + BaseStatModifier, + PokemonFriendshipBoosterModifier, + PokemonHeldItemModifier, + PokemonNatureWeightModifier, + ShinyRateBoosterModifier, + SurviveDamageModifier, + TempStatStageBoosterModifier, + TempCritBoosterModifier, + StatBoosterModifier, + CritBoosterModifier, + PokemonBaseStatFlatModifier, + PokemonBaseStatTotalModifier, + PokemonIncrementingStatModifier, + EvoTrackerModifier, + PokemonMultiHitModifier, +} from "#app/modifier/modifier"; import { PokeballType } from "#enums/pokeball"; import { Gender } from "#app/data/gender"; import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; import { Status, getRandomStatus } from "#app/data/status-effect"; -import type { SpeciesFormEvolution, SpeciesEvolutionCondition } from "#app/data/balance/pokemon-evolutions"; -import { pokemonEvolutions, pokemonPrevolutions, FusionSpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions"; -import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "#app/data/balance/tms"; -import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, SubstituteTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, MoveRestrictionBattlerTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag, TarShotTag, AutotomizedTag, PowerTrickTag } from "../data/battler-tags"; +import type { + SpeciesFormEvolution, + SpeciesEvolutionCondition, +} from "#app/data/balance/pokemon-evolutions"; +import { + pokemonEvolutions, + pokemonPrevolutions, + FusionSpeciesFormEvolution, +} from "#app/data/balance/pokemon-evolutions"; +import { + reverseCompatibleTms, + tmSpecies, + tmPoolTiers, +} from "#app/data/balance/tms"; +import { + BattlerTag, + BattlerTagLapseType, + EncoreTag, + GroundedTag, + HighestStatBoostTag, + SubstituteTag, + TypeImmuneTag, + getBattlerTag, + SemiInvulnerableTag, + TypeBoostTag, + MoveRestrictionBattlerTag, + ExposedTag, + DragonCheerTag, + CritBoostTag, + TrappedTag, + TarShotTag, + AutotomizedTag, + PowerTrickTag, +} from "../data/battler-tags"; import { WeatherType } from "#enums/weather-type"; -import { ArenaTagSide, NoCritTag, WeakenMoveScreenTag } from "#app/data/arena-tag"; +import { + ArenaTagSide, + NoCritTag, + WeakenMoveScreenTag, +} from "#app/data/arena-tag"; +import type { SuppressAbilitiesTag } from "#app/data/arena-tag"; import type { Ability, AbAttr } from "#app/data/ability"; -import { StatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatStagesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldStatMultiplierAbAttrs, FieldMultiplyStatAbAttr, AddSecondStrikeAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr, MoveTypeChangeAbAttr, FullHpResistTypeAbAttr, applyCheckTrappedAbAttrs, CheckTrappedAbAttr, PostSetStatusAbAttr, applyPostSetStatusAbAttrs, InfiltratorAbAttr, AlliedFieldDamageReductionAbAttr, PostDamageAbAttr, applyPostDamageAbAttrs, CommanderAbAttr, applyPostItemLostAbAttrs, PostItemLostAbAttr } from "#app/data/ability"; +import { + StatMultiplierAbAttr, + BlockCritAbAttr, + BonusCritAbAttr, + BypassBurnDamageReductionAbAttr, + FieldPriorityMoveImmunityAbAttr, + IgnoreOpponentStatStagesAbAttr, + MoveImmunityAbAttr, + PreDefendFullHpEndureAbAttr, + ReceivedMoveDamageMultiplierAbAttr, + StabBoostAbAttr, + StatusEffectImmunityAbAttr, + TypeImmunityAbAttr, + WeightMultiplierAbAttr, + allAbilities, + applyAbAttrs, + applyStatMultiplierAbAttrs, + applyPreApplyBattlerTagAbAttrs, + applyPreAttackAbAttrs, + applyPreDefendAbAttrs, + applyPreSetStatusAbAttrs, + UnsuppressableAbilityAbAttr, + NoFusionAbilityAbAttr, + MultCritAbAttr, + IgnoreTypeImmunityAbAttr, + DamageBoostAbAttr, + IgnoreTypeStatusEffectImmunityAbAttr, + ConditionalCritAbAttr, + applyFieldStatMultiplierAbAttrs, + FieldMultiplyStatAbAttr, + AddSecondStrikeAbAttr, + UserFieldStatusEffectImmunityAbAttr, + UserFieldBattlerTagImmunityAbAttr, + BattlerTagImmunityAbAttr, + MoveTypeChangeAbAttr, + FullHpResistTypeAbAttr, + applyCheckTrappedAbAttrs, + CheckTrappedAbAttr, + PostSetStatusAbAttr, + applyPostSetStatusAbAttrs, + InfiltratorAbAttr, + AlliedFieldDamageReductionAbAttr, + PostDamageAbAttr, + applyPostDamageAbAttrs, + CommanderAbAttr, + applyPostItemLostAbAttrs, + PostItemLostAbAttr, + applyOnGainAbAttrs, + PreLeaveFieldAbAttr, + applyPreLeaveFieldAbAttrs, + applyOnLoseAbAttrs, + PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, +} from "#app/data/ability"; import type PokemonData from "#app/system/pokemon-data"; import { BattlerIndex } from "#app/battle"; import { Mode } from "#app/ui/ui"; @@ -39,14 +200,27 @@ import type { PartyOption } from "#app/ui/party-ui-handler"; import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; import type { LevelMoves } from "#app/data/balance/pokemon-level-moves"; -import { EVOLVE_MOVE, RELEARN_MOVE } from "#app/data/balance/pokemon-level-moves"; +import { + EVOLVE_MOVE, + RELEARN_MOVE, +} from "#app/data/balance/pokemon-level-moves"; import { DamageAchv, achvs } from "#app/system/achv"; import type { StarterDataEntry, StarterMoveset } from "#app/system/game-data"; import { DexAttr } from "#app/system/game-data"; -import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities"; +import { + QuantizerCelebi, + argbFromRgba, + rgbaFromArgb, +} from "@material/material-color-utilities"; import { getNatureStatMultiplier } from "#app/data/nature"; import type { SpeciesFormChange } from "#app/data/pokemon-forms"; -import { SpeciesFormChangeActiveTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, SpeciesFormChangeStatusEffectTrigger } from "#app/data/pokemon-forms"; +import { + SpeciesFormChangeActiveTrigger, + SpeciesFormChangeLapseTeraTrigger, + SpeciesFormChangeMoveLearnedTrigger, + SpeciesFormChangePostMoveTrigger, + SpeciesFormChangeStatusEffectTrigger, +} from "#app/data/pokemon-forms"; import { TerrainType } from "#app/data/terrain"; import type { TrainerSlot } from "#app/data/trainer-config"; import Overrides from "#app/overrides"; @@ -71,14 +245,18 @@ import { MoveEndPhase } from "#app/phases/move-end-phase"; import { ObtainStatusEffectPhase } from "#app/phases/obtain-status-effect-phase"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; -import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase"; import { Challenges } from "#enums/challenges"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; import { SwitchType } from "#enums/switch-type"; import { SpeciesFormKey } from "#enums/species-form-key"; -import { BASE_HIDDEN_ABILITY_CHANCE, BASE_SHINY_CHANCE, SHINY_EPIC_CHANCE, SHINY_VARIANT_CHANCE } from "#app/data/balance/rates"; +import { + BASE_HIDDEN_ABILITY_CHANCE, + BASE_SHINY_CHANCE, + SHINY_EPIC_CHANCE, + SHINY_VARIANT_CHANCE, +} from "#app/data/balance/rates"; import { Nature } from "#enums/nature"; import { StatusEffect } from "#enums/status-effect"; import { doShinySparkleAnim } from "#app/field/anims"; @@ -89,56 +267,60 @@ export enum LearnMoveSituation { RELEARN, EVOLUTION, EVOLUTION_FUSED, // If fusionSpecies has Evolved - EVOLUTION_FUSED_BASE // If fusion's base species has Evolved + EVOLUTION_FUSED_BASE, // If fusion's base species has Evolved } export enum FieldPosition { CENTER, LEFT, - RIGHT + RIGHT, } export default abstract class Pokemon extends Phaser.GameObjects.Container { - public id: integer; + public id: number; public name: string; public nickname: string; public species: PokemonSpecies; - public formIndex: integer; - public abilityIndex: integer; + public formIndex: number; + public abilityIndex: number; public passive: boolean; public shiny: boolean; public variant: Variant; public pokeball: PokeballType; protected battleInfo: BattleInfo; - public level: integer; - public exp: integer; - public levelExp: integer; + public level: number; + public exp: number; + public levelExp: number; public gender: Gender; - public hp: integer; - public stats: integer[]; - public ivs: integer[]; + public hp: number; + public stats: number[]; + public ivs: number[]; public nature: Nature; public moveset: (PokemonMove | null)[]; public status: Status | null; - public friendship: integer; - public metLevel: integer; + public friendship: number; + public metLevel: number; public metBiome: Biome | -1; public metSpecies: Species; public metWave: number; - public luck: integer; + public luck: number; public pauseEvolutions: boolean; public pokerus: boolean; public switchOutStatus: boolean; - public evoCounter: integer; + public evoCounter: number; + public teraType: PokemonType; + public isTerastallized: boolean; + public stellarTypesBoosted: PokemonType[]; public fusionSpecies: PokemonSpecies | null; - public fusionFormIndex: integer; - public fusionAbilityIndex: integer; + public fusionFormIndex: number; + public fusionAbilityIndex: number; public fusionShiny: boolean; public fusionVariant: Variant; public fusionGender: Gender; - public fusionLuck: integer; + public fusionLuck: number; public fusionCustomPokemonData: CustomPokemonData | null; + public fusionTeraType: PokemonType; private summonDataPrimer: PokemonSummonData | null; @@ -160,16 +342,35 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { private shinySparkle: Phaser.GameObjects.Sprite; - constructor(x: number, y: number, species: PokemonSpecies, level: integer, abilityIndex?: integer, formIndex?: integer, gender?: Gender, shiny?: boolean, variant?: Variant, ivs?: integer[], nature?: Nature, dataSource?: Pokemon | PokemonData) { + constructor( + x: number, + y: number, + species: PokemonSpecies, + level: number, + abilityIndex?: number, + formIndex?: number, + gender?: Gender, + shiny?: boolean, + variant?: Variant, + ivs?: number[], + nature?: Nature, + dataSource?: Pokemon | PokemonData, + ) { super(globalScene, x, y); if (!species.isObtainable() && this.isPlayer()) { throw `Cannot create a player Pokemon for species '${species.getName(formIndex)}'`; } - const hiddenAbilityChance = new Utils.IntegerHolder(BASE_HIDDEN_ABILITY_CHANCE); + const hiddenAbilityChance = new Utils.NumberHolder( + BASE_HIDDEN_ABILITY_CHANCE, + ); if (!this.hasTrainer()) { - globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance); + globalScene.applyModifiers( + HiddenAbilityRateBoosterModifier, + true, + hiddenAbilityChance, + ); } this.species = species; @@ -189,7 +390,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.abilityIndex = 2; } else { // If there is no hidden ability or species does not have a hidden ability - this.abilityIndex = species.ability2 !== species.ability1 ? randAbilityIndex : 0; // Use random ability index if species has a second ability, otherwise use 0 + this.abilityIndex = + species.ability2 !== species.ability1 ? randAbilityIndex : 0; // Use random ability index if species has a second ability, otherwise use 0 } } if (formIndex !== undefined) { @@ -204,7 +406,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (variant !== undefined) { this.variant = variant; } - this.exp = dataSource?.exp || getLevelTotalExp(this.level, species.growthRate); + this.exp = + dataSource?.exp || getLevelTotalExp(this.level, species.growthRate); this.levelExp = dataSource?.levelExp || 0; if (dataSource) { this.id = dataSource.id; @@ -215,20 +418,32 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.variant === undefined) { this.variant = 0; } - this.nature = dataSource.nature || 0 as Nature; + this.nature = dataSource.nature || (0 as Nature); this.nickname = dataSource.nickname; this.moveset = dataSource.moveset; this.status = dataSource.status!; // TODO: is this bang correct? - this.friendship = dataSource.friendship !== undefined ? dataSource.friendship : this.species.baseFriendship; + this.friendship = + dataSource.friendship !== undefined + ? dataSource.friendship + : this.species.baseFriendship; this.metLevel = dataSource.metLevel || 5; this.luck = dataSource.luck; this.metBiome = dataSource.metBiome; - this.metSpecies = dataSource.metSpecies ?? (this.metBiome !== -1 ? this.species.speciesId : this.species.getRootSpeciesId(true)); + this.metSpecies = + dataSource.metSpecies ?? + (this.metBiome !== -1 + ? this.species.speciesId + : this.species.getRootSpeciesId(true)); this.metWave = dataSource.metWave ?? (this.metBiome === -1 ? -1 : 0); this.pauseEvolutions = dataSource.pauseEvolutions; this.pokerus = !!dataSource.pokerus; this.evoCounter = dataSource.evoCounter ?? 0; - this.fusionSpecies = dataSource.fusionSpecies instanceof PokemonSpecies ? dataSource.fusionSpecies : dataSource.fusionSpecies ? getPokemonSpecies(dataSource.fusionSpecies) : null; + this.fusionSpecies = + dataSource.fusionSpecies instanceof PokemonSpecies + ? dataSource.fusionSpecies + : dataSource.fusionSpecies + ? getPokemonSpecies(dataSource.fusionSpecies) + : null; this.fusionFormIndex = dataSource.fusionFormIndex; this.fusionAbilityIndex = dataSource.fusionAbilityIndex; this.fusionShiny = dataSource.fusionShiny; @@ -236,8 +451,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.fusionGender = dataSource.fusionGender; this.fusionLuck = dataSource.fusionLuck; this.fusionCustomPokemonData = dataSource.fusionCustomPokemonData; + this.fusionTeraType = dataSource.fusionTeraType; this.usedTMs = dataSource.usedTMs ?? []; - this.customPokemonData = new CustomPokemonData(dataSource.customPokemonData); + this.customPokemonData = new CustomPokemonData( + dataSource.customPokemonData, + ); + this.teraType = dataSource.teraType; + this.isTerastallized = dataSource.isTerastallized; + this.stellarTypesBoosted = dataSource.stellarTypesBoosted ?? []; } else { this.id = Utils.randSeedInt(4294967296); this.ivs = ivs || Utils.getIvsFromId(this.id); @@ -247,7 +468,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } if (this.formIndex === undefined) { - this.formIndex = globalScene.getSpeciesFormIndex(species, this.gender, this.nature, this.isPlayer()); + this.formIndex = globalScene.getSpeciesFormIndex( + species, + this.gender, + this.nature, + this.isPlayer(), + ); } if (this.shiny === undefined) { @@ -268,13 +494,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.friendship = species.baseFriendship; this.metLevel = level; - this.metBiome = globalScene.currentBattle ? globalScene.arena.biomeType : -1; + this.metBiome = globalScene.currentBattle + ? globalScene.arena.biomeType + : -1; this.metSpecies = species.speciesId; - this.metWave = globalScene.currentBattle ? globalScene.currentBattle.waveIndex : -1; + this.metWave = globalScene.currentBattle + ? globalScene.currentBattle.waveIndex + : -1; this.pokerus = false; if (level > 1) { - const fused = new Utils.BooleanHolder(globalScene.gameMode.isSplicedOnly); + const fused = new Utils.BooleanHolder( + globalScene.gameMode.isSplicedOnly, + ); if (!fused.value && !this.isPlayer() && !this.hasTrainer()) { globalScene.applyModifier(EnemyFusionChanceModifier, false, fused); } @@ -284,8 +516,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.generateFusionSpecies(); } } - this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0); + this.luck = + (this.shiny ? this.variant + 1 : 0) + + (this.fusionShiny ? this.fusionVariant + 1 : 0); this.fusionLuck = this.luck; + + this.teraType = Utils.randSeedItem(this.getTypes(false, false, true)); + this.isTerastallized = false; + this.stellarTypesBoosted = []; } this.generateName(); @@ -299,7 +537,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } - getNameToRender() { try { if (this.nickname) { @@ -320,9 +557,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { globalScene.fieldUI.addAt(this.battleInfo, 0); const getSprite = (hasShadow?: boolean) => { - const ret = globalScene.addPokemonSprite(this, 0, 0, `pkmn__${this.isPlayer() ? "back__" : ""}sub`, undefined, true); + const ret = globalScene.addPokemonSprite( + this, + 0, + 0, + `pkmn__${this.isPlayer() ? "back__" : ""}sub`, + undefined, + true, + ); ret.setOrigin(0.5, 1); - ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: !!hasShadow, teraColor: getTypeRgb(this.getTeraType()) }); + ret.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + hasShadow: !!hasShadow, + teraColor: getTypeRgb(this.getTeraType()), + isTerastallized: this.isTerastallized, + }); return ret; }; @@ -359,8 +608,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param checkStatus `true` to also check that the pokemon's status is {@linkcode StatusEffect.FAINT} * @returns `true` if the pokemon is fainted */ - public isFainted(checkStatus: boolean = false): boolean { - return this.hp <= 0 && (!checkStatus || this.status?.effect === StatusEffect.FAINT); + public isFainted(checkStatus = false): boolean { + return ( + this.hp <= 0 && + (!checkStatus || this.status?.effect === StatusEffect.FAINT) + ); } /** @@ -378,7 +630,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ public isAllowedInChallenge(): boolean { const challengeAllowed = new Utils.BooleanHolder(true); - applyChallenges(globalScene.gameMode, ChallengeType.POKEMON_IN_BATTLE, this, challengeAllowed); + applyChallenges( + globalScene.gameMode, + ChallengeType.POKEMON_IN_BATTLE, + this, + challengeAllowed, + ); return challengeAllowed.value; } @@ -387,7 +644,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param onField `true` to also check if the pokemon is currently on the field, defaults to `false` * @returns `true` if the pokemon is "active". Returns `false` if there is no active {@linkcode BattleScene} */ - public isActive(onField: boolean = false): boolean { + public isActive(onField = false): boolean { if (!globalScene) { return false; } @@ -398,7 +655,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let ret = 0n; ret |= this.gender !== Gender.FEMALE ? DexAttr.MALE : DexAttr.FEMALE; ret |= !this.shiny ? DexAttr.NON_SHINY : DexAttr.SHINY; - ret |= this.variant >= 2 ? DexAttr.VARIANT_3 : this.variant === 1 ? DexAttr.VARIANT_2 : DexAttr.DEFAULT_VARIANT; + ret |= + this.variant >= 2 + ? DexAttr.VARIANT_3 + : this.variant === 1 + ? DexAttr.VARIANT_2 + : DexAttr.DEFAULT_VARIANT; ret |= globalScene.gameData.getFormAttr(this.formIndex); return ret; } @@ -413,7 +675,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.name = this.species.getName(this.formIndex); return; } - this.name = getFusedSpeciesName(this.species.getName(this.formIndex), this.fusionSpecies.getName(this.fusionFormIndex)); + this.name = getFusedSpeciesName( + this.species.getName(this.formIndex), + this.fusionSpecies.getName(this.fusionFormIndex), + ); if (this.battleInfo) { this.updateInfo(true); } @@ -423,78 +688,118 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { abstract hasTrainer(): boolean; - abstract getFieldIndex(): integer; + abstract getFieldIndex(): number; abstract getBattlerIndex(): BattlerIndex; - loadAssets(ignoreOverride: boolean = true): Promise { + loadAssets(ignoreOverride = true): Promise { return new Promise(resolve => { const moveIds = this.getMoveset().map(m => m!.getMove().id); // TODO: is this bang correct? - Promise.allSettled(moveIds.map(m => initMoveAnim(m))) - .then(() => { - loadMoveAnimAssets(moveIds); - this.getSpeciesForm().loadAssets(this.getGender() === Gender.FEMALE, this.formIndex, this.shiny, this.variant); - if (this.isPlayer() || this.getFusionSpeciesForm()) { - globalScene.loadPokemonAtlas(this.getBattleSpriteKey(true, ignoreOverride), this.getBattleSpriteAtlasPath(true, ignoreOverride)); - } - if (this.getFusionSpeciesForm()) { - this.getFusionSpeciesForm().loadAssets(this.getFusionGender() === Gender.FEMALE, this.fusionFormIndex, this.fusionShiny, this.fusionVariant); - globalScene.loadPokemonAtlas(this.getFusionBattleSpriteKey(true, ignoreOverride), this.getFusionBattleSpriteAtlasPath(true, ignoreOverride)); - } - globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => { - if (this.isPlayer()) { - const originalWarn = console.warn; - // Ignore warnings for missing frames, because there will be a lot - console.warn = () => {}; - const battleFrameNames = globalScene.anims.generateFrameNames(this.getBattleSpriteKey(), { zeroPad: 4, suffix: ".png", start: 1, end: 400 }); - console.warn = originalWarn; - if (!(globalScene.anims.exists(this.getBattleSpriteKey()))) { - globalScene.anims.create({ - key: this.getBattleSpriteKey(), - frames: battleFrameNames, - frameRate: 10, - repeat: -1 - }); - } + Promise.allSettled(moveIds.map(m => initMoveAnim(m))).then(() => { + loadMoveAnimAssets(moveIds); + this.getSpeciesForm().loadAssets( + this.getGender() === Gender.FEMALE, + this.formIndex, + this.shiny, + this.variant, + ); + if (this.isPlayer() || this.getFusionSpeciesForm()) { + globalScene.loadPokemonAtlas( + this.getBattleSpriteKey(true, ignoreOverride), + this.getBattleSpriteAtlasPath(true, ignoreOverride), + ); + } + if (this.getFusionSpeciesForm()) { + this.getFusionSpeciesForm().loadAssets( + this.getFusionGender() === Gender.FEMALE, + this.fusionFormIndex, + this.fusionShiny, + this.fusionVariant, + ); + globalScene.loadPokemonAtlas( + this.getFusionBattleSpriteKey(true, ignoreOverride), + this.getFusionBattleSpriteAtlasPath(true, ignoreOverride), + ); + } + globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => { + if (this.isPlayer()) { + const originalWarn = console.warn; + // Ignore warnings for missing frames, because there will be a lot + console.warn = () => {}; + const battleFrameNames = globalScene.anims.generateFrameNames( + this.getBattleSpriteKey(), + { zeroPad: 4, suffix: ".png", start: 1, end: 400 }, + ); + console.warn = originalWarn; + if (!globalScene.anims.exists(this.getBattleSpriteKey())) { + globalScene.anims.create({ + key: this.getBattleSpriteKey(), + frames: battleFrameNames, + frameRate: 10, + repeat: -1, + }); } - this.playAnim(); - const updateFusionPaletteAndResolve = () => { - this.updateFusionPalette(); - if (this.summonData?.speciesForm) { - this.updateFusionPalette(true); - } - resolve(); - }; - if (this.shiny) { - const populateVariantColors = (isBackSprite: boolean = false): Promise => { - return new Promise(async resolve => { - const battleSpritePath = this.getBattleSpriteAtlasPath(isBackSprite, ignoreOverride).replace("variant/", "").replace(/_[1-3]$/, ""); - let config = variantData; - const useExpSprite = globalScene.experimentalSprites && globalScene.hasExpSprite(this.getBattleSpriteKey(isBackSprite, ignoreOverride)); - battleSpritePath.split("/").map(p => config ? config = config[p] : null); - const variantSet: VariantSet = config as VariantSet; - if (variantSet && variantSet[this.variant] === 1) { - const cacheKey = this.getBattleSpriteKey(isBackSprite); - if (!variantColorCache.hasOwnProperty(cacheKey)) { - await this.populateVariantColorCache(cacheKey, useExpSprite, battleSpritePath); - } + } + this.playAnim(); + const updateFusionPaletteAndResolve = () => { + this.updateFusionPalette(); + if (this.summonData?.speciesForm) { + this.updateFusionPalette(true); + } + resolve(); + }; + if (this.shiny) { + const populateVariantColors = ( + isBackSprite = false, + ): Promise => { + return new Promise(async resolve => { + const battleSpritePath = this.getBattleSpriteAtlasPath( + isBackSprite, + ignoreOverride, + ) + .replace("variant/", "") + .replace(/_[1-3]$/, ""); + let config = variantData; + const useExpSprite = + globalScene.experimentalSprites && + globalScene.hasExpSprite( + this.getBattleSpriteKey(isBackSprite, ignoreOverride), + ); + battleSpritePath + .split("/") + .map(p => (config ? (config = config[p]) : null)); + const variantSet: VariantSet = config as VariantSet; + if (variantSet && variantSet[this.variant] === 1) { + const cacheKey = this.getBattleSpriteKey(isBackSprite); + if (!variantColorCache.hasOwnProperty(cacheKey)) { + await this.populateVariantColorCache( + cacheKey, + useExpSprite, + battleSpritePath, + ); } - resolve(); - }); - }; - if (this.isPlayer()) { - Promise.all([ populateVariantColors(false), populateVariantColors(true) ]).then(() => updateFusionPaletteAndResolve()); - } else { - populateVariantColors(false).then(() => updateFusionPaletteAndResolve()); - } + } + resolve(); + }); + }; + if (this.isPlayer()) { + Promise.all([ + populateVariantColors(false), + populateVariantColors(true), + ]).then(() => updateFusionPaletteAndResolve()); } else { - updateFusionPaletteAndResolve(); + populateVariantColors(false).then(() => + updateFusionPaletteAndResolve(), + ); } - }); - if (!globalScene.load.isLoading()) { - globalScene.load.start(); + } else { + updateFusionPaletteAndResolve(); } }); + if (!globalScene.load.isLoading()) { + globalScene.load.start(); + } + }); }); } @@ -508,7 +813,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param battleSpritePath the filename of the sprite * @param optionalParams any additional params to log */ - async fallbackVariantColor(cacheKey: string, attemptedSpritePath: string, useExpSprite: boolean, battleSpritePath: string, ...optionalParams: any[]) { + async fallbackVariantColor( + cacheKey: string, + attemptedSpritePath: string, + useExpSprite: boolean, + battleSpritePath: string, + ...optionalParams: any[] + ) { console.warn(`Could not load ${attemptedSpritePath}!`, ...optionalParams); if (useExpSprite) { await this.populateVariantColorCache(cacheKey, false, battleSpritePath); @@ -522,25 +833,49 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param useExpSprite should the experimental sprite be used * @param battleSpritePath the filename of the sprite */ - async populateVariantColorCache(cacheKey: string, useExpSprite: boolean, battleSpritePath: string) { + async populateVariantColorCache( + cacheKey: string, + useExpSprite: boolean, + battleSpritePath: string, + ) { const spritePath = `./images/pokemon/variant/${useExpSprite ? "exp/" : ""}${battleSpritePath}.json`; - return globalScene.cachedFetch(spritePath).then(res => { - // Prevent the JSON from processing if it failed to load - if (!res.ok) { - return this.fallbackVariantColor(cacheKey, res.url, useExpSprite, battleSpritePath, res.status, res.statusText); - } - return res.json(); - }).catch(error => { - return this.fallbackVariantColor(cacheKey, spritePath, useExpSprite, battleSpritePath, error); - }).then(c => { - if (!isNullOrUndefined(c)) { - variantColorCache[cacheKey] = c; - } - }); + return globalScene + .cachedFetch(spritePath) + .then(res => { + // Prevent the JSON from processing if it failed to load + if (!res.ok) { + return this.fallbackVariantColor( + cacheKey, + res.url, + useExpSprite, + battleSpritePath, + res.status, + res.statusText, + ); + } + return res.json(); + }) + .catch(error => { + return this.fallbackVariantColor( + cacheKey, + spritePath, + useExpSprite, + battleSpritePath, + error, + ); + }) + .then(c => { + if (!isNullOrUndefined(c)) { + variantColorCache[cacheKey] = c; + } + }); } getFormKey(): string { - if (!this.species.forms.length || this.species.forms.length <= this.formIndex) { + if ( + !this.species.forms.length || + this.species.forms.length <= this.formIndex + ) { return ""; } return this.species.forms[this.formIndex].formKey; @@ -550,7 +885,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!this.fusionSpecies) { return null; } - if (!this.fusionSpecies.forms.length || this.fusionSpecies.forms.length <= this.fusionFormIndex) { + if ( + !this.fusionSpecies.forms.length || + this.fusionSpecies.forms.length <= this.fusionFormIndex + ) { return ""; } return this.fusionSpecies.forms[this.fusionFormIndex].formKey; @@ -562,23 +900,42 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getBattleSpriteAtlasPath(back?: boolean, ignoreOverride?: boolean): string { - const spriteId = this.getBattleSpriteId(back, ignoreOverride).replace(/\_{2}/g, "/"); + const spriteId = this.getBattleSpriteId(back, ignoreOverride).replace( + /\_{2}/g, + "/", + ); return `${/_[1-3]$/.test(spriteId) ? "variant/" : ""}${spriteId}`; } getSpriteId(ignoreOverride?: boolean): string { - return this.getSpeciesForm(ignoreOverride).getSpriteId(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.shiny, this.variant); + return this.getSpeciesForm(ignoreOverride).getSpriteId( + this.getGender(ignoreOverride) === Gender.FEMALE, + this.formIndex, + this.shiny, + this.variant, + ); } getBattleSpriteId(back?: boolean, ignoreOverride?: boolean): string { if (back === undefined) { back = this.isPlayer(); } - return this.getSpeciesForm(ignoreOverride).getSpriteId(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.shiny, this.variant, back); + return this.getSpeciesForm(ignoreOverride).getSpriteId( + this.getGender(ignoreOverride) === Gender.FEMALE, + this.formIndex, + this.shiny, + this.variant, + back, + ); } getSpriteKey(ignoreOverride?: boolean): string { - return this.getSpeciesForm(ignoreOverride).getSpriteKey(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.shiny, this.variant); + return this.getSpeciesForm(ignoreOverride).getSpriteKey( + this.getGender(ignoreOverride) === Gender.FEMALE, + this.formIndex, + this.shiny, + this.variant, + ); } getBattleSpriteKey(back?: boolean, ignoreOverride?: boolean): string { @@ -586,38 +943,73 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getFusionSpriteId(ignoreOverride?: boolean): string { - return this.getFusionSpeciesForm(ignoreOverride).getSpriteId(this.getFusionGender(ignoreOverride) === Gender.FEMALE, this.fusionFormIndex, this.fusionShiny, this.fusionVariant); + return this.getFusionSpeciesForm(ignoreOverride).getSpriteId( + this.getFusionGender(ignoreOverride) === Gender.FEMALE, + this.fusionFormIndex, + this.fusionShiny, + this.fusionVariant, + ); } getFusionBattleSpriteId(back?: boolean, ignoreOverride?: boolean): string { if (back === undefined) { back = this.isPlayer(); } - return this.getFusionSpeciesForm(ignoreOverride).getSpriteId(this.getFusionGender(ignoreOverride) === Gender.FEMALE, this.fusionFormIndex, this.fusionShiny, this.fusionVariant, back); + return this.getFusionSpeciesForm(ignoreOverride).getSpriteId( + this.getFusionGender(ignoreOverride) === Gender.FEMALE, + this.fusionFormIndex, + this.fusionShiny, + this.fusionVariant, + back, + ); } getFusionBattleSpriteKey(back?: boolean, ignoreOverride?: boolean): string { return `pkmn__${this.getFusionBattleSpriteId(back, ignoreOverride)}`; } - getFusionBattleSpriteAtlasPath(back?: boolean, ignoreOverride?: boolean): string { - return this.getFusionBattleSpriteId(back, ignoreOverride).replace(/\_{2}/g, "/"); + getFusionBattleSpriteAtlasPath( + back?: boolean, + ignoreOverride?: boolean, + ): string { + return this.getFusionBattleSpriteId(back, ignoreOverride).replace( + /\_{2}/g, + "/", + ); } getIconAtlasKey(ignoreOverride?: boolean): string { - return this.getSpeciesForm(ignoreOverride).getIconAtlasKey(this.formIndex, this.shiny, this.variant); + return this.getSpeciesForm(ignoreOverride).getIconAtlasKey( + this.formIndex, + this.shiny, + this.variant, + ); } getFusionIconAtlasKey(ignoreOverride?: boolean): string { - return this.getFusionSpeciesForm(ignoreOverride).getIconAtlasKey(this.fusionFormIndex, this.fusionShiny, this.fusionVariant); + return this.getFusionSpeciesForm(ignoreOverride).getIconAtlasKey( + this.fusionFormIndex, + this.fusionShiny, + this.fusionVariant, + ); } getIconId(ignoreOverride?: boolean): string { - return this.getSpeciesForm(ignoreOverride).getIconId(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.shiny, this.variant); + return this.getSpeciesForm(ignoreOverride).getIconId( + this.getGender(ignoreOverride) === Gender.FEMALE, + this.formIndex, + this.shiny, + this.variant, + ); } getFusionIconId(ignoreOverride?: boolean): string { - return this.getFusionSpeciesForm(ignoreOverride).getIconId(this.getFusionGender(ignoreOverride) === Gender.FEMALE, this.fusionFormIndex, this.fusionShiny, this.fusionVariant); + return this.getFusionSpeciesForm(ignoreOverride).getIconId( + this.getFusionGender(ignoreOverride) === Gender.FEMALE, + this.fusionFormIndex, + this.fusionShiny, + this.fusionVariant, + ); } getSpeciesForm(ignoreOverride?: boolean): PokemonSpeciesForm { @@ -635,7 +1027,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!ignoreOverride && this.summonData?.speciesForm) { return this.summonData.fusionSpeciesForm; } - if (!this.fusionSpecies?.forms?.length || this.fusionFormIndex >= this.fusionSpecies?.forms.length) { + if ( + !this.fusionSpecies?.forms?.length || + this.fusionFormIndex >= this.fusionSpecies?.forms.length + ) { //@ts-ignore return this.fusionSpecies; // TODO: I don't even know how to fix this... A complete cluster of classes involved + null } @@ -648,15 +1043,23 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { getTintSprite(): Phaser.GameObjects.Sprite | null { return !this.maskEnabled - ? this.getAt(1) as Phaser.GameObjects.Sprite + ? (this.getAt(1) as Phaser.GameObjects.Sprite) : this.maskSprite; } getSpriteScale(): number { const formKey = this.getFormKey(); - if (this.isMax() === true || formKey === "segin-starmobile" || formKey === "schedar-starmobile" || formKey === "navi-starmobile" || formKey === "ruchbah-starmobile" || formKey === "caph-starmobile") { + if ( + this.isMax() === true || + formKey === "segin-starmobile" || + formKey === "schedar-starmobile" || + formKey === "navi-starmobile" || + formKey === "ruchbah-starmobile" || + formKey === "caph-starmobile" + ) { return 1.5; - } else if (this.customPokemonData.spriteScale > 0) { + } + if (this.customPokemonData.spriteScale > 0) { return this.customPokemonData.spriteScale; } return 1; @@ -682,7 +1085,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!globalScene) { return []; } - return globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.id, this.isPlayer()) as PokemonHeldItemModifier[]; + return globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.id, + this.isPlayer(), + ) as PokemonHeldItemModifier[]; } updateScale(): void { @@ -690,7 +1096,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } updateSpritePipelineData(): void { - [ this.getSprite(), this.getTintSprite() ].filter(s => !!s).map(s => s.pipelineData["teraColor"] = getTypeRgb(this.getTeraType())); + [this.getSprite(), this.getTintSprite()] + .filter(s => !!s) + .map(s => { + s.pipelineData["teraColor"] = getTypeRgb(this.getTeraType()); + s.pipelineData["isTerastallized"] = this.isTerastallized; + }); this.updateInfo(true); } @@ -711,13 +1122,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param animConfig {@linkcode String} to pass to {@linkcode Phaser.GameObjects.Sprite.play} * @returns true if the sprite was able to be animated */ - tryPlaySprite(sprite: Phaser.GameObjects.Sprite, tintSprite: Phaser.GameObjects.Sprite, key: string): boolean { + tryPlaySprite( + sprite: Phaser.GameObjects.Sprite, + tintSprite: Phaser.GameObjects.Sprite, + key: string, + ): boolean { // Catch errors when trying to play an animation that doesn't exist try { sprite.play(key); tintSprite.play(key); } catch (error: unknown) { - console.error(`Couldn't play animation for '${key}'!\nIs the image for this Pokemon missing?\n`, error); + console.error( + `Couldn't play animation for '${key}'!\nIs the image for this Pokemon missing?\n`, + error, + ); return false; } @@ -726,17 +1144,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } playAnim(): void { - this.tryPlaySprite(this.getSprite(), this.getTintSprite()!, this.getBattleSpriteKey()); // TODO: is the bag correct? + this.tryPlaySprite( + this.getSprite(), + this.getTintSprite()!, + this.getBattleSpriteKey(), + ); // TODO: is the bag correct? } - getFieldPositionOffset(): [ number, number ] { + getFieldPositionOffset(): [number, number] { switch (this.fieldPosition) { case FieldPosition.CENTER: - return [ 0, 0 ]; + return [0, 0]; case FieldPosition.LEFT: - return [ -32, -8 ]; + return [-32, -8]; case FieldPosition.RIGHT: - return [ 32, 0 ]; + return [32, 0]; } } @@ -746,8 +1168,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @see {@linkcode SubstituteTag} * @see {@linkcode getFieldPositionOffset} */ - getSubstituteOffset(): [ number, number ] { - return this.isPlayer() ? [ -30, 10 ] : [ 30, -10 ]; + getSubstituteOffset(): [number, number] { + return this.isPlayer() ? [-30, 10] : [30, -10]; } /** @@ -764,7 +1186,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // During the Pokemon's MoveEffect phase, the offset is removed to put the Pokemon "in focus" const currentPhase = globalScene.getCurrentPhase(); - if (currentPhase instanceof MoveEffectPhase && currentPhase.getPokemon() === this) { + if ( + currentPhase instanceof MoveEffectPhase && + currentPhase.getPokemon() === this + ) { return false; } return true; @@ -781,7 +1206,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } - setFieldPosition(fieldPosition: FieldPosition, duration?: integer): Promise { + setFieldPosition( + fieldPosition: FieldPosition, + duration?: number, + ): Promise { return new Promise(resolve => { if (fieldPosition === this.fieldPosition) { resolve(); @@ -804,7 +1232,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (duration) { // TODO: can this use stricter typing? - const targets: any[] = [ this ]; + const targets: any[] = [this]; if (subTag?.sprite) { targets.push(subTag.sprite); } @@ -814,7 +1242,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { y: (_target, _key, value: number) => value + relY, duration: duration, ease: "Sine.easeOut", - onComplete: () => resolve() + onComplete: () => resolve(), }); } else { this.x += relX; @@ -832,7 +1260,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param bypassSummonData prefer actual stats (`true` by default) or in-battle overriden stats (`false`) * @returns the numeric values of the {@linkcode Pokemon}'s stats */ - getStats(bypassSummonData: boolean = true): number[] { + getStats(bypassSummonData = true): number[] { if (!bypassSummonData && this.summonData?.stats) { return this.summonData.stats; } @@ -845,8 +1273,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param bypassSummonData prefer actual stats (`true` by default) or in-battle overridden stats (`false`) * @returns the numeric value of the desired {@linkcode Stat} */ - getStat(stat: PermanentStat, bypassSummonData: boolean = true): number { - if (!bypassSummonData && this.summonData && (this.summonData.stats[stat] !== 0)) { + getStat(stat: PermanentStat, bypassSummonData = true): number { + if ( + !bypassSummonData && + this.summonData && + this.summonData.stats[stat] !== 0 + ) { return this.summonData.stats[stat]; } return this.stats[stat]; @@ -860,7 +1292,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param value the desired numeric value * @param bypassSummonData write to actual stats (`true` by default) or in-battle overridden stats (`false`) */ - setStat(stat: PermanentStat, value: number, bypassSummonData: boolean = true): void { + setStat(stat: PermanentStat, value: number, bypassSummonData = true): void { if (value >= 0) { if (!bypassSummonData && this.summonData) { this.summonData.stats[stat] = value; @@ -875,7 +1307,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns the numeric values of the {@linkcode Pokemon}'s in-battle stat stages if available, a fresh stat stage array otherwise */ getStatStages(): number[] { - return this.summonData ? this.summonData.statStages : [ 0, 0, 0, 0, 0, 0, 0 ]; + return this.summonData ? this.summonData.statStages : [0, 0, 0, 0, 0, 0, 0]; } /** @@ -912,13 +1344,23 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns the final critical-hit stage value */ getCritStage(source: Pokemon, move: Move): number { - const critStage = new Utils.IntegerHolder(0); + const critStage = new Utils.NumberHolder(0); applyMoveAttrs(HighCritAttr, source, this, move, critStage); - globalScene.applyModifiers(CritBoosterModifier, source.isPlayer(), source, critStage); - globalScene.applyModifiers(TempCritBoosterModifier, source.isPlayer(), critStage); + globalScene.applyModifiers( + CritBoosterModifier, + source.isPlayer(), + source, + critStage, + ); + globalScene.applyModifiers( + TempCritBoosterModifier, + source.isPlayer(), + critStage, + ); const bonusCrit = new Utils.BooleanHolder(false); //@ts-ignore - if (applyAbAttrs(BonusCritAbAttr, source, null, false, bonusCrit)) { // TODO: resolve ts-ignore. This is a promise. Checking a promise is bogus. + if (applyAbAttrs(BonusCritAbAttr, source, null, false, bonusCrit)) { + // TODO: resolve ts-ignore. This is a promise. Checking a promise is bogus. if (bonusCrit.value) { critStage.value += 1; } @@ -926,7 +1368,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const critBoostTag = source.getTag(CritBoostTag); if (critBoostTag) { if (critBoostTag instanceof DragonCheerTag) { - critStage.value += critBoostTag.typesOnAdd.includes(Type.DRAGON) ? 2 : 1; + critStage.value += critBoostTag.typesOnAdd.includes(PokemonType.DRAGON) + ? 2 + : 1; } else { critStage.value += 2; } @@ -947,25 +1391,67 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreOppAbility during an attack, determines whether the opposing Pokemon's abilities should be ignored during the stat calculation. * @param isCritical determines whether a critical hit has occurred or not (`false` by default) * @param simulated if `true`, nullifies any effects that produce any changes to game state from triggering + * @param ignoreHeldItems determines whether this Pokemon's held items should be ignored during the stat calculation, default `false` * @returns the final in-battle value of a stat */ - getEffectiveStat(stat: EffectiveStat, opponent?: Pokemon, move?: Move, ignoreAbility: boolean = false, ignoreOppAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): integer { + getEffectiveStat( + stat: EffectiveStat, + opponent?: Pokemon, + move?: Move, + ignoreAbility = false, + ignoreOppAbility = false, + isCritical = false, + simulated = true, + ignoreHeldItems = false, + ): number { const statValue = new Utils.NumberHolder(this.getStat(stat, false)); - globalScene.applyModifiers(StatBoosterModifier, this.isPlayer(), this, stat, statValue); + if (!ignoreHeldItems) { + globalScene.applyModifiers( + StatBoosterModifier, + this.isPlayer(), + this, + stat, + statValue, + ); + } // The Ruin abilities here are never ignored, but they reveal themselves on summon anyway const fieldApplied = new Utils.BooleanHolder(false); for (const pokemon of globalScene.getField(true)) { - applyFieldStatMultiplierAbAttrs(FieldMultiplyStatAbAttr, pokemon, stat, statValue, this, fieldApplied, simulated); + applyFieldStatMultiplierAbAttrs( + FieldMultiplyStatAbAttr, + pokemon, + stat, + statValue, + this, + fieldApplied, + simulated, + ); if (fieldApplied.value) { break; } } if (!ignoreAbility) { - applyStatMultiplierAbAttrs(StatMultiplierAbAttr, this, stat, statValue, simulated); + applyStatMultiplierAbAttrs( + StatMultiplierAbAttr, + this, + stat, + statValue, + simulated, + ); } - let ret = statValue.value * this.getStatStageMultiplier(stat, opponent, move, ignoreOppAbility, isCritical, simulated); + let ret = + statValue.value * + this.getStatStageMultiplier( + stat, + opponent, + move, + ignoreOppAbility, + isCritical, + simulated, + ignoreHeldItems, + ); switch (stat) { case Stat.ATK: @@ -974,14 +1460,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } break; case Stat.DEF: - if (this.isOfType(Type.ICE) && globalScene.arena.weather?.weatherType === WeatherType.SNOW) { + if ( + this.isOfType(PokemonType.ICE) && + globalScene.arena.weather?.weatherType === WeatherType.SNOW + ) { ret *= 1.5; } break; case Stat.SPATK: break; case Stat.SPDEF: - if (this.isOfType(Type.ROCK) && globalScene.arena.weather?.weatherType === WeatherType.SANDSTORM) { + if ( + this.isOfType(PokemonType.ROCK) && + globalScene.arena.weather?.weatherType === WeatherType.SANDSTORM + ) { ret *= 1.5; } break; @@ -990,7 +1482,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (globalScene.arena.getTagOnSide(ArenaTagType.TAILWIND, side)) { ret *= 2; } - if (globalScene.arena.getTagOnSide(ArenaTagType.GRASS_WATER_PLEDGE, side)) { + if ( + globalScene.arena.getTagOnSide(ArenaTagType.GRASS_WATER_PLEDGE, side) + ) { ret >>= 2; } @@ -1000,13 +1494,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.status && this.status.effect === StatusEffect.PARALYSIS) { ret >>= 1; } - if (this.getTag(BattlerTagType.UNBURDEN) && this.hasAbility(Abilities.UNBURDEN)) { + if ( + this.getTag(BattlerTagType.UNBURDEN) && + this.hasAbility(Abilities.UNBURDEN) + ) { ret *= 2; } break; } - const highestStatBoost = this.findTag(t => t instanceof HighestStatBoostTag && (t as HighestStatBoostTag).stat === stat) as HighestStatBoostTag; + const highestStatBoost = this.findTag( + t => + t instanceof HighestStatBoostTag && + (t as HighestStatBoostTag).stat === stat, + ) as HighestStatBoostTag; if (highestStatBoost) { ret *= highestStatBoost.multiplier; } @@ -1016,17 +1517,25 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { calculateStats(): void { if (!this.stats) { - this.stats = [ 0, 0, 0, 0, 0, 0 ]; + this.stats = [0, 0, 0, 0, 0, 0]; } // Get and manipulate base stats const baseStats = this.calculateBaseStats(); // Using base stats, calculate and store stats one by one for (const s of PERMANENT_STATS) { - const statHolder = new Utils.IntegerHolder(Math.floor(((2 * baseStats[s] + this.ivs[s]) * this.level) * 0.01)); + const statHolder = new Utils.NumberHolder( + Math.floor((2 * baseStats[s] + this.ivs[s]) * this.level * 0.01), + ); if (s === Stat.HP) { statHolder.value = statHolder.value + this.level + 10; - globalScene.applyModifier(PokemonIncrementingStatModifier, this.isPlayer(), this, s, statHolder); + globalScene.applyModifier( + PokemonIncrementingStatModifier, + this.isPlayer(), + this, + s, + statHolder, + ); if (this.hasAbility(Abilities.WONDER_GUARD, false, true)) { statHolder.value = 1; } @@ -1040,15 +1549,37 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } else { statHolder.value += 5; - const natureStatMultiplier = new Utils.NumberHolder(getNatureStatMultiplier(this.getNature(), s)); - globalScene.applyModifier(PokemonNatureWeightModifier, this.isPlayer(), this, natureStatMultiplier); + const natureStatMultiplier = new Utils.NumberHolder( + getNatureStatMultiplier(this.getNature(), s), + ); + globalScene.applyModifier( + PokemonNatureWeightModifier, + this.isPlayer(), + this, + natureStatMultiplier, + ); if (natureStatMultiplier.value !== 1) { - statHolder.value = Math.max(Math[natureStatMultiplier.value > 1 ? "ceil" : "floor"](statHolder.value * natureStatMultiplier.value), 1); + statHolder.value = Math.max( + Math[natureStatMultiplier.value > 1 ? "ceil" : "floor"]( + statHolder.value * natureStatMultiplier.value, + ), + 1, + ); } - globalScene.applyModifier(PokemonIncrementingStatModifier, this.isPlayer(), this, s, statHolder); + globalScene.applyModifier( + PokemonIncrementingStatModifier, + this.isPlayer(), + this, + s, + statHolder, + ); } - statHolder.value = Phaser.Math.Clamp(statHolder.value, 1, Number.MAX_SAFE_INTEGER); + statHolder.value = Phaser.Math.Clamp( + statHolder.value, + 1, + Number.MAX_SAFE_INTEGER, + ); this.setStat(s, statHolder.value); } @@ -1056,13 +1587,35 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { calculateBaseStats(): number[] { const baseStats = this.getSpeciesForm(true).baseStats.slice(0); - applyChallenges(globalScene.gameMode, ChallengeType.FLIP_STAT, this, baseStats); + applyChallenges( + globalScene.gameMode, + ChallengeType.FLIP_STAT, + this, + baseStats, + ); // Shuckle Juice - globalScene.applyModifiers(PokemonBaseStatTotalModifier, this.isPlayer(), this, baseStats); + globalScene.applyModifiers( + PokemonBaseStatTotalModifier, + this.isPlayer(), + this, + baseStats, + ); // Old Gateau - globalScene.applyModifiers(PokemonBaseStatFlatModifier, this.isPlayer(), this, baseStats); + globalScene.applyModifiers( + PokemonBaseStatFlatModifier, + this.isPlayer(), + this, + baseStats, + ); if (this.isFusion()) { const fusionBaseStats = this.getFusionSpeciesForm(true).baseStats; + applyChallenges( + globalScene.gameMode, + ChallengeType.FLIP_STAT, + this, + fusionBaseStats, + ); + for (const s of PERMANENT_STATS) { baseStats[s] = Math.ceil((baseStats[s] + fusionBaseStats[s]) / 2); } @@ -1072,13 +1625,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } // Vitamins - globalScene.applyModifiers(BaseStatModifier, this.isPlayer(), this, baseStats); + globalScene.applyModifiers( + BaseStatModifier, + this.isPlayer(), + this, + baseStats, + ); return baseStats; } getNature(): Nature { - return this.customPokemonData.nature !== -1 ? this.customPokemonData.nature : this.nature; + return this.customPokemonData.nature !== -1 + ? this.customPokemonData.nature + : this.nature; } setNature(nature: Nature): void { @@ -1103,16 +1663,16 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return this.hp >= this.getMaxHp(); } - getMaxHp(): integer { + getMaxHp(): number { return this.getStat(Stat.HP); } /** Returns the amount of hp currently missing from this {@linkcode Pokemon} (max - current) */ - getInverseHp(): integer { + getInverseHp(): number { return this.getMaxHp() - this.hp; } - getHpRatio(precise: boolean = false): number { + getHpRatio(precise = false): number { return precise ? this.hp / this.getMaxHp() : Math.round((this.hp / this.getMaxHp()) * 100) / 100; @@ -1150,10 +1710,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getVariant(): Variant { - return !this.isFusion() ? this.variant : Math.max(this.variant, this.fusionVariant) as Variant; + return !this.isFusion() + ? this.variant + : (Math.max(this.variant, this.fusionVariant) as Variant); } - getLuck(): integer { + getLuck(): number { return this.luck + (this.isFusion() ? this.fusionLuck : 0); } @@ -1170,17 +1732,37 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return this.fusionSpecies?.speciesId === species; } + /** + * Checks if the {@linkcode Pokemon} has is the specified {@linkcode Species} or is fused with it. + * @param species the pokemon {@linkcode Species} to check + * @param formKey If provided, requires the species to be in that form + * @returns `true` if the pokemon is the species or is fused with it, `false` otherwise + */ + hasSpecies(species: Species, formKey?: string): boolean { + if (Utils.isNullOrUndefined(formKey)) { + return ( + this.species.speciesId === species || + this.fusionSpecies?.speciesId === species + ); + } + + return (this.species.speciesId === species && this.getFormKey() === formKey) || (this.fusionSpecies?.speciesId === species && this.getFusionFormKey() === formKey); + } + abstract isBoss(): boolean; getMoveset(ignoreOverride?: boolean): (PokemonMove | null)[] { - const ret = !ignoreOverride && this.summonData?.moveset - ? this.summonData.moveset - : this.moveset; + const ret = + !ignoreOverride && this.summonData?.moveset + ? this.summonData.moveset + : this.moveset; // Overrides moveset based on arrays specified in overrides.ts - let overrideArray: Moves | Array = this.isPlayer() ? Overrides.MOVESET_OVERRIDE : Overrides.OPP_MOVESET_OVERRIDE; + let overrideArray: Moves | Array = this.isPlayer() + ? Overrides.MOVESET_OVERRIDE + : Overrides.OPP_MOVESET_OVERRIDE; if (!Array.isArray(overrideArray)) { - overrideArray = [ overrideArray ]; + overrideArray = [overrideArray]; } if (overrideArray.length > 0) { if (!this.isPlayer()) { @@ -1188,7 +1770,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } overrideArray.forEach((move: Moves, index: number) => { const ppUsed = this.moveset[index]?.ppUsed ?? 0; - this.moveset[index] = new PokemonMove(move, Math.min(ppUsed, allMoves[move].pp)); + this.moveset[index] = new PokemonMove( + move, + Math.min(ppUsed, allMoves[move].pp), + ); }); } @@ -1204,7 +1789,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ getUnlockedEggMoves(): Moves[] { const moves: Moves[] = []; - const species = this.metSpecies in speciesEggMoves ? this.metSpecies : this.getSpeciesForm(true).getRootSpeciesId(true); + const species = + this.metSpecies in speciesEggMoves + ? this.metSpecies + : this.getSpeciesForm(true).getRootSpeciesId(true); if (species in speciesEggMoves) { for (let i = 0; i < 4; i++) { if (globalScene.gameData.starterData[species].eggMoves & (1 << i)) { @@ -1226,13 +1814,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ public getLearnableLevelMoves(): Moves[] { let levelMoves = this.getLevelMoves(1, true, false, true).map(lm => lm[1]); - if (this.metBiome === -1 && !globalScene.gameMode.isFreshStartChallenge() && !globalScene.gameMode.isDaily) { + if ( + this.metBiome === -1 && + !globalScene.gameMode.isFreshStartChallenge() && + !globalScene.gameMode.isDaily + ) { levelMoves = this.getUnlockedEggMoves().concat(levelMoves); } if (Array.isArray(this.usedTMs) && this.usedTMs.length > 0) { - levelMoves = this.usedTMs.filter(m => !levelMoves.includes(m)).concat(levelMoves); + levelMoves = this.usedTMs + .filter(m => !levelMoves.includes(m)) + .concat(levelMoves); } - levelMoves = levelMoves.filter(lm => !this.moveset.some(m => m?.moveId === lm)); + levelMoves = levelMoves.filter( + lm => !this.moveset.some(m => m?.moveId === lm), + ); return levelMoves; } @@ -1241,14 +1837,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param includeTeraType - `true` to include tera-formed type; Default: `false` * @param forDefend - `true` if the pokemon is defending from an attack; Default: `false` * @param ignoreOverride - If `true`, ignore ability changing effects; Default: `false` - * @returns array of {@linkcode Type} + * @returns array of {@linkcode PokemonType} */ - public getTypes(includeTeraType = false, forDefend: boolean = false, ignoreOverride: boolean = false): Type[] { - const types: Type[] = []; + public getTypes( + includeTeraType = false, + forDefend = false, + ignoreOverride = false, + ): PokemonType[] { + const types: PokemonType[] = []; - if (includeTeraType) { + if (includeTeraType && this.isTerastallized) { const teraType = this.getTeraType(); - if (teraType !== Type.UNKNOWN) { + if (this.isTerastallized && !(forDefend && teraType === PokemonType.STELLAR)) { + // Stellar tera uses its original types defensively types.push(teraType); if (forDefend) { return types; @@ -1257,7 +1858,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } if (!types.length || !includeTeraType) { - if (!ignoreOverride && this.summonData?.types && this.summonData.types.length > 0) { + if ( + !ignoreOverride && + this.summonData?.types && + this.summonData.types.length > 0 + ) { this.summonData.types.forEach(t => types.push(t)); } else { const speciesForm = this.getSpeciesForm(ignoreOverride); @@ -1265,18 +1870,29 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const customTypes = this.customPokemonData.types?.length > 0; // First type, checking for "permanently changed" types from ME - const firstType = (customTypes && this.customPokemonData.types[0] !== Type.UNKNOWN) ? this.customPokemonData.types[0] : speciesForm.type1; + const firstType = + customTypes && this.customPokemonData.types[0] !== PokemonType.UNKNOWN + ? this.customPokemonData.types[0] + : speciesForm.type1; types.push(firstType); // Second type - let secondType: Type = Type.UNKNOWN; + let secondType: PokemonType = PokemonType.UNKNOWN; if (fusionSpeciesForm) { // Check if the fusion Pokemon also has permanent changes from ME when determining the fusion types - const fusionType1 = (this.fusionCustomPokemonData?.types && this.fusionCustomPokemonData.types.length > 0 && this.fusionCustomPokemonData.types[0] !== Type.UNKNOWN) - ? this.fusionCustomPokemonData.types[0] : fusionSpeciesForm.type1; - const fusionType2 = (this.fusionCustomPokemonData?.types && this.fusionCustomPokemonData.types.length > 1 && this.fusionCustomPokemonData.types[1] !== Type.UNKNOWN) - ? this.fusionCustomPokemonData.types[1] : fusionSpeciesForm.type2; + const fusionType1 = + this.fusionCustomPokemonData?.types && + this.fusionCustomPokemonData.types.length > 0 && + this.fusionCustomPokemonData.types[0] !== PokemonType.UNKNOWN + ? this.fusionCustomPokemonData.types[0] + : fusionSpeciesForm.type1; + const fusionType2 = + this.fusionCustomPokemonData?.types && + this.fusionCustomPokemonData.types.length > 1 && + this.fusionCustomPokemonData.types[1] !== PokemonType.UNKNOWN + ? this.fusionCustomPokemonData.types[1] + : fusionSpeciesForm.type2; // Assign second type if the fusion can provide one if (fusionType2 !== null && fusionType2 !== types[0]) { @@ -1284,13 +1900,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } else if (fusionType1 !== types[0]) { secondType = fusionType1; } + + if ( + secondType === PokemonType.UNKNOWN && + Utils.isNullOrUndefined(fusionType2) + ) { + // If second pokemon was monotype and shared its primary type + secondType = + customTypes && + this.customPokemonData.types.length > 1 && + this.customPokemonData.types[1] !== PokemonType.UNKNOWN + ? this.customPokemonData.types[1] + : (speciesForm.type2 ?? PokemonType.UNKNOWN); + } } else { // If not a fusion, just get the second type from the species, checking for permanent changes from ME - secondType = (customTypes && this.customPokemonData.types.length > 1 && this.customPokemonData.types[1] !== Type.UNKNOWN) - ? this.customPokemonData.types[1] : (speciesForm.type2 ?? Type.UNKNOWN); + secondType = + customTypes && + this.customPokemonData.types.length > 1 && + this.customPokemonData.types[1] !== PokemonType.UNKNOWN + ? this.customPokemonData.types[1] + : (speciesForm.type2 ?? PokemonType.UNKNOWN); } - if (secondType !== Type.UNKNOWN) { + if (secondType !== PokemonType.UNKNOWN) { types.push(secondType); } } @@ -1298,19 +1931,24 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // become UNKNOWN if no types are present if (!types.length) { - types.push(Type.UNKNOWN); + types.push(PokemonType.UNKNOWN); } // remove UNKNOWN if other types are present - if (types.length > 1 && types.includes(Type.UNKNOWN)) { - const index = types.indexOf(Type.UNKNOWN); + if (types.length > 1 && types.includes(PokemonType.UNKNOWN)) { + const index = types.indexOf(PokemonType.UNKNOWN); if (index !== -1) { types.splice(index, 1); } } // the type added to Pokemon from moves like Forest's Curse or Trick Or Treat - if (!ignoreOverride && this.summonData && this.summonData.addedType && !types.includes(this.summonData.addedType)) { + if ( + !ignoreOverride && + this.summonData && + this.summonData.addedType && + !types.includes(this.summonData.addedType) + ) { types.push(this.summonData.addedType); } @@ -1324,14 +1962,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { /** * Checks if the pokemon's typing includes the specified type - * @param type - {@linkcode Type} to check + * @param type - {@linkcode PokemonType} to check * @param includeTeraType - `true` to include tera-formed type; Default: `true` * @param forDefend - `true` if the pokemon is defending from an attack; Default: `false` * @param ignoreOverride - If `true`, ignore ability changing effects; Default: `false` * @returns `true` if the Pokemon's type matches */ - public isOfType(type: Type, includeTeraType: boolean = true, forDefend: boolean = false, ignoreOverride: boolean = false): boolean { - return this.getTypes(includeTeraType, forDefend, ignoreOverride).some((t) => t === type); + public isOfType( + type: PokemonType, + includeTeraType = true, + forDefend = false, + ignoreOverride = false, + ): boolean { + return this.getTypes(includeTeraType, forDefend, ignoreOverride).some( + t => t === type, + ); } /** @@ -1342,7 +1987,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreOverride - If `true`, ignore ability changing effects; Default: `false` * @returns The non-passive {@linkcode Ability} of the pokemon */ - public getAbility(ignoreOverride: boolean = false): Ability { + public getAbility(ignoreOverride = false): Ability { if (!ignoreOverride && this.summonData?.ability) { return allAbilities[this.summonData.ability]; } @@ -1353,16 +1998,27 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return allAbilities[Overrides.OPP_ABILITY_OVERRIDE]; } if (this.isFusion()) { - if (!isNullOrUndefined(this.fusionCustomPokemonData?.ability) && this.fusionCustomPokemonData.ability !== -1) { + if ( + !isNullOrUndefined(this.fusionCustomPokemonData?.ability) && + this.fusionCustomPokemonData.ability !== -1 + ) { return allAbilities[this.fusionCustomPokemonData.ability]; - } else { - return allAbilities[this.getFusionSpeciesForm(ignoreOverride).getAbility(this.fusionAbilityIndex)]; } + return allAbilities[ + this.getFusionSpeciesForm(ignoreOverride).getAbility( + this.fusionAbilityIndex, + ) + ]; } - if (!isNullOrUndefined(this.customPokemonData.ability) && this.customPokemonData.ability !== -1) { + if ( + !isNullOrUndefined(this.customPokemonData.ability) && + this.customPokemonData.ability !== -1 + ) { return allAbilities[this.customPokemonData.ability]; } - let abilityId = this.getSpeciesForm(ignoreOverride).getAbility(this.abilityIndex); + let abilityId = this.getSpeciesForm(ignoreOverride).getAbility( + this.abilityIndex, + ); if (abilityId === Abilities.NONE) { abilityId = this.species.ability1; } @@ -1383,7 +2039,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (Overrides.OPP_PASSIVE_ABILITY_OVERRIDE && !this.isPlayer()) { return allAbilities[Overrides.OPP_PASSIVE_ABILITY_OVERRIDE]; } - if (!isNullOrUndefined(this.customPokemonData.passive) && this.customPokemonData.passive !== -1) { + if ( + !isNullOrUndefined(this.customPokemonData.passive) && + this.customPokemonData.passive !== -1 + ) { return allAbilities[this.customPokemonData.passive]; } @@ -1399,11 +2058,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreOverride - If `true`, it ignores ability changing effects; Default `false` * @returns An array of all the ability attributes on this ability. */ - public getAbilityAttrs(attrType: { new(...args: any[]): T }, canApply: boolean = true, ignoreOverride: boolean = false): T[] { + public getAbilityAttrs( + attrType: { new (...args: any[]): T }, + canApply = true, + ignoreOverride = false, + ): T[] { const abilityAttrs: T[] = []; if (!canApply || this.canApplyAbility()) { - abilityAttrs.push(...this.getAbility(ignoreOverride).getAttrs(attrType)); + abilityAttrs.push( + ...this.getAbility(ignoreOverride).getAttrs(attrType), + ); } if (!canApply || this.canApplyAbility(true)) { @@ -1413,6 +2078,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return abilityAttrs; } + /** + * Sets the {@linkcode Pokemon}'s ability and activates it if it normally activates on summon + * + * Also clears primal weather if it is from the ability being changed + * @param ability New Ability + */ + public setTempAbility(ability: Ability, passive = false): void { + applyOnLoseAbAttrs(this, passive); + if (passive) { + this.summonData.passiveAbility = ability.id; + } else { + this.summonData.ability = ability.id; + } + applyOnGainAbAttrs(this, passive); + } + + /** + * Suppresses an ability and calls its onlose attributes + */ + public suppressAbility() { + [true, false].forEach(passive => applyOnLoseAbAttrs(this, passive)); + this.summonData.abilitySuppressed = true; + } + /** * Checks if a pokemon has a passive either from: * - bought with starter candy @@ -1422,18 +2111,32 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ public hasPassive(): boolean { // returns override if valid for current case - if ((Overrides.PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE && this.isPlayer()) - || (Overrides.OPP_PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE && !this.isPlayer())) { + if ( + (Overrides.HAS_PASSIVE_ABILITY_OVERRIDE === false && this.isPlayer()) || + (Overrides.OPP_HAS_PASSIVE_ABILITY_OVERRIDE === false && !this.isPlayer()) + ) { + return false; + } + if ( + ((Overrides.PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE || + Overrides.HAS_PASSIVE_ABILITY_OVERRIDE) && + this.isPlayer()) || + ((Overrides.OPP_PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE || + Overrides.OPP_HAS_PASSIVE_ABILITY_OVERRIDE) && + !this.isPlayer()) + ) { return true; } // Classic Final boss and Endless Minor/Major bosses do not have passive const { currentBattle, gameMode } = globalScene; const waveIndex = currentBattle?.waveIndex; - if (this instanceof EnemyPokemon && + if ( + this instanceof EnemyPokemon && (currentBattle?.battleSpec === BattleSpec.FINAL_BOSS || - gameMode.isEndlessMinorBoss(waveIndex) || - gameMode.isEndlessMajorBoss(waveIndex))) { + gameMode.isEndlessMinorBoss(waveIndex) || + gameMode.isEndlessMajorBoss(waveIndex)) + ) { return false; } @@ -1447,36 +2150,58 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param passive If true, check if passive can be applied instead of non-passive * @returns `true` if the ability can be applied */ - public canApplyAbility(passive: boolean = false): boolean { + public canApplyAbility(passive = false): boolean { if (passive && !this.hasPassive()) { return false; } - const ability = (!passive ? this.getAbility() : this.getPassiveAbility()); + const ability = !passive ? this.getAbility() : this.getPassiveAbility(); if (this.isFusion() && ability.hasAttr(NoFusionAbilityAbAttr)) { return false; } const arena = globalScene?.arena; - if (arena.ignoreAbilities && arena.ignoringEffectSource !== this.getBattlerIndex() && ability.isIgnorable) { + if ( + arena.ignoreAbilities && + arena.ignoringEffectSource !== this.getBattlerIndex() && + ability.isIgnorable + ) { return false; } - if (this.summonData?.abilitySuppressed && !ability.hasAttr(UnsuppressableAbilityAbAttr)) { + if ( + this.summonData?.abilitySuppressed && + !ability.hasAttr(UnsuppressableAbilityAbAttr) + ) { return false; } - if (this.isOnField() && !ability.hasAttr(SuppressFieldAbilitiesAbAttr)) { - const suppressed = new Utils.BooleanHolder(false); - globalScene.getField(true).filter(p => p !== this).map(p => { - if (p.getAbility().hasAttr(SuppressFieldAbilitiesAbAttr) && p.canApplyAbility()) { - p.getAbility().getAttrs(SuppressFieldAbilitiesAbAttr).map(a => a.apply(this, false, false, suppressed, [ ability ])); - } - if (p.getPassiveAbility().hasAttr(SuppressFieldAbilitiesAbAttr) && p.canApplyAbility(true)) { - p.getPassiveAbility().getAttrs(SuppressFieldAbilitiesAbAttr).map(a => a.apply(this, true, false, suppressed, [ ability ])); - } - }); - if (suppressed.value) { + const suppressAbilitiesTag = arena.getTag( + ArenaTagType.NEUTRALIZING_GAS, + ) as SuppressAbilitiesTag; + if ( + this.isOnField() && + suppressAbilitiesTag && + !suppressAbilitiesTag.isBeingRemoved() + ) { + const thisAbilitySuppressing = ability.hasAttr( + PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, + ); + const hasSuppressingAbility = this.hasAbilityWithAttr( + PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, + false, + ); + // Neutralizing gas is up - suppress abilities unless they are unsuppressable or this pokemon is responsible for the gas + // (Balance decided that the other ability of a neutralizing gas pokemon should not be neutralized) + // If the ability itself is neutralizing gas, don't suppress it (handled through arena tag) + const unsuppressable = + ability.hasAttr(UnsuppressableAbilityAbAttr) || + thisAbilitySuppressing || + (hasSuppressingAbility && !suppressAbilitiesTag.shouldApplyToSelf()); + if (!unsuppressable) { return false; } } - return (this.hp > 0 || ability.isBypassFaint) && !ability.conditions.find(condition => !condition(this)); + return ( + (this.hp > 0 || ability.isBypassFaint) && + !ability.conditions.find(condition => !condition(this)) + ); } /** @@ -1488,11 +2213,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param {boolean} ignoreOverride If true, it ignores ability changing effects * @returns {boolean} Whether the ability is present and active */ - public hasAbility(ability: Abilities, canApply: boolean = true, ignoreOverride?: boolean): boolean { - if (this.getAbility(ignoreOverride).id === ability && (!canApply || this.canApplyAbility())) { + public hasAbility( + ability: Abilities, + canApply = true, + ignoreOverride?: boolean, + ): boolean { + if ( + this.getAbility(ignoreOverride).id === ability && + (!canApply || this.canApplyAbility()) + ) { return true; } - if (this.getPassiveAbility().id === ability && this.hasPassive() && (!canApply || this.canApplyAbility(true))) { + if ( + this.getPassiveAbility().id === ability && + this.hasPassive() && + (!canApply || this.canApplyAbility(true)) + ) { return true; } return false; @@ -1508,11 +2244,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param {boolean} ignoreOverride If true, it ignores ability changing effects * @returns {boolean} Whether an ability with that attribute is present and active */ - public hasAbilityWithAttr(attrType: Constructor, canApply: boolean = true, ignoreOverride?: boolean): boolean { - if ((!canApply || this.canApplyAbility()) && this.getAbility(ignoreOverride).hasAttr(attrType)) { + public hasAbilityWithAttr( + attrType: Constructor, + canApply = true, + ignoreOverride?: boolean, + ): boolean { + if ( + (!canApply || this.canApplyAbility()) && + this.getAbility(ignoreOverride).hasAttr(attrType) + ) { return true; } - if (this.hasPassive() && (!canApply || this.canApplyAbility(true)) && this.getPassiveAbility().hasAttr(attrType)) { + if ( + this.hasPassive() && + (!canApply || this.canApplyAbility(true)) && + this.getPassiveAbility().hasAttr(attrType) + ) { return true; } return false; @@ -1538,27 +2285,46 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } /** - * @returns the pokemon's current tera {@linkcode Type}, or `Type.UNKNOWN` if the pokemon is not terastallized + * @returns the pokemon's current tera {@linkcode PokemonType} */ - public getTeraType(): Type { - // I don't think this should be possible anymore, please report if you encounter this. --NightKev - if (globalScene === undefined) { - console.warn("Pokemon.getTeraType(): Global scene is not defined!"); - return Type.UNKNOWN; + getTeraType(): PokemonType { + if (this.hasSpecies(Species.TERAPAGOS)) { + return PokemonType.STELLAR; } - const teraModifier = globalScene.findModifier(m => - m instanceof TerastallizeModifier - && m.pokemonId === this.id - && m.getBattlesLeft() > 0, this.isPlayer()) as TerastallizeModifier; - return teraModifier?.teraType ?? Type.UNKNOWN; - } - - public isTerastallized(): boolean { - return this.getTeraType() !== Type.UNKNOWN; + if (this.hasSpecies(Species.OGERPON)) { + const ogerponForm = + this.species.speciesId === Species.OGERPON + ? this.formIndex + : this.fusionFormIndex; + switch (ogerponForm) { + case 0: + case 4: + return PokemonType.GRASS; + case 1: + case 5: + return PokemonType.WATER; + case 2: + case 6: + return PokemonType.FIRE; + case 3: + case 7: + return PokemonType.ROCK; + } + } + if (this.hasSpecies(Species.SHEDINJA)) { + return PokemonType.BUG; + } + return this.teraType; } public isGrounded(): boolean { - return !!this.getTag(GroundedTag) || (!this.isOfType(Type.FLYING, true, true) && !this.hasAbility(Abilities.LEVITATE) && !this.getTag(BattlerTagType.FLOATING) && !this.getTag(SemiInvulnerableTag)); + return ( + !!this.getTag(GroundedTag) || + (!this.isOfType(PokemonType.FLYING, true, true) && + !this.hasAbility(Abilities.LEVITATE) && + !this.getTag(BattlerTagType.FLOATING) && + !this.getTag(SemiInvulnerableTag)) + ); } /** @@ -1569,13 +2335,16 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param simulated - If `true`, applies abilities via simulated calls. * @returns `true` if the pokemon is trapped */ - public isTrapped(trappedAbMessages: string[] = [], simulated: boolean = true): boolean { + public isTrapped( + trappedAbMessages: string[] = [], + simulated = true, + ): boolean { const commandedTag = this.getTag(BattlerTagType.COMMANDED); if (commandedTag?.getSourcePokemon()?.isActive(true)) { return true; } - if (this.isOfType(Type.GHOST)) { + if (this.isOfType(PokemonType.GHOST)) { return false; } @@ -1584,15 +2353,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Contains opposing Pokemon (Enemy/Player Pokemon) depending on perspective * Afterwards, it filters out Pokemon that have been switched out of the field so trapped abilities/moves do not trigger */ - const opposingFieldUnfiltered = this.isPlayer() ? globalScene.getEnemyField() : globalScene.getPlayerField(); - const opposingField = opposingFieldUnfiltered.filter(enemyPkm => enemyPkm.switchOutStatus === false); - - opposingField.forEach((opponent) => - applyCheckTrappedAbAttrs(CheckTrappedAbAttr, opponent, trappedByAbility, this, trappedAbMessages, simulated) + const opposingFieldUnfiltered = this.isPlayer() + ? globalScene.getEnemyField() + : globalScene.getPlayerField(); + const opposingField = opposingFieldUnfiltered.filter( + enemyPkm => enemyPkm.switchOutStatus === false, ); + for (const opponent of opposingField) { + applyCheckTrappedAbAttrs( + CheckTrappedAbAttr, + opponent, + trappedByAbility, + this, + trappedAbMessages, + simulated, + ); + } + const side = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; - return (trappedByAbility.value || !!this.getTag(TrappedTag) || !!globalScene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, side)); + return ( + trappedByAbility.value || + !!this.getTag(TrappedTag) || + !!globalScene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, side) + ); } /** @@ -1600,23 +2384,33 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * type-changing move and ability attributes have applied. * @param move - {@linkcode Move} The move being used. * @param simulated - If `true`, prevents showing abilities applied in this calculation. - * @returns The {@linkcode Type} of the move after attributes are applied + * @returns The {@linkcode PokemonType} of the move after attributes are applied */ - public getMoveType(move: Move, simulated: boolean = true): Type { + public getMoveType(move: Move, simulated = true): PokemonType { const moveTypeHolder = new Utils.NumberHolder(move.type); applyMoveAttrs(VariableMoveTypeAttr, this, null, move, moveTypeHolder); - applyPreAttackAbAttrs(MoveTypeChangeAbAttr, this, null, move, simulated, moveTypeHolder); + applyPreAttackAbAttrs( + MoveTypeChangeAbAttr, + this, + null, + move, + simulated, + moveTypeHolder, + ); - globalScene.arena.applyTags(ArenaTagType.ION_DELUGE, simulated, moveTypeHolder); + globalScene.arena.applyTags( + ArenaTagType.ION_DELUGE, + simulated, + moveTypeHolder, + ); if (this.getTag(BattlerTagType.ELECTRIFIED)) { - moveTypeHolder.value = Type.ELECTRIC; + moveTypeHolder.value = PokemonType.ELECTRIC; } - return moveTypeHolder.value as Type; + return moveTypeHolder.value as PokemonType; } - /** * Calculates the effectiveness of a move against the Pokémon. * This includes modifiers from move and ability attributes. @@ -1628,7 +2422,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Currently only used by {@linkcode Pokemon.apply} to determine whether a "No effect" message should be shown. * @returns The type damage multiplier, indicating the effectiveness of the move */ - getMoveEffectiveness(source: Pokemon, move: Move, ignoreAbility: boolean = false, simulated: boolean = true, cancelled?: Utils.BooleanHolder): TypeDamageMultiplier { + getMoveEffectiveness( + source: Pokemon, + move: Move, + ignoreAbility = false, + simulated = true, + cancelled?: Utils.BooleanHolder, + ): TypeDamageMultiplier { if (!Utils.isNullOrUndefined(this.turnData?.moveEffectiveness)) { return this.turnData?.moveEffectiveness; } @@ -1638,36 +2438,84 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } const moveType = source.getMoveType(move); - const typeMultiplier = new Utils.NumberHolder((move.category !== MoveCategory.STATUS || move.hasAttr(RespectAttackTypeImmunityAttr)) - ? this.getAttackTypeEffectiveness(moveType, source, false, simulated, move) - : 1); + const typeMultiplier = new Utils.NumberHolder( + move.category !== MoveCategory.STATUS || + move.hasAttr(RespectAttackTypeImmunityAttr) + ? this.getAttackTypeEffectiveness( + moveType, + source, + false, + simulated, + move, + ) + : 1, + ); - applyMoveAttrs(VariableMoveTypeMultiplierAttr, source, this, move, typeMultiplier); - if (this.getTypes(true, true).find(t => move.isTypeImmune(source, this, t))) { + applyMoveAttrs( + VariableMoveTypeMultiplierAttr, + source, + this, + move, + typeMultiplier, + ); + if ( + this.getTypes(true, true).find(t => move.isTypeImmune(source, this, t)) + ) { typeMultiplier.value = 0; } - if (this.getTag(TarShotTag) && (this.getMoveType(move) === Type.FIRE)) { + if (this.getTag(TarShotTag) && this.getMoveType(move) === PokemonType.FIRE) { typeMultiplier.value *= 2; } const cancelledHolder = cancelled ?? new Utils.BooleanHolder(false); if (!ignoreAbility) { - applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier); + applyPreDefendAbAttrs( + TypeImmunityAbAttr, + this, + source, + move, + cancelledHolder, + simulated, + typeMultiplier, + ); if (!cancelledHolder.value) { - applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier); + applyPreDefendAbAttrs( + MoveImmunityAbAttr, + this, + source, + move, + cancelledHolder, + simulated, + typeMultiplier, + ); } if (!cancelledHolder.value) { - const defendingSidePlayField = this.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField(); - defendingSidePlayField.forEach((p) => applyPreDefendAbAttrs(FieldPriorityMoveImmunityAbAttr, p, source, move, cancelledHolder)); + const defendingSidePlayField = this.isPlayer() + ? globalScene.getPlayerField() + : globalScene.getEnemyField(); + defendingSidePlayField.forEach(p => + applyPreDefendAbAttrs( + FieldPriorityMoveImmunityAbAttr, + p, + source, + move, + cancelledHolder, + ), + ); } } - const immuneTags = this.findTags(tag => tag instanceof TypeImmuneTag && tag.immuneType === moveType); + const immuneTags = this.findTags( + tag => tag instanceof TypeImmuneTag && tag.immuneType === moveType, + ); for (const tag of immuneTags) { - if (move && !move.getAttrs(HitsTagAttr).some(attr => attr.tagType === tag.tagType)) { + if ( + move && + !move.getAttrs(HitsTagAttr).some(attr => attr.tagType === tag.tagType) + ) { typeMultiplier.value = 0; break; } @@ -1675,72 +2523,133 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Apply Tera Shell's effect to attacks after all immunities are accounted for if (!ignoreAbility && move.category !== MoveCategory.STATUS) { - applyPreDefendAbAttrs(FullHpResistTypeAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier); + applyPreDefendAbAttrs( + FullHpResistTypeAbAttr, + this, + source, + move, + cancelledHolder, + simulated, + typeMultiplier, + ); } - if (move.category === MoveCategory.STATUS && move.hitsSubstitute(source, this)) { + if ( + move.category === MoveCategory.STATUS && + move.hitsSubstitute(source, this) + ) { typeMultiplier.value = 0; } - return (!cancelledHolder.value ? typeMultiplier.value : 0) as TypeDamageMultiplier; + return ( + !cancelledHolder.value ? typeMultiplier.value : 0 + ) as TypeDamageMultiplier; } /** * Calculates the move's type effectiveness multiplier based on the target's type/s. - * @param moveType {@linkcode Type} the type of the move being used + * @param moveType {@linkcode PokemonType} the type of the move being used * @param source {@linkcode Pokemon} the Pokemon using the move * @param ignoreStrongWinds whether or not this ignores strong winds (anticipation, forewarn, stealth rocks) * @param simulated tag to only apply the strong winds effect message when the move is used * @param move (optional) the move whose type effectiveness is to be checked. Used for applying {@linkcode VariableMoveTypeChartAttr} * @returns a multiplier for the type effectiveness */ - getAttackTypeEffectiveness(moveType: Type, source?: Pokemon, ignoreStrongWinds: boolean = false, simulated: boolean = true, move?: Move): TypeDamageMultiplier { - if (moveType === Type.STELLAR) { - return this.isTerastallized() ? 2 : 1; + getAttackTypeEffectiveness( + moveType: PokemonType, + source?: Pokemon, + ignoreStrongWinds = false, + simulated = true, + move?: Move, + ): TypeDamageMultiplier { + if (moveType === PokemonType.STELLAR) { + return this.isTerastallized ? 2 : 1; } const types = this.getTypes(true, true); const arena = globalScene.arena; // Handle flying v ground type immunity without removing flying type so effective types are still effective // Related to https://github.com/pagefaultgames/pokerogue/issues/524 - if (moveType === Type.GROUND && (this.isGrounded() || arena.hasTag(ArenaTagType.GRAVITY))) { - const flyingIndex = types.indexOf(Type.FLYING); + if ( + moveType === PokemonType.GROUND && + (this.isGrounded() || arena.hasTag(ArenaTagType.GRAVITY)) + ) { + const flyingIndex = types.indexOf(PokemonType.FLYING); if (flyingIndex > -1) { types.splice(flyingIndex, 1); } } - let multiplier = types.map(defType => { - const multiplier = new Utils.NumberHolder(getTypeDamageMultiplier(moveType, defType)); - applyChallenges(globalScene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, multiplier); - if (move) { - applyMoveAttrs(VariableMoveTypeChartAttr, null, this, move, multiplier, defType); - } - if (source) { - const ignoreImmunity = new Utils.BooleanHolder(false); - if (source.isActive(true) && source.hasAbilityWithAttr(IgnoreTypeImmunityAbAttr)) { - applyAbAttrs(IgnoreTypeImmunityAbAttr, source, ignoreImmunity, simulated, moveType, defType); + let multiplier = types + .map(defType => { + const multiplier = new Utils.NumberHolder( + getTypeDamageMultiplier(moveType, defType), + ); + applyChallenges( + globalScene.gameMode, + ChallengeType.TYPE_EFFECTIVENESS, + multiplier, + ); + if (move) { + applyMoveAttrs( + VariableMoveTypeChartAttr, + null, + this, + move, + multiplier, + defType, + ); } - if (ignoreImmunity.value) { - if (multiplier.value === 0) { - return 1; + if (source) { + const ignoreImmunity = new Utils.BooleanHolder(false); + if ( + source.isActive(true) && + source.hasAbilityWithAttr(IgnoreTypeImmunityAbAttr) + ) { + applyAbAttrs( + IgnoreTypeImmunityAbAttr, + source, + ignoreImmunity, + simulated, + moveType, + defType, + ); + } + if (ignoreImmunity.value) { + if (multiplier.value === 0) { + return 1; + } + } + + const exposedTags = this.findTags( + tag => tag instanceof ExposedTag, + ) as ExposedTag[]; + if (exposedTags.some(t => t.ignoreImmunity(defType, moveType))) { + if (multiplier.value === 0) { + return 1; + } } } + return multiplier.value; + }) + .reduce((acc, cur) => acc * cur, 1) as TypeDamageMultiplier; - const exposedTags = this.findTags(tag => tag instanceof ExposedTag) as ExposedTag[]; - if (exposedTags.some(t => t.ignoreImmunity(defType, moveType))) { - if (multiplier.value === 0) { - return 1; - } - } - } - return multiplier.value; - }).reduce((acc, cur) => acc * cur, 1) as TypeDamageMultiplier; - - const typeMultiplierAgainstFlying = new Utils.NumberHolder(getTypeDamageMultiplier(moveType, Type.FLYING)); - applyChallenges(globalScene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, typeMultiplierAgainstFlying); + const typeMultiplierAgainstFlying = new Utils.NumberHolder( + getTypeDamageMultiplier(moveType, PokemonType.FLYING), + ); + applyChallenges( + globalScene.gameMode, + ChallengeType.TYPE_EFFECTIVENESS, + typeMultiplierAgainstFlying, + ); // Handle strong winds lowering effectiveness of types super effective against pure flying - if (!ignoreStrongWinds && arena.weather?.weatherType === WeatherType.STRONG_WINDS && !arena.weather.isEffectSuppressed() && this.isOfType(Type.FLYING) && typeMultiplierAgainstFlying.value === 2) { + if ( + !ignoreStrongWinds && + arena.weather?.weatherType === WeatherType.STRONG_WINDS && + !arena.weather.isEffectSuppressed() && + this.isOfType(PokemonType.FLYING) && + typeMultiplierAgainstFlying.value === 2 + ) { multiplier /= 2; if (!simulated) { globalScene.queueMessage(i18next.t("weather:strongWindsEffectMessage")); @@ -1759,22 +2668,35 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const types = this.getTypes(true); const enemyTypes = opponent.getTypes(true, true); /** Is this Pokemon faster than the opponent? */ - const outspeed = (this.isActive(true) ? this.getEffectiveStat(Stat.SPD, opponent) : this.getStat(Stat.SPD, false)) >= opponent.getEffectiveStat(Stat.SPD, this); + const outspeed = + (this.isActive(true) + ? this.getEffectiveStat(Stat.SPD, opponent) + : this.getStat(Stat.SPD, false)) >= + opponent.getEffectiveStat(Stat.SPD, this); /** * Based on how effective this Pokemon's types are offensively against the opponent's types. * This score is increased by 25 percent if this Pokemon is faster than the opponent. */ - let atkScore = opponent.getAttackTypeEffectiveness(types[0], this) * (outspeed ? 1.25 : 1); + let atkScore = + opponent.getAttackTypeEffectiveness(types[0], this) * + (outspeed ? 1.25 : 1); /** * Based on how effectively this Pokemon defends against the opponent's types. * This score cannot be higher than 4. */ - let defScore = 1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[0], opponent), 0.25); + let defScore = + 1 / + Math.max(this.getAttackTypeEffectiveness(enemyTypes[0], opponent), 0.25); if (types.length > 1) { atkScore *= opponent.getAttackTypeEffectiveness(types[1], this); } if (enemyTypes.length > 1) { - defScore *= (1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[1], opponent), 0.25)); + defScore *= + 1 / + Math.max( + this.getAttackTypeEffectiveness(enemyTypes[1], opponent), + 0.25, + ); } /** * Based on this Pokemon's HP ratio compared to that of the opponent. @@ -1792,19 +2714,41 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (pokemonEvolutions.hasOwnProperty(this.species.speciesId)) { const evolutions = pokemonEvolutions[this.species.speciesId]; for (const e of evolutions) { - if (!e.item && this.level >= e.level && (isNullOrUndefined(e.preFormKey) || this.getFormKey() === e.preFormKey)) { - if (e.condition === null || (e.condition as SpeciesEvolutionCondition).predicate(this)) { + if ( + !e.item && + this.level >= e.level && + (isNullOrUndefined(e.preFormKey) || + this.getFormKey() === e.preFormKey) + ) { + if ( + e.condition === null || + (e.condition as SpeciesEvolutionCondition).predicate(this) + ) { return e; } } } } - if (this.isFusion() && this.fusionSpecies && pokemonEvolutions.hasOwnProperty(this.fusionSpecies.speciesId)) { - const fusionEvolutions = pokemonEvolutions[this.fusionSpecies.speciesId].map(e => new FusionSpeciesFormEvolution(this.species.speciesId, e)); + if ( + this.isFusion() && + this.fusionSpecies && + pokemonEvolutions.hasOwnProperty(this.fusionSpecies.speciesId) + ) { + const fusionEvolutions = pokemonEvolutions[ + this.fusionSpecies.speciesId + ].map(e => new FusionSpeciesFormEvolution(this.species.speciesId, e)); for (const fe of fusionEvolutions) { - if (!fe.item && this.level >= fe.level && (isNullOrUndefined(fe.preFormKey) || this.getFusionFormKey() === fe.preFormKey)) { - if (fe.condition === null || (fe.condition as SpeciesEvolutionCondition).predicate(this)) { + if ( + !fe.item && + this.level >= fe.level && + (isNullOrUndefined(fe.preFormKey) || + this.getFusionFormKey() === fe.preFormKey) + ) { + if ( + fe.condition === null || + (fe.condition as SpeciesEvolutionCondition).predicate(this) + ) { return fe; } } @@ -1816,54 +2760,131 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { /** * Gets all level up moves in a given range for a particular pokemon. - * @param {integer} startingLevel Don't include moves below this level + * @param {number} startingLevel Don't include moves below this level * @param {boolean} includeEvolutionMoves Whether to include evolution moves * @param {boolean} simulateEvolutionChain Whether to include moves from prior evolutions * @param {boolean} includeRelearnerMoves Whether to include moves that would require a relearner. Note the move relearner inherently allows evolution moves * @returns {LevelMoves} A list of moves and the levels they can be learned at */ - getLevelMoves(startingLevel?: integer, includeEvolutionMoves: boolean = false, simulateEvolutionChain: boolean = false, includeRelearnerMoves: boolean = false, learnSituation: LearnMoveSituation = LearnMoveSituation.MISC): LevelMoves { + getLevelMoves( + startingLevel?: number, + includeEvolutionMoves = false, + simulateEvolutionChain = false, + includeRelearnerMoves = false, + learnSituation: LearnMoveSituation = LearnMoveSituation.MISC, + ): LevelMoves { const ret: LevelMoves = []; let levelMoves: LevelMoves = []; if (!startingLevel) { startingLevel = this.level; } - if (learnSituation === LearnMoveSituation.EVOLUTION_FUSED && this.fusionSpecies) { // For fusion evolutions, get ONLY the moves of the component mon that evolved - levelMoves = this.getFusionSpeciesForm(true).getLevelMoves().filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || (includeRelearnerMoves && lm[0] === RELEARN_MOVE) || lm[0] > 0); + if ( + learnSituation === LearnMoveSituation.EVOLUTION_FUSED && + this.fusionSpecies + ) { + // For fusion evolutions, get ONLY the moves of the component mon that evolved + levelMoves = this.getFusionSpeciesForm(true) + .getLevelMoves() + .filter( + lm => + (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || + (includeRelearnerMoves && lm[0] === RELEARN_MOVE) || + lm[0] > 0, + ); } else { if (simulateEvolutionChain) { - const evolutionChain = this.species.getSimulatedEvolutionChain(this.level, this.hasTrainer(), this.isBoss(), this.isPlayer()); + const evolutionChain = this.species.getSimulatedEvolutionChain( + this.level, + this.hasTrainer(), + this.isBoss(), + this.isPlayer(), + ); for (let e = 0; e < evolutionChain.length; e++) { // TODO: Might need to pass specific form index in simulated evolution chain - const speciesLevelMoves = getPokemonSpeciesForm(evolutionChain[e][0], this.formIndex).getLevelMoves(); + const speciesLevelMoves = getPokemonSpeciesForm( + evolutionChain[e][0], + this.formIndex, + ).getLevelMoves(); if (includeRelearnerMoves) { levelMoves.push(...speciesLevelMoves); } else { - levelMoves.push(...speciesLevelMoves.filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || ((!e || lm[0] > 1) && (e === evolutionChain.length - 1 || lm[0] <= evolutionChain[e + 1][1])))); + levelMoves.push( + ...speciesLevelMoves.filter( + lm => + (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || + ((!e || lm[0] > 1) && + (e === evolutionChain.length - 1 || + lm[0] <= evolutionChain[e + 1][1])), + ), + ); } } } else { - levelMoves = this.getSpeciesForm(true).getLevelMoves().filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || (includeRelearnerMoves && lm[0] === RELEARN_MOVE) || lm[0] > 0); + levelMoves = this.getSpeciesForm(true) + .getLevelMoves() + .filter( + lm => + (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || + (includeRelearnerMoves && lm[0] === RELEARN_MOVE) || + lm[0] > 0, + ); } - if (this.fusionSpecies && learnSituation !== LearnMoveSituation.EVOLUTION_FUSED_BASE) { // For fusion evolutions, get ONLY the moves of the component mon that evolved + if ( + this.fusionSpecies && + learnSituation !== LearnMoveSituation.EVOLUTION_FUSED_BASE + ) { + // For fusion evolutions, get ONLY the moves of the component mon that evolved if (simulateEvolutionChain) { - const fusionEvolutionChain = this.fusionSpecies.getSimulatedEvolutionChain(this.level, this.hasTrainer(), this.isBoss(), this.isPlayer()); + const fusionEvolutionChain = + this.fusionSpecies.getSimulatedEvolutionChain( + this.level, + this.hasTrainer(), + this.isBoss(), + this.isPlayer(), + ); for (let e = 0; e < fusionEvolutionChain.length; e++) { // TODO: Might need to pass specific form index in simulated evolution chain - const speciesLevelMoves = getPokemonSpeciesForm(fusionEvolutionChain[e][0], this.fusionFormIndex).getLevelMoves(); + const speciesLevelMoves = getPokemonSpeciesForm( + fusionEvolutionChain[e][0], + this.fusionFormIndex, + ).getLevelMoves(); if (includeRelearnerMoves) { - levelMoves.push(...speciesLevelMoves.filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || lm[0] !== EVOLVE_MOVE)); + levelMoves.push( + ...speciesLevelMoves.filter( + lm => + (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || + lm[0] !== EVOLVE_MOVE, + ), + ); } else { - levelMoves.push(...speciesLevelMoves.filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || ((!e || lm[0] > 1) && (e === fusionEvolutionChain.length - 1 || lm[0] <= fusionEvolutionChain[e + 1][1])))); + levelMoves.push( + ...speciesLevelMoves.filter( + lm => + (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || + ((!e || lm[0] > 1) && + (e === fusionEvolutionChain.length - 1 || + lm[0] <= fusionEvolutionChain[e + 1][1])), + ), + ); } } } else { - levelMoves.push(...this.getFusionSpeciesForm(true).getLevelMoves().filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || (includeRelearnerMoves && lm[0] === RELEARN_MOVE) || lm[0] > 0)); + levelMoves.push( + ...this.getFusionSpeciesForm(true) + .getLevelMoves() + .filter( + lm => + (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || + (includeRelearnerMoves && lm[0] === RELEARN_MOVE) || + lm[0] > 0, + ), + ); } } } - levelMoves.sort((lma: [integer, integer], lmb: [integer, integer]) => lma[0] > lmb[0] ? 1 : lma[0] < lmb[0] ? -1 : 0); - + levelMoves.sort((lma: [number, number], lmb: [number, number]) => + lma[0] > lmb[0] ? 1 : lma[0] < lmb[0] ? -1 : 0, + ); /** * Filter out moves not within the correct level range(s) @@ -1873,10 +2894,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { levelMoves = levelMoves.filter(lm => { const level = lm[0]; const isRelearner = level < startingLevel; - const allowedEvolutionMove = (level === 0) && includeEvolutionMoves; + const allowedEvolutionMove = level === 0 && includeEvolutionMoves; - return !(level > this.level) - && (includeRelearnerMoves || !isRelearner || allowedEvolutionMove); + return ( + !(level > this.level) && + (includeRelearnerMoves || !isRelearner || allowedEvolutionMove) + ); }); /** @@ -1899,8 +2922,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param levelMoves the input array to search for non-duplicates from * @param ret the output array to be pushed into. */ - private getUniqueMoves(levelMoves: LevelMoves, ret: LevelMoves ): void { - const uniqueMoves : Moves[] = []; + private getUniqueMoves(levelMoves: LevelMoves, ret: LevelMoves): void { + const uniqueMoves: Moves[] = []; for (const lm of levelMoves) { if (!uniqueMoves.find(m => m === lm[1])) { uniqueMoves.push(lm[1]); @@ -1909,17 +2932,16 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } - /** * Get a list of all egg moves * * @returns list of egg moves */ - getEggMoves() : Moves[] | undefined { + getEggMoves(): Moves[] | undefined { return speciesEggMoves[this.getSpeciesForm().getRootSpeciesId()]; } - setMove(moveIndex: integer, moveId: Moves): void { + setMove(moveIndex: number, moveId: Moves): void { const move = moveId ? new PokemonMove(moveId) : null; this.moveset[moveIndex] = move; if (this.summonData?.moveset) { @@ -1940,12 +2962,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ trySetShiny(thresholdOverride?: number): boolean { // Shiny Pokemon should not spawn in the end biome in endless - if (globalScene.gameMode.isEndless && globalScene.arena.biomeType === Biome.END) { + if ( + globalScene.gameMode.isEndless && + globalScene.arena.biomeType === Biome.END + ) { return false; } - const rand1 = (this.id & 0xFFFF0000) >>> 16; - const rand2 = (this.id & 0x0000FFFF); + const rand1 = (this.id & 0xffff0000) >>> 16; + const rand2 = this.id & 0x0000ffff; const E = globalScene.gameData.trainerId ^ globalScene.gameData.secretId; const F = rand1 ^ rand2; @@ -1956,7 +2981,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { shinyThreshold.value *= globalScene.eventManager.getShinyMultiplier(); } if (!this.hasTrainer()) { - globalScene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); + globalScene.applyModifiers( + ShinyRateBoosterModifier, + true, + shinyThreshold, + ); } } else { shinyThreshold.value = thresholdOverride; @@ -1981,7 +3010,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param applyModifiersToOverride If {@linkcode thresholdOverride} is set and this is true, will apply Shiny Charm and event modifiers to {@linkcode thresholdOverride} * @returns `true` if the Pokemon has been set as a shiny, `false` otherwise */ - public trySetShinySeed(thresholdOverride?: number, applyModifiersToOverride?: boolean): boolean { + public trySetShinySeed( + thresholdOverride?: number, + applyModifiersToOverride?: boolean, + ): boolean { const shinyThreshold = new Utils.NumberHolder(BASE_SHINY_CHANCE); if (thresholdOverride === undefined || applyModifiersToOverride) { if (thresholdOverride !== undefined && applyModifiersToOverride) { @@ -1991,7 +3023,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { shinyThreshold.value *= globalScene.eventManager.getShinyMultiplier(); } if (!this.hasTrainer()) { - globalScene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); + globalScene.applyModifiers( + ShinyRateBoosterModifier, + true, + shinyThreshold, + ); } } else { shinyThreshold.value = thresholdOverride; @@ -2001,7 +3037,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.shiny) { this.variant = this.generateShinyVariant(); - this.luck = this.variant + 1 + (this.fusionShiny ? this.fusionVariant + 1 : 0); + this.luck = + this.variant + 1 + (this.fusionShiny ? this.fusionVariant + 1 : 0); this.initShinySparkle(); } @@ -2025,20 +3062,28 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } // Checks if there is no variant data for both the index or index with form - if (!this.shiny || (!variantData.hasOwnProperty(variantDataIndex) && !variantData.hasOwnProperty(this.species.speciesId))) { + if ( + !this.shiny || + (!variantData.hasOwnProperty(variantDataIndex) && + !variantData.hasOwnProperty(this.species.speciesId)) + ) { return 0; } const rand = new Utils.NumberHolder(0); - globalScene.executeWithSeedOffset(() => { - rand.value = Utils.randSeedInt(10); - }, this.id, globalScene.waveSeed); + globalScene.executeWithSeedOffset( + () => { + rand.value = Utils.randSeedInt(10); + }, + this.id, + globalScene.waveSeed, + ); if (rand.value >= SHINY_VARIANT_CHANCE) { - return 0; // 6/10 - } else if (rand.value >= SHINY_EPIC_CHANCE) { - return 1; // 3/10 - } else { - return 2; // 1/10 + return 0; // 6/10 } + if (rand.value >= SHINY_EPIC_CHANCE) { + return 1; // 3/10 + } + return 2; // 1/10 } /** @@ -2050,7 +3095,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param applyModifiersToOverride If {@linkcode thresholdOverride} is set and this is true, will apply Ability Charm to {@linkcode thresholdOverride} * @returns `true` if the Pokemon has been set to have its hidden ability, `false` otherwise */ - public tryRerollHiddenAbilitySeed(thresholdOverride?: number, applyModifiersToOverride?: boolean): boolean { + public tryRerollHiddenAbilitySeed( + thresholdOverride?: number, + applyModifiersToOverride?: boolean, + ): boolean { if (!this.species.abilityHidden) { return false; } @@ -2060,7 +3108,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { haThreshold.value = thresholdOverride; } if (!this.hasTrainer()) { - globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, haThreshold); + globalScene.applyModifiers( + HiddenAbilityRateBoosterModifier, + true, + haThreshold, + ); } } else { haThreshold.value = thresholdOverride; @@ -2074,37 +3126,67 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } public generateFusionSpecies(forStarter?: boolean): void { - const hiddenAbilityChance = new Utils.NumberHolder(BASE_HIDDEN_ABILITY_CHANCE); + const hiddenAbilityChance = new Utils.NumberHolder( + BASE_HIDDEN_ABILITY_CHANCE, + ); if (!this.hasTrainer()) { - globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance); + globalScene.applyModifiers( + HiddenAbilityRateBoosterModifier, + true, + hiddenAbilityChance, + ); } const hasHiddenAbility = !Utils.randSeedInt(hiddenAbilityChance.value); const randAbilityIndex = Utils.randSeedInt(2); - const filter = !forStarter ? - this.species.getCompatibleFusionSpeciesFilter() + const filter = !forStarter + ? this.species.getCompatibleFusionSpeciesFilter() : (species: PokemonSpecies) => { - return pokemonEvolutions.hasOwnProperty(species.speciesId) - && !pokemonPrevolutions.hasOwnProperty(species.speciesId) - && !species.subLegendary - && !species.legendary - && !species.mythical - && !species.isTrainerForbidden() - && species.speciesId !== this.species.speciesId - && species.speciesId !== Species.DITTO; - }; + return ( + pokemonEvolutions.hasOwnProperty(species.speciesId) && + !pokemonPrevolutions.hasOwnProperty(species.speciesId) && + !species.subLegendary && + !species.legendary && + !species.mythical && + !species.isTrainerForbidden() && + species.speciesId !== this.species.speciesId && + species.speciesId !== Species.DITTO + ); + }; let fusionOverride: PokemonSpecies | undefined = undefined; - if (forStarter && this instanceof PlayerPokemon && Overrides.STARTER_FUSION_SPECIES_OVERRIDE) { - fusionOverride = getPokemonSpecies(Overrides.STARTER_FUSION_SPECIES_OVERRIDE); - } else if (this instanceof EnemyPokemon && Overrides.OPP_FUSION_SPECIES_OVERRIDE) { + if ( + forStarter && + this instanceof PlayerPokemon && + Overrides.STARTER_FUSION_SPECIES_OVERRIDE + ) { + fusionOverride = getPokemonSpecies( + Overrides.STARTER_FUSION_SPECIES_OVERRIDE, + ); + } else if ( + this instanceof EnemyPokemon && + Overrides.OPP_FUSION_SPECIES_OVERRIDE + ) { fusionOverride = getPokemonSpecies(Overrides.OPP_FUSION_SPECIES_OVERRIDE); } - this.fusionSpecies = fusionOverride ?? globalScene.randomSpecies(globalScene.currentBattle?.waveIndex || 0, this.level, false, filter, true); - this.fusionAbilityIndex = (this.fusionSpecies.abilityHidden && hasHiddenAbility ? 2 : this.fusionSpecies.ability2 !== this.fusionSpecies.ability1 ? randAbilityIndex : 0); + this.fusionSpecies = + fusionOverride ?? + globalScene.randomSpecies( + globalScene.currentBattle?.waveIndex || 0, + this.level, + false, + filter, + true, + ); + this.fusionAbilityIndex = + this.fusionSpecies.abilityHidden && hasHiddenAbility + ? 2 + : this.fusionSpecies.ability2 !== this.fusionSpecies.ability1 + ? randAbilityIndex + : 0; this.fusionShiny = this.shiny; this.fusionVariant = this.variant; @@ -2119,7 +3201,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } - this.fusionFormIndex = globalScene.getSpeciesFormIndex(this.fusionSpecies, this.fusionGender, this.getNature(), true); + this.fusionFormIndex = globalScene.getSpeciesFormIndex( + this.fusionSpecies, + this.fusionGender, + this.getNature(), + true, + ); this.fusionLuck = this.luck; this.generateName(); @@ -2145,7 +3232,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let movePool: [Moves, number][] = []; const allLevelMoves = this.getLevelMoves(1, true, true); if (!allLevelMoves) { - console.warn("Error encountered trying to generate moveset for:", this.species.name); + console.warn( + "Error encountered trying to generate moveset for:", + this.species.name, + ); return; } @@ -2163,34 +3253,55 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (weight === 1 && allMoves[levelMove[1]].power >= 80) { weight = 40; } - if (!movePool.some(m => m[0] === levelMove[1]) && !allMoves[levelMove[1]].name.endsWith(" (N)")) { - movePool.push([ levelMove[1], weight ]); + if ( + !movePool.some(m => m[0] === levelMove[1]) && + !allMoves[levelMove[1]].name.endsWith(" (N)") + ) { + movePool.push([levelMove[1], weight]); } } if (this.hasTrainer()) { const tms = Object.keys(tmSpecies); for (const tm of tms) { - const moveId = parseInt(tm) as Moves; + const moveId = Number.parseInt(tm) as Moves; let compatible = false; for (const p of tmSpecies[tm]) { if (Array.isArray(p)) { - if (p[0] === this.species.speciesId || (this.fusionSpecies && p[0] === this.fusionSpecies.speciesId) && p.slice(1).indexOf(this.species.forms[this.formIndex]) > -1) { + if ( + p[0] === this.species.speciesId || + (this.fusionSpecies && + p[0] === this.fusionSpecies.speciesId && + p.slice(1).indexOf(this.species.forms[this.formIndex]) > -1) + ) { compatible = true; break; } - } else if (p === this.species.speciesId || (this.fusionSpecies && p === this.fusionSpecies.speciesId)) { + } else if ( + p === this.species.speciesId || + (this.fusionSpecies && p === this.fusionSpecies.speciesId) + ) { compatible = true; break; } } - if (compatible && !movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) { + if ( + compatible && + !movePool.some(m => m[0] === moveId) && + !allMoves[moveId].name.endsWith(" (N)") + ) { if (tmPoolTiers[moveId] === ModifierTier.COMMON && this.level >= 15) { - movePool.push([ moveId, 4 ]); - } else if (tmPoolTiers[moveId] === ModifierTier.GREAT && this.level >= 30) { - movePool.push([ moveId, 8 ]); - } else if (tmPoolTiers[moveId] === ModifierTier.ULTRA && this.level >= 50) { - movePool.push([ moveId, 14 ]); + movePool.push([moveId, 4]); + } else if ( + tmPoolTiers[moveId] === ModifierTier.GREAT && + this.level >= 30 + ) { + movePool.push([moveId, 8]); + } else if ( + tmPoolTiers[moveId] === ModifierTier.ULTRA && + this.level >= 50 + ) { + movePool.push([moveId, 14]); } } } @@ -2199,26 +3310,44 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.level >= 60) { for (let i = 0; i < 3; i++) { const moveId = speciesEggMoves[this.species.getRootSpeciesId()][i]; - if (!movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) { - movePool.push([ moveId, 40 ]); + if ( + !movePool.some(m => m[0] === moveId) && + !allMoves[moveId].name.endsWith(" (N)") + ) { + movePool.push([moveId, 40]); } } const moveId = speciesEggMoves[this.species.getRootSpeciesId()][3]; // No rare egg moves before e4 - if (this.level >= 170 && !movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)") && !this.isBoss()) { - movePool.push([ moveId, 30 ]); + if ( + this.level >= 170 && + !movePool.some(m => m[0] === moveId) && + !allMoves[moveId].name.endsWith(" (N)") && + !this.isBoss() + ) { + movePool.push([moveId, 30]); } if (this.fusionSpecies) { for (let i = 0; i < 3; i++) { - const moveId = speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][i]; - if (!movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) { - movePool.push([ moveId, 40 ]); + const moveId = + speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][i]; + if ( + !movePool.some(m => m[0] === moveId) && + !allMoves[moveId].name.endsWith(" (N)") + ) { + movePool.push([moveId, 40]); } } - const moveId = speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][3]; + const moveId = + speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][3]; // No rare egg moves before e4 - if (this.level >= 170 && !movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)") && !this.isBoss()) { - movePool.push([ moveId, 30 ]); + if ( + this.level >= 170 && + !movePool.some(m => m[0] === moveId) && + !allMoves[moveId].name.endsWith(" (N)") && + !this.isBoss() + ) { + movePool.push([moveId, 30]); } } } @@ -2229,31 +3358,79 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(SacrificialAttr)); movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(HpSplitAttr)); } - movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(SacrificialAttrOnHit)); + movePool = movePool.filter( + m => !allMoves[m[0]].hasAttr(SacrificialAttrOnHit), + ); if (this.hasTrainer()) { // Trainers never get OHKO moves movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(OneHitKOAttr)); // Half the weight of self KO moves - movePool = movePool.map(m => [ m[0], m[1] * (!!allMoves[m[0]].hasAttr(SacrificialAttr) ? 0.5 : 1) ]); - movePool = movePool.map(m => [ m[0], m[1] * (!!allMoves[m[0]].hasAttr(SacrificialAttrOnHit) ? 0.5 : 1) ]); + movePool = movePool.map(m => [ + m[0], + m[1] * (allMoves[m[0]].hasAttr(SacrificialAttr) ? 0.5 : 1), + ]); + movePool = movePool.map(m => [ + m[0], + m[1] * (allMoves[m[0]].hasAttr(SacrificialAttrOnHit) ? 0.5 : 1), + ]); // Trainers get a weight bump to stat buffing moves - movePool = movePool.map(m => [ m[0], m[1] * (allMoves[m[0]].getAttrs(StatStageChangeAttr).some(a => a.stages > 1 && a.selfTarget) ? 1.25 : 1) ]); + movePool = movePool.map(m => [ + m[0], + m[1] * + (allMoves[m[0]] + .getAttrs(StatStageChangeAttr) + .some(a => a.stages > 1 && a.selfTarget) + ? 1.25 + : 1), + ]); // Trainers get a weight decrease to multiturn moves - movePool = movePool.map(m => [ m[0], m[1] * (!!allMoves[m[0]].isChargingMove() || !!allMoves[m[0]].hasAttr(RechargeAttr) ? 0.7 : 1) ]); + movePool = movePool.map(m => [ + m[0], + m[1] * + (!!allMoves[m[0]].isChargingMove() || + !!allMoves[m[0]].hasAttr(RechargeAttr) + ? 0.7 + : 1), + ]); } // Weight towards higher power moves, by reducing the power of moves below the highest power. // Caps max power at 90 to avoid something like hyper beam ruining the stats. // This is a pretty soft weighting factor, although it is scaled with the weight multiplier. - const maxPower = Math.min(movePool.reduce((v, m) => Math.max(allMoves[m[0]].power, v), 40), 90); - movePool = movePool.map(m => [ m[0], m[1] * (allMoves[m[0]].category === MoveCategory.STATUS ? 1 : Math.max(Math.min(allMoves[m[0]].power / maxPower, 1), 0.5)) ]); + const maxPower = Math.min( + movePool.reduce( + (v, m) => Math.max(allMoves[m[0]].calculateEffectivePower(), v), + 40, + ), + 90, + ); + movePool = movePool.map(m => [ + m[0], + m[1] * + (allMoves[m[0]].category === MoveCategory.STATUS + ? 1 + : Math.max( + Math.min(allMoves[m[0]].calculateEffectivePower() / maxPower, 1), + 0.5, + )), + ]); - // Weight damaging moves against the lower stat + // Weight damaging moves against the lower stat. This uses a non-linear relationship. + // If the higher stat is 1 - 1.09x higher, no change. At higher stat ~1.38x lower stat, off-stat moves have half weight. + // One third weight at ~1.58x higher, one quarter weight at ~1.73x higher, one fifth at ~1.87x, and one tenth at ~2.35x higher. const atk = this.getStat(Stat.ATK); const spAtk = this.getStat(Stat.SPATK); - const worseCategory: MoveCategory = atk > spAtk ? MoveCategory.SPECIAL : MoveCategory.PHYSICAL; - const statRatio = worseCategory === MoveCategory.PHYSICAL ? atk / spAtk : spAtk / atk; - movePool = movePool.map(m => [ m[0], m[1] * (allMoves[m[0]].category === worseCategory ? statRatio : 1) ]); + const worseCategory: MoveCategory = + atk > spAtk ? MoveCategory.SPECIAL : MoveCategory.PHYSICAL; + const statRatio = + worseCategory === MoveCategory.PHYSICAL ? atk / spAtk : spAtk / atk; + movePool = movePool.map(m => [ + m[0], + m[1] * + (allMoves[m[0]].category === worseCategory + ? Math.min(Math.pow(statRatio, 3) * 1.3, 1) + : 1), + ]); /** The higher this is the more the game weights towards higher level moves. At `0` all moves are equal weight. */ let weightMultiplier = 0.9; @@ -2263,11 +3440,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.isBoss()) { weightMultiplier += 0.4; } - const baseWeights: [Moves, number][] = movePool.map(m => [ m[0], Math.ceil(Math.pow(m[1], weightMultiplier) * 100) ]); + const baseWeights: [Moves, number][] = movePool.map(m => [ + m[0], + Math.ceil(Math.pow(m[1], weightMultiplier) * 100), + ]); // Trainers and bosses always force a stab move if (this.hasTrainer() || this.isBoss()) { - const stabMovePool = baseWeights.filter(m => allMoves[m[0]].category !== MoveCategory.STATUS && this.isOfType(allMoves[m[0]].type)); + const stabMovePool = baseWeights.filter( + m => + allMoves[m[0]].category !== MoveCategory.STATUS && + this.isOfType(allMoves[m[0]].type), + ); if (stabMovePool.length) { const totalWeight = stabMovePool.reduce((v, m) => v + m[1], 0); @@ -2278,8 +3462,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } this.moveset.push(new PokemonMove(stabMovePool[index][0], 0, 0)); } - } else { // Normal wild pokemon just force a random damaging move - const attackMovePool = baseWeights.filter(m => allMoves[m[0]].category !== MoveCategory.STATUS); + } else { + // Normal wild pokemon just force a random damaging move + const attackMovePool = baseWeights.filter( + m => allMoves[m[0]].category !== MoveCategory.STATUS, + ); if (attackMovePool.length) { const totalWeight = attackMovePool.reduce((v, m) => v + m[1], 0); let rand = Utils.randSeedInt(totalWeight); @@ -2291,25 +3478,49 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } - while (baseWeights.length > this.moveset.length && this.moveset.length < 4) { + while ( + baseWeights.length > this.moveset.length && + this.moveset.length < 4 + ) { if (this.hasTrainer()) { // Sqrt the weight of any damaging moves with overlapping types. This is about a 0.05 - 0.1 multiplier. - // Other damaging moves 2x weight if 0-1 damaging moves, 0.5x if 2, 0.125x if 3. These weights double if STAB. + // Other damaging moves 2x weight if 0-1 damaging moves, 0.5x if 2, 0.125x if 3. These weights get 20x if STAB. // Status moves remain unchanged on weight, this encourages 1-2 - movePool = baseWeights.filter(m => !this.moveset.some(mo => m[0] === mo?.moveId)).map((m) => { - let ret: number; - if (this.moveset.some(mo => mo?.getMove().category !== MoveCategory.STATUS && mo?.getMove().type === allMoves[m[0]].type)) { - ret = Math.ceil(Math.sqrt(m[1])); - } else if (allMoves[m[0]].category !== MoveCategory.STATUS) { - ret = Math.ceil(m[1] / Math.max(Math.pow(4, this.moveset.filter(mo => (mo?.getMove().power ?? 0) > 1).length) / 8, 0.5) * (this.isOfType(allMoves[m[0]].type) ? 2 : 1)); - } else { - ret = m[1]; - } - return [ m[0], ret ]; - }); + movePool = baseWeights + .filter(m => !this.moveset.some(mo => m[0] === mo?.moveId)) + .map(m => { + let ret: number; + if ( + this.moveset.some( + mo => + mo?.getMove().category !== MoveCategory.STATUS && + mo?.getMove().type === allMoves[m[0]].type, + ) + ) { + ret = Math.ceil(Math.sqrt(m[1])); + } else if (allMoves[m[0]].category !== MoveCategory.STATUS) { + ret = Math.ceil( + (m[1] / + Math.max( + Math.pow( + 4, + this.moveset.filter(mo => (mo?.getMove().power ?? 0) > 1) + .length, + ) / 8, + 0.5, + )) * + (this.isOfType(allMoves[m[0]].type) ? 20 : 1), + ); + } else { + ret = m[1]; + } + return [m[0], ret]; + }); } else { // Non-trainer pokemon just use normal weights - movePool = baseWeights.filter(m => !this.moveset.some(mo => m[0] === mo?.moveId)); + movePool = baseWeights.filter( + m => !this.moveset.some(mo => m[0] === mo?.moveId), + ); } const totalWeight = movePool.reduce((v, m) => v + m[1], 0); let rand = Utils.randSeedInt(totalWeight); @@ -2321,37 +3532,56 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } // Trigger FormChange, except for enemy Pokemon during Mystery Encounters, to avoid crashes - if (this.isPlayer() || !globalScene.currentBattle?.isBattleMysteryEncounter() || !globalScene.currentBattle?.mysteryEncounter) { - globalScene.triggerPokemonFormChange(this, SpeciesFormChangeMoveLearnedTrigger); + if ( + this.isPlayer() || + !globalScene.currentBattle?.isBattleMysteryEncounter() || + !globalScene.currentBattle?.mysteryEncounter + ) { + globalScene.triggerPokemonFormChange( + this, + SpeciesFormChangeMoveLearnedTrigger, + ); } } - public trySelectMove(moveIndex: integer, ignorePp?: boolean): boolean { - const move = this.getMoveset().length > moveIndex - ? this.getMoveset()[moveIndex] - : null; + public trySelectMove(moveIndex: number, ignorePp?: boolean): boolean { + const move = + this.getMoveset().length > moveIndex + ? this.getMoveset()[moveIndex] + : null; return move?.isUsable(this, ignorePp) ?? false; } showInfo(): void { if (!this.battleInfo.visible) { - const otherBattleInfo = globalScene.fieldUI.getAll().slice(0, 4).filter(ui => ui instanceof BattleInfo && ((ui as BattleInfo) instanceof PlayerBattleInfo) === this.isPlayer()).find(() => true); + const otherBattleInfo = globalScene.fieldUI + .getAll() + .slice(0, 4) + .filter( + ui => + ui instanceof BattleInfo && + (ui as BattleInfo) instanceof PlayerBattleInfo === this.isPlayer(), + ) + .find(() => true); if (!otherBattleInfo || !this.getFieldIndex()) { globalScene.fieldUI.sendToBack(this.battleInfo); globalScene.sendTextToBack(); // Push the top right text objects behind everything else } else { globalScene.fieldUI.moveAbove(this.battleInfo, otherBattleInfo); } - this.battleInfo.setX(this.battleInfo.x + (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198)); + this.battleInfo.setX( + this.battleInfo.x + + (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198), + ); this.battleInfo.setVisible(true); if (this.isPlayer()) { this.battleInfo.expMaskRect.x += 150; } globalScene.tweens.add({ - targets: [ this.battleInfo, this.battleInfo.expMaskRect ], + targets: [this.battleInfo, this.battleInfo.expMaskRect], x: this.isPlayer() ? "-=150" : `+=${!this.isBoss() ? 150 : 246}`, duration: 1000, - ease: "Cubic.easeOut" + ease: "Cubic.easeOut", }); } } @@ -2360,7 +3590,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return new Promise(resolve => { if (this.battleInfo && this.battleInfo.visible) { globalScene.tweens.add({ - targets: [ this.battleInfo, this.battleInfo.expMaskRect ], + targets: [this.battleInfo, this.battleInfo.expMaskRect], x: this.isPlayer() ? "+=150" : `-=${!this.isBoss() ? 150 : 246}`, duration: 500, ease: "Cubic.easeIn", @@ -2369,9 +3599,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.battleInfo.expMaskRect.x -= 150; } this.battleInfo.setVisible(false); - this.battleInfo.setX(this.battleInfo.x - (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198)); + this.battleInfo.setX( + this.battleInfo.x - + (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198), + ); resolve(); - } + }, }); } else { resolve(); @@ -2412,18 +3645,29 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param exp The amount of experience to add * @param ignoreLevelCap Whether to ignore level caps when adding experience (defaults to false) */ - addExp(exp: integer, ignoreLevelCap: boolean = false) { + addExp(exp: number, ignoreLevelCap = false) { const maxExpLevel = globalScene.getMaxExpLevel(ignoreLevelCap); const initialExp = this.exp; this.exp += exp; - while (this.level < maxExpLevel && this.exp >= getLevelTotalExp(this.level + 1, this.species.growthRate)) { + while ( + this.level < maxExpLevel && + this.exp >= getLevelTotalExp(this.level + 1, this.species.growthRate) + ) { this.level++; } if (this.level >= maxExpLevel) { - console.log(initialExp, this.exp, getLevelTotalExp(this.level, this.species.growthRate)); - this.exp = Math.max(getLevelTotalExp(this.level, this.species.growthRate), initialExp); + console.log( + initialExp, + this.exp, + getLevelTotalExp(this.level, this.species.growthRate), + ); + this.exp = Math.max( + getLevelTotalExp(this.level, this.species.growthRate), + initialExp, + ); } - this.levelExp = this.exp - getLevelTotalExp(this.level, this.species.growthRate); + this.levelExp = + this.exp - getLevelTotalExp(this.level, this.species.growthRate); } /** @@ -2435,7 +3679,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return this.isPlayer() !== target.isPlayer(); } - getOpponent(targetIndex: integer): Pokemon | null { + getOpponent(targetIndex: number): Pokemon | null { const ret = this.getOpponents()[targetIndex]; if (ret.summonData) { return ret; @@ -2444,7 +3688,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getOpponents(): Pokemon[] { - return ((this.isPlayer() ? globalScene.getEnemyField() : globalScene.getPlayerField()) as Pokemon[]).filter(p => p.isActive()); + return ( + (this.isPlayer() + ? globalScene.getEnemyField() + : globalScene.getPlayerField()) as Pokemon[] + ).filter(p => p.isActive()); } getOpponentDescriptor(): string { @@ -2452,11 +3700,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (opponents.length === 1) { return opponents[0].name; } - return this.isPlayer() ? i18next.t("arenaTag:opposingTeam") : i18next.t("arenaTag:yourTeam"); + return this.isPlayer() + ? i18next.t("arenaTag:opposingTeam") + : i18next.t("arenaTag:yourTeam"); } getAlly(): Pokemon { - return (this.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField())[this.getFieldIndex() ? 0 : 1]; + return ( + this.isPlayer() + ? globalScene.getPlayerField() + : globalScene.getEnemyField() + )[this.getFieldIndex() ? 0 : 1]; } /** @@ -2465,7 +3719,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns An array of Pokémon on the allied field. */ getAlliedField(): Pokemon[] { - return this instanceof PlayerPokemon ? globalScene.getPlayerField() : globalScene.getEnemyField(); + return this instanceof PlayerPokemon + ? globalScene.getPlayerField() + : globalScene.getEnemyField(); } /** @@ -2479,10 +3735,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreOppAbility determines whether the effects of the opponent's abilities (i.e. Unaware) should be ignored (`false` by default) * @param isCritical determines whether a critical hit has occurred or not (`false` by default) * @param simulated determines whether effects are applied without altering game state (`true` by default) + * @param ignoreHeldItems determines whether this Pokemon's held items should be ignored during the stat calculation, default `false` * @return the stat stage multiplier to be used for effective stat calculation */ - getStatStageMultiplier(stat: EffectiveStat, opponent?: Pokemon, move?: Move, ignoreOppAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): number { - const statStage = new Utils.IntegerHolder(this.getStatStage(stat)); + getStatStageMultiplier( + stat: EffectiveStat, + opponent?: Pokemon, + move?: Move, + ignoreOppAbility = false, + isCritical = false, + simulated = true, + ignoreHeldItems = false, + ): number { + const statStage = new Utils.NumberHolder(this.getStatStage(stat)); const ignoreStatStage = new Utils.BooleanHolder(false); if (opponent) { @@ -2499,16 +3764,38 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } if (!ignoreOppAbility) { - applyAbAttrs(IgnoreOpponentStatStagesAbAttr, opponent, null, simulated, stat, ignoreStatStage); + applyAbAttrs( + IgnoreOpponentStatStagesAbAttr, + opponent, + null, + simulated, + stat, + ignoreStatStage, + ); } if (move) { - applyMoveAttrs(IgnoreOpponentStatStagesAttr, this, opponent, move, ignoreStatStage); + applyMoveAttrs( + IgnoreOpponentStatStagesAttr, + this, + opponent, + move, + ignoreStatStage, + ); } } if (!ignoreStatStage.value) { - const statStageMultiplier = new Utils.NumberHolder(Math.max(2, 2 + statStage.value) / Math.max(2, 2 - statStage.value)); - globalScene.applyModifiers(TempStatStageBoosterModifier, this.isPlayer(), stat, statStageMultiplier); + const statStageMultiplier = new Utils.NumberHolder( + Math.max(2, 2 + statStage.value) / Math.max(2, 2 - statStage.value), + ); + if (!ignoreHeldItems) { + globalScene.applyModifiers( + TempStatStageBoosterModifier, + this.isPlayer(), + stat, + statStageMultiplier, + ); + } return Math.min(statStageMultiplier.value, 4); } return 1; @@ -2530,19 +3817,48 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return 1; } - const userAccStage = new Utils.IntegerHolder(this.getStatStage(Stat.ACC)); - const targetEvaStage = new Utils.IntegerHolder(target.getStatStage(Stat.EVA)); + const userAccStage = new Utils.NumberHolder(this.getStatStage(Stat.ACC)); + const targetEvaStage = new Utils.NumberHolder( + target.getStatStage(Stat.EVA), + ); const ignoreAccStatStage = new Utils.BooleanHolder(false); const ignoreEvaStatStage = new Utils.BooleanHolder(false); - applyAbAttrs(IgnoreOpponentStatStagesAbAttr, target, null, false, Stat.ACC, ignoreAccStatStage); - applyAbAttrs(IgnoreOpponentStatStagesAbAttr, this, null, false, Stat.EVA, ignoreEvaStatStage); - applyMoveAttrs(IgnoreOpponentStatStagesAttr, this, target, sourceMove, ignoreEvaStatStage); + applyAbAttrs( + IgnoreOpponentStatStagesAbAttr, + target, + null, + false, + Stat.ACC, + ignoreAccStatStage, + ); + applyAbAttrs( + IgnoreOpponentStatStagesAbAttr, + this, + null, + false, + Stat.EVA, + ignoreEvaStatStage, + ); + applyMoveAttrs( + IgnoreOpponentStatStagesAttr, + this, + target, + sourceMove, + ignoreEvaStatStage, + ); - globalScene.applyModifiers(TempStatStageBoosterModifier, this.isPlayer(), Stat.ACC, userAccStage); + globalScene.applyModifiers( + TempStatStageBoosterModifier, + this.isPlayer(), + Stat.ACC, + userAccStage, + ); - userAccStage.value = ignoreAccStatStage.value ? 0 : Math.min(userAccStage.value, 6); + userAccStage.value = ignoreAccStatStage.value + ? 0 + : Math.min(userAccStage.value, 6); targetEvaStage.value = ignoreEvaStatStage.value ? 0 : targetEvaStage.value; if (target.findTag(t => t instanceof ExposedTag)) { @@ -2551,15 +3867,28 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const accuracyMultiplier = new Utils.NumberHolder(1); if (userAccStage.value !== targetEvaStage.value) { - accuracyMultiplier.value = userAccStage.value > targetEvaStage.value - ? (3 + Math.min(userAccStage.value - targetEvaStage.value, 6)) / 3 - : 3 / (3 + Math.min(targetEvaStage.value - userAccStage.value, 6)); + accuracyMultiplier.value = + userAccStage.value > targetEvaStage.value + ? (3 + Math.min(userAccStage.value - targetEvaStage.value, 6)) / 3 + : 3 / (3 + Math.min(targetEvaStage.value - userAccStage.value, 6)); } - applyStatMultiplierAbAttrs(StatMultiplierAbAttr, this, Stat.ACC, accuracyMultiplier, false, sourceMove); + applyStatMultiplierAbAttrs( + StatMultiplierAbAttr, + this, + Stat.ACC, + accuracyMultiplier, + false, + sourceMove, + ); const evasionMultiplier = new Utils.NumberHolder(1); - applyStatMultiplierAbAttrs(StatMultiplierAbAttr, target, Stat.EVA, evasionMultiplier); + applyStatMultiplierAbAttrs( + StatMultiplierAbAttr, + target, + Stat.EVA, + evasionMultiplier, + ); return accuracyMultiplier.value / evasionMultiplier.value; } @@ -2576,11 +3905,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param simulated if `true`, suppresses changes to game state during calculation (defaults to `true`). * @returns The move's base damage against this Pokemon when used by the source Pokemon. */ - getBaseDamage(source: Pokemon, move: Move, moveCategory: MoveCategory, ignoreAbility: boolean = false, ignoreSourceAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): number { + getBaseDamage( + source: Pokemon, + move: Move, + moveCategory: MoveCategory, + ignoreAbility = false, + ignoreSourceAbility = false, + isCritical = false, + simulated = true, + ): number { const isPhysical = moveCategory === MoveCategory.PHYSICAL; /** A base damage multiplier based on the source's level */ - const levelMultiplier = (2 * source.level / 5 + 2); + const levelMultiplier = (2 * source.level) / 5 + 2; /** The power of the move after power boosts from abilities, etc. have applied */ const power = move.calculateBattlePower(source, this, simulated); @@ -2589,25 +3926,53 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * The attacker's offensive stat for the given move's category. * Critical hits cause negative stat stages to be ignored. */ - const sourceAtk = new Utils.NumberHolder(source.getEffectiveStat(isPhysical ? Stat.ATK : Stat.SPATK, this, undefined, ignoreSourceAbility, ignoreAbility, isCritical, simulated)); + const sourceAtk = new Utils.NumberHolder( + source.getEffectiveStat( + isPhysical ? Stat.ATK : Stat.SPATK, + this, + undefined, + ignoreSourceAbility, + ignoreAbility, + isCritical, + simulated, + ), + ); applyMoveAttrs(VariableAtkAttr, source, this, move, sourceAtk); /** * This Pokemon's defensive stat for the given move's category. * Critical hits cause positive stat stages to be ignored. */ - const targetDef = new Utils.NumberHolder(this.getEffectiveStat(isPhysical ? Stat.DEF : Stat.SPDEF, source, move, ignoreAbility, ignoreSourceAbility, isCritical, simulated)); + const targetDef = new Utils.NumberHolder( + this.getEffectiveStat( + isPhysical ? Stat.DEF : Stat.SPDEF, + source, + move, + ignoreAbility, + ignoreSourceAbility, + isCritical, + simulated, + ), + ); applyMoveAttrs(VariableDefAttr, source, this, move, targetDef); /** * The attack's base damage, as determined by the source's level, move power * and Attack stat as well as this Pokemon's Defense stat */ - const baseDamage = ((levelMultiplier * power * sourceAtk.value / targetDef.value) / 50) + 2; + const baseDamage = + (levelMultiplier * power * sourceAtk.value) / targetDef.value / 50 + 2; /** Debug message for non-simulated calls (i.e. when damage is actually dealt) */ if (!simulated) { - console.log("base damage", baseDamage, move.name, power, sourceAtk.value, targetDef.value); + console.log( + "base damage", + baseDamage, + move.name, + power, + sourceAtk.value, + targetDef.value, + ); } return baseDamage; @@ -2626,12 +3991,27 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * - `result`: {@linkcode HitResult} indicates the attack's type effectiveness. * - `damage`: `number` the attack's final damage output. */ - getAttackDamage(source: Pokemon, move: Move, ignoreAbility: boolean = false, ignoreSourceAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): DamageCalculationResult { + getAttackDamage( + source: Pokemon, + move: Move, + ignoreAbility = false, + ignoreSourceAbility = false, + isCritical = false, + simulated = true, + ): DamageCalculationResult { const damage = new Utils.NumberHolder(0); - const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; + const defendingSide = this.isPlayer() + ? ArenaTagSide.PLAYER + : ArenaTagSide.ENEMY; const variableCategory = new Utils.NumberHolder(move.category); - applyMoveAttrs(VariableMoveCategoryAttr, source, this, move, variableCategory); + applyMoveAttrs( + VariableMoveCategoryAttr, + source, + this, + move, + variableCategory, + ); const moveCategory = variableCategory.value as MoveCategory; /** The move's type after type-changing effects are applied */ @@ -2647,21 +4027,36 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * * Note that the source's abilities are not ignored here */ - const typeMultiplier = this.getMoveEffectiveness(source, move, ignoreAbility, simulated, cancelled); + const typeMultiplier = this.getMoveEffectiveness( + source, + move, + ignoreAbility, + simulated, + cancelled, + ); const isPhysical = moveCategory === MoveCategory.PHYSICAL; /** Combined damage multiplier from field effects such as weather, terrain, etc. */ - const arenaAttackTypeMultiplier = new Utils.NumberHolder(globalScene.arena.getAttackTypeMultiplier(moveType, source.isGrounded())); - applyMoveAttrs(IgnoreWeatherTypeDebuffAttr, source, this, move, arenaAttackTypeMultiplier); + const arenaAttackTypeMultiplier = new Utils.NumberHolder( + globalScene.arena.getAttackTypeMultiplier(moveType, source.isGrounded()), + ); + applyMoveAttrs( + IgnoreWeatherTypeDebuffAttr, + source, + this, + move, + arenaAttackTypeMultiplier, + ); - const isTypeImmune = (typeMultiplier * arenaAttackTypeMultiplier.value) === 0; + const isTypeImmune = typeMultiplier * arenaAttackTypeMultiplier.value === 0; if (cancelled.value || isTypeImmune) { return { cancelled: cancelled.value, - result: move.id === Moves.SHEER_COLD ? HitResult.IMMUNE : HitResult.NO_EFFECT, - damage: 0 + result: + move.id === Moves.SHEER_COLD ? HitResult.IMMUNE : HitResult.NO_EFFECT, + damage: 0, }; } @@ -2670,13 +4065,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { applyMoveAttrs(FixedDamageAttr, source, this, move, fixedDamage); if (fixedDamage.value) { const multiLensMultiplier = new Utils.NumberHolder(1); - globalScene.applyModifiers(PokemonMultiHitModifier, source.isPlayer(), source, move.id, null, multiLensMultiplier); - fixedDamage.value = Utils.toDmgValue(fixedDamage.value * multiLensMultiplier.value); + globalScene.applyModifiers( + PokemonMultiHitModifier, + source.isPlayer(), + source, + move.id, + null, + multiLensMultiplier, + ); + fixedDamage.value = Utils.toDmgValue( + fixedDamage.value * multiLensMultiplier.value, + ); return { cancelled: false, result: HitResult.EFFECTIVE, - damage: fixedDamage.value + damage: fixedDamage.value, }; } @@ -2687,7 +4091,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return { cancelled: false, result: HitResult.ONE_HIT_KO, - damage: this.hp + damage: this.hp, }; } @@ -2695,22 +4099,45 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * The attack's base damage, as determined by the source's level, move power * and Attack stat as well as this Pokemon's Defense stat */ - const baseDamage = this.getBaseDamage(source, move, moveCategory, ignoreAbility, ignoreSourceAbility, isCritical, simulated); + const baseDamage = this.getBaseDamage( + source, + move, + moveCategory, + ignoreAbility, + ignoreSourceAbility, + isCritical, + simulated, + ); /** 25% damage debuff on moves hitting more than one non-fainted target (regardless of immunities) */ const { targets, multiple } = getMoveTargets(source, move.id); const numTargets = multiple ? targets.length : 1; - const targetMultiplier = (numTargets > 1) ? 0.75 : 1; + const targetMultiplier = numTargets > 1 ? 0.75 : 1; /** Multiplier for moves enhanced by Multi-Lens and/or Parental Bond */ const multiStrikeEnhancementMultiplier = new Utils.NumberHolder(1); - globalScene.applyModifiers(PokemonMultiHitModifier, source.isPlayer(), source, move.id, null, multiStrikeEnhancementMultiplier); + globalScene.applyModifiers( + PokemonMultiHitModifier, + source.isPlayer(), + source, + move.id, + null, + multiStrikeEnhancementMultiplier, + ); if (!ignoreSourceAbility) { - applyPreAttackAbAttrs(AddSecondStrikeAbAttr, source, this, move, simulated, null, multiStrikeEnhancementMultiplier); + applyPreAttackAbAttrs( + AddSecondStrikeAbAttr, + source, + this, + move, + simulated, + null, + multiStrikeEnhancementMultiplier, + ); } /** Doubles damage if this Pokemon's last move was Glaive Rush */ - const glaiveRushMultiplier = new Utils.IntegerHolder(1); + const glaiveRushMultiplier = new Utils.NumberHolder(1); if (this.getTag(BattlerTagType.RECEIVE_DOUBLE_DAMAGE)) { glaiveRushMultiplier.value = 2; } @@ -2723,18 +4150,16 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * A multiplier for random damage spread in the range [0.85, 1] * This is always 1 for simulated calls. */ - const randomMultiplier = simulated ? 1 : ((this.randSeedIntRange(85, 100)) / 100); + const randomMultiplier = simulated + ? 1 + : this.randSeedIntRange(85, 100) / 100; const sourceTypes = source.getTypes(); const sourceTeraType = source.getTeraType(); const matchesSourceType = sourceTypes.includes(moveType); /** A damage multiplier for when the attack is of the attacker's type and/or Tera type. */ const stabMultiplier = new Utils.NumberHolder(1); - if (matchesSourceType) { - stabMultiplier.value += 0.5; - } - applyMoveAttrs(CombinedPledgeStabBoostAttr, source, this, move, stabMultiplier); - if (sourceTeraType !== Type.UNKNOWN && sourceTeraType === moveType) { + if (matchesSourceType && moveType !== PokemonType.STELLAR) { stabMultiplier.value += 0.5; } @@ -2742,15 +4167,53 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { applyAbAttrs(StabBoostAbAttr, source, null, simulated, stabMultiplier); } + applyMoveAttrs( + CombinedPledgeStabBoostAttr, + source, + this, + move, + stabMultiplier, + ); + + if ( + source.isTerastallized && + sourceTeraType === moveType && + moveType !== PokemonType.STELLAR + ) { + stabMultiplier.value += 0.5; + } + + if ( + source.isTerastallized && + source.getTeraType() === PokemonType.STELLAR && + (!source.stellarTypesBoosted.includes(moveType) || + source.hasSpecies(Species.TERAPAGOS)) + ) { + if (matchesSourceType) { + stabMultiplier.value += 0.5; + } else { + stabMultiplier.value += 0.2; + } + } + stabMultiplier.value = Math.min(stabMultiplier.value, 2.25); /** Halves damage if the attacker is using a physical attack while burned */ const burnMultiplier = new Utils.NumberHolder(1); - if (isPhysical && source.status && source.status.effect === StatusEffect.BURN) { + if ( + isPhysical && + source.status && + source.status.effect === StatusEffect.BURN + ) { if (!move.hasAttr(BypassBurnDamageReductionAttr)) { const burnDamageReductionCancelled = new Utils.BooleanHolder(false); if (!ignoreSourceAbility) { - applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled, simulated); + applyAbAttrs( + BypassBurnDamageReductionAbAttr, + source, + burnDamageReductionCancelled, + simulated, + ); } if (!burnDamageReductionCancelled.value) { burnMultiplier.value = 0.5; @@ -2760,7 +4223,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { /** Reduces damage if this Pokemon has a relevant screen (e.g. Light Screen for special attacks) */ const screenMultiplier = new Utils.NumberHolder(1); - globalScene.arena.applyTagsForSide(WeakenMoveScreenTag, defendingSide, simulated, source, moveCategory, screenMultiplier); + + // Critical hits should bypass screens + if (!isCritical) { + globalScene.arena.applyTagsForSide( + WeakenMoveScreenTag, + defendingSide, + simulated, + source, + moveCategory, + screenMultiplier, + ); + } /** * For each {@linkcode HitsTagAttr} the move has, doubles the damage of the move if: @@ -2769,36 +4243,49 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * The move doubles damage when used against that tag */ const hitsTagMultiplier = new Utils.NumberHolder(1); - move.getAttrs(HitsTagAttr).filter(hta => hta.doubleDamage).forEach(hta => { - if (this.getTag(hta.tagType)) { - hitsTagMultiplier.value *= 2; - } - }); + move + .getAttrs(HitsTagAttr) + .filter(hta => hta.doubleDamage) + .forEach(hta => { + if (this.getTag(hta.tagType)) { + hitsTagMultiplier.value *= 2; + } + }); /** Halves damage if this Pokemon is grounded in Misty Terrain against a Dragon-type attack */ - const mistyTerrainMultiplier = (globalScene.arena.terrain?.terrainType === TerrainType.MISTY && this.isGrounded() && moveType === Type.DRAGON) - ? 0.5 - : 1; + const mistyTerrainMultiplier = + globalScene.arena.terrain?.terrainType === TerrainType.MISTY && + this.isGrounded() && + moveType === PokemonType.DRAGON + ? 0.5 + : 1; damage.value = Utils.toDmgValue( - baseDamage - * targetMultiplier - * multiStrikeEnhancementMultiplier.value - * arenaAttackTypeMultiplier.value - * glaiveRushMultiplier.value - * criticalMultiplier.value - * randomMultiplier - * stabMultiplier.value - * typeMultiplier - * burnMultiplier.value - * screenMultiplier.value - * hitsTagMultiplier.value - * mistyTerrainMultiplier + baseDamage * + targetMultiplier * + multiStrikeEnhancementMultiplier.value * + arenaAttackTypeMultiplier.value * + glaiveRushMultiplier.value * + criticalMultiplier.value * + randomMultiplier * + stabMultiplier.value * + typeMultiplier * + burnMultiplier.value * + screenMultiplier.value * + hitsTagMultiplier.value * + mistyTerrainMultiplier, ); /** Doubles damage if the attacker has Tinted Lens and is using a resisted move */ if (!ignoreSourceAbility) { - applyPreAttackAbAttrs(DamageBoostAbAttr, source, this, move, simulated, damage); + applyPreAttackAbAttrs( + DamageBoostAbAttr, + source, + this, + move, + simulated, + damage, + ); } /** Apply the enemy's Damage and Resistance tokens */ @@ -2809,14 +4296,29 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { globalScene.applyModifiers(EnemyDamageReducerModifier, false, damage); } - /** Apply this Pokemon's post-calc defensive modifiers (e.g. Fur Coat) */ if (!ignoreAbility) { - applyPreDefendAbAttrs(ReceivedMoveDamageMultiplierAbAttr, this, source, move, cancelled, simulated, damage); + applyPreDefendAbAttrs( + ReceivedMoveDamageMultiplierAbAttr, + this, + source, + move, + cancelled, + simulated, + damage, + ); /** Additionally apply friend guard damage reduction if ally has it. */ if (globalScene.currentBattle.double && this.getAlly()?.isActive(true)) { - applyPreDefendAbAttrs(AlliedFieldDamageReductionAbAttr, this.getAlly(), source, move, cancelled, simulated, damage); + applyPreDefendAbAttrs( + AlliedFieldDamageReductionAbAttr, + this.getAlly(), + source, + move, + cancelled, + simulated, + damage, + ); } } @@ -2824,7 +4326,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { applyMoveAttrs(ModifiedDamageAttr, source, this, move, damage); if (this.isFullHp() && !ignoreAbility) { - applyPreDefendAbAttrs(PreDefendFullHpEndureAbAttr, this, source, move, cancelled, false, damage); + applyPreDefendAbAttrs( + PreDefendFullHpEndureAbAttr, + this, + source, + move, + cancelled, + false, + damage, + ); } // debug message for when damage is applied (i.e. not simulated) @@ -2844,7 +4354,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return { cancelled: cancelled.value, result: hitResult, - damage: damage.value + damage: damage.value, }; } @@ -2855,133 +4365,211 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns The {@linkcode HitResult} of the attack */ apply(source: Pokemon, move: Move): HitResult { - const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; + const defendingSide = this.isPlayer() + ? ArenaTagSide.PLAYER + : ArenaTagSide.ENEMY; const moveCategory = new Utils.NumberHolder(move.category); applyMoveAttrs(VariableMoveCategoryAttr, source, this, move, moveCategory); if (moveCategory.value === MoveCategory.STATUS) { const cancelled = new Utils.BooleanHolder(false); - const typeMultiplier = this.getMoveEffectiveness(source, move, false, false, cancelled); + const typeMultiplier = this.getMoveEffectiveness( + source, + move, + false, + false, + cancelled, + ); if (!cancelled.value && typeMultiplier === 0) { - globalScene.queueMessage(i18next.t("battle:hitResultNoEffect", { pokemonName: getPokemonNameWithAffix(this) })); + globalScene.queueMessage( + i18next.t("battle:hitResultNoEffect", { + pokemonName: getPokemonNameWithAffix(this), + }), + ); } - return (typeMultiplier === 0) ? HitResult.NO_EFFECT : HitResult.STATUS; + return typeMultiplier === 0 ? HitResult.NO_EFFECT : HitResult.STATUS; + } + /** Determines whether the attack critically hits */ + let isCritical: boolean; + const critOnly = new Utils.BooleanHolder(false); + const critAlways = source.getTag(BattlerTagType.ALWAYS_CRIT); + applyMoveAttrs(CritOnlyAttr, source, this, move, critOnly); + applyAbAttrs( + ConditionalCritAbAttr, + source, + null, + false, + critOnly, + this, + move, + ); + if (critOnly.value || critAlways) { + isCritical = true; } else { - /** Determines whether the attack critically hits */ - let isCritical: boolean; - const critOnly = new Utils.BooleanHolder(false); - const critAlways = source.getTag(BattlerTagType.ALWAYS_CRIT); - applyMoveAttrs(CritOnlyAttr, source, this, move, critOnly); - applyAbAttrs(ConditionalCritAbAttr, source, null, false, critOnly, this, move); - if (critOnly.value || critAlways) { - isCritical = true; - } else { - const critChance = [ 24, 8, 2, 1 ][Math.max(0, Math.min(this.getCritStage(source, move), 3))]; - isCritical = critChance === 1 || !globalScene.randBattleSeedInt(critChance); - } + const critChance = [24, 8, 2, 1][ + Math.max(0, Math.min(this.getCritStage(source, move), 3)) + ]; + isCritical = + critChance === 1 || !globalScene.randBattleSeedInt(critChance); + } - const noCritTag = globalScene.arena.getTagOnSide(NoCritTag, defendingSide); - const blockCrit = new Utils.BooleanHolder(false); - applyAbAttrs(BlockCritAbAttr, this, null, false, blockCrit); - if (noCritTag || blockCrit.value || Overrides.NEVER_CRIT_OVERRIDE) { - isCritical = false; - } + const noCritTag = globalScene.arena.getTagOnSide(NoCritTag, defendingSide); + const blockCrit = new Utils.BooleanHolder(false); + applyAbAttrs(BlockCritAbAttr, this, null, false, blockCrit); + if (noCritTag || blockCrit.value || Overrides.NEVER_CRIT_OVERRIDE) { + isCritical = false; + } - const { cancelled, result, damage: dmg } = this.getAttackDamage(source, move, false, false, isCritical, false); + /** + * Applies stat changes from {@linkcode move} and gives it to {@linkcode source} + * before damage calculation + */ + applyMoveAttrs(StatChangeBeforeDmgCalcAttr, source, this, move); - const typeBoost = source.findTag(t => t instanceof TypeBoostTag && t.boostedType === source.getMoveType(move)) as TypeBoostTag; - if (typeBoost?.oneUse) { - source.removeTag(typeBoost.tagType); - } + const { + cancelled, + result, + damage: dmg, + } = this.getAttackDamage(source, move, false, false, isCritical, false); - if (cancelled || result === HitResult.IMMUNE || result === HitResult.NO_EFFECT) { - source.stopMultiHit(this); + const typeBoost = source.findTag( + t => + t instanceof TypeBoostTag && t.boostedType === source.getMoveType(move), + ) as TypeBoostTag; + if (typeBoost?.oneUse) { + source.removeTag(typeBoost.tagType); + } - if (!cancelled) { - if (result === HitResult.IMMUNE) { - globalScene.queueMessage(i18next.t("battle:hitResultImmune", { pokemonName: getPokemonNameWithAffix(this) })); - } else { - globalScene.queueMessage(i18next.t("battle:hitResultNoEffect", { pokemonName: getPokemonNameWithAffix(this) })); - } - } - return result; - } + if ( + cancelled || + result === HitResult.IMMUNE || + result === HitResult.NO_EFFECT + ) { + source.stopMultiHit(this); - // In case of fatal damage, this tag would have gotten cleared before we could lapse it. - const destinyTag = this.getTag(BattlerTagType.DESTINY_BOND); - const grudgeTag = this.getTag(BattlerTagType.GRUDGE); - - const isOneHitKo = result === HitResult.ONE_HIT_KO; - - if (dmg) { - this.lapseTags(BattlerTagLapseType.HIT); - - const substitute = this.getTag(SubstituteTag); - const isBlockedBySubstitute = !!substitute && move.hitsSubstitute(source, this); - if (isBlockedBySubstitute) { - substitute.hp -= dmg; - } - if (!this.isPlayer() && dmg >= this.hp) { - globalScene.applyModifiers(EnemyEndureChanceModifier, false, this); - } - - /** - * We explicitly require to ignore the faint phase here, as we want to show the messages - * about the critical hit and the super effective/not very effective messages before the faint phase. - */ - const damage = this.damageAndUpdate(isBlockedBySubstitute ? 0 : dmg, result as DamageResult, isCritical, isOneHitKo, isOneHitKo, true, source); - - if (damage > 0) { - if (source.isPlayer()) { - globalScene.validateAchvs(DamageAchv, new Utils.NumberHolder(damage)); - if (damage > globalScene.gameData.gameStats.highestDamage) { - globalScene.gameData.gameStats.highestDamage = damage; - } - } - source.turnData.totalDamageDealt += damage; - source.turnData.singleHitDamageDealt = damage; - this.turnData.damageTaken += damage; - this.battleData.hitCount++; - - const attackResult = { move: move.id, result: result as DamageResult, damage: damage, critical: isCritical, sourceId: source.id, sourceBattlerIndex: source.getBattlerIndex() }; - this.turnData.attacksReceived.unshift(attackResult); - if (source.isPlayer() && !this.isPlayer()) { - globalScene.applyModifiers(DamageMoneyRewardModifier, true, source, new Utils.NumberHolder(damage)); - } + if (!cancelled) { + if (result === HitResult.IMMUNE) { + globalScene.queueMessage( + i18next.t("battle:hitResultImmune", { + pokemonName: getPokemonNameWithAffix(this), + }), + ); + } else { + globalScene.queueMessage( + i18next.t("battle:hitResultNoEffect", { + pokemonName: getPokemonNameWithAffix(this), + }), + ); } } - - if (isCritical) { - globalScene.queueMessage(i18next.t("battle:hitResultCriticalHit")); - } - - // want to include is.Fainted() in case multi hit move ends early, still want to render message - if (source.turnData.hitsLeft === 1 || this.isFainted()) { - switch (result) { - case HitResult.SUPER_EFFECTIVE: - globalScene.queueMessage(i18next.t("battle:hitResultSuperEffective")); - break; - case HitResult.NOT_VERY_EFFECTIVE: - globalScene.queueMessage(i18next.t("battle:hitResultNotVeryEffective")); - break; - case HitResult.ONE_HIT_KO: - globalScene.queueMessage(i18next.t("battle:hitResultOneHitKO")); - break; - } - } - - if (this.isFainted()) { - // set splice index here, so future scene queues happen before FaintedPhase - globalScene.setPhaseQueueSplice(); - globalScene.unshiftPhase(new FaintPhase(this.getBattlerIndex(), isOneHitKo, destinyTag, grudgeTag, source)); - - this.destroySubstitute(); - this.lapseTag(BattlerTagType.COMMANDED); - this.resetSummonData(); - } - return result; } + + // In case of fatal damage, this tag would have gotten cleared before we could lapse it. + const destinyTag = this.getTag(BattlerTagType.DESTINY_BOND); + const grudgeTag = this.getTag(BattlerTagType.GRUDGE); + + const isOneHitKo = result === HitResult.ONE_HIT_KO; + + if (dmg) { + this.lapseTags(BattlerTagLapseType.HIT); + + const substitute = this.getTag(SubstituteTag); + const isBlockedBySubstitute = + !!substitute && move.hitsSubstitute(source, this); + if (isBlockedBySubstitute) { + substitute.hp -= dmg; + } + if (!this.isPlayer() && dmg >= this.hp) { + globalScene.applyModifiers(EnemyEndureChanceModifier, false, this); + } + + /** + * We explicitly require to ignore the faint phase here, as we want to show the messages + * about the critical hit and the super effective/not very effective messages before the faint phase. + */ + const damage = this.damageAndUpdate( + isBlockedBySubstitute ? 0 : dmg, + result as DamageResult, + isCritical, + isOneHitKo, + isOneHitKo, + true, + source, + ); + + if (damage > 0) { + if (source.isPlayer()) { + globalScene.validateAchvs(DamageAchv, new Utils.NumberHolder(damage)); + if (damage > globalScene.gameData.gameStats.highestDamage) { + globalScene.gameData.gameStats.highestDamage = damage; + } + } + source.turnData.totalDamageDealt += damage; + source.turnData.singleHitDamageDealt = damage; + this.turnData.damageTaken += damage; + this.battleData.hitCount++; + + const attackResult = { + move: move.id, + result: result as DamageResult, + damage: damage, + critical: isCritical, + sourceId: source.id, + sourceBattlerIndex: source.getBattlerIndex(), + }; + this.turnData.attacksReceived.unshift(attackResult); + if (source.isPlayer() && !this.isPlayer()) { + globalScene.applyModifiers( + DamageMoneyRewardModifier, + true, + source, + new Utils.NumberHolder(damage), + ); + } + } + } + + if (isCritical) { + globalScene.queueMessage(i18next.t("battle:hitResultCriticalHit")); + } + + // want to include is.Fainted() in case multi hit move ends early, still want to render message + if (source.turnData.hitsLeft === 1 || this.isFainted()) { + switch (result) { + case HitResult.SUPER_EFFECTIVE: + globalScene.queueMessage(i18next.t("battle:hitResultSuperEffective")); + break; + case HitResult.NOT_VERY_EFFECTIVE: + globalScene.queueMessage( + i18next.t("battle:hitResultNotVeryEffective"), + ); + break; + case HitResult.ONE_HIT_KO: + globalScene.queueMessage(i18next.t("battle:hitResultOneHitKO")); + break; + } + } + + if (this.isFainted()) { + // set splice index here, so future scene queues happen before FaintedPhase + globalScene.setPhaseQueueSplice(); + globalScene.unshiftPhase( + new FaintPhase( + this.getBattlerIndex(), + isOneHitKo, + destinyTag, + grudgeTag, + source, + ), + ); + + this.destroySubstitute(); + this.lapseTag(BattlerTagType.COMMANDED); + this.resetSummonData(); + } + + return result; } /** @@ -2992,7 +4580,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreFaintPhase flag on wheter to add FaintPhase if pokemon after applying damage faints * @returns integer representing damage */ - damage(damage: integer, ignoreSegments: boolean = false, preventEndure: boolean = false, ignoreFaintPhase: boolean = false): integer { + damage( + damage: number, + _ignoreSegments = false, + preventEndure = false, + ignoreFaintPhase = false, + ): number { if (this.isFainted()) { return 0; } @@ -3007,7 +4600,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { surviveDamage.value = this.lapseTag(BattlerTagType.ENDURE_TOKEN); } if (!surviveDamage.value) { - globalScene.applyModifiers(SurviveDamageModifier, this.isPlayer(), this, surviveDamage); + globalScene.applyModifiers( + SurviveDamageModifier, + this.isPlayer(), + this, + surviveDamage, + ); } if (surviveDamage.value) { damage = this.hp - 1; @@ -3025,7 +4623,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Once the MoveEffectPhase is over (and calls it's .end() function, shiftPhase() will reset the PhaseQueueSplice via clearPhaseQueueSplice() ) */ globalScene.setPhaseQueueSplice(); - globalScene.unshiftPhase(new FaintPhase(this.getBattlerIndex(), preventEndure)); + globalScene.unshiftPhase( + new FaintPhase(this.getBattlerIndex(), preventEndure), + ); this.destroySubstitute(); this.lapseTag(BattlerTagType.COMMANDED); this.resetSummonData(); @@ -3043,13 +4643,31 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreFaintPhase boolean to ignore adding a FaintPhase, passsed to damage() * @returns integer of damage done */ - damageAndUpdate(damage: number, result?: DamageResult, critical: boolean = false, ignoreSegments: boolean = false, preventEndure: boolean = false, ignoreFaintPhase: boolean = false, source?: Pokemon): number { - const damagePhase = new DamageAnimPhase(this.getBattlerIndex(), damage, result as DamageResult, critical); + damageAndUpdate( + damage: number, + result?: DamageResult, + critical = false, + ignoreSegments = false, + preventEndure = false, + ignoreFaintPhase = false, + source?: Pokemon, + ): number { + const damagePhase = new DamageAnimPhase( + this.getBattlerIndex(), + damage, + result as DamageResult, + critical, + ); globalScene.unshiftPhase(damagePhase); if (this.switchOutStatus && source) { damage = 0; } - damage = this.damage(damage, ignoreSegments, preventEndure, ignoreFaintPhase); + damage = this.damage( + damage, + ignoreSegments, + preventEndure, + ignoreFaintPhase, + ); // Damage amount may have changed, but needed to be queued before calling damage function damagePhase.updateAmount(damage); /** @@ -3057,12 +4675,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Multi-hits are handled in move-effect-phase.ts for PostDamageAbAttr */ if (!source || source.turnData.hitCount <= 1) { - applyPostDamageAbAttrs(PostDamageAbAttr, this, damage, this.hasPassive(), false, [], source); + applyPostDamageAbAttrs( + PostDamageAbAttr, + this, + damage, + this.hasPassive(), + false, + [], + source, + ); } return damage; } - heal(amount: integer): integer { + heal(amount: number): number { const healAmount = Math.min(amount, this.getMaxHp() - this.hp); this.hp += healAmount; return healAmount; @@ -3077,6 +4703,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return maxForms.includes(this.getFormKey()) || (!!this.getFusionFormKey() && maxForms.includes(this.getFusionFormKey()!)); } + isMega(): boolean { + const megaForms = [ SpeciesFormKey.MEGA, SpeciesFormKey.MEGA_X, SpeciesFormKey.MEGA_Y, SpeciesFormKey.PRIMAL ] as string[]; + return megaForms.includes(this.getFormKey()) || (!!this.getFusionFormKey() && megaForms.includes(this.getFusionFormKey()!)); + } + canAddTag(tagType: BattlerTagType): boolean { if (this.getTag(tagType)) { return false; @@ -3085,15 +4716,34 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const stubTag = new BattlerTag(tagType, 0, 0); const cancelled = new Utils.BooleanHolder(false); - applyPreApplyBattlerTagAbAttrs(BattlerTagImmunityAbAttr, this, stubTag, cancelled, true); + applyPreApplyBattlerTagAbAttrs( + BattlerTagImmunityAbAttr, + this, + stubTag, + cancelled, + true, + ); const userField = this.getAlliedField(); - userField.forEach(pokemon => applyPreApplyBattlerTagAbAttrs(UserFieldBattlerTagImmunityAbAttr, pokemon, stubTag, cancelled, true)); + userField.forEach(pokemon => + applyPreApplyBattlerTagAbAttrs( + UserFieldBattlerTagImmunityAbAttr, + pokemon, + stubTag, + cancelled, + true, + ), + ); return !cancelled.value; } - addTag(tagType: BattlerTagType, turnCount: integer = 0, sourceMove?: Moves, sourceId?: integer): boolean { + addTag( + tagType: BattlerTagType, + turnCount = 0, + sourceMove?: Moves, + sourceId?: number, + ): boolean { const existingTag = this.getTag(tagType); if (existingTag) { existingTag.onOverlap(this); @@ -3103,10 +4753,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const newTag = getBattlerTag(tagType, turnCount, sourceMove!, sourceId!); // TODO: are the bangs correct? const cancelled = new Utils.BooleanHolder(false); - applyPreApplyBattlerTagAbAttrs(BattlerTagImmunityAbAttr, this, newTag, cancelled); + applyPreApplyBattlerTagAbAttrs( + BattlerTagImmunityAbAttr, + this, + newTag, + cancelled, + ); const userField = this.getAlliedField(); - userField.forEach(pokemon => applyPreApplyBattlerTagAbAttrs(UserFieldBattlerTagImmunityAbAttr, pokemon, newTag, cancelled)); + userField.forEach(pokemon => + applyPreApplyBattlerTagAbAttrs( + UserFieldBattlerTagImmunityAbAttr, + pokemon, + newTag, + cancelled, + ), + ); if (!cancelled.value && newTag.canAdd(this)) { this.summonData.tags.push(newTag); @@ -3128,20 +4790,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!this.summonData) { return null; } - return (tagType instanceof Function + return tagType instanceof Function ? this.summonData.tags.find(t => t instanceof tagType) - : this.summonData.tags.find(t => t.tagType === tagType) - ); + : this.summonData.tags.find(t => t.tagType === tagType); } - findTag(tagFilter: ((tag: BattlerTag) => boolean)) { + findTag(tagFilter: (tag: BattlerTag) => boolean) { if (!this.summonData) { return null; } return this.summonData.tags.find(t => tagFilter(t)); } - findTags(tagFilter: ((tag: BattlerTag) => boolean)): BattlerTag[] { + findTags(tagFilter: (tag: BattlerTag) => boolean): BattlerTag[] { if (!this.summonData) { return []; } @@ -3154,7 +4815,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } const tags = this.summonData.tags; const tag = tags.find(t => t.tagType === tagType); - if (tag && !(tag.lapse(this, BattlerTagLapseType.CUSTOM))) { + if (tag && !tag.lapse(this, BattlerTagLapseType.CUSTOM)) { tag.onRemove(this); tags.splice(tags.indexOf(tag), 1); } @@ -3166,10 +4827,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return; } const tags = this.summonData.tags; - tags.filter(t => lapseType === BattlerTagLapseType.FAINT || ((t.lapseTypes.some(lType => lType === lapseType)) && !(t.lapse(this, lapseType)))).forEach(t => { - t.onRemove(this); - tags.splice(tags.indexOf(t), 1); - }); + tags + .filter( + t => + lapseType === BattlerTagLapseType.FAINT || + (t.lapseTypes.some(lType => lType === lapseType) && + !t.lapse(this, lapseType)), + ) + .forEach(t => { + t.onRemove(this); + tags.splice(tags.indexOf(t), 1); + }); } removeTag(tagType: BattlerTagType): boolean { @@ -3185,7 +4853,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return !!tag; } - findAndRemoveTags(tagFilter: ((tag: BattlerTag) => boolean)): boolean { + findAndRemoveTags(tagFilter: (tag: BattlerTag) => boolean): boolean { if (!this.summonData) { return false; } @@ -3199,16 +4867,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return true; } - removeTagsBySourceId(sourceId: integer): void { + removeTagsBySourceId(sourceId: number): void { this.findAndRemoveTags(t => t.isSourceLinked() && t.sourceId === sourceId); } - transferTagsBySourceId(sourceId: integer, newSourceId: integer): void { + transferTagsBySourceId(sourceId: number, newSourceId: number): void { if (!this.summonData) { return; } const tags = this.summonData.tags; - tags.filter(t => t.sourceId === sourceId).forEach(t => t.sourceId = newSourceId); + tags + .filter(t => t.sourceId === sourceId) + .forEach(t => (t.sourceId = newSourceId)); } /** @@ -3219,14 +4889,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Copy all stat stages for (const s of BATTLE_STATS) { const sourceStage = source.getStatStage(s); - if ((this instanceof PlayerPokemon) && (sourceStage === 6)) { + if (this instanceof PlayerPokemon && sourceStage === 6) { globalScene.validateAchv(achvs.TRANSFER_MAX_STAT_STAGE); } this.setStatStage(s, sourceStage); } for (const tag of source.summonData.tags) { - if (!tag.isBatonPassable) { + if ( + !tag.isBatonPassable || + (tag.tagType === BattlerTagType.TELEKINESIS && + this.species.speciesId === Species.GENGAR && + this.getFormKey() === "mega") + ) { continue; } @@ -3263,10 +4938,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * * @see {@linkcode MoveRestrictionBattlerTag} */ - isMoveTargetRestricted(moveId: Moves, user: Pokemon, target: Pokemon): boolean { - for (const tag of this.findTags(t => t instanceof MoveRestrictionBattlerTag)) { - if ((tag as MoveRestrictionBattlerTag).isMoveTargetRestricted(moveId, user, target)) { - return (tag as MoveRestrictionBattlerTag !== null); + isMoveTargetRestricted( + moveId: Moves, + user: Pokemon, + target: Pokemon, + ): boolean { + for (const tag of this.findTags( + t => t instanceof MoveRestrictionBattlerTag, + )) { + if ( + (tag as MoveRestrictionBattlerTag).isMoveTargetRestricted( + moveId, + user, + target, + ) + ) { + return (tag as MoveRestrictionBattlerTag) !== null; } } return false; @@ -3280,11 +4967,26 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param {Pokemon} target {@linkcode Pokemon} the target of the move, optional and used when the target is a factor in the move's restricted status * @returns {MoveRestrictionBattlerTag | null} the first tag on this Pokemon that restricts the move, or `null` if the move is not restricted. */ - getRestrictingTag(moveId: Moves, user?: Pokemon, target?: Pokemon): MoveRestrictionBattlerTag | null { - for (const tag of this.findTags(t => t instanceof MoveRestrictionBattlerTag)) { + getRestrictingTag( + moveId: Moves, + user?: Pokemon, + target?: Pokemon, + ): MoveRestrictionBattlerTag | null { + for (const tag of this.findTags( + t => t instanceof MoveRestrictionBattlerTag, + )) { if ((tag as MoveRestrictionBattlerTag).isMoveRestricted(moveId, user)) { return tag as MoveRestrictionBattlerTag; - } else if (user && target && (tag as MoveRestrictionBattlerTag).isMoveTargetRestricted(moveId, user, target)) { + } + if ( + user && + target && + (tag as MoveRestrictionBattlerTag).isMoveTargetRestricted( + moveId, + user, + target, + ) + ) { return tag as MoveRestrictionBattlerTag; } } @@ -3311,13 +5013,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Default is `1`. * @returns A list of {@linkcode TurnMove}, as specified above. */ - getLastXMoves(moveCount: number = 1): TurnMove[] { + getLastXMoves(moveCount = 1): TurnMove[] { const moveHistory = this.getMoveHistory(); if (moveCount >= 0) { - return moveHistory.slice(Math.max(moveHistory.length - moveCount, 0)).reverse(); - } else { - return moveHistory.slice(0).reverse(); + return moveHistory + .slice(Math.max(moveHistory.length - moveCount, 0)) + .reverse(); } + return moveHistory.slice(0).reverse(); } getMoveQueue(): TurnMove[] { @@ -3330,17 +5033,24 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ stopMultiHit(target?: Pokemon): void { const effectPhase = globalScene.getCurrentPhase(); - if (effectPhase instanceof MoveEffectPhase && effectPhase.getUserPokemon() === this) { + if ( + effectPhase instanceof MoveEffectPhase && + effectPhase.getUserPokemon() === this + ) { effectPhase.stopMultiHit(target); } } changeForm(formChange: SpeciesFormChange): Promise { return new Promise(resolve => { - this.formIndex = Math.max(this.species.forms.findIndex(f => f.formKey === formChange.formKey), 0); + this.formIndex = Math.max( + this.species.forms.findIndex(f => f.formKey === formChange.formKey), + 0, + ); this.generateName(); const abilityCount = this.getSpeciesForm().getAbilityCount(); - if (this.abilityIndex >= abilityCount) {// Shouldn't happen + if (this.abilityIndex >= abilityCount) { + // Shouldn't happen this.abilityIndex = abilityCount - 1; } globalScene.gameData.setPokemonSeen(this, false); @@ -3348,24 +5058,47 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.loadAssets().then(() => { this.calculateStats(); globalScene.updateModifiers(this.isPlayer(), true); - Promise.all([ this.updateInfo(), globalScene.updateFieldScale() ]).then(() => resolve()); + Promise.all([this.updateInfo(), globalScene.updateFieldScale()]).then( + () => resolve(), + ); }); }); } - cry(soundConfig?: Phaser.Types.Sound.SoundConfig, sceneOverride?: BattleScene): AnySound { + cry( + soundConfig?: Phaser.Types.Sound.SoundConfig, + sceneOverride?: BattleScene, + ): AnySound { const scene = sceneOverride ?? globalScene; // TODO: is `sceneOverride` needed? const cry = this.getSpeciesForm().cry(soundConfig); let duration = cry.totalDuration * 1000; - if (this.fusionSpecies && this.getSpeciesForm() !== this.getFusionSpeciesForm()) { + if ( + this.fusionSpecies && + this.getSpeciesForm() !== this.getFusionSpeciesForm() + ) { let fusionCry = this.getFusionSpeciesForm().cry(soundConfig, true); duration = Math.min(duration, fusionCry.totalDuration * 1000); fusionCry.destroy(); scene.time.delayedCall(Utils.fixedInt(Math.ceil(duration * 0.4)), () => { try { - SoundFade.fadeOut(scene, cry, Utils.fixedInt(Math.ceil(duration * 0.2))); - fusionCry = this.getFusionSpeciesForm().cry(Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0) }, soundConfig)); - SoundFade.fadeIn(scene, fusionCry, Utils.fixedInt(Math.ceil(duration * 0.2)), scene.masterVolume * scene.fieldVolume, 0); + SoundFade.fadeOut( + scene, + cry, + Utils.fixedInt(Math.ceil(duration * 0.2)), + ); + fusionCry = this.getFusionSpeciesForm().cry( + Object.assign( + { seek: Math.max(fusionCry.totalDuration * 0.4, 0) }, + soundConfig, + ), + ); + SoundFade.fadeIn( + scene, + fusionCry, + Utils.fixedInt(Math.ceil(duration * 0.2)), + scene.masterVolume * scene.fieldVolume, + 0, + ); } catch (err) { console.error(err); } @@ -3375,8 +5108,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return cry; } + // biome-ignore lint: there are a ton of issues.. faintCry(callback: Function): void { - if (this.fusionSpecies && this.getSpeciesForm() !== this.getFusionSpeciesForm()) { + if ( + this.fusionSpecies && + this.getSpeciesForm() !== this.getFusionSpeciesForm() + ) { return this.fusionFaintCry(callback); } @@ -3396,31 +5133,32 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { sprite.anims.pause(); tintSprite?.anims.pause(); - let faintCryTimer : Phaser.Time.TimerEvent | null = globalScene.time.addEvent({ - delay: Utils.fixedInt(delay), - repeat: -1, - callback: () => { - frameThreshold = sprite.anims.msPerFrame / rate; - frameProgress += delay; - while (frameProgress > frameThreshold) { - if (sprite.anims.duration) { - sprite.anims.nextFrame(); - tintSprite?.anims.nextFrame(); + let faintCryTimer: Phaser.Time.TimerEvent | null = + globalScene.time.addEvent({ + delay: Utils.fixedInt(delay), + repeat: -1, + callback: () => { + frameThreshold = sprite.anims.msPerFrame / rate; + frameProgress += delay; + while (frameProgress > frameThreshold) { + if (sprite.anims.duration) { + sprite.anims.nextFrame(); + tintSprite?.anims.nextFrame(); + } + frameProgress -= frameThreshold; } - frameProgress -= frameThreshold; - } - if (cry && !cry.pendingRemove) { - rate *= 0.99; - cry.setRate(rate); - } else { - faintCryTimer?.destroy(); - faintCryTimer = null; - if (callback) { - callback(); + if (cry && !cry.pendingRemove) { + rate *= 0.99; + cry.setRate(rate); + } else { + faintCryTimer?.destroy(); + faintCryTimer = null; + if (callback) { + callback(); + } } - } - } - }); + }, + }); // Failsafe globalScene.time.delayedCall(Utils.fixedInt(3000), () => { @@ -3437,6 +5175,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { }); } + // biome-ignore lint/complexity/noBannedTypes: Consider refactoring to change type of Function private fusionFaintCry(callback: Function): void { const key = this.species.getCryKey(this.formIndex); let i = 0; @@ -3447,7 +5186,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let duration = cry.totalDuration * 1000; const fusionCryKey = this.fusionSpecies!.getCryKey(this.fusionFormIndex); - let fusionCry = globalScene.playSound(fusionCryKey, { rate: rate }) as AnySound; + let fusionCry = globalScene.playSound(fusionCryKey, { + rate: rate, + }) as AnySound; if (!cry || !fusionCry || globalScene.fieldVolume === 0) { return callback(); } @@ -3477,41 +5218,61 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { sprite.anims.pause(); tintSprite?.anims.pause(); - let faintCryTimer: Phaser.Time.TimerEvent | null = globalScene.time.addEvent({ - delay: Utils.fixedInt(delay), - repeat: -1, - callback: () => { - ++i; - frameThreshold = sprite.anims.msPerFrame / rate; - frameProgress += delay; - while (frameProgress > frameThreshold) { - if (sprite.anims.duration) { - sprite.anims.nextFrame(); - tintSprite?.anims.nextFrame(); + let faintCryTimer: Phaser.Time.TimerEvent | null = + globalScene.time.addEvent({ + delay: Utils.fixedInt(delay), + repeat: -1, + callback: () => { + ++i; + frameThreshold = sprite.anims.msPerFrame / rate; + frameProgress += delay; + while (frameProgress > frameThreshold) { + if (sprite.anims.duration) { + sprite.anims.nextFrame(); + tintSprite?.anims.nextFrame(); + } + frameProgress -= frameThreshold; } - frameProgress -= frameThreshold; - } - if (i === transitionIndex && fusionCryKey) { - SoundFade.fadeOut(globalScene, cry, Utils.fixedInt(Math.ceil((duration / rate) * 0.2))); - fusionCry = globalScene.playSound(fusionCryKey, Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0), rate: rate })); - SoundFade.fadeIn(globalScene, fusionCry, Utils.fixedInt(Math.ceil((duration / rate) * 0.2)), globalScene.masterVolume * globalScene.fieldVolume, 0); - } - rate *= 0.99; - if (cry && !cry.pendingRemove) { - cry.setRate(rate); - } - if (fusionCry && !fusionCry.pendingRemove) { - fusionCry.setRate(rate); - } - if ((!cry || cry.pendingRemove) && (!fusionCry || fusionCry.pendingRemove)) { - faintCryTimer?.destroy(); - faintCryTimer = null; - if (callback) { - callback(); + if (i === transitionIndex && fusionCryKey) { + SoundFade.fadeOut( + globalScene, + cry, + Utils.fixedInt(Math.ceil((duration / rate) * 0.2)), + ); + fusionCry = globalScene.playSound( + fusionCryKey, + Object.assign({ + seek: Math.max(fusionCry.totalDuration * 0.4, 0), + rate: rate, + }), + ); + SoundFade.fadeIn( + globalScene, + fusionCry, + Utils.fixedInt(Math.ceil((duration / rate) * 0.2)), + globalScene.masterVolume * globalScene.fieldVolume, + 0, + ); } - } - } - }); + rate *= 0.99; + if (cry && !cry.pendingRemove) { + cry.setRate(rate); + } + if (fusionCry && !fusionCry.pendingRemove) { + fusionCry.setRate(rate); + } + if ( + (!cry || cry.pendingRemove) && + (!fusionCry || fusionCry.pendingRemove) + ) { + faintCryTimer?.destroy(); + faintCryTimer = null; + if (callback) { + callback(); + } + } + }, + }); // Failsafe globalScene.time.delayedCall(Utils.fixedInt(3000), () => { @@ -3532,7 +5293,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } isOppositeGender(pokemon: Pokemon): boolean { - return this.gender !== Gender.GENDERLESS && pokemon.gender === (this.gender === Gender.MALE ? Gender.FEMALE : Gender.MALE); + return ( + this.gender !== Gender.GENDERLESS && + pokemon.gender === + (this.gender === Gender.MALE ? Gender.FEMALE : Gender.MALE) + ); } /** @@ -3544,17 +5309,31 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param sourcePokemon The Pokemon that is setting the status effect * @param ignoreField Whether any field effects (weather, terrain, etc.) should be considered */ - canSetStatus(effect: StatusEffect | undefined, quiet: boolean = false, overrideStatus: boolean = false, sourcePokemon: Pokemon | null = null, ignoreField: boolean = false): boolean { + canSetStatus( + effect: StatusEffect | undefined, + quiet = false, + overrideStatus = false, + sourcePokemon: Pokemon | null = null, + ignoreField = false, + ): boolean { if (effect !== StatusEffect.FAINT) { if (overrideStatus ? this.status?.effect === effect : this.status) { return false; } - if (this.isGrounded() && (!ignoreField && globalScene.arena.terrain?.terrainType === TerrainType.MISTY)) { + if ( + this.isGrounded() && + !ignoreField && + globalScene.arena.terrain?.terrainType === TerrainType.MISTY + ) { return false; } } - if (sourcePokemon && sourcePokemon !== this && this.isSafeguarded(sourcePokemon)) { + if ( + sourcePokemon && + sourcePokemon !== this && + this.isSafeguarded(sourcePokemon) + ) { return false; } @@ -3563,17 +5342,24 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { switch (effect) { case StatusEffect.POISON: case StatusEffect.TOXIC: - // Check if the Pokemon is immune to Poison/Toxic or if the source pokemon is canceling the immunity + // Check if the Pokemon is immune to Poison/Toxic or if the source pokemon is canceling the immunity const poisonImmunity = types.map(defType => { - // Check if the Pokemon is not immune to Poison/Toxic - if (defType !== Type.POISON && defType !== Type.STEEL) { + // Check if the Pokemon is not immune to Poison/Toxic + if (defType !== PokemonType.POISON && defType !== PokemonType.STEEL) { return false; } // Check if the source Pokemon has an ability that cancels the Poison/Toxic immunity const cancelImmunity = new Utils.BooleanHolder(false); if (sourcePokemon) { - applyAbAttrs(IgnoreTypeStatusEffectImmunityAbAttr, sourcePokemon, cancelImmunity, false, effect, defType); + applyAbAttrs( + IgnoreTypeStatusEffectImmunityAbAttr, + sourcePokemon, + cancelImmunity, + false, + effect, + defType, + ); if (cancelImmunity.value) { return false; } @@ -3582,39 +5368,63 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return true; }); - if (this.isOfType(Type.POISON) || this.isOfType(Type.STEEL)) { + if (this.isOfType(PokemonType.POISON) || this.isOfType(PokemonType.STEEL)) { if (poisonImmunity.includes(true)) { return false; } } break; case StatusEffect.PARALYSIS: - if (this.isOfType(Type.ELECTRIC)) { + if (this.isOfType(PokemonType.ELECTRIC)) { return false; } break; case StatusEffect.SLEEP: - if (this.isGrounded() && globalScene.arena.terrain?.terrainType === TerrainType.ELECTRIC) { + if ( + this.isGrounded() && + globalScene.arena.terrain?.terrainType === TerrainType.ELECTRIC + ) { return false; } break; case StatusEffect.FREEZE: - if (this.isOfType(Type.ICE) || (!ignoreField && (globalScene?.arena?.weather?.weatherType && [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(globalScene.arena.weather.weatherType)))) { + if ( + this.isOfType(PokemonType.ICE) || + (!ignoreField && + globalScene?.arena?.weather?.weatherType && + [WeatherType.SUNNY, WeatherType.HARSH_SUN].includes( + globalScene.arena.weather.weatherType, + )) + ) { return false; } break; case StatusEffect.BURN: - if (this.isOfType(Type.FIRE)) { + if (this.isOfType(PokemonType.FIRE)) { return false; } break; } const cancelled = new Utils.BooleanHolder(false); - applyPreSetStatusAbAttrs(StatusEffectImmunityAbAttr, this, effect, cancelled, quiet); + applyPreSetStatusAbAttrs( + StatusEffectImmunityAbAttr, + this, + effect, + cancelled, + quiet, + ); const userField = this.getAlliedField(); - userField.forEach(pokemon => applyPreSetStatusAbAttrs(UserFieldStatusEffectImmunityAbAttr, pokemon, effect, cancelled, quiet)); + userField.forEach(pokemon => + applyPreSetStatusAbAttrs( + UserFieldStatusEffectImmunityAbAttr, + pokemon, + effect, + cancelled, + quiet, + ), + ); if (cancelled.value) { return false; @@ -3623,7 +5433,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return true; } - trySetStatus(effect?: StatusEffect, asPhase: boolean = false, sourcePokemon: Pokemon | null = null, turnsRemaining: number = 0, sourceText: string | null = null): boolean { + trySetStatus( + effect?: StatusEffect, + asPhase = false, + sourcePokemon: Pokemon | null = null, + turnsRemaining = 0, + sourceText: string | null = null, + ): boolean { if (!this.canSetStatus(effect, asPhase, false, sourcePokemon)) { return false; } @@ -3640,7 +5456,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } if (asPhase) { - globalScene.unshiftPhase(new ObtainStatusEffectPhase(this.getBattlerIndex(), effect, turnsRemaining, sourceText, sourcePokemon)); + globalScene.unshiftPhase( + new ObtainStatusEffectPhase( + this.getBattlerIndex(), + effect, + turnsRemaining, + sourceText, + sourcePokemon, + ), + ); return true; } @@ -3656,10 +5480,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { BattlerTagType.UNDERGROUND, BattlerTagType.UNDERWATER, BattlerTagType.HIDDEN, - BattlerTagType.FLYING + BattlerTagType.FLYING, ]; - const tag = invulnerableTags.find((t) => this.getTag(t)); + const tag = invulnerableTags.find(t => this.getTag(t)); if (tag) { this.removeTag(tag); @@ -3672,20 +5496,29 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.status = new Status(effect, 0, sleepTurnsRemaining?.value); if (effect !== StatusEffect.FAINT) { - globalScene.triggerPokemonFormChange(this, SpeciesFormChangeStatusEffectTrigger, true); - applyPostSetStatusAbAttrs(PostSetStatusAbAttr, this, effect, sourcePokemon); + globalScene.triggerPokemonFormChange( + this, + SpeciesFormChangeStatusEffectTrigger, + true, + ); + applyPostSetStatusAbAttrs( + PostSetStatusAbAttr, + this, + effect, + sourcePokemon, + ); } return true; } /** - * Resets the status of a pokemon. - * @param revive Whether revive should be cured; defaults to true. - * @param confusion Whether resetStatus should include confusion or not; defaults to false. - * @param reloadAssets Whether to reload the assets or not; defaults to false. - */ - resetStatus(revive: boolean = true, confusion: boolean = false, reloadAssets: boolean = false): void { + * Resets the status of a pokemon. + * @param revive Whether revive should be cured; defaults to true. + * @param confusion Whether resetStatus should include confusion or not; defaults to false. + * @param reloadAssets Whether to reload the assets or not; defaults to false. + */ + resetStatus(revive = true, confusion = false, reloadAssets = false): void { const lastStatus = this.status?.effect; if (!revive && lastStatus === StatusEffect.FAINT) { return; @@ -3713,7 +5546,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns `true` if this Pokemon is protected by Safeguard; `false` otherwise. */ isSafeguarded(attacker: Pokemon): boolean { - const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; + const defendingSide = this.isPlayer() + ? ArenaTagSide.PLAYER + : ArenaTagSide.ENEMY; if (globalScene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, defendingSide)) { const bypassed = new Utils.BooleanHolder(false); if (attacker) { @@ -3747,14 +5582,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } // If this Pokemon has a Substitute when loading in, play an animation to add its sprite if (this.getTag(SubstituteTag)) { - globalScene.triggerPokemonBattleAnim(this, PokemonAnimType.SUBSTITUTE_ADD); + globalScene.triggerPokemonBattleAnim( + this, + PokemonAnimType.SUBSTITUTE_ADD, + ); this.getTag(SubstituteTag)!.sourceInFocus = false; } // If this Pokemon has Commander and Dondozo as an active ally, hide this Pokemon's sprite. - if (this.hasAbilityWithAttr(CommanderAbAttr) - && globalScene.currentBattle.double - && this.getAlly()?.species.speciesId === Species.DONDOZO) { + if ( + this.hasAbilityWithAttr(CommanderAbAttr) && + globalScene.currentBattle.double && + this.getAlly()?.species.speciesId === Species.DONDOZO + ) { this.setVisible(false); } this.summonDataPrimer = null; @@ -3772,7 +5612,24 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.lapseTag(BattlerTagType.SEEDED); } if (globalScene) { - globalScene.triggerPokemonFormChange(this, SpeciesFormChangePostMoveTrigger, true); + globalScene.triggerPokemonFormChange( + this, + SpeciesFormChangePostMoveTrigger, + true, + ); + } + } + + resetTera(): void { + const wasTerastallized = this.isTerastallized; + this.isTerastallized = false; + this.stellarTypesBoosted = []; + if (wasTerastallized) { + this.updateSpritePipelineData(); + globalScene.triggerPokemonFormChange( + this, + SpeciesFormChangeLapseTeraTrigger, + ); } } @@ -3780,26 +5637,32 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.turnData = new PokemonTurnData(); } - getExpValue(): integer { + getExpValue(): number { // Logic to factor in victor level has been removed for balancing purposes, so the player doesn't have to focus on EXP maxxing - return ((this.getSpeciesForm().getBaseExp() * this.level) / 5 + 1); + return (this.getSpeciesForm().getBaseExp() * this.level) / 5 + 1; } - setFrameRate(frameRate: integer) { + setFrameRate(frameRate: number) { globalScene.anims.get(this.getBattleSpriteKey()).frameRate = frameRate; try { this.getSprite().play(this.getBattleSpriteKey()); } catch (err: unknown) { - console.error(`Failed to play animation for ${this.getBattleSpriteKey()}`, err); + console.error( + `Failed to play animation for ${this.getBattleSpriteKey()}`, + err, + ); } try { this.getTintSprite()?.play(this.getBattleSpriteKey()); } catch (err: unknown) { - console.error(`Failed to play animation for ${this.getBattleSpriteKey()}`, err); + console.error( + `Failed to play animation for ${this.getBattleSpriteKey()}`, + err, + ); } } - tint(color: number, alpha?: number, duration?: integer, ease?: string) { + tint(color: number, alpha?: number, duration?: number, ease?: string) { const tintSprite = this.getTintSprite(); tintSprite?.setTintFill(color); tintSprite?.setVisible(true); @@ -3811,14 +5674,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { targets: tintSprite, alpha: alpha || 1, duration: duration, - ease: ease || "Linear" + ease: ease || "Linear", }); } else { tintSprite?.setAlpha(alpha); } } - untint(duration: integer, ease?: string) { + untint(duration: number, ease?: string) { const tintSprite = this.getTintSprite(); if (duration) { @@ -3830,7 +5693,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { onComplete: () => { tintSprite?.setVisible(false); tintSprite?.setAlpha(1); - } + }, }); } else { tintSprite?.setVisible(false); @@ -3842,9 +5705,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!this.maskEnabled) { this.maskSprite = this.getTintSprite(); this.maskSprite?.setVisible(true); - this.maskSprite?.setPosition(this.x * this.parentContainer.scale + this.parentContainer.x, - this.y * this.parentContainer.scale + this.parentContainer.y); - this.maskSprite?.setScale(this.getSpriteScale() * this.parentContainer.scale); + this.maskSprite?.setPosition( + this.x * this.parentContainer.scale + this.parentContainer.x, + this.y * this.parentContainer.scale + this.parentContainer.y, + ); + this.maskSprite?.setScale( + this.getSpriteScale() * this.parentContainer.scale, + ); this.maskEnabled = true; } } @@ -3867,74 +5734,141 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { updateFusionPalette(ignoreOveride?: boolean): void { if (!this.getFusionSpeciesForm(ignoreOveride)) { - [ this.getSprite(), this.getTintSprite() ].filter(s => !!s).map(s => { - s.pipelineData[`spriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}`] = []; - s.pipelineData[`fusionSpriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}`] = []; - }); + [this.getSprite(), this.getTintSprite()] + .filter(s => !!s) + .map(s => { + s.pipelineData[ + `spriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}` + ] = []; + s.pipelineData[ + `fusionSpriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}` + ] = []; + }); return; } const speciesForm = this.getSpeciesForm(ignoreOveride); const fusionSpeciesForm = this.getFusionSpeciesForm(ignoreOveride); - const spriteKey = speciesForm.getSpriteKey(this.getGender(ignoreOveride) === Gender.FEMALE, speciesForm.formIndex, this.shiny, this.variant); - const backSpriteKey = speciesForm.getSpriteKey(this.getGender(ignoreOveride) === Gender.FEMALE, speciesForm.formIndex, this.shiny, this.variant).replace("pkmn__", "pkmn__back__"); - const fusionSpriteKey = fusionSpeciesForm.getSpriteKey(this.getFusionGender(ignoreOveride) === Gender.FEMALE, fusionSpeciesForm.formIndex, this.fusionShiny, this.fusionVariant); - const fusionBackSpriteKey = fusionSpeciesForm.getSpriteKey(this.getFusionGender(ignoreOveride) === Gender.FEMALE, fusionSpeciesForm.formIndex, this.fusionShiny, this.fusionVariant).replace("pkmn__", "pkmn__back__"); + const spriteKey = speciesForm.getSpriteKey( + this.getGender(ignoreOveride) === Gender.FEMALE, + speciesForm.formIndex, + this.shiny, + this.variant, + ); + const backSpriteKey = speciesForm + .getSpriteKey( + this.getGender(ignoreOveride) === Gender.FEMALE, + speciesForm.formIndex, + this.shiny, + this.variant, + ) + .replace("pkmn__", "pkmn__back__"); + const fusionSpriteKey = fusionSpeciesForm.getSpriteKey( + this.getFusionGender(ignoreOveride) === Gender.FEMALE, + fusionSpeciesForm.formIndex, + this.fusionShiny, + this.fusionVariant, + ); + const fusionBackSpriteKey = fusionSpeciesForm + .getSpriteKey( + this.getFusionGender(ignoreOveride) === Gender.FEMALE, + fusionSpeciesForm.formIndex, + this.fusionShiny, + this.fusionVariant, + ) + .replace("pkmn__", "pkmn__back__"); const sourceTexture = globalScene.textures.get(spriteKey); const sourceBackTexture = globalScene.textures.get(backSpriteKey); const fusionTexture = globalScene.textures.get(fusionSpriteKey); const fusionBackTexture = globalScene.textures.get(fusionBackSpriteKey); - const [ sourceFrame, sourceBackFrame, fusionFrame, fusionBackFrame ] = [ sourceTexture, sourceBackTexture, fusionTexture, fusionBackTexture ].map(texture => texture.frames[texture.firstFrame]); - const [ sourceImage, sourceBackImage, fusionImage, fusionBackImage ] = [ sourceTexture, sourceBackTexture, fusionTexture, fusionBackTexture ].map(i => i.getSourceImage() as HTMLImageElement); + const [sourceFrame, sourceBackFrame, fusionFrame, fusionBackFrame] = [ + sourceTexture, + sourceBackTexture, + fusionTexture, + fusionBackTexture, + ].map(texture => texture.frames[texture.firstFrame]); + const [sourceImage, sourceBackImage, fusionImage, fusionBackImage] = [ + sourceTexture, + sourceBackTexture, + fusionTexture, + fusionBackTexture, + ].map(i => i.getSourceImage() as HTMLImageElement); const canvas = document.createElement("canvas"); const backCanvas = document.createElement("canvas"); const fusionCanvas = document.createElement("canvas"); const fusionBackCanvas = document.createElement("canvas"); - const spriteColors: integer[][] = []; + const spriteColors: number[][] = []; const pixelData: Uint8ClampedArray[] = []; - [ canvas, backCanvas, fusionCanvas, fusionBackCanvas ].forEach((canv: HTMLCanvasElement, c: integer) => { - const context = canv.getContext("2d"); - const frame = [ sourceFrame, sourceBackFrame, fusionFrame, fusionBackFrame ][c]; - canv.width = frame.width; - canv.height = frame.height; + [canvas, backCanvas, fusionCanvas, fusionBackCanvas].forEach( + (canv: HTMLCanvasElement, c: number) => { + const context = canv.getContext("2d"); + const frame = [ + sourceFrame, + sourceBackFrame, + fusionFrame, + fusionBackFrame, + ][c]; + canv.width = frame.width; + canv.height = frame.height; - if (context) { - context.drawImage([ sourceImage, sourceBackImage, fusionImage, fusionBackImage ][c], frame.cutX, frame.cutY, frame.width, frame.height, 0, 0, frame.width, frame.height); - const imageData = context.getImageData(frame.cutX, frame.cutY, frame.width, frame.height); - pixelData.push(imageData.data); - } - }); + if (context) { + context.drawImage( + [sourceImage, sourceBackImage, fusionImage, fusionBackImage][c], + frame.cutX, + frame.cutY, + frame.width, + frame.height, + 0, + 0, + frame.width, + frame.height, + ); + const imageData = context.getImageData( + frame.cutX, + frame.cutY, + frame.width, + frame.height, + ); + pixelData.push(imageData.data); + } + }, + ); for (let f = 0; f < 2; f++) { const variantColors = variantColorCache[!f ? spriteKey : backSpriteKey]; - const variantColorSet = new Map(); + const variantColorSet = new Map(); if (this.shiny && variantColors && variantColors[this.variant]) { Object.keys(variantColors[this.variant]).forEach(k => { - variantColorSet.set(Utils.rgbaToInt(Array.from(Object.values(Utils.rgbHexToRgba(k)))), Array.from(Object.values(Utils.rgbHexToRgba(variantColors[this.variant][k])))); + variantColorSet.set( + Utils.rgbaToInt(Array.from(Object.values(Utils.rgbHexToRgba(k)))), + Array.from( + Object.values(Utils.rgbHexToRgba(variantColors[this.variant][k])), + ), + ); }); } for (let i = 0; i < pixelData[f].length; i += 4) { if (pixelData[f][i + 3]) { const pixel = pixelData[f].slice(i, i + 4); - let [ r, g, b, a ] = pixel; + let [r, g, b, a] = pixel; if (variantColors) { - const color = Utils.rgbaToInt([ r, g, b, a ]); + const color = Utils.rgbaToInt([r, g, b, a]); if (variantColorSet.has(color)) { const mappedPixel = variantColorSet.get(color); if (mappedPixel) { - [ r, g, b, a ] = mappedPixel; + [r, g, b, a] = mappedPixel; } } } if (!spriteColors.find(c => c[0] === r && c[1] === g && c[2] === b)) { - spriteColors.push([ r, g, b, a ]); + spriteColors.push([r, g, b, a]); } } } @@ -3945,35 +5879,63 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const pixelColors: number[] = []; for (let f = 0; f < 2; f++) { for (let i = 0; i < pixelData[f].length; i += 4) { - const total = pixelData[f].slice(i, i + 3).reduce((total: integer, value: integer) => total + value, 0); + const total = pixelData[f] + .slice(i, i + 3) + .reduce((total: number, value: number) => total + value, 0); if (!total) { continue; } - pixelColors.push(argbFromRgba({ r: pixelData[f][i], g: pixelData[f][i + 1], b: pixelData[f][i + 2], a: pixelData[f][i + 3] })); + pixelColors.push( + argbFromRgba({ + r: pixelData[f][i], + g: pixelData[f][i + 1], + b: pixelData[f][i + 2], + a: pixelData[f][i + 3], + }), + ); } } - const fusionPixelColors : number[] = []; + const fusionPixelColors: number[] = []; for (let f = 0; f < 2; f++) { - const variantColors = variantColorCache[!f ? fusionSpriteKey : fusionBackSpriteKey]; - const variantColorSet = new Map(); - if (this.fusionShiny && variantColors && variantColors[this.fusionVariant]) { - Object.keys(variantColors[this.fusionVariant]).forEach(k => { - variantColorSet.set(Utils.rgbaToInt(Array.from(Object.values(Utils.rgbHexToRgba(k)))), Array.from(Object.values(Utils.rgbHexToRgba(variantColors[this.fusionVariant][k])))); - }); + const variantColors = + variantColorCache[!f ? fusionSpriteKey : fusionBackSpriteKey]; + const variantColorSet = new Map(); + if ( + this.fusionShiny && + variantColors && + variantColors[this.fusionVariant] + ) { + for (const k of Object.keys(variantColors[this.fusionVariant])) { + variantColorSet.set( + Utils.rgbaToInt(Array.from(Object.values(Utils.rgbHexToRgba(k)))), + Array.from( + Object.values( + Utils.rgbHexToRgba(variantColors[this.fusionVariant][k]), + ), + ), + ); + } } for (let i = 0; i < pixelData[2 + f].length; i += 4) { - const total = pixelData[2 + f].slice(i, i + 3).reduce((total: integer, value: integer) => total + value, 0); + const total = pixelData[2 + f] + .slice(i, i + 3) + .reduce((total: number, value: number) => total + value, 0); if (!total) { continue; } - let [ r, g, b, a ] = [ pixelData[2 + f][i], pixelData[2 + f][i + 1], pixelData[2 + f][i + 2], pixelData[2 + f][i + 3] ]; + let [r, g, b, a] = [ + pixelData[2 + f][i], + pixelData[2 + f][i + 1], + pixelData[2 + f][i + 2], + pixelData[2 + f][i + 3], + ]; if (variantColors) { - const color = Utils.rgbaToInt([ r, g, b, a ]); + const color = Utils.rgbaToInt([r, g, b, a]); if (variantColorSet.has(color)) { const mappedPixel = variantColorSet.get(color); if (mappedPixel) { - [ r, g, b, a ] = mappedPixel; + [r, g, b, a] = mappedPixel; } } } @@ -3981,40 +5943,57 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } + if (fusionPixelColors.length === 0) { + // ERROR HANDLING IS NOT OPTIONAL BUDDY + console.log("Failed to create fusion palette"); + return; + } + let paletteColors: Map; let fusionPaletteColors: Map; const originalRandom = Math.random; Math.random = () => Phaser.Math.RND.realInRange(0, 1); - globalScene.executeWithSeedOffset(() => { - paletteColors = QuantizerCelebi.quantize(pixelColors, 4); - fusionPaletteColors = QuantizerCelebi.quantize(fusionPixelColors, 4); - }, 0, "This result should not vary"); + globalScene.executeWithSeedOffset( + () => { + paletteColors = QuantizerCelebi.quantize(pixelColors, 4); + fusionPaletteColors = QuantizerCelebi.quantize(fusionPixelColors, 4); + }, + 0, + "This result should not vary", + ); Math.random = originalRandom; - paletteColors = paletteColors!; // tell TS compiler that paletteColors is defined! - fusionPaletteColors = fusionPaletteColors!; // TS compiler that fusionPaletteColors is defined! - const [ palette, fusionPalette ] = [ paletteColors, fusionPaletteColors ] - .map(paletteColors => { - let keys = Array.from(paletteColors.keys()).sort((a: integer, b: integer) => paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1); - let rgbaColors: Map; + paletteColors = paletteColors!; // erroneously tell TS compiler that paletteColors is defined! + fusionPaletteColors = fusionPaletteColors!; // mischievously misinform TS compiler that fusionPaletteColors is defined! + const [palette, fusionPalette] = [paletteColors, fusionPaletteColors].map( + paletteColors => { + let keys = Array.from(paletteColors.keys()).sort( + (a: number, b: number) => + paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1, + ); + let rgbaColors: Map; let hsvColors: Map; - const mappedColors = new Map(); + const mappedColors = new Map(); do { mappedColors.clear(); - rgbaColors = keys.reduce((map: Map, k: number) => { - map.set(k, Object.values(rgbaFromArgb(k))); return map; - }, new Map()); - hsvColors = Array.from(rgbaColors.keys()).reduce((map: Map, k: number) => { - const rgb = rgbaColors.get(k)!.slice(0, 3); - map.set(k, Utils.rgbToHsv(rgb[0], rgb[1], rgb[2])); + rgbaColors = keys.reduce((map: Map, k: number) => { + map.set(k, Object.values(rgbaFromArgb(k))); return map; }, new Map()); + hsvColors = Array.from(rgbaColors.keys()).reduce( + (map: Map, k: number) => { + const rgb = rgbaColors.get(k)!.slice(0, 3); + map.set(k, Utils.rgbToHsv(rgb[0], rgb[1], rgb[2])); + return map; + }, + new Map(), + ); for (let c = keys.length - 1; c >= 0; c--) { const hsv = hsvColors.get(keys[c])!; @@ -4025,14 +6004,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (mappedColors.has(keys[c])) { mappedColors.get(keys[c])!.push(keys[c2]); } else { - mappedColors.set(keys[c], [ keys[c2] ]); + mappedColors.set(keys[c], [keys[c2]]); } break; } } } - mappedColors.forEach((values: integer[], key: integer) => { + mappedColors.forEach((values: number[], key: number) => { const keyColor = rgbaColors.get(key)!; const valueColors = values.map(v => rgbaColors.get(v)!); const color = keyColor.slice(0); @@ -4046,8 +6025,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } for (let c = 0; c < 3; c++) { - color[c] *= (paletteColors.get(key)! / count); - values.forEach((value: integer, i: integer) => { + color[c] *= paletteColors.get(key)! / count; + values.forEach((value: number, i: number) => { if (paletteColors.has(value)) { const valueCount = paletteColors.get(value)!; color[c] += valueColors[i][c] * (valueCount / count); @@ -4064,19 +6043,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } - paletteColors.set(argbFromRgba({ r: color[0], g: color[1], b: color[2], a: color[3] }), count); + paletteColors.set( + argbFromRgba({ + r: color[0], + g: color[1], + b: color[2], + a: color[3], + }), + count, + ); }); - keys = Array.from(paletteColors.keys()).sort((a: integer, b: integer) => paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1); + keys = Array.from(paletteColors.keys()).sort( + (a: number, b: number) => + paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1, + ); } while (mappedColors.size); return keys.map(c => Object.values(rgbaFromArgb(c))); - } - ); + }, + ); const paletteDeltas: number[][] = []; - spriteColors.forEach((sc: integer[], i: integer) => { + spriteColors.forEach((sc: number[], i: number) => { paletteDeltas.push([]); for (let p = 0; p < palette.length; p++) { paletteDeltas[i].push(Utils.deltaRgb(sc, palette[p])); @@ -4087,21 +6077,33 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { for (let sc = 0; sc < spriteColors.length; sc++) { const delta = Math.min(...paletteDeltas[sc]); - const paletteIndex = Math.min(paletteDeltas[sc].findIndex(pd => pd === delta), fusionPalette.length - 1); + const paletteIndex = Math.min( + paletteDeltas[sc].findIndex(pd => pd === delta), + fusionPalette.length - 1, + ); if (delta < 255) { const ratio = easeFunc(delta / 255); - const color = [ 0, 0, 0, fusionSpriteColors[sc][3] ]; + const color = [0, 0, 0, fusionSpriteColors[sc][3]]; for (let c = 0; c < 3; c++) { - color[c] = Math.round((fusionSpriteColors[sc][c] * ratio) + (fusionPalette[paletteIndex][c] * (1 - ratio))); + color[c] = Math.round( + fusionSpriteColors[sc][c] * ratio + + fusionPalette[paletteIndex][c] * (1 - ratio), + ); } fusionSpriteColors[sc] = color; } } - [ this.getSprite(), this.getTintSprite() ].filter(s => !!s).map(s => { - s.pipelineData[`spriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}`] = spriteColors; - s.pipelineData[`fusionSpriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}`] = fusionSpriteColors; - }); + [this.getSprite(), this.getTintSprite()] + .filter(s => !!s) + .map(s => { + s.pipelineData[ + `spriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}` + ] = spriteColors; + s.pipelineData[ + `fusionSpriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}` + ] = fusionSpriteColors; + }); canvas.remove(); fusionCanvas.remove(); @@ -4119,7 +6121,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param min The minimum integer to pick, default `0` * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1) */ - randSeedInt(range: integer, min: integer = 0): integer { + randSeedInt(range: number, min = 0): number { return globalScene.currentBattle ? globalScene.randBattleSeedInt(range, min) : Utils.randSeedInt(range, min); @@ -4131,8 +6133,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param max The maximum integer to generate * @returns a random integer between {@linkcode min} and {@linkcode max} inclusive */ - randSeedIntRange(min: integer, max: integer): integer { - return this.randSeedInt((max - min) + 1, min); + randSeedIntRange(min: number, max: number): number { + return this.randSeedInt(max - min + 1, min); } /** @@ -4142,9 +6144,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param hideInfo Indicates if this should also play the animation to hide the Pokemon's * info container. */ - leaveField(clearEffects: boolean = true, hideInfo: boolean = true) { + leaveField(clearEffects = true, hideInfo = true, destroy = false) { this.resetSprite(); this.resetTurnData(); + globalScene + .getField(true) + .filter(p => p !== this) + .forEach(p => p.removeTagsBySourceId(this.id)); + if (clearEffects) { this.destroySubstitute(); this.resetSummonData(); // this also calls `resetBattleSummonData` @@ -4152,9 +6159,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (hideInfo) { this.hideInfo(); } - globalScene.field.remove(this); + // Trigger abilities that activate upon leaving the field + applyPreLeaveFieldAbAttrs(PreLeaveFieldAbAttr, this); this.setSwitchOutStatus(true); - globalScene.triggerPokemonFormChange(this, SpeciesFormChangeActiveTrigger, true); + globalScene.triggerPokemonFormChange( + this, + SpeciesFormChangeActiveTrigger, + true, + ); + globalScene.field.remove(this, destroy); } destroy(): void { @@ -4175,7 +6188,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { hasSameAbilityInRootForm(abilityIndex: number): boolean { const currentAbilityIndex = this.abilityIndex; const rootForm = getPokemonSpecies(this.species.getRootSpeciesId()); - return rootForm.getAbility(abilityIndex) === rootForm.getAbility(currentAbilityIndex); + return ( + rootForm.getAbility(abilityIndex) === + rootForm.getAbility(currentAbilityIndex) + ); } /** @@ -4204,7 +6220,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param forBattle If `false`, do not trigger in-battle effects (such as Unburden) from losing the item. For example, set this to `false` if the Pokemon is giving away the held item for a Mystery Encounter. Default is `true`. * @returns `true` if the item was removed successfully, `false` otherwise. */ - public loseHeldItem(heldItem: PokemonHeldItemModifier, forBattle: boolean = true): boolean { + public loseHeldItem( + heldItem: PokemonHeldItemModifier, + forBattle = true, + ): boolean { if (heldItem.pokemonId === -1 || heldItem.pokemonId === this.id) { heldItem.stackCount--; if (heldItem.stackCount <= 0) { @@ -4223,8 +6242,32 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { export class PlayerPokemon extends Pokemon { public compatibleTms: Moves[]; - constructor(species: PokemonSpecies, level: integer, abilityIndex?: integer, formIndex?: integer, gender?: Gender, shiny?: boolean, variant?: Variant, ivs?: integer[], nature?: Nature, dataSource?: Pokemon | PokemonData) { - super(106, 148, species, level, abilityIndex, formIndex, gender, shiny, variant, ivs, nature, dataSource); + constructor( + species: PokemonSpecies, + level: number, + abilityIndex?: number, + formIndex?: number, + gender?: Gender, + shiny?: boolean, + variant?: Variant, + ivs?: number[], + nature?: Nature, + dataSource?: Pokemon | PokemonData, + ) { + super( + 106, + 148, + species, + level, + abilityIndex, + formIndex, + gender, + shiny, + variant, + ivs, + nature, + dataSource, + ); if (Overrides.STATUS_OVERRIDE) { this.status = new Status(Overrides.STATUS_OVERRIDE, 0, 4); @@ -4268,7 +6311,7 @@ export class PlayerPokemon extends Pokemon { return false; } - getFieldIndex(): integer { + getFieldIndex(): number { return globalScene.getPlayerField().indexOf(this); } @@ -4281,16 +6324,23 @@ export class PlayerPokemon extends Pokemon { const tms = Object.keys(tmSpecies); for (const tm of tms) { - const moveId = parseInt(tm) as Moves; + const moveId = Number.parseInt(tm) as Moves; let compatible = false; for (const p of tmSpecies[tm]) { if (Array.isArray(p)) { - const [ pkm, form ] = p; - if ((pkm === this.species.speciesId || this.fusionSpecies && pkm === this.fusionSpecies.speciesId) && form === this.getFormKey()) { + const [pkm, form] = p; + if ( + (pkm === this.species.speciesId || + (this.fusionSpecies && pkm === this.fusionSpecies.speciesId)) && + form === this.getFormKey() + ) { compatible = true; break; } - } else if (p === this.species.speciesId || (this.fusionSpecies && p === this.fusionSpecies.speciesId)) { + } else if ( + p === this.species.speciesId || + (this.fusionSpecies && p === this.fusionSpecies.speciesId) + ) { compatible = true; break; } @@ -4305,7 +6355,13 @@ export class PlayerPokemon extends Pokemon { } tryPopulateMoveset(moveset: StarterMoveset): boolean { - if (!this.getSpeciesForm().validateStarterMoveset(moveset, globalScene.gameData.starterData[this.species.getRootSpeciesId()].eggMoves)) { + if ( + !this.getSpeciesForm().validateStarterMoveset( + moveset, + globalScene.gameData.starterData[this.species.getRootSpeciesId()] + .eggMoves, + ) + ) { return false; } @@ -4325,27 +6381,65 @@ export class PlayerPokemon extends Pokemon { return new Promise(resolve => { this.leaveField(switchType === SwitchType.SWITCH); - globalScene.ui.setMode(Mode.PARTY, PartyUiMode.FAINT_SWITCH, this.getFieldIndex(), (slotIndex: integer, option: PartyOption) => { - if (slotIndex >= globalScene.currentBattle.getBattlerCount() && slotIndex < 6) { - globalScene.prependToPhase(new SwitchSummonPhase(switchType, this.getFieldIndex(), slotIndex, false), MoveEndPhase); - } - globalScene.ui.setMode(Mode.MESSAGE).then(resolve); - }, PartyUiHandler.FilterNonFainted); + globalScene.ui.setMode( + Mode.PARTY, + PartyUiMode.FAINT_SWITCH, + this.getFieldIndex(), + (slotIndex: number, option: PartyOption) => { + if ( + slotIndex >= globalScene.currentBattle.getBattlerCount() && + slotIndex < 6 + ) { + globalScene.prependToPhase( + new SwitchSummonPhase( + switchType, + this.getFieldIndex(), + slotIndex, + false, + ), + MoveEndPhase, + ); + } + globalScene.ui.setMode(Mode.MESSAGE).then(resolve); + }, + PartyUiHandler.FilterNonFainted, + ); }); } addFriendship(friendship: number): void { if (friendship > 0) { const starterSpeciesId = this.species.getRootSpeciesId(); - const fusionStarterSpeciesId = this.isFusion() && this.fusionSpecies ? this.fusionSpecies.getRootSpeciesId() : 0; + const fusionStarterSpeciesId = + this.isFusion() && this.fusionSpecies + ? this.fusionSpecies.getRootSpeciesId() + : 0; const starterData = [ globalScene.gameData.starterData[starterSpeciesId], - fusionStarterSpeciesId ? globalScene.gameData.starterData[fusionStarterSpeciesId] : null + fusionStarterSpeciesId + ? globalScene.gameData.starterData[fusionStarterSpeciesId] + : null, ].filter(d => !!d); const amount = new Utils.NumberHolder(friendship); - globalScene.applyModifier(PokemonFriendshipBoosterModifier, true, this, amount); - const candyFriendshipMultiplier = globalScene.eventManager.getClassicFriendshipMultiplier(); - const starterAmount = new Utils.NumberHolder(Math.floor(amount.value * (globalScene.gameMode.isClassic ? candyFriendshipMultiplier : 1) / (fusionStarterSpeciesId ? 2 : 1))); + globalScene.applyModifier( + PokemonFriendshipBoosterModifier, + true, + this, + amount, + ); + const candyFriendshipMultiplier = globalScene.gameMode.isClassic + ? globalScene.eventManager.getClassicFriendshipMultiplier() + : 1; + const fusionReduction = fusionStarterSpeciesId + ? globalScene.eventManager.areFusionsBoosted() + ? 1.5 // Divide candy gain for fusions by 1.5 during events + : 2 // 2 for fusions outside events + : 1; // 1 for non-fused mons + const starterAmount = new Utils.NumberHolder( + Math.floor( + (amount.value * candyFriendshipMultiplier) / fusionReduction, + ), + ); // Add friendship to this PlayerPokemon this.friendship = Math.min(this.friendship + amount.value, 255); @@ -4354,9 +6448,14 @@ export class PlayerPokemon extends Pokemon { } // Add to candy progress for this mon's starter species and its fused species (if it has one) starterData.forEach((sd: StarterDataEntry, i: number) => { - const speciesId = !i ? starterSpeciesId : fusionStarterSpeciesId as Species; + const speciesId = !i + ? starterSpeciesId + : (fusionStarterSpeciesId as Species); sd.friendship = (sd.friendship || 0) + starterAmount.value; - if (sd.friendship >= getStarterValueFriendshipCap(speciesStarterCosts[speciesId])) { + if ( + sd.friendship >= + getStarterValueFriendshipCap(speciesStarterCosts[speciesId]) + ) { globalScene.gameData.addStarterCandy(getPokemonSpecies(speciesId), 1); sd.friendship = 0; } @@ -4366,45 +6465,10 @@ export class PlayerPokemon extends Pokemon { this.friendship = Math.max(this.friendship + friendship, 0); } } - /** - * Handles Revival Blessing when used by player. - * @returns Promise to revive a pokemon. - * @see {@linkcode RevivalBlessingAttr} - */ - revivalBlessing(): Promise { - return new Promise(resolve => { - globalScene.ui.setMode(Mode.PARTY, PartyUiMode.REVIVAL_BLESSING, this.getFieldIndex(), (slotIndex:integer, option: PartyOption) => { - if (slotIndex >= 0 && slotIndex < 6) { - const pokemon = globalScene.getPlayerParty()[slotIndex]; - if (!pokemon || !pokemon.isFainted()) { - resolve(); - } - pokemon.resetTurnData(); - pokemon.resetStatus(); - pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp())); - globalScene.queueMessage(i18next.t("moveTriggers:revivalBlessing", { pokemonName: pokemon.name }), 0, true); - - if (globalScene.currentBattle.double && globalScene.getPlayerParty().length > 1) { - const allyPokemon = this.getAlly(); - if (slotIndex <= 1) { - // Revived ally pokemon - globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, pokemon.getFieldIndex(), slotIndex, false, true)); - globalScene.unshiftPhase(new ToggleDoublePositionPhase(true)); - } else if (allyPokemon.isFainted()) { - // Revived party pokemon, and ally pokemon is fainted - globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, true)); - globalScene.unshiftPhase(new ToggleDoublePositionPhase(true)); - } - } - - } - globalScene.ui.setMode(Mode.MESSAGE).then(() => resolve()); - }, PartyUiHandler.FilterFainted); - }); - } - - getPossibleEvolution(evolution: SpeciesFormEvolution | null): Promise { + getPossibleEvolution( + evolution: SpeciesFormEvolution | null, + ): Promise { if (!evolution) { return new Promise(resolve => resolve(this)); } @@ -4416,19 +6480,60 @@ export class PlayerPokemon extends Pokemon { const originalFusionSpecies = this.fusionSpecies; const originalFusionFormIndex = this.fusionFormIndex; this.fusionSpecies = evolutionSpecies; - this.fusionFormIndex = evolution.evoFormKey !== null ? Math.max(evolutionSpecies.forms.findIndex(f => f.formKey === evolution.evoFormKey), 0) : this.fusionFormIndex; - ret = globalScene.addPlayerPokemon(this.species, this.level, this.abilityIndex, this.formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this); + this.fusionFormIndex = + evolution.evoFormKey !== null + ? Math.max( + evolutionSpecies.forms.findIndex( + f => f.formKey === evolution.evoFormKey, + ), + 0, + ) + : this.fusionFormIndex; + ret = globalScene.addPlayerPokemon( + this.species, + this.level, + this.abilityIndex, + this.formIndex, + this.gender, + this.shiny, + this.variant, + this.ivs, + this.nature, + this, + ); this.fusionSpecies = originalFusionSpecies; this.fusionFormIndex = originalFusionFormIndex; } else { - const formIndex = evolution.evoFormKey !== null && !isFusion ? Math.max(evolutionSpecies.forms.findIndex(f => f.formKey === evolution.evoFormKey), 0) : this.formIndex; - ret = globalScene.addPlayerPokemon(!isFusion ? evolutionSpecies : this.species, this.level, this.abilityIndex, formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this); + const formIndex = + evolution.evoFormKey !== null && !isFusion + ? Math.max( + evolutionSpecies.forms.findIndex( + f => f.formKey === evolution.evoFormKey, + ), + 0, + ) + : this.formIndex; + ret = globalScene.addPlayerPokemon( + !isFusion ? evolutionSpecies : this.species, + this.level, + this.abilityIndex, + formIndex, + this.gender, + this.shiny, + this.variant, + this.ivs, + this.nature, + this, + ); } ret.loadAssets().then(() => resolve(ret)); }); } - evolve(evolution: SpeciesFormEvolution | null, preEvolution: PokemonSpeciesForm): Promise { + evolve( + evolution: SpeciesFormEvolution | null, + preEvolution: PokemonSpeciesForm, + ): Promise { if (!evolution) { return new Promise(resolve => resolve()); } @@ -4443,7 +6548,13 @@ export class PlayerPokemon extends Pokemon { this.fusionSpecies = getPokemonSpecies(evolution.speciesId); } if (evolution.preFormKey !== null) { - const formIndex = Math.max((!isFusion || !this.fusionSpecies ? this.species : this.fusionSpecies).forms.findIndex(f => f.formKey === evolution.evoFormKey), 0); + const formIndex = Math.max( + (!isFusion || !this.fusionSpecies + ? this.species + : this.fusionSpecies + ).forms.findIndex(f => f.formKey === evolution.evoFormKey), + 0, + ); if (!isFusion) { this.formIndex = formIndex; } else { @@ -4454,25 +6565,39 @@ export class PlayerPokemon extends Pokemon { if (!isFusion) { const abilityCount = this.getSpeciesForm().getAbilityCount(); const preEvoAbilityCount = preEvolution.getAbilityCount(); - if ([ 0, 1, 2 ].includes(this.abilityIndex)) { + if ([0, 1, 2].includes(this.abilityIndex)) { // Handles cases where a Pokemon with 3 abilities evolves into a Pokemon with 2 abilities (ie: Eevee -> any Eeveelution) - if (this.abilityIndex === 2 && preEvoAbilityCount === 3 && abilityCount === 2) { + if ( + this.abilityIndex === 2 && + preEvoAbilityCount === 3 && + abilityCount === 2 + ) { this.abilityIndex = 1; } - } else { // Prevent pokemon with an illegal ability value from breaking things - console.warn("this.abilityIndex is somehow an illegal value, please report this"); + } else { + // Prevent pokemon with an illegal ability value from breaking things + console.warn( + "this.abilityIndex is somehow an illegal value, please report this", + ); console.warn(this.abilityIndex); this.abilityIndex = 0; } - } else { // Do the same as above, but for fusions + } else { + // Do the same as above, but for fusions const abilityCount = this.getFusionSpeciesForm().getAbilityCount(); const preEvoAbilityCount = preEvolution.getAbilityCount(); - if ([ 0, 1, 2 ].includes(this.fusionAbilityIndex)) { - if (this.fusionAbilityIndex === 2 && preEvoAbilityCount === 3 && abilityCount === 2) { + if ([0, 1, 2].includes(this.fusionAbilityIndex)) { + if ( + this.fusionAbilityIndex === 2 && + preEvoAbilityCount === 3 && + abilityCount === 2 + ) { this.fusionAbilityIndex = 1; } } else { - console.warn("this.fusionAbilityIndex is somehow an illegal value, please report this"); + console.warn( + "this.fusionAbilityIndex is somehow an illegal value, please report this", + ); console.warn(this.fusionAbilityIndex); this.fusionAbilityIndex = 0; } @@ -4486,15 +6611,22 @@ export class PlayerPokemon extends Pokemon { }); }; if (preEvolution.speciesId === Species.GIMMIGHOUL) { - const evotracker = this.getHeldItems().filter(m => m instanceof EvoTrackerModifier)[0] ?? null; + const evotracker = + this.getHeldItems().filter(m => m instanceof EvoTrackerModifier)[0] ?? + null; if (evotracker) { globalScene.removeModifier(evotracker); } } if (!globalScene.gameMode.isDaily || this.metBiome > -1) { - globalScene.gameData.updateSpeciesDexIvs(this.species.speciesId, this.ivs); + globalScene.gameData.updateSpeciesDexIvs( + this.species.speciesId, + this.ivs, + ); globalScene.gameData.setPokemonSeen(this, false); - globalScene.gameData.setPokemonCaught(this, false).then(() => updateAndResolve()); + globalScene.gameData + .setPokemonCaught(this, false) + .then(() => updateAndResolve()); } else { updateAndResolve(); } @@ -4504,12 +6636,25 @@ export class PlayerPokemon extends Pokemon { private handleSpecialEvolutions(evolution: SpeciesFormEvolution) { const isFusion = evolution instanceof FusionSpeciesFormEvolution; - const evoSpecies = (!isFusion ? this.species : this.fusionSpecies); - if (evoSpecies?.speciesId === Species.NINCADA && evolution.speciesId === Species.NINJASK) { + const evoSpecies = !isFusion ? this.species : this.fusionSpecies; + if ( + evoSpecies?.speciesId === Species.NINCADA && + evolution.speciesId === Species.NINJASK + ) { const newEvolution = pokemonEvolutions[evoSpecies.speciesId][1]; if (newEvolution.condition?.predicate(this)) { - const newPokemon = globalScene.addPlayerPokemon(this.species, this.level, this.abilityIndex, this.formIndex, undefined, this.shiny, this.variant, this.ivs, this.nature); + const newPokemon = globalScene.addPlayerPokemon( + this.species, + this.level, + this.abilityIndex, + this.formIndex, + undefined, + this.shiny, + this.variant, + this.ivs, + this.nature, + ); newPokemon.passive = this.passive; newPokemon.moveset = this.moveset.slice(); newPokemon.moveset = this.copyMoveset(); @@ -4526,12 +6671,21 @@ export class PlayerPokemon extends Pokemon { newPokemon.fusionVariant = this.fusionVariant; newPokemon.fusionGender = this.fusionGender; newPokemon.fusionLuck = this.fusionLuck; + newPokemon.fusionTeraType = this.fusionTeraType; newPokemon.usedTMs = this.usedTMs; + newPokemon.evoCounter = this.evoCounter; globalScene.getPlayerParty().push(newPokemon); - newPokemon.evolve((!isFusion ? newEvolution : new FusionSpeciesFormEvolution(this.id, newEvolution)), evoSpecies); - const modifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.pokemonId === this.id, true) as PokemonHeldItemModifier[]; + newPokemon.evolve( + !isFusion + ? newEvolution + : new FusionSpeciesFormEvolution(this.id, newEvolution), + evoSpecies, + ); + const modifiers = globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.id, + true, + ) as PokemonHeldItemModifier[]; modifiers.forEach(m => { const clonedModifier = m.clone() as PokemonHeldItemModifier; clonedModifier.pokemonId = newPokemon.id; @@ -4544,18 +6698,36 @@ export class PlayerPokemon extends Pokemon { getPossibleForm(formChange: SpeciesFormChange): Promise { return new Promise(resolve => { - const formIndex = Math.max(this.species.forms.findIndex(f => f.formKey === formChange.formKey), 0); - const ret = globalScene.addPlayerPokemon(this.species, this.level, this.abilityIndex, formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this); + const formIndex = Math.max( + this.species.forms.findIndex(f => f.formKey === formChange.formKey), + 0, + ); + const ret = globalScene.addPlayerPokemon( + this.species, + this.level, + this.abilityIndex, + formIndex, + this.gender, + this.shiny, + this.variant, + this.ivs, + this.nature, + this, + ); ret.loadAssets().then(() => resolve(ret)); }); } changeForm(formChange: SpeciesFormChange): Promise { return new Promise(resolve => { - this.formIndex = Math.max(this.species.forms.findIndex(f => f.formKey === formChange.formKey), 0); + this.formIndex = Math.max( + this.species.forms.findIndex(f => f.formKey === formChange.formKey), + 0, + ); this.generateName(); const abilityCount = this.getSpeciesForm().getAbilityCount(); - if (this.abilityIndex >= abilityCount) { // Shouldn't happen + if (this.abilityIndex >= abilityCount) { + // Shouldn't happen this.abilityIndex = abilityCount - 1; } @@ -4570,7 +6742,9 @@ export class PlayerPokemon extends Pokemon { }; if (!globalScene.gameMode.isDaily || this.metBiome > -1) { globalScene.gameData.setPokemonSeen(this, false); - globalScene.gameData.setPokemonCaught(this, false).then(() => updateAndResolve()); + globalScene.gameData + .setPokemonCaught(this, false) + .then(() => updateAndResolve()); } else { updateAndResolve(); } @@ -4583,70 +6757,81 @@ export class PlayerPokemon extends Pokemon { } /** - * Returns a Promise to fuse two PlayerPokemon together - * @param pokemon The PlayerPokemon to fuse to this one - */ - fuse(pokemon: PlayerPokemon): Promise { - return new Promise(resolve => { - this.fusionSpecies = pokemon.species; - this.fusionFormIndex = pokemon.formIndex; - this.fusionAbilityIndex = pokemon.abilityIndex; - this.fusionShiny = pokemon.shiny; - this.fusionVariant = pokemon.variant; - this.fusionGender = pokemon.gender; - this.fusionLuck = pokemon.luck; - this.fusionCustomPokemonData = pokemon.customPokemonData; - if ((pokemon.pauseEvolutions) || (this.pauseEvolutions)) { - this.pauseEvolutions = true; - } + * Returns a Promise to fuse two PlayerPokemon together + * @param pokemon The PlayerPokemon to fuse to this one + */ + fuse(pokemon: PlayerPokemon): void { + this.fusionSpecies = pokemon.species; + this.fusionFormIndex = pokemon.formIndex; + this.fusionAbilityIndex = pokemon.abilityIndex; + this.fusionShiny = pokemon.shiny; + this.fusionVariant = pokemon.variant; + this.fusionGender = pokemon.gender; + this.fusionLuck = pokemon.luck; + this.fusionCustomPokemonData = pokemon.customPokemonData; + this.evoCounter = Math.max(pokemon.evoCounter, this.evoCounter); + if (pokemon.pauseEvolutions || this.pauseEvolutions) { + this.pauseEvolutions = true; + } - globalScene.validateAchv(achvs.SPLICE); - globalScene.gameData.gameStats.pokemonFused++; + globalScene.validateAchv(achvs.SPLICE); + globalScene.gameData.gameStats.pokemonFused++; - // Store the average HP% that each Pokemon has - const maxHp = this.getMaxHp(); - const newHpPercent = ((pokemon.hp / pokemon.getMaxHp()) + (this.hp / maxHp)) / 2; + // Store the average HP% that each Pokemon has + const maxHp = this.getMaxHp(); + const newHpPercent = + (pokemon.hp / pokemon.getMaxHp() + this.hp / maxHp) / 2; - this.generateName(); - this.calculateStats(); + this.generateName(); + this.calculateStats(); - // Set this Pokemon's HP to the average % of both fusion components - this.hp = Math.round(maxHp * newHpPercent); - if (!this.isFainted()) { - // If this Pokemon hasn't fainted, make sure the HP wasn't set over the new maximum - this.hp = Math.min(this.hp, maxHp); - this.status = getRandomStatus(this.status, pokemon.status); // Get a random valid status between the two - } else if (!pokemon.isFainted()) { - // If this Pokemon fainted but the other hasn't, make sure the HP wasn't set to zero - this.hp = Math.max(this.hp, 1); - this.status = pokemon.status; // Inherit the other Pokemon's status - } + // Set this Pokemon's HP to the average % of both fusion components + this.hp = Math.round(maxHp * newHpPercent); + if (!this.isFainted()) { + // If this Pokemon hasn't fainted, make sure the HP wasn't set over the new maximum + this.hp = Math.min(this.hp, maxHp); + this.status = getRandomStatus(this.status, pokemon.status); // Get a random valid status between the two + } else if (!pokemon.isFainted()) { + // If this Pokemon fainted but the other hasn't, make sure the HP wasn't set to zero + this.hp = Math.max(this.hp, 1); + this.status = pokemon.status; // Inherit the other Pokemon's status + } - this.generateCompatibleTms(); - this.updateInfo(true); - const fusedPartyMemberIndex = globalScene.getPlayerParty().indexOf(pokemon); - let partyMemberIndex = globalScene.getPlayerParty().indexOf(this); - if (partyMemberIndex > fusedPartyMemberIndex) { - partyMemberIndex--; - } - const fusedPartyMemberHeldModifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.pokemonId === pokemon.id, true) as PokemonHeldItemModifier[]; - const transferModifiers: Promise[] = []; - for (const modifier of fusedPartyMemberHeldModifiers) { - transferModifiers.push(globalScene.tryTransferHeldItemModifier(modifier, this, false, modifier.getStackCount(), true, true, false)); - } - Promise.allSettled(transferModifiers).then(() => { - globalScene.updateModifiers(true, true).then(() => { - globalScene.removePartyMemberModifiers(fusedPartyMemberIndex); - globalScene.getPlayerParty().splice(fusedPartyMemberIndex, 1)[0]; - const newPartyMemberIndex = globalScene.getPlayerParty().indexOf(this); - pokemon.getMoveset(true).map((m: PokemonMove) => globalScene.unshiftPhase(new LearnMovePhase(newPartyMemberIndex, m.getMove().id))); - pokemon.destroy(); - this.updateFusionPalette(); - resolve(); - }); - }); - }); + this.generateCompatibleTms(); + this.updateInfo(true); + const fusedPartyMemberIndex = globalScene.getPlayerParty().indexOf(pokemon); + let partyMemberIndex = globalScene.getPlayerParty().indexOf(this); + if (partyMemberIndex > fusedPartyMemberIndex) { + partyMemberIndex--; + } + const fusedPartyMemberHeldModifiers = globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id, + true, + ) as PokemonHeldItemModifier[]; + for (const modifier of fusedPartyMemberHeldModifiers) { + globalScene.tryTransferHeldItemModifier( + modifier, + this, + false, + modifier.getStackCount(), + true, + true, + false, + ); + } + globalScene.updateModifiers(true, true); + globalScene.removePartyMemberModifiers(fusedPartyMemberIndex); + globalScene.getPlayerParty().splice(fusedPartyMemberIndex, 1)[0]; + const newPartyMemberIndex = globalScene.getPlayerParty().indexOf(this); + pokemon + .getMoveset(true) + .map((m: PokemonMove) => + globalScene.unshiftPhase( + new LearnMovePhase(newPartyMemberIndex, m.getMove().id), + ), + ); + pokemon.destroy(); + this.updateFusionPalette(); } unfuse(): Promise { @@ -4660,11 +6845,19 @@ export class PlayerPokemon extends Pokemon { /** Returns a deep copy of this Pokemon's moveset array */ copyMoveset(): PokemonMove[] { - const newMoveset : PokemonMove[] = []; - this.moveset.forEach((move) => { + const newMoveset: PokemonMove[] = []; + this.moveset.forEach(move => { // TODO: refactor `moveset` to not accept `null`s if (move) { - newMoveset.push(new PokemonMove(move.moveId, 0, move.ppUp, move.virtual, move.maxPpOverride)); + newMoveset.push( + new PokemonMove( + move.moveId, + 0, + move.ppUp, + move.virtual, + move.maxPpOverride, + ), + ); } }); @@ -4675,17 +6868,37 @@ export class PlayerPokemon extends Pokemon { export class EnemyPokemon extends Pokemon { public trainerSlot: TrainerSlot; public aiType: AiType; - public bossSegments: integer; - public bossSegmentIndex: integer; + public bossSegments: number; + public bossSegmentIndex: number; + public initialTeamIndex: number; /** To indicate if the instance was populated with a dataSource -> e.g. loaded & populated from session data */ public readonly isPopulatedFromDataSource: boolean; - constructor(species: PokemonSpecies, level: integer, trainerSlot: TrainerSlot, boss: boolean, shinyLock: boolean = false, dataSource?: PokemonData) { - super(236, 84, species, level, dataSource?.abilityIndex, dataSource?.formIndex, dataSource?.gender, - (!shinyLock && dataSource) ? dataSource.shiny : false, (!shinyLock && dataSource) ? dataSource.variant : undefined, - undefined, dataSource ? dataSource.nature : undefined, dataSource); + constructor( + species: PokemonSpecies, + level: number, + trainerSlot: TrainerSlot, + boss: boolean, + shinyLock = false, + dataSource?: PokemonData, + ) { + super( + 236, + 84, + species, + level, + dataSource?.abilityIndex, + dataSource?.formIndex, + dataSource?.gender, + !shinyLock && dataSource ? dataSource.shiny : false, + !shinyLock && dataSource ? dataSource.variant : undefined, + undefined, + dataSource ? dataSource.nature : undefined, + dataSource, + ); this.trainerSlot = trainerSlot; + this.initialTeamIndex = globalScene.currentBattle?.enemyParty.length ?? 0; this.isPopulatedFromDataSource = !!dataSource; // if a dataSource is provided, then it was populated from dataSource if (boss) { this.setBoss(boss, dataSource?.bossSegments); @@ -4702,11 +6915,11 @@ export class EnemyPokemon extends Pokemon { const speciesId = this.species.speciesId; if ( - speciesId in Overrides.OPP_FORM_OVERRIDES - && Overrides.OPP_FORM_OVERRIDES[speciesId] - && this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]] + speciesId in Overrides.OPP_FORM_OVERRIDES && + !isNullOrUndefined(Overrides.OPP_FORM_OVERRIDES[speciesId]) && + this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]] ) { - this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId] ?? 0; + this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId]; } if (!dataSource) { @@ -4730,12 +6943,18 @@ export class EnemyPokemon extends Pokemon { } } - this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0); + this.luck = + (this.shiny ? this.variant + 1 : 0) + + (this.fusionShiny ? this.fusionVariant + 1 : 0); let prevolution: Species; let speciesId = species.speciesId; while ((prevolution = pokemonPrevolutions[speciesId])) { - const evolution = pokemonEvolutions[prevolution].find(pe => pe.speciesId === speciesId && (!pe.evoFormKey || pe.evoFormKey === this.getFormKey())); + const evolution = pokemonEvolutions[prevolution].find( + pe => + pe.speciesId === speciesId && + (!pe.evoFormKey || pe.evoFormKey === this.getFormKey()), + ); if (evolution?.condition?.enforceFunc) { evolution.condition.enforceFunc(this); } @@ -4743,7 +6962,8 @@ export class EnemyPokemon extends Pokemon { } } - this.aiType = boss || this.hasTrainer() ? AiType.SMART : AiType.SMART_RANDOM; + this.aiType = + boss || this.hasTrainer() ? AiType.SMART : AiType.SMART_RANDOM; } initBattleInfo(): void { @@ -4763,9 +6983,16 @@ export class EnemyPokemon extends Pokemon { * @param boss if the pokemon is a boss * @param bossSegments amount of boss segments (health-bar segments) */ - setBoss(boss: boolean = true, bossSegments: integer = 0): void { + setBoss(boss = true, bossSegments = 0): void { if (boss) { - this.bossSegments = bossSegments || globalScene.getEncounterBossSegments(globalScene.currentBattle.waveIndex, this.level, this.species, true); + this.bossSegments = + bossSegments || + globalScene.getEncounterBossSegments( + globalScene.currentBattle.waveIndex, + this.level, + this.species, + true, + ); this.bossSegmentIndex = this.bossSegments - 1; } else { this.bossSegments = 0; @@ -4773,30 +7000,30 @@ export class EnemyPokemon extends Pokemon { } } - generateAndPopulateMoveset(formIndex?: integer): void { + generateAndPopulateMoveset(formIndex?: number): void { switch (true) { - case (this.species.speciesId === Species.SMEARGLE): + case this.species.speciesId === Species.SMEARGLE: this.moveset = [ new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.SKETCH), - new PokemonMove(Moves.SKETCH) + new PokemonMove(Moves.SKETCH), ]; break; - case (this.species.speciesId === Species.ETERNATUS): + case this.species.speciesId === Species.ETERNATUS: this.moveset = (formIndex !== undefined ? formIndex : this.formIndex) ? [ - new PokemonMove(Moves.DYNAMAX_CANNON), - new PokemonMove(Moves.CROSS_POISON), - new PokemonMove(Moves.FLAMETHROWER), - new PokemonMove(Moves.RECOVER, 0, -4) - ] + new PokemonMove(Moves.DYNAMAX_CANNON), + new PokemonMove(Moves.CROSS_POISON), + new PokemonMove(Moves.FLAMETHROWER), + new PokemonMove(Moves.RECOVER, 0, -4), + ] : [ - new PokemonMove(Moves.ETERNABEAM), - new PokemonMove(Moves.SLUDGE_BOMB), - new PokemonMove(Moves.FLAMETHROWER), - new PokemonMove(Moves.COSMIC_POWER) - ]; + new PokemonMove(Moves.ETERNABEAM), + new PokemonMove(Moves.SLUDGE_BOMB), + new PokemonMove(Moves.FLAMETHROWER), + new PokemonMove(Moves.COSMIC_POWER), + ]; if (globalScene.gameMode.hasChallenge(Challenges.INVERSE_BATTLE)) { this.moveset[2] = new PokemonMove(Moves.THUNDERBOLT); } @@ -4818,8 +7045,17 @@ export class EnemyPokemon extends Pokemon { if (moveQueue.length !== 0) { const queuedMove = moveQueue[0]; if (queuedMove) { - const moveIndex = this.getMoveset().findIndex(m => m?.moveId === queuedMove.move); - if ((moveIndex > -1 && this.getMoveset()[moveIndex]!.isUsable(this, queuedMove.ignorePP)) || queuedMove.virtual) { + const moveIndex = this.getMoveset().findIndex( + m => m?.moveId === queuedMove.move, + ); + if ( + (moveIndex > -1 && + this.getMoveset()[moveIndex]!.isUsable( + this, + queuedMove.ignorePP, + )) || + queuedMove.virtual + ) { return queuedMove; } else { this.getMoveQueue().shift(); @@ -4834,27 +7070,34 @@ export class EnemyPokemon extends Pokemon { if (movePool.length) { // If there's only 1 move in the move pool, use it. if (movePool.length === 1) { - return { move: movePool[0]!.moveId, targets: this.getNextTargets(movePool[0]!.moveId) }; // TODO: are the bangs correct? + return { + move: movePool[0]!.moveId, + targets: this.getNextTargets(movePool[0]!.moveId), + }; // TODO: are the bangs correct? } // If a move is forced because of Encore, use it. const encoreTag = this.getTag(EncoreTag) as EncoreTag; if (encoreTag) { const encoreMove = movePool.find(m => m?.moveId === encoreTag.moveId); if (encoreMove) { - return { move: encoreMove.moveId, targets: this.getNextTargets(encoreMove.moveId) }; + return { + move: encoreMove.moveId, + targets: this.getNextTargets(encoreMove.moveId), + }; } } switch (this.aiType) { case AiType.RANDOM: // No enemy should spawn with this AI type in-game - const moveId = movePool[globalScene.randBattleSeedInt(movePool.length)]!.moveId; // TODO: is the bang correct? + const moveId = + movePool[globalScene.randBattleSeedInt(movePool.length)]!.moveId; // TODO: is the bang correct? return { move: moveId, targets: this.getNextTargets(moveId) }; case AiType.SMART_RANDOM: case AiType.SMART: - /** - * Search this Pokemon's move pool for moves that will KO an opposing target. - * If there are any moves that can KO an opponent (i.e. a player Pokemon), - * those moves are the only ones considered for selection on this turn. - */ + /** + * Search this Pokemon's move pool for moves that will KO an opposing target. + * If there are any moves that can KO an opponent (i.e. a player Pokemon), + * those moves are the only ones considered for selection on this turn. + */ const koMoves = movePool.filter(pkmnMove => { if (!pkmnMove) { return false; @@ -4866,17 +7109,36 @@ export class EnemyPokemon extends Pokemon { } const fieldPokemon = globalScene.getField(); - const moveTargets = getMoveTargets(this, move.id).targets - .map(ind => fieldPokemon[ind]) + const moveTargets = getMoveTargets(this, move.id) + .targets.map(ind => fieldPokemon[ind]) .filter(p => this.isPlayer() !== p.isPlayer()); // Only considers critical hits for crit-only moves or when this Pokemon is under the effect of Laser Focus - const isCritical = move.hasAttr(CritOnlyAttr) || !!this.getTag(BattlerTagType.ALWAYS_CRIT); + const isCritical = + move.hasAttr(CritOnlyAttr) || + !!this.getTag(BattlerTagType.ALWAYS_CRIT); - return move.category !== MoveCategory.STATUS - && moveTargets.some(p => { - const doesNotFail = move.applyConditions(this, p, move) || [ Moves.SUCKER_PUNCH, Moves.UPPER_HAND, Moves.THUNDERCLAP ].includes(move.id); - return doesNotFail && p.getAttackDamage(this, move, !p.battleData.abilityRevealed, false, isCritical).damage >= p.hp; - }); + return ( + move.category !== MoveCategory.STATUS && + moveTargets.some(p => { + const doesNotFail = + move.applyConditions(this, p, move) || + [ + Moves.SUCKER_PUNCH, + Moves.UPPER_HAND, + Moves.THUNDERCLAP, + ].includes(move.id); + return ( + doesNotFail && + p.getAttackDamage( + this, + move, + !p.battleData.abilityRevealed, + false, + isCritical, + ).damage >= p.hp + ); + }) + ); }, this); if (koMoves.length > 0) { @@ -4884,47 +7146,64 @@ export class EnemyPokemon extends Pokemon { } /** - * Move selection is based on the move's calculated "benefit score" against the - * best possible target(s) (as determined by {@linkcode getNextTargets}). - * For more information on how benefit scores are calculated, see `docs/enemy-ai.md`. - */ + * Move selection is based on the move's calculated "benefit score" against the + * best possible target(s) (as determined by {@linkcode getNextTargets}). + * For more information on how benefit scores are calculated, see `docs/enemy-ai.md`. + */ const moveScores = movePool.map(() => 0); - const moveTargets = Object.fromEntries(movePool.map(m => [ m!.moveId, this.getNextTargets(m!.moveId) ])); // TODO: are those bangs correct? + const moveTargets = Object.fromEntries( + movePool.map(m => [m!.moveId, this.getNextTargets(m!.moveId)]), + ); // TODO: are those bangs correct? for (const m in movePool) { const pokemonMove = movePool[m]!; // TODO: is the bang correct? const move = pokemonMove.getMove(); let moveScore = moveScores[m]; - const targetScores: integer[] = []; + const targetScores: number[] = []; for (const mt of moveTargets[move.id]) { - // Prevent a target score from being calculated when the target is whoever attacks the user + // Prevent a target score from being calculated when the target is whoever attacks the user if (mt === BattlerIndex.ATTACKER) { break; } const target = globalScene.getField()[mt]; /** - * The "target score" of a move is given by the move's user benefit score + the move's target benefit score. - * If the target is an ally, the target benefit score is multiplied by -1. - */ - let targetScore = move.getUserBenefitScore(this, target, move) + move.getTargetBenefitScore(this, target, move) * (mt < BattlerIndex.ENEMY === this.isPlayer() ? 1 : -1); + * The "target score" of a move is given by the move's user benefit score + the move's target benefit score. + * If the target is an ally, the target benefit score is multiplied by -1. + */ + let targetScore = + move.getUserBenefitScore(this, target, move) + + move.getTargetBenefitScore(this, target, move) * + (mt < BattlerIndex.ENEMY === this.isPlayer() ? 1 : -1); if (Number.isNaN(targetScore)) { console.error(`Move ${move.name} returned score of NaN`); targetScore = 0; } /** - * If this move is unimplemented, or the move is known to fail when used, set its - * target score to -20 - */ - if ((move.name.endsWith(" (N)") || !move.applyConditions(this, target, move)) && ![ Moves.SUCKER_PUNCH, Moves.UPPER_HAND, Moves.THUNDERCLAP ].includes(move.id)) { + * If this move is unimplemented, or the move is known to fail when used, set its + * target score to -20 + */ + if ( + (move.name.endsWith(" (N)") || + !move.applyConditions(this, target, move)) && + ![ + Moves.SUCKER_PUNCH, + Moves.UPPER_HAND, + Moves.THUNDERCLAP, + ].includes(move.id) + ) { targetScore = -20; } else if (move instanceof AttackMove) { - /** - * Attack moves are given extra multipliers to their base benefit score based on - * the move's type effectiveness against the target and whether the move is a STAB move. - */ - const effectiveness = target.getMoveEffectiveness(this, move, !target.battleData?.abilityRevealed); + /** + * Attack moves are given extra multipliers to their base benefit score based on + * the move's type effectiveness against the target and whether the move is a STAB move. + */ + const effectiveness = target.getMoveEffectiveness( + this, + move, + !target.battleData?.abilityRevealed, + ); if (target.isPlayer() !== this.isPlayer()) { targetScore *= effectiveness; if (this.isOfType(move.type)) { @@ -4961,23 +7240,47 @@ export class EnemyPokemon extends Pokemon { }); let r = 0; if (this.aiType === AiType.SMART_RANDOM) { - // Has a 5/8 chance to select the best move, and a 3/8 chance to advance to the next best move (and repeat this roll) - while (r < sortedMovePool.length - 1 && globalScene.randBattleSeedInt(8) >= 5) { + // Has a 5/8 chance to select the best move, and a 3/8 chance to advance to the next best move (and repeat this roll) + while ( + r < sortedMovePool.length - 1 && + globalScene.randBattleSeedInt(8) >= 5 + ) { r++; } } else if (this.aiType === AiType.SMART) { - // The chance to advance to the next best move increases when the compared moves' scores are closer to each other. - while (r < sortedMovePool.length - 1 && (moveScores[movePool.indexOf(sortedMovePool[r + 1])] / moveScores[movePool.indexOf(sortedMovePool[r])]) >= 0 - && globalScene.randBattleSeedInt(100) < Math.round((moveScores[movePool.indexOf(sortedMovePool[r + 1])] / moveScores[movePool.indexOf(sortedMovePool[r])]) * 50)) { + // The chance to advance to the next best move increases when the compared moves' scores are closer to each other. + while ( + r < sortedMovePool.length - 1 && + moveScores[movePool.indexOf(sortedMovePool[r + 1])] / + moveScores[movePool.indexOf(sortedMovePool[r])] >= + 0 && + globalScene.randBattleSeedInt(100) < + Math.round( + (moveScores[movePool.indexOf(sortedMovePool[r + 1])] / + moveScores[movePool.indexOf(sortedMovePool[r])]) * + 50, + ) + ) { r++; } } - console.log(movePool.map(m => m!.getName()), moveScores, r, sortedMovePool.map(m => m!.getName())); // TODO: are those bangs correct? - return { move: sortedMovePool[r]!.moveId, targets: moveTargets[sortedMovePool[r]!.moveId] }; + console.log( + movePool.map(m => m!.getName()), + moveScores, + r, + sortedMovePool.map(m => m!.getName()), + ); // TODO: are those bangs correct? + return { + move: sortedMovePool[r]!.moveId, + targets: moveTargets[sortedMovePool[r]!.moveId], + }; } } - return { move: Moves.STRUGGLE, targets: this.getNextTargets(Moves.STRUGGLE) }; + return { + move: Moves.STRUGGLE, + targets: this.getNextTargets(Moves.STRUGGLE), + }; } /** @@ -4987,7 +7290,9 @@ export class EnemyPokemon extends Pokemon { */ getNextTargets(moveId: Moves): BattlerIndex[] { const moveTargets = getMoveTargets(this, moveId); - const targets = globalScene.getField(true).filter(p => moveTargets.targets.indexOf(p.getBattlerIndex()) > -1); + const targets = globalScene + .getField(true) + .filter(p => moveTargets.targets.indexOf(p.getBattlerIndex()) > -1); // If the move is multi-target, return all targets' indexes if (moveTargets.multiple) { return targets.map(p => p.getBattlerIndex()); @@ -4999,8 +7304,11 @@ export class EnemyPokemon extends Pokemon { * Get the move's target benefit score against each potential target. * For allies, this score is multiplied by -1. */ - const benefitScores = targets - .map(p => [ p.getBattlerIndex(), move.getTargetBenefitScore(this, p, move) * (p.isPlayer() === this.isPlayer() ? 1 : -1) ]); + const benefitScores = targets.map(p => [ + p.getBattlerIndex(), + move.getTargetBenefitScore(this, p, move) * + (p.isPlayer() === this.isPlayer() ? 1 : -1), + ]); const sortedBenefitScores = benefitScores.slice(0); sortedBenefitScores.sort((a, b) => { @@ -5013,7 +7321,7 @@ export class EnemyPokemon extends Pokemon { // Set target to BattlerIndex.ATTACKER when using a counter move // This is the same as when the player does so if (move.hasAttr(CounterDamageAttr)) { - return [ BattlerIndex.ATTACKER ]; + return [BattlerIndex.ATTACKER]; } return []; @@ -5030,14 +7338,16 @@ export class EnemyPokemon extends Pokemon { } // Remove any targets whose weights are less than half the max of the target weights from consideration - const benefitCutoffIndex = targetWeights.findIndex(s => s < targetWeights[0] / 2); + const benefitCutoffIndex = targetWeights.findIndex( + s => s < targetWeights[0] / 2, + ); if (benefitCutoffIndex > -1) { targetWeights = targetWeights.slice(0, benefitCutoffIndex); } - const thresholds: integer[] = []; - let totalWeight: integer = 0; - targetWeights.reduce((total: integer, w: integer) => { + const thresholds: number[] = []; + let totalWeight = 0; + targetWeights.reduce((total: number, w: number) => { total += w; thresholds.push(total); totalWeight = total; @@ -5050,7 +7360,7 @@ export class EnemyPokemon extends Pokemon { * is greater than that random number. */ const randValue = globalScene.randBattleSeedInt(totalWeight); - let targetIndex: integer = 0; + let targetIndex = 0; thresholds.every((t, i) => { if (randValue >= t) { @@ -5061,7 +7371,7 @@ export class EnemyPokemon extends Pokemon { return false; }); - return [ sortedBenefitScores[targetIndex][0] ]; + return [sortedBenefitScores[targetIndex][0]]; } isPlayer() { @@ -5076,7 +7386,7 @@ export class EnemyPokemon extends Pokemon { return !!this.bossSegments; } - getBossSegmentIndex(): integer { + getBossSegmentIndex(): number { const segments = (this as EnemyPokemon).bossSegments; const segmentSize = this.getMaxHp() / segments; for (let s = segments - 1; s > 0; s--) { @@ -5089,14 +7399,17 @@ export class EnemyPokemon extends Pokemon { return 0; } - damage(damage: integer, ignoreSegments: boolean = false, preventEndure: boolean = false, ignoreFaintPhase: boolean = false): integer { + damage( + damage: number, + ignoreSegments = false, + preventEndure = false, + ignoreFaintPhase = false, + ): number { if (this.isFainted()) { return 0; } - let clearedBossSegmentIndex = this.isBoss() - ? this.bossSegmentIndex + 1 - : 0; + let clearedBossSegmentIndex = this.isBoss() ? this.bossSegmentIndex + 1 : 0; if (this.isBoss() && !ignoreSegments) { const segmentSize = this.getMaxHp() / this.bossSegments; @@ -5107,12 +7420,19 @@ export class EnemyPokemon extends Pokemon { if (this.hp - damage <= roundedHpThreshold) { const hpRemainder = this.hp - roundedHpThreshold; let segmentsBypassed = 0; - while (segmentsBypassed < this.bossSegmentIndex && this.canBypassBossSegments(segmentsBypassed + 1) && (damage - hpRemainder) >= Math.round(segmentSize * Math.pow(2, segmentsBypassed + 1))) { + while ( + segmentsBypassed < this.bossSegmentIndex && + this.canBypassBossSegments(segmentsBypassed + 1) && + damage - hpRemainder >= + Math.round(segmentSize * Math.pow(2, segmentsBypassed + 1)) + ) { segmentsBypassed++; //console.log('damage', damage, 'segment', segmentsBypassed + 1, 'segment size', segmentSize, 'damage needed', Math.round(segmentSize * Math.pow(2, segmentsBypassed + 1))); } - damage = Utils.toDmgValue(this.hp - hpThreshold + segmentSize * segmentsBypassed); + damage = Utils.toDmgValue( + this.hp - hpThreshold + segmentSize * segmentsBypassed, + ); clearedBossSegmentIndex = s - segmentsBypassed; } break; @@ -5127,7 +7447,12 @@ export class EnemyPokemon extends Pokemon { } } - const ret = super.damage(damage, ignoreSegments, preventEndure, ignoreFaintPhase); + const ret = super.damage( + damage, + ignoreSegments, + preventEndure, + ignoreFaintPhase, + ); if (this.isBoss()) { if (ignoreSegments) { @@ -5143,9 +7468,9 @@ export class EnemyPokemon extends Pokemon { return ret; } - canBypassBossSegments(segmentCount: integer = 1): boolean { + canBypassBossSegments(segmentCount = 1): boolean { if (globalScene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) { - if (!this.formIndex && (this.bossSegmentIndex - segmentCount) < 1) { + if (!this.formIndex && this.bossSegmentIndex - segmentCount < 1) { return false; } } @@ -5160,11 +7485,18 @@ export class EnemyPokemon extends Pokemon { * For Pokemon with 5 health segments or more, breaking the last two shields give +2 each * @param segmentIndex index of the segment to get down to (0 = no shield left, 1 = 1 shield left, etc.) */ - handleBossSegmentCleared(segmentIndex: integer): void { - while (this.bossSegmentIndex > 0 && segmentIndex - 1 < this.bossSegmentIndex) { + handleBossSegmentCleared(segmentIndex: number): void { + while ( + this.bossSegmentIndex > 0 && + segmentIndex - 1 < this.bossSegmentIndex + ) { // Filter out already maxed out stat stages and weigh the rest based on existing stats - const leftoverStats = EFFECTIVE_STATS.filter((s: EffectiveStat) => this.getStatStage(s) < 6); - const statWeights = leftoverStats.map((s: EffectiveStat) => this.getStat(s, false)); + const leftoverStats = EFFECTIVE_STATS.filter( + (s: EffectiveStat) => this.getStatStage(s) < 6, + ); + const statWeights = leftoverStats.map((s: EffectiveStat) => + this.getStat(s, false), + ); let boostedStat: EffectiveStat; const statThresholds: number[] = []; @@ -5195,12 +7527,21 @@ export class EnemyPokemon extends Pokemon { stages++; } - globalScene.unshiftPhase(new StatStageChangePhase(this.getBattlerIndex(), true, [ boostedStat! ], stages, true, true)); + globalScene.unshiftPhase( + new StatStageChangePhase( + this.getBattlerIndex(), + true, + [boostedStat!], + stages, + true, + true, + ), + ); this.bossSegmentIndex--; } } - getFieldIndex(): integer { + getFieldIndex(): number { return globalScene.getEnemyField().indexOf(this); } @@ -5215,7 +7556,7 @@ export class EnemyPokemon extends Pokemon { * @param slotIndex an optional index to place the pokemon in the party * @returns the pokemon that was added or null if the pokemon could not be added */ - addToParty(pokeballType: PokeballType, slotIndex: number = -1) { + addToParty(pokeballType: PokeballType, slotIndex = -1) { const party = globalScene.getPlayerParty(); let ret: PlayerPokemon | null = null; @@ -5225,7 +7566,18 @@ export class EnemyPokemon extends Pokemon { this.metBiome = globalScene.arena.biomeType; this.metWave = globalScene.currentBattle.waveIndex; this.metSpecies = this.species.speciesId; - const newPokemon = globalScene.addPlayerPokemon(this.species, this.level, this.abilityIndex, this.formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this); + const newPokemon = globalScene.addPlayerPokemon( + this.species, + this.level, + this.abilityIndex, + this.formIndex, + this.gender, + this.shiny, + this.variant, + this.ivs, + this.nature, + this, + ); if (Utils.isBetween(slotIndex, 0, PLAYER_PARTY_MAX_SIZE - 1)) { party.splice(slotIndex, 0, newPokemon); @@ -5237,7 +7589,11 @@ export class EnemyPokemon extends Pokemon { newPokemon.setVisible(false); ret = newPokemon; - globalScene.triggerPokemonFormChange(newPokemon, SpeciesFormChangeActiveTrigger, true); + globalScene.triggerPokemonFormChange( + newPokemon, + SpeciesFormChangeActiveTrigger, + true, + ); } return ret; @@ -5264,10 +7620,10 @@ export interface AttackMoveResult { export class PokemonSummonData { /** [Atk, Def, SpAtk, SpDef, Spd, Acc, Eva] */ - public statStages: number[] = [ 0, 0, 0, 0, 0, 0, 0 ]; + public statStages: number[] = [0, 0, 0, 0, 0, 0, 0]; public moveQueue: TurnMove[] = []; public tags: BattlerTag[] = []; - public abilitySuppressed: boolean = false; + public abilitySuppressed = false; public abilitiesApplied: Abilities[] = []; public speciesForm: PokemonSpeciesForm | null; public fusionSpeciesForm: PokemonSpeciesForm; @@ -5275,66 +7631,66 @@ export class PokemonSummonData { public passiveAbility: Abilities = Abilities.NONE; public gender: Gender; public fusionGender: Gender; - public stats: number[] = [ 0, 0, 0, 0, 0, 0 ]; + public stats: number[] = [0, 0, 0, 0, 0, 0]; public moveset: (PokemonMove | null)[]; // If not initialized this value will not be populated from save data. - public types: Type[] = []; - public addedType: Type | null = null; + public types: PokemonType[] = []; + public addedType: PokemonType | null = null; } export class PokemonBattleData { /** counts the hits the pokemon received */ - public hitCount: number = 0; + public hitCount = 0; /** used for {@linkcode Moves.RAGE_FIST} in order to save hit Counts received before Rage Fist is applied */ - public prevHitCount: number = 0; - public endured: boolean = false; + public prevHitCount = 0; + public endured = false; public berriesEaten: BerryType[] = []; public abilitiesApplied: Abilities[] = []; - public abilityRevealed: boolean = false; + public abilityRevealed = false; } export class PokemonBattleSummonData { /** The number of turns the pokemon has passed since entering the battle */ - public turnCount: number = 1; + public turnCount = 1; /** The number of turns the pokemon has passed since the start of the wave */ - public waveTurnCount: number = 1; + public waveTurnCount = 1; /** The list of moves the pokemon has used since entering the battle */ public moveHistory: TurnMove[] = []; } export class PokemonTurnData { - public flinched: boolean = false; - public acted: boolean = false; + public flinched = false; + public acted = false; /** How many times the move should hit the target(s) */ - public hitCount: number = 0; + public hitCount = 0; /** * - `-1` = Calculate how many hits are left * - `0` = Move is finished */ - public hitsLeft: number = -1; - public totalDamageDealt: number = 0; - public singleHitDamageDealt: number = 0; - public damageTaken: number = 0; + public hitsLeft = -1; + public totalDamageDealt = 0; + public singleHitDamageDealt = 0; + public damageTaken = 0; public attacksReceived: AttackMoveResult[] = []; public order: number; - public statStagesIncreased: boolean = false; - public statStagesDecreased: boolean = false; + public statStagesIncreased = false; + public statStagesDecreased = false; public moveEffectiveness: TypeDamageMultiplier | null = null; public combiningPledge?: Moves; - public switchedInThisTurn: boolean = false; - public failedRunAway: boolean = false; - public joinedRound: boolean = false; + public switchedInThisTurn = false; + public failedRunAway = false; + public joinedRound = false; /** * Used to make sure multi-hits occur properly when the user is * forced to act again in the same turn */ - public extraTurns: number = 0; + public extraTurns = 0; } export enum AiType { RANDOM, SMART_RANDOM, - SMART + SMART, } export enum MoveResult { @@ -5342,7 +7698,7 @@ export enum MoveResult { SUCCESS, FAIL, MISS, - OTHER + OTHER, } export enum HitResult { @@ -5356,10 +7712,15 @@ export enum HitResult { FAIL, MISS, OTHER, - IMMUNE + IMMUNE, } -export type DamageResult = HitResult.EFFECTIVE | HitResult.SUPER_EFFECTIVE | HitResult.NOT_VERY_EFFECTIVE | HitResult.ONE_HIT_KO | HitResult.OTHER; +export type DamageResult = + | HitResult.EFFECTIVE + | HitResult.SUPER_EFFECTIVE + | HitResult.NOT_VERY_EFFECTIVE + | HitResult.ONE_HIT_KO + | HitResult.OTHER; /** Interface containing the results of a damage calculation for a given move */ export interface DamageCalculationResult { @@ -5396,7 +7757,13 @@ export class PokemonMove { */ public maxPpOverride?: number; - constructor(moveId: Moves, ppUsed: number = 0, ppUp: number = 0, virtual: boolean = false, maxPpOverride?: number) { + constructor( + moveId: Moves, + ppUsed = 0, + ppUp = 0, + virtual = false, + maxPpOverride?: number, + ) { this.moveId = moveId; this.ppUsed = ppUsed; this.ppUp = ppUp; @@ -5413,8 +7780,16 @@ export class PokemonMove { * @param {boolean} ignoreRestrictionTags If `true`, skips the check for move restriction tags (see {@link MoveRestrictionBattlerTag}) * @returns `true` if the move can be selected and used by the Pokemon, otherwise `false`. */ - isUsable(pokemon: Pokemon, ignorePp: boolean = false, ignoreRestrictionTags: boolean = false): boolean { - if (this.moveId && !ignoreRestrictionTags && pokemon.isMoveRestricted(this.moveId, pokemon)) { + isUsable( + pokemon: Pokemon, + ignorePp = false, + ignoreRestrictionTags = false, + ): boolean { + if ( + this.moveId && + !ignoreRestrictionTags && + pokemon.isMoveRestricted(this.moveId, pokemon) + ) { return false; } @@ -5422,7 +7797,9 @@ export class PokemonMove { return false; } - return (ignorePp || this.ppUsed < this.getMovePp() || this.getMove().pp === -1); + return ( + ignorePp || this.ppUsed < this.getMovePp() || this.getMove().pp === -1 + ); } getMove(): Move { @@ -5433,16 +7810,19 @@ export class PokemonMove { * Sets {@link ppUsed} for this move and ensures the value does not exceed {@link getMovePp} * @param {number} count Amount of PP to use */ - usePp(count: number = 1) { + usePp(count = 1) { this.ppUsed = Math.min(this.ppUsed + count, this.getMovePp()); } - getMovePp(): integer { - return this.maxPpOverride || (this.getMove().pp + this.ppUp * Utils.toDmgValue(this.getMove().pp / 5)); + getMovePp(): number { + return ( + this.maxPpOverride || + this.getMove().pp + this.ppUp * Utils.toDmgValue(this.getMove().pp / 5) + ); } getPpRatio(): number { - return 1 - (this.ppUsed / this.getMovePp()); + return 1 - this.ppUsed / this.getMovePp(); } getName(): string { @@ -5450,11 +7830,17 @@ export class PokemonMove { } /** - * Copies an existing move or creates a valid PokemonMove object from json representing one - * @param {PokemonMove | any} source The data for the move to copy - * @return {PokemonMove} A valid pokemonmove object - */ + * Copies an existing move or creates a valid PokemonMove object from json representing one + * @param {PokemonMove | any} source The data for the move to copy + * @return {PokemonMove} A valid pokemonmove object + */ static loadMove(source: PokemonMove | any): PokemonMove { - return new PokemonMove(source.moveId, source.ppUsed, source.ppUp, source.virtual, source.maxPpOverride); + return new PokemonMove( + source.moveId, + source.ppUsed, + source.ppUp, + source.virtual, + source.maxPpOverride, + ); } } diff --git a/src/field/trainer.ts b/src/field/trainer.ts index 2b74c1e5069..98919ebfa93 100644 --- a/src/field/trainer.ts +++ b/src/field/trainer.ts @@ -2,16 +2,14 @@ import { globalScene } from "#app/global-scene"; import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions"; import type PokemonSpecies from "#app/data/pokemon-species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import type { - TrainerConfig, - TrainerPartyTemplate } from "#app/data/trainer-config"; +import type { TrainerConfig, TrainerPartyTemplate } from "#app/data/trainer-config"; import { TrainerPartyCompoundTemplate, TrainerPoolTier, TrainerSlot, trainerConfigs, trainerPartyTemplates, - signatureSpecies + TeraAIMode, } from "#app/data/trainer-config"; import type { EnemyPokemon } from "#app/field/pokemon"; import * as Utils from "#app/utils"; @@ -23,21 +21,30 @@ import i18next from "i18next"; import { PartyMemberStrength } from "#enums/party-member-strength"; import { Species } from "#enums/species"; import { TrainerType } from "#enums/trainer-type"; +import { signatureSpecies } from "#app/data/balance/signature-species"; export enum TrainerVariant { - DEFAULT, - FEMALE, - DOUBLE + DEFAULT, + FEMALE, + DOUBLE, } export default class Trainer extends Phaser.GameObjects.Container { public config: TrainerConfig; public variant: TrainerVariant; - public partyTemplateIndex: integer; + public partyTemplateIndex: number; public name: string; public partnerName: string; + public originalIndexes: { [key: number]: number } = {}; - constructor(trainerType: TrainerType, variant: TrainerVariant, partyTemplateIndex?: integer, name?: string, partnerName?: string, trainerConfigOverride?: TrainerConfig) { + constructor( + trainerType: TrainerType, + variant: TrainerVariant, + partyTemplateIndex?: number, + name?: string, + partnerName?: string, + trainerConfigOverride?: TrainerConfig, + ) { super(globalScene, -72, 80); this.config = trainerConfigs.hasOwnProperty(trainerType) ? trainerConfigs[trainerType] @@ -48,17 +55,23 @@ export default class Trainer extends Phaser.GameObjects.Container { } this.variant = variant; - this.partyTemplateIndex = Math.min(partyTemplateIndex !== undefined ? partyTemplateIndex : Utils.randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)), - this.config.partyTemplates.length - 1); + this.partyTemplateIndex = Math.min( + partyTemplateIndex !== undefined + ? partyTemplateIndex + : Utils.randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)), + this.config.partyTemplates.length - 1, + ); if (trainerNamePools.hasOwnProperty(trainerType)) { const namePool = trainerNamePools[trainerType]; - this.name = name || Utils.randSeedItem(Array.isArray(namePool[0]) ? namePool[variant === TrainerVariant.FEMALE ? 1 : 0] : namePool); + this.name = + name || + Utils.randSeedItem(Array.isArray(namePool[0]) ? namePool[variant === TrainerVariant.FEMALE ? 1 : 0] : namePool); if (variant === TrainerVariant.DOUBLE) { if (this.config.doubleOnly) { if (partnerName) { this.partnerName = partnerName; } else { - [ this.name, this.partnerName ] = this.name.split(" & "); + [this.name, this.partnerName] = this.name.split(" & "); } } else { this.partnerName = partnerName || Utils.randSeedItem(Array.isArray(namePool[0]) ? namePool[1] : namePool); @@ -79,12 +92,21 @@ export default class Trainer extends Phaser.GameObjects.Container { break; } - console.log(Object.keys(trainerPartyTemplates)[Object.values(trainerPartyTemplates).indexOf(this.getPartyTemplate())]); + console.log( + Object.keys(trainerPartyTemplates)[Object.values(trainerPartyTemplates).indexOf(this.getPartyTemplate())], + ); const getSprite = (hasShadow?: boolean, forceFemale?: boolean) => { - const ret = globalScene.addFieldSprite(0, 0, this.config.getSpriteKey(variant === TrainerVariant.FEMALE || forceFemale, this.isDouble())); + const ret = globalScene.addFieldSprite( + 0, + 0, + this.config.getSpriteKey(variant === TrainerVariant.FEMALE || forceFemale, this.isDouble()), + ); ret.setOrigin(0.5, 1); - ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: !!hasShadow }); + ret.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + hasShadow: !!hasShadow, + }); return ret; }; @@ -122,13 +144,13 @@ export default class Trainer extends Phaser.GameObjects.Container { * @param {boolean} includeTitle - Whether to include the title in the returned name. Defaults to false. * @returns {string} - The formatted name of the trainer. **/ - getName(trainerSlot: TrainerSlot = TrainerSlot.NONE, includeTitle: boolean = false): string { + getName(trainerSlot: TrainerSlot = TrainerSlot.NONE, includeTitle = false): string { // Get the base title based on the trainer slot and variant. let name = this.config.getTitle(trainerSlot, this.variant); // Determine the title to include based on the configuration and includeTitle flag. let title = includeTitle && this.config.title ? this.config.title : null; - const evilTeamTitles = [ "grunt" ]; + const evilTeamTitles = ["grunt"]; if (this.name === "" && evilTeamTitles.some(t => name.toLocaleLowerCase().includes(t))) { // This is a evil team grunt so we localize it by only using the "name" as the title title = i18next.t(`trainerClasses:${name.toLowerCase().replace(/\s/g, "_")}`); @@ -178,7 +200,6 @@ export default class Trainer extends Phaser.GameObjects.Container { return title ? `${title} ${name}` : name; } - isDouble(): boolean { return this.config.doubleOnly || this.variant === TrainerVariant.DOUBLE; } @@ -192,19 +213,34 @@ export default class Trainer extends Phaser.GameObjects.Container { } getEncounterBgm(): string { - return !this.variant ? this.config.encounterBgm : (this.variant === TrainerVariant.DOUBLE ? this.config.doubleEncounterBgm : this.config.femaleEncounterBgm) || this.config.encounterBgm; + return !this.variant + ? this.config.encounterBgm + : (this.variant === TrainerVariant.DOUBLE ? this.config.doubleEncounterBgm : this.config.femaleEncounterBgm) || + this.config.encounterBgm; } getEncounterMessages(): string[] { - return !this.variant ? this.config.encounterMessages : (this.variant === TrainerVariant.DOUBLE ? this.config.doubleEncounterMessages : this.config.femaleEncounterMessages) || this.config.encounterMessages; + return !this.variant + ? this.config.encounterMessages + : (this.variant === TrainerVariant.DOUBLE + ? this.config.doubleEncounterMessages + : this.config.femaleEncounterMessages) || this.config.encounterMessages; } getVictoryMessages(): string[] { - return !this.variant ? this.config.victoryMessages : (this.variant === TrainerVariant.DOUBLE ? this.config.doubleVictoryMessages : this.config.femaleVictoryMessages) || this.config.victoryMessages; + return !this.variant + ? this.config.victoryMessages + : (this.variant === TrainerVariant.DOUBLE + ? this.config.doubleVictoryMessages + : this.config.femaleVictoryMessages) || this.config.victoryMessages; } getDefeatMessages(): string[] { - return !this.variant ? this.config.defeatMessages : (this.variant === TrainerVariant.DOUBLE ? this.config.doubleDefeatMessages : this.config.femaleDefeatMessages) || this.config.defeatMessages; + return !this.variant + ? this.config.defeatMessages + : (this.variant === TrainerVariant.DOUBLE + ? this.config.doubleDefeatMessages + : this.config.femaleDefeatMessages) || this.config.defeatMessages; } getPartyTemplate(): TrainerPartyTemplate { @@ -214,7 +250,7 @@ export default class Trainer extends Phaser.GameObjects.Container { return this.config.partyTemplates[this.partyTemplateIndex]; } - getPartyLevels(waveIndex: integer): integer[] { + getPartyLevels(waveIndex: number): number[] { const ret: number[] = []; const partyTemplate = this.getPartyTemplate(); @@ -262,136 +298,164 @@ export default class Trainer extends Phaser.GameObjects.Container { return ret; } - genPartyMember(index: integer): EnemyPokemon { + genPartyMember(index: number): EnemyPokemon { const battle = globalScene.currentBattle; const level = battle.enemyLevels?.[index]!; // TODO: is this bang correct? let ret: EnemyPokemon; - globalScene.executeWithSeedOffset(() => { - const template = this.getPartyTemplate(); - const strength: PartyMemberStrength = template.getStrength(index); + globalScene.executeWithSeedOffset( + () => { + const template = this.getPartyTemplate(); + const strength: PartyMemberStrength = template.getStrength(index); - - // If the battle is not one of the named trainer doubles - if (!(this.config.trainerTypeDouble && this.isDouble() && !this.config.doubleOnly)) { - - if (this.config.partyMemberFuncs.hasOwnProperty(index)) { - ret = this.config.partyMemberFuncs[index](level, strength); - return; - } - if (this.config.partyMemberFuncs.hasOwnProperty(index - template.size)) { - ret = this.config.partyMemberFuncs[index - template.size](level, template.getStrength(index)); - return; - } - } - let offset = 0; - - if (template instanceof TrainerPartyCompoundTemplate) { - for (const innerTemplate of template.templates) { - if (offset + innerTemplate.size > index) { - break; + // If the battle is not one of the named trainer doubles + if (!(this.config.trainerTypeDouble && this.isDouble() && !this.config.doubleOnly)) { + if (this.config.partyMemberFuncs.hasOwnProperty(index)) { + ret = this.config.partyMemberFuncs[index](level, strength); + return; + } + if (this.config.partyMemberFuncs.hasOwnProperty(index - template.size)) { + ret = this.config.partyMemberFuncs[index - template.size](level, template.getStrength(index)); + return; } - offset += innerTemplate.size; } - } + let offset = 0; - // Create an empty species pool (which will be set to one of the species pools based on the index) - let newSpeciesPool: Species[] = []; - let useNewSpeciesPool = false; - - // If we are in a double battle of named trainers, we need to use alternate species pools (generate half the party from each trainer) - if (this.config.trainerTypeDouble && this.isDouble() && !this.config.doubleOnly) { - - // Use the new species pool for this party generation - useNewSpeciesPool = true; - - - // Get the species pool for the partner trainer and the current trainer - const speciesPoolPartner = signatureSpecies[TrainerType[this.config.trainerTypeDouble]]; - const speciesPool = signatureSpecies[TrainerType[this.config.trainerType]]; - - - // Get the species that are already in the enemy party so we dont generate the same species twice - const AlreadyUsedSpecies = battle.enemyParty.map(p => p.species.speciesId); - - // Filter out the species that are already in the enemy party from the main trainer species pool - const speciesPoolFiltered = speciesPool.filter(species => { - // Since some species pools have arrays in them (use either of those species), we need to check if one of the species is already in the party and filter the whole array if it is - if (Array.isArray(species)) { - return !species.some(s => AlreadyUsedSpecies.includes(s)); + if (template instanceof TrainerPartyCompoundTemplate) { + for (const innerTemplate of template.templates) { + if (offset + innerTemplate.size > index) { + break; + } + offset += innerTemplate.size; } - return !AlreadyUsedSpecies.includes(species); - }).flat(); + } - // Filter out the species that are already in the enemy party from the partner trainer species pool - const speciesPoolPartnerFiltered = speciesPoolPartner.filter(species => { - // Since some species pools have arrays in them (use either of those species), we need to check if one of the species is already in the party and filter the whole array if it is - if (Array.isArray(species)) { - return !species.some(s => AlreadyUsedSpecies.includes(s)); - } - return !AlreadyUsedSpecies.includes(species); - }).flat(); + // Create an empty species pool (which will be set to one of the species pools based on the index) + let newSpeciesPool: Species[] = []; + let useNewSpeciesPool = false; + // If we are in a double battle of named trainers, we need to use alternate species pools (generate half the party from each trainer) + if (this.config.trainerTypeDouble && this.isDouble() && !this.config.doubleOnly) { + // Use the new species pool for this party generation + useNewSpeciesPool = true; - // If the index is even, use the species pool for the main trainer (that way he only uses his own pokemon in battle) - if (!(index % 2)) { - // Since the only currently allowed double battle with named trainers is Tate & Liza, we need to make sure that Solrock is the first pokemon in the party for Tate and Lunatone for Liza - if (index === 0 && (TrainerType[this.config.trainerType] === TrainerType[TrainerType.TATE])) { - newSpeciesPool = [ Species.SOLROCK ]; - } else if (index === 0 && (TrainerType[this.config.trainerType] === TrainerType[TrainerType.LIZA])) { - newSpeciesPool = [ Species.LUNATONE ]; + // Get the species pool for the partner trainer and the current trainer + const speciesPoolPartner = signatureSpecies[TrainerType[this.config.trainerTypeDouble]]; + const speciesPool = signatureSpecies[TrainerType[this.config.trainerType]]; + + // Get the species that are already in the enemy party so we dont generate the same species twice + const AlreadyUsedSpecies = battle.enemyParty.map(p => p.species.speciesId); + + // Filter out the species that are already in the enemy party from the main trainer species pool + const speciesPoolFiltered = speciesPool + .filter(species => { + // Since some species pools have arrays in them (use either of those species), we need to check if one of the species is already in the party and filter the whole array if it is + if (Array.isArray(species)) { + return !species.some(s => AlreadyUsedSpecies.includes(s)); + } + return !AlreadyUsedSpecies.includes(species); + }) + .flat(); + + // Filter out the species that are already in the enemy party from the partner trainer species pool + const speciesPoolPartnerFiltered = speciesPoolPartner + .filter(species => { + // Since some species pools have arrays in them (use either of those species), we need to check if one of the species is already in the party and filter the whole array if it is + if (Array.isArray(species)) { + return !species.some(s => AlreadyUsedSpecies.includes(s)); + } + return !AlreadyUsedSpecies.includes(species); + }) + .flat(); + + // If the index is even, use the species pool for the main trainer (that way he only uses his own pokemon in battle) + if (!(index % 2)) { + // Since the only currently allowed double battle with named trainers is Tate & Liza, we need to make sure that Solrock is the first pokemon in the party for Tate and Lunatone for Liza + if (index === 0 && TrainerType[this.config.trainerType] === TrainerType[TrainerType.TATE]) { + newSpeciesPool = [Species.SOLROCK]; + } else if (index === 0 && TrainerType[this.config.trainerType] === TrainerType[TrainerType.LIZA]) { + newSpeciesPool = [Species.LUNATONE]; + } else { + newSpeciesPool = speciesPoolFiltered; + } } else { - newSpeciesPool = speciesPoolFiltered; + // If the index is odd, use the species pool for the partner trainer (that way he only uses his own pokemon in battle) + // Since the only currently allowed double battle with named trainers is Tate & Liza, we need to make sure that Solrock is the first pokemon in the party for Tate and Lunatone for Liza + if (index === 1 && TrainerType[this.config.trainerTypeDouble] === TrainerType[TrainerType.TATE]) { + newSpeciesPool = [Species.SOLROCK]; + } else if (index === 1 && TrainerType[this.config.trainerTypeDouble] === TrainerType[TrainerType.LIZA]) { + newSpeciesPool = [Species.LUNATONE]; + } else { + newSpeciesPool = speciesPoolPartnerFiltered; + } } - } else { - // If the index is odd, use the species pool for the partner trainer (that way he only uses his own pokemon in battle) - // Since the only currently allowed double battle with named trainers is Tate & Liza, we need to make sure that Solrock is the first pokemon in the party for Tate and Lunatone for Liza - if (index === 1 && (TrainerType[this.config.trainerTypeDouble] === TrainerType[TrainerType.TATE])) { - newSpeciesPool = [ Species.SOLROCK ]; - } else if (index === 1 && (TrainerType[this.config.trainerTypeDouble] === TrainerType[TrainerType.LIZA])) { - newSpeciesPool = [ Species.LUNATONE ]; - } else { - newSpeciesPool = speciesPoolPartnerFiltered; + // Fallback for when the species pool is empty + if (newSpeciesPool.length === 0) { + // If all pokemon from this pool are already in the party, generate a random species + useNewSpeciesPool = false; } } - // Fallback for when the species pool is empty - if (newSpeciesPool.length === 0) { - // If all pokemon from this pool are already in the party, generate a random species - useNewSpeciesPool = false; + + // If useNewSpeciesPool is true, we need to generate a new species from the new species pool, otherwise we generate a random species + let species = useNewSpeciesPool + ? getPokemonSpecies(newSpeciesPool[Math.floor(Utils.randSeedInt(newSpeciesPool.length))]) + : template.isSameSpecies(index) && index > offset + ? getPokemonSpecies( + battle.enemyParty[offset].species.getTrainerSpeciesForLevel( + level, + false, + template.getStrength(offset), + globalScene.currentBattle.waveIndex, + ), + ) + : this.genNewPartyMemberSpecies(level, strength); + + // If the species is from newSpeciesPool, we need to adjust it based on the level and strength + if (newSpeciesPool) { + species = getPokemonSpecies( + species.getSpeciesForLevel(level, true, true, strength, globalScene.currentBattle.waveIndex), + ); } - } - // If useNewSpeciesPool is true, we need to generate a new species from the new species pool, otherwise we generate a random species - let species = useNewSpeciesPool - ? getPokemonSpecies(newSpeciesPool[Math.floor(Utils.randSeedInt(newSpeciesPool.length))]) - : template.isSameSpecies(index) && index > offset - ? getPokemonSpecies(battle.enemyParty[offset].species.getTrainerSpeciesForLevel(level, false, template.getStrength(offset), globalScene.currentBattle.waveIndex)) - : this.genNewPartyMemberSpecies(level, strength); - - // If the species is from newSpeciesPool, we need to adjust it based on the level and strength - if (newSpeciesPool) { - species = getPokemonSpecies(species.getSpeciesForLevel(level, true, true, strength, globalScene.currentBattle.waveIndex)); - } - - ret = globalScene.addEnemyPokemon(species, level, !this.isDouble() || !(index % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER); - }, this.config.hasStaticParty ? this.config.getDerivedType() + ((index + 1) << 8) : globalScene.currentBattle.waveIndex + (this.config.getDerivedType() << 10) + (((!this.config.useSameSeedForAllMembers ? index : 0) + 1) << 8)); + ret = globalScene.addEnemyPokemon( + species, + level, + !this.isDouble() || !(index % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER, + ); + }, + this.config.hasStaticParty + ? this.config.getDerivedType() + ((index + 1) << 8) + : globalScene.currentBattle.waveIndex + + (this.config.getDerivedType() << 10) + + (((!this.config.useSameSeedForAllMembers ? index : 0) + 1) << 8), + ); return ret!; // TODO: is this bang correct? } - - genNewPartyMemberSpecies(level: integer, strength: PartyMemberStrength, attempt?: integer): PokemonSpecies { + genNewPartyMemberSpecies(level: number, strength: PartyMemberStrength, attempt?: number): PokemonSpecies { const battle = globalScene.currentBattle; const template = this.getPartyTemplate(); let baseSpecies: PokemonSpecies; if (this.config.speciesPools) { const tierValue = Utils.randSeedInt(512); - let tier = tierValue >= 156 ? TrainerPoolTier.COMMON : tierValue >= 32 ? TrainerPoolTier.UNCOMMON : tierValue >= 6 ? TrainerPoolTier.RARE : tierValue >= 1 ? TrainerPoolTier.SUPER_RARE : TrainerPoolTier.ULTRA_RARE; + let tier = + tierValue >= 156 + ? TrainerPoolTier.COMMON + : tierValue >= 32 + ? TrainerPoolTier.UNCOMMON + : tierValue >= 6 + ? TrainerPoolTier.RARE + : tierValue >= 1 + ? TrainerPoolTier.SUPER_RARE + : TrainerPoolTier.ULTRA_RARE; console.log(TrainerPoolTier[tier]); while (!this.config.speciesPools.hasOwnProperty(tier) || !this.config.speciesPools[tier].length) { - console.log(`Downgraded trainer Pokemon rarity tier from ${TrainerPoolTier[tier]} to ${TrainerPoolTier[tier - 1]}`); + console.log( + `Downgraded trainer Pokemon rarity tier from ${TrainerPoolTier[tier]} to ${TrainerPoolTier[tier - 1]}`, + ); tier--; } const tierPool = this.config.speciesPools[tier]; @@ -400,7 +464,9 @@ export default class Trainer extends Phaser.GameObjects.Container { baseSpecies = globalScene.randomSpecies(battle.waveIndex, level, false, this.config.speciesFilter); } - let ret = getPokemonSpecies(baseSpecies.getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex)); + let ret = getPokemonSpecies( + baseSpecies.getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex), + ); let retry = false; console.log(ret.getName()); @@ -408,20 +474,27 @@ export default class Trainer extends Phaser.GameObjects.Container { if (pokemonPrevolutions.hasOwnProperty(baseSpecies.speciesId) && ret.speciesId !== baseSpecies.speciesId) { retry = true; } else if (template.isBalanced(battle.enemyParty.length)) { - const partyMemberTypes = battle.enemyParty.map(p => p.getTypes(true)).flat(); - if (partyMemberTypes.indexOf(ret.type1) > -1 || (ret.type2 !== null && partyMemberTypes.indexOf(ret.type2) > -1)) { + const partyMemberTypes = battle.enemyParty.flatMap(p => p.getTypes(true)); + if ( + partyMemberTypes.indexOf(ret.type1) > -1 || + (ret.type2 !== null && partyMemberTypes.indexOf(ret.type2) > -1) + ) { retry = true; } } - if (!retry && this.config.specialtyTypes.length && !this.config.specialtyTypes.find(t => ret.isOfType(t))) { + // Prompts reroll of party member species if doesn't fit specialty type. + // Can be removed by adding a type parameter to getTrainerSpeciesForLevel and filtering the list of evolutions for that type. + if (!retry && this.config.hasSpecialtyType() && !ret.isOfType(this.config.specialtyType)) { retry = true; console.log("Attempting reroll of species evolution to fit specialty type..."); let evoAttempt = 0; while (retry && evoAttempt++ < 10) { - ret = getPokemonSpecies(baseSpecies.getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex)); + ret = getPokemonSpecies( + baseSpecies.getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex), + ); console.log(ret.name); - if (this.config.specialtyTypes.find(t => ret.isOfType(t))) { + if (ret.isOfType(this.config.specialtyType)) { retry = false; } } @@ -462,13 +535,16 @@ export default class Trainer extends Phaser.GameObjects.Container { return currentSpecies.includes(baseSpecies) || staticSpecies.includes(baseSpecies); } - getPartyMemberMatchupScores(trainerSlot: TrainerSlot = TrainerSlot.NONE, forSwitch: boolean = false): [integer, integer][] { + getPartyMemberMatchupScores(trainerSlot: TrainerSlot = TrainerSlot.NONE, forSwitch = false): [number, number][] { if (trainerSlot && !this.isDouble()) { trainerSlot = TrainerSlot.NONE; } const party = globalScene.getEnemyParty(); - const nonFaintedLegalPartyMembers = party.slice(globalScene.currentBattle.getBattlerCount()).filter(p => p.isAllowedInBattle()).filter(p => !trainerSlot || p.trainerSlot === trainerSlot); + const nonFaintedLegalPartyMembers = party + .slice(globalScene.currentBattle.getBattlerCount()) + .filter(p => p.isAllowedInBattle()) + .filter(p => !trainerSlot || p.trainerSlot === trainerSlot); const partyMemberScores = nonFaintedLegalPartyMembers.map(p => { const playerField = globalScene.getPlayerField().filter(p => p.isAllowedInBattle()); let score = 0; @@ -482,17 +558,19 @@ export default class Trainer extends Phaser.GameObjects.Container { } score /= playerField.length; if (forSwitch && !p.isOnField()) { - globalScene.arena.findTagsOnSide(t => t instanceof ArenaTrapTag, ArenaTagSide.ENEMY).map(t => score *= (t as ArenaTrapTag).getMatchupScoreMultiplier(p)); + globalScene.arena + .findTagsOnSide(t => t instanceof ArenaTrapTag, ArenaTagSide.ENEMY) + .map(t => (score *= (t as ArenaTrapTag).getMatchupScoreMultiplier(p))); } } - return [ party.indexOf(p), score ]; - }) as [integer, integer][]; + return [party.indexOf(p), score]; + }) as [number, number][]; return partyMemberScores; } - getSortedPartyMemberMatchupScores(partyMemberScores: [integer, integer][] = this.getPartyMemberMatchupScores()) { + getSortedPartyMemberMatchupScores(partyMemberScores: [number, number][] = this.getPartyMemberMatchupScores()) { const sortedPartyMemberScores = partyMemberScores.slice(0); sortedPartyMemberScores.sort((a, b) => { const scoreA = a[1]; @@ -503,25 +581,33 @@ export default class Trainer extends Phaser.GameObjects.Container { return sortedPartyMemberScores; } - getNextSummonIndex(trainerSlot: TrainerSlot = TrainerSlot.NONE, partyMemberScores: [integer, integer][] = this.getPartyMemberMatchupScores(trainerSlot)): integer { + getNextSummonIndex( + trainerSlot: TrainerSlot = TrainerSlot.NONE, + partyMemberScores: [number, number][] = this.getPartyMemberMatchupScores(trainerSlot), + ): number { if (trainerSlot && !this.isDouble()) { trainerSlot = TrainerSlot.NONE; } const sortedPartyMemberScores = this.getSortedPartyMemberMatchupScores(partyMemberScores); - const maxScorePartyMemberIndexes = partyMemberScores.filter(pms => pms[1] === sortedPartyMemberScores[0][1]).map(pms => pms[0]); + const maxScorePartyMemberIndexes = partyMemberScores + .filter(pms => pms[1] === sortedPartyMemberScores[0][1]) + .map(pms => pms[0]); if (maxScorePartyMemberIndexes.length > 1) { - let rand: integer; - globalScene.executeWithSeedOffset(() => rand = Utils.randSeedInt(maxScorePartyMemberIndexes.length), globalScene.currentBattle.turn << 2); + let rand: number; + globalScene.executeWithSeedOffset( + () => (rand = Utils.randSeedInt(maxScorePartyMemberIndexes.length)), + globalScene.currentBattle.turn << 2, + ); return maxScorePartyMemberIndexes[rand!]; } return maxScorePartyMemberIndexes[0]; } - getPartyMemberModifierChanceMultiplier(index: integer): number { + getPartyMemberModifierChanceMultiplier(index: number): number { switch (this.getPartyTemplate().getStrength(index)) { case PartyMemberStrength.WEAKER: return 0.75; @@ -546,6 +632,13 @@ export default class Trainer extends Phaser.GameObjects.Container { return []; } + genAI(party: EnemyPokemon[]) { + if (this.config.genAIFuncs) { + this.config.genAIFuncs.forEach(f => f(party)); + } + console.log("Generated AI funcs"); + } + loadAssets(): Promise { return this.config.loadAssets(this.variant); } @@ -563,7 +656,11 @@ export default class Trainer extends Phaser.GameObjects.Container { * @param animConfig {@linkcode Phaser.Types.Animations.PlayAnimationConfig} to pass to {@linkcode Phaser.GameObjects.Sprite.play} * @returns true if the sprite was able to be animated */ - tryPlaySprite(sprite: Phaser.GameObjects.Sprite, tintSprite: Phaser.GameObjects.Sprite, animConfig: Phaser.Types.Animations.PlayAnimationConfig): boolean { + tryPlaySprite( + sprite: Phaser.GameObjects.Sprite, + tintSprite: Phaser.GameObjects.Sprite, + animConfig: Phaser.Types.Animations.PlayAnimationConfig, + ): boolean { // Show an error in the console if there isn't a texture loaded if (sprite.texture.key === "__MISSING") { console.error(`No texture found for '${animConfig.key}'!`); @@ -587,7 +684,7 @@ export default class Trainer extends Phaser.GameObjects.Container { const trainerAnimConfig = { key: this.getKey(), repeat: 0, - startFrame: 0 + startFrame: 0, }; const sprites = this.getSprites(); const tintSprites = this.getTintSprites(); @@ -599,7 +696,7 @@ export default class Trainer extends Phaser.GameObjects.Container { const partnerTrainerAnimConfig = { key: this.getKey(true), repeat: 0, - startFrame: 0 + startFrame: 0, }; this.tryPlaySprite(sprites[1], tintSprites[1], partnerTrainerAnimConfig); @@ -607,9 +704,7 @@ export default class Trainer extends Phaser.GameObjects.Container { } getSprites(): Phaser.GameObjects.Sprite[] { - const ret: Phaser.GameObjects.Sprite[] = [ - this.getAt(0) - ]; + const ret: Phaser.GameObjects.Sprite[] = [this.getAt(0)]; if (this.variant === TrainerVariant.DOUBLE && !this.config.doubleOnly) { ret.push(this.getAt(2)); } @@ -617,16 +712,14 @@ export default class Trainer extends Phaser.GameObjects.Container { } getTintSprites(): Phaser.GameObjects.Sprite[] { - const ret: Phaser.GameObjects.Sprite[] = [ - this.getAt(1) - ]; + const ret: Phaser.GameObjects.Sprite[] = [this.getAt(1)]; if (this.variant === TrainerVariant.DOUBLE && !this.config.doubleOnly) { ret.push(this.getAt(3)); } return ret; } - tint(color: number, alpha?: number, duration?: integer, ease?: string): void { + tint(color: number, alpha?: number, duration?: number, ease?: string): void { const tintSprites = this.getTintSprites(); tintSprites.map(tintSprite => { tintSprite.setTintFill(color); @@ -639,7 +732,7 @@ export default class Trainer extends Phaser.GameObjects.Container { targets: tintSprite, alpha: alpha || 1, duration: duration, - ease: ease || "Linear" + ease: ease || "Linear", }); } else { tintSprite.setAlpha(alpha); @@ -647,7 +740,7 @@ export default class Trainer extends Phaser.GameObjects.Container { }); } - untint(duration: integer, ease?: string): void { + untint(duration: number, ease?: string): void { const tintSprites = this.getTintSprites(); tintSprites.map(tintSprite => { if (duration) { @@ -659,7 +752,7 @@ export default class Trainer extends Phaser.GameObjects.Container { onComplete: () => { tintSprite.setVisible(false); tintSprite.setAlpha(1); - } + }, }); } else { tintSprite.setVisible(false); @@ -667,4 +760,18 @@ export default class Trainer extends Phaser.GameObjects.Container { } }); } + + /** + * Determines whether a Trainer should Terastallize their Pokemon + * @param pokemon {@linkcode EnemyPokemon} Trainer Pokemon in question + * @returns boolean Whether the EnemyPokemon should Terastalize this turn + */ + shouldTera(pokemon: EnemyPokemon): boolean { + if (this.config.trainerAI.teraMode === TeraAIMode.INSTANT_TERA) { + if (!pokemon.isTerastallized && this.config.trainerAI.instantTeras.includes(pokemon.initialTeamIndex)) { + return true; + } + } + return false; + } } diff --git a/src/game-mode.ts b/src/game-mode.ts index 78a65a54890..9ab1674bcce 100644 --- a/src/game-mode.ts +++ b/src/game-mode.ts @@ -19,7 +19,7 @@ export enum GameModes { ENDLESS, SPLICED_ENDLESS, DAILY, - CHALLENGE + CHALLENGE, } interface GameModeConfig { @@ -37,8 +37,8 @@ interface GameModeConfig { } // Describes min and max waves for MEs in specific game modes -export const CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES: [number, number] = [ 10, 180 ]; -export const CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES: [number, number] = [ 10, 180 ]; +export const CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES: [number, number] = [10, 180]; +export const CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES: [number, number] = [10, 180]; export class GameMode implements GameModeConfig { public modeId: GameModes; @@ -91,7 +91,7 @@ export class GameMode implements GameModeConfig { * - 20 for Daily Runs * - 5 for all other modes */ - getStartingLevel(): integer { + getStartingLevel(): number { if (Overrides.STARTING_LEVEL_OVERRIDE) { return Overrides.STARTING_LEVEL_OVERRIDE; } @@ -108,7 +108,7 @@ export class GameMode implements GameModeConfig { * - override from overrides.ts * - 1000 */ - getStartingMoney(): integer { + getStartingMoney(): number { return Overrides.STARTING_MONEY_OVERRIDE || 1000; } @@ -127,7 +127,7 @@ export class GameMode implements GameModeConfig { } } - getWaveForDifficulty(waveIndex: integer, ignoreCurveChanges: boolean = false): integer { + getWaveForDifficulty(waveIndex: number, ignoreCurveChanges = false): number { switch (this.modeId) { case GameModes.DAILY: return waveIndex + 30 + (!ignoreCurveChanges ? Math.floor(waveIndex / 5) : 0); @@ -142,16 +142,17 @@ export class GameMode implements GameModeConfig { * @param arena the current {@linkcode Arena} * @returns `true` if a trainer should be generated, `false` otherwise */ - isWaveTrainer(waveIndex: integer, arena: Arena): boolean { + isWaveTrainer(waveIndex: number, arena: Arena): boolean { /** * Daily spawns trainers on floors 5, 15, 20, 25, 30, 35, 40, and 45 */ if (this.isDaily) { return waveIndex % 10 === 5 || (!(waveIndex % 10) && waveIndex > 10 && !this.isWaveFinal(waveIndex)); } - if ((waveIndex % 30) === (globalScene.offsetGym ? 0 : 20) && !this.isWaveFinal(waveIndex)) { + if (waveIndex % 30 === (globalScene.offsetGym ? 0 : 20) && !this.isWaveFinal(waveIndex)) { return true; - } else if (waveIndex % 10 !== 1 && waveIndex % 10) { + } + if (waveIndex % 10 !== 1 && waveIndex % 10) { /** * Do not check X1 floors since there's a bug that stops trainer sprites from appearing * after a X0 full party heal @@ -165,10 +166,11 @@ export class GameMode implements GameModeConfig { if (w === waveIndex) { continue; } - if ((w % 30) === (globalScene.offsetGym ? 0 : 20) || this.isFixedBattle(w)) { + if (w % 30 === (globalScene.offsetGym ? 0 : 20) || this.isFixedBattle(w)) { allowTrainerBattle = false; break; - } else if (w < waveIndex) { + } + if (w < waveIndex) { globalScene.executeWithSeedOffset(() => { const waveTrainerChance = arena.getTrainerChance(); if (!Utils.randSeedInt(waveTrainerChance)) { @@ -186,19 +188,27 @@ export class GameMode implements GameModeConfig { return false; } - isTrainerBoss(waveIndex: integer, biomeType: Biome, offsetGym: boolean): boolean { + isTrainerBoss(waveIndex: number, biomeType: Biome, offsetGym: boolean): boolean { switch (this.modeId) { case GameModes.DAILY: return waveIndex > 10 && waveIndex < 50 && !(waveIndex % 10); default: - return (waveIndex % 30) === (offsetGym ? 0 : 20) && (biomeType !== Biome.END || this.isClassic || this.isWaveFinal(waveIndex)); + return ( + waveIndex % 30 === (offsetGym ? 0 : 20) && + (biomeType !== Biome.END || this.isClassic || this.isWaveFinal(waveIndex)) + ); } } - getOverrideSpecies(waveIndex: integer): PokemonSpecies | null { + getOverrideSpecies(waveIndex: number): PokemonSpecies | null { if (this.isDaily && this.isWaveFinal(waveIndex)) { - const allFinalBossSpecies = allSpecies.filter(s => (s.subLegendary || s.legendary || s.mythical) - && s.baseTotal >= 600 && s.speciesId !== Species.ETERNATUS && s.speciesId !== Species.ARCEUS); + const allFinalBossSpecies = allSpecies.filter( + s => + (s.subLegendary || s.legendary || s.mythical) && + s.baseTotal >= 600 && + s.speciesId !== Species.ETERNATUS && + s.speciesId !== Species.ARCEUS, + ); return Utils.randSeedItem(allFinalBossSpecies); } @@ -211,7 +221,7 @@ export class GameMode implements GameModeConfig { * @param modeId game mode * @returns if the current wave is final for classic or daily OR a minor boss in endless */ - isWaveFinal(waveIndex: integer, modeId: GameModes = this.modeId): boolean { + isWaveFinal(waveIndex: number, modeId: GameModes = this.modeId): boolean { switch (modeId) { case GameModes.CLASSIC: case GameModes.CHALLENGE: @@ -225,10 +235,10 @@ export class GameMode implements GameModeConfig { } /** - * Every 10 waves is a boss battle - * @returns true if waveIndex is a multiple of 10 - */ - isBoss(waveIndex: integer): boolean { + * Every 10 waves is a boss battle + * @returns true if waveIndex is a multiple of 10 + */ + isBoss(waveIndex: number): boolean { return waveIndex % 10 === 0; } @@ -240,61 +250,59 @@ export class GameMode implements GameModeConfig { } /** - * Every 50 waves of an Endless mode is a boss - * At this time it is paradox pokemon - * @returns true if waveIndex is a multiple of 50 in Endless - */ - isEndlessBoss(waveIndex: integer): boolean { - return waveIndex % 50 === 0 && - (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS); + * Every 50 waves of an Endless mode is a boss + * At this time it is paradox pokemon + * @returns true if waveIndex is a multiple of 50 in Endless + */ + isEndlessBoss(waveIndex: number): boolean { + return waveIndex % 50 === 0 && (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS); } /** - * Every 250 waves of an Endless mode is a minor boss - * At this time it is Eternatus - * @returns true if waveIndex is a multiple of 250 in Endless - */ - isEndlessMinorBoss(waveIndex: integer): boolean { - return waveIndex % 250 === 0 && - (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS); + * Every 250 waves of an Endless mode is a minor boss + * At this time it is Eternatus + * @returns true if waveIndex is a multiple of 250 in Endless + */ + isEndlessMinorBoss(waveIndex: number): boolean { + return waveIndex % 250 === 0 && (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS); } /** - * Every 1000 waves of an Endless mode is a major boss - * At this time it is Eternamax Eternatus - * @returns true if waveIndex is a multiple of 1000 in Endless - */ - isEndlessMajorBoss(waveIndex: integer): boolean { - return waveIndex % 1000 === 0 && - (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS); + * Every 1000 waves of an Endless mode is a major boss + * At this time it is Eternamax Eternatus + * @returns true if waveIndex is a multiple of 1000 in Endless + */ + isEndlessMajorBoss(waveIndex: number): boolean { + return waveIndex % 1000 === 0 && (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS); } /** * Checks whether there is a fixed battle on this gamemode on a given wave. - * @param {integer} waveIndex The wave to check. + * @param {number} waveIndex The wave to check. * @returns {boolean} If this game mode has a fixed battle on this wave */ - isFixedBattle(waveIndex: integer): boolean { + isFixedBattle(waveIndex: number): boolean { const dummyConfig = new FixedBattleConfig(); - return this.battleConfig.hasOwnProperty(waveIndex) || applyChallenges(this, ChallengeType.FIXED_BATTLES, waveIndex, dummyConfig); + return ( + this.battleConfig.hasOwnProperty(waveIndex) || + applyChallenges(this, ChallengeType.FIXED_BATTLES, waveIndex, dummyConfig) + ); } /** * Returns the config for the fixed battle for a particular wave. - * @param {integer} waveIndex The wave to check. + * @param {number} waveIndex The wave to check. * @returns {boolean} The fixed battle for this wave. */ - getFixedBattle(waveIndex: integer): FixedBattleConfig { + getFixedBattle(waveIndex: number): FixedBattleConfig { const challengeConfig = new FixedBattleConfig(); if (applyChallenges(this, ChallengeType.FIXED_BATTLES, waveIndex, challengeConfig)) { return challengeConfig; - } else { - return this.battleConfig[waveIndex]; } + return this.battleConfig[waveIndex]; } - - getClearScoreBonus(): integer { + getClearScoreBonus(): number { switch (this.modeId) { case GameModes.CLASSIC: case GameModes.CHALLENGE: @@ -306,7 +314,7 @@ export class GameMode implements GameModeConfig { } } - getEnemyModifierChance(isBoss: boolean): integer { + getEnemyModifierChance(isBoss: boolean): number { switch (this.modeId) { case GameModes.CLASSIC: case GameModes.CHALLENGE: @@ -338,12 +346,12 @@ export class GameMode implements GameModeConfig { */ getMysteryEncounterLegalWaves(): [number, number] { switch (this.modeId) { - default: - return [ 0, 0 ]; case GameModes.CLASSIC: return CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES; case GameModes.CHALLENGE: return CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES; + default: + return [0, 0]; } } @@ -366,14 +374,40 @@ export class GameMode implements GameModeConfig { export function getGameMode(gameMode: GameModes): GameMode { switch (gameMode) { case GameModes.CLASSIC: - return new GameMode(GameModes.CLASSIC, { isClassic: true, hasTrainers: true, hasMysteryEncounters: true }, classicFixedBattles); + return new GameMode( + GameModes.CLASSIC, + { isClassic: true, hasTrainers: true, hasMysteryEncounters: true }, + classicFixedBattles, + ); case GameModes.ENDLESS: - return new GameMode(GameModes.ENDLESS, { isEndless: true, hasShortBiomes: true, hasRandomBosses: true }); + return new GameMode(GameModes.ENDLESS, { + isEndless: true, + hasShortBiomes: true, + hasRandomBosses: true, + }); case GameModes.SPLICED_ENDLESS: - return new GameMode(GameModes.SPLICED_ENDLESS, { isEndless: true, hasShortBiomes: true, hasRandomBosses: true, isSplicedOnly: true }); + return new GameMode(GameModes.SPLICED_ENDLESS, { + isEndless: true, + hasShortBiomes: true, + hasRandomBosses: true, + isSplicedOnly: true, + }); case GameModes.DAILY: - return new GameMode(GameModes.DAILY, { isDaily: true, hasTrainers: true, hasNoShop: true }); + return new GameMode(GameModes.DAILY, { + isDaily: true, + hasTrainers: true, + hasNoShop: true, + }); case GameModes.CHALLENGE: - return new GameMode(GameModes.CHALLENGE, { isClassic: true, hasTrainers: true, isChallenge: true, hasMysteryEncounters: true }, classicFixedBattles); + return new GameMode( + GameModes.CHALLENGE, + { + isClassic: true, + hasTrainers: true, + isChallenge: true, + hasMysteryEncounters: true, + }, + classicFixedBattles, + ); } } diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts index d382caf6cb6..fb4555084ee 100644 --- a/src/inputs-controller.ts +++ b/src/inputs-controller.ts @@ -10,11 +10,7 @@ import { Mode } from "./ui/ui"; import type SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler"; import type SettingsKeyboardUiHandler from "./ui/settings/settings-keyboard-ui-handler"; import cfg_keyboard_qwerty from "./configs/inputs/cfg_keyboard_qwerty"; -import { - assign, - getButtonWithKeycode, - getIconForLatestInput, swap, -} from "#app/configs/inputs/configHandler"; +import { assign, getButtonWithKeycode, getIconForLatestInput, swap } from "#app/configs/inputs/configHandler"; import { globalScene } from "#app/global-scene"; import type { SettingGamepad } from "#app/system/settings/settings-gamepad"; import type { SettingKeyboard } from "#app/system/settings/settings-keyboard"; @@ -24,29 +20,29 @@ import { Device } from "#enums/devices"; import MoveTouchControlsHandler from "./ui/settings/move-touch-controls-handler"; export interface DeviceMapping { - [key: string]: number; + [key: string]: number; } export interface IconsMapping { - [key: string]: string; + [key: string]: string; } export interface SettingMapping { - [key: string]: Button; + [key: string]: Button; } export interface MappingLayout { - [key: string]: SettingGamepad | SettingKeyboard | number; + [key: string]: SettingGamepad | SettingKeyboard | number; } export interface InterfaceConfig { - padID: string; - padType: string; - deviceMapping: DeviceMapping; - icons: IconsMapping; - settings: SettingMapping; - default: MappingLayout; - custom?: MappingLayout; + padID: string; + padType: string; + deviceMapping: DeviceMapping; + icons: IconsMapping; + settings: SettingMapping; + default: MappingLayout; + custom?: MappingLayout; } const repeatInputDelayMillis = 250; @@ -81,30 +77,29 @@ export class InputsController { private interactions: Map> = new Map(); private configs: Map = new Map(); - public gamepadSupport: boolean = true; + public gamepadSupport = true; public selectedDevice; - private disconnectedGamepads: Array = new Array(); + private disconnectedGamepads: Array = new Array(); - - public lastSource: string = "keyboard"; + public lastSource = "keyboard"; private inputInterval: NodeJS.Timeout[] = new Array(); private touchControls: TouchControl; public moveTouchControlsHandler: MoveTouchControlsHandler; /** - * Initializes a new instance of the game control system, setting up initial state and configurations. - * - * @remarks - * This constructor initializes the game control system with necessary setups for handling inputs. - * It prepares an interactions array indexed by button identifiers and configures default states for each button. - * Specific buttons like MENU and STATS are set not to repeat their actions. - * It concludes by calling the `init` method to complete the setup. - */ + * Initializes a new instance of the game control system, setting up initial state and configurations. + * + * @remarks + * This constructor initializes the game control system with necessary setups for handling inputs. + * It prepares an interactions array indexed by button identifiers and configures default states for each button. + * Specific buttons like MENU and STATS are set not to repeat their actions. + * It concludes by calling the `init` method to complete the setup. + */ constructor() { this.selectedDevice = { [Device.GAMEPAD]: null, - [Device.KEYBOARD]: "default" + [Device.KEYBOARD]: "default", }; for (const b of Utils.getEnumValues(Button)) { @@ -121,13 +116,13 @@ export class InputsController { } /** - * Sets up event handlers and initializes gamepad and keyboard controls. - * - * @remarks - * This method configures event listeners for both gamepad and keyboard inputs. - * It handles gamepad connections/disconnections and button press events, and ensures keyboard controls are set up. - * Additionally, it manages the game's behavior when it loses focus to prevent unwanted game actions during this state. - */ + * Sets up event handlers and initializes gamepad and keyboard controls. + * + * @remarks + * This method configures event listeners for both gamepad and keyboard inputs. + * It handles gamepad connections/disconnections and button press events, and ensures keyboard controls are set up. + * Additionally, it manages the game's behavior when it loses focus to prevent unwanted game actions during this state. + */ init(): void { this.events = globalScene.game.events; @@ -136,18 +131,26 @@ export class InputsController { }); if (typeof globalScene.input.gamepad !== "undefined") { - globalScene.input.gamepad?.on("connected", function (thisGamepad) { - if (!thisGamepad) { - return; - } - this.refreshGamepads(); - this.setupGamepad(thisGamepad); - this.onReconnect(thisGamepad); - }, this); + globalScene.input.gamepad?.on( + "connected", + function (thisGamepad) { + if (!thisGamepad) { + return; + } + this.refreshGamepads(); + this.setupGamepad(thisGamepad); + this.onReconnect(thisGamepad); + }, + this, + ); - globalScene.input.gamepad?.on("disconnected", function (thisGamepad) { - this.onDisconnect(thisGamepad); // when a gamepad is disconnected - }, this); + globalScene.input.gamepad?.on( + "disconnected", + function (thisGamepad) { + this.onDisconnect(thisGamepad); // when a gamepad is disconnected + }, + this, + ); // Check to see if the gamepad has already been setup by the browser globalScene.input.gamepad?.refreshPads(); @@ -168,24 +171,24 @@ export class InputsController { } /** - * Handles actions to take when the game loses focus, such as deactivating pressed keys. - * - * @remarks - * This method is triggered when the game or the browser tab loses focus. It ensures that any keys pressed are deactivated to prevent stuck keys affecting gameplay when the game is not active. - */ + * Handles actions to take when the game loses focus, such as deactivating pressed keys. + * + * @remarks + * This method is triggered when the game or the browser tab loses focus. It ensures that any keys pressed are deactivated to prevent stuck keys affecting gameplay when the game is not active. + */ loseFocus(): void { this.deactivatePressedKey(); this.touchControls.deactivatePressedKey(); } /** - * Enables or disables support for gamepad input. - * - * @param value - A boolean indicating whether gamepad support should be enabled (true) or disabled (false). - * - * @remarks - * This method toggles gamepad support. If disabled, it also ensures that all currently pressed gamepad buttons are deactivated to avoid stuck inputs. - */ + * Enables or disables support for gamepad input. + * + * @param value - A boolean indicating whether gamepad support should be enabled (true) or disabled (false). + * + * @remarks + * This method toggles gamepad support. If disabled, it also ensures that all currently pressed gamepad buttons are deactivated to avoid stuck inputs. + */ setGamepadSupport(value: boolean): void { if (value) { this.gamepadSupport = true; @@ -196,92 +199,92 @@ export class InputsController { } /** - * Sets the currently chosen gamepad and initializes related settings. - * This method first deactivates any active key presses and then initializes the gamepad settings. - * - * @param gamepad - The identifier of the gamepad to set as chosen. - */ - setChosenGamepad(gamepad: String): void { + * Sets the currently chosen gamepad and initializes related settings. + * This method first deactivates any active key presses and then initializes the gamepad settings. + * + * @param gamepad - The identifier of the gamepad to set as chosen. + */ + setChosenGamepad(gamepad: string): void { this.deactivatePressedKey(); this.initChosenGamepad(gamepad); } /** - * Sets the currently chosen keyboard layout and initializes related settings. - * - * @param layoutKeyboard - The identifier of the keyboard layout to set as chosen. - */ - setChosenKeyboardLayout(layoutKeyboard: String): void { + * Sets the currently chosen keyboard layout and initializes related settings. + * + * @param layoutKeyboard - The identifier of the keyboard layout to set as chosen. + */ + setChosenKeyboardLayout(layoutKeyboard: string): void { this.deactivatePressedKey(); this.initChosenLayoutKeyboard(layoutKeyboard); } /** - * Retrieves the identifiers of all connected gamepads, excluding any that are currently marked as disconnected. - * @returns Array An array of strings representing the IDs of the connected gamepads. - */ - getGamepadsName(): Array { + * Retrieves the identifiers of all connected gamepads, excluding any that are currently marked as disconnected. + * @returns Array An array of strings representing the IDs of the connected gamepads. + */ + getGamepadsName(): Array { return this.gamepads.filter(g => !this.disconnectedGamepads.includes(g.id)).map(g => g.id); } /** - * Initializes the chosen gamepad by setting its identifier in the local storage and updating the UI to reflect the chosen gamepad. - * If a gamepad name is provided, it uses that as the chosen gamepad; otherwise, it defaults to the currently chosen gamepad. - * @param gamepadName Optional parameter to specify the name of the gamepad to initialize as chosen. - */ - initChosenGamepad(gamepadName?: String): void { + * Initializes the chosen gamepad by setting its identifier in the local storage and updating the UI to reflect the chosen gamepad. + * If a gamepad name is provided, it uses that as the chosen gamepad; otherwise, it defaults to the currently chosen gamepad. + * @param gamepadName Optional parameter to specify the name of the gamepad to initialize as chosen. + */ + initChosenGamepad(gamepadName?: string): void { if (gamepadName) { this.selectedDevice[Device.GAMEPAD] = gamepadName.toLowerCase(); } const handler = globalScene.ui?.handlers[Mode.SETTINGS_GAMEPAD] as SettingsGamepadUiHandler; - handler && handler.updateChosenGamepadDisplay(); + handler?.updateChosenGamepadDisplay(); } /** - * Initializes the chosen keyboard layout by setting its identifier in the local storage and updating the UI to reflect the chosen layout. - * If a layout name is provided, it uses that as the chosen layout; otherwise, it defaults to the currently chosen layout. - * @param layoutKeyboard Optional parameter to specify the name of the keyboard layout to initialize as chosen. - */ - initChosenLayoutKeyboard(layoutKeyboard?: String): void { + * Initializes the chosen keyboard layout by setting its identifier in the local storage and updating the UI to reflect the chosen layout. + * If a layout name is provided, it uses that as the chosen layout; otherwise, it defaults to the currently chosen layout. + * @param layoutKeyboard Optional parameter to specify the name of the keyboard layout to initialize as chosen. + */ + initChosenLayoutKeyboard(layoutKeyboard?: string): void { if (layoutKeyboard) { this.selectedDevice[Device.KEYBOARD] = layoutKeyboard.toLowerCase(); } const handler = globalScene.ui?.handlers[Mode.SETTINGS_KEYBOARD] as SettingsKeyboardUiHandler; - handler && handler.updateChosenKeyboardDisplay(); + handler?.updateChosenKeyboardDisplay(); } /** - * Handles the disconnection of a gamepad by adding its identifier to a list of disconnected gamepads. - * This is necessary because Phaser retains memory of previously connected gamepads, and without tracking - * disconnections, it would be impossible to determine the connection status of gamepads. This method ensures - * that disconnected gamepads are recognized and can be appropriately hidden in the gamepad selection menu. - * - * @param thisGamepad The gamepad that has been disconnected. - */ + * Handles the disconnection of a gamepad by adding its identifier to a list of disconnected gamepads. + * This is necessary because Phaser retains memory of previously connected gamepads, and without tracking + * disconnections, it would be impossible to determine the connection status of gamepads. This method ensures + * that disconnected gamepads are recognized and can be appropriately hidden in the gamepad selection menu. + * + * @param thisGamepad The gamepad that has been disconnected. + */ onDisconnect(thisGamepad: Phaser.Input.Gamepad.Gamepad): void { this.disconnectedGamepads.push(thisGamepad.id); } /** - * Updates the tracking of disconnected gamepads when a gamepad is reconnected. - * It removes the reconnected gamepad's identifier from the `disconnectedGamepads` array, - * effectively updating its status to connected. - * - * @param thisGamepad The gamepad that has been reconnected. - */ + * Updates the tracking of disconnected gamepads when a gamepad is reconnected. + * It removes the reconnected gamepad's identifier from the `disconnectedGamepads` array, + * effectively updating its status to connected. + * + * @param thisGamepad The gamepad that has been reconnected. + */ onReconnect(thisGamepad: Phaser.Input.Gamepad.Gamepad): void { this.disconnectedGamepads = this.disconnectedGamepads.filter(g => g !== thisGamepad.id); } /** - * Initializes or updates configurations for connected gamepads. - * It retrieves the names of all connected gamepads, sets up their configurations according to stored or default settings, - * and ensures these configurations are saved. If the connected gamepad is the currently chosen one, - * it reinitializes the chosen gamepad settings. - * - * @param thisGamepad The gamepad that is being set up. - */ - setupGamepad(thisGamepad: Phaser.Input.Gamepad.Gamepad): void { + * Initializes or updates configurations for connected gamepads. + * It retrieves the names of all connected gamepads, sets up their configurations according to stored or default settings, + * and ensures these configurations are saved. If the connected gamepad is the currently chosen one, + * it reinitializes the chosen gamepad settings. + * + * @param thisGamepad The gamepad that is being set up. + */ + setupGamepad(_thisGamepad: Phaser.Input.Gamepad.Gamepad): void { const allGamepads = this.getGamepadsName(); for (const gamepad of allGamepads) { const gamepadID = gamepad.toLowerCase(); @@ -295,14 +298,14 @@ export class InputsController { } this.lastSource = "gamepad"; const handler = globalScene.ui?.handlers[Mode.SETTINGS_GAMEPAD] as SettingsGamepadUiHandler; - handler && handler.updateChosenGamepadDisplay(); + handler?.updateChosenGamepadDisplay(); } /** - * Initializes or updates configurations for connected keyboards. - */ + * Initializes or updates configurations for connected keyboards. + */ setupKeyboard(): void { - for (const layout of [ "default" ]) { + for (const layout of ["default"]) { const config = deepCopy(this.getConfigKeyboard(layout)) as InterfaceConfig; config.custom = this.configs[layout]?.custom || { ...config.default }; this.configs[layout] = config; @@ -312,28 +315,26 @@ export class InputsController { } /** - * Refreshes and re-indexes the list of connected gamepads. - * - * @remarks - * This method updates the list of gamepads to exclude any that are undefined. - * It corrects the index of each gamepad to account for any previously undefined entries, - * ensuring that all gamepads are properly indexed and can be accurately referenced within the game. - */ + * Refreshes and re-indexes the list of connected gamepads. + * + * @remarks + * This method updates the list of gamepads to exclude any that are undefined. + * It corrects the index of each gamepad to account for any previously undefined entries, + * ensuring that all gamepads are properly indexed and can be accurately referenced within the game. + */ refreshGamepads(): void { // Sometimes, gamepads are undefined. For some reason. - this.gamepads = globalScene.input.gamepad?.gamepads.filter(function (el) { - return el !== null; - }) ?? []; + this.gamepads = globalScene.input.gamepad?.gamepads.filter(el => el !== null) ?? []; - for (const [ index, thisGamepad ] of this.gamepads.entries()) { + for (const [index, thisGamepad] of this.gamepads.entries()) { thisGamepad.index = index; // Overwrite the gamepad index, in case we had undefined gamepads earlier } } /** - * Ensures the keyboard is initialized by checking if there is an active configuration for the keyboard. - * If not, it sets up the keyboard with default configurations. - */ + * Ensures the keyboard is initialized by checking if there is an active configuration for the keyboard. + * If not, it sets up the keyboard with default configurations. + */ ensureKeyboardIsInit(): void { if (!this.getActiveConfig(Device.KEYBOARD)?.padID) { this.setupKeyboard(); @@ -341,10 +342,10 @@ export class InputsController { } /** - * Handles the keydown event for the keyboard. - * - * @param event The keyboard event. - */ + * Handles the keydown event for the keyboard. + * + * @param event The keyboard event. + */ keyboardKeyDown(event): void { this.lastSource = "keyboard"; this.ensureKeyboardIsInit(); @@ -369,10 +370,10 @@ export class InputsController { } /** - * Handles the keyup event for the keyboard. - * - * @param event The keyboard event. - */ + * Handles the keyup event for the keyboard. + * + * @param event The keyboard event. + */ keyboardKeyUp(event): void { this.lastSource = "keyboard"; const buttonUp = getButtonWithKeycode(this.getActiveConfig(Device.KEYBOARD), event.keyCode); @@ -388,15 +389,15 @@ export class InputsController { } /** - * Handles button press events on a gamepad. This method sets the gamepad as chosen on the first input if no gamepad is currently chosen. - * It checks if gamepad support is enabled and if the event comes from the chosen gamepad. If so, it maps the button press to a specific - * action using a custom configuration, emits an event for the button press, and records the time of the action. - * - * @param pad The gamepad on which the button was pressed. - * @param button The specific button that was pressed. - * @param value The intensity or value of the button press, if applicable. - */ - gamepadButtonDown(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, value: number): void { + * Handles button press events on a gamepad. This method sets the gamepad as chosen on the first input if no gamepad is currently chosen. + * It checks if gamepad support is enabled and if the event comes from the chosen gamepad. If so, it maps the button press to a specific + * action using a custom configuration, emits an event for the button press, and records the time of the action. + * + * @param pad The gamepad on which the button was pressed. + * @param button The specific button that was pressed. + * @param value The intensity or value of the button press, if applicable. + */ + gamepadButtonDown(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, _value: number): void { if (!this.configs[this.selectedDevice[Device.KEYBOARD]]?.padID) { this.setupKeyboard(); } @@ -404,7 +405,11 @@ export class InputsController { return; } this.lastSource = "gamepad"; - if (!this.selectedDevice[Device.GAMEPAD] || (globalScene.ui.getMode() !== Mode.GAMEPAD_BINDING && this.selectedDevice[Device.GAMEPAD] !== pad.id.toLowerCase())) { + if ( + !this.selectedDevice[Device.GAMEPAD] || + (globalScene.ui.getMode() !== Mode.GAMEPAD_BINDING && + this.selectedDevice[Device.GAMEPAD] !== pad.id.toLowerCase()) + ) { this.setChosenGamepad(pad.id); } if (!this.gamepadSupport || pad.id.toLowerCase() !== this.selectedDevice[Device.GAMEPAD].toLowerCase()) { @@ -436,15 +441,15 @@ export class InputsController { } /** - * Responds to a button release event on a gamepad by checking if the gamepad is supported and currently chosen. - * If conditions are met, it identifies the configured action for the button, emits an event signaling the button release, - * and clears the record of the button. - * - * @param pad The gamepad from which the button was released. - * @param button The specific button that was released. - * @param value The intensity or value of the button release, if applicable. - */ - gamepadButtonUp(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, value: number): void { + * Responds to a button release event on a gamepad by checking if the gamepad is supported and currently chosen. + * If conditions are met, it identifies the configured action for the button, emits an event signaling the button release, + * and clears the record of the button. + * + * @param pad The gamepad from which the button was released. + * @param button The specific button that was released. + * @param value The intensity or value of the button release, if applicable. + */ + gamepadButtonUp(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, _value: number): void { if (!pad) { return; } @@ -465,23 +470,26 @@ export class InputsController { } /** - * Retrieves the configuration object for a gamepad based on its identifier. The method identifies specific gamepad models - * based on substrings in the identifier and returns predefined configurations for recognized models. - * If no specific configuration matches, it defaults to a generic gamepad configuration. - * - * @param id The identifier string of the gamepad. - * @returns InterfaceConfig The configuration object corresponding to the identified gamepad type. - */ + * Retrieves the configuration object for a gamepad based on its identifier. The method identifies specific gamepad models + * based on substrings in the identifier and returns predefined configurations for recognized models. + * If no specific configuration matches, it defaults to a generic gamepad configuration. + * + * @param id The identifier string of the gamepad. + * @returns InterfaceConfig The configuration object corresponding to the identified gamepad type. + */ getConfig(id: string): InterfaceConfig { id = id.toLowerCase(); if (id.includes("081f") && id.includes("e401")) { return pad_unlicensedSNES; - } else if (id.includes("xbox") && id.includes("360")) { + } + if (id.includes("xbox") && id.includes("360")) { return pad_xbox360; - } else if (id.includes("054c")) { + } + if (id.includes("054c")) { return pad_dualshock; - } else if (id.includes("057e") && id.includes("2009")) { + } + if (id.includes("057e") && id.includes("2009")) { return pad_procon; } @@ -489,11 +497,11 @@ export class InputsController { } /** - * Retrieves the configuration object for a keyboard layout based on its identifier. - * - * @param id The identifier string of the keyboard layout. - * @returns InterfaceConfig The configuration object corresponding to the identified keyboard layout. - */ + * Retrieves the configuration object for a keyboard layout based on its identifier. + * + * @param id The identifier string of the keyboard layout. + * @returns InterfaceConfig The configuration object corresponding to the identified keyboard layout. + */ getConfigKeyboard(id: string): InterfaceConfig { if (id === "default") { return cfg_keyboard_qwerty; @@ -503,8 +511,8 @@ export class InputsController { } /** - * Deactivates all currently pressed keys. - */ + * Deactivates all currently pressed keys. + */ deactivatePressedKey(): void { for (const key of Object.keys(this.inputInterval)) { clearInterval(this.inputInterval[key]); @@ -513,11 +521,11 @@ export class InputsController { } /** - * Retrieves the active configuration for the currently chosen device. - * It checks if a specific device ID is stored in configurations and returns it. - * - * @returns InterfaceConfig The configuration object for the active gamepad, or null if not set. - */ + * Retrieves the active configuration for the currently chosen device. + * It checks if a specific device ID is stored in configurations and returns it. + * + * @returns InterfaceConfig The configuration object for the active gamepad, or null if not set. + */ getActiveConfig(device: Device) { if (this.configs[this.selectedDevice[device]]?.padID) { return this.configs[this.selectedDevice[device]]; @@ -535,9 +543,8 @@ export class InputsController { getLastSourceDevice(): Device { if (this.lastSource === "gamepad") { return Device.GAMEPAD; - } else { - return Device.KEYBOARD; } + return Device.KEYBOARD; } getLastSourceConfig() { @@ -554,16 +561,25 @@ export class InputsController { } /** - * Injects a custom mapping configuration into the configuration for a specific gamepad. - * If the device does not have an existing configuration, it initializes one first. - * - * @param selectedDevice The identifier of the device to configure. - * @param mappingConfigs The mapping configuration to apply to the device. - */ + * Injects a custom mapping configuration into the configuration for a specific gamepad. + * If the device does not have an existing configuration, it initializes one first. + * + * @param selectedDevice The identifier of the device to configure. + * @param mappingConfigs The mapping configuration to apply to the device. + */ injectConfig(selectedDevice: string, mappingConfigs): void { if (!this.configs[selectedDevice]) { this.configs[selectedDevice] = {}; } + // A proper way of handling migrating keybinds would be much better + const mappingOverrides = { + BUTTON_CYCLE_VARIANT: "BUTTON_CYCLE_TERA", + }; + for (const key in mappingConfigs.custom) { + if (mappingConfigs.custom[key] in mappingOverrides) { + mappingConfigs.custom[key] = mappingOverrides[mappingConfigs.custom[key]]; + } + } this.configs[selectedDevice].custom = mappingConfigs.custom; } @@ -576,18 +592,17 @@ export class InputsController { } /** - * Swaps a binding in the configuration. - * - * @param config The configuration object. - * @param settingName The name of the setting to swap. - * @param pressedButton The button that was pressed. - */ + * Swaps a binding in the configuration. + * + * @param config The configuration object. + * @param settingName The name of the setting to swap. + * @param pressedButton The button that was pressed. + */ assignBinding(config, settingName, pressedButton): boolean { this.deactivatePressedKey(); if (config.padType === "keyboard") { return assign(config, settingName, pressedButton); - } else { - return swap(config, settingName, pressedButton); } + return swap(config, settingName, pressedButton); } } diff --git a/src/interfaces/locales.ts b/src/interfaces/locales.ts index 4405095e0fe..2d26911f82f 100644 --- a/src/interfaces/locales.ts +++ b/src/interfaces/locales.ts @@ -1,93 +1,93 @@ export interface Localizable { - localize(): void; - } + localize(): void; +} export interface TranslationEntries { - [key: string]: string | { [key: string]: string } + [key: string]: string | { [key: string]: string }; } export interface SimpleTranslationEntries { - [key: string]: string - } + [key: string]: string; +} export interface MoveTranslationEntry { - name: string, - effect: string - } + name: string; + effect: string; +} export interface MoveTranslationEntries { - [key: string]: MoveTranslationEntry - } + [key: string]: MoveTranslationEntry; +} export interface AbilityTranslationEntry { - name: string, - description: string - } + name: string; + description: string; +} export interface AbilityTranslationEntries { - [key: string]: AbilityTranslationEntry - } + [key: string]: AbilityTranslationEntry; +} export interface ModifierTypeTranslationEntry { - name?: string, - description?: string, - extra?: SimpleTranslationEntries - } + name?: string; + description?: string; + extra?: SimpleTranslationEntries; +} export interface ModifierTypeTranslationEntries { - ModifierType: { [key: string]: ModifierTypeTranslationEntry }, - SpeciesBoosterItem: { [key: string]: ModifierTypeTranslationEntry }, - AttackTypeBoosterItem: SimpleTranslationEntries, - TempStatStageBoosterItem: SimpleTranslationEntries, - BaseStatBoosterItem: SimpleTranslationEntries, - EvolutionItem: SimpleTranslationEntries, - FormChangeItem: SimpleTranslationEntries, - } + ModifierType: { [key: string]: ModifierTypeTranslationEntry }; + SpeciesBoosterItem: { [key: string]: ModifierTypeTranslationEntry }; + AttackTypeBoosterItem: SimpleTranslationEntries; + TempStatStageBoosterItem: SimpleTranslationEntries; + BaseStatBoosterItem: SimpleTranslationEntries; + EvolutionItem: SimpleTranslationEntries; + FormChangeItem: SimpleTranslationEntries; +} export interface PokemonInfoTranslationEntries { - Stat: SimpleTranslationEntries, - Type: SimpleTranslationEntries, - } + Stat: SimpleTranslationEntries; + Type: SimpleTranslationEntries; +} export interface BerryTranslationEntry { - name: string, - effect: string, - } + name: string; + effect: string; +} export interface BerryTranslationEntries { - [key: string]: BerryTranslationEntry - } + [key: string]: BerryTranslationEntry; +} export interface StatusEffectTranslationEntries { - [key: string]: StatusEffectTranslationEntry + [key: string]: StatusEffectTranslationEntry; } export interface StatusEffectTranslationEntry { - name: string, - obtain: string, - obtainSource: string, - activation: string, - overlap: string, - heal: string - description: string, + name: string; + obtain: string; + obtainSource: string; + activation: string; + overlap: string; + heal: string; + description: string; } export interface AchievementTranslationEntry { - name?: string, - description?: string, - } + name?: string; + description?: string; +} export interface AchievementTranslationEntries { - [key: string]: AchievementTranslationEntry; - } + [key: string]: AchievementTranslationEntry; +} export interface DialogueTranslationEntry { - [key: number]: string; - } + [key: number]: string; +} export interface DialogueTranslationCategory { - [category: string]: DialogueTranslationEntry; - } + [category: string]: DialogueTranslationEntry; +} export interface DialogueTranslationEntries { - [trainertype: string]: DialogueTranslationCategory; - } + [trainertype: string]: DialogueTranslationCategory; +} diff --git a/src/loading-scene.ts b/src/loading-scene.ts index 023f907a30d..295dc318db4 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -5,12 +5,12 @@ import { SceneBase } from "#app/scene-base"; import { WindowVariant, getWindowVariantSuffix } from "#app/ui/ui-theme"; import { isMobile } from "#app/touch-controls"; import * as Utils from "#app/utils"; -import { initPokemonPrevolutions } from "#app/data/balance/pokemon-evolutions"; +import { initPokemonPrevolutions, initPokemonStarters } from "#app/data/balance/pokemon-evolutions"; import { initBiomes } from "#app/data/balance/biomes"; import { initEggMoves } from "#app/data/balance/egg-moves"; import { initPokemonForms } from "#app/data/pokemon-forms"; import { initSpecies } from "#app/data/pokemon-species"; -import { initMoves } from "#app/data/move"; +import { initMoves } from "#app/data/moves/move"; import { initAbilities } from "#app/data/ability"; import { initAchievements } from "#app/system/achv"; import { initTrainerTypeDialogue } from "#app/data/dialogue"; @@ -79,6 +79,7 @@ export class LoadingScene extends SceneBase { this.loadImage("icon_owned", "ui"); this.loadImage("icon_egg_move", "ui"); this.loadImage("ability_bar_left", "ui"); + this.loadImage("ability_bar_right", "ui"); this.loadImage("bgm_bar", "ui"); this.loadImage("party_exp_bar", "ui"); this.loadImage("achv_bar", "ui"); @@ -101,8 +102,12 @@ export class LoadingScene extends SceneBase { this.loadImage("icon_lock", "ui", "icon_lock.png"); this.loadImage("icon_stop", "ui", "icon_stop.png"); this.loadImage("icon_tera", "ui"); + this.loadImage("cursor_tera", "ui"); this.loadImage("type_tera", "ui"); this.loadAtlas("type_bgs", "ui"); + this.loadAtlas("button_tera", "ui"); + this.loadImage("mystery_egg", "ui"); + this.loadImage("normal_memory", "ui"); this.loadImage("dawn_icon_fg", "ui"); this.loadImage("dawn_icon_mg", "ui"); @@ -134,10 +139,10 @@ export class LoadingScene extends SceneBase { this.loadImage("summary_bg", "ui"); this.loadImage("summary_overlay_shiny", "ui"); this.loadImage("summary_profile", "ui"); - this.loadImage("summary_profile_prompt_z", "ui"); // The pixel Z button prompt - this.loadImage("summary_profile_prompt_a", "ui"); // The pixel A button prompt - this.loadImage("summary_profile_ability", "ui"); // Pixel text 'ABILITY' - this.loadImage("summary_profile_passive", "ui"); // Pixel text 'PASSIVE' + this.loadImage("summary_profile_prompt_z", "ui"); // The pixel Z button prompt + this.loadImage("summary_profile_prompt_a", "ui"); // The pixel A button prompt + this.loadImage("summary_profile_ability", "ui"); // Pixel text 'ABILITY' + this.loadImage("summary_profile_passive", "ui"); // Pixel text 'PASSIVE' this.loadImage("summary_status", "ui"); this.loadImage("summary_stats", "ui"); this.loadImage("summary_stats_overlay_exp", "ui"); @@ -154,6 +159,7 @@ export class LoadingScene extends SceneBase { this.loadImage("scroll_bar_handle", "ui"); this.loadImage("starter_container_bg", "ui"); this.loadImage("starter_select_bg", "ui"); + this.loadImage("pokedex_summary_bg", "ui"); this.loadImage("select_cursor", "ui"); this.loadImage("select_cursor_highlight", "ui"); this.loadImage("select_cursor_highlight_thick", "ui"); @@ -188,7 +194,7 @@ export class LoadingScene extends SceneBase { } if (getBiomeHasProps(bt)) { for (let p = 1; p <= 3; p++) { - const isPropAnimated = p === 3 && [ "power_plant", "end" ].find(b => b === btKey); + const isPropAnimated = p === 3 && ["power_plant", "end"].find(b => b === btKey); const propKey = `${btKey}_b_${p}`; if (!isPropAnimated) { this.loadImage(propKey, "arenas"); @@ -244,11 +250,11 @@ export class LoadingScene extends SceneBase { this.loadAtlas("statuses", ""); this.loadAtlas("types", ""); } - const availableLangs = [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ]; + const availableLangs = ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN"]; if (lang && availableLangs.includes(lang)) { - this.loadImage("yearofthesnakeevent-" + lang, "events"); + this.loadImage(`pkmnday2025event-${lang}`, "events"); } else { - this.loadImage("yearofthesnakeevent-en", "events"); + this.loadImage("pkmnday2025event-en", "events"); } this.loadAtlas("statuses", ""); @@ -259,11 +265,11 @@ export class LoadingScene extends SceneBase { this.loadAtlas("egg_icons", "egg"); this.loadAtlas("egg_shard", "egg"); this.loadAtlas("egg_lightrays", "egg"); - Utils.getEnumKeys(GachaType).forEach(gt => { + for (const gt of Utils.getEnumKeys(GachaType)) { const key = gt.toLowerCase(); this.loadImage(`gacha_${key}`, "egg"); this.loadAtlas(`gacha_underlay_${key}`, "egg"); - }); + } this.loadImage("gacha_glass", "egg"); this.loadImage("gacha_eggs", "egg"); this.loadAtlas("gacha_hatch", "egg"); @@ -346,7 +352,11 @@ export class LoadingScene extends SceneBase { this.loadBgm("evolution", "bw/evolution.mp3"); this.loadBgm("evolution_fanfare", "bw/evolution_fanfare.mp3"); - this.load.plugin("rextexteditplugin", "https://raw.githubusercontent.com/rexrainbow/phaser3-rex-notes/master/dist/rextexteditplugin.min.js", true); + this.load.plugin( + "rextexteditplugin", + "https://raw.githubusercontent.com/rexrainbow/phaser3-rex-notes/master/dist/rextexteditplugin.min.js", + true, + ); this.loadLoadingScreen(); @@ -354,6 +364,7 @@ export class LoadingScene extends SceneBase { initVouchers(); initStatsKeys(); initPokemonPrevolutions(); + initPokemonStarters(); initBiomes(); initEggMoves(); initPokemonForms(); @@ -435,12 +446,22 @@ export class LoadingScene extends SceneBase { style: { font: "48px emerald", color: "#ffffff", - align: "center" + align: "center", }, }); disclaimerDescriptionText.setOrigin(0.5, 0.5); - loadingGraphics.push(bg, graphics, progressBar, progressBox, logo, percentText, assetText, disclaimerText, disclaimerDescriptionText); + loadingGraphics.push( + bg, + graphics, + progressBar, + progressBox, + logo, + percentText, + assetText, + disclaimerText, + disclaimerDescriptionText, + ); if (!mobile) { loadingGraphics.map(g => g.setVisible(false)); @@ -455,7 +476,9 @@ export class LoadingScene extends SceneBase { ease: "Sine.easeIn", onComplete: () => video.destroy(), }); - loadingGraphics.forEach(g => g.setVisible(true)); + for (const g of loadingGraphics) { + g.setVisible(true); + } }); intro.setOrigin(0, 0); intro.setScale(3); @@ -496,7 +519,9 @@ export class LoadingScene extends SceneBase { }); this.load.on(this.LOAD_EVENTS.COMPLETE, () => { - loadingGraphics.forEach(go => go.destroy()); + for (const go of loadingGraphics) { + go.destroy(); + } intro.destroy(); }); } diff --git a/src/main.ts b/src/main.ts index 993bd1018ae..3d3965cad08 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,9 +7,8 @@ import InputTextPlugin from "phaser3-rex-plugins/plugins/inputtext-plugin"; import TransitionImagePackPlugin from "phaser3-rex-plugins/templates/transitionimagepack/transitionimagepack-plugin"; import { initI18n } from "./plugins/i18n"; - // Catch global errors and display them in an alert so users can report the issue. -window.onerror = function (message, source, lineno, colno, error) { +window.onerror = (_message, _source, _lineno, _colno, error) => { console.error(error); // const errorString = `Received unhandled error. Open browser console and click OK to see details.\nError: ${message}\nSource: ${source}\nLine: ${lineno}\nColumn: ${colno}\nStack: ${error.stack}`; //alert(errorString); @@ -18,7 +17,7 @@ window.onerror = function (message, source, lineno, colno, error) { }; // Catch global promise rejections and display them in an alert so users can report the issue. -window.addEventListener("unhandledrejection", (event) => { +window.addEventListener("unhandledrejection", event => { // const errorString = `Received unhandled promise rejection. Open browser console and click OK to see details.\nReason: ${event.reason}`; console.error(event.reason); //alert(errorString); @@ -41,7 +40,7 @@ Phaser.GameObjects.Text.prototype.setPositionRelative = setPositionRelative; Phaser.GameObjects.Rectangle.prototype.setPositionRelative = setPositionRelative; document.fonts.load("16px emerald").then(() => document.fonts.load("10px pkmnems")); - +// biome-ignore lint/suspicious/noImplicitAnyLet: TODO let game; const startGame = async (manifest?: any) => { @@ -54,44 +53,50 @@ const startGame = async (manifest?: any) => { scale: { width: 1920, height: 1080, - mode: Phaser.Scale.FIT + mode: Phaser.Scale.FIT, }, plugins: { - global: [{ - key: "rexInputTextPlugin", - plugin: InputTextPlugin, - start: true - }, { - key: "rexBBCodeTextPlugin", - plugin: BBCodeTextPlugin, - start: true - }, { - key: "rexTransitionImagePackPlugin", - plugin: TransitionImagePackPlugin, - start: true - }], - scene: [{ - key: "rexUI", - plugin: UIPlugin, - mapping: "rexUI" - }] + global: [ + { + key: "rexInputTextPlugin", + plugin: InputTextPlugin, + start: true, + }, + { + key: "rexBBCodeTextPlugin", + plugin: BBCodeTextPlugin, + start: true, + }, + { + key: "rexTransitionImagePackPlugin", + plugin: TransitionImagePackPlugin, + start: true, + }, + ], + scene: [ + { + key: "rexUI", + plugin: UIPlugin, + mapping: "rexUI", + }, + ], }, input: { mouse: { - target: "app" + target: "app", }, touch: { - target: "app" + target: "app", }, - gamepad: true + gamepad: true, }, dom: { - createContainer: true + createContainer: true, }, pixelArt: true, - pipeline: [ InvertPostFX ] as unknown as Phaser.Types.Core.PipelineConfig, - scene: [ LoadingScene, BattleScene ], - version: version + pipeline: [InvertPostFX] as unknown as Phaser.Types.Core.PipelineConfig, + scene: [LoadingScene, BattleScene], + version: version, }); game.sound.pauseOnBlur = false; if (manifest) { @@ -103,7 +108,8 @@ fetch("/manifest.json") .then(res => res.json()) .then(jsonResponse => { startGame(jsonResponse.manifest); - }).catch(() => { + }) + .catch(() => { // Manifest not found (likely local build) startGame(); }); diff --git a/src/messages.ts b/src/messages.ts index 26fd3353cc6..e35b48f7226 100644 --- a/src/messages.ts +++ b/src/messages.ts @@ -18,15 +18,17 @@ export function getPokemonNameWithAffix(pokemon: Pokemon | undefined): string { return !pokemon.isPlayer() ? pokemon.hasTrainer() ? i18next.t("battle:foePokemonWithAffix", { - pokemonName: pokemon.getNameToRender(), - }) + pokemonName: pokemon.getNameToRender(), + }) : i18next.t("battle:wildPokemonWithAffix", { - pokemonName: pokemon.getNameToRender(), - }) + pokemonName: pokemon.getNameToRender(), + }) : pokemon.getNameToRender(); case BattleSpec.FINAL_BOSS: return !pokemon.isPlayer() - ? i18next.t("battle:foePokemonWithAffix", { pokemonName: pokemon.getNameToRender() }) + ? i18next.t("battle:foePokemonWithAffix", { + pokemonName: pokemon.getNameToRender(), + }) : pokemon.getNameToRender(); default: return pokemon.getNameToRender(); diff --git a/src/modifier/modifier-tier.ts b/src/modifier/modifier-tier.ts index 81bb1ad8ae5..d8a75e41b0a 100644 --- a/src/modifier/modifier-tier.ts +++ b/src/modifier/modifier-tier.ts @@ -4,5 +4,5 @@ export enum ModifierTier { ULTRA, ROGUE, MASTER, - LUXURY + LUXURY, } diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index f531e96d641..3d2e67b0dc3 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -2,16 +2,102 @@ import { globalScene } from "#app/global-scene"; import { EvolutionItem, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; import { tmPoolTiers, tmSpecies } from "#app/data/balance/tms"; import { getBerryEffectDescription, getBerryName } from "#app/data/berry"; -import { allMoves, AttackMove, selfStatLowerMoves } from "#app/data/move"; +import { allMoves, AttackMove } from "#app/data/moves/move"; import { getNatureName, getNatureStatMultiplier } from "#app/data/nature"; import { getPokeballCatchMultiplier, getPokeballName, MAX_PER_TYPE_POKEBALLS } from "#app/data/pokeball"; -import { FormChangeItem, pokemonFormChanges, SpeciesFormChangeCondition, SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms"; +import { + FormChangeItem, + pokemonFormChanges, + SpeciesFormChangeCondition, + SpeciesFormChangeItemTrigger, +} from "#app/data/pokemon-forms"; import { getStatusEffectDescriptor } from "#app/data/status-effect"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import type { EnemyPokemon, PlayerPokemon, PokemonMove } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { AddPokeballModifier, AddVoucherModifier, AttackTypeBoosterModifier, BaseStatModifier, BerryModifier, BoostBugSpawnModifier, BypassSpeedChanceModifier, ContactHeldItemTransferChanceModifier, CritBoosterModifier, DamageMoneyRewardModifier, DoubleBattleChanceBoosterModifier, EnemyAttackStatusEffectChanceModifier, EnemyDamageBoosterModifier, EnemyDamageReducerModifier, EnemyEndureChanceModifier, EnemyFusionChanceModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, EvolutionItemModifier, EvolutionStatBoosterModifier, EvoTrackerModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, GigantamaxAccessModifier, HealingBoosterModifier, HealShopCostModifier, HiddenAbilityRateBoosterModifier, HitHealModifier, IvScannerModifier, LevelIncrementBoosterModifier, LockModifierTiersModifier, MapModifier, MegaEvolutionAccessModifier, MoneyInterestModifier, MoneyMultiplierModifier, MoneyRewardModifier, MultipleParticipantExpBonusModifier, PokemonAllMovePpRestoreModifier, PokemonBaseStatFlatModifier, PokemonBaseStatTotalModifier, PokemonExpBoosterModifier, PokemonFormChangeItemModifier, PokemonFriendshipBoosterModifier, PokemonHeldItemModifier, PokemonHpRestoreModifier, PokemonIncrementingStatModifier, PokemonInstantReviveModifier, PokemonLevelIncrementModifier, PokemonMoveAccuracyBoosterModifier, PokemonMultiHitModifier, PokemonNatureChangeModifier, PokemonNatureWeightModifier, PokemonPpRestoreModifier, PokemonPpUpModifier, PokemonStatusHealModifier, PreserveBerryModifier, RememberMoveModifier, ResetNegativeStatStageModifier, ShinyRateBoosterModifier, SpeciesCritBoosterModifier, SpeciesStatBoosterModifier, SurviveDamageModifier, SwitchEffectTransferModifier, TempCritBoosterModifier, TempStatStageBoosterModifier, TerastallizeAccessModifier, TerastallizeModifier, TmModifier, TurnHealModifier, TurnHeldItemTransferModifier, TurnStatusEffectModifier, type EnemyPersistentModifier, type Modifier, type PersistentModifier, TempExtraModifierModifier, CriticalCatchChanceBoosterModifier } from "#app/modifier/modifier"; +import { + AddPokeballModifier, + AddVoucherModifier, + AttackTypeBoosterModifier, + BaseStatModifier, + BerryModifier, + BoostBugSpawnModifier, + BypassSpeedChanceModifier, + ContactHeldItemTransferChanceModifier, + CritBoosterModifier, + DamageMoneyRewardModifier, + DoubleBattleChanceBoosterModifier, + EnemyAttackStatusEffectChanceModifier, + EnemyDamageBoosterModifier, + EnemyDamageReducerModifier, + EnemyEndureChanceModifier, + EnemyFusionChanceModifier, + EnemyStatusEffectHealChanceModifier, + EnemyTurnHealModifier, + EvolutionItemModifier, + EvolutionStatBoosterModifier, + EvoTrackerModifier, + ExpBalanceModifier, + ExpBoosterModifier, + ExpShareModifier, + ExtraModifierModifier, + FlinchChanceModifier, + FusePokemonModifier, + GigantamaxAccessModifier, + HealingBoosterModifier, + HealShopCostModifier, + HiddenAbilityRateBoosterModifier, + HitHealModifier, + IvScannerModifier, + LevelIncrementBoosterModifier, + LockModifierTiersModifier, + MapModifier, + MegaEvolutionAccessModifier, + MoneyInterestModifier, + MoneyMultiplierModifier, + MoneyRewardModifier, + MultipleParticipantExpBonusModifier, + PokemonAllMovePpRestoreModifier, + PokemonBaseStatFlatModifier, + PokemonBaseStatTotalModifier, + PokemonExpBoosterModifier, + PokemonFormChangeItemModifier, + PokemonFriendshipBoosterModifier, + PokemonHeldItemModifier, + PokemonHpRestoreModifier, + PokemonIncrementingStatModifier, + PokemonInstantReviveModifier, + PokemonLevelIncrementModifier, + PokemonMoveAccuracyBoosterModifier, + PokemonMultiHitModifier, + PokemonNatureChangeModifier, + PokemonNatureWeightModifier, + PokemonPpRestoreModifier, + PokemonPpUpModifier, + PokemonStatusHealModifier, + PreserveBerryModifier, + RememberMoveModifier, + ResetNegativeStatStageModifier, + ShinyRateBoosterModifier, + SpeciesCritBoosterModifier, + SpeciesStatBoosterModifier, + SurviveDamageModifier, + SwitchEffectTransferModifier, + TempCritBoosterModifier, + TempStatStageBoosterModifier, + TerastallizeAccessModifier, + TerrastalizeModifier, + TmModifier, + TurnHealModifier, + TurnHeldItemTransferModifier, + TurnStatusEffectModifier, + type EnemyPersistentModifier, + type Modifier, + type PersistentModifier, + TempExtraModifierModifier, + CriticalCatchChanceBoosterModifier, +} from "#app/modifier/modifier"; import { ModifierTier } from "#app/modifier/modifier-tier"; import Overrides from "#app/overrides"; import { Unlockables } from "#app/system/unlockables"; @@ -19,7 +105,15 @@ import { getVoucherTypeIcon, getVoucherTypeName, VoucherType } from "#app/system import type { PokemonMoveSelectFilter, PokemonSelectFilter } from "#app/ui/party-ui-handler"; import PartyUiHandler from "#app/ui/party-ui-handler"; import { getModifierTierTextTint } from "#app/ui/text"; -import { formatMoney, getEnumKeys, getEnumValues, isNullOrUndefined, NumberHolder, padInt, randSeedInt, randSeedItem } from "#app/utils"; +import { + formatMoney, + getEnumKeys, + getEnumValues, + isNullOrUndefined, + NumberHolder, + padInt, + randSeedInt, +} from "#app/utils"; import { Abilities } from "#enums/abilities"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; @@ -41,7 +135,7 @@ export enum ModifierPoolType { WILD, TRAINER, ENEMY_BUFF, - DAILY_STARTER + DAILY_STARTER, } type NewModifierFunc = (type: ModifierType, args: any[]) => Modifier; @@ -55,7 +149,13 @@ export class ModifierType { public tier: ModifierTier; protected newModifierFunc: NewModifierFunc | null; - constructor(localeKey: string | null, iconImage: string | null, newModifierFunc: NewModifierFunc | null, group?: string, soundName?: string) { + constructor( + localeKey: string | null, + iconImage: string | null, + newModifierFunc: NewModifierFunc | null, + group?: string, + soundName?: string, + ) { this.localeKey = localeKey!; // TODO: is this bang correct? this.iconImage = iconImage!; // TODO: is this bang correct? this.group = group!; // TODO: is this bang correct? @@ -85,16 +185,16 @@ export class ModifierType { let poolTypes: ModifierPoolType[]; switch (poolType) { case ModifierPoolType.PLAYER: - poolTypes = [ poolType, ModifierPoolType.TRAINER, ModifierPoolType.WILD ]; + poolTypes = [poolType, ModifierPoolType.TRAINER, ModifierPoolType.WILD]; break; case ModifierPoolType.WILD: - poolTypes = [ poolType, ModifierPoolType.PLAYER, ModifierPoolType.TRAINER ]; + poolTypes = [poolType, ModifierPoolType.PLAYER, ModifierPoolType.TRAINER]; break; case ModifierPoolType.TRAINER: - poolTypes = [ poolType, ModifierPoolType.PLAYER, ModifierPoolType.WILD ]; + poolTypes = [poolType, ModifierPoolType.PLAYER, ModifierPoolType.WILD]; break; default: - poolTypes = [ poolType ]; + poolTypes = [poolType]; break; } // Try multiple pool types in case of stolen items @@ -133,7 +233,11 @@ export class ModifierType { * if not provided or empty, the weight check will be ignored * @param rerollCount Default `0`. Used to check the weight of modifiers with conditional weight (see {@linkcode WeightedModifierTypeWeightFunc}) */ - withTierFromPool(poolType: ModifierPoolType = ModifierPoolType.PLAYER, party?: PlayerPokemon[], rerollCount: number = 0): ModifierType { + withTierFromPool( + poolType: ModifierPoolType = ModifierPoolType.PLAYER, + party?: PlayerPokemon[], + rerollCount = 0, + ): ModifierType { let defaultTier: undefined | ModifierTier; for (const tier of Object.values(getModifierPoolForType(poolType))) { for (const modifier of tier) { @@ -147,7 +251,8 @@ export class ModifierType { if (weight > 0) { this.tier = modifier.modifierType.tier; return this; - } else if (isNullOrUndefined(defaultTier)) { + } + if (isNullOrUndefined(defaultTier)) { // If weight is 0, keep track of the first tier where the item was found defaultTier = modifier.modifierType.tier; } @@ -164,6 +269,7 @@ export class ModifierType { } newModifier(...args: any[]): Modifier | null { + // biome-ignore lint/complexity/useOptionalChain: Changing to optional would coerce null return into undefined return this.newModifierFunc && this.newModifierFunc(this, args); } } @@ -171,7 +277,7 @@ export class ModifierType { type ModifierTypeGeneratorFunc = (party: Pokemon[], pregenArgs?: any[]) => ModifierType | null; export class ModifierTypeGenerator extends ModifierType { - private genTypeFunc: ModifierTypeGeneratorFunc; + private genTypeFunc: ModifierTypeGeneratorFunc; constructor(genTypeFunc: ModifierTypeGeneratorFunc) { super(null, null, null); @@ -194,9 +300,9 @@ export interface GeneratedPersistentModifierType { class AddPokeballModifierType extends ModifierType { private pokeballType: PokeballType; - private count: integer; + private count: number; - constructor(iconImage: string, pokeballType: PokeballType, count: integer) { + constructor(iconImage: string, pokeballType: PokeballType, count: number) { super("", iconImage, (_type, _args) => new AddPokeballModifier(this, pokeballType, count), "pb", "se/pb_bounce_1"); this.pokeballType = pokeballType; this.count = count; @@ -204,42 +310,50 @@ class AddPokeballModifierType extends ModifierType { get name(): string { return i18next.t("modifierType:ModifierType.AddPokeballModifierType.name", { - "modifierCount": this.count, - "pokeballName": getPokeballName(this.pokeballType), + modifierCount: this.count, + pokeballName: getPokeballName(this.pokeballType), }); } getDescription(): string { return i18next.t("modifierType:ModifierType.AddPokeballModifierType.description", { - "modifierCount": this.count, - "pokeballName": getPokeballName(this.pokeballType), - "catchRate": getPokeballCatchMultiplier(this.pokeballType) > -1 ? `${getPokeballCatchMultiplier(this.pokeballType)}x` : "100%", - "pokeballAmount": `${globalScene.pokeballCounts[this.pokeballType]}`, + modifierCount: this.count, + pokeballName: getPokeballName(this.pokeballType), + catchRate: + getPokeballCatchMultiplier(this.pokeballType) > -1 + ? `${getPokeballCatchMultiplier(this.pokeballType)}x` + : "100%", + pokeballAmount: `${globalScene.pokeballCounts[this.pokeballType]}`, }); } } class AddVoucherModifierType extends ModifierType { private voucherType: VoucherType; - private count: integer; + private count: number; - constructor(voucherType: VoucherType, count: integer) { - super("", getVoucherTypeIcon(voucherType), (_type, _args) => new AddVoucherModifier(this, voucherType, count), "voucher"); + constructor(voucherType: VoucherType, count: number) { + super( + "", + getVoucherTypeIcon(voucherType), + (_type, _args) => new AddVoucherModifier(this, voucherType, count), + "voucher", + ); this.count = count; this.voucherType = voucherType; } get name(): string { return i18next.t("modifierType:ModifierType.AddVoucherModifierType.name", { - "modifierCount": this.count, - "voucherTypeName": getVoucherTypeName(this.voucherType), + modifierCount: this.count, + voucherTypeName: getVoucherTypeName(this.voucherType), }); } getDescription(): string { return i18next.t("modifierType:ModifierType.AddVoucherModifierType.description", { - "modifierCount": this.count, - "voucherTypeName": getVoucherTypeName(this.voucherType), + modifierCount: this.count, + voucherTypeName: getVoucherTypeName(this.voucherType), }); } } @@ -247,7 +361,14 @@ class AddVoucherModifierType extends ModifierType { export class PokemonModifierType extends ModifierType { public selectFilter: PokemonSelectFilter | undefined; - constructor(localeKey: string, iconImage: string, newModifierFunc: NewModifierFunc, selectFilter?: PokemonSelectFilter, group?: string, soundName?: string) { + constructor( + localeKey: string, + iconImage: string, + newModifierFunc: NewModifierFunc, + selectFilter?: PokemonSelectFilter, + group?: string, + soundName?: string, + ) { super(localeKey, iconImage, newModifierFunc, group, soundName); this.selectFilter = selectFilter; @@ -255,19 +376,38 @@ export class PokemonModifierType extends ModifierType { } export class PokemonHeldItemModifierType extends PokemonModifierType { - constructor(localeKey: string, iconImage: string, newModifierFunc: NewModifierFunc, group?: string, soundName?: string) { - super(localeKey, iconImage, newModifierFunc, (pokemon: PlayerPokemon) => { - const dummyModifier = this.newModifier(pokemon); - const matchingModifier = globalScene.findModifier(m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id && m.matchType(dummyModifier)) as PokemonHeldItemModifier; - const maxStackCount = dummyModifier.getMaxStackCount(); - if (!maxStackCount) { - return i18next.t("modifierType:ModifierType.PokemonHeldItemModifierType.extra.inoperable", { "pokemonName": getPokemonNameWithAffix(pokemon) }); - } - if (matchingModifier && matchingModifier.stackCount === maxStackCount) { - return i18next.t("modifierType:ModifierType.PokemonHeldItemModifierType.extra.tooMany", { "pokemonName": getPokemonNameWithAffix(pokemon) }); - } - return null; - }, group, soundName); + constructor( + localeKey: string, + iconImage: string, + newModifierFunc: NewModifierFunc, + group?: string, + soundName?: string, + ) { + super( + localeKey, + iconImage, + newModifierFunc, + (pokemon: PlayerPokemon) => { + const dummyModifier = this.newModifier(pokemon); + const matchingModifier = globalScene.findModifier( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id && m.matchType(dummyModifier), + ) as PokemonHeldItemModifier; + const maxStackCount = dummyModifier.getMaxStackCount(); + if (!maxStackCount) { + return i18next.t("modifierType:ModifierType.PokemonHeldItemModifierType.extra.inoperable", { + pokemonName: getPokemonNameWithAffix(pokemon), + }); + } + if (matchingModifier && matchingModifier.stackCount === maxStackCount) { + return i18next.t("modifierType:ModifierType.PokemonHeldItemModifierType.extra.tooMany", { + pokemonName: getPokemonNameWithAffix(pokemon), + }); + } + return null; + }, + group, + soundName, + ); } newModifier(...args: any[]): PokemonHeldItemModifier { @@ -275,19 +415,87 @@ export class PokemonHeldItemModifierType extends PokemonModifierType { } } -export class PokemonHpRestoreModifierType extends PokemonModifierType { - protected restorePoints: integer; - protected restorePercent: integer; - protected healStatus: boolean; +export class TerastallizeModifierType extends PokemonModifierType { + private teraType: PokemonType; - constructor(localeKey: string, iconImage: string, restorePoints: integer, restorePercent: integer, healStatus: boolean = false, newModifierFunc?: NewModifierFunc, selectFilter?: PokemonSelectFilter, group?: string) { - super(localeKey, iconImage, newModifierFunc || ((_type, args) => new PokemonHpRestoreModifier(this, (args[0] as PlayerPokemon).id, this.restorePoints, this.restorePercent, this.healStatus, false)), - selectFilter || ((pokemon: PlayerPokemon) => { - if (!pokemon.hp || (pokemon.isFullHp() && (!this.healStatus || (!pokemon.status && !pokemon.getTag(BattlerTagType.CONFUSED))))) { + constructor(teraType: PokemonType) { + super( + "", + `${PokemonType[teraType].toLowerCase()}_tera_shard`, + (type, args) => new TerrastalizeModifier(type as TerastallizeModifierType, (args[0] as Pokemon).id, teraType), + (pokemon: PlayerPokemon) => { + if ( + [pokemon.species.speciesId, pokemon.fusionSpecies?.speciesId].filter( + s => s === Species.TERAPAGOS || s === Species.OGERPON || s === Species.SHEDINJA, + ).length > 0 + ) { return PartyUiHandler.NoEffectMessage; } return null; - }), group || "potion"); + }, + "tera_shard", + ); + + this.teraType = teraType; + } + + get name(): string { + return i18next.t("modifierType:ModifierType.TerastallizeModifierType.name", { + teraType: i18next.t(`pokemonInfo:Type.${PokemonType[this.teraType]}`), + }); + } + + getDescription(): string { + return i18next.t("modifierType:ModifierType.TerastallizeModifierType.description", { + teraType: i18next.t(`pokemonInfo:Type.${PokemonType[this.teraType]}`), + }); + } + + getPregenArgs(): any[] { + return [this.teraType]; + } +} + +export class PokemonHpRestoreModifierType extends PokemonModifierType { + protected restorePoints: number; + protected restorePercent: number; + protected healStatus: boolean; + + constructor( + localeKey: string, + iconImage: string, + restorePoints: number, + restorePercent: number, + healStatus = false, + newModifierFunc?: NewModifierFunc, + selectFilter?: PokemonSelectFilter, + group?: string, + ) { + super( + localeKey, + iconImage, + newModifierFunc || + ((_type, args) => + new PokemonHpRestoreModifier( + this, + (args[0] as PlayerPokemon).id, + this.restorePoints, + this.restorePercent, + this.healStatus, + false, + )), + selectFilter || + ((pokemon: PlayerPokemon) => { + if ( + !pokemon.hp || + (pokemon.isFullHp() && (!this.healStatus || (!pokemon.status && !pokemon.getTag(BattlerTagType.CONFUSED)))) + ) { + return PartyUiHandler.NoEffectMessage; + } + return null; + }), + group || "potion", + ); this.restorePoints = restorePoints; this.restorePercent = restorePercent; @@ -297,9 +505,9 @@ export class PokemonHpRestoreModifierType extends PokemonModifierType { getDescription(): string { return this.restorePoints ? i18next.t("modifierType:ModifierType.PokemonHpRestoreModifierType.description", { - restorePoints: this.restorePoints, - restorePercent: this.restorePercent, - }) + restorePoints: this.restorePoints, + restorePercent: this.restorePercent, + }) : this.healStatus ? i18next.t("modifierType:ModifierType.PokemonHpRestoreModifierType.extra.fullyWithStatus") : i18next.t("modifierType:ModifierType.PokemonHpRestoreModifierType.extra.fully"); @@ -307,14 +515,23 @@ export class PokemonHpRestoreModifierType extends PokemonModifierType { } export class PokemonReviveModifierType extends PokemonHpRestoreModifierType { - constructor(localeKey: string, iconImage: string, restorePercent: integer) { - super(localeKey, iconImage, 0, restorePercent, false, (_type, args) => new PokemonHpRestoreModifier(this, (args[0] as PlayerPokemon).id, 0, this.restorePercent, false, true), - ((pokemon: PlayerPokemon) => { + constructor(localeKey: string, iconImage: string, restorePercent: number) { + super( + localeKey, + iconImage, + 0, + restorePercent, + false, + (_type, args) => + new PokemonHpRestoreModifier(this, (args[0] as PlayerPokemon).id, 0, this.restorePercent, false, true), + (pokemon: PlayerPokemon) => { if (!pokemon.isFainted()) { return PartyUiHandler.NoEffectMessage; } return null; - }), "revive"); + }, + "revive", + ); this.selectFilter = (pokemon: PlayerPokemon) => { if (pokemon.hp) { @@ -325,19 +542,25 @@ export class PokemonReviveModifierType extends PokemonHpRestoreModifierType { } getDescription(): string { - return i18next.t("modifierType:ModifierType.PokemonReviveModifierType.description", { restorePercent: this.restorePercent }); + return i18next.t("modifierType:ModifierType.PokemonReviveModifierType.description", { + restorePercent: this.restorePercent, + }); } } export class PokemonStatusHealModifierType extends PokemonModifierType { constructor(localeKey: string, iconImage: string) { - super(localeKey, iconImage, ((_type, args) => new PokemonStatusHealModifier(this, (args[0] as PlayerPokemon).id)), - ((pokemon: PlayerPokemon) => { + super( + localeKey, + iconImage, + (_type, args) => new PokemonStatusHealModifier(this, (args[0] as PlayerPokemon).id), + (pokemon: PlayerPokemon) => { if (!pokemon.hp || (!pokemon.status && !pokemon.getTag(BattlerTagType.CONFUSED))) { return PartyUiHandler.NoEffectMessage; } return null; - })); + }, + ); } getDescription(): string { @@ -348,7 +571,14 @@ export class PokemonStatusHealModifierType extends PokemonModifierType { export abstract class PokemonMoveModifierType extends PokemonModifierType { public moveSelectFilter: PokemonMoveSelectFilter | undefined; - constructor(localeKey: string, iconImage: string, newModifierFunc: NewModifierFunc, selectFilter?: PokemonSelectFilter, moveSelectFilter?: PokemonMoveSelectFilter, group?: string) { + constructor( + localeKey: string, + iconImage: string, + newModifierFunc: NewModifierFunc, + selectFilter?: PokemonSelectFilter, + moveSelectFilter?: PokemonMoveSelectFilter, + group?: string, + ) { super(localeKey, iconImage, newModifierFunc, selectFilter, group); this.moveSelectFilter = moveSelectFilter; @@ -356,66 +586,86 @@ export abstract class PokemonMoveModifierType extends PokemonModifierType { } export class PokemonPpRestoreModifierType extends PokemonMoveModifierType { - protected restorePoints: integer; + protected restorePoints: number; - constructor(localeKey: string, iconImage: string, restorePoints: integer) { - super(localeKey, iconImage, (_type, args) => new PokemonPpRestoreModifier(this, (args[0] as PlayerPokemon).id, (args[1] as integer), this.restorePoints), + constructor(localeKey: string, iconImage: string, restorePoints: number) { + super( + localeKey, + iconImage, + (_type, args) => + new PokemonPpRestoreModifier(this, (args[0] as PlayerPokemon).id, args[1] as number, this.restorePoints), (_pokemon: PlayerPokemon) => { return null; - }, (pokemonMove: PokemonMove) => { + }, + (pokemonMove: PokemonMove) => { if (!pokemonMove.ppUsed) { return PartyUiHandler.NoEffectMessage; } return null; - }, "ether"); + }, + "ether", + ); this.restorePoints = restorePoints; } getDescription(): string { return this.restorePoints > -1 - ? i18next.t("modifierType:ModifierType.PokemonPpRestoreModifierType.description", { restorePoints: this.restorePoints }) - : i18next.t("modifierType:ModifierType.PokemonPpRestoreModifierType.extra.fully") - ; + ? i18next.t("modifierType:ModifierType.PokemonPpRestoreModifierType.description", { + restorePoints: this.restorePoints, + }) + : i18next.t("modifierType:ModifierType.PokemonPpRestoreModifierType.extra.fully"); } } export class PokemonAllMovePpRestoreModifierType extends PokemonModifierType { - protected restorePoints: integer; + protected restorePoints: number; - constructor(localeKey: string, iconImage: string, restorePoints: integer) { - super(localeKey, iconImage, (_type, args) => new PokemonAllMovePpRestoreModifier(this, (args[0] as PlayerPokemon).id, this.restorePoints), + constructor(localeKey: string, iconImage: string, restorePoints: number) { + super( + localeKey, + iconImage, + (_type, args) => new PokemonAllMovePpRestoreModifier(this, (args[0] as PlayerPokemon).id, this.restorePoints), (pokemon: PlayerPokemon) => { if (!pokemon.getMoveset().filter(m => m?.ppUsed).length) { return PartyUiHandler.NoEffectMessage; } return null; - }, "elixir"); + }, + "elixir", + ); this.restorePoints = restorePoints; } getDescription(): string { return this.restorePoints > -1 - ? i18next.t("modifierType:ModifierType.PokemonAllMovePpRestoreModifierType.description", { restorePoints: this.restorePoints }) - : i18next.t("modifierType:ModifierType.PokemonAllMovePpRestoreModifierType.extra.fully") - ; + ? i18next.t("modifierType:ModifierType.PokemonAllMovePpRestoreModifierType.description", { + restorePoints: this.restorePoints, + }) + : i18next.t("modifierType:ModifierType.PokemonAllMovePpRestoreModifierType.extra.fully"); } } export class PokemonPpUpModifierType extends PokemonMoveModifierType { - protected upPoints: integer; + protected upPoints: number; - constructor(localeKey: string, iconImage: string, upPoints: integer) { - super(localeKey, iconImage, (_type, args) => new PokemonPpUpModifier(this, (args[0] as PlayerPokemon).id, (args[1] as integer), this.upPoints), + constructor(localeKey: string, iconImage: string, upPoints: number) { + super( + localeKey, + iconImage, + (_type, args) => new PokemonPpUpModifier(this, (args[0] as PlayerPokemon).id, args[1] as number, this.upPoints), (_pokemon: PlayerPokemon) => { return null; - }, (pokemonMove: PokemonMove) => { + }, + (pokemonMove: PokemonMove) => { if (pokemonMove.getMove().pp < 5 || pokemonMove.ppUp >= 3 || pokemonMove.maxPpOverride) { return PartyUiHandler.NoEffectMessage; } return null; - }, "ppUp"); + }, + "ppUp", + ); this.upPoints = upPoints; } @@ -429,35 +679,53 @@ export class PokemonNatureChangeModifierType extends PokemonModifierType { protected nature: Nature; constructor(nature: Nature) { - super("", `mint_${getEnumKeys(Stat).find(s => getNatureStatMultiplier(nature, Stat[s]) > 1)?.toLowerCase() || "neutral" }`, ((_type, args) => new PokemonNatureChangeModifier(this, (args[0] as PlayerPokemon).id, this.nature)), - ((pokemon: PlayerPokemon) => { + super( + "", + `mint_${ + getEnumKeys(Stat) + .find(s => getNatureStatMultiplier(nature, Stat[s]) > 1) + ?.toLowerCase() || "neutral" + }`, + (_type, args) => new PokemonNatureChangeModifier(this, (args[0] as PlayerPokemon).id, this.nature), + (pokemon: PlayerPokemon) => { if (pokemon.getNature() === this.nature) { return PartyUiHandler.NoEffectMessage; } return null; - }), "mint"); + }, + "mint", + ); this.nature = nature; } get name(): string { - return i18next.t("modifierType:ModifierType.PokemonNatureChangeModifierType.name", { natureName: getNatureName(this.nature) }); + return i18next.t("modifierType:ModifierType.PokemonNatureChangeModifierType.name", { + natureName: getNatureName(this.nature), + }); } getDescription(): string { - return i18next.t("modifierType:ModifierType.PokemonNatureChangeModifierType.description", { natureName: getNatureName(this.nature, true, true, true) }); + return i18next.t("modifierType:ModifierType.PokemonNatureChangeModifierType.description", { + natureName: getNatureName(this.nature, true, true, true), + }); } } export class RememberMoveModifierType extends PokemonModifierType { constructor(localeKey: string, iconImage: string, group?: string) { - super(localeKey, iconImage, (type, args) => new RememberMoveModifier(type, (args[0] as PlayerPokemon).id, (args[1] as integer)), + super( + localeKey, + iconImage, + (type, args) => new RememberMoveModifier(type, (args[0] as PlayerPokemon).id, args[1] as number), (pokemon: PlayerPokemon) => { if (!pokemon.getLearnableLevelMoves().length) { return PartyUiHandler.NoEffectMessage; } return null; - }, group); + }, + group, + ); } } @@ -472,7 +740,7 @@ export class DoubleBattleChanceBoosterModifierType extends ModifierType { getDescription(): string { return i18next.t("modifierType:ModifierType.DoubleBattleChanceBoosterModifierType.description", { - battleCount: this.maxBattles + battleCount: this.maxBattles, }); } } @@ -488,7 +756,7 @@ export class TempStatStageBoosterModifierType extends ModifierType implements Ge this.stat = stat; this.nameKey = nameKey; - this.quantityKey = (stat !== Stat.ACC) ? "percentage" : "stage"; + this.quantityKey = stat !== Stat.ACC ? "percentage" : "stage"; } get name(): string { @@ -498,12 +766,12 @@ export class TempStatStageBoosterModifierType extends ModifierType implements Ge getDescription(): string { return i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.description", { stat: i18next.t(getStatKey(this.stat)), - amount: i18next.t(`modifierType:ModifierType.TempStatStageBoosterModifierType.extra.${this.quantityKey}`) + amount: i18next.t(`modifierType:ModifierType.TempStatStageBoosterModifierType.extra.${this.quantityKey}`), }); } getPregenArgs(): any[] { - return [ this.stat ]; + return [this.stat]; } } @@ -511,7 +779,12 @@ export class BerryModifierType extends PokemonHeldItemModifierType implements Ge private berryType: BerryType; constructor(berryType: BerryType) { - super("", `${BerryType[berryType].toLowerCase()}_berry`, (type, args) => new BerryModifier(type, (args[0] as Pokemon).id, berryType), "berry"); + super( + "", + `${BerryType[berryType].toLowerCase()}_berry`, + (type, args) => new BerryModifier(type, (args[0] as Pokemon).id, berryType), + "berry", + ); this.berryType = berryType; } @@ -525,7 +798,7 @@ export class BerryModifierType extends PokemonHeldItemModifierType implements Ge } getPregenArgs(): any[] { - return [ this.berryType ]; + return [this.berryType]; } } @@ -547,16 +820,22 @@ enum AttackTypeBoosterItem { NEVER_MELT_ICE, DRAGON_FANG, BLACK_GLASSES, - FAIRY_FEATHER + FAIRY_FEATHER, } -export class AttackTypeBoosterModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType { - public moveType: Type; - public boostPercent: integer; +export class AttackTypeBoosterModifierType + extends PokemonHeldItemModifierType + implements GeneratedPersistentModifierType +{ + public moveType: PokemonType; + public boostPercent: number; - constructor(moveType: Type, boostPercent: integer) { - super("", `${AttackTypeBoosterItem[moveType]?.toLowerCase()}`, - (_type, args) => new AttackTypeBoosterModifier(this, (args[0] as Pokemon).id, moveType, boostPercent)); + constructor(moveType: PokemonType, boostPercent: number) { + super( + "", + `${AttackTypeBoosterItem[moveType]?.toLowerCase()}`, + (_type, args) => new AttackTypeBoosterModifier(this, (args[0] as Pokemon).id, moveType, boostPercent), + ); this.moveType = moveType; this.boostPercent = boostPercent; @@ -568,11 +847,13 @@ export class AttackTypeBoosterModifierType extends PokemonHeldItemModifierType i getDescription(): string { // TODO: Need getTypeName? - return i18next.t("modifierType:ModifierType.AttackTypeBoosterModifierType.description", { moveType: i18next.t(`pokemonInfo:Type.${Type[this.moveType]}`) }); + return i18next.t("modifierType:ModifierType.AttackTypeBoosterModifierType.description", { + moveType: i18next.t(`pokemonInfo:Type.${PokemonType[this.moveType]}`), + }); } getPregenArgs(): any[] { - return [ this.moveType ]; + return [this.moveType]; } } @@ -583,24 +864,37 @@ export type SpeciesStatBoosterItem = keyof typeof SpeciesStatBoosterModifierType * @extends PokemonHeldItemModifierType * @implements GeneratedPersistentModifierType */ -export class SpeciesStatBoosterModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType { +export class SpeciesStatBoosterModifierType + extends PokemonHeldItemModifierType + implements GeneratedPersistentModifierType +{ private key: SpeciesStatBoosterItem; constructor(key: SpeciesStatBoosterItem) { const item = SpeciesStatBoosterModifierTypeGenerator.items[key]; - super(`modifierType:SpeciesBoosterItem.${key}`, key.toLowerCase(), (type, args) => new SpeciesStatBoosterModifier(type, (args[0] as Pokemon).id, item.stats, item.multiplier, item.species)); + super( + `modifierType:SpeciesBoosterItem.${key}`, + key.toLowerCase(), + (type, args) => + new SpeciesStatBoosterModifier(type, (args[0] as Pokemon).id, item.stats, item.multiplier, item.species), + ); this.key = key; } getPregenArgs(): any[] { - return [ this.key ]; + return [this.key]; } } export class PokemonLevelIncrementModifierType extends PokemonModifierType { constructor(localeKey: string, iconImage: string) { - super(localeKey, iconImage, (_type, args) => new PokemonLevelIncrementModifier(this, (args[0] as PlayerPokemon).id), (_pokemon: PlayerPokemon) => null); + super( + localeKey, + iconImage, + (_type, args) => new PokemonLevelIncrementModifier(this, (args[0] as PlayerPokemon).id), + (_pokemon: PlayerPokemon) => null, + ); } getDescription(): string { @@ -628,7 +922,10 @@ export class AllPokemonLevelIncrementModifierType extends ModifierType { } } -export class BaseStatBoosterModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType { +export class BaseStatBoosterModifierType + extends PokemonHeldItemModifierType + implements GeneratedPersistentModifierType +{ private stat: PermanentStat; private key: string; @@ -645,47 +942,71 @@ export class BaseStatBoosterModifierType extends PokemonHeldItemModifierType imp } getDescription(): string { - return i18next.t("modifierType:ModifierType.BaseStatBoosterModifierType.description", { stat: i18next.t(getStatKey(this.stat)) }); + return i18next.t("modifierType:ModifierType.BaseStatBoosterModifierType.description", { + stat: i18next.t(getStatKey(this.stat)), + }); } getPregenArgs(): any[] { - return [ this.stat ]; + return [this.stat]; } } /** * Shuckle Juice item */ -export class PokemonBaseStatTotalModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType { - private readonly statModifier: integer; +export class PokemonBaseStatTotalModifierType + extends PokemonHeldItemModifierType + implements GeneratedPersistentModifierType +{ + private readonly statModifier: number; - constructor(statModifier: integer) { - super("modifierType:ModifierType.MYSTERY_ENCOUNTER_SHUCKLE_JUICE", "berry_juice", (_type, args) => new PokemonBaseStatTotalModifier(this, (args[0] as Pokemon).id, this.statModifier)); + constructor(statModifier: number) { + super( + "modifierType:ModifierType.MYSTERY_ENCOUNTER_SHUCKLE_JUICE", + "berry_juice", + (_type, args) => new PokemonBaseStatTotalModifier(this, (args[0] as Pokemon).id, this.statModifier), + ); this.statModifier = statModifier; } override getDescription(): string { return i18next.t("modifierType:ModifierType.PokemonBaseStatTotalModifierType.description", { - increaseDecrease: i18next.t(this.statModifier >= 0 ? "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.increase" : "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.decrease"), - blessCurse: i18next.t(this.statModifier >= 0 ? "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.blessed" : "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.cursed"), + increaseDecrease: i18next.t( + this.statModifier >= 0 + ? "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.increase" + : "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.decrease", + ), + blessCurse: i18next.t( + this.statModifier >= 0 + ? "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.blessed" + : "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.cursed", + ), statValue: this.statModifier, }); } public getPregenArgs(): any[] { - return [ this.statModifier ]; + return [this.statModifier]; } } /** * Old Gateau item */ -export class PokemonBaseStatFlatModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType { - private readonly statModifier: integer; +export class PokemonBaseStatFlatModifierType + extends PokemonHeldItemModifierType + implements GeneratedPersistentModifierType +{ + private readonly statModifier: number; private readonly stats: Stat[]; - constructor(statModifier: integer, stats: Stat[]) { - super("modifierType:ModifierType.MYSTERY_ENCOUNTER_OLD_GATEAU", "old_gateau", (_type, args) => new PokemonBaseStatFlatModifier(this, (args[0] as Pokemon).id, this.statModifier, this.stats)); + constructor(statModifier: number, stats: Stat[]) { + super( + "modifierType:ModifierType.MYSTERY_ENCOUNTER_OLD_GATEAU", + "old_gateau", + (_type, args) => new PokemonBaseStatFlatModifier(this, (args[0] as Pokemon).id, this.statModifier, this.stats), + ); this.statModifier = statModifier; this.stats = stats; } @@ -698,7 +1019,7 @@ export class PokemonBaseStatFlatModifierType extends PokemonHeldItemModifierType } public getPregenArgs(): any[] { - return [ this.statModifier, this.stats ]; + return [this.statModifier, this.stats]; } } @@ -706,19 +1027,30 @@ class AllPokemonFullHpRestoreModifierType extends ModifierType { private descriptionKey: string; constructor(localeKey: string, iconImage: string, descriptionKey?: string, newModifierFunc?: NewModifierFunc) { - super(localeKey, iconImage, newModifierFunc || ((_type, _args) => new PokemonHpRestoreModifier(this, -1, 0, 100, false))); + super( + localeKey, + iconImage, + newModifierFunc || ((_type, _args) => new PokemonHpRestoreModifier(this, -1, 0, 100, false)), + ); this.descriptionKey = descriptionKey!; // TODO: is this bang correct? } getDescription(): string { - return i18next.t(`${this.descriptionKey || "modifierType:ModifierType.AllPokemonFullHpRestoreModifierType"}.description` as any); + return i18next.t( + `${this.descriptionKey || "modifierType:ModifierType.AllPokemonFullHpRestoreModifierType"}.description` as any, + ); } } class AllPokemonFullReviveModifierType extends AllPokemonFullHpRestoreModifierType { constructor(localeKey: string, iconImage: string) { - super(localeKey, iconImage, "modifierType:ModifierType.AllPokemonFullReviveModifierType", (_type, _args) => new PokemonHpRestoreModifier(this, -1, 0, 100, false, true)); + super( + localeKey, + iconImage, + "modifierType:ModifierType.AllPokemonFullReviveModifierType", + (_type, _args) => new PokemonHpRestoreModifier(this, -1, 0, 100, false, true), + ); } } @@ -746,30 +1078,38 @@ export class MoneyRewardModifierType extends ModifierType { } export class ExpBoosterModifierType extends ModifierType { - private boostPercent: integer; + private boostPercent: number; - constructor(localeKey: string, iconImage: string, boostPercent: integer) { + constructor(localeKey: string, iconImage: string, boostPercent: number) { super(localeKey, iconImage, () => new ExpBoosterModifier(this, boostPercent)); this.boostPercent = boostPercent; } getDescription(): string { - return i18next.t("modifierType:ModifierType.ExpBoosterModifierType.description", { boostPercent: this.boostPercent }); + return i18next.t("modifierType:ModifierType.ExpBoosterModifierType.description", { + boostPercent: this.boostPercent, + }); } } export class PokemonExpBoosterModifierType extends PokemonHeldItemModifierType { - private boostPercent: integer; + private boostPercent: number; - constructor(localeKey: string, iconImage: string, boostPercent: integer) { - super(localeKey, iconImage, (_type, args) => new PokemonExpBoosterModifier(this, (args[0] as Pokemon).id, boostPercent)); + constructor(localeKey: string, iconImage: string, boostPercent: number) { + super( + localeKey, + iconImage, + (_type, args) => new PokemonExpBoosterModifier(this, (args[0] as Pokemon).id, boostPercent), + ); this.boostPercent = boostPercent; } getDescription(): string { - return i18next.t("modifierType:ModifierType.PokemonExpBoosterModifierType.description", { boostPercent: this.boostPercent }); + return i18next.t("modifierType:ModifierType.PokemonExpBoosterModifierType.description", { + boostPercent: this.boostPercent, + }); } } @@ -784,22 +1124,34 @@ export class PokemonFriendshipBoosterModifierType extends PokemonHeldItemModifie } export class PokemonMoveAccuracyBoosterModifierType extends PokemonHeldItemModifierType { - private amount: integer; + private amount: number; - constructor(localeKey: string, iconImage: string, amount: integer, group?: string, soundName?: string) { - super(localeKey, iconImage, (_type, args) => new PokemonMoveAccuracyBoosterModifier(this, (args[0] as Pokemon).id, amount), group, soundName); + constructor(localeKey: string, iconImage: string, amount: number, group?: string, soundName?: string) { + super( + localeKey, + iconImage, + (_type, args) => new PokemonMoveAccuracyBoosterModifier(this, (args[0] as Pokemon).id, amount), + group, + soundName, + ); this.amount = amount; } getDescription(): string { - return i18next.t("modifierType:ModifierType.PokemonMoveAccuracyBoosterModifierType.description", { accuracyAmount: this.amount }); + return i18next.t("modifierType:ModifierType.PokemonMoveAccuracyBoosterModifierType.description", { + accuracyAmount: this.amount, + }); } } export class PokemonMultiHitModifierType extends PokemonHeldItemModifierType { constructor(localeKey: string, iconImage: string) { - super(localeKey, iconImage, (type, args) => new PokemonMultiHitModifier(type as PokemonMultiHitModifierType, (args[0] as Pokemon).id)); + super( + localeKey, + iconImage, + (type, args) => new PokemonMultiHitModifier(type as PokemonMultiHitModifierType, (args[0] as Pokemon).id), + ); } getDescription(): string { @@ -811,13 +1163,21 @@ export class TmModifierType extends PokemonModifierType { public moveId: Moves; constructor(moveId: Moves) { - super("", `tm_${Type[allMoves[moveId].type].toLowerCase()}`, (_type, args) => new TmModifier(this, (args[0] as PlayerPokemon).id), + super( + "", + `tm_${PokemonType[allMoves[moveId].type].toLowerCase()}`, + (_type, args) => new TmModifier(this, (args[0] as PlayerPokemon).id), (pokemon: PlayerPokemon) => { - if (pokemon.compatibleTms.indexOf(moveId) === -1 || pokemon.getMoveset().filter(m => m?.moveId === moveId).length) { + if ( + pokemon.compatibleTms.indexOf(moveId) === -1 || + pokemon.getMoveset().filter(m => m?.moveId === moveId).length + ) { return PartyUiHandler.NoEffectMessage; } return null; - }, "tm"); + }, + "tm", + ); this.moveId = moveId; } @@ -830,7 +1190,12 @@ export class TmModifierType extends PokemonModifierType { } getDescription(): string { - return i18next.t(globalScene.enableMoveInfo ? "modifierType:ModifierType.TmModifierTypeWithInfo.description" : "modifierType:ModifierType.TmModifierType.description", { moveName: allMoves[this.moveId].name }); + return i18next.t( + globalScene.enableMoveInfo + ? "modifierType:ModifierType.TmModifierTypeWithInfo.description" + : "modifierType:ModifierType.TmModifierType.description", + { moveName: allMoves[this.moveId].name }, + ); } } @@ -838,18 +1203,41 @@ export class EvolutionItemModifierType extends PokemonModifierType implements Ge public evolutionItem: EvolutionItem; constructor(evolutionItem: EvolutionItem) { - super("", EvolutionItem[evolutionItem].toLowerCase(), (_type, args) => new EvolutionItemModifier(this, (args[0] as PlayerPokemon).id), + super( + "", + EvolutionItem[evolutionItem].toLowerCase(), + (_type, args) => new EvolutionItemModifier(this, (args[0] as PlayerPokemon).id), (pokemon: PlayerPokemon) => { - if (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && pokemonEvolutions[pokemon.species.speciesId].filter(e => e.item === this.evolutionItem - && (!e.condition || e.condition.predicate(pokemon)) && (e.preFormKey === null || e.preFormKey === pokemon.getFormKey())).length && (pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX)) { + if ( + pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && + pokemonEvolutions[pokemon.species.speciesId].filter( + e => + e.item === this.evolutionItem && + (!e.condition || e.condition.predicate(pokemon)) && + (e.preFormKey === null || e.preFormKey === pokemon.getFormKey()), + ).length && + pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX + ) { return null; - } else if (pokemon.isFusion() && pokemon.fusionSpecies && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => e.item === this.evolutionItem - && (!e.condition || e.condition.predicate(pokemon)) && (e.preFormKey === null || e.preFormKey === pokemon.getFusionFormKey())).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX)) { + } + if ( + pokemon.isFusion() && + pokemon.fusionSpecies && + pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && + pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter( + e => + e.item === this.evolutionItem && + (!e.condition || e.condition.predicate(pokemon)) && + (e.preFormKey === null || e.preFormKey === pokemon.getFusionFormKey()), + ).length && + pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX + ) { return null; } return PartyUiHandler.NoEffectMessage; - }); + }, + ); this.evolutionItem = evolutionItem; } @@ -863,7 +1251,7 @@ export class EvolutionItemModifierType extends PokemonModifierType implements Ge } getPregenArgs(): any[] { - return [ this.evolutionItem ]; + return [this.evolutionItem]; } } @@ -874,21 +1262,30 @@ export class FormChangeItemModifierType extends PokemonModifierType implements G public formChangeItem: FormChangeItem; constructor(formChangeItem: FormChangeItem) { - super("", FormChangeItem[formChangeItem].toLowerCase(), (_type, args) => new PokemonFormChangeItemModifier(this, (args[0] as PlayerPokemon).id, formChangeItem, true), + super( + "", + FormChangeItem[formChangeItem].toLowerCase(), + (_type, args) => new PokemonFormChangeItemModifier(this, (args[0] as PlayerPokemon).id, formChangeItem, true), (pokemon: PlayerPokemon) => { // Make sure the Pokemon has alternate forms - if (pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId) + if ( + pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId) && // Get all form changes for this species with an item trigger, including any compound triggers - && pokemonFormChanges[pokemon.species.speciesId].filter(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger) && (fc.preFormKey === pokemon.getFormKey())) - // Returns true if any form changes match this item - .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger) - .flat().flatMap(fc => fc.item).includes(this.formChangeItem) + pokemonFormChanges[pokemon.species.speciesId] + .filter( + fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger) && fc.preFormKey === pokemon.getFormKey(), + ) + // Returns true if any form changes match this item + .flatMap(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger) + .flatMap(fc => fc.item) + .includes(this.formChangeItem) ) { return null; } return PartyUiHandler.NoEffectMessage; - }); + }, + ); this.formChangeItem = formChangeItem; } @@ -902,19 +1299,23 @@ export class FormChangeItemModifierType extends PokemonModifierType implements G } getPregenArgs(): any[] { - return [ this.formChangeItem ]; + return [this.formChangeItem]; } } export class FusePokemonModifierType extends PokemonModifierType { constructor(localeKey: string, iconImage: string) { - super(localeKey, iconImage, (_type, args) => new FusePokemonModifier(this, (args[0] as PlayerPokemon).id, (args[1] as PlayerPokemon).id), + super( + localeKey, + iconImage, + (_type, args) => new FusePokemonModifier(this, (args[0] as PlayerPokemon).id, (args[1] as PlayerPokemon).id), (pokemon: PlayerPokemon) => { if (pokemon.isFusion()) { return PartyUiHandler.NoEffectMessage; } return null; - }); + }, + ); } getDescription(): string { @@ -925,20 +1326,27 @@ export class FusePokemonModifierType extends PokemonModifierType { class AttackTypeBoosterModifierTypeGenerator extends ModifierTypeGenerator { constructor() { super((party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Type)) { - return new AttackTypeBoosterModifierType(pregenArgs[0] as Type, 20); + if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in PokemonType) { + return new AttackTypeBoosterModifierType(pregenArgs[0] as PokemonType, 20); } - const attackMoveTypes = party.map(p => p.getMoveset().map(m => m?.getMove()).filter(m => m instanceof AttackMove).map(m => m.type)).flat(); + const attackMoveTypes = party.flatMap(p => + p + .getMoveset() + .map(m => m?.getMove()) + .filter(m => m instanceof AttackMove) + .map(m => m.type), + ); if (!attackMoveTypes.length) { return null; } - const attackMoveTypeWeights = new Map(); + const attackMoveTypeWeights = new Map(); let totalWeight = 0; for (const t of attackMoveTypes) { if (attackMoveTypeWeights.has(t)) { - if (attackMoveTypeWeights.get(t)! < 3) { // attackMoveTypeWeights.has(t) was checked before + if (attackMoveTypeWeights.get(t)! < 3) { + // attackMoveTypeWeights.has(t) was checked before attackMoveTypeWeights.set(t, attackMoveTypeWeights.get(t)! + 1); } else { continue; @@ -953,7 +1361,7 @@ class AttackTypeBoosterModifierTypeGenerator extends ModifierTypeGenerator { return null; } - let type: Type; + let type: PokemonType; const randInt = randSeedInt(totalWeight); let weight = 0; @@ -979,7 +1387,7 @@ class BaseStatBoosterModifierTypeGenerator extends ModifierTypeGenerator { [Stat.DEF]: "iron", [Stat.SPATK]: "calcium", [Stat.SPDEF]: "zinc", - [Stat.SPD]: "carbos" + [Stat.SPD]: "carbos", }; constructor() { @@ -1000,12 +1408,12 @@ class TempStatStageBoosterModifierTypeGenerator extends ModifierTypeGenerator { [Stat.SPATK]: "x_sp_atk", [Stat.SPDEF]: "x_sp_def", [Stat.SPD]: "x_speed", - [Stat.ACC]: "x_accuracy" + [Stat.ACC]: "x_accuracy", }; constructor() { super((_party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs && (pregenArgs.length === 1) && TEMP_BATTLE_STATS.includes(pregenArgs[0])) { + if (pregenArgs && pregenArgs.length === 1 && TEMP_BATTLE_STATS.includes(pregenArgs[0])) { return new TempStatStageBoosterModifierType(pregenArgs[0]); } const randStat: TempBattleStat = randSeedInt(Stat.ACC, Stat.ATK); @@ -1023,16 +1431,32 @@ class TempStatStageBoosterModifierTypeGenerator extends ModifierTypeGenerator { class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator { /** Object comprised of the currently available species-based stat boosting held items */ public static readonly items = { - LIGHT_BALL: { stats: [ Stat.ATK, Stat.SPATK ], multiplier: 2, species: [ Species.PIKACHU ]}, - THICK_CLUB: { stats: [ Stat.ATK ], multiplier: 2, species: [ Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK ]}, - METAL_POWDER: { stats: [ Stat.DEF ], multiplier: 2, species: [ Species.DITTO ]}, - QUICK_POWDER: { stats: [ Stat.SPD ], multiplier: 2, species: [ Species.DITTO ]}, + LIGHT_BALL: { + stats: [Stat.ATK, Stat.SPATK], + multiplier: 2, + species: [Species.PIKACHU], + }, + THICK_CLUB: { + stats: [Stat.ATK], + multiplier: 2, + species: [Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK], + }, + METAL_POWDER: { + stats: [Stat.DEF], + multiplier: 2, + species: [Species.DITTO], + }, + QUICK_POWDER: { + stats: [Stat.SPD], + multiplier: 2, + species: [Species.DITTO], + }, }; constructor() { super((party: Pokemon[], pregenArgs?: any[]) => { const items = SpeciesStatBoosterModifierTypeGenerator.items; - if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in items)) { + if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in items) { return new SpeciesStatBoosterModifierType(pregenArgs[0] as SpeciesStatBoosterItem); } @@ -1051,8 +1475,13 @@ class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator { const checkedStats = values[i].stats; // If party member already has the item being weighted currently, skip to the next item - const hasItem = p.getHeldItems().some(m => m instanceof SpeciesStatBoosterModifier - && (m as SpeciesStatBoosterModifier).contains(checkedSpecies[0], checkedStats[0])); + const hasItem = p + .getHeldItems() + .some( + m => + m instanceof SpeciesStatBoosterModifier && + (m as SpeciesStatBoosterModifier).contains(checkedSpecies[0], checkedStats[0]), + ); if (!hasItem) { if (checkedSpecies.includes(speciesId) || (!!fusionSpeciesId && checkedSpecies.includes(fusionSpeciesId))) { @@ -1094,14 +1523,20 @@ class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator { class TmModifierTypeGenerator extends ModifierTypeGenerator { constructor(tier: ModifierTier) { super((party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Moves)) { + if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in Moves) { return new TmModifierType(pregenArgs[0] as Moves); } const partyMemberCompatibleTms = party.map(p => { const previousLevelMoves = p.getLearnableLevelMoves(); - return (p as PlayerPokemon).compatibleTms.filter(tm => !p.moveset.find(m => m?.moveId === tm) && !previousLevelMoves.find(lm=>lm === tm)); + return (p as PlayerPokemon).compatibleTms.filter( + tm => !p.moveset.find(m => m?.moveId === tm) && !previousLevelMoves.find(lm => lm === tm), + ); }); - const tierUniqueCompatibleTms = partyMemberCompatibleTms.flat().filter(tm => tmPoolTiers[tm] === tier).filter(tm => !allMoves[tm].name.endsWith(" (N)")).filter((tm, i, array) => array.indexOf(tm) === i); + const tierUniqueCompatibleTms = partyMemberCompatibleTms + .flat() + .filter(tm => tmPoolTiers[tm] === tier) + .filter(tm => !allMoves[tm].name.endsWith(" (N)")) + .filter((tm, i, array) => array.indexOf(tm) === i); if (!tierUniqueCompatibleTms.length) { return null; } @@ -1114,20 +1549,49 @@ class TmModifierTypeGenerator extends ModifierTypeGenerator { class EvolutionItemModifierTypeGenerator extends ModifierTypeGenerator { constructor(rare: boolean) { super((party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in EvolutionItem)) { + if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in EvolutionItem) { return new EvolutionItemModifierType(pregenArgs[0] as EvolutionItem); } const evolutionItemPool = [ - party.filter(p => pokemonEvolutions.hasOwnProperty(p.species.speciesId) && (!p.pauseEvolutions || p.species.speciesId === Species.SLOWPOKE || p.species.speciesId === Species.EEVEE)).map(p => { - const evolutions = pokemonEvolutions[p.species.speciesId]; - return evolutions.filter(e => e.item !== EvolutionItem.NONE && (e.evoFormKey === null || (e.preFormKey || "") === p.getFormKey()) && (!e.condition || e.condition.predicate(p))); - }).flat(), - party.filter(p => p.isFusion() && p.fusionSpecies && pokemonEvolutions.hasOwnProperty(p.fusionSpecies.speciesId) && (!p.pauseEvolutions || p.fusionSpecies.speciesId === Species.SLOWPOKE || p.fusionSpecies.speciesId === Species.EEVEE)).map(p => { - const evolutions = pokemonEvolutions[p.fusionSpecies!.speciesId]; - return evolutions.filter(e => e.item !== EvolutionItem.NONE && (e.evoFormKey === null || (e.preFormKey || "") === p.getFusionFormKey()) && (!e.condition || e.condition.predicate(p))); - }).flat() - ].flat().flatMap(e => e.item).filter(i => (!!i && i > 50) === rare); + party + .filter( + p => + pokemonEvolutions.hasOwnProperty(p.species.speciesId) && + (!p.pauseEvolutions || p.species.speciesId === Species.SLOWPOKE || p.species.speciesId === Species.EEVEE), + ) + .flatMap(p => { + const evolutions = pokemonEvolutions[p.species.speciesId]; + return evolutions.filter( + e => + e.item !== EvolutionItem.NONE && + (e.evoFormKey === null || (e.preFormKey || "") === p.getFormKey()) && + (!e.condition || e.condition.predicate(p)), + ); + }), + party + .filter( + p => + p.isFusion() && + p.fusionSpecies && + pokemonEvolutions.hasOwnProperty(p.fusionSpecies.speciesId) && + (!p.pauseEvolutions || + p.fusionSpecies.speciesId === Species.SLOWPOKE || + p.fusionSpecies.speciesId === Species.EEVEE), + ) + .flatMap(p => { + const evolutions = pokemonEvolutions[p.fusionSpecies!.speciesId]; + return evolutions.filter( + e => + e.item !== EvolutionItem.NONE && + (e.evoFormKey === null || (e.preFormKey || "") === p.getFusionFormKey()) && + (!e.condition || e.condition.predicate(p)), + ); + }), + ] + .flat() + .flatMap(e => e.item) + .filter(i => (!!i && i > 50) === rare); if (!evolutionItemPool.length) { return null; @@ -1141,46 +1605,77 @@ class EvolutionItemModifierTypeGenerator extends ModifierTypeGenerator { class FormChangeItemModifierTypeGenerator extends ModifierTypeGenerator { constructor(isRareFormChangeItem: boolean) { super((party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in FormChangeItem)) { + if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in FormChangeItem) { return new FormChangeItemModifierType(pregenArgs[0] as FormChangeItem); } - const formChangeItemPool = [ ...new Set(party.filter(p => pokemonFormChanges.hasOwnProperty(p.species.speciesId)).map(p => { - const formChanges = pokemonFormChanges[p.species.speciesId]; - let formChangeItemTriggers = formChanges.filter(fc => ((fc.formKey.indexOf(SpeciesFormKey.MEGA) === -1 && fc.formKey.indexOf(SpeciesFormKey.PRIMAL) === -1) || globalScene.getModifiers(MegaEvolutionAccessModifier).length) - && ((fc.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) === -1 && fc.formKey.indexOf(SpeciesFormKey.ETERNAMAX) === -1) || globalScene.getModifiers(GigantamaxAccessModifier).length) - && (!fc.conditions.length || fc.conditions.filter(cond => cond instanceof SpeciesFormChangeCondition && cond.predicate(p)).length) - && (fc.preFormKey === p.getFormKey())) - .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger) - .filter(t => t && t.active && !globalScene.findModifier(m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === p.id && m.formChangeItem === t.item)); + const formChangeItemPool = [ + ...new Set( + party + .filter(p => pokemonFormChanges.hasOwnProperty(p.species.speciesId)) + .flatMap(p => { + const formChanges = pokemonFormChanges[p.species.speciesId]; + let formChangeItemTriggers = formChanges + .filter( + fc => + ((fc.formKey.indexOf(SpeciesFormKey.MEGA) === -1 && + fc.formKey.indexOf(SpeciesFormKey.PRIMAL) === -1) || + globalScene.getModifiers(MegaEvolutionAccessModifier).length) && + ((fc.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) === -1 && + fc.formKey.indexOf(SpeciesFormKey.ETERNAMAX) === -1) || + globalScene.getModifiers(GigantamaxAccessModifier).length) && + (!fc.conditions.length || + fc.conditions.filter(cond => cond instanceof SpeciesFormChangeCondition && cond.predicate(p)) + .length) && + fc.preFormKey === p.getFormKey(), + ) + .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger) + .filter( + t => + t?.active && + !globalScene.findModifier( + m => + m instanceof PokemonFormChangeItemModifier && + m.pokemonId === p.id && + m.formChangeItem === t.item, + ), + ); - if (p.species.speciesId === Species.NECROZMA) { - // technically we could use a simplified version and check for formChanges.length > 3, but in case any code changes later, this might break... - - let foundULTRA_Z = false, - foundN_LUNA = false, - foundN_SOLAR = false; - formChangeItemTriggers.forEach((fc, _i) => { - switch (fc.item) { - case FormChangeItem.ULTRANECROZIUM_Z: - foundULTRA_Z = true; - break; - case FormChangeItem.N_LUNARIZER: - foundN_LUNA = true; - break; - case FormChangeItem.N_SOLARIZER: - foundN_SOLAR = true; - break; - } - }); - if (foundULTRA_Z && foundN_LUNA && foundN_SOLAR) { - // all three items are present -> user hasn't acquired any of the N_*ARIZERs -> block ULTRANECROZIUM_Z acquisition. - formChangeItemTriggers = formChangeItemTriggers.filter(fc => fc.item !== FormChangeItem.ULTRANECROZIUM_Z); - } - } - return formChangeItemTriggers; - }).flat()) - ].flat().flatMap(fc => fc.item).filter(i => (i && i < 100) === isRareFormChangeItem); + if (p.species.speciesId === Species.NECROZMA) { + // technically we could use a simplified version and check for formChanges.length > 3, but in case any code changes later, this might break... + let foundULTRA_Z = false, + foundN_LUNA = false, + foundN_SOLAR = false; + formChangeItemTriggers.forEach((fc, _i) => { + console.log("Checking ", fc.item); + switch (fc.item) { + case FormChangeItem.ULTRANECROZIUM_Z: + foundULTRA_Z = true; + break; + case FormChangeItem.N_LUNARIZER: + foundN_LUNA = true; + break; + case FormChangeItem.N_SOLARIZER: + foundN_SOLAR = true; + break; + } + }); + if (foundULTRA_Z && foundN_LUNA && foundN_SOLAR) { + // all three items are present -> user hasn't acquired any of the N_*ARIZERs -> block ULTRANECROZIUM_Z acquisition. + formChangeItemTriggers = formChangeItemTriggers.filter( + fc => fc.item !== FormChangeItem.ULTRANECROZIUM_Z, + ); + } else { + console.log("DID NOT FIND "); + } + } + return formChangeItemTriggers; + }), + ), + ] + .flat() + .flatMap(fc => fc.item) + .filter(i => (i && i < 100) === isRareFormChangeItem); // convert it into a set to remove duplicate values, which can appear when the same species with a potential form change is in the party. if (!formChangeItemPool.length) { @@ -1192,45 +1687,37 @@ class FormChangeItemModifierTypeGenerator extends ModifierTypeGenerator { } } -export class TerastallizeModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType { - private teraType: Type; - - constructor(teraType: Type) { - super("", `${Type[teraType].toLowerCase()}_tera_shard`, (type, args) => new TerastallizeModifier(type as TerastallizeModifierType, (args[0] as Pokemon).id, teraType), "tera_shard"); - - this.teraType = teraType; - } - - get name(): string { - return i18next.t("modifierType:ModifierType.TerastallizeModifierType.name", { teraType: i18next.t(`pokemonInfo:Type.${Type[this.teraType]}`) }); - } - - getDescription(): string { - return i18next.t("modifierType:ModifierType.TerastallizeModifierType.description", { teraType: i18next.t(`pokemonInfo:Type.${Type[this.teraType]}`) }); - } - - getPregenArgs(): any[] { - return [ this.teraType ]; - } -} - export class ContactHeldItemTransferChanceModifierType extends PokemonHeldItemModifierType { - private chancePercent: integer; + private chancePercent: number; - constructor(localeKey: string, iconImage: string, chancePercent: integer, group?: string, soundName?: string) { - super(localeKey, iconImage, (type, args) => new ContactHeldItemTransferChanceModifier(type, (args[0] as Pokemon).id, chancePercent), group, soundName); + constructor(localeKey: string, iconImage: string, chancePercent: number, group?: string, soundName?: string) { + super( + localeKey, + iconImage, + (type, args) => new ContactHeldItemTransferChanceModifier(type, (args[0] as Pokemon).id, chancePercent), + group, + soundName, + ); this.chancePercent = chancePercent; } getDescription(): string { - return i18next.t("modifierType:ModifierType.ContactHeldItemTransferChanceModifierType.description", { chancePercent: this.chancePercent }); + return i18next.t("modifierType:ModifierType.ContactHeldItemTransferChanceModifierType.description", { + chancePercent: this.chancePercent, + }); } } export class TurnHeldItemTransferModifierType extends PokemonHeldItemModifierType { constructor(localeKey: string, iconImage: string, group?: string, soundName?: string) { - super(localeKey, iconImage, (type, args) => new TurnHeldItemTransferModifier(type, (args[0] as Pokemon).id), group, soundName); + super( + localeKey, + iconImage, + (type, args) => new TurnHeldItemTransferModifier(type, (args[0] as Pokemon).id), + group, + soundName, + ); } getDescription(): string { @@ -1239,11 +1726,16 @@ export class TurnHeldItemTransferModifierType extends PokemonHeldItemModifierTyp } export class EnemyAttackStatusEffectChanceModifierType extends ModifierType { - private chancePercent: integer; + private chancePercent: number; private effect: StatusEffect; - constructor(localeKey: string, iconImage: string, chancePercent: integer, effect: StatusEffect, stackCount?: integer) { - super(localeKey, iconImage, (type, _args) => new EnemyAttackStatusEffectChanceModifier(type, effect, chancePercent, stackCount), "enemy_status_chance"); + constructor(localeKey: string, iconImage: string, chancePercent: number, effect: StatusEffect, stackCount?: number) { + super( + localeKey, + iconImage, + (type, _args) => new EnemyAttackStatusEffectChanceModifier(type, effect, chancePercent, stackCount), + "enemy_status_chance", + ); this.chancePercent = chancePercent; this.effect = effect; @@ -1267,12 +1759,14 @@ export class EnemyEndureChanceModifierType extends ModifierType { } getDescription(): string { - return i18next.t("modifierType:ModifierType.EnemyEndureChanceModifierType.description", { chancePercent: this.chancePercent }); + return i18next.t("modifierType:ModifierType.EnemyEndureChanceModifierType.description", { + chancePercent: this.chancePercent, + }); } } export type ModifierTypeFunc = () => ModifierType; -type WeightedModifierTypeWeightFunc = (party: Pokemon[], rerollCount?: integer) => integer; +type WeightedModifierTypeWeightFunc = (party: Pokemon[], rerollCount?: number) => number; /** * High order function that returns a WeightedModifierTypeWeightFunc that will only be applied on @@ -1281,9 +1775,9 @@ type WeightedModifierTypeWeightFunc = (party: Pokemon[], rerollCount?: integer) * @param defaultWeight - ModifierType default weight * @returns A WeightedModifierTypeWeightFunc */ -function skipInClassicAfterWave(wave: integer, defaultWeight: integer): WeightedModifierTypeWeightFunc { +function skipInClassicAfterWave(wave: number, defaultWeight: number): WeightedModifierTypeWeightFunc { return () => { - const gameMode = globalScene.gameMode; + const gameMode = globalScene.gameMode; const currentWave = globalScene.currentBattle.waveIndex; return gameMode.isClassic && currentWave >= wave ? 0 : defaultWeight; }; @@ -1295,7 +1789,7 @@ function skipInClassicAfterWave(wave: integer, defaultWeight: integer): Weighted * @param defaultWeight ModifierType default weight * @returns A WeightedModifierTypeWeightFunc */ -function skipInLastClassicWaveOrDefault(defaultWeight: integer) : WeightedModifierTypeWeightFunc { +function skipInLastClassicWaveOrDefault(defaultWeight: number): WeightedModifierTypeWeightFunc { return skipInClassicAfterWave(199, defaultWeight); } @@ -1309,15 +1803,23 @@ function skipInLastClassicWaveOrDefault(defaultWeight: integer) : WeightedModifi function lureWeightFunc(maxBattles: number, weight: number): WeightedModifierTypeWeightFunc { return () => { const lures = globalScene.getModifiers(DoubleBattleChanceBoosterModifier); - return !(globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex === 199) && (lures.length === 0 || lures.filter(m => m.getMaxBattles() === maxBattles && m.getBattleCount() >= maxBattles * 0.6).length === 0) ? weight : 0; + return !(globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex === 199) && + (lures.length === 0 || + lures.filter(m => m.getMaxBattles() === maxBattles && m.getBattleCount() >= maxBattles * 0.6).length === 0) + ? weight + : 0; }; } class WeightedModifierType { public modifierType: ModifierType; - public weight: integer | WeightedModifierTypeWeightFunc; - public maxWeight: integer | WeightedModifierTypeWeightFunc; + public weight: number | WeightedModifierTypeWeightFunc; + public maxWeight: number | WeightedModifierTypeWeightFunc; - constructor(modifierTypeFunc: ModifierTypeFunc, weight: integer | WeightedModifierTypeWeightFunc, maxWeight?: integer | WeightedModifierTypeWeightFunc) { + constructor( + modifierTypeFunc: ModifierTypeFunc, + weight: number | WeightedModifierTypeWeightFunc, + maxWeight?: number | WeightedModifierTypeWeightFunc, + ) { this.modifierType = modifierTypeFunc(); this.modifierType.id = Object.keys(modifierTypes).find(k => modifierTypes[k] === modifierTypeFunc)!; // TODO: is this bang correct? this.weight = weight; @@ -1356,7 +1858,7 @@ export type GeneratorModifierOverride = { } | { name: keyof Pick; - type?: Type; + type?: PokemonType; } | { name: keyof Pick; @@ -1396,20 +1898,42 @@ export const modifierTypes = { FORM_CHANGE_ITEM: () => new FormChangeItemModifierTypeGenerator(false), RARE_FORM_CHANGE_ITEM: () => new FormChangeItemModifierTypeGenerator(true), - EVOLUTION_TRACKER_GIMMIGHOUL: () => new PokemonHeldItemModifierType("modifierType:ModifierType.EVOLUTION_TRACKER_GIMMIGHOUL", "relic_gold", - (type, args) => new EvoTrackerModifier(type, (args[0] as Pokemon).id, Species.GIMMIGHOUL, 10)), + EVOLUTION_TRACKER_GIMMIGHOUL: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.EVOLUTION_TRACKER_GIMMIGHOUL", + "relic_gold", + (type, args) => new EvoTrackerModifier(type, (args[0] as Pokemon).id, Species.GIMMIGHOUL, 10), + ), - MEGA_BRACELET: () => new ModifierType("modifierType:ModifierType.MEGA_BRACELET", "mega_bracelet", (type, _args) => new MegaEvolutionAccessModifier(type)), - DYNAMAX_BAND: () => new ModifierType("modifierType:ModifierType.DYNAMAX_BAND", "dynamax_band", (type, _args) => new GigantamaxAccessModifier(type)), - TERA_ORB: () => new ModifierType("modifierType:ModifierType.TERA_ORB", "tera_orb", (type, _args) => new TerastallizeAccessModifier(type)), + MEGA_BRACELET: () => + new ModifierType( + "modifierType:ModifierType.MEGA_BRACELET", + "mega_bracelet", + (type, _args) => new MegaEvolutionAccessModifier(type), + ), + DYNAMAX_BAND: () => + new ModifierType( + "modifierType:ModifierType.DYNAMAX_BAND", + "dynamax_band", + (type, _args) => new GigantamaxAccessModifier(type), + ), + TERA_ORB: () => + new ModifierType( + "modifierType:ModifierType.TERA_ORB", + "tera_orb", + (type, _args) => new TerastallizeAccessModifier(type), + ), MAP: () => new ModifierType("modifierType:ModifierType.MAP", "map", (type, _args) => new MapModifier(type)), POTION: () => new PokemonHpRestoreModifierType("modifierType:ModifierType.POTION", "potion", 20, 10), - SUPER_POTION: () => new PokemonHpRestoreModifierType("modifierType:ModifierType.SUPER_POTION", "super_potion", 50, 25), - HYPER_POTION: () => new PokemonHpRestoreModifierType("modifierType:ModifierType.HYPER_POTION", "hyper_potion", 200, 50), + SUPER_POTION: () => + new PokemonHpRestoreModifierType("modifierType:ModifierType.SUPER_POTION", "super_potion", 50, 25), + HYPER_POTION: () => + new PokemonHpRestoreModifierType("modifierType:ModifierType.HYPER_POTION", "hyper_potion", 200, 50), MAX_POTION: () => new PokemonHpRestoreModifierType("modifierType:ModifierType.MAX_POTION", "max_potion", 0, 100), - FULL_RESTORE: () => new PokemonHpRestoreModifierType("modifierType:ModifierType.FULL_RESTORE", "full_restore", 0, 100, true), + FULL_RESTORE: () => + new PokemonHpRestoreModifierType("modifierType:ModifierType.FULL_RESTORE", "full_restore", 0, 100, true), REVIVE: () => new PokemonReviveModifierType("modifierType:ModifierType.REVIVE", "revive", 50), MAX_REVIVE: () => new PokemonReviveModifierType("modifierType:ModifierType.MAX_REVIVE", "max_revive", 100), @@ -1418,8 +1942,18 @@ export const modifierTypes = { SACRED_ASH: () => new AllPokemonFullReviveModifierType("modifierType:ModifierType.SACRED_ASH", "sacred_ash"), - REVIVER_SEED: () => new PokemonHeldItemModifierType("modifierType:ModifierType.REVIVER_SEED", "reviver_seed", (type, args) => new PokemonInstantReviveModifier(type, (args[0] as Pokemon).id)), - WHITE_HERB: () => new PokemonHeldItemModifierType("modifierType:ModifierType.WHITE_HERB", "white_herb", (type, args) => new ResetNegativeStatStageModifier(type, (args[0] as Pokemon).id)), + REVIVER_SEED: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.REVIVER_SEED", + "reviver_seed", + (type, args) => new PokemonInstantReviveModifier(type, (args[0] as Pokemon).id), + ), + WHITE_HERB: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.WHITE_HERB", + "white_herb", + (type, args) => new ResetNegativeStatStageModifier(type, (args[0] as Pokemon).id), + ), ETHER: () => new PokemonPpRestoreModifierType("modifierType:ModifierType.ETHER", "ether", 10), MAX_ETHER: () => new PokemonPpRestoreModifierType("modifierType:ModifierType.MAX_ETHER", "max_ether", -1), @@ -1442,61 +1976,72 @@ export const modifierTypes = { TEMP_STAT_STAGE_BOOSTER: () => new TempStatStageBoosterModifierTypeGenerator(), - DIRE_HIT: () => new class extends ModifierType { - getDescription(): string { - return i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.description", { - stat: i18next.t("modifierType:ModifierType.DIRE_HIT.extra.raises"), - amount: i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.extra.stage") - }); - } - }("modifierType:ModifierType.DIRE_HIT", "dire_hit", (type, _args) => new TempCritBoosterModifier(type, 5)), + DIRE_HIT: () => + new (class extends ModifierType { + getDescription(): string { + return i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.description", { + stat: i18next.t("modifierType:ModifierType.DIRE_HIT.extra.raises"), + amount: i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.extra.stage"), + }); + } + })("modifierType:ModifierType.DIRE_HIT", "dire_hit", (type, _args) => new TempCritBoosterModifier(type, 5)), BASE_STAT_BOOSTER: () => new BaseStatBoosterModifierTypeGenerator(), ATTACK_TYPE_BOOSTER: () => new AttackTypeBoosterModifierTypeGenerator(), - MINT: () => new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Nature)) { - return new PokemonNatureChangeModifierType(pregenArgs[0] as Nature); - } - return new PokemonNatureChangeModifierType(randSeedInt(getEnumValues(Nature).length) as Nature); - }), + MINT: () => + new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => { + if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in Nature) { + return new PokemonNatureChangeModifierType(pregenArgs[0] as Nature); + } + return new PokemonNatureChangeModifierType(randSeedInt(getEnumValues(Nature).length) as Nature); + }), - TERA_SHARD: () => new ModifierTypeGenerator((party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Type)) { - return new TerastallizeModifierType(pregenArgs[0] as Type); - } - if (!globalScene.getModifiers(TerastallizeAccessModifier).length) { - return null; - } - let type: Type; - if (!randSeedInt(3)) { - const partyMemberTypes = party.map(p => p.getTypes(false, false, true)).flat(); - type = randSeedItem(partyMemberTypes); - } else { - type = randSeedInt(64) ? randSeedInt(18) as Type : Type.STELLAR; - } - return new TerastallizeModifierType(type); - }), + TERA_SHARD: () => + new ModifierTypeGenerator((party: Pokemon[], pregenArgs?: any[]) => { + if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in PokemonType) { + return new TerastallizeModifierType(pregenArgs[0] as PokemonType); + } + if (!globalScene.getModifiers(TerastallizeAccessModifier).length) { + return null; + } + const teraTypes: PokemonType[] = []; + for (const p of party) { + if (!(p.hasSpecies(Species.TERAPAGOS) || p.hasSpecies(Species.OGERPON) || p.hasSpecies(Species.SHEDINJA))) { + teraTypes.push(p.teraType); + } + } + let excludedType = PokemonType.UNKNOWN; + if (teraTypes.length > 0 && teraTypes.filter(t => t === teraTypes[0]).length === teraTypes.length) { + excludedType = teraTypes[0]; + } + let shardType = randSeedInt(64) ? (randSeedInt(18) as PokemonType) : PokemonType.STELLAR; + while (shardType === excludedType) { + shardType = randSeedInt(64) ? (randSeedInt(18) as PokemonType) : PokemonType.STELLAR; + } + return new TerastallizeModifierType(shardType); + }), - BERRY: () => new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in BerryType)) { - return new BerryModifierType(pregenArgs[0] as BerryType); - } - const berryTypes = getEnumValues(BerryType); - let randBerryType: BerryType; - const rand = randSeedInt(12); - if (rand < 2) { - randBerryType = BerryType.SITRUS; - } else if (rand < 4) { - randBerryType = BerryType.LUM; - } else if (rand < 6) { - randBerryType = BerryType.LEPPA; - } else { - randBerryType = berryTypes[randSeedInt(berryTypes.length - 3) + 2]; - } - return new BerryModifierType(randBerryType); - }), + BERRY: () => + new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => { + if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in BerryType) { + return new BerryModifierType(pregenArgs[0] as BerryType); + } + const berryTypes = getEnumValues(BerryType); + let randBerryType: BerryType; + const rand = randSeedInt(12); + if (rand < 2) { + randBerryType = BerryType.SITRUS; + } else if (rand < 4) { + randBerryType = BerryType.LUM; + } else if (rand < 6) { + randBerryType = BerryType.LEPPA; + } else { + randBerryType = berryTypes[randSeedInt(berryTypes.length - 3) + 2]; + } + return new BerryModifierType(randBerryType); + }), TM_COMMON: () => new TmModifierTypeGenerator(ModifierTier.COMMON), TM_GREAT: () => new TmModifierTypeGenerator(ModifierTier.GREAT), @@ -1504,113 +2049,343 @@ export const modifierTypes = { MEMORY_MUSHROOM: () => new RememberMoveModifierType("modifierType:ModifierType.MEMORY_MUSHROOM", "big_mushroom"), - EXP_SHARE: () => new ModifierType("modifierType:ModifierType.EXP_SHARE", "exp_share", (type, _args) => new ExpShareModifier(type)), - EXP_BALANCE: () => new ModifierType("modifierType:ModifierType.EXP_BALANCE", "exp_balance", (type, _args) => new ExpBalanceModifier(type)), + EXP_SHARE: () => + new ModifierType("modifierType:ModifierType.EXP_SHARE", "exp_share", (type, _args) => new ExpShareModifier(type)), + EXP_BALANCE: () => + new ModifierType( + "modifierType:ModifierType.EXP_BALANCE", + "exp_balance", + (type, _args) => new ExpBalanceModifier(type), + ), - OVAL_CHARM: () => new ModifierType("modifierType:ModifierType.OVAL_CHARM", "oval_charm", (type, _args) => new MultipleParticipantExpBonusModifier(type)), + OVAL_CHARM: () => + new ModifierType( + "modifierType:ModifierType.OVAL_CHARM", + "oval_charm", + (type, _args) => new MultipleParticipantExpBonusModifier(type), + ), EXP_CHARM: () => new ExpBoosterModifierType("modifierType:ModifierType.EXP_CHARM", "exp_charm", 25), SUPER_EXP_CHARM: () => new ExpBoosterModifierType("modifierType:ModifierType.SUPER_EXP_CHARM", "super_exp_charm", 60), - GOLDEN_EXP_CHARM: () => new ExpBoosterModifierType("modifierType:ModifierType.GOLDEN_EXP_CHARM", "golden_exp_charm", 100), + GOLDEN_EXP_CHARM: () => + new ExpBoosterModifierType("modifierType:ModifierType.GOLDEN_EXP_CHARM", "golden_exp_charm", 100), LUCKY_EGG: () => new PokemonExpBoosterModifierType("modifierType:ModifierType.LUCKY_EGG", "lucky_egg", 40), GOLDEN_EGG: () => new PokemonExpBoosterModifierType("modifierType:ModifierType.GOLDEN_EGG", "golden_egg", 100), SOOTHE_BELL: () => new PokemonFriendshipBoosterModifierType("modifierType:ModifierType.SOOTHE_BELL", "soothe_bell"), - SCOPE_LENS: () => new PokemonHeldItemModifierType("modifierType:ModifierType.SCOPE_LENS", "scope_lens", (type, args) => new CritBoosterModifier(type, (args[0] as Pokemon).id, 1)), - LEEK: () => new PokemonHeldItemModifierType("modifierType:ModifierType.LEEK", "leek", (type, args) => new SpeciesCritBoosterModifier(type, (args[0] as Pokemon).id, 2, [ Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD ])), + SCOPE_LENS: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.SCOPE_LENS", + "scope_lens", + (type, args) => new CritBoosterModifier(type, (args[0] as Pokemon).id, 1), + ), + LEEK: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.LEEK", + "leek", + (type, args) => + new SpeciesCritBoosterModifier(type, (args[0] as Pokemon).id, 2, [ + Species.FARFETCHD, + Species.GALAR_FARFETCHD, + Species.SIRFETCHD, + ]), + ), - EVIOLITE: () => new PokemonHeldItemModifierType("modifierType:ModifierType.EVIOLITE", "eviolite", (type, args) => new EvolutionStatBoosterModifier(type, (args[0] as Pokemon).id, [ Stat.DEF, Stat.SPDEF ], 1.5)), + EVIOLITE: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.EVIOLITE", + "eviolite", + (type, args) => new EvolutionStatBoosterModifier(type, (args[0] as Pokemon).id, [Stat.DEF, Stat.SPDEF], 1.5), + ), - SOUL_DEW: () => new PokemonHeldItemModifierType("modifierType:ModifierType.SOUL_DEW", "soul_dew", (type, args) => new PokemonNatureWeightModifier(type, (args[0] as Pokemon).id)), + SOUL_DEW: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.SOUL_DEW", + "soul_dew", + (type, args) => new PokemonNatureWeightModifier(type, (args[0] as Pokemon).id), + ), - NUGGET: () => new MoneyRewardModifierType("modifierType:ModifierType.NUGGET", "nugget", 1, "modifierType:ModifierType.MoneyRewardModifierType.extra.small"), - BIG_NUGGET: () => new MoneyRewardModifierType("modifierType:ModifierType.BIG_NUGGET", "big_nugget", 2.5, "modifierType:ModifierType.MoneyRewardModifierType.extra.moderate"), - RELIC_GOLD: () => new MoneyRewardModifierType("modifierType:ModifierType.RELIC_GOLD", "relic_gold", 10, "modifierType:ModifierType.MoneyRewardModifierType.extra.large"), + NUGGET: () => + new MoneyRewardModifierType( + "modifierType:ModifierType.NUGGET", + "nugget", + 1, + "modifierType:ModifierType.MoneyRewardModifierType.extra.small", + ), + BIG_NUGGET: () => + new MoneyRewardModifierType( + "modifierType:ModifierType.BIG_NUGGET", + "big_nugget", + 2.5, + "modifierType:ModifierType.MoneyRewardModifierType.extra.moderate", + ), + RELIC_GOLD: () => + new MoneyRewardModifierType( + "modifierType:ModifierType.RELIC_GOLD", + "relic_gold", + 10, + "modifierType:ModifierType.MoneyRewardModifierType.extra.large", + ), - AMULET_COIN: () => new ModifierType("modifierType:ModifierType.AMULET_COIN", "amulet_coin", (type, _args) => new MoneyMultiplierModifier(type)), - GOLDEN_PUNCH: () => new PokemonHeldItemModifierType("modifierType:ModifierType.GOLDEN_PUNCH", "golden_punch", (type, args) => new DamageMoneyRewardModifier(type, (args[0] as Pokemon).id)), - COIN_CASE: () => new ModifierType("modifierType:ModifierType.COIN_CASE", "coin_case", (type, _args) => new MoneyInterestModifier(type)), + AMULET_COIN: () => + new ModifierType( + "modifierType:ModifierType.AMULET_COIN", + "amulet_coin", + (type, _args) => new MoneyMultiplierModifier(type), + ), + GOLDEN_PUNCH: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.GOLDEN_PUNCH", + "golden_punch", + (type, args) => new DamageMoneyRewardModifier(type, (args[0] as Pokemon).id), + ), + COIN_CASE: () => + new ModifierType( + "modifierType:ModifierType.COIN_CASE", + "coin_case", + (type, _args) => new MoneyInterestModifier(type), + ), - LOCK_CAPSULE: () => new ModifierType("modifierType:ModifierType.LOCK_CAPSULE", "lock_capsule", (type, _args) => new LockModifierTiersModifier(type)), + LOCK_CAPSULE: () => + new ModifierType( + "modifierType:ModifierType.LOCK_CAPSULE", + "lock_capsule", + (type, _args) => new LockModifierTiersModifier(type), + ), - GRIP_CLAW: () => new ContactHeldItemTransferChanceModifierType("modifierType:ModifierType.GRIP_CLAW", "grip_claw", 10), + GRIP_CLAW: () => + new ContactHeldItemTransferChanceModifierType("modifierType:ModifierType.GRIP_CLAW", "grip_claw", 10), WIDE_LENS: () => new PokemonMoveAccuracyBoosterModifierType("modifierType:ModifierType.WIDE_LENS", "wide_lens", 5), MULTI_LENS: () => new PokemonMultiHitModifierType("modifierType:ModifierType.MULTI_LENS", "zoom_lens"), - HEALING_CHARM: () => new ModifierType("modifierType:ModifierType.HEALING_CHARM", "healing_charm", (type, _args) => new HealingBoosterModifier(type, 1.1)), - CANDY_JAR: () => new ModifierType("modifierType:ModifierType.CANDY_JAR", "candy_jar", (type, _args) => new LevelIncrementBoosterModifier(type)), + HEALING_CHARM: () => + new ModifierType( + "modifierType:ModifierType.HEALING_CHARM", + "healing_charm", + (type, _args) => new HealingBoosterModifier(type, 1.1), + ), + CANDY_JAR: () => + new ModifierType( + "modifierType:ModifierType.CANDY_JAR", + "candy_jar", + (type, _args) => new LevelIncrementBoosterModifier(type), + ), - BERRY_POUCH: () => new ModifierType("modifierType:ModifierType.BERRY_POUCH", "berry_pouch", (type, _args) => new PreserveBerryModifier(type)), + BERRY_POUCH: () => + new ModifierType( + "modifierType:ModifierType.BERRY_POUCH", + "berry_pouch", + (type, _args) => new PreserveBerryModifier(type), + ), - FOCUS_BAND: () => new PokemonHeldItemModifierType("modifierType:ModifierType.FOCUS_BAND", "focus_band", (type, args) => new SurviveDamageModifier(type, (args[0] as Pokemon).id)), + FOCUS_BAND: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.FOCUS_BAND", + "focus_band", + (type, args) => new SurviveDamageModifier(type, (args[0] as Pokemon).id), + ), - QUICK_CLAW: () => new PokemonHeldItemModifierType("modifierType:ModifierType.QUICK_CLAW", "quick_claw", (type, args) => new BypassSpeedChanceModifier(type, (args[0] as Pokemon).id)), + QUICK_CLAW: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.QUICK_CLAW", + "quick_claw", + (type, args) => new BypassSpeedChanceModifier(type, (args[0] as Pokemon).id), + ), - KINGS_ROCK: () => new PokemonHeldItemModifierType("modifierType:ModifierType.KINGS_ROCK", "kings_rock", (type, args) => new FlinchChanceModifier(type, (args[0] as Pokemon).id)), + KINGS_ROCK: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.KINGS_ROCK", + "kings_rock", + (type, args) => new FlinchChanceModifier(type, (args[0] as Pokemon).id), + ), - LEFTOVERS: () => new PokemonHeldItemModifierType("modifierType:ModifierType.LEFTOVERS", "leftovers", (type, args) => new TurnHealModifier(type, (args[0] as Pokemon).id)), - SHELL_BELL: () => new PokemonHeldItemModifierType("modifierType:ModifierType.SHELL_BELL", "shell_bell", (type, args) => new HitHealModifier(type, (args[0] as Pokemon).id)), + LEFTOVERS: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.LEFTOVERS", + "leftovers", + (type, args) => new TurnHealModifier(type, (args[0] as Pokemon).id), + ), + SHELL_BELL: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.SHELL_BELL", + "shell_bell", + (type, args) => new HitHealModifier(type, (args[0] as Pokemon).id), + ), - TOXIC_ORB: () => new PokemonHeldItemModifierType("modifierType:ModifierType.TOXIC_ORB", "toxic_orb", (type, args) => new TurnStatusEffectModifier(type, (args[0] as Pokemon).id)), - FLAME_ORB: () => new PokemonHeldItemModifierType("modifierType:ModifierType.FLAME_ORB", "flame_orb", (type, args) => new TurnStatusEffectModifier(type, (args[0] as Pokemon).id)), + TOXIC_ORB: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.TOXIC_ORB", + "toxic_orb", + (type, args) => new TurnStatusEffectModifier(type, (args[0] as Pokemon).id), + ), + FLAME_ORB: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.FLAME_ORB", + "flame_orb", + (type, args) => new TurnStatusEffectModifier(type, (args[0] as Pokemon).id), + ), - BATON: () => new PokemonHeldItemModifierType("modifierType:ModifierType.BATON", "baton", (type, args) => new SwitchEffectTransferModifier(type, (args[0] as Pokemon).id)), + BATON: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.BATON", + "baton", + (type, args) => new SwitchEffectTransferModifier(type, (args[0] as Pokemon).id), + ), - SHINY_CHARM: () => new ModifierType("modifierType:ModifierType.SHINY_CHARM", "shiny_charm", (type, _args) => new ShinyRateBoosterModifier(type)), - ABILITY_CHARM: () => new ModifierType("modifierType:ModifierType.ABILITY_CHARM", "ability_charm", (type, _args) => new HiddenAbilityRateBoosterModifier(type)), - CATCHING_CHARM: () => new ModifierType("modifierType:ModifierType.CATCHING_CHARM", "catching_charm", (type, _args) => new CriticalCatchChanceBoosterModifier(type)), + SHINY_CHARM: () => + new ModifierType( + "modifierType:ModifierType.SHINY_CHARM", + "shiny_charm", + (type, _args) => new ShinyRateBoosterModifier(type), + ), + ABILITY_CHARM: () => + new ModifierType( + "modifierType:ModifierType.ABILITY_CHARM", + "ability_charm", + (type, _args) => new HiddenAbilityRateBoosterModifier(type), + ), + CATCHING_CHARM: () => + new ModifierType( + "modifierType:ModifierType.CATCHING_CHARM", + "catching_charm", + (type, _args) => new CriticalCatchChanceBoosterModifier(type), + ), - IV_SCANNER: () => new ModifierType("modifierType:ModifierType.IV_SCANNER", "scanner", (type, _args) => new IvScannerModifier(type)), + IV_SCANNER: () => + new ModifierType("modifierType:ModifierType.IV_SCANNER", "scanner", (type, _args) => new IvScannerModifier(type)), DNA_SPLICERS: () => new FusePokemonModifierType("modifierType:ModifierType.DNA_SPLICERS", "dna_splicers"), - MINI_BLACK_HOLE: () => new TurnHeldItemTransferModifierType("modifierType:ModifierType.MINI_BLACK_HOLE", "mini_black_hole"), + MINI_BLACK_HOLE: () => + new TurnHeldItemTransferModifierType("modifierType:ModifierType.MINI_BLACK_HOLE", "mini_black_hole"), VOUCHER: () => new AddVoucherModifierType(VoucherType.REGULAR, 1), VOUCHER_PLUS: () => new AddVoucherModifierType(VoucherType.PLUS, 1), VOUCHER_PREMIUM: () => new AddVoucherModifierType(VoucherType.PREMIUM, 1), - GOLDEN_POKEBALL: () => new ModifierType("modifierType:ModifierType.GOLDEN_POKEBALL", "pb_gold", (type, _args) => new ExtraModifierModifier(type), undefined, "se/pb_bounce_1"), - SILVER_POKEBALL: () => new ModifierType("modifierType:ModifierType.SILVER_POKEBALL", "pb_silver", (type, _args) => new TempExtraModifierModifier(type, 100), undefined, "se/pb_bounce_1"), + GOLDEN_POKEBALL: () => + new ModifierType( + "modifierType:ModifierType.GOLDEN_POKEBALL", + "pb_gold", + (type, _args) => new ExtraModifierModifier(type), + undefined, + "se/pb_bounce_1", + ), + SILVER_POKEBALL: () => + new ModifierType( + "modifierType:ModifierType.SILVER_POKEBALL", + "pb_silver", + (type, _args) => new TempExtraModifierModifier(type, 100), + undefined, + "se/pb_bounce_1", + ), - ENEMY_DAMAGE_BOOSTER: () => new ModifierType("modifierType:ModifierType.ENEMY_DAMAGE_BOOSTER", "wl_item_drop", (type, _args) => new EnemyDamageBoosterModifier(type, 5)), - ENEMY_DAMAGE_REDUCTION: () => new ModifierType("modifierType:ModifierType.ENEMY_DAMAGE_REDUCTION", "wl_guard_spec", (type, _args) => new EnemyDamageReducerModifier(type, 2.5)), + ENEMY_DAMAGE_BOOSTER: () => + new ModifierType( + "modifierType:ModifierType.ENEMY_DAMAGE_BOOSTER", + "wl_item_drop", + (type, _args) => new EnemyDamageBoosterModifier(type, 5), + ), + ENEMY_DAMAGE_REDUCTION: () => + new ModifierType( + "modifierType:ModifierType.ENEMY_DAMAGE_REDUCTION", + "wl_guard_spec", + (type, _args) => new EnemyDamageReducerModifier(type, 2.5), + ), //ENEMY_SUPER_EFFECT_BOOSTER: () => new ModifierType('Type Advantage Token', 'Increases damage of super effective attacks by 30%', (type, _args) => new EnemySuperEffectiveDamageBoosterModifier(type, 30), 'wl_custom_super_effective'), - ENEMY_HEAL: () => new ModifierType("modifierType:ModifierType.ENEMY_HEAL", "wl_potion", (type, _args) => new EnemyTurnHealModifier(type, 2, 10)), - ENEMY_ATTACK_POISON_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType("modifierType:ModifierType.ENEMY_ATTACK_POISON_CHANCE", "wl_antidote", 5, StatusEffect.POISON, 10), - ENEMY_ATTACK_PARALYZE_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType("modifierType:ModifierType.ENEMY_ATTACK_PARALYZE_CHANCE", "wl_paralyze_heal", 2.5, StatusEffect.PARALYSIS, 10), - ENEMY_ATTACK_BURN_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType("modifierType:ModifierType.ENEMY_ATTACK_BURN_CHANCE", "wl_burn_heal", 5, StatusEffect.BURN, 10), - ENEMY_STATUS_EFFECT_HEAL_CHANCE: () => new ModifierType("modifierType:ModifierType.ENEMY_STATUS_EFFECT_HEAL_CHANCE", "wl_full_heal", (type, _args) => new EnemyStatusEffectHealChanceModifier(type, 2.5, 10)), - ENEMY_ENDURE_CHANCE: () => new EnemyEndureChanceModifierType("modifierType:ModifierType.ENEMY_ENDURE_CHANCE", "wl_reset_urge", 2), - ENEMY_FUSED_CHANCE: () => new ModifierType("modifierType:ModifierType.ENEMY_FUSED_CHANCE", "wl_custom_spliced", (type, _args) => new EnemyFusionChanceModifier(type, 1)), + ENEMY_HEAL: () => + new ModifierType( + "modifierType:ModifierType.ENEMY_HEAL", + "wl_potion", + (type, _args) => new EnemyTurnHealModifier(type, 2, 10), + ), + ENEMY_ATTACK_POISON_CHANCE: () => + new EnemyAttackStatusEffectChanceModifierType( + "modifierType:ModifierType.ENEMY_ATTACK_POISON_CHANCE", + "wl_antidote", + 5, + StatusEffect.POISON, + 10, + ), + ENEMY_ATTACK_PARALYZE_CHANCE: () => + new EnemyAttackStatusEffectChanceModifierType( + "modifierType:ModifierType.ENEMY_ATTACK_PARALYZE_CHANCE", + "wl_paralyze_heal", + 2.5, + StatusEffect.PARALYSIS, + 10, + ), + ENEMY_ATTACK_BURN_CHANCE: () => + new EnemyAttackStatusEffectChanceModifierType( + "modifierType:ModifierType.ENEMY_ATTACK_BURN_CHANCE", + "wl_burn_heal", + 5, + StatusEffect.BURN, + 10, + ), + ENEMY_STATUS_EFFECT_HEAL_CHANCE: () => + new ModifierType( + "modifierType:ModifierType.ENEMY_STATUS_EFFECT_HEAL_CHANCE", + "wl_full_heal", + (type, _args) => new EnemyStatusEffectHealChanceModifier(type, 2.5, 10), + ), + ENEMY_ENDURE_CHANCE: () => + new EnemyEndureChanceModifierType("modifierType:ModifierType.ENEMY_ENDURE_CHANCE", "wl_reset_urge", 2), + ENEMY_FUSED_CHANCE: () => + new ModifierType( + "modifierType:ModifierType.ENEMY_FUSED_CHANCE", + "wl_custom_spliced", + (type, _args) => new EnemyFusionChanceModifier(type, 1), + ), - MYSTERY_ENCOUNTER_SHUCKLE_JUICE: () => new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs) { - return new PokemonBaseStatTotalModifierType(pregenArgs[0] as number); - } - return new PokemonBaseStatTotalModifierType(randSeedInt(20, 1)); - }), - MYSTERY_ENCOUNTER_OLD_GATEAU: () => new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs) { - return new PokemonBaseStatFlatModifierType(pregenArgs[0] as number, pregenArgs[1] as Stat[]); - } - return new PokemonBaseStatFlatModifierType(randSeedInt(20, 1), [ Stat.HP, Stat.ATK, Stat.DEF ]); - }), - MYSTERY_ENCOUNTER_BLACK_SLUDGE: () => new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => { - if (pregenArgs) { - return new ModifierType("modifierType:ModifierType.MYSTERY_ENCOUNTER_BLACK_SLUDGE", "black_sludge", (type, _args) => new HealShopCostModifier(type, pregenArgs[0] as number)); - } - return new ModifierType("modifierType:ModifierType.MYSTERY_ENCOUNTER_BLACK_SLUDGE", "black_sludge", (type, _args) => new HealShopCostModifier(type, 2.5)); - }), - MYSTERY_ENCOUNTER_MACHO_BRACE: () => new PokemonHeldItemModifierType("modifierType:ModifierType.MYSTERY_ENCOUNTER_MACHO_BRACE", "macho_brace", (type, args) => new PokemonIncrementingStatModifier(type, (args[0] as Pokemon).id)), - MYSTERY_ENCOUNTER_GOLDEN_BUG_NET: () => new ModifierType("modifierType:ModifierType.MYSTERY_ENCOUNTER_GOLDEN_BUG_NET", "golden_net", (type, _args) => new BoostBugSpawnModifier(type)), + MYSTERY_ENCOUNTER_SHUCKLE_JUICE: () => + new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => { + if (pregenArgs) { + return new PokemonBaseStatTotalModifierType(pregenArgs[0] as number); + } + return new PokemonBaseStatTotalModifierType(randSeedInt(20, 1)); + }), + MYSTERY_ENCOUNTER_OLD_GATEAU: () => + new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => { + if (pregenArgs) { + return new PokemonBaseStatFlatModifierType(pregenArgs[0] as number, pregenArgs[1] as Stat[]); + } + return new PokemonBaseStatFlatModifierType(randSeedInt(20, 1), [Stat.HP, Stat.ATK, Stat.DEF]); + }), + MYSTERY_ENCOUNTER_BLACK_SLUDGE: () => + new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => { + if (pregenArgs) { + return new ModifierType( + "modifierType:ModifierType.MYSTERY_ENCOUNTER_BLACK_SLUDGE", + "black_sludge", + (type, _args) => new HealShopCostModifier(type, pregenArgs[0] as number), + ); + } + return new ModifierType( + "modifierType:ModifierType.MYSTERY_ENCOUNTER_BLACK_SLUDGE", + "black_sludge", + (type, _args) => new HealShopCostModifier(type, 2.5), + ); + }), + MYSTERY_ENCOUNTER_MACHO_BRACE: () => + new PokemonHeldItemModifierType( + "modifierType:ModifierType.MYSTERY_ENCOUNTER_MACHO_BRACE", + "macho_brace", + (type, args) => new PokemonIncrementingStatModifier(type, (args[0] as Pokemon).id), + ), + MYSTERY_ENCOUNTER_GOLDEN_BUG_NET: () => + new ModifierType( + "modifierType:ModifierType.MYSTERY_ENCOUNTER_GOLDEN_BUG_NET", + "golden_net", + (type, _args) => new BoostBugSpawnModifier(type), + ), }; interface ModifierPool { - [tier: string]: WeightedModifierType[] + [tier: string]: WeightedModifierType[]; } /** @@ -1619,219 +2394,422 @@ interface ModifierPool { * @returns boolean: true if the player has the maximum of a given ball type */ function hasMaximumBalls(ballType: PokeballType): boolean { - return (globalScene.gameMode.isClassic && globalScene.pokeballCounts[ballType] >= MAX_PER_TYPE_POKEBALLS); + return globalScene.gameMode.isClassic && globalScene.pokeballCounts[ballType] >= MAX_PER_TYPE_POKEBALLS; } const modifierPool: ModifierPool = { [ModifierTier.COMMON]: [ - new WeightedModifierType(modifierTypes.POKEBALL, () => (hasMaximumBalls(PokeballType.POKEBALL)) ? 0 : 6, 6), + new WeightedModifierType(modifierTypes.POKEBALL, () => (hasMaximumBalls(PokeballType.POKEBALL) ? 0 : 6), 6), new WeightedModifierType(modifierTypes.RARE_CANDY, 2), - new WeightedModifierType(modifierTypes.POTION, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 10 && p.getHpRatio() <= 0.875) && !p.isFainted()).length, 3); - return thresholdPartyMemberCount * 3; - }, 9), - new WeightedModifierType(modifierTypes.SUPER_POTION, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 25 && p.getHpRatio() <= 0.75) && !p.isFainted()).length, 3); - return thresholdPartyMemberCount; - }, 3), - new WeightedModifierType(modifierTypes.ETHER, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) - && p.getMoveset().filter(m => m?.ppUsed && (m.getMovePp() - m.ppUsed) <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)).length).length, 3); - return thresholdPartyMemberCount * 3; - }, 9), - new WeightedModifierType(modifierTypes.MAX_ETHER, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) - && p.getMoveset().filter(m => m?.ppUsed && (m.getMovePp() - m.ppUsed) <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)).length).length, 3); - return thresholdPartyMemberCount; - }, 3), + new WeightedModifierType( + modifierTypes.POTION, + (party: Pokemon[]) => { + const thresholdPartyMemberCount = Math.min( + party.filter(p => p.getInverseHp() >= 10 && p.getHpRatio() <= 0.875 && !p.isFainted()).length, + 3, + ); + return thresholdPartyMemberCount * 3; + }, + 9, + ), + new WeightedModifierType( + modifierTypes.SUPER_POTION, + (party: Pokemon[]) => { + const thresholdPartyMemberCount = Math.min( + party.filter(p => p.getInverseHp() >= 25 && p.getHpRatio() <= 0.75 && !p.isFainted()).length, + 3, + ); + return thresholdPartyMemberCount; + }, + 3, + ), + new WeightedModifierType( + modifierTypes.ETHER, + (party: Pokemon[]) => { + const thresholdPartyMemberCount = Math.min( + party.filter( + p => + p.hp && + !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) && + p + .getMoveset() + .filter(m => m?.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)) + .length, + ).length, + 3, + ); + return thresholdPartyMemberCount * 3; + }, + 9, + ), + new WeightedModifierType( + modifierTypes.MAX_ETHER, + (party: Pokemon[]) => { + const thresholdPartyMemberCount = Math.min( + party.filter( + p => + p.hp && + !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) && + p + .getMoveset() + .filter(m => m?.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)) + .length, + ).length, + 3, + ); + return thresholdPartyMemberCount; + }, + 3, + ), new WeightedModifierType(modifierTypes.LURE, lureWeightFunc(10, 2)), new WeightedModifierType(modifierTypes.TEMP_STAT_STAGE_BOOSTER, 4), new WeightedModifierType(modifierTypes.BERRY, 2), new WeightedModifierType(modifierTypes.TM_COMMON, 2), ].map(m => { - m.setTier(ModifierTier.COMMON); return m; + m.setTier(ModifierTier.COMMON); + return m; }), [ModifierTier.GREAT]: [ - new WeightedModifierType(modifierTypes.GREAT_BALL, () => (hasMaximumBalls(PokeballType.GREAT_BALL)) ? 0 : 6, 6), + new WeightedModifierType(modifierTypes.GREAT_BALL, () => (hasMaximumBalls(PokeballType.GREAT_BALL) ? 0 : 6), 6), new WeightedModifierType(modifierTypes.PP_UP, 2), - new WeightedModifierType(modifierTypes.FULL_HEAL, (party: Pokemon[]) => { - const statusEffectPartyMemberCount = Math.min(party.filter(p => p.hp && !!p.status && !p.getHeldItems().some(i => { - if (i instanceof TurnStatusEffectModifier) { - return (i as TurnStatusEffectModifier).getStatusEffect() === p.status?.effect; - } - return false; - })).length, 3); - return statusEffectPartyMemberCount * 6; - }, 18), - new WeightedModifierType(modifierTypes.REVIVE, (party: Pokemon[]) => { - const faintedPartyMemberCount = Math.min(party.filter(p => p.isFainted()).length, 3); - return faintedPartyMemberCount * 9; - }, 27), - new WeightedModifierType(modifierTypes.MAX_REVIVE, (party: Pokemon[]) => { - const faintedPartyMemberCount = Math.min(party.filter(p => p.isFainted()).length, 3); - return faintedPartyMemberCount * 3; - }, 9), - new WeightedModifierType(modifierTypes.SACRED_ASH, (party: Pokemon[]) => { - return party.filter(p => p.isFainted()).length >= Math.ceil(party.length / 2) ? 1 : 0; - }, 1), - new WeightedModifierType(modifierTypes.HYPER_POTION, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 100 && p.getHpRatio() <= 0.625) && !p.isFainted()).length, 3); - return thresholdPartyMemberCount * 3; - }, 9), - new WeightedModifierType(modifierTypes.MAX_POTION, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 100 && p.getHpRatio() <= 0.5) && !p.isFainted()).length, 3); - return thresholdPartyMemberCount; - }, 3), - new WeightedModifierType(modifierTypes.FULL_RESTORE, (party: Pokemon[]) => { - const statusEffectPartyMemberCount = Math.min(party.filter(p => p.hp && !!p.status && !p.getHeldItems().some(i => { - if (i instanceof TurnStatusEffectModifier) { - return (i as TurnStatusEffectModifier).getStatusEffect() === p.status?.effect; - } - return false; - })).length, 3); - const thresholdPartyMemberCount = Math.floor((Math.min(party.filter(p => (p.getInverseHp() >= 100 && p.getHpRatio() <= 0.5) && !p.isFainted()).length, 3) + statusEffectPartyMemberCount) / 2); - return thresholdPartyMemberCount; - }, 3), - new WeightedModifierType(modifierTypes.ELIXIR, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) - && p.getMoveset().filter(m => m?.ppUsed && (m.getMovePp() - m.ppUsed) <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)).length).length, 3); - return thresholdPartyMemberCount * 3; - }, 9), - new WeightedModifierType(modifierTypes.MAX_ELIXIR, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) - && p.getMoveset().filter(m => m?.ppUsed && (m.getMovePp() - m.ppUsed) <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)).length).length, 3); - return thresholdPartyMemberCount; - }, 3), + new WeightedModifierType( + modifierTypes.FULL_HEAL, + (party: Pokemon[]) => { + const statusEffectPartyMemberCount = Math.min( + party.filter( + p => + p.hp && + !!p.status && + !p.getHeldItems().some(i => { + if (i instanceof TurnStatusEffectModifier) { + return (i as TurnStatusEffectModifier).getStatusEffect() === p.status?.effect; + } + return false; + }), + ).length, + 3, + ); + return statusEffectPartyMemberCount * 6; + }, + 18, + ), + new WeightedModifierType( + modifierTypes.REVIVE, + (party: Pokemon[]) => { + const faintedPartyMemberCount = Math.min(party.filter(p => p.isFainted()).length, 3); + return faintedPartyMemberCount * 9; + }, + 27, + ), + new WeightedModifierType( + modifierTypes.MAX_REVIVE, + (party: Pokemon[]) => { + const faintedPartyMemberCount = Math.min(party.filter(p => p.isFainted()).length, 3); + return faintedPartyMemberCount * 3; + }, + 9, + ), + new WeightedModifierType( + modifierTypes.SACRED_ASH, + (party: Pokemon[]) => { + return party.filter(p => p.isFainted()).length >= Math.ceil(party.length / 2) ? 1 : 0; + }, + 1, + ), + new WeightedModifierType( + modifierTypes.HYPER_POTION, + (party: Pokemon[]) => { + const thresholdPartyMemberCount = Math.min( + party.filter(p => p.getInverseHp() >= 100 && p.getHpRatio() <= 0.625 && !p.isFainted()).length, + 3, + ); + return thresholdPartyMemberCount * 3; + }, + 9, + ), + new WeightedModifierType( + modifierTypes.MAX_POTION, + (party: Pokemon[]) => { + const thresholdPartyMemberCount = Math.min( + party.filter(p => p.getInverseHp() >= 100 && p.getHpRatio() <= 0.5 && !p.isFainted()).length, + 3, + ); + return thresholdPartyMemberCount; + }, + 3, + ), + new WeightedModifierType( + modifierTypes.FULL_RESTORE, + (party: Pokemon[]) => { + const statusEffectPartyMemberCount = Math.min( + party.filter( + p => + p.hp && + !!p.status && + !p.getHeldItems().some(i => { + if (i instanceof TurnStatusEffectModifier) { + return (i as TurnStatusEffectModifier).getStatusEffect() === p.status?.effect; + } + return false; + }), + ).length, + 3, + ); + const thresholdPartyMemberCount = Math.floor( + (Math.min(party.filter(p => p.getInverseHp() >= 100 && p.getHpRatio() <= 0.5 && !p.isFainted()).length, 3) + + statusEffectPartyMemberCount) / + 2, + ); + return thresholdPartyMemberCount; + }, + 3, + ), + new WeightedModifierType( + modifierTypes.ELIXIR, + (party: Pokemon[]) => { + const thresholdPartyMemberCount = Math.min( + party.filter( + p => + p.hp && + !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) && + p + .getMoveset() + .filter(m => m?.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)) + .length, + ).length, + 3, + ); + return thresholdPartyMemberCount * 3; + }, + 9, + ), + new WeightedModifierType( + modifierTypes.MAX_ELIXIR, + (party: Pokemon[]) => { + const thresholdPartyMemberCount = Math.min( + party.filter( + p => + p.hp && + !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) && + p + .getMoveset() + .filter(m => m?.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)) + .length, + ).length, + 3, + ); + return thresholdPartyMemberCount; + }, + 3, + ), new WeightedModifierType(modifierTypes.DIRE_HIT, 4), new WeightedModifierType(modifierTypes.SUPER_LURE, lureWeightFunc(15, 4)), new WeightedModifierType(modifierTypes.NUGGET, skipInLastClassicWaveOrDefault(5)), - new WeightedModifierType(modifierTypes.EVOLUTION_ITEM, () => { - return Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 15), 8); - }, 8), - new WeightedModifierType(modifierTypes.MAP, () => globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex < 180 ? 2 : 0, 2), + new WeightedModifierType( + modifierTypes.EVOLUTION_ITEM, + () => { + return Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 15), 8); + }, + 8, + ), + new WeightedModifierType( + modifierTypes.MAP, + () => (globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex < 180 ? 2 : 0), + 2, + ), new WeightedModifierType(modifierTypes.SOOTHE_BELL, 2), new WeightedModifierType(modifierTypes.TM_GREAT, 3), - new WeightedModifierType(modifierTypes.MEMORY_MUSHROOM, (party: Pokemon[]) => { - if (!party.find(p => p.getLearnableLevelMoves().length)) { - return 0; - } - const highestPartyLevel = party.map(p => p.level).reduce((highestLevel: integer, level: integer) => Math.max(highestLevel, level), 1); - return Math.min(Math.ceil(highestPartyLevel / 20), 4); - }, 4), + new WeightedModifierType( + modifierTypes.MEMORY_MUSHROOM, + (party: Pokemon[]) => { + if (!party.find(p => p.getLearnableLevelMoves().length)) { + return 0; + } + const highestPartyLevel = party + .map(p => p.level) + .reduce((highestLevel: number, level: number) => Math.max(highestLevel, level), 1); + return Math.min(Math.ceil(highestPartyLevel / 20), 4); + }, + 4, + ), new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3), - new WeightedModifierType(modifierTypes.TERA_SHARD, 1), - new WeightedModifierType(modifierTypes.DNA_SPLICERS, (party: Pokemon[]) => globalScene.gameMode.isSplicedOnly && party.filter(p => !p.fusionSpecies).length > 1 ? 4 : 0), - new WeightedModifierType(modifierTypes.VOUCHER, (_party: Pokemon[], rerollCount: integer) => !globalScene.gameMode.isDaily ? Math.max(1 - rerollCount, 0) : 0, 1), + new WeightedModifierType(modifierTypes.TERA_SHARD, (party: Pokemon[]) => + party.filter( + p => !(p.hasSpecies(Species.TERAPAGOS) || p.hasSpecies(Species.OGERPON) || p.hasSpecies(Species.SHEDINJA)), + ).length > 0 + ? 1 + : 0, + ), + new WeightedModifierType( + modifierTypes.DNA_SPLICERS, + (party: Pokemon[]) => { + if (party.filter(p => !p.fusionSpecies).length > 1) { + if (globalScene.gameMode.isSplicedOnly) { + return 4; + } + if (globalScene.gameMode.isClassic && globalScene.eventManager.areFusionsBoosted()) { + return 2; + } + } + return 0; + }, + 4, + ), + new WeightedModifierType( + modifierTypes.VOUCHER, + (_party: Pokemon[], rerollCount: number) => (!globalScene.gameMode.isDaily ? Math.max(1 - rerollCount, 0) : 0), + 1, + ), ].map(m => { - m.setTier(ModifierTier.GREAT); return m; + m.setTier(ModifierTier.GREAT); + return m; }), [ModifierTier.ULTRA]: [ - new WeightedModifierType(modifierTypes.ULTRA_BALL, () => (hasMaximumBalls(PokeballType.ULTRA_BALL)) ? 0 : 15, 15), + new WeightedModifierType(modifierTypes.ULTRA_BALL, () => (hasMaximumBalls(PokeballType.ULTRA_BALL) ? 0 : 15), 15), new WeightedModifierType(modifierTypes.MAX_LURE, lureWeightFunc(30, 4)), new WeightedModifierType(modifierTypes.BIG_NUGGET, skipInLastClassicWaveOrDefault(12)), new WeightedModifierType(modifierTypes.PP_MAX, 3), new WeightedModifierType(modifierTypes.MINT, 4), - new WeightedModifierType(modifierTypes.RARE_EVOLUTION_ITEM, () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 15) * 4, 32), 32), - new WeightedModifierType(modifierTypes.FORM_CHANGE_ITEM, () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 6, 24), + new WeightedModifierType( + modifierTypes.RARE_EVOLUTION_ITEM, + () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 15) * 4, 32), + 32, + ), + new WeightedModifierType( + modifierTypes.FORM_CHANGE_ITEM, + () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 6, + 24, + ), new WeightedModifierType(modifierTypes.AMULET_COIN, skipInLastClassicWaveOrDefault(3)), new WeightedModifierType(modifierTypes.EVIOLITE, (party: Pokemon[]) => { const { gameMode, gameData } = globalScene; if (gameMode.isDaily || (!gameMode.isFreshStartChallenge() && gameData.isUnlocked(Unlockables.EVIOLITE))) { return party.some(p => { // Check if Pokemon's species (or fusion species, if applicable) can evolve or if they're G-Max'd - if (!p.isMax() && ((p.getSpeciesForm(true).speciesId in pokemonEvolutions) || (p.isFusion() && (p.getFusionSpeciesForm(true).speciesId in pokemonEvolutions)))) { + if ( + !p.isMax() && + (p.getSpeciesForm(true).speciesId in pokemonEvolutions || + (p.isFusion() && p.getFusionSpeciesForm(true).speciesId in pokemonEvolutions)) + ) { // Check if Pokemon is already holding an Eviolite return !p.getHeldItems().some(i => i.type.id === "EVIOLITE"); } return false; - }) ? 10 : 0; + }) + ? 10 + : 0; } return 0; }), new WeightedModifierType(modifierTypes.SPECIES_STAT_BOOSTER, 12), - new WeightedModifierType(modifierTypes.LEEK, (party: Pokemon[]) => { - const checkedSpecies = [ Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD ]; - // If a party member doesn't already have a Leek and is one of the relevant species, Leek can appear - return party.some(p => !p.getHeldItems().some(i => i instanceof SpeciesCritBoosterModifier) - && (checkedSpecies.includes(p.getSpeciesForm(true).speciesId) - || (p.isFusion() && checkedSpecies.includes(p.getFusionSpeciesForm(true).speciesId)))) ? 12 : 0; - }, 12), - new WeightedModifierType(modifierTypes.TOXIC_ORB, (party: Pokemon[]) => { - return party.some(p => { - const isHoldingOrb = p.getHeldItems().some(i => i.type.id === "FLAME_ORB" || i.type.id === "TOXIC_ORB"); + new WeightedModifierType( + modifierTypes.LEEK, + (party: Pokemon[]) => { + const checkedSpecies = [Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD]; + // If a party member doesn't already have a Leek and is one of the relevant species, Leek can appear + return party.some( + p => + !p.getHeldItems().some(i => i instanceof SpeciesCritBoosterModifier) && + (checkedSpecies.includes(p.getSpeciesForm(true).speciesId) || + (p.isFusion() && checkedSpecies.includes(p.getFusionSpeciesForm(true).speciesId))), + ) + ? 12 + : 0; + }, + 12, + ), + new WeightedModifierType( + modifierTypes.TOXIC_ORB, + (party: Pokemon[]) => { + return party.some(p => { + const isHoldingOrb = p.getHeldItems().some(i => i.type.id === "FLAME_ORB" || i.type.id === "TOXIC_ORB"); - if (!isHoldingOrb) { - const moveset = p.getMoveset(true).filter(m => !isNullOrUndefined(m)).map(m => m.moveId); - const canSetStatus = p.canSetStatus(StatusEffect.TOXIC, true, true, null, true); + if (!isHoldingOrb) { + const moveset = p + .getMoveset(true) + .filter(m => !isNullOrUndefined(m)) + .map(m => m.moveId); + const canSetStatus = p.canSetStatus(StatusEffect.TOXIC, true, true, null, true); - // Moves that take advantage of obtaining the actual status effect - const hasStatusMoves = [ Moves.FACADE, Moves.PSYCHO_SHIFT ] - .some(m => moveset.includes(m)); - // Moves that take advantage of being able to give the target a status orb - // TODO: Take moves (Trick, Fling, Switcheroo) from comment when they are implemented - const hasItemMoves = [ /* Moves.TRICK, Moves.FLING, Moves.SWITCHEROO */ ] - .some(m => moveset.includes(m)); + // Moves that take advantage of obtaining the actual status effect + const hasStatusMoves = [Moves.FACADE, Moves.PSYCHO_SHIFT].some(m => moveset.includes(m)); + // Moves that take advantage of being able to give the target a status orb + // TODO: Take moves (Trick, Fling, Switcheroo) from comment when they are implemented + const hasItemMoves = [ + /* Moves.TRICK, Moves.FLING, Moves.SWITCHEROO */ + ].some(m => moveset.includes(m)); - if (canSetStatus) { - // Abilities that take advantage of obtaining the actual status effect, separated based on specificity to the orb - const hasGeneralAbility = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.MAGIC_GUARD ] - .some(a => p.hasAbility(a, false, true)); - const hasSpecificAbility = [ Abilities.TOXIC_BOOST, Abilities.POISON_HEAL ] - .some(a => p.hasAbility(a, false, true)); - const hasOppositeAbility = [ Abilities.FLARE_BOOST ] - .some(a => p.hasAbility(a, false, true)); + if (canSetStatus) { + // Abilities that take advantage of obtaining the actual status effect, separated based on specificity to the orb + const hasGeneralAbility = [ + Abilities.QUICK_FEET, + Abilities.GUTS, + Abilities.MARVEL_SCALE, + Abilities.MAGIC_GUARD, + ].some(a => p.hasAbility(a, false, true)); + const hasSpecificAbility = [Abilities.TOXIC_BOOST, Abilities.POISON_HEAL].some(a => + p.hasAbility(a, false, true), + ); + const hasOppositeAbility = [Abilities.FLARE_BOOST].some(a => p.hasAbility(a, false, true)); - return hasSpecificAbility || (hasGeneralAbility && !hasOppositeAbility) || hasStatusMoves; - } else { + return hasSpecificAbility || (hasGeneralAbility && !hasOppositeAbility) || hasStatusMoves; + } return hasItemMoves; } - } - return false; - }) ? 10 : 0; - }, 10), - new WeightedModifierType(modifierTypes.FLAME_ORB, (party: Pokemon[]) => { - return party.some(p => { - const isHoldingOrb = p.getHeldItems().some(i => i.type.id === "FLAME_ORB" || i.type.id === "TOXIC_ORB"); + return false; + }) + ? 10 + : 0; + }, + 10, + ), + new WeightedModifierType( + modifierTypes.FLAME_ORB, + (party: Pokemon[]) => { + return party.some(p => { + const isHoldingOrb = p.getHeldItems().some(i => i.type.id === "FLAME_ORB" || i.type.id === "TOXIC_ORB"); - if (!isHoldingOrb) { - const moveset = p.getMoveset(true).filter(m => !isNullOrUndefined(m)).map(m => m.moveId); - const canSetStatus = p.canSetStatus(StatusEffect.TOXIC, true, true, null, true); + if (!isHoldingOrb) { + const moveset = p + .getMoveset(true) + .filter(m => !isNullOrUndefined(m)) + .map(m => m.moveId); + const canSetStatus = p.canSetStatus(StatusEffect.BURN, true, true, null, true); - // Moves that take advantage of obtaining the actual status effect - const hasStatusMoves = [ Moves.FACADE, Moves.PSYCHO_SHIFT ] - .some(m => moveset.includes(m)); - // Moves that take advantage of being able to give the target a status orb - // TODO: Take moves (Trick, Fling, Switcheroo) from comment when they are implemented - const hasItemMoves = [ /* Moves.TRICK, Moves.FLING, Moves.SWITCHEROO */ ] - .some(m => moveset.includes(m)); + // Moves that take advantage of obtaining the actual status effect + const hasStatusMoves = [Moves.FACADE, Moves.PSYCHO_SHIFT].some(m => moveset.includes(m)); + // Moves that take advantage of being able to give the target a status orb + // TODO: Take moves (Trick, Fling, Switcheroo) from comment when they are implemented + const hasItemMoves = [ + /* Moves.TRICK, Moves.FLING, Moves.SWITCHEROO */ + ].some(m => moveset.includes(m)); - if (canSetStatus) { - // Abilities that take advantage of obtaining the actual status effect, separated based on specificity to the orb - const hasGeneralAbility = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.MAGIC_GUARD ] - .some(a => p.hasAbility(a, false, true)); - const hasSpecificAbility = [ Abilities.FLARE_BOOST ] - .some(a => p.hasAbility(a, false, true)); - const hasOppositeAbility = [ Abilities.TOXIC_BOOST, Abilities.POISON_HEAL ] - .some(a => p.hasAbility(a, false, true)); + if (canSetStatus) { + // Abilities that take advantage of obtaining the actual status effect, separated based on specificity to the orb + const hasGeneralAbility = [ + Abilities.QUICK_FEET, + Abilities.GUTS, + Abilities.MARVEL_SCALE, + Abilities.MAGIC_GUARD, + ].some(a => p.hasAbility(a, false, true)); + const hasSpecificAbility = [Abilities.FLARE_BOOST].some(a => p.hasAbility(a, false, true)); + const hasOppositeAbility = [Abilities.TOXIC_BOOST, Abilities.POISON_HEAL].some(a => + p.hasAbility(a, false, true), + ); - return hasSpecificAbility || (hasGeneralAbility && !hasOppositeAbility) || hasStatusMoves; - } else { + return hasSpecificAbility || (hasGeneralAbility && !hasOppositeAbility) || hasStatusMoves; + } return hasItemMoves; } - } - return false; - }) ? 10 : 0; - }, 10), - new WeightedModifierType(modifierTypes.WHITE_HERB, (party: Pokemon[]) => { - const checkedAbilities = [ Abilities.WEAK_ARMOR, Abilities.CONTRARY, Abilities.MOODY, Abilities.ANGER_SHELL, Abilities.COMPETITIVE, Abilities.DEFIANT ]; - const weightMultiplier = party.filter( - p => !p.getHeldItems().some(i => i instanceof ResetNegativeStatStageModifier && i.stackCount >= i.getMaxHeldItemCount(p)) && - (checkedAbilities.some(a => p.hasAbility(a, false, true)) || p.getMoveset(true).some(m => m && selfStatLowerMoves.includes(m.moveId)))).length; - // If a party member has one of the above moves or abilities and doesn't have max herbs, the herb will appear more frequently - return 0 * (weightMultiplier ? 2 : 1) + (weightMultiplier ? weightMultiplier * 0 : 0); - }, 10), + return false; + }) + ? 10 + : 0; + }, + 10, + ), new WeightedModifierType(modifierTypes.REVIVER_SEED, 4), new WeightedModifierType(modifierTypes.CANDY_JAR, skipInLastClassicWaveOrDefault(5)), new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 9), @@ -1841,15 +2819,22 @@ const modifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.IV_SCANNER, skipInLastClassicWaveOrDefault(4)), new WeightedModifierType(modifierTypes.EXP_CHARM, skipInLastClassicWaveOrDefault(8)), new WeightedModifierType(modifierTypes.EXP_SHARE, skipInLastClassicWaveOrDefault(10)), - new WeightedModifierType(modifierTypes.EXP_BALANCE, skipInLastClassicWaveOrDefault(3)), - new WeightedModifierType(modifierTypes.TERA_ORB, () => Math.min(Math.max(Math.floor(globalScene.currentBattle.waveIndex / 50) * 2, 1), 4), 4), + new WeightedModifierType( + modifierTypes.TERA_ORB, + () => + !globalScene.gameMode.isClassic + ? Math.min(Math.max(Math.floor(globalScene.currentBattle.waveIndex / 50) * 2, 1), 4) + : 0, + 4, + ), new WeightedModifierType(modifierTypes.QUICK_CLAW, 3), - new WeightedModifierType(modifierTypes.WIDE_LENS, 4), + new WeightedModifierType(modifierTypes.WIDE_LENS, 7), ].map(m => { - m.setTier(ModifierTier.ULTRA); return m; + m.setTier(ModifierTier.ULTRA); + return m; }), [ModifierTier.ROGUE]: [ - new WeightedModifierType(modifierTypes.ROGUE_BALL, () => (hasMaximumBalls(PokeballType.ROGUE_BALL)) ? 0 : 16, 16), + new WeightedModifierType(modifierTypes.ROGUE_BALL, () => (hasMaximumBalls(PokeballType.ROGUE_BALL) ? 0 : 16), 16), new WeightedModifierType(modifierTypes.RELIC_GOLD, skipInLastClassicWaveOrDefault(2)), new WeightedModifierType(modifierTypes.LEFTOVERS, 3), new WeightedModifierType(modifierTypes.SHELL_BELL, 3), @@ -1858,80 +2843,119 @@ const modifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.SCOPE_LENS, 4), new WeightedModifierType(modifierTypes.BATON, 2), new WeightedModifierType(modifierTypes.SOUL_DEW, 7), - //new WeightedModifierType(modifierTypes.OVAL_CHARM, 6), - new WeightedModifierType(modifierTypes.CATCHING_CHARM, () => globalScene.gameMode.isDaily || (!globalScene.gameMode.isFreshStartChallenge() && globalScene.gameData.getSpeciesCount(d => !!d.caughtAttr) > 100) ? 4 : 0, 4), + new WeightedModifierType(modifierTypes.CATCHING_CHARM, () => (!globalScene.gameMode.isClassic ? 4 : 0), 4), new WeightedModifierType(modifierTypes.ABILITY_CHARM, skipInClassicAfterWave(189, 6)), new WeightedModifierType(modifierTypes.FOCUS_BAND, 5), new WeightedModifierType(modifierTypes.KINGS_ROCK, 3), - new WeightedModifierType(modifierTypes.LOCK_CAPSULE, () => globalScene.gameMode.isClassic ? 0 : 3), + new WeightedModifierType(modifierTypes.LOCK_CAPSULE, () => (globalScene.gameMode.isClassic ? 0 : 3)), new WeightedModifierType(modifierTypes.SUPER_EXP_CHARM, skipInLastClassicWaveOrDefault(8)), - new WeightedModifierType(modifierTypes.RARE_FORM_CHANGE_ITEM, () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 6, 24), - new WeightedModifierType(modifierTypes.MEGA_BRACELET, () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 9, 36), - new WeightedModifierType(modifierTypes.DYNAMAX_BAND, () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 9, 36), - new WeightedModifierType(modifierTypes.VOUCHER_PLUS, (_party: Pokemon[], rerollCount: integer) => !globalScene.gameMode.isDaily ? Math.max(3 - rerollCount * 1, 0) : 0, 3), + new WeightedModifierType( + modifierTypes.RARE_FORM_CHANGE_ITEM, + () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 6, + 24, + ), + new WeightedModifierType( + modifierTypes.MEGA_BRACELET, + () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 9, + 36, + ), + new WeightedModifierType( + modifierTypes.DYNAMAX_BAND, + () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 9, + 36, + ), + new WeightedModifierType( + modifierTypes.VOUCHER_PLUS, + (_party: Pokemon[], rerollCount: number) => + !globalScene.gameMode.isDaily ? Math.max(3 - rerollCount * 1, 0) : 0, + 3, + ), ].map(m => { - m.setTier(ModifierTier.ROGUE); return m; + m.setTier(ModifierTier.ROGUE); + return m; }), [ModifierTier.MASTER]: [ - new WeightedModifierType(modifierTypes.MASTER_BALL, () => (hasMaximumBalls(PokeballType.MASTER_BALL)) ? 0 : 24, 24), + new WeightedModifierType(modifierTypes.MASTER_BALL, () => (hasMaximumBalls(PokeballType.MASTER_BALL) ? 0 : 24), 24), new WeightedModifierType(modifierTypes.SHINY_CHARM, 14), new WeightedModifierType(modifierTypes.HEALING_CHARM, 18), new WeightedModifierType(modifierTypes.MULTI_LENS, 18), - new WeightedModifierType(modifierTypes.VOUCHER_PREMIUM, (_party: Pokemon[], rerollCount: integer) => - !globalScene.gameMode.isDaily && !globalScene.gameMode.isEndless && !globalScene.gameMode.isSplicedOnly ? Math.max(5 - rerollCount * 2, 0) : 0, 5), - new WeightedModifierType(modifierTypes.DNA_SPLICERS, (party: Pokemon[]) => !globalScene.gameMode.isSplicedOnly && party.filter(p => !p.fusionSpecies).length > 1 ? 24 : 0, 24), - new WeightedModifierType(modifierTypes.MINI_BLACK_HOLE, () => (globalScene.gameMode.isDaily || (!globalScene.gameMode.isFreshStartChallenge() && globalScene.gameData.isUnlocked(Unlockables.MINI_BLACK_HOLE))) ? 1 : 0, 1), + new WeightedModifierType( + modifierTypes.VOUCHER_PREMIUM, + (_party: Pokemon[], rerollCount: number) => + !globalScene.gameMode.isDaily && !globalScene.gameMode.isEndless && !globalScene.gameMode.isSplicedOnly + ? Math.max(5 - rerollCount * 2, 0) + : 0, + 5, + ), + new WeightedModifierType( + modifierTypes.DNA_SPLICERS, + (party: Pokemon[]) => + !(globalScene.gameMode.isClassic && globalScene.eventManager.areFusionsBoosted()) && + !globalScene.gameMode.isSplicedOnly && + party.filter(p => !p.fusionSpecies).length > 1 + ? 24 + : 0, + 24, + ), + new WeightedModifierType( + modifierTypes.MINI_BLACK_HOLE, + () => + globalScene.gameMode.isDaily || + (!globalScene.gameMode.isFreshStartChallenge() && globalScene.gameData.isUnlocked(Unlockables.MINI_BLACK_HOLE)) + ? 1 + : 0, + 1, + ), ].map(m => { - m.setTier(ModifierTier.MASTER); return m; - }) + m.setTier(ModifierTier.MASTER); + return m; + }), }; const wildModifierPool: ModifierPool = { - [ModifierTier.COMMON]: [ - new WeightedModifierType(modifierTypes.BERRY, 1) - ].map(m => { - m.setTier(ModifierTier.COMMON); return m; + [ModifierTier.COMMON]: [new WeightedModifierType(modifierTypes.BERRY, 1)].map(m => { + m.setTier(ModifierTier.COMMON); + return m; }), - [ModifierTier.GREAT]: [ - new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 1) - ].map(m => { - m.setTier(ModifierTier.GREAT); return m; - }), - [ModifierTier.ULTRA]: [ - new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10), - new WeightedModifierType(modifierTypes.WHITE_HERB, 0) - ].map(m => { - m.setTier(ModifierTier.ULTRA); return m; - }), - [ModifierTier.ROGUE]: [ - new WeightedModifierType(modifierTypes.LUCKY_EGG, 4), - ].map(m => { - m.setTier(ModifierTier.ROGUE); return m; - }), - [ModifierTier.MASTER]: [ - new WeightedModifierType(modifierTypes.GOLDEN_EGG, 1) - ].map(m => { - m.setTier(ModifierTier.MASTER); return m; - }) -}; - -const trainerModifierPool: ModifierPool = { - [ModifierTier.COMMON]: [ - new WeightedModifierType(modifierTypes.BERRY, 8), - new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3) - ].map(m => { - m.setTier(ModifierTier.COMMON); return m; - }), - [ModifierTier.GREAT]: [ - new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3), - ].map(m => { - m.setTier(ModifierTier.GREAT); return m; + [ModifierTier.GREAT]: [new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 1)].map(m => { + m.setTier(ModifierTier.GREAT); + return m; }), [ModifierTier.ULTRA]: [ new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10), new WeightedModifierType(modifierTypes.WHITE_HERB, 0), ].map(m => { - m.setTier(ModifierTier.ULTRA); return m; + m.setTier(ModifierTier.ULTRA); + return m; + }), + [ModifierTier.ROGUE]: [new WeightedModifierType(modifierTypes.LUCKY_EGG, 4)].map(m => { + m.setTier(ModifierTier.ROGUE); + return m; + }), + [ModifierTier.MASTER]: [new WeightedModifierType(modifierTypes.GOLDEN_EGG, 1)].map(m => { + m.setTier(ModifierTier.MASTER); + return m; + }), +}; + +const trainerModifierPool: ModifierPool = { + [ModifierTier.COMMON]: [ + new WeightedModifierType(modifierTypes.BERRY, 8), + new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3), + ].map(m => { + m.setTier(ModifierTier.COMMON); + return m; + }), + [ModifierTier.GREAT]: [new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3)].map(m => { + m.setTier(ModifierTier.GREAT); + return m; + }), + [ModifierTier.ULTRA]: [ + new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10), + new WeightedModifierType(modifierTypes.WHITE_HERB, 0), + ].map(m => { + m.setTier(ModifierTier.ULTRA); + return m; }), [ModifierTier.ROGUE]: [ new WeightedModifierType(modifierTypes.FOCUS_BAND, 2), @@ -1940,7 +2964,8 @@ const trainerModifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.GRIP_CLAW, 1), new WeightedModifierType(modifierTypes.WIDE_LENS, 1), ].map(m => { - m.setTier(ModifierTier.ROGUE); return m; + m.setTier(ModifierTier.ROGUE); + return m; }), [ModifierTier.MASTER]: [ new WeightedModifierType(modifierTypes.KINGS_ROCK, 1), @@ -1948,8 +2973,9 @@ const trainerModifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.SHELL_BELL, 1), new WeightedModifierType(modifierTypes.SCOPE_LENS, 1), ].map(m => { - m.setTier(ModifierTier.MASTER); return m; - }) + m.setTier(ModifierTier.MASTER); + return m; + }), }; const enemyBuffModifierPool: ModifierPool = { @@ -1961,18 +2987,20 @@ const enemyBuffModifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.ENEMY_ATTACK_BURN_CHANCE, 3), new WeightedModifierType(modifierTypes.ENEMY_STATUS_EFFECT_HEAL_CHANCE, 9), new WeightedModifierType(modifierTypes.ENEMY_ENDURE_CHANCE, 4), - new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 1) + new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 1), ].map(m => { - m.setTier(ModifierTier.COMMON); return m; + m.setTier(ModifierTier.COMMON); + return m; }), [ModifierTier.GREAT]: [ new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_BOOSTER, 5), new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_REDUCTION, 5), new WeightedModifierType(modifierTypes.ENEMY_STATUS_EFFECT_HEAL_CHANCE, 5), new WeightedModifierType(modifierTypes.ENEMY_ENDURE_CHANCE, 5), - new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 1) + new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 1), ].map(m => { - m.setTier(ModifierTier.GREAT); return m; + m.setTier(ModifierTier.GREAT); + return m; }), [ModifierTier.ULTRA]: [ new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_BOOSTER, 10), @@ -1980,16 +3008,19 @@ const enemyBuffModifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.ENEMY_HEAL, 10), new WeightedModifierType(modifierTypes.ENEMY_STATUS_EFFECT_HEAL_CHANCE, 10), new WeightedModifierType(modifierTypes.ENEMY_ENDURE_CHANCE, 10), - new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 5) + new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 5), ].map(m => { - m.setTier(ModifierTier.ULTRA); return m; + m.setTier(ModifierTier.ULTRA); + return m; }), - [ModifierTier.ROGUE]: [ ].map((m: WeightedModifierType) => { - m.setTier(ModifierTier.ROGUE); return m; + [ModifierTier.ROGUE]: [].map((m: WeightedModifierType) => { + m.setTier(ModifierTier.ROGUE); + return m; + }), + [ModifierTier.MASTER]: [].map((m: WeightedModifierType) => { + m.setTier(ModifierTier.MASTER); + return m; }), - [ModifierTier.MASTER]: [ ].map((m: WeightedModifierType) => { - m.setTier(ModifierTier.MASTER); return m; - }) }; const dailyStarterModifierPool: ModifierPool = { @@ -1997,12 +3028,12 @@ const dailyStarterModifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 1), new WeightedModifierType(modifierTypes.BERRY, 3), ].map(m => { - m.setTier(ModifierTier.COMMON); return m; + m.setTier(ModifierTier.COMMON); + return m; }), - [ModifierTier.GREAT]: [ - new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 5), - ].map(m => { - m.setTier(ModifierTier.GREAT); return m; + [ModifierTier.GREAT]: [new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 5)].map(m => { + m.setTier(ModifierTier.GREAT); + return m; }), [ModifierTier.ULTRA]: [ new WeightedModifierType(modifierTypes.REVIVER_SEED, 4), @@ -2010,7 +3041,8 @@ const dailyStarterModifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.SOUL_DEW, 1), new WeightedModifierType(modifierTypes.GOLDEN_PUNCH, 1), ].map(m => { - m.setTier(ModifierTier.ULTRA); return m; + m.setTier(ModifierTier.ULTRA); + return m; }), [ModifierTier.ROGUE]: [ new WeightedModifierType(modifierTypes.GRIP_CLAW, 5), @@ -2019,14 +3051,16 @@ const dailyStarterModifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.QUICK_CLAW, 3), new WeightedModifierType(modifierTypes.KINGS_ROCK, 3), ].map(m => { - m.setTier(ModifierTier.ROGUE); return m; + m.setTier(ModifierTier.ROGUE); + return m; }), [ModifierTier.MASTER]: [ new WeightedModifierType(modifierTypes.LEFTOVERS, 1), new WeightedModifierType(modifierTypes.SHELL_BELL, 1), ].map(m => { - m.setTier(ModifierTier.MASTER); return m; - }) + m.setTier(ModifierTier.MASTER); + return m; + }), }; export function getModifierType(modifierTypeFunc: ModifierTypeFunc): ModifierType { @@ -2041,13 +3075,16 @@ let modifierPoolThresholds = {}; let ignoredPoolIndexes = {}; let dailyStarterModifierPoolThresholds = {}; -let ignoredDailyStarterPoolIndexes = {}; // eslint-disable-line @typescript-eslint/no-unused-vars +// biome-ignore lint/correctness/noUnusedVariables: TODO explain why this is marked as OK +let ignoredDailyStarterPoolIndexes = {}; let enemyModifierPoolThresholds = {}; -let enemyIgnoredPoolIndexes = {}; // eslint-disable-line @typescript-eslint/no-unused-vars +// biome-ignore lint/correctness/noUnusedVariables: TODO explain why this is marked as OK +let enemyIgnoredPoolIndexes = {}; let enemyBuffModifierPoolThresholds = {}; -let enemyBuffIgnoredPoolIndexes = {}; // eslint-disable-line @typescript-eslint/no-unused-vars +// biome-ignore lint/correctness/noUnusedVariables: TODO explain why this is marked as OK +let enemyBuffIgnoredPoolIndexes = {}; export function getModifierPoolForType(poolType: ModifierPoolType): ModifierPool { let pool: ModifierPool; @@ -2071,13 +3108,13 @@ export function getModifierPoolForType(poolType: ModifierPoolType): ModifierPool return pool; } -const tierWeights = [ 768 / 1024, 195 / 1024, 48 / 1024, 12 / 1024, 1 / 1024 ]; +const tierWeights = [768 / 1024, 195 / 1024, 48 / 1024, 12 / 1024, 1 / 1024]; /** * Allows a unit test to check if an item exists in the Modifier Pool. Checks the pool directly, rather than attempting to reroll for the item. */ export const itemPoolChecks: Map = new Map(); -export function regenerateModifierPoolThresholds(party: Pokemon[], poolType: ModifierPoolType, rerollCount: integer = 0) { +export function regenerateModifierPoolThresholds(party: Pokemon[], poolType: ModifierPoolType, rerollCount = 0) { const pool = getModifierPoolForType(poolType); itemPoolChecks.forEach((_v, k) => { itemPoolChecks.set(k, false); @@ -2085,52 +3122,68 @@ export function regenerateModifierPoolThresholds(party: Pokemon[], poolType: Mod const ignoredIndexes = {}; const modifierTableData = {}; - const thresholds = Object.fromEntries(new Map(Object.keys(pool).map(t => { - ignoredIndexes[t] = []; - const thresholds = new Map(); - const tierModifierIds: string[] = []; - let tierMaxWeight = 0; - let i = 0; - pool[t].reduce((total: integer, modifierType: WeightedModifierType) => { - const weightedModifierType = modifierType as WeightedModifierType; - const existingModifiers = globalScene.findModifiers(m => m.type.id === weightedModifierType.modifierType.id, poolType === ModifierPoolType.PLAYER); - const itemModifierType = weightedModifierType.modifierType instanceof ModifierTypeGenerator - ? weightedModifierType.modifierType.generateType(party) - : weightedModifierType.modifierType; - const weight = !existingModifiers.length - || itemModifierType instanceof PokemonHeldItemModifierType - || itemModifierType instanceof FormChangeItemModifierType - || existingModifiers.find(m => m.stackCount < m.getMaxStackCount(true)) - ? weightedModifierType.weight instanceof Function - ? (weightedModifierType.weight as Function)(party, rerollCount) - : weightedModifierType.weight as integer - : 0; - if (weightedModifierType.maxWeight) { - const modifierId = weightedModifierType.modifierType.id; - tierModifierIds.push(modifierId); - const outputWeight = useMaxWeightForOutput ? weightedModifierType.maxWeight : weight; - modifierTableData[modifierId] = { weight: outputWeight, tier: parseInt(t), tierPercent: 0, totalPercent: 0 }; - tierMaxWeight += outputWeight; - } - if (weight) { - total += weight; - } else { - ignoredIndexes[t].push(i++); - return total; - } - if (itemPoolChecks.has(modifierType.modifierType.id as ModifierTypeKeys)) { - itemPoolChecks.set(modifierType.modifierType.id as ModifierTypeKeys, true); - } - thresholds.set(total, i++); - return total; - }, 0); - for (const id of tierModifierIds) { - modifierTableData[id].tierPercent = Math.floor((modifierTableData[id].weight / tierMaxWeight) * 10000) / 100; - } - return [ t, Object.fromEntries(thresholds) ]; - }))); + const thresholds = Object.fromEntries( + new Map( + Object.keys(pool).map(t => { + ignoredIndexes[t] = []; + const thresholds = new Map(); + const tierModifierIds: string[] = []; + let tierMaxWeight = 0; + let i = 0; + pool[t].reduce((total: number, modifierType: WeightedModifierType) => { + const weightedModifierType = modifierType as WeightedModifierType; + const existingModifiers = globalScene.findModifiers( + m => m.type.id === weightedModifierType.modifierType.id, + poolType === ModifierPoolType.PLAYER, + ); + const itemModifierType = + weightedModifierType.modifierType instanceof ModifierTypeGenerator + ? weightedModifierType.modifierType.generateType(party) + : weightedModifierType.modifierType; + const weight = + !existingModifiers.length || + itemModifierType instanceof PokemonHeldItemModifierType || + itemModifierType instanceof FormChangeItemModifierType || + existingModifiers.find(m => m.stackCount < m.getMaxStackCount(true)) + ? weightedModifierType.weight instanceof Function + ? // biome-ignore lint/complexity/noBannedTypes: TODO: refactor to not use Function type + (weightedModifierType.weight as Function)(party, rerollCount) + : (weightedModifierType.weight as number) + : 0; + if (weightedModifierType.maxWeight) { + const modifierId = weightedModifierType.modifierType.id; + tierModifierIds.push(modifierId); + const outputWeight = useMaxWeightForOutput ? weightedModifierType.maxWeight : weight; + modifierTableData[modifierId] = { + weight: outputWeight, + tier: Number.parseInt(t), + tierPercent: 0, + totalPercent: 0, + }; + tierMaxWeight += outputWeight; + } + if (weight) { + total += weight; + } else { + ignoredIndexes[t].push(i++); + return total; + } + if (itemPoolChecks.has(modifierType.modifierType.id as ModifierTypeKeys)) { + itemPoolChecks.set(modifierType.modifierType.id as ModifierTypeKeys, true); + } + thresholds.set(total, i++); + return total; + }, 0); + for (const id of tierModifierIds) { + modifierTableData[id].tierPercent = Math.floor((modifierTableData[id].weight / tierMaxWeight) * 10000) / 100; + } + return [t, Object.fromEntries(thresholds)]; + }), + ), + ); for (const id of Object.keys(modifierTableData)) { - modifierTableData[id].totalPercent = Math.floor(modifierTableData[id].tierPercent * tierWeights[modifierTableData[id].tier] * 100) / 100; + modifierTableData[id].totalPercent = + Math.floor(modifierTableData[id].tierPercent * tierWeights[modifierTableData[id].tier] * 100) / 100; modifierTableData[id].tier = ModifierTier[modifierTableData[id].tier]; } if (outputModifierData) { @@ -2187,21 +3240,39 @@ export function getModifierTypeFuncById(id: string): ModifierTypeFunc { * - `rerollMultiplier?: number` If specified, can adjust the amount of money required for a shop reroll. If set to a negative value, the shop will not allow rerolls at all. * - `allowLuckUpgrades?: boolean` Default `true`, if `false` will prevent set item tiers from upgrading via luck */ -export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemon[], modifierTiers?: ModifierTier[], customModifierSettings?: CustomModifierSettings): ModifierTypeOption[] { +export function getPlayerModifierTypeOptions( + count: number, + party: PlayerPokemon[], + modifierTiers?: ModifierTier[], + customModifierSettings?: CustomModifierSettings, +): ModifierTypeOption[] { const options: ModifierTypeOption[] = []; const retryCount = Math.min(count * 5, 50); if (!customModifierSettings) { new Array(count).fill(0).map((_, i) => { - options.push(getModifierTypeOptionWithRetry(options, retryCount, party, modifierTiers && modifierTiers.length > i ? modifierTiers[i] : undefined)); + options.push( + getModifierTypeOptionWithRetry( + options, + retryCount, + party, + modifierTiers && modifierTiers.length > i ? modifierTiers[i] : undefined, + ), + ); }); } else { // Guaranteed mod options first - if (customModifierSettings?.guaranteedModifierTypeOptions && customModifierSettings.guaranteedModifierTypeOptions.length > 0) { + if ( + customModifierSettings?.guaranteedModifierTypeOptions && + customModifierSettings.guaranteedModifierTypeOptions.length > 0 + ) { options.push(...customModifierSettings.guaranteedModifierTypeOptions!); } // Guaranteed mod functions second - if (customModifierSettings.guaranteedModifierTypeFuncs && customModifierSettings.guaranteedModifierTypeFuncs.length > 0) { + if ( + customModifierSettings.guaranteedModifierTypeFuncs && + customModifierSettings.guaranteedModifierTypeFuncs.length > 0 + ) { customModifierSettings.guaranteedModifierTypeFuncs!.forEach((mod, _i) => { const modifierId = Object.keys(modifierTypes).find(k => modifierTypes[k] === mod) as string; let guaranteedMod: ModifierType = modifierTypes[modifierId]?.(); @@ -2211,7 +3282,8 @@ export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemo .withIdFromFunc(modifierTypes[modifierId]) .withTierFromPool(ModifierPoolType.PLAYER, party); - const modType = guaranteedMod instanceof ModifierTypeGenerator ? guaranteedMod.generateType(party) : guaranteedMod; + const modType = + guaranteedMod instanceof ModifierTypeGenerator ? guaranteedMod.generateType(party) : guaranteedMod; if (modType) { const option = new ModifierTypeOption(modType, 0); options.push(option); @@ -2222,9 +3294,9 @@ export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemo // Guaranteed tiers third if (customModifierSettings.guaranteedModifierTiers && customModifierSettings.guaranteedModifierTiers.length > 0) { const allowLuckUpgrades = customModifierSettings.allowLuckUpgrades ?? true; - customModifierSettings.guaranteedModifierTiers.forEach((tier) => { + for (const tier of customModifierSettings.guaranteedModifierTiers) { options.push(getModifierTypeOptionWithRetry(options, retryCount, party, tier, allowLuckUpgrades)); - }); + } } // Fill remaining @@ -2248,12 +3320,29 @@ export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemo * @param tier If specified will generate item of tier * @param allowLuckUpgrades `true` to allow items to upgrade tiers (the little animation that plays and is affected by luck) */ -function getModifierTypeOptionWithRetry(existingOptions: ModifierTypeOption[], retryCount: integer, party: PlayerPokemon[], tier?: ModifierTier, allowLuckUpgrades?: boolean): ModifierTypeOption { +function getModifierTypeOptionWithRetry( + existingOptions: ModifierTypeOption[], + retryCount: number, + party: PlayerPokemon[], + tier?: ModifierTier, + allowLuckUpgrades?: boolean, +): ModifierTypeOption { allowLuckUpgrades = allowLuckUpgrades ?? true; let candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, tier, undefined, 0, allowLuckUpgrades); let r = 0; - while (existingOptions.length && ++r < retryCount && existingOptions.filter(o => o.type.name === candidate?.type.name || o.type.group === candidate?.type.group).length) { - candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, candidate?.type.tier ?? tier, candidate?.upgradeCount, 0, allowLuckUpgrades); + while ( + existingOptions.length && + ++r < retryCount && + existingOptions.filter(o => o.type.name === candidate?.type.name || o.type.group === candidate?.type.group).length + ) { + candidate = getNewModifierTypeOption( + party, + ModifierPoolType.PLAYER, + candidate?.type.tier ?? tier, + candidate?.upgradeCount, + 0, + allowLuckUpgrades, + ); } return candidate!; } @@ -2273,7 +3362,7 @@ export function overridePlayerModifierTypeOptions(options: ModifierTypeOption[], let modifierType: ModifierType | null = modifierFunc(); if (modifierType instanceof ModifierTypeGenerator) { - const pregenArgs = ("type" in override) && (override.type !== null) ? [ override.type ] : undefined; + const pregenArgs = "type" in override && override.type !== null ? [override.type] : undefined; modifierType = modifierType.generateType(party, pregenArgs); } @@ -2283,7 +3372,7 @@ export function overridePlayerModifierTypeOptions(options: ModifierTypeOption[], } } -export function getPlayerShopModifierTypeOptionsForWave(waveIndex: integer, baseCost: integer): ModifierTypeOption[] { +export function getPlayerShopModifierTypeOptionsForWave(waveIndex: number, baseCost: number): ModifierTypeOption[] { if (!(waveIndex % 10)) { return []; } @@ -2292,7 +3381,7 @@ export function getPlayerShopModifierTypeOptionsForWave(waveIndex: integer, base [ new ModifierTypeOption(modifierTypes.POTION(), 0, baseCost * 0.2), new ModifierTypeOption(modifierTypes.ETHER(), 0, baseCost * 0.4), - new ModifierTypeOption(modifierTypes.REVIVE(), 0, baseCost * 2) + new ModifierTypeOption(modifierTypes.REVIVE(), 0, baseCost * 2), ], [ new ModifierTypeOption(modifierTypes.SUPER_POTION(), 0, baseCost * 0.45), @@ -2300,28 +3389,27 @@ export function getPlayerShopModifierTypeOptionsForWave(waveIndex: integer, base ], [ new ModifierTypeOption(modifierTypes.ELIXIR(), 0, baseCost), - new ModifierTypeOption(modifierTypes.MAX_ETHER(), 0, baseCost) + new ModifierTypeOption(modifierTypes.MAX_ETHER(), 0, baseCost), ], [ new ModifierTypeOption(modifierTypes.HYPER_POTION(), 0, baseCost * 0.8), new ModifierTypeOption(modifierTypes.MAX_REVIVE(), 0, baseCost * 2.75), - new ModifierTypeOption(modifierTypes.MEMORY_MUSHROOM(), 0, baseCost * 4) + new ModifierTypeOption(modifierTypes.MEMORY_MUSHROOM(), 0, baseCost * 4), ], [ new ModifierTypeOption(modifierTypes.MAX_POTION(), 0, baseCost * 1.5), - new ModifierTypeOption(modifierTypes.MAX_ELIXIR(), 0, baseCost * 2.5) + new ModifierTypeOption(modifierTypes.MAX_ELIXIR(), 0, baseCost * 2.5), ], - [ - new ModifierTypeOption(modifierTypes.FULL_RESTORE(), 0, baseCost * 2.25) - ], - [ - new ModifierTypeOption(modifierTypes.SACRED_ASH(), 0, baseCost * 10) - ] + [new ModifierTypeOption(modifierTypes.FULL_RESTORE(), 0, baseCost * 2.25)], + [new ModifierTypeOption(modifierTypes.SACRED_ASH(), 0, baseCost * 10)], ]; return options.slice(0, Math.ceil(Math.max(waveIndex + 10, 0) / 30)).flat(); } -export function getEnemyBuffModifierForWave(tier: ModifierTier, enemyModifiers: PersistentModifier[]): EnemyPersistentModifier { +export function getEnemyBuffModifierForWave( + tier: ModifierTier, + enemyModifiers: PersistentModifier[], +): EnemyPersistentModifier { let tierStackCount: number; switch (tier) { case ModifierTier.ULTRA: @@ -2339,7 +3427,11 @@ export function getEnemyBuffModifierForWave(tier: ModifierTier, enemyModifiers: let candidate = getNewModifierTypeOption([], ModifierPoolType.ENEMY_BUFF, tier); let r = 0; let matchingModifier: PersistentModifier | undefined; - while (++r < retryCount && (matchingModifier = enemyModifiers.find(m => m.type.id === candidate?.type?.id)) && matchingModifier.getMaxStackCount() < matchingModifier.stackCount + (r < 10 ? tierStackCount : 1)) { + while ( + ++r < retryCount && + (matchingModifier = enemyModifiers.find(m => m.type.id === candidate?.type?.id)) && + matchingModifier.getMaxStackCount() < matchingModifier.stackCount + (r < 10 ? tierStackCount : 1) + ) { candidate = getNewModifierTypeOption([], ModifierPoolType.ENEMY_BUFF, tier); } @@ -2349,8 +3441,20 @@ export function getEnemyBuffModifierForWave(tier: ModifierTier, enemyModifiers: return modifier; } -export function getEnemyModifierTypesForWave(waveIndex: integer, count: integer, party: EnemyPokemon[], poolType: ModifierPoolType.WILD | ModifierPoolType.TRAINER, upgradeChance: integer = 0): PokemonHeldItemModifierType[] { - const ret = new Array(count).fill(0).map(() => getNewModifierTypeOption(party, poolType, undefined, upgradeChance && !randSeedInt(upgradeChance) ? 1 : 0)?.type as PokemonHeldItemModifierType); +export function getEnemyModifierTypesForWave( + waveIndex: number, + count: number, + party: EnemyPokemon[], + poolType: ModifierPoolType.WILD | ModifierPoolType.TRAINER, + upgradeChance = 0, +): PokemonHeldItemModifierType[] { + const ret = new Array(count) + .fill(0) + .map( + () => + getNewModifierTypeOption(party, poolType, undefined, upgradeChance && !randSeedInt(upgradeChance) ? 1 : 0) + ?.type as PokemonHeldItemModifierType, + ); if (!(waveIndex % 1000)) { ret.push(getModifierType(modifierTypes.MINI_BLACK_HOLE) as PokemonHeldItemModifierType); } @@ -2376,7 +3480,9 @@ export function getDailyRunStarterModifiers(party: PlayerPokemon[]): PokemonHeld tier = ModifierTier.MASTER; } - const modifier = getNewModifierTypeOption(party, ModifierPoolType.DAILY_STARTER, tier)?.type?.newModifier(p) as PokemonHeldItemModifier; + const modifier = getNewModifierTypeOption(party, ModifierPoolType.DAILY_STARTER, tier)?.type?.newModifier( + p, + ) as PokemonHeldItemModifier; ret.push(modifier); } } @@ -2393,7 +3499,14 @@ export function getDailyRunStarterModifiers(party: PlayerPokemon[]): PokemonHeld * @param retryCount Max allowed tries before the next tier down is checked for a valid ModifierType * @param allowLuckUpgrades Default true. If false, will not allow ModifierType to randomly upgrade to next tier */ -function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType, tier?: ModifierTier, upgradeCount?: integer, retryCount: integer = 0, allowLuckUpgrades: boolean = true): ModifierTypeOption | null { +function getNewModifierTypeOption( + party: Pokemon[], + poolType: ModifierPoolType, + tier?: ModifierTier, + upgradeCount?: number, + retryCount = 0, + allowLuckUpgrades = true, +): ModifierTypeOption | null { const player = !poolType; const pool = getModifierPoolForType(poolType); let thresholds: object; @@ -2453,10 +3566,10 @@ function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType, } else if (upgradeCount === undefined && player) { upgradeCount = 0; if (tier < ModifierTier.MASTER && allowLuckUpgrades) { - const partyShinyCount = party.filter(p => p.isShiny() && !p.isFainted()).length; - const upgradeOdds = Math.floor(32 / ((partyShinyCount + 2) / 2)); + const partyLuckValue = getPartyLuckValue(party); + const upgradeOdds = Math.floor(128 / ((partyLuckValue + 4) / 4)); while (modifierPool.hasOwnProperty(tier + upgradeCount + 1) && modifierPool[tier + upgradeCount + 1].length) { - if (!randSeedInt(upgradeOdds)) { + if (randSeedInt(upgradeOdds) < 4) { upgradeCount++; } else { break; @@ -2470,11 +3583,11 @@ function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType, } const tierThresholds = Object.keys(thresholds[tier]); - const totalWeight = parseInt(tierThresholds[tierThresholds.length - 1]); + const totalWeight = Number.parseInt(tierThresholds[tierThresholds.length - 1]); const value = randSeedInt(totalWeight); - let index: integer | undefined; + let index: number | undefined; for (const t of tierThresholds) { - const threshold = parseInt(t); + const threshold = Number.parseInt(t); if (value < threshold) { index = thresholds[tier][threshold]; break; @@ -2488,7 +3601,7 @@ function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType, if (player) { console.log(index, ignoredPoolIndexes[tier].filter(i => i <= index).length, ignoredPoolIndexes[tier]); } - let modifierType: ModifierType | null = (pool[tier][index]).modifierType; + let modifierType: ModifierType | null = pool[tier][index].modifierType; if (modifierType instanceof ModifierTypeGenerator) { modifierType = (modifierType as ModifierTypeGenerator).generateType(party); if (modifierType === null) { @@ -2514,10 +3627,10 @@ export function getDefaultModifierTypeForTier(tier: ModifierTier): ModifierType export class ModifierTypeOption { public type: ModifierType; - public upgradeCount: integer; - public cost: integer; + public upgradeCount: number; + public cost: number; - constructor(type: ModifierType, upgradeCount: integer, cost: number = 0) { + constructor(type: ModifierType, upgradeCount: number, cost = 0) { this.type = type; this.upgradeCount = upgradeCount; this.cost = Math.min(Math.round(cost), Number.MAX_SAFE_INTEGER); @@ -2529,25 +3642,34 @@ export class ModifierTypeOption { * @param party The player's party. * @returns A number between 0 and 14 based on the party's total luck value, or a random number between 0 and 14 if the player is in Daily Run mode. */ -export function getPartyLuckValue(party: Pokemon[]): integer { +export function getPartyLuckValue(party: Pokemon[]): number { if (globalScene.gameMode.isDaily) { const DailyLuck = new NumberHolder(0); - globalScene.executeWithSeedOffset(() => { - DailyLuck.value = randSeedInt(15); // Random number between 0 and 14 - }, 0, globalScene.seed); + globalScene.executeWithSeedOffset( + () => { + DailyLuck.value = randSeedInt(15); // Random number between 0 and 14 + }, + 0, + globalScene.seed, + ); return DailyLuck.value; } const eventSpecies = globalScene.eventManager.getEventLuckBoostedSpecies(); - const luck = Phaser.Math.Clamp(party.map(p => p.isAllowedInBattle() ? p.getLuck() + (eventSpecies.includes(p.species.speciesId) ? 1 : 0) : 0) - .reduce((total: integer, value: integer) => total += value, 0), 0, 14); + const luck = Phaser.Math.Clamp( + party + .map(p => (p.isAllowedInBattle() ? p.getLuck() + (eventSpecies.includes(p.species.speciesId) ? 1 : 0) : 0)) + .reduce((total: number, value: number) => (total += value), 0), + 0, + 14, + ); return Math.min(globalScene.eventManager.getEventLuckBoost() + (luck ?? 0), 14); } -export function getLuckString(luckValue: integer): string { - return [ "D", "C", "C+", "B-", "B", "B+", "A-", "A", "A+", "A++", "S", "S+", "SS", "SS+", "SSS" ][luckValue]; +export function getLuckString(luckValue: number): string { + return ["D", "C", "C+", "B-", "B", "B+", "A-", "A", "A+", "A++", "S", "S+", "SS", "SS+", "SSS"][luckValue]; } -export function getLuckTextTint(luckValue: integer): integer { +export function getLuckTextTint(luckValue: number): number { let modifierTier: ModifierTier; if (luckValue > 11) { modifierTier = ModifierTier.LUXURY; diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 37f88deea7f..a084474ddac 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -1,18 +1,18 @@ import { FusionSpeciesFormEvolution, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; import { getBerryEffectFunc, getBerryPredicate } from "#app/data/berry"; import { getLevelTotalExp } from "#app/data/exp"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { MAX_PER_TYPE_POKEBALLS } from "#app/data/pokeball"; -import { type FormChangeItem, SpeciesFormChangeItemTrigger, SpeciesFormChangeLapseTeraTrigger, SpeciesFormChangeTeraTrigger } from "#app/data/pokemon-forms"; +import { type FormChangeItem, SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms"; import { getStatusEffectHealText } from "#app/data/status-effect"; -import Pokemon, { type PlayerPokemon } from "#app/field/pokemon"; +import type { PlayerPokemon } from "#app/field/pokemon"; +import Pokemon from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; import Overrides from "#app/overrides"; import { EvolutionPhase } from "#app/phases/evolution-phase"; import { LearnMovePhase, LearnMoveType } from "#app/phases/learn-move-phase"; import { LevelUpPhase } from "#app/phases/level-up-phase"; import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; -import { achvs } from "#app/system/achv"; import type { VoucherType } from "#app/system/voucher"; import { Command } from "#app/ui/command-ui-handler"; import { addTextObject, TextStyle } from "#app/ui/text"; @@ -25,9 +25,27 @@ import type { PokeballType } from "#enums/pokeball"; import { Species } from "#enums/species"; import { type PermanentStat, type TempBattleStat, BATTLE_STATS, Stat, TEMP_BATTLE_STATS } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; -import { Type } from "#enums/type"; +import type { PokemonType } from "#enums/pokemon-type"; import i18next from "i18next"; -import { type DoubleBattleChanceBoosterModifierType, type EvolutionItemModifierType, type FormChangeItemModifierType, type ModifierOverride, type ModifierType, type PokemonBaseStatTotalModifierType, type PokemonExpBoosterModifierType, type PokemonFriendshipBoosterModifierType, type PokemonMoveAccuracyBoosterModifierType, type PokemonMultiHitModifierType, type TerastallizeModifierType, type TmModifierType, getModifierType, ModifierPoolType, ModifierTypeGenerator, modifierTypes, PokemonHeldItemModifierType } from "./modifier-type"; +import { + type DoubleBattleChanceBoosterModifierType, + type EvolutionItemModifierType, + type FormChangeItemModifierType, + type ModifierOverride, + type ModifierType, + type PokemonBaseStatTotalModifierType, + type PokemonExpBoosterModifierType, + type PokemonFriendshipBoosterModifierType, + type PokemonMoveAccuracyBoosterModifierType, + type PokemonMultiHitModifierType, + type TerastallizeModifierType, + type TmModifierType, + getModifierType, + ModifierPoolType, + ModifierTypeGenerator, + modifierTypes, + PokemonHeldItemModifierType, +} from "./modifier-type"; import { Color, ShadowColor } from "#enums/color"; import { FRIENDSHIP_GAIN_FROM_RARE_CANDY } from "#app/data/balance/starters"; import { applyAbAttrs, CommanderAbAttr } from "#app/data/ability"; @@ -46,19 +64,19 @@ export const modifierSortFunc = (a: Modifier, b: Modifier): number => { //First sort by pokemonID if (aId < bId) { return 1; - } else if (aId > bId) { + } + if (aId > bId) { return -1; - } else if (aId === bId) { + } + if (aId === bId) { //Then sort by item type if (typeNameMatch === 0) { return itemNameMatch; //Finally sort by item name - } else { - return typeNameMatch; } - } else { - return 0; + return typeNameMatch; } + return 0; }; export class ModifierBar extends Phaser.GameObjects.Container { @@ -77,16 +95,20 @@ export class ModifierBar extends Phaser.GameObjects.Container { * @param {PersistentModifier[]} modifiers - The list of modifiers to be displayed in the {@linkcode ModifierBar} * @param {boolean} hideHeldItems - If set to "true", only modifiers not assigned to a Pokémon are displayed */ - updateModifiers(modifiers: PersistentModifier[], hideHeldItems: boolean = false) { + updateModifiers(modifiers: PersistentModifier[], hideHeldItems = false) { this.removeAll(true); const visibleIconModifiers = modifiers.filter(m => m.isIconVisible()); - const nonPokemonSpecificModifiers = visibleIconModifiers.filter(m => !(m as PokemonHeldItemModifier).pokemonId).sort(modifierSortFunc); - const pokemonSpecificModifiers = visibleIconModifiers.filter(m => (m as PokemonHeldItemModifier).pokemonId).sort(modifierSortFunc); + const nonPokemonSpecificModifiers = visibleIconModifiers + .filter(m => !(m as PokemonHeldItemModifier).pokemonId) + .sort(modifierSortFunc); + const pokemonSpecificModifiers = visibleIconModifiers + .filter(m => (m as PokemonHeldItemModifier).pokemonId) + .sort(modifierSortFunc); - const sortedVisibleIconModifiers = hideHeldItems ? nonPokemonSpecificModifiers : nonPokemonSpecificModifiers.concat(pokemonSpecificModifiers); - - const thisArg = this; + const sortedVisibleIconModifiers = hideHeldItems + ? nonPokemonSpecificModifiers + : nonPokemonSpecificModifiers.concat(pokemonSpecificModifiers); sortedVisibleIconModifiers.forEach((modifier: PersistentModifier, i: number) => { const icon = modifier.getIcon(); @@ -99,13 +121,13 @@ export class ModifierBar extends Phaser.GameObjects.Container { icon.on("pointerover", () => { globalScene.ui.showTooltip(modifier.type.name, modifier.type.getDescription()); if (this.modifierCache && this.modifierCache.length > iconOverflowIndex) { - thisArg.updateModifierOverflowVisibility(true); + this.updateModifierOverflowVisibility(true); } }); icon.on("pointerout", () => { globalScene.ui.hideTooltip(); if (this.modifierCache && this.modifierCache.length > iconOverflowIndex) { - thisArg.updateModifierOverflowVisibility(false); + this.updateModifierOverflowVisibility(false); } }); }); @@ -125,9 +147,9 @@ export class ModifierBar extends Phaser.GameObjects.Container { } setModifierIconPosition(icon: Phaser.GameObjects.Container, modifierCount: number) { - const rowIcons: number = 12 + 6 * Math.max((Math.ceil(Math.min(modifierCount, 24) / 12) - 2), 0); + const rowIcons: number = 12 + 6 * Math.max(Math.ceil(Math.min(modifierCount, 24) / 12) - 2, 0); - const x = (this.getIndex(icon) % rowIcons) * 26 / (rowIcons / 12); + const x = ((this.getIndex(icon) % rowIcons) * 26) / (rowIcons / 12); const y = Math.floor(this.getIndex(icon) / rowIcons) * 20; icon.setPosition(this.player ? x : -x, y); @@ -158,16 +180,16 @@ export abstract class Modifier { * Handles applying of {@linkcode Modifier} * @param args collection of all passed parameters */ - abstract apply(...args: unknown[]): boolean | Promise; + abstract apply(...args: unknown[]): boolean; } export abstract class PersistentModifier extends Modifier { public stackCount: number; public virtualStackCount: number; - constructor(type: ModifierType, stackCount?: number) { + constructor(type: ModifierType, stackCount = 1) { super(type); - this.stackCount = stackCount === undefined ? 1 : stackCount; + this.stackCount = stackCount; this.virtualStackCount = 0; } @@ -215,7 +237,7 @@ export abstract class PersistentModifier extends Modifier { return true; } - getIcon(forSummary?: boolean): Phaser.GameObjects.Container { + getIcon(_forSummary?: boolean): Phaser.GameObjects.Container { const container = globalScene.add.container(0, 0); const item = globalScene.add.sprite(0, 12, "items"); @@ -253,10 +275,6 @@ export abstract class PersistentModifier extends Modifier { } export abstract class ConsumableModifier extends Modifier { - constructor(type: ModifierType) { - super(type); - } - add(_modifiers: Modifier[]): boolean { return true; } @@ -280,7 +298,10 @@ export class AddPokeballModifier extends ConsumableModifier { */ override apply(): boolean { const pokeballCounts = globalScene.pokeballCounts; - pokeballCounts[this.pokeballType] = Math.min(pokeballCounts[this.pokeballType] + this.count, MAX_PER_TYPE_POKEBALLS); + pokeballCounts[this.pokeballType] = Math.min( + pokeballCounts[this.pokeballType] + this.count, + MAX_PER_TYPE_POKEBALLS, + ); return true; } @@ -418,7 +439,7 @@ export abstract class LapsingPersistentModifier extends PersistentModifier { } getArgs(): any[] { - return [ this.maxBattles, this.battleCount ]; + return [this.maxBattles, this.battleCount]; } getMaxStackCount(_forThreshold?: boolean): number { @@ -436,16 +457,17 @@ export abstract class LapsingPersistentModifier extends PersistentModifier { export class DoubleBattleChanceBoosterModifier extends LapsingPersistentModifier { public override type: DoubleBattleChanceBoosterModifierType; - constructor(type: ModifierType, maxBattles:number, battleCount?: number, stackCount?: number) { - super(type, maxBattles, battleCount, stackCount); - } - match(modifier: Modifier): boolean { - return (modifier instanceof DoubleBattleChanceBoosterModifier) && (modifier.getMaxBattles() === this.getMaxBattles()); + return modifier instanceof DoubleBattleChanceBoosterModifier && modifier.getMaxBattles() === this.getMaxBattles(); } clone(): DoubleBattleChanceBoosterModifier { - return new DoubleBattleChanceBoosterModifier(this.type, this.getMaxBattles(), this.getBattleCount(), this.stackCount); + return new DoubleBattleChanceBoosterModifier( + this.type, + this.getMaxBattles(), + this.getBattleCount(), + this.stackCount, + ); } /** @@ -481,23 +503,29 @@ export class TempStatStageBoosterModifier extends LapsingPersistentModifier { this.stat = stat; // Note that, because we want X Accuracy to maintain its original behavior, // it will increment as it did previously, directly to the stat stage. - this.boost = (stat !== Stat.ACC) ? 0.3 : 1; + this.boost = stat !== Stat.ACC ? 0.3 : 1; } match(modifier: Modifier): boolean { if (modifier instanceof TempStatStageBoosterModifier) { const modifierInstance = modifier as TempStatStageBoosterModifier; - return (modifierInstance.stat === this.stat); + return modifierInstance.stat === this.stat; } return false; } clone() { - return new TempStatStageBoosterModifier(this.type, this.stat, this.getMaxBattles(), this.getBattleCount(), this.stackCount); + return new TempStatStageBoosterModifier( + this.type, + this.stat, + this.getMaxBattles(), + this.getBattleCount(), + this.stackCount, + ); } getArgs(): any[] { - return [ this.stat, ...super.getArgs() ]; + return [this.stat, ...super.getArgs()]; } /** @@ -508,7 +536,9 @@ export class TempStatStageBoosterModifier extends LapsingPersistentModifier { * @returns `true` if the modifier can be applied, false otherwise */ override shouldApply(tempBattleStat?: TempBattleStat, statLevel?: NumberHolder): boolean { - return !!tempBattleStat && !!statLevel && TEMP_BATTLE_STATS.includes(tempBattleStat) && (tempBattleStat === this.stat); + return ( + !!tempBattleStat && !!statLevel && TEMP_BATTLE_STATS.includes(tempBattleStat) && tempBattleStat === this.stat + ); } /** @@ -529,16 +559,12 @@ export class TempStatStageBoosterModifier extends LapsingPersistentModifier { * @see {@linkcode apply} */ export class TempCritBoosterModifier extends LapsingPersistentModifier { - constructor(type: ModifierType, maxBattles: number, battleCount?: number, stackCount?: number) { - super(type, maxBattles, battleCount, stackCount); - } - clone() { return new TempCritBoosterModifier(this.type, this.getMaxBattles(), this.getBattleCount(), this.stackCount); } match(modifier: Modifier): boolean { - return (modifier instanceof TempCritBoosterModifier); + return modifier instanceof TempCritBoosterModifier; } /** @@ -562,10 +588,6 @@ export class TempCritBoosterModifier extends LapsingPersistentModifier { } export class MapModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - clone(): MapModifier { return new MapModifier(this.type, this.stackCount); } @@ -580,10 +602,6 @@ export class MapModifier extends PersistentModifier { } export class MegaEvolutionAccessModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - clone(): MegaEvolutionAccessModifier { return new MegaEvolutionAccessModifier(this.type, this.stackCount); } @@ -598,10 +616,6 @@ export class MegaEvolutionAccessModifier extends PersistentModifier { } export class GigantamaxAccessModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - clone(): GigantamaxAccessModifier { return new GigantamaxAccessModifier(this.type, this.stackCount); } @@ -621,10 +635,6 @@ export class GigantamaxAccessModifier extends PersistentModifier { } export class TerastallizeAccessModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - clone(): TerastallizeAccessModifier { return new TerastallizeAccessModifier(this.type, this.stackCount); } @@ -645,7 +655,7 @@ export class TerastallizeAccessModifier extends PersistentModifier { export abstract class PokemonHeldItemModifier extends PersistentModifier { public pokemonId: number; - public isTransferable: boolean = true; + public isTransferable = true; constructor(type: ModifierType, pokemonId: number, stackCount?: number) { super(type, stackCount); @@ -660,7 +670,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier { } getArgs(): any[] { - return [ this.pokemonId ]; + return [this.pokemonId]; } /** @@ -681,7 +691,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier { } isIconVisible(): boolean { - return !!(this.getPokemon()?.isOnField()); + return !!this.getPokemon()?.isOnField(); } getIcon(forSummary?: boolean): Phaser.GameObjects.Container { @@ -718,7 +728,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier { } getPokemon(): Pokemon | undefined { - return this.pokemonId ? globalScene.getPokemonById(this.pokemonId) ?? undefined : undefined; + return this.pokemonId ? (globalScene.getPokemonById(this.pokemonId) ?? undefined) : undefined; } getScoreMultiplier(): number { @@ -731,7 +741,10 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier { return 0; } if (pokemon.isPlayer() && forThreshold) { - return globalScene.getPlayerParty().map(p => this.getMaxHeldItemCount(p)).reduce((stackCount: number, maxStackCount: number) => Math.max(stackCount, maxStackCount), 0); + return globalScene + .getPlayerParty() + .map(p => this.getMaxHeldItemCount(p)) + .reduce((stackCount: number, maxStackCount: number) => Math.max(stackCount, maxStackCount), 0); } return this.getMaxHeldItemCount(pokemon); } @@ -741,7 +754,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier { export abstract class LapsingPokemonHeldItemModifier extends PokemonHeldItemModifier { protected battlesLeft: number; - public isTransferable: boolean = false; + public isTransferable = false; constructor(type: ModifierType, pokemonId: number, battlesLeft?: number, stackCount?: number) { super(type, pokemonId, stackCount); @@ -767,7 +780,10 @@ export abstract class LapsingPokemonHeldItemModifier extends PokemonHeldItemModi const container = super.getIcon(forSummary); if (this.getPokemon()?.isPlayer()) { - const battleCountText = addTextObject(27, 0, this.battlesLeft.toString(), TextStyle.PARTY, { fontSize: "66px", color: Color.PINK }); + const battleCountText = addTextObject(27, 0, this.battlesLeft.toString(), TextStyle.PARTY, { + fontSize: "66px", + color: Color.PINK, + }); battleCountText.setShadow(0, 0); battleCountText.setStroke(ShadowColor.RED, 16); battleCountText.setOrigin(1, 0); @@ -781,73 +797,7 @@ export abstract class LapsingPokemonHeldItemModifier extends PokemonHeldItemModi return this.battlesLeft; } - getMaxStackCount(forThreshold?: boolean): number { - return 1; - } -} - -export class TerastallizeModifier extends LapsingPokemonHeldItemModifier { - public override type: TerastallizeModifierType; - public teraType: Type; - public isTransferable: boolean = false; - - constructor(type: TerastallizeModifierType, pokemonId: number, teraType: Type, battlesLeft?: number, stackCount?: number) { - super(type, pokemonId, battlesLeft || 10, stackCount); - - this.teraType = teraType; - } - - matchType(modifier: Modifier): boolean { - if (modifier instanceof TerastallizeModifier && modifier.teraType === this.teraType) { - return true; - } - return false; - } - - clone(): TerastallizeModifier { - return new TerastallizeModifier(this.type, this.pokemonId, this.teraType, this.battlesLeft, this.stackCount); - } - - getArgs(): any[] { - return [ this.pokemonId, this.teraType, this.battlesLeft ]; - } - - /** - * Applies the {@linkcode TerastallizeModifier} to the specified {@linkcode Pokemon}. - * @param pokemon the {@linkcode Pokemon} to be terastallized - * @returns always `true` - */ - override apply(pokemon: Pokemon): boolean { - if (pokemon.isPlayer()) { - globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeTeraTrigger); - globalScene.validateAchv(achvs.TERASTALLIZE); - if (this.teraType === Type.STELLAR) { - globalScene.validateAchv(achvs.STELLAR_TERASTALLIZE); - } - } - pokemon.updateSpritePipelineData(); - return true; - } - - /** - * Triggers {@linkcode LapsingPokemonHeldItemModifier.lapse} and if it returns `0` a form change is triggered. - * @param pokemon THe {@linkcode Pokemon} to be terastallized - * @returns the result of {@linkcode LapsingPokemonHeldItemModifier.lapse} - */ - public override lapse(pokemon: Pokemon): boolean { - const ret = super.lapse(pokemon); - if (!ret) { - globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeLapseTeraTrigger); - pokemon.updateSpritePipelineData(); - } - return ret; - } - - getScoreMultiplier(): number { - return 1.25; - } - - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxStackCount(_forThreshold?: boolean): number { return 1; } } @@ -860,7 +810,7 @@ export class TerastallizeModifier extends LapsingPokemonHeldItemModifier { */ export class BaseStatModifier extends PokemonHeldItemModifier { protected stat: PermanentStat; - public isTransferable: boolean = false; + public isTransferable = false; constructor(type: ModifierType, pokemonId: number, stat: PermanentStat, stackCount?: number) { super(type, pokemonId, stackCount); @@ -915,7 +865,7 @@ export class BaseStatModifier extends PokemonHeldItemModifier { export class EvoTrackerModifier extends PokemonHeldItemModifier { protected species: Species; protected required: number; - public isTransferable: boolean = false; + public isTransferable = false; constructor(type: ModifierType, pokemonId: number, species: Species, required: number, stackCount?: number) { super(type, pokemonId, stackCount); @@ -924,7 +874,9 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier { } matchType(modifier: Modifier): boolean { - return modifier instanceof EvoTrackerModifier && modifier.species === this.species && modifier.required === this.required; + return ( + modifier instanceof EvoTrackerModifier && modifier.species === this.species && modifier.required === this.required + ); } clone(): PersistentModifier { @@ -932,7 +884,7 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier { } getArgs(): any[] { - return super.getArgs().concat([ this.species, this.required ]); + return super.getArgs().concat([this.species, this.required]); } /** @@ -951,8 +903,14 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier { const pokemon = globalScene.getPokemonById(this.pokemonId); this.stackCount = pokemon - ? pokemon.evoCounter + pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length - + globalScene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier || m instanceof TempExtraModifierModifier).length + ? pokemon.evoCounter + + pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length + + globalScene.findModifiers( + m => + m instanceof MoneyMultiplierModifier || + m instanceof ExtraModifierModifier || + m instanceof TempExtraModifierModifier, + ).length : this.stackCount; const text = globalScene.add.bitmapText(10, 15, "item-count", this.stackCount.toString(), 11); @@ -966,8 +924,15 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier { } getMaxHeldItemCount(pokemon: Pokemon): number { - this.stackCount = pokemon.evoCounter + pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length - + globalScene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier || m instanceof TempExtraModifierModifier).length; + this.stackCount = + pokemon.evoCounter + + pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length + + globalScene.findModifiers( + m => + m instanceof MoneyMultiplierModifier || + m instanceof ExtraModifierModifier || + m instanceof TempExtraModifierModifier, + ).length; return 999; } } @@ -977,7 +942,7 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier { */ export class PokemonBaseStatTotalModifier extends PokemonHeldItemModifier { public override type: PokemonBaseStatTotalModifierType; - public isTransferable: boolean = false; + public isTransferable = false; private statModifier: number; @@ -1029,7 +994,7 @@ export class PokemonBaseStatTotalModifier extends PokemonHeldItemModifier { return 1.2; } - override getMaxHeldItemCount(pokemon: Pokemon): number { + override getMaxHeldItemCount(_pokemon: Pokemon): number { return 2; } } @@ -1040,9 +1005,9 @@ export class PokemonBaseStatTotalModifier extends PokemonHeldItemModifier { export class PokemonBaseStatFlatModifier extends PokemonHeldItemModifier { private statModifier: number; private stats: Stat[]; - public isTransferable: boolean = false; + public isTransferable = false; - constructor (type: ModifierType, pokemonId: number, statModifier: number, stats: Stat[], stackCount?: number) { + constructor(type: ModifierType, pokemonId: number, statModifier: number, stats: Stat[], stackCount?: number) { super(type, pokemonId, stackCount); this.statModifier = statModifier; @@ -1050,7 +1015,11 @@ export class PokemonBaseStatFlatModifier extends PokemonHeldItemModifier { } override matchType(modifier: Modifier): boolean { - return modifier instanceof PokemonBaseStatFlatModifier && modifier.statModifier === this.statModifier && this.stats.every(s => modifier.stats.some(stat => s === stat)); + return ( + modifier instanceof PokemonBaseStatFlatModifier && + modifier.statModifier === this.statModifier && + this.stats.every(s => modifier.stats.some(stat => s === stat)) + ); } override clone(): PersistentModifier { @@ -1058,7 +1027,7 @@ export class PokemonBaseStatFlatModifier extends PokemonHeldItemModifier { } override getArgs(): any[] { - return [ ...super.getArgs(), this.statModifier, this.stats ]; + return [...super.getArgs(), this.statModifier, this.stats]; } /** @@ -1093,7 +1062,7 @@ export class PokemonBaseStatFlatModifier extends PokemonHeldItemModifier { return 1.1; } - override getMaxHeldItemCount(pokemon: Pokemon): number { + override getMaxHeldItemCount(_pokemon: Pokemon): number { return 1; } } @@ -1102,11 +1071,7 @@ export class PokemonBaseStatFlatModifier extends PokemonHeldItemModifier { * Currently used by Macho Brace item */ export class PokemonIncrementingStatModifier extends PokemonHeldItemModifier { - public isTransferable: boolean = false; - - constructor (type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } + public isTransferable = false; matchType(modifier: Modifier): boolean { return modifier instanceof PokemonIncrementingStatModifier; @@ -1162,7 +1127,7 @@ export class PokemonIncrementingStatModifier extends PokemonHeldItemModifier { return 1.2; } - getMaxHeldItemCount(pokemon?: Pokemon): number { + getMaxHeldItemCount(_pokemon?: Pokemon): number { return 50; } } @@ -1191,13 +1156,13 @@ export class StatBoosterModifier extends PokemonHeldItemModifier { } getArgs(): any[] { - return [ ...super.getArgs(), this.stats, this.multiplier ]; + return [...super.getArgs(), this.stats, this.multiplier]; } matchType(modifier: Modifier): boolean { if (modifier instanceof StatBoosterModifier) { const modifierInstance = modifier as StatBoosterModifier; - if ((modifierInstance.multiplier === this.multiplier) && (modifierInstance.stats.length === this.stats.length)) { + if (modifierInstance.multiplier === this.multiplier && modifierInstance.stats.length === this.stats.length) { return modifierInstance.stats.every((e, i) => e === this.stats[i]); } } @@ -1277,11 +1242,12 @@ export class EvolutionStatBoosterModifier extends StatBoosterModifier { override apply(pokemon: Pokemon, stat: Stat, statValue: NumberHolder): boolean { const isUnevolved = pokemon.getSpeciesForm(true).speciesId in pokemonEvolutions; - if (pokemon.isFusion() && (pokemon.getFusionSpeciesForm(true).speciesId in pokemonEvolutions) !== isUnevolved) { + if (pokemon.isFusion() && pokemon.getFusionSpeciesForm(true).speciesId in pokemonEvolutions !== isUnevolved) { // Half boost applied if pokemon is fused and either part of fusion is fully evolved statValue.value *= 1 + (this.multiplier - 1) / 2; return true; - } else if (isUnevolved) { + } + if (isUnevolved) { // Full boost applied if holder is unfused and unevolved or, if fused, both parts of fusion are unevolved return super.apply(pokemon, stat, statValue); } @@ -1300,18 +1266,32 @@ export class SpeciesStatBoosterModifier extends StatBoosterModifier { /** The species that the held item's stat boost(s) apply to */ private species: Species[]; - constructor(type: ModifierType, pokemonId: number, stats: Stat[], multiplier: number, species: Species[], stackCount?: number) { + constructor( + type: ModifierType, + pokemonId: number, + stats: Stat[], + multiplier: number, + species: Species[], + stackCount?: number, + ) { super(type, pokemonId, stats, multiplier, stackCount); this.species = species; } clone() { - return new SpeciesStatBoosterModifier(this.type, this.pokemonId, this.stats, this.multiplier, this.species, this.stackCount); + return new SpeciesStatBoosterModifier( + this.type, + this.pokemonId, + this.stats, + this.multiplier, + this.species, + this.stackCount, + ); } getArgs(): any[] { - return [ ...super.getArgs(), this.species ]; + return [...super.getArgs(), this.species]; } matchType(modifier: Modifier): boolean { @@ -1334,7 +1314,11 @@ export class SpeciesStatBoosterModifier extends StatBoosterModifier { * @returns `true` if the stat could be boosted, false otherwise */ override shouldApply(pokemon: Pokemon, stat: Stat, statValue: NumberHolder): boolean { - return super.shouldApply(pokemon, stat, statValue) && (this.species.includes(pokemon.getSpeciesForm(true).speciesId) || (pokemon.isFusion() && this.species.includes(pokemon.getFusionSpeciesForm(true).speciesId))); + return ( + super.shouldApply(pokemon, stat, statValue) && + (this.species.includes(pokemon.getSpeciesForm(true).speciesId) || + (pokemon.isFusion() && this.species.includes(pokemon.getFusionSpeciesForm(true).speciesId))) + ); } /** @@ -1412,11 +1396,17 @@ export class SpeciesCritBoosterModifier extends CritBoosterModifier { } clone() { - return new SpeciesCritBoosterModifier(this.type, this.pokemonId, this.stageIncrement, this.species, this.stackCount); + return new SpeciesCritBoosterModifier( + this.type, + this.pokemonId, + this.stageIncrement, + this.species, + this.stackCount, + ); } getArgs(): any[] { - return [ ...super.getArgs(), this.species ]; + return [...super.getArgs(), this.species]; } matchType(modifier: Modifier): boolean { @@ -1431,7 +1421,11 @@ export class SpeciesCritBoosterModifier extends CritBoosterModifier { * @returns `true` if the critical-hit level can be incremented, false otherwise */ override shouldApply(pokemon: Pokemon, critStage: NumberHolder): boolean { - return super.shouldApply(pokemon, critStage) && (this.species.includes(pokemon.getSpeciesForm(true).speciesId) || (pokemon.isFusion() && this.species.includes(pokemon.getFusionSpeciesForm(true).speciesId))); + return ( + super.shouldApply(pokemon, critStage) && + (this.species.includes(pokemon.getSpeciesForm(true).speciesId) || + (pokemon.isFusion() && this.species.includes(pokemon.getFusionSpeciesForm(true).speciesId))) + ); } } @@ -1439,10 +1433,10 @@ export class SpeciesCritBoosterModifier extends CritBoosterModifier { * Applies Specific Type item boosts (e.g., Magnet) */ export class AttackTypeBoosterModifier extends PokemonHeldItemModifier { - public moveType: Type; + public moveType: PokemonType; private boostMultiplier: number; - constructor(type: ModifierType, pokemonId: number, moveType: Type, boostPercent: number, stackCount?: number) { + constructor(type: ModifierType, pokemonId: number, moveType: PokemonType, boostPercent: number, stackCount?: number) { super(type, pokemonId, stackCount); this.moveType = moveType; @@ -1452,41 +1446,56 @@ export class AttackTypeBoosterModifier extends PokemonHeldItemModifier { matchType(modifier: Modifier): boolean { if (modifier instanceof AttackTypeBoosterModifier) { const attackTypeBoosterModifier = modifier as AttackTypeBoosterModifier; - return attackTypeBoosterModifier.moveType === this.moveType && attackTypeBoosterModifier.boostMultiplier === this.boostMultiplier; + return ( + attackTypeBoosterModifier.moveType === this.moveType && + attackTypeBoosterModifier.boostMultiplier === this.boostMultiplier + ); } return false; } clone() { - return new AttackTypeBoosterModifier(this.type, this.pokemonId, this.moveType, this.boostMultiplier * 100, this.stackCount); + return new AttackTypeBoosterModifier( + this.type, + this.pokemonId, + this.moveType, + this.boostMultiplier * 100, + this.stackCount, + ); } getArgs(): any[] { - return super.getArgs().concat([ this.moveType, this.boostMultiplier * 100 ]); + return super.getArgs().concat([this.moveType, this.boostMultiplier * 100]); } /** * Checks if {@linkcode AttackTypeBoosterModifier} should be applied * @param pokemon the {@linkcode Pokemon} that holds the held item - * @param moveType the {@linkcode Type} of the move being used + * @param moveType the {@linkcode PokemonType} of the move being used * @param movePower the {@linkcode NumberHolder} that holds the power of the move * @returns `true` if boosts should be applied to the move. */ - override shouldApply(pokemon?: Pokemon, moveType?: Type, movePower?: NumberHolder): boolean { - return super.shouldApply(pokemon, moveType, movePower) && typeof moveType === "number" && movePower instanceof NumberHolder; + override shouldApply(pokemon?: Pokemon, moveType?: PokemonType, movePower?: NumberHolder): boolean { + return ( + super.shouldApply(pokemon, moveType, movePower) && + typeof moveType === "number" && + movePower instanceof NumberHolder + ); } /** * Applies {@linkcode AttackTypeBoosterModifier} * @param pokemon {@linkcode Pokemon} that holds the held item - * @param moveType {@linkcode Type} of the move being used + * @param moveType {@linkcode PokemonType} of the move being used * @param movePower {@linkcode NumberHolder} that holds the power of the move * @returns `true` if boosts have been applied to the move. */ - override apply(_pokemon: Pokemon, moveType: Type, movePower: NumberHolder): boolean { + override apply(_pokemon: Pokemon, moveType: PokemonType, movePower: NumberHolder): boolean { if (moveType === this.moveType && movePower.value >= 1) { - (movePower as NumberHolder).value = Math.floor((movePower as NumberHolder).value * (1 + (this.getStackCount() * this.boostMultiplier))); + (movePower as NumberHolder).value = Math.floor( + (movePower as NumberHolder).value * (1 + this.getStackCount() * this.boostMultiplier), + ); return true; } @@ -1497,16 +1506,12 @@ export class AttackTypeBoosterModifier extends PokemonHeldItemModifier { return 1.2; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 99; } } export class SurviveDamageModifier extends PokemonHeldItemModifier { - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier): boolean { return modifier instanceof SurviveDamageModifier; } @@ -1535,23 +1540,24 @@ export class SurviveDamageModifier extends PokemonHeldItemModifier { if (!surviveDamage.value && pokemon.randSeedInt(10) < this.getStackCount()) { surviveDamage.value = true; - globalScene.queueMessage(i18next.t("modifier:surviveDamageApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name })); + globalScene.queueMessage( + i18next.t("modifier:surviveDamageApply", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + typeName: this.type.name, + }), + ); return true; } return false; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 5; } } export class BypassSpeedChanceModifier extends PokemonHeldItemModifier { - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier) { return modifier instanceof BypassSpeedChanceModifier; } @@ -1579,11 +1585,17 @@ export class BypassSpeedChanceModifier extends PokemonHeldItemModifier { override apply(pokemon: Pokemon, doBypassSpeed: BooleanHolder): boolean { if (!doBypassSpeed.value && pokemon.randSeedInt(10) < this.getStackCount()) { doBypassSpeed.value = true; - const isCommandFight = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()]?.command === Command.FIGHT; + const isCommandFight = + globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()]?.command === Command.FIGHT; const hasQuickClaw = this.type instanceof PokemonHeldItemModifierType && this.type.id === "QUICK_CLAW"; if (isCommandFight && hasQuickClaw) { - globalScene.queueMessage(i18next.t("modifier:bypassSpeedChanceApply", { pokemonName: getPokemonNameWithAffix(pokemon), itemName: i18next.t("modifierType:ModifierType.QUICK_CLAW.name") })); + globalScene.queueMessage( + i18next.t("modifier:bypassSpeedChanceApply", { + pokemonName: getPokemonNameWithAffix(pokemon), + itemName: i18next.t("modifierType:ModifierType.QUICK_CLAW.name"), + }), + ); } return true; } @@ -1591,7 +1603,7 @@ export class BypassSpeedChanceModifier extends PokemonHeldItemModifier { return false; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 3; } } @@ -1634,7 +1646,7 @@ export class FlinchChanceModifier extends PokemonHeldItemModifier { */ override apply(pokemon: Pokemon, flinched: BooleanHolder): boolean { // The check for pokemon.battleSummonData is to ensure that a crash doesn't occur when a Pokemon with King's Rock procs a flinch - if (pokemon.battleSummonData && !flinched.value && pokemon.randSeedInt(100) < (this.getStackCount() * this.chance)) { + if (pokemon.battleSummonData && !flinched.value && pokemon.randSeedInt(100) < this.getStackCount() * this.chance) { flinched.value = true; return true; } @@ -1648,10 +1660,6 @@ export class FlinchChanceModifier extends PokemonHeldItemModifier { } export class TurnHealModifier extends PokemonHeldItemModifier { - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier) { return modifier instanceof TurnHealModifier; } @@ -1667,15 +1675,24 @@ export class TurnHealModifier extends PokemonHeldItemModifier { */ override apply(pokemon: Pokemon): boolean { if (!pokemon.isFullHp()) { - globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), - toDmgValue(pokemon.getMaxHp() / 16) * this.stackCount, i18next.t("modifier:turnHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), true)); + globalScene.unshiftPhase( + new PokemonHealPhase( + pokemon.getBattlerIndex(), + toDmgValue(pokemon.getMaxHp() / 16) * this.stackCount, + i18next.t("modifier:turnHealApply", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + typeName: this.type.name, + }), + true, + ), + ); return true; } return false; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 4; } } @@ -1690,7 +1707,7 @@ export class TurnStatusEffectModifier extends PokemonHeldItemModifier { /** The status effect to be applied by the held item */ private effect: StatusEffect; - constructor (type: ModifierType, pokemonId: number, stackCount?: number) { + constructor(type: ModifierType, pokemonId: number, stackCount?: number) { super(type, pokemonId, stackCount); switch (type.id) { @@ -1730,7 +1747,7 @@ export class TurnStatusEffectModifier extends PokemonHeldItemModifier { return pokemon.trySetStatus(this.effect, true, undefined, undefined, this.type.name); } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 1; } @@ -1740,10 +1757,6 @@ export class TurnStatusEffectModifier extends PokemonHeldItemModifier { } export class HitHealModifier extends PokemonHeldItemModifier { - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier) { return modifier instanceof HitHealModifier; } @@ -1759,23 +1772,28 @@ export class HitHealModifier extends PokemonHeldItemModifier { */ override apply(pokemon: Pokemon): boolean { if (pokemon.turnData.totalDamageDealt && !pokemon.isFullHp()) { - globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), - toDmgValue(pokemon.turnData.totalDamageDealt / 8) * this.stackCount, i18next.t("modifier:hitHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), true)); + globalScene.unshiftPhase( + new PokemonHealPhase( + pokemon.getBattlerIndex(), + toDmgValue(pokemon.turnData.totalDamageDealt / 8) * this.stackCount, + i18next.t("modifier:hitHealApply", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + typeName: this.type.name, + }), + true, + ), + ); } return true; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 4; } } export class LevelIncrementBoosterModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier) { return modifier instanceof LevelIncrementBoosterModifier; } @@ -1804,7 +1822,7 @@ export class LevelIncrementBoosterModifier extends PersistentModifier { return true; } - getMaxStackCount(forThreshold?: boolean): number { + getMaxStackCount(_forThreshold?: boolean): number { return 99; } } @@ -1858,8 +1876,8 @@ export class BerryModifier extends PokemonHeldItemModifier { return true; } - getMaxHeldItemCount(pokemon: Pokemon): number { - if ([ BerryType.LUM, BerryType.LEPPA, BerryType.SITRUS, BerryType.ENIGMA ].includes(this.berryType)) { + getMaxHeldItemCount(_pokemon: Pokemon): number { + if ([BerryType.LUM, BerryType.LEPPA, BerryType.SITRUS, BerryType.ENIGMA].includes(this.berryType)) { return 2; } return 3; @@ -1867,10 +1885,6 @@ export class BerryModifier extends PokemonHeldItemModifier { } export class PreserveBerryModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier) { return modifier instanceof PreserveBerryModifier; } @@ -1909,10 +1923,6 @@ export class PreserveBerryModifier extends PersistentModifier { } export class PokemonInstantReviveModifier extends PokemonHeldItemModifier { - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier) { return modifier instanceof PokemonInstantReviveModifier; } @@ -1928,19 +1938,32 @@ export class PokemonInstantReviveModifier extends PokemonHeldItemModifier { */ override apply(pokemon: Pokemon): boolean { // Restore the Pokemon to half HP - globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), - toDmgValue(pokemon.getMaxHp() / 2), i18next.t("modifier:pokemonInstantReviveApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), false, false, true)); + globalScene.unshiftPhase( + new PokemonHealPhase( + pokemon.getBattlerIndex(), + toDmgValue(pokemon.getMaxHp() / 2), + i18next.t("modifier:pokemonInstantReviveApply", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + typeName: this.type.name, + }), + false, + false, + true, + ), + ); // Remove the Pokemon's FAINT status pokemon.resetStatus(true, false, true); // Reapply Commander on the Pokemon's side of the field, if applicable const field = pokemon.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField(); - field.forEach((p) => applyAbAttrs(CommanderAbAttr, p, null, false)); + for (const p of field) { + applyAbAttrs(CommanderAbAttr, p, null, false); + } return true; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 1; } } @@ -1952,10 +1975,6 @@ export class PokemonInstantReviveModifier extends PokemonHeldItemModifier { * @see {@linkcode apply} */ export class ResetNegativeStatStageModifier extends PokemonHeldItemModifier { - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier) { return modifier instanceof ResetNegativeStatStageModifier; } @@ -1981,7 +2000,12 @@ export class ResetNegativeStatStageModifier extends PokemonHeldItemModifier { } if (statRestored) { - globalScene.queueMessage(i18next.t("modifier:resetNegativeStatStageApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name })); + globalScene.queueMessage( + i18next.t("modifier:resetNegativeStatStageApply", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + typeName: this.type.name, + }), + ); } return statRestored; } @@ -2015,20 +2039,62 @@ export abstract class ConsumablePokemonModifier extends ConsumableModifier { * @param playerPokemon The {@linkcode PlayerPokemon} that consumes the item * @param args Additional arguments passed to {@linkcode ConsumablePokemonModifier.apply} */ - abstract override apply(playerPokemon: PlayerPokemon, ...args: unknown[]): boolean | Promise; + abstract override apply(playerPokemon: PlayerPokemon, ...args: unknown[]): boolean; getPokemon() { return globalScene.getPlayerParty().find(p => p.id === this.pokemonId); } } +export class TerrastalizeModifier extends ConsumablePokemonModifier { + public override type: TerastallizeModifierType; + public teraType: PokemonType; + + constructor(type: TerastallizeModifierType, pokemonId: number, teraType: PokemonType) { + super(type, pokemonId); + + this.teraType = teraType; + } + + /** + * Checks if {@linkcode TerrastalizeModifier} should be applied + * @param playerPokemon The {@linkcode PlayerPokemon} that consumes the item + * @returns `true` if the {@linkcode TerrastalizeModifier} should be applied + */ + override shouldApply(playerPokemon?: PlayerPokemon): boolean { + return ( + super.shouldApply(playerPokemon) && + [playerPokemon?.species.speciesId, playerPokemon?.fusionSpecies?.speciesId].filter( + s => s === Species.TERAPAGOS || s === Species.OGERPON || s === Species.SHEDINJA, + ).length === 0 + ); + } + + /** + * Applies {@linkcode TerrastalizeModifier} + * @param pokemon The {@linkcode PlayerPokemon} that consumes the item + * @returns `true` if hp was restored + */ + override apply(pokemon: Pokemon): boolean { + pokemon.teraType = this.teraType; + return true; + } +} + export class PokemonHpRestoreModifier extends ConsumablePokemonModifier { private restorePoints: number; private restorePercent: number; private healStatus: boolean; public fainted: boolean; - constructor(type: ModifierType, pokemonId: number, restorePoints: number, restorePercent: number, healStatus: boolean, fainted?: boolean) { + constructor( + type: ModifierType, + pokemonId: number, + restorePoints: number, + restorePercent: number, + healStatus: boolean, + fainted?: boolean, + ) { super(type, pokemonId); this.restorePoints = restorePoints; @@ -2044,7 +2110,10 @@ export class PokemonHpRestoreModifier extends ConsumablePokemonModifier { * @returns `true` if the {@linkcode PokemonHpRestoreModifier} should be applied */ override shouldApply(playerPokemon?: PlayerPokemon, multiplier?: number): boolean { - return super.shouldApply(playerPokemon) && (this.fainted || (!isNullOrUndefined(multiplier) && typeof(multiplier) === "number")); + return ( + super.shouldApply(playerPokemon) && + (this.fainted || (!isNullOrUndefined(multiplier) && typeof multiplier === "number")) + ); } /** @@ -2062,7 +2131,11 @@ export class PokemonHpRestoreModifier extends ConsumablePokemonModifier { if (this.fainted || this.healStatus) { pokemon.resetStatus(true, true); } - pokemon.hp = Math.min(pokemon.hp + Math.max(Math.ceil(Math.max(Math.floor((this.restorePercent * 0.01) * pokemon.getMaxHp()), restorePoints)), 1), pokemon.getMaxHp()); + pokemon.hp = Math.min( + pokemon.hp + + Math.max(Math.ceil(Math.max(Math.floor(this.restorePercent * 0.01 * pokemon.getMaxHp()), restorePoints)), 1), + pokemon.getMaxHp(), + ); return true; } return false; @@ -2070,10 +2143,6 @@ export class PokemonHpRestoreModifier extends ConsumablePokemonModifier { } export class PokemonStatusHealModifier extends ConsumablePokemonModifier { - constructor(type: ModifierType, pokemonId: number) { - super(type, pokemonId); - } - /** * Applies {@linkcode PokemonStatusHealModifier} * @param playerPokemon The {@linkcode PlayerPokemon} that gets healed from the status @@ -2193,10 +2262,6 @@ export class PokemonNatureChangeModifier extends ConsumablePokemonModifier { } export class PokemonLevelIncrementModifier extends ConsumablePokemonModifier { - constructor(type: ModifierType, pokemonId: number) { - super(type, pokemonId); - } - /** * Applies {@linkcode PokemonLevelIncrementModifier} * @param playerPokemon The {@linkcode PlayerPokemon} that should get levels incremented @@ -2214,7 +2279,13 @@ export class PokemonLevelIncrementModifier extends ConsumablePokemonModifier { playerPokemon.addFriendship(FRIENDSHIP_GAIN_FROM_RARE_CANDY); - globalScene.unshiftPhase(new LevelUpPhase(globalScene.getPlayerParty().indexOf(playerPokemon), playerPokemon.level - levelCount.value, playerPokemon.level)); + globalScene.unshiftPhase( + new LevelUpPhase( + globalScene.getPlayerParty().indexOf(playerPokemon), + playerPokemon.level - levelCount.value, + playerPokemon.level, + ), + ); return true; } @@ -2223,18 +2294,15 @@ export class PokemonLevelIncrementModifier extends ConsumablePokemonModifier { export class TmModifier extends ConsumablePokemonModifier { public override type: TmModifierType; - constructor(type: TmModifierType, pokemonId: number) { - super(type, pokemonId); - } - /** * Applies {@linkcode TmModifier} * @param playerPokemon The {@linkcode PlayerPokemon} that should learn the TM * @returns always `true` */ override apply(playerPokemon: PlayerPokemon): boolean { - - globalScene.unshiftPhase(new LearnMovePhase(globalScene.getPlayerParty().indexOf(playerPokemon), this.type.moveId, LearnMoveType.TM)); + globalScene.unshiftPhase( + new LearnMovePhase(globalScene.getPlayerParty().indexOf(playerPokemon), this.type.moveId, LearnMoveType.TM), + ); return true; } @@ -2255,8 +2323,14 @@ export class RememberMoveModifier extends ConsumablePokemonModifier { * @returns always `true` */ override apply(playerPokemon: PlayerPokemon, cost?: number): boolean { - - globalScene.unshiftPhase(new LearnMovePhase(globalScene.getPlayerParty().indexOf(playerPokemon), playerPokemon.getLearnableLevelMoves()[this.levelMoveIndex], LearnMoveType.MEMORY, cost)); + globalScene.unshiftPhase( + new LearnMovePhase( + globalScene.getPlayerParty().indexOf(playerPokemon), + playerPokemon.getLearnableLevelMoves()[this.levelMoveIndex], + LearnMoveType.MEMORY, + cost, + ), + ); return true; } @@ -2264,11 +2338,6 @@ export class RememberMoveModifier extends ConsumablePokemonModifier { export class EvolutionItemModifier extends ConsumablePokemonModifier { public override type: EvolutionItemModifierType; - - constructor(type: EvolutionItemModifierType, pokemonId: number) { - super(type, pokemonId); - } - /** * Applies {@linkcode EvolutionItemModifier} * @param playerPokemon The {@linkcode PlayerPokemon} that should evolve via item @@ -2276,15 +2345,21 @@ export class EvolutionItemModifier extends ConsumablePokemonModifier { */ override apply(playerPokemon: PlayerPokemon): boolean { let matchingEvolution = pokemonEvolutions.hasOwnProperty(playerPokemon.species.speciesId) - ? pokemonEvolutions[playerPokemon.species.speciesId].find(e => e.item === this.type.evolutionItem - && (e.evoFormKey === null || (e.preFormKey || "") === playerPokemon.getFormKey()) - && (!e.condition || e.condition.predicate(playerPokemon))) + ? pokemonEvolutions[playerPokemon.species.speciesId].find( + e => + e.item === this.type.evolutionItem && + (e.evoFormKey === null || (e.preFormKey || "") === playerPokemon.getFormKey()) && + (!e.condition || e.condition.predicate(playerPokemon)), + ) : null; if (!matchingEvolution && playerPokemon.isFusion()) { - matchingEvolution = pokemonEvolutions[playerPokemon.fusionSpecies!.speciesId].find(e => e.item === this.type.evolutionItem // TODO: is the bang correct? - && (e.evoFormKey === null || (e.preFormKey || "") === playerPokemon.getFusionFormKey()) - && (!e.condition || e.condition.predicate(playerPokemon))); + matchingEvolution = pokemonEvolutions[playerPokemon.fusionSpecies!.speciesId].find( + e => + e.item === this.type.evolutionItem && // TODO: is the bang correct? + (e.evoFormKey === null || (e.preFormKey || "") === playerPokemon.getFusionFormKey()) && + (!e.condition || e.condition.predicate(playerPokemon)), + ); if (matchingEvolution) { matchingEvolution = new FusionSpeciesFormEvolution(playerPokemon.species.speciesId, matchingEvolution); } @@ -2315,7 +2390,9 @@ export class FusePokemonModifier extends ConsumablePokemonModifier { * @returns `true` if {@linkcode FusePokemonModifier} should be applied */ override shouldApply(playerPokemon?: PlayerPokemon, playerPokemon2?: PlayerPokemon): boolean { - return super.shouldApply(playerPokemon, playerPokemon2) && !!playerPokemon2 && this.fusePokemonId === playerPokemon2.id; + return ( + super.shouldApply(playerPokemon, playerPokemon2) && !!playerPokemon2 && this.fusePokemonId === playerPokemon2.id + ); } /** @@ -2324,17 +2401,13 @@ export class FusePokemonModifier extends ConsumablePokemonModifier { * @param playerPokemon2 {@linkcode PlayerPokemon} that should be fused with {@linkcode playerPokemon} * @returns always Promise */ - override async apply(playerPokemon: PlayerPokemon, playerPokemon2: PlayerPokemon): Promise { - await playerPokemon.fuse(playerPokemon2); + override apply(playerPokemon: PlayerPokemon, playerPokemon2: PlayerPokemon): boolean { + playerPokemon.fuse(playerPokemon2); return true; } } export class MultipleParticipantExpBonusModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof MultipleParticipantExpBonusModifier; } @@ -2374,7 +2447,7 @@ export class HealingBoosterModifier extends PersistentModifier { } getArgs(): any[] { - return [ this.multiplier ]; + return [this.multiplier]; } /** @@ -2383,7 +2456,7 @@ export class HealingBoosterModifier extends PersistentModifier { * @returns always `true` */ override apply(healingMultiplier: NumberHolder): boolean { - healingMultiplier.value *= 1 + ((this.multiplier - 1) * this.getStackCount()); + healingMultiplier.value *= 1 + (this.multiplier - 1) * this.getStackCount(); return true; } @@ -2415,7 +2488,7 @@ export class ExpBoosterModifier extends PersistentModifier { } getArgs(): any[] { - return [ this.boostMultiplier * 100 ]; + return [this.boostMultiplier * 100]; } /** @@ -2424,13 +2497,13 @@ export class ExpBoosterModifier extends PersistentModifier { * @returns always `true` */ override apply(boost: NumberHolder): boolean { - boost.value = Math.floor(boost.value * (1 + (this.getStackCount() * this.boostMultiplier))); + boost.value = Math.floor(boost.value * (1 + this.getStackCount() * this.boostMultiplier)); return true; } - getMaxStackCount(forThreshold?: boolean): number { - return this.boostMultiplier < 1 ? this.boostMultiplier < 0.6 ? 99 : 30 : 10; + getMaxStackCount(_forThreshold?: boolean): number { + return this.boostMultiplier < 1 ? (this.boostMultiplier < 0.6 ? 99 : 30) : 10; } } @@ -2477,21 +2550,17 @@ export class PokemonExpBoosterModifier extends PokemonHeldItemModifier { * @returns always `true` */ override apply(_pokemon: Pokemon, boost: NumberHolder): boolean { - boost.value = Math.floor(boost.value * (1 + (this.getStackCount() * this.boostMultiplier))); + boost.value = Math.floor(boost.value * (1 + this.getStackCount() * this.boostMultiplier)); return true; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 99; } } export class ExpShareModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof ExpShareModifier; } @@ -2514,10 +2583,6 @@ export class ExpShareModifier extends PersistentModifier { } export class ExpBalanceModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof ExpBalanceModifier; } @@ -2542,10 +2607,6 @@ export class ExpBalanceModifier extends PersistentModifier { export class PokemonFriendshipBoosterModifier extends PokemonHeldItemModifier { public override type: PokemonFriendshipBoosterModifierType; - constructor(type: PokemonFriendshipBoosterModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier): boolean { return modifier instanceof PokemonFriendshipBoosterModifier; } @@ -2566,16 +2627,12 @@ export class PokemonFriendshipBoosterModifier extends PokemonHeldItemModifier { return true; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 3; } } export class PokemonNatureWeightModifier extends PokemonHeldItemModifier { - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier): boolean { return modifier instanceof PokemonNatureWeightModifier; } @@ -2599,7 +2656,7 @@ export class PokemonNatureWeightModifier extends PokemonHeldItemModifier { return false; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 10; } } @@ -2651,7 +2708,7 @@ export class PokemonMoveAccuracyBoosterModifier extends PokemonHeldItemModifier return true; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 3; } } @@ -2659,10 +2716,6 @@ export class PokemonMoveAccuracyBoosterModifier extends PokemonHeldItemModifier export class PokemonMultiHitModifier extends PokemonHeldItemModifier { public override type: PokemonMultiHitModifierType; - constructor(type: PokemonMultiHitModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier): boolean { return modifier instanceof PokemonMultiHitModifier; } @@ -2679,7 +2732,12 @@ export class PokemonMultiHitModifier extends PokemonHeldItemModifier { * @param damageMultiplier {@linkcode NumberHolder} holding a damage multiplier applied to a strike of this move * @returns always `true` */ - override apply(pokemon: Pokemon, moveId: Moves, count: NumberHolder | null = null, damageMultiplier: NumberHolder | null = null): boolean { + override apply( + pokemon: Pokemon, + moveId: Moves, + count: NumberHolder | null = null, + damageMultiplier: NumberHolder | null = null, + ): boolean { const move = allMoves[moveId]; /** * The move must meet Parental Bond's restrictions for this item @@ -2696,7 +2754,8 @@ export class PokemonMultiHitModifier extends PokemonHeldItemModifier { if (!isNullOrUndefined(count)) { return this.applyHitCountBoost(count); - } else if (!isNullOrUndefined(damageMultiplier)) { + } + if (!isNullOrUndefined(damageMultiplier)) { return this.applyDamageModifier(pokemon, damageMultiplier); } @@ -2719,17 +2778,17 @@ export class PokemonMultiHitModifier extends PokemonHeldItemModifier { // Reduce first hit by 25% for each stack count damageMultiplier.value *= 1 - 0.25 * this.getStackCount(); return true; - } else if (pokemon.turnData.hitCount - pokemon.turnData.hitsLeft !== this.getStackCount() + 1) { + } + if (pokemon.turnData.hitCount - pokemon.turnData.hitsLeft !== this.getStackCount() + 1) { // Deal 25% damage for each remaining Multi Lens hit damageMultiplier.value *= 0.25; return true; - } else { - // An extra hit not caused by Multi Lens -- assume it is Parental Bond - return false; } + // An extra hit not caused by Multi Lens -- assume it is Parental Bond + return false; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 2; } } @@ -2738,9 +2797,15 @@ export class PokemonFormChangeItemModifier extends PokemonHeldItemModifier { public override type: FormChangeItemModifierType; public formChangeItem: FormChangeItem; public active: boolean; - public isTransferable: boolean = false; + public isTransferable = false; - constructor(type: FormChangeItemModifierType, pokemonId: number, formChangeItem: FormChangeItem, active: boolean, stackCount?: number) { + constructor( + type: FormChangeItemModifierType, + pokemonId: number, + formChangeItem: FormChangeItem, + active: boolean, + stackCount?: number, + ) { super(type, pokemonId, stackCount); this.formChangeItem = formChangeItem; this.active = active; @@ -2751,7 +2816,13 @@ export class PokemonFormChangeItemModifier extends PokemonHeldItemModifier { } clone(): PersistentModifier { - return new PokemonFormChangeItemModifier(this.type, this.pokemonId, this.formChangeItem, this.active, this.stackCount); + return new PokemonFormChangeItemModifier( + this.type, + this.pokemonId, + this.formChangeItem, + this.active, + this.stackCount, + ); } getArgs(): any[] { @@ -2780,7 +2851,7 @@ export class PokemonFormChangeItemModifier extends PokemonHeldItemModifier { return ret; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 1; } } @@ -2807,8 +2878,12 @@ export class MoneyRewardModifier extends ConsumableModifier { globalScene.getPlayerParty().map(p => { if (p.species?.speciesId === Species.GIMMIGHOUL || p.fusionSpecies?.speciesId === Species.GIMMIGHOUL) { - p.evoCounter ? p.evoCounter += Math.min(Math.floor(this.moneyMultiplier), 3) : p.evoCounter = Math.min(Math.floor(this.moneyMultiplier), 3); - const modifier = getModifierType(modifierTypes.EVOLUTION_TRACKER_GIMMIGHOUL).newModifier(p) as EvoTrackerModifier; + p.evoCounter + ? (p.evoCounter += Math.min(Math.floor(this.moneyMultiplier), 3)) + : (p.evoCounter = Math.min(Math.floor(this.moneyMultiplier), 3)); + const modifier = getModifierType(modifierTypes.EVOLUTION_TRACKER_GIMMIGHOUL).newModifier( + p, + ) as EvoTrackerModifier; globalScene.addModifier(modifier); } }); @@ -2818,10 +2893,6 @@ export class MoneyRewardModifier extends ConsumableModifier { } export class MoneyMultiplierModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof MoneyMultiplierModifier; } @@ -2847,10 +2918,6 @@ export class MoneyMultiplierModifier extends PersistentModifier { } export class DamageMoneyRewardModifier extends PokemonHeldItemModifier { - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier): boolean { return modifier instanceof DamageMoneyRewardModifier; } @@ -2865,7 +2932,7 @@ export class DamageMoneyRewardModifier extends PokemonHeldItemModifier { * @param multiplier {@linkcode NumberHolder} holding the multiplier value * @returns always `true` */ - override apply(pokemon: Pokemon, multiplier: NumberHolder): boolean { + override apply(_pokemon: Pokemon, multiplier: NumberHolder): boolean { const moneyAmount = new NumberHolder(Math.floor(multiplier.value * (0.5 * this.getStackCount()))); globalScene.applyModifiers(MoneyMultiplierModifier, true, moneyAmount); globalScene.addMoney(moneyAmount.value); @@ -2873,16 +2940,12 @@ export class DamageMoneyRewardModifier extends PokemonHeldItemModifier { return true; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 5; } } export class MoneyInterestModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof MoneyInterestModifier; } @@ -2897,7 +2960,10 @@ export class MoneyInterestModifier extends PersistentModifier { const userLocale = navigator.language || "en-US"; const formattedMoneyAmount = interestAmount.toLocaleString(userLocale); - const message = i18next.t("modifier:moneyInterestApply", { moneyAmount: formattedMoneyAmount, typeName: this.type.name }); + const message = i18next.t("modifier:moneyInterestApply", { + moneyAmount: formattedMoneyAmount, + typeName: this.type.name, + }); globalScene.queueMessage(message, undefined, true); return true; @@ -2913,10 +2979,6 @@ export class MoneyInterestModifier extends PersistentModifier { } export class HiddenAbilityRateBoosterModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof HiddenAbilityRateBoosterModifier; } @@ -2942,10 +3004,6 @@ export class HiddenAbilityRateBoosterModifier extends PersistentModifier { } export class ShinyRateBoosterModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof ShinyRateBoosterModifier; } @@ -2971,10 +3029,6 @@ export class ShinyRateBoosterModifier extends PersistentModifier { } export class CriticalCatchChanceBoosterModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof CriticalCatchChanceBoosterModifier; } @@ -3003,10 +3057,6 @@ export class CriticalCatchChanceBoosterModifier extends PersistentModifier { } export class LockModifierTiersModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof LockModifierTiersModifier; } @@ -3069,10 +3119,6 @@ export class HealShopCostModifier extends PersistentModifier { } export class BoostBugSpawnModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof BoostBugSpawnModifier; } @@ -3095,10 +3141,6 @@ export class BoostBugSpawnModifier extends PersistentModifier { } export class SwitchEffectTransferModifier extends PokemonHeldItemModifier { - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - matchType(modifier: Modifier): boolean { return modifier instanceof SwitchEffectTransferModifier; } @@ -3115,7 +3157,7 @@ export class SwitchEffectTransferModifier extends PokemonHeldItemModifier { return true; } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 1; } } @@ -3126,10 +3168,6 @@ export class SwitchEffectTransferModifier extends PokemonHeldItemModifier { * @see {@linkcode ContactHeldItemTransferChanceModifier} */ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier { - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } - /** * Determines the targets to transfer items from when this applies. * @param pokemon the {@linkcode Pokemon} holding this item @@ -3137,9 +3175,7 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier { * @returns the opponents of the source {@linkcode Pokemon} */ getTargets(pokemon?: Pokemon, ..._args: unknown[]): Pokemon[] { - return pokemon instanceof Pokemon - ? pokemon.getOpponents() - : []; + return pokemon instanceof Pokemon ? pokemon.getOpponents() : []; } /** @@ -3164,16 +3200,22 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier { return false; } - const poolType = pokemon.isPlayer() ? ModifierPoolType.PLAYER : pokemon.hasTrainer() ? ModifierPoolType.TRAINER : ModifierPoolType.WILD; + const poolType = pokemon.isPlayer() + ? ModifierPoolType.PLAYER + : pokemon.hasTrainer() + ? ModifierPoolType.TRAINER + : ModifierPoolType.WILD; const transferredModifierTypes: ModifierType[] = []; - const itemModifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.pokemonId === targetPokemon.id && m.isTransferable, targetPokemon.isPlayer()) as PokemonHeldItemModifier[]; - let highestItemTier = itemModifiers.map(m => m.type.getOrInferTier(poolType)).reduce((highestTier, tier) => Math.max(tier!, highestTier), 0); // TODO: is this bang correct? + const itemModifiers = globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === targetPokemon.id && m.isTransferable, + targetPokemon.isPlayer(), + ) as PokemonHeldItemModifier[]; + let highestItemTier = itemModifiers + .map(m => m.type.getOrInferTier(poolType)) + .reduce((highestTier, tier) => Math.max(tier!, highestTier), 0); // TODO: is this bang correct? let tierItemModifiers = itemModifiers.filter(m => m.type.getOrInferTier(poolType) === highestItemTier); - const heldItemTransferPromises: Promise[] = []; - for (let i = 0; i < transferredItemCount; i++) { if (!tierItemModifiers.length) { while (highestItemTier-- && !tierItemModifiers.length) { @@ -3185,19 +3227,15 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier { } const randItemIndex = pokemon.randSeedInt(itemModifiers.length); const randItem = itemModifiers[randItemIndex]; - heldItemTransferPromises.push(globalScene.tryTransferHeldItemModifier(randItem, pokemon, false).then(success => { - if (success) { - transferredModifierTypes.push(randItem.type); - itemModifiers.splice(randItemIndex, 1); - } - })); + if (globalScene.tryTransferHeldItemModifier(randItem, pokemon, false)) { + transferredModifierTypes.push(randItem.type); + itemModifiers.splice(randItemIndex, 1); + } } - Promise.all(heldItemTransferPromises).then(() => { - for (const mt of transferredModifierTypes) { - globalScene.queueMessage(this.getTransferMessage(pokemon, targetPokemon, mt)); - } - }); + for (const mt of transferredModifierTypes) { + globalScene.queueMessage(this.getTransferMessage(pokemon, targetPokemon, mt)); + } return !!transferredModifierTypes.length; } @@ -3213,10 +3251,7 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier { * @see {@linkcode modifierTypes[MINI_BLACK_HOLE]} */ export class TurnHeldItemTransferModifier extends HeldItemTransferModifier { - isTransferable: boolean = true; - constructor(type: ModifierType, pokemonId: number, stackCount?: number) { - super(type, pokemonId, stackCount); - } + isTransferable = true; matchType(modifier: Modifier): boolean { return modifier instanceof TurnHeldItemTransferModifier; @@ -3231,10 +3266,15 @@ export class TurnHeldItemTransferModifier extends HeldItemTransferModifier { } getTransferMessage(pokemon: Pokemon, targetPokemon: Pokemon, item: ModifierType): string { - return i18next.t("modifier:turnHeldItemTransferApply", { pokemonNameWithAffix: getPokemonNameWithAffix(targetPokemon), itemName: item.name, pokemonName: pokemon.getNameToRender(), typeName: this.type.name }); + return i18next.t("modifier:turnHeldItemTransferApply", { + pokemonNameWithAffix: getPokemonNameWithAffix(targetPokemon), + itemName: item.name, + pokemonName: pokemon.getNameToRender(), + typeName: this.type.name, + }); } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 1; } @@ -3265,7 +3305,7 @@ export class ContactHeldItemTransferChanceModifier extends HeldItemTransferModif * @returns The target {@linkcode Pokemon} as array for further use in `apply` implementations */ override getTargets(_holderPokemon: Pokemon, targetPokemon: Pokemon): Pokemon[] { - return !!targetPokemon ? [ targetPokemon ] : []; + return targetPokemon ? [targetPokemon] : []; } matchType(modifier: Modifier): boolean { @@ -3281,21 +3321,26 @@ export class ContactHeldItemTransferChanceModifier extends HeldItemTransferModif } getTransferredItemCount(): number { - return Phaser.Math.RND.realInRange(0, 1) < (this.chance * this.getStackCount()) ? 1 : 0; + return Phaser.Math.RND.realInRange(0, 1) < this.chance * this.getStackCount() ? 1 : 0; } getTransferMessage(pokemon: Pokemon, targetPokemon: Pokemon, item: ModifierType): string { - return i18next.t("modifier:contactHeldItemTransferApply", { pokemonNameWithAffix: getPokemonNameWithAffix(targetPokemon), itemName: item.name, pokemonName: getPokemonNameWithAffix(pokemon), typeName: this.type.name }); + return i18next.t("modifier:contactHeldItemTransferApply", { + pokemonNameWithAffix: getPokemonNameWithAffix(targetPokemon), + itemName: item.name, + pokemonName: getPokemonNameWithAffix(pokemon), + typeName: this.type.name, + }); } - getMaxHeldItemCount(pokemon: Pokemon): number { + getMaxHeldItemCount(_pokemon: Pokemon): number { return 5; } } export class IvScannerModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); + constructor(type: ModifierType, _stackCount?: number) { + super(type); } match(modifier: Modifier): boolean { @@ -3303,7 +3348,7 @@ export class IvScannerModifier extends PersistentModifier { } clone(): IvScannerModifier { - return new IvScannerModifier(this.type, this.stackCount); + return new IvScannerModifier(this.type); } /** @@ -3311,19 +3356,15 @@ export class IvScannerModifier extends PersistentModifier { * @returns always `true` */ override apply(): boolean { - return true; + return true; //Dude are you kidding me } getMaxStackCount(): number { - return 3; + return 1; } } export class ExtraModifierModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - match(modifier: Modifier): boolean { return modifier instanceof ExtraModifierModifier; } @@ -3354,10 +3395,6 @@ export class ExtraModifierModifier extends PersistentModifier { * @see {@linkcode apply} */ export class TempExtraModifierModifier extends LapsingPersistentModifier { - constructor(type: ModifierType, maxBattles: number, battleCount?: number, stackCount?: number) { - super(type, maxBattles, battleCount, stackCount); - } - /** * Goes through existing modifiers for any that match Silver Pokeball, * which will then add the max count of the new item to the existing count of the current item. @@ -3387,7 +3424,7 @@ export class TempExtraModifierModifier extends LapsingPersistentModifier { } match(modifier: Modifier): boolean { - return (modifier instanceof TempExtraModifierModifier); + return modifier instanceof TempExtraModifierModifier; } /** @@ -3402,10 +3439,6 @@ export class TempExtraModifierModifier extends LapsingPersistentModifier { } export abstract class EnemyPersistentModifier extends PersistentModifier { - constructor(type: ModifierType, stackCount?: number) { - super(type, stackCount); - } - getMaxStackCount(): number { return 5; } @@ -3426,7 +3459,7 @@ abstract class EnemyDamageMultiplierModifier extends EnemyPersistentModifier { * @returns always `true` */ override apply(multiplier: NumberHolder): boolean { - multiplier.value = Math.floor(multiplier.value * Math.pow(this.damageMultiplier, this.getStackCount())); + multiplier.value = toDmgValue(multiplier.value * Math.pow(this.damageMultiplier, this.getStackCount())); return true; } @@ -3437,7 +3470,7 @@ abstract class EnemyDamageMultiplierModifier extends EnemyPersistentModifier { } export class EnemyDamageBoosterModifier extends EnemyDamageMultiplierModifier { - constructor(type: ModifierType, boostPercent: number, stackCount?: number) { + constructor(type: ModifierType, _boostPercent: number, stackCount?: number) { //super(type, 1 + ((boostPercent || 10) * 0.01), stackCount); super(type, 1.05, stackCount); // Hardcode multiplier temporarily } @@ -3451,7 +3484,7 @@ export class EnemyDamageBoosterModifier extends EnemyDamageMultiplierModifier { } getArgs(): any[] { - return [ (this.damageMultiplier - 1) * 100 ]; + return [(this.damageMultiplier - 1) * 100]; } getMaxStackCount(): number { @@ -3460,7 +3493,7 @@ export class EnemyDamageBoosterModifier extends EnemyDamageMultiplierModifier { } export class EnemyDamageReducerModifier extends EnemyDamageMultiplierModifier { - constructor(type: ModifierType, reductionPercent: number, stackCount?: number) { + constructor(type: ModifierType, _reductionPercent: number, stackCount?: number) { //super(type, 1 - ((reductionPercent || 5) * 0.01), stackCount); super(type, 0.975, stackCount); // Hardcode multiplier temporarily } @@ -3474,7 +3507,7 @@ export class EnemyDamageReducerModifier extends EnemyDamageMultiplierModifier { } getArgs(): any[] { - return [ (1 - this.damageMultiplier) * 100 ]; + return [(1 - this.damageMultiplier) * 100]; } getMaxStackCount(): number { @@ -3485,7 +3518,7 @@ export class EnemyDamageReducerModifier extends EnemyDamageMultiplierModifier { export class EnemyTurnHealModifier extends EnemyPersistentModifier { public healPercent: number; - constructor(type: ModifierType, healPercent: number, stackCount?: number) { + constructor(type: ModifierType, _healPercent: number, stackCount?: number) { super(type, stackCount); // Hardcode temporarily @@ -3501,7 +3534,7 @@ export class EnemyTurnHealModifier extends EnemyPersistentModifier { } getArgs(): any[] { - return [ this.healPercent ]; + return [this.healPercent]; } /** @@ -3511,8 +3544,20 @@ export class EnemyTurnHealModifier extends EnemyPersistentModifier { */ override apply(enemyPokemon: Pokemon): boolean { if (!enemyPokemon.isFullHp()) { - globalScene.unshiftPhase(new PokemonHealPhase(enemyPokemon.getBattlerIndex(), - Math.max(Math.floor(enemyPokemon.getMaxHp() / (100 / this.healPercent)) * this.stackCount, 1), i18next.t("modifier:enemyTurnHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(enemyPokemon) }), true, false, false, false, true)); + globalScene.unshiftPhase( + new PokemonHealPhase( + enemyPokemon.getBattlerIndex(), + Math.max(Math.floor(enemyPokemon.getMaxHp() / (100 / this.healPercent)) * this.stackCount, 1), + i18next.t("modifier:enemyTurnHealApply", { + pokemonNameWithAffix: getPokemonNameWithAffix(enemyPokemon), + }), + true, + false, + false, + false, + true, + ), + ); return true; } @@ -3528,12 +3573,12 @@ export class EnemyAttackStatusEffectChanceModifier extends EnemyPersistentModifi public effect: StatusEffect; public chance: number; - constructor(type: ModifierType, effect: StatusEffect, chancePercent: number, stackCount?: number) { + constructor(type: ModifierType, effect: StatusEffect, _chancePercent: number, stackCount?: number) { super(type, stackCount); this.effect = effect; //Hardcode temporarily - this.chance = .025 * ((this.effect === StatusEffect.BURN || this.effect === StatusEffect.POISON) ? 2 : 1); + this.chance = 0.025 * (this.effect === StatusEffect.BURN || this.effect === StatusEffect.POISON ? 2 : 1); } match(modifier: Modifier): boolean { @@ -3545,7 +3590,7 @@ export class EnemyAttackStatusEffectChanceModifier extends EnemyPersistentModifi } getArgs(): any[] { - return [ this.effect, this.chance * 100 ]; + return [this.effect, this.chance * 100]; } /** @@ -3554,7 +3599,7 @@ export class EnemyAttackStatusEffectChanceModifier extends EnemyPersistentModifi * @returns `true` if the {@linkcode Pokemon} was affected */ override apply(enemyPokemon: Pokemon): boolean { - if (Phaser.Math.RND.realInRange(0, 1) < (this.chance * this.getStackCount())) { + if (Phaser.Math.RND.realInRange(0, 1) < this.chance * this.getStackCount()) { return enemyPokemon.trySetStatus(this.effect, true); } @@ -3569,11 +3614,11 @@ export class EnemyAttackStatusEffectChanceModifier extends EnemyPersistentModifi export class EnemyStatusEffectHealChanceModifier extends EnemyPersistentModifier { public chance: number; - constructor(type: ModifierType, chancePercent: number, stackCount?: number) { + constructor(type: ModifierType, _chancePercent: number, stackCount?: number) { super(type, stackCount); //Hardcode temporarily - this.chance = .025; + this.chance = 0.025; } match(modifier: Modifier): boolean { @@ -3585,7 +3630,7 @@ export class EnemyStatusEffectHealChanceModifier extends EnemyPersistentModifier } getArgs(): any[] { - return [ this.chance * 100 ]; + return [this.chance * 100]; } /** @@ -3594,8 +3639,10 @@ export class EnemyStatusEffectHealChanceModifier extends EnemyPersistentModifier * @returns `true` if the {@linkcode Pokemon} was healed */ override apply(enemyPokemon: Pokemon): boolean { - if (enemyPokemon.status && Phaser.Math.RND.realInRange(0, 1) < (this.chance * this.getStackCount())) { - globalScene.queueMessage(getStatusEffectHealText(enemyPokemon.status.effect, getPokemonNameWithAffix(enemyPokemon))); + if (enemyPokemon.status && Phaser.Math.RND.realInRange(0, 1) < this.chance * this.getStackCount()) { + globalScene.queueMessage( + getStatusEffectHealText(enemyPokemon.status.effect, getPokemonNameWithAffix(enemyPokemon)), + ); enemyPokemon.resetStatus(); enemyPokemon.updateInfo(); return true; @@ -3612,7 +3659,7 @@ export class EnemyStatusEffectHealChanceModifier extends EnemyPersistentModifier export class EnemyEndureChanceModifier extends EnemyPersistentModifier { public chance: number; - constructor(type: ModifierType, chancePercent?: number, stackCount?: number) { + constructor(type: ModifierType, _chancePercent?: number, stackCount?: number) { super(type, stackCount || 10); //Hardcode temporarily @@ -3628,7 +3675,7 @@ export class EnemyEndureChanceModifier extends EnemyPersistentModifier { } getArgs(): any[] { - return [ this.chance ]; + return [this.chance]; } /** @@ -3637,7 +3684,7 @@ export class EnemyEndureChanceModifier extends EnemyPersistentModifier { * @returns `true` if {@linkcode Pokemon} endured */ override apply(target: Pokemon): boolean { - if (target.battleData.endured || target.randSeedInt(100) >= (this.chance * this.getStackCount())) { + if (target.battleData.endured || target.randSeedInt(100) >= this.chance * this.getStackCount()) { return false; } @@ -3671,7 +3718,7 @@ export class EnemyFusionChanceModifier extends EnemyPersistentModifier { } getArgs(): any[] { - return [ this.chance * 100 ]; + return [this.chance * 100]; } /** @@ -3680,7 +3727,7 @@ export class EnemyFusionChanceModifier extends EnemyPersistentModifier { * @returns `true` if the {@linkcode EnemyPokemon} is a fusion */ override apply(isFusion: BooleanHolder): boolean { - if (Phaser.Math.RND.realInRange(0, 1) >= (this.chance * this.getStackCount())) { + if (Phaser.Math.RND.realInRange(0, 1) >= this.chance * this.getStackCount()) { return false; } @@ -3700,8 +3747,10 @@ export class EnemyFusionChanceModifier extends EnemyPersistentModifier { * - The enemy * @param isPlayer {@linkcode boolean} for whether the player (`true`) or enemy (`false`) is being overridden */ -export function overrideModifiers(isPlayer: boolean = true): void { - const modifiersOverride: ModifierOverride[] = isPlayer ? Overrides.STARTING_MODIFIER_OVERRIDE : Overrides.OPP_MODIFIER_OVERRIDE; +export function overrideModifiers(isPlayer = true): void { + const modifiersOverride: ModifierOverride[] = isPlayer + ? Overrides.STARTING_MODIFIER_OVERRIDE + : Overrides.OPP_MODIFIER_OVERRIDE; if (!modifiersOverride || modifiersOverride.length === 0 || !globalScene) { return; } @@ -3711,16 +3760,16 @@ export function overrideModifiers(isPlayer: boolean = true): void { globalScene.clearEnemyModifiers(); } - modifiersOverride.forEach(item => { + for (const item of modifiersOverride) { const modifierFunc = modifierTypes[item.name]; let modifierType: ModifierType | null = modifierFunc(); if (modifierType instanceof ModifierTypeGenerator) { - const pregenArgs = ("type" in item) && (item.type !== null) ? [ item.type ] : undefined; + const pregenArgs = "type" in item && item.type !== null ? [item.type] : undefined; modifierType = modifierType.generateType([], pregenArgs); } - const modifier = modifierType && modifierType.withIdFromFunc(modifierFunc).newModifier() as PersistentModifier; + const modifier = modifierType && (modifierType.withIdFromFunc(modifierFunc).newModifier() as PersistentModifier); if (modifier) { modifier.stackCount = item.count || 1; @@ -3730,7 +3779,7 @@ export function overrideModifiers(isPlayer: boolean = true): void { globalScene.addEnemyModifier(modifier, true, true); } } - }); + } } /** @@ -3740,8 +3789,10 @@ export function overrideModifiers(isPlayer: boolean = true): void { * @param pokemon {@linkcode Pokemon} whose held items are being overridden * @param isPlayer {@linkcode boolean} for whether the {@linkcode pokemon} is the player's (`true`) or an enemy (`false`) */ -export function overrideHeldItems(pokemon: Pokemon, isPlayer: boolean = true): void { - const heldItemsOverride: ModifierOverride[] = isPlayer ? Overrides.STARTING_HELD_ITEMS_OVERRIDE : Overrides.OPP_HELD_ITEMS_OVERRIDE; +export function overrideHeldItems(pokemon: Pokemon, isPlayer = true): void { + const heldItemsOverride: ModifierOverride[] = isPlayer + ? Overrides.STARTING_HELD_ITEMS_OVERRIDE + : Overrides.OPP_HELD_ITEMS_OVERRIDE; if (!heldItemsOverride || heldItemsOverride.length === 0 || !globalScene) { return; } @@ -3750,17 +3801,18 @@ export function overrideHeldItems(pokemon: Pokemon, isPlayer: boolean = true): v globalScene.clearEnemyHeldItemModifiers(pokemon); } - heldItemsOverride.forEach(item => { + for (const item of heldItemsOverride) { const modifierFunc = modifierTypes[item.name]; let modifierType: ModifierType | null = modifierFunc(); const qty = item.count || 1; if (modifierType instanceof ModifierTypeGenerator) { - const pregenArgs = ("type" in item) && (item.type !== null) ? [ item.type ] : undefined; + const pregenArgs = "type" in item && item.type !== null ? [item.type] : undefined; modifierType = modifierType.generateType([], pregenArgs); } - const heldItemModifier = modifierType && modifierType.withIdFromFunc(modifierFunc).newModifier(pokemon) as PokemonHeldItemModifier; + const heldItemModifier = + modifierType && (modifierType.withIdFromFunc(modifierFunc).newModifier(pokemon) as PokemonHeldItemModifier); if (heldItemModifier) { heldItemModifier.pokemonId = pokemon.id; heldItemModifier.stackCount = qty; @@ -3770,5 +3822,5 @@ export function overrideHeldItems(pokemon: Pokemon, isPlayer: boolean = true): v globalScene.addEnemyModifier(heldItemModifier, true, true); } } - }); + } } diff --git a/src/overrides.ts b/src/overrides.ts index 06ad619a074..882a634ff90 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -1,22 +1,31 @@ -/* eslint-disable @typescript-eslint/consistent-type-imports */ import { type PokeballCounts } from "#app/battle-scene"; +import { EvolutionItem } from "#app/data/balance/pokemon-evolutions"; import { Gender } from "#app/data/gender"; +import { FormChangeItem } from "#app/data/pokemon-forms"; import { Variant } from "#app/data/variant"; import { type ModifierOverride } from "#app/modifier/modifier-type"; import { Unlockables } from "#app/system/unlockables"; import { Abilities } from "#enums/abilities"; +import { BerryType } from "#enums/berry-type"; import { Biome } from "#enums/biome"; import { EggTier } from "#enums/egg-type"; import { Moves } from "#enums/moves"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { PokeballType } from "#enums/pokeball"; +import { PokemonType } from "#enums/pokemon-type"; import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; import { TimeOfDay } from "#enums/time-of-day"; import { VariantTier } from "#enums/variant-tier"; import { WeatherType } from "#enums/weather-type"; +/** + * This comment block exists to prevent IDEs from automatically removing unused imports + * {@linkcode BerryType}, {@linkcode EvolutionItem}, {@linkcode FormChangeItem} + * {@linkcode Stat}, {@linkcode PokemonType} + */ /** * Overrides that are using when testing different in game situations * @@ -47,6 +56,7 @@ class DefaultOverrides { // ----------------- /** a specific seed (default: a random string of 24 characters) */ readonly SEED_OVERRIDE: string = ""; + readonly DAILY_RUN_SEED_OVERRIDE: string | null = null; readonly WEATHER_OVERRIDE: WeatherType = WeatherType.NONE; /** * If `null`, ignore this override. @@ -126,9 +136,10 @@ class DefaultOverrides { /** * This will override the species of the fusion */ - readonly STARTER_FUSION_SPECIES_OVERRIDE: Species | integer = 0; + readonly STARTER_FUSION_SPECIES_OVERRIDE: Species | number = 0; readonly ABILITY_OVERRIDE: Abilities = Abilities.NONE; readonly PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE; + readonly HAS_PASSIVE_ABILITY_OVERRIDE: boolean | null = null; readonly STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE; readonly GENDER_OVERRIDE: Gender | null = null; readonly MOVESET_OVERRIDE: Moves | Array = []; @@ -146,10 +157,11 @@ class DefaultOverrides { /** * This will override the species of the fusion only when the opponent is already a fusion */ - readonly OPP_FUSION_SPECIES_OVERRIDE: Species | integer = 0; + readonly OPP_FUSION_SPECIES_OVERRIDE: Species | number = 0; readonly OPP_LEVEL_OVERRIDE: number = 0; readonly OPP_ABILITY_OVERRIDE: Abilities = Abilities.NONE; readonly OPP_PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE; + readonly OPP_HAS_PASSIVE_ABILITY_OVERRIDE: boolean | null = null; readonly OPP_STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE; readonly OPP_GENDER_OVERRIDE: Gender | null = null; readonly OPP_MOVESET_OVERRIDE: Moves | Array = []; diff --git a/src/phase.ts b/src/phase.ts index 8da00d78b61..20cc7cc4063 100644 --- a/src/phase.ts +++ b/src/phase.ts @@ -1,11 +1,7 @@ import { globalScene } from "#app/global-scene"; export class Phase { - start() { - if (globalScene.abilityBar.shown) { - globalScene.abilityBar.resetAutoHideTimer(); - } - } + start() {} end() { globalScene.shiftPhase(); diff --git a/src/phases/add-enemy-buff-modifier-phase.ts b/src/phases/add-enemy-buff-modifier-phase.ts index d79b4f6eca5..7d91e64382a 100644 --- a/src/phases/add-enemy-buff-modifier-phase.ts +++ b/src/phases/add-enemy-buff-modifier-phase.ts @@ -1,5 +1,9 @@ import { ModifierTier } from "#app/modifier/modifier-tier"; -import { regenerateModifierPoolThresholds, ModifierPoolType, getEnemyBuffModifierForWave } from "#app/modifier/modifier-type"; +import { + regenerateModifierPoolThresholds, + ModifierPoolType, + getEnemyBuffModifierForWave, +} from "#app/modifier/modifier-type"; import { EnemyPersistentModifier } from "#app/modifier/modifier"; import { Phase } from "#app/phase"; import { globalScene } from "#app/global-scene"; @@ -13,14 +17,26 @@ export class AddEnemyBuffModifierPhase extends Phase { super.start(); const waveIndex = globalScene.currentBattle.waveIndex; - const tier = !(waveIndex % 1000) ? ModifierTier.ULTRA : !(waveIndex % 250) ? ModifierTier.GREAT : ModifierTier.COMMON; + const tier = !(waveIndex % 1000) + ? ModifierTier.ULTRA + : !(waveIndex % 250) + ? ModifierTier.GREAT + : ModifierTier.COMMON; regenerateModifierPoolThresholds(globalScene.getEnemyParty(), ModifierPoolType.ENEMY_BUFF); const count = Math.ceil(waveIndex / 250); for (let i = 0; i < count; i++) { - globalScene.addEnemyModifier(getEnemyBuffModifierForWave(tier, globalScene.findModifiers(m => m instanceof EnemyPersistentModifier, false)), true, true); + globalScene.addEnemyModifier( + getEnemyBuffModifierForWave( + tier, + globalScene.findModifiers(m => m instanceof EnemyPersistentModifier, false), + ), + true, + true, + ); } - globalScene.updateModifiers(false, true).then(() => this.end()); + globalScene.updateModifiers(false, true); + this.end(); } } diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts index 1f4fc0d6271..6b905c2a07f 100644 --- a/src/phases/attempt-capture-phase.ts +++ b/src/phases/attempt-capture-phase.ts @@ -1,7 +1,13 @@ import { BattlerIndex } from "#app/battle"; import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; import { SubstituteTag } from "#app/data/battler-tags"; -import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, getCriticalCaptureChance } from "#app/data/pokeball"; +import { + doPokeballBounceAnim, + getPokeballAtlasKey, + getPokeballCatchMultiplier, + getPokeballTintColor, + getCriticalCaptureChance, +} from "#app/data/pokeball"; import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect"; import { addPokeballCaptureStars, addPokeballOpenParticles } from "#app/field/anims"; import type { EnemyPokemon } from "#app/field/pokemon"; @@ -24,7 +30,7 @@ export class AttemptCapturePhase extends PokemonPhase { private pokeball: Phaser.GameObjects.Sprite; private originalY: number; - constructor(targetIndex: integer, pokeballType: PokeballType) { + constructor(targetIndex: number, pokeballType: PokeballType) { super(BattlerIndex.ENEMY + targetIndex); this.pokeballType = pokeballType; @@ -54,7 +60,7 @@ export class AttemptCapturePhase extends PokemonPhase { const pokeballMultiplier = getPokeballCatchMultiplier(this.pokeballType); const statusMultiplier = pokemon.status ? getStatusEffectCatchRateMultiplier(pokemon.status.effect) : 1; const modifiedCatchRate = Math.round((((_3m - _2h) * catchRate * pokeballMultiplier) / _3m) * statusMultiplier); - const shakeProbability = Math.round(65536 / Math.pow((255 / modifiedCatchRate), 0.1875)); // Formula taken from gen 6 + const shakeProbability = Math.round(65536 / Math.pow(255 / modifiedCatchRate, 0.1875)); // Formula taken from gen 6 const criticalCaptureChance = getCriticalCaptureChance(modifiedCatchRate); const isCritical = pokemon.randSeedInt(256) < criticalCaptureChance; const fpOffset = pokemon.getFieldPositionOffset(); @@ -124,7 +130,12 @@ export class AttemptCapturePhase extends PokemonPhase { this.failCatch(shakeCount); } else if (shakeCount++ < (isCritical ? 1 : 3)) { // Shake check (skip check for critical or guaranteed captures, but still play the sound) - if (pokeballMultiplier === -1 || isCritical || modifiedCatchRate >= 255 || pokemon.randSeedInt(65536) < shakeProbability) { + if ( + pokeballMultiplier === -1 || + isCritical || + modifiedCatchRate >= 255 || + pokemon.randSeedInt(65536) < shakeProbability + ) { globalScene.playSound("se/pb_move"); } else { shakeCounter.stop(); @@ -154,27 +165,29 @@ export class AttemptCapturePhase extends PokemonPhase { alpha: 0, duration: 200, easing: "Sine.easeIn", - onComplete: () => pbTint.destroy() + onComplete: () => pbTint.destroy(), }); - } + }, }); } }, onComplete: () => { this.catch(); - } + }, }); }; // Ball bounces (handled in pokemon.ts) - globalScene.time.delayedCall(250, () => doPokeballBounceAnim(this.pokeball, 16, 72, 350, doShake, isCritical)); - } + globalScene.time.delayedCall(250, () => + doPokeballBounceAnim(this.pokeball, 16, 72, 350, doShake, isCritical), + ); + }, }); - } + }, }); } - failCatch(shakeCount: integer) { + failCatch(_shakeCount: number) { const pokemon = this.getPokemon(); globalScene.playSound("se/pb_rel"); @@ -199,7 +212,7 @@ export class AttemptCapturePhase extends PokemonPhase { targets: pokemon, duration: 250, ease: "Sine.easeOut", - scale: 1 + scale: 1, }); globalScene.currentBattle.lastUsedPokeball = this.pokeballType; @@ -212,7 +225,10 @@ export class AttemptCapturePhase extends PokemonPhase { const speciesForm = !pokemon.fusionSpecies ? pokemon.getSpeciesForm() : pokemon.getFusionSpeciesForm(); - if (speciesForm.abilityHidden && (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1) { + if ( + speciesForm.abilityHidden && + (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1 + ) { globalScene.validateAchv(achvs.HIDDEN_ABILITY); } @@ -232,73 +248,115 @@ export class AttemptCapturePhase extends PokemonPhase { globalScene.gameData.updateSpeciesDexIvs(pokemon.species.getRootSpeciesId(true), pokemon.ivs); - globalScene.ui.showText(i18next.t("battle:pokemonCaught", { pokemonName: getPokemonNameWithAffix(pokemon) }), null, () => { - const end = () => { - globalScene.unshiftPhase(new VictoryPhase(this.battlerIndex)); - globalScene.pokemonInfoContainer.hide(); - this.removePb(); - this.end(); - }; - const removePokemon = () => { - globalScene.addFaintedEnemyScore(pokemon); - globalScene.getPlayerField().filter(p => p.isActive(true)).forEach(playerPokemon => playerPokemon.removeTagsBySourceId(pokemon.id)); - pokemon.hp = 0; - pokemon.trySetStatus(StatusEffect.FAINT); - globalScene.clearEnemyHeldItemModifiers(); - globalScene.field.remove(pokemon, true); - }; - const addToParty = (slotIndex?: number) => { - const newPokemon = pokemon.addToParty(this.pokeballType, slotIndex); - const modifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier, false); - if (globalScene.getPlayerParty().filter(p => p.isShiny()).length === PLAYER_PARTY_MAX_SIZE) { - globalScene.validateAchv(achvs.SHINY_PARTY); - } - Promise.all(modifiers.map(m => globalScene.addModifier(m, true))).then(() => { - globalScene.updateModifiers(true); - removePokemon(); - if (newPokemon) { - newPokemon.loadAssets().then(end); + globalScene.ui.showText( + i18next.t("battle:pokemonCaught", { + pokemonName: getPokemonNameWithAffix(pokemon), + }), + null, + () => { + const end = () => { + globalScene.unshiftPhase(new VictoryPhase(this.battlerIndex)); + globalScene.pokemonInfoContainer.hide(); + this.removePb(); + this.end(); + }; + const removePokemon = () => { + globalScene.addFaintedEnemyScore(pokemon); + pokemon.hp = 0; + pokemon.trySetStatus(StatusEffect.FAINT); + globalScene.clearEnemyHeldItemModifiers(); + pokemon.leaveField(true, true, true); + }; + const addToParty = (slotIndex?: number) => { + const newPokemon = pokemon.addToParty(this.pokeballType, slotIndex); + const modifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier, false); + if (globalScene.getPlayerParty().filter(p => p.isShiny()).length === PLAYER_PARTY_MAX_SIZE) { + globalScene.validateAchv(achvs.SHINY_PARTY); + } + Promise.all(modifiers.map(m => globalScene.addModifier(m, true))).then(() => { + globalScene.updateModifiers(true); + removePokemon(); + if (newPokemon) { + newPokemon.loadAssets().then(end); + } else { + end(); + } + }); + }; + Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => { + if (globalScene.getPlayerParty().length === PLAYER_PARTY_MAX_SIZE) { + const promptRelease = () => { + globalScene.ui.showText( + i18next.t("battle:partyFull", { + pokemonName: pokemon.getNameToRender(), + }), + null, + () => { + globalScene.pokemonInfoContainer.makeRoomForConfirmUi(1, true); + globalScene.ui.setMode( + Mode.CONFIRM, + () => { + const newPokemon = globalScene.addPlayerPokemon( + pokemon.species, + pokemon.level, + pokemon.abilityIndex, + pokemon.formIndex, + pokemon.gender, + pokemon.shiny, + pokemon.variant, + pokemon.ivs, + pokemon.nature, + pokemon, + ); + globalScene.ui.setMode( + Mode.SUMMARY, + newPokemon, + 0, + SummaryUiMode.DEFAULT, + () => { + globalScene.ui.setMode(Mode.MESSAGE).then(() => { + promptRelease(); + }); + }, + false, + ); + }, + () => { + globalScene.ui.setMode( + Mode.PARTY, + PartyUiMode.RELEASE, + this.fieldIndex, + (slotIndex: number, _option: PartyOption) => { + globalScene.ui.setMode(Mode.MESSAGE).then(() => { + if (slotIndex < 6) { + addToParty(slotIndex); + } else { + promptRelease(); + } + }); + }, + ); + }, + () => { + globalScene.ui.setMode(Mode.MESSAGE).then(() => { + removePokemon(); + end(); + }); + }, + "fullParty", + ); + }, + ); + }; + promptRelease(); } else { - end(); + addToParty(); } }); - }; - Promise.all([ pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon) ]).then(() => { - if (globalScene.getPlayerParty().length === PLAYER_PARTY_MAX_SIZE) { - const promptRelease = () => { - globalScene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.getNameToRender() }), null, () => { - globalScene.pokemonInfoContainer.makeRoomForConfirmUi(1, true); - globalScene.ui.setMode(Mode.CONFIRM, () => { - const newPokemon = globalScene.addPlayerPokemon(pokemon.species, pokemon.level, pokemon.abilityIndex, pokemon.formIndex, pokemon.gender, pokemon.shiny, pokemon.variant, pokemon.ivs, pokemon.nature, pokemon); - globalScene.ui.setMode(Mode.SUMMARY, newPokemon, 0, SummaryUiMode.DEFAULT, () => { - globalScene.ui.setMode(Mode.MESSAGE).then(() => { - promptRelease(); - }); - }, false); - }, () => { - globalScene.ui.setMode(Mode.PARTY, PartyUiMode.RELEASE, this.fieldIndex, (slotIndex: integer, _option: PartyOption) => { - globalScene.ui.setMode(Mode.MESSAGE).then(() => { - if (slotIndex < 6) { - addToParty(slotIndex); - } else { - promptRelease(); - } - }); - }); - }, () => { - globalScene.ui.setMode(Mode.MESSAGE).then(() => { - removePokemon(); - end(); - }); - }, "fullParty"); - }); - }; - promptRelease(); - } else { - addToParty(); - } - }); - }, 0, true); + }, + 0, + true, + ); } removePb() { @@ -308,7 +366,7 @@ export class AttemptCapturePhase extends PokemonPhase { delay: 250, ease: "Sine.easeIn", alpha: 0, - onComplete: () => this.pokeball.destroy() + onComplete: () => this.pokeball.destroy(), }); } } diff --git a/src/phases/attempt-run-phase.ts b/src/phases/attempt-run-phase.ts index 72a108c1991..c9c0e23dabb 100644 --- a/src/phases/attempt-run-phase.ts +++ b/src/phases/attempt-run-phase.ts @@ -11,14 +11,9 @@ import { PokemonPhase } from "./pokemon-phase"; import { globalScene } from "#app/global-scene"; export class AttemptRunPhase extends PokemonPhase { - /** For testing purposes: this is to force the pokemon to fail and escape */ public forceFailEscape = false; - constructor(fieldIndex: number) { - super(fieldIndex); - } - start() { super.start(); @@ -38,15 +33,18 @@ export class AttemptRunPhase extends PokemonPhase { globalScene.queueMessage(i18next.t("battle:runAwaySuccess"), null, true, 500); globalScene.tweens.add({ - targets: [ globalScene.arenaEnemy, enemyField ].flat(), + targets: [globalScene.arenaEnemy, enemyField].flat(), alpha: 0, duration: 250, ease: "Sine.easeIn", - onComplete: () => enemyField.forEach(enemyPokemon => enemyPokemon.destroy()) + onComplete: () => + // biome-ignore lint/complexity/noForEach: TODO + enemyField.forEach(enemyPokemon => enemyPokemon.destroy()), }); globalScene.clearEnemyHeldItemModifiers(); + // biome-ignore lint/complexity/noForEach: TODO enemyField.forEach(enemyPokemon => { enemyPokemon.hideInfo().then(() => enemyPokemon.destroy()); enemyPokemon.hp = 0; @@ -65,9 +63,15 @@ export class AttemptRunPhase extends PokemonPhase { attemptRunAway(playerField: PlayerPokemon[], enemyField: EnemyPokemon[], escapeChance: Utils.NumberHolder) { /** Sum of the speed of all enemy pokemon on the field */ - const enemySpeed = enemyField.reduce((total: number, enemyPokemon: Pokemon) => total + enemyPokemon.getStat(Stat.SPD), 0); + const enemySpeed = enemyField.reduce( + (total: number, enemyPokemon: Pokemon) => total + enemyPokemon.getStat(Stat.SPD), + 0, + ); /** Sum of the speed of all player pokemon on the field */ - const playerSpeed = playerField.reduce((total: number, playerPokemon: Pokemon) => total + playerPokemon.getStat(Stat.SPD), 0); + const playerSpeed = playerField.reduce( + (total: number, playerPokemon: Pokemon) => total + playerPokemon.getStat(Stat.SPD), + 0, + ); /* The way the escape chance works is by looking at the difference between your speed and the enemy field's average speed as a ratio. The higher this ratio, the higher your chance of success. * However, there is a cap for the ratio of your speed vs enemy speed which beyond that point, you won't gain any advantage. It also looks at how many times you've tried to escape. @@ -104,6 +108,10 @@ export class AttemptRunPhase extends PokemonPhase { const escapeSlope = (maxChance - minChance) / speedCap; // This will calculate the escape chance given all of the above and clamp it to the range of [`minChance`, `maxChance`] - escapeChance.value = Phaser.Math.Clamp(Math.round((escapeSlope * speedRatio) + minChance + (escapeBonus * globalScene.currentBattle.escapeAttempts++)), minChance, maxChance); + escapeChance.value = Phaser.Math.Clamp( + Math.round(escapeSlope * speedRatio + minChance + escapeBonus * globalScene.currentBattle.escapeAttempts++), + minChance, + maxChance, + ); } } diff --git a/src/phases/battle-end-phase.ts b/src/phases/battle-end-phase.ts index edffd8498d6..a7158264ab7 100644 --- a/src/phases/battle-end-phase.ts +++ b/src/phases/battle-end-phase.ts @@ -18,7 +18,10 @@ export class BattleEndPhase extends BattlePhase { super.start(); globalScene.gameData.gameStats.battles++; - if (globalScene.gameMode.isEndless && globalScene.currentBattle.waveIndex + 1 > globalScene.gameData.gameStats.highestEndlessWave) { + if ( + globalScene.gameMode.isEndless && + globalScene.currentBattle.waveIndex + 1 > globalScene.gameData.gameStats.highestEndlessWave + ) { globalScene.gameData.gameStats.highestEndlessWave = globalScene.currentBattle.waveIndex + 1; } @@ -37,7 +40,7 @@ export class BattleEndPhase extends BattlePhase { } for (const pokemon of globalScene.getField()) { - if (pokemon && pokemon.battleSummonData) { + if (pokemon?.battleSummonData) { pokemon.battleSummonData.waveTurnCount = 1; } } @@ -52,7 +55,9 @@ export class BattleEndPhase extends BattlePhase { globalScene.clearEnemyHeldItemModifiers(); - const lapsingModifiers = globalScene.findModifiers(m => m instanceof LapsingPersistentModifier || m instanceof LapsingPokemonHeldItemModifier) as (LapsingPersistentModifier | LapsingPokemonHeldItemModifier)[]; + const lapsingModifiers = globalScene.findModifiers( + m => m instanceof LapsingPersistentModifier || m instanceof LapsingPokemonHeldItemModifier, + ) as (LapsingPersistentModifier | LapsingPokemonHeldItemModifier)[]; for (const m of lapsingModifiers) { const args: any[] = []; if (m instanceof LapsingPokemonHeldItemModifier) { @@ -63,6 +68,7 @@ export class BattleEndPhase extends BattlePhase { } } - globalScene.updateModifiers().then(() => this.end()); + globalScene.updateModifiers(); + this.end(); } } diff --git a/src/phases/battle-phase.ts b/src/phases/battle-phase.ts index 4fc826b7957..3fc2b9c0467 100644 --- a/src/phases/battle-phase.ts +++ b/src/phases/battle-phase.ts @@ -12,7 +12,7 @@ export class BattlePhase extends Phase { const tintSprites = globalScene.currentBattle.trainer?.getTintSprites()!; // TODO: is this bang correct? for (let i = 0; i < sprites.length; i++) { const visible = !trainerSlot || !i === (trainerSlot === TrainerSlot.TRAINER) || sprites.length < 2; - [ sprites[i], tintSprites[i] ].map(sprite => { + [sprites[i], tintSprites[i]].map(sprite => { if (visible) { sprite.x = trainerSlot || sprites.length < 2 ? 0 : i ? 16 : -16; } @@ -30,7 +30,7 @@ export class BattlePhase extends Phase { y: "+=16", alpha: 1, ease: "Sine.easeInOut", - duration: 750 + duration: 750, }); } @@ -41,7 +41,7 @@ export class BattlePhase extends Phase { y: "-=16", alpha: 0, ease: "Sine.easeInOut", - duration: 750 + duration: 750, }); } } diff --git a/src/phases/berry-phase.ts b/src/phases/berry-phase.ts index dd56e8b37d7..0048f8cd2f2 100644 --- a/src/phases/berry-phase.ts +++ b/src/phases/berry-phase.ts @@ -14,20 +14,24 @@ export class BerryPhase extends FieldPhase { start() { super.start(); - this.executeForAll((pokemon) => { - const hasUsableBerry = !!globalScene.findModifier((m) => { + this.executeForAll(pokemon => { + const hasUsableBerry = !!globalScene.findModifier(m => { return m instanceof BerryModifier && m.shouldApply(pokemon); }, pokemon.isPlayer()); if (hasUsableBerry) { const cancelled = new Utils.BooleanHolder(false); - pokemon.getOpponents().map((opp) => applyAbAttrs(PreventBerryUseAbAttr, opp, cancelled)); + pokemon.getOpponents().map(opp => applyAbAttrs(PreventBerryUseAbAttr, opp, cancelled)); if (cancelled.value) { - globalScene.queueMessage(i18next.t("abilityTriggers:preventBerryUse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + globalScene.queueMessage( + i18next.t("abilityTriggers:preventBerryUse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + ); } else { globalScene.unshiftPhase( - new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.USE_ITEM) + new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.USE_ITEM), ); for (const berryModifier of globalScene.applyModifiers(BerryModifier, pokemon.isPlayer(), pokemon)) { diff --git a/src/phases/check-status-effect-phase.ts b/src/phases/check-status-effect-phase.ts index 683c1ea1cd2..f59dfea9f02 100644 --- a/src/phases/check-status-effect-phase.ts +++ b/src/phases/check-status-effect-phase.ts @@ -4,8 +4,8 @@ import type { BattlerIndex } from "#app/battle"; import { globalScene } from "#app/global-scene"; export class CheckStatusEffectPhase extends Phase { - private order : BattlerIndex[]; - constructor(order : BattlerIndex[]) { + private order: BattlerIndex[]; + constructor(order: BattlerIndex[]) { super(); this.order = order; } @@ -13,7 +13,7 @@ export class CheckStatusEffectPhase extends Phase { start() { const field = globalScene.getField(); for (const o of this.order) { - if (field[o].status && field[o].status.isPostTurn()) { + if (field[o].status?.isPostTurn()) { globalScene.unshiftPhase(new PostTurnStatusEffectPhase(o)); } } diff --git a/src/phases/check-switch-phase.ts b/src/phases/check-switch-phase.ts index 06e08f7f30d..ba4837fd7cc 100644 --- a/src/phases/check-switch-phase.ts +++ b/src/phases/check-switch-phase.ts @@ -10,10 +10,10 @@ import { SwitchPhase } from "./switch-phase"; import { SwitchType } from "#enums/switch-type"; export class CheckSwitchPhase extends BattlePhase { - protected fieldIndex: integer; + protected fieldIndex: number; protected useName: boolean; - constructor(fieldIndex: integer, useName: boolean) { + constructor(fieldIndex: number, useName: boolean) { super(); this.fieldIndex = fieldIndex; @@ -39,26 +39,43 @@ export class CheckSwitchPhase extends BattlePhase { } // ...if there are no other allowed Pokemon in the player's party to switch with - if (!globalScene.getPlayerParty().slice(1).filter(p => p.isActive()).length) { + if ( + !globalScene + .getPlayerParty() + .slice(1) + .filter(p => p.isActive()).length + ) { return super.end(); } // ...or if any player Pokemon has an effect that prevents the checked Pokemon from switching - if (pokemon.getTag(BattlerTagType.FRENZY) - || pokemon.isTrapped() - || globalScene.getPlayerField().some(p => p.getTag(BattlerTagType.COMMANDED))) { + if ( + pokemon.getTag(BattlerTagType.FRENZY) || + pokemon.isTrapped() || + globalScene.getPlayerField().some(p => p.getTag(BattlerTagType.COMMANDED)) + ) { return super.end(); } - globalScene.ui.showText(i18next.t("battle:switchQuestion", { pokemonName: this.useName ? getPokemonNameWithAffix(pokemon) : i18next.t("battle:pokemon") }), null, () => { - globalScene.ui.setMode(Mode.CONFIRM, () => { - globalScene.ui.setMode(Mode.MESSAGE); - globalScene.unshiftPhase(new SwitchPhase(SwitchType.INITIAL_SWITCH, this.fieldIndex, false, true)); - this.end(); - }, () => { - globalScene.ui.setMode(Mode.MESSAGE); - this.end(); - }); - }); + globalScene.ui.showText( + i18next.t("battle:switchQuestion", { + pokemonName: this.useName ? getPokemonNameWithAffix(pokemon) : i18next.t("battle:pokemon"), + }), + null, + () => { + globalScene.ui.setMode( + Mode.CONFIRM, + () => { + globalScene.ui.setMode(Mode.MESSAGE); + globalScene.unshiftPhase(new SwitchPhase(SwitchType.INITIAL_SWITCH, this.fieldIndex, false, true)); + this.end(); + }, + () => { + globalScene.ui.setMode(Mode.MESSAGE); + this.end(); + }, + ); + }, + ); } } diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts index e2bad953fc5..055d52e7a8b 100644 --- a/src/phases/command-phase.ts +++ b/src/phases/command-phase.ts @@ -3,8 +3,8 @@ import type { TurnCommand } from "#app/battle"; import { BattleType } from "#app/battle"; import type { EncoreTag } from "#app/data/battler-tags"; import { TrappedTag } from "#app/data/battler-tags"; -import type { MoveTargetSet } from "#app/data/move"; -import { getMoveTargets } from "#app/data/move"; +import type { MoveTargetSet } from "#app/data/moves/move"; +import { getMoveTargets } from "#app/data/moves/move"; import { speciesStarterCosts } from "#app/data/balance/starters"; import { Abilities } from "#app/enums/abilities"; import { BattlerTagType } from "#app/enums/battler-tag-type"; @@ -25,9 +25,9 @@ import { ArenaTagSide } from "#app/data/arena-tag"; import { ArenaTagType } from "#app/enums/arena-tag-type"; export class CommandPhase extends FieldPhase { - protected fieldIndex: integer; + protected fieldIndex: number; - constructor(fieldIndex: integer) { + constructor(fieldIndex: number) { super(); this.fieldIndex = fieldIndex; @@ -41,12 +41,16 @@ export class CommandPhase extends FieldPhase { const commandUiHandler = globalScene.ui.handlers[Mode.COMMAND]; // If one of these conditions is true, we always reset the cursor to Command.FIGHT - const cursorResetEvent = globalScene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER || - globalScene.currentBattle.battleType === BattleType.TRAINER || - globalScene.arena.biomeType === Biome.END; + const cursorResetEvent = + globalScene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER || + globalScene.currentBattle.battleType === BattleType.TRAINER || + globalScene.arena.biomeType === Biome.END; if (commandUiHandler) { - if ((globalScene.currentBattle.turn === 1 && (!globalScene.commandCursorMemory || cursorResetEvent)) || commandUiHandler.getCursor() === Command.POKEMON) { + if ( + (globalScene.currentBattle.turn === 1 && (!globalScene.commandCursorMemory || cursorResetEvent)) || + commandUiHandler.getCursor() === Command.POKEMON + ) { commandUiHandler.setCursor(Command.FIGHT); } else { commandUiHandler.setCursor(commandUiHandler.getCursor()); @@ -61,14 +65,24 @@ export class CommandPhase extends FieldPhase { } else { const allyCommand = globalScene.currentBattle.turnCommands[this.fieldIndex - 1]; if (allyCommand?.command === Command.BALL || allyCommand?.command === Command.RUN) { - globalScene.currentBattle.turnCommands[this.fieldIndex] = { command: allyCommand?.command, skip: true }; + globalScene.currentBattle.turnCommands[this.fieldIndex] = { + command: allyCommand?.command, + skip: true, + }; } } } // If the Pokemon has applied Commander's effects to its ally, skip this command - if (globalScene.currentBattle?.double && this.getPokemon().getAlly()?.getTag(BattlerTagType.COMMANDED)?.getSourcePokemon() === this.getPokemon()) { - globalScene.currentBattle.turnCommands[this.fieldIndex] = { command: Command.FIGHT, move: { move: Moves.NONE, targets: []}, skip: true }; + if ( + globalScene.currentBattle?.double && + this.getPokemon().getAlly()?.getTag(BattlerTagType.COMMANDED)?.getSourcePokemon() === this.getPokemon() + ) { + globalScene.currentBattle.turnCommands[this.fieldIndex] = { + command: Command.FIGHT, + move: { move: Moves.NONE, targets: [] }, + skip: true, + }; } // Checks if the Pokemon is under the effects of Encore. If so, Encore can end early if the encored move has no more PP. @@ -85,9 +99,20 @@ export class CommandPhase extends FieldPhase { const moveQueue = playerPokemon.getMoveQueue(); - while (moveQueue.length && moveQueue[0] - && moveQueue[0].move && !moveQueue[0].virtual && (!playerPokemon.getMoveset().find(m => m?.moveId === moveQueue[0].move) - || !playerPokemon.getMoveset()[playerPokemon.getMoveset().findIndex(m => m?.moveId === moveQueue[0].move)]!.isUsable(playerPokemon, moveQueue[0].ignorePP))) { // TODO: is the bang correct? + while ( + moveQueue.length && + moveQueue[0] && + moveQueue[0].move && + !moveQueue[0].virtual && + (!playerPokemon.getMoveset().find(m => m?.moveId === moveQueue[0].move) || + !playerPokemon + .getMoveset() + [playerPokemon.getMoveset().findIndex(m => m?.moveId === moveQueue[0].move)]!.isUsable( + playerPokemon, + moveQueue[0].ignorePP, + )) + ) { + // TODO: is the bang correct? moveQueue.shift(); } @@ -97,14 +122,21 @@ export class CommandPhase extends FieldPhase { this.handleCommand(Command.FIGHT, -1); } else { const moveIndex = playerPokemon.getMoveset().findIndex(m => m?.moveId === queuedMove.move); - if ((moveIndex > -1 && playerPokemon.getMoveset()[moveIndex]!.isUsable(playerPokemon, queuedMove.ignorePP)) || queuedMove.virtual) { // TODO: is the bang correct? + if ( + (moveIndex > -1 && playerPokemon.getMoveset()[moveIndex]!.isUsable(playerPokemon, queuedMove.ignorePP)) || + queuedMove.virtual + ) { + // TODO: is the bang correct? this.handleCommand(Command.FIGHT, moveIndex, queuedMove.ignorePP, queuedMove); } else { globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); } } } else { - if (globalScene.currentBattle.isBattleMysteryEncounter() && globalScene.currentBattle.mysteryEncounter?.skipToFightInput) { + if ( + globalScene.currentBattle.isBattleMysteryEncounter() && + globalScene.currentBattle.mysteryEncounter?.skipToFightInput + ) { globalScene.ui.clearText(); globalScene.ui.setMode(Mode.FIGHT, this.fieldIndex); } else { @@ -113,18 +145,20 @@ export class CommandPhase extends FieldPhase { } } - handleCommand(command: Command, cursor: integer, ...args: any[]): boolean { + handleCommand(command: Command, cursor: number, ...args: any[]): boolean { const playerPokemon = globalScene.getPlayerField()[this.fieldIndex]; - let success: boolean = false; + let success = false; switch (command) { + case Command.TERA: case Command.FIGHT: let useStruggle = false; - const turnMove: TurnMove | undefined = (args.length === 2 ? (args[1] as TurnMove) : undefined); - if (cursor === -1 || - playerPokemon.trySelectMove(cursor, args[0] as boolean) || - (useStruggle = cursor > -1 && !playerPokemon.getMoveset().filter(m => m?.isUsable(playerPokemon)).length)) { - + const turnMove: TurnMove | undefined = args.length === 2 ? (args[1] as TurnMove) : undefined; + if ( + cursor === -1 || + playerPokemon.trySelectMove(cursor, args[0] as boolean) || + (useStruggle = cursor > -1 && !playerPokemon.getMoveset().filter(m => m?.isUsable(playerPokemon)).length) + ) { let moveId: Moves; if (useStruggle) { moveId = Moves.STRUGGLE; @@ -136,10 +170,26 @@ export class CommandPhase extends FieldPhase { moveId = Moves.NONE; } - const turnCommand: TurnCommand = { command: Command.FIGHT, cursor: cursor, move: { move: moveId, targets: [], ignorePP: args[0] }, args: args }; - const moveTargets: MoveTargetSet = turnMove === undefined ? getMoveTargets(playerPokemon, moveId) : { targets: turnMove.targets, multiple: turnMove.targets.length > 1 }; + const turnCommand: TurnCommand = { + command: Command.FIGHT, + cursor: cursor, + move: { move: moveId, targets: [], ignorePP: args[0] }, + args: args, + }; + const preTurnCommand: TurnCommand = { + command: command, + targets: [this.fieldIndex], + skip: command === Command.FIGHT, + }; + const moveTargets: MoveTargetSet = + turnMove === undefined + ? getMoveTargets(playerPokemon, moveId) + : { + targets: turnMove.targets, + multiple: turnMove.targets.length > 1, + }; if (!moveId) { - turnCommand.targets = [ this.fieldIndex ]; + turnCommand.targets = [this.fieldIndex]; } console.log(moveTargets, getPokemonNameWithAffix(playerPokemon)); if (moveTargets.targets.length > 1 && moveTargets.multiple) { @@ -152,6 +202,7 @@ export class CommandPhase extends FieldPhase { } else { globalScene.unshiftPhase(new SelectTargetPhase(this.fieldIndex)); } + globalScene.currentBattle.preTurnCommands[this.fieldIndex] = preTurnCommand; globalScene.currentBattle.turnCommands[this.fieldIndex] = turnCommand; success = true; } else if (cursor < playerPokemon.getMoveset().length) { @@ -159,61 +210,122 @@ export class CommandPhase extends FieldPhase { globalScene.ui.setMode(Mode.MESSAGE); // Decides between a Disabled, Not Implemented, or No PP translation message - const errorMessage = - playerPokemon.isMoveRestricted(move.moveId, playerPokemon) - ? playerPokemon.getRestrictingTag(move.moveId, playerPokemon)!.selectionDeniedText(playerPokemon, move.moveId) - : move.getName().endsWith(" (N)") ? "battle:moveNotImplemented" : "battle:moveNoPP"; + const errorMessage = playerPokemon.isMoveRestricted(move.moveId, playerPokemon) + ? playerPokemon + .getRestrictingTag(move.moveId, playerPokemon)! + .selectionDeniedText(playerPokemon, move.moveId) + : move.getName().endsWith(" (N)") + ? "battle:moveNotImplemented" + : "battle:moveNoPP"; const moveName = move.getName().replace(" (N)", ""); // Trims off the indicator - globalScene.ui.showText(i18next.t(errorMessage, { moveName: moveName }), null, () => { - globalScene.ui.clearText(); - globalScene.ui.setMode(Mode.FIGHT, this.fieldIndex); - }, null, true); + globalScene.ui.showText( + i18next.t(errorMessage, { moveName: moveName }), + null, + () => { + globalScene.ui.clearText(); + globalScene.ui.setMode(Mode.FIGHT, this.fieldIndex); + }, + null, + true, + ); } break; case Command.BALL: - const notInDex = (globalScene.getEnemyField().filter(p => p.isActive(true)).some(p => !globalScene.gameData.dexData[p.species.speciesId].caughtAttr) && globalScene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarterCosts).length - 1); - if (globalScene.arena.biomeType === Biome.END && (!globalScene.gameMode.isClassic || globalScene.gameMode.isFreshStartChallenge() || notInDex )) { + const notInDex = + globalScene + .getEnemyField() + .filter(p => p.isActive(true)) + .some(p => !globalScene.gameData.dexData[p.species.speciesId].caughtAttr) && + globalScene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarterCosts).length - 1; + if ( + globalScene.arena.biomeType === Biome.END && + (!globalScene.gameMode.isClassic || globalScene.gameMode.isFreshStartChallenge() || notInDex) + ) { globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.showText(i18next.t("battle:noPokeballForce"), null, () => { - globalScene.ui.showText("", 0); - globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); - }, null, true); + globalScene.ui.showText( + i18next.t("battle:noPokeballForce"), + null, + () => { + globalScene.ui.showText("", 0); + globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); + }, + null, + true, + ); } else if (globalScene.currentBattle.battleType === BattleType.TRAINER) { globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.showText(i18next.t("battle:noPokeballTrainer"), null, () => { - globalScene.ui.showText("", 0); - globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); - }, null, true); - } else if (globalScene.currentBattle.isBattleMysteryEncounter() && !globalScene.currentBattle.mysteryEncounter!.catchAllowed) { + globalScene.ui.showText( + i18next.t("battle:noPokeballTrainer"), + null, + () => { + globalScene.ui.showText("", 0); + globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); + }, + null, + true, + ); + } else if ( + globalScene.currentBattle.isBattleMysteryEncounter() && + !globalScene.currentBattle.mysteryEncounter!.catchAllowed + ) { globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.showText(i18next.t("battle:noPokeballMysteryEncounter"), null, () => { - globalScene.ui.showText("", 0); - globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); - }, null, true); + globalScene.ui.showText( + i18next.t("battle:noPokeballMysteryEncounter"), + null, + () => { + globalScene.ui.showText("", 0); + globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); + }, + null, + true, + ); } else { - const targets = globalScene.getEnemyField().filter(p => p.isActive(true)).map(p => p.getBattlerIndex()); + const targets = globalScene + .getEnemyField() + .filter(p => p.isActive(true)) + .map(p => p.getBattlerIndex()); if (targets.length > 1) { globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.showText(i18next.t("battle:noPokeballMulti"), null, () => { - globalScene.ui.showText("", 0); - globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); - }, null, true); - } else if (cursor < 5) { - const targetPokemon = globalScene.getEnemyField().find(p => p.isActive(true)); - if (targetPokemon?.isBoss() && targetPokemon?.bossSegmentIndex >= 1 && !targetPokemon?.hasAbility(Abilities.WONDER_GUARD, false, true) && cursor < PokeballType.MASTER_BALL) { - globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); - globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.showText(i18next.t("battle:noPokeballStrong"), null, () => { + globalScene.ui.showText( + i18next.t("battle:noPokeballMulti"), + null, + () => { globalScene.ui.showText("", 0); globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); - }, null, true); + }, + null, + true, + ); + } else if (cursor < 5) { + const targetPokemon = globalScene.getEnemyField().find(p => p.isActive(true)); + if ( + targetPokemon?.isBoss() && + targetPokemon?.bossSegmentIndex >= 1 && + !targetPokemon?.hasAbility(Abilities.WONDER_GUARD, false, true) && + cursor < PokeballType.MASTER_BALL + ) { + globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); + globalScene.ui.setMode(Mode.MESSAGE); + globalScene.ui.showText( + i18next.t("battle:noPokeballStrong"), + null, + () => { + globalScene.ui.showText("", 0); + globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); + }, + null, + true, + ); } else { - globalScene.currentBattle.turnCommands[this.fieldIndex] = { command: Command.BALL, cursor: cursor }; + globalScene.currentBattle.turnCommands[this.fieldIndex] = { + command: Command.BALL, + cursor: cursor, + }; globalScene.currentBattle.turnCommands[this.fieldIndex]!.targets = targets; if (this.fieldIndex) { globalScene.currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true; @@ -228,22 +340,42 @@ export class CommandPhase extends FieldPhase { const isSwitch = command === Command.POKEMON; const { currentBattle, arena } = globalScene; const mysteryEncounterFleeAllowed = currentBattle.mysteryEncounter?.fleeAllowed; - if (!isSwitch && (arena.biomeType === Biome.END || (!isNullOrUndefined(mysteryEncounterFleeAllowed) && !mysteryEncounterFleeAllowed))) { + if ( + !isSwitch && + (arena.biomeType === Biome.END || + (!isNullOrUndefined(mysteryEncounterFleeAllowed) && !mysteryEncounterFleeAllowed)) + ) { globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.showText(i18next.t("battle:noEscapeForce"), null, () => { - globalScene.ui.showText("", 0); - globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); - }, null, true); - } else if (!isSwitch && (currentBattle.battleType === BattleType.TRAINER || currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE)) { + globalScene.ui.showText( + i18next.t("battle:noEscapeForce"), + null, + () => { + globalScene.ui.showText("", 0); + globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); + }, + null, + true, + ); + } else if ( + !isSwitch && + (currentBattle.battleType === BattleType.TRAINER || + currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) + ) { globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.showText(i18next.t("battle:noEscapeTrainer"), null, () => { - globalScene.ui.showText("", 0); - globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); - }, null, true); + globalScene.ui.showText( + i18next.t("battle:noEscapeTrainer"), + null, + () => { + globalScene.ui.showText("", 0); + globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); + }, + null, + true, + ); } else { - const batonPass = isSwitch && args[0] as boolean; + const batonPass = isSwitch && (args[0] as boolean); const trappedAbMessages: string[] = []; if (batonPass || !playerPokemon.isTrapped(trappedAbMessages)) { currentBattle.turnCommands[this.fieldIndex] = isSwitch @@ -251,18 +383,24 @@ export class CommandPhase extends FieldPhase { : { command: Command.RUN }; success = true; if (!isSwitch && this.fieldIndex) { - currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true; + currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true; } } else if (trappedAbMessages.length > 0) { if (!isSwitch) { globalScene.ui.setMode(Mode.MESSAGE); } - globalScene.ui.showText(trappedAbMessages[0], null, () => { - globalScene.ui.showText("", 0); - if (!isSwitch) { - globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); - } - }, null, true); + globalScene.ui.showText( + trappedAbMessages[0], + null, + () => { + globalScene.ui.showText("", 0); + if (!isSwitch) { + globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex); + } + }, + null, + true, + ); } else { const trapTag = playerPokemon.getTag(TrappedTag); const fairyLockTag = globalScene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.PLAYER); @@ -278,9 +416,12 @@ export class CommandPhase extends FieldPhase { const showNoEscapeText = (tag: any) => { globalScene.ui.showText( i18next.t("battle:noEscapePokemon", { - pokemonName: tag.sourceId && globalScene.getPokemonById(tag.sourceId) ? getPokemonNameWithAffix(globalScene.getPokemonById(tag.sourceId)!) : "", + pokemonName: + tag.sourceId && globalScene.getPokemonById(tag.sourceId) + ? getPokemonNameWithAffix(globalScene.getPokemonById(tag.sourceId)!) + : "", moveName: tag.getMoveName(), - escapeVerb: isSwitch ? i18next.t("battle:escapeVerbSwitch") : i18next.t("battle:escapeVerbFlee") + escapeVerb: isSwitch ? i18next.t("battle:escapeVerbSwitch") : i18next.t("battle:escapeVerbFlee"), }), null, () => { @@ -290,7 +431,7 @@ export class CommandPhase extends FieldPhase { } }, null, - true + true, ); }; @@ -319,7 +460,7 @@ export class CommandPhase extends FieldPhase { } } - getFieldIndex(): integer { + getFieldIndex(): number { return this.fieldIndex; } diff --git a/src/phases/common-anim-phase.ts b/src/phases/common-anim-phase.ts index 53cbdfaeb38..d32e93ea6aa 100644 --- a/src/phases/common-anim-phase.ts +++ b/src/phases/common-anim-phase.ts @@ -6,10 +6,10 @@ import { PokemonPhase } from "./pokemon-phase"; export class CommonAnimPhase extends PokemonPhase { private anim: CommonAnim | null; - private targetIndex: integer | undefined; + private targetIndex: number | undefined; private playOnEmptyField: boolean; - constructor(battlerIndex?: BattlerIndex, targetIndex?: BattlerIndex, anim?: CommonAnim, playOnEmptyField: boolean = false) { + constructor(battlerIndex?: BattlerIndex, targetIndex?: BattlerIndex, anim?: CommonAnim, playOnEmptyField = false) { super(battlerIndex); this.anim = anim!; // TODO: is this bang correct? @@ -22,7 +22,10 @@ export class CommonAnimPhase extends PokemonPhase { } start() { - const target = this.targetIndex !== undefined ? (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField())[this.targetIndex] : this.getPokemon(); + const target = + this.targetIndex !== undefined + ? (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField())[this.targetIndex] + : this.getPokemon(); new CommonBattleAnim(this.anim, this.getPokemon(), target).play(false, () => { this.end(); }); diff --git a/src/phases/damage-anim-phase.ts b/src/phases/damage-anim-phase.ts index 2983d6b2de0..e31fe8c9475 100644 --- a/src/phases/damage-anim-phase.ts +++ b/src/phases/damage-anim-phase.ts @@ -1,16 +1,16 @@ import { globalScene } from "#app/global-scene"; -import { type BattlerIndex } from "#app/battle"; +import type { BattlerIndex } from "#app/battle"; import { BattleSpec } from "#enums/battle-spec"; import { type DamageResult, HitResult } from "#app/field/pokemon"; import { fixedInt } from "#app/utils"; import { PokemonPhase } from "#app/phases/pokemon-phase"; export class DamageAnimPhase extends PokemonPhase { - private amount: integer; + private amount: number; private damageResult: DamageResult; private critical: boolean; - constructor(battlerIndex: BattlerIndex, amount: integer, damageResult?: DamageResult, critical: boolean = false) { + constructor(battlerIndex: BattlerIndex, amount: number, damageResult?: DamageResult, critical = false) { super(battlerIndex); this.amount = amount; @@ -35,7 +35,7 @@ export class DamageAnimPhase extends PokemonPhase { this.applyDamage(); } - updateAmount(amount: integer): void { + updateAmount(amount: number): void { this.amount = amount; } @@ -63,14 +63,20 @@ export class DamageAnimPhase extends PokemonPhase { repeat: 5, startAt: 200, callback: () => { - this.getPokemon().getSprite().setVisible(flashTimer.repeatCount % 2 === 0); + this.getPokemon() + .getSprite() + .setVisible(flashTimer.repeatCount % 2 === 0); if (!flashTimer.repeatCount) { - this.getPokemon().updateInfo().then(() => this.end()); + this.getPokemon() + .updateInfo() + .then(() => this.end()); } - } + }, }); } else { - this.getPokemon().updateInfo().then(() => this.end()); + this.getPokemon() + .updateInfo() + .then(() => this.end()); } } diff --git a/src/phases/egg-hatch-phase.ts b/src/phases/egg-hatch-phase.ts index 11bf9584ee7..49a408e8699 100644 --- a/src/phases/egg-hatch-phase.ts +++ b/src/phases/egg-hatch-phase.ts @@ -3,7 +3,6 @@ import { globalScene } from "#app/global-scene"; import type { Egg } from "#app/data/egg"; import { EggCountChangedEvent } from "#app/events/egg"; import type { PlayerPokemon } from "#app/field/pokemon"; -import { getPokemonNameWithAffix } from "#app/messages"; import { Phase } from "#app/phase"; import { achvs } from "#app/system/achv"; import EggCounterContainer from "#app/ui/egg-counter-container"; @@ -17,7 +16,6 @@ import type { EggLapsePhase } from "./egg-lapse-phase"; import type { EggHatchData } from "#app/data/egg-hatch-data"; import { doShinySparkleAnim } from "#app/field/anims"; - /** * Class that represents egg hatching */ @@ -28,7 +26,7 @@ export class EggHatchPhase extends Phase { private eggHatchData: EggHatchData; /** The number of eggs that are hatching */ - private eggsToHatchCount: integer; + private eggsToHatchCount: number; /** The container that lists how many eggs are hatching */ private eggCounterContainer: EggCounterContainer; @@ -59,7 +57,7 @@ export class EggHatchPhase extends Phase { /** The newly hatched {@link PlayerPokemon} */ private pokemon: PlayerPokemon; /** The index of which egg move is unlocked. 0-2 is common, 3 is rare */ - private eggMoveIndex: integer; + private eggMoveIndex: number; /** Internal booleans representing if the egg is hatched, able to be skipped, or skipped */ private hatched: boolean; private canSkip: boolean; @@ -68,7 +66,7 @@ export class EggHatchPhase extends Phase { private evolutionBgm: AnySound; private eggLapsePhase: EggLapsePhase; - constructor(hatchScene: EggLapsePhase, egg: Egg, eggsToHatchCount: integer) { + constructor(hatchScene: EggLapsePhase, egg: Egg, eggsToHatchCount: number) { super(); this.eggLapsePhase = hatchScene; this.egg = egg; @@ -79,7 +77,6 @@ export class EggHatchPhase extends Phase { super.start(); globalScene.ui.setModeForceTransition(Mode.EGG_HATCH_SCENE).then(() => { - if (!this.egg) { return this.end(); } @@ -102,13 +99,21 @@ export class EggHatchPhase extends Phase { this.eggHatchBg.setOrigin(0, 0); this.eggHatchContainer.add(this.eggHatchBg); - this.eggContainer = globalScene.add.container(this.eggHatchBg.displayWidth / 2, this.eggHatchBg.displayHeight / 2); + this.eggContainer = globalScene.add.container( + this.eggHatchBg.displayWidth / 2, + this.eggHatchBg.displayHeight / 2, + ); this.eggSprite = globalScene.add.sprite(0, 0, "egg", `egg_${this.egg.getKey()}`); this.eggCrackSprite = globalScene.add.sprite(0, 0, "egg_crack", "0"); this.eggCrackSprite.setVisible(false); - this.eggLightraysOverlay = globalScene.add.sprite((-this.eggHatchBg.displayWidth / 2) + 4, -this.eggHatchBg.displayHeight / 2, "egg_lightrays", "3"); + this.eggLightraysOverlay = globalScene.add.sprite( + -this.eggHatchBg.displayWidth / 2 + 4, + -this.eggHatchBg.displayHeight / 2, + "egg_lightrays", + "3", + ); this.eggLightraysOverlay.setOrigin(0, 0); this.eggLightraysOverlay.setVisible(false); @@ -121,8 +126,15 @@ export class EggHatchPhase extends Phase { this.eggHatchContainer.add(this.eggCounterContainer); const getPokemonSprite = () => { - const ret = globalScene.add.sprite(this.eggHatchBg.displayWidth / 2, this.eggHatchBg.displayHeight / 2, "pkmn__sub"); - ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true }); + const ret = globalScene.add.sprite( + this.eggHatchBg.displayWidth / 2, + this.eggHatchBg.displayHeight / 2, + "pkmn__sub", + ); + ret.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + }); return ret; }; @@ -133,7 +145,13 @@ export class EggHatchPhase extends Phase { this.eggHatchContainer.add(this.pokemonShinySparkle); - this.eggHatchOverlay = globalScene.add.rectangle(0, -globalScene.game.canvas.height / 6, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0xFFFFFF); + this.eggHatchOverlay = globalScene.add.rectangle( + 0, + -globalScene.game.canvas.height / 6, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6, + 0xffffff, + ); this.eggHatchOverlay.setOrigin(0, 0); this.eggHatchOverlay.setAlpha(0); globalScene.fieldUI.add(this.eggHatchOverlay); @@ -206,7 +224,7 @@ export class EggHatchPhase extends Phase { } end() { - if (globalScene.findPhase((p) => p instanceof EggHatchPhase)) { + if (globalScene.findPhase(p => p instanceof EggHatchPhase)) { this.eggHatchHandler.clear(); } else { globalScene.time.delayedCall(250, () => globalScene.setModifiersVisible(true)); @@ -221,7 +239,7 @@ export class EggHatchPhase extends Phase { * @param count the current number of times this function has been called. * @returns nothing since it's a Promise */ - doEggShake(intensity: number, repeatCount?: integer, count?: integer): Promise { + doEggShake(intensity: number, repeatCount?: number, count?: number): Promise { return new Promise(resolve => { if (repeatCount === undefined) { repeatCount = 0; @@ -243,7 +261,8 @@ export class EggHatchPhase extends Phase { duration: 250, onComplete: () => { count!++; - if (count! < repeatCount!) { // we know they are defined + if (count! < repeatCount!) { + // we know they are defined return this.doEggShake(intensity, repeatCount, count).then(() => resolve()); } globalScene.tweens.add({ @@ -251,11 +270,11 @@ export class EggHatchPhase extends Phase { x: `-=${intensity / 2}`, ease: "Sine.easeInOut", duration: 125, - onComplete: () => resolve() + onComplete: () => resolve(), }); - } + }, }); - } + }, }); }); } @@ -290,7 +309,9 @@ export class EggHatchPhase extends Phase { SoundFade.fadeOut(globalScene, this.evolutionBgm, Utils.fixedInt(100)); } for (let e = 0; e < 5; e++) { - globalScene.time.delayedCall(Utils.fixedInt(375 * e), () => globalScene.playSound("se/egg_hatch", { volume: 1 - (e * 0.2) })); + globalScene.time.delayedCall(Utils.fixedInt(375 * e), () => + globalScene.playSound("se/egg_hatch", { volume: 1 - e * 0.2 }), + ); } this.eggLightraysOverlay.setVisible(true); this.eggLightraysOverlay.play("egg_lightrays"); @@ -302,7 +323,7 @@ export class EggHatchPhase extends Phase { onComplete: () => { this.skipped = false; this.canSkip = true; - } + }, }); globalScene.time.delayedCall(Utils.fixedInt(1500), () => { this.canSkip = false; @@ -351,28 +372,40 @@ export class EggHatchPhase extends Phase { doShinySparkleAnim(this.pokemonShinySparkle, this.pokemon.variant); }); } - globalScene.time.delayedCall(Utils.fixedInt(!this.skipped ? !isShiny ? 1250 : 1750 : !isShiny ? 250 : 750), () => { - this.infoContainer.show(this.pokemon, false, this.skipped ? 2 : 1); + globalScene.time.delayedCall( + Utils.fixedInt(!this.skipped ? (!isShiny ? 1250 : 1750) : !isShiny ? 250 : 750), + () => { + this.infoContainer.show(this.pokemon, false, this.skipped ? 2 : 1); - globalScene.playSoundWithoutBgm("evolution_fanfare"); + globalScene.playSoundWithoutBgm("evolution_fanfare"); - globalScene.ui.showText(i18next.t("egg:hatchFromTheEgg", { pokemonName: getPokemonNameWithAffix(this.pokemon) }), null, () => { - globalScene.gameData.updateSpeciesDexIvs(this.pokemon.species.speciesId, this.pokemon.ivs); - globalScene.gameData.setPokemonCaught(this.pokemon, true, true).then(() => { - globalScene.gameData.setEggMoveUnlocked(this.pokemon.species, this.eggMoveIndex).then((value) => { - this.eggHatchData.setEggMoveUnlocked(value); - globalScene.ui.showText("", 0); - this.end(); - }); - }); - }, null, true, 3000); - }); + globalScene.ui.showText( + i18next.t("egg:hatchFromTheEgg", { + pokemonName: this.pokemon.species.getExpandedSpeciesName(), + }), + null, + () => { + globalScene.gameData.updateSpeciesDexIvs(this.pokemon.species.speciesId, this.pokemon.ivs); + globalScene.gameData.setPokemonCaught(this.pokemon, true, true).then(() => { + globalScene.gameData.setEggMoveUnlocked(this.pokemon.species, this.eggMoveIndex).then(value => { + this.eggHatchData.setEggMoveUnlocked(value); + globalScene.ui.showText("", 0); + this.end(); + }); + }); + }, + null, + true, + 3000, + ); + }, + ); }); globalScene.tweens.add({ duration: Utils.fixedInt(this.skipped ? 500 : 3000), targets: this.eggHatchOverlay, alpha: 0, - ease: "Cubic.easeOut" + ease: "Cubic.easeOut", }); } @@ -382,7 +415,7 @@ export class EggHatchPhase extends Phase { * @param amplitude Scaling * @returns a number */ - sin(index: integer, amplitude: integer): number { + sin(index: number, amplitude: number): number { return amplitude * Math.sin(index * (Math.PI / 128)); } @@ -391,13 +424,13 @@ export class EggHatchPhase extends Phase { * @param intensity number of times this is repeated (this is a badly named variable) * @param offsetY how much to offset the Y coordinates */ - doSpray(intensity: integer, offsetY?: number) { + doSpray(intensity: number, offsetY?: number) { globalScene.tweens.addCounter({ repeat: intensity, duration: Utils.getFrameMs(1), onRepeat: () => { this.doSprayParticle(Utils.randInt(8), offsetY || 0); - } + }, }); } @@ -406,7 +439,7 @@ export class EggHatchPhase extends Phase { * @param trigIndex Used to modify the particle's vertical speed, is a random number from 0-7 * @param offsetY how much to offset the Y coordinate */ - doSprayParticle(trigIndex: integer, offsetY: number) { + doSprayParticle(trigIndex: number, offsetY: number) { const initialX = this.eggHatchBg.displayWidth / 2; const initialY = this.eggHatchBg.displayHeight / 2 + offsetY; const shardKey = !this.egg.isManaphyEgg() ? this.egg.tier.toString() : "1"; @@ -423,7 +456,7 @@ export class EggHatchPhase extends Phase { duration: Utils.getFrameMs(1), onRepeat: () => { updateParticle(); - } + }, }); const updateParticle = () => { @@ -433,7 +466,7 @@ export class EggHatchPhase extends Phase { particle.setPosition(initialX + (speed * f) / 3, initialY + yOffset); particle.y += -this.sin(trigIndex, amp); if (f > 108) { - particle.setScale((1 - (f - 108) / 20)); + particle.setScale(1 - (f - 108) / 20); } trigIndex += 2 * speedMultiplier; f += speedMultiplier; @@ -446,7 +479,6 @@ export class EggHatchPhase extends Phase { updateParticle(); } - /** * Generates a Pokemon to be hatched by the egg * Also stores the generated pokemon in this.eggHatchData diff --git a/src/phases/egg-lapse-phase.ts b/src/phases/egg-lapse-phase.ts index 62da0edf5b7..397eb970fec 100644 --- a/src/phases/egg-lapse-phase.ts +++ b/src/phases/egg-lapse-phase.ts @@ -16,12 +16,8 @@ import { EggHatchData } from "#app/data/egg-hatch-data"; * Also handles prompts for skipping animation, and calling the egg summary phase */ export class EggLapsePhase extends Phase { - private eggHatchData: EggHatchData[] = []; private readonly minEggsToSkip: number = 2; - constructor() { - super(); - } start() { super.start(); @@ -33,19 +29,37 @@ export class EggLapsePhase extends Phase { if (eggsToHatchCount > 0) { if (eggsToHatchCount >= this.minEggsToSkip && globalScene.eggSkipPreference === 1) { - globalScene.ui.showText(i18next.t("battle:eggHatching"), 0, () => { - // show prompt for skip, blocking inputs for 1 second - globalScene.ui.showText(i18next.t("battle:eggSkipPrompt", { eggsToHatch: eggsToHatchCount }), 0); - globalScene.ui.setModeWithoutClear(Mode.CONFIRM, () => { - this.hatchEggsSkipped(eggsToHatch); - this.showSummary(); - }, () => { - this.hatchEggsRegular(eggsToHatch); - this.end(); + globalScene.ui.showText( + i18next.t("battle:eggHatching"), + 0, + () => { + // show prompt for skip, blocking inputs for 1 second + globalScene.ui.showText( + i18next.t("battle:eggSkipPrompt", { + eggsToHatch: eggsToHatchCount, + }), + 0, + ); + globalScene.ui.setModeWithoutClear( + Mode.CONFIRM, + () => { + this.hatchEggsSkipped(eggsToHatch); + this.showSummary(); + }, + () => { + this.hatchEggsRegular(eggsToHatch); + this.end(); + }, + null, + null, + null, + 1000, + true, + ); }, - null, null, null, 1000, true - ); - }, 100, true); + 100, + true, + ); } else if (eggsToHatchCount >= this.minEggsToSkip && globalScene.eggSkipPreference === 2) { globalScene.queueMessage(i18next.t("battle:eggHatching")); this.hatchEggsSkipped(eggsToHatch); @@ -118,7 +132,6 @@ export class EggLapsePhase extends Phase { if (pokemon.isShiny()) { globalScene.validateAchv(achvs.HATCH_SHINY); } - } /** @@ -129,14 +142,16 @@ export class EggLapsePhase extends Phase { generatePokemon(egg: Egg): EggHatchData { let ret: PlayerPokemon; let newHatchData: EggHatchData; - globalScene.executeWithSeedOffset(() => { - ret = egg.generatePlayerPokemon(); - newHatchData = new EggHatchData(ret, egg.eggMoveIndex); - newHatchData.setDex(); - this.eggHatchData.push(newHatchData); - - }, egg.id, EGG_SEED.toString()); + globalScene.executeWithSeedOffset( + () => { + ret = egg.generatePlayerPokemon(); + newHatchData = new EggHatchData(ret, egg.eggMoveIndex); + newHatchData.setDex(); + this.eggHatchData.push(newHatchData); + }, + egg.id, + EGG_SEED.toString(), + ); return newHatchData!; } - } diff --git a/src/phases/egg-summary-phase.ts b/src/phases/egg-summary-phase.ts index 56741c5820f..9d9259d1e67 100644 --- a/src/phases/egg-summary-phase.ts +++ b/src/phases/egg-summary-phase.ts @@ -25,7 +25,6 @@ export class EggSummaryPhase extends Phase { globalScene.ui.setModeForceTransition(Mode.EGG_HATCH_SUMMARY, this.eggHatchData).then(() => { globalScene.fadeOutBgm(undefined, false); }); - } else { this.eggHatchData[i].setDex(); this.eggHatchData[i].updatePokemon().then(() => { @@ -36,7 +35,6 @@ export class EggSummaryPhase extends Phase { } }; updateNextPokemon(0); - } end() { diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts index 353dd6681cb..5decab522b5 100644 --- a/src/phases/encounter-phase.ts +++ b/src/phases/encounter-phase.ts @@ -38,6 +38,7 @@ import { Species } from "#enums/species"; import { overrideHeldItems, overrideModifiers } from "#app/modifier/modifier"; import i18next from "i18next"; import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters"; +import { getNatureName } from "#app/data/nature"; export class EncounterPhase extends BattlePhase { private loaded: boolean; @@ -87,7 +88,9 @@ export class EncounterPhase extends BattlePhase { // Add any special encounter animations to load if (mysteryEncounter.encounterAnimations && mysteryEncounter.encounterAnimations.length > 0) { - loadEnemyAssets.push(initEncounterAnims(mysteryEncounter.encounterAnimations).then(() => loadEncounterAnimAssets(true))); + loadEnemyAssets.push( + initEncounterAnims(mysteryEncounter.encounterAnimations).then(() => loadEncounterAnimAssets(true)), + ); } // Add intro visuals for mystery encounter @@ -114,19 +117,31 @@ export class EncounterPhase extends BattlePhase { } else { let enemySpecies = globalScene.randomSpecies(battle.waveIndex, level, true); // If player has golden bug net, rolls 10% chance to replace non-boss wave wild species from the golden bug net bug pool - if (globalScene.findModifier(m => m instanceof BoostBugSpawnModifier) - && !globalScene.gameMode.isBoss(battle.waveIndex) - && globalScene.arena.biomeType !== Biome.END - && randSeedInt(10) === 0) { + if ( + globalScene.findModifier(m => m instanceof BoostBugSpawnModifier) && + !globalScene.gameMode.isBoss(battle.waveIndex) && + globalScene.arena.biomeType !== Biome.END && + randSeedInt(10) === 0 + ) { enemySpecies = getGoldenBugNetSpecies(level); } - battle.enemyParty[e] = globalScene.addEnemyPokemon(enemySpecies, level, TrainerSlot.NONE, !!globalScene.getEncounterBossSegments(battle.waveIndex, level, enemySpecies)); + battle.enemyParty[e] = globalScene.addEnemyPokemon( + enemySpecies, + level, + TrainerSlot.NONE, + !!globalScene.getEncounterBossSegments(battle.waveIndex, level, enemySpecies), + ); if (globalScene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) { battle.enemyParty[e].ivs = new Array(6).fill(31); } - globalScene.getPlayerParty().slice(0, !battle.double ? 1 : 2).reverse().forEach(playerPokemon => { - applyAbAttrs(SyncEncounterNatureAbAttr, playerPokemon, null, false, battle.enemyParty[e]); - }); + // biome-ignore lint/complexity/noForEach: Improves readability + globalScene + .getPlayerParty() + .slice(0, !battle.double ? 1 : 2) + .reverse() + .forEach(playerPokemon => { + applyAbAttrs(SyncEncounterNatureAbAttr, playerPokemon, null, false, battle.enemyParty[e]); + }); } } const enemyPokemon = globalScene.getEnemyParty()[e]; @@ -136,11 +151,19 @@ export class EncounterPhase extends BattlePhase { } if (!this.loaded) { - globalScene.gameData.setPokemonSeen(enemyPokemon, true, battle.battleType === BattleType.TRAINER || battle?.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE); + globalScene.gameData.setPokemonSeen( + enemyPokemon, + true, + battle.battleType === BattleType.TRAINER || + battle?.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE, + ); } if (enemyPokemon.species.speciesId === Species.ETERNATUS) { - if (globalScene.gameMode.isClassic && (battle.battleSpec === BattleSpec.FINAL_BOSS || globalScene.gameMode.isWaveFinal(battle.waveIndex))) { + if ( + globalScene.gameMode.isClassic && + (battle.battleSpec === BattleSpec.FINAL_BOSS || globalScene.gameMode.isWaveFinal(battle.waveIndex)) + ) { if (battle.battleSpec !== BattleSpec.FINAL_BOSS) { enemyPokemon.formIndex = 1; enemyPokemon.updateScale(); @@ -156,7 +179,31 @@ export class EncounterPhase extends BattlePhase { loadEnemyAssets.push(enemyPokemon.loadAssets()); - console.log(`Pokemon: ${getPokemonNameWithAffix(enemyPokemon)}`, `Species ID: ${enemyPokemon.species.speciesId}`, `Stats: ${enemyPokemon.stats}`, `Ability: ${enemyPokemon.getAbility().name}`, `Passive Ability: ${enemyPokemon.getPassiveAbility().name}`); + const stats: string[] = [ + `HP: ${enemyPokemon.stats[0]} (${enemyPokemon.ivs[0]})`, + ` Atk: ${enemyPokemon.stats[1]} (${enemyPokemon.ivs[1]})`, + ` Def: ${enemyPokemon.stats[2]} (${enemyPokemon.ivs[2]})`, + ` Spatk: ${enemyPokemon.stats[3]} (${enemyPokemon.ivs[3]})`, + ` Spdef: ${enemyPokemon.stats[4]} (${enemyPokemon.ivs[4]})`, + ` Spd: ${enemyPokemon.stats[5]} (${enemyPokemon.ivs[5]})`, + ]; + const moveset: string[] = []; + for (const move of enemyPokemon.getMoveset()) { + moveset.push(move!.getName()); // TODO: remove `!` after moveset-null removal PR + } + + console.log( + `Pokemon: ${getPokemonNameWithAffix(enemyPokemon)}`, + `| Species ID: ${enemyPokemon.species.speciesId}`, + `| Nature: ${getNatureName(enemyPokemon.nature, true, true, true)}`, + ); + console.log(`Stats (IVs): ${stats}`); + console.log( + `Ability: ${enemyPokemon.getAbility().name}`, + `| Passive Ability${enemyPokemon.hasPassive() ? "" : " (inactive)"}: ${enemyPokemon.getPassiveAbility().name}`, + `${enemyPokemon.isBoss() ? `| Boss Bars: ${enemyPokemon.bossSegments}` : ""}`, + ); + console.log("Moveset:", moveset); return true; }); @@ -168,20 +215,26 @@ export class EncounterPhase extends BattlePhase { loadEnemyAssets.push(battle.trainer?.loadAssets().then(() => battle.trainer?.initSprite())!); // TODO: is this bang correct? } else if (battle.isBattleMysteryEncounter()) { if (battle.mysteryEncounter?.introVisuals) { - loadEnemyAssets.push(battle.mysteryEncounter.introVisuals.loadAssets().then(() => battle.mysteryEncounter!.introVisuals!.initSprite())); + loadEnemyAssets.push( + battle.mysteryEncounter.introVisuals + .loadAssets() + .then(() => battle.mysteryEncounter!.introVisuals!.initSprite()), + ); } if (battle.mysteryEncounter?.loadAssets && battle.mysteryEncounter.loadAssets.length > 0) { loadEnemyAssets.push(...battle.mysteryEncounter.loadAssets); } // Load Mystery Encounter Exclamation bubble and sfx - loadEnemyAssets.push(new Promise(resolve => { - globalScene.loadSe("GEN8- Exclaim", "battle_anims", "GEN8- Exclaim.wav"); - globalScene.loadImage("encounter_exclaim", "mystery-encounters"); - globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => resolve()); - if (!globalScene.load.isLoading()) { - globalScene.load.start(); - } - })); + loadEnemyAssets.push( + new Promise(resolve => { + globalScene.loadSe("GEN8- Exclaim", "battle_anims", "GEN8- Exclaim.wav"); + globalScene.loadImage("encounter_exclaim", "mystery-encounters"); + globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => resolve()); + if (!globalScene.load.isLoading()) { + globalScene.load.start(); + } + }), + ); } else { const overridedBossSegments = Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE > 1; // for double battles, reduce the health segments for boss Pokemon unless there is an override @@ -189,7 +242,10 @@ export class EncounterPhase extends BattlePhase { for (const enemyPokemon of battle.enemyParty) { // If the enemy pokemon is a boss and wasn't populated from data source, then update the number of segments if (enemyPokemon.isBoss() && !enemyPokemon.isPopulatedFromDataSource) { - enemyPokemon.setBoss(true, Math.ceil(enemyPokemon.bossSegments * (enemyPokemon.getSpeciesForm().baseTotal / totalBst))); + enemyPokemon.setBoss( + true, + Math.ceil(enemyPokemon.bossSegments * (enemyPokemon.getSpeciesForm().baseTotal / totalBst)), + ); enemyPokemon.initBattleInfo(); } } @@ -222,27 +278,36 @@ export class EncounterPhase extends BattlePhase { }); if (!this.loaded && battle.battleType !== BattleType.MYSTERY_ENCOUNTER) { - regenerateModifierPoolThresholds(globalScene.getEnemyField(), battle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD); + regenerateModifierPoolThresholds( + globalScene.getEnemyField(), + battle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD, + ); globalScene.generateEnemyModifiers(); overrideModifiers(false); - globalScene.getEnemyField().forEach(enemy => { - overrideHeldItems(enemy, false); - }); + for (const enemy of globalScene.getEnemyField()) { + overrideHeldItems(enemy, false); + } + } + + if (battle.battleType === BattleType.TRAINER) { + globalScene.currentBattle.trainer!.genAI(globalScene.getEnemyParty()); } globalScene.ui.setMode(Mode.MESSAGE).then(() => { if (!this.loaded) { this.trySetWeatherIfNewBiome(); // Set weather before session gets saved // Game syncs to server on waves X1 and X6 (As of 1.2.0) - globalScene.gameData.saveAll(true, battle.waveIndex % 5 === 1 || (globalScene.lastSavePlayTime ?? 0) >= 300).then(success => { - globalScene.disableMenu = false; - if (!success) { - return globalScene.reset(true); - } - this.doEncounter(); - globalScene.resetSeed(); - }); + globalScene.gameData + .saveAll(true, battle.waveIndex % 5 === 1 || (globalScene.lastSavePlayTime ?? 0) >= 300) + .then(success => { + globalScene.disableMenu = false; + if (!success) { + return globalScene.reset(true); + } + this.doEncounter(); + globalScene.resetSeed(); + }); } else { this.doEncounter(); globalScene.resetSeed(); @@ -257,7 +322,10 @@ export class EncounterPhase extends BattlePhase { globalScene.setFieldScale(1); const { battleType, waveIndex } = globalScene.currentBattle; - if (globalScene.isMysteryEncounterValidForWave(battleType, waveIndex) && !globalScene.currentBattle.isBattleMysteryEncounter()) { + if ( + globalScene.isMysteryEncounterValidForWave(battleType, waveIndex) && + !globalScene.currentBattle.isBattleMysteryEncounter() + ) { // Increment ME spawn chance if an ME could have spawned but did not // Only do this AFTER session has been saved to avoid duplicating increments globalScene.mysteryEncounterSaveData.encounterSpawnChance += WEIGHT_INCREMENT_ON_SPAWN_MISS; @@ -271,14 +339,20 @@ export class EncounterPhase extends BattlePhase { const enemyField = globalScene.getEnemyField(); globalScene.tweens.add({ - targets: [ globalScene.arenaEnemy, globalScene.currentBattle.trainer, enemyField, globalScene.arenaPlayer, globalScene.trainer ].flat(), - x: (_target, _key, value, fieldIndex: integer) => fieldIndex < 2 + (enemyField.length) ? value + 300 : value - 300, + targets: [ + globalScene.arenaEnemy, + globalScene.currentBattle.trainer, + enemyField, + globalScene.arenaPlayer, + globalScene.trainer, + ].flat(), + x: (_target, _key, value, fieldIndex: number) => (fieldIndex < 2 + enemyField.length ? value + 300 : value - 300), duration: 2000, onComplete: () => { if (!this.tryOverrideForBattleSpec()) { this.doEncounterCommon(); } - } + }, }); const encounterIntroVisuals = globalScene.currentBattle?.mysteryEncounter?.introVisuals; @@ -290,7 +364,7 @@ export class EncounterPhase extends BattlePhase { globalScene.tweens.add({ targets: encounterIntroVisuals, x: enterFromRight ? "-=200" : "+=300", - duration: 2000 + duration: 2000, }); } } @@ -299,35 +373,44 @@ export class EncounterPhase extends BattlePhase { const enemyField = globalScene.getEnemyField(); if (globalScene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) { - return i18next.t("battle:bossAppeared", { bossName: getPokemonNameWithAffix(enemyField[0]) }); + return i18next.t("battle:bossAppeared", { + bossName: getPokemonNameWithAffix(enemyField[0]), + }); } if (globalScene.currentBattle.battleType === BattleType.TRAINER) { if (globalScene.currentBattle.double) { - return i18next.t("battle:trainerAppearedDouble", { trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) }); - - } else { - return i18next.t("battle:trainerAppeared", { trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) }); + return i18next.t("battle:trainerAppearedDouble", { + trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true), + }); } + return i18next.t("battle:trainerAppeared", { + trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true), + }); } return enemyField.length === 1 - ? i18next.t("battle:singleWildAppeared", { pokemonName: enemyField[0].getNameToRender() }) - : i18next.t("battle:multiWildAppeared", { pokemonName1: enemyField[0].getNameToRender(), pokemonName2: enemyField[1].getNameToRender() }); + ? i18next.t("battle:singleWildAppeared", { + pokemonName: enemyField[0].getNameToRender(), + }) + : i18next.t("battle:multiWildAppeared", { + pokemonName1: enemyField[0].getNameToRender(), + pokemonName2: enemyField[1].getNameToRender(), + }); } - doEncounterCommon(showEncounterMessage: boolean = true) { + doEncounterCommon(showEncounterMessage = true) { const enemyField = globalScene.getEnemyField(); if (globalScene.currentBattle.battleType === BattleType.WILD) { - enemyField.forEach(enemyPokemon => { + for (const enemyPokemon of enemyField) { enemyPokemon.untint(100, "Sine.easeOut"); enemyPokemon.cry(); enemyPokemon.showInfo(); if (enemyPokemon.isShiny()) { globalScene.validateAchv(achvs.SEE_SHINY); } - }); + } globalScene.updateFieldScale(); if (showEncounterMessage) { globalScene.ui.showText(this.getEncounterMessage(), null, () => this.end(), 1500); @@ -366,7 +449,10 @@ export class EncounterPhase extends BattlePhase { doSummon(); } else { let message: string; - globalScene.executeWithSeedOffset(() => message = randSeedItem(encounterMessages), globalScene.currentBattle.waveIndex); + globalScene.executeWithSeedOffset( + () => (message = randSeedItem(encounterMessages)), + globalScene.currentBattle.waveIndex, + ); message = message!; // tell TS compiler it's defined now const showDialogueAndSummon = () => { globalScene.ui.showDialogue(message, trainer?.getName(TrainerSlot.NONE, true), null, () => { @@ -374,7 +460,13 @@ export class EncounterPhase extends BattlePhase { }); }; if (globalScene.currentBattle.trainer?.config.hasCharSprite && !globalScene.ui.shouldSkipDialogue(message)) { - globalScene.showFieldOverlay(500).then(() => globalScene.charSprite.showCharacter(trainer?.getKey()!, getCharVariantFromDialogue(encounterMessages[0])).then(() => showDialogueAndSummon())); // TODO: is this bang correct? + globalScene + .showFieldOverlay(500) + .then(() => + globalScene.charSprite + .showCharacter(trainer?.getKey()!, getCharVariantFromDialogue(encounterMessages[0])) + .then(() => showDialogueAndSummon()), + ); // TODO: is this bang correct? } else { showDialogueAndSummon(); } @@ -414,7 +506,14 @@ export class EncounterPhase extends BattlePhase { const text = getEncounterText(dialogue.text)!; i++; if (title) { - globalScene.ui.showDialogue(text, title, null, nextAction, 0, i === 1 ? FIRST_DIALOGUE_PROMPT_DELAY : 0); + globalScene.ui.showDialogue( + text, + title, + null, + nextAction, + 0, + i === 1 ? FIRST_DIALOGUE_PROMPT_DELAY : 0, + ); } else { globalScene.ui.showText(text, null, nextAction, i === 1 ? FIRST_DIALOGUE_PROMPT_DELAY : 0, true); } @@ -450,8 +549,15 @@ export class EncounterPhase extends BattlePhase { globalScene.unshiftPhase(new ShinySparklePhase(BattlerIndex.ENEMY + e)); } /** This sets Eternatus' held item to be untransferrable, preventing it from being stolen */ - if (enemyPokemon.species.speciesId === Species.ETERNATUS && (globalScene.gameMode.isBattleClassicFinalBoss(globalScene.currentBattle.waveIndex) || globalScene.gameMode.isEndlessMajorBoss(globalScene.currentBattle.waveIndex))) { - const enemyMBH = globalScene.findModifier(m => m instanceof TurnHeldItemTransferModifier, false) as TurnHeldItemTransferModifier; + if ( + enemyPokemon.species.speciesId === Species.ETERNATUS && + (globalScene.gameMode.isBattleClassicFinalBoss(globalScene.currentBattle.waveIndex) || + globalScene.gameMode.isEndlessMajorBoss(globalScene.currentBattle.waveIndex)) + ) { + const enemyMBH = globalScene.findModifier( + m => m instanceof TurnHeldItemTransferModifier, + false, + ) as TurnHeldItemTransferModifier; if (enemyMBH) { globalScene.removeModifier(enemyMBH, true); enemyMBH.setTransferrableFalse(); @@ -460,25 +566,27 @@ export class EncounterPhase extends BattlePhase { } }); - if (![ BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER ].includes(globalScene.currentBattle.battleType)) { - enemyField.map(p => globalScene.pushConditionalPhase(new PostSummonPhase(p.getBattlerIndex()), () => { - // if there is not a player party, we can't continue - if (!globalScene.getPlayerParty().length) { - return false; - } - // how many player pokemon are on the field ? - const pokemonsOnFieldCount = globalScene.getPlayerParty().filter(p => p.isOnField()).length; - // if it's a 2vs1, there will never be a 2nd pokemon on our field even - const requiredPokemonsOnField = Math.min(globalScene.getPlayerParty().filter((p) => !p.isFainted()).length, 2); - // if it's a double, there should be 2, otherwise 1 - if (globalScene.currentBattle.double) { - return pokemonsOnFieldCount === requiredPokemonsOnField; - } - return pokemonsOnFieldCount === 1; - })); + if (![BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(globalScene.currentBattle.battleType)) { + enemyField.map(p => + globalScene.pushConditionalPhase(new PostSummonPhase(p.getBattlerIndex()), () => { + // if there is not a player party, we can't continue + if (!globalScene.getPlayerParty().length) { + return false; + } + // how many player pokemon are on the field ? + const pokemonsOnFieldCount = globalScene.getPlayerParty().filter(p => p.isOnField()).length; + // if it's a 2vs1, there will never be a 2nd pokemon on our field even + const requiredPokemonsOnField = Math.min(globalScene.getPlayerParty().filter(p => !p.isFainted()).length, 2); + // if it's a double, there should be 2, otherwise 1 + if (globalScene.currentBattle.double) { + return pokemonsOnFieldCount === requiredPokemonsOnField; + } + return pokemonsOnFieldCount === 1; + }), + ); const ivScannerModifier = globalScene.findModifier(m => m instanceof IvScannerModifier); if (ivScannerModifier) { - enemyField.map(p => globalScene.pushPhase(new ScanIvsPhase(p.getBattlerIndex(), Math.min(ivScannerModifier.getStackCount() * 2, 6)))); + enemyField.map(p => globalScene.pushPhase(new ScanIvsPhase(p.getBattlerIndex()))); } } @@ -503,7 +611,10 @@ export class EncounterPhase extends BattlePhase { globalScene.pushPhase(new ToggleDoublePositionPhase(false)); } - if (globalScene.currentBattle.battleType !== BattleType.TRAINER && (globalScene.currentBattle.waveIndex > 1 || !globalScene.gameMode.isDaily)) { + if ( + globalScene.currentBattle.battleType !== BattleType.TRAINER && + (globalScene.currentBattle.waveIndex > 1 || !globalScene.gameMode.isDaily) + ) { const minPartySize = globalScene.currentBattle.double ? 2 : 1; if (availablePartyMembers.length > minPartySize) { globalScene.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double)); @@ -518,31 +629,47 @@ export class EncounterPhase extends BattlePhase { tryOverrideForBattleSpec(): boolean { switch (globalScene.currentBattle.battleSpec) { - case BattleSpec.FINAL_BOSS: + case BattleSpec.FINAL_BOSS: { const enemy = globalScene.getEnemyPokemon(); - globalScene.ui.showText(this.getEncounterMessage(), null, () => { - const localizationKey = "battleSpecDialogue:encounter"; - if (globalScene.ui.shouldSkipDialogue(localizationKey)) { - // Logging mirrors logging found in dialogue-ui-handler - console.log(`Dialogue ${localizationKey} skipped`); - this.doEncounterCommon(false); - } else { - const count = 5643853 + globalScene.gameData.gameStats.classicSessionsPlayed; - // The line below checks if an English ordinal is necessary or not based on whether an entry for encounterLocalizationKey exists in the language or not. - const ordinalUsed = !i18next.exists(localizationKey, { fallbackLng: []}) || i18next.resolvedLanguage === "en" ? i18next.t("battleSpecDialogue:key", { count: count, ordinal: true }) : ""; - const cycleCount = count.toLocaleString() + ordinalUsed; - const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET; - const genderStr = PlayerGender[genderIndex].toLowerCase(); - const encounterDialogue = i18next.t(localizationKey, { context: genderStr, cycleCount: cycleCount }); - if (!globalScene.gameData.getSeenDialogues()[localizationKey]) { - globalScene.gameData.saveSeenDialogue(localizationKey); - } - globalScene.ui.showDialogue(encounterDialogue, enemy?.species.name, null, () => { + globalScene.ui.showText( + this.getEncounterMessage(), + null, + () => { + const localizationKey = "battleSpecDialogue:encounter"; + if (globalScene.ui.shouldSkipDialogue(localizationKey)) { + // Logging mirrors logging found in dialogue-ui-handler + console.log(`Dialogue ${localizationKey} skipped`); this.doEncounterCommon(false); - }); - } - }, 1500, true); + } else { + const count = 5643853 + globalScene.gameData.gameStats.classicSessionsPlayed; + // The line below checks if an English ordinal is necessary or not based on whether an entry for encounterLocalizationKey exists in the language or not. + const ordinalUsed = + !i18next.exists(localizationKey, { fallbackLng: [] }) || i18next.resolvedLanguage === "en" + ? i18next.t("battleSpecDialogue:key", { + count: count, + ordinal: true, + }) + : ""; + const cycleCount = count.toLocaleString() + ordinalUsed; + const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET; + const genderStr = PlayerGender[genderIndex].toLowerCase(); + const encounterDialogue = i18next.t(localizationKey, { + context: genderStr, + cycleCount: cycleCount, + }); + if (!globalScene.gameData.getSeenDialogues()[localizationKey]) { + globalScene.gameData.saveSeenDialogue(localizationKey); + } + globalScene.ui.showDialogue(encounterDialogue, enemy?.species.name, null, () => { + this.doEncounterCommon(false); + }); + } + }, + 1500, + true, + ); return true; + } } return false; } diff --git a/src/phases/end-card-phase.ts b/src/phases/end-card-phase.ts index 4615a60e661..41775248b67 100644 --- a/src/phases/end-card-phase.ts +++ b/src/phases/end-card-phase.ts @@ -7,34 +7,44 @@ import i18next from "i18next"; export class EndCardPhase extends Phase { public endCard: Phaser.GameObjects.Image; public text: Phaser.GameObjects.Text; - - constructor() { - super(); - } - start(): void { super.start(); globalScene.ui.getMessageHandler().bg.setVisible(false); globalScene.ui.getMessageHandler().nameBoxContainer.setVisible(false); - this.endCard = globalScene.add.image(0, 0, `end_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}`); + this.endCard = globalScene.add.image( + 0, + 0, + `end_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}`, + ); this.endCard.setOrigin(0); this.endCard.setScale(0.5); globalScene.field.add(this.endCard); - this.text = addTextObject(globalScene.game.canvas.width / 12, (globalScene.game.canvas.height / 6) - 16, i18next.t("battle:congratulations"), TextStyle.SUMMARY, { fontSize: "128px" }); + this.text = addTextObject( + globalScene.game.canvas.width / 12, + globalScene.game.canvas.height / 6 - 16, + i18next.t("battle:congratulations"), + TextStyle.SUMMARY, + { fontSize: "128px" }, + ); this.text.setOrigin(0.5); globalScene.field.add(this.text); globalScene.ui.clearText(); globalScene.ui.fadeIn(1000).then(() => { - - globalScene.ui.showText("", null, () => { - globalScene.ui.getMessageHandler().bg.setVisible(true); - this.end(); - }, null, true); + globalScene.ui.showText( + "", + null, + () => { + globalScene.ui.getMessageHandler().bg.setVisible(true); + this.end(); + }, + null, + true, + ); }); } } diff --git a/src/phases/end-evolution-phase.ts b/src/phases/end-evolution-phase.ts index 58e2e203482..e0bdc7e0d68 100644 --- a/src/phases/end-evolution-phase.ts +++ b/src/phases/end-evolution-phase.ts @@ -3,11 +3,6 @@ import { Phase } from "#app/phase"; import { Mode } from "#app/ui/ui"; export class EndEvolutionPhase extends Phase { - - constructor() { - super(); - } - start() { super.start(); diff --git a/src/phases/enemy-command-phase.ts b/src/phases/enemy-command-phase.ts index 715303863be..2e4861aacfc 100644 --- a/src/phases/enemy-command-phase.ts +++ b/src/phases/enemy-command-phase.ts @@ -15,10 +15,10 @@ import { BattlerTagType } from "#enums/battler-tag-type"; * @see {@linkcode EnemyPokemon.getNextMove} */ export class EnemyCommandPhase extends FieldPhase { - protected fieldIndex: integer; - protected skipTurn: boolean = false; + protected fieldIndex: number; + protected skipTurn = false; - constructor(fieldIndex: integer) { + constructor(fieldIndex: number) { super(); this.fieldIndex = fieldIndex; @@ -36,20 +36,23 @@ export class EnemyCommandPhase extends FieldPhase { const trainer = battle.trainer; - if (battle.double && enemyPokemon.hasAbility(Abilities.COMMANDER) - && enemyPokemon.getAlly().getTag(BattlerTagType.COMMANDED)) { + if ( + battle.double && + enemyPokemon.hasAbility(Abilities.COMMANDER) && + enemyPokemon.getAlly().getTag(BattlerTagType.COMMANDED) + ) { this.skipTurn = true; } /** - * If the enemy has a trainer, decide whether or not the enemy should switch - * to another member in its party. - * - * This block compares the active enemy Pokemon's {@linkcode Pokemon.getMatchupScore | matchup score} - * against the active player Pokemon with the enemy party's other non-fainted Pokemon. If a party - * member's matchup score is 3x the active enemy's score (or 2x for "boss" trainers), - * the enemy will switch to that Pokemon. - */ + * If the enemy has a trainer, decide whether or not the enemy should switch + * to another member in its party. + * + * This block compares the active enemy Pokemon's {@linkcode Pokemon.getMatchupScore | matchup score} + * against the active player Pokemon with the enemy party's other non-fainted Pokemon. If a party + * member's matchup score is 3x the active enemy's score (or 2x for "boss" trainers), + * the enemy will switch to that Pokemon. + */ if (trainer && !enemyPokemon.getMoveQueue().length) { const opponents = enemyPokemon.getOpponents(); @@ -58,17 +61,21 @@ export class EnemyCommandPhase extends FieldPhase { if (partyMemberScores.length) { const matchupScores = opponents.map(opp => enemyPokemon.getMatchupScore(opp)); - const matchupScore = matchupScores.reduce((total, score) => total += score, 0) / matchupScores.length; + const matchupScore = matchupScores.reduce((total, score) => (total += score), 0) / matchupScores.length; const sortedPartyMemberScores = trainer.getSortedPartyMemberMatchupScores(partyMemberScores); - const switchMultiplier = 1 - (battle.enemySwitchCounter ? Math.pow(0.1, (1 / battle.enemySwitchCounter)) : 0); + const switchMultiplier = 1 - (battle.enemySwitchCounter ? Math.pow(0.1, 1 / battle.enemySwitchCounter) : 0); if (sortedPartyMemberScores[0][1] * switchMultiplier >= matchupScore * (trainer.config.isBoss ? 2 : 3)) { const index = trainer.getNextSummonIndex(enemyPokemon.trainerSlot, partyMemberScores); - battle.turnCommands[this.fieldIndex + BattlerIndex.ENEMY] = - { command: Command.POKEMON, cursor: index, args: [ false ], skip: this.skipTurn }; + battle.turnCommands[this.fieldIndex + BattlerIndex.ENEMY] = { + command: Command.POKEMON, + cursor: index, + args: [false], + skip: this.skipTurn, + }; battle.enemySwitchCounter++; @@ -81,8 +88,15 @@ export class EnemyCommandPhase extends FieldPhase { /** Select a move to use (and a target to use it against, if applicable) */ const nextMove = enemyPokemon.getNextMove(); - globalScene.currentBattle.turnCommands[this.fieldIndex + BattlerIndex.ENEMY] = - { command: Command.FIGHT, move: nextMove, skip: this.skipTurn }; + if (trainer?.shouldTera(enemyPokemon)) { + globalScene.currentBattle.preTurnCommands[this.fieldIndex + BattlerIndex.ENEMY] = { command: Command.TERA }; + } + + globalScene.currentBattle.turnCommands[this.fieldIndex + BattlerIndex.ENEMY] = { + command: Command.FIGHT, + move: nextMove, + skip: this.skipTurn, + }; globalScene.currentBattle.enemySwitchCounter = Math.max(globalScene.currentBattle.enemySwitchCounter - 1, 0); diff --git a/src/phases/enemy-party-member-pokemon-phase.ts b/src/phases/enemy-party-member-pokemon-phase.ts index 7c02cf97880..5c701f7d73a 100644 --- a/src/phases/enemy-party-member-pokemon-phase.ts +++ b/src/phases/enemy-party-member-pokemon-phase.ts @@ -2,7 +2,7 @@ import type { EnemyPokemon } from "#app/field/pokemon"; import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase"; export abstract class EnemyPartyMemberPokemonPhase extends PartyMemberPokemonPhase { - constructor(partyMemberIndex: integer) { + constructor(partyMemberIndex: number) { super(partyMemberIndex, false); } diff --git a/src/phases/evolution-phase.ts b/src/phases/evolution-phase.ts index bf046e682e4..bb283fa8139 100644 --- a/src/phases/evolution-phase.ts +++ b/src/phases/evolution-phase.ts @@ -20,7 +20,7 @@ import { EVOLVE_MOVE } from "#app/data/balance/pokemon-level-moves"; export class EvolutionPhase extends Phase { protected pokemon: PlayerPokemon; - protected lastLevel: integer; + protected lastLevel: number; private preEvolvedPokemonName: string; @@ -39,7 +39,7 @@ export class EvolutionPhase extends Phase { protected pokemonEvoSprite: Phaser.GameObjects.Sprite; protected pokemonEvoTintSprite: Phaser.GameObjects.Sprite; - constructor(pokemon: PlayerPokemon, evolution: SpeciesFormEvolution | null, lastLevel: integer) { + constructor(pokemon: PlayerPokemon, evolution: SpeciesFormEvolution | null, lastLevel: number) { super(); this.pokemon = pokemon; @@ -60,7 +60,6 @@ export class EvolutionPhase extends Phase { super.start(); this.setMode().then(() => { - if (!this.validate()) { return this.end(); } @@ -81,14 +80,28 @@ export class EvolutionPhase extends Phase { this.evolutionBg.setVisible(false); this.evolutionContainer.add(this.evolutionBg); - this.evolutionBgOverlay = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0x262626); + this.evolutionBgOverlay = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6, + 0x262626, + ); this.evolutionBgOverlay.setOrigin(0, 0); this.evolutionBgOverlay.setAlpha(0); this.evolutionContainer.add(this.evolutionBgOverlay); const getPokemonSprite = () => { - const ret = globalScene.addPokemonSprite(this.pokemon, this.evolutionBaseBg.displayWidth / 2, this.evolutionBaseBg.displayHeight / 2, "pkmn__sub"); - ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true }); + const ret = globalScene.addPokemonSprite( + this.pokemon, + this.evolutionBaseBg.displayWidth / 2, + this.evolutionBaseBg.displayHeight / 2, + "pkmn__sub", + ); + ret.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + }); return ret; }; @@ -98,17 +111,23 @@ export class EvolutionPhase extends Phase { this.evolutionContainer.add((this.pokemonEvoTintSprite = getPokemonSprite())); this.pokemonTintSprite.setAlpha(0); - this.pokemonTintSprite.setTintFill(0xFFFFFF); + this.pokemonTintSprite.setTintFill(0xffffff); this.pokemonEvoSprite.setVisible(false); this.pokemonEvoTintSprite.setVisible(false); - this.pokemonEvoTintSprite.setTintFill(0xFFFFFF); + this.pokemonEvoTintSprite.setTintFill(0xffffff); - this.evolutionOverlay = globalScene.add.rectangle(0, -globalScene.game.canvas.height / 6, globalScene.game.canvas.width / 6, (globalScene.game.canvas.height / 6) - 48, 0xFFFFFF); + this.evolutionOverlay = globalScene.add.rectangle( + 0, + -globalScene.game.canvas.height / 6, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6 - 48, + 0xffffff, + ); this.evolutionOverlay.setOrigin(0, 0); this.evolutionOverlay.setAlpha(0); globalScene.ui.add(this.evolutionOverlay); - [ this.pokemonSprite, this.pokemonTintSprite, this.pokemonEvoSprite, this.pokemonEvoTintSprite ].map(sprite => { + [this.pokemonSprite, this.pokemonTintSprite, this.pokemonEvoSprite, this.pokemonEvoTintSprite].map(sprite => { const spriteKey = this.pokemon.getSpriteKey(true); try { sprite.play(spriteKey); @@ -116,12 +135,17 @@ export class EvolutionPhase extends Phase { console.error(`Failed to play animation for ${spriteKey}`, err); } - sprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: false, teraColor: getTypeRgb(this.pokemon.getTeraType()) }); + sprite.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + hasShadow: false, + teraColor: getTypeRgb(this.pokemon.getTeraType()), + isTerastallized: this.pokemon.isTerastallized, + }); sprite.setPipelineData("ignoreTimeTint", true); sprite.setPipelineData("spriteKey", this.pokemon.getSpriteKey()); sprite.setPipelineData("shiny", this.pokemon.shiny); sprite.setPipelineData("variant", this.pokemon.variant); - [ "spriteColors", "fusionSpriteColors" ].map(k => { + ["spriteColors", "fusionSpriteColors"].map(k => { if (this.pokemon.summonData?.speciesForm) { k += "Base"; } @@ -134,83 +158,87 @@ export class EvolutionPhase extends Phase { } doEvolution(): void { - globalScene.ui.showText(i18next.t("menu:evolving", { pokemonName: this.preEvolvedPokemonName }), null, () => { - this.pokemon.cry(); + globalScene.ui.showText( + i18next.t("menu:evolving", { pokemonName: this.preEvolvedPokemonName }), + null, + () => { + this.pokemon.cry(); - this.pokemon.getPossibleEvolution(this.evolution).then(evolvedPokemon => { - - [ this.pokemonEvoSprite, this.pokemonEvoTintSprite ].map(sprite => { - const spriteKey = evolvedPokemon.getSpriteKey(true); - try { - sprite.play(spriteKey); - } catch (err: unknown) { - console.error(`Failed to play animation for ${spriteKey}`, err); - } - - sprite.setPipelineData("ignoreTimeTint", true); - sprite.setPipelineData("spriteKey", evolvedPokemon.getSpriteKey()); - sprite.setPipelineData("shiny", evolvedPokemon.shiny); - sprite.setPipelineData("variant", evolvedPokemon.variant); - [ "spriteColors", "fusionSpriteColors" ].map(k => { - if (evolvedPokemon.summonData?.speciesForm) { - k += "Base"; + this.pokemon.getPossibleEvolution(this.evolution).then(evolvedPokemon => { + [this.pokemonEvoSprite, this.pokemonEvoTintSprite].map(sprite => { + const spriteKey = evolvedPokemon.getSpriteKey(true); + try { + sprite.play(spriteKey); + } catch (err: unknown) { + console.error(`Failed to play animation for ${spriteKey}`, err); } - sprite.pipelineData[k] = evolvedPokemon.getSprite().pipelineData[k]; - }); - }); - globalScene.time.delayedCall(1000, () => { - this.evolutionBgm = globalScene.playSoundWithoutBgm("evolution"); - globalScene.tweens.add({ - targets: this.evolutionBgOverlay, - alpha: 1, - delay: 500, - duration: 1500, - ease: "Sine.easeOut", - onComplete: () => { - globalScene.time.delayedCall(1000, () => { - globalScene.tweens.add({ - targets: this.evolutionBgOverlay, - alpha: 0, - duration: 250 + sprite.setPipelineData("ignoreTimeTint", true); + sprite.setPipelineData("spriteKey", evolvedPokemon.getSpriteKey()); + sprite.setPipelineData("shiny", evolvedPokemon.shiny); + sprite.setPipelineData("variant", evolvedPokemon.variant); + ["spriteColors", "fusionSpriteColors"].map(k => { + if (evolvedPokemon.summonData?.speciesForm) { + k += "Base"; + } + sprite.pipelineData[k] = evolvedPokemon.getSprite().pipelineData[k]; + }); + }); + + globalScene.time.delayedCall(1000, () => { + this.evolutionBgm = globalScene.playSoundWithoutBgm("evolution"); + globalScene.tweens.add({ + targets: this.evolutionBgOverlay, + alpha: 1, + delay: 500, + duration: 1500, + ease: "Sine.easeOut", + onComplete: () => { + globalScene.time.delayedCall(1000, () => { + globalScene.tweens.add({ + targets: this.evolutionBgOverlay, + alpha: 0, + duration: 250, + }); + this.evolutionBg.setVisible(true); + this.evolutionBg.play(); }); - this.evolutionBg.setVisible(true); - this.evolutionBg.play(); - }); - globalScene.playSound("se/charge"); - this.doSpiralUpward(); - globalScene.tweens.addCounter({ - from: 0, - to: 1, - duration: 2000, - onUpdate: t => { - this.pokemonTintSprite.setAlpha(t.getValue()); - }, - onComplete: () => { - this.pokemonSprite.setVisible(false); - globalScene.time.delayedCall(1100, () => { - globalScene.playSound("se/beam"); - this.doArcDownward(); - globalScene.time.delayedCall(1500, () => { - this.pokemonEvoTintSprite.setScale(0.25); - this.pokemonEvoTintSprite.setVisible(true); - this.evolutionHandler.canCancel = true; - this.doCycle(1).then(success => { - if (success) { - this.handleSuccessEvolution(evolvedPokemon); - } else { - this.handleFailedEvolution(evolvedPokemon); - } + globalScene.playSound("se/charge"); + this.doSpiralUpward(); + globalScene.tweens.addCounter({ + from: 0, + to: 1, + duration: 2000, + onUpdate: t => { + this.pokemonTintSprite.setAlpha(t.getValue()); + }, + onComplete: () => { + this.pokemonSprite.setVisible(false); + globalScene.time.delayedCall(1100, () => { + globalScene.playSound("se/beam"); + this.doArcDownward(); + globalScene.time.delayedCall(1500, () => { + this.pokemonEvoTintSprite.setScale(0.25); + this.pokemonEvoTintSprite.setVisible(true); + this.evolutionHandler.canCancel = true; + this.doCycle(1).then(success => { + if (success) { + this.handleSuccessEvolution(evolvedPokemon); + } else { + this.handleFailedEvolution(evolvedPokemon); + } + }); }); }); - }); - } - }); - } + }, + }); + }, + }); }); }); - }); - }, 1000); + }, + 1000, + ); } /** @@ -221,36 +249,61 @@ export class EvolutionPhase extends Phase { this.pokemonSprite.setVisible(true); this.pokemonTintSprite.setScale(1); globalScene.tweens.add({ - targets: [ this.evolutionBg, this.pokemonTintSprite, this.pokemonEvoSprite, this.pokemonEvoTintSprite ], + targets: [this.evolutionBg, this.pokemonTintSprite, this.pokemonEvoSprite, this.pokemonEvoTintSprite], alpha: 0, duration: 250, onComplete: () => { this.evolutionBg.setVisible(false); - } + }, }); SoundFade.fadeOut(globalScene, this.evolutionBgm, 100); globalScene.unshiftPhase(new EndEvolutionPhase()); - globalScene.ui.showText(i18next.t("menu:stoppedEvolving", { pokemonName: this.preEvolvedPokemonName }), null, () => { - globalScene.ui.showText(i18next.t("menu:pauseEvolutionsQuestion", { pokemonName: this.preEvolvedPokemonName }), null, () => { - const end = () => { - globalScene.ui.showText("", 0); - globalScene.playBgm(); - evolvedPokemon.destroy(); - this.end(); - }; - globalScene.ui.setOverlayMode(Mode.CONFIRM, () => { - globalScene.ui.revertMode(); - this.pokemon.pauseEvolutions = true; - globalScene.ui.showText(i18next.t("menu:evolutionsPaused", { pokemonName: this.preEvolvedPokemonName }), null, end, 3000); - }, () => { - globalScene.ui.revertMode(); - globalScene.time.delayedCall(3000, end); - }); - }); - }, null, true); + globalScene.ui.showText( + i18next.t("menu:stoppedEvolving", { + pokemonName: this.preEvolvedPokemonName, + }), + null, + () => { + globalScene.ui.showText( + i18next.t("menu:pauseEvolutionsQuestion", { + pokemonName: this.preEvolvedPokemonName, + }), + null, + () => { + const end = () => { + globalScene.ui.showText("", 0); + globalScene.playBgm(); + evolvedPokemon.destroy(); + this.end(); + }; + globalScene.ui.setOverlayMode( + Mode.CONFIRM, + () => { + globalScene.ui.revertMode(); + this.pokemon.pauseEvolutions = true; + globalScene.ui.showText( + i18next.t("menu:evolutionsPaused", { + pokemonName: this.preEvolvedPokemonName, + }), + null, + end, + 3000, + ); + }, + () => { + globalScene.ui.revertMode(); + globalScene.time.delayedCall(3000, end); + }, + ); + }, + ); + }, + null, + true, + ); } /** @@ -270,7 +323,17 @@ export class EvolutionPhase extends Phase { globalScene.playSoundWithoutBgm("evolution_fanfare"); evolvedPokemon.destroy(); - globalScene.ui.showText(i18next.t("menu:evolutionDone", { pokemonName: this.preEvolvedPokemonName, evolvedPokemonName: this.pokemon.name }), null, () => this.end(), null, true, Utils.fixedInt(4000)); + globalScene.ui.showText( + i18next.t("menu:evolutionDone", { + pokemonName: this.preEvolvedPokemonName, + evolvedPokemonName: this.pokemon.species.getExpandedSpeciesName(), + }), + null, + () => this.end(), + null, + true, + Utils.fixedInt(4000), + ); globalScene.time.delayedCall(Utils.fixedInt(4250), () => globalScene.playBgm()); }); }); @@ -280,8 +343,14 @@ export class EvolutionPhase extends Phase { this.evolutionHandler.canCancel = false; this.pokemon.evolve(this.evolution, this.pokemon.species).then(() => { - const learnSituation: LearnMoveSituation = this.fusionSpeciesEvolved ? LearnMoveSituation.EVOLUTION_FUSED : this.pokemon.fusionSpecies ? LearnMoveSituation.EVOLUTION_FUSED_BASE : LearnMoveSituation.EVOLUTION; - const levelMoves = this.pokemon.getLevelMoves(this.lastLevel + 1, true, false, false, learnSituation).filter(lm => lm[0] === EVOLVE_MOVE); + const learnSituation: LearnMoveSituation = this.fusionSpeciesEvolved + ? LearnMoveSituation.EVOLUTION_FUSED + : this.pokemon.fusionSpecies + ? LearnMoveSituation.EVOLUTION_FUSED_BASE + : LearnMoveSituation.EVOLUTION; + const levelMoves = this.pokemon + .getLevelMoves(this.lastLevel + 1, true, false, false, learnSituation) + .filter(lm => lm[0] === EVOLVE_MOVE); for (const lm of levelMoves) { globalScene.unshiftPhase(new LearnMovePhase(globalScene.getPlayerParty().indexOf(this.pokemon), lm[1])); } @@ -298,7 +367,7 @@ export class EvolutionPhase extends Phase { this.evolutionBgOverlay.setAlpha(1); this.evolutionBg.setVisible(false); globalScene.tweens.add({ - targets: [ this.evolutionOverlay, this.pokemonEvoTintSprite ], + targets: [this.evolutionOverlay, this.pokemonEvoTintSprite], alpha: 0, duration: 2000, delay: 150, @@ -308,11 +377,11 @@ export class EvolutionPhase extends Phase { targets: this.evolutionBgOverlay, alpha: 0, duration: 250, - onComplete: onEvolutionComplete + onComplete: onEvolutionComplete, }); - } + }, }); - } + }, }); }); }); @@ -333,7 +402,7 @@ export class EvolutionPhase extends Phase { } f++; } - } + }, }); } @@ -352,11 +421,11 @@ export class EvolutionPhase extends Phase { } f++; } - } + }, }); } - doCycle(l: number, lastCycle: integer = 15): Promise { + doCycle(l: number, lastCycle = 15): Promise { return new Promise(resolve => { const isLastCycle = l === lastCycle; globalScene.tweens.add({ @@ -364,7 +433,7 @@ export class EvolutionPhase extends Phase { scale: 0.25, ease: "Cubic.easeInOut", duration: 500 / l, - yoyo: !isLastCycle + yoyo: !isLastCycle, }); globalScene.tweens.add({ targets: this.pokemonEvoTintSprite, @@ -382,7 +451,7 @@ export class EvolutionPhase extends Phase { this.pokemonTintSprite.setVisible(false); resolve(true); } - } + }, }); }); } @@ -404,7 +473,7 @@ export class EvolutionPhase extends Phase { } } f++; - } + }, }); } @@ -423,11 +492,11 @@ export class EvolutionPhase extends Phase { this.doSprayParticle(Utils.randInt(8)); } f++; - } + }, }); } - doSpiralUpwardParticle(trigIndex: integer) { + doSpiralUpwardParticle(trigIndex: number) { const initialX = this.evolutionBaseBg.displayWidth / 2; const particle = globalScene.add.image(initialX, 0, "evo_sparkle"); this.evolutionContainer.add(particle); @@ -440,7 +509,7 @@ export class EvolutionPhase extends Phase { duration: Utils.getFrameMs(1), onRepeat: () => { updateParticle(); - } + }, }); const updateParticle = () => { @@ -448,7 +517,7 @@ export class EvolutionPhase extends Phase { particle.setPosition(initialX, 88 - (f * f) / 80); particle.y += sin(trigIndex, amp) / 4; particle.x += cos(trigIndex, amp); - particle.setScale(1 - (f / 80)); + particle.setScale(1 - f / 80); trigIndex += 4; if (f & 1) { amp--; @@ -463,7 +532,7 @@ export class EvolutionPhase extends Phase { updateParticle(); } - doArcDownParticle(trigIndex: integer) { + doArcDownParticle(trigIndex: number) { const initialX = this.evolutionBaseBg.displayWidth / 2; const particle = globalScene.add.image(initialX, 0, "evo_sparkle"); particle.setScale(0.5); @@ -477,7 +546,7 @@ export class EvolutionPhase extends Phase { duration: Utils.getFrameMs(1), onRepeat: () => { updateParticle(); - } + }, }); const updateParticle = () => { @@ -496,7 +565,7 @@ export class EvolutionPhase extends Phase { updateParticle(); } - doCircleInwardParticle(trigIndex: integer, speed: integer) { + doCircleInwardParticle(trigIndex: number, speed: number) { const initialX = this.evolutionBaseBg.displayWidth / 2; const initialY = this.evolutionBaseBg.displayHeight / 2; const particle = globalScene.add.image(initialX, initialY, "evo_sparkle"); @@ -509,7 +578,7 @@ export class EvolutionPhase extends Phase { duration: Utils.getFrameMs(1), onRepeat: () => { updateParticle(); - } + }, }); const updateParticle = () => { @@ -528,7 +597,7 @@ export class EvolutionPhase extends Phase { updateParticle(); } - doSprayParticle(trigIndex: integer) { + doSprayParticle(trigIndex: number) { const initialX = this.evolutionBaseBg.displayWidth / 2; const initialY = this.evolutionBaseBg.displayHeight / 2; const particle = globalScene.add.image(initialX, initialY, "evo_sparkle"); @@ -544,7 +613,7 @@ export class EvolutionPhase extends Phase { duration: Utils.getFrameMs(1), onRepeat: () => { updateParticle(); - } + }, }); const updateParticle = () => { @@ -555,7 +624,7 @@ export class EvolutionPhase extends Phase { particle.setPosition(initialX + (speed * f) / 3, initialY + yOffset); particle.y += -sin(trigIndex, amp); if (f > 108) { - particle.setScale((1 - (f - 108) / 20)); + particle.setScale(1 - (f - 108) / 20); } trigIndex++; f++; diff --git a/src/phases/exp-phase.ts b/src/phases/exp-phase.ts index f0fe9fde719..092482d4c18 100644 --- a/src/phases/exp-phase.ts +++ b/src/phases/exp-phase.ts @@ -9,7 +9,7 @@ import { LevelUpPhase } from "./level-up-phase"; export class ExpPhase extends PlayerPartyMemberPokemonPhase { private expValue: number; - constructor(partyMemberIndex: integer, expValue: number) { + constructor(partyMemberIndex: number, expValue: number) { super(partyMemberIndex); this.expValue = expValue; @@ -22,14 +22,23 @@ export class ExpPhase extends PlayerPartyMemberPokemonPhase { const exp = new Utils.NumberHolder(this.expValue); globalScene.applyModifiers(ExpBoosterModifier, true, exp); exp.value = Math.floor(exp.value); - globalScene.ui.showText(i18next.t("battle:expGain", { pokemonName: getPokemonNameWithAffix(pokemon), exp: exp.value }), null, () => { - const lastLevel = pokemon.level; - pokemon.addExp(exp.value); - const newLevel = pokemon.level; - if (newLevel > lastLevel) { - globalScene.unshiftPhase(new LevelUpPhase(this.partyMemberIndex, lastLevel, newLevel)); - } - pokemon.updateInfo().then(() => this.end()); - }, null, true); + globalScene.ui.showText( + i18next.t("battle:expGain", { + pokemonName: getPokemonNameWithAffix(pokemon), + exp: exp.value, + }), + null, + () => { + const lastLevel = pokemon.level; + pokemon.addExp(exp.value); + const newLevel = pokemon.level; + if (newLevel > lastLevel) { + globalScene.unshiftPhase(new LevelUpPhase(this.partyMemberIndex, lastLevel, newLevel)); + } + pokemon.updateInfo().then(() => this.end()); + }, + null, + true, + ); } } diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts index 7bf3bc81930..7fc7a517853 100644 --- a/src/phases/faint-phase.ts +++ b/src/phases/faint-phase.ts @@ -1,11 +1,18 @@ import type { BattlerIndex } from "#app/battle"; import { BattleType } from "#app/battle"; import { globalScene } from "#app/global-scene"; -import { applyPostFaintAbAttrs, applyPostKnockOutAbAttrs, applyPostVictoryAbAttrs, PostFaintAbAttr, PostKnockOutAbAttr, PostVictoryAbAttr } from "#app/data/ability"; +import { + applyPostFaintAbAttrs, + applyPostKnockOutAbAttrs, + applyPostVictoryAbAttrs, + PostFaintAbAttr, + PostKnockOutAbAttr, + PostVictoryAbAttr, +} from "#app/data/ability"; import type { DestinyBondTag, GrudgeTag } from "#app/data/battler-tags"; import { BattlerTagLapseType } from "#app/data/battler-tags"; import { battleSpecDialogue } from "#app/data/dialogue"; -import { allMoves, PostVictoryStatStageChangeAttr } from "#app/data/move"; +import { allMoves, PostVictoryStatStageChangeAttr } from "#app/data/moves/move"; import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; import { BattleSpec } from "#app/enums/battle-spec"; import { StatusEffect } from "#app/enums/status-effect"; @@ -47,7 +54,13 @@ export class FaintPhase extends PokemonPhase { */ private source?: Pokemon; - constructor(battlerIndex: BattlerIndex, preventEndure: boolean = false, destinyTag?: DestinyBondTag | null, grudgeTag?: GrudgeTag | null, source?: Pokemon) { + constructor( + battlerIndex: BattlerIndex, + preventEndure = false, + destinyTag?: DestinyBondTag | null, + grudgeTag?: GrudgeTag | null, + source?: Pokemon, + ) { super(battlerIndex); this.preventEndure = preventEndure; @@ -70,7 +83,11 @@ export class FaintPhase extends PokemonPhase { } if (!this.preventEndure) { - const instantReviveModifier = globalScene.applyModifier(PokemonInstantReviveModifier, this.player, faintPokemon) as PokemonInstantReviveModifier; + const instantReviveModifier = globalScene.applyModifier( + PokemonInstantReviveModifier, + this.player, + faintPokemon, + ) as PokemonInstantReviveModifier; if (instantReviveModifier) { faintPokemon.loseHeldItem(instantReviveModifier); @@ -80,13 +97,11 @@ export class FaintPhase extends PokemonPhase { } /** In case the current pokemon was just switched in, make sure it is counted as participating in the combat */ - globalScene.getPlayerField().forEach((pokemon, i) => { - if (pokemon?.isActive(true)) { - if (pokemon.isPlayer()) { - globalScene.currentBattle.addParticipant(pokemon as PlayerPokemon); - } + for (const pokemon of globalScene.getPlayerField()) { + if (pokemon?.isActive(true) && pokemon.isPlayer()) { + globalScene.currentBattle.addParticipant(pokemon as PlayerPokemon); } - }); + } if (!this.tryOverrideForBattleSpec()) { this.doFaint(); @@ -96,30 +111,53 @@ export class FaintPhase extends PokemonPhase { doFaint(): void { const pokemon = this.getPokemon(); - - // Track total times pokemon have been KO'd for supreme overlord/last respects + // Track total times pokemon have been KO'd for Last Respects/Supreme Overlord if (pokemon.isPlayer()) { - globalScene.currentBattle.playerFaints += 1; - globalScene.currentBattle.playerFaintsHistory.push({ pokemon: pokemon, turn: globalScene.currentBattle.turn }); + globalScene.arena.playerFaints += 1; + globalScene.currentBattle.playerFaintsHistory.push({ + pokemon: pokemon, + turn: globalScene.currentBattle.turn, + }); } else { globalScene.currentBattle.enemyFaints += 1; - globalScene.currentBattle.enemyFaintsHistory.push({ pokemon: pokemon, turn: globalScene.currentBattle.turn }); + globalScene.currentBattle.enemyFaintsHistory.push({ + pokemon: pokemon, + turn: globalScene.currentBattle.turn, + }); } - globalScene.queueMessage(i18next.t("battle:fainted", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, true); + globalScene.queueMessage( + i18next.t("battle:fainted", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + null, + true, + ); globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeActiveTrigger, true); + pokemon.resetTera(); + if (pokemon.turnData?.attacksReceived?.length) { const lastAttack = pokemon.turnData.attacksReceived[0]; - applyPostFaintAbAttrs(PostFaintAbAttr, pokemon, globalScene.getPokemonById(lastAttack.sourceId)!, new PokemonMove(lastAttack.move).getMove(), lastAttack.result); // TODO: is this bang correct? - } else { //If killed by indirect damage, apply post-faint abilities without providing a last move + applyPostFaintAbAttrs( + PostFaintAbAttr, + pokemon, + globalScene.getPokemonById(lastAttack.sourceId)!, + new PokemonMove(lastAttack.move).getMove(), + lastAttack.result, + ); // TODO: is this bang correct? + } else { + //If killed by indirect damage, apply post-faint abilities without providing a last move applyPostFaintAbAttrs(PostFaintAbAttr, pokemon); } const alivePlayField = globalScene.getField(true); - alivePlayField.forEach(p => applyPostKnockOutAbAttrs(PostKnockOutAbAttr, p, pokemon)); + for (const p of alivePlayField) { + applyPostKnockOutAbAttrs(PostKnockOutAbAttr, p, pokemon); + } if (pokemon.turnData?.attacksReceived?.length) { - const defeatSource = globalScene.getPokemonById(pokemon.turnData.attacksReceived[0].sourceId); + const defeatSource = this.source; + if (defeatSource?.isOnField()) { applyPostVictoryAbAttrs(PostVictoryAbAttr, defeatSource); const pvmove = allMoves[pokemon.turnData.attacksReceived[0].move]; @@ -140,7 +178,11 @@ export class FaintPhase extends PokemonPhase { if (!legalPlayerPokemon.length) { /** If the player doesn't have any legal Pokemon, end the game */ globalScene.unshiftPhase(new GameOverPhase()); - } else if (globalScene.currentBattle.double && legalPlayerPokemon.length === 1 && legalPlayerPartyPokemon.length === 0) { + } else if ( + globalScene.currentBattle.double && + legalPlayerPokemon.length === 1 && + legalPlayerPartyPokemon.length === 0 + ) { /** * If the player has exactly one Pokemon in total at this point in a double battle, and that Pokemon * is already on the field, unshift a phase that moves that Pokemon to center position. @@ -155,8 +197,11 @@ export class FaintPhase extends PokemonPhase { } } else { globalScene.unshiftPhase(new VictoryPhase(this.battlerIndex)); - if ([ BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER ].includes(globalScene.currentBattle.battleType)) { - const hasReservePartyMember = !!globalScene.getEnemyParty().filter(p => p.isActive() && !p.isOnField() && p.trainerSlot === (pokemon as EnemyPokemon).trainerSlot).length; + if ([BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(globalScene.currentBattle.battleType)) { + const hasReservePartyMember = !!globalScene + .getEnemyParty() + .filter(p => p.isActive() && !p.isOnField() && p.trainerSlot === (pokemon as EnemyPokemon).trainerSlot) + .length; if (hasReservePartyMember) { globalScene.pushPhase(new SwitchSummonPhase(SwitchType.SWITCH, this.fieldIndex, -1, false, false)); } @@ -181,9 +226,7 @@ export class FaintPhase extends PokemonPhase { y: pokemon.y + 150, ease: "Sine.easeIn", onComplete: () => { - pokemon.resetSprite(); pokemon.lapseTags(BattlerTagLapseType.FAINT); - globalScene.getField(true).filter(p => p !== pokemon).forEach(p => p.removeTagsBySourceId(pokemon.id)); pokemon.y -= 150; pokemon.trySetStatus(StatusEffect.FAINT); @@ -193,9 +236,9 @@ export class FaintPhase extends PokemonPhase { globalScene.addFaintedEnemyScore(pokemon as EnemyPokemon); globalScene.currentBattle.addPostBattleLoot(pokemon as EnemyPokemon); } - globalScene.field.remove(pokemon); + pokemon.leaveField(); this.end(); - } + }, }); }); } @@ -206,9 +249,14 @@ export class FaintPhase extends PokemonPhase { if (!this.player) { const enemy = this.getPokemon(); if (enemy.formIndex) { - globalScene.ui.showDialogue(battleSpecDialogue[BattleSpec.FINAL_BOSS].secondStageWin, enemy.species.name, null, () => this.doFaint()); + globalScene.ui.showDialogue( + battleSpecDialogue[BattleSpec.FINAL_BOSS].secondStageWin, + enemy.species.name, + null, + () => this.doFaint(), + ); } else { - // Final boss' HP threshold has been bypassed; cancel faint and force check for 2nd phase + // Final boss' HP threshold has been bypassed; cancel faint and force check for 2nd phase enemy.hp++; globalScene.unshiftPhase(new DamageAnimPhase(enemy.getBattlerIndex(), 0, HitResult.OTHER)); this.end(); diff --git a/src/phases/field-phase.ts b/src/phases/field-phase.ts index 0836d1171c0..98c1ced510f 100644 --- a/src/phases/field-phase.ts +++ b/src/phases/field-phase.ts @@ -7,6 +7,8 @@ type PokemonFunc = (pokemon: Pokemon) => void; export abstract class FieldPhase extends BattlePhase { executeForAll(func: PokemonFunc): void { const field = globalScene.getField(true).filter(p => p.summonData); - field.forEach(pokemon => func(pokemon)); + for (const pokemon of field) { + func(pokemon); + } } } diff --git a/src/phases/form-change-phase.ts b/src/phases/form-change-phase.ts index 353fed7b76c..e0ec4e87600 100644 --- a/src/phases/form-change-phase.ts +++ b/src/phases/form-change-phase.ts @@ -38,8 +38,7 @@ export class FormChangePhase extends EvolutionPhase { const preName = getPokemonNameWithAffix(this.pokemon); this.pokemon.getPossibleForm(this.formChange).then(transformedPokemon => { - - [ this.pokemonEvoSprite, this.pokemonEvoTintSprite ].map(sprite => { + [this.pokemonEvoSprite, this.pokemonEvoTintSprite].map(sprite => { const spriteKey = transformedPokemon.getSpriteKey(true); try { sprite.play(spriteKey); @@ -51,7 +50,7 @@ export class FormChangePhase extends EvolutionPhase { sprite.setPipelineData("spriteKey", transformedPokemon.getSpriteKey()); sprite.setPipelineData("shiny", transformedPokemon.shiny); sprite.setPipelineData("variant", transformedPokemon.variant); - [ "spriteColors", "fusionSpriteColors" ].map(k => { + ["spriteColors", "fusionSpriteColors"].map(k => { if (transformedPokemon.summonData?.speciesForm) { k += "Base"; } @@ -71,7 +70,7 @@ export class FormChangePhase extends EvolutionPhase { globalScene.tweens.add({ targets: this.evolutionBgOverlay, alpha: 0, - duration: 250 + duration: 250, }); this.evolutionBg.setVisible(true); this.evolutionBg.play(); @@ -114,7 +113,7 @@ export class FormChangePhase extends EvolutionPhase { this.evolutionBgOverlay.setAlpha(1); this.evolutionBg.setVisible(false); globalScene.tweens.add({ - targets: [ this.evolutionOverlay, this.pokemonEvoTintSprite ], + targets: [this.evolutionOverlay, this.pokemonEvoTintSprite], alpha: 0, duration: 2000, delay: 150, @@ -132,33 +131,47 @@ export class FormChangePhase extends EvolutionPhase { if (this.formChange.formKey.indexOf(SpeciesFormKey.MEGA) > -1) { globalScene.validateAchv(achvs.MEGA_EVOLVE); playEvolutionFanfare = true; - } else if (this.formChange.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) > -1 || this.formChange.formKey.indexOf(SpeciesFormKey.ETERNAMAX) > -1) { + } else if ( + this.formChange.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) > -1 || + this.formChange.formKey.indexOf(SpeciesFormKey.ETERNAMAX) > -1 + ) { globalScene.validateAchv(achvs.GIGANTAMAX); playEvolutionFanfare = true; } const delay = playEvolutionFanfare ? 4000 : 1750; - globalScene.playSoundWithoutBgm(playEvolutionFanfare ? "evolution_fanfare" : "minor_fanfare"); + globalScene.playSoundWithoutBgm( + playEvolutionFanfare ? "evolution_fanfare" : "minor_fanfare", + ); transformedPokemon.destroy(); - globalScene.ui.showText(getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), null, () => this.end(), null, true, Utils.fixedInt(delay)); - globalScene.time.delayedCall(Utils.fixedInt(delay + 250), () => globalScene.playBgm()); + globalScene.ui.showText( + getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), + null, + () => this.end(), + null, + true, + Utils.fixedInt(delay), + ); + globalScene.time.delayedCall(Utils.fixedInt(delay + 250), () => + globalScene.playBgm(), + ); }); }); - } + }, }); - } + }, }); - } + }, }); }); }); }); }); }); - } + }, }); - } + }, }); }); }); diff --git a/src/phases/game-over-modifier-reward-phase.ts b/src/phases/game-over-modifier-reward-phase.ts index c98bb5fff04..f3f2aebd67d 100644 --- a/src/phases/game-over-modifier-reward-phase.ts +++ b/src/phases/game-over-modifier-reward-phase.ts @@ -5,23 +5,27 @@ import i18next from "i18next"; import { ModifierRewardPhase } from "./modifier-reward-phase"; export class GameOverModifierRewardPhase extends ModifierRewardPhase { - constructor(modifierTypeFunc: ModifierTypeFunc) { - super(modifierTypeFunc); - } - doReward(): Promise { return new Promise(resolve => { const newModifier = this.modifierType.newModifier(); - globalScene.addModifier(newModifier).then(() => { - // Sound loaded into game as is - globalScene.playSound("level_up_fanfare"); - globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.fadeIn(250).then(() => { - globalScene.ui.showText(i18next.t("battle:rewardGain", { modifierName: newModifier?.type.name }), null, () => { + globalScene.addModifier(newModifier); + // Sound loaded into game as is + globalScene.playSound("level_up_fanfare"); + globalScene.ui.setMode(Mode.MESSAGE); + globalScene.ui.fadeIn(250).then(() => { + globalScene.ui.showText( + i18next.t("battle:rewardGain", { + modifierName: newModifier?.type.name, + }), + null, + () => { globalScene.time.delayedCall(1500, () => globalScene.arenaBg.setVisible(true)); resolve(); - }, null, true, 1500); - }); + }, + null, + true, + 1500, + ); }); }); } diff --git a/src/phases/game-over-phase.ts b/src/phases/game-over-phase.ts index 5e4e8e1cdf7..af948ad0632 100644 --- a/src/phases/game-over-phase.ts +++ b/src/phases/game-over-phase.ts @@ -36,7 +36,7 @@ export class GameOverPhase extends BattlePhase { private isVictory: boolean; private firstRibbons: PokemonSpecies[] = []; - constructor(isVictory: boolean = false) { + constructor(isVictory = false) { super(); this.isVictory = isVictory; @@ -52,7 +52,11 @@ export class GameOverPhase extends BattlePhase { // Handle Mystery Encounter special Game Over cases // Situations such as when player lost a battle, but it isn't treated as full Game Over - if (!this.isVictory && globalScene.currentBattle.mysteryEncounter?.onGameOver && !globalScene.currentBattle.mysteryEncounter.onGameOver()) { + if ( + !this.isVictory && + globalScene.currentBattle.mysteryEncounter?.onGameOver && + !globalScene.currentBattle.mysteryEncounter.onGameOver() + ) { // Do not end the game return this.end(); } @@ -61,36 +65,52 @@ export class GameOverPhase extends BattlePhase { if (this.isVictory && globalScene.gameMode.isEndless) { const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET; const genderStr = PlayerGender[genderIndex].toLowerCase(); - globalScene.ui.showDialogue(i18next.t("miscDialogue:ending_endless", { context: genderStr }), i18next.t("miscDialogue:ending_name"), 0, () => this.handleGameOver()); + globalScene.ui.showDialogue( + i18next.t("miscDialogue:ending_endless", { context: genderStr }), + i18next.t("miscDialogue:ending_name"), + 0, + () => this.handleGameOver(), + ); } else if (this.isVictory || !globalScene.enableRetries) { this.handleGameOver(); } else { globalScene.ui.showText(i18next.t("battle:retryBattle"), null, () => { - globalScene.ui.setMode(Mode.CONFIRM, () => { - globalScene.ui.fadeOut(1250).then(() => { - globalScene.reset(); - globalScene.clearPhaseQueue(); - globalScene.gameData.loadSession(globalScene.sessionSlotId).then(() => { - globalScene.pushPhase(new EncounterPhase(true)); + globalScene.ui.setMode( + Mode.CONFIRM, + () => { + globalScene.ui.fadeOut(1250).then(() => { + globalScene.reset(); + globalScene.clearPhaseQueue(); + globalScene.gameData.loadSession(globalScene.sessionSlotId).then(() => { + globalScene.pushPhase(new EncounterPhase(true)); - const availablePartyMembers = globalScene.getPokemonAllowedInBattle().length; + const availablePartyMembers = globalScene.getPokemonAllowedInBattle().length; - globalScene.pushPhase(new SummonPhase(0)); - if (globalScene.currentBattle.double && availablePartyMembers > 1) { - globalScene.pushPhase(new SummonPhase(1)); - } - if (globalScene.currentBattle.waveIndex > 1 && globalScene.currentBattle.battleType !== BattleType.TRAINER) { - globalScene.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double)); + globalScene.pushPhase(new SummonPhase(0)); if (globalScene.currentBattle.double && availablePartyMembers > 1) { - globalScene.pushPhase(new CheckSwitchPhase(1, globalScene.currentBattle.double)); + globalScene.pushPhase(new SummonPhase(1)); + } + if ( + globalScene.currentBattle.waveIndex > 1 && + globalScene.currentBattle.battleType !== BattleType.TRAINER + ) { + globalScene.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double)); + if (globalScene.currentBattle.double && availablePartyMembers > 1) { + globalScene.pushPhase(new CheckSwitchPhase(1, globalScene.currentBattle.double)); + } } - } - globalScene.ui.fadeIn(1250); - this.end(); + globalScene.ui.fadeIn(1250); + this.end(); + }); }); - }); - }, () => this.handleGameOver(), false, 0, 0, 1000); + }, + () => this.handleGameOver(), + false, + 0, + 0, + 1000, + ); }); } } @@ -158,17 +178,29 @@ export class GameOverPhase extends BattlePhase { const genderStr = PlayerGender[genderIndex].toLowerCase(); // Dialogue has to be retrieved so that the rival's expressions can be loaded and shown via getCharVariantFromDialogue const dialogue = i18next.t(dialogueKey, { context: genderStr }); - globalScene.charSprite.showCharacter(`rival_${globalScene.gameData.gender === PlayerGender.FEMALE ? "m" : "f"}`, getCharVariantFromDialogue(dialogue)).then(() => { - globalScene.ui.showDialogue(dialogueKey, globalScene.gameData.gender === PlayerGender.FEMALE ? trainerConfigs[TrainerType.RIVAL].name : trainerConfigs[TrainerType.RIVAL].nameFemale, null, () => { - globalScene.ui.fadeOut(500).then(() => { - globalScene.charSprite.hide().then(() => { - const endCardPhase = new EndCardPhase(); - globalScene.unshiftPhase(endCardPhase); - clear(endCardPhase); - }); - }); + globalScene.charSprite + .showCharacter( + `rival_${globalScene.gameData.gender === PlayerGender.FEMALE ? "m" : "f"}`, + getCharVariantFromDialogue(dialogue), + ) + .then(() => { + globalScene.ui.showDialogue( + dialogueKey, + globalScene.gameData.gender === PlayerGender.FEMALE + ? trainerConfigs[TrainerType.RIVAL].name + : trainerConfigs[TrainerType.RIVAL].nameFemale, + null, + () => { + globalScene.ui.fadeOut(500).then(() => { + globalScene.charSprite.hide().then(() => { + const endCardPhase = new EndCardPhase(); + globalScene.unshiftPhase(endCardPhase); + clear(endCardPhase); + }); + }); + }, + ); }); - }); }); } else { const endCardPhase = new EndCardPhase(); @@ -186,8 +218,13 @@ export class GameOverPhase extends BattlePhase { If Online, execute apiFetch as intended If Offline, execute offlineNewClear() only for victory, a localStorage implementation of newClear daily run checks */ if (!Utils.isLocal || Utils.isLocalServerConnected) { - pokerogueApi.savedata.session.newclear({ slot: globalScene.sessionSlotId, isVictory: this.isVictory, clientSessionId: clientSessionId }) - .then((success) => doGameOver(!!success)); + pokerogueApi.savedata.session + .newclear({ + slot: globalScene.sessionSlotId, + isVictory: this.isVictory, + clientSessionId: clientSessionId, + }) + .then(success => doGameOver(!!success)); } else if (this.isVictory) { globalScene.gameData.offlineNewClear().then(result => { doGameOver(result); @@ -202,19 +239,25 @@ export class GameOverPhase extends BattlePhase { if (!globalScene.gameData.unlocks[Unlockables.ENDLESS_MODE]) { globalScene.unshiftPhase(new UnlockPhase(Unlockables.ENDLESS_MODE)); } - if (globalScene.getPlayerParty().filter(p => p.fusionSpecies).length && !globalScene.gameData.unlocks[Unlockables.SPLICED_ENDLESS_MODE]) { + if ( + globalScene.getPlayerParty().filter(p => p.fusionSpecies).length && + !globalScene.gameData.unlocks[Unlockables.SPLICED_ENDLESS_MODE] + ) { globalScene.unshiftPhase(new UnlockPhase(Unlockables.SPLICED_ENDLESS_MODE)); } if (!globalScene.gameData.unlocks[Unlockables.MINI_BLACK_HOLE]) { globalScene.unshiftPhase(new UnlockPhase(Unlockables.MINI_BLACK_HOLE)); } - if (!globalScene.gameData.unlocks[Unlockables.EVIOLITE] && globalScene.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)) { + if ( + !globalScene.gameData.unlocks[Unlockables.EVIOLITE] && + globalScene.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions) + ) { globalScene.unshiftPhase(new UnlockPhase(Unlockables.EVIOLITE)); } } } - awardRibbon(pokemon: Pokemon, forStarter: boolean = false): void { + awardRibbon(pokemon: Pokemon, forStarter = false): void { const speciesId = getPokemonSpecies(pokemon.species.speciesId); const speciesRibbonCount = globalScene.gameData.incrementRibbonCount(speciesId, forStarter); // first time classic win, award voucher @@ -236,8 +279,12 @@ export class GameOverPhase extends BattlePhase { gameMode: globalScene.gameMode.modeId, party: globalScene.getPlayerParty().map(p => new PokemonData(p)), enemyParty: globalScene.getEnemyParty().map(p => new PokemonData(p)), - modifiers: preWaveSessionData ? preWaveSessionData.modifiers : globalScene.findModifiers(() => true).map(m => new PersistentModifierData(m, true)), - enemyModifiers: preWaveSessionData ? preWaveSessionData.enemyModifiers : globalScene.findModifiers(() => true, false).map(m => new PersistentModifierData(m, false)), + modifiers: preWaveSessionData + ? preWaveSessionData.modifiers + : globalScene.findModifiers(() => true).map(m => new PersistentModifierData(m, true)), + enemyModifiers: preWaveSessionData + ? preWaveSessionData.enemyModifiers + : globalScene.findModifiers(() => true, false).map(m => new PersistentModifierData(m, false)), arena: new ArenaData(globalScene.arena), pokeballCounts: globalScene.pokeballCounts, money: Math.floor(globalScene.money), @@ -249,8 +296,8 @@ export class GameOverPhase extends BattlePhase { timestamp: new Date().getTime(), challenges: globalScene.gameMode.challenges.map(c => new ChallengeData(c)), mysteryEncounterType: globalScene.currentBattle.mysteryEncounter?.encounterType ?? -1, - mysteryEncounterSaveData: globalScene.mysteryEncounterSaveData + mysteryEncounterSaveData: globalScene.mysteryEncounterSaveData, + playerFaints: globalScene.arena.playerFaints, } as SessionSaveData; } } - diff --git a/src/phases/hide-ability-phase.ts b/src/phases/hide-ability-phase.ts new file mode 100644 index 00000000000..0745b3f832a --- /dev/null +++ b/src/phases/hide-ability-phase.ts @@ -0,0 +1,27 @@ +import { globalScene } from "#app/global-scene"; +import type { BattlerIndex } from "#app/battle"; +import { PokemonPhase } from "./pokemon-phase"; + +export class HideAbilityPhase extends PokemonPhase { + private passive: boolean; + + constructor(battlerIndex: BattlerIndex, passive = false) { + super(battlerIndex); + + this.passive = passive; + } + + start() { + super.start(); + + const pokemon = this.getPokemon(); + + if (pokemon) { + globalScene.abilityBar.hide().then(() => { + this.end(); + }); + } else { + this.end(); + } + } +} diff --git a/src/phases/hide-party-exp-bar-phase.ts b/src/phases/hide-party-exp-bar-phase.ts index 0dce41044c0..52cfd1f71d6 100644 --- a/src/phases/hide-party-exp-bar-phase.ts +++ b/src/phases/hide-party-exp-bar-phase.ts @@ -2,10 +2,6 @@ import { globalScene } from "#app/global-scene"; import { BattlePhase } from "./battle-phase"; export class HidePartyExpBarPhase extends BattlePhase { - constructor() { - super(); - } - start() { super.start(); diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts index a11b797c574..7bed71b3363 100644 --- a/src/phases/learn-move-phase.ts +++ b/src/phases/learn-move-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; -import type Move from "#app/data/move"; -import { allMoves } from "#app/data/move"; +import type Move from "#app/data/moves/move"; +import { allMoves } from "#app/data/moves/move"; import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms"; import { Moves } from "#enums/moves"; import { getPokemonNameWithAffix } from "#app/messages"; @@ -20,7 +20,7 @@ export enum LearnMoveType { /** For learning a move via Memory Mushroom */ MEMORY, /** For learning a move via TM */ - TM + TM, } export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { @@ -29,7 +29,12 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { private learnMoveType: LearnMoveType; private cost: number; - constructor(partyMemberIndex: integer, moveId: Moves, learnMoveType: LearnMoveType = LearnMoveType.LEARN_MOVE, cost: number = -1) { + constructor( + partyMemberIndex: number, + moveId: Moves, + learnMoveType: LearnMoveType = LearnMoveType.LEARN_MOVE, + cost = -1, + ) { super(partyMemberIndex); this.moveId = moveId; this.learnMoveType = learnMoveType; @@ -49,7 +54,8 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { return this.end(); } - this.messageMode = globalScene.ui.getHandler() instanceof EvolutionSceneHandler ? Mode.EVOLUTION_SCENE : Mode.MESSAGE; + this.messageMode = + globalScene.ui.getHandler() instanceof EvolutionSceneHandler ? Mode.EVOLUTION_SCENE : Mode.MESSAGE; globalScene.ui.setMode(this.messageMode); // If the Pokemon has less than 4 moves, the new move is added to the largest empty moveset index // If it has 4 moves, the phase then checks if the player wants to replace the move itself. @@ -70,18 +76,27 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { * @param Pokemon The Pokemon learning the move */ async replaceMoveCheck(move: Move, pokemon: Pokemon) { - const learnMovePrompt = i18next.t("battle:learnMovePrompt", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }); - const moveLimitReached = i18next.t("battle:learnMoveLimitReached", { pokemonName: getPokemonNameWithAffix(pokemon) }); - const shouldReplaceQ = i18next.t("battle:learnMoveReplaceQuestion", { moveName: move.name }); - const preQText = [ learnMovePrompt, moveLimitReached ].join("$"); + const learnMovePrompt = i18next.t("battle:learnMovePrompt", { + pokemonName: getPokemonNameWithAffix(pokemon), + moveName: move.name, + }); + const moveLimitReached = i18next.t("battle:learnMoveLimitReached", { + pokemonName: getPokemonNameWithAffix(pokemon), + }); + const shouldReplaceQ = i18next.t("battle:learnMoveReplaceQuestion", { + moveName: move.name, + }); + const preQText = [learnMovePrompt, moveLimitReached].join("$"); await globalScene.ui.showTextPromise(preQText); await globalScene.ui.showTextPromise(shouldReplaceQ, undefined, false); - await globalScene.ui.setModeWithoutClear(Mode.CONFIRM, + await globalScene.ui.setModeWithoutClear( + Mode.CONFIRM, () => this.forgetMoveProcess(move, pokemon), // Yes - () => { // No + () => { + // No globalScene.ui.setMode(this.messageMode); this.rejectMoveAndEnd(move, pokemon); - } + }, ); } @@ -99,15 +114,26 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { async forgetMoveProcess(move: Move, pokemon: Pokemon) { globalScene.ui.setMode(this.messageMode); await globalScene.ui.showTextPromise(i18next.t("battle:learnMoveForgetQuestion"), undefined, true); - await globalScene.ui.setModeWithoutClear(Mode.SUMMARY, pokemon, SummaryUiMode.LEARN_MOVE, move, (moveIndex: integer) => { - if (moveIndex === 4) { - globalScene.ui.setMode(this.messageMode).then(() => this.rejectMoveAndEnd(move, pokemon)); - return; - } - const forgetSuccessText = i18next.t("battle:learnMoveForgetSuccess", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: pokemon.moveset[moveIndex]!.getName() }); - const fullText = [ i18next.t("battle:countdownPoof"), forgetSuccessText, i18next.t("battle:learnMoveAnd") ].join("$"); - globalScene.ui.setMode(this.messageMode).then(() => this.learnMove(moveIndex, move, pokemon, fullText)); - }); + await globalScene.ui.setModeWithoutClear( + Mode.SUMMARY, + pokemon, + SummaryUiMode.LEARN_MOVE, + move, + (moveIndex: number) => { + if (moveIndex === 4) { + globalScene.ui.setMode(this.messageMode).then(() => this.rejectMoveAndEnd(move, pokemon)); + return; + } + const forgetSuccessText = i18next.t("battle:learnMoveForgetSuccess", { + pokemonName: getPokemonNameWithAffix(pokemon), + moveName: pokemon.moveset[moveIndex]!.getName(), + }); + const fullText = [i18next.t("battle:countdownPoof"), forgetSuccessText, i18next.t("battle:learnMoveAnd")].join( + "$", + ); + globalScene.ui.setMode(this.messageMode).then(() => this.learnMove(moveIndex, move, pokemon, fullText)); + }, + ); } /** @@ -121,16 +147,30 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { * @param Pokemon The Pokemon learning the move */ async rejectMoveAndEnd(move: Move, pokemon: Pokemon) { - await globalScene.ui.showTextPromise(i18next.t("battle:learnMoveStopTeaching", { moveName: move.name }), undefined, false); - globalScene.ui.setModeWithoutClear(Mode.CONFIRM, + await globalScene.ui.showTextPromise( + i18next.t("battle:learnMoveStopTeaching", { moveName: move.name }), + undefined, + false, + ); + globalScene.ui.setModeWithoutClear( + Mode.CONFIRM, () => { globalScene.ui.setMode(this.messageMode); - globalScene.ui.showTextPromise(i18next.t("battle:learnMoveNotLearned", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }), undefined, true).then(() => this.end()); + globalScene.ui + .showTextPromise( + i18next.t("battle:learnMoveNotLearned", { + pokemonName: getPokemonNameWithAffix(pokemon), + moveName: move.name, + }), + undefined, + true, + ) + .then(() => this.end()); }, () => { globalScene.ui.setMode(this.messageMode); this.replaceMoveCheck(move, pokemon); - } + }, ); } @@ -155,7 +195,7 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { pokemon.usedTMs = []; } pokemon.usedTMs.push(this.moveId); - globalScene.tryRemovePhase((phase) => phase instanceof SelectModifierPhase); + globalScene.tryRemovePhase(phase => phase instanceof SelectModifierPhase); } else if (this.learnMoveType === LearnMoveType.MEMORY) { if (this.cost !== -1) { if (!Overrides.WAIVE_ROLL_FEE_OVERRIDE) { @@ -165,22 +205,31 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { } globalScene.playSound("se/buy"); } else { - globalScene.tryRemovePhase((phase) => phase instanceof SelectModifierPhase); + globalScene.tryRemovePhase(phase => phase instanceof SelectModifierPhase); } } pokemon.setMove(index, this.moveId); initMoveAnim(this.moveId).then(() => { - loadMoveAnimAssets([ this.moveId ], true); + loadMoveAnimAssets([this.moveId], true); }); globalScene.ui.setMode(this.messageMode); - const learnMoveText = i18next.t("battle:learnMove", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }); + const learnMoveText = i18next.t("battle:learnMove", { + pokemonName: getPokemonNameWithAffix(pokemon), + moveName: move.name, + }); if (textMessage) { await globalScene.ui.showTextPromise(textMessage); } globalScene.playSound("level_up_fanfare"); // Sound loaded into game as is - globalScene.ui.showText(learnMoveText, null, () => { - globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeMoveLearnedTrigger, true); - this.end(); - }, this.messageMode === Mode.EVOLUTION_SCENE ? 1000 : undefined, true); + globalScene.ui.showText( + learnMoveText, + null, + () => { + globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeMoveLearnedTrigger, true); + this.end(); + }, + this.messageMode === Mode.EVOLUTION_SCENE ? 1000 : undefined, + true, + ); } } diff --git a/src/phases/level-cap-phase.ts b/src/phases/level-cap-phase.ts index d75bc3be6d4..567ac922124 100644 --- a/src/phases/level-cap-phase.ts +++ b/src/phases/level-cap-phase.ts @@ -4,17 +4,21 @@ import i18next from "i18next"; import { FieldPhase } from "./field-phase"; export class LevelCapPhase extends FieldPhase { - constructor() { - super(); - } - start(): void { super.start(); globalScene.ui.setMode(Mode.MESSAGE).then(() => { // Sound loaded into game as is globalScene.playSound("level_up_fanfare"); - globalScene.ui.showText(i18next.t("battle:levelCapUp", { levelCap: globalScene.getMaxExpLevel() }), null, () => this.end(), null, true); + globalScene.ui.showText( + i18next.t("battle:levelCapUp", { + levelCap: globalScene.getMaxExpLevel(), + }), + null, + () => this.end(), + null, + true, + ); this.executeForAll(pokemon => pokemon.updateInfo(true)); }); } diff --git a/src/phases/level-up-phase.ts b/src/phases/level-up-phase.ts index 450ecca0c70..31c7fabf451 100644 --- a/src/phases/level-up-phase.ts +++ b/src/phases/level-up-phase.ts @@ -36,20 +36,33 @@ export class LevelUpPhase extends PlayerPartyMemberPokemonPhase { if (globalScene.expParty === ExpNotification.DEFAULT) { globalScene.playSound("level_up_fanfare"); globalScene.ui.showText( - i18next.t("battle:levelUp", { pokemonName: getPokemonNameWithAffix(this.pokemon), level: this.level }), + i18next.t("battle:levelUp", { + pokemonName: getPokemonNameWithAffix(this.pokemon), + level: this.level, + }), null, - () => globalScene.ui.getMessageHandler().promptLevelUpStats(this.partyMemberIndex, prevStats, false) - .then(() => this.end()), null, true); + () => + globalScene.ui + .getMessageHandler() + .promptLevelUpStats(this.partyMemberIndex, prevStats, false) + .then(() => this.end()), + null, + true, + ); } else if (globalScene.expParty === ExpNotification.SKIP) { this.end(); } else { // we still want to display the stats if activated - globalScene.ui.getMessageHandler().promptLevelUpStats(this.partyMemberIndex, prevStats, false).then(() => this.end()); + globalScene.ui + .getMessageHandler() + .promptLevelUpStats(this.partyMemberIndex, prevStats, false) + .then(() => this.end()); } } public override end() { - if (this.lastLevel < 100) { // this feels like an unnecessary optimization + if (this.lastLevel < 100) { + // this feels like an unnecessary optimization const levelMoves = this.getPokemon().getLevelMoves(this.lastLevel + 1); for (const lm of levelMoves) { globalScene.unshiftPhase(new LearnMovePhase(this.partyMemberIndex, lm[1])); diff --git a/src/phases/load-move-anim-phase.ts b/src/phases/load-move-anim-phase.ts new file mode 100644 index 00000000000..3d914f738a7 --- /dev/null +++ b/src/phases/load-move-anim-phase.ts @@ -0,0 +1,20 @@ +import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; +import type { Moves } from "#enums/moves"; +import { Phase } from "#app/phase"; + +/** + * Phase for synchronous move animation loading. + * Should be used when a move invokes another move that + * isn't already loaded (e.g. for Metronome) + */ +export class LoadMoveAnimPhase extends Phase { + constructor(protected moveId: Moves) { + super(); + } + + public override start(): void { + initMoveAnim(this.moveId) + .then(() => loadMoveAnimAssets([this.moveId], true)) + .then(() => this.end()); + } +} diff --git a/src/phases/login-phase.ts b/src/phases/login-phase.ts index 0ed8b6feb88..5cce6ca0298 100644 --- a/src/phases/login-phase.ts +++ b/src/phases/login-phase.ts @@ -23,7 +23,7 @@ export class LoginPhase extends Phase { const hasSession = !!Utils.getCookie(Utils.sessionIdKey); - globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); + globalScene.ui.setMode(Mode.LOADING, { buttonActions: [] }); Utils.executeIf(bypassLogin || hasSession, updateUserInfo).then(response => { const success = response ? response[0] : false; const statusCode = response ? response[1] : null; @@ -51,7 +51,8 @@ export class LoginPhase extends Phase { () => { globalScene.ui.playSelect(); loadData(); - }, () => { + }, + () => { globalScene.playSound("menu_open"); globalScene.ui.setMode(Mode.REGISTRATION_FORM, { buttonActions: [ @@ -64,25 +65,28 @@ export class LoginPhase extends Phase { return; } this.end(); - } ); - }, () => { + }); + }, + () => { globalScene.unshiftPhase(new LoginPhase(false)); this.end(); - } - ] + }, + ], }); - }, () => { + }, + () => { const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/discord/callback`); const discordId = import.meta.env.VITE_DISCORD_CLIENT_ID; const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&prompt=none`; window.open(discordUrl, "_self"); - }, () => { + }, + () => { const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/google/callback`); const googleId = import.meta.env.VITE_GOOGLE_CLIENT_ID; const googleUrl = `https://accounts.google.com/o/oauth2/auth?client_id=${googleId}&redirect_uri=${redirectUri}&response_type=code&scope=openid`; window.open(googleUrl, "_self"); - } - ] + }, + ], }); } else if (statusCode === 401) { Utils.removeCookie(Utils.sessionIdKey); @@ -92,16 +96,15 @@ export class LoginPhase extends Phase { super.end(); } return null; - } else { - globalScene.gameData.loadSystem().then(success => { - if (success || bypassLogin) { - this.end(); - } else { - globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.showText(t("menu:failedToLoadSaveData")); - } - }); } + globalScene.gameData.loadSystem().then(success => { + if (success || bypassLogin) { + this.end(); + } else { + globalScene.ui.setMode(Mode.MESSAGE); + globalScene.ui.showText(t("menu:failedToLoadSaveData")); + } + }); }); } diff --git a/src/phases/message-phase.ts b/src/phases/message-phase.ts index 9439d8286c3..f671307d86a 100644 --- a/src/phases/message-phase.ts +++ b/src/phases/message-phase.ts @@ -3,12 +3,18 @@ import { Phase } from "#app/phase"; export class MessagePhase extends Phase { private text: string; - private callbackDelay: integer | null; + private callbackDelay: number | null; private prompt: boolean | null; - private promptDelay: integer | null; + private promptDelay: number | null; private speaker?: string; - constructor(text: string, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null, speaker?: string) { + constructor( + text: string, + callbackDelay?: number | null, + prompt?: boolean | null, + promptDelay?: number | null, + speaker?: string, + ) { super(); this.text = text; @@ -23,22 +29,36 @@ export class MessagePhase extends Phase { if (this.text.indexOf("$") > -1) { const pageIndex = this.text.indexOf("$"); - globalScene.unshiftPhase(new MessagePhase(this.text.slice(pageIndex + 1), this.callbackDelay, this.prompt, this.promptDelay, this.speaker)); + globalScene.unshiftPhase( + new MessagePhase( + this.text.slice(pageIndex + 1), + this.callbackDelay, + this.prompt, + this.promptDelay, + this.speaker, + ), + ); this.text = this.text.slice(0, pageIndex).trim(); } if (this.speaker) { - globalScene.ui.showDialogue(this.text, this.speaker, null, () => this.end(), this.callbackDelay || (this.prompt ? 0 : 1500), this.promptDelay ?? 0); + globalScene.ui.showDialogue( + this.text, + this.speaker, + null, + () => this.end(), + this.callbackDelay || (this.prompt ? 0 : 1500), + this.promptDelay ?? 0, + ); } else { - globalScene.ui.showText(this.text, null, () => this.end(), this.callbackDelay || (this.prompt ? 0 : 1500), this.prompt, this.promptDelay); + globalScene.ui.showText( + this.text, + null, + () => this.end(), + this.callbackDelay || (this.prompt ? 0 : 1500), + this.prompt, + this.promptDelay, + ); } } - - end() { - if (globalScene.abilityBar.shown) { - globalScene.abilityBar.hide(); - } - - super.end(); - } } diff --git a/src/phases/modifier-reward-phase.ts b/src/phases/modifier-reward-phase.ts index 1cdfd6b2721..c94c4deb819 100644 --- a/src/phases/modifier-reward-phase.ts +++ b/src/phases/modifier-reward-phase.ts @@ -22,10 +22,17 @@ export class ModifierRewardPhase extends BattlePhase { doReward(): Promise { return new Promise(resolve => { const newModifier = this.modifierType.newModifier(); - globalScene.addModifier(newModifier).then(() => { - globalScene.playSound("item_fanfare"); - globalScene.ui.showText(i18next.t("battle:rewardGain", { modifierName: newModifier?.type.name }), null, () => resolve(), null, true); - }); + globalScene.addModifier(newModifier); + globalScene.playSound("item_fanfare"); + globalScene.ui.showText( + i18next.t("battle:rewardGain", { + modifierName: newModifier?.type.name, + }), + null, + () => resolve(), + null, + true, + ); }); } } diff --git a/src/phases/money-reward-phase.ts b/src/phases/money-reward-phase.ts index 70f0019227c..56f46d25f77 100644 --- a/src/phases/money-reward-phase.ts +++ b/src/phases/money-reward-phase.ts @@ -15,7 +15,7 @@ export class MoneyRewardPhase extends BattlePhase { } start() { - const moneyAmount = new Utils.IntegerHolder(globalScene.getWaveMoneyAmount(this.moneyMultiplier)); + const moneyAmount = new Utils.NumberHolder(globalScene.getWaveMoneyAmount(this.moneyMultiplier)); globalScene.applyModifiers(MoneyMultiplierModifier, true, moneyAmount); @@ -27,7 +27,9 @@ export class MoneyRewardPhase extends BattlePhase { const userLocale = navigator.language || "en-US"; const formattedMoneyAmount = moneyAmount.value.toLocaleString(userLocale); - const message = i18next.t("battle:moneyWon", { moneyAmount: formattedMoneyAmount }); + const message = i18next.t("battle:moneyWon", { + moneyAmount: formattedMoneyAmount, + }); globalScene.ui.showText(message, null, () => this.end(), null, true); } diff --git a/src/phases/move-anim-phase.ts b/src/phases/move-anim-phase.ts new file mode 100644 index 00000000000..830e72cb8be --- /dev/null +++ b/src/phases/move-anim-phase.ts @@ -0,0 +1,20 @@ +import type { MoveAnim } from "#app/data/battle-anims"; +import { Phase } from "#app/phase"; + +/** + * Plays the given {@linkcode MoveAnim} sequentially. + */ +export class MoveAnimPhase extends Phase { + constructor( + protected anim: Anim, + protected onSubstitute = false, + ) { + super(); + } + + public override start(): void { + super.start(); + + this.anim.play(this.onSubstitute, () => this.end()); + } +} diff --git a/src/phases/move-anim-test-phase.ts b/src/phases/move-anim-test-phase.ts index 588fc402357..e8b7c0c8fa7 100644 --- a/src/phases/move-anim-test-phase.ts +++ b/src/phases/move-anim-test-phase.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; import { initMoveAnim, loadMoveAnimAssets, MoveAnim } from "#app/data/battle-anims"; -import { allMoves, SelfStatusMove } from "#app/data/move"; +import { allMoves, SelfStatusMove } from "#app/data/moves/move"; import { Moves } from "#app/enums/moves"; import * as Utils from "#app/utils"; import { BattlePhase } from "./battle-phase"; @@ -24,23 +24,27 @@ export class MoveAnimTestPhase extends BattlePhase { if (moveId === undefined) { this.playMoveAnim(this.moveQueue.slice(0), true); return; - } else if (player) { + } + if (player) { console.log(Moves[moveId]); } initMoveAnim(moveId).then(() => { - loadMoveAnimAssets([ moveId ], true) - .then(() => { - const user = player ? globalScene.getPlayerPokemon()! : globalScene.getEnemyPokemon()!; - const target = (player !== (allMoves[moveId] instanceof SelfStatusMove)) ? globalScene.getEnemyPokemon()! : globalScene.getPlayerPokemon()!; - new MoveAnim(moveId, user, target.getBattlerIndex()).play(allMoves[moveId].hitsSubstitute(user, target), () => { // TODO: are the bangs correct here? - if (player) { - this.playMoveAnim(moveQueue, false); - } else { - this.playMoveAnim(moveQueue, true); - } - }); + loadMoveAnimAssets([moveId], true).then(() => { + const user = player ? globalScene.getPlayerPokemon()! : globalScene.getEnemyPokemon()!; + const target = + player !== allMoves[moveId] instanceof SelfStatusMove + ? globalScene.getEnemyPokemon()! + : globalScene.getPlayerPokemon()!; + new MoveAnim(moveId, user, target.getBattlerIndex()).play(allMoves[moveId].hitsSubstitute(user, target), () => { + // TODO: are the bangs correct here? + if (player) { + this.playMoveAnim(moveQueue, false); + } else { + this.playMoveAnim(moveQueue, true); + } }); + }); }); } } diff --git a/src/phases/move-charge-phase.ts b/src/phases/move-charge-phase.ts index b0925f1f6cb..26ad85bbe03 100644 --- a/src/phases/move-charge-phase.ts +++ b/src/phases/move-charge-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import type { BattlerIndex } from "#app/battle"; import { MoveChargeAnim } from "#app/data/battle-anims"; -import { applyMoveChargeAttrs, MoveEffectAttr, InstantChargeAttr } from "#app/data/move"; +import { applyMoveChargeAttrs, MoveEffectAttr, InstantChargeAttr } from "#app/data/moves/move"; import type { PokemonMove } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { MoveResult } from "#app/field/pokemon"; @@ -36,7 +36,7 @@ export class MoveChargePhase extends PokemonPhase { // If the target is somehow not defined, or the move is somehow not a ChargingMove, // immediately end this phase. - if (!target || !(move.isChargingMove())) { + if (!target || !move.isChargingMove()) { console.warn("Invalid parameters for MoveChargePhase"); return super.end(); } @@ -44,10 +44,9 @@ export class MoveChargePhase extends PokemonPhase { new MoveChargeAnim(move.chargeAnim, move.id, user).play(false, () => { move.showChargeText(user, target); - applyMoveChargeAttrs(MoveEffectAttr, user, target, move).then(() => { - user.addTag(BattlerTagType.CHARGING, 1, move.id, user.id); - this.end(); - }); + applyMoveChargeAttrs(MoveEffectAttr, user, target, move); + user.addTag(BattlerTagType.CHARGING, 1, move.id, user.id); + this.end(); }); } @@ -63,15 +62,19 @@ export class MoveChargePhase extends PokemonPhase { if (instantCharge.value) { // this MoveEndPhase will be duplicated by the queued MovePhase if not removed - globalScene.tryRemovePhase((phase) => phase instanceof MoveEndPhase && phase.getPokemon() === user); + globalScene.tryRemovePhase(phase => phase instanceof MoveEndPhase && phase.getPokemon() === user); // queue a new MovePhase for this move's attack phase - globalScene.unshiftPhase(new MovePhase(user, [ this.targetIndex ], this.move, false)); + globalScene.unshiftPhase(new MovePhase(user, [this.targetIndex], this.move, false)); } else { - user.getMoveQueue().push({ move: move.id, targets: [ this.targetIndex ]}); + user.getMoveQueue().push({ move: move.id, targets: [this.targetIndex] }); } // Add this move's charging phase to the user's move history - user.pushMoveHistory({ move: this.move.moveId, targets: [ this.targetIndex ], result: MoveResult.OTHER }); + user.pushMoveHistory({ + move: this.move.moveId, + targets: [this.targetIndex], + result: MoveResult.OTHER, + }); } super.end(); } @@ -81,6 +84,6 @@ export class MoveChargePhase extends PokemonPhase { } public getTargetPokemon(): Pokemon | undefined { - return globalScene.getField(true).find((p) => this.targetIndex === p.getBattlerIndex()); + return globalScene.getField(true).find(p => this.targetIndex === p.getBattlerIndex()); } } diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts index fff8caf38b5..4152fc243f0 100644 --- a/src/phases/move-effect-phase.ts +++ b/src/phases/move-effect-phase.ts @@ -12,6 +12,7 @@ import { PostAttackAbAttr, PostDamageAbAttr, PostDefendAbAttr, + ReflectStatusMoveAbAttr, TypeImmunityAbAttr, } from "#app/data/ability"; import { ArenaTagSide, ConditionalProtectTag } from "#app/data/arena-tag"; @@ -23,31 +24,31 @@ import { SemiInvulnerableTag, SubstituteTag, } from "#app/data/battler-tags"; -import type { - MoveAttr } from "#app/data/move"; +import type { MoveAttr } from "#app/data/moves/move"; import { applyFilteredMoveAttrs, applyMoveAttrs, AttackMove, DelayedAttackAttr, FlinchAttr, + getMoveTargets, HitsTagAttr, MissEffectAttr, - MoveCategory, MoveEffectAttr, - MoveEffectTrigger, - MoveFlags, - MoveTarget, MultiHitAttr, NoEffectAttr, OneHitKOAttr, OverrideMoveEffectAttr, ToxicAccuracyAttr, VariableTargetAttr, -} from "#app/data/move"; +} from "#app/data/moves/move"; +import { MoveEffectTrigger } from "#enums/MoveEffectTrigger"; +import { MoveFlags } from "#enums/MoveFlags"; +import { MoveTarget } from "#enums/MoveTarget"; +import { MoveCategory } from "#enums/MoveCategory"; import { SpeciesFormChangePostMoveTrigger } from "#app/data/pokemon-forms"; -import { Type } from "#enums/type"; -import type { PokemonMove } from "#app/field/pokemon"; +import { PokemonType } from "#enums/pokemon-type"; +import { PokemonMove } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { HitResult, MoveResult } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; @@ -59,18 +60,28 @@ import { PokemonMultiHitModifier, } from "#app/modifier/modifier"; import { PokemonPhase } from "#app/phases/pokemon-phase"; -import { BooleanHolder, executeIf, isNullOrUndefined, NumberHolder } from "#app/utils"; +import { BooleanHolder, isNullOrUndefined, NumberHolder } from "#app/utils"; +import type { nil } from "#app/utils"; import { BattlerTagType } from "#enums/battler-tag-type"; import type { Moves } from "#enums/moves"; import i18next from "i18next"; +import type { Phase } from "#app/phase"; +import { ShowAbilityPhase } from "./show-ability-phase"; +import { MovePhase } from "./move-phase"; +import { MoveEndPhase } from "./move-end-phase"; export class MoveEffectPhase extends PokemonPhase { public move: PokemonMove; protected targets: BattlerIndex[]; + protected reflected = false; - constructor(battlerIndex: BattlerIndex, targets: BattlerIndex[], move: PokemonMove) { + /** + * @param reflected Indicates that the move was reflected by the user due to magic coat or magic bounce + */ + constructor(battlerIndex: BattlerIndex, targets: BattlerIndex[], move: PokemonMove, reflected = false) { super(battlerIndex); this.move = move; + this.reflected = reflected; /** * In double battles, if the right Pokemon selects a spread move and the left Pokemon dies * with no party members available to switch in, then the right Pokemon takes the index @@ -95,6 +106,13 @@ export class MoveEffectPhase extends PokemonPhase { return super.end(); } + /** If an enemy used this move, set this as last enemy that used move or ability */ + if (!user.isPlayer()) { + globalScene.currentBattle.lastEnemyInvolved = this.fieldIndex; + } else { + globalScene.currentBattle.lastPlayerInvolved = this.fieldIndex; + } + const isDelayedAttack = this.move.getMove().hasAttr(DelayedAttackAttr); /** If the user was somehow removed from the field and it's not a delayed attack, end this phase */ if (!user.isOnField()) { @@ -124,92 +142,129 @@ export class MoveEffectPhase extends PokemonPhase { const move = this.move.getMove(); // Assume single target for override - applyMoveAttrs(OverrideMoveEffectAttr, user, this.getFirstTarget() ?? null, move, overridden, this.move.virtual).then(() => { - // If other effects were overriden, stop this phase before they can be applied - if (overridden.value) { - return this.end(); + applyMoveAttrs(OverrideMoveEffectAttr, user, this.getFirstTarget() ?? null, move, overridden, this.move.virtual); + + // If other effects were overriden, stop this phase before they can be applied + if (overridden.value) { + return this.end(); + } + + user.lapseTags(BattlerTagLapseType.MOVE_EFFECT); + + // If the user is acting again (such as due to Instruct), reset hitsLeft/hitCount so that + // the move executes correctly (ensures all hits of a multi-hit are properly calculated) + if (user.turnData.hitsLeft === 0 && user.turnData.hitCount > 0 && user.turnData.extraTurns > 0) { + user.turnData.hitsLeft = -1; + user.turnData.hitCount = 0; + user.turnData.extraTurns--; + } + + /** + * If this phase is for the first hit of the invoked move, + * resolve the move's total hit count. This block combines the + * effects of the move itself, Parental Bond, and Multi-Lens to do so. + */ + if (user.turnData.hitsLeft === -1) { + const hitCount = new NumberHolder(1); + // Assume single target for multi hit + applyMoveAttrs(MultiHitAttr, user, this.getFirstTarget() ?? null, move, hitCount); + // If Parental Bond is applicable, add another hit + applyPreAttackAbAttrs(AddSecondStrikeAbAttr, user, null, move, false, hitCount, null); + // If Multi-Lens is applicable, add hits equal to the number of held Multi-Lenses + globalScene.applyModifiers(PokemonMultiHitModifier, user.isPlayer(), user, move.id, hitCount); + // Set the user's relevant turnData fields to reflect the final hit count + user.turnData.hitCount = hitCount.value; + user.turnData.hitsLeft = hitCount.value; + } + + /** + * Log to be entered into the user's move history once the move result is resolved. + * Note that `result` (a {@linkcode MoveResult}) logs whether the move was successfully + * used in the sense of "Does it have an effect on the user?". + */ + const moveHistoryEntry = { + move: this.move.moveId, + targets: this.targets, + result: MoveResult.PENDING, + virtual: this.move.virtual, + }; + + /** + * Stores results of hit checks of the invoked move against all targets, organized by battler index. + * @see {@linkcode hitCheck} + */ + const targetHitChecks = Object.fromEntries(targets.map(p => [p.getBattlerIndex(), this.hitCheck(p)])); + const hasActiveTargets = targets.some(t => t.isActive(true)); + + /** Check if the target is immune via ability to the attacking move, and NOT in semi invulnerable state */ + const isImmune = + targets[0]?.hasAbilityWithAttr(TypeImmunityAbAttr) && + targets[0]?.getAbility()?.getAttrs(TypeImmunityAbAttr)?.[0]?.getImmuneType() === user.getMoveType(move) && + !targets[0]?.getTag(SemiInvulnerableTag); + + const mayBounce = + move.hasFlag(MoveFlags.REFLECTABLE) && + !this.reflected && + targets.some(t => t.hasAbilityWithAttr(ReflectStatusMoveAbAttr) || !!t.getTag(BattlerTagType.MAGIC_COAT)); + + /** + * If no targets are left for the move to hit (FAIL), or the invoked move is non-reflectable, single-target + * (and not random target) and failed the hit check against its target (MISS), log the move + * as FAILed or MISSed (depending on the conditions above) and end this phase. + */ + if ( + !hasActiveTargets || + (!mayBounce && + !move.hasAttr(VariableTargetAttr) && + !move.isMultiTarget() && + !targetHitChecks[this.targets[0]] && + !targets[0].getTag(ProtectedTag) && + !isImmune) + ) { + this.stopMultiHit(); + if (hasActiveTargets) { + globalScene.queueMessage( + i18next.t("battle:attackMissed", { + pokemonNameWithAffix: this.getFirstTarget() ? getPokemonNameWithAffix(this.getFirstTarget()!) : "", + }), + ); + moveHistoryEntry.result = MoveResult.MISS; + applyMoveAttrs(MissEffectAttr, user, null, this.move.getMove()); + } else { + globalScene.queueMessage(i18next.t("battle:attackFailed")); + moveHistoryEntry.result = MoveResult.FAIL; } + user.pushMoveHistory(moveHistoryEntry); + return this.end(); + } - user.lapseTags(BattlerTagLapseType.MOVE_EFFECT); - - // If the user is acting again (such as due to Instruct), reset hitsLeft/hitCount so that - // the move executes correctly (ensures all hits of a multi-hit are properly calculated) - if (user.turnData.hitsLeft === 0 && user.turnData.hitCount > 0 && user.turnData.extraTurns > 0) { - user.turnData.hitsLeft = -1; - user.turnData.hitCount = 0; - user.turnData.extraTurns--; - } - - /** - * If this phase is for the first hit of the invoked move, - * resolve the move's total hit count. This block combines the - * effects of the move itself, Parental Bond, and Multi-Lens to do so. - */ - if (user.turnData.hitsLeft === -1) { - const hitCount = new NumberHolder(1); - // Assume single target for multi hit - applyMoveAttrs(MultiHitAttr, user, this.getFirstTarget() ?? null, move, hitCount); - // If Parental Bond is applicable, add another hit - applyPreAttackAbAttrs(AddSecondStrikeAbAttr, user, null, move, false, hitCount, null); - // If Multi-Lens is applicable, add hits equal to the number of held Multi-Lenses - globalScene.applyModifiers(PokemonMultiHitModifier, user.isPlayer(), user, move.id, hitCount); - // Set the user's relevant turnData fields to reflect the final hit count - user.turnData.hitCount = hitCount.value; - user.turnData.hitsLeft = hitCount.value; - } - - /** - * Log to be entered into the user's move history once the move result is resolved. - * Note that `result` (a {@linkcode MoveResult}) logs whether the move was successfully - * used in the sense of "Does it have an effect on the user?". - */ - const moveHistoryEntry = { move: this.move.moveId, targets: this.targets, result: MoveResult.PENDING, virtual: this.move.virtual }; - - /** - * Stores results of hit checks of the invoked move against all targets, organized by battler index. - * @see {@linkcode hitCheck} - */ - const targetHitChecks = Object.fromEntries(targets.map(p => [ p.getBattlerIndex(), this.hitCheck(p) ])); - const hasActiveTargets = targets.some(t => t.isActive(true)); - - /** Check if the target is immune via ability to the attacking move, and NOT in semi invulnerable state */ - const isImmune = targets[0]?.hasAbilityWithAttr(TypeImmunityAbAttr) - && (targets[0]?.getAbility()?.getAttrs(TypeImmunityAbAttr)?.[0]?.getImmuneType() === user.getMoveType(move)) - && !targets[0]?.getTag(SemiInvulnerableTag); - - /** - * If no targets are left for the move to hit (FAIL), or the invoked move is single-target - * (and not random target) and failed the hit check against its target (MISS), log the move - * as FAILed or MISSed (depending on the conditions above) and end this phase. - */ - if (!hasActiveTargets || (!move.hasAttr(VariableTargetAttr) && !move.isMultiTarget() && !targetHitChecks[this.targets[0]] && !targets[0].getTag(ProtectedTag) && !isImmune)) { - this.stopMultiHit(); - if (hasActiveTargets) { - globalScene.queueMessage(i18next.t("battle:attackMissed", { pokemonNameWithAffix: this.getFirstTarget() ? getPokemonNameWithAffix(this.getFirstTarget()!) : "" })); - moveHistoryEntry.result = MoveResult.MISS; - applyMoveAttrs(MissEffectAttr, user, null, this.move.getMove()); - } else { - globalScene.queueMessage(i18next.t("battle:attackFailed")); - moveHistoryEntry.result = MoveResult.FAIL; - } - user.pushMoveHistory(moveHistoryEntry); - return this.end(); - } - - /** All move effect attributes are chained together in this array to be applied asynchronously. */ - const applyAttrs: Promise[] = []; - - const playOnEmptyField = globalScene.currentBattle?.mysteryEncounter?.hasBattleAnimationsWithoutTargets ?? false; - // Move animation only needs one target - new MoveAnim(move.id as Moves, user, this.getFirstTarget()!.getBattlerIndex(), playOnEmptyField).play(move.hitsSubstitute(user, this.getFirstTarget()!), () => { + const playOnEmptyField = globalScene.currentBattle?.mysteryEncounter?.hasBattleAnimationsWithoutTargets ?? false; + // Move animation only needs one target + new MoveAnim(move.id as Moves, user, this.getFirstTarget()!.getBattlerIndex(), playOnEmptyField).play( + move.hitsSubstitute(user, this.getFirstTarget()!), + () => { /** Has the move successfully hit a target (for damage) yet? */ - let hasHit: boolean = false; - for (const target of targets) { - // Prevent ENEMY_SIDE targeted moves from occurring twice in double battles - if (move.moveTarget === MoveTarget.ENEMY_SIDE && target !== targets[targets.length - 1]) { - continue; - } + let hasHit = false; + // Prevent ENEMY_SIDE targeted moves from occurring twice in double battles + // and check which target will magic bounce. + const trueTargets: Pokemon[] = + move.moveTarget !== MoveTarget.ENEMY_SIDE + ? targets + : (() => { + const magicCoatTargets = targets.filter( + t => t.getTag(BattlerTagType.MAGIC_COAT) || t.hasAbilityWithAttr(ReflectStatusMoveAbAttr), + ); + + // only magic coat effect cares about order + if (!mayBounce || magicCoatTargets.length === 0) { + return [targets[0]]; + } + return [magicCoatTargets[0]]; + })(); + + const queuedPhases: Phase[] = []; + for (const target of trueTargets) { /** The {@linkcode ArenaTagSide} to which the target belongs */ const targetSide = target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; /** Has the invoked move been cancelled by conditional protection (e.g Quick Guard)? */ @@ -218,35 +273,95 @@ export class MoveEffectPhase extends PokemonPhase { const bypassIgnoreProtect = new BooleanHolder(false); /** If the move is not targeting a Pokemon on the user's side, try to apply conditional protection effects */ if (!this.move.getMove().isAllyTarget()) { - globalScene.arena.applyTagsForSide(ConditionalProtectTag, targetSide, false, hasConditionalProtectApplied, user, target, move.id, bypassIgnoreProtect); + globalScene.arena.applyTagsForSide( + ConditionalProtectTag, + targetSide, + false, + hasConditionalProtectApplied, + user, + target, + move.id, + bypassIgnoreProtect, + ); } /** Is the target protected by Protect, etc. or a relevant conditional protection effect? */ - const isProtected = ( - bypassIgnoreProtect.value - || !this.move.getMove().checkFlag(MoveFlags.IGNORE_PROTECT, user, target)) - && (hasConditionalProtectApplied.value - || (!target.findTags(t => t instanceof DamageProtectedTag).length - && target.findTags(t => t instanceof ProtectedTag).find(t => target.lapseTag(t.tagType))) - || (this.move.getMove().category !== MoveCategory.STATUS - && target.findTags(t => t instanceof DamageProtectedTag).find(t => target.lapseTag(t.tagType)))); - - /** Is the pokemon immune due to an ablility, and also not in a semi invulnerable state? */ - const isImmune = target.hasAbilityWithAttr(TypeImmunityAbAttr) - && (target.getAbility()?.getAttrs(TypeImmunityAbAttr)?.[0]?.getImmuneType() === user.getMoveType(move)) - && !target.getTag(SemiInvulnerableTag); + const isProtected = + ![MoveTarget.ENEMY_SIDE, MoveTarget.BOTH_SIDES].includes(this.move.getMove().moveTarget) && + (bypassIgnoreProtect.value || !this.move.getMove().checkFlag(MoveFlags.IGNORE_PROTECT, user, target)) && + (hasConditionalProtectApplied.value || + (!target.findTags(t => t instanceof DamageProtectedTag).length && + target.findTags(t => t instanceof ProtectedTag).find(t => target.lapseTag(t.tagType))) || + (this.move.getMove().category !== MoveCategory.STATUS && + target.findTags(t => t instanceof DamageProtectedTag).find(t => target.lapseTag(t.tagType)))); /** Is the target hidden by the effects of its Commander ability? */ - const isCommanding = globalScene.currentBattle.double && target.getAlly()?.getTag(BattlerTagType.COMMANDED)?.getSourcePokemon() === target; + const isCommanding = + globalScene.currentBattle.double && + target.getAlly()?.getTag(BattlerTagType.COMMANDED)?.getSourcePokemon() === target; + + /** Is the target reflecting status moves from the magic coat move? */ + const isReflecting = !!target.getTag(BattlerTagType.MAGIC_COAT); + + /** Is the target's magic bounce ability not ignored and able to reflect this move? */ + const canMagicBounce = + !isReflecting && + !move.checkFlag(MoveFlags.IGNORE_ABILITIES, user, target) && + target.hasAbilityWithAttr(ReflectStatusMoveAbAttr); + + const semiInvulnerableTag = target.getTag(SemiInvulnerableTag); + + /** Is the target reflecting the effect, not protected, and not in an semi-invulnerable state?*/ + const willBounce = + !isProtected && + !this.reflected && + !isCommanding && + move.hasFlag(MoveFlags.REFLECTABLE) && + (isReflecting || canMagicBounce) && + !semiInvulnerableTag; + + // If the move will bounce, then queue the bounce and move on to the next target + if (!target.switchOutStatus && willBounce) { + const newTargets = move.isMultiTarget() + ? getMoveTargets(target, move.id).targets + : [user.getBattlerIndex()]; + if (!isReflecting) { + queuedPhases.push( + new ShowAbilityPhase( + target.getBattlerIndex(), + target.getPassiveAbility().hasAttr(ReflectStatusMoveAbAttr), + ), + ); + } + + queuedPhases.push( + new MovePhase(target, newTargets, new PokemonMove(move.id, 0, 0, true), true, true, true), + ); + continue; + } + + /** Is the pokemon immune due to an ablility, and also not in a semi invulnerable state? */ + const isImmune = + target.hasAbilityWithAttr(TypeImmunityAbAttr) && + target.getAbility()?.getAttrs(TypeImmunityAbAttr)?.[0]?.getImmuneType() === user.getMoveType(move) && + !semiInvulnerableTag; /** * If the move missed a target, stop all future hits against that target * and move on to the next target (if there is one). */ - if (target.switchOutStatus || isCommanding || (!isImmune && !isProtected && !targetHitChecks[target.getBattlerIndex()])) { + if ( + target.switchOutStatus || + isCommanding || + (!isImmune && !isProtected && !targetHitChecks[target.getBattlerIndex()]) + ) { this.stopMultiHit(target); if (!target.switchOutStatus) { - globalScene.queueMessage(i18next.t("battle:attackMissed", { pokemonNameWithAffix: getPokemonNameWithAffix(target) })); + globalScene.queueMessage( + i18next.t("battle:attackMissed", { + pokemonNameWithAffix: getPokemonNameWithAffix(target), + }), + ); } if (moveHistoryEntry.result === MoveResult.PENDING) { moveHistoryEntry.result = MoveResult.MISS; @@ -257,7 +372,7 @@ export class MoveEffectPhase extends PokemonPhase { } /** Does this phase represent the invoked move's first strike? */ - const firstHit = (user.turnData.hitsLeft === user.turnData.hitCount); + const firstHit = user.turnData.hitsLeft === user.turnData.hitCount; // Only log the move's result on the first strike if (firstHit) { @@ -289,7 +404,7 @@ export class MoveEffectPhase extends PokemonPhase { HitResult.EFFECTIVE, HitResult.SUPER_EFFECTIVE, HitResult.NOT_VERY_EFFECTIVE, - HitResult.ONE_HIT_KO + HitResult.ONE_HIT_KO, ].includes(hitResult); /** Is this target the first one hit by the move on its current strike? */ @@ -307,7 +422,7 @@ export class MoveEffectPhase extends PokemonPhase { } /** Does this phase represent the invoked move's last strike? */ - const lastHit = (user.turnData.hitsLeft === 1 || !this.getFirstTarget()?.isActive()); + const lastHit = user.turnData.hitsLeft === 1 || !this.getFirstTarget()?.isActive(); /** * If the user can change forms by using the invoked move, @@ -325,75 +440,65 @@ export class MoveEffectPhase extends PokemonPhase { } } - /** - * Create a Promise that applies *all* effects from the invoked move's MoveEffectAttrs. - * These are ordered by trigger type (see {@linkcode MoveEffectTrigger}), and each trigger - * type requires different conditions to be met with respect to the move's hit result. - */ - const k = new Promise((resolve) => { - //Start promise chain and apply PRE_APPLY move attributes - let promiseChain: Promise = applyFilteredMoveAttrs((attr: MoveAttr) => - attr instanceof MoveEffectAttr - && attr.trigger === MoveEffectTrigger.PRE_APPLY - && (!attr.firstHitOnly || firstHit) - && (!attr.lastHitOnly || lastHit) - && hitResult !== HitResult.NO_EFFECT, user, target, move); + applyFilteredMoveAttrs( + (attr: MoveAttr) => + attr instanceof MoveEffectAttr && + attr.trigger === MoveEffectTrigger.PRE_APPLY && + (!attr.firstHitOnly || firstHit) && + (!attr.lastHitOnly || lastHit) && + hitResult !== HitResult.NO_EFFECT, + user, + target, + move, + ); - /** Don't complete if the move failed */ - if (hitResult === HitResult.FAIL) { - return resolve(); - } - - /** Apply Move/Ability Effects in correct order */ - promiseChain = promiseChain - .then(this.applySelfTargetEffects(user, target, firstHit, lastHit)); + if (hitResult !== HitResult.FAIL) { + this.applySelfTargetEffects(user, target, firstHit, lastHit); if (hitResult !== HitResult.NO_EFFECT) { - promiseChain - .then(this.applyPostApplyEffects(user, target, firstHit, lastHit)) - .then(this.applyHeldItemFlinchCheck(user, target, dealsDamage)) - .then(this.applySuccessfulAttackEffects(user, target, firstHit, lastHit, !!isProtected, hitResult, firstTarget)) - .then(() => resolve()); + this.applyPostApplyEffects(user, target, firstHit, lastHit); + this.applyHeldItemFlinchCheck(user, target, dealsDamage); + this.applySuccessfulAttackEffects(user, target, firstHit, lastHit, !!isProtected, hitResult, firstTarget); } else { - promiseChain - .then(() => applyMoveAttrs(NoEffectAttr, user, null, move)) - .then(resolve); + applyMoveAttrs(NoEffectAttr, user, null, move); } - }); - - applyAttrs.push(k); - } - - // Apply the move's POST_TARGET effects on the move's last hit, after all targeted effects have resolved - const postTarget = (user.turnData.hitsLeft === 1 || !this.getFirstTarget()?.isActive()) ? - applyFilteredMoveAttrs((attr: MoveAttr) => attr instanceof MoveEffectAttr && attr.trigger === MoveEffectTrigger.POST_TARGET, user, null, move) : - null; - - if (postTarget) { - if (applyAttrs.length) { // If there is a pending asynchronous move effect, do this after - applyAttrs[applyAttrs.length - 1].then(() => postTarget); - } else { // Otherwise, push a new asynchronous move effect - applyAttrs.push(postTarget); } } - // Wait for all move effects to finish applying, then end this phase - Promise.allSettled(applyAttrs).then(() => { - /** - * Remove the target's substitute (if it exists and has expired) - * after all targeted effects have applied. - * This prevents blocked effects from applying until after this hit resolves. - */ - targets.forEach(target => { - const substitute = target.getTag(SubstituteTag); - if (substitute && substitute.hp <= 0) { - target.lapseTag(BattlerTagType.SUBSTITUTE); - } - }); - this.end(); + // Apply queued phases + if (queuedPhases.length) { + globalScene.appendToPhase(queuedPhases, MoveEndPhase); + } + // Apply the move's POST_TARGET effects on the move's last hit, after all targeted effects have resolved + if (user.turnData.hitsLeft === 1 || !this.getFirstTarget()?.isActive()) { + applyFilteredMoveAttrs( + (attr: MoveAttr) => attr instanceof MoveEffectAttr && attr.trigger === MoveEffectTrigger.POST_TARGET, + user, + null, + move, + ); + } + + /** + * Remove the target's substitute (if it exists and has expired) + * after all targeted effects have applied. + * This prevents blocked effects from applying until after this hit resolves. + */ + targets.forEach(target => { + const substitute = target.getTag(SubstituteTag); + if (substitute && substitute.hp <= 0) { + target.lapseTag(BattlerTagType.SUBSTITUTE); + } }); - }); - }); + + const moveType = user.getMoveType(move, true); + if (move.category !== MoveCategory.STATUS && !user.stellarTypesBoosted.includes(moveType)) { + user.stellarTypesBoosted.push(moveType); + } + + this.end(); + }, + ); } public override end(): void { @@ -418,7 +523,7 @@ export class MoveEffectPhase extends PokemonPhase { } globalScene.applyModifiers(HitHealModifier, this.player, user); // Clear all cached move effectiveness values among targets - this.getTargets().forEach((target) => target.turnData.moveEffectiveness = null); + this.getTargets().forEach(target => (target.turnData.moveEffectiveness = null)); } } @@ -434,13 +539,18 @@ export class MoveEffectPhase extends PokemonPhase { * @param lastHit - `true` if this is the last hit in a multi-hit attack * @returns a function intended to be passed into a `then()` call. */ - protected applySelfTargetEffects(user: Pokemon, target: Pokemon, firstHit: boolean, lastHit: boolean): () => Promise { - return () => applyFilteredMoveAttrs((attr: MoveAttr) => - attr instanceof MoveEffectAttr - && attr.trigger === MoveEffectTrigger.POST_APPLY - && attr.selfTarget - && (!attr.firstHitOnly || firstHit) - && (!attr.lastHitOnly || lastHit), user, target, this.move.getMove()); + protected applySelfTargetEffects(user: Pokemon, target: Pokemon, firstHit: boolean, lastHit: boolean): void { + applyFilteredMoveAttrs( + (attr: MoveAttr) => + attr instanceof MoveEffectAttr && + attr.trigger === MoveEffectTrigger.POST_APPLY && + attr.selfTarget && + (!attr.firstHitOnly || firstHit) && + (!attr.lastHitOnly || lastHit), + user, + target, + this.move.getMove(), + ); } /** @@ -452,13 +562,18 @@ export class MoveEffectPhase extends PokemonPhase { * @param lastHit - `true` if this is the last hit in a multi-hit attack * @returns a function intended to be passed into a `then()` call. */ - protected applyPostApplyEffects(user: Pokemon, target: Pokemon, firstHit: boolean, lastHit: boolean): () => Promise { - return () => applyFilteredMoveAttrs((attr: MoveAttr) => - attr instanceof MoveEffectAttr - && attr.trigger === MoveEffectTrigger.POST_APPLY - && !attr.selfTarget - && (!attr.firstHitOnly || firstHit) - && (!attr.lastHitOnly || lastHit), user, target, this.move.getMove()); + protected applyPostApplyEffects(user: Pokemon, target: Pokemon, firstHit: boolean, lastHit: boolean): void { + applyFilteredMoveAttrs( + (attr: MoveAttr) => + attr instanceof MoveEffectAttr && + attr.trigger === MoveEffectTrigger.POST_APPLY && + !attr.selfTarget && + (!attr.firstHitOnly || firstHit) && + (!attr.lastHitOnly || lastHit), + user, + target, + this.move.getMove(), + ); } /** @@ -471,13 +586,24 @@ export class MoveEffectPhase extends PokemonPhase { * @param firstTarget - `true` if {@linkcode target} is the first target hit by this strike of {@linkcode move} * @returns a function intended to be passed into a `then()` call. */ - protected applyOnHitEffects(user: Pokemon, target: Pokemon, firstHit : boolean, lastHit: boolean, firstTarget: boolean): Promise { - return applyFilteredMoveAttrs((attr: MoveAttr) => - attr instanceof MoveEffectAttr - && attr.trigger === MoveEffectTrigger.HIT - && (!attr.firstHitOnly || firstHit) - && (!attr.lastHitOnly || lastHit) - && (!attr.firstTargetOnly || firstTarget), user, target, this.move.getMove()); + protected applyOnHitEffects( + user: Pokemon, + target: Pokemon, + firstHit: boolean, + lastHit: boolean, + firstTarget: boolean, + ): void { + applyFilteredMoveAttrs( + (attr: MoveAttr) => + attr instanceof MoveEffectAttr && + attr.trigger === MoveEffectTrigger.HIT && + (!attr.firstHitOnly || firstHit) && + (!attr.lastHitOnly || lastHit) && + (!attr.firstTargetOnly || firstTarget), + user, + target, + this.move.getMove(), + ); } /** @@ -488,21 +614,18 @@ export class MoveEffectPhase extends PokemonPhase { * @param hitResult - The {@linkcode HitResult} of the attempted move * @returns a `Promise` intended to be passed into a `then()` call. */ - protected applyOnGetHitAbEffects(user: Pokemon, target: Pokemon, hitResult: HitResult): Promise { - return executeIf(!target.isFainted() || target.canApplyAbility(), () => - applyPostDefendAbAttrs(PostDefendAbAttr, target, user, this.move.getMove(), hitResult) - .then(() => { + protected applyOnGetHitAbEffects(user: Pokemon, target: Pokemon, hitResult: HitResult): void { + if (!target.isFainted() || target.canApplyAbility()) { + applyPostDefendAbAttrs(PostDefendAbAttr, target, user, this.move.getMove(), hitResult); - if (!this.move.getMove().hitsSubstitute(user, target)) { - if (!user.isPlayer() && this.move.getMove() instanceof AttackMove) { - globalScene.applyShuffledModifiers(EnemyAttackStatusEffectChanceModifier, false, target); - } + if (!this.move.getMove().hitsSubstitute(user, target)) { + if (!user.isPlayer() && this.move.getMove() instanceof AttackMove) { + globalScene.applyShuffledModifiers(EnemyAttackStatusEffectChanceModifier, false, target); + } - target.lapseTags(BattlerTagLapseType.AFTER_HIT); - } - - }) - ); + target.lapseTags(BattlerTagLapseType.AFTER_HIT); + } + } } /** @@ -517,17 +640,23 @@ export class MoveEffectPhase extends PokemonPhase { * @param firstTarget - `true` if {@linkcode target} is the first target hit by this strike of {@linkcode move} * @returns a function intended to be passed into a `then()` call. */ - protected applySuccessfulAttackEffects(user: Pokemon, target: Pokemon, firstHit : boolean, lastHit: boolean, isProtected : boolean, hitResult: HitResult, firstTarget: boolean) : () => Promise { - return () => executeIf(!isProtected, () => - this.applyOnHitEffects(user, target, firstHit, lastHit, firstTarget).then(() => - this.applyOnGetHitAbEffects(user, target, hitResult)).then(() => - applyPostAttackAbAttrs(PostAttackAbAttr, user, target, this.move.getMove(), hitResult)).then(() => { // Item Stealing Effects - - if (this.move.getMove() instanceof AttackMove) { - globalScene.applyModifiers(ContactHeldItemTransferChanceModifier, this.player, user, target); - } - }) - ); + protected applySuccessfulAttackEffects( + user: Pokemon, + target: Pokemon, + firstHit: boolean, + lastHit: boolean, + isProtected: boolean, + hitResult: HitResult, + firstTarget: boolean, + ): void { + if (!isProtected) { + this.applyOnHitEffects(user, target, firstHit, lastHit, firstTarget); + this.applyOnGetHitAbEffects(user, target, hitResult); + applyPostAttackAbAttrs(PostAttackAbAttr, user, target, this.move.getMove(), hitResult); + if (this.move.getMove() instanceof AttackMove) { + globalScene.applyModifiers(ContactHeldItemTransferChanceModifier, this.player, user, target); + } + } } /** @@ -537,20 +666,22 @@ export class MoveEffectPhase extends PokemonPhase { * @param dealsDamage - `true` if the attempted move successfully dealt damage * @returns a function intended to be passed into a `then()` call. */ - protected applyHeldItemFlinchCheck(user: Pokemon, target: Pokemon, dealsDamage: boolean) : () => void { - return () => { - if (this.move.getMove().hasAttr(FlinchAttr)) { - return; - } + protected applyHeldItemFlinchCheck(user: Pokemon, target: Pokemon, dealsDamage: boolean): void { + if (this.move.getMove().hasAttr(FlinchAttr)) { + return; + } - if (dealsDamage && !target.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && !this.move.getMove().hitsSubstitute(user, target)) { - const flinched = new BooleanHolder(false); - globalScene.applyModifiers(FlinchChanceModifier, user.isPlayer(), user, flinched); - if (flinched.value) { - target.addTag(BattlerTagType.FLINCHED, undefined, this.move.moveId, user.id); - } + if ( + dealsDamage && + !target.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && + !this.move.getMove().hitsSubstitute(user, target) + ) { + const flinched = new BooleanHolder(false); + globalScene.applyModifiers(FlinchChanceModifier, user.isPlayer(), user, flinched); + if (flinched.value) { + target.addTag(BattlerTagType.FLINCHED, undefined, this.move.moveId, user.id); } - }; + } } /** @@ -560,7 +691,7 @@ export class MoveEffectPhase extends PokemonPhase { */ public hitCheck(target: Pokemon): boolean { // Moves targeting the user and entry hazards can't miss - if ([ MoveTarget.USER, MoveTarget.ENEMY_SIDE ].includes(this.move.getMove().moveTarget)) { + if ([MoveTarget.USER, MoveTarget.ENEMY_SIDE].includes(this.move.getMove().moveTarget)) { return true; } @@ -579,12 +710,7 @@ export class MoveEffectPhase extends PokemonPhase { } } - if (user.hasAbilityWithAttr(AlwaysHitAbAttr) || target.hasAbilityWithAttr(AlwaysHitAbAttr)) { - return true; - } - - // If the user should ignore accuracy on a target, check who the user targeted last turn and see if they match - if (user.getTag(BattlerTagType.IGNORE_ACCURACY) && (user.getLastXMoves().find(() => true)?.targets || []).indexOf(target.getBattlerIndex()) !== -1) { + if (this.checkBypassAccAndInvuln(target)) { return true; } @@ -592,15 +718,16 @@ export class MoveEffectPhase extends PokemonPhase { return true; } - if (target.getTag(BattlerTagType.TELEKINESIS) && !target.getTag(SemiInvulnerableTag) && !this.move.getMove().hasAttr(OneHitKOAttr)) { + const semiInvulnerableTag = target.getTag(SemiInvulnerableTag); + if ( + target.getTag(BattlerTagType.TELEKINESIS) && + !semiInvulnerableTag && + !this.move.getMove().hasAttr(OneHitKOAttr) + ) { return true; } - const semiInvulnerableTag = target.getTag(SemiInvulnerableTag); - if (semiInvulnerableTag - && !this.move.getMove().getAttrs(HitsTagAttr).some(hta => hta.tagType === semiInvulnerableTag.tagType) - && !(this.move.getMove().hasAttr(ToxicAccuracyAttr) && user.isOfType(Type.POISON)) - ) { + if (semiInvulnerableTag && !this.checkBypassSemiInvuln(semiInvulnerableTag)) { return false; } @@ -613,7 +740,56 @@ export class MoveEffectPhase extends PokemonPhase { const accuracyMultiplier = user.getAccuracyMultiplier(target, this.move.getMove()); const rand = user.randSeedInt(100); - return rand < (moveAccuracy * accuracyMultiplier); + return rand < moveAccuracy * accuracyMultiplier; + } + + /** + * Check whether the move should bypass *both* the accuracy *and* semi-invulnerable states. + * @param target - The {@linkcode Pokemon} targeted by the invoked move + * @returns `true` if the move should bypass accuracy and semi-invulnerability + * + * Accuracy and semi-invulnerability can be bypassed by: + * - An ability like {@linkcode Abilities.NO_GUARD | No Guard} + * - A poison type using {@linkcode Moves.TOXIC | Toxic} + * - A move like {@linkcode Moves.LOCK_ON | Lock-On} or {@linkcode Moves.MIND_READER | Mind Reader}. + * + * Does *not* check against effects {@linkcode Moves.GLAIVE_RUSH | Glaive Rush} status (which + * should not bypass semi-invulnerability), or interactions like Earthquake hitting against Dig, + * (which should not bypass the accuracy check). + * + * @see {@linkcode hitCheck} + */ + public checkBypassAccAndInvuln(target: Pokemon) { + const user = this.getUserPokemon(); + if (!user) { + return false; + } + if (user.hasAbilityWithAttr(AlwaysHitAbAttr) || target.hasAbilityWithAttr(AlwaysHitAbAttr)) { + return true; + } + if (this.move.getMove().hasAttr(ToxicAccuracyAttr) && user.isOfType(PokemonType.POISON)) { + return true; + } + // TODO: Fix lock on / mind reader check. + if ( + user.getTag(BattlerTagType.IGNORE_ACCURACY) && + (user.getLastXMoves().find(() => true)?.targets || []).indexOf(target.getBattlerIndex()) !== -1 + ) { + return true; + } + } + + /** + * Check whether the move is able to ignore the given `semiInvulnerableTag` + * @param semiInvulnerableTag - The semiInvulnerbale tag to check against + * @returns `true` if the move can ignore the semi-invulnerable state + */ + public checkBypassSemiInvuln(semiInvulnerableTag: SemiInvulnerableTag | nil): boolean { + if (!semiInvulnerableTag) { + return false; + } + const move = this.move.getMove(); + return move.getAttrs(HitsTagAttr).some(hta => hta.tagType === semiInvulnerableTag.tagType); } /** @returns The {@linkcode Pokemon} using this phase's invoked move */ @@ -641,7 +817,10 @@ export class MoveEffectPhase extends PokemonPhase { protected removeTarget(target: Pokemon): void { const targetIndex = this.targets.findIndex(ind => ind === target.getBattlerIndex()); if (targetIndex !== -1) { - this.targets.splice(this.targets.findIndex(ind => ind === target.getBattlerIndex()), 1); + this.targets.splice( + this.targets.findIndex(ind => ind === target.getBattlerIndex()), + 1, + ); } } @@ -660,7 +839,7 @@ export class MoveEffectPhase extends PokemonPhase { } // If no target specified, or the specified target was the last of this move's // targets, completely cancel all subsequent strikes. - if (!target || this.targets.length === 0 ) { + if (!target || this.targets.length === 0) { user.turnData.hitCount = 1; user.turnData.hitsLeft = 1; } diff --git a/src/phases/move-end-phase.ts b/src/phases/move-end-phase.ts index 428dacd639a..4716370cc4e 100644 --- a/src/phases/move-end-phase.ts +++ b/src/phases/move-end-phase.ts @@ -4,10 +4,6 @@ import { BattlerTagLapseType } from "#app/data/battler-tags"; import { PokemonPhase } from "./pokemon-phase"; export class MoveEndPhase extends PokemonPhase { - constructor(battlerIndex: BattlerIndex) { - super(battlerIndex); - } - start() { super.start(); diff --git a/src/phases/move-header-phase.ts b/src/phases/move-header-phase.ts index 6a982646b50..c320df462d1 100644 --- a/src/phases/move-header-phase.ts +++ b/src/phases/move-header-phase.ts @@ -1,4 +1,4 @@ -import { applyMoveAttrs, MoveHeaderAttr } from "#app/data/move"; +import { applyMoveAttrs, MoveHeaderAttr } from "#app/data/moves/move"; import type { PokemonMove } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { BattlePhase } from "./battle-phase"; @@ -22,9 +22,8 @@ export class MoveHeaderPhase extends BattlePhase { super.start(); if (this.canMove()) { - applyMoveAttrs(MoveHeaderAttr, this.pokemon, null, this.move.getMove()).then(() => this.end()); - } else { - this.end(); + applyMoveAttrs(MoveHeaderAttr, this.pokemon, null, this.move.getMove()); } + this.end(); } } diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts index 5330540c8b2..f8edaa56981 100644 --- a/src/phases/move-phase.ts +++ b/src/phases/move-phase.ts @@ -9,7 +9,7 @@ import { PokemonTypeChangeAbAttr, PostMoveUsedAbAttr, RedirectMoveAbAttr, - ReduceStatusEffectDurationAbAttr + ReduceStatusEffectDurationAbAttr, } from "#app/data/ability"; import type { DelayedAttackTag } from "#app/data/arena-tag"; import { CommonAnim } from "#app/data/battle-anims"; @@ -23,13 +23,14 @@ import { DelayedAttackAttr, frenzyMissFunc, HealStatusEffectAttr, - MoveFlags, - PreMoveMessageAttr -} from "#app/data/move"; + PreMoveMessageAttr, + PreUseInterruptAttr, +} from "#app/data/moves/move"; +import { MoveFlags } from "#enums/MoveFlags"; import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms"; import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect"; -import { Type } from "#enums/type"; -import { getTerrainBlockMessage } from "#app/data/weather"; +import { PokemonType } from "#enums/pokemon-type"; +import { getTerrainBlockMessage, getWeatherBlockMessage } from "#app/data/weather"; import { MoveUsedEvent } from "#app/events/battle-scene"; import type { PokemonMove } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; @@ -42,7 +43,7 @@ import { MoveChargePhase } from "#app/phases/move-charge-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { ShowAbilityPhase } from "#app/phases/show-ability-phase"; -import { BooleanHolder, NumberHolder } from "#app/utils"; +import { NumberHolder } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; @@ -56,8 +57,10 @@ export class MovePhase extends BattlePhase { protected _targets: BattlerIndex[]; protected followUp: boolean; protected ignorePp: boolean; - protected failed: boolean = false; - protected cancelled: boolean = false; + protected forcedLast: boolean; + protected failed = false; + protected cancelled = false; + protected reflected = false; public get pokemon(): Pokemon { return this._pokemon; @@ -84,10 +87,21 @@ export class MovePhase extends BattlePhase { } /** - * @param followUp Indicates that the move being uses is a "follow-up" - for example, a move being used by Metronome or Dancer. + * @param followUp Indicates that the move being used is a "follow-up" - for example, a move being used by Metronome or Dancer. * Follow-ups bypass a few failure conditions, including flinches, sleep/paralysis/freeze and volatile status checks, etc. + * @param reflected Indicates that the move was reflected by Magic Coat or Magic Bounce. + * Reflected moves cannot be reflected again and will not trigger Dancer. */ - constructor(pokemon: Pokemon, targets: BattlerIndex[], move: PokemonMove, followUp: boolean = false, ignorePp: boolean = false) { + + constructor( + pokemon: Pokemon, + targets: BattlerIndex[], + move: PokemonMove, + followUp = false, + ignorePp = false, + reflected = false, + forcedLast = false, + ) { super(); this.pokemon = pokemon; @@ -95,6 +109,8 @@ export class MovePhase extends BattlePhase { this.move = move; this.followUp = followUp; this.ignorePp = ignorePp; + this.reflected = reflected; + this.forcedLast = forcedLast; } /** @@ -102,8 +118,12 @@ export class MovePhase extends BattlePhase { * @param ignoreDisableTags `true` to not check if the move is disabled * @returns `true` if all the checks pass */ - public canMove(ignoreDisableTags: boolean = false): boolean { - return this.pokemon.isActive(true) && this.move.isUsable(this.pokemon, this.ignorePp, ignoreDisableTags) && !!this.targets.length; + public canMove(ignoreDisableTags = false): boolean { + return ( + this.pokemon.isActive(true) && + this.move.isUsable(this.pokemon, this.ignorePp, ignoreDisableTags) && + !!this.targets.length + ); } /**Signifies the current move should fail but still use PP */ @@ -116,6 +136,14 @@ export class MovePhase extends BattlePhase { this.cancelled = true; } + /** + * Shows whether the current move has been forced to the end of the turn + * Needed for speed order, see {@linkcode Moves.QUASH} + * */ + public isForcedLast(): boolean { + return this.forcedLast; + } + public start(): void { super.start(); @@ -140,7 +168,7 @@ export class MovePhase extends BattlePhase { } // Check move to see if arena.ignoreAbilities should be true. - if (!this.followUp) { + if (!this.followUp || this.reflected) { if (this.move.getMove().checkFlag(MoveFlags.IGNORE_ABILITIES, this.pokemon, null)) { globalScene.arena.setIgnoreAbilities(true, this.pokemon.getBattlerIndex()); } @@ -196,24 +224,34 @@ export class MovePhase extends BattlePhase { switch (this.pokemon.status.effect) { case StatusEffect.PARALYSIS: - activated = (!this.pokemon.randSeedInt(4) || Overrides.STATUS_ACTIVATION_OVERRIDE === true) && Overrides.STATUS_ACTIVATION_OVERRIDE !== false; + activated = + (!this.pokemon.randSeedInt(4) || Overrides.STATUS_ACTIVATION_OVERRIDE === true) && + Overrides.STATUS_ACTIVATION_OVERRIDE !== false; break; case StatusEffect.SLEEP: applyMoveAttrs(BypassSleepAttr, this.pokemon, null, this.move.getMove()); const turnsRemaining = new NumberHolder(this.pokemon.status.sleepTurnsRemaining ?? 0); - applyAbAttrs(ReduceStatusEffectDurationAbAttr, this.pokemon, null, false, this.pokemon.status.effect, turnsRemaining); + applyAbAttrs( + ReduceStatusEffectDurationAbAttr, + this.pokemon, + null, + false, + this.pokemon.status.effect, + turnsRemaining, + ); this.pokemon.status.sleepTurnsRemaining = turnsRemaining.value; healed = this.pokemon.status.sleepTurnsRemaining <= 0; activated = !healed && !this.pokemon.getTag(BattlerTagType.BYPASS_SLEEP); break; case StatusEffect.FREEZE: healed = - !!this.move.getMove().findAttr((attr) => - attr instanceof HealStatusEffectAttr - && attr.selfTarget - && attr.isOfEffect(StatusEffect.FREEZE)) - || (!this.pokemon.randSeedInt(5) && Overrides.STATUS_ACTIVATION_OVERRIDE !== true) - || Overrides.STATUS_ACTIVATION_OVERRIDE === false; + !!this.move + .getMove() + .findAttr( + attr => attr instanceof HealStatusEffectAttr && attr.selfTarget && attr.isOfEffect(StatusEffect.FREEZE), + ) || + (!this.pokemon.randSeedInt(5) && Overrides.STATUS_ACTIVATION_OVERRIDE !== true) || + Overrides.STATUS_ACTIVATION_OVERRIDE === false; activated = !healed; break; @@ -221,10 +259,20 @@ export class MovePhase extends BattlePhase { if (activated) { this.cancel(); - globalScene.queueMessage(getStatusEffectActivationText(this.pokemon.status.effect, getPokemonNameWithAffix(this.pokemon))); - globalScene.unshiftPhase(new CommonAnimPhase(this.pokemon.getBattlerIndex(), undefined, CommonAnim.POISON + (this.pokemon.status.effect - 1))); + globalScene.queueMessage( + getStatusEffectActivationText(this.pokemon.status.effect, getPokemonNameWithAffix(this.pokemon)), + ); + globalScene.unshiftPhase( + new CommonAnimPhase( + this.pokemon.getBattlerIndex(), + undefined, + CommonAnim.POISON + (this.pokemon.status.effect - 1), + ), + ); } else if (healed) { - globalScene.queueMessage(getStatusEffectHealText(this.pokemon.status.effect, getPokemonNameWithAffix(this.pokemon))); + globalScene.queueMessage( + getStatusEffectHealText(this.pokemon.status.effect, getPokemonNameWithAffix(this.pokemon)), + ); this.pokemon.resetStatus(); this.pokemon.updateInfo(); } @@ -254,7 +302,7 @@ export class MovePhase extends BattlePhase { const isDelayedAttack = this.move.getMove().hasAttr(DelayedAttackAttr); if (isDelayedAttack) { // Check the player side arena if future sight is active - const futureSightTags = globalScene.arena.findTags(t => t.tagType === ArenaTagType.FUTURE_SIGHT); + const futureSightTags = globalScene.arena.findTags(t => t.tagType === ArenaTagType.FUTURE_SIGHT); const doomDesireTags = globalScene.arena.findTags(t => t.tagType === ArenaTagType.DOOM_DESIRE); let fail = false; const currentTargetIndex = targets[0].getBattlerIndex(); @@ -277,7 +325,18 @@ export class MovePhase extends BattlePhase { } } - this.showMoveText(); + let success = true; + // Check if there are any attributes that can interrupt the move, overriding the fail message. + for (const move of this.move.getMove().getAttrs(PreUseInterruptAttr)) { + if (move.apply(this.pokemon, targets[0], this.move.getMove())) { + success = false; + break; + } + } + + if (success) { + this.showMoveText(); + } if (moveQueue.length > 0) { // Using .shift here clears out two turn moves once they've been used @@ -313,11 +372,14 @@ export class MovePhase extends BattlePhase { * Move conditions assume the move has a single target * TODO: is this sustainable? */ - const passesConditions = move.applyConditions(this.pokemon, targets[0], move); - const failedDueToWeather: boolean = globalScene.arena.isMoveWeatherCancelled(this.pokemon, move); - const failedDueToTerrain: boolean = globalScene.arena.isMoveTerrainCancelled(this.pokemon, this.targets, move); - - const success = passesConditions && !failedDueToWeather && !failedDueToTerrain; + let failedDueToTerrain = false; + let failedDueToWeather = false; + if (success) { + const passesConditions = move.applyConditions(this.pokemon, targets[0], move); + failedDueToWeather = globalScene.arena.isMoveWeatherCancelled(this.pokemon, move); + failedDueToTerrain = globalScene.arena.isMoveTerrainCancelled(this.pokemon, this.targets, move); + success = passesConditions && !failedDueToWeather && !failedDueToTerrain; + } // Update the battle's "last move" pointer, unless we're currently mimicking a move. if (!allMoves[this.move.moveId].hasAttr(CopyMoveAttr)) { @@ -335,22 +397,29 @@ export class MovePhase extends BattlePhase { */ if (success) { applyPreAttackAbAttrs(PokemonTypeChangeAbAttr, this.pokemon, null, this.move.getMove()); - globalScene.unshiftPhase(new MoveEffectPhase(this.pokemon.getBattlerIndex(), this.targets, this.move)); - + globalScene.unshiftPhase( + new MoveEffectPhase(this.pokemon.getBattlerIndex(), this.targets, this.move, this.reflected), + ); } else { - if ([ Moves.ROAR, Moves.WHIRLWIND, Moves.TRICK_OR_TREAT, Moves.FORESTS_CURSE ].includes(this.move.moveId)) { + if ([Moves.ROAR, Moves.WHIRLWIND, Moves.TRICK_OR_TREAT, Moves.FORESTS_CURSE].includes(this.move.moveId)) { applyPreAttackAbAttrs(PokemonTypeChangeAbAttr, this.pokemon, null, this.move.getMove()); } - this.pokemon.pushMoveHistory({ move: this.move.moveId, targets: this.targets, result: MoveResult.FAIL, virtual: this.move.virtual }); + this.pokemon.pushMoveHistory({ + move: this.move.moveId, + targets: this.targets, + result: MoveResult.FAIL, + virtual: this.move.virtual, + }); + const failureMessage = move.getFailedText(this.pokemon, targets[0], move); let failedText: string | undefined; - const failureMessage = move.getFailedText(this.pokemon, targets[0], move, new BooleanHolder(false)); - if (failureMessage) { failedText = failureMessage; } else if (failedDueToTerrain) { - failedText = getTerrainBlockMessage(this.pokemon, globalScene.arena.getTerrainType()); + failedText = getTerrainBlockMessage(targets[0], globalScene.arena.getTerrainType()); + } else if (failedDueToWeather) { + failedText = getWeatherBlockMessage(globalScene.arena.getWeatherType()); } this.showFailedText(failedText); @@ -380,9 +449,14 @@ export class MovePhase extends BattlePhase { this.showMoveText(); globalScene.unshiftPhase(new MoveChargePhase(this.pokemon.getBattlerIndex(), this.targets[0], this.move)); } else { - this.pokemon.pushMoveHistory({ move: this.move.moveId, targets: this.targets, result: MoveResult.FAIL, virtual: this.move.virtual }); + this.pokemon.pushMoveHistory({ + move: this.move.moveId, + targets: this.targets, + result: MoveResult.FAIL, + virtual: this.move.virtual, + }); - const failureMessage = move.getFailedText(this.pokemon, targets[0], move, new BooleanHolder(false)); + const failureMessage = move.getFailedText(this.pokemon, targets[0], move); this.showMoveText(); this.showFailedText(failureMessage ?? undefined); @@ -410,7 +484,9 @@ export class MovePhase extends BattlePhase { * TODO: This hardcodes the PP increase at 1 per opponent, rather than deferring to the ability. */ public getPpIncreaseFromPressure(targets: Pokemon[]): number { - const foesWithPressure = this.pokemon.getOpponents().filter(o => targets.includes(o) && o.isActive(true) && o.hasAbilityWithAttr(IncreasePpAbAttr)); + const foesWithPressure = this.pokemon + .getOpponents() + .filter(o => targets.includes(o) && o.isActive(true) && o.hasAbilityWithAttr(IncreasePpAbAttr)); return foesWithPressure.length; } @@ -425,10 +501,13 @@ export class MovePhase extends BattlePhase { const redirectTarget = new NumberHolder(currentTarget); // check move redirection abilities of every pokemon *except* the user. - globalScene.getField(true).filter(p => p !== this.pokemon).forEach(p => applyAbAttrs(RedirectMoveAbAttr, p, null, false, this.move.moveId, redirectTarget)); + globalScene + .getField(true) + .filter(p => p !== this.pokemon) + .forEach(p => applyAbAttrs(RedirectMoveAbAttr, p, null, false, this.move.moveId, redirectTarget, this.pokemon)); /** `true` if an Ability is responsible for redirecting the move to another target; `false` otherwise */ - let redirectedByAbility = (currentTarget !== redirectTarget.value); + let redirectedByAbility = currentTarget !== redirectTarget.value; // check for center-of-attention tags (note that this will override redirect abilities) this.pokemon.getOpponents().forEach(p => { @@ -436,7 +515,11 @@ export class MovePhase extends BattlePhase { // TODO: don't hardcode this interaction. // Handle interaction between the rage powder center-of-attention tag and moves used by grass types/overcoat-havers (which are immune to RP's redirect) - if (redirectTag && (!redirectTag.powder || (!this.pokemon.isOfType(Type.GRASS) && !this.pokemon.hasAbility(Abilities.OVERCOAT)))) { + if ( + redirectTag && + (!redirectTag.powder || + (!this.pokemon.isOfType(PokemonType.GRASS) && !this.pokemon.hasAbility(Abilities.OVERCOAT))) + ) { redirectTarget.value = p.getBattlerIndex(); redirectedByAbility = false; } @@ -444,7 +527,7 @@ export class MovePhase extends BattlePhase { if (currentTarget !== redirectTarget.value) { const bypassRedirectAttrs = this.move.getMove().getAttrs(BypassRedirectAttr); - bypassRedirectAttrs.forEach((attr) => { + bypassRedirectAttrs.forEach(attr => { if (!attr.abilitiesOnly || redirectedByAbility) { redirectTarget.value = currentTarget; } @@ -452,7 +535,12 @@ export class MovePhase extends BattlePhase { if (this.pokemon.hasAbilityWithAttr(BlockRedirectAbAttr)) { redirectTarget.value = currentTarget; - globalScene.unshiftPhase(new ShowAbilityPhase(this.pokemon.getBattlerIndex(), this.pokemon.getPassiveAbility().hasAttr(BlockRedirectAbAttr))); + globalScene.unshiftPhase( + new ShowAbilityPhase( + this.pokemon.getBattlerIndex(), + this.pokemon.getPassiveAbility().hasAttr(BlockRedirectAbAttr), + ), + ); } this.targets[0] = redirectTarget.value; @@ -521,7 +609,11 @@ export class MovePhase extends BattlePhase { frenzyMissFunc(this.pokemon, this.move.getMove()); } - this.pokemon.pushMoveHistory({ move: Moves.NONE, result: MoveResult.FAIL, targets: this.targets }); + this.pokemon.pushMoveHistory({ + move: Moves.NONE, + result: MoveResult.FAIL, + targets: this.targets, + }); this.pokemon.lapseTags(BattlerTagLapseType.MOVE_EFFECT); this.pokemon.lapseTags(BattlerTagLapseType.AFTER_MOVE); @@ -543,14 +635,17 @@ export class MovePhase extends BattlePhase { return; } - globalScene.queueMessage(i18next.t("battle:useMove", { - pokemonNameWithAffix: getPokemonNameWithAffix(this.pokemon), - moveName: this.move.getName() - }), 500); + globalScene.queueMessage( + i18next.t(this.reflected ? "battle:magicCoatActivated" : "battle:useMove", { + pokemonNameWithAffix: getPokemonNameWithAffix(this.pokemon), + moveName: this.move.getName(), + }), + 500, + ); applyMoveAttrs(PreMoveMessageAttr, this.pokemon, this.pokemon.getOpponents()[0], this.move.getMove()); } - public showFailedText(failedText?: string): void { - globalScene.queueMessage(failedText ?? i18next.t("battle:attackFailed")); + public showFailedText(failedText: string = i18next.t("battle:attackFailed")): void { + globalScene.queueMessage(failedText); } } diff --git a/src/phases/mystery-encounter-phases.ts b/src/phases/mystery-encounter-phases.ts index be07dbfc196..26012df191d 100644 --- a/src/phases/mystery-encounter-phases.ts +++ b/src/phases/mystery-encounter-phases.ts @@ -67,7 +67,9 @@ export class MysteryEncounterPhase extends Phase { if (!this.optionSelectSettings) { // Sets flag that ME was encountered, only if this is not a followup option select phase // Can be used in later MEs to check for requirements to spawn, run history, etc. - globalScene.mysteryEncounterSaveData.encounteredEvents.push(new SeenEncounterData(encounter.encounterType, encounter.encounterTier, globalScene.currentBattle.waveIndex)); + globalScene.mysteryEncounterSaveData.encounteredEvents.push( + new SeenEncounterData(encounter.encounterType, encounter.encounterTier, globalScene.currentBattle.waveIndex), + ); } // Initiates encounter dialogue window and option select @@ -86,7 +88,10 @@ export class MysteryEncounterPhase extends Phase { if (!this.optionSelectSettings) { // Saves the selected option in the ME save data, only if this is not a followup option select phase // Can be used for analytics purposes to track what options are popular on certain encounters - const encounterSaveData = globalScene.mysteryEncounterSaveData.encounteredEvents[globalScene.mysteryEncounterSaveData.encounteredEvents.length - 1]; + const encounterSaveData = + globalScene.mysteryEncounterSaveData.encounteredEvents[ + globalScene.mysteryEncounterSaveData.encounteredEvents.length - 1 + ]; if (encounterSaveData.type === globalScene.currentBattle.mysteryEncounter?.encounterType) { encounterSaveData.selectedOption = index; } @@ -101,12 +106,11 @@ export class MysteryEncounterPhase extends Phase { if (option.onPreOptionPhase) { globalScene.executeWithSeedOffset(async () => { - return await option.onPreOptionPhase!() - .then((result) => { - if (isNullOrUndefined(result) || result) { - this.continueEncounter(); - } - }); + return await option.onPreOptionPhase!().then(result => { + if (isNullOrUndefined(result) || result) { + this.continueEncounter(); + } + }); }, globalScene.currentBattle.mysteryEncounter?.getSeedOffset()); } else { this.continueEncounter(); @@ -141,7 +145,14 @@ export class MysteryEncounterPhase extends Phase { i++; if (title) { - globalScene.ui.showDialogue(text ?? "", title, null, nextAction, 0, i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0); + globalScene.ui.showDialogue( + text ?? "", + title, + null, + nextAction, + 0, + i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0, + ); } else { globalScene.ui.showText(text ?? "", null, nextAction, i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0, true); } @@ -210,10 +221,6 @@ export class MysteryEncounterOptionSelectedPhase extends Phase { * See {@linkcode TurnEndPhase} for more details */ export class MysteryEncounterBattleStartCleanupPhase extends Phase { - constructor() { - super(); - } - /** * Cleans up `TURN_END` tags, any {@linkcode PostTurnStatusEffectPhase}s, checks for Pokemon switches, then continues */ @@ -221,20 +228,25 @@ export class MysteryEncounterBattleStartCleanupPhase extends Phase { super.start(); // Lapse any residual flinches/endures but ignore all other turn-end battle tags - const includedLapseTags = [ BattlerTagType.FLINCHED, BattlerTagType.ENDURING ]; + const includedLapseTags = [BattlerTagType.FLINCHED, BattlerTagType.ENDURING]; const field = globalScene.getField(true).filter(p => p.summonData); field.forEach(pokemon => { const tags = pokemon.summonData.tags; - tags.filter(t => includedLapseTags.includes(t.tagType) - && t.lapseTypes.includes(BattlerTagLapseType.TURN_END) - && !(t.lapse(pokemon, BattlerTagLapseType.TURN_END))).forEach(t => { - t.onRemove(pokemon); - tags.splice(tags.indexOf(t), 1); - }); + tags + .filter( + t => + includedLapseTags.includes(t.tagType) && + t.lapseTypes.includes(BattlerTagLapseType.TURN_END) && + !t.lapse(pokemon, BattlerTagLapseType.TURN_END), + ) + .forEach(t => { + t.onRemove(pokemon); + tags.splice(tags.indexOf(t), 1); + }); }); // Remove any status tick phases - while (!!globalScene.findPhase(p => p instanceof PostTurnStatusEffectPhase)) { + while (globalScene.findPhase(p => p instanceof PostTurnStatusEffectPhase)) { globalScene.tryRemovePhase(p => p instanceof PostTurnStatusEffectPhase); } @@ -303,16 +315,23 @@ export class MysteryEncounterBattlePhase extends Phase { if (encounterMode === MysteryEncounterMode.TRAINER_BATTLE) { if (globalScene.currentBattle.double) { - return i18next.t("battle:trainerAppearedDouble", { trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) }); - - } else { - return i18next.t("battle:trainerAppeared", { trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) }); + return i18next.t("battle:trainerAppearedDouble", { + trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true), + }); } + return i18next.t("battle:trainerAppeared", { + trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true), + }); } return enemyField.length === 1 - ? i18next.t("battle:singleWildAppeared", { pokemonName: enemyField[0].name }) - : i18next.t("battle:multiWildAppeared", { pokemonName1: enemyField[0].name, pokemonName2: enemyField[1].name }); + ? i18next.t("battle:singleWildAppeared", { + pokemonName: enemyField[0].name, + }) + : i18next.t("battle:multiWildAppeared", { + pokemonName1: enemyField[0].name, + pokemonName2: enemyField[1].name, + }); } /** @@ -367,7 +386,10 @@ export class MysteryEncounterBattlePhase extends Phase { } else { const trainer = globalScene.currentBattle.trainer; let message: string; - globalScene.executeWithSeedOffset(() => message = Utils.randSeedItem(encounterMessages), globalScene.currentBattle.mysteryEncounter?.getSeedOffset()); + globalScene.executeWithSeedOffset( + () => (message = Utils.randSeedItem(encounterMessages)), + globalScene.currentBattle.mysteryEncounter?.getSeedOffset(), + ); message = message!; // tell TS compiler it's defined now const showDialogueAndSummon = () => { globalScene.ui.showDialogue(message, trainer?.getName(TrainerSlot.NONE, true), null, () => { @@ -375,7 +397,13 @@ export class MysteryEncounterBattlePhase extends Phase { }); }; if (globalScene.currentBattle.trainer?.config.hasCharSprite && !globalScene.ui.shouldSkipDialogue(message)) { - globalScene.showFieldOverlay(500).then(() => globalScene.charSprite.showCharacter(trainer?.getKey()!, getCharVariantFromDialogue(encounterMessages[0])).then(() => showDialogueAndSummon())); // TODO: is this bang correct? + globalScene + .showFieldOverlay(500) + .then(() => + globalScene.charSprite + .showCharacter(trainer?.getKey()!, getCharVariantFromDialogue(encounterMessages[0])) + .then(() => showDialogueAndSummon()), + ); // TODO: is this bang correct? } else { showDialogueAndSummon(); } @@ -396,7 +424,7 @@ export class MysteryEncounterBattlePhase extends Phase { if (encounterMode !== MysteryEncounterMode.TRAINER_BATTLE) { const ivScannerModifier = globalScene.findModifier(m => m instanceof IvScannerModifier); if (ivScannerModifier) { - enemyField.map(p => globalScene.pushPhase(new ScanIvsPhase(p.getBattlerIndex(), Math.min(ivScannerModifier.getStackCount() * 2, 6)))); + enemyField.map(p => globalScene.pushPhase(new ScanIvsPhase(p.getBattlerIndex()))); } } @@ -415,7 +443,7 @@ export class MysteryEncounterBattlePhase extends Phase { } } else { if (availablePartyMembers.length > 1 && availablePartyMembers[1].isOnField()) { - globalScene.getPlayerField().forEach((pokemon) => pokemon.lapseTag(BattlerTagType.COMMANDED)); + globalScene.getPlayerField().forEach(pokemon => pokemon.lapseTag(BattlerTagType.COMMANDED)); globalScene.pushPhase(new ReturnPhase(1)); } globalScene.pushPhase(new ToggleDoublePositionPhase(false)); @@ -458,7 +486,7 @@ export class MysteryEncounterBattlePhase extends Phase { onComplete: () => { trainer.untint(100, "Sine.easeOut"); trainer.playAnim(); - } + }, }); } @@ -469,7 +497,7 @@ export class MysteryEncounterBattlePhase extends Phase { y: "-=16", alpha: 0, ease: "Sine.easeInOut", - duration: 750 + duration: 750, }); } } @@ -488,7 +516,7 @@ export class MysteryEncounterBattlePhase extends Phase { export class MysteryEncounterRewardsPhase extends Phase { addHealPhase: boolean; - constructor(addHealPhase: boolean = false) { + constructor(addHealPhase = false) { super(); this.addHealPhase = addHealPhase; } @@ -532,7 +560,12 @@ export class MysteryEncounterRewardsPhase extends Phase { encounter.doEncounterRewards(); } else if (this.addHealPhase) { globalScene.tryRemovePhase(p => p instanceof SelectModifierPhase); - globalScene.unshiftPhase(new SelectModifierPhase(0, undefined, { fillRemaining: false, rerollMultiplier: -1 })); + globalScene.unshiftPhase( + new SelectModifierPhase(0, undefined, { + fillRemaining: false, + rerollMultiplier: -1, + }), + ); } globalScene.pushPhase(new PostMysteryEncounterPhase()); @@ -564,12 +597,11 @@ export class PostMysteryEncounterPhase extends Phase { if (this.onPostOptionSelect) { globalScene.executeWithSeedOffset(async () => { - return await this.onPostOptionSelect!() - .then((result) => { - if (isNullOrUndefined(result) || result) { - this.continueEncounter(); - } - }); + return await this.onPostOptionSelect!().then(result => { + if (isNullOrUndefined(result) || result) { + this.continueEncounter(); + } + }); }, globalScene.currentBattle.mysteryEncounter?.getSeedOffset() * 2000); } else { this.continueEncounter(); @@ -600,7 +632,14 @@ export class PostMysteryEncounterPhase extends Phase { i++; globalScene.ui.setMode(Mode.MESSAGE); if (title) { - globalScene.ui.showDialogue(text ?? "", title, null, nextAction, 0, i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0); + globalScene.ui.showDialogue( + text ?? "", + title, + null, + nextAction, + 0, + i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0, + ); } else { globalScene.ui.showText(text ?? "", null, nextAction, i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0, true); } diff --git a/src/phases/new-biome-encounter-phase.ts b/src/phases/new-biome-encounter-phase.ts index 2de9a4300c5..ed768742aac 100644 --- a/src/phases/new-biome-encounter-phase.ts +++ b/src/phases/new-biome-encounter-phase.ts @@ -23,7 +23,7 @@ export class NewBiomeEncounterPhase extends NextEncounterPhase { } const enemyField = globalScene.getEnemyField(); - const moveTargets: any[] = [ globalScene.arenaEnemy, enemyField ]; + const moveTargets: any[] = [globalScene.arenaEnemy, enemyField]; const mysteryEncounter = globalScene.currentBattle?.mysteryEncounter?.introVisuals; if (mysteryEncounter) { moveTargets.push(mysteryEncounter); @@ -37,7 +37,7 @@ export class NewBiomeEncounterPhase extends NextEncounterPhase { if (!this.tryOverrideForBattleSpec()) { this.doEncounterCommon(); } - } + }, }); } diff --git a/src/phases/next-encounter-phase.ts b/src/phases/next-encounter-phase.ts index 229d37f9a69..e53f775f083 100644 --- a/src/phases/next-encounter-phase.ts +++ b/src/phases/next-encounter-phase.ts @@ -23,7 +23,13 @@ export class NextEncounterPhase extends EncounterPhase { globalScene.arenaNextEnemy.setVisible(true); const enemyField = globalScene.getEnemyField(); - const moveTargets: any[] = [ globalScene.arenaEnemy, globalScene.arenaNextEnemy, globalScene.currentBattle.trainer, enemyField, globalScene.lastEnemyTrainer ]; + const moveTargets: any[] = [ + globalScene.arenaEnemy, + globalScene.arenaNextEnemy, + globalScene.currentBattle.trainer, + enemyField, + globalScene.lastEnemyTrainer, + ]; const lastEncounterVisuals = globalScene.lastMysteryEncounter?.introVisuals; if (lastEncounterVisuals) { moveTargets.push(lastEncounterVisuals); @@ -36,7 +42,7 @@ export class NextEncounterPhase extends EncounterPhase { globalScene.tweens.add({ targets: nextEncounterVisuals, x: "-=200", - duration: 2000 + duration: 2000, }); } else { moveTargets.push(nextEncounterVisuals); @@ -64,13 +70,12 @@ export class NextEncounterPhase extends EncounterPhase { if (!this.tryOverrideForBattleSpec()) { this.doEncounterCommon(); } - } + }, }); } /** * Do nothing (since this is simply the next wave in the same biome). */ - trySetWeatherIfNewBiome(): void { - } + trySetWeatherIfNewBiome(): void {} } diff --git a/src/phases/obtain-status-effect-phase.ts b/src/phases/obtain-status-effect-phase.ts index b01a90bd235..a0c0c14e93f 100644 --- a/src/phases/obtain-status-effect-phase.ts +++ b/src/phases/obtain-status-effect-phase.ts @@ -13,7 +13,13 @@ export class ObtainStatusEffectPhase extends PokemonPhase { private sourceText?: string | null; private sourcePokemon?: Pokemon | null; - constructor(battlerIndex: BattlerIndex, statusEffect?: StatusEffect, turnsRemaining?: number, sourceText?: string | null, sourcePokemon?: Pokemon | null) { + constructor( + battlerIndex: BattlerIndex, + statusEffect?: StatusEffect, + turnsRemaining?: number, + sourceText?: string | null, + sourcePokemon?: Pokemon | null, + ) { super(battlerIndex); this.statusEffect = statusEffect; @@ -31,13 +37,21 @@ export class ObtainStatusEffectPhase extends PokemonPhase { } pokemon.updateInfo(true); new CommonBattleAnim(CommonAnim.POISON + (this.statusEffect! - 1), pokemon).play(false, () => { - globalScene.queueMessage(getStatusEffectObtainText(this.statusEffect, getPokemonNameWithAffix(pokemon), this.sourceText ?? undefined)); + globalScene.queueMessage( + getStatusEffectObtainText( + this.statusEffect, + getPokemonNameWithAffix(pokemon), + this.sourceText ?? undefined, + ), + ); this.end(); }); return; } } else if (pokemon.status?.effect === this.statusEffect) { - globalScene.queueMessage(getStatusEffectOverlapText(this.statusEffect ?? StatusEffect.NONE, getPokemonNameWithAffix(pokemon))); + globalScene.queueMessage( + getStatusEffectOverlapText(this.statusEffect ?? StatusEffect.NONE, getPokemonNameWithAffix(pokemon)), + ); } this.end(); } diff --git a/src/phases/party-heal-phase.ts b/src/phases/party-heal-phase.ts index 2c1a6c33163..d95400a3f48 100644 --- a/src/phases/party-heal-phase.ts +++ b/src/phases/party-heal-phase.ts @@ -23,7 +23,7 @@ export class PartyHealPhase extends BattlePhase { pokemon.hp = pokemon.getMaxHp(); pokemon.resetStatus(); for (const move of pokemon.moveset) { - move!.ppUsed = 0; // TODO: is this bang correct? + move!.ppUsed = 0; // TODO: is this bang correct? } pokemon.updateInfo(true); } @@ -36,5 +36,6 @@ export class PartyHealPhase extends BattlePhase { globalScene.ui.fadeIn(500).then(() => this.end()); }); }); + globalScene.arena.playerTerasUsed = 0; } } diff --git a/src/phases/party-member-pokemon-phase.ts b/src/phases/party-member-pokemon-phase.ts index bc702c832b1..a782eabda38 100644 --- a/src/phases/party-member-pokemon-phase.ts +++ b/src/phases/party-member-pokemon-phase.ts @@ -3,17 +3,15 @@ import type Pokemon from "#app/field/pokemon"; import { FieldPhase } from "./field-phase"; export abstract class PartyMemberPokemonPhase extends FieldPhase { - protected partyMemberIndex: integer; - protected fieldIndex: integer; + protected partyMemberIndex: number; + protected fieldIndex: number; protected player: boolean; - constructor(partyMemberIndex: integer, player: boolean) { + constructor(partyMemberIndex: number, player: boolean) { super(); this.partyMemberIndex = partyMemberIndex; - this.fieldIndex = partyMemberIndex < globalScene.currentBattle.getBattlerCount() - ? partyMemberIndex - : -1; + this.fieldIndex = partyMemberIndex < globalScene.currentBattle.getBattlerCount() ? partyMemberIndex : -1; this.player = player; } diff --git a/src/phases/player-party-member-pokemon-phase.ts b/src/phases/player-party-member-pokemon-phase.ts index bdedc0743e9..d97376a8614 100644 --- a/src/phases/player-party-member-pokemon-phase.ts +++ b/src/phases/player-party-member-pokemon-phase.ts @@ -2,7 +2,7 @@ import type { PlayerPokemon } from "#app/field/pokemon"; import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase"; export abstract class PlayerPartyMemberPokemonPhase extends PartyMemberPokemonPhase { - constructor(partyMemberIndex: integer) { + constructor(partyMemberIndex: number) { super(partyMemberIndex, true); } diff --git a/src/phases/pokemon-anim-phase.ts b/src/phases/pokemon-anim-phase.ts index 54140ec96b5..b9c91508b5a 100644 --- a/src/phases/pokemon-anim-phase.ts +++ b/src/phases/pokemon-anim-phase.ts @@ -6,7 +6,6 @@ import { isNullOrUndefined } from "#app/utils"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; import { Species } from "#enums/species"; - export class PokemonAnimPhase extends BattlePhase { /** The type of animation to play in this phase */ private key: PokemonAnimType; @@ -60,19 +59,19 @@ export class PokemonAnimPhase extends BattlePhase { const sprite = globalScene.addFieldSprite( this.pokemon.x + this.pokemon.getSprite().x, this.pokemon.y + this.pokemon.getSprite().y, - `pkmn${this.pokemon.isPlayer() ? "__back" : ""}__sub` + `pkmn${this.pokemon.isPlayer() ? "__back" : ""}__sub`, ); sprite.setOrigin(0.5, 1); globalScene.field.add(sprite); return sprite; }; - const [ subSprite, subTintSprite ] = [ getSprite(), getSprite() ]; + const [subSprite, subTintSprite] = [getSprite(), getSprite()]; const subScale = this.pokemon.getSpriteScale() * (this.pokemon.isPlayer() ? 0.5 : 1); subSprite.setVisible(false); subSprite.setScale(subScale); - subTintSprite.setTintFill(0xFFFFFF); + subTintSprite.setTintFill(0xffffff); subTintSprite.setScale(0.01); if (this.pokemon.isPlayer()) { @@ -87,7 +86,7 @@ export class PokemonAnimPhase extends BattlePhase { x: this.pokemon.x + this.pokemon.getSubstituteOffset()[0], y: this.pokemon.y + this.pokemon.getSubstituteOffset()[1], alpha: 0.5, - ease: "Sine.easeIn" + ease: "Sine.easeIn", }); globalScene.tweens.add({ @@ -108,9 +107,9 @@ export class PokemonAnimPhase extends BattlePhase { subTintSprite.destroy(); substitute.sprite = subSprite; this.end(); - } + }, }); - } + }, }); } @@ -128,7 +127,7 @@ export class PokemonAnimPhase extends BattlePhase { targets: subSprite, alpha: 0, ease: "Sine.easeInOut", - duration: 500 + duration: 500, }); globalScene.tweens.add({ @@ -139,7 +138,7 @@ export class PokemonAnimPhase extends BattlePhase { ease: "Sine.easeInOut", delay: 250, duration: 500, - onComplete: () => this.end() + onComplete: () => this.end(), }); } @@ -159,7 +158,7 @@ export class PokemonAnimPhase extends BattlePhase { y: subSprite.y + this.pokemon.getSubstituteOffset()[1], alpha: 0.5, ease: "Sine.easeInOut", - duration: 500 + duration: 500, }); globalScene.tweens.add({ @@ -168,7 +167,7 @@ export class PokemonAnimPhase extends BattlePhase { ease: "Sine.easeInOut", delay: 250, duration: 500, - onComplete: () => this.end() + onComplete: () => this.end(), }); } @@ -186,7 +185,7 @@ export class PokemonAnimPhase extends BattlePhase { const sprite = globalScene.addFieldSprite( subSprite.x, subSprite.y, - `pkmn${this.pokemon.isPlayer() ? "__back" : ""}__sub` + `pkmn${this.pokemon.isPlayer() ? "__back" : ""}__sub`, ); sprite.setOrigin(0.5, 1); globalScene.field.add(sprite); @@ -196,7 +195,7 @@ export class PokemonAnimPhase extends BattlePhase { const subTintSprite = getSprite(); const subScale = this.pokemon.getSpriteScale() * (this.pokemon.isPlayer() ? 0.5 : 1); subTintSprite.setAlpha(0); - subTintSprite.setTintFill(0xFFFFFF); + subTintSprite.setTintFill(0xffffff); subTintSprite.setScale(subScale); globalScene.tweens.add({ @@ -219,7 +218,7 @@ export class PokemonAnimPhase extends BattlePhase { targets: subTintSprite, scale: 0.01, ease: "Sine.cubicEaseIn", - duration: 500 + duration: 500, }); globalScene.tweens.add({ @@ -233,12 +232,12 @@ export class PokemonAnimPhase extends BattlePhase { onComplete: () => { subTintSprite.destroy(); this.end(); - } + }, }); } - } + }, }); - } + }, }); } @@ -256,8 +255,17 @@ export class PokemonAnimPhase extends BattlePhase { const tatsugiriY = this.pokemon.y + this.pokemon.getSprite().y; const getSourceSprite = () => { - const sprite = globalScene.addPokemonSprite(this.pokemon, tatsugiriX, tatsugiriY, this.pokemon.getSprite().texture, this.pokemon.getSprite()!.frame.name, true); - [ "spriteColors", "fusionSpriteColors" ].map(k => sprite.pipelineData[k] = this.pokemon.getSprite().pipelineData[k]); + const sprite = globalScene.addPokemonSprite( + this.pokemon, + tatsugiriX, + tatsugiriY, + this.pokemon.getSprite().texture, + this.pokemon.getSprite()!.frame.name, + true, + ); + ["spriteColors", "fusionSpriteColors"].map( + k => (sprite.pipelineData[k] = this.pokemon.getSprite().pipelineData[k]), + ); sprite.setPipelineData("spriteKey", this.pokemon.getBattleSpriteKey()); sprite.setPipelineData("shiny", this.pokemon.shiny); sprite.setPipelineData("variant", this.pokemon.variant); @@ -281,8 +289,14 @@ export class PokemonAnimPhase extends BattlePhase { targets: sourceSprite, duration: 375, scale: 0.5, - x: { value: tatsugiriX + (dondozoFpOffset[0] - sourceFpOffset[0]) / 2, ease: "Linear" }, - y: { value: (this.pokemon.isPlayer() ? 100 : 65) + sourceFpOffset[1], ease: "Sine.easeOut" }, + x: { + value: tatsugiriX + (dondozoFpOffset[0] - sourceFpOffset[0]) / 2, + ease: "Linear", + }, + y: { + value: (this.pokemon.isPlayer() ? 100 : 65) + sourceFpOffset[1], + ease: "Sine.easeOut", + }, onComplete: () => { globalScene.field.bringToTop(dondozo); globalScene.tweens.add({ @@ -300,11 +314,11 @@ export class PokemonAnimPhase extends BattlePhase { ease: "Sine.easeInOut", scale: 0.85, yoyo: true, - onComplete: () => this.end() + onComplete: () => this.end(), }); - } + }, }); - } + }, }); } @@ -323,9 +337,11 @@ export class PokemonAnimPhase extends BattlePhase { this.pokemon.y + this.pokemon.getSprite().y + this.pokemon.height / 2, tatsugiri.getSprite().texture, tatsugiri.getSprite()!.frame.name, - true + true, + ); + ["spriteColors", "fusionSpriteColors"].map( + k => (tatsuSprite.pipelineData[k] = tatsugiri.getSprite().pipelineData[k]), ); - [ "spriteColors", "fusionSpriteColors" ].map(k => tatsuSprite.pipelineData[k] = tatsugiri.getSprite().pipelineData[k]); tatsuSprite.setPipelineData("spriteKey", tatsugiri.getBattleSpriteKey()); tatsuSprite.setPipelineData("shiny", tatsugiri.shiny); tatsuSprite.setPipelineData("variant", tatsugiri.variant); @@ -352,14 +368,17 @@ export class PokemonAnimPhase extends BattlePhase { duration: 500, scale: 1, x: { value: tatsugiri.x + tatsugiri.getSprite().x, ease: "Linear" }, - y: { value: tatsugiri.y + tatsugiri.getSprite().y, ease: "Sine.easeIn" }, + y: { + value: tatsugiri.y + tatsugiri.getSprite().y, + ease: "Sine.easeIn", + }, onComplete: () => { tatsugiri.setVisible(true); tatsuSprite.destroy(); this.end(); - } + }, }); - } + }, }); } } diff --git a/src/phases/pokemon-heal-phase.ts b/src/phases/pokemon-heal-phase.ts index 268794ce97c..ab49def5a3d 100644 --- a/src/phases/pokemon-heal-phase.ts +++ b/src/phases/pokemon-heal-phase.ts @@ -15,7 +15,7 @@ import { BattlerTagType } from "#app/enums/battler-tag-type"; import type { HealBlockTag } from "#app/data/battler-tags"; export class PokemonHealPhase extends CommonAnimPhase { - private hpHealed: integer; + private hpHealed: number; private message: string | null; private showFullHpMessage: boolean; private skipAnim: boolean; @@ -24,7 +24,17 @@ export class PokemonHealPhase extends CommonAnimPhase { private preventFullHeal: boolean; private fullRestorePP: boolean; - constructor(battlerIndex: BattlerIndex, hpHealed: integer, message: string | null, showFullHpMessage: boolean, skipAnim: boolean = false, revive: boolean = false, healStatus: boolean = false, preventFullHeal: boolean = false, fullRestorePP: boolean = false) { + constructor( + battlerIndex: BattlerIndex, + hpHealed: number, + message: string | null, + showFullHpMessage: boolean, + skipAnim = false, + revive = false, + healStatus = false, + preventFullHeal = false, + fullRestorePP = false, + ) { super(battlerIndex, undefined, CommonAnim.HEALTH_UP); this.hpHealed = hpHealed; @@ -53,7 +63,7 @@ export class PokemonHealPhase extends CommonAnimPhase { } const hasMessage = !!this.message; - const healOrDamage = (!pokemon.isFullHp() || this.hpHealed < 0); + const healOrDamage = !pokemon.isFullHp() || this.hpHealed < 0; const healBlock = pokemon.getTag(BattlerTagType.HEAL_BLOCK) as HealBlockTag; let lastStatusEffect = StatusEffect.NONE; @@ -61,8 +71,9 @@ export class PokemonHealPhase extends CommonAnimPhase { globalScene.queueMessage(healBlock.onActivation(pokemon)); this.message = null; return super.end(); - } else if (healOrDamage) { - const hpRestoreMultiplier = new Utils.IntegerHolder(1); + } + if (healOrDamage) { + const hpRestoreMultiplier = new Utils.NumberHolder(1); if (!this.revive) { globalScene.applyModifiers(HealingBoosterModifier, this.player, hpRestoreMultiplier); } @@ -73,7 +84,7 @@ export class PokemonHealPhase extends CommonAnimPhase { } // Prevent healing to full if specified (in case of healing tokens so Sturdy doesn't cause a softlock) if (this.preventFullHeal && pokemon.hp + healAmount.value >= pokemon.getMaxHp()) { - healAmount.value = (pokemon.getMaxHp() - pokemon.hp) - 1; + healAmount.value = pokemon.getMaxHp() - pokemon.hp - 1; } healAmount.value = pokemon.heal(healAmount.value); if (healAmount.value) { @@ -102,7 +113,9 @@ export class PokemonHealPhase extends CommonAnimPhase { pokemon.resetStatus(); pokemon.updateInfo().then(() => super.end()); } else if (this.showFullHpMessage) { - this.message = i18next.t("battle:hpIsFull", { pokemonName: getPokemonNameWithAffix(pokemon) }); + this.message = i18next.t("battle:hpIsFull", { + pokemonName: getPokemonNameWithAffix(pokemon), + }); } if (this.message) { diff --git a/src/phases/pokemon-phase.ts b/src/phases/pokemon-phase.ts index 29153ee726a..3ca5f09f953 100644 --- a/src/phases/pokemon-phase.ts +++ b/src/phases/pokemon-phase.ts @@ -4,15 +4,18 @@ import type Pokemon from "#app/field/pokemon"; import { FieldPhase } from "./field-phase"; export abstract class PokemonPhase extends FieldPhase { - protected battlerIndex: BattlerIndex | integer; + protected battlerIndex: BattlerIndex | number; public player: boolean; - public fieldIndex: integer; + public fieldIndex: number; - constructor(battlerIndex?: BattlerIndex | integer) { + constructor(battlerIndex?: BattlerIndex | number) { super(); if (battlerIndex === undefined) { - battlerIndex = globalScene.getField().find(p => p?.isActive())!.getBattlerIndex(); // TODO: is the bang correct here? + battlerIndex = globalScene + .getField() + .find(p => p?.isActive())! + .getBattlerIndex(); // TODO: is the bang correct here? } this.battlerIndex = battlerIndex; diff --git a/src/phases/pokemon-transform-phase.ts b/src/phases/pokemon-transform-phase.ts new file mode 100644 index 00000000000..b33689321b5 --- /dev/null +++ b/src/phases/pokemon-transform-phase.ts @@ -0,0 +1,85 @@ +import type { BattlerIndex } from "#app/battle"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Moves } from "#enums/moves"; +import { EFFECTIVE_STATS, BATTLE_STATS } from "#enums/stat"; +import { PokemonMove } from "#app/field/pokemon"; +import { globalScene } from "#app/global-scene"; +import { PokemonPhase } from "./pokemon-phase"; +import { getPokemonNameWithAffix } from "#app/messages"; +import i18next from "i18next"; + +/** + * Transforms a Pokemon into another Pokemon on the field. + * Used for Transform (move) and Imposter (ability) + */ +export class PokemonTransformPhase extends PokemonPhase { + protected targetIndex: BattlerIndex; + private playSound: boolean; + + constructor(userIndex: BattlerIndex, targetIndex: BattlerIndex, playSound = false) { + super(userIndex); + + this.targetIndex = targetIndex; + this.playSound = playSound; + } + + public override start(): void { + const user = this.getPokemon(); + const target = globalScene.getField(true).find(p => p.getBattlerIndex() === this.targetIndex); + + if (!target) { + return this.end(); + } + + user.summonData.speciesForm = target.getSpeciesForm(); + user.summonData.ability = target.getAbility().id; + user.summonData.gender = target.getGender(); + + // Power Trick's effect is removed after using Transform + user.removeTag(BattlerTagType.POWER_TRICK); + + // Copy all stats (except HP) + for (const s of EFFECTIVE_STATS) { + user.setStat(s, target.getStat(s, false), false); + } + + // Copy all stat stages + for (const s of BATTLE_STATS) { + user.setStatStage(s, target.getStatStage(s)); + } + + user.summonData.moveset = target.getMoveset().map(m => { + if (m) { + // If PP value is less than 5, do nothing. If greater, we need to reduce the value to 5. + return new PokemonMove(m.moveId, 0, 0, false, Math.min(m.getMove().pp, 5)); + } + console.warn(`Transform: somehow iterating over a ${m} value when copying moveset!`); + return new PokemonMove(Moves.NONE); + }); + user.summonData.types = target.getTypes(); + + const promises = [user.updateInfo()]; + + if (this.playSound) { + globalScene.playSound("battle_anims/PRSFX- Transform"); + } + + globalScene.queueMessage( + i18next.t("abilityTriggers:postSummonTransform", { + pokemonNameWithAffix: getPokemonNameWithAffix(user), + targetName: target.name, + }), + ); + + promises.push( + user.loadAssets(false).then(() => { + user.playAnim(); + user.updateInfo(); + // If the new ability activates immediately, it needs to happen after all the transform animations + user.setTempAbility(target.getAbility()); + }), + ); + + Promise.allSettled(promises).then(() => this.end()); + } +} diff --git a/src/phases/post-game-over-phase.ts b/src/phases/post-game-over-phase.ts index 4643d4d1bef..f86ec8496e0 100644 --- a/src/phases/post-game-over-phase.ts +++ b/src/phases/post-game-over-phase.ts @@ -20,14 +20,16 @@ export class PostGameOverPhase extends Phase { if (!success) { return globalScene.reset(true); } - globalScene.gameData.tryClearSession(globalScene.sessionSlotId).then((success: boolean | [boolean, boolean]) => { - if (!success[0]) { - return globalScene.reset(true); - } - globalScene.reset(); - globalScene.unshiftPhase(new TitlePhase()); - this.end(); - }); + globalScene.gameData + .tryClearSession(globalScene.sessionSlotId) + .then((success: boolean | [boolean, boolean]) => { + if (!success[0]) { + return globalScene.reset(true); + } + globalScene.reset(); + globalScene.unshiftPhase(new TitlePhase()); + this.end(); + }); }); }; diff --git a/src/phases/post-summon-phase.ts b/src/phases/post-summon-phase.ts index d76708b7050..a7aa9389505 100644 --- a/src/phases/post-summon-phase.ts +++ b/src/phases/post-summon-phase.ts @@ -8,10 +8,6 @@ import { MysteryEncounterPostSummonTag } from "#app/data/battler-tags"; import { BattlerTagType } from "#enums/battler-tag-type"; export class PostSummonPhase extends PokemonPhase { - constructor(battlerIndex: BattlerIndex) { - super(battlerIndex); - } - start() { super.start(); @@ -23,16 +19,19 @@ export class PostSummonPhase extends PokemonPhase { globalScene.arena.applyTags(ArenaTrapTag, false, pokemon); // If this is mystery encounter and has post summon phase tag, apply post summon effects - if (globalScene.currentBattle.isBattleMysteryEncounter() && pokemon.findTags(t => t instanceof MysteryEncounterPostSummonTag).length > 0) { + if ( + globalScene.currentBattle.isBattleMysteryEncounter() && + pokemon.findTags(t => t instanceof MysteryEncounterPostSummonTag).length > 0 + ) { pokemon.lapseTag(BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON); } - applyPostSummonAbAttrs(PostSummonAbAttr, pokemon) - .then(() => { - const field = pokemon.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField(); - field.forEach((p) => applyAbAttrs(CommanderAbAttr, p, null, false)); + applyPostSummonAbAttrs(PostSummonAbAttr, pokemon); + const field = pokemon.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField(); + for (const p of field) { + applyAbAttrs(CommanderAbAttr, p, null, false); + } - this.end(); - }); + this.end(); } } diff --git a/src/phases/post-turn-status-effect-phase.ts b/src/phases/post-turn-status-effect-phase.ts index 13cac6eed7c..f6341666e7e 100644 --- a/src/phases/post-turn-status-effect-phase.ts +++ b/src/phases/post-turn-status-effect-phase.ts @@ -1,6 +1,13 @@ import { globalScene } from "#app/global-scene"; import type { BattlerIndex } from "#app/battle"; -import { applyAbAttrs, applyPostDamageAbAttrs, BlockNonDirectDamageAbAttr, BlockStatusDamageAbAttr, PostDamageAbAttr, ReduceBurnDamageAbAttr } from "#app/data/ability"; +import { + applyAbAttrs, + applyPostDamageAbAttrs, + BlockNonDirectDamageAbAttr, + BlockStatusDamageAbAttr, + PostDamageAbAttr, + ReduceBurnDamageAbAttr, +} from "#app/data/ability"; import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims"; import { getStatusEffectActivationText } from "#app/data/status-effect"; import { BattleSpec } from "#app/enums/battle-spec"; @@ -10,6 +17,7 @@ import * as Utils from "#app/utils"; import { PokemonPhase } from "./pokemon-phase"; export class PostTurnStatusEffectPhase extends PokemonPhase { + // biome-ignore lint/complexity/noUselessConstructor: Not unnecessary as it makes battlerIndex required constructor(battlerIndex: BattlerIndex) { super(battlerIndex); } @@ -23,7 +31,9 @@ export class PostTurnStatusEffectPhase extends PokemonPhase { applyAbAttrs(BlockStatusDamageAbAttr, pokemon, cancelled); if (!cancelled.value) { - globalScene.queueMessage(getStatusEffectActivationText(pokemon.status.effect, getPokemonNameWithAffix(pokemon))); + globalScene.queueMessage( + getStatusEffectActivationText(pokemon.status.effect, getPokemonNameWithAffix(pokemon)), + ); const damage = new Utils.NumberHolder(0); switch (pokemon.status.effect) { case StatusEffect.POISON: diff --git a/src/phases/quiet-form-change-phase.ts b/src/phases/quiet-form-change-phase.ts index 185156a20c7..1512609abf9 100644 --- a/src/phases/quiet-form-change-phase.ts +++ b/src/phases/quiet-form-change-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { SemiInvulnerableTag } from "#app/data/battler-tags"; import type { SpeciesFormChange } from "#app/data/pokemon-forms"; -import { getSpeciesFormChangeMessage } from "#app/data/pokemon-forms"; +import { getSpeciesFormChangeMessage, SpeciesFormChangeTeraTrigger } from "#app/data/pokemon-forms"; import { getTypeRgb } from "#app/data/type"; import { BattleSpec } from "#app/enums/battle-spec"; import { BattlerTagType } from "#app/enums/battler-tag-type"; @@ -11,6 +11,12 @@ import { getPokemonNameWithAffix } from "#app/messages"; import { BattlePhase } from "./battle-phase"; import { MovePhase } from "./move-phase"; import { PokemonHealPhase } from "./pokemon-heal-phase"; +import { + applyAbAttrs, + ClearTerrainAbAttr, + ClearWeatherAbAttr, + PostTeraFormChangeStatChangeAbAttr, +} from "#app/data/ability"; export class QuietFormChangePhase extends BattlePhase { protected pokemon: Pokemon; @@ -34,7 +40,12 @@ export class QuietFormChangePhase extends BattlePhase { if (!this.pokemon.isOnField() || this.pokemon.getTag(SemiInvulnerableTag) || this.pokemon.isFainted()) { if (this.pokemon.isPlayer() || this.pokemon.isActive()) { this.pokemon.changeForm(this.formChange).then(() => { - globalScene.ui.showText(getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), null, () => this.end(), 1500); + globalScene.ui.showText( + getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), + null, + () => this.end(), + 1500, + ); }); } else { this.end(); @@ -43,7 +54,12 @@ export class QuietFormChangePhase extends BattlePhase { } const getPokemonSprite = () => { - const sprite = globalScene.addPokemonSprite(this.pokemon, this.pokemon.x + this.pokemon.getSprite().x, this.pokemon.y + this.pokemon.getSprite().y, "pkmn__sub"); + const sprite = globalScene.addPokemonSprite( + this.pokemon, + this.pokemon.x + this.pokemon.getSprite().x, + this.pokemon.y + this.pokemon.getSprite().y, + "pkmn__sub", + ); sprite.setOrigin(0.5, 1); const spriteKey = this.pokemon.getBattleSpriteKey(); try { @@ -51,8 +67,13 @@ export class QuietFormChangePhase extends BattlePhase { } catch (err: unknown) { console.error(`Failed to play animation for ${spriteKey}`, err); } - sprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: false, teraColor: getTypeRgb(this.pokemon.getTeraType()) }); - [ "spriteColors", "fusionSpriteColors" ].map(k => { + sprite.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + hasShadow: false, + teraColor: getTypeRgb(this.pokemon.getTeraType()), + isTerastallized: this.pokemon.isTerastallized, + }); + ["spriteColors", "fusionSpriteColors"].map(k => { if (this.pokemon.summonData?.speciesForm) { k += "Base"; } @@ -62,7 +83,7 @@ export class QuietFormChangePhase extends BattlePhase { return sprite; }; - const [ pokemonTintSprite, pokemonFormTintSprite ] = [ getPokemonSprite(), getPokemonSprite() ]; + const [pokemonTintSprite, pokemonFormTintSprite] = [getPokemonSprite(), getPokemonSprite()]; this.pokemon.getSprite().on("animationupdate", (_anim, frame) => { if (frame.textureKey === pokemonTintSprite.texture.key) { @@ -73,9 +94,9 @@ export class QuietFormChangePhase extends BattlePhase { }); pokemonTintSprite.setAlpha(0); - pokemonTintSprite.setTintFill(0xFFFFFF); + pokemonTintSprite.setTintFill(0xffffff); pokemonFormTintSprite.setVisible(false); - pokemonFormTintSprite.setTintFill(0xFFFFFF); + pokemonFormTintSprite.setTintFill(0xffffff); globalScene.playSound("battle_anims/PRSFX- Transform"); @@ -101,7 +122,7 @@ export class QuietFormChangePhase extends BattlePhase { scale: 0.01, ease: "Cubic.easeInOut", duration: 500, - onComplete: () => pokemonTintSprite.destroy() + onComplete: () => pokemonTintSprite.destroy(), }); globalScene.tweens.add({ targets: pokemonFormTintSprite, @@ -119,13 +140,18 @@ export class QuietFormChangePhase extends BattlePhase { duration: 1000, onComplete: () => { pokemonTintSprite.setVisible(false); - globalScene.ui.showText(getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), null, () => this.end(), 1500); - } + globalScene.ui.showText( + getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), + null, + () => this.end(), + 1500, + ); + }, }); - } + }, }); }); - } + }, }); } @@ -133,7 +159,9 @@ export class QuietFormChangePhase extends BattlePhase { this.pokemon.findAndRemoveTags(t => t.tagType === BattlerTagType.AUTOTOMIZED); if (globalScene?.currentBattle.battleSpec === BattleSpec.FINAL_BOSS && this.pokemon instanceof EnemyPokemon) { globalScene.playBgm(); - globalScene.unshiftPhase(new PokemonHealPhase(this.pokemon.getBattlerIndex(), this.pokemon.getMaxHp(), null, false, false, false, true)); + globalScene.unshiftPhase( + new PokemonHealPhase(this.pokemon.getBattlerIndex(), this.pokemon.getMaxHp(), null, false, false, false, true), + ); this.pokemon.findAndRemoveTags(() => true); this.pokemon.bossSegments = 5; this.pokemon.bossSegmentIndex = 4; @@ -145,6 +173,11 @@ export class QuietFormChangePhase extends BattlePhase { movePhase.cancel(); } } + if (this.formChange.trigger instanceof SpeciesFormChangeTeraTrigger) { + applyAbAttrs(PostTeraFormChangeStatChangeAbAttr, this.pokemon, null); + applyAbAttrs(ClearWeatherAbAttr, this.pokemon, null); + applyAbAttrs(ClearTerrainAbAttr, this.pokemon, null); + } super.end(); } diff --git a/src/phases/reload-session-phase.ts b/src/phases/reload-session-phase.ts index a88cb1b1de3..3a4a4e0e3a5 100644 --- a/src/phases/reload-session-phase.ts +++ b/src/phases/reload-session-phase.ts @@ -28,12 +28,14 @@ export class ReloadSessionPhase extends Phase { globalScene.gameData.clearLocalData(); - (this.systemDataStr ? globalScene.gameData.initSystem(this.systemDataStr) : globalScene.gameData.loadSystem()).then(() => { - if (delayElapsed) { - this.end(); - } else { - loaded = true; - } - }); + (this.systemDataStr ? globalScene.gameData.initSystem(this.systemDataStr) : globalScene.gameData.loadSystem()).then( + () => { + if (delayElapsed) { + this.end(); + } else { + loaded = true; + } + }, + ); } } diff --git a/src/phases/return-phase.ts b/src/phases/return-phase.ts index 9dd13f6d5be..6dee982a4f0 100644 --- a/src/phases/return-phase.ts +++ b/src/phases/return-phase.ts @@ -4,7 +4,7 @@ import { SwitchType } from "#enums/switch-type"; import { SwitchSummonPhase } from "./switch-summon-phase"; export class ReturnPhase extends SwitchSummonPhase { - constructor(fieldIndex: integer) { + constructor(fieldIndex: number) { super(SwitchType.SWITCH, fieldIndex, -1, true); } @@ -12,7 +12,7 @@ export class ReturnPhase extends SwitchSummonPhase { this.end(); } - summon(): void { } + summon(): void {} onEnd(): void { const pokemon = this.getPokemon(); diff --git a/src/phases/revival-blessing-phase.ts b/src/phases/revival-blessing-phase.ts new file mode 100644 index 00000000000..1ed63f76b64 --- /dev/null +++ b/src/phases/revival-blessing-phase.ts @@ -0,0 +1,67 @@ +import { SwitchType } from "#enums/switch-type"; +import { globalScene } from "#app/global-scene"; +import type { PartyOption } from "#app/ui/party-ui-handler"; +import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler"; +import { Mode } from "#app/ui/ui"; +import i18next from "i18next"; +import * as Utils from "#app/utils"; +import { BattlePhase } from "#app/phases/battle-phase"; +import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; +import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase"; +import type { PlayerPokemon } from "#app/field/pokemon"; + +/** + * Sets the Party UI and handles the effect of Revival Blessing + * when used by one of the player's Pokemon. + */ +export class RevivalBlessingPhase extends BattlePhase { + constructor(protected user: PlayerPokemon) { + super(); + } + + public override start(): void { + globalScene.ui.setMode( + Mode.PARTY, + PartyUiMode.REVIVAL_BLESSING, + this.user.getFieldIndex(), + (slotIndex: integer, _option: PartyOption) => { + if (slotIndex >= 0 && slotIndex < 6) { + const pokemon = globalScene.getPlayerParty()[slotIndex]; + if (!pokemon || !pokemon.isFainted()) { + return this.end(); + } + + pokemon.resetTurnData(); + pokemon.resetStatus(); + pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp())); + globalScene.queueMessage( + i18next.t("moveTriggers:revivalBlessing", { + pokemonName: pokemon.name, + }), + 0, + true, + ); + + if (globalScene.currentBattle.double && globalScene.getPlayerParty().length > 1) { + const allyPokemon = this.user.getAlly(); + if (slotIndex <= 1) { + // Revived ally pokemon + globalScene.unshiftPhase( + new SwitchSummonPhase(SwitchType.SWITCH, pokemon.getFieldIndex(), slotIndex, false, true), + ); + globalScene.unshiftPhase(new ToggleDoublePositionPhase(true)); + } else if (allyPokemon.isFainted()) { + // Revived party pokemon, and ally pokemon is fainted + globalScene.unshiftPhase( + new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, true), + ); + globalScene.unshiftPhase(new ToggleDoublePositionPhase(true)); + } + } + } + globalScene.ui.setMode(Mode.MESSAGE).then(() => this.end()); + }, + PartyUiHandler.FilterFainted, + ); + } +} diff --git a/src/phases/ribbon-modifier-reward-phase.ts b/src/phases/ribbon-modifier-reward-phase.ts index 8cf15ba8f2c..0ee38250ce1 100644 --- a/src/phases/ribbon-modifier-reward-phase.ts +++ b/src/phases/ribbon-modifier-reward-phase.ts @@ -17,17 +17,23 @@ export class RibbonModifierRewardPhase extends ModifierRewardPhase { doReward(): Promise { return new Promise(resolve => { const newModifier = this.modifierType.newModifier(); - globalScene.addModifier(newModifier).then(() => { - globalScene.playSound("level_up_fanfare"); - globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.showText(i18next.t("battle:beatModeFirstTime", { + globalScene.addModifier(newModifier); + globalScene.playSound("level_up_fanfare"); + globalScene.ui.setMode(Mode.MESSAGE); + globalScene.ui.showText( + i18next.t("battle:beatModeFirstTime", { speciesName: this.species.name, gameMode: globalScene.gameMode.getName(), - newModifier: newModifier?.type.name - }), null, () => { + newModifier: newModifier?.type.name, + }), + null, + () => { resolve(); - }, null, true, 1500); - }); + }, + null, + true, + 1500, + ); }); } } diff --git a/src/phases/scan-ivs-phase.ts b/src/phases/scan-ivs-phase.ts index b3385a5de94..2a2d68591ca 100644 --- a/src/phases/scan-ivs-phase.ts +++ b/src/phases/scan-ivs-phase.ts @@ -1,7 +1,6 @@ import { globalScene } from "#app/global-scene"; import type { BattlerIndex } from "#app/battle"; -import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims"; -import { Stat } from "#app/enums/stat"; +import { PERMANENT_STATS, Stat } from "#app/enums/stat"; import { getPokemonNameWithAffix } from "#app/messages"; import { getTextColor, TextStyle } from "#app/ui/text"; import { Mode } from "#app/ui/ui"; @@ -9,21 +8,13 @@ import i18next from "i18next"; import { PokemonPhase } from "./pokemon-phase"; export class ScanIvsPhase extends PokemonPhase { - private shownIvs: integer; - - constructor(battlerIndex: BattlerIndex, shownIvs: integer) { + constructor(battlerIndex: BattlerIndex) { super(battlerIndex); - - this.shownIvs = shownIvs; } start() { super.start(); - if (!this.shownIvs) { - return this.end(); - } - const pokemon = this.getPokemon(); let enemyIvs: number[] = []; @@ -33,14 +24,16 @@ export class ScanIvsPhase extends PokemonPhase { const uiTheme = globalScene.uiTheme; // Assuming uiTheme is accessible for (let e = 0; e < enemyField.length; e++) { enemyIvs = enemyField[e].ivs; - const currentIvs = globalScene.gameData.dexData[enemyField[e].species.getRootSpeciesId()].ivs; // we are using getRootSpeciesId() here because we want to check against the baby form, not the mid form if it exists - const ivsToShow = globalScene.ui.getMessageHandler().getTopIvs(enemyIvs, this.shownIvs); + const currentIvs = globalScene.gameData.dexData[enemyField[e].species.getRootSpeciesId()].ivs; // we are using getRootSpeciesId() here because we want to check against the baby form, not the mid form if it exists statsContainer = enemyField[e].getBattleInfo().getStatsValueContainer().list as Phaser.GameObjects.Sprite[]; statsContainerLabels = statsContainer.filter(m => m.name.indexOf("icon_stat_label") >= 0); for (let s = 0; s < statsContainerLabels.length; s++) { const ivStat = Stat[statsContainerLabels[s].frame.name]; - if (enemyIvs[ivStat] > currentIvs[ivStat] && ivsToShow.indexOf(Number(ivStat)) >= 0) { - const hexColour = enemyIvs[ivStat] === 31 ? getTextColor(TextStyle.PERFECT_IV, false, uiTheme) : getTextColor(TextStyle.SUMMARY_GREEN, false, uiTheme); + if (enemyIvs[ivStat] > currentIvs[ivStat] && PERMANENT_STATS.indexOf(Number(ivStat)) >= 0) { + const hexColour = + enemyIvs[ivStat] === 31 + ? getTextColor(TextStyle.PERFECT_IV, false, uiTheme) + : getTextColor(TextStyle.SUMMARY_GREEN, false, uiTheme); const hexTextColour = Phaser.Display.Color.HexStringToColor(hexColour).color; statsContainerLabels[s].setTint(hexTextColour); } @@ -49,19 +42,30 @@ export class ScanIvsPhase extends PokemonPhase { } if (!globalScene.hideIvs) { - globalScene.ui.showText(i18next.t("battle:ivScannerUseQuestion", { pokemonName: getPokemonNameWithAffix(pokemon) }), null, () => { - globalScene.ui.setMode(Mode.CONFIRM, () => { - globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.clearText(); - new CommonBattleAnim(CommonAnim.LOCK_ON, pokemon, pokemon).play(false, () => { - globalScene.ui.getMessageHandler().promptIvs(pokemon.id, pokemon.ivs, this.shownIvs).then(() => this.end()); - }); - }, () => { - globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.clearText(); - this.end(); - }); - }); + globalScene.ui.showText( + i18next.t("battle:ivScannerUseQuestion", { + pokemonName: getPokemonNameWithAffix(pokemon), + }), + null, + () => { + globalScene.ui.setMode( + Mode.CONFIRM, + () => { + globalScene.ui.setMode(Mode.MESSAGE); + globalScene.ui.clearText(); + globalScene.ui + .getMessageHandler() + .promptIvs(pokemon.id, pokemon.ivs) + .then(() => this.end()); + }, + () => { + globalScene.ui.setMode(Mode.MESSAGE); + globalScene.ui.clearText(); + this.end(); + }, + ); + }, + ); } else { this.end(); } diff --git a/src/phases/select-biome-phase.ts b/src/phases/select-biome-phase.ts index 41077dfffc1..6a11967832a 100644 --- a/src/phases/select-biome-phase.ts +++ b/src/phases/select-biome-phase.ts @@ -28,27 +28,31 @@ export class SelectBiomePhase extends BattlePhase { this.end(); }; - if ((globalScene.gameMode.isClassic && globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex + 9)) - || (globalScene.gameMode.isDaily && globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) - || (globalScene.gameMode.hasShortBiomes && !(globalScene.currentBattle.waveIndex % 50))) { + if ( + (globalScene.gameMode.isClassic && globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex + 9)) || + (globalScene.gameMode.isDaily && globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) || + (globalScene.gameMode.hasShortBiomes && !(globalScene.currentBattle.waveIndex % 50)) + ) { setNextBiome(Biome.END); } else if (globalScene.gameMode.hasRandomBiomes) { setNextBiome(this.generateNextBiome()); } else if (Array.isArray(biomeLinks[currentBiome])) { let biomes: Biome[] = []; globalScene.executeWithSeedOffset(() => { - biomes = (biomeLinks[currentBiome] as (Biome | [Biome, integer])[]) + biomes = (biomeLinks[currentBiome] as (Biome | [Biome, number])[]) .filter(b => !Array.isArray(b) || !Utils.randSeedInt(b[1])) - .map(b => !Array.isArray(b) ? b : b[0]); + .map(b => (!Array.isArray(b) ? b : b[0])); }, globalScene.currentBattle.waveIndex); if (biomes.length > 1 && globalScene.findModifier(m => m instanceof MapModifier)) { let biomeChoices: Biome[] = []; globalScene.executeWithSeedOffset(() => { - biomeChoices = (!Array.isArray(biomeLinks[currentBiome]) - ? [ biomeLinks[currentBiome] as Biome ] - : biomeLinks[currentBiome] as (Biome | [Biome, integer])[]) - .filter((b, i) => !Array.isArray(b) || !Utils.randSeedInt(b[1])) - .map(b => Array.isArray(b) ? b[0] : b); + biomeChoices = ( + !Array.isArray(biomeLinks[currentBiome]) + ? [biomeLinks[currentBiome] as Biome] + : (biomeLinks[currentBiome] as (Biome | [Biome, number])[]) + ) + .filter((b, _i) => !Array.isArray(b) || !Utils.randSeedInt(b[1])) + .map(b => (Array.isArray(b) ? b[0] : b)); }, globalScene.currentBattle.waveIndex); const biomeSelectItems = biomeChoices.map(b => { const ret: OptionSelectItem = { @@ -57,13 +61,13 @@ export class SelectBiomePhase extends BattlePhase { globalScene.ui.setMode(Mode.MESSAGE); setNextBiome(b); return true; - } + }, }; return ret; }); globalScene.ui.setMode(Mode.OPTION_SELECT, { options: biomeSelectItems, - delay: 1000 + delay: 1000, }); } else { setNextBiome(biomes[Utils.randSeedInt(biomes.length)]); diff --git a/src/phases/select-gender-phase.ts b/src/phases/select-gender-phase.ts index 45cbb70dcac..1c86536de53 100644 --- a/src/phases/select-gender-phase.ts +++ b/src/phases/select-gender-phase.ts @@ -23,7 +23,7 @@ export class SelectGenderPhase extends Phase { globalScene.gameData.saveSetting(SettingKeys.Player_Gender, 0); globalScene.gameData.saveSystem().then(() => this.end()); return true; - } + }, }, { label: i18next.t("settings:girl"), @@ -32,9 +32,9 @@ export class SelectGenderPhase extends Phase { globalScene.gameData.saveSetting(SettingKeys.Player_Gender, 1); globalScene.gameData.saveSystem().then(() => this.end()); return true; - } - } - ] + }, + }, + ], }); }); } diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts index 6c8788c6a51..11d448876d3 100644 --- a/src/phases/select-modifier-phase.ts +++ b/src/phases/select-modifier-phase.ts @@ -1,9 +1,26 @@ import { globalScene } from "#app/global-scene"; import type { ModifierTier } from "#app/modifier/modifier-tier"; import type { ModifierTypeOption, ModifierType } from "#app/modifier/modifier-type"; -import { regenerateModifierPoolThresholds, getPlayerShopModifierTypeOptionsForWave, PokemonModifierType, FusePokemonModifierType, PokemonMoveModifierType, TmModifierType, RememberMoveModifierType, PokemonPpRestoreModifierType, PokemonPpUpModifierType, ModifierPoolType, getPlayerModifierTypeOptions } from "#app/modifier/modifier-type"; +import { + regenerateModifierPoolThresholds, + getPlayerShopModifierTypeOptionsForWave, + PokemonModifierType, + FusePokemonModifierType, + PokemonMoveModifierType, + TmModifierType, + RememberMoveModifierType, + PokemonPpRestoreModifierType, + PokemonPpUpModifierType, + ModifierPoolType, + getPlayerModifierTypeOptions, +} from "#app/modifier/modifier-type"; import type { Modifier } from "#app/modifier/modifier"; -import { ExtraModifierModifier, HealShopCostModifier, PokemonHeldItemModifier, TempExtraModifierModifier } from "#app/modifier/modifier"; +import { + ExtraModifierModifier, + HealShopCostModifier, + PokemonHeldItemModifier, + TempExtraModifierModifier, +} from "#app/modifier/modifier"; import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { SHOP_OPTIONS_ROW_LIMIT } from "#app/ui/modifier-select-ui-handler"; import PartyUiHandler, { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler"; @@ -16,14 +33,19 @@ import type { CustomModifierSettings } from "#app/modifier/modifier-type"; import { isNullOrUndefined, NumberHolder } from "#app/utils"; export class SelectModifierPhase extends BattlePhase { - private rerollCount: integer; + private rerollCount: number; private modifierTiers?: ModifierTier[]; private customModifierSettings?: CustomModifierSettings; private isCopy: boolean; private typeOptions: ModifierTypeOption[]; - constructor(rerollCount: integer = 0, modifierTiers?: ModifierTier[], customModifierSettings?: CustomModifierSettings, isCopy: boolean = false) { + constructor( + rerollCount = 0, + modifierTiers?: ModifierTier[], + customModifierSettings?: CustomModifierSettings, + isCopy = false, + ) { super(); this.rerollCount = rerollCount; @@ -45,15 +67,16 @@ export class SelectModifierPhase extends BattlePhase { if (!this.isCopy) { regenerateModifierPoolThresholds(party, this.getPoolType(), this.rerollCount); } - const modifierCount = new Utils.IntegerHolder(3); + const modifierCount = new Utils.NumberHolder(3); if (this.isPlayer()) { globalScene.applyModifiers(ExtraModifierModifier, true, modifierCount); globalScene.applyModifiers(TempExtraModifierModifier, true, modifierCount); } // If custom modifiers are specified, overrides default item count - if (!!this.customModifierSettings) { - const newItemCount = (this.customModifierSettings.guaranteedModifierTiers?.length || 0) + + if (this.customModifierSettings) { + const newItemCount = + (this.customModifierSettings.guaranteedModifierTiers?.length || 0) + (this.customModifierSettings.guaranteedModifierTypeOptions?.length || 0) + (this.customModifierSettings.guaranteedModifierTypeFuncs?.length || 0); if (this.customModifierSettings.fillRemaining) { @@ -66,19 +89,30 @@ export class SelectModifierPhase extends BattlePhase { this.typeOptions = this.getModifierTypeOptions(modifierCount.value); - const modifierSelectCallback = (rowCursor: integer, cursor: integer) => { + const modifierSelectCallback = (rowCursor: number, cursor: number) => { if (rowCursor < 0 || cursor < 0) { globalScene.ui.showText(i18next.t("battle:skipItemQuestion"), null, () => { - globalScene.ui.setOverlayMode(Mode.CONFIRM, () => { - globalScene.ui.revertMode(); - globalScene.ui.setMode(Mode.MESSAGE); - super.end(); - }, () => globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers))); + globalScene.ui.setOverlayMode( + Mode.CONFIRM, + () => { + globalScene.ui.revertMode(); + globalScene.ui.setMode(Mode.MESSAGE); + super.end(); + }, + () => + globalScene.ui.setMode( + Mode.MODIFIER_SELECT, + this.isPlayer(), + this.typeOptions, + modifierSelectCallback, + this.getRerollCost(globalScene.lockModifierTiers), + ), + ); }); return false; } let modifierType: ModifierType; - let cost: integer; + let cost: number; const rerollCost = this.getRerollCost(globalScene.lockModifierTiers); switch (rowCursor) { case 0: @@ -87,34 +121,74 @@ export class SelectModifierPhase extends BattlePhase { if (rerollCost < 0 || globalScene.money < rerollCost) { globalScene.ui.playError(); return false; - } else { - globalScene.reroll = true; - globalScene.unshiftPhase(new SelectModifierPhase(this.rerollCount + 1, this.typeOptions.map(o => o.type?.tier).filter(t => t !== undefined) as ModifierTier[])); - globalScene.ui.clearText(); - globalScene.ui.setMode(Mode.MESSAGE).then(() => super.end()); - if (!Overrides.WAIVE_ROLL_FEE_OVERRIDE) { - globalScene.money -= rerollCost; - globalScene.updateMoneyText(); - globalScene.animateMoneyChanged(false); - } - globalScene.playSound("se/buy"); } + globalScene.reroll = true; + globalScene.unshiftPhase( + new SelectModifierPhase( + this.rerollCount + 1, + this.typeOptions.map(o => o.type?.tier).filter(t => t !== undefined) as ModifierTier[], + ), + ); + globalScene.ui.clearText(); + globalScene.ui.setMode(Mode.MESSAGE).then(() => super.end()); + if (!Overrides.WAIVE_ROLL_FEE_OVERRIDE) { + globalScene.money -= rerollCost; + globalScene.updateMoneyText(); + globalScene.animateMoneyChanged(false); + } + globalScene.playSound("se/buy"); break; case 1: - globalScene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.MODIFIER_TRANSFER, -1, (fromSlotIndex: integer, itemIndex: integer, itemQuantity: integer, toSlotIndex: integer) => { - if (toSlotIndex !== undefined && fromSlotIndex < 6 && toSlotIndex < 6 && fromSlotIndex !== toSlotIndex && itemIndex > -1) { - const itemModifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.isTransferable && m.pokemonId === party[fromSlotIndex].id) as PokemonHeldItemModifier[]; - const itemModifier = itemModifiers[itemIndex]; - globalScene.tryTransferHeldItemModifier(itemModifier, party[toSlotIndex], true, itemQuantity, undefined, undefined, false); - } else { - globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers)); - } - }, PartyUiHandler.FilterItemMaxStacks); + globalScene.ui.setModeWithoutClear( + Mode.PARTY, + PartyUiMode.MODIFIER_TRANSFER, + -1, + (fromSlotIndex: number, itemIndex: number, itemQuantity: number, toSlotIndex: number) => { + if ( + toSlotIndex !== undefined && + fromSlotIndex < 6 && + toSlotIndex < 6 && + fromSlotIndex !== toSlotIndex && + itemIndex > -1 + ) { + const itemModifiers = globalScene.findModifiers( + m => + m instanceof PokemonHeldItemModifier && + m.isTransferable && + m.pokemonId === party[fromSlotIndex].id, + ) as PokemonHeldItemModifier[]; + const itemModifier = itemModifiers[itemIndex]; + globalScene.tryTransferHeldItemModifier( + itemModifier, + party[toSlotIndex], + true, + itemQuantity, + undefined, + undefined, + false, + ); + } else { + globalScene.ui.setMode( + Mode.MODIFIER_SELECT, + this.isPlayer(), + this.typeOptions, + modifierSelectCallback, + this.getRerollCost(globalScene.lockModifierTiers), + ); + } + }, + PartyUiHandler.FilterItemMaxStacks, + ); break; case 2: globalScene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.CHECK, -1, () => { - globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers)); + globalScene.ui.setMode( + Mode.MODIFIER_SELECT, + this.isPlayer(), + this.typeOptions, + modifierSelectCallback, + this.getRerollCost(globalScene.lockModifierTiers), + ); }); break; case 3: @@ -143,8 +217,14 @@ export class SelectModifierPhase extends BattlePhase { } break; default: - const shopOptions = getPlayerShopModifierTypeOptionsForWave(globalScene.currentBattle.waveIndex, globalScene.getWaveMoneyAmount(1)); - const shopOption = shopOptions[rowCursor > 2 || shopOptions.length <= SHOP_OPTIONS_ROW_LIMIT ? cursor : cursor + SHOP_OPTIONS_ROW_LIMIT]; + const shopOptions = getPlayerShopModifierTypeOptionsForWave( + globalScene.currentBattle.waveIndex, + globalScene.getWaveMoneyAmount(1), + ); + const shopOption = + shopOptions[ + rowCursor > 2 || shopOptions.length <= SHOP_OPTIONS_ROW_LIMIT ? cursor : cursor + SHOP_OPTIONS_ROW_LIMIT + ]; if (shopOption.type) { modifierType = shopOption.type; } @@ -155,96 +235,130 @@ export class SelectModifierPhase extends BattlePhase { break; } - if (cost! && (globalScene.money < cost) && !Overrides.WAIVE_ROLL_FEE_OVERRIDE) { // TODO: is the bang on cost correct? + if (cost! && globalScene.money < cost && !Overrides.WAIVE_ROLL_FEE_OVERRIDE) { + // TODO: is the bang on cost correct? globalScene.ui.playError(); return false; } - const applyModifier = (modifier: Modifier, playSound: boolean = false) => { + const applyModifier = (modifier: Modifier, playSound = false) => { const result = globalScene.addModifier(modifier, false, playSound, undefined, undefined, cost); // Queue a copy of this phase when applying a TM or Memory Mushroom. // If the player selects either of these, then escapes out of consuming them, // they are returned to a shop in the same state. - if (modifier.type instanceof RememberMoveModifierType || - modifier.type instanceof TmModifierType) { + if (modifier.type instanceof RememberMoveModifierType || modifier.type instanceof TmModifierType) { globalScene.unshiftPhase(this.copy()); } if (cost && !(modifier.type instanceof RememberMoveModifierType)) { - result.then(success => { - if (success) { - if (!Overrides.WAIVE_ROLL_FEE_OVERRIDE) { - globalScene.money -= cost; - globalScene.updateMoneyText(); - globalScene.animateMoneyChanged(false); - } - globalScene.playSound("se/buy"); - (globalScene.ui.getHandler() as ModifierSelectUiHandler).updateCostText(); - } else { - globalScene.ui.playError(); + if (result) { + if (!Overrides.WAIVE_ROLL_FEE_OVERRIDE) { + globalScene.money -= cost; + globalScene.updateMoneyText(); + globalScene.animateMoneyChanged(false); } - }); - } else { - const doEnd = () => { - globalScene.ui.clearText(); - globalScene.ui.setMode(Mode.MESSAGE); - super.end(); - }; - if (result instanceof Promise) { - result.then(() => doEnd()); + globalScene.playSound("se/buy"); + (globalScene.ui.getHandler() as ModifierSelectUiHandler).updateCostText(); } else { - doEnd(); + globalScene.ui.playError(); } + } else { + globalScene.ui.clearText(); + globalScene.ui.setMode(Mode.MESSAGE); + super.end(); } }; - if (modifierType! instanceof PokemonModifierType) { //TODO: is the bang correct? + if (modifierType! instanceof PokemonModifierType) { + //TODO: is the bang correct? if (modifierType instanceof FusePokemonModifierType) { - globalScene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.SPLICE, -1, (fromSlotIndex: integer, spliceSlotIndex: integer) => { - if (spliceSlotIndex !== undefined && fromSlotIndex < 6 && spliceSlotIndex < 6 && fromSlotIndex !== spliceSlotIndex) { - globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer()).then(() => { - const modifier = modifierType.newModifier(party[fromSlotIndex], party[spliceSlotIndex])!; //TODO: is the bang correct? - applyModifier(modifier, true); - }); - } else { - globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers)); - } - }, modifierType.selectFilter); + globalScene.ui.setModeWithoutClear( + Mode.PARTY, + PartyUiMode.SPLICE, + -1, + (fromSlotIndex: number, spliceSlotIndex: number) => { + if ( + spliceSlotIndex !== undefined && + fromSlotIndex < 6 && + spliceSlotIndex < 6 && + fromSlotIndex !== spliceSlotIndex + ) { + globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer()).then(() => { + const modifier = modifierType.newModifier(party[fromSlotIndex], party[spliceSlotIndex])!; //TODO: is the bang correct? + applyModifier(modifier, true); + }); + } else { + globalScene.ui.setMode( + Mode.MODIFIER_SELECT, + this.isPlayer(), + this.typeOptions, + modifierSelectCallback, + this.getRerollCost(globalScene.lockModifierTiers), + ); + } + }, + modifierType.selectFilter, + ); } else { const pokemonModifierType = modifierType as PokemonModifierType; const isMoveModifier = modifierType instanceof PokemonMoveModifierType; const isTmModifier = modifierType instanceof TmModifierType; const isRememberMoveModifier = modifierType instanceof RememberMoveModifierType; - const isPpRestoreModifier = (modifierType instanceof PokemonPpRestoreModifierType || modifierType instanceof PokemonPpUpModifierType); - const partyUiMode = isMoveModifier ? PartyUiMode.MOVE_MODIFIER - : isTmModifier ? PartyUiMode.TM_MODIFIER - : isRememberMoveModifier ? PartyUiMode.REMEMBER_MOVE_MODIFIER + const isPpRestoreModifier = + modifierType instanceof PokemonPpRestoreModifierType || modifierType instanceof PokemonPpUpModifierType; + const partyUiMode = isMoveModifier + ? PartyUiMode.MOVE_MODIFIER + : isTmModifier + ? PartyUiMode.TM_MODIFIER + : isRememberMoveModifier + ? PartyUiMode.REMEMBER_MOVE_MODIFIER : PartyUiMode.MODIFIER; - const tmMoveId = isTmModifier - ? (modifierType as TmModifierType).moveId - : undefined; - globalScene.ui.setModeWithoutClear(Mode.PARTY, partyUiMode, -1, (slotIndex: integer, option: PartyOption) => { - if (slotIndex < 6) { - globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer()).then(() => { - const modifier = !isMoveModifier - ? !isRememberMoveModifier - ? modifierType.newModifier(party[slotIndex]) - : modifierType.newModifier(party[slotIndex], option as integer) - : modifierType.newModifier(party[slotIndex], option - PartyOption.MOVE_1); - applyModifier(modifier!, true); // TODO: is the bang correct? - }); - } else { - globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers)); - } - }, pokemonModifierType.selectFilter, modifierType instanceof PokemonMoveModifierType ? (modifierType as PokemonMoveModifierType).moveSelectFilter : undefined, tmMoveId, isPpRestoreModifier); + const tmMoveId = isTmModifier ? (modifierType as TmModifierType).moveId : undefined; + globalScene.ui.setModeWithoutClear( + Mode.PARTY, + partyUiMode, + -1, + (slotIndex: number, option: PartyOption) => { + if (slotIndex < 6) { + globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer()).then(() => { + const modifier = !isMoveModifier + ? !isRememberMoveModifier + ? modifierType.newModifier(party[slotIndex]) + : modifierType.newModifier(party[slotIndex], option as number) + : modifierType.newModifier(party[slotIndex], option - PartyOption.MOVE_1); + applyModifier(modifier!, true); // TODO: is the bang correct? + }); + } else { + globalScene.ui.setMode( + Mode.MODIFIER_SELECT, + this.isPlayer(), + this.typeOptions, + modifierSelectCallback, + this.getRerollCost(globalScene.lockModifierTiers), + ); + } + }, + pokemonModifierType.selectFilter, + modifierType instanceof PokemonMoveModifierType + ? (modifierType as PokemonMoveModifierType).moveSelectFilter + : undefined, + tmMoveId, + isPpRestoreModifier, + ); } } else { applyModifier(modifierType!.newModifier()!); // TODO: is the bang correct? } - return !cost!;// TODO: is the bang correct? + return !cost!; // TODO: is the bang correct? }; - globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers)); + globalScene.ui.setMode( + Mode.MODIFIER_SELECT, + this.isPlayer(), + this.typeOptions, + modifierSelectCallback, + this.getRerollCost(globalScene.lockModifierTiers), + ); } updateSeed(): void { @@ -259,8 +373,9 @@ export class SelectModifierPhase extends BattlePhase { let baseValue = 0; if (Overrides.WAIVE_ROLL_FEE_OVERRIDE) { return baseValue; - } else if (lockRarities) { - const tierValues = [ 50, 125, 300, 750, 2000 ]; + } + if (lockRarities) { + const tierValues = [50, 125, 300, 750, 2000]; for (const opt of this.typeOptions) { baseValue += tierValues[opt.type.tier ?? 0]; } @@ -279,7 +394,10 @@ export class SelectModifierPhase extends BattlePhase { multiplier = this.customModifierSettings.rerollMultiplier; } - const baseMultiplier = Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 10) * baseValue * (2 ** this.rerollCount) * multiplier, Number.MAX_SAFE_INTEGER); + const baseMultiplier = Math.min( + Math.ceil(globalScene.currentBattle.waveIndex / 10) * baseValue * 2 ** this.rerollCount * multiplier, + Number.MAX_SAFE_INTEGER, + ); // Apply Black Sludge to reroll cost const modifiedRerollCost = new NumberHolder(baseMultiplier); @@ -291,20 +409,29 @@ export class SelectModifierPhase extends BattlePhase { return ModifierPoolType.PLAYER; } - getModifierTypeOptions(modifierCount: integer): ModifierTypeOption[] { - return getPlayerModifierTypeOptions(modifierCount, globalScene.getPlayerParty(), globalScene.lockModifierTiers ? this.modifierTiers : undefined, this.customModifierSettings); + getModifierTypeOptions(modifierCount: number): ModifierTypeOption[] { + return getPlayerModifierTypeOptions( + modifierCount, + globalScene.getPlayerParty(), + globalScene.lockModifierTiers ? this.modifierTiers : undefined, + this.customModifierSettings, + ); } copy(): SelectModifierPhase { return new SelectModifierPhase( this.rerollCount, this.modifierTiers, - { guaranteedModifierTypeOptions: this.typeOptions, rerollMultiplier: this.customModifierSettings?.rerollMultiplier, allowLuckUpgrades: false }, - true + { + guaranteedModifierTypeOptions: this.typeOptions, + rerollMultiplier: this.customModifierSettings?.rerollMultiplier, + allowLuckUpgrades: false, + }, + true, ); } - addModifier(modifier: Modifier): Promise { + addModifier(modifier: Modifier): boolean { return globalScene.addModifier(modifier, false, true); } } diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts index 20ba414147a..0f4360b0af6 100644 --- a/src/phases/select-starter-phase.ts +++ b/src/phases/select-starter-phase.ts @@ -12,9 +12,9 @@ import type { Starter } from "#app/ui/starter-select-ui-handler"; import { Mode } from "#app/ui/ui"; import type { Species } from "#enums/species"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; +import * as Utils from "../utils"; export class SelectStarterPhase extends Phase { - constructor() { super(); } @@ -26,7 +26,7 @@ export class SelectStarterPhase extends Phase { globalScene.ui.setMode(Mode.STARTER_SELECT, (starters: Starter[]) => { globalScene.ui.clearText(); - globalScene.ui.setMode(Mode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: integer) => { + globalScene.ui.setMode(Mode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => { if (slotId === -1) { globalScene.clearPhaseQueue(); globalScene.pushPhase(new TitlePhase()); @@ -45,7 +45,7 @@ export class SelectStarterPhase extends Phase { initBattle(starters: Starter[]) { const party = globalScene.getPlayerParty(); const loadPokemonAssets: Promise[] = []; - starters.forEach((starter: Starter, i: integer) => { + starters.forEach((starter: Starter, i: number) => { if (!i && Overrides.STARTER_SPECIES_OVERRIDE) { starter.species = getPokemonSpecies(Overrides.STARTER_SPECIES_OVERRIDE as Species); } @@ -53,24 +53,36 @@ export class SelectStarterPhase extends Phase { let starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0)); if ( starter.species.speciesId in Overrides.STARTER_FORM_OVERRIDES && + !Utils.isNullOrUndefined(Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]) && starter.species.forms[Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]!] ) { starterFormIndex = Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]!; } - let starterGender = starter.species.malePercent !== null - ? !starterProps.female ? Gender.MALE : Gender.FEMALE - : Gender.GENDERLESS; + let starterGender = + starter.species.malePercent !== null ? (!starterProps.female ? Gender.MALE : Gender.FEMALE) : Gender.GENDERLESS; if (Overrides.GENDER_OVERRIDE !== null) { starterGender = Overrides.GENDER_OVERRIDE; } const starterIvs = globalScene.gameData.dexData[starter.species.speciesId].ivs.slice(0); - const starterPokemon = globalScene.addPlayerPokemon(starter.species, globalScene.gameMode.getStartingLevel(), starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, starterIvs, starter.nature); + const starterPokemon = globalScene.addPlayerPokemon( + starter.species, + globalScene.gameMode.getStartingLevel(), + starter.abilityIndex, + starterFormIndex, + starterGender, + starterProps.shiny, + starterProps.variant, + starterIvs, + starter.nature, + ); starter.moveset && starterPokemon.tryPopulateMoveset(starter.moveset); if (starter.passive) { starterPokemon.passive = true; } - starterPokemon.luck = globalScene.gameData.getDexAttrLuck(globalScene.gameData.dexData[starter.species.speciesId].caughtAttr); + starterPokemon.luck = globalScene.gameData.getDexAttrLuck( + globalScene.gameData.dexData[starter.species.speciesId].caughtAttr, + ); if (starter.pokerus) { starterPokemon.pokerus = true; } @@ -79,6 +91,12 @@ export class SelectStarterPhase extends Phase { starterPokemon.nickname = starter.nickname; } + if (!Utils.isNullOrUndefined(starter.teraType)) { + starterPokemon.teraType = starter.teraType; + } else { + starterPokemon.teraType = starterPokemon.species.type1; + } + if (globalScene.gameMode.isSplicedOnly || Overrides.STARTER_FUSION_OVERRIDE) { starterPokemon.generateFusionSpecies(true); } @@ -102,7 +120,7 @@ export class SelectStarterPhase extends Phase { globalScene.sessionPlayTime = 0; globalScene.lastSavePlayTime = 0; // Ensures Keldeo (or any future Pokemon that have this type of form change) starts in the correct form - globalScene.getPlayerParty().forEach((p) => { + globalScene.getPlayerParty().forEach(p => { globalScene.triggerPokemonFormChange(p, SpeciesFormChangeMoveLearnedTrigger); }); this.end(); diff --git a/src/phases/select-target-phase.ts b/src/phases/select-target-phase.ts index b21415746fb..2042d0a3fcf 100644 --- a/src/phases/select-target-phase.ts +++ b/src/phases/select-target-phase.ts @@ -5,10 +5,10 @@ import { Mode } from "#app/ui/ui"; import { CommandPhase } from "./command-phase"; import { PokemonPhase } from "./pokemon-phase"; import i18next from "#app/plugins/i18n"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; export class SelectTargetPhase extends PokemonPhase { - constructor(fieldIndex: integer) { + constructor(fieldIndex: number) { super(fieldIndex); } @@ -23,7 +23,9 @@ export class SelectTargetPhase extends PokemonPhase { const user = fieldSide[this.fieldIndex]; const moveObject = allMoves[move!]; if (moveObject && user.isMoveTargetRestricted(moveObject.id, user, fieldSide[targets[0]])) { - const errorMessage = user.getRestrictingTag(move!, user, fieldSide[targets[0]])!.selectionDeniedText(user, moveObject.id); + const errorMessage = user + .getRestrictingTag(move!, user, fieldSide[targets[0]])! + .selectionDeniedText(user, moveObject.id); globalScene.queueMessage(i18next.t(errorMessage, { moveName: moveObject.name }), 0, true); targets = []; } @@ -31,10 +33,10 @@ export class SelectTargetPhase extends PokemonPhase { globalScene.currentBattle.turnCommands[this.fieldIndex] = null; globalScene.unshiftPhase(new CommandPhase(this.fieldIndex)); } else { - turnCommand!.targets = targets; //TODO: is the bang correct here? + turnCommand!.targets = targets; //TODO: is the bang correct here? } if (turnCommand?.command === Command.BALL && this.fieldIndex) { - globalScene.currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true; //TODO: is the bang correct here? + globalScene.currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true; //TODO: is the bang correct here? } this.end(); }); diff --git a/src/phases/show-ability-phase.ts b/src/phases/show-ability-phase.ts index a0db660ded5..1b3c6dde568 100644 --- a/src/phases/show-ability-phase.ts +++ b/src/phases/show-ability-phase.ts @@ -1,29 +1,60 @@ import { globalScene } from "#app/global-scene"; import type { BattlerIndex } from "#app/battle"; import { PokemonPhase } from "./pokemon-phase"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { HideAbilityPhase } from "#app/phases/hide-ability-phase"; export class ShowAbilityPhase extends PokemonPhase { private passive: boolean; + private pokemonName: string; + private abilityName: string; + private pokemonOnField: boolean; - constructor(battlerIndex: BattlerIndex, passive: boolean = false) { + constructor(battlerIndex: BattlerIndex, passive = false) { super(battlerIndex); this.passive = passive; + + const pokemon = this.getPokemon(); + if (pokemon) { + // Set these now as the pokemon object may change before the queued phase is run + this.pokemonName = getPokemonNameWithAffix(pokemon); + this.abilityName = (passive ? this.getPokemon().getPassiveAbility() : this.getPokemon().getAbility()).name; + this.pokemonOnField = true; + } else { + this.pokemonOnField = false; + } } start() { super.start(); + if (!this.pokemonOnField || !this.getPokemon()) { + return this.end(); + } + + // If the bar is already out, hide it before showing the new one + if (globalScene.abilityBar.isVisible()) { + globalScene.unshiftPhase(new HideAbilityPhase(this.battlerIndex, this.passive)); + globalScene.unshiftPhase(new ShowAbilityPhase(this.battlerIndex, this.passive)); + return this.end(); + } + const pokemon = this.getPokemon(); - if (pokemon) { - globalScene.abilityBar.showAbility(pokemon, this.passive); + if (!pokemon.isPlayer()) { + /** If its an enemy pokemon, list it as last enemy to use ability or move */ + globalScene.currentBattle.lastEnemyInvolved = pokemon.getBattlerIndex() % 2; + } else { + globalScene.currentBattle.lastPlayerInvolved = pokemon.getBattlerIndex() % 2; + } + globalScene.abilityBar.showAbility(this.pokemonName, this.abilityName, this.passive, this.player).then(() => { if (pokemon?.battleData) { pokemon.battleData.abilityRevealed = true; } - } - this.end(); + this.end(); + }); } } diff --git a/src/phases/show-party-exp-bar-phase.ts b/src/phases/show-party-exp-bar-phase.ts index 71bd39e3898..568b8b615c8 100644 --- a/src/phases/show-party-exp-bar-phase.ts +++ b/src/phases/show-party-exp-bar-phase.ts @@ -10,7 +10,7 @@ import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-pha export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase { private expValue: number; - constructor(partyMemberIndex: integer, expValue: number) { + constructor(partyMemberIndex: number, expValue: number) { super(partyMemberIndex); this.expValue = expValue; @@ -36,12 +36,15 @@ export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase { if (globalScene.expParty === ExpNotification.SKIP) { this.end(); } else if (globalScene.expParty === ExpNotification.ONLY_LEVEL_UP) { - if (newLevel > lastLevel) { // this means if we level up + if (newLevel > lastLevel) { + // this means if we level up // instead of displaying the exp gain in the small frame, we display the new level // we use the same method for mode 0 & 1, by giving a parameter saying to display the exp or the level - globalScene.partyExpBar.showPokemonExp(pokemon, exp.value, globalScene.expParty === ExpNotification.ONLY_LEVEL_UP, newLevel).then(() => { - setTimeout(() => this.end(), 800 / Math.pow(2, globalScene.expGainsSpeed)); - }); + globalScene.partyExpBar + .showPokemonExp(pokemon, exp.value, globalScene.expParty === ExpNotification.ONLY_LEVEL_UP, newLevel) + .then(() => { + setTimeout(() => this.end(), 800 / Math.pow(2, globalScene.expGainsSpeed)); + }); } else { this.end(); } @@ -52,6 +55,5 @@ export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase { } else { this.end(); } - } } diff --git a/src/phases/show-trainer-phase.ts b/src/phases/show-trainer-phase.ts index 17106b54048..740c11f5c5d 100644 --- a/src/phases/show-trainer-phase.ts +++ b/src/phases/show-trainer-phase.ts @@ -18,7 +18,7 @@ export class ShowTrainerPhase extends BattlePhase { targets: globalScene.trainer, x: 106, duration: 1000, - onComplete: () => this.end() + onComplete: () => this.end(), }); } } diff --git a/src/phases/stat-stage-change-phase.ts b/src/phases/stat-stage-change-phase.ts index f2e95446139..71b50fa9dce 100644 --- a/src/phases/stat-stage-change-phase.ts +++ b/src/phases/stat-stage-change-phase.ts @@ -1,7 +1,17 @@ import { globalScene } from "#app/global-scene"; import type { BattlerIndex } from "#app/battle"; -import { applyAbAttrs, applyPostStatStageChangeAbAttrs, applyPreStatStageChangeAbAttrs, PostStatStageChangeAbAttr, ProtectStatAbAttr, StatStageChangeCopyAbAttr, StatStageChangeMultiplierAbAttr } from "#app/data/ability"; +import { + applyAbAttrs, + applyPostStatStageChangeAbAttrs, + applyPreStatStageChangeAbAttrs, + PostStatStageChangeAbAttr, + ProtectStatAbAttr, + ReflectStatStageChangeAbAttr, + StatStageChangeCopyAbAttr, + StatStageChangeMultiplierAbAttr, +} from "#app/data/ability"; import { ArenaTagSide, MistTag } from "#app/data/arena-tag"; +import type { ArenaTag } from "#app/data/arena-tag"; import type Pokemon from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; import { ResetNegativeStatStageModifier } from "#app/modifier/modifier"; @@ -10,20 +20,38 @@ import { NumberHolder, BooleanHolder } from "#app/utils"; import i18next from "i18next"; import { PokemonPhase } from "./pokemon-phase"; import { Stat, type BattleStat, getStatKey, getStatStageChangeDescriptionKey } from "#enums/stat"; +import { OctolockTag } from "#app/data/battler-tags"; +import { ArenaTagType } from "#app/enums/arena-tag-type"; -export type StatStageChangeCallback = (target: Pokemon | null, changed: BattleStat[], relativeChanges: number[]) => void; +export type StatStageChangeCallback = ( + target: Pokemon | null, + changed: BattleStat[], + relativeChanges: number[], +) => void; export class StatStageChangePhase extends PokemonPhase { private stats: BattleStat[]; private selfTarget: boolean; - private stages: integer; + private stages: number; private showMessage: boolean; private ignoreAbilities: boolean; private canBeCopied: boolean; private onChange: StatStageChangeCallback | null; + private comingFromMirrorArmorUser: boolean; + private comingFromStickyWeb: boolean; - - constructor(battlerIndex: BattlerIndex, selfTarget: boolean, stats: BattleStat[], stages: integer, showMessage: boolean = true, ignoreAbilities: boolean = false, canBeCopied: boolean = true, onChange: StatStageChangeCallback | null = null) { + constructor( + battlerIndex: BattlerIndex, + selfTarget: boolean, + stats: BattleStat[], + stages: number, + showMessage = true, + ignoreAbilities = false, + canBeCopied = true, + onChange: StatStageChangeCallback | null = null, + comingFromMirrorArmorUser = false, + comingFromStickyWeb = false, + ) { super(battlerIndex); this.selfTarget = selfTarget; @@ -33,20 +61,67 @@ export class StatStageChangePhase extends PokemonPhase { this.ignoreAbilities = ignoreAbilities; this.canBeCopied = canBeCopied; this.onChange = onChange; + this.comingFromMirrorArmorUser = comingFromMirrorArmorUser; + this.comingFromStickyWeb = comingFromStickyWeb; } start() { - // Check if multiple stats are being changed at the same time, then run SSCPhase for each of them if (this.stats.length > 1) { for (let i = 0; i < this.stats.length; i++) { - const stat = [ this.stats[i] ]; - globalScene.unshiftPhase(new StatStageChangePhase(this.battlerIndex, this.selfTarget, stat, this.stages, this.showMessage, this.ignoreAbilities, this.canBeCopied, this.onChange)); + const stat = [this.stats[i]]; + globalScene.unshiftPhase( + new StatStageChangePhase( + this.battlerIndex, + this.selfTarget, + stat, + this.stages, + this.showMessage, + this.ignoreAbilities, + this.canBeCopied, + this.onChange, + this.comingFromMirrorArmorUser, + ), + ); } return this.end(); } const pokemon = this.getPokemon(); + let opponentPokemon: Pokemon | undefined; + + /** Gets the position of last enemy or player pokemon that used ability or move, primarily for double battles involving Mirror Armor */ + if (pokemon.isPlayer()) { + /** If this SSCP is not from sticky web, then we find the opponent pokemon that last did something */ + if (!this.comingFromStickyWeb) { + opponentPokemon = globalScene.getEnemyField()[globalScene.currentBattle.lastEnemyInvolved]; + } else { + /** If this SSCP is from sticky web, then check if pokemon that last sucessfully used sticky web is on field */ + const stickyTagID = globalScene.arena.findTagsOnSide( + (t: ArenaTag) => t.tagType === ArenaTagType.STICKY_WEB, + ArenaTagSide.PLAYER, + )[0].sourceId; + globalScene.getEnemyField().forEach(e => { + if (e.id === stickyTagID) { + opponentPokemon = e; + } + }); + } + } else { + if (!this.comingFromStickyWeb) { + opponentPokemon = globalScene.getPlayerField()[globalScene.currentBattle.lastPlayerInvolved]; + } else { + const stickyTagID = globalScene.arena.findTagsOnSide( + (t: ArenaTag) => t.tagType === ArenaTagType.STICKY_WEB, + ArenaTagSide.ENEMY, + )[0].sourceId; + globalScene.getPlayerField().forEach(e => { + if (e.id === stickyTagID) { + opponentPokemon = e; + } + }); + } + } if (!pokemon.isActive(true)) { return this.end(); @@ -65,11 +140,34 @@ export class StatStageChangePhase extends PokemonPhase { if (!this.selfTarget && stages.value < 0) { // TODO: add a reference to the source of the stat change to fix Infiltrator interaction - globalScene.arena.applyTagsForSide(MistTag, pokemon.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY, false, null, cancelled); + globalScene.arena.applyTagsForSide( + MistTag, + pokemon.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY, + false, + null, + cancelled, + ); } if (!cancelled.value && !this.selfTarget && stages.value < 0) { applyPreStatStageChangeAbAttrs(ProtectStatAbAttr, pokemon, stat, cancelled, simulate); + + /** Potential stat reflection due to Mirror Armor, does not apply to Octolock end of turn effect */ + if ( + opponentPokemon !== undefined && + !pokemon.findTag(t => t instanceof OctolockTag) && + !this.comingFromMirrorArmorUser + ) { + applyPreStatStageChangeAbAttrs( + ReflectStatStageChangeAbAttr, + pokemon, + stat, + cancelled, + simulate, + opponentPokemon, + this.stages, + ); + } } // If one stat stage decrease is cancelled, simulate the rest of the applications @@ -80,9 +178,14 @@ export class StatStageChangePhase extends PokemonPhase { return !cancelled.value; }); - const relLevels = filteredStats.map(s => (stages.value >= 1 ? Math.min(pokemon.getStatStage(s) + stages.value, 6) : Math.max(pokemon.getStatStage(s) + stages.value, -6)) - pokemon.getStatStage(s)); + const relLevels = filteredStats.map( + s => + (stages.value >= 1 + ? Math.min(pokemon.getStatStage(s) + stages.value, 6) + : Math.max(pokemon.getStatStage(s) + stages.value, -6)) - pokemon.getStatStage(s), + ); - this.onChange && this.onChange(this.getPokemon(), filteredStats, relLevels); + this.onChange?.(this.getPokemon(), filteredStats, relLevels); const end = () => { if (this.showMessage) { @@ -119,10 +222,16 @@ export class StatStageChangePhase extends PokemonPhase { applyPostStatStageChangeAbAttrs(PostStatStageChangeAbAttr, pokemon, filteredStats, this.stages, this.selfTarget); // Look for any other stat change phases; if this is the last one, do White Herb check - const existingPhase = globalScene.findPhase(p => p instanceof StatStageChangePhase && p.battlerIndex === this.battlerIndex); + const existingPhase = globalScene.findPhase( + p => p instanceof StatStageChangePhase && p.battlerIndex === this.battlerIndex, + ); if (!(existingPhase instanceof StatStageChangePhase)) { // Apply White Herb if needed - const whiteHerb = globalScene.applyModifier(ResetNegativeStatStageModifier, this.player, pokemon) as ResetNegativeStatStageModifier; + const whiteHerb = globalScene.applyModifier( + ResetNegativeStatStageModifier, + this.player, + pokemon, + ) as ResetNegativeStatStageModifier; // If the White Herb was applied, consume it if (whiteHerb) { pokemon.loseHeldItem(whiteHerb); @@ -140,7 +249,8 @@ export class StatStageChangePhase extends PokemonPhase { const pokemonMaskSprite = pokemon.maskSprite; const tileX = (this.player ? 106 : 236) * pokemon.getSpriteScale() * globalScene.field.scale; - const tileY = ((this.player ? 148 : 84) + (stages.value >= 1 ? 160 : 0)) * pokemon.getSpriteScale() * globalScene.field.scale; + const tileY = + ((this.player ? 148 : 84) + (stages.value >= 1 ? 160 : 0)) * pokemon.getSpriteScale() * globalScene.field.scale; const tileWidth = 156 * globalScene.field.scale * pokemon.getSpriteScale(); const tileHeight = 316 * globalScene.field.scale * pokemon.getSpriteScale(); @@ -166,15 +276,15 @@ export class StatStageChangePhase extends PokemonPhase { targets: statSprite, delay: 1000, duration: 250, - alpha: 0 + alpha: 0, }); - } + }, }); globalScene.tweens.add({ targets: statSprite, duration: 1500, - y: `${stages.value >= 1 ? "-" : "+"}=${160 * 6}` + y: `${stages.value >= 1 ? "-" : "+"}=${160 * 6}`, }); globalScene.time.delayedCall(1750, () => { @@ -187,13 +297,22 @@ export class StatStageChangePhase extends PokemonPhase { } aggregateStatStageChanges(): void { - const accEva: BattleStat[] = [ Stat.ACC, Stat.EVA ]; + const accEva: BattleStat[] = [Stat.ACC, Stat.EVA]; const isAccEva = accEva.some(s => this.stats.includes(s)); let existingPhase: StatStageChangePhase; if (this.stats.length === 1) { - while ((existingPhase = (globalScene.findPhase(p => p instanceof StatStageChangePhase && p.battlerIndex === this.battlerIndex && p.stats.length === 1 - && (p.stats[0] === this.stats[0]) - && p.selfTarget === this.selfTarget && p.showMessage === this.showMessage && p.ignoreAbilities === this.ignoreAbilities) as StatStageChangePhase))) { + while ( + (existingPhase = globalScene.findPhase( + p => + p instanceof StatStageChangePhase && + p.battlerIndex === this.battlerIndex && + p.stats.length === 1 && + p.stats[0] === this.stats[0] && + p.selfTarget === this.selfTarget && + p.showMessage === this.showMessage && + p.ignoreAbilities === this.ignoreAbilities, + ) as StatStageChangePhase) + ) { this.stages += existingPhase.stages; if (!globalScene.tryRemovePhase(p => p === existingPhase)) { @@ -201,9 +320,18 @@ export class StatStageChangePhase extends PokemonPhase { } } } - while ((existingPhase = (globalScene.findPhase(p => p instanceof StatStageChangePhase && p.battlerIndex === this.battlerIndex && p.selfTarget === this.selfTarget - && (accEva.some(s => p.stats.includes(s)) === isAccEva) - && p.stages === this.stages && p.showMessage === this.showMessage && p.ignoreAbilities === this.ignoreAbilities) as StatStageChangePhase))) { + while ( + (existingPhase = globalScene.findPhase( + p => + p instanceof StatStageChangePhase && + p.battlerIndex === this.battlerIndex && + p.selfTarget === this.selfTarget && + accEva.some(s => p.stats.includes(s)) === isAccEva && + p.stages === this.stages && + p.showMessage === this.showMessage && + p.ignoreAbilities === this.ignoreAbilities, + ) as StatStageChangePhase) + ) { this.stats.push(...existingPhase.stats); if (!globalScene.tryRemovePhase(p => p === existingPhase)) { break; @@ -211,7 +339,7 @@ export class StatStageChangePhase extends PokemonPhase { } } - getStatStageChangeMessages(stats: BattleStat[], stages: integer, relStages: integer[]): string[] { + getStatStageChangeMessages(stats: BattleStat[], stages: number, relStages: number[]): string[] { const messages: string[] = []; const relStageStatIndexes = {}; @@ -228,21 +356,31 @@ export class StatStageChangePhase extends PokemonPhase { let statsFragment = ""; if (relStageStats.length > 1) { - statsFragment = relStageStats.length >= 5 - ? i18next.t("battle:stats") - : `${relStageStats.slice(0, -1).map(s => i18next.t(getStatKey(s))).join(", ")}${relStageStats.length > 2 ? "," : ""} ${i18next.t("battle:statsAnd")} ${i18next.t(getStatKey(relStageStats[relStageStats.length - 1]))}`; - messages.push(i18next.t(getStatStageChangeDescriptionKey(Math.abs(parseInt(rl)), stages >= 1), { - pokemonNameWithAffix: getPokemonNameWithAffix(this.getPokemon()), - stats: statsFragment, - count: relStageStats.length - })); + statsFragment = + relStageStats.length >= 5 + ? i18next.t("battle:stats") + : `${relStageStats + .slice(0, -1) + .map(s => i18next.t(getStatKey(s))) + .join( + ", ", + )}${relStageStats.length > 2 ? "," : ""} ${i18next.t("battle:statsAnd")} ${i18next.t(getStatKey(relStageStats[relStageStats.length - 1]))}`; + messages.push( + i18next.t(getStatStageChangeDescriptionKey(Math.abs(Number.parseInt(rl)), stages >= 1), { + pokemonNameWithAffix: getPokemonNameWithAffix(this.getPokemon()), + stats: statsFragment, + count: relStageStats.length, + }), + ); } else { statsFragment = i18next.t(getStatKey(relStageStats[0])); - messages.push(i18next.t(getStatStageChangeDescriptionKey(Math.abs(parseInt(rl)), stages >= 1), { - pokemonNameWithAffix: getPokemonNameWithAffix(this.getPokemon()), - stats: statsFragment, - count: relStageStats.length - })); + messages.push( + i18next.t(getStatStageChangeDescriptionKey(Math.abs(Number.parseInt(rl)), stages >= 1), { + pokemonNameWithAffix: getPokemonNameWithAffix(this.getPokemon()), + stats: statsFragment, + count: relStageStats.length, + }), + ); } }); diff --git a/src/phases/summon-missing-phase.ts b/src/phases/summon-missing-phase.ts index f32f6a377f5..32bc7495dce 100644 --- a/src/phases/summon-missing-phase.ts +++ b/src/phases/summon-missing-phase.ts @@ -4,12 +4,16 @@ import { SummonPhase } from "./summon-phase"; import { globalScene } from "#app/global-scene"; export class SummonMissingPhase extends SummonPhase { - constructor(fieldIndex: integer) { + constructor(fieldIndex: number) { super(fieldIndex); } preSummon(): void { - globalScene.ui.showText(i18next.t("battle:sendOutPokemon", { pokemonName: getPokemonNameWithAffix(this.getPokemon()) })); + globalScene.ui.showText( + i18next.t("battle:sendOutPokemon", { + pokemonName: getPokemonNameWithAffix(this.getPokemon()), + }), + ); globalScene.time.delayedCall(250, () => this.summon()); } } diff --git a/src/phases/summon-phase.ts b/src/phases/summon-phase.ts index 72f5ec8640f..31cd2645e68 100644 --- a/src/phases/summon-phase.ts +++ b/src/phases/summon-phase.ts @@ -18,7 +18,7 @@ import { globalScene } from "#app/global-scene"; export class SummonPhase extends PartyMemberPokemonPhase { private loaded: boolean; - constructor(fieldIndex: integer, player: boolean = true, loaded: boolean = false) { + constructor(fieldIndex: number, player = true, loaded = false) { super(fieldIndex, player); this.loaded = loaded; @@ -31,13 +31,15 @@ export class SummonPhase extends PartyMemberPokemonPhase { } /** - * Sends out a Pokemon before the battle begins and shows the appropriate messages - */ + * Sends out a Pokemon before the battle begins and shows the appropriate messages + */ preSummon(): void { const partyMember = this.getPokemon(); // If the Pokemon about to be sent out is fainted, illegal under a challenge, or no longer in the party for some reason, switch to the first non-fainted legal Pokemon if (!partyMember.isAllowedInBattle() || (this.player && !this.getParty().some(p => p.id === partyMember.id))) { - console.warn("The Pokemon about to be sent out is fainted or illegal under a challenge. Attempting to resolve..."); + console.warn( + "The Pokemon about to be sent out is fainted or illegal under a challenge. Attempting to resolve...", + ); // First check if they're somehow still in play, if so remove them. if (partyMember.isOnField()) { @@ -58,16 +60,28 @@ export class SummonPhase extends PartyMemberPokemonPhase { } // Swaps the fainted Pokemon and the first non-fainted legal Pokemon in the party - [ party[this.partyMemberIndex], party[legalIndex] ] = [ party[legalIndex], party[this.partyMemberIndex] ]; - console.warn("Swapped %s %O with %s %O", getPokemonNameWithAffix(partyMember), partyMember, getPokemonNameWithAffix(party[0]), party[0]); + [party[this.partyMemberIndex], party[legalIndex]] = [party[legalIndex], party[this.partyMemberIndex]]; + console.warn( + "Swapped %s %O with %s %O", + getPokemonNameWithAffix(partyMember), + partyMember, + getPokemonNameWithAffix(party[0]), + party[0], + ); } if (this.player) { - globalScene.ui.showText(i18next.t("battle:playerGo", { pokemonName: getPokemonNameWithAffix(this.getPokemon()) })); + globalScene.ui.showText( + i18next.t("battle:playerGo", { + pokemonName: getPokemonNameWithAffix(this.getPokemon()), + }), + ); if (this.player) { globalScene.pbTray.hide(); } - globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`); + globalScene.trainer.setTexture( + `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`, + ); globalScene.time.delayedCall(562, () => { globalScene.trainer.setFrame("2"); globalScene.time.delayedCall(64, () => { @@ -78,13 +92,21 @@ export class SummonPhase extends PartyMemberPokemonPhase { targets: globalScene.trainer, x: -36, duration: 1000, - onComplete: () => globalScene.trainer.setVisible(false) + onComplete: () => globalScene.trainer.setVisible(false), }); globalScene.time.delayedCall(750, () => this.summon()); - } else if (globalScene.currentBattle.battleType === BattleType.TRAINER || globalScene.currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) { - const trainerName = globalScene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER); + } else if ( + globalScene.currentBattle.battleType === BattleType.TRAINER || + globalScene.currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE + ) { + const trainerName = globalScene.currentBattle.trainer?.getName( + !(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER, + ); const pokemonName = this.getPokemon().getNameToRender(); - const message = i18next.t("battle:trainerSendOut", { trainerName, pokemonName }); + const message = i18next.t("battle:trainerSendOut", { + trainerName, + pokemonName, + }); globalScene.pbTrayEnemy.hide(); globalScene.ui.showText(message, null, () => this.summon()); @@ -100,7 +122,12 @@ export class SummonPhase extends PartyMemberPokemonPhase { summon(): void { const pokemon = this.getPokemon(); - const pokeball = globalScene.addFieldSprite(this.player ? 36 : 248, this.player ? 80 : 44, "pb", getPokeballAtlasKey(pokemon.pokeball)); + const pokeball = globalScene.addFieldSprite( + this.player ? 36 : 248, + this.player ? 80 : 44, + "pb", + getPokeballAtlasKey(pokemon.pokeball), + ); pokeball.setVisible(false); pokeball.setOrigin(0.5, 0.625); globalScene.field.add(pokeball); @@ -109,7 +136,9 @@ export class SummonPhase extends PartyMemberPokemonPhase { pokemon.setFieldPosition(FieldPosition.RIGHT, 0); } else { const availablePartyMembers = this.getParty().filter(p => p.isAllowedInBattle()).length; - pokemon.setFieldPosition(!globalScene.currentBattle.double || availablePartyMembers === 1 ? FieldPosition.CENTER : FieldPosition.LEFT); + pokemon.setFieldPosition( + !globalScene.currentBattle.double || availablePartyMembers === 1 ? FieldPosition.CENTER : FieldPosition.LEFT, + ); } const fpOffset = pokemon.getFieldPositionOffset(); @@ -119,7 +148,7 @@ export class SummonPhase extends PartyMemberPokemonPhase { globalScene.tweens.add({ targets: pokeball, duration: 650, - x: (this.player ? 100 : 236) + fpOffset[0] + x: (this.player ? 100 : 236) + fpOffset[0], }); globalScene.tweens.add({ @@ -167,11 +196,11 @@ export class SummonPhase extends PartyMemberPokemonPhase { pokemon.getSprite().clearTint(); pokemon.resetSummonData(); globalScene.time.delayedCall(1000, () => this.end()); - } + }, }); - } + }, }); - } + }, }); } @@ -187,7 +216,9 @@ export class SummonPhase extends PartyMemberPokemonPhase { pokemon.setFieldPosition(FieldPosition.RIGHT, 0); } else { const availablePartyMembers = this.getParty().filter(p => !p.isFainted()).length; - pokemon.setFieldPosition(!globalScene.currentBattle.double || availablePartyMembers === 1 ? FieldPosition.CENTER : FieldPosition.LEFT); + pokemon.setFieldPosition( + !globalScene.currentBattle.double || availablePartyMembers === 1 ? FieldPosition.CENTER : FieldPosition.LEFT, + ); } globalScene.add.existing(pokemon); @@ -228,7 +259,7 @@ export class SummonPhase extends PartyMemberPokemonPhase { pokemon.resetSummonData(); globalScene.updateFieldScale(); globalScene.time.delayedCall(1000, () => this.end()); - } + }, }); } @@ -241,7 +272,11 @@ export class SummonPhase extends PartyMemberPokemonPhase { pokemon.resetTurnData(); - if (!this.loaded || [ BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER ].includes(globalScene.currentBattle.battleType) || (globalScene.currentBattle.waveIndex % 10) === 1) { + if ( + !this.loaded || + [BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(globalScene.currentBattle.battleType) || + globalScene.currentBattle.waveIndex % 10 === 1 + ) { globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeActiveTrigger, true); this.queuePostSummon(); } diff --git a/src/phases/switch-biome-phase.ts b/src/phases/switch-biome-phase.ts index 88addb4ef47..2dd2a642f43 100644 --- a/src/phases/switch-biome-phase.ts +++ b/src/phases/switch-biome-phase.ts @@ -20,7 +20,7 @@ export class SwitchBiomePhase extends BattlePhase { } globalScene.tweens.add({ - targets: [ globalScene.arenaEnemy, globalScene.lastEnemyTrainer ], + targets: [globalScene.arenaEnemy, globalScene.lastEnemyTrainer], x: "+=300", duration: 2000, onComplete: () => { @@ -38,11 +38,11 @@ export class SwitchBiomePhase extends BattlePhase { globalScene.arenaPlayerTransition.setVisible(true); globalScene.tweens.add({ - targets: [ globalScene.arenaPlayer, globalScene.arenaBgTransition, globalScene.arenaPlayerTransition ], + targets: [globalScene.arenaPlayer, globalScene.arenaBgTransition, globalScene.arenaPlayerTransition], duration: 1000, delay: 1000, ease: "Sine.easeInOut", - alpha: (target: any) => target === globalScene.arenaPlayer ? 0 : 1, + alpha: (target: any) => (target === globalScene.arenaPlayer ? 0 : 1), onComplete: () => { globalScene.arenaBg.setTexture(bgTexture); globalScene.arenaPlayer.setBiome(this.nextBiome); @@ -57,9 +57,9 @@ export class SwitchBiomePhase extends BattlePhase { } this.end(); - } + }, }); - } + }, }); } } diff --git a/src/phases/switch-phase.ts b/src/phases/switch-phase.ts index e763aee1521..8562309ede5 100644 --- a/src/phases/switch-phase.ts +++ b/src/phases/switch-phase.ts @@ -11,21 +11,21 @@ import { SwitchSummonPhase } from "./switch-summon-phase"; * for the player (if a switch would be valid for the current battle state). */ export class SwitchPhase extends BattlePhase { - protected readonly fieldIndex: integer; + protected readonly fieldIndex: number; private readonly switchType: SwitchType; private readonly isModal: boolean; private readonly doReturn: boolean; /** - * Creates a new SwitchPhase - * @param switchType {@linkcode SwitchType} The type of switch logic this phase implements - * @param fieldIndex Field index to switch out - * @param isModal Indicates if the switch should be forced (true) or is - * optional (false). - * @param doReturn Indicates if the party member on the field should be - * recalled to ball or has already left the field. Passed to {@linkcode SwitchSummonPhase}. - */ - constructor(switchType: SwitchType, fieldIndex: integer, isModal: boolean, doReturn: boolean) { + * Creates a new SwitchPhase + * @param switchType {@linkcode SwitchType} The type of switch logic this phase implements + * @param fieldIndex Field index to switch out + * @param isModal Indicates if the switch should be forced (true) or is + * optional (false). + * @param doReturn Indicates if the party member on the field should be + * recalled to ball or has already left the field. Passed to {@linkcode SwitchSummonPhase}. + */ + constructor(switchType: SwitchType, fieldIndex: number, isModal: boolean, doReturn: boolean) { super(); this.switchType = switchType; @@ -54,22 +54,35 @@ export class SwitchPhase extends BattlePhase { } // Check if there is any space still in field - if (this.isModal && globalScene.getPlayerField().filter(p => p.isAllowedInBattle() && p.isActive(true)).length >= globalScene.currentBattle.getBattlerCount()) { + if ( + this.isModal && + globalScene.getPlayerField().filter(p => p.isAllowedInBattle() && p.isActive(true)).length >= + globalScene.currentBattle.getBattlerCount() + ) { return super.end(); } // Override field index to 0 in case of double battle where 2/3 remaining legal party members fainted at once - const fieldIndex = globalScene.currentBattle.getBattlerCount() === 1 || globalScene.getPokemonAllowedInBattle().length > 1 ? this.fieldIndex : 0; + const fieldIndex = + globalScene.currentBattle.getBattlerCount() === 1 || globalScene.getPokemonAllowedInBattle().length > 1 + ? this.fieldIndex + : 0; - globalScene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.FAINT_SWITCH : PartyUiMode.POST_BATTLE_SWITCH, fieldIndex, (slotIndex: integer, option: PartyOption) => { - if (slotIndex >= globalScene.currentBattle.getBattlerCount() && slotIndex < 6) { - // Remove any pre-existing PostSummonPhase under the same field index. - // Pre-existing PostSummonPhases may occur when this phase is invoked during a prompt to switch at the start of a wave. - globalScene.tryRemovePhase(p => p instanceof PostSummonPhase && p.player && p.fieldIndex === this.fieldIndex); - const switchType = (option === PartyOption.PASS_BATON) ? SwitchType.BATON_PASS : this.switchType; - globalScene.unshiftPhase(new SwitchSummonPhase(switchType, fieldIndex, slotIndex, this.doReturn)); - } - globalScene.ui.setMode(Mode.MESSAGE).then(() => super.end()); - }, PartyUiHandler.FilterNonFainted); + globalScene.ui.setMode( + Mode.PARTY, + this.isModal ? PartyUiMode.FAINT_SWITCH : PartyUiMode.POST_BATTLE_SWITCH, + fieldIndex, + (slotIndex: number, option: PartyOption) => { + if (slotIndex >= globalScene.currentBattle.getBattlerCount() && slotIndex < 6) { + // Remove any pre-existing PostSummonPhase under the same field index. + // Pre-existing PostSummonPhases may occur when this phase is invoked during a prompt to switch at the start of a wave. + globalScene.tryRemovePhase(p => p instanceof PostSummonPhase && p.player && p.fieldIndex === this.fieldIndex); + const switchType = option === PartyOption.PASS_BATON ? SwitchType.BATON_PASS : this.switchType; + globalScene.unshiftPhase(new SwitchSummonPhase(switchType, fieldIndex, slotIndex, this.doReturn)); + } + globalScene.ui.setMode(Mode.MESSAGE).then(() => super.end()); + }, + PartyUiHandler.FilterNonFainted, + ); } } diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts index 94e57435922..48bcd0c4ebd 100644 --- a/src/phases/switch-summon-phase.ts +++ b/src/phases/switch-summon-phase.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; import { applyPreSwitchOutAbAttrs, PostDamageForceSwitchAbAttr, PreSwitchOutAbAttr } from "#app/data/ability"; -import { allMoves, ForceSwitchOutAttr } from "#app/data/move"; +import { allMoves, ForceSwitchOutAttr } from "#app/data/moves/move"; import { getPokeballTintColor } from "#app/data/pokeball"; import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; import { TrainerSlot } from "#app/data/trainer-config"; @@ -16,20 +16,20 @@ import { SwitchType } from "#enums/switch-type"; export class SwitchSummonPhase extends SummonPhase { private readonly switchType: SwitchType; - private readonly slotIndex: integer; + private readonly slotIndex: number; private readonly doReturn: boolean; private lastPokemon: Pokemon; /** - * Constructor for creating a new SwitchSummonPhase - * @param switchType the type of switch behavior - * @param fieldIndex integer representing position on the battle field - * @param slotIndex integer for the index of pokemon (in party of 6) to switch into - * @param doReturn boolean whether to render "comeback" dialogue - * @param player boolean if the switch is from the player - */ - constructor(switchType: SwitchType, fieldIndex: integer, slotIndex: integer, doReturn: boolean, player?: boolean) { + * Constructor for creating a new SwitchSummonPhase + * @param switchType the type of switch behavior + * @param fieldIndex integer representing position on the battle field + * @param slotIndex integer for the index of pokemon (in party of 6) to switch into + * @param doReturn boolean whether to render "comeback" dialogue + * @param player boolean if the switch is from the player + */ + constructor(switchType: SwitchType, fieldIndex: number, slotIndex: number, doReturn: boolean, player?: boolean) { super(fieldIndex, player !== undefined ? player : true); this.switchType = switchType; @@ -45,7 +45,9 @@ export class SwitchSummonPhase extends SummonPhase { if (!this.player) { if (this.slotIndex === -1) { //@ts-ignore - this.slotIndex = globalScene.currentBattle.trainer?.getNextSummonIndex(!this.fieldIndex ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER); // TODO: what would be the default trainer-slot fallback? + this.slotIndex = globalScene.currentBattle.trainer?.getNextSummonIndex( + !this.fieldIndex ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER, + ); // TODO: what would be the default trainer-slot fallback? } if (this.slotIndex > -1) { this.showEnemyTrainer(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER); @@ -53,17 +55,23 @@ export class SwitchSummonPhase extends SummonPhase { } } - if (!this.doReturn || (this.slotIndex !== -1 && !(this.player ? globalScene.getPlayerParty() : globalScene.getEnemyParty())[this.slotIndex])) { + if ( + !this.doReturn || + (this.slotIndex !== -1 && + !(this.player ? globalScene.getPlayerParty() : globalScene.getEnemyParty())[this.slotIndex]) + ) { if (this.player) { return this.switchAndSummon(); - } else { - globalScene.time.delayedCall(750, () => this.switchAndSummon()); - return; } + globalScene.time.delayedCall(750, () => this.switchAndSummon()); + return; } const pokemon = this.getPokemon(); - (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach(enemyPokemon => enemyPokemon.removeTagsBySourceId(pokemon.id)); + (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach(enemyPokemon => + enemyPokemon.removeTagsBySourceId(pokemon.id), + ); + if (this.switchType === SwitchType.SWITCH || this.switchType === SwitchType.INITIAL_SWITCH) { const substitute = pokemon.getTag(SubstituteTag); if (substitute) { @@ -72,17 +80,22 @@ export class SwitchSummonPhase extends SummonPhase { duration: 250, scale: substitute.sprite.scale * 0.5, ease: "Sine.easeIn", - onComplete: () => substitute.sprite.destroy() + onComplete: () => substitute.sprite.destroy(), }); } } - globalScene.ui.showText(this.player ? - i18next.t("battle:playerComeBack", { pokemonName: getPokemonNameWithAffix(pokemon) }) : - i18next.t("battle:trainerComeBack", { - trainerName: globalScene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER), - pokemonName: pokemon.getNameToRender() - }) + globalScene.ui.showText( + this.player + ? i18next.t("battle:playerComeBack", { + pokemonName: getPokemonNameWithAffix(pokemon), + }) + : i18next.t("battle:trainerComeBack", { + trainerName: globalScene.currentBattle.trainer?.getName( + !(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER, + ), + pokemonName: pokemon.getNameToRender(), + }), ); globalScene.playSound("se/pb_rel"); pokemon.hideInfo(); @@ -93,9 +106,9 @@ export class SwitchSummonPhase extends SummonPhase { ease: "Sine.easeIn", scale: 0.5, onComplete: () => { - pokemon.leaveField(this.switchType === SwitchType.SWITCH, false); globalScene.time.delayedCall(750, () => this.switchAndSummon()); - } + pokemon.leaveField(this.switchType === SwitchType.SWITCH, false); + }, }); } @@ -105,12 +118,38 @@ export class SwitchSummonPhase extends SummonPhase { this.lastPokemon = this.getPokemon(); applyPreSwitchOutAbAttrs(PreSwitchOutAbAttr, this.lastPokemon); if (this.switchType === SwitchType.BATON_PASS && switchedInPokemon) { - (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach(enemyPokemon => enemyPokemon.transferTagsBySourceId(this.lastPokemon.id, switchedInPokemon.id)); - if (!globalScene.findModifier(m => m instanceof SwitchEffectTransferModifier && (m as SwitchEffectTransferModifier).pokemonId === switchedInPokemon.id)) { - const batonPassModifier = globalScene.findModifier(m => m instanceof SwitchEffectTransferModifier - && (m as SwitchEffectTransferModifier).pokemonId === this.lastPokemon.id) as SwitchEffectTransferModifier; - if (batonPassModifier && !globalScene.findModifier(m => m instanceof SwitchEffectTransferModifier && (m as SwitchEffectTransferModifier).pokemonId === switchedInPokemon.id)) { - globalScene.tryTransferHeldItemModifier(batonPassModifier, switchedInPokemon, false, undefined, undefined, undefined, false); + (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach(enemyPokemon => + enemyPokemon.transferTagsBySourceId(this.lastPokemon.id, switchedInPokemon.id), + ); + if ( + !globalScene.findModifier( + m => + m instanceof SwitchEffectTransferModifier && + (m as SwitchEffectTransferModifier).pokemonId === switchedInPokemon.id, + ) + ) { + const batonPassModifier = globalScene.findModifier( + m => + m instanceof SwitchEffectTransferModifier && + (m as SwitchEffectTransferModifier).pokemonId === this.lastPokemon.id, + ) as SwitchEffectTransferModifier; + if ( + batonPassModifier && + !globalScene.findModifier( + m => + m instanceof SwitchEffectTransferModifier && + (m as SwitchEffectTransferModifier).pokemonId === switchedInPokemon.id, + ) + ) { + globalScene.tryTransferHeldItemModifier( + batonPassModifier, + switchedInPokemon, + false, + undefined, + undefined, + undefined, + false, + ); } } } @@ -118,12 +157,17 @@ export class SwitchSummonPhase extends SummonPhase { party[this.slotIndex] = this.lastPokemon; party[this.fieldIndex] = switchedInPokemon; const showTextAndSummon = () => { - globalScene.ui.showText(this.player ? - i18next.t("battle:playerGo", { pokemonName: getPokemonNameWithAffix(switchedInPokemon) }) : - i18next.t("battle:trainerGo", { - trainerName: globalScene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER), - pokemonName: this.getPokemon().getNameToRender() - }) + globalScene.ui.showText( + this.player + ? i18next.t("battle:playerGo", { + pokemonName: getPokemonNameWithAffix(switchedInPokemon), + }) + : i18next.t("battle:trainerGo", { + trainerName: globalScene.currentBattle.trainer?.getName( + !(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER, + ), + pokemonName: this.getPokemon().getNameToRender(), + }), ); /** * If this switch is passing a Substitute, make the switched Pokemon match the returned Pokemon's state as it left. @@ -164,12 +208,18 @@ export class SwitchSummonPhase extends SummonPhase { const lastUsedMove = moveId ? allMoves[moveId] : undefined; const currentCommand = globalScene.currentBattle.turnCommands[this.fieldIndex]?.command; - const lastPokemonIsForceSwitchedAndNotFainted = lastUsedMove?.hasAttr(ForceSwitchOutAttr) && !this.lastPokemon.isFainted(); - const lastPokemonHasForceSwitchAbAttr = this.lastPokemon.hasAbilityWithAttr(PostDamageForceSwitchAbAttr) && !this.lastPokemon.isFainted(); + const lastPokemonIsForceSwitchedAndNotFainted = + lastUsedMove?.hasAttr(ForceSwitchOutAttr) && !this.lastPokemon.isFainted(); + const lastPokemonHasForceSwitchAbAttr = + this.lastPokemon.hasAbilityWithAttr(PostDamageForceSwitchAbAttr) && !this.lastPokemon.isFainted(); // Compensate for turn spent summoning // Or compensate for force switch move if switched out pokemon is not fainted - if (currentCommand === Command.POKEMON || lastPokemonIsForceSwitchedAndNotFainted || lastPokemonHasForceSwitchAbAttr) { + if ( + currentCommand === Command.POKEMON || + lastPokemonIsForceSwitchedAndNotFainted || + lastPokemonHasForceSwitchAbAttr + ) { pokemon.battleSummonData.turnCount--; pokemon.battleSummonData.waveTurnCount--; } diff --git a/src/phases/tera-phase.ts b/src/phases/tera-phase.ts new file mode 100644 index 00000000000..c9320daf12f --- /dev/null +++ b/src/phases/tera-phase.ts @@ -0,0 +1,53 @@ +import type Pokemon from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { BattlePhase } from "./battle-phase"; +import i18next from "i18next"; +import { globalScene } from "#app/global-scene"; +import { PokemonType } from "#enums/pokemon-type"; +import { achvs } from "#app/system/achv"; +import { SpeciesFormChangeTeraTrigger } from "#app/data/pokemon-forms"; +import { CommonAnim, CommonBattleAnim } from "#app/data/battle-anims"; + +export class TeraPhase extends BattlePhase { + public pokemon: Pokemon; + + constructor(pokemon: Pokemon) { + super(); + + this.pokemon = pokemon; + } + + start() { + super.start(); + + globalScene.queueMessage( + i18next.t("battle:pokemonTerastallized", { + pokemonNameWithAffix: getPokemonNameWithAffix(this.pokemon), + type: i18next.t(`pokemonInfo:Type.${PokemonType[this.pokemon.getTeraType()]}`), + }), + ); + new CommonBattleAnim(CommonAnim.TERASTALLIZE, this.pokemon).play(false, () => { + this.end(); + }); + } + + end() { + this.pokemon.isTerastallized = true; + this.pokemon.updateSpritePipelineData(); + + if (this.pokemon.isPlayer()) { + globalScene.arena.playerTerasUsed += 1; + } + + globalScene.triggerPokemonFormChange(this.pokemon, SpeciesFormChangeTeraTrigger); + + if (this.pokemon.isPlayer()) { + globalScene.validateAchv(achvs.TERASTALLIZE); + if (this.pokemon.getTeraType() === PokemonType.STELLAR) { + globalScene.validateAchv(achvs.STELLAR_TERASTALLIZE); + } + } + + super.end(); + } +} diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts index 86b5fe04a09..5b69f8db45c 100644 --- a/src/phases/title-phase.ts +++ b/src/phases/title-phase.ts @@ -5,7 +5,12 @@ import { Gender } from "#app/data/gender"; import { getBiomeKey } from "#app/field/arena"; import { GameMode, GameModes, getGameMode } from "#app/game-mode"; import type { Modifier } from "#app/modifier/modifier"; -import { getDailyRunStarterModifiers, ModifierPoolType, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; +import { + getDailyRunStarterModifiers, + ModifierPoolType, + modifierTypes, + regenerateModifierPoolThresholds, +} from "#app/modifier/modifier-type"; import { Phase } from "#app/phase"; import type { SessionSaveData } from "#app/system/game-data"; import { Unlockables } from "#app/system/unlockables"; @@ -21,7 +26,7 @@ import { SelectChallengePhase } from "./select-challenge-phase"; import { SelectStarterPhase } from "./select-starter-phase"; import { SummonPhase } from "./summon-phase"; import { globalScene } from "#app/global-scene"; - +import Overrides from "#app/overrides"; export class TitlePhase extends Phase { private loaded: boolean; @@ -42,18 +47,21 @@ export class TitlePhase extends Phase { globalScene.playBgm("title", true); - globalScene.gameData.getSession(loggedInUser?.lastSessionSlot ?? -1).then(sessionData => { - if (sessionData) { - this.lastSessionData = sessionData; - const biomeKey = getBiomeKey(sessionData.arena.biome); - const bgTexture = `${biomeKey}_bg`; - globalScene.arenaBg.setTexture(bgTexture); - } - this.showOptions(); - }).catch(err => { - console.error(err); - this.showOptions(); - }); + globalScene.gameData + .getSession(loggedInUser?.lastSessionSlot ?? -1) + .then(sessionData => { + if (sessionData) { + this.lastSessionData = sessionData; + const biomeKey = getBiomeKey(sessionData.arena.biome); + const bgTexture = `${biomeKey}_bg`; + globalScene.arenaBg.setTexture(bgTexture); + } + this.showOptions(); + }) + .catch(err => { + console.error(err); + this.showOptions(); + }); } showOptions(): void { @@ -64,51 +72,59 @@ export class TitlePhase extends Phase { handler: () => { this.loadSaveSlot(this.lastSessionData || !loggedInUser ? -1 : loggedInUser.lastSessionSlot); return true; - } + }, }); } - options.push({ - label: i18next.t("menu:newGame"), - handler: () => { - const setModeAndEnd = (gameMode: GameModes) => { - this.gameMode = gameMode; - globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.clearText(); - this.end(); - }; - const { gameData } = globalScene; - if (gameData.isUnlocked(Unlockables.ENDLESS_MODE)) { - const options: OptionSelectItem[] = [ - { - label: GameMode.getModeName(GameModes.CLASSIC), - handler: () => { - setModeAndEnd(GameModes.CLASSIC); - return true; - } + options.push( + { + label: i18next.t("menu:newGame"), + handler: () => { + const setModeAndEnd = (gameMode: GameModes) => { + this.gameMode = gameMode; + globalScene.ui.setMode(Mode.MESSAGE); + globalScene.ui.clearText(); + this.end(); + }; + const { gameData } = globalScene; + const options: OptionSelectItem[] = []; + options.push({ + label: GameMode.getModeName(GameModes.CLASSIC), + handler: () => { + setModeAndEnd(GameModes.CLASSIC); + return true; }, - { + }); + options.push({ + label: i18next.t("menu:dailyRun"), + handler: () => { + this.initDailyRun(); + return true; + }, + }); + if (gameData.isUnlocked(Unlockables.ENDLESS_MODE)) { + options.push({ label: GameMode.getModeName(GameModes.CHALLENGE), handler: () => { setModeAndEnd(GameModes.CHALLENGE); return true; - } - }, - { + }, + }); + options.push({ label: GameMode.getModeName(GameModes.ENDLESS), handler: () => { setModeAndEnd(GameModes.ENDLESS); return true; - } - } - ]; - if (gameData.isUnlocked(Unlockables.SPLICED_ENDLESS_MODE)) { - options.push({ - label: GameMode.getModeName(GameModes.SPLICED_ENDLESS), - handler: () => { - setModeAndEnd(GameModes.SPLICED_ENDLESS); - return true; - } + }, }); + if (gameData.isUnlocked(Unlockables.SPLICED_ENDLESS_MODE)) { + options.push({ + label: GameMode.getModeName(GameModes.SPLICED_ENDLESS), + handler: () => { + setModeAndEnd(GameModes.SPLICED_ENDLESS); + return true; + }, + }); + } } options.push({ label: i18next.t("menu:cancel"), @@ -117,82 +133,76 @@ export class TitlePhase extends Phase { globalScene.pushPhase(new TitlePhase()); super.end(); return true; - } + }, }); - globalScene.ui.showText(i18next.t("menu:selectGameMode"), null, () => globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, { options: options })); - } else { - this.gameMode = GameModes.CLASSIC; - globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.clearText(); - this.end(); - } - return true; - } - }, - { - label: i18next.t("menu:loadGame"), - handler: () => { - globalScene.ui.setOverlayMode(Mode.SAVE_SLOT, SaveSlotUiMode.LOAD, - (slotId: integer) => { + globalScene.ui.showText(i18next.t("menu:selectGameMode"), null, () => + globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, { + options: options, + }), + ); + return true; + }, + }, + { + label: i18next.t("menu:loadGame"), + handler: () => { + globalScene.ui.setOverlayMode(Mode.SAVE_SLOT, SaveSlotUiMode.LOAD, (slotId: number) => { if (slotId === -1) { return this.showOptions(); } this.loadSaveSlot(slotId); }); - return true; - } - }, - { - label: i18next.t("menu:dailyRun"), - handler: () => { - this.initDailyRun(); - return true; + return true; + }, }, - keepOpen: true - }, - { - label: i18next.t("menu:runHistory"), - handler: () => { - globalScene.ui.setOverlayMode(Mode.RUN_HISTORY); - return true; + { + label: i18next.t("menu:runHistory"), + handler: () => { + globalScene.ui.setOverlayMode(Mode.RUN_HISTORY); + return true; + }, + keepOpen: true, }, - keepOpen: true - }, - { - label: i18next.t("menu:settings"), - handler: () => { - globalScene.ui.setOverlayMode(Mode.SETTINGS); - return true; + { + label: i18next.t("menu:settings"), + handler: () => { + globalScene.ui.setOverlayMode(Mode.SETTINGS); + return true; + }, + keepOpen: true, }, - keepOpen: true - }); + ); const config: OptionSelectConfig = { options: options, noCancel: true, - yOffset: 47 + yOffset: 47, }; globalScene.ui.setMode(Mode.TITLE, config); } - loadSaveSlot(slotId: integer): void { + loadSaveSlot(slotId: number): void { globalScene.sessionSlotId = slotId > -1 || !loggedInUser ? slotId : loggedInUser.lastSessionSlot; globalScene.ui.setMode(Mode.MESSAGE); globalScene.ui.resetModeChain(); - globalScene.gameData.loadSession(slotId, slotId === -1 ? this.lastSessionData : undefined).then((success: boolean) => { - if (success) { - this.loaded = true; - globalScene.ui.showText(i18next.t("menu:sessionSuccess"), null, () => this.end()); - } else { - this.end(); - } - }).catch(err => { - console.error(err); - globalScene.ui.showText(i18next.t("menu:failedToLoadSession"), null); - }); + globalScene.gameData + .loadSession(slotId, slotId === -1 ? this.lastSessionData : undefined) + .then((success: boolean) => { + if (success) { + this.loaded = true; + globalScene.ui.showText(i18next.t("menu:sessionSuccess"), null, () => this.end()); + } else { + this.end(); + } + }) + .catch(err => { + console.error(err); + globalScene.ui.showText(i18next.t("menu:failedToLoadSession"), null); + }); } initDailyRun(): void { - globalScene.ui.setMode(Mode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: integer) => { + globalScene.ui.clearText(); + globalScene.ui.setMode(Mode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => { globalScene.clearPhaseQueue(); if (slotId === -1) { globalScene.pushPhase(new TitlePhase()); @@ -216,10 +226,23 @@ export class TitlePhase extends Phase { for (const starter of starters) { const starterProps = globalScene.gameData.getSpeciesDexAttrProps(starter.species, starter.dexAttr); const starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0)); - const starterGender = starter.species.malePercent !== null - ? !starterProps.female ? Gender.MALE : Gender.FEMALE - : Gender.GENDERLESS; - const starterPokemon = globalScene.addPlayerPokemon(starter.species, startingLevel, starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, undefined, starter.nature); + const starterGender = + starter.species.malePercent !== null + ? !starterProps.female + ? Gender.MALE + : Gender.FEMALE + : Gender.GENDERLESS; + const starterPokemon = globalScene.addPlayerPokemon( + starter.species, + startingLevel, + starter.abilityIndex, + starterFormIndex, + starterGender, + starterProps.shiny, + starterProps.variant, + undefined, + starter.nature, + ); starterPokemon.setVisible(false); party.push(starterPokemon); loadPokemonAssets.push(starterPokemon.loadAssets()); @@ -227,11 +250,17 @@ export class TitlePhase extends Phase { regenerateModifierPoolThresholds(party, ModifierPoolType.DAILY_STARTER); - const modifiers: Modifier[] = Array(3).fill(null).map(() => modifierTypes.EXP_SHARE().withIdFromFunc(modifierTypes.EXP_SHARE).newModifier()) - .concat(Array(3).fill(null).map(() => modifierTypes.GOLDEN_EXP_CHARM().withIdFromFunc(modifierTypes.GOLDEN_EXP_CHARM).newModifier())) - .concat([ modifierTypes.MAP().withIdFromFunc(modifierTypes.MAP).newModifier() ]) + const modifiers: Modifier[] = Array(3) + .fill(null) + .map(() => modifierTypes.EXP_SHARE().withIdFromFunc(modifierTypes.EXP_SHARE).newModifier()) + .concat( + Array(3) + .fill(null) + .map(() => modifierTypes.GOLDEN_EXP_CHARM().withIdFromFunc(modifierTypes.GOLDEN_EXP_CHARM).newModifier()), + ) + .concat([modifierTypes.MAP().withIdFromFunc(modifierTypes.MAP).newModifier()]) .concat(getDailyRunStarterModifiers(party)) - .filter((m) => m !== null); + .filter(m => m !== null); for (const m of modifiers) { globalScene.addModifier(m, true, false, false, true); @@ -252,17 +281,23 @@ export class TitlePhase extends Phase { // If Online, calls seed fetch from db to generate daily run. If Offline, generates a daily run based on current date. if (!Utils.isLocal || Utils.isLocalServerConnected) { - fetchDailyRunSeed().then(seed => { - if (seed) { - generateDaily(seed); - } else { - throw new Error("Daily run seed is null!"); - } - }).catch(err => { - console.error("Failed to load daily run:\n", err); - }); + fetchDailyRunSeed() + .then(seed => { + if (seed) { + generateDaily(seed); + } else { + throw new Error("Daily run seed is null!"); + } + }) + .catch(err => { + console.error("Failed to load daily run:\n", err); + }); } else { - generateDaily(btoa(new Date().toISOString().substring(0, 10))); + let seed: string = btoa(new Date().toISOString().substring(0, 10)); + if (!Utils.isNullOrUndefined(Overrides.DAILY_RUN_SEED_OVERRIDE)) { + seed = Overrides.DAILY_RUN_SEED_OVERRIDE; + } + generateDaily(seed); } }); } @@ -291,7 +326,10 @@ export class TitlePhase extends Phase { globalScene.pushPhase(new SummonPhase(1, true, true)); } - if (globalScene.currentBattle.battleType !== BattleType.TRAINER && (globalScene.currentBattle.waveIndex > 1 || !globalScene.gameMode.isDaily)) { + if ( + globalScene.currentBattle.battleType !== BattleType.TRAINER && + (globalScene.currentBattle.waveIndex > 1 || !globalScene.gameMode.isDaily) + ) { const minPartySize = globalScene.currentBattle.double ? 2 : 1; if (availablePartyMembers > minPartySize) { globalScene.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double)); diff --git a/src/phases/toggle-double-position-phase.ts b/src/phases/toggle-double-position-phase.ts index f61577444d2..37f47d5cf95 100644 --- a/src/phases/toggle-double-position-phase.ts +++ b/src/phases/toggle-double-position-phase.ts @@ -16,14 +16,19 @@ export class ToggleDoublePositionPhase extends BattlePhase { const playerPokemon = globalScene.getPlayerField().find(p => p.isActive(true)); if (playerPokemon) { - playerPokemon.setFieldPosition(this.double && globalScene.getPokemonAllowedInBattle().length > 1 ? FieldPosition.LEFT : FieldPosition.CENTER, 500).then(() => { - if (playerPokemon.getFieldIndex() === 1) { - const party = globalScene.getPlayerParty(); - party[1] = party[0]; - party[0] = playerPokemon; - } - this.end(); - }); + playerPokemon + .setFieldPosition( + this.double && globalScene.getPokemonAllowedInBattle().length > 1 ? FieldPosition.LEFT : FieldPosition.CENTER, + 500, + ) + .then(() => { + if (playerPokemon.getFieldIndex() === 1) { + const party = globalScene.getPlayerParty(); + party[1] = party[0]; + party[0] = playerPokemon; + } + this.end(); + }); } else { this.end(); } diff --git a/src/phases/trainer-message-test-phase.ts b/src/phases/trainer-message-test-phase.ts index 34ce2e8b53e..fa3f553cdd6 100644 --- a/src/phases/trainer-message-test-phase.ts +++ b/src/phases/trainer-message-test-phase.ts @@ -19,17 +19,23 @@ export class TrainerMessageTestPhase extends BattlePhase { const testMessages: string[] = []; for (const t of Object.keys(trainerConfigs)) { - const type = parseInt(t); - if (this.trainerTypes.length && !this.trainerTypes.find(tt => tt === type as TrainerType)) { + const type = Number.parseInt(t); + if (this.trainerTypes.length && !this.trainerTypes.find(tt => tt === (type as TrainerType))) { continue; } const config = trainerConfigs[type]; - [ config.encounterMessages, config.femaleEncounterMessages, config.victoryMessages, config.femaleVictoryMessages, config.defeatMessages, config.femaleDefeatMessages ] - .map(messages => { - if (messages?.length) { - testMessages.push(...messages); - } - }); + [ + config.encounterMessages, + config.femaleEncounterMessages, + config.victoryMessages, + config.femaleVictoryMessages, + config.defeatMessages, + config.femaleDefeatMessages, + ].map(messages => { + if (messages?.length) { + testMessages.push(...messages); + } + }); } for (const message of testMessages) { diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts index e2617f598da..024c1e3f837 100644 --- a/src/phases/trainer-victory-phase.ts +++ b/src/phases/trainer-victory-phase.ts @@ -38,47 +38,92 @@ export class TrainerVictoryPhase extends BattlePhase { const trainerType = globalScene.currentBattle.trainer?.config.trainerType!; // TODO: is this bang correct? // Validate Voucher for boss trainers if (vouchers.hasOwnProperty(TrainerType[trainerType])) { - if (!globalScene.validateVoucher(vouchers[TrainerType[trainerType]]) && globalScene.currentBattle.trainer?.config.isBoss) { + if ( + !globalScene.validateVoucher(vouchers[TrainerType[trainerType]]) && + globalScene.currentBattle.trainer?.config.isBoss + ) { if (globalScene.eventManager.getUpgradeUnlockedVouchers()) { - globalScene.unshiftPhase(new ModifierRewardPhase([ modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType])); + globalScene.unshiftPhase( + new ModifierRewardPhase( + [ + modifierTypes.VOUCHER_PLUS, + modifierTypes.VOUCHER_PLUS, + modifierTypes.VOUCHER_PLUS, + modifierTypes.VOUCHER_PREMIUM, + ][vouchers[TrainerType[trainerType]].voucherType], + ), + ); } else { - globalScene.unshiftPhase(new ModifierRewardPhase([ modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType])); + globalScene.unshiftPhase( + new ModifierRewardPhase( + [modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM][ + vouchers[TrainerType[trainerType]].voucherType + ], + ), + ); } } } // Breeders in Space achievement if ( - globalScene.arena.biomeType === Biome.SPACE - && (trainerType === TrainerType.BREEDER || trainerType === TrainerType.EXPERT_POKEMON_BREEDER) + globalScene.arena.biomeType === Biome.SPACE && + (trainerType === TrainerType.BREEDER || trainerType === TrainerType.EXPERT_POKEMON_BREEDER) ) { globalScene.validateAchv(achvs.BREEDERS_IN_SPACE); } - globalScene.ui.showText(i18next.t("battle:trainerDefeated", { trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) }), null, () => { - const victoryMessages = globalScene.currentBattle.trainer?.getVictoryMessages()!; // TODO: is this bang correct? - let message: string; - globalScene.executeWithSeedOffset(() => message = Utils.randSeedItem(victoryMessages), globalScene.currentBattle.waveIndex); - message = message!; // tell TS compiler it's defined now + globalScene.ui.showText( + i18next.t("battle:trainerDefeated", { + trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true), + }), + null, + () => { + const victoryMessages = globalScene.currentBattle.trainer?.getVictoryMessages()!; // TODO: is this bang correct? + let message: string; + globalScene.executeWithSeedOffset( + () => (message = Utils.randSeedItem(victoryMessages)), + globalScene.currentBattle.waveIndex, + ); + message = message!; // tell TS compiler it's defined now - const showMessage = () => { - const originalFunc = showMessageOrEnd; - showMessageOrEnd = () => globalScene.ui.showDialogue(message, globalScene.currentBattle.trainer?.getName(TrainerSlot.TRAINER, true), null, originalFunc); - - showMessageOrEnd(); - }; - let showMessageOrEnd = () => this.end(); - if (victoryMessages?.length) { - if (globalScene.currentBattle.trainer?.config.hasCharSprite && !globalScene.ui.shouldSkipDialogue(message)) { + const showMessage = () => { const originalFunc = showMessageOrEnd; - showMessageOrEnd = () => globalScene.charSprite.hide().then(() => globalScene.hideFieldOverlay(250).then(() => originalFunc())); - globalScene.showFieldOverlay(500).then(() => globalScene.charSprite.showCharacter(globalScene.currentBattle.trainer?.getKey()!, getCharVariantFromDialogue(victoryMessages[0])).then(() => showMessage())); // TODO: is this bang correct? + showMessageOrEnd = () => + globalScene.ui.showDialogue( + message, + globalScene.currentBattle.trainer?.getName(TrainerSlot.TRAINER, true), + null, + originalFunc, + ); + + showMessageOrEnd(); + }; + let showMessageOrEnd = () => this.end(); + if (victoryMessages?.length) { + if (globalScene.currentBattle.trainer?.config.hasCharSprite && !globalScene.ui.shouldSkipDialogue(message)) { + const originalFunc = showMessageOrEnd; + showMessageOrEnd = () => + globalScene.charSprite.hide().then(() => globalScene.hideFieldOverlay(250).then(() => originalFunc())); + globalScene + .showFieldOverlay(500) + .then(() => + globalScene.charSprite + .showCharacter( + globalScene.currentBattle.trainer?.getKey()!, + getCharVariantFromDialogue(victoryMessages[0]), + ) + .then(() => showMessage()), + ); // TODO: is this bang correct? + } else { + showMessage(); + } } else { - showMessage(); + showMessageOrEnd(); } - } else { - showMessageOrEnd(); - } - }, null, true); + }, + null, + true, + ); this.showEnemyTrainer(); } diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts index fc4190ef2eb..c55f6d69a58 100644 --- a/src/phases/turn-end-phase.ts +++ b/src/phases/turn-end-phase.ts @@ -5,7 +5,13 @@ import { WeatherType } from "#app/enums/weather-type"; import { TurnEndEvent } from "#app/events/battle-scene"; import type Pokemon from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { TurnHealModifier, EnemyTurnHealModifier, EnemyStatusEffectHealChanceModifier, TurnStatusEffectModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier"; +import { + TurnHealModifier, + EnemyTurnHealModifier, + EnemyStatusEffectHealChanceModifier, + TurnStatusEffectModifier, + TurnHeldItemTransferModifier, +} from "#app/modifier/modifier"; import i18next from "i18next"; import { FieldPhase } from "./field-phase"; import { PokemonHealPhase } from "./pokemon-heal-phase"; @@ -29,8 +35,16 @@ export class TurnEndPhase extends FieldPhase { globalScene.applyModifiers(TurnHealModifier, pokemon.isPlayer(), pokemon); if (globalScene.arena.terrain?.terrainType === TerrainType.GRASSY && pokemon.isGrounded()) { - globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(), - Math.max(pokemon.getMaxHp() >> 4, 1), i18next.t("battle:turnEndHpRestore", { pokemonName: getPokemonNameWithAffix(pokemon) }), true)); + globalScene.unshiftPhase( + new PokemonHealPhase( + pokemon.getBattlerIndex(), + Math.max(pokemon.getMaxHp() >> 4, 1), + i18next.t("battle:turnEndHpRestore", { + pokemonName: getPokemonNameWithAffix(pokemon), + }), + true, + ), + ); } if (!pokemon.isPlayer()) { diff --git a/src/phases/turn-init-phase.ts b/src/phases/turn-init-phase.ts index 946c9626718..3104b65eb3f 100644 --- a/src/phases/turn-init-phase.ts +++ b/src/phases/turn-init-phase.ts @@ -1,5 +1,8 @@ import { BattlerIndex } from "#app/battle"; -import { handleMysteryEncounterBattleStartEffects, handleMysteryEncounterTurnStartEffects } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { + handleMysteryEncounterBattleStartEffects, + handleMysteryEncounterTurnStartEffects, +} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { TurnInitEvent } from "#app/events/battle-scene"; import type { PlayerPokemon } from "#app/field/pokemon"; import i18next from "i18next"; @@ -22,7 +25,7 @@ export class TurnInitPhase extends FieldPhase { globalScene.getPlayerField().forEach(p => { // If this pokemon is in play and evolved into something illegal under the current challenge, force a switch if (p.isOnField() && !p.isAllowedInBattle()) { - globalScene.queueMessage(i18next.t("challenges:illegalEvolution", { "pokemon": p.name }), null, true); + globalScene.queueMessage(i18next.t("challenges:illegalEvolution", { pokemon: p.name }), null, true); const allowedPokemon = globalScene.getPokemonAllowedInBattle(); @@ -30,7 +33,10 @@ export class TurnInitPhase extends FieldPhase { // If there are no longer any legal pokemon in the party, game over. globalScene.clearPhaseQueue(); globalScene.unshiftPhase(new GameOverPhase()); - } else if (allowedPokemon.length >= globalScene.currentBattle.getBattlerCount() || (globalScene.currentBattle.double && !allowedPokemon[0].isActive(true))) { + } else if ( + allowedPokemon.length >= globalScene.currentBattle.getBattlerCount() || + (globalScene.currentBattle.double && !allowedPokemon[0].isActive(true)) + ) { // If there is at least one pokemon in the back that is legal to switch in, force a switch. p.switchOut(); } else { diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts index c64d7ddf526..6065a0caf6e 100644 --- a/src/phases/turn-start-phase.ts +++ b/src/phases/turn-start-phase.ts @@ -1,5 +1,5 @@ import { applyAbAttrs, BypassSpeedChanceAbAttr, PreventBypassSpeedChanceAbAttr } from "#app/data/ability"; -import { allMoves, MoveHeaderAttr } from "#app/data/move"; +import { allMoves, MoveHeaderAttr } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { Stat } from "#app/enums/stat"; import type Pokemon from "#app/field/pokemon"; @@ -21,6 +21,7 @@ import { BattlerIndex } from "#app/battle"; import { TrickRoomTag } from "#app/data/arena-tag"; import { SwitchType } from "#enums/switch-type"; import { globalScene } from "#app/global-scene"; +import { TeraPhase } from "./tera-phase"; export class TurnStartPhase extends FieldPhase { constructor() { @@ -40,9 +41,13 @@ export class TurnStartPhase extends FieldPhase { let orderedTargets: Pokemon[] = playerField.concat(enemyField); // We seed it with the current turn to prevent an inconsistency where it // was varying based on how long since you last reloaded - globalScene.executeWithSeedOffset(() => { - orderedTargets = Utils.randSeedShuffle(orderedTargets); - }, globalScene.currentBattle.turn, globalScene.waveSeed); + globalScene.executeWithSeedOffset( + () => { + orderedTargets = Utils.randSeedShuffle(orderedTargets); + }, + globalScene.currentBattle.turn, + globalScene.waveSeed, + ); // Next, a check for Trick Room is applied to determine sort order. const speedReversed = new Utils.BooleanHolder(false); @@ -71,16 +76,19 @@ export class TurnStartPhase extends FieldPhase { // This occurs before the main loop because of battles with more than two Pokemon const battlerBypassSpeed = {}; - globalScene.getField(true).filter(p => p.summonData).map(p => { - const bypassSpeed = new Utils.BooleanHolder(false); - const canCheckHeldItems = new Utils.BooleanHolder(true); - applyAbAttrs(BypassSpeedChanceAbAttr, p, null, false, bypassSpeed); - applyAbAttrs(PreventBypassSpeedChanceAbAttr, p, null, false, bypassSpeed, canCheckHeldItems); - if (canCheckHeldItems.value) { - globalScene.applyModifiers(BypassSpeedChanceModifier, p.isPlayer(), p, bypassSpeed); - } - battlerBypassSpeed[p.getBattlerIndex()] = bypassSpeed; - }); + globalScene + .getField(true) + .filter(p => p.summonData) + .map(p => { + const bypassSpeed = new Utils.BooleanHolder(false); + const canCheckHeldItems = new Utils.BooleanHolder(true); + applyAbAttrs(BypassSpeedChanceAbAttr, p, null, false, bypassSpeed); + applyAbAttrs(PreventBypassSpeedChanceAbAttr, p, null, false, bypassSpeed, canCheckHeldItems); + if (canCheckHeldItems.value) { + globalScene.applyModifiers(BypassSpeedChanceModifier, p.isPlayer(), p, bypassSpeed); + } + battlerBypassSpeed[p.getBattlerIndex()] = bypassSpeed; + }); // The function begins sorting orderedTargets based on command priority, move priority, and possible speed bypasses. // Non-FIGHT commands (SWITCH, BALL, RUN) have a higher command priority and will always occur before any FIGHT commands. @@ -92,7 +100,8 @@ export class TurnStartPhase extends FieldPhase { if (aCommand?.command !== bCommand?.command) { if (aCommand?.command === Command.FIGHT) { return 1; - } else if (bCommand?.command === Command.FIGHT) { + } + if (bCommand?.command === Command.FIGHT) { return -1; } } else if (aCommand?.command === Command.FIGHT) { @@ -114,7 +123,7 @@ export class TurnStartPhase extends FieldPhase { if (isSameBracket && battlerBypassSpeed[a].value !== battlerBypassSpeed[b].value) { return battlerBypassSpeed[a].value ? -1 : 1; } - return (aPriority < bPriority) ? 1 : -1; + return aPriority < bPriority ? 1 : -1; } } @@ -139,8 +148,21 @@ export class TurnStartPhase extends FieldPhase { let orderIndex = 0; - for (const o of moveOrder) { + for (const o of this.getSpeedOrder()) { + const pokemon = field[o]; + const preTurnCommand = globalScene.currentBattle.preTurnCommands[o]; + if (preTurnCommand?.skip) { + continue; + } + + switch (preTurnCommand?.command) { + case Command.TERA: + globalScene.pushPhase(new TeraPhase(pokemon)); + } + } + + for (const o of moveOrder) { const pokemon = field[o]; const turnCommand = globalScene.currentBattle.turnCommands[o]; @@ -155,42 +177,62 @@ export class TurnStartPhase extends FieldPhase { if (!queuedMove) { continue; } - const move = pokemon.getMoveset().find(m => m?.moveId === queuedMove.move && m?.ppUsed < m?.getMovePp()) || new PokemonMove(queuedMove.move); + const move = + pokemon.getMoveset().find(m => m?.moveId === queuedMove.move && m?.ppUsed < m?.getMovePp()) || + new PokemonMove(queuedMove.move); if (move.getMove().hasAttr(MoveHeaderAttr)) { globalScene.unshiftPhase(new MoveHeaderPhase(pokemon, move)); } if (pokemon.isPlayer()) { if (turnCommand.cursor === -1) { - globalScene.pushPhase(new MovePhase(pokemon, turnCommand.targets || turnCommand.move!.targets, move));//TODO: is the bang correct here? + globalScene.pushPhase(new MovePhase(pokemon, turnCommand.targets || turnCommand.move!.targets, move)); //TODO: is the bang correct here? } else { - const playerPhase = new MovePhase(pokemon, turnCommand.targets || turnCommand.move!.targets, move, false, queuedMove.ignorePP);//TODO: is the bang correct here? + const playerPhase = new MovePhase( + pokemon, + turnCommand.targets || turnCommand.move!.targets, + move, + false, + queuedMove.ignorePP, + ); //TODO: is the bang correct here? globalScene.pushPhase(playerPhase); } } else { - globalScene.pushPhase(new MovePhase(pokemon, turnCommand.targets || turnCommand.move!.targets, move, false, queuedMove.ignorePP));//TODO: is the bang correct here? + globalScene.pushPhase( + new MovePhase( + pokemon, + turnCommand.targets || turnCommand.move!.targets, + move, + false, + queuedMove.ignorePP, + ), + ); //TODO: is the bang correct here? } break; case Command.BALL: - globalScene.unshiftPhase(new AttemptCapturePhase(turnCommand.targets![0] % 2, turnCommand.cursor!));//TODO: is the bang correct here? + globalScene.unshiftPhase(new AttemptCapturePhase(turnCommand.targets![0] % 2, turnCommand.cursor!)); //TODO: is the bang correct here? break; case Command.POKEMON: const switchType = turnCommand.args?.[0] ? SwitchType.BATON_PASS : SwitchType.SWITCH; - globalScene.unshiftPhase(new SwitchSummonPhase(switchType, pokemon.getFieldIndex(), turnCommand.cursor!, true, pokemon.isPlayer())); + globalScene.unshiftPhase( + new SwitchSummonPhase(switchType, pokemon.getFieldIndex(), turnCommand.cursor!, true, pokemon.isPlayer()), + ); break; case Command.RUN: let runningPokemon = pokemon; if (globalScene.currentBattle.double) { const playerActivePokemon = field.filter(pokemon => { - if (!!pokemon) { + if (pokemon) { return pokemon.isPlayer() && pokemon.isActive(); - } else { - return; } + return; }); // if only one pokemon is alive, use that one if (playerActivePokemon.length > 1) { - // find which active pokemon has faster speed - const fasterPokemon = playerActivePokemon[0].getStat(Stat.SPD) > playerActivePokemon[1].getStat(Stat.SPD) ? playerActivePokemon[0] : playerActivePokemon[1]; + // find which active pokemon has faster speed + const fasterPokemon = + playerActivePokemon[0].getStat(Stat.SPD) > playerActivePokemon[1].getStat(Stat.SPD) + ? playerActivePokemon[0] + : playerActivePokemon[1]; // check if either active pokemon has the ability "Run Away" const hasRunAway = playerActivePokemon.find(p => p.hasAbility(Abilities.RUN_AWAY)); runningPokemon = hasRunAway !== undefined ? hasRunAway : fasterPokemon; @@ -210,10 +252,10 @@ export class TurnStartPhase extends FieldPhase { globalScene.pushPhase(new TurnEndPhase()); /** - * this.end() will call shiftPhase(), which dumps everything from PrependQueue (aka everything that is unshifted()) to the front - * of the queue and dequeues to start the next phase - * this is important since stuff like SwitchSummon, AttemptRun, AttemptCapture Phases break the "flow" and should take precedence - */ + * this.end() will call shiftPhase(), which dumps everything from PrependQueue (aka everything that is unshifted()) to the front + * of the queue and dequeues to start the next phase + * this is important since stuff like SwitchSummon, AttemptRun, AttemptCapture Phases break the "flow" and should take precedence + */ this.end(); } } diff --git a/src/phases/unlock-phase.ts b/src/phases/unlock-phase.ts index 2d24ee92baf..b420a4b3a61 100644 --- a/src/phases/unlock-phase.ts +++ b/src/phases/unlock-phase.ts @@ -20,10 +20,19 @@ export class UnlockPhase extends Phase { // Sound loaded into game as is globalScene.playSound("level_up_fanfare"); globalScene.ui.setMode(Mode.MESSAGE); - globalScene.ui.showText(i18next.t("battle:unlockedSomething", { unlockedThing: getUnlockableName(this.unlockable) }), null, () => { - globalScene.time.delayedCall(1500, () => globalScene.arenaBg.setVisible(true)); - this.end(); - }, null, true, 1500); + globalScene.ui.showText( + i18next.t("battle:unlockedSomething", { + unlockedThing: getUnlockableName(this.unlockable), + }), + null, + () => { + globalScene.time.delayedCall(1500, () => globalScene.arenaBg.setVisible(true)); + this.end(); + }, + null, + true, + 1500, + ); }); } } diff --git a/src/phases/victory-phase.ts b/src/phases/victory-phase.ts index 8918b664a36..78bf72195e8 100644 --- a/src/phases/victory-phase.ts +++ b/src/phases/victory-phase.ts @@ -18,7 +18,7 @@ export class VictoryPhase extends PokemonPhase { /** If true, indicates that the phase is intended for EXP purposes only, and not to continue a battle to next phase */ isExpOnly: boolean; - constructor(battlerIndex: BattlerIndex | integer, isExpOnly: boolean = false) { + constructor(battlerIndex: BattlerIndex | number, isExpOnly = false) { super(battlerIndex); this.isExpOnly = isExpOnly; @@ -42,14 +42,21 @@ export class VictoryPhase extends PokemonPhase { return this.end(); } - if (!globalScene.getEnemyParty().find(p => globalScene.currentBattle.battleType === BattleType.WILD ? p.isOnField() : !p?.isFainted(true))) { + if ( + !globalScene + .getEnemyParty() + .find(p => (globalScene.currentBattle.battleType === BattleType.WILD ? p.isOnField() : !p?.isFainted(true))) + ) { globalScene.pushPhase(new BattleEndPhase(true)); if (globalScene.currentBattle.battleType === BattleType.TRAINER) { globalScene.pushPhase(new TrainerVictoryPhase()); } if (globalScene.gameMode.isEndless || !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) { globalScene.pushPhase(new EggLapsePhase()); - if (globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex === ClassicFixedBossWaves.EVIL_BOSS_2) { + if ( + globalScene.gameMode.isClassic && + globalScene.currentBattle.waveIndex === ClassicFixedBossWaves.EVIL_BOSS_2 + ) { // Should get Lock Capsule on 165 before shop phase so it can be used in the rewards shop globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.LOCK_CAPSULE)); } @@ -57,7 +64,10 @@ export class VictoryPhase extends PokemonPhase { globalScene.pushPhase(new SelectModifierPhase(undefined, undefined, this.getFixedBattleCustomModifiers())); } else if (globalScene.gameMode.isDaily) { globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.EXP_CHARM)); - if (globalScene.currentBattle.waveIndex > 10 && !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) { + if ( + globalScene.currentBattle.waveIndex > 10 && + !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex) + ) { globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.GOLDEN_POKEBALL)); } } else { @@ -65,14 +75,29 @@ export class VictoryPhase extends PokemonPhase { if (globalScene.gameMode.isEndless && globalScene.currentBattle.waveIndex === 10) { globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.EXP_SHARE)); } - if (globalScene.currentBattle.waveIndex <= 750 && (globalScene.currentBattle.waveIndex <= 500 || (globalScene.currentBattle.waveIndex % 30) === superExpWave)) { - globalScene.pushPhase(new ModifierRewardPhase((globalScene.currentBattle.waveIndex % 30) !== superExpWave || globalScene.currentBattle.waveIndex > 250 ? modifierTypes.EXP_CHARM : modifierTypes.SUPER_EXP_CHARM)); + if ( + globalScene.currentBattle.waveIndex <= 750 && + (globalScene.currentBattle.waveIndex <= 500 || globalScene.currentBattle.waveIndex % 30 === superExpWave) + ) { + globalScene.pushPhase( + new ModifierRewardPhase( + globalScene.currentBattle.waveIndex % 30 !== superExpWave || globalScene.currentBattle.waveIndex > 250 + ? modifierTypes.EXP_CHARM + : modifierTypes.SUPER_EXP_CHARM, + ), + ); } if (globalScene.currentBattle.waveIndex <= 150 && !(globalScene.currentBattle.waveIndex % 50)) { globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.GOLDEN_POKEBALL)); } if (globalScene.gameMode.isEndless && !(globalScene.currentBattle.waveIndex % 50)) { - globalScene.pushPhase(new ModifierRewardPhase(!(globalScene.currentBattle.waveIndex % 250) ? modifierTypes.VOUCHER_PREMIUM : modifierTypes.VOUCHER_PLUS)); + globalScene.pushPhase( + new ModifierRewardPhase( + !(globalScene.currentBattle.waveIndex % 250) + ? modifierTypes.VOUCHER_PREMIUM + : modifierTypes.VOUCHER_PLUS, + ), + ); globalScene.pushPhase(new AddEnemyBuffModifierPhase()); } } diff --git a/src/phases/weather-effect-phase.ts b/src/phases/weather-effect-phase.ts index aa09f8a850d..9199b7996bc 100644 --- a/src/phases/weather-effect-phase.ts +++ b/src/phases/weather-effect-phase.ts @@ -1,5 +1,13 @@ import { globalScene } from "#app/global-scene"; -import { applyPreWeatherEffectAbAttrs, SuppressWeatherEffectAbAttr, PreWeatherDamageAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPostWeatherLapseAbAttrs, PostWeatherLapseAbAttr } from "#app/data/ability"; +import { + applyPreWeatherEffectAbAttrs, + SuppressWeatherEffectAbAttr, + PreWeatherDamageAbAttr, + applyAbAttrs, + BlockNonDirectDamageAbAttr, + applyPostWeatherLapseAbAttrs, + PostWeatherLapseAbAttr, +} from "#app/data/ability"; import { CommonAnim } from "#app/data/battle-anims"; import type { Weather } from "#app/data/weather"; import { getWeatherDamageMessage, getWeatherLapseMessage } from "#app/data/weather"; @@ -14,7 +22,11 @@ export class WeatherEffectPhase extends CommonAnimPhase { public weather: Weather | null; constructor() { - super(undefined, undefined, CommonAnim.SUNNY + ((globalScene?.arena?.weather?.weatherType || WeatherType.NONE) - 1)); + super( + undefined, + undefined, + CommonAnim.SUNNY + ((globalScene?.arena?.weather?.weatherType || WeatherType.NONE) - 1), + ); this.weather = globalScene?.arena?.weather; } @@ -30,10 +42,11 @@ export class WeatherEffectPhase extends CommonAnimPhase { this.setAnimation(CommonAnim.SUNNY + (this.weather.weatherType - 1)); if (this.weather.isDamaging()) { - const cancelled = new Utils.BooleanHolder(false); - this.executeForAll((pokemon: Pokemon) => applyPreWeatherEffectAbAttrs(SuppressWeatherEffectAbAttr, pokemon, this.weather, cancelled)); + this.executeForAll((pokemon: Pokemon) => + applyPreWeatherEffectAbAttrs(SuppressWeatherEffectAbAttr, pokemon, this.weather, cancelled), + ); if (!cancelled.value) { const inflictDamage = (pokemon: Pokemon) => { @@ -42,7 +55,11 @@ export class WeatherEffectPhase extends CommonAnimPhase { applyPreWeatherEffectAbAttrs(PreWeatherDamageAbAttr, pokemon, this.weather, cancelled); applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled); - if (cancelled.value || pokemon.getTag(BattlerTagType.UNDERGROUND) || pokemon.getTag(BattlerTagType.UNDERWATER)) { + if ( + cancelled.value || + pokemon.getTag(BattlerTagType.UNDERGROUND) || + pokemon.getTag(BattlerTagType.UNDERWATER) + ) { return; } @@ -53,7 +70,10 @@ export class WeatherEffectPhase extends CommonAnimPhase { }; this.executeForAll((pokemon: Pokemon) => { - const immune = !pokemon || !!pokemon.getTypes(true, true).filter(t => this.weather?.isTypeDamageImmune(t)).length || pokemon.switchOutStatus; + const immune = + !pokemon || + !!pokemon.getTypes(true, true).filter(t => this.weather?.isTypeDamageImmune(t)).length || + pokemon.switchOutStatus; if (!immune) { inflictDamage(pokemon); } diff --git a/src/pipelines/field-sprite.ts b/src/pipelines/field-sprite.ts index f81845073c1..547281d7dee 100644 --- a/src/pipelines/field-sprite.ts +++ b/src/pipelines/field-sprite.ts @@ -208,19 +208,21 @@ void main() { export default class FieldSpritePipeline extends Phaser.Renderer.WebGL.Pipelines.MultiPipeline { constructor(game: Phaser.Game, config?: Phaser.Types.Renderer.WebGL.WebGLPipelineConfig) { - super(config || { - game: game, - name: "field-sprite", - fragShader: spriteFragShader, - vertShader: spriteVertShader - }); + super( + config || { + game: game, + name: "field-sprite", + fragShader: spriteFragShader, + vertShader: spriteVertShader, + }, + ); } onPreRender(): void { this.set1f("time", 0); this.set1i("ignoreTimeTint", 0); this.set1f("terrainColorRatio", 0); - this.set3fv("terrainColor", [ 0, 0, 0 ]); + this.set3fv("terrainColor", [0, 0, 0]); } onBind(gameObject: Phaser.GameObjects.GameObject): void { @@ -230,7 +232,7 @@ export default class FieldSpritePipeline extends Phaser.Renderer.WebGL.Pipelines const data = sprite.pipelineData; const ignoreTimeTint = data["ignoreTimeTint"] as boolean; - const terrainColorRatio = data["terrainColorRatio"] as number || 0; + const terrainColorRatio = (data["terrainColorRatio"] as number) || 0; const time = globalScene.currentBattle?.waveIndex ? ((globalScene.currentBattle.waveIndex + globalScene.waveCycleOffset) % 40) / 40 // ((new Date().getSeconds() * 1000 + new Date().getMilliseconds()) % 10000) / 10000 @@ -238,10 +240,22 @@ export default class FieldSpritePipeline extends Phaser.Renderer.WebGL.Pipelines this.set1f("time", time); this.set1i("ignoreTimeTint", ignoreTimeTint ? 1 : 0); this.set1i("isOutside", globalScene.arena.isOutside() ? 1 : 0); - this.set3fv("dayTint", globalScene.arena.getDayTint().map(c => c / 255)); - this.set3fv("duskTint", globalScene.arena.getDuskTint().map(c => c / 255)); - this.set3fv("nightTint", globalScene.arena.getNightTint().map(c => c / 255)); - this.set3fv("terrainColor", getTerrainColor(globalScene.arena.terrain?.terrainType || TerrainType.NONE).map(c => c / 255)); + this.set3fv( + "dayTint", + globalScene.arena.getDayTint().map(c => c / 255), + ); + this.set3fv( + "duskTint", + globalScene.arena.getDuskTint().map(c => c / 255), + ); + this.set3fv( + "nightTint", + globalScene.arena.getNightTint().map(c => c / 255), + ); + this.set3fv( + "terrainColor", + getTerrainColor(globalScene.arena.terrain?.terrainType || TerrainType.NONE).map(c => c / 255), + ); this.set1f("terrainColorRatio", terrainColorRatio); } diff --git a/src/pipelines/invert.ts b/src/pipelines/invert.ts index 9c30f2b5cee..a945d0c95aa 100644 --- a/src/pipelines/invert.ts +++ b/src/pipelines/invert.ts @@ -14,14 +14,12 @@ void main() `; export default class InvertPostFX extends Phaser.Renderer.WebGL.Pipelines.PostFXPipeline { - constructor (game: Game) { + constructor(game: Game) { super({ game, name: "InvertPostFX", fragShader, - uniforms: [ - "uMainSampler" - ] + uniforms: ["uMainSampler"], } as Phaser.Types.Renderer.WebGL.WebGLPipelineConfig); } } diff --git a/src/pipelines/sprite.ts b/src/pipelines/sprite.ts index 1fc3b771897..439e35f711f 100644 --- a/src/pipelines/sprite.ts +++ b/src/pipelines/sprite.ts @@ -322,17 +322,17 @@ export default class SpritePipeline extends FieldSpritePipeline { game: game, name: "sprite", fragShader: spriteFragShader, - vertShader: spriteVertShader + vertShader: spriteVertShader, }); - this._tone = [ 0, 0, 0, 0 ]; + this._tone = [0, 0, 0, 0]; } onPreRender(): void { super.onPreRender(); this.set1f("teraTime", 0); - this.set3fv("teraColor", [ 0, 0, 0 ]); + this.set3fv("teraColor", [0, 0, 0]); this.set1i("hasShadow", 0); this.set1i("yCenter", 0); this.set2f("relPosition", 0, 0); @@ -347,31 +347,38 @@ export default class SpritePipeline extends FieldSpritePipeline { onBind(gameObject: Phaser.GameObjects.GameObject): void { super.onBind(gameObject); - const sprite = (gameObject as Phaser.GameObjects.Sprite); + const sprite = gameObject as Phaser.GameObjects.Sprite; const data = sprite.pipelineData; const tone = data["tone"] as number[]; - const teraColor = data["teraColor"] as integer[] ?? [ 0, 0, 0 ]; + const teraColor = (data["isTerastallized"] as boolean) ? ((data["teraColor"] as number[]) ?? [0, 0, 0]) : [0, 0, 0]; const hasShadow = data["hasShadow"] as boolean; const yShadowOffset = data["yShadowOffset"] as number; const ignoreFieldPos = data["ignoreFieldPos"] as boolean; const ignoreOverride = data["ignoreOverride"] as boolean; - const isEntityObj = sprite.parentContainer instanceof Pokemon || sprite.parentContainer instanceof Trainer || sprite.parentContainer instanceof MysteryEncounterIntroVisuals; + const isEntityObj = + sprite.parentContainer instanceof Pokemon || + sprite.parentContainer instanceof Trainer || + sprite.parentContainer instanceof MysteryEncounterIntroVisuals; const field = isEntityObj ? sprite.parentContainer.parentContainer : sprite.parentContainer; - const position = isEntityObj - ? [ sprite.parentContainer.x, sprite.parentContainer.y ] - : [ sprite.x, sprite.y ]; + const position = isEntityObj ? [sprite.parentContainer.x, sprite.parentContainer.y] : [sprite.x, sprite.y]; if (field) { position[0] += field.x / field.scale; position[1] += field.y / field.scale; } - position[0] += -(sprite.width - (sprite.frame.width)) / 2 + sprite.frame.x + (!ignoreFieldPos ? (sprite.x - field.x) : 0); + position[0] += + -(sprite.width - sprite.frame.width) / 2 + sprite.frame.x + (!ignoreFieldPos ? sprite.x - field.x : 0); if (sprite.originY === 0.5) { - position[1] += (sprite.height / 2) * ((isEntityObj ? sprite.parentContainer : sprite).scale - 1) + (!ignoreFieldPos ? (sprite.y - field.y) : 0); + position[1] += + (sprite.height / 2) * ((isEntityObj ? sprite.parentContainer : sprite).scale - 1) + + (!ignoreFieldPos ? sprite.y - field.y : 0); } this.set1f("teraTime", (this.game.getTime() % 500000) / 500000); - this.set3fv("teraColor", teraColor.map(c => c / 255)); + this.set3fv( + "teraColor", + teraColor.map(c => c / 255), + ); this.set1i("hasShadow", hasShadow ? 1 : 0); this.set1i("yCenter", sprite.originY === 0.5 ? 1 : 0); this.set1f("fieldScale", field?.scale || 1); @@ -379,21 +386,34 @@ export default class SpritePipeline extends FieldSpritePipeline { this.set2f("texFrameUv", sprite.frame.u0, sprite.frame.v0); this.set2f("size", sprite.frame.width, sprite.height); this.set2f("texSize", sprite.texture.source[0].width, sprite.texture.source[0].height); - this.set1f("yOffset", sprite.height - sprite.frame.height * (isEntityObj ? sprite.parentContainer.scale : sprite.scale)); + this.set1f( + "yOffset", + sprite.height - sprite.frame.height * (isEntityObj ? sprite.parentContainer.scale : sprite.scale), + ); this.set1f("yShadowOffset", yShadowOffset ?? 0); this.set4fv("tone", tone); this.bindTexture(this.game.textures.get("tera").source[0].glTexture!, 1); // TODO: is this bang correct? if (globalScene.fusionPaletteSwaps) { const spriteColors = ((ignoreOverride && data["spriteColorsBase"]) || data["spriteColors"] || []) as number[][]; - const fusionSpriteColors = ((ignoreOverride && data["fusionSpriteColorsBase"]) || data["fusionSpriteColors"] || []) as number[][]; + const fusionSpriteColors = ((ignoreOverride && data["fusionSpriteColorsBase"]) || + data["fusionSpriteColors"] || + []) as number[][]; - const emptyColors = [ 0, 0, 0, 0 ]; - const flatSpriteColors: integer[] = []; - const flatFusionSpriteColors: integer[] = []; + const emptyColors = [0, 0, 0, 0]; + const flatSpriteColors: number[] = []; + const flatFusionSpriteColors: number[] = []; for (let c = 0; c < 32; c++) { - flatSpriteColors.splice(flatSpriteColors.length, 0, ...(c < spriteColors.length ? spriteColors[c] : emptyColors)); - flatFusionSpriteColors.splice(flatFusionSpriteColors.length, 0, ...(c < fusionSpriteColors.length ? fusionSpriteColors[c] : emptyColors)); + flatSpriteColors.splice( + flatSpriteColors.length, + 0, + ...(c < spriteColors.length ? spriteColors[c] : emptyColors), + ); + flatFusionSpriteColors.splice( + flatFusionSpriteColors.length, + 0, + ...(c < fusionSpriteColors.length ? fusionSpriteColors[c] : emptyColors), + ); } this.set4iv("spriteColors", flatSpriteColors.flat()); @@ -403,21 +423,30 @@ export default class SpritePipeline extends FieldSpritePipeline { onBatch(gameObject: Phaser.GameObjects.GameObject): void { if (gameObject) { - const sprite = (gameObject as Phaser.GameObjects.Sprite); + const sprite = gameObject as Phaser.GameObjects.Sprite; const data = sprite.pipelineData; - const variant: integer = data.hasOwnProperty("variant") + const variant: number = data.hasOwnProperty("variant") ? data["variant"] - : sprite.parentContainer instanceof Pokemon ? sprite.parentContainer.variant + : sprite.parentContainer instanceof Pokemon + ? sprite.parentContainer.variant : 0; - let variantColors; + let variantColors: { [x: string]: string }[]; - const emptyColors = [ 0, 0, 0, 0 ]; - const flatBaseColors: integer[] = []; + const emptyColors = [0, 0, 0, 0]; + const flatBaseColors: number[] = []; const flatVariantColors: number[] = []; - if ((sprite.parentContainer instanceof Pokemon ? sprite.parentContainer.shiny : !!data["shiny"]) - && (variantColors = variantColorCache[sprite.parentContainer instanceof Pokemon ? sprite.parentContainer.getSprite().texture.key : data["spriteKey"]]) && variantColors.hasOwnProperty(variant)) { + if ( + (sprite.parentContainer instanceof Pokemon ? sprite.parentContainer.shiny : !!data["shiny"]) && + (variantColors = + variantColorCache[ + sprite.parentContainer instanceof Pokemon + ? sprite.parentContainer.getSprite().texture.key + : data["spriteKey"] + ]) && + variantColors.hasOwnProperty(variant) + ) { const baseColors = Object.keys(variantColors[variant]); for (let c = 0; c < 32; c++) { if (c < baseColors.length) { @@ -444,30 +473,72 @@ export default class SpritePipeline extends FieldSpritePipeline { super.onBatch(gameObject); } - batchQuad(gameObject: Phaser.GameObjects.GameObject, x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, x3: number, y3: number, - u0: number, v0: number, u1: number, v1: number, tintTL: number, tintTR: number, tintBL: number, tintBR: number, tintEffect: number | boolean, - texture?: Phaser.Renderer.WebGL.Wrappers.WebGLTextureWrapper, unit?: number): boolean { + batchQuad( + gameObject: Phaser.GameObjects.GameObject, + x0: number, + y0: number, + x1: number, + y1: number, + x2: number, + y2: number, + x3: number, + y3: number, + u0: number, + v0: number, + u1: number, + v1: number, + tintTL: number, + tintTR: number, + tintBL: number, + tintBR: number, + tintEffect: number | boolean, + texture?: Phaser.Renderer.WebGL.Wrappers.WebGLTextureWrapper, + unit?: number, + ): boolean { const sprite = gameObject as Phaser.GameObjects.Sprite; this.set1f("vCutoff", v1); const hasShadow = sprite.pipelineData["hasShadow"] as boolean; - const yShadowOffset = sprite.pipelineData["yShadowOffset"] as number ?? 0; + const yShadowOffset = (sprite.pipelineData["yShadowOffset"] as number) ?? 0; if (hasShadow) { - const isEntityObj = sprite.parentContainer instanceof Pokemon || sprite.parentContainer instanceof Trainer || sprite.parentContainer instanceof MysteryEncounterIntroVisuals; + const isEntityObj = + sprite.parentContainer instanceof Pokemon || + sprite.parentContainer instanceof Trainer || + sprite.parentContainer instanceof MysteryEncounterIntroVisuals; const field = isEntityObj ? sprite.parentContainer.parentContainer : sprite.parentContainer; const fieldScaleRatio = field.scale / 6; - const baseY = (isEntityObj - ? sprite.parentContainer.y - : sprite.y + sprite.height) * 6 / fieldScaleRatio; - const bottomPadding = Math.ceil(sprite.height * 0.05 + Math.max(yShadowOffset, 0)) * 6 / fieldScaleRatio; + const baseY = ((isEntityObj ? sprite.parentContainer.y : sprite.y + sprite.height) * 6) / fieldScaleRatio; + const bottomPadding = (Math.ceil(sprite.height * 0.05 + Math.max(yShadowOffset, 0)) * 6) / fieldScaleRatio; const yDelta = (baseY - y1) / field.scale; y2 = y1 = baseY + bottomPadding; - const pixelHeight = (v1 - v0) / (sprite.frame.height * (isEntityObj ? sprite.parentContainer.scale : sprite.scale)); + const pixelHeight = + (v1 - v0) / (sprite.frame.height * (isEntityObj ? sprite.parentContainer.scale : sprite.scale)); v1 += (yDelta + bottomPadding / field.scale) * pixelHeight; } - return super.batchQuad(gameObject, x0, y0, x1, y1, x2, y2, x3, y3, u0, v0, u1, v1, tintTL, tintTR, tintBL, tintBR, tintEffect, texture, unit); + return super.batchQuad( + gameObject, + x0, + y0, + x1, + y1, + x2, + y2, + x3, + y3, + u0, + v0, + u1, + v1, + tintTL, + tintTR, + tintBL, + tintBR, + tintEffect, + texture, + unit, + ); } get tone(): number[] { diff --git a/src/plugins/api/api-base.ts b/src/plugins/api/api-base.ts index 5c1a30ff3ab..6a0eca56eaa 100644 --- a/src/plugins/api/api-base.ts +++ b/src/plugins/api/api-base.ts @@ -85,8 +85,8 @@ export abstract class ApiBase { */ protected toUrlSearchParams>(data: D) { const arr = Object.entries(data) - .map(([ key, value ]) => (value !== undefined ? [ key, String(value) ] : [ key, "" ])) - .filter(([ , value ]) => value !== ""); + .map(([key, value]) => (value !== undefined ? [key, String(value)] : [key, ""])) + .filter(([, value]) => value !== ""); return new URLSearchParams(arr); } diff --git a/src/plugins/api/pokerogue-account-api.ts b/src/plugins/api/pokerogue-account-api.ts index 66ab8d67520..bab74799677 100644 --- a/src/plugins/api/pokerogue-account-api.ts +++ b/src/plugins/api/pokerogue-account-api.ts @@ -24,14 +24,13 @@ export class PokerogueAccountApi extends ApiBase { if (response.ok) { const resData = (await response.json()) as AccountInfoResponse; - return [ resData, response.status ]; - } else { - console.warn("Could not get account info!", response.status, response.statusText); - return [ null, response.status ]; + return [resData, response.status]; } + console.warn("Could not get account info!", response.status, response.statusText); + return [null, response.status]; } catch (err) { console.warn("Could not get account info!", err); - return [ null, 500 ]; + return [null, 500]; } } @@ -46,9 +45,8 @@ export class PokerogueAccountApi extends ApiBase { if (response.ok) { return null; - } else { - return response.text(); } + return response.text(); } catch (err) { console.warn("Register failed!", err); } @@ -70,10 +68,9 @@ export class PokerogueAccountApi extends ApiBase { const loginResponse = (await response.json()) as AccountLoginResponse; setCookie(SESSION_ID_COOKIE_NAME, loginResponse.token); return null; - } else { - console.warn("Login failed!", response.status, response.statusText); - return response.text(); } + console.warn("Login failed!", response.status, response.statusText); + return response.text(); } catch (err) { console.warn("Login failed!", err); } diff --git a/src/plugins/api/pokerogue-admin-api.ts b/src/plugins/api/pokerogue-admin-api.ts index eeba5319adc..5923f286430 100644 --- a/src/plugins/api/pokerogue-admin-api.ts +++ b/src/plugins/api/pokerogue-admin-api.ts @@ -22,12 +22,11 @@ export class PokerogueAdminApi extends ApiBase { if (response.ok) { return null; - } else { - console.warn("Could not link account with discord!", response.status, response.statusText); + } + console.warn("Could not link account with discord!", response.status, response.statusText); - if (response.status === 404) { - return this.ERR_USERNAME_NOT_FOUND; - } + if (response.status === 404) { + return this.ERR_USERNAME_NOT_FOUND; } } catch (err) { console.warn("Could not link account with discord!", err); @@ -47,12 +46,11 @@ export class PokerogueAdminApi extends ApiBase { if (response.ok) { return null; - } else { - console.warn("Could not unlink account from discord!", response.status, response.statusText); + } + console.warn("Could not unlink account from discord!", response.status, response.statusText); - if (response.status === 404) { - return this.ERR_USERNAME_NOT_FOUND; - } + if (response.status === 404) { + return this.ERR_USERNAME_NOT_FOUND; } } catch (err) { console.warn("Could not unlink account from discord!", err); @@ -72,12 +70,11 @@ export class PokerogueAdminApi extends ApiBase { if (response.ok) { return null; - } else { - console.warn("Could not link account with google!", response.status, response.statusText); + } + console.warn("Could not link account with google!", response.status, response.statusText); - if (response.status === 404) { - return this.ERR_USERNAME_NOT_FOUND; - } + if (response.status === 404) { + return this.ERR_USERNAME_NOT_FOUND; } } catch (err) { console.warn("Could not link account with google!", err); @@ -97,12 +94,11 @@ export class PokerogueAdminApi extends ApiBase { if (response.ok) { return null; - } else { - console.warn("Could not unlink account from google!", response.status, response.statusText); + } + console.warn("Could not unlink account from google!", response.status, response.statusText); - if (response.status === 404) { - return this.ERR_USERNAME_NOT_FOUND; - } + if (response.status === 404) { + return this.ERR_USERNAME_NOT_FOUND; } } catch (err) { console.warn("Could not unlink account from google!", err); @@ -123,18 +119,17 @@ export class PokerogueAdminApi extends ApiBase { if (response.ok) { const resData: SearchAccountResponse = await response.json(); - return [ resData, undefined ]; - } else { - console.warn("Could not find account!", response.status, response.statusText); + return [resData, undefined]; + } + console.warn("Could not find account!", response.status, response.statusText); - if (response.status === 404) { - return [ undefined, this.ERR_USERNAME_NOT_FOUND ]; - } + if (response.status === 404) { + return [undefined, this.ERR_USERNAME_NOT_FOUND]; } } catch (err) { console.warn("Could not find account!", err); } - return [ undefined, this.ERR_GENERIC ]; + return [undefined, this.ERR_GENERIC]; } } diff --git a/src/plugins/api/pokerogue-api.ts b/src/plugins/api/pokerogue-api.ts index 92d0ff1bbbb..c6dfae019a5 100644 --- a/src/plugins/api/pokerogue-api.ts +++ b/src/plugins/api/pokerogue-api.ts @@ -48,9 +48,8 @@ export class PokerogueApi extends ApiBase { const response = await this.doPost("/auth/discord/logout"); if (response.ok) { return true; - } else { - console.warn(`Discord unlink failed (${response.status}: ${response.statusText})`); } + console.warn(`Discord unlink failed (${response.status}: ${response.statusText})`); } catch (err) { console.warn("Could not unlink Discord!", err); } @@ -67,9 +66,8 @@ export class PokerogueApi extends ApiBase { const response = await this.doPost("/auth/google/logout"); if (response.ok) { return true; - } else { - console.warn(`Google unlink failed (${response.status}: ${response.statusText})`); } + console.warn(`Google unlink failed (${response.status}: ${response.statusText})`); } catch (err) { console.warn("Could not unlink Google!", err); } diff --git a/src/plugins/api/pokerogue-savedata-api.ts b/src/plugins/api/pokerogue-savedata-api.ts index 184bfbb4bdb..b8531e82d4f 100644 --- a/src/plugins/api/pokerogue-savedata-api.ts +++ b/src/plugins/api/pokerogue-savedata-api.ts @@ -29,7 +29,7 @@ export class PokerogueSavedataApi extends ApiBase { public async updateAll(bodyData: UpdateAllSavedataRequest) { try { const rawBodyData = JSON.stringify(bodyData, (_k: any, v: any) => - typeof v === "bigint" ? (v <= MAX_INT_ATTR_VALUE ? Number(v) : v.toString()) : v + typeof v === "bigint" ? (v <= MAX_INT_ATTR_VALUE ? Number(v) : v.toString()) : v, ); const response = await this.doPost("/savedata/updateall", rawBodyData); return await response.text(); diff --git a/src/plugins/api/pokerogue-session-savedata-api.ts b/src/plugins/api/pokerogue-session-savedata-api.ts index 44a7b463849..e703d55a242 100644 --- a/src/plugins/api/pokerogue-session-savedata-api.ts +++ b/src/plugins/api/pokerogue-session-savedata-api.ts @@ -82,9 +82,8 @@ export class PokerogueSessionSavedataApi extends ApiBase { if (response.ok) { return null; - } else { - return await response.text(); } + return await response.text(); } catch (err) { console.warn("Could not delete session savedata!", err); return "Unknown error"; diff --git a/src/plugins/cache-busted-loader-plugin.ts b/src/plugins/cache-busted-loader-plugin.ts index 344da3eaa66..e5b1abb5903 100644 --- a/src/plugins/cache-busted-loader-plugin.ts +++ b/src/plugins/cache-busted-loader-plugin.ts @@ -15,7 +15,7 @@ export default class CacheBustedLoaderPlugin extends Phaser.Loader.LoaderPlugin addFile(file): void { if (!Array.isArray(file)) { - file = [ file ]; + file = [file]; } file.forEach(item => { diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index cc798bc8585..92b0e15dbb9 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -1,4 +1,4 @@ -import { camelCaseToKebabCase, } from "#app/utils"; +import { camelCaseToKebabCase } from "#app/utils"; import i18next from "i18next"; import LanguageDetector from "i18next-browser-languagedetector"; import HttpBackend from "i18next-http-backend"; @@ -8,9 +8,9 @@ import pkg from "../../package.json"; //#region Interfaces/Types interface LoadingFontFaceProperty { - face: FontFace, - extraOptions?: { [key:string]: any }, - only?: Array + face: FontFace; + extraOptions?: { [key: string]: any }; + only?: Array; } //#region Constants @@ -23,52 +23,70 @@ const unicodeRanges = { kana: "U+3040-30FF", CJKCommon: "U+2E80-2EFF,U+3000-303F,U+31C0-31EF,U+3200-32FF,U+3400-4DBF,U+F900-FAFF,U+FE30-FE4F", CJKIdeograph: "U+4E00-9FFF", - specialCharacters: "U+266A,U+2605,U+2665,U+2663" //♪.★,♥,♣ + specialCharacters: "U+266A,U+2605,U+2665,U+2663", //♪.★,♥,♣ }; const rangesByLanguage = { - korean: [ unicodeRanges.CJKCommon, unicodeRanges.hangul ].join(","), - chinese: [ unicodeRanges.CJKCommon, unicodeRanges.fullwidth, unicodeRanges.CJKIdeograph ].join(","), - japanese: [ unicodeRanges.CJKCommon, unicodeRanges.fullwidth, unicodeRanges.kana, unicodeRanges.CJKIdeograph ].join(",") + korean: [unicodeRanges.CJKCommon, unicodeRanges.hangul].join(","), + chinese: [unicodeRanges.CJKCommon, unicodeRanges.fullwidth, unicodeRanges.CJKIdeograph].join(","), + japanese: [unicodeRanges.CJKCommon, unicodeRanges.fullwidth, unicodeRanges.kana, unicodeRanges.CJKIdeograph].join( + ",", + ), }; const fonts: Array = [ // unicode (special character from PokePT) { - face: new FontFace("emerald", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: unicodeRanges.specialCharacters }), + face: new FontFace("emerald", "url(./fonts/PokePT_Wansung.woff2)", { + unicodeRange: unicodeRanges.specialCharacters, + }), }, { - face: new FontFace("pkmnems", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: unicodeRanges.specialCharacters }), + face: new FontFace("pkmnems", "url(./fonts/PokePT_Wansung.woff2)", { + unicodeRange: unicodeRanges.specialCharacters, + }), extraOptions: { sizeAdjust: "133%" }, }, // unicode (korean) { - face: new FontFace("emerald", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: rangesByLanguage.korean }), + face: new FontFace("emerald", "url(./fonts/PokePT_Wansung.woff2)", { + unicodeRange: rangesByLanguage.korean, + }), }, { - face: new FontFace("pkmnems", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: rangesByLanguage.korean }), + face: new FontFace("pkmnems", "url(./fonts/PokePT_Wansung.woff2)", { + unicodeRange: rangesByLanguage.korean, + }), extraOptions: { sizeAdjust: "133%" }, }, // unicode (chinese) { - face: new FontFace("emerald", "url(./fonts/unifont-15.1.05.subset.woff2)", { unicodeRange: rangesByLanguage.chinese }), + face: new FontFace("emerald", "url(./fonts/unifont-15.1.05.subset.woff2)", { + unicodeRange: rangesByLanguage.chinese, + }), extraOptions: { sizeAdjust: "70%", format: "woff2" }, - only: [ "en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca" ], + only: ["en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca"], }, { - face: new FontFace("pkmnems", "url(./fonts/unifont-15.1.05.subset.woff2)", { unicodeRange: rangesByLanguage.chinese }), + face: new FontFace("pkmnems", "url(./fonts/unifont-15.1.05.subset.woff2)", { + unicodeRange: rangesByLanguage.chinese, + }), extraOptions: { format: "woff2" }, - only: [ "en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca" ], + only: ["en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca"], }, // japanese { - face: new FontFace("emerald", "url(./fonts/Galmuri11.subset.woff2)", { unicodeRange: rangesByLanguage.japanese }), + face: new FontFace("emerald", "url(./fonts/Galmuri11.subset.woff2)", { + unicodeRange: rangesByLanguage.japanese, + }), extraOptions: { sizeAdjust: "66%" }, - only: [ "ja" ], + only: ["ja"], }, { - face: new FontFace("pkmnems", "url(./fonts/Galmuri9.subset.woff2)", { unicodeRange: rangesByLanguage.japanese }), - only: [ "ja" ], + face: new FontFace("pkmnems", "url(./fonts/Galmuri9.subset.woff2)", { + unicodeRange: rangesByLanguage.japanese, + }), + only: ["ja"], }, ]; @@ -91,7 +109,7 @@ async function initFonts(language: string | undefined) { const results = await Promise.allSettled( fonts .filter(font => !font.only || font.only.some(exclude => language?.indexOf(exclude) === 0)) - .map(font => Object.assign(font.face, font.extraOptions ?? {}).load()) + .map(font => Object.assign(font.face, font.extraOptions ?? {}).load()), ); for (const result of results) { if (result.status === "fulfilled") { @@ -111,7 +129,7 @@ async function initFonts(language: string | undefined) { * @returns a money formatted string */ function i18nMoneyFormatter(amount: any): string { - if (isNaN(Number(amount))) { + if (Number.isNaN(Number(amount))) { console.warn(`i18nMoneyFormatter: value "${amount}" is not a number!`); } @@ -153,9 +171,9 @@ export async function initI18n(): Promise { i18next.use(new KoreanPostpositionProcessor()); await i18next.init({ fallbackLng: "en", - supportedLngs: [ "en", "es-ES", "fr", "it", "de", "zh-CN", "zh-TW", "pt-BR", "ko", "ja", "ca-ES" ], + supportedLngs: ["en", "es-ES", "fr", "it", "de", "zh-CN", "zh-TW", "pt-BR", "ko", "ja", "ca-ES"], backend: { - loadPath(lng: string, [ ns ]: string[]) { + loadPath(lng: string, [ns]: string[]) { let fileName: string; if (namespaceMap[ns]) { fileName = namespaceMap[ns]; @@ -193,6 +211,7 @@ export async function initI18n(): Promise { "egg", "fightUiHandler", "filterBar", + "filterText", "gameMode", "gameStatsUiHandler", "growth", @@ -203,6 +222,7 @@ export async function initI18n(): Promise { "move", "nature", "pokeball", + "pokedexUiHandler", "pokemon", "pokemonEvolutions", "pokemonForm", @@ -259,16 +279,15 @@ export async function initI18n(): Promise { "mysteryEncounterMessages", ], detection: { - lookupLocalStorage: "prLang" + lookupLocalStorage: "prLang", }, debug: Number(import.meta.env.VITE_I18N_DEBUG) === 1, interpolation: { escapeValue: false, }, - postProcess: [ "korean-postposition" ], + postProcess: ["korean-postposition"], }); - if (i18next.services.formatter) { i18next.services.formatter.add("money", i18nMoneyFormatter); } diff --git a/src/plugins/vite/vite-minify-json-plugin.ts b/src/plugins/vite/vite-minify-json-plugin.ts index a638271562f..f14fdf7042d 100644 --- a/src/plugins/vite/vite-minify-json-plugin.ts +++ b/src/plugins/vite/vite-minify-json-plugin.ts @@ -1,6 +1,6 @@ import path from "path"; import fs from "fs"; -import { type Plugin as VitePlugin } from "vite"; +import type { Plugin as VitePlugin } from "vite"; /** * Crawl a directory (recursively if wanted) for json files and minifies found ones. @@ -8,7 +8,7 @@ import { type Plugin as VitePlugin } from "vite"; * @param recursive if true, will crawl subdirectories */ function applyToDir(dir: string, recursive?: boolean) { - const files = fs.readdirSync(dir).filter((file) => !/^\..*/.test(file)); + const files = fs.readdirSync(dir).filter(file => !/^\..*/.test(file)); for (const file of files) { const filePath = path.join(dir, file); @@ -41,9 +41,9 @@ export function minifyJsonPlugin(basePath: string | string[], recursive?: boolea }, async closeBundle() { console.log("Minifying JSON files..."); - const basePathes = Array.isArray(basePath) ? basePath : [ basePath ]; + const basePathes = Array.isArray(basePath) ? basePath : [basePath]; - basePathes.forEach((basePath) => { + basePathes.forEach(basePath => { const baseDir = path.resolve(buildDir, basePath); if (fs.existsSync(baseDir)) { applyToDir(baseDir, recursive); diff --git a/src/scene-base.ts b/src/scene-base.ts index 9af97b8e6d4..430a9bc8aac 100644 --- a/src/scene-base.ts +++ b/src/scene-base.ts @@ -12,11 +12,8 @@ export class SceneBase extends Phaser.Scene { */ public readonly scaledCanvas = { width: 1920 / 6, - height: 1080 / 6 + height: 1080 / 6, }; - constructor(config?: string | Phaser.Types.Scenes.SettingsConfig) { - super(config); - } getCachedUrl(url: string): string { const manifest = this.game["manifest"]; @@ -41,15 +38,21 @@ export class SceneBase extends Phaser.Scene { } } - loadSpritesheet(key: string, folder: string, size: integer, filename?: string) { + loadSpritesheet(key: string, folder: string, size: number, filename?: string) { if (!filename) { filename = `${key}.png`; } - this.load.spritesheet(key, this.getCachedUrl(`images/${folder}/${filename}`), { frameWidth: size, frameHeight: size }); + this.load.spritesheet(key, this.getCachedUrl(`images/${folder}/${filename}`), { + frameWidth: size, + frameHeight: size, + }); if (folder.startsWith("ui")) { legacyCompatibleImages.push(key); folder = folder.replace("ui", "ui/legacy"); - this.load.spritesheet(`${key}_legacy`, this.getCachedUrl(`images/${folder}/${filename}`), { frameWidth: size, frameHeight: size }); + this.load.spritesheet(`${key}_legacy`, this.getCachedUrl(`images/${folder}/${filename}`), { + frameWidth: size, + frameHeight: size, + }); } } @@ -60,11 +63,19 @@ export class SceneBase extends Phaser.Scene { if (folder) { folder += "/"; } - this.load.atlas(key, this.getCachedUrl(`images/${folder}${filenameRoot}.png`), this.getCachedUrl(`images/${folder}${filenameRoot}.json`)); + this.load.atlas( + key, + this.getCachedUrl(`images/${folder}${filenameRoot}.png`), + this.getCachedUrl(`images/${folder}${filenameRoot}.json`), + ); if (folder.startsWith("ui")) { legacyCompatibleImages.push(key); folder = folder.replace("ui", "ui/legacy"); - this.load.atlas(`${key}_legacy`, this.getCachedUrl(`images/${folder}${filenameRoot}.png`), this.getCachedUrl(`images/${folder}${filenameRoot}.json`)); + this.load.atlas( + `${key}_legacy`, + this.getCachedUrl(`images/${folder}${filenameRoot}.png`), + this.getCachedUrl(`images/${folder}${filenameRoot}.json`), + ); } } @@ -78,7 +89,7 @@ export class SceneBase extends Phaser.Scene { folder += "/"; } if (!Array.isArray(filenames)) { - filenames = [ filenames ]; + filenames = [filenames]; } for (const f of filenames as string[]) { this.load.audio(folder + key, this.getCachedUrl(`audio/${folder}${f}`)); diff --git a/src/system/achv.ts b/src/system/achv.ts index e0c9f0cf052..bd8595b2f94 100644 --- a/src/system/achv.ts +++ b/src/system/achv.ts @@ -5,7 +5,13 @@ import i18next from "i18next"; import * as Utils from "../utils"; import { PlayerGender } from "#enums/player-gender"; import type { Challenge } from "#app/data/challenge"; -import { FlipStatChallenge, FreshStartChallenge, SingleGenerationChallenge, SingleTypeChallenge, InverseBattleChallenge } from "#app/data/challenge"; +import { + FlipStatChallenge, + FreshStartChallenge, + SingleGenerationChallenge, + SingleTypeChallenge, + InverseBattleChallenge, +} from "#app/data/challenge"; import type { ConditionFn } from "#app/@types/common"; import { Stat, getShortenedStatKey } from "#app/enums/stat"; import { Challenges } from "#app/enums/challenges"; @@ -16,7 +22,7 @@ export enum AchvTier { GREAT, ULTRA, ROGUE, - MASTER + MASTER, } export class Achv { @@ -25,7 +31,7 @@ export class Achv { public name: string; public description: string; public iconImage: string; - public score: integer; + public score: number; public secret: boolean; public hasParent: boolean; @@ -33,7 +39,14 @@ export class Achv { private conditionFunc: ConditionFn | undefined; - constructor(localizationKey:string, name: string, description: string, iconImage: string, score: integer, conditionFunc?: ConditionFn) { + constructor( + localizationKey: string, + name: string, + description: string, + iconImage: string, + score: number, + conditionFunc?: ConditionFn, + ) { this.name = name; this.description = description; this.iconImage = iconImage; @@ -50,7 +63,9 @@ export class Achv { getName(playerGender: PlayerGender = PlayerGender.UNSET): string { const genderStr = PlayerGender[playerGender].toLowerCase(); // Localization key is used to get the name of the achievement - return i18next.t(`achv:${this.localizationKey}.name`, { context: genderStr }); + return i18next.t(`achv:${this.localizationKey}.name`, { + context: genderStr, + }); } getDescription(): string { @@ -89,63 +104,104 @@ export class Achv { } export class MoneyAchv extends Achv { - moneyAmount: integer; + moneyAmount: number; - constructor(localizationKey: string, name: string, moneyAmount: integer, iconImage: string, score: integer) { + constructor(localizationKey: string, name: string, moneyAmount: number, iconImage: string, score: number) { super(localizationKey, name, "", iconImage, score, (_args: any[]) => globalScene.money >= this.moneyAmount); this.moneyAmount = moneyAmount; } } export class RibbonAchv extends Achv { - ribbonAmount: integer; + ribbonAmount: number; - constructor(localizationKey: string, name: string, ribbonAmount: integer, iconImage: string, score: integer) { - super(localizationKey, name, "", iconImage, score, (_args: any[]) => globalScene.gameData.gameStats.ribbonsOwned >= this.ribbonAmount); + constructor(localizationKey: string, name: string, ribbonAmount: number, iconImage: string, score: number) { + super( + localizationKey, + name, + "", + iconImage, + score, + (_args: any[]) => globalScene.gameData.gameStats.ribbonsOwned >= this.ribbonAmount, + ); this.ribbonAmount = ribbonAmount; } } export class DamageAchv extends Achv { - damageAmount: integer; + damageAmount: number; - constructor(localizationKey: string, name: string, damageAmount: integer, iconImage: string, score: integer) { - super(localizationKey, name, "", iconImage, score, (args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.damageAmount); + constructor(localizationKey: string, name: string, damageAmount: number, iconImage: string, score: number) { + super( + localizationKey, + name, + "", + iconImage, + score, + (args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.damageAmount, + ); this.damageAmount = damageAmount; } } export class HealAchv extends Achv { - healAmount: integer; + healAmount: number; - constructor(localizationKey: string, name: string, healAmount: integer, iconImage: string, score: integer) { - super(localizationKey, name, "", iconImage, score, (args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.healAmount); + constructor(localizationKey: string, name: string, healAmount: number, iconImage: string, score: number) { + super( + localizationKey, + name, + "", + iconImage, + score, + (args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.healAmount, + ); this.healAmount = healAmount; } } export class LevelAchv extends Achv { - level: integer; + level: number; - constructor(localizationKey: string, name: string, level: integer, iconImage: string, score: integer) { - super(localizationKey, name, "", iconImage, score, (args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.level); + constructor(localizationKey: string, name: string, level: number, iconImage: string, score: number) { + super( + localizationKey, + name, + "", + iconImage, + score, + (args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.level, + ); this.level = level; } } export class ModifierAchv extends Achv { - constructor(localizationKey: string, name: string, description: string, iconImage: string, score: integer, modifierFunc: (modifier: Modifier) => boolean) { - super(localizationKey, name, description, iconImage, score, (args: any[]) => modifierFunc((args[0] as Modifier))); + constructor( + localizationKey: string, + name: string, + description: string, + iconImage: string, + score: number, + modifierFunc: (modifier: Modifier) => boolean, + ) { + super(localizationKey, name, description, iconImage, score, (args: any[]) => modifierFunc(args[0] as Modifier)); } } export class ChallengeAchv extends Achv { - constructor(localizationKey: string, name: string, description: string, iconImage: string, score: integer, challengeFunc: (challenge: Challenge) => boolean) { + constructor( + localizationKey: string, + name: string, + description: string, + iconImage: string, + score: number, + challengeFunc: (challenge: Challenge) => boolean, + ) { super(localizationKey, name, description, iconImage, score, (args: any[]) => challengeFunc(args[0] as Challenge)); } } - /** * Get the description of an achievement from the localization file with all the necessary variables filled in * @param localizationKey The localization key of the achievement @@ -158,49 +214,117 @@ export function getAchievementDescription(localizationKey: string): string { switch (localizationKey) { case "10K_MONEY": - return i18next.t("achv:MoneyAchv.description", { context: genderStr, "moneyAmount": achvs._10K_MONEY.moneyAmount.toLocaleString("en-US") }); + return i18next.t("achv:MoneyAchv.description", { + context: genderStr, + moneyAmount: achvs._10K_MONEY.moneyAmount.toLocaleString("en-US"), + }); case "100K_MONEY": - return i18next.t("achv:MoneyAchv.description", { context: genderStr, "moneyAmount": achvs._100K_MONEY.moneyAmount.toLocaleString("en-US") }); + return i18next.t("achv:MoneyAchv.description", { + context: genderStr, + moneyAmount: achvs._100K_MONEY.moneyAmount.toLocaleString("en-US"), + }); case "1M_MONEY": - return i18next.t("achv:MoneyAchv.description", { context: genderStr, "moneyAmount": achvs._1M_MONEY.moneyAmount.toLocaleString("en-US") }); + return i18next.t("achv:MoneyAchv.description", { + context: genderStr, + moneyAmount: achvs._1M_MONEY.moneyAmount.toLocaleString("en-US"), + }); case "10M_MONEY": - return i18next.t("achv:MoneyAchv.description", { context: genderStr, "moneyAmount": achvs._10M_MONEY.moneyAmount.toLocaleString("en-US") }); + return i18next.t("achv:MoneyAchv.description", { + context: genderStr, + moneyAmount: achvs._10M_MONEY.moneyAmount.toLocaleString("en-US"), + }); case "250_DMG": - return i18next.t("achv:DamageAchv.description", { context: genderStr, "damageAmount": achvs._250_DMG.damageAmount.toLocaleString("en-US") }); + return i18next.t("achv:DamageAchv.description", { + context: genderStr, + damageAmount: achvs._250_DMG.damageAmount.toLocaleString("en-US"), + }); case "1000_DMG": - return i18next.t("achv:DamageAchv.description", { context: genderStr, "damageAmount": achvs._1000_DMG.damageAmount.toLocaleString("en-US") }); + return i18next.t("achv:DamageAchv.description", { + context: genderStr, + damageAmount: achvs._1000_DMG.damageAmount.toLocaleString("en-US"), + }); case "2500_DMG": - return i18next.t("achv:DamageAchv.description", { context: genderStr, "damageAmount": achvs._2500_DMG.damageAmount.toLocaleString("en-US") }); + return i18next.t("achv:DamageAchv.description", { + context: genderStr, + damageAmount: achvs._2500_DMG.damageAmount.toLocaleString("en-US"), + }); case "10000_DMG": - return i18next.t("achv:DamageAchv.description", { context: genderStr, "damageAmount": achvs._10000_DMG.damageAmount.toLocaleString("en-US") }); + return i18next.t("achv:DamageAchv.description", { + context: genderStr, + damageAmount: achvs._10000_DMG.damageAmount.toLocaleString("en-US"), + }); case "250_HEAL": - return i18next.t("achv:HealAchv.description", { context: genderStr, "healAmount": achvs._250_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t(getShortenedStatKey(Stat.HP)) }); + return i18next.t("achv:HealAchv.description", { + context: genderStr, + healAmount: achvs._250_HEAL.healAmount.toLocaleString("en-US"), + HP: i18next.t(getShortenedStatKey(Stat.HP)), + }); case "1000_HEAL": - return i18next.t("achv:HealAchv.description", { context: genderStr, "healAmount": achvs._1000_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t(getShortenedStatKey(Stat.HP)) }); + return i18next.t("achv:HealAchv.description", { + context: genderStr, + healAmount: achvs._1000_HEAL.healAmount.toLocaleString("en-US"), + HP: i18next.t(getShortenedStatKey(Stat.HP)), + }); case "2500_HEAL": - return i18next.t("achv:HealAchv.description", { context: genderStr, "healAmount": achvs._2500_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t(getShortenedStatKey(Stat.HP)) }); + return i18next.t("achv:HealAchv.description", { + context: genderStr, + healAmount: achvs._2500_HEAL.healAmount.toLocaleString("en-US"), + HP: i18next.t(getShortenedStatKey(Stat.HP)), + }); case "10000_HEAL": - return i18next.t("achv:HealAchv.description", { context: genderStr, "healAmount": achvs._10000_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t(getShortenedStatKey(Stat.HP)) }); + return i18next.t("achv:HealAchv.description", { + context: genderStr, + healAmount: achvs._10000_HEAL.healAmount.toLocaleString("en-US"), + HP: i18next.t(getShortenedStatKey(Stat.HP)), + }); case "LV_100": - return i18next.t("achv:LevelAchv.description", { context: genderStr, "level": achvs.LV_100.level }); + return i18next.t("achv:LevelAchv.description", { + context: genderStr, + level: achvs.LV_100.level, + }); case "LV_250": - return i18next.t("achv:LevelAchv.description", { context: genderStr, "level": achvs.LV_250.level }); + return i18next.t("achv:LevelAchv.description", { + context: genderStr, + level: achvs.LV_250.level, + }); case "LV_1000": - return i18next.t("achv:LevelAchv.description", { context: genderStr, "level": achvs.LV_1000.level }); + return i18next.t("achv:LevelAchv.description", { + context: genderStr, + level: achvs.LV_1000.level, + }); case "10_RIBBONS": - return i18next.t("achv:RibbonAchv.description", { context: genderStr, "ribbonAmount": achvs._10_RIBBONS.ribbonAmount.toLocaleString("en-US") }); + return i18next.t("achv:RibbonAchv.description", { + context: genderStr, + ribbonAmount: achvs._10_RIBBONS.ribbonAmount.toLocaleString("en-US"), + }); case "25_RIBBONS": - return i18next.t("achv:RibbonAchv.description", { context: genderStr, "ribbonAmount": achvs._25_RIBBONS.ribbonAmount.toLocaleString("en-US") }); + return i18next.t("achv:RibbonAchv.description", { + context: genderStr, + ribbonAmount: achvs._25_RIBBONS.ribbonAmount.toLocaleString("en-US"), + }); case "50_RIBBONS": - return i18next.t("achv:RibbonAchv.description", { context: genderStr, "ribbonAmount": achvs._50_RIBBONS.ribbonAmount.toLocaleString("en-US") }); + return i18next.t("achv:RibbonAchv.description", { + context: genderStr, + ribbonAmount: achvs._50_RIBBONS.ribbonAmount.toLocaleString("en-US"), + }); case "75_RIBBONS": - return i18next.t("achv:RibbonAchv.description", { context: genderStr, "ribbonAmount": achvs._75_RIBBONS.ribbonAmount.toLocaleString("en-US") }); + return i18next.t("achv:RibbonAchv.description", { + context: genderStr, + ribbonAmount: achvs._75_RIBBONS.ribbonAmount.toLocaleString("en-US"), + }); case "100_RIBBONS": - return i18next.t("achv:RibbonAchv.description", { context: genderStr, "ribbonAmount": achvs._100_RIBBONS.ribbonAmount.toLocaleString("en-US") }); + return i18next.t("achv:RibbonAchv.description", { + context: genderStr, + ribbonAmount: achvs._100_RIBBONS.ribbonAmount.toLocaleString("en-US"), + }); case "TRANSFER_MAX_STAT_STAGE": - return i18next.t("achv:TRANSFER_MAX_STAT_STAGE.description", { context: genderStr }); + return i18next.t("achv:TRANSFER_MAX_STAT_STAGE.description", { + context: genderStr, + }); case "MAX_FRIENDSHIP": - return i18next.t("achv:MAX_FRIENDSHIP.description", { context: genderStr }); + return i18next.t("achv:MAX_FRIENDSHIP.description", { + context: genderStr, + }); case "MEGA_EVOLVE": return i18next.t("achv:MEGA_EVOLVE.description", { context: genderStr }); case "GIGANTAMAX": @@ -208,55 +332,89 @@ export function getAchievementDescription(localizationKey: string): string { case "TERASTALLIZE": return i18next.t("achv:TERASTALLIZE.description", { context: genderStr }); case "STELLAR_TERASTALLIZE": - return i18next.t("achv:STELLAR_TERASTALLIZE.description", { context: genderStr }); + return i18next.t("achv:STELLAR_TERASTALLIZE.description", { + context: genderStr, + }); case "SPLICE": return i18next.t("achv:SPLICE.description", { context: genderStr }); case "MINI_BLACK_HOLE": - return i18next.t("achv:MINI_BLACK_HOLE.description", { context: genderStr }); + return i18next.t("achv:MINI_BLACK_HOLE.description", { + context: genderStr, + }); case "CATCH_MYTHICAL": - return i18next.t("achv:CATCH_MYTHICAL.description", { context: genderStr }); + return i18next.t("achv:CATCH_MYTHICAL.description", { + context: genderStr, + }); case "CATCH_SUB_LEGENDARY": - return i18next.t("achv:CATCH_SUB_LEGENDARY.description", { context: genderStr }); + return i18next.t("achv:CATCH_SUB_LEGENDARY.description", { + context: genderStr, + }); case "CATCH_LEGENDARY": - return i18next.t("achv:CATCH_LEGENDARY.description", { context: genderStr }); + return i18next.t("achv:CATCH_LEGENDARY.description", { + context: genderStr, + }); case "SEE_SHINY": return i18next.t("achv:SEE_SHINY.description", { context: genderStr }); case "SHINY_PARTY": return i18next.t("achv:SHINY_PARTY.description", { context: genderStr }); case "HATCH_MYTHICAL": - return i18next.t("achv:HATCH_MYTHICAL.description", { context: genderStr }); + return i18next.t("achv:HATCH_MYTHICAL.description", { + context: genderStr, + }); case "HATCH_SUB_LEGENDARY": - return i18next.t("achv:HATCH_SUB_LEGENDARY.description", { context: genderStr }); + return i18next.t("achv:HATCH_SUB_LEGENDARY.description", { + context: genderStr, + }); case "HATCH_LEGENDARY": - return i18next.t("achv:HATCH_LEGENDARY.description", { context: genderStr }); + return i18next.t("achv:HATCH_LEGENDARY.description", { + context: genderStr, + }); case "HATCH_SHINY": return i18next.t("achv:HATCH_SHINY.description", { context: genderStr }); case "HIDDEN_ABILITY": - return i18next.t("achv:HIDDEN_ABILITY.description", { context: genderStr }); + return i18next.t("achv:HIDDEN_ABILITY.description", { + context: genderStr, + }); case "PERFECT_IVS": return i18next.t("achv:PERFECT_IVS.description", { context: genderStr }); case "CLASSIC_VICTORY": - return i18next.t("achv:CLASSIC_VICTORY.description", { context: genderStr }); + return i18next.t("achv:CLASSIC_VICTORY.description", { + context: genderStr, + }); case "UNEVOLVED_CLASSIC_VICTORY": - return i18next.t("achv:UNEVOLVED_CLASSIC_VICTORY.description", { context: genderStr }); + return i18next.t("achv:UNEVOLVED_CLASSIC_VICTORY.description", { + context: genderStr, + }); case "MONO_GEN_ONE": return i18next.t("achv:MONO_GEN_ONE.description", { context: genderStr }); case "MONO_GEN_TWO": return i18next.t("achv:MONO_GEN_TWO.description", { context: genderStr }); case "MONO_GEN_THREE": - return i18next.t("achv:MONO_GEN_THREE.description", { context: genderStr }); + return i18next.t("achv:MONO_GEN_THREE.description", { + context: genderStr, + }); case "MONO_GEN_FOUR": - return i18next.t("achv:MONO_GEN_FOUR.description", { context: genderStr }); + return i18next.t("achv:MONO_GEN_FOUR.description", { + context: genderStr, + }); case "MONO_GEN_FIVE": - return i18next.t("achv:MONO_GEN_FIVE.description", { context: genderStr }); + return i18next.t("achv:MONO_GEN_FIVE.description", { + context: genderStr, + }); case "MONO_GEN_SIX": return i18next.t("achv:MONO_GEN_SIX.description", { context: genderStr }); case "MONO_GEN_SEVEN": - return i18next.t("achv:MONO_GEN_SEVEN.description", { context: genderStr }); + return i18next.t("achv:MONO_GEN_SEVEN.description", { + context: genderStr, + }); case "MONO_GEN_EIGHT": - return i18next.t("achv:MONO_GEN_EIGHT.description", { context: genderStr }); + return i18next.t("achv:MONO_GEN_EIGHT.description", { + context: genderStr, + }); case "MONO_GEN_NINE": - return i18next.t("achv:MONO_GEN_NINE.description", { context: genderStr }); + return i18next.t("achv:MONO_GEN_NINE.description", { + context: genderStr, + }); case "MONO_NORMAL": case "MONO_FIGHTING": case "MONO_FLYING": @@ -275,21 +433,27 @@ export function getAchievementDescription(localizationKey: string): string { case "MONO_DRAGON": case "MONO_DARK": case "MONO_FAIRY": - return i18next.t("achv:MonoType.description", { context: genderStr, "type": i18next.t(`pokemonInfo:Type.${localizationKey.slice(5)}`) }); + return i18next.t("achv:MonoType.description", { + context: genderStr, + type: i18next.t(`pokemonInfo:Type.${localizationKey.slice(5)}`), + }); case "FRESH_START": return i18next.t("achv:FRESH_START.description", { context: genderStr }); case "INVERSE_BATTLE": - return i18next.t("achv:INVERSE_BATTLE.description", { context: genderStr }); + return i18next.t("achv:INVERSE_BATTLE.description", { + context: genderStr, + }); case "FLIP_STATS": return i18next.t("achv:FLIP_STATS.description", { context: genderStr }); case "FLIP_INVERSE": return i18next.t("achv:FLIP_INVERSE.description", { context: genderStr }); case "BREEDERS_IN_SPACE": - return i18next.t("achv:BREEDERS_IN_SPACE.description", { context: genderStr }); + return i18next.t("achv:BREEDERS_IN_SPACE.description", { + context: genderStr, + }); default: return ""; } - } export const achvs = { @@ -313,64 +477,457 @@ export const achvs = { _50_RIBBONS: new RibbonAchv("50_RIBBONS", "", 50, "ultra_ribbon", 50).setSecret(true), _75_RIBBONS: new RibbonAchv("75_RIBBONS", "", 75, "rogue_ribbon", 75).setSecret(true), _100_RIBBONS: new RibbonAchv("100_RIBBONS", "", 100, "master_ribbon", 100).setSecret(true), - TRANSFER_MAX_STAT_STAGE: new Achv("TRANSFER_MAX_STAT_STAGE", "", "TRANSFER_MAX_STAT_STAGE.description", "baton", 20), + TRANSFER_MAX_STAT_STAGE: new Achv("TRANSFER_MAX_STAT_STAGE", "", "TRANSFER_MAX_STAT_STAGE.description", "baton", 20), MAX_FRIENDSHIP: new Achv("MAX_FRIENDSHIP", "", "MAX_FRIENDSHIP.description", "soothe_bell", 25), MEGA_EVOLVE: new Achv("MEGA_EVOLVE", "", "MEGA_EVOLVE.description", "mega_bracelet", 50), GIGANTAMAX: new Achv("GIGANTAMAX", "", "GIGANTAMAX.description", "dynamax_band", 50), - TERASTALLIZE: new Achv("TERASTALLIZE", "", "TERASTALLIZE.description", "tera_orb", 25), - STELLAR_TERASTALLIZE: new Achv("STELLAR_TERASTALLIZE", "", "STELLAR_TERASTALLIZE.description", "stellar_tera_shard", 25).setSecret(true), - SPLICE: new Achv("SPLICE", "", "SPLICE.description", "dna_splicers", 10), - MINI_BLACK_HOLE: new ModifierAchv("MINI_BLACK_HOLE", "", "MINI_BLACK_HOLE.description", "mini_black_hole", 25, modifier => modifier instanceof TurnHeldItemTransferModifier).setSecret(), - CATCH_MYTHICAL: new Achv("CATCH_MYTHICAL", "", "CATCH_MYTHICAL.description", "strange_ball", 50).setSecret(), - CATCH_SUB_LEGENDARY: new Achv("CATCH_SUB_LEGENDARY", "", "CATCH_SUB_LEGENDARY.description", "rb", 75).setSecret(), + TERASTALLIZE: new Achv("TERASTALLIZE", "", "TERASTALLIZE.description", "tera_orb", 25), + STELLAR_TERASTALLIZE: new Achv( + "STELLAR_TERASTALLIZE", + "", + "STELLAR_TERASTALLIZE.description", + "stellar_tera_shard", + 25, + ).setSecret(true), + SPLICE: new Achv("SPLICE", "", "SPLICE.description", "dna_splicers", 10), + MINI_BLACK_HOLE: new ModifierAchv( + "MINI_BLACK_HOLE", + "", + "MINI_BLACK_HOLE.description", + "mini_black_hole", + 25, + modifier => modifier instanceof TurnHeldItemTransferModifier, + ).setSecret(), + CATCH_MYTHICAL: new Achv("CATCH_MYTHICAL", "", "CATCH_MYTHICAL.description", "strange_ball", 50).setSecret(), + CATCH_SUB_LEGENDARY: new Achv("CATCH_SUB_LEGENDARY", "", "CATCH_SUB_LEGENDARY.description", "rb", 75).setSecret(), CATCH_LEGENDARY: new Achv("CATCH_LEGENDARY", "", "CATCH_LEGENDARY.description", "mb", 100).setSecret(), SEE_SHINY: new Achv("SEE_SHINY", "", "SEE_SHINY.description", "pb_gold", 75), SHINY_PARTY: new Achv("SHINY_PARTY", "", "SHINY_PARTY.description", "shiny_charm", 100).setSecret(true), HATCH_MYTHICAL: new Achv("HATCH_MYTHICAL", "", "HATCH_MYTHICAL.description", "mystery_egg", 75).setSecret(), - HATCH_SUB_LEGENDARY: new Achv("HATCH_SUB_LEGENDARY", "", "HATCH_SUB_LEGENDARY.description", "oval_stone", 100).setSecret(), - HATCH_LEGENDARY: new Achv("HATCH_LEGENDARY", "", "HATCH_LEGENDARY.description", "lucky_egg", 125).setSecret(), - HATCH_SHINY: new Achv("HATCH_SHINY", "", "HATCH_SHINY.description", "golden_egg", 100).setSecret(), - HIDDEN_ABILITY: new Achv("HIDDEN_ABILITY", "", "HIDDEN_ABILITY.description", "ability_charm", 75), - PERFECT_IVS: new Achv("PERFECT_IVS", "", "PERFECT_IVS.description", "blunder_policy", 100), - CLASSIC_VICTORY: new Achv("CLASSIC_VICTORY", "", "CLASSIC_VICTORY.description", "relic_crown", 150, (_) => globalScene.gameData.gameStats.sessionsWon === 0), - UNEVOLVED_CLASSIC_VICTORY: new Achv("UNEVOLVED_CLASSIC_VICTORY", "", "UNEVOLVED_CLASSIC_VICTORY.description", "eviolite", 175, (_) => globalScene.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)), - MONO_GEN_ONE_VICTORY: new ChallengeAchv("MONO_GEN_ONE", "", "MONO_GEN_ONE.description", "ribbon_gen1", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 1 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GEN_TWO_VICTORY: new ChallengeAchv("MONO_GEN_TWO", "", "MONO_GEN_TWO.description", "ribbon_gen2", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 2 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GEN_THREE_VICTORY: new ChallengeAchv("MONO_GEN_THREE", "", "MONO_GEN_THREE.description", "ribbon_gen3", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 3 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GEN_FOUR_VICTORY: new ChallengeAchv("MONO_GEN_FOUR", "", "MONO_GEN_FOUR.description", "ribbon_gen4", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 4 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GEN_FIVE_VICTORY: new ChallengeAchv("MONO_GEN_FIVE", "", "MONO_GEN_FIVE.description", "ribbon_gen5", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 5 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GEN_SIX_VICTORY: new ChallengeAchv("MONO_GEN_SIX", "", "MONO_GEN_SIX.description", "ribbon_gen6", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 6 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GEN_SEVEN_VICTORY: new ChallengeAchv("MONO_GEN_SEVEN", "", "MONO_GEN_SEVEN.description", "ribbon_gen7", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 7 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GEN_EIGHT_VICTORY: new ChallengeAchv("MONO_GEN_EIGHT", "", "MONO_GEN_EIGHT.description", "ribbon_gen8", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 8 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GEN_NINE_VICTORY: new ChallengeAchv("MONO_GEN_NINE", "", "MONO_GEN_NINE.description", "ribbon_gen9", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 9 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_NORMAL: new ChallengeAchv("MONO_NORMAL", "", "MONO_NORMAL.description", "silk_scarf", 100, (c) => c instanceof SingleTypeChallenge && c.value === 1 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_FIGHTING: new ChallengeAchv("MONO_FIGHTING", "", "MONO_FIGHTING.description", "black_belt", 100, (c) => c instanceof SingleTypeChallenge && c.value === 2 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_FLYING: new ChallengeAchv("MONO_FLYING", "", "MONO_FLYING.description", "sharp_beak", 100, (c) => c instanceof SingleTypeChallenge && c.value === 3 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_POISON: new ChallengeAchv("MONO_POISON", "", "MONO_POISON.description", "poison_barb", 100, (c) => c instanceof SingleTypeChallenge && c.value === 4 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GROUND: new ChallengeAchv("MONO_GROUND", "", "MONO_GROUND.description", "soft_sand", 100, (c) => c instanceof SingleTypeChallenge && c.value === 5 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_ROCK: new ChallengeAchv("MONO_ROCK", "", "MONO_ROCK.description", "hard_stone", 100, (c) => c instanceof SingleTypeChallenge && c.value === 6 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_BUG: new ChallengeAchv("MONO_BUG", "", "MONO_BUG.description", "silver_powder", 100, (c) => c instanceof SingleTypeChallenge && c.value === 7 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GHOST: new ChallengeAchv("MONO_GHOST", "", "MONO_GHOST.description", "spell_tag", 100, (c) => c instanceof SingleTypeChallenge && c.value === 8 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_STEEL: new ChallengeAchv("MONO_STEEL", "", "MONO_STEEL.description", "metal_coat", 100, (c) => c instanceof SingleTypeChallenge && c.value === 9 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_FIRE: new ChallengeAchv("MONO_FIRE", "", "MONO_FIRE.description", "charcoal", 100, (c) => c instanceof SingleTypeChallenge && c.value === 10 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_WATER: new ChallengeAchv("MONO_WATER", "", "MONO_WATER.description", "mystic_water", 100, (c) => c instanceof SingleTypeChallenge && c.value === 11 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_GRASS: new ChallengeAchv("MONO_GRASS", "", "MONO_GRASS.description", "miracle_seed", 100, (c) => c instanceof SingleTypeChallenge && c.value === 12 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_ELECTRIC: new ChallengeAchv("MONO_ELECTRIC", "", "MONO_ELECTRIC.description", "magnet", 100, (c) => c instanceof SingleTypeChallenge && c.value === 13 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_PSYCHIC: new ChallengeAchv("MONO_PSYCHIC", "", "MONO_PSYCHIC.description", "twisted_spoon", 100, (c) => c instanceof SingleTypeChallenge && c.value === 14 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_ICE: new ChallengeAchv("MONO_ICE", "", "MONO_ICE.description", "never_melt_ice", 100, (c) => c instanceof SingleTypeChallenge && c.value === 15 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_DRAGON: new ChallengeAchv("MONO_DRAGON", "", "MONO_DRAGON.description", "dragon_fang", 100, (c) => c instanceof SingleTypeChallenge && c.value === 16 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_DARK: new ChallengeAchv("MONO_DARK", "", "MONO_DARK.description", "black_glasses", 100, (c) => c instanceof SingleTypeChallenge && c.value === 17 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - MONO_FAIRY: new ChallengeAchv("MONO_FAIRY", "", "MONO_FAIRY.description", "fairy_feather", 100, (c) => c instanceof SingleTypeChallenge && c.value === 18 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - FRESH_START: new ChallengeAchv("FRESH_START", "", "FRESH_START.description", "reviver_seed", 100, (c) => c instanceof FreshStartChallenge && c.value > 0 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)), - INVERSE_BATTLE: new ChallengeAchv("INVERSE_BATTLE", "", "INVERSE_BATTLE.description", "inverse", 100, (c) => c instanceof InverseBattleChallenge && c.value > 0), - FLIP_STATS: new ChallengeAchv("FLIP_STATS", "", "FLIP_STATS.description", "dubious_disc", 100, (c) => c instanceof FlipStatChallenge && c.value > 0), - FLIP_INVERSE: new ChallengeAchv("FLIP_INVERSE", "", "FLIP_INVERSE.description", "cracked_pot", 100, (c) => c instanceof FlipStatChallenge && c.value > 0 && globalScene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)).setSecret(), + HATCH_SUB_LEGENDARY: new Achv( + "HATCH_SUB_LEGENDARY", + "", + "HATCH_SUB_LEGENDARY.description", + "oval_stone", + 100, + ).setSecret(), + HATCH_LEGENDARY: new Achv("HATCH_LEGENDARY", "", "HATCH_LEGENDARY.description", "lucky_egg", 125).setSecret(), + HATCH_SHINY: new Achv("HATCH_SHINY", "", "HATCH_SHINY.description", "golden_egg", 100).setSecret(), + HIDDEN_ABILITY: new Achv("HIDDEN_ABILITY", "", "HIDDEN_ABILITY.description", "ability_charm", 75), + PERFECT_IVS: new Achv("PERFECT_IVS", "", "PERFECT_IVS.description", "blunder_policy", 100), + CLASSIC_VICTORY: new Achv( + "CLASSIC_VICTORY", + "", + "CLASSIC_VICTORY.description", + "relic_crown", + 150, + _ => globalScene.gameData.gameStats.sessionsWon === 0, + ), + UNEVOLVED_CLASSIC_VICTORY: new Achv( + "UNEVOLVED_CLASSIC_VICTORY", + "", + "UNEVOLVED_CLASSIC_VICTORY.description", + "eviolite", + 175, + _ => globalScene.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions), + ), + MONO_GEN_ONE_VICTORY: new ChallengeAchv( + "MONO_GEN_ONE", + "", + "MONO_GEN_ONE.description", + "ribbon_gen1", + 100, + c => + c instanceof SingleGenerationChallenge && + c.value === 1 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GEN_TWO_VICTORY: new ChallengeAchv( + "MONO_GEN_TWO", + "", + "MONO_GEN_TWO.description", + "ribbon_gen2", + 100, + c => + c instanceof SingleGenerationChallenge && + c.value === 2 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GEN_THREE_VICTORY: new ChallengeAchv( + "MONO_GEN_THREE", + "", + "MONO_GEN_THREE.description", + "ribbon_gen3", + 100, + c => + c instanceof SingleGenerationChallenge && + c.value === 3 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GEN_FOUR_VICTORY: new ChallengeAchv( + "MONO_GEN_FOUR", + "", + "MONO_GEN_FOUR.description", + "ribbon_gen4", + 100, + c => + c instanceof SingleGenerationChallenge && + c.value === 4 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GEN_FIVE_VICTORY: new ChallengeAchv( + "MONO_GEN_FIVE", + "", + "MONO_GEN_FIVE.description", + "ribbon_gen5", + 100, + c => + c instanceof SingleGenerationChallenge && + c.value === 5 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GEN_SIX_VICTORY: new ChallengeAchv( + "MONO_GEN_SIX", + "", + "MONO_GEN_SIX.description", + "ribbon_gen6", + 100, + c => + c instanceof SingleGenerationChallenge && + c.value === 6 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GEN_SEVEN_VICTORY: new ChallengeAchv( + "MONO_GEN_SEVEN", + "", + "MONO_GEN_SEVEN.description", + "ribbon_gen7", + 100, + c => + c instanceof SingleGenerationChallenge && + c.value === 7 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GEN_EIGHT_VICTORY: new ChallengeAchv( + "MONO_GEN_EIGHT", + "", + "MONO_GEN_EIGHT.description", + "ribbon_gen8", + 100, + c => + c instanceof SingleGenerationChallenge && + c.value === 8 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GEN_NINE_VICTORY: new ChallengeAchv( + "MONO_GEN_NINE", + "", + "MONO_GEN_NINE.description", + "ribbon_gen9", + 100, + c => + c instanceof SingleGenerationChallenge && + c.value === 9 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_NORMAL: new ChallengeAchv( + "MONO_NORMAL", + "", + "MONO_NORMAL.description", + "silk_scarf", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 1 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_FIGHTING: new ChallengeAchv( + "MONO_FIGHTING", + "", + "MONO_FIGHTING.description", + "black_belt", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 2 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_FLYING: new ChallengeAchv( + "MONO_FLYING", + "", + "MONO_FLYING.description", + "sharp_beak", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 3 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_POISON: new ChallengeAchv( + "MONO_POISON", + "", + "MONO_POISON.description", + "poison_barb", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 4 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GROUND: new ChallengeAchv( + "MONO_GROUND", + "", + "MONO_GROUND.description", + "soft_sand", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 5 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_ROCK: new ChallengeAchv( + "MONO_ROCK", + "", + "MONO_ROCK.description", + "hard_stone", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 6 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_BUG: new ChallengeAchv( + "MONO_BUG", + "", + "MONO_BUG.description", + "silver_powder", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 7 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GHOST: new ChallengeAchv( + "MONO_GHOST", + "", + "MONO_GHOST.description", + "spell_tag", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 8 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_STEEL: new ChallengeAchv( + "MONO_STEEL", + "", + "MONO_STEEL.description", + "metal_coat", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 9 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_FIRE: new ChallengeAchv( + "MONO_FIRE", + "", + "MONO_FIRE.description", + "charcoal", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 10 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_WATER: new ChallengeAchv( + "MONO_WATER", + "", + "MONO_WATER.description", + "mystic_water", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 11 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_GRASS: new ChallengeAchv( + "MONO_GRASS", + "", + "MONO_GRASS.description", + "miracle_seed", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 12 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_ELECTRIC: new ChallengeAchv( + "MONO_ELECTRIC", + "", + "MONO_ELECTRIC.description", + "magnet", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 13 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_PSYCHIC: new ChallengeAchv( + "MONO_PSYCHIC", + "", + "MONO_PSYCHIC.description", + "twisted_spoon", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 14 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_ICE: new ChallengeAchv( + "MONO_ICE", + "", + "MONO_ICE.description", + "never_melt_ice", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 15 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_DRAGON: new ChallengeAchv( + "MONO_DRAGON", + "", + "MONO_DRAGON.description", + "dragon_fang", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 16 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_DARK: new ChallengeAchv( + "MONO_DARK", + "", + "MONO_DARK.description", + "black_glasses", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 17 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + MONO_FAIRY: new ChallengeAchv( + "MONO_FAIRY", + "", + "MONO_FAIRY.description", + "fairy_feather", + 100, + c => + c instanceof SingleTypeChallenge && + c.value === 18 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + FRESH_START: new ChallengeAchv( + "FRESH_START", + "", + "FRESH_START.description", + "reviver_seed", + 100, + c => + c instanceof FreshStartChallenge && + c.value > 0 && + !globalScene.gameMode.challenges.some( + c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0, + ), + ), + INVERSE_BATTLE: new ChallengeAchv( + "INVERSE_BATTLE", + "", + "INVERSE_BATTLE.description", + "inverse", + 100, + c => c instanceof InverseBattleChallenge && c.value > 0, + ), + FLIP_STATS: new ChallengeAchv( + "FLIP_STATS", + "", + "FLIP_STATS.description", + "dubious_disc", + 100, + c => c instanceof FlipStatChallenge && c.value > 0, + ), + FLIP_INVERSE: new ChallengeAchv( + "FLIP_INVERSE", + "", + "FLIP_INVERSE.description", + "cracked_pot", + 100, + c => + c instanceof FlipStatChallenge && + c.value > 0 && + globalScene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0), + ).setSecret(), BREEDERS_IN_SPACE: new Achv("BREEDERS_IN_SPACE", "", "BREEDERS_IN_SPACE.description", "moon_stone", 50).setSecret(), }; export function initAchievements() { const achvKeys = Object.keys(achvs); - achvKeys.forEach((a: string, i: integer) => { + achvKeys.forEach((a: string, i: number) => { achvs[a].id = a; if (achvs[a].hasParent) { achvs[a].parentId = achvKeys[i - 1]; diff --git a/src/system/arena-data.ts b/src/system/arena-data.ts index 98ab611ff3c..07396b31d1b 100644 --- a/src/system/arena-data.ts +++ b/src/system/arena-data.ts @@ -10,12 +10,22 @@ export default class ArenaData { public weather: Weather | null; public terrain: Terrain | null; public tags: ArenaTag[]; + public playerTerasUsed: number; constructor(source: Arena | any) { - const sourceArena = source instanceof Arena ? source as Arena : null; + const sourceArena = source instanceof Arena ? (source as Arena) : null; this.biome = sourceArena ? sourceArena.biomeType : source.biome; - this.weather = sourceArena ? sourceArena.weather : source.weather ? new Weather(source.weather.weatherType, source.weather.turnsLeft) : null; - this.terrain = sourceArena ? sourceArena.terrain : source.terrain ? new Terrain(source.terrain.terrainType, source.terrain.turnsLeft) : null; + this.weather = sourceArena + ? sourceArena.weather + : source.weather + ? new Weather(source.weather.weatherType, source.weather.turnsLeft) + : null; + this.terrain = sourceArena + ? sourceArena.terrain + : source.terrain + ? new Terrain(source.terrain.terrainType, source.terrain.turnsLeft) + : null; + this.playerTerasUsed = (sourceArena ? sourceArena.playerTerasUsed : source.playerTerasUsed) ?? 0; this.tags = []; if (source.tags) { diff --git a/src/system/challenge-data.ts b/src/system/challenge-data.ts index 76a3392861d..87299ae653a 100644 --- a/src/system/challenge-data.ts +++ b/src/system/challenge-data.ts @@ -2,9 +2,9 @@ import type { Challenge } from "#app/data/challenge"; import { copyChallenge } from "#app/data/challenge"; export default class ChallengeData { - public id: integer; - public value: integer; - public severity: integer; + public id: number; + public value: number; + public severity: number; constructor(source: Challenge | any) { this.id = source.id; diff --git a/src/system/egg-data.ts b/src/system/egg-data.ts index 7b75f387c63..8fb8335bcf7 100644 --- a/src/system/egg-data.ts +++ b/src/system/egg-data.ts @@ -5,11 +5,11 @@ import { EGG_SEED, Egg } from "../data/egg"; import type { EggSourceType } from "#app/enums/egg-source-types"; export default class EggData { - public id: integer; + public id: number; public tier: EggTier; public sourceType: EggSourceType; - public hatchWaves: integer; - public timestamp: integer; + public hatchWaves: number; + public timestamp: number; public variantTier: VariantTier; public isShiny: boolean; public species: Species; @@ -17,9 +17,9 @@ export default class EggData { public overrideHiddenAbility: boolean; constructor(source: Egg | any) { - const sourceEgg = source instanceof Egg ? source as Egg : null; + const sourceEgg = source instanceof Egg ? (source as Egg) : null; this.id = sourceEgg ? sourceEgg.id : source.id; - this.tier = sourceEgg ? sourceEgg.tier : (source.tier ?? Math.floor(this.id / EGG_SEED)); + this.tier = sourceEgg ? sourceEgg.tier : (source.tier ?? Math.floor(this.id / EGG_SEED)); // legacy egg if (source.species === 0) { // check if it has a gachaType (deprecated) @@ -39,11 +39,25 @@ export default class EggData { toEgg(): Egg { // Species will be 0 if an old legacy is loaded from DB if (!this.species) { - return new Egg({ id: this.id, hatchWaves: this.hatchWaves, sourceType: this.sourceType, timestamp: this.timestamp, tier: Math.floor(this.id / EGG_SEED) }); - } else { - return new Egg({ id: this.id, tier: this.tier, sourceType: this.sourceType, hatchWaves: this.hatchWaves, - timestamp: this.timestamp, variantTier: this.variantTier, isShiny: this.isShiny, species: this.species, - eggMoveIndex: this.eggMoveIndex, overrideHiddenAbility: this.overrideHiddenAbility }); + return new Egg({ + id: this.id, + hatchWaves: this.hatchWaves, + sourceType: this.sourceType, + timestamp: this.timestamp, + tier: Math.floor(this.id / EGG_SEED), + }); } + return new Egg({ + id: this.id, + tier: this.tier, + sourceType: this.sourceType, + hatchWaves: this.hatchWaves, + timestamp: this.timestamp, + variantTier: this.variantTier, + isShiny: this.isShiny, + species: this.species, + eggMoveIndex: this.eggMoveIndex, + overrideHiddenAbility: this.overrideHiddenAbility, + }); } } diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 58d416eb468..82ad2276fef 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -30,7 +30,7 @@ import { Nature } from "#enums/nature"; import { GameStats } from "#app/system/game-stats"; import { Tutorial } from "#app/tutorial"; import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { TrainerVariant } from "#app/field/trainer"; import type { Variant } from "#app/data/variant"; import { setSettingGamepad, SettingGamepad, settingGamepadDefaults } from "#app/system/settings/settings-gamepad"; @@ -50,27 +50,51 @@ import { WeatherType } from "#enums/weather-type"; import { TerrainType } from "#app/data/terrain"; import { ReloadSessionPhase } from "#app/phases/reload-session-phase"; import { RUN_HISTORY_LIMIT } from "#app/ui/run-history-ui-handler"; -import { applySessionVersionMigration, applySystemVersionMigration, applySettingsVersionMigration } from "./version_migration/version_converter"; +import { + applySessionVersionMigration, + applySystemVersionMigration, + applySettingsVersionMigration, +} from "./version_migration/version_converter"; import { MysteryEncounterSaveData } from "#app/data/mystery-encounters/mystery-encounter-save-data"; import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; import { ArenaTrapTag } from "#app/data/arena-tag"; +import { pokemonFormChanges } from "#app/data/pokemon-forms"; +import type { PokemonType } from "#enums/pokemon-type"; export const defaultStarterSpecies: Species[] = [ - Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, - Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, - Species.TREECKO, Species.TORCHIC, Species.MUDKIP, - Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, - Species.SNIVY, Species.TEPIG, Species.OSHAWOTT, - Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE, - Species.ROWLET, Species.LITTEN, Species.POPPLIO, - Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE, - Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY + Species.BULBASAUR, + Species.CHARMANDER, + Species.SQUIRTLE, + Species.CHIKORITA, + Species.CYNDAQUIL, + Species.TOTODILE, + Species.TREECKO, + Species.TORCHIC, + Species.MUDKIP, + Species.TURTWIG, + Species.CHIMCHAR, + Species.PIPLUP, + Species.SNIVY, + Species.TEPIG, + Species.OSHAWOTT, + Species.CHESPIN, + Species.FENNEKIN, + Species.FROAKIE, + Species.ROWLET, + Species.LITTEN, + Species.POPPLIO, + Species.GROOKEY, + Species.SCORBUNNY, + Species.SOBBLE, + Species.SPRIGATITO, + Species.FUECOCO, + Species.QUAXLY, ]; const saveKey = "x0i2O7WRiANTqPmZ"; // Temporary; secure encryption is not yet necessary -export function getDataTypeKey(dataType: GameDataType, slotId: integer = 0): string { +export function getDataTypeKey(dataType: GameDataType, slotId = 0): string { switch (dataType) { case GameDataType.SYSTEM: return "data"; @@ -92,20 +116,20 @@ export function getDataTypeKey(dataType: GameDataType, slotId: integer = 0): str } export function encrypt(data: string, bypassLogin: boolean): string { - return (bypassLogin - ? (data: string) => btoa(data) - : (data: string) => AES.encrypt(data, saveKey))(data) as unknown as string; // TODO: is this correct? + return (bypassLogin ? (data: string) => btoa(data) : (data: string) => AES.encrypt(data, saveKey))( + data, + ) as unknown as string; // TODO: is this correct? } export function decrypt(data: string, bypassLogin: boolean): string { - return (bypassLogin - ? (data: string) => atob(data) - : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8))(data); + return (bypassLogin ? (data: string) => atob(data) : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8))( + data, + ); } export interface SystemSaveData { - trainerId: integer; - secretId: integer; + trainerId: number; + secretId: number; gender: PlayerGender; dexData: DexData; starterData: StarterData; @@ -116,14 +140,14 @@ export interface SystemSaveData { voucherCounts: VoucherCounts; eggs: EggData[]; gameVersion: string; - timestamp: integer; - eggPity: integer[]; - unlockPity: integer[]; + timestamp: number; + eggPity: number[]; + unlockPity: number[]; } export interface SessionSaveData { seed: string; - playTime: integer; + playTime: number; gameMode: GameModes; party: PokemonData[]; enemyParty: PokemonData[]; @@ -131,46 +155,50 @@ export interface SessionSaveData { enemyModifiers: PersistentModifierData[]; arena: ArenaData; pokeballCounts: PokeballCounts; - money: integer; - score: integer; - waveIndex: integer; + money: number; + score: number; + waveIndex: number; battleType: BattleType; trainer: TrainerData; gameVersion: string; - timestamp: integer; + timestamp: number; challenges: ChallengeData[]; mysteryEncounterType: MysteryEncounterType | -1; // Only defined when current wave is ME, mysteryEncounterSaveData: MysteryEncounterSaveData; + /** + * Counts the amount of pokemon fainted in your party during the current arena encounter. + */ + playerFaints: number; } interface Unlocks { - [key: integer]: boolean; + [key: number]: boolean; } interface AchvUnlocks { - [key: string]: integer + [key: string]: number; } interface VoucherUnlocks { - [key: string]: integer + [key: string]: number; } export interface VoucherCounts { - [type: string]: integer; + [type: string]: number; } export interface DexData { - [key: integer]: DexEntry + [key: number]: DexEntry; } export interface DexEntry { seenAttr: bigint; caughtAttr: bigint; - natureAttr: integer, - seenCount: integer; - caughtCount: integer; - hatchedCount: integer; - ivs: integer[]; + natureAttr: number; + seenCount: number; + caughtCount: number; + hatchedCount: number; + ivs: number[]; } export const DexAttr = { @@ -181,20 +209,20 @@ export const DexAttr = { DEFAULT_VARIANT: 16n, VARIANT_2: 32n, VARIANT_3: 64n, - DEFAULT_FORM: 128n + DEFAULT_FORM: 128n, }; export interface DexAttrProps { shiny: boolean; female: boolean; variant: Variant; - formIndex: integer; + formIndex: number; } export const AbilityAttr = { ABILITY_1: 1, ABILITY_2: 2, - ABILITY_HIDDEN: 4 + ABILITY_HIDDEN: 4, }; export type RunHistoryData = Record; @@ -206,78 +234,79 @@ export interface RunEntry { isFavorite: boolean; } -export type StarterMoveset = [ Moves ] | [ Moves, Moves ] | [ Moves, Moves, Moves ] | [ Moves, Moves, Moves, Moves ]; +export type StarterMoveset = [Moves] | [Moves, Moves] | [Moves, Moves, Moves] | [Moves, Moves, Moves, Moves]; export interface StarterFormMoveData { - [key: integer]: StarterMoveset + [key: number]: StarterMoveset; } export interface StarterMoveData { - [key: integer]: StarterMoveset | StarterFormMoveData + [key: number]: StarterMoveset | StarterFormMoveData; } export interface StarterAttributes { - nature?: integer; - ability?: integer; - variant?: integer; - form?: integer; + nature?: number; + ability?: number; + variant?: number; + form?: number; female?: boolean; shiny?: boolean; favorite?: boolean; nickname?: string; + tera?: PokemonType; } export interface StarterPreferences { - [key: integer]: StarterAttributes; + [key: number]: StarterAttributes; } // the latest data saved/loaded for the Starter Preferences. Required to reduce read/writes. Initialize as "{}", since this is the default value and no data needs to be stored if present. // if they ever add private static variables, move this into StarterPrefs -const StarterPrefers_DEFAULT : string = "{}"; -let StarterPrefers_private_latest : string = StarterPrefers_DEFAULT; +const StarterPrefers_DEFAULT: string = "{}"; +let StarterPrefers_private_latest: string = StarterPrefers_DEFAULT; +// called on starter selection show once +export function loadStarterPreferences(): StarterPreferences { + return JSON.parse( + (StarterPrefers_private_latest = + localStorage.getItem(`starterPrefs_${loggedInUser?.username}`) || StarterPrefers_DEFAULT), + ); +} + +// called on starter selection clear, always +export function saveStarterPreferences(prefs: StarterPreferences): void { + const pStr: string = JSON.stringify(prefs); + if (pStr !== StarterPrefers_private_latest) { + // something changed, store the update + localStorage.setItem(`starterPrefs_${loggedInUser?.username}`, pStr); + // update the latest prefs + StarterPrefers_private_latest = pStr; + } +} // This is its own class as StarterPreferences... // - don't need to be loaded on startup // - isn't stored with other data // - don't require to be encrypted // - shouldn't require calls outside of the starter selection -export class StarterPrefs { - // called on starter selection show once - static load(): StarterPreferences { - return JSON.parse( - StarterPrefers_private_latest = (localStorage.getItem(`starterPrefs_${loggedInUser?.username}`) || StarterPrefers_DEFAULT) - ); - } - - // called on starter selection clear, always - static save(prefs: StarterPreferences): void { - const pStr : string = JSON.stringify(prefs); - if (pStr !== StarterPrefers_private_latest) { - // something changed, store the update - localStorage.setItem(`starterPrefs_${loggedInUser?.username}`, pStr); - // update the latest prefs - StarterPrefers_private_latest = pStr; - } - } -} +export class StarterPrefs {} export interface StarterDataEntry { moveset: StarterMoveset | StarterFormMoveData | null; - eggMoves: integer; - candyCount: integer; - friendship: integer; - abilityAttr: integer; - passiveAttr: integer; - valueReduction: integer; - classicWinCount: integer; + eggMoves: number; + candyCount: number; + friendship: number; + abilityAttr: number; + passiveAttr: number; + valueReduction: number; + classicWinCount: number; } export interface StarterData { - [key: integer]: StarterDataEntry + [key: number]: StarterDataEntry; } export interface TutorialFlags { - [key: string]: boolean + [key: string]: boolean; } export interface SeenDialogues { @@ -299,12 +328,12 @@ const systemShortKeys = { abilityAttr: "$a", passiveAttr: "$pa", valueReduction: "$vr", - classicWinCount: "$wc" + classicWinCount: "$wc", }; export class GameData { - public trainerId: integer; - public secretId: integer; + public trainerId: number; + public secretId: number; public gender: PlayerGender; @@ -323,8 +352,8 @@ export class GameData { public voucherUnlocks: VoucherUnlocks; public voucherCounts: VoucherCounts; public eggs: Egg[]; - public eggPity: integer[]; - public unlockPity: integer[]; + public eggPity: number[]; + public unlockPity: number[]; constructor() { this.loadSettings(); @@ -339,7 +368,7 @@ export class GameData { [Unlockables.ENDLESS_MODE]: false, [Unlockables.MINI_BLACK_HOLE]: false, [Unlockables.SPLICED_ENDLESS_MODE]: false, - [Unlockables.EVIOLITE]: false + [Unlockables.EVIOLITE]: false, }; this.achvUnlocks = {}; this.voucherUnlocks = {}; @@ -347,11 +376,11 @@ export class GameData { [VoucherType.REGULAR]: 0, [VoucherType.PLUS]: 0, [VoucherType.PREMIUM]: 0, - [VoucherType.GOLDEN]: 0 + [VoucherType.GOLDEN]: 0, }; this.eggs = []; - this.eggPity = [ 0, 0, 0, 0 ]; - this.unlockPity = [ 0, 0, 0, 0 ]; + this.eggPity = [0, 0, 0, 0]; + this.unlockPity = [0, 0, 0, 0]; this.initDexData(); this.initStarterData(); } @@ -372,7 +401,7 @@ export class GameData { gameVersion: globalScene.game.config.gameVersion, timestamp: new Date().getTime(), eggPity: this.eggPity.slice(0), - unlockPity: this.unlockPity.slice(0) + unlockPity: this.unlockPity.slice(0), }; } @@ -394,24 +423,25 @@ export class GameData { const data = this.getSystemSaveData(); const maxIntAttrValue = 0x80000000; - const systemData = JSON.stringify(data, (k: any, v: any) => typeof v === "bigint" ? v <= maxIntAttrValue ? Number(v) : v.toString() : v); + const systemData = JSON.stringify(data, (_k: any, v: any) => + typeof v === "bigint" ? (v <= maxIntAttrValue ? Number(v) : v.toString()) : v, + ); localStorage.setItem(`data_${loggedInUser?.username}`, encrypt(systemData, bypassLogin)); if (!bypassLogin) { - pokerogueApi.savedata.system.update({ clientSessionId }, systemData) - .then(error => { - globalScene.ui.savingIcon.hide(); - if (error) { - if (error.startsWith("session out of date")) { - globalScene.clearPhaseQueue(); - globalScene.unshiftPhase(new ReloadSessionPhase()); - } - console.error(error); - return resolve(false); + pokerogueApi.savedata.system.update({ clientSessionId }, systemData).then(error => { + globalScene.ui.savingIcon.hide(); + if (error) { + if (error.startsWith("session out of date")) { + globalScene.clearPhaseQueue(); + globalScene.unshiftPhase(new ReloadSessionPhase()); } - resolve(true); - }); + console.error(error); + return resolve(false); + } + resolve(true); + }); } else { globalScene.ui.savingIcon.hide(); @@ -429,23 +459,34 @@ export class GameData { } if (!bypassLogin) { - pokerogueApi.savedata.system.get({ clientSessionId }) - .then(saveDataOrErr => { - if (!saveDataOrErr || saveDataOrErr.length === 0 || saveDataOrErr[0] !== "{") { - if (saveDataOrErr?.startsWith("sql: no rows in result set")) { - globalScene.queueMessage("Save data could not be found. If this is a new account, you can safely ignore this message.", null, true); - return resolve(true); - } else if (saveDataOrErr?.includes("Too many connections")) { - globalScene.queueMessage("Too many people are trying to connect and the server is overloaded. Please try again later.", null, true); - return resolve(false); - } - console.error(saveDataOrErr); + pokerogueApi.savedata.system.get({ clientSessionId }).then(saveDataOrErr => { + if (!saveDataOrErr || saveDataOrErr.length === 0 || saveDataOrErr[0] !== "{") { + if (saveDataOrErr?.startsWith("sql: no rows in result set")) { + globalScene.queueMessage( + "Save data could not be found. If this is a new account, you can safely ignore this message.", + null, + true, + ); + return resolve(true); + } + if (saveDataOrErr?.includes("Too many connections")) { + globalScene.queueMessage( + "Too many people are trying to connect and the server is overloaded. Please try again later.", + null, + true, + ); return resolve(false); } + console.error(saveDataOrErr); + return resolve(false); + } - const cachedSystem = localStorage.getItem(`data_${loggedInUser?.username}`); - this.initSystem(saveDataOrErr, cachedSystem ? AES.decrypt(cachedSystem, saveKey).toString(enc.Utf8) : undefined).then(resolve); - }); + const cachedSystem = localStorage.getItem(`data_${loggedInUser?.username}`); + this.initSystem( + saveDataOrErr, + cachedSystem ? AES.decrypt(cachedSystem, saveKey).toString(enc.Utf8) : undefined, + ).then(resolve); + }); } else { this.initSystem(decrypt(localStorage.getItem(`data_${loggedInUser?.username}`)!, bypassLogin)).then(resolve); // TODO: is this bang correct? } @@ -506,7 +547,7 @@ export class GameData { this.migrateStarterAbilities(systemData, this.starterData); - const starterIds = Object.keys(this.starterData).map(s => parseInt(s) as Species); + const starterIds = Object.keys(this.starterData).map(s => Number.parseInt(s) as Species); for (const s of starterIds) { this.starterData[s].candyCount += systemData.dexData[s].caughtCount; this.starterData[s].candyCount += systemData.dexData[s].hatchedCount * 2; @@ -553,12 +594,10 @@ export class GameData { }); } - this.eggs = systemData.eggs - ? systemData.eggs.map(e => e.toEgg()) - : []; + this.eggs = systemData.eggs ? systemData.eggs.map(e => e.toEgg()) : []; - this.eggPity = systemData.eggPity ? systemData.eggPity.slice(0) : [ 0, 0, 0, 0 ]; - this.unlockPity = systemData.unlockPity ? systemData.unlockPity.slice(0) : [ 0, 0, 0, 0 ]; + this.eggPity = systemData.eggPity ? systemData.eggPity.slice(0) : [0, 0, 0, 0]; + this.unlockPity = systemData.unlockPity ? systemData.unlockPity.slice(0) : [0, 0, 0, 0]; this.dexData = Object.assign(this.dexData, systemData.dexData); this.consolidateDexData(this.dexData); @@ -588,7 +627,7 @@ export class GameData { const lsItemKey = `runHistoryData_${loggedInUser?.username}`; const lsItem = localStorage.getItem(lsItemKey); if (lsItem) { - const cachedResponse = lsItem; + const cachedResponse = lsItem; if (cachedResponse) { const runHistory = JSON.parse(decrypt(cachedResponse, bypassLogin)); return runHistory; @@ -602,25 +641,22 @@ export class GameData { return cachedRHData; } */ - } else { - localStorage.setItem(`runHistoryData_${loggedInUser?.username}`, ""); - return {}; - } - } else { - const lsItemKey = `runHistoryData_${loggedInUser?.username}`; - const lsItem = localStorage.getItem(lsItemKey); - if (lsItem) { - const cachedResponse = lsItem; - if (cachedResponse) { - const runHistory : RunHistoryData = JSON.parse(decrypt(cachedResponse, bypassLogin)); - return runHistory; - } - return {}; - } else { - localStorage.setItem(`runHistoryData_${loggedInUser?.username}`, ""); - return {}; } + localStorage.setItem(`runHistoryData_${loggedInUser?.username}`, ""); + return {}; } + const lsItemKey = `runHistoryData_${loggedInUser?.username}`; + const lsItem = localStorage.getItem(lsItemKey); + if (lsItem) { + const cachedResponse = lsItem; + if (cachedResponse) { + const runHistory: RunHistoryData = JSON.parse(decrypt(cachedResponse, bypassLogin)); + return runHistory; + } + return {}; + } + localStorage.setItem(`runHistoryData_${loggedInUser?.username}`, ""); + return {}; } /** @@ -629,25 +665,28 @@ export class GameData { * @param isVictory: result of the run * Arbitrary limit of 25 runs per player - Will delete runs, starting with the oldest one, if needed */ - async saveRunHistory(runEntry : SessionSaveData, isVictory: boolean): Promise { + async saveRunHistory(runEntry: SessionSaveData, isVictory: boolean): Promise { const runHistoryData = await this.getRunHistoryData(); // runHistoryData should always return run history or {} empty object let timestamps = Object.keys(runHistoryData).map(Number); // Arbitrary limit of 25 entries per user --> Can increase or decrease - while (timestamps.length >= RUN_HISTORY_LIMIT ) { - const oldestTimestamp = (Math.min.apply(Math, timestamps)).toString(); + while (timestamps.length >= RUN_HISTORY_LIMIT) { + const oldestTimestamp = Math.min.apply(Math, timestamps).toString(); delete runHistoryData[oldestTimestamp]; timestamps = Object.keys(runHistoryData).map(Number); } - const timestamp = (runEntry.timestamp).toString(); + const timestamp = runEntry.timestamp.toString(); runHistoryData[timestamp] = { entry: runEntry, isVictory: isVictory, isFavorite: false, }; - localStorage.setItem(`runHistoryData_${loggedInUser?.username}`, encrypt(JSON.stringify(runHistoryData), bypassLogin)); + localStorage.setItem( + `runHistoryData_${loggedInUser?.username}`, + encrypt(JSON.stringify(runHistoryData), bypassLogin), + ); /** * Networking Code DO NOT DELETE * @@ -669,7 +708,8 @@ export class GameData { return JSON.parse(dataStr, (k: string, v: any) => { if (k === "gameStats") { return new GameStats(v); - } else if (k === "eggs") { + } + if (k === "eggs") { const ret: EggData[] = []; if (v === null) { v = []; @@ -680,11 +720,11 @@ export class GameData { return ret; } - return k.endsWith("Attr") && ![ "natureAttr", "abilityAttr", "passiveAttr" ].includes(k) ? BigInt(v ?? 0) : v; + return k.endsWith("Attr") && !["natureAttr", "abilityAttr", "passiveAttr"].includes(k) ? BigInt(v ?? 0) : v; }) as SystemSaveData; } - convertSystemDataStr(dataStr: string, shorten: boolean = false): string { + convertSystemDataStr(dataStr: string, shorten = false): string { if (!shorten) { // Account for past key oversight dataStr = dataStr.replace(/\$pAttr/g, "$pa"); @@ -705,7 +745,9 @@ export class GameData { return true; } - const systemData = await pokerogueApi.savedata.system.verify({ clientSessionId }); + const systemData = await pokerogueApi.savedata.system.verify({ + clientSessionId, + }); if (systemData) { globalScene.clearPhaseQueue(); @@ -733,7 +775,7 @@ export class GameData { * @param valueIndex index of the setting's option * @returns true */ - public saveSetting(setting: string, valueIndex: integer): boolean { + public saveSetting(setting: string, valueIndex: number): boolean { let settings: object = {}; if (localStorage.hasOwnProperty("settings")) { settings = JSON.parse(localStorage.getItem("settings")!); // TODO: is this bang correct? @@ -757,17 +799,18 @@ export class GameData { * @returns `true` if the configurations are successfully saved. */ public saveMappingConfigs(deviceName: string, config): boolean { - const key = deviceName.toLowerCase(); // Convert the gamepad name to lowercase to use as a key - let mappingConfigs: object = {}; // Initialize an empty object to hold the mapping configurations - if (localStorage.hasOwnProperty("mappingConfigs")) {// Check if 'mappingConfigs' exists in localStorage + const key = deviceName.toLowerCase(); // Convert the gamepad name to lowercase to use as a key + let mappingConfigs: object = {}; // Initialize an empty object to hold the mapping configurations + if (localStorage.hasOwnProperty("mappingConfigs")) { + // Check if 'mappingConfigs' exists in localStorage mappingConfigs = JSON.parse(localStorage.getItem("mappingConfigs")!); // TODO: is this bang correct? - } // Parse the existing 'mappingConfigs' from localStorage + } // Parse the existing 'mappingConfigs' from localStorage if (!mappingConfigs[key]) { mappingConfigs[key] = {}; - } // If there is no configuration for the given key, create an empty object for it - mappingConfigs[key].custom = config.custom; // Assign the custom configuration to the mapping configuration for the given key - localStorage.setItem("mappingConfigs", JSON.stringify(mappingConfigs)); // Save the updated mapping configurations back to localStorage - return true; // Return true to indicate the operation was successful + } // If there is no configuration for the given key, create an empty object for it + mappingConfigs[key].custom = config.custom; // Assign the custom configuration to the mapping configuration for the given key + localStorage.setItem("mappingConfigs", JSON.stringify(mappingConfigs)); // Save the updated mapping configurations back to localStorage + return true; // Return true to indicate the operation was successful } /** @@ -781,23 +824,26 @@ export class GameData { * for the corresponding gamepad or device key. The method then returns `true` to indicate success. */ public loadMappingConfigs(): boolean { - if (!localStorage.hasOwnProperty("mappingConfigs")) {// Check if 'mappingConfigs' exists in localStorage + if (!localStorage.hasOwnProperty("mappingConfigs")) { + // Check if 'mappingConfigs' exists in localStorage return false; - } // If 'mappingConfigs' does not exist, return false + } // If 'mappingConfigs' does not exist, return false - const mappingConfigs = JSON.parse(localStorage.getItem("mappingConfigs")!); // Parse the existing 'mappingConfigs' from localStorage // TODO: is this bang correct? + const mappingConfigs = JSON.parse(localStorage.getItem("mappingConfigs")!); // Parse the existing 'mappingConfigs' from localStorage // TODO: is this bang correct? - for (const key of Object.keys(mappingConfigs)) {// Iterate over the keys of the mapping configurations + for (const key of Object.keys(mappingConfigs)) { + // Iterate over the keys of the mapping configurations globalScene.inputController.injectConfig(key, mappingConfigs[key]); - } // Inject each configuration into the input controller for the corresponding key + } // Inject each configuration into the input controller for the corresponding key - return true; // Return true to indicate the operation was successful + return true; // Return true to indicate the operation was successful } public resetMappingToFactory(): boolean { - if (!localStorage.hasOwnProperty("mappingConfigs")) {// Check if 'mappingConfigs' exists in localStorage + if (!localStorage.hasOwnProperty("mappingConfigs")) { + // Check if 'mappingConfigs' exists in localStorage return false; - } // If 'mappingConfigs' does not exist, return false + } // If 'mappingConfigs' does not exist, return false localStorage.removeItem("mappingConfigs"); globalScene.inputController.resetConfigs(); return true; // TODO: is `true` the correct return value? @@ -816,11 +862,18 @@ export class GameData { * to update the specified setting with the new value. Finally, it saves the updated settings back * to localStorage and returns `true` to indicate success. */ - public saveControlSetting(device: Device, localStoragePropertyName: string, setting: SettingGamepad|SettingKeyboard, settingDefaults, valueIndex: integer): boolean { - let settingsControls: object = {}; // Initialize an empty object to hold the gamepad settings + public saveControlSetting( + device: Device, + localStoragePropertyName: string, + setting: SettingGamepad | SettingKeyboard, + settingDefaults, + valueIndex: number, + ): boolean { + let settingsControls: object = {}; // Initialize an empty object to hold the gamepad settings - if (localStorage.hasOwnProperty(localStoragePropertyName)) { // Check if 'settingsControls' exists in localStorage - settingsControls = JSON.parse(localStorage.getItem(localStoragePropertyName)!); // Parse the existing 'settingsControls' from localStorage // TODO: is this bang correct? + if (localStorage.hasOwnProperty(localStoragePropertyName)) { + // Check if 'settingsControls' exists in localStorage + settingsControls = JSON.parse(localStorage.getItem(localStoragePropertyName)!); // Parse the existing 'settingsControls' from localStorage // TODO: is this bang correct? } if (device === Device.GAMEPAD) { @@ -829,15 +882,17 @@ export class GameData { setSettingKeyboard(setting as SettingKeyboard, valueIndex); } - Object.keys(settingDefaults).forEach(s => { // Iterate over the default gamepad settings - if (s === setting) {// If the current setting matches, update its value + Object.keys(settingDefaults).forEach(s => { + // Iterate over the default gamepad settings + if (s === setting) { + // If the current setting matches, update its value settingsControls[s] = valueIndex; } }); - localStorage.setItem(localStoragePropertyName, JSON.stringify(settingsControls)); // Save the updated gamepad settings back to localStorage + localStorage.setItem(localStoragePropertyName, JSON.stringify(settingsControls)); // Save the updated gamepad settings back to localStorage - return true; // Return true to indicate the operation was successful + return true; // Return true to indicate the operation was successful } /** @@ -863,7 +918,9 @@ export class GameData { } private loadGamepadSettings(): boolean { - Object.values(SettingGamepad).map(setting => setting as SettingGamepad).forEach(setting => setSettingGamepad(setting, settingGamepadDefaults[setting])); + Object.values(SettingGamepad) + .map(setting => setting as SettingGamepad) + .forEach(setting => setSettingGamepad(setting, settingGamepadDefaults[setting])); if (!localStorage.hasOwnProperty("settingsGamepad")) { return false; @@ -884,14 +941,16 @@ export class GameData { tutorials = JSON.parse(localStorage.getItem(key)!); // TODO: is this bang correct? } - Object.keys(Tutorial).map(t => t as Tutorial).forEach(t => { - const key = Tutorial[t]; - if (key === tutorial) { - tutorials[key] = flag; - } else { - tutorials[key] ??= false; - } - }); + Object.keys(Tutorial) + .map(t => t as Tutorial) + .forEach(t => { + const key = Tutorial[t]; + if (key === tutorial) { + tutorials[key] = flag; + } else { + tutorials[key] ??= false; + } + }); localStorage.setItem(key, JSON.stringify(tutorials)); @@ -901,7 +960,9 @@ export class GameData { public getTutorialFlags(): TutorialFlags { const key = getDataTypeKey(GameDataType.TUTORIALS); const ret: TutorialFlags = {}; - Object.values(Tutorial).map(tutorial => tutorial as Tutorial).forEach(tutorial => ret[Tutorial[tutorial]] = false); + Object.values(Tutorial) + .map(tutorial => tutorial as Tutorial) + .forEach(tutorial => (ret[Tutorial[tutorial]] = false)); if (!localStorage.hasOwnProperty(key)) { return ret; @@ -959,16 +1020,20 @@ export class GameData { score: globalScene.score, waveIndex: globalScene.currentBattle.waveIndex, battleType: globalScene.currentBattle.battleType, - trainer: globalScene.currentBattle.battleType === BattleType.TRAINER ? new TrainerData(globalScene.currentBattle.trainer) : null, + trainer: + globalScene.currentBattle.battleType === BattleType.TRAINER + ? new TrainerData(globalScene.currentBattle.trainer) + : null, gameVersion: globalScene.game.config.gameVersion, timestamp: new Date().getTime(), challenges: globalScene.gameMode.challenges.map(c => new ChallengeData(c)), mysteryEncounterType: globalScene.currentBattle.mysteryEncounter?.encounterType ?? -1, - mysteryEncounterSaveData: globalScene.mysteryEncounterSaveData + mysteryEncounterSaveData: globalScene.mysteryEncounterSaveData, + playerFaints: globalScene.arena.playerFaints, } as SessionSaveData; } - getSession(slotId: integer): Promise { + getSession(slotId: number): Promise { return new Promise(async (resolve, reject) => { if (slotId < 0) { return resolve(null); @@ -984,17 +1049,19 @@ export class GameData { }; if (!bypassLogin && !localStorage.getItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`)) { - pokerogueApi.savedata.session.get({ slot: slotId, clientSessionId }) - .then(async response => { - if (!response || response?.length === 0 || response?.[0] !== "{") { - console.error(response); - return resolve(null); - } + pokerogueApi.savedata.session.get({ slot: slotId, clientSessionId }).then(async response => { + if (!response || response?.length === 0 || response?.[0] !== "{") { + console.error(response); + return resolve(null); + } - localStorage.setItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`, encrypt(response, bypassLogin)); + localStorage.setItem( + `sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`, + encrypt(response, bypassLogin), + ); - await handleSessionData(response); - }); + await handleSessionData(response); + }); } else { const sessionData = localStorage.getItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`); if (sessionData) { @@ -1006,7 +1073,7 @@ export class GameData { }); } - loadSession(slotId: integer, sessionData?: SessionSaveData): Promise { + loadSession(slotId: number, sessionData?: SessionSaveData): Promise { return new Promise(async (resolve, reject) => { try { const initSessionFromData = async (sessionData: SessionSaveData) => { @@ -1056,18 +1123,31 @@ export class GameData { globalScene.mysteryEncounterSaveData = new MysteryEncounterSaveData(sessionData.mysteryEncounterSaveData); - globalScene.newArena(sessionData.arena.biome); + globalScene.newArena(sessionData.arena.biome, sessionData.playerFaints); const battleType = sessionData.battleType || 0; const trainerConfig = sessionData.trainer ? trainerConfigs[sessionData.trainer.trainerType] : null; - const mysteryEncounterType = sessionData.mysteryEncounterType !== -1 ? sessionData.mysteryEncounterType : undefined; - const battle = globalScene.newBattle(sessionData.waveIndex, battleType, sessionData.trainer, battleType === BattleType.TRAINER ? trainerConfig?.doubleOnly || sessionData.trainer?.variant === TrainerVariant.DOUBLE : sessionData.enemyParty.length > 1, mysteryEncounterType)!; // TODO: is this bang correct? + const mysteryEncounterType = + sessionData.mysteryEncounterType !== -1 ? sessionData.mysteryEncounterType : undefined; + const battle = globalScene.newBattle( + sessionData.waveIndex, + battleType, + sessionData.trainer, + battleType === BattleType.TRAINER + ? trainerConfig?.doubleOnly || sessionData.trainer?.variant === TrainerVariant.DOUBLE + : sessionData.enemyParty.length > 1, + mysteryEncounterType, + )!; // TODO: is this bang correct? battle.enemyLevels = sessionData.enemyParty.map(p => p.level); globalScene.arena.init(); sessionData.enemyParty.forEach((enemyData, e) => { - const enemyPokemon = enemyData.toPokemon(battleType, e, sessionData.trainer?.variant === TrainerVariant.DOUBLE) as EnemyPokemon; + const enemyPokemon = enemyData.toPokemon( + battleType, + e, + sessionData.trainer?.variant === TrainerVariant.DOUBLE, + ) as EnemyPokemon; battle.enemyParty[e] = enemyPokemon; if (battleType === BattleType.WILD) { battle.seenEnemyPartyMemberIds.add(enemyPokemon.id); @@ -1077,17 +1157,33 @@ export class GameData { }); globalScene.arena.weather = sessionData.arena.weather; - globalScene.arena.eventTarget.dispatchEvent(new WeatherChangedEvent(WeatherType.NONE, globalScene.arena.weather?.weatherType!, globalScene.arena.weather?.turnsLeft!)); // TODO: is this bang correct? + globalScene.arena.eventTarget.dispatchEvent( + new WeatherChangedEvent( + WeatherType.NONE, + globalScene.arena.weather?.weatherType!, + globalScene.arena.weather?.turnsLeft!, + ), + ); // TODO: is this bang correct? globalScene.arena.terrain = sessionData.arena.terrain; - globalScene.arena.eventTarget.dispatchEvent(new TerrainChangedEvent(TerrainType.NONE, globalScene.arena.terrain?.terrainType!, globalScene.arena.terrain?.turnsLeft!)); // TODO: is this bang correct? + globalScene.arena.eventTarget.dispatchEvent( + new TerrainChangedEvent( + TerrainType.NONE, + globalScene.arena.terrain?.terrainType!, + globalScene.arena.terrain?.turnsLeft!, + ), + ); // TODO: is this bang correct? + + globalScene.arena.playerTerasUsed = sessionData.arena.playerTerasUsed; globalScene.arena.tags = sessionData.arena.tags; if (globalScene.arena.tags) { for (const tag of globalScene.arena.tags) { if (tag instanceof ArenaTrapTag) { const { tagType, side, turnCount, layers, maxLayers } = tag as ArenaTrapTag; - globalScene.arena.eventTarget.dispatchEvent(new TagAddedEvent(tagType, side, turnCount, layers, maxLayers)); + globalScene.arena.eventTarget.dispatchEvent( + new TagAddedEvent(tagType, side, turnCount, layers, maxLayers), + ); } else { globalScene.arena.eventTarget.dispatchEvent(new TagAddedEvent(tag.tagType, tag.side, tag.turnCount)); } @@ -1137,7 +1233,7 @@ export class GameData { * @param slotId the slot to clear * @returns Promise with result `true` if the session was deleted successfully, `false` otherwise */ - deleteSession(slotId: integer): Promise { + deleteSession(slotId: number): Promise { return new Promise(resolve => { if (bypassLogin) { localStorage.removeItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`); @@ -1163,7 +1259,6 @@ export class GameData { localStorage.removeItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`); resolve(true); - } }); }); @@ -1184,53 +1279,52 @@ export class GameData { daily = JSON.parse(atob(localStorage.getItem("daily")!)); // TODO: is this bang correct? if (daily.includes(seed)) { return resolve(false); - } else { - daily.push(seed); - localStorage.setItem("daily", btoa(JSON.stringify(daily))); - return resolve(true); } - } else { daily.push(seed); localStorage.setItem("daily", btoa(JSON.stringify(daily))); return resolve(true); } - } else { + daily.push(seed); + localStorage.setItem("daily", btoa(JSON.stringify(daily))); return resolve(true); } + return resolve(true); }); } - /** * Attempt to clear session data after the end of a run * After session data is removed, attempt to update user info so the menu updates * To delete an unfinished run instead, use {@linkcode deleteSession} */ - async tryClearSession(slotId: integer): Promise<[success: boolean, newClear: boolean]> { - let result: [boolean, boolean] = [ false, false ]; + async tryClearSession(slotId: number): Promise<[success: boolean, newClear: boolean]> { + let result: [boolean, boolean] = [false, false]; if (bypassLogin) { localStorage.removeItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`); - result = [ true, true ]; + result = [true, true]; } else { const sessionData = this.getSessionSaveData(); const { trainerId } = this; - const jsonResponse = await pokerogueApi.savedata.session.clear({ slot: slotId, trainerId, clientSessionId }, sessionData); + const jsonResponse = await pokerogueApi.savedata.session.clear( + { slot: slotId, trainerId, clientSessionId }, + sessionData, + ); if (!jsonResponse?.error) { - result = [ true, jsonResponse?.success ?? false ]; + result = [true, jsonResponse?.success ?? false]; if (loggedInUser) { loggedInUser!.lastSessionSlot = -1; } localStorage.removeItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`); } else { - if (jsonResponse && jsonResponse.error?.startsWith("session out of date")) { + if (jsonResponse?.error?.startsWith("session out of date")) { globalScene.clearPhaseQueue(); globalScene.unshiftPhase(new ReloadSessionPhase()); } console.error(jsonResponse); - result = [ false, false ]; + result = [false, false]; } } @@ -1263,10 +1357,14 @@ export class GameData { v = []; } for (const md of v) { - if (md?.className === "ExpBalanceModifier") { // Temporarily limit EXP Balance until it gets reworked + if (md?.className === "ExpBalanceModifier") { + // Temporarily limit EXP Balance until it gets reworked md.stackCount = Math.min(md.stackCount, 4); } - if (md instanceof Modifier.EnemyAttackStatusEffectChanceModifier && md.effect === StatusEffect.FREEZE || md.effect === StatusEffect.SLEEP) { + if ( + (md instanceof Modifier.EnemyAttackStatusEffectChanceModifier && md.effect === StatusEffect.FREEZE) || + md.effect === StatusEffect.SLEEP + ) { continue; } ret.push(new PersistentModifierData(md, player)); @@ -1305,7 +1403,7 @@ export class GameData { return sessionData; } - saveAll(skipVerification: boolean = false, sync: boolean = false, useCachedSession: boolean = false, useCachedSystem: boolean = false): Promise { + saveAll(skipVerification = false, sync = false, useCachedSession = false, useCachedSystem = false): Promise { return new Promise(resolve => { Utils.executeIf(!skipVerification, updateUserInfo).then(success => { if (success !== null && !success) { @@ -1314,43 +1412,62 @@ export class GameData { if (sync) { globalScene.ui.savingIcon.show(); } - const sessionData = useCachedSession ? - this.parseSessionData(decrypt(localStorage.getItem(`sessionData${globalScene.sessionSlotId ? globalScene.sessionSlotId : ""}_${loggedInUser?.username}`)!, bypassLogin)) // TODO: is this bang correct? + const sessionData = useCachedSession + ? this.parseSessionData( + decrypt( + localStorage.getItem( + `sessionData${globalScene.sessionSlotId ? globalScene.sessionSlotId : ""}_${loggedInUser?.username}`, + )!, + bypassLogin, + ), + ) // TODO: is this bang correct? : this.getSessionSaveData(); const maxIntAttrValue = 0x80000000; - const systemData = useCachedSystem ? this.parseSystemData(decrypt(localStorage.getItem(`data_${loggedInUser?.username}`)!, bypassLogin)) : this.getSystemSaveData(); // TODO: is this bang correct? + const systemData = useCachedSystem + ? this.parseSystemData(decrypt(localStorage.getItem(`data_${loggedInUser?.username}`)!, bypassLogin)) + : this.getSystemSaveData(); // TODO: is this bang correct? const request = { system: systemData, session: sessionData, sessionSlotId: globalScene.sessionSlotId, - clientSessionId: clientSessionId + clientSessionId: clientSessionId, }; - localStorage.setItem(`data_${loggedInUser?.username}`, encrypt(JSON.stringify(systemData, (k: any, v: any) => typeof v === "bigint" ? v <= maxIntAttrValue ? Number(v) : v.toString() : v), bypassLogin)); + localStorage.setItem( + `data_${loggedInUser?.username}`, + encrypt( + JSON.stringify(systemData, (_k: any, v: any) => + typeof v === "bigint" ? (v <= maxIntAttrValue ? Number(v) : v.toString()) : v, + ), + bypassLogin, + ), + ); - localStorage.setItem(`sessionData${globalScene.sessionSlotId ? globalScene.sessionSlotId : ""}_${loggedInUser?.username}`, encrypt(JSON.stringify(sessionData), bypassLogin)); + localStorage.setItem( + `sessionData${globalScene.sessionSlotId ? globalScene.sessionSlotId : ""}_${loggedInUser?.username}`, + encrypt(JSON.stringify(sessionData), bypassLogin), + ); console.debug("Session data saved"); if (!bypassLogin && sync) { - pokerogueApi.savedata.updateAll(request) - .then(error => { - if (sync) { - globalScene.lastSavePlayTime = 0; - globalScene.ui.savingIcon.hide(); + pokerogueApi.savedata.updateAll(request).then(error => { + if (sync) { + globalScene.lastSavePlayTime = 0; + globalScene.ui.savingIcon.hide(); + } + if (error) { + if (error.startsWith("session out of date")) { + globalScene.clearPhaseQueue(); + globalScene.unshiftPhase(new ReloadSessionPhase()); } - if (error) { - if (error.startsWith("session out of date")) { - globalScene.clearPhaseQueue(); - globalScene.unshiftPhase(new ReloadSessionPhase()); - } - console.error(error); - return resolve(false); - } - resolve(true); - }); + console.error(error); + return resolve(false); + } + resolve(true); + }); } else { this.verify().then(success => { globalScene.ui.savingIcon.hide(); @@ -1361,7 +1478,7 @@ export class GameData { }); } - public tryExportData(dataType: GameDataType, slotId: integer = 0): Promise { + public tryExportData(dataType: GameDataType, slotId = 0): Promise { return new Promise(resolve => { const dataKey: string = `${getDataTypeKey(dataType, slotId)}_${loggedInUser?.username}`; const handleData = (dataStr: string) => { @@ -1371,7 +1488,9 @@ export class GameData { break; } const encryptedData = AES.encrypt(dataStr, saveKey); - const blob = new Blob([ encryptedData.toString() ], { type: "text/json" }); + const blob = new Blob([encryptedData.toString()], { + type: "text/json", + }); const link = document.createElement("a"); link.href = window.URL.createObjectURL(blob); link.download = `${dataKey}.prsv`; @@ -1384,7 +1503,10 @@ export class GameData { if (dataType === GameDataType.SYSTEM) { promise = pokerogueApi.savedata.system.get({ clientSessionId }); } else if (dataType === GameDataType.SESSION) { - promise = pokerogueApi.savedata.session.get({ slot: slotId, clientSessionId }); + promise = pokerogueApi.savedata.session.get({ + slot: slotId, + clientSessionId, + }); } promise.then(response => { @@ -1407,7 +1529,7 @@ export class GameData { }); } - public importData(dataType: GameDataType, slotId: integer = 0): void { + public importData(dataType: GameDataType, slotId = 0): void { const dataKey = `${getDataTypeKey(dataType, slotId)}_${loggedInUser?.username}`; let saveFile: any = document.getElementById("saveFile"); @@ -1420,91 +1542,120 @@ export class GameData { saveFile.type = "file"; saveFile.accept = ".prsv"; saveFile.style.display = "none"; - saveFile.addEventListener("change", - e => { - const reader = new FileReader(); + saveFile.addEventListener("change", e => { + const reader = new FileReader(); - reader.onload = (_ => { - return e => { - let dataName: string; - let dataStr = AES.decrypt(e.target?.result?.toString()!, saveKey).toString(enc.Utf8); // TODO: is this bang correct? - let valid = false; - try { - dataName = GameDataType[dataType].toLowerCase(); - switch (dataType) { - case GameDataType.SYSTEM: - dataStr = this.convertSystemDataStr(dataStr); - const systemData = this.parseSystemData(dataStr); - valid = !!systemData.dexData && !!systemData.timestamp; - break; - case GameDataType.SESSION: - const sessionData = this.parseSessionData(dataStr); - valid = !!sessionData.party && !!sessionData.enemyParty && !!sessionData.timestamp; - break; - case GameDataType.RUN_HISTORY: - const data = JSON.parse(dataStr); - const keys = Object.keys(data); - dataName = i18next.t("menuUiHandler:RUN_HISTORY").toLowerCase(); - keys.forEach((key) => { - const entryKeys = Object.keys(data[key]); - valid = [ "isFavorite", "isVictory", "entry" ].every(v => entryKeys.includes(v)) && entryKeys.length === 3; - }); - break; - case GameDataType.SETTINGS: - case GameDataType.TUTORIALS: - valid = true; - break; - } - } catch (ex) { - console.error(ex); + reader.onload = (_ => { + return e => { + let dataName: string; + let dataStr = AES.decrypt(e.target?.result?.toString()!, saveKey).toString(enc.Utf8); // TODO: is this bang correct? + let valid = false; + try { + dataName = GameDataType[dataType].toLowerCase(); + switch (dataType) { + case GameDataType.SYSTEM: + dataStr = this.convertSystemDataStr(dataStr); + const systemData = this.parseSystemData(dataStr); + valid = !!systemData.dexData && !!systemData.timestamp; + break; + case GameDataType.SESSION: + const sessionData = this.parseSessionData(dataStr); + valid = !!sessionData.party && !!sessionData.enemyParty && !!sessionData.timestamp; + break; + case GameDataType.RUN_HISTORY: + const data = JSON.parse(dataStr); + const keys = Object.keys(data); + dataName = i18next.t("menuUiHandler:RUN_HISTORY").toLowerCase(); + keys.forEach(key => { + const entryKeys = Object.keys(data[key]); + valid = + ["isFavorite", "isVictory", "entry"].every(v => entryKeys.includes(v)) && entryKeys.length === 3; + }); + break; + case GameDataType.SETTINGS: + case GameDataType.TUTORIALS: + valid = true; + break; } + } catch (ex) { + console.error(ex); + } - const displayError = (error: string) => globalScene.ui.showText(error, null, () => globalScene.ui.showText("", 0), Utils.fixedInt(1500)); - dataName = dataName!; // tell TS compiler that dataName is defined! + const displayError = (error: string) => + globalScene.ui.showText(error, null, () => globalScene.ui.showText("", 0), Utils.fixedInt(1500)); + dataName = dataName!; // tell TS compiler that dataName is defined! - if (!valid) { - return globalScene.ui.showText(`Your ${dataName} data could not be loaded. It may be corrupted.`, null, () => globalScene.ui.showText("", 0), Utils.fixedInt(1500)); - } + if (!valid) { + return globalScene.ui.showText( + `Your ${dataName} data could not be loaded. It may be corrupted.`, + null, + () => globalScene.ui.showText("", 0), + Utils.fixedInt(1500), + ); + } - globalScene.ui.showText(`Your ${dataName} data will be overridden and the page will reload. Proceed?`, null, () => { - globalScene.ui.setOverlayMode(Mode.CONFIRM, () => { - localStorage.setItem(dataKey, encrypt(dataStr, bypassLogin)); + globalScene.ui.showText( + `Your ${dataName} data will be overridden and the page will reload. Proceed?`, + null, + () => { + globalScene.ui.setOverlayMode( + Mode.CONFIRM, + () => { + localStorage.setItem(dataKey, encrypt(dataStr, bypassLogin)); - if (!bypassLogin && dataType < GameDataType.SETTINGS) { - updateUserInfo().then(success => { - if (!success[0]) { - return displayError(`Could not contact the server. Your ${dataName} data could not be imported.`); - } - const { trainerId, secretId } = this; - let updatePromise: Promise; - if (dataType === GameDataType.SESSION) { - updatePromise = pokerogueApi.savedata.session.update({ slot: slotId, trainerId, secretId, clientSessionId }, dataStr); - } else { - updatePromise = pokerogueApi.savedata.system.update({ trainerId, secretId, clientSessionId }, dataStr); - } - updatePromise - .then(error => { + if (!bypassLogin && dataType < GameDataType.SETTINGS) { + updateUserInfo().then(success => { + if (!success[0]) { + return displayError( + `Could not contact the server. Your ${dataName} data could not be imported.`, + ); + } + const { trainerId, secretId } = this; + let updatePromise: Promise; + if (dataType === GameDataType.SESSION) { + updatePromise = pokerogueApi.savedata.session.update( + { + slot: slotId, + trainerId, + secretId, + clientSessionId, + }, + dataStr, + ); + } else { + updatePromise = pokerogueApi.savedata.system.update( + { trainerId, secretId, clientSessionId }, + dataStr, + ); + } + updatePromise.then(error => { if (error) { console.error(error); - return displayError(`An error occurred while updating ${dataName} data. Please contact the administrator.`); + return displayError( + `An error occurred while updating ${dataName} data. Please contact the administrator.`, + ); } - window.location = window.location; + window.location.reload(); }); - }); - } else { - window.location = window.location; - } - }, () => { - globalScene.ui.revertMode(); - globalScene.ui.showText("", 0); - }, false, -98); - }); - }; - })((e.target as any).files[0]); + }); + } else { + window.location.reload(); + } + }, + () => { + globalScene.ui.revertMode(); + globalScene.ui.showText("", 0); + }, + false, + -98, + ); + }, + ); + }; + })((e.target as any).files[0]); - reader.readAsText((e.target as any).files[0]); - } - ); + reader.readAsText((e.target as any).files[0]); + }); saveFile.click(); } @@ -1513,20 +1664,31 @@ export class GameData { for (const species of allSpecies) { data[species.speciesId] = { - seenAttr: 0n, caughtAttr: 0n, natureAttr: 0, seenCount: 0, caughtCount: 0, hatchedCount: 0, ivs: [ 0, 0, 0, 0, 0, 0 ] + seenAttr: 0n, + caughtAttr: 0n, + natureAttr: 0, + seenCount: 0, + caughtCount: 0, + hatchedCount: 0, + ivs: [0, 0, 0, 0, 0, 0], }; } - const defaultStarterAttr = DexAttr.NON_SHINY | DexAttr.MALE | DexAttr.FEMALE | DexAttr.DEFAULT_VARIANT | DexAttr.DEFAULT_FORM; + const defaultStarterAttr = + DexAttr.NON_SHINY | DexAttr.MALE | DexAttr.FEMALE | DexAttr.DEFAULT_VARIANT | DexAttr.DEFAULT_FORM; const defaultStarterNatures: Nature[] = []; - globalScene.executeWithSeedOffset(() => { - const neutralNatures = [ Nature.HARDY, Nature.DOCILE, Nature.SERIOUS, Nature.BASHFUL, Nature.QUIRKY ]; - for (let s = 0; s < defaultStarterSpecies.length; s++) { - defaultStarterNatures.push(Utils.randSeedItem(neutralNatures)); - } - }, 0, "default"); + globalScene.executeWithSeedOffset( + () => { + const neutralNatures = [Nature.HARDY, Nature.DOCILE, Nature.SERIOUS, Nature.BASHFUL, Nature.QUIRKY]; + for (let s = 0; s < defaultStarterSpecies.length; s++) { + defaultStarterNatures.push(Utils.randSeedItem(neutralNatures)); + } + }, + 0, + "default", + ); for (let ds = 0; ds < defaultStarterSpecies.length; ds++) { const entry = data[defaultStarterSpecies[ds]] as DexEntry; @@ -1545,7 +1707,7 @@ export class GameData { private initStarterData(): void { const starterData: StarterData = {}; - const starterSpeciesIds = Object.keys(speciesStarterCosts).map(k => parseInt(k) as Species); + const starterSpeciesIds = Object.keys(speciesStarterCosts).map(k => Number.parseInt(k) as Species); for (const speciesId of starterSpeciesIds) { starterData[speciesId] = { @@ -1556,16 +1718,19 @@ export class GameData { abilityAttr: defaultStarterSpecies.includes(speciesId) ? AbilityAttr.ABILITY_1 : 0, passiveAttr: 0, valueReduction: 0, - classicWinCount: 0 + classicWinCount: 0, }; } this.starterData = starterData; } - setPokemonSeen(pokemon: Pokemon, incrementCount: boolean = true, trainer: boolean = false): void { + setPokemonSeen(pokemon: Pokemon, incrementCount = true, trainer = false): void { // Some Mystery Encounters block updates to these stats - if (globalScene.currentBattle?.isBattleMysteryEncounter() && globalScene.currentBattle.mysteryEncounter?.preventGameStatsUpdates) { + if ( + globalScene.currentBattle?.isBattleMysteryEncounter() && + globalScene.currentBattle.mysteryEncounter?.preventGameStatsUpdates + ) { return; } const dexEntry = this.dexData[pokemon.species.speciesId]; @@ -1594,15 +1759,14 @@ export class GameData { * @param showMessage * @returns `true` if Pokemon catch unlocked a new starter, `false` if Pokemon catch did not unlock a starter */ - setPokemonCaught(pokemon: Pokemon, incrementCount: boolean = true, fromEgg: boolean = false, showMessage: boolean = true): Promise { + setPokemonCaught(pokemon: Pokemon, incrementCount = true, fromEgg = false, showMessage = true): Promise { // If incrementCount === false (not a catch scenario), only update the pokemon's dex data if the Pokemon has already been marked as caught in dex // Prevents form changes, nature changes, etc. from unintentionally updating the dex data of a "rental" pokemon const speciesRootForm = pokemon.species.getRootSpeciesId(); if (!incrementCount && !globalScene.gameData.dexData[speciesRootForm].caughtAttr) { return Promise.resolve(false); - } else { - return this.setPokemonSpeciesCaught(pokemon, pokemon.species, incrementCount, fromEgg, showMessage); } + return this.setPokemonSpeciesCaught(pokemon, pokemon.species, incrementCount, fromEgg, showMessage); } /** @@ -1614,22 +1778,57 @@ export class GameData { * @param showMessage * @returns `true` if Pokemon catch unlocked a new starter, `false` if Pokemon catch did not unlock a starter */ - setPokemonSpeciesCaught(pokemon: Pokemon, species: PokemonSpecies, incrementCount: boolean = true, fromEgg: boolean = false, showMessage: boolean = true): Promise { + setPokemonSpeciesCaught( + pokemon: Pokemon, + species: PokemonSpecies, + incrementCount = true, + fromEgg = false, + showMessage = true, + ): Promise { return new Promise(resolve => { const dexEntry = this.dexData[species.speciesId]; const caughtAttr = dexEntry.caughtAttr; const formIndex = pokemon.formIndex; const dexAttr = pokemon.getDexAttr(); - pokemon.formIndex = formIndex; // Mark as caught dexEntry.caughtAttr |= dexAttr; + // If the caught form is a battleform, we want to also mark the base form as caught. + // This snippet assumes that the base form has formIndex equal to 0, which should be + // always true except for the case of Urshifu. + const formKey = pokemon.getFormKey(); + if (formIndex > 0) { + if (pokemon.species.speciesId === Species.URSHIFU) { + if (formIndex === 2) { + dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(0); + } else if (formIndex === 3) { + dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(1); + } + } else if (pokemon.species.speciesId === Species.ZYGARDE) { + if (formIndex === 4) { + dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(2); + } else if (formIndex === 5) { + dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(3); + } + } else { + const allFormChanges = pokemonFormChanges.hasOwnProperty(species.speciesId) + ? pokemonFormChanges[species.speciesId] + : []; + const toCurrentFormChanges = allFormChanges.filter(f => f.formKey === formKey); + if (toCurrentFormChanges.length > 0) { + // Needs to do this or Castform can unlock the wrong form, etc. + dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(0); + } + } + } + // Unlock ability if (speciesStarterCosts.hasOwnProperty(species.speciesId)) { - this.starterData[species.speciesId].abilityAttr |= pokemon.abilityIndex !== 1 || pokemon.species.ability2 - ? 1 << pokemon.abilityIndex - : AbilityAttr.ABILITY_HIDDEN; + this.starterData[species.speciesId].abilityAttr |= + pokemon.abilityIndex !== 1 || pokemon.species.ability2 + ? 1 << pokemon.abilityIndex + : AbilityAttr.ABILITY_HIDDEN; } // Unlock nature @@ -1669,14 +1868,23 @@ export class GameData { } if (!hasPrevolution && (!globalScene.gameMode.isDaily || hasNewAttr || fromEgg)) { - this.addStarterCandy(species, (1 * (pokemon.isShiny() ? 5 * (1 << (pokemon.variant ?? 0)) : 1)) * (fromEgg || pokemon.isBoss() ? 2 : 1)); + this.addStarterCandy( + species, + 1 * (pokemon.isShiny() ? 5 * (1 << (pokemon.variant ?? 0)) : 1) * (fromEgg || pokemon.isBoss() ? 2 : 1), + ); } } const checkPrevolution = (newStarter: boolean) => { if (hasPrevolution) { const prevolutionSpecies = pokemonPrevolutions[species.speciesId]; - this.setPokemonSpeciesCaught(pokemon, getPokemonSpecies(prevolutionSpecies), incrementCount, fromEgg, showMessage).then(result => resolve(result)); + this.setPokemonSpeciesCaught( + pokemon, + getPokemonSpecies(prevolutionSpecies), + incrementCount, + fromEgg, + showMessage, + ).then(result => resolve(result)); } else { resolve(newStarter); } @@ -1688,14 +1896,20 @@ export class GameData { return; } globalScene.playSound("level_up_fanfare"); - globalScene.ui.showText(i18next.t("battle:addedAsAStarter", { pokemonName: species.name }), null, () => checkPrevolution(true), null, true); + globalScene.ui.showText( + i18next.t("battle:addedAsAStarter", { pokemonName: species.name }), + null, + () => checkPrevolution(true), + null, + true, + ); } else { checkPrevolution(false); } }); } - incrementRibbonCount(species: PokemonSpecies, forStarter: boolean = false): integer { + incrementRibbonCount(species: PokemonSpecies, forStarter = false): number { const speciesIdToIncrement: Species = species.getRootSpeciesId(forStarter); if (!this.starterData[speciesIdToIncrement].classicWinCount) { @@ -1706,7 +1920,7 @@ export class GameData { globalScene.gameData.gameStats.ribbonsOwned++; } - const ribbonsInStats: integer = globalScene.gameData.gameStats.ribbonsOwned; + const ribbonsInStats: number = globalScene.gameData.gameStats.ribbonsOwned; if (ribbonsInStats >= 100) { globalScene.validateAchv(achvs._100_RIBBONS); @@ -1733,7 +1947,7 @@ export class GameData { * @param species * @param count */ - addStarterCandy(species: PokemonSpecies, count: integer): void { + addStarterCandy(species: PokemonSpecies, count: number): void { // Only gain candies if the Pokemon has already been marked as caught in dex (ignore "rental" pokemon) const speciesRootForm = species.getRootSpeciesId(); if (globalScene.gameData.dexData[speciesRootForm].caughtAttr) { @@ -1749,7 +1963,12 @@ export class GameData { * @param showMessage Default true. If true, will display message for unlocked egg move * @param prependSpeciesToMessage Default false. If true, will change message from "X Egg Move Unlocked!" to "Bulbasaur X Egg Move Unlocked!" */ - setEggMoveUnlocked(species: PokemonSpecies, eggMoveIndex: integer, showMessage: boolean = true, prependSpeciesToMessage: boolean = false): Promise { + setEggMoveUnlocked( + species: PokemonSpecies, + eggMoveIndex: number, + showMessage = true, + prependSpeciesToMessage = false, + ): Promise { return new Promise(resolve => { const speciesId = species.speciesId; if (!speciesEggMoves.hasOwnProperty(speciesId) || !speciesEggMoves[speciesId][eggMoveIndex]) { @@ -1776,7 +1995,10 @@ export class GameData { globalScene.playSound("level_up_fanfare"); const moveName = allMoves[speciesEggMoves[speciesId][eggMoveIndex]].name; let message = prependSpeciesToMessage ? species.getName() + " " : ""; - message += eggMoveIndex === 3 ? i18next.t("egg:rareEggMoveUnlock", { moveName: moveName }) : i18next.t("egg:eggMoveUnlock", { moveName: moveName }); + message += + eggMoveIndex === 3 + ? i18next.t("egg:rareEggMoveUnlock", { moveName: moveName }) + : i18next.t("egg:eggMoveUnlock", { moveName: moveName }); globalScene.ui.showText(message, null, () => resolve(true), null, true); }); @@ -1808,7 +2030,7 @@ export class GameData { _unlockSpeciesNature(species.speciesId); } - updateSpeciesDexIvs(speciesId: Species, ivs: integer[]): void { + updateSpeciesDexIvs(speciesId: Species, ivs: number[]): void { let dexEntry: DexEntry; do { dexEntry = globalScene.gameData.dexData[speciesId]; @@ -1824,7 +2046,7 @@ export class GameData { } while (pokemonPrevolutions.hasOwnProperty(speciesId) && (speciesId = pokemonPrevolutions[speciesId])); } - getSpeciesCount(dexEntryPredicate: (entry: DexEntry) => boolean): integer { + getSpeciesCount(dexEntryPredicate: (entry: DexEntry) => boolean): number { const dexKeys = Object.keys(this.dexData); let speciesCount = 0; for (const s of dexKeys) { @@ -1835,7 +2057,7 @@ export class GameData { return speciesCount; } - getStarterCount(dexEntryPredicate: (entry: DexEntry) => boolean): integer { + getStarterCount(dexEntryPredicate: (entry: DexEntry) => boolean): number { const starterKeys = Object.keys(speciesStarterCosts); let starterCount = 0; for (const s of starterKeys) { @@ -1847,7 +2069,7 @@ export class GameData { return starterCount; } - getSpeciesDefaultDexAttr(species: PokemonSpecies, _forSeen: boolean = false, optimistic: boolean = false): bigint { + getSpeciesDefaultDexAttr(species: PokemonSpecies, _forSeen = false, optimistic = false): bigint { let ret = 0n; const dexEntry = this.dexData[species.speciesId]; const attr = dexEntry.caughtAttr; @@ -1868,7 +2090,7 @@ export class GameData { } } else { // Default to non shiny. Fallback to shiny if it's the only thing that's unlocked - ret |= (attr & DexAttr.NON_SHINY || !(attr & DexAttr.SHINY)) ? DexAttr.NON_SHINY : DexAttr.SHINY; + ret |= attr & DexAttr.NON_SHINY || !(attr & DexAttr.SHINY) ? DexAttr.NON_SHINY : DexAttr.SHINY; if (attr & DexAttr.DEFAULT_VARIANT) { ret |= DexAttr.DEFAULT_VARIANT; @@ -1885,7 +2107,7 @@ export class GameData { return ret; } - getSpeciesDexAttrProps(species: PokemonSpecies, dexAttr: bigint): DexAttrProps { + getSpeciesDexAttrProps(_species: PokemonSpecies, dexAttr: bigint): DexAttrProps { const shiny = !(dexAttr & DexAttr.NON_SHINY); const female = !(dexAttr & DexAttr.MALE); let variant: Variant = 0; @@ -1902,11 +2124,11 @@ export class GameData { shiny, female, variant, - formIndex + formIndex, }; } - getStarterSpeciesDefaultAbilityIndex(species: PokemonSpecies): integer { + getStarterSpeciesDefaultAbilityIndex(species: PokemonSpecies): number { const abilityAttr = this.starterData[species.speciesId].abilityAttr; return abilityAttr & AbilityAttr.ABILITY_1 ? 0 : !species.ability2 || abilityAttr & AbilityAttr.ABILITY_2 ? 1 : 2; } @@ -1921,15 +2143,15 @@ export class GameData { return 0 as Nature; } - getSpeciesDefaultNatureAttr(species: PokemonSpecies): integer { - return 1 << (this.getSpeciesDefaultNature(species)); + getSpeciesDefaultNatureAttr(species: PokemonSpecies): number { + return 1 << this.getSpeciesDefaultNature(species); } - getDexAttrLuck(dexAttr: bigint): integer { - return dexAttr & DexAttr.SHINY ? dexAttr & DexAttr.VARIANT_3 ? 3 : dexAttr & DexAttr.VARIANT_2 ? 2 : 1 : 0; + getDexAttrLuck(dexAttr: bigint): number { + return dexAttr & DexAttr.SHINY ? (dexAttr & DexAttr.VARIANT_3 ? 3 : dexAttr & DexAttr.VARIANT_2 ? 2 : 1) : 0; } - getNaturesForAttr(natureAttr: integer = 0): Nature[] { + getNaturesForAttr(natureAttr = 0): Nature[] { const ret: Nature[] = []; for (let n = 0; n < 25; n++) { if (natureAttr & (1 << (n + 1))) { @@ -1962,7 +2184,7 @@ export class GameData { return cost.value; } - getFormIndex(attr: bigint): integer { + getFormIndex(attr: bigint): number { if (!attr || attr < DexAttr.DEFAULT_FORM) { return 0; } @@ -1973,7 +2195,7 @@ export class GameData { return f; } - getFormAttr(formIndex: integer): bigint { + getFormAttr(formIndex: number): bigint { return BigInt(1) << BigInt(7 + formIndex); } @@ -1984,20 +2206,21 @@ export class GameData { entry.hatchedCount = 0; } if (!entry.hasOwnProperty("natureAttr") || (entry.caughtAttr && !entry.natureAttr)) { - entry.natureAttr = this.defaultDexData?.[k].natureAttr || (1 << Utils.randInt(25, 1)); + entry.natureAttr = this.defaultDexData?.[k].natureAttr || 1 << Utils.randInt(25, 1); } } } migrateStarterAbilities(systemData: SystemSaveData, initialStarterData?: StarterData): void { - const starterIds = Object.keys(this.starterData).map(s => parseInt(s) as Species); + const starterIds = Object.keys(this.starterData).map(s => Number.parseInt(s) as Species); const starterData = initialStarterData || systemData.starterData; const dexData = systemData.dexData; for (const s of starterIds) { const dexAttr = dexData[s].caughtAttr; - starterData[s].abilityAttr = (dexAttr & DexAttr.DEFAULT_VARIANT ? AbilityAttr.ABILITY_1 : 0) - | (dexAttr & DexAttr.VARIANT_2 ? AbilityAttr.ABILITY_2 : 0) - | (dexAttr & DexAttr.VARIANT_3 ? AbilityAttr.ABILITY_HIDDEN : 0); + starterData[s].abilityAttr = + (dexAttr & DexAttr.DEFAULT_VARIANT ? AbilityAttr.ABILITY_1 : 0) | + (dexAttr & DexAttr.VARIANT_2 ? AbilityAttr.ABILITY_2 : 0) | + (dexAttr & DexAttr.VARIANT_3 ? AbilityAttr.ABILITY_HIDDEN : 0); if (dexAttr) { if (!(dexAttr & DexAttr.DEFAULT_VARIANT)) { dexData[s].caughtAttr ^= DexAttr.DEFAULT_VARIANT; diff --git a/src/system/game-speed.ts b/src/system/game-speed.ts index 4b34a04b5f8..e2156c03728 100644 --- a/src/system/game-speed.ts +++ b/src/system/game-speed.ts @@ -15,7 +15,7 @@ export function initGameSpeed() { if (value instanceof Utils.FixedInt) { return (value as Utils.FixedInt).value; } - return thisArg.gameSpeed === 1 ? value : Math.ceil(value /= thisArg.gameSpeed); + return thisArg.gameSpeed === 1 ? value : Math.ceil((value /= thisArg.gameSpeed)); }; const originalAddEvent = this.time.addEvent; @@ -23,15 +23,21 @@ export function initGameSpeed() { if (!(config instanceof Phaser.Time.TimerEvent) && config.delay) { config.delay = transformValue(config.delay); } - return originalAddEvent.apply(this, [ config ]); + return originalAddEvent.apply(this, [config]); }; const originalTweensAdd = this.tweens.add; - this.tweens.add = function (config: Phaser.Types.Tweens.TweenBuilderConfig | Phaser.Types.Tweens.TweenChainBuilderConfig | Phaser.Tweens.Tween | Phaser.Tweens.TweenChain) { + this.tweens.add = function ( + config: + | Phaser.Types.Tweens.TweenBuilderConfig + | Phaser.Types.Tweens.TweenChainBuilderConfig + | Phaser.Tweens.Tween + | Phaser.Tweens.TweenChain, + ) { if (config.loopDelay) { config.loopDelay = transformValue(config.loopDelay as number); } - if (!(config instanceof Phaser.Tweens.TweenChain) ) { + if (!(config instanceof Phaser.Tweens.TweenChain)) { if (config.duration) { config.duration = transformValue(config.duration); } @@ -48,12 +54,12 @@ export function initGameSpeed() { } } } - return originalTweensAdd.apply(this, [ config ]); + return originalTweensAdd.apply(this, [config]); }; const originalTweensChain = this.tweens.chain; this.tweens.chain = function (config: Phaser.Types.Tweens.TweenChainBuilderConfig): Phaser.Tweens.TweenChain { if (config.tweens) { - config.tweens.forEach(t => { + for (const t of config.tweens) { if (t.duration) { t.duration = transformValue(t.duration); } @@ -69,9 +75,9 @@ export function initGameSpeed() { if (t.hold) { t.hold = transformValue(t.hold); } - }); + } } - return originalTweensChain.apply(this, [ config ]); + return originalTweensChain.apply(this, [config]); }; const originalAddCounter = this.tweens.addCounter; this.tweens.addCounter = function (config: Phaser.Types.Tweens.NumberTweenBuilderConfig) { @@ -90,23 +96,19 @@ export function initGameSpeed() { if (config.hold) { config.hold = transformValue(config.hold); } - return originalAddCounter.apply(this, [ config ]); + return originalAddCounter.apply(this, [config]); }; const originalFadeOut = SoundFade.fadeOut; - SoundFade.fadeOut = (( - scene: Phaser.Scene, - sound: Phaser.Sound.BaseSound, - duration: number, - destroy?: boolean - ) => originalFadeOut(globalScene, sound, transformValue(duration), destroy)) as FadeOut; + SoundFade.fadeOut = ((_scene: Phaser.Scene, sound: Phaser.Sound.BaseSound, duration: number, destroy?: boolean) => + originalFadeOut(globalScene, sound, transformValue(duration), destroy)) as FadeOut; const originalFadeIn = SoundFade.fadeIn; SoundFade.fadeIn = (( - scene: Phaser.Scene, + _scene: Phaser.Scene, sound: string | Phaser.Sound.BaseSound, duration: number, endVolume?: number, - startVolume?: number + startVolume?: number, ) => originalFadeIn(globalScene, sound, transformValue(duration), endVolume, startVolume)) as FadeIn; } diff --git a/src/system/game-stats.ts b/src/system/game-stats.ts index a8b74f29bb7..5553a0332fc 100644 --- a/src/system/game-stats.ts +++ b/src/system/game-stats.ts @@ -1,43 +1,43 @@ -// public (.*?): integer; +// public (.*?): number; // this.$1 = source?.$1 || 0; export class GameStats { - public playTime: integer; - public battles: integer; - public classicSessionsPlayed: integer; - public sessionsWon: integer; - public ribbonsOwned: integer; - public dailyRunSessionsPlayed: integer; - public dailyRunSessionsWon: integer; - public endlessSessionsPlayed: integer; - public highestEndlessWave: integer; - public highestLevel: integer; - public highestMoney: integer; - public highestDamage: integer; - public highestHeal: integer; - public pokemonSeen: integer; - public pokemonDefeated: integer; - public pokemonCaught: integer; - public pokemonHatched: integer; - public subLegendaryPokemonSeen: integer; - public subLegendaryPokemonCaught: integer; - public subLegendaryPokemonHatched: integer; - public legendaryPokemonSeen: integer; - public legendaryPokemonCaught: integer; - public legendaryPokemonHatched: integer; - public mythicalPokemonSeen: integer; - public mythicalPokemonCaught: integer; - public mythicalPokemonHatched: integer; - public shinyPokemonSeen: integer; - public shinyPokemonCaught: integer; - public shinyPokemonHatched: integer; - public pokemonFused: integer; - public trainersDefeated: integer; - public eggsPulled: integer; - public rareEggsPulled: integer; - public epicEggsPulled: integer; - public legendaryEggsPulled: integer; - public manaphyEggsPulled: integer; + public playTime: number; + public battles: number; + public classicSessionsPlayed: number; + public sessionsWon: number; + public ribbonsOwned: number; + public dailyRunSessionsPlayed: number; + public dailyRunSessionsWon: number; + public endlessSessionsPlayed: number; + public highestEndlessWave: number; + public highestLevel: number; + public highestMoney: number; + public highestDamage: number; + public highestHeal: number; + public pokemonSeen: number; + public pokemonDefeated: number; + public pokemonCaught: number; + public pokemonHatched: number; + public subLegendaryPokemonSeen: number; + public subLegendaryPokemonCaught: number; + public subLegendaryPokemonHatched: number; + public legendaryPokemonSeen: number; + public legendaryPokemonCaught: number; + public legendaryPokemonHatched: number; + public mythicalPokemonSeen: number; + public mythicalPokemonCaught: number; + public mythicalPokemonHatched: number; + public shinyPokemonSeen: number; + public shinyPokemonCaught: number; + public shinyPokemonHatched: number; + public pokemonFused: number; + public trainersDefeated: number; + public eggsPulled: number; + public rareEggsPulled: number; + public epicEggsPulled: number; + public legendaryEggsPulled: number; + public manaphyEggsPulled: number; constructor(source?: any) { this.playTime = source?.playTime || 0; diff --git a/src/system/modifier-data.ts b/src/system/modifier-data.ts index d153236c93e..cbda45572ac 100644 --- a/src/system/modifier-data.ts +++ b/src/system/modifier-data.ts @@ -8,12 +8,12 @@ export default class ModifierData { public typeId: string; public typePregenArgs: any[]; public args: any[]; - public stackCount: integer; + public stackCount: number; public className: string; constructor(source: PersistentModifier | any, player: boolean) { - const sourceModifier = source instanceof PersistentModifier ? source as PersistentModifier : null; + const sourceModifier = source instanceof PersistentModifier ? (source as PersistentModifier) : null; this.player = player; this.typeId = sourceModifier ? sourceModifier.type.id : source.typeId; if (sourceModifier) { @@ -28,7 +28,7 @@ export default class ModifierData { this.className = sourceModifier ? sourceModifier.constructor.name : source.className; } - toModifier(constructor: any): PersistentModifier | null { + toModifier(_constructor: any): PersistentModifier | null { const typeFunc = getModifierTypeFuncById(this.typeId); if (!typeFunc) { return null; @@ -39,10 +39,16 @@ export default class ModifierData { type.id = this.typeId; if (type instanceof ModifierTypeGenerator) { - type = (type as ModifierTypeGenerator).generateType(this.player ? globalScene.getPlayerParty() : globalScene.getEnemyField(), this.typePregenArgs); + type = (type as ModifierTypeGenerator).generateType( + this.player ? globalScene.getPlayerParty() : globalScene.getEnemyField(), + this.typePregenArgs, + ); } - const ret = Reflect.construct(constructor, ([ type ] as any[]).concat(this.args).concat(this.stackCount)) as PersistentModifier; + const ret = Reflect.construct( + _constructor, + ([type] as any[]).concat(this.args).concat(this.stackCount), + ) as PersistentModifier; if (ret.stackCount > ret.getMaxStackCount()) { ret.stackCount = ret.getMaxStackCount(); diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts index 92eca5c3e9f..4e694bc1189 100644 --- a/src/system/pokemon-data.ts +++ b/src/system/pokemon-data.ts @@ -13,49 +13,54 @@ import type { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import type { Species } from "#enums/species"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; +import type { PokemonType } from "#enums/pokemon-type"; export default class PokemonData { - public id: integer; + public id: number; public player: boolean; public species: Species; public nickname: string; - public formIndex: integer; - public abilityIndex: integer; + public formIndex: number; + public abilityIndex: number; public passive: boolean; public shiny: boolean; public variant: Variant; public pokeball: PokeballType; - public level: integer; - public exp: integer; - public levelExp: integer; + public level: number; + public exp: number; + public levelExp: number; public gender: Gender; - public hp: integer; - public stats: integer[]; - public ivs: integer[]; + public hp: number; + public stats: number[]; + public ivs: number[]; public nature: Nature; public moveset: (PokemonMove | null)[]; public status: Status | null; - public friendship: integer; - public metLevel: integer; - public metBiome: Biome | -1; // -1 for starters + public friendship: number; + public metLevel: number; + public metBiome: Biome | -1; // -1 for starters public metSpecies: Species; - public metWave: number; // 0 for unknown (previous saves), -1 for starters - public luck: integer; + public metWave: number; // 0 for unknown (previous saves), -1 for starters + public luck: number; public pauseEvolutions: boolean; public pokerus: boolean; public usedTMs: Moves[]; - public evoCounter: integer; + public evoCounter: number; + public teraType: PokemonType; + public isTerastallized: boolean; + public stellarTypesBoosted: PokemonType[]; public fusionSpecies: Species; - public fusionFormIndex: integer; - public fusionAbilityIndex: integer; + public fusionFormIndex: number; + public fusionAbilityIndex: number; public fusionShiny: boolean; public fusionVariant: Variant; public fusionGender: Gender; - public fusionLuck: integer; + public fusionLuck: number; + public fusionTeraType: PokemonType; public boss: boolean; - public bossSegments?: integer; + public bossSegments?: number; public summonData: PokemonSummonData; @@ -68,7 +73,7 @@ export default class PokemonData { public mysteryEncounterPokemonData: CustomPokemonData | null; public fusionMysteryEncounterPokemonData: CustomPokemonData | null; - constructor(source: Pokemon | any, forHistory: boolean = false) { + constructor(source: Pokemon | any, forHistory = false) { const sourcePokemon = source instanceof Pokemon ? source : null; this.id = source.id; this.player = sourcePokemon ? sourcePokemon.isPlayer() : source.player; @@ -91,18 +96,22 @@ export default class PokemonData { } this.stats = source.stats; this.ivs = source.ivs; - this.nature = source.nature !== undefined ? source.nature : 0 as Nature; - this.friendship = source.friendship !== undefined ? source.friendship : getPokemonSpecies(this.species).baseFriendship; + this.nature = source.nature !== undefined ? source.nature : (0 as Nature); + this.friendship = + source.friendship !== undefined ? source.friendship : getPokemonSpecies(this.species).baseFriendship; this.metLevel = source.metLevel || 5; this.metBiome = source.metBiome !== undefined ? source.metBiome : -1; this.metSpecies = source.metSpecies; this.metWave = source.metWave ?? (this.metBiome === -1 ? -1 : 0); - this.luck = source.luck !== undefined ? source.luck : (source.shiny ? (source.variant + 1) : 0); + this.luck = source.luck !== undefined ? source.luck : source.shiny ? source.variant + 1 : 0; if (!forHistory) { this.pauseEvolutions = !!source.pauseEvolutions; this.evoCounter = source.evoCounter ?? 0; } this.pokerus = !!source.pokerus; + this.teraType = source.teraType as PokemonType; + this.isTerastallized = source.isTerastallized || false; + this.stellarTypesBoosted = source.stellarTypesBoosted || []; this.fusionSpecies = sourcePokemon ? sourcePokemon.fusionSpecies?.speciesId : source.fusionSpecies; this.fusionFormIndex = source.fusionFormIndex; @@ -110,16 +119,22 @@ export default class PokemonData { this.fusionShiny = source.fusionShiny; this.fusionVariant = source.fusionVariant; this.fusionGender = source.fusionGender; - this.fusionLuck = source.fusionLuck !== undefined ? source.fusionLuck : (source.fusionShiny ? source.fusionVariant + 1 : 0); + this.fusionLuck = + source.fusionLuck !== undefined ? source.fusionLuck : source.fusionShiny ? source.fusionVariant + 1 : 0; this.fusionCustomPokemonData = new CustomPokemonData(source.fusionCustomPokemonData); + this.fusionTeraType = (source.fusionTeraType ?? 0) as PokemonType; this.usedTMs = source.usedTMs ?? []; this.customPokemonData = new CustomPokemonData(source.customPokemonData); // Deprecated, but needed for session data migration this.natureOverride = source.natureOverride; - this.mysteryEncounterPokemonData = source.mysteryEncounterPokemonData ? new CustomPokemonData(source.mysteryEncounterPokemonData) : null; - this.fusionMysteryEncounterPokemonData = source.fusionMysteryEncounterPokemonData ? new CustomPokemonData(source.fusionMysteryEncounterPokemonData) : null; + this.mysteryEncounterPokemonData = source.mysteryEncounterPokemonData + ? new CustomPokemonData(source.mysteryEncounterPokemonData) + : null; + this.fusionMysteryEncounterPokemonData = source.fusionMysteryEncounterPokemonData + ? new CustomPokemonData(source.fusionMysteryEncounterPokemonData) + : null; if (!forHistory) { this.boss = (source instanceof EnemyPokemon && !!source.bossSegments) || (!this.player && !!source.boss); @@ -135,7 +150,9 @@ export default class PokemonData { } } } else { - this.moveset = (source.moveset || [ new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.GROWL) ]).filter(m => m).map((m: any) => new PokemonMove(m.moveId, m.ppUsed, m.ppUp, m.virtual, m.maxPpOverride)); + this.moveset = (source.moveset || [new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.GROWL)]) + .filter(m => m) + .map((m: any) => new PokemonMove(m.moveId, m.ppUsed, m.ppUp, m.virtual, m.maxPpOverride)); if (!forHistory) { this.status = source.status ? new Status(source.status.effect, source.status.toxicTurnCount, source.status.sleepTurnsRemaining) @@ -163,15 +180,38 @@ export default class PokemonData { } } - toPokemon(battleType?: BattleType, partyMemberIndex: integer = 0, double: boolean = false): Pokemon { + toPokemon(battleType?: BattleType, partyMemberIndex = 0, double = false): Pokemon { const species = getPokemonSpecies(this.species); const ret: Pokemon = this.player - ? globalScene.addPlayerPokemon(species, this.level, this.abilityIndex, this.formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this, (playerPokemon) => { - if (this.nickname) { - playerPokemon.nickname = this.nickname; - } - }) - : globalScene.addEnemyPokemon(species, this.level, battleType === BattleType.TRAINER ? !double || !(partyMemberIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER : TrainerSlot.NONE, this.boss, false, this); + ? globalScene.addPlayerPokemon( + species, + this.level, + this.abilityIndex, + this.formIndex, + this.gender, + this.shiny, + this.variant, + this.ivs, + this.nature, + this, + playerPokemon => { + if (this.nickname) { + playerPokemon.nickname = this.nickname; + } + }, + ) + : globalScene.addEnemyPokemon( + species, + this.level, + battleType === BattleType.TRAINER + ? !double || !(partyMemberIndex % 2) + ? TrainerSlot.TRAINER + : TrainerSlot.TRAINER_PARTNER + : TrainerSlot.NONE, + this.boss, + false, + this, + ); if (this.summonData) { ret.primeSummonData(this.summonData); } diff --git a/src/system/session-history.ts b/src/system/session-history.ts index e6901b2fa93..8eb81cb6efe 100644 --- a/src/system/session-history.ts +++ b/src/system/session-history.ts @@ -5,18 +5,18 @@ import type PersistentModifierData from "./modifier-data"; export enum SessionHistoryResult { ACTIVE, WIN, - LOSS + LOSS, } export interface SessionHistory { seed: string; - playTime: integer; - result: SessionHistoryResult, + playTime: number; + result: SessionHistoryResult; gameMode: GameModes; party: PokemonData[]; modifiers: PersistentModifierData[]; - money: integer; - waveIndex: integer; + money: number; + waveIndex: number; gameVersion: string; - timestamp: integer; + timestamp: number; } diff --git a/src/system/settings/settings-gamepad.ts b/src/system/settings/settings-gamepad.ts index 18973666766..f4a6bd465af 100644 --- a/src/system/settings/settings-gamepad.ts +++ b/src/system/settings/settings-gamepad.ts @@ -6,49 +6,49 @@ import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; import { globalScene } from "#app/global-scene"; export enum SettingGamepad { - Controller = "CONTROLLER", - Gamepad_Support = "GAMEPAD_SUPPORT", - Button_Up = "BUTTON_UP", - Button_Down = "BUTTON_DOWN", - Button_Left = "BUTTON_LEFT", - Button_Right = "BUTTON_RIGHT", - Button_Action = "BUTTON_ACTION", - Button_Cancel = "BUTTON_CANCEL", - Button_Menu = "BUTTON_MENU", - Button_Stats = "BUTTON_STATS", - Button_Cycle_Form = "BUTTON_CYCLE_FORM", - Button_Cycle_Shiny = "BUTTON_CYCLE_SHINY", - Button_Cycle_Gender = "BUTTON_CYCLE_GENDER", - Button_Cycle_Ability = "BUTTON_CYCLE_ABILITY", - Button_Cycle_Nature = "BUTTON_CYCLE_NATURE", - Button_Cycle_Variant = "BUTTON_CYCLE_VARIANT", - Button_Speed_Up = "BUTTON_SPEED_UP", - Button_Slow_Down = "BUTTON_SLOW_DOWN", - Button_Submit = "BUTTON_SUBMIT", + Controller = "CONTROLLER", + Gamepad_Support = "GAMEPAD_SUPPORT", + Button_Up = "BUTTON_UP", + Button_Down = "BUTTON_DOWN", + Button_Left = "BUTTON_LEFT", + Button_Right = "BUTTON_RIGHT", + Button_Action = "BUTTON_ACTION", + Button_Cancel = "BUTTON_CANCEL", + Button_Menu = "BUTTON_MENU", + Button_Stats = "BUTTON_STATS", + Button_Cycle_Form = "BUTTON_CYCLE_FORM", + Button_Cycle_Shiny = "BUTTON_CYCLE_SHINY", + Button_Cycle_Gender = "BUTTON_CYCLE_GENDER", + Button_Cycle_Ability = "BUTTON_CYCLE_ABILITY", + Button_Cycle_Nature = "BUTTON_CYCLE_NATURE", + Button_Cycle_Tera = "BUTTON_CYCLE_TERA", + Button_Speed_Up = "BUTTON_SPEED_UP", + Button_Slow_Down = "BUTTON_SLOW_DOWN", + Button_Submit = "BUTTON_SUBMIT", } const pressAction = "Press action to assign"; export const settingGamepadOptions = { - [SettingGamepad.Controller]: [ "Default", "Change" ], - [SettingGamepad.Gamepad_Support]: [ "Auto", "Disabled" ], - [SettingGamepad.Button_Up]: [ `KEY ${Button.UP.toString()}`, pressAction ], - [SettingGamepad.Button_Down]: [ `KEY ${Button.DOWN.toString()}`, pressAction ], - [SettingGamepad.Button_Left]: [ `KEY ${Button.LEFT.toString()}`, pressAction ], - [SettingGamepad.Button_Right]: [ `KEY ${Button.RIGHT.toString()}`, pressAction ], - [SettingGamepad.Button_Action]: [ `KEY ${Button.ACTION.toString()}`, pressAction ], - [SettingGamepad.Button_Cancel]: [ `KEY ${Button.CANCEL.toString()}`, pressAction ], - [SettingGamepad.Button_Menu]: [ `KEY ${Button.MENU.toString()}`, pressAction ], - [SettingGamepad.Button_Stats]: [ `KEY ${Button.STATS.toString()}`, pressAction ], - [SettingGamepad.Button_Cycle_Form]: [ `KEY ${Button.CYCLE_FORM.toString()}`, pressAction ], - [SettingGamepad.Button_Cycle_Shiny]: [ `KEY ${Button.CYCLE_SHINY.toString()}`, pressAction ], - [SettingGamepad.Button_Cycle_Gender]: [ `KEY ${Button.CYCLE_GENDER.toString()}`, pressAction ], - [SettingGamepad.Button_Cycle_Ability]: [ `KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction ], - [SettingGamepad.Button_Cycle_Nature]: [ `KEY ${Button.CYCLE_NATURE.toString()}`, pressAction ], - [SettingGamepad.Button_Cycle_Variant]: [ `KEY ${Button.V.toString()}`, pressAction ], - [SettingGamepad.Button_Speed_Up]: [ `KEY ${Button.SPEED_UP.toString()}`, pressAction ], - [SettingGamepad.Button_Slow_Down]: [ `KEY ${Button.SLOW_DOWN.toString()}`, pressAction ], - [SettingGamepad.Button_Submit]: [ `KEY ${Button.SUBMIT.toString()}`, pressAction ], + [SettingGamepad.Controller]: ["Default", "Change"], + [SettingGamepad.Gamepad_Support]: ["Auto", "Disabled"], + [SettingGamepad.Button_Up]: [`KEY ${Button.UP.toString()}`, pressAction], + [SettingGamepad.Button_Down]: [`KEY ${Button.DOWN.toString()}`, pressAction], + [SettingGamepad.Button_Left]: [`KEY ${Button.LEFT.toString()}`, pressAction], + [SettingGamepad.Button_Right]: [`KEY ${Button.RIGHT.toString()}`, pressAction], + [SettingGamepad.Button_Action]: [`KEY ${Button.ACTION.toString()}`, pressAction], + [SettingGamepad.Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, pressAction], + [SettingGamepad.Button_Menu]: [`KEY ${Button.MENU.toString()}`, pressAction], + [SettingGamepad.Button_Stats]: [`KEY ${Button.STATS.toString()}`, pressAction], + [SettingGamepad.Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, pressAction], + [SettingGamepad.Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, pressAction], + [SettingGamepad.Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, pressAction], + [SettingGamepad.Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction], + [SettingGamepad.Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, pressAction], + [SettingGamepad.Button_Cycle_Tera]: [`KEY ${Button.CYCLE_TERA.toString()}`, pressAction], + [SettingGamepad.Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, pressAction], + [SettingGamepad.Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, pressAction], + [SettingGamepad.Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, pressAction], }; export const settingGamepadDefaults = { @@ -67,7 +67,7 @@ export const settingGamepadDefaults = { [SettingGamepad.Button_Cycle_Gender]: 0, [SettingGamepad.Button_Cycle_Ability]: 0, [SettingGamepad.Button_Cycle_Nature]: 0, - [SettingGamepad.Button_Cycle_Variant]: 0, + [SettingGamepad.Button_Cycle_Tera]: 0, [SettingGamepad.Button_Speed_Up]: 0, [SettingGamepad.Button_Slow_Down]: 0, [SettingGamepad.Button_Submit]: 0, @@ -80,11 +80,11 @@ export const settingGamepadBlackList = [ SettingKeyboard.Button_Right, ]; -export function setSettingGamepad(setting: SettingGamepad, value: integer): boolean { +export function setSettingGamepad(setting: SettingGamepad, value: number): boolean { switch (setting) { case SettingGamepad.Gamepad_Support: - // if we change the value of the gamepad support, we call a method in the inputController to - // activate or deactivate the controller listener + // if we change the value of the gamepad support, we call a method in the inputController to + // activate or deactivate the controller listener globalScene.inputController.setGamepadSupport(settingGamepadOptions[setting][value] !== "Disabled"); break; case SettingGamepad.Button_Action: @@ -96,13 +96,13 @@ export function setSettingGamepad(setting: SettingGamepad, value: integer): bool case SettingGamepad.Button_Cycle_Gender: case SettingGamepad.Button_Cycle_Ability: case SettingGamepad.Button_Cycle_Nature: - case SettingGamepad.Button_Cycle_Variant: + case SettingGamepad.Button_Cycle_Tera: case SettingGamepad.Button_Speed_Up: case SettingGamepad.Button_Slow_Down: case SettingGamepad.Button_Submit: if (value) { if (globalScene.ui) { - const cancelHandler = (success: boolean = false) : boolean => { + const cancelHandler = (success = false): boolean => { globalScene.ui.revertMode(); (globalScene.ui.getHandler() as SettingsGamepadUiHandler).updateBindings(); return success; @@ -120,7 +120,11 @@ export function setSettingGamepad(setting: SettingGamepad, value: integer): bool if (globalScene.ui && gp) { const cancelHandler = () => { globalScene.ui.revertMode(); - (globalScene.ui.getHandler() as SettingsGamepadUiHandler).setOptionCursor(Object.values(SettingGamepad).indexOf(SettingGamepad.Controller), 0, true); + (globalScene.ui.getHandler() as SettingsGamepadUiHandler).setOptionCursor( + Object.values(SettingGamepad).indexOf(SettingGamepad.Controller), + 0, + true, + ); (globalScene.ui.getHandler() as SettingsGamepadUiHandler).updateBindings(); return false; }; @@ -130,13 +134,16 @@ export function setSettingGamepad(setting: SettingGamepad, value: integer): bool return true; }; globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, { - options: [ ...gp.map((g: string) => ({ - label: truncateString(g, 30), // Truncate the gamepad name for display - handler: () => changeGamepadHandler(g) - })), { - label: "Cancel", - handler: cancelHandler, - }] + options: [ + ...gp.map((g: string) => ({ + label: truncateString(g, 30), // Truncate the gamepad name for display + handler: () => changeGamepadHandler(g), + })), + { + label: "Cancel", + handler: cancelHandler, + }, + ], }); return false; } diff --git a/src/system/settings/settings-keyboard.ts b/src/system/settings/settings-keyboard.ts index f4adc30ee52..ffe8811e5d9 100644 --- a/src/system/settings/settings-keyboard.ts +++ b/src/system/settings/settings-keyboard.ts @@ -5,81 +5,81 @@ import i18next from "i18next"; import { globalScene } from "#app/global-scene"; export enum SettingKeyboard { - // Default_Layout = "DEFAULT_LAYOUT", - Button_Up = "BUTTON_UP", - Alt_Button_Up = "ALT_BUTTON_UP", - Button_Down = "BUTTON_DOWN", - Alt_Button_Down = "ALT_BUTTON_DOWN", - Button_Left = "BUTTON_LEFT", - Alt_Button_Left = "ALT_BUTTON_LEFT", - Button_Right = "BUTTON_RIGHT", - Alt_Button_Right = "ALT_BUTTON_RIGHT", - Button_Action = "BUTTON_ACTION", - Alt_Button_Action = "ALT_BUTTON_ACTION", - Button_Cancel = "BUTTON_CANCEL", - Alt_Button_Cancel = "ALT_BUTTON_CANCEL", - Button_Menu = "BUTTON_MENU", - Alt_Button_Menu = "ALT_BUTTON_MENU", - Button_Stats = "BUTTON_STATS", - Alt_Button_Stats = "ALT_BUTTON_STATS", - Button_Cycle_Form = "BUTTON_CYCLE_FORM", - Alt_Button_Cycle_Form = "ALT_BUTTON_CYCLE_FORM", - Button_Cycle_Shiny = "BUTTON_CYCLE_SHINY", - Alt_Button_Cycle_Shiny = "ALT_BUTTON_CYCLE_SHINY", - Button_Cycle_Gender = "BUTTON_CYCLE_GENDER", - Alt_Button_Cycle_Gender = "ALT_BUTTON_CYCLE_GENDER", - Button_Cycle_Ability = "BUTTON_CYCLE_ABILITY", - Alt_Button_Cycle_Ability = "ALT_BUTTON_CYCLE_ABILITY", - Button_Cycle_Nature = "BUTTON_CYCLE_NATURE", - Alt_Button_Cycle_Nature = "ALT_BUTTON_CYCLE_NATURE", - Button_Cycle_Variant = "BUTTON_CYCLE_VARIANT", - Alt_Button_Cycle_Variant = "ALT_BUTTON_CYCLE_VARIANT", - Button_Speed_Up = "BUTTON_SPEED_UP", - Alt_Button_Speed_Up = "ALT_BUTTON_SPEED_UP", - Button_Slow_Down = "BUTTON_SLOW_DOWN", - Alt_Button_Slow_Down = "ALT_BUTTON_SLOW_DOWN", - Button_Submit = "BUTTON_SUBMIT", - Alt_Button_Submit = "ALT_BUTTON_SUBMIT", + // Default_Layout = "DEFAULT_LAYOUT", + Button_Up = "BUTTON_UP", + Alt_Button_Up = "ALT_BUTTON_UP", + Button_Down = "BUTTON_DOWN", + Alt_Button_Down = "ALT_BUTTON_DOWN", + Button_Left = "BUTTON_LEFT", + Alt_Button_Left = "ALT_BUTTON_LEFT", + Button_Right = "BUTTON_RIGHT", + Alt_Button_Right = "ALT_BUTTON_RIGHT", + Button_Action = "BUTTON_ACTION", + Alt_Button_Action = "ALT_BUTTON_ACTION", + Button_Cancel = "BUTTON_CANCEL", + Alt_Button_Cancel = "ALT_BUTTON_CANCEL", + Button_Menu = "BUTTON_MENU", + Alt_Button_Menu = "ALT_BUTTON_MENU", + Button_Stats = "BUTTON_STATS", + Alt_Button_Stats = "ALT_BUTTON_STATS", + Button_Cycle_Form = "BUTTON_CYCLE_FORM", + Alt_Button_Cycle_Form = "ALT_BUTTON_CYCLE_FORM", + Button_Cycle_Shiny = "BUTTON_CYCLE_SHINY", + Alt_Button_Cycle_Shiny = "ALT_BUTTON_CYCLE_SHINY", + Button_Cycle_Gender = "BUTTON_CYCLE_GENDER", + Alt_Button_Cycle_Gender = "ALT_BUTTON_CYCLE_GENDER", + Button_Cycle_Ability = "BUTTON_CYCLE_ABILITY", + Alt_Button_Cycle_Ability = "ALT_BUTTON_CYCLE_ABILITY", + Button_Cycle_Nature = "BUTTON_CYCLE_NATURE", + Alt_Button_Cycle_Nature = "ALT_BUTTON_CYCLE_NATURE", + Button_Cycle_Tera = "BUTTON_CYCLE_TERA", + Alt_Button_Cycle_Tera = "ALT_BUTTON_CYCLE_TERA", + Button_Speed_Up = "BUTTON_SPEED_UP", + Alt_Button_Speed_Up = "ALT_BUTTON_SPEED_UP", + Button_Slow_Down = "BUTTON_SLOW_DOWN", + Alt_Button_Slow_Down = "ALT_BUTTON_SLOW_DOWN", + Button_Submit = "BUTTON_SUBMIT", + Alt_Button_Submit = "ALT_BUTTON_SUBMIT", } const pressAction = i18next.t("settings:pressToBind"); export const settingKeyboardOptions = { // [SettingKeyboard.Default_Layout]: ['Default'], - [SettingKeyboard.Button_Up]: [ `KEY ${Button.UP.toString()}`, pressAction ], - [SettingKeyboard.Button_Down]: [ `KEY ${Button.DOWN.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Up]: [ `KEY ${Button.UP.toString()}`, pressAction ], - [SettingKeyboard.Button_Left]: [ `KEY ${Button.LEFT.toString()}`, pressAction ], - [SettingKeyboard.Button_Right]: [ `KEY ${Button.RIGHT.toString()}`, pressAction ], - [SettingKeyboard.Button_Action]: [ `KEY ${Button.ACTION.toString()}`, pressAction ], - [SettingKeyboard.Button_Menu]: [ `KEY ${Button.MENU.toString()}`, pressAction ], - [SettingKeyboard.Button_Submit]: [ `KEY ${Button.SUBMIT.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Down]: [ `KEY ${Button.DOWN.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Left]: [ `KEY ${Button.LEFT.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Right]: [ `KEY ${Button.RIGHT.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Action]: [ `KEY ${Button.ACTION.toString()}`, pressAction ], - [SettingKeyboard.Button_Cancel]: [ `KEY ${Button.CANCEL.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Cancel]: [ `KEY ${Button.CANCEL.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Menu]: [ `KEY ${Button.MENU.toString()}`, pressAction ], - [SettingKeyboard.Button_Stats]: [ `KEY ${Button.STATS.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Stats]: [ `KEY ${Button.STATS.toString()}`, pressAction ], - [SettingKeyboard.Button_Cycle_Form]: [ `KEY ${Button.CYCLE_FORM.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Cycle_Form]: [ `KEY ${Button.CYCLE_FORM.toString()}`, pressAction ], - [SettingKeyboard.Button_Cycle_Shiny]: [ `KEY ${Button.CYCLE_SHINY.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Cycle_Shiny]: [ `KEY ${Button.CYCLE_SHINY.toString()}`, pressAction ], - [SettingKeyboard.Button_Cycle_Gender]: [ `KEY ${Button.CYCLE_GENDER.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Cycle_Gender]: [ `KEY ${Button.CYCLE_GENDER.toString()}`, pressAction ], - [SettingKeyboard.Button_Cycle_Ability]: [ `KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Cycle_Ability]: [ `KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction ], - [SettingKeyboard.Button_Cycle_Nature]: [ `KEY ${Button.CYCLE_NATURE.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Cycle_Nature]: [ `KEY ${Button.CYCLE_NATURE.toString()}`, pressAction ], - [SettingKeyboard.Button_Cycle_Variant]: [ `KEY ${Button.V.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Cycle_Variant]: [ `KEY ${Button.V.toString()}`, pressAction ], - [SettingKeyboard.Button_Speed_Up]: [ `KEY ${Button.SPEED_UP.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Speed_Up]: [ `KEY ${Button.SPEED_UP.toString()}`, pressAction ], - [SettingKeyboard.Button_Slow_Down]: [ `KEY ${Button.SLOW_DOWN.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Slow_Down]: [ `KEY ${Button.SLOW_DOWN.toString()}`, pressAction ], - [SettingKeyboard.Alt_Button_Submit]: [ `KEY ${Button.SUBMIT.toString()}`, pressAction ], + [SettingKeyboard.Button_Up]: [`KEY ${Button.UP.toString()}`, pressAction], + [SettingKeyboard.Button_Down]: [`KEY ${Button.DOWN.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Up]: [`KEY ${Button.UP.toString()}`, pressAction], + [SettingKeyboard.Button_Left]: [`KEY ${Button.LEFT.toString()}`, pressAction], + [SettingKeyboard.Button_Right]: [`KEY ${Button.RIGHT.toString()}`, pressAction], + [SettingKeyboard.Button_Action]: [`KEY ${Button.ACTION.toString()}`, pressAction], + [SettingKeyboard.Button_Menu]: [`KEY ${Button.MENU.toString()}`, pressAction], + [SettingKeyboard.Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Down]: [`KEY ${Button.DOWN.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Left]: [`KEY ${Button.LEFT.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Right]: [`KEY ${Button.RIGHT.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Action]: [`KEY ${Button.ACTION.toString()}`, pressAction], + [SettingKeyboard.Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Menu]: [`KEY ${Button.MENU.toString()}`, pressAction], + [SettingKeyboard.Button_Stats]: [`KEY ${Button.STATS.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Stats]: [`KEY ${Button.STATS.toString()}`, pressAction], + [SettingKeyboard.Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, pressAction], + [SettingKeyboard.Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, pressAction], + [SettingKeyboard.Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, pressAction], + [SettingKeyboard.Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction], + [SettingKeyboard.Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, pressAction], + [SettingKeyboard.Button_Cycle_Tera]: [`KEY ${Button.CYCLE_TERA.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Cycle_Tera]: [`KEY ${Button.CYCLE_TERA.toString()}`, pressAction], + [SettingKeyboard.Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, pressAction], + [SettingKeyboard.Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, pressAction], + [SettingKeyboard.Alt_Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, pressAction], }; export const settingKeyboardDefaults = { @@ -112,8 +112,8 @@ export const settingKeyboardDefaults = { [SettingKeyboard.Alt_Button_Cycle_Ability]: 0, [SettingKeyboard.Button_Cycle_Nature]: 0, [SettingKeyboard.Alt_Button_Cycle_Nature]: 0, - [SettingKeyboard.Button_Cycle_Variant]: 0, - [SettingKeyboard.Alt_Button_Cycle_Variant]: 0, + [SettingKeyboard.Button_Cycle_Tera]: 0, + [SettingKeyboard.Alt_Button_Cycle_Tera]: 0, [SettingKeyboard.Button_Speed_Up]: 0, [SettingKeyboard.Alt_Button_Speed_Up]: 0, [SettingKeyboard.Button_Slow_Down]: 0, @@ -132,8 +132,7 @@ export const settingKeyboardBlackList = [ SettingKeyboard.Button_Right, ]; - -export function setSettingKeyboard(setting: SettingKeyboard, value: integer): boolean { +export function setSettingKeyboard(setting: SettingKeyboard, value: number): boolean { switch (setting) { case SettingKeyboard.Button_Up: case SettingKeyboard.Button_Down: @@ -148,7 +147,7 @@ export function setSettingKeyboard(setting: SettingKeyboard, value: integer): bo case SettingKeyboard.Button_Cycle_Gender: case SettingKeyboard.Button_Cycle_Ability: case SettingKeyboard.Button_Cycle_Nature: - case SettingKeyboard.Button_Cycle_Variant: + case SettingKeyboard.Button_Cycle_Tera: case SettingKeyboard.Button_Speed_Up: case SettingKeyboard.Button_Slow_Down: case SettingKeyboard.Alt_Button_Up: @@ -164,13 +163,13 @@ export function setSettingKeyboard(setting: SettingKeyboard, value: integer): bo case SettingKeyboard.Alt_Button_Cycle_Gender: case SettingKeyboard.Alt_Button_Cycle_Ability: case SettingKeyboard.Alt_Button_Cycle_Nature: - case SettingKeyboard.Alt_Button_Cycle_Variant: + case SettingKeyboard.Alt_Button_Cycle_Tera: case SettingKeyboard.Alt_Button_Speed_Up: case SettingKeyboard.Alt_Button_Slow_Down: case SettingKeyboard.Alt_Button_Submit: if (value) { if (globalScene.ui) { - const cancelHandler = (success: boolean = false) : boolean => { + const cancelHandler = (success = false): boolean => { globalScene.ui.revertMode(); (globalScene.ui.getHandler() as SettingsKeyboardUiHandler).updateBindings(); return success; @@ -184,5 +183,4 @@ export function setSettingKeyboard(setting: SettingKeyboard, value: integer): bo break; } return true; - } diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index 44fc1ee4f31..1a7279d371c 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -9,14 +9,19 @@ import { EaseType } from "#enums/ease-type"; import { MoneyFormat } from "#enums/money-format"; import { PlayerGender } from "#enums/player-gender"; import { ShopCursorTarget } from "#enums/shop-cursor-target"; +import { isLocal } from "#app/utils"; -const VOLUME_OPTIONS: SettingOption[] = new Array(11).fill(null).map((_, i) => i ? { - value: (i * 10).toString(), - label: (i * 10).toString(), -} : { - value: "Mute", - label: i18next.t("settings:mute") -}); +const VOLUME_OPTIONS: SettingOption[] = new Array(11).fill(null).map((_, i) => + i + ? { + value: (i * 10).toString(), + label: (i * 10).toString(), + } + : { + value: "Mute", + label: i18next.t("settings:mute"), + }, +); const SHOP_OVERLAY_OPACITY_OPTIONS: SettingOption[] = new Array(9).fill(null).map((_, i) => { const value = ((i + 1) * 10).toString(); @@ -29,55 +34,55 @@ const SHOP_OVERLAY_OPACITY_OPTIONS: SettingOption[] = new Array(9).fill(null).ma const OFF_ON: SettingOption[] = [ { value: "Off", - label: i18next.t("settings:off") + label: i18next.t("settings:off"), }, { value: "On", - label: i18next.t("settings:on") - } + label: i18next.t("settings:on"), + }, ]; const AUTO_DISABLED: SettingOption[] = [ { value: "Auto", - label: i18next.t("settings:auto") + label: i18next.t("settings:auto"), }, { value: "Disabled", - label: i18next.t("settings:disabled") - } + label: i18next.t("settings:disabled"), + }, ]; const TOUCH_CONTROLS_OPTIONS: SettingOption[] = [ { value: "Auto", - label: i18next.t("settings:auto") + label: i18next.t("settings:auto"), }, { value: "Disabled", label: i18next.t("settings:disabled"), needConfirmation: true, - confirmationMessage: i18next.t("settings:confirmDisableTouch") - } + confirmationMessage: i18next.t("settings:confirmDisableTouch"), + }, ]; const SHOP_CURSOR_TARGET_OPTIONS: SettingOption[] = [ { value: "Rewards", - label: i18next.t("settings:rewards") + label: i18next.t("settings:rewards"), }, { value: "Shop", - label: i18next.t("settings:shop") + label: i18next.t("settings:shop"), }, { value: "Reroll", - label: i18next.t("settings:reroll") + label: i18next.t("settings:reroll"), }, { value: "Check Team", - label: i18next.t("settings:checkTeam") - } + label: i18next.t("settings:checkTeam"), + }, ]; const shopCursorTargetIndexMap = SHOP_CURSOR_TARGET_OPTIONS.map(option => { @@ -101,27 +106,27 @@ const shopCursorTargetIndexMap = SHOP_CURSOR_TARGET_OPTIONS.map(option => { export enum SettingType { GENERAL, DISPLAY, - AUDIO + AUDIO, } type SettingOption = { - value: string, - label: string, - needConfirmation?: boolean, - confirmationMessage?: string + value: string; + label: string; + needConfirmation?: boolean; + confirmationMessage?: string; }; export interface Setting { - key: string - label: string - options: SettingOption[] - default: number - type: SettingType - requireReload?: boolean + key: string; + label: string; + options: SettingOption[]; + default: number; + type: SettingType; + requireReload?: boolean; /** Whether the setting can be activated or not */ - activatable?: boolean + activatable?: boolean; /** Determines whether the setting should be hidden from the UI */ - isHidden?: () => boolean + isHidden?: () => boolean; } /** @@ -150,6 +155,7 @@ export const SettingKeys = { Show_Stats_on_Level_Up: "SHOW_LEVEL_UP_STATS", Shop_Cursor_Target: "SHOP_CURSOR_TARGET", Command_Cursor_Memory: "COMMAND_CURSOR_MEMORY", + Dex_For_Devs: "DEX_FOR_DEVS", Candy_Upgrade_Notification: "CANDY_UPGRADE_NOTIFICATION", Candy_Upgrade_Display: "CANDY_UPGRADE_DISPLAY", Move_Info: "MOVE_INFO", @@ -169,12 +175,12 @@ export const SettingKeys = { Battle_Music: "BATTLE_MUSIC", Show_BGM_Bar: "SHOW_BGM_BAR", Move_Touch_Controls: "MOVE_TOUCH_CONTROLS", - Shop_Overlay_Opacity: "SHOP_OVERLAY_OPACITY" + Shop_Overlay_Opacity: "SHOP_OVERLAY_OPACITY", }; export enum MusicPreference { GENFIVE, - ALLGENS + ALLGENS, } /** @@ -187,39 +193,39 @@ export const Setting: Array = [ options: [ { value: "1", - label: "1x" + label: "1x", }, { value: "1.25", - label: "1.25x" + label: "1.25x", }, { value: "1.5", - label: "1.5x" + label: "1.5x", }, { value: "2", - label: "2x" + label: "2x", }, { value: "2.5", - label: "2.5x" + label: "2.5x", }, { value: "3", - label: "3x" + label: "3x", }, { value: "4", - label: "4x" + label: "4x", }, { value: "5", - label: "5x" - } + label: "5x", + }, ], default: 3, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.HP_Bar_Speed, @@ -227,23 +233,23 @@ export const Setting: Array = [ options: [ { value: "Normal", - label: i18next.t("settings:normal") + label: i18next.t("settings:normal"), }, { value: "Fast", - label: i18next.t("settings:fast") + label: i18next.t("settings:fast"), }, { value: "Faster", - label: i18next.t("settings:faster") + label: i18next.t("settings:faster"), }, { value: "Skip", - label: i18next.t("settings:skip") - } + label: i18next.t("settings:skip"), + }, ], default: 0, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.EXP_Gains_Speed, @@ -251,23 +257,23 @@ export const Setting: Array = [ options: [ { value: "Normal", - label: i18next.t("settings:normal") + label: i18next.t("settings:normal"), }, { value: "Fast", - label: i18next.t("settings:fast") + label: i18next.t("settings:fast"), }, { value: "Faster", - label: i18next.t("settings:faster") + label: i18next.t("settings:faster"), }, { value: "Skip", - label: i18next.t("settings:skip") - } + label: i18next.t("settings:skip"), + }, ], default: 0, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.EXP_Party_Display, @@ -275,26 +281,26 @@ export const Setting: Array = [ options: [ { value: "Normal", - label: i18next.t("settings:normal") + label: i18next.t("settings:normal"), }, { value: "Level Up Notification", - label: i18next.t("settings:levelUpNotifications") + label: i18next.t("settings:levelUpNotifications"), }, { value: "Skip", - label: i18next.t("settings:skip") - } + label: i18next.t("settings:skip"), + }, ], default: 0, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.Skip_Seen_Dialogues, label: i18next.t("settings:skipSeenDialogues"), options: OFF_ON, default: 0, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.Egg_Skip, @@ -302,19 +308,19 @@ export const Setting: Array = [ options: [ { value: "Never", - label: i18next.t("settings:never") + label: i18next.t("settings:never"), }, { value: "Ask", - label: i18next.t("settings:ask") + label: i18next.t("settings:ask"), }, { value: "Always", - label: i18next.t("settings:always") - } + label: i18next.t("settings:always"), + }, ], default: 1, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.Battle_Style, @@ -322,50 +328,50 @@ export const Setting: Array = [ options: [ { value: "Switch", - label: i18next.t("settings:switch") + label: i18next.t("settings:switch"), }, { value: "Set", - label: i18next.t("settings:set") - } + label: i18next.t("settings:set"), + }, ], default: 0, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.Command_Cursor_Memory, label: i18next.t("settings:commandCursorMemory"), options: OFF_ON, default: 0, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.Enable_Retries, label: i18next.t("settings:enableRetries"), options: OFF_ON, default: 0, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.Hide_IVs, label: i18next.t("settings:hideIvs"), options: OFF_ON, default: 0, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.Tutorials, label: i18next.t("settings:tutorials"), options: OFF_ON, default: 1, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.Vibration, label: i18next.t("settings:vibrations"), options: AUTO_DISABLED, default: 0, - type: SettingType.GENERAL + type: SettingType.GENERAL, }, { key: SettingKeys.Touch_Controls, @@ -373,7 +379,7 @@ export const Setting: Array = [ options: TOUCH_CONTROLS_OPTIONS, default: 0, type: SettingType.GENERAL, - isHidden: () => !hasTouchscreen() + isHidden: () => !hasTouchscreen(), }, { key: SettingKeys.Move_Touch_Controls, @@ -381,13 +387,13 @@ export const Setting: Array = [ options: [ { value: "Configure", - label: i18next.t("settings:change") - } + label: i18next.t("settings:change"), + }, ], default: 0, type: SettingType.GENERAL, activatable: true, - isHidden: () => !hasTouchscreen() + isHidden: () => !hasTouchscreen(), }, { key: SettingKeys.Language, @@ -395,16 +401,16 @@ export const Setting: Array = [ options: [ { value: "English", - label: "English" + label: "English", }, { value: "Change", - label: i18next.t("settings:change") - } + label: i18next.t("settings:change"), + }, ], default: 0, type: SettingType.DISPLAY, - requireReload: true + requireReload: true, }, { key: SettingKeys.UI_Theme, @@ -412,16 +418,16 @@ export const Setting: Array = [ options: [ { value: "Default", - label: i18next.t("settings:default") + label: i18next.t("settings:default"), }, { value: "Legacy", - label: i18next.t("settings:legacy") - } + label: i18next.t("settings:legacy"), + }, ], default: 0, type: SettingType.DISPLAY, - requireReload: true + requireReload: true, }, { key: SettingKeys.Window_Type, @@ -430,11 +436,11 @@ export const Setting: Array = [ const windowType = (i + 1).toString(); return { value: windowType, - label: windowType + label: windowType, }; }), default: 0, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Money_Format, @@ -442,15 +448,15 @@ export const Setting: Array = [ options: [ { value: "Normal", - label: i18next.t("settings:normal") + label: i18next.t("settings:normal"), }, { value: "Abbreviated", - label: i18next.t("settings:abbreviated") - } + label: i18next.t("settings:abbreviated"), + }, ], default: 0, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Damage_Numbers, @@ -458,33 +464,33 @@ export const Setting: Array = [ options: [ { value: "Off", - label: i18next.t("settings:off") + label: i18next.t("settings:off"), }, { value: "Simple", - label: i18next.t("settings:simple") + label: i18next.t("settings:simple"), }, { value: "Fancy", - label: i18next.t("settings:fancy") - } + label: i18next.t("settings:fancy"), + }, ], default: 0, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Move_Animations, label: i18next.t("settings:moveAnimations"), options: OFF_ON, default: 1, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Show_Stats_on_Level_Up, label: i18next.t("settings:showStatsOnLevelUp"), options: OFF_ON, default: 1, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Candy_Upgrade_Notification, @@ -492,19 +498,19 @@ export const Setting: Array = [ options: [ { value: "Off", - label: i18next.t("settings:off") + label: i18next.t("settings:off"), }, { value: "Passives Only", - label: i18next.t("settings:passivesOnly") + label: i18next.t("settings:passivesOnly"), }, { value: "On", - label: i18next.t("settings:on") - } + label: i18next.t("settings:on"), + }, ], default: 0, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Candy_Upgrade_Display, @@ -512,37 +518,37 @@ export const Setting: Array = [ options: [ { value: "Icon", - label: i18next.t("settings:icon") + label: i18next.t("settings:icon"), }, { value: "Animation", - label: i18next.t("settings:animation") - } + label: i18next.t("settings:animation"), + }, ], default: 0, type: SettingType.DISPLAY, - requireReload: true + requireReload: true, }, { key: SettingKeys.Move_Info, label: i18next.t("settings:moveInfo"), options: OFF_ON, default: 1, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Show_Moveset_Flyout, label: i18next.t("settings:showMovesetFlyout"), options: OFF_ON, default: 1, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Show_Arena_Flyout, label: i18next.t("settings:showArenaFlyout"), options: OFF_ON, default: 1, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Show_Time_Of_Day_Widget, @@ -558,15 +564,15 @@ export const Setting: Array = [ options: [ { value: "Bounce", - label: i18next.t("settings:bounce") + label: i18next.t("settings:bounce"), }, { value: "Back", - label: i18next.t("settings:timeOfDay_back") - } + label: i18next.t("settings:timeOfDay_back"), + }, ], default: 0, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Sprite_Set, @@ -574,23 +580,23 @@ export const Setting: Array = [ options: [ { value: "Consistent", - label: i18next.t("settings:consistent") + label: i18next.t("settings:consistent"), }, { value: "Experimental", - label: i18next.t("settings:experimental") - } + label: i18next.t("settings:experimental"), + }, ], default: 0, type: SettingType.DISPLAY, - requireReload: true + requireReload: true, }, { key: SettingKeys.Fusion_Palette_Swaps, label: i18next.t("settings:fusionPaletteSwaps"), options: OFF_ON, default: 1, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Player_Gender, @@ -598,64 +604,64 @@ export const Setting: Array = [ options: [ { value: "Boy", - label: i18next.t("settings:boy") + label: i18next.t("settings:boy"), }, { value: "Girl", - label: i18next.t("settings:girl") - } + label: i18next.t("settings:girl"), + }, ], default: 0, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Type_Hints, label: i18next.t("settings:typeHints"), options: OFF_ON, default: 0, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Show_BGM_Bar, label: i18next.t("settings:showBgmBar"), options: OFF_ON, default: 1, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Master_Volume, label: i18next.t("settings:masterVolume"), options: VOLUME_OPTIONS, default: 5, - type: SettingType.AUDIO + type: SettingType.AUDIO, }, { key: SettingKeys.BGM_Volume, label: i18next.t("settings:bgmVolume"), options: VOLUME_OPTIONS, default: 10, - type: SettingType.AUDIO + type: SettingType.AUDIO, }, { key: SettingKeys.Field_Volume, label: i18next.t("settings:fieldVolume"), options: VOLUME_OPTIONS, default: 10, - type: SettingType.AUDIO + type: SettingType.AUDIO, }, { key: SettingKeys.SE_Volume, label: i18next.t("settings:seVolume"), options: VOLUME_OPTIONS, default: 10, - type: SettingType.AUDIO + type: SettingType.AUDIO, }, { key: SettingKeys.UI_Volume, label: i18next.t("settings:uiVolume"), options: VOLUME_OPTIONS, default: 10, - type: SettingType.AUDIO + type: SettingType.AUDIO, }, { key: SettingKeys.Battle_Music, @@ -663,23 +669,23 @@ export const Setting: Array = [ options: [ { value: "Gen V", - label: i18next.t("settings:musicGenFive") + label: i18next.t("settings:musicGenFive"), }, { value: "All Gens", - label: i18next.t("settings:musicAllGens") - } + label: i18next.t("settings:musicAllGens"), + }, ], default: MusicPreference.ALLGENS, type: SettingType.AUDIO, - requireReload: true + requireReload: true, }, { key: SettingKeys.Shop_Cursor_Target, label: i18next.t("settings:shopCursorTarget"), options: SHOP_CURSOR_TARGET_OPTIONS, default: 0, - type: SettingType.DISPLAY + type: SettingType.DISPLAY, }, { key: SettingKeys.Shop_Overlay_Opacity, @@ -687,10 +693,20 @@ export const Setting: Array = [ options: SHOP_OVERLAY_OPACITY_OPTIONS, default: 7, type: SettingType.DISPLAY, - requireReload: false - } + requireReload: false, + }, ]; +if (isLocal) { + Setting.push({ + key: SettingKeys.Dex_For_Devs, + label: i18next.t("settings:dexForDevs"), + options: OFF_ON, + default: 0, + type: SettingType.GENERAL, + }); +} + /** * Return the index of a Setting * @param key SettingKey @@ -704,7 +720,9 @@ export function settingIndex(key: string) { * Resets all settings to their defaults */ export function resetSettings() { - Setting.forEach(s => setSetting(s.key, s.default)); + for (const s of Setting) { + setSetting(s.key, s.default); + } } /** @@ -713,33 +731,33 @@ export function resetSettings() { * @param value value to update setting with * @returns true if successful, false if not */ -export function setSetting(setting: string, value: integer): boolean { +export function setSetting(setting: string, value: number): boolean { const index: number = settingIndex(setting); if (index === -1) { return false; } switch (Setting[index].key) { case SettingKeys.Game_Speed: - globalScene.gameSpeed = parseFloat(Setting[index].options[value].value.replace("x", "")); + globalScene.gameSpeed = Number.parseFloat(Setting[index].options[value].value.replace("x", "")); break; case SettingKeys.Master_Volume: - globalScene.masterVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0; + globalScene.masterVolume = value ? Number.parseInt(Setting[index].options[value].value) * 0.01 : 0; globalScene.updateSoundVolume(); break; case SettingKeys.BGM_Volume: - globalScene.bgmVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0; + globalScene.bgmVolume = value ? Number.parseInt(Setting[index].options[value].value) * 0.01 : 0; globalScene.updateSoundVolume(); break; case SettingKeys.Field_Volume: - globalScene.fieldVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0; + globalScene.fieldVolume = value ? Number.parseInt(Setting[index].options[value].value) * 0.01 : 0; globalScene.updateSoundVolume(); break; case SettingKeys.SE_Volume: - globalScene.seVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0; + globalScene.seVolume = value ? Number.parseInt(Setting[index].options[value].value) * 0.01 : 0; globalScene.updateSoundVolume(); break; case SettingKeys.UI_Volume: - globalScene.uiVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0; + globalScene.uiVolume = value ? Number.parseInt(Setting[index].options[value].value) * 0.01 : 0; break; case SettingKeys.Battle_Music: globalScene.musicPreference = value; @@ -751,7 +769,7 @@ export function setSetting(setting: string, value: integer): boolean { globalScene.uiTheme = value; break; case SettingKeys.Window_Type: - updateWindowType(parseInt(Setting[index].options[value].value)); + updateWindowType(Number.parseInt(Setting[index].options[value].value)); break; case SettingKeys.Tutorials: globalScene.enableTutorials = Setting[index].options[value].value === "On"; @@ -816,18 +834,23 @@ export function setSetting(setting: string, value: integer): boolean { globalScene.showTimeOfDayWidget = Setting[index].options[value].value === "On"; break; case SettingKeys.Time_Of_Day_Animation: - globalScene.timeOfDayAnimation = Setting[index].options[value].value === "Bounce" ? EaseType.BOUNCE : EaseType.BACK; + globalScene.timeOfDayAnimation = + Setting[index].options[value].value === "Bounce" ? EaseType.BOUNCE : EaseType.BACK; break; case SettingKeys.Show_Stats_on_Level_Up: globalScene.showLevelUpStats = Setting[index].options[value].value === "On"; break; - case SettingKeys.Shop_Cursor_Target: + case SettingKeys.Shop_Cursor_Target: { const selectedValue = shopCursorTargetIndexMap[value]; globalScene.shopCursorTarget = selectedValue; break; + } case SettingKeys.Command_Cursor_Memory: globalScene.commandCursorMemory = Setting[index].options[value].value === "On"; break; + case SettingKeys.Dex_For_Devs: + globalScene.dexForDevs = Setting[index].options[value].value === "On"; + break; case SettingKeys.EXP_Gains_Speed: globalScene.expGainsSpeed = value; break; @@ -849,13 +872,14 @@ export function setSetting(setting: string, value: integer): boolean { return false; } break; - case SettingKeys.Touch_Controls: + case SettingKeys.Touch_Controls: { globalScene.enableTouchControls = Setting[index].options[value].value !== "Disabled" && hasTouchscreen(); const touchControls = document.getElementById("touchControls"); if (touchControls) { touchControls.classList.toggle("visible", globalScene.enableTouchControls); } break; + } case SettingKeys.Vibration: globalScene.enableVibration = Setting[index].options[value].value !== "Disabled" && hasTouchscreen(); break; @@ -886,43 +910,43 @@ export function setSetting(setting: string, value: integer): boolean { options: [ { label: "English", - handler: () => changeLocaleHandler("en") + handler: () => changeLocaleHandler("en"), }, { label: "Español (ES)", - handler: () => changeLocaleHandler("es-ES") + handler: () => changeLocaleHandler("es-ES"), }, { label: "Italiano", - handler: () => changeLocaleHandler("it") + handler: () => changeLocaleHandler("it"), }, { label: "Français", - handler: () => changeLocaleHandler("fr") + handler: () => changeLocaleHandler("fr"), }, { label: "Deutsch", - handler: () => changeLocaleHandler("de") + handler: () => changeLocaleHandler("de"), }, { label: "Português (BR)", - handler: () => changeLocaleHandler("pt-BR") + handler: () => changeLocaleHandler("pt-BR"), }, { label: "简体中文", - handler: () => changeLocaleHandler("zh-CN") + handler: () => changeLocaleHandler("zh-CN"), }, { label: "繁體中文", - handler: () => changeLocaleHandler("zh-TW") + handler: () => changeLocaleHandler("zh-TW"), }, { label: "한국어", - handler: () => changeLocaleHandler("ko") + handler: () => changeLocaleHandler("ko"), }, { label: "日本語", - handler: () => changeLocaleHandler("ja") + handler: () => changeLocaleHandler("ja"), }, // { // label: "Català", @@ -930,17 +954,17 @@ export function setSetting(setting: string, value: integer): boolean { // }, { label: i18next.t("settings:back"), - handler: () => cancelHandler() - } + handler: () => cancelHandler(), + }, ], - maxOptions: 7 + maxOptions: 7, }); return false; } } break; case SettingKeys.Shop_Overlay_Opacity: - globalScene.updateShopOverlayOpacity(parseInt(Setting[index].options[value].value) * .01); + globalScene.updateShopOverlayOpacity(Number.parseInt(Setting[index].options[value].value) * 0.01); break; } diff --git a/src/system/trainer-data.ts b/src/system/trainer-data.ts index 51dfdde9ec1..48ab8d8d42a 100644 --- a/src/system/trainer-data.ts +++ b/src/system/trainer-data.ts @@ -4,14 +4,18 @@ import Trainer, { TrainerVariant } from "../field/trainer"; export default class TrainerData { public trainerType: TrainerType; public variant: TrainerVariant; - public partyTemplateIndex: integer; + public partyTemplateIndex: number; public name: string; public partnerName: string; constructor(source: Trainer | any) { - const sourceTrainer = source instanceof Trainer ? source as Trainer : null; + const sourceTrainer = source instanceof Trainer ? (source as Trainer) : null; this.trainerType = sourceTrainer ? sourceTrainer.config.trainerType : source.trainerType; - this.variant = source.hasOwnProperty("variant") ? source.variant : source.female ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT; + this.variant = source.hasOwnProperty("variant") + ? source.variant + : source.female + ? TrainerVariant.FEMALE + : TrainerVariant.DEFAULT; this.partyTemplateIndex = source.partyMemberTemplateIndex; this.name = source.name; this.partnerName = source.partnerName; diff --git a/src/system/unlockables.ts b/src/system/unlockables.ts index 0a666e2c755..2c396aad1f9 100644 --- a/src/system/unlockables.ts +++ b/src/system/unlockables.ts @@ -5,7 +5,7 @@ export enum Unlockables { ENDLESS_MODE, MINI_BLACK_HOLE, SPLICED_ENDLESS_MODE, - EVIOLITE + EVIOLITE, } export function getUnlockableName(unlockable: Unlockables) { diff --git a/src/system/version_migration/version_converter.ts b/src/system/version_migration/version_converter.ts index aee84805143..3c5abc2cc18 100644 --- a/src/system/version_migration/version_converter.ts +++ b/src/system/version_migration/version_converter.ts @@ -7,7 +7,10 @@ import * as v1_0_4 from "./versions/v1_0_4"; // --- v1.1.0 PATCHES --- // import * as v1_1_0 from "./versions/v1_1_0"; -const LATEST_VERSION = version.split(".").map(value => parseInt(value)); +// --- v1.7.0 PATCHES --- // +import * as v1_7_0 from "./versions/v1_7_0"; + +const LATEST_VERSION = version.split(".").map(value => Number.parseInt(value)); /** * Converts incoming {@linkcode SystemSaveData} that has a version below the @@ -20,7 +23,7 @@ const LATEST_VERSION = version.split(".").map(value => parseInt(value)); * @see {@link SystemVersionConverter} */ export function applySystemVersionMigration(data: SystemSaveData) { - const curVersion = data.gameVersion.split(".").map(value => parseInt(value)); + const curVersion = data.gameVersion.split(".").map(value => Number.parseInt(value)); if (!curVersion.every((value, index) => value === LATEST_VERSION[index])) { const converter = new SystemVersionConverter(); @@ -40,7 +43,7 @@ export function applySystemVersionMigration(data: SystemSaveData) { * @see {@link SessionVersionConverter} */ export function applySessionVersionMigration(data: SessionSaveData) { - const curVersion = data.gameVersion.split(".").map(value => parseInt(value)); + const curVersion = data.gameVersion.split(".").map(value => Number.parseInt(value)); if (!curVersion.every((value, index) => value === LATEST_VERSION[index])) { const converter = new SessionVersionConverter(); @@ -61,7 +64,7 @@ export function applySessionVersionMigration(data: SessionSaveData) { */ export function applySettingsVersionMigration(data: Object) { const gameVersion: string = data.hasOwnProperty("gameVersion") ? data["gameVersion"] : "1.0.0"; - const curVersion = gameVersion.split(".").map(value => parseInt(value)); + const curVersion = gameVersion.split(".").map(value => Number.parseInt(value)); if (!curVersion.every((value, index) => value === LATEST_VERSION[index])) { const converter = new SettingsVersionConverter(); @@ -98,8 +101,7 @@ abstract class VersionConverter { * body. * @param data The data to be operated on */ - applyStaticPreprocessors(_data: any): void { - } + applyStaticPreprocessors(_data: any): void {} /** * Uses the current version the incoming data to determine the starting point @@ -125,7 +127,7 @@ class SessionVersionConverter extends VersionConverter { } override applyMigration(data: SessionSaveData, curVersion: number[]): void { - const [ curMajor, curMinor, curPatch ] = curVersion; + const [curMajor, curMinor, curPatch] = curVersion; if (curMajor === 1) { if (curMinor === 0) { @@ -138,6 +140,10 @@ class SessionVersionConverter extends VersionConverter { console.log("Applying v1.1.0 session data migration!"); this.callMigrators(data, v1_1_0.sessionMigrators); } + if (curMinor < 7) { + console.log("Applying v1.7.0 session data migration!"); + this.callMigrators(data, v1_7_0.sessionMigrators); + } } console.log(`Session data successfully migrated to v${version}!`); @@ -151,7 +157,7 @@ class SessionVersionConverter extends VersionConverter { */ class SystemVersionConverter extends VersionConverter { override applyMigration(data: SystemSaveData, curVersion: number[]): void { - const [ curMajor, curMinor, curPatch ] = curVersion; + const [curMajor, curMinor, curPatch] = curVersion; if (curMajor === 1) { if (curMinor === 0) { @@ -164,6 +170,10 @@ class SystemVersionConverter extends VersionConverter { console.log("Applying v1.1.0 system data migraton!"); this.callMigrators(data, v1_1_0.systemMigrators); } + if (curMinor < 7) { + console.log("Applying v1.7.0 system data migration!"); + this.callMigrators(data, v1_7_0.systemMigrators); + } } console.log(`System data successfully migrated to v${version}!`); @@ -177,7 +187,7 @@ class SystemVersionConverter extends VersionConverter { */ class SettingsVersionConverter extends VersionConverter { override applyMigration(data: Object, curVersion: number[]): void { - const [ curMajor, curMinor, curPatch ] = curVersion; + const [curMajor, curMinor, curPatch] = curVersion; if (curMajor === 1) { if (curMinor === 0) { @@ -190,8 +200,12 @@ class SettingsVersionConverter extends VersionConverter { console.log("Applying v1.1.0 settings data migraton!"); this.callMigrators(data, v1_1_0.settingsMigrators); } + if (curMinor < 7) { + console.log("Applying v1.7.0 settings data migration!"); + this.callMigrators(data, v1_7_0.settingsMigrators); + } } - console.log(`System data successfully migrated to v${version}!`); + console.log(`Settings data successfully migrated to v${version}!`); } } diff --git a/src/system/version_migration/versions/v1_0_4.ts b/src/system/version_migration/versions/v1_0_4.ts index 2795e940866..16bd9db9915 100644 --- a/src/system/version_migration/versions/v1_0_4.ts +++ b/src/system/version_migration/versions/v1_0_4.ts @@ -1,6 +1,6 @@ import { SettingKeys } from "#app/system/settings/settings"; -import type { SystemSaveData, SessionSaveData } from "#app/system/game-data"; -import { AbilityAttr, defaultStarterSpecies, DexAttr } from "#app/system/game-data"; +import type { SystemSaveData, SessionSaveData } from "#app/system/game-data"; +import { AbilityAttr, defaultStarterSpecies, DexAttr } from "#app/system/game-data"; import { allSpecies } from "#app/data/pokemon-species"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; import { isNullOrUndefined } from "#app/utils"; @@ -12,8 +12,9 @@ export const systemMigrators = [ */ function migrateAbilityData(data: SystemSaveData) { if (data.starterData && data.dexData) { + // biome-ignore lint/complexity/noForEach: Object.keys(data.starterData).forEach(sd => { - if (data.dexData[sd]?.caughtAttr && (data.starterData[sd] && !data.starterData[sd].abilityAttr)) { + if (data.dexData[sd]?.caughtAttr && data.starterData[sd] && !data.starterData[sd].abilityAttr) { data.starterData[sd].abilityAttr = 1; } }); @@ -25,22 +26,44 @@ export const systemMigrators = [ * @param data {@linkcode SystemSaveData} */ function fixLegendaryStats(data: SystemSaveData) { - if (data.gameStats && (data.gameStats.legendaryPokemonCaught !== undefined && data.gameStats.subLegendaryPokemonCaught === undefined)) { + if ( + data.gameStats && + data.gameStats.legendaryPokemonCaught !== undefined && + data.gameStats.subLegendaryPokemonCaught === undefined + ) { data.gameStats.subLegendaryPokemonSeen = 0; data.gameStats.subLegendaryPokemonCaught = 0; data.gameStats.subLegendaryPokemonHatched = 0; - allSpecies.filter(s => s.subLegendary).forEach(s => { - const dexEntry = data.dexData[s.speciesId]; - data.gameStats.subLegendaryPokemonSeen += dexEntry.seenCount; - data.gameStats.legendaryPokemonSeen = Math.max(data.gameStats.legendaryPokemonSeen - dexEntry.seenCount, 0); - data.gameStats.subLegendaryPokemonCaught += dexEntry.caughtCount; - data.gameStats.legendaryPokemonCaught = Math.max(data.gameStats.legendaryPokemonCaught - dexEntry.caughtCount, 0); - data.gameStats.subLegendaryPokemonHatched += dexEntry.hatchedCount; - data.gameStats.legendaryPokemonHatched = Math.max(data.gameStats.legendaryPokemonHatched - dexEntry.hatchedCount, 0); - }); - data.gameStats.subLegendaryPokemonSeen = Math.max(data.gameStats.subLegendaryPokemonSeen, data.gameStats.subLegendaryPokemonCaught); - data.gameStats.legendaryPokemonSeen = Math.max(data.gameStats.legendaryPokemonSeen, data.gameStats.legendaryPokemonCaught); - data.gameStats.mythicalPokemonSeen = Math.max(data.gameStats.mythicalPokemonSeen, data.gameStats.mythicalPokemonCaught); + // biome-ignore lint/complexity/noForEach: + allSpecies + .filter(s => s.subLegendary) + .forEach(s => { + const dexEntry = data.dexData[s.speciesId]; + data.gameStats.subLegendaryPokemonSeen += dexEntry.seenCount; + data.gameStats.legendaryPokemonSeen = Math.max(data.gameStats.legendaryPokemonSeen - dexEntry.seenCount, 0); + data.gameStats.subLegendaryPokemonCaught += dexEntry.caughtCount; + data.gameStats.legendaryPokemonCaught = Math.max( + data.gameStats.legendaryPokemonCaught - dexEntry.caughtCount, + 0, + ); + data.gameStats.subLegendaryPokemonHatched += dexEntry.hatchedCount; + data.gameStats.legendaryPokemonHatched = Math.max( + data.gameStats.legendaryPokemonHatched - dexEntry.hatchedCount, + 0, + ); + }); + data.gameStats.subLegendaryPokemonSeen = Math.max( + data.gameStats.subLegendaryPokemonSeen, + data.gameStats.subLegendaryPokemonCaught, + ); + data.gameStats.legendaryPokemonSeen = Math.max( + data.gameStats.legendaryPokemonSeen, + data.gameStats.legendaryPokemonCaught, + ); + data.gameStats.mythicalPokemonSeen = Math.max( + data.gameStats.mythicalPokemonSeen, + data.gameStats.mythicalPokemonCaught, + ); } }, @@ -59,7 +82,7 @@ export const systemMigrators = [ } } } - } + }, ] as const; export const settingsMigrators = [ @@ -68,13 +91,16 @@ export const settingsMigrators = [ * SettingKeys.Shop_Cursor_Target}. * @param data the `settings` object */ + + // biome-ignore lint/complexity/noBannedTypes: TODO: fix the type to not be object... function fixRerollTarget(data: Object) { if (data.hasOwnProperty("REROLL_TARGET") && !data.hasOwnProperty(SettingKeys.Shop_Cursor_Target)) { data[SettingKeys.Shop_Cursor_Target] = data["REROLL_TARGET"]; + // biome-ignore lint/performance/noDelete: intentional delete data["REROLL_TARGET"]; localStorage.setItem("settings", JSON.stringify(data)); } - } + }, ] as const; export const sessionMigrators = [ @@ -85,7 +111,7 @@ export const sessionMigrators = [ * @param data {@linkcode SessionSaveData} */ function migrateModifiers(data: SessionSaveData) { - data.modifiers.forEach((m) => { + for (const m of data.modifiers) { if (m.className === "PokemonBaseStatModifier") { m.className = "BaseStatModifier"; } else if (m.className === "PokemonResetNegativeStatStageModifier") { @@ -102,13 +128,13 @@ export const sessionMigrators = [ m.typePregenArgs[0] = newStat; // From [ stat, battlesLeft ] to [ stat, maxBattles, battleCount ] - m.args = [ newStat, maxBattles, Math.min(m.args[1], maxBattles) ]; + m.args = [newStat, maxBattles, Math.min(m.args[1], maxBattles)]; } else { m.className = "TempCritBoosterModifier"; m.typePregenArgs = []; // From [ stat, battlesLeft ] to [ maxBattles, battleCount ] - m.args = [ maxBattles, Math.min(m.args[1], maxBattles) ]; + m.args = [maxBattles, Math.min(m.args[1], maxBattles)]; } } else if (m.className === "DoubleBattleChanceBoosterModifier" && m.args.length === 1) { let maxBattles: number; @@ -125,17 +151,17 @@ export const sessionMigrators = [ } // From [ battlesLeft ] to [ maxBattles, battleCount ] - m.args = [ maxBattles, Math.min(m.args[0], maxBattles) ]; + m.args = [maxBattles, Math.min(m.args[0], maxBattles)]; } - }); + } - data.enemyModifiers.forEach((m) => { + for (const m of data.enemyModifiers) { if (m.className === "PokemonBaseStatModifier") { m.className = "BaseStatModifier"; } else if (m.className === "PokemonResetNegativeStatStageModifier") { m.className = "ResetNegativeStatStageModifier"; } - }); + } }, /** * Converts old Pokemon natureOverride and mysteryEncounterData @@ -144,7 +170,7 @@ export const sessionMigrators = [ */ function migrateCustomPokemonDataAndNatureOverrides(data: SessionSaveData) { // Fix Pokemon nature overrides and custom data migration - data.party.forEach(pokemon => { + for (const pokemon of data.party) { if (pokemon["mysteryEncounterPokemonData"]) { pokemon.customPokemonData = new CustomPokemonData(pokemon["mysteryEncounterPokemonData"]); pokemon["mysteryEncounterPokemonData"] = null; @@ -158,6 +184,6 @@ export const sessionMigrators = [ pokemon.customPokemonData.nature = pokemon["natureOverride"]; pokemon["natureOverride"] = -1; } - }); - } + } + }, ] as const; diff --git a/src/system/version_migration/versions/v1_7_0.ts b/src/system/version_migration/versions/v1_7_0.ts new file mode 100644 index 00000000000..167cd974e56 --- /dev/null +++ b/src/system/version_migration/versions/v1_7_0.ts @@ -0,0 +1,77 @@ +import { getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species"; +import { globalScene } from "#app/global-scene"; +import { DexAttr, type SessionSaveData, type SystemSaveData } from "#app/system/game-data"; +import * as Utils from "#app/utils"; + +export const systemMigrators = [ + /** + * If a starter is caught, but the only forms registered as caught are not starterSelectable, + * unlock the default form. + * @param data {@linkcode SystemSaveData} + */ + function migrateUnselectableForms(data: SystemSaveData) { + if (data.starterData && data.dexData) { + Object.keys(data.starterData).forEach(sd => { + const caughtAttr = data.dexData[sd]?.caughtAttr; + const speciesNumber = Number(sd); + if (!speciesNumber) { + // An unknown bug at some point in time caused some accounts to have starter data for pokedex number 0 which crashes + return; + } + const species = getPokemonSpecies(speciesNumber); + if (caughtAttr && species.forms?.length > 1) { + const selectableForms = species.forms.filter( + (form, formIndex) => form.isStarterSelectable && caughtAttr & globalScene.gameData.getFormAttr(formIndex), + ); + if (selectableForms.length === 0) { + data.dexData[sd].caughtAttr += DexAttr.DEFAULT_FORM; + } + } + }); + } + }, +] as const; + +export const settingsMigrators = [] as const; + +export const sessionMigrators = [ + function migrateTera(data: SessionSaveData) { + for (let i = 0; i < data.modifiers.length; ) { + if (data.modifiers[i].className === "TerastallizeModifier") { + data.party.forEach(p => { + if (p.id === data.modifiers[i].args[0]) { + p.teraType = data.modifiers[i].args[1]; + } + }); + data.modifiers.splice(i, 1); + } else { + i++; + } + } + + for (let i = 0; i < data.enemyModifiers.length; ) { + if (data.enemyModifiers[i].className === "TerastallizeModifier") { + data.enemyParty.forEach(p => { + if (p.id === data.enemyModifiers[i].args[0]) { + p.teraType = data.enemyModifiers[i].args[1]; + } + }); + data.enemyModifiers.splice(i, 1); + } else { + i++; + } + } + + data.party.forEach(p => { + if (Utils.isNullOrUndefined(p.teraType)) { + p.teraType = getPokemonSpeciesForm(p.species, p.formIndex).type1; + } + }); + + data.enemyParty.forEach(p => { + if (Utils.isNullOrUndefined(p.teraType)) { + p.teraType = getPokemonSpeciesForm(p.species, p.formIndex).type1; + } + }); + }, +] as const; diff --git a/src/system/voucher.ts b/src/system/voucher.ts index e6bee131797..39294bccf13 100644 --- a/src/system/voucher.ts +++ b/src/system/voucher.ts @@ -9,7 +9,7 @@ export enum VoucherType { REGULAR, PLUS, PREMIUM, - GOLDEN + GOLDEN, } export class Voucher { @@ -31,10 +31,10 @@ export class Voucher { /** * Get the name of the voucher - * @param playerGender - this is ignored here. It's only there to match the signature of the function in the Achv class + * @param _playerGender - this is ignored here. It's only there to match the signature of the function in the Achv class * @returns the name of the voucher */ - getName(playerGender: PlayerGender): string { + getName(_playerGender: PlayerGender): string { return getVoucherTypeName(this.voucherType); } @@ -89,32 +89,32 @@ export interface Vouchers { export const vouchers: Vouchers = {}; export function initVouchers() { - for (const achv of [ achvs.CLASSIC_VICTORY ]) { - const voucherType = achv.score >= 150 - ? VoucherType.GOLDEN - : achv.score >= 100 - ? VoucherType.PREMIUM - : achv.score >= 75 - ? VoucherType.PLUS - : VoucherType.REGULAR; + for (const achv of [achvs.CLASSIC_VICTORY]) { + const voucherType = + achv.score >= 150 + ? VoucherType.GOLDEN + : achv.score >= 100 + ? VoucherType.PREMIUM + : achv.score >= 75 + ? VoucherType.PLUS + : VoucherType.REGULAR; vouchers[achv.id] = new Voucher(voucherType, getAchievementDescription(achv.localizationKey)); } - const bossTrainerTypes = Object.keys(trainerConfigs) - .filter(tt => trainerConfigs[tt].isBoss && trainerConfigs[tt].getDerivedType() !== TrainerType.RIVAL && trainerConfigs[tt].hasVoucher); + const bossTrainerTypes = Object.keys(trainerConfigs).filter( + tt => + trainerConfigs[tt].isBoss && + trainerConfigs[tt].getDerivedType() !== TrainerType.RIVAL && + trainerConfigs[tt].hasVoucher, + ); for (const trainerType of bossTrainerTypes) { - const voucherType = trainerConfigs[trainerType].moneyMultiplier < 10 - ? VoucherType.PLUS - : VoucherType.PREMIUM; + const voucherType = trainerConfigs[trainerType].moneyMultiplier < 10 ? VoucherType.PLUS : VoucherType.PREMIUM; const key = TrainerType[trainerType]; const trainerName = trainerConfigs[trainerType].name; const trainer = trainerConfigs[trainerType]; const title = trainer.title ? ` (${trainer.title})` : ""; - vouchers[key] = new Voucher( - voucherType, - `${i18next.t("voucher:defeatTrainer", { trainerName })} ${title}`, - ); + vouchers[key] = new Voucher(voucherType, `${i18next.t("voucher:defeatTrainer", { trainerName })} ${title}`); } const voucherKeys = Object.keys(vouchers); for (const k of voucherKeys) { diff --git a/src/test/abilities/costar.test.ts b/src/test/abilities/costar.test.ts deleted file mode 100644 index 3be29ea2dcf..00000000000 --- a/src/test/abilities/costar.test.ts +++ /dev/null @@ -1,85 +0,0 @@ -import { Stat } from "#enums/stat"; -import { Abilities } from "#app/enums/abilities"; -import { Moves } from "#app/enums/moves"; -import { Species } from "#app/enums/species"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MessagePhase } from "#app/phases/message-phase"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -describe("Abilities - COSTAR", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("double"); - game.override.ability(Abilities.COSTAR); - game.override.moveset([ Moves.SPLASH, Moves.NASTY_PLOT ]); - game.override.enemyMoveset(Moves.SPLASH); - }); - - - test( - "ability copies positive stat stages", - async () => { - game.override.enemyAbility(Abilities.BALL_FETCH); - - await game.startBattle([ Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO ]); - - let [ leftPokemon, rightPokemon ] = game.scene.getPlayerField(); - - game.move.select(Moves.NASTY_PLOT); - await game.phaseInterceptor.to(CommandPhase); - game.move.select(Moves.SPLASH, 1); - await game.toNextTurn(); - - expect(leftPokemon.getStatStage(Stat.SPATK)).toBe(2); - expect(rightPokemon.getStatStage(Stat.SPATK)).toBe(0); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(CommandPhase); - game.doSwitchPokemon(2); - await game.phaseInterceptor.to(MessagePhase); - - [ leftPokemon, rightPokemon ] = game.scene.getPlayerField(); - expect(leftPokemon.getStatStage(Stat.SPATK)).toBe(2); - expect(rightPokemon.getStatStage(Stat.SPATK)).toBe(2); - }, - ); - - test( - "ability copies negative stat stages", - async () => { - game.override.enemyAbility(Abilities.INTIMIDATE); - - await game.startBattle([ Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO ]); - - let [ leftPokemon, rightPokemon ] = game.scene.getPlayerField(); - - expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2); - expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(CommandPhase); - game.doSwitchPokemon(2); - await game.phaseInterceptor.to(MessagePhase); - - [ leftPokemon, rightPokemon ] = game.scene.getPlayerField(); - expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2); - expect(rightPokemon.getStatStage(Stat.ATK)).toBe(-2); - }, - ); -}); diff --git a/src/test/abilities/libero.test.ts b/src/test/abilities/libero.test.ts deleted file mode 100644 index 42627da51a3..00000000000 --- a/src/test/abilities/libero.test.ts +++ /dev/null @@ -1,347 +0,0 @@ -import { allMoves } from "#app/data/move"; -import { Type } from "#enums/type"; -import { Weather } from "#app/data/weather"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Abilities } from "#enums/abilities"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { Biome } from "#enums/biome"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; - - -describe("Abilities - Libero", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - game.override.ability(Abilities.LIBERO); - game.override.startingLevel(100); - game.override.enemySpecies(Species.RATTATA); - game.override.enemyMoveset([ Moves.ENDURE, Moves.ENDURE, Moves.ENDURE, Moves.ENDURE ]); - }); - - test( - "ability applies and changes a pokemon's type", - async () => { - game.override.moveset([ Moves.SPLASH ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); - }, - ); - - // Test for Gen9+ functionality, we are using previous funcionality - test.skip( - "ability applies only once per switch in", - async () => { - game.override.moveset([ Moves.SPLASH, Moves.AGILITY ]); - - await game.startBattle([ Species.MAGIKARP, Species.BULBASAUR ]); - - let leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); - - game.move.select(Moves.AGILITY); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied.filter((a) => a === Abilities.LIBERO)).toHaveLength(1); - const leadPokemonType = Type[leadPokemon.getTypes()[0]]; - const moveType = Type[allMoves[Moves.AGILITY].type]; - expect(leadPokemonType).not.toBe(moveType); - - await game.toNextTurn(); - game.doSwitchPokemon(1); - await game.toNextTurn(); - game.doSwitchPokemon(1); - await game.toNextTurn(); - - leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); - }, - ); - - test( - "ability applies correctly even if the pokemon's move has a variable type", - async () => { - game.override.moveset([ Moves.WEATHER_BALL ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.scene.arena.weather = new Weather(WeatherType.SUNNY); - game.move.select(Moves.WEATHER_BALL); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.LIBERO); - expect(leadPokemon.getTypes()).toHaveLength(1); - const leadPokemonType = Type[leadPokemon.getTypes()[0]], - moveType = Type[Type.FIRE]; - expect(leadPokemonType).toBe(moveType); - }, - ); - - test( - "ability applies correctly even if the type has changed by another ability", - async () => { - game.override.moveset([ Moves.TACKLE ]); - game.override.passiveAbility(Abilities.REFRIGERATE); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.LIBERO); - expect(leadPokemon.getTypes()).toHaveLength(1); - const leadPokemonType = Type[leadPokemon.getTypes()[0]], - moveType = Type[Type.ICE]; - expect(leadPokemonType).toBe(moveType); - }, - ); - - test( - "ability applies correctly even if the pokemon's move calls another move", - async () => { - game.override.moveset([ Moves.NATURE_POWER ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.scene.arena.biomeType = Biome.MOUNTAIN; - game.move.select(Moves.NATURE_POWER); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.AIR_SLASH); - }, - ); - - test( - "ability applies correctly even if the pokemon's move is delayed / charging", - async () => { - game.override.moveset([ Moves.DIG ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.DIG); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.DIG); - }, - ); - - test( - "ability applies correctly even if the pokemon's move misses", - async () => { - game.override.moveset([ Moves.TACKLE ]); - game.override.enemyMoveset(Moves.SPLASH); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.TACKLE); - await game.move.forceMiss(); - await game.phaseInterceptor.to(TurnEndPhase); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon.isFullHp()).toBe(true); - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); - }, - ); - - test( - "ability applies correctly even if the pokemon's move is protected against", - async () => { - game.override.moveset([ Moves.TACKLE ]); - game.override.enemyMoveset([ Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); - }, - ); - - test( - "ability applies correctly even if the pokemon's move fails because of type immunity", - async () => { - game.override.moveset([ Moves.TACKLE ]); - game.override.enemySpecies(Species.GASTLY); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); - }, - ); - - test( - "ability is not applied if pokemon's type is the same as the move's type", - async () => { - game.override.moveset([ Moves.SPLASH ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - leadPokemon.summonData.types = [ allMoves[Moves.SPLASH].type ]; - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO); - }, - ); - - test( - "ability is not applied if pokemon is terastallized", - async () => { - game.override.moveset([ Moves.SPLASH ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - vi.spyOn(leadPokemon, "isTerastallized").mockReturnValue(true); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO); - }, - ); - - test( - "ability is not applied if pokemon uses struggle", - async () => { - game.override.moveset([ Moves.STRUGGLE ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.STRUGGLE); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO); - }, - ); - - test( - "ability is not applied if the pokemon's move fails", - async () => { - game.override.moveset([ Moves.BURN_UP ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.BURN_UP); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO); - }, - ); - - test( - "ability applies correctly even if the pokemon's Trick-or-Treat fails", - async () => { - game.override.moveset([ Moves.TRICK_OR_TREAT ]); - game.override.enemySpecies(Species.GASTLY); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.TRICK_OR_TREAT); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TRICK_OR_TREAT); - }, - ); - - test( - "ability applies correctly and the pokemon curses itself", - async () => { - game.override.moveset([ Moves.CURSE ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.CURSE); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.CURSE); - expect(leadPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined); - }, - ); -}); - -function testPokemonTypeMatchesDefaultMoveType(pokemon: PlayerPokemon, move: Moves) { - expect(pokemon.summonData.abilitiesApplied).toContain(Abilities.LIBERO); - expect(pokemon.getTypes()).toHaveLength(1); - const pokemonType = Type[pokemon.getTypes()[0]], - moveType = Type[allMoves[move].type]; - expect(pokemonType).toBe(moveType); -} diff --git a/src/test/abilities/magic_guard.test.ts b/src/test/abilities/magic_guard.test.ts deleted file mode 100644 index 7c038354748..00000000000 --- a/src/test/abilities/magic_guard.test.ts +++ /dev/null @@ -1,468 +0,0 @@ -import { ArenaTagSide, getArenaTag } from "#app/data/arena-tag"; -import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Abilities } from "#enums/abilities"; -import { ArenaTagType } from "#enums/arena-tag-type"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { StatusEffect } from "#enums/status-effect"; -import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - -describe("Abilities - Magic Guard", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - /** Player Pokemon overrides */ - game.override.ability(Abilities.MAGIC_GUARD); - game.override.moveset([ Moves.SPLASH ]); - game.override.startingLevel(100); - - /** Enemy Pokemon overrides */ - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyAbility(Abilities.INSOMNIA); - game.override.enemyMoveset(Moves.SPLASH); - game.override.enemyLevel(100); - }); - - //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Magic_Guard_(Ability) - - it( - "ability should prevent damage caused by weather", - async () => { - game.override.weather(WeatherType.SANDSTORM); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).toBeDefined(); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) has not taken damage from weather - * - The enemy Pokemon (without Magic Guard) has taken damage from weather - */ - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - } - ); - - it( - "ability should prevent damage caused by status effects but other non-damage effects still apply", - async () => { - //Toxic keeps track of the turn counters -> important that Magic Guard keeps track of post-Toxic turns - game.override.statusEffect(StatusEffect.POISON); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) has not taken damage from poison - * - The Pokemon's CatchRateMultiplier should be 1.5 - */ - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(getStatusEffectCatchRateMultiplier(leadPokemon.status!.effect)).toBe(1.5); - } - ); - - it( - "ability effect should not persist when the ability is replaced", - async () => { - game.override.enemyMoveset([ Moves.WORRY_SEED, Moves.WORRY_SEED, Moves.WORRY_SEED, Moves.WORRY_SEED ]); - game.override.statusEffect(StatusEffect.POISON); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (that just lost its Magic Guard ability) has taken damage from poison - */ - expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp()); - } - ); - - - it("Magic Guard prevents damage caused by burn but other non-damaging effects are still applied", - async () => { - game.override.enemyStatusEffect(StatusEffect.BURN); - game.override.enemyAbility(Abilities.MAGIC_GUARD); - - await game.startBattle([ Species.MAGIKARP ]); - - game.move.select(Moves.SPLASH); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The enemy Pokemon (with Magic Guard) has not taken damage from burn - * - The enemy Pokemon's physical attack damage is halved (TBD) - * - The enemy Pokemon's hypothetical CatchRateMultiplier should be 1.5 - */ - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - expect(getStatusEffectCatchRateMultiplier(enemyPokemon.status!.effect)).toBe(1.5); - } - ); - - it("Magic Guard prevents damage caused by toxic but other non-damaging effects are still applied", - async () => { - game.override.enemyStatusEffect(StatusEffect.TOXIC); - game.override.enemyAbility(Abilities.MAGIC_GUARD); - - await game.startBattle([ Species.MAGIKARP ]); - - game.move.select(Moves.SPLASH); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - const toxicStartCounter = enemyPokemon.status!.toxicTurnCount; - //should be 0 - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The enemy Pokemon (with Magic Guard) has not taken damage from toxic - * - The enemy Pokemon's status effect duration should be incremented - * - The enemy Pokemon's hypothetical CatchRateMultiplier should be 1.5 - */ - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - expect(enemyPokemon.status!.toxicTurnCount).toBeGreaterThan(toxicStartCounter); - expect(getStatusEffectCatchRateMultiplier(enemyPokemon.status!.effect)).toBe(1.5); - } - ); - - - it("Magic Guard prevents damage caused by entry hazards", async () => { - //Adds and applies Spikes to both sides of the arena - const newTag = getArenaTag(ArenaTagType.SPIKES, 5, Moves.SPIKES, 0, 0, ArenaTagSide.BOTH)!; - game.scene.arena.tags.push(newTag); - - await game.startBattle([ Species.MAGIKARP ]); - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SPLASH); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) has not taken damage from spikes - * - The enemy Pokemon (without Magic Guard) has taken damage from spikes - */ - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - } - ); - - it("Magic Guard does not prevent poison from Toxic Spikes", async () => { - //Adds and applies Spikes to both sides of the arena - const playerTag = getArenaTag(ArenaTagType.TOXIC_SPIKES, 5, Moves.TOXIC_SPIKES, 0, 0, ArenaTagSide.PLAYER)!; - const enemyTag = getArenaTag(ArenaTagType.TOXIC_SPIKES, 5, Moves.TOXIC_SPIKES, 0, 0, ArenaTagSide.ENEMY)!; - game.scene.arena.tags.push(playerTag); - game.scene.arena.tags.push(enemyTag); - - await game.startBattle([ Species.MAGIKARP ]); - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SPLASH); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - Both Pokemon gain the poison status effect - * - The player Pokemon (with Magic Guard) has not taken damage from poison - * - The enemy Pokemon (without Magic Guard) has taken damage from poison - */ - expect(leadPokemon.status!.effect).toBe(StatusEffect.POISON); - expect(enemyPokemon.status!.effect).toBe(StatusEffect.POISON); - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - } - ); - - it("Magic Guard prevents against damage from volatile status effects", - async () => { - await game.startBattle([ Species.DUSKULL ]); - game.override.moveset([ Moves.CURSE ]); - game.override.enemyAbility(Abilities.MAGIC_GUARD); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.CURSE); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) has cut its HP to inflict curse - * - The enemy Pokemon (with Magic Guard) is cursed - * - The enemy Pokemon (with Magic Guard) does not lose HP from being cursed - */ - expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp()); - expect(enemyPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - } - ); - - it("Magic Guard prevents crash damage", async () => { - game.override.moveset([ Moves.HIGH_JUMP_KICK ]); - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.HIGH_JUMP_KICK); - await game.move.forceMiss(); - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) misses High Jump Kick but does not lose HP as a result - */ - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - } - ); - - it("Magic Guard prevents damage from recoil", async () => { - game.override.moveset([ Moves.TAKE_DOWN ]); - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.TAKE_DOWN); - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) uses a recoil move but does not lose HP from recoil - */ - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - } - ); - - it("Magic Guard does not prevent damage from Struggle's recoil", async () => { - game.override.moveset([ Moves.STRUGGLE ]); - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.STRUGGLE); - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) uses Struggle but does lose HP from Struggle's recoil - */ - expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp()); - } - ); - - //This tests different move attributes than the recoil tests above - it("Magic Guard prevents self-damage from attacking moves", async () => { - game.override.moveset([ Moves.STEEL_BEAM ]); - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.STEEL_BEAM); - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) uses a move with an HP cost but does not lose HP from using it - */ - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - } - ); - - /* - it("Magic Guard does not prevent self-damage from confusion", async () => { - await game.startBattle([Species.MAGIKARP]); - - game.move.select(Moves.CHARM); - - await game.phaseInterceptor.to(TurnEndPhase); - }); -*/ - - it("Magic Guard does not prevent self-damage from non-attacking moves", async () => { - game.override.moveset([ Moves.BELLY_DRUM ]); - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.BELLY_DRUM); - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) uses a non-attacking move with an HP cost and thus loses HP from using it - */ - expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp()); - } - ); - - it("Magic Guard prevents damage from abilities with PostTurnHurtIfSleepingAbAttr", async () => { - //Tests the ability Bad Dreams - game.override.statusEffect(StatusEffect.SLEEP); - //enemy pokemon is given Spore just in case player pokemon somehow awakens during test - game.override.enemyMoveset([ Moves.SPORE, Moves.SPORE, Moves.SPORE, Moves.SPORE ]); - game.override.enemyAbility(Abilities.BAD_DREAMS); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute - * - The player Pokemon is asleep - */ - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(leadPokemon.status!.effect).toBe(StatusEffect.SLEEP); - } - ); - - it("Magic Guard prevents damage from abilities with PostFaintContactDamageAbAttr", async () => { - //Tests the abilities Innards Out/Aftermath - game.override.moveset([ Moves.TACKLE ]); - game.override.enemyAbility(Abilities.AFTERMATH); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - const enemyPokemon = game.scene.getEnemyPokemon()!; - enemyPokemon.hp = 1; - - game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute - * - The enemy Pokemon has fainted - */ - expect(enemyPokemon.hp).toBe(0); - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - } - ); - - it("Magic Guard prevents damage from abilities with PostDefendContactDamageAbAttr", async () => { - //Tests the abilities Iron Barbs/Rough Skin - game.override.moveset([ Moves.TACKLE ]); - game.override.enemyAbility(Abilities.IRON_BARBS); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute - * - The player Pokemon's move should have connected - */ - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - } - ); - - it("Magic Guard prevents damage from abilities with ReverseDrainAbAttr", async () => { - //Tests the ability Liquid Ooze - game.override.moveset([ Moves.ABSORB ]); - game.override.enemyAbility(Abilities.LIQUID_OOZE); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.ABSORB); - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute - * - The player Pokemon's move should have connected - */ - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - } - ); - - it("Magic Guard prevents HP loss from abilities with PostWeatherLapseDamageAbAttr", async () => { - //Tests the abilities Solar Power/Dry Skin - game.override.passiveAbility(Abilities.SOLAR_POWER); - game.override.weather(WeatherType.SUNNY); - - await game.startBattle([ Species.MAGIKARP ]); - const leadPokemon = game.scene.getPlayerPokemon()!; - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - /** - * Expect: - * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute - */ - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - } - ); -}); diff --git a/src/test/abilities/moody.test.ts b/src/test/abilities/moody.test.ts deleted file mode 100644 index 166f69b0fe3..00000000000 --- a/src/test/abilities/moody.test.ts +++ /dev/null @@ -1,88 +0,0 @@ -import { BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - -describe("Abilities - Moody", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override - .battleType("single") - .enemySpecies(Species.RATTATA) - .enemyAbility(Abilities.BALL_FETCH) - .ability(Abilities.MOODY) - .enemyMoveset(Moves.SPLASH) - .moveset(Moves.SPLASH); - }); - - it("should increase one stat stage by 2 and decrease a different stat stage by 1", - async () => { - await game.classicMode.startBattle(); - - const playerPokemon = game.scene.getPlayerPokemon()!; - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - - // Find the increased and decreased stats, make sure they are different. - const changedStats = EFFECTIVE_STATS.filter(s => playerPokemon.getStatStage(s) === 2 || playerPokemon.getStatStage(s) === -1); - - expect(changedStats).toBeTruthy(); - expect(changedStats.length).toBe(2); - expect(changedStats[0] !== changedStats[1]).toBeTruthy(); - }); - - it("should only increase one stat stage by 2 if all stat stages are at -6", - async () => { - await game.classicMode.startBattle(); - - const playerPokemon = game.scene.getPlayerPokemon()!; - - // Set all stat stages to -6 - vi.spyOn(playerPokemon.summonData, "statStages", "get").mockReturnValue(new Array(BATTLE_STATS.length).fill(-6)); - - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - - // Should increase one stat stage by 2 (from -6, meaning it will be -4) - const increasedStat = EFFECTIVE_STATS.filter(s => playerPokemon.getStatStage(s) === -4); - - expect(increasedStat).toBeTruthy(); - expect(increasedStat.length).toBe(1); - }); - - it("should only decrease one stat stage by 1 stage if all stat stages are at 6", - async () => { - await game.classicMode.startBattle(); - - const playerPokemon = game.scene.getPlayerPokemon()!; - - // Set all stat stages to 6 - vi.spyOn(playerPokemon.summonData, "statStages", "get").mockReturnValue(new Array(BATTLE_STATS.length).fill(6)); - - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - - // Should decrease one stat stage by 1 (from 6, meaning it will be 5) - const decreasedStat = EFFECTIVE_STATS.filter(s => playerPokemon.getStatStage(s) === 5); - - expect(decreasedStat).toBeTruthy(); - expect(decreasedStat.length).toBe(1); - }); -}); diff --git a/src/test/abilities/parental_bond.test.ts b/src/test/abilities/parental_bond.test.ts deleted file mode 100644 index c2f54fa4cfc..00000000000 --- a/src/test/abilities/parental_bond.test.ts +++ /dev/null @@ -1,494 +0,0 @@ -import { Type } from "#enums/type"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { toDmgValue } from "#app/utils"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { Stat } from "#enums/stat"; -import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - - -describe("Abilities - Parental Bond", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - game.override.disableCrits(); - game.override.ability(Abilities.PARENTAL_BOND); - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyAbility(Abilities.FUR_COAT); - game.override.enemyMoveset(Moves.SPLASH); - game.override.startingLevel(100); - game.override.enemyLevel(100); - }); - - it( - "should add second strike to attack move", - async () => { - game.override.moveset([ Moves.TACKLE ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - let enemyStartingHp = enemyPokemon.hp; - - game.move.select(Moves.TACKLE); - - await game.phaseInterceptor.to("DamageAnimPhase"); - const firstStrikeDamage = enemyStartingHp - enemyPokemon.hp; - enemyStartingHp = enemyPokemon.hp; - - await game.phaseInterceptor.to("BerryPhase", false); - - const secondStrikeDamage = enemyStartingHp - enemyPokemon.hp; - - expect(leadPokemon.turnData.hitCount).toBe(2); - expect(secondStrikeDamage).toBe(toDmgValue(0.25 * firstStrikeDamage)); - } - ); - - it( - "should apply secondary effects to both strikes", - async () => { - game.override.moveset([ Moves.POWER_UP_PUNCH ]); - game.override.enemySpecies(Species.AMOONGUSS); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.POWER_UP_PUNCH); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.turnData.hitCount).toBe(2); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); - } - ); - - it( - "should not apply to Status moves", - async () => { - game.override.moveset([ Moves.BABY_DOLL_EYES ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.BABY_DOLL_EYES); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1); - } - ); - - it( - "should not apply to multi-hit moves", - async () => { - game.override.moveset([ Moves.DOUBLE_HIT ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.DOUBLE_HIT); - await game.move.forceHit(); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.turnData.hitCount).toBe(2); - } - ); - - it( - "should not apply to self-sacrifice moves", - async () => { - game.override.moveset([ Moves.SELF_DESTRUCT ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SELF_DESTRUCT); - - await game.phaseInterceptor.to("DamageAnimPhase", false); - - expect(leadPokemon.turnData.hitCount).toBe(1); - } - ); - - it( - "should not apply to Rollout", - async () => { - game.override.moveset([ Moves.ROLLOUT ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.ROLLOUT); - await game.move.forceHit(); - - await game.phaseInterceptor.to("DamageAnimPhase", false); - - expect(leadPokemon.turnData.hitCount).toBe(1); - } - ); - - it( - "should not apply multiplier to fixed-damage moves", - async () => { - game.override.moveset([ Moves.DRAGON_RAGE ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.DRAGON_RAGE); - await game.phaseInterceptor.to("BerryPhase", false); - - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - 80); - } - ); - - it( - "should not apply multiplier to counter moves", - async () => { - game.override.moveset([ Moves.COUNTER ]); - game.override.enemyMoveset([ Moves.TACKLE ]); - - await game.classicMode.startBattle([ Species.SHUCKLE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.COUNTER); - await game.phaseInterceptor.to("DamageAnimPhase"); - - const playerDamage = leadPokemon.getMaxHp() - leadPokemon.hp; - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - 4 * playerDamage); - } - ); - - it( - "should not apply to multi-target moves", - async () => { - game.override.battleType("double"); - game.override.moveset([ Moves.EARTHQUAKE ]); - game.override.passiveAbility(Abilities.LEVITATE); - - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); - - const playerPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.EARTHQUAKE); - game.move.select(Moves.EARTHQUAKE, 1); - - await game.phaseInterceptor.to("BerryPhase", false); - - playerPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1)); - } - ); - - it( - "should apply to multi-target moves when hitting only one target", - async () => { - game.override.moveset([ Moves.EARTHQUAKE ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.EARTHQUAKE); - await game.phaseInterceptor.to("DamageAnimPhase", false); - - expect(leadPokemon.turnData.hitCount).toBe(2); - } - ); - - it( - "should only trigger post-target move effects once", - async () => { - game.override.moveset([ Moves.MIND_BLOWN ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.MIND_BLOWN); - - await game.phaseInterceptor.to("DamageAnimPhase", false); - - expect(leadPokemon.turnData.hitCount).toBe(2); - - // This test will time out if the user faints - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() / 2)); - } - ); - - it( - "Burn Up only removes type after the second strike", - async () => { - game.override.moveset([ Moves.BURN_UP ]); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.BURN_UP); - - await game.phaseInterceptor.to("MoveEffectPhase"); - - expect(leadPokemon.turnData.hitCount).toBe(2); - expect(enemyPokemon.hp).toBeGreaterThan(0); - expect(leadPokemon.isOfType(Type.FIRE)).toBe(true); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.isOfType(Type.FIRE)).toBe(false); - } - ); - - it( - "Moves boosted by this ability and Multi-Lens should strike 3 times", - async () => { - game.override.moveset([ Moves.TACKLE ]); - game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.TACKLE); - - await game.phaseInterceptor.to("DamageAnimPhase"); - - expect(leadPokemon.turnData.hitCount).toBe(3); - } - ); - - it( - "Seismic Toss boosted by this ability and Multi-Lens should strike 3 times", - async () => { - game.override.moveset([ Moves.SEISMIC_TOSS ]); - game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - const enemyStartingHp = enemyPokemon.hp; - - game.move.select(Moves.SEISMIC_TOSS); - await game.move.forceHit(); - - await game.phaseInterceptor.to("DamageAnimPhase"); - - expect(leadPokemon.turnData.hitCount).toBe(3); - - await game.phaseInterceptor.to("MoveEndPhase", false); - - expect(enemyPokemon.hp).toBe(enemyStartingHp - 200); - } - ); - - it( - "Hyper Beam boosted by this ability should strike twice, then recharge", - async () => { - game.override.moveset([ Moves.HYPER_BEAM ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.HYPER_BEAM); - await game.move.forceHit(); - - await game.phaseInterceptor.to("DamageAnimPhase"); - - expect(leadPokemon.turnData.hitCount).toBe(2); - expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeUndefined(); - - await game.phaseInterceptor.to("TurnEndPhase"); - - expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeDefined(); - } - ); - - it( - "Anchor Shot boosted by this ability should only trap the target after the second hit", - async () => { - game.override.moveset([ Moves.ANCHOR_SHOT ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.ANCHOR_SHOT); - await game.move.forceHit(); - - await game.phaseInterceptor.to("DamageAnimPhase"); - - expect(leadPokemon.turnData.hitCount).toBe(2); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - - await game.phaseInterceptor.to("MoveEndPhase"); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); - - await game.phaseInterceptor.to("TurnEndPhase"); - - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); - } - ); - - it( - "Smack Down boosted by this ability should only ground the target after the second hit", - async () => { - game.override.moveset([ Moves.SMACK_DOWN ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.SMACK_DOWN); - await game.move.forceHit(); - - await game.phaseInterceptor.to("DamageAnimPhase"); - - expect(leadPokemon.turnData.hitCount).toBe(2); - expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined(); - - await game.phaseInterceptor.to("TurnEndPhase"); - - expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined(); - } - ); - - it( - "U-turn boosted by this ability should strike twice before forcing a switch", - async () => { - game.override.moveset([ Moves.U_TURN ]); - - await game.classicMode.startBattle([ Species.MAGIKARP, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.U_TURN); - await game.move.forceHit(); - - await game.phaseInterceptor.to("MoveEffectPhase"); - expect(leadPokemon.turnData.hitCount).toBe(2); - - // This will cause this test to time out if the switch was forced on the first hit. - await game.phaseInterceptor.to("MoveEffectPhase", false); - } - ); - - it( - "Wake-Up Slap boosted by this ability should only wake up the target after the second hit", - async () => { - game.override.moveset([ Moves.WAKE_UP_SLAP ]).enemyStatusEffect(StatusEffect.SLEEP); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.WAKE_UP_SLAP); - await game.move.forceHit(); - - await game.phaseInterceptor.to("DamageAnimPhase"); - - expect(leadPokemon.turnData.hitCount).toBe(2); - expect(enemyPokemon.status?.effect).toBe(StatusEffect.SLEEP); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(enemyPokemon.status?.effect).toBeUndefined(); - } - ); - - it( - "should not cause user to hit into King's Shield more than once", - async () => { - game.override.moveset([ Moves.TACKLE ]); - game.override.enemyMoveset([ Moves.KINGS_SHIELD ]); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.TACKLE); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(-1); - } - ); - - it( - "should not cause user to hit into Storm Drain more than once", - async () => { - game.override.moveset([ Moves.WATER_GUN ]); - game.override.enemyAbility(Abilities.STORM_DRAIN); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.WATER_GUN); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(1); - } - ); - - it("should not allow Future Sight to hit infinitely many times if the user switches out", async () => { - game.override.enemyLevel(1000) - .moveset(Moves.FUTURE_SIGHT); - await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - vi.spyOn(enemyPokemon, "damageAndUpdate"); - - game.move.select(Moves.FUTURE_SIGHT); - await game.toNextTurn(); - - game.doSwitchPokemon(1); - await game.toNextTurn(); - - game.doSwitchPokemon(2); - await game.toNextTurn(); - - // TODO: Update hit count to 1 once Future Sight is fixed to not activate abilities if user is off the field - expect(enemyPokemon.damageAndUpdate).toHaveBeenCalledTimes(2); - }); -}); diff --git a/src/test/abilities/power_construct.test.ts b/src/test/abilities/power_construct.test.ts deleted file mode 100644 index aaab5ddb5c4..00000000000 --- a/src/test/abilities/power_construct.test.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { Status } from "#app/data/status-effect"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -describe("Abilities - POWER CONSTRUCT", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - const moveToUse = Moves.SPLASH; - game.override.battleType("single"); - game.override.ability(Abilities.POWER_CONSTRUCT); - game.override.moveset([ moveToUse ]); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); - }); - - test( - "check if fainted 50% Power Construct Pokemon switches to base form on arena reset", - async () => { - const baseForm = 2, - completeForm = 4; - game.override.startingWave(4); - game.override.starterForms({ - [Species.ZYGARDE]: completeForm, - }); - - await game.classicMode.startBattle([ Species.MAGIKARP, Species.ZYGARDE ]); - - const zygarde = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.ZYGARDE); - expect(zygarde).not.toBe(undefined); - expect(zygarde!.formIndex).toBe(completeForm); - - zygarde!.hp = 0; - zygarde!.status = new Status(StatusEffect.FAINT); - expect(zygarde!.isFainted()).toBe(true); - - game.move.select(Moves.SPLASH); - await game.doKillOpponents(); - await game.phaseInterceptor.to(TurnEndPhase); - game.doSelectModifier(); - await game.phaseInterceptor.to(QuietFormChangePhase); - - expect(zygarde!.formIndex).toBe(baseForm); - }, - ); - - test( - "check if fainted 10% Power Construct Pokemon switches to base form on arena reset", - async () => { - const baseForm = 3, - completeForm = 5; - game.override.startingWave(4); - game.override.starterForms({ - [Species.ZYGARDE]: completeForm, - }); - - await game.classicMode.startBattle([ Species.MAGIKARP, Species.ZYGARDE ]); - - const zygarde = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.ZYGARDE); - expect(zygarde).not.toBe(undefined); - expect(zygarde!.formIndex).toBe(completeForm); - - zygarde!.hp = 0; - zygarde!.status = new Status(StatusEffect.FAINT); - expect(zygarde!.isFainted()).toBe(true); - - game.move.select(Moves.SPLASH); - await game.doKillOpponents(); - await game.phaseInterceptor.to(TurnEndPhase); - game.doSelectModifier(); - await game.phaseInterceptor.to(QuietFormChangePhase); - - expect(zygarde!.formIndex).toBe(baseForm); - }, - ); -}); diff --git a/src/test/abilities/protean.test.ts b/src/test/abilities/protean.test.ts deleted file mode 100644 index 787834f8a9d..00000000000 --- a/src/test/abilities/protean.test.ts +++ /dev/null @@ -1,347 +0,0 @@ -import { allMoves } from "#app/data/move"; -import { Type } from "#enums/type"; -import { Weather } from "#app/data/weather"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Abilities } from "#enums/abilities"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { Biome } from "#enums/biome"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; - - -describe("Abilities - Protean", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - game.override.ability(Abilities.PROTEAN); - game.override.startingLevel(100); - game.override.enemySpecies(Species.RATTATA); - game.override.enemyMoveset([ Moves.ENDURE, Moves.ENDURE, Moves.ENDURE, Moves.ENDURE ]); - }); - - test( - "ability applies and changes a pokemon's type", - async () => { - game.override.moveset([ Moves.SPLASH ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); - }, - ); - - // Test for Gen9+ functionality, we are using previous funcionality - test.skip( - "ability applies only once per switch in", - async () => { - game.override.moveset([ Moves.SPLASH, Moves.AGILITY ]); - - await game.startBattle([ Species.MAGIKARP, Species.BULBASAUR ]); - - let leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); - - game.move.select(Moves.AGILITY); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied.filter((a) => a === Abilities.PROTEAN)).toHaveLength(1); - const leadPokemonType = Type[leadPokemon.getTypes()[0]]; - const moveType = Type[allMoves[Moves.AGILITY].type]; - expect(leadPokemonType).not.toBe(moveType); - - await game.toNextTurn(); - game.doSwitchPokemon(1); - await game.toNextTurn(); - game.doSwitchPokemon(1); - await game.toNextTurn(); - - leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); - }, - ); - - test( - "ability applies correctly even if the pokemon's move has a variable type", - async () => { - game.override.moveset([ Moves.WEATHER_BALL ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.scene.arena.weather = new Weather(WeatherType.SUNNY); - game.move.select(Moves.WEATHER_BALL); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.PROTEAN); - expect(leadPokemon.getTypes()).toHaveLength(1); - const leadPokemonType = Type[leadPokemon.getTypes()[0]], - moveType = Type[Type.FIRE]; - expect(leadPokemonType).toBe(moveType); - }, - ); - - test( - "ability applies correctly even if the type has changed by another ability", - async () => { - game.override.moveset([ Moves.TACKLE ]); - game.override.passiveAbility(Abilities.REFRIGERATE); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.PROTEAN); - expect(leadPokemon.getTypes()).toHaveLength(1); - const leadPokemonType = Type[leadPokemon.getTypes()[0]], - moveType = Type[Type.ICE]; - expect(leadPokemonType).toBe(moveType); - }, - ); - - test( - "ability applies correctly even if the pokemon's move calls another move", - async () => { - game.override.moveset([ Moves.NATURE_POWER ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.scene.arena.biomeType = Biome.MOUNTAIN; - game.move.select(Moves.NATURE_POWER); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.AIR_SLASH); - }, - ); - - test( - "ability applies correctly even if the pokemon's move is delayed / charging", - async () => { - game.override.moveset([ Moves.DIG ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.DIG); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.DIG); - }, - ); - - test( - "ability applies correctly even if the pokemon's move misses", - async () => { - game.override.moveset([ Moves.TACKLE ]); - game.override.enemyMoveset(Moves.SPLASH); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.TACKLE); - await game.move.forceMiss(); - await game.phaseInterceptor.to(TurnEndPhase); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon.isFullHp()).toBe(true); - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); - }, - ); - - test( - "ability applies correctly even if the pokemon's move is protected against", - async () => { - game.override.moveset([ Moves.TACKLE ]); - game.override.enemyMoveset([ Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); - }, - ); - - test( - "ability applies correctly even if the pokemon's move fails because of type immunity", - async () => { - game.override.moveset([ Moves.TACKLE ]); - game.override.enemySpecies(Species.GASTLY); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); - }, - ); - - test( - "ability is not applied if pokemon's type is the same as the move's type", - async () => { - game.override.moveset([ Moves.SPLASH ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - leadPokemon.summonData.types = [ allMoves[Moves.SPLASH].type ]; - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN); - }, - ); - - test( - "ability is not applied if pokemon is terastallized", - async () => { - game.override.moveset([ Moves.SPLASH ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - vi.spyOn(leadPokemon, "isTerastallized").mockReturnValue(true); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN); - }, - ); - - test( - "ability is not applied if pokemon uses struggle", - async () => { - game.override.moveset([ Moves.STRUGGLE ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.STRUGGLE); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN); - }, - ); - - test( - "ability is not applied if the pokemon's move fails", - async () => { - game.override.moveset([ Moves.BURN_UP ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.BURN_UP); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN); - }, - ); - - test( - "ability applies correctly even if the pokemon's Trick-or-Treat fails", - async () => { - game.override.moveset([ Moves.TRICK_OR_TREAT ]); - game.override.enemySpecies(Species.GASTLY); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.TRICK_OR_TREAT); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TRICK_OR_TREAT); - }, - ); - - test( - "ability applies correctly and the pokemon curses itself", - async () => { - game.override.moveset([ Moves.CURSE ]); - - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - game.move.select(Moves.CURSE); - await game.phaseInterceptor.to(TurnEndPhase); - - testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.CURSE); - expect(leadPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined); - }, - ); -}); - -function testPokemonTypeMatchesDefaultMoveType(pokemon: PlayerPokemon, move: Moves) { - expect(pokemon.summonData.abilitiesApplied).toContain(Abilities.PROTEAN); - expect(pokemon.getTypes()).toHaveLength(1); - const pokemonType = Type[pokemon.getTypes()[0]], - moveType = Type[allMoves[move].type]; - expect(pokemonType).toBe(moveType); -} diff --git a/src/test/abilities/sand_veil.test.ts b/src/test/abilities/sand_veil.test.ts deleted file mode 100644 index ee8ca450df9..00000000000 --- a/src/test/abilities/sand_veil.test.ts +++ /dev/null @@ -1,79 +0,0 @@ -import { StatMultiplierAbAttr, allAbilities } from "#app/data/ability"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { Stat } from "#enums/stat"; -import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; - - -describe("Abilities - Sand Veil", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.moveset([ Moves.SPLASH ]); - game.override.enemySpecies(Species.MEOWSCARADA); - game.override.enemyAbility(Abilities.INSOMNIA); - game.override.enemyMoveset([ Moves.TWISTER, Moves.TWISTER, Moves.TWISTER, Moves.TWISTER ]); - game.override.startingLevel(100); - game.override.enemyLevel(100); - game.override - .weather(WeatherType.SANDSTORM) - .battleType("double"); - }); - - test( - "ability should increase the evasiveness of the source", - async () => { - await game.startBattle([ Species.SNORLAX, Species.BLISSEY ]); - - const leadPokemon = game.scene.getPlayerField(); - - vi.spyOn(leadPokemon[0], "getAbility").mockReturnValue(allAbilities[Abilities.SAND_VEIL]); - - const sandVeilAttr = allAbilities[Abilities.SAND_VEIL].getAttrs(StatMultiplierAbAttr)[0]; - vi.spyOn(sandVeilAttr, "applyStatStage").mockImplementation( - (_pokemon, _passive, _simulated, stat, statValue, _args) => { - if (stat === Stat.EVA && game.scene.arena.weather?.weatherType === WeatherType.SANDSTORM) { - statValue.value *= -1; // will make all attacks miss - return true; - } - return false; - } - ); - - expect(leadPokemon[0].hasAbility(Abilities.SAND_VEIL)).toBe(true); - expect(leadPokemon[1].hasAbility(Abilities.SAND_VEIL)).toBe(false); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(MoveEffectPhase, false); - - await game.phaseInterceptor.to(MoveEndPhase, false); - - expect(leadPokemon[0].isFullHp()).toBe(true); - expect(leadPokemon[1].hp).toBeLessThan(leadPokemon[1].getMaxHp()); - } - ); -}); diff --git a/src/test/abilities/schooling.test.ts b/src/test/abilities/schooling.test.ts deleted file mode 100644 index e1ec58f517e..00000000000 --- a/src/test/abilities/schooling.test.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { Status } from "#app/data/status-effect"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -describe("Abilities - SCHOOLING", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - const moveToUse = Moves.SPLASH; - game.override.battleType("single"); - game.override.ability(Abilities.SCHOOLING); - game.override.moveset([ moveToUse ]); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); - }); - - test( - "check if fainted pokemon switches to base form on arena reset", - async () => { - const soloForm = 0, - schoolForm = 1; - game.override.startingWave(4); - game.override.starterForms({ - [Species.WISHIWASHI]: schoolForm, - }); - - await game.startBattle([ Species.MAGIKARP, Species.WISHIWASHI ]); - - const wishiwashi = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.WISHIWASHI)!; - expect(wishiwashi).not.toBe(undefined); - expect(wishiwashi.formIndex).toBe(schoolForm); - - wishiwashi.hp = 0; - wishiwashi.status = new Status(StatusEffect.FAINT); - expect(wishiwashi.isFainted()).toBe(true); - - game.move.select(Moves.SPLASH); - await game.doKillOpponents(); - await game.phaseInterceptor.to(TurnEndPhase); - game.doSelectModifier(); - await game.phaseInterceptor.to(QuietFormChangePhase); - - expect(wishiwashi.formIndex).toBe(soloForm); - }, - ); -}); diff --git a/src/test/abilities/shields_down.test.ts b/src/test/abilities/shields_down.test.ts deleted file mode 100644 index 6ffc28c37ab..00000000000 --- a/src/test/abilities/shields_down.test.ts +++ /dev/null @@ -1,192 +0,0 @@ -import { Status } from "#app/data/status-effect"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -describe("Abilities - SHIELDS DOWN", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - const moveToUse = Moves.SPLASH; - game.override.battleType("single"); - game.override.ability(Abilities.SHIELDS_DOWN); - game.override.moveset([ moveToUse ]); - game.override.enemyMoveset([ Moves.TACKLE ]); - }); - - test( - "check if fainted pokemon switched to base form on arena reset", - async () => { - const meteorForm = 0, - coreForm = 7; - game.override.startingWave(4); - game.override.starterForms({ - [Species.MINIOR]: coreForm, - }); - - await game.classicMode.startBattle([ Species.MAGIKARP, Species.MINIOR ]); - - const minior = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.MINIOR)!; - expect(minior).not.toBe(undefined); - expect(minior.formIndex).toBe(coreForm); - - minior.hp = 0; - minior.status = new Status(StatusEffect.FAINT); - expect(minior.isFainted()).toBe(true); - - game.move.select(Moves.SPLASH); - await game.doKillOpponents(); - await game.phaseInterceptor.to(TurnEndPhase); - game.doSelectModifier(); - await game.phaseInterceptor.to(QuietFormChangePhase); - - expect(minior.formIndex).toBe(meteorForm); - }, - ); - - test("should ignore non-volatile status moves", - async () => { - game.override.enemyMoveset([ Moves.SPORE ]); - - await game.classicMode.startBattle([ Species.MINIOR ]); - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(game.scene.getPlayerPokemon()!.status).toBe(undefined); - } - ); - - test("should still ignore non-volatile status moves used by a pokemon with mold breaker", - async () => { - game.override.enemyAbility(Abilities.MOLD_BREAKER); - game.override.enemyMoveset([ Moves.SPORE ]); - - await game.classicMode.startBattle([ Species.MINIOR ]); - - game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPORE); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(game.scene.getPlayerPokemon()!.status).toBe(undefined); - } - ); - - test("should ignore non-volatile secondary status effects", - async() => { - game.override.enemyMoveset([ Moves.NUZZLE ]); - - await game.classicMode.startBattle([ Species.MINIOR ]); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(game.scene.getPlayerPokemon()!.status).toBe(undefined); - } - ); - - test("should ignore status moves even through mold breaker", - async () => { - game.override.enemyMoveset([ Moves.SPORE ]); - game.override.enemyAbility(Abilities.MOLD_BREAKER); - - await game.classicMode.startBattle([ Species.MINIOR ]); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase); - - expect(game.scene.getPlayerPokemon()!.status).toBe(undefined); - } - ); - - - // toxic spikes currently does not poison flying types when gravity is in effect - test.todo("should become poisoned by toxic spikes when grounded", - async () => { - game.override.enemyMoveset([ Moves.GRAVITY, Moves.TOXIC_SPIKES, Moves.SPLASH ]); - game.override.moveset([ Moves.GRAVITY, Moves.SPLASH ]); - - await game.classicMode.startBattle([ Species.MAGIKARP, Species.MINIOR ]); - - // turn 1 - game.move.select(Moves.GRAVITY); - await game.forceEnemyMove(Moves.TOXIC_SPIKES); - await game.toNextTurn(); - - // turn 2 - game.doSwitchPokemon(1); - await game.forceEnemyMove(Moves.SPLASH); - await game.toNextTurn(); - - expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.MINIOR); - expect(game.scene.getPlayerPokemon()!.species.formIndex).toBe(0); - expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.POISON); - } - ); - - test("should ignore yawn", - async () => { - game.override.enemyMoveset([ Moves.YAWN ]); - - await game.classicMode.startBattle([ Species.MAGIKARP, Species.MINIOR ]); - - game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.YAWN); - - await game.phaseInterceptor.to(TurnEndPhase); - expect(game.scene.getPlayerPokemon()!.findTag( (tag ) => tag.tagType === BattlerTagType.DROWSY)).toBe(undefined); - } - ); - - test("should not ignore volatile status effects", - async () => { - game.override.enemyMoveset([ Moves.CONFUSE_RAY ]); - - await game.classicMode.startBattle([ Species.MINIOR ]); - - game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.CONFUSE_RAY); - - await game.phaseInterceptor.to(TurnEndPhase); - - expect(game.scene.getPlayerPokemon()!.findTag( (tag ) => tag.tagType === BattlerTagType.CONFUSED)).not.toBe(undefined); - } - ); - - // the `NoTransformAbilityAbAttr` attribute is not checked anywhere, so this test cannot pass. - test.todo("ditto should not be immune to status after transforming", - async () => { - game.override.enemySpecies(Species.DITTO); - game.override.enemyAbility(Abilities.IMPOSTER); - game.override.moveset([ Moves.SPLASH, Moves.SPORE ]); - - await game.classicMode.startBattle([ Species.MINIOR ]); - - game.move.select(Moves.SPORE); - await game.forceEnemyMove(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase); - expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.SLEEP); - } - ); - -}); diff --git a/src/test/abilities/speed_boost.test.ts b/src/test/abilities/speed_boost.test.ts deleted file mode 100644 index 74ee6a8cb92..00000000000 --- a/src/test/abilities/speed_boost.test.ts +++ /dev/null @@ -1,129 +0,0 @@ -import { Stat } from "#enums/stat"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import type { CommandPhase } from "#app/phases/command-phase"; -import { Command } from "#app/ui/command-ui-handler"; -import { AttemptRunPhase } from "#app/phases/attempt-run-phase"; - -describe("Abilities - Speed Boost", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override - .battleType("single") - .enemySpecies(Species.SHUCKLE) - .enemyAbility(Abilities.BALL_FETCH) - .enemyLevel(100) - .ability(Abilities.SPEED_BOOST) - .enemyMoveset(Moves.SPLASH) - .moveset([ Moves.SPLASH, Moves.U_TURN ]); - }); - - it("should increase speed by 1 stage at end of turn", - async () => { - await game.classicMode.startBattle(); - - const playerPokemon = game.scene.getPlayerPokemon()!; - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - - expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1); - }); - - it("should not trigger this turn if pokemon was switched into combat via attack, but the turn after", - async () => { - await game.classicMode.startBattle([ - Species.SHUCKLE, - Species.NINJASK - ]); - - game.move.select(Moves.U_TURN); - game.doSelectPartyPokemon(1); - await game.toNextTurn(); - const playerPokemon = game.scene.getPlayerPokemon()!; - expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0); - - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1); - }); - - it("checking back to back swtiches", - async () => { - await game.classicMode.startBattle([ - Species.SHUCKLE, - Species.NINJASK - ]); - - const [ shuckle, ninjask ] = game.scene.getPlayerParty(); - - game.move.select(Moves.U_TURN); - game.doSelectPartyPokemon(1); - await game.toNextTurn(); - expect(game.scene.getPlayerPokemon()!).toBe(ninjask); - expect(ninjask.getStatStage(Stat.SPD)).toBe(0); - - game.move.select(Moves.U_TURN); - game.doSelectPartyPokemon(1); - await game.toNextTurn(); - expect(game.scene.getPlayerPokemon()!).toBe(shuckle); - expect(shuckle.getStatStage(Stat.SPD)).toBe(0); - - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - expect(shuckle.getStatStage(Stat.SPD)).toBe(1); - }); - - it("should not trigger this turn if pokemon was switched into combat via normal switch, but the turn after", - async () => { - await game.classicMode.startBattle([ - Species.SHUCKLE, - Species.NINJASK - ]); - - game.doSwitchPokemon(1); - await game.toNextTurn(); - const playerPokemon = game.scene.getPlayerPokemon()!; - expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0); - - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1); - }); - - it("should not trigger if pokemon fails to escape", - async () => { - await game.classicMode.startBattle([ Species.SHUCKLE ]); - - const commandPhase = game.scene.getCurrentPhase() as CommandPhase; - commandPhase.handleCommand(Command.RUN, 0); - const runPhase = game.scene.getCurrentPhase() as AttemptRunPhase; - runPhase.forceFailEscape = true; - await game.phaseInterceptor.to(AttemptRunPhase); - await game.toNextTurn(); - - const playerPokemon = game.scene.getPlayerPokemon()!; - expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0); - - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1); - }); -}); diff --git a/src/test/abilities/sturdy.test.ts b/src/test/abilities/sturdy.test.ts deleted file mode 100644 index 8f134338f12..00000000000 --- a/src/test/abilities/sturdy.test.ts +++ /dev/null @@ -1,92 +0,0 @@ -import type { EnemyPokemon } from "#app/field/pokemon"; -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -describe("Abilities - Sturdy", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - - game.override.starterSpecies(Species.LUCARIO); - game.override.startingLevel(100); - game.override.moveset([ Moves.CLOSE_COMBAT, Moves.FISSURE ]); - - game.override.enemySpecies(Species.ARON); - game.override.enemyLevel(5); - game.override.enemyAbility(Abilities.STURDY); - }); - - test( - "Sturdy activates when user is at full HP", - async () => { - await game.startBattle(); - game.move.select(Moves.CLOSE_COMBAT); - await game.phaseInterceptor.to(MoveEndPhase); - expect(game.scene.getEnemyParty()[0].hp).toBe(1); - }, - ); - - test( - "Sturdy doesn't activate when user is not at full HP", - async () => { - await game.startBattle(); - - const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0]; - enemyPokemon.hp = enemyPokemon.getMaxHp() - 1; - - game.move.select(Moves.CLOSE_COMBAT); - await game.phaseInterceptor.to(DamageAnimPhase); - - expect(enemyPokemon.hp).toBe(0); - expect(enemyPokemon.isFainted()).toBe(true); - }, - ); - - test( - "Sturdy pokemon should be immune to OHKO moves", - async () => { - await game.startBattle(); - game.move.select(Moves.FISSURE); - await game.phaseInterceptor.to(MoveEndPhase); - - const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0]; - expect(enemyPokemon.isFullHp()).toBe(true); - }, - ); - - test( - "Sturdy is ignored by pokemon with `Abilities.MOLD_BREAKER`", - async () => { - game.override.ability(Abilities.MOLD_BREAKER); - - await game.startBattle(); - game.move.select(Moves.CLOSE_COMBAT); - await game.phaseInterceptor.to(DamageAnimPhase); - - const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0]; - expect(enemyPokemon.hp).toBe(0); - expect(enemyPokemon.isFainted()).toBe(true); - }, - ); - -}); diff --git a/src/test/abilities/tera_shell.test.ts b/src/test/abilities/tera_shell.test.ts deleted file mode 100644 index 01382d0fd9a..00000000000 --- a/src/test/abilities/tera_shell.test.ts +++ /dev/null @@ -1,132 +0,0 @@ -import { BattlerIndex } from "#app/battle"; -import { Abilities } from "#app/enums/abilities"; -import { Moves } from "#app/enums/moves"; -import { Species } from "#app/enums/species"; -import { HitResult } from "#app/field/pokemon"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - -describe("Abilities - Tera Shell", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override - .battleType("single") - .ability(Abilities.TERA_SHELL) - .moveset([ Moves.SPLASH ]) - .enemySpecies(Species.SNORLAX) - .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset([ Moves.MACH_PUNCH ]) - .startingLevel(100) - .enemyLevel(100); - }); - - it( - "should change the effectiveness of non-resisted attacks when the source is at full HP", - async () => { - await game.classicMode.startBattle([ Species.SNORLAX ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - vi.spyOn(playerPokemon, "getMoveEffectiveness"); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to("MoveEndPhase"); - expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0.5); - - await game.toNextTurn(); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to("MoveEndPhase"); - expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(2); - } - ); - - it( - "should not override type immunities", - async () => { - game.override.enemyMoveset([ Moves.SHADOW_SNEAK ]); - - await game.classicMode.startBattle([ Species.SNORLAX ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - vi.spyOn(playerPokemon, "getMoveEffectiveness"); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to("MoveEndPhase"); - expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0); - } - ); - - it( - "should not override type multipliers less than 0.5x", - async () => { - game.override.enemyMoveset([ Moves.QUICK_ATTACK ]); - - await game.classicMode.startBattle([ Species.AGGRON ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - vi.spyOn(playerPokemon, "getMoveEffectiveness"); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to("MoveEndPhase"); - expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0.25); - } - ); - - it( - "should not affect the effectiveness of fixed-damage moves", - async () => { - game.override.enemyMoveset([ Moves.DRAGON_RAGE ]); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - vi.spyOn(playerPokemon, "apply"); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to("BerryPhase", false); - expect(playerPokemon.apply).toHaveLastReturnedWith(HitResult.EFFECTIVE); - expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp() - 40); - } - ); - - it( - "should change the effectiveness of all strikes of a multi-strike move", - async () => { - game.override.enemyMoveset([ Moves.DOUBLE_HIT ]); - - await game.classicMode.startBattle([ Species.SNORLAX ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - vi.spyOn(playerPokemon, "apply"); - - game.move.select(Moves.SPLASH); - - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); - await game.move.forceHit(); - for (let i = 0; i < 2; i++) { - await game.phaseInterceptor.to("MoveEffectPhase"); - expect(playerPokemon.apply).toHaveLastReturnedWith(HitResult.NOT_VERY_EFFECTIVE); - } - expect(playerPokemon.apply).toHaveReturnedTimes(2); - } - ); -}); diff --git a/src/test/abilities/unseen_fist.test.ts b/src/test/abilities/unseen_fist.test.ts deleted file mode 100644 index f8fa8a723fe..00000000000 --- a/src/test/abilities/unseen_fist.test.ts +++ /dev/null @@ -1,107 +0,0 @@ -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; - - -describe("Abilities - Unseen Fist", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - game.override.starterSpecies(Species.URSHIFU); - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset([ Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT ]); - game.override.startingLevel(100); - game.override.enemyLevel(100); - }); - - it( - "should cause a contact move to ignore Protect", - () => testUnseenFistHitResult(game, Moves.QUICK_ATTACK, Moves.PROTECT, true), - ); - - it( - "should not cause a non-contact move to ignore Protect", - () => testUnseenFistHitResult(game, Moves.ABSORB, Moves.PROTECT, false), - ); - - it( - "should not apply if the source has Long Reach", - () => { - game.override.passiveAbility(Abilities.LONG_REACH); - testUnseenFistHitResult(game, Moves.QUICK_ATTACK, Moves.PROTECT, false); - } - ); - - it( - "should cause a contact move to ignore Wide Guard", - () => testUnseenFistHitResult(game, Moves.BREAKING_SWIPE, Moves.WIDE_GUARD, true), - ); - - it( - "should not cause a non-contact move to ignore Wide Guard", - () => testUnseenFistHitResult(game, Moves.BULLDOZE, Moves.WIDE_GUARD, false), - ); - - it( - "should cause a contact move to ignore Protect, but not Substitute", - async () => { - game.override.enemyLevel(1); - game.override.moveset([ Moves.TACKLE ]); - - await game.startBattle(); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - enemyPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, enemyPokemon.id); - - game.move.select(Moves.TACKLE); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(enemyPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeUndefined(); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - } - ); -}); - -async function testUnseenFistHitResult(game: GameManager, attackMove: Moves, protectMove: Moves, shouldSucceed: boolean = true): Promise { - game.override.moveset([ attackMove ]); - game.override.enemyMoveset([ protectMove, protectMove, protectMove, protectMove ]); - - await game.startBattle(); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); - - const enemyStartingHp = enemyPokemon.hp; - - game.move.select(attackMove); - await game.phaseInterceptor.to(TurnEndPhase, false); - - if (shouldSucceed) { - expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); - } else { - expect(enemyPokemon.hp).toBe(enemyStartingHp); - } -} diff --git a/src/test/battlerTags/substitute.test.ts b/src/test/battlerTags/substitute.test.ts deleted file mode 100644 index 4bf7e584ed3..00000000000 --- a/src/test/battlerTags/substitute.test.ts +++ /dev/null @@ -1,231 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from "vitest"; -import type { PokemonTurnData, TurnMove, PokemonMove } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { MoveResult } from "#app/field/pokemon"; -import BattleScene from "#app/battle-scene"; -import { BattlerTagLapseType, BindTag, SubstituteTag } from "#app/data/battler-tags"; -import { Moves } from "#app/enums/moves"; -import { PokemonAnimType } from "#app/enums/pokemon-anim-type"; -import * as messages from "#app/messages"; -import { allMoves } from "#app/data/move"; -import type { MoveEffectPhase } from "#app/phases/move-effect-phase"; - -describe("BattlerTag - SubstituteTag", () => { - let mockPokemon: Pokemon; - - describe("onAdd behavior", () => { - beforeEach(() => { - mockPokemon = { - scene: new BattleScene(), - hp: 101, - id: 0, - getMaxHp: vi.fn().mockReturnValue(101) as Pokemon["getMaxHp"], - findAndRemoveTags: vi.fn().mockImplementation((tagFilter) => { - // simulate a Trapped tag set by another Pokemon, then expect the filter to catch it. - const trapTag = new BindTag(5, 0); - expect(tagFilter(trapTag)).toBeTruthy(); - return true; - }) as Pokemon["findAndRemoveTags"] - } as unknown as Pokemon; - - vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue(""); - vi.spyOn(mockPokemon.scene as BattleScene, "getPokemonById").mockImplementation(pokemonId => mockPokemon.id === pokemonId ? mockPokemon : null); - }); - - it( - "sets the tag's HP to 1/4 of the source's max HP (rounded down)", - async () => { - const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); - - vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true); - vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); - - subject.onAdd(mockPokemon); - - expect(subject.hp).toBe(25); - } - ); - - it( - "triggers on-add effects that bring the source out of focus", - async () => { - const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); - - vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation( - (pokemon, battleAnimType, fieldAssets?, delayed?) => { - expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_ADD); - return true; - } - ); - - vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); - - subject.onAdd(mockPokemon); - - expect(subject.sourceInFocus).toBeFalsy(); - expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1); - expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1); - } - ); - - it( - "removes effects that trap the source", - async () => { - const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); - - vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); - - subject.onAdd(mockPokemon); - expect(mockPokemon.findAndRemoveTags).toHaveBeenCalledTimes(1); - } - ); - }); - - describe("onRemove behavior", () => { - beforeEach(() => { - mockPokemon = { - scene: new BattleScene(), - hp: 101, - id: 0, - isFainted: vi.fn().mockReturnValue(false) as Pokemon["isFainted"] - } as unknown as Pokemon; - - vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue(""); - }); - - it( - "triggers on-remove animation and message", - async () => { - const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); - subject.sourceInFocus = false; - - vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation( - (pokemon, battleAnimType, fieldAssets?, delayed?) => { - expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_REMOVE); - return true; - } - ); - - vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); - - subject.onRemove(mockPokemon); - - expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1); - expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1); - } - ); - }); - - describe("lapse behavior", () => { - beforeEach(() => { - mockPokemon = { - scene: new BattleScene(), - hp: 101, - id: 0, - turnData: { acted: true } as PokemonTurnData, - getLastXMoves: vi.fn().mockReturnValue([ { move: Moves.TACKLE, result: MoveResult.SUCCESS } as TurnMove ]) as Pokemon["getLastXMoves"], - } as unknown as Pokemon; - - vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue(""); - }); - - it( - "PRE_MOVE lapse triggers pre-move animation", - async () => { - const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); - - vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation( - (pokemon, battleAnimType, fieldAssets?, delayed?) => { - expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_PRE_MOVE); - return true; - } - ); - - vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); - - expect(subject.lapse(mockPokemon, BattlerTagLapseType.PRE_MOVE)).toBeTruthy(); - - expect(subject.sourceInFocus).toBeTruthy(); - expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1); - expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled(); - } - ); - - it( - "AFTER_MOVE lapse triggers post-move animation", - async () => { - const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); - - vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation( - (pokemon, battleAnimType, fieldAssets?, delayed?) => { - expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_POST_MOVE); - return true; - } - ); - - vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); - - expect(subject.lapse(mockPokemon, BattlerTagLapseType.AFTER_MOVE)).toBeTruthy(); - - expect(subject.sourceInFocus).toBeFalsy(); - expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1); - expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled(); - } - ); - - // TODO: Figure out how to mock a MoveEffectPhase correctly for this test - it.todo( - "HIT lapse triggers on-hit message", - async () => { - const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); - - vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true); - vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); - - const pokemonMove = { - getMove: vi.fn().mockReturnValue(allMoves[Moves.TACKLE]) as PokemonMove["getMove"] - } as PokemonMove; - - const moveEffectPhase = { - move: pokemonMove, - getUserPokemon: vi.fn().mockReturnValue(undefined) as MoveEffectPhase["getUserPokemon"] - } as MoveEffectPhase; - - vi.spyOn(mockPokemon.scene as BattleScene, "getCurrentPhase").mockReturnValue(moveEffectPhase); - vi.spyOn(allMoves[Moves.TACKLE], "hitsSubstitute").mockReturnValue(true); - - expect(subject.lapse(mockPokemon, BattlerTagLapseType.HIT)).toBeTruthy(); - - expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).not.toHaveBeenCalled(); - expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1); - } - ); - - it( - "CUSTOM lapse flags the tag for removal", - async () => { - const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); - - vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true); - vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); - - expect(subject.lapse(mockPokemon, BattlerTagLapseType.CUSTOM)).toBeFalsy(); - } - ); - - it( - "Unsupported lapse type does nothing", - async () => { - const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); - - vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true); - vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); - - expect(subject.lapse(mockPokemon, BattlerTagLapseType.TURN_END)).toBeTruthy(); - - expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).not.toHaveBeenCalled(); - expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled(); - } - ); - }); -}); diff --git a/src/test/enemy_command.test.ts b/src/test/enemy_command.test.ts deleted file mode 100644 index 647c0be279a..00000000000 --- a/src/test/enemy_command.test.ts +++ /dev/null @@ -1,109 +0,0 @@ -import type BattleScene from "#app/battle-scene"; -import { allMoves, MoveCategory } from "#app/data/move"; -import { Abilities } from "#app/enums/abilities"; -import { Moves } from "#app/enums/moves"; -import { Species } from "#app/enums/species"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import { AiType } from "#app/field/pokemon"; -import { randSeedInt } from "#app/utils"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - -let globalScene: BattleScene; -const NUM_TRIALS = 300; - -type MoveChoiceSet = { [key: number]: number }; - -function getEnemyMoveChoices(pokemon: EnemyPokemon, moveChoices: MoveChoiceSet): void { - // Use an unseeded random number generator in place of the mocked-out randBattleSeedInt - vi.spyOn(globalScene, "randBattleSeedInt").mockImplementation((range, min?) => { - return randSeedInt(range, min); - }); - for (let i = 0; i < NUM_TRIALS; i++) { - const queuedMove = pokemon.getNextMove(); - moveChoices[queuedMove.move]++; - } - - for (const [ moveId, count ] of Object.entries(moveChoices)) { - console.log(`Move: ${allMoves[moveId].name} Count: ${count} (${count / NUM_TRIALS * 100}%)`); - } -} - -describe("Enemy Commands - Move Selection", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - globalScene = game.scene; - - game.override - .ability(Abilities.BALL_FETCH) - .enemyAbility(Abilities.BALL_FETCH); - }); - - it( - "should never use Status moves if an attack can KO", - async () => { - game.override - .enemySpecies(Species.ETERNATUS) - .enemyMoveset([ Moves.ETERNABEAM, Moves.SLUDGE_BOMB, Moves.DRAGON_DANCE, Moves.COSMIC_POWER ]) - .startingLevel(1) - .enemyLevel(100); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - enemyPokemon.aiType = AiType.SMART_RANDOM; - - const moveChoices: MoveChoiceSet = {}; - const enemyMoveset = enemyPokemon.getMoveset(); - enemyMoveset.forEach(mv => moveChoices[mv!.moveId] = 0); - getEnemyMoveChoices(enemyPokemon, moveChoices); - - enemyMoveset.forEach(mv => { - if (mv?.getMove().category === MoveCategory.STATUS) { - expect(moveChoices[mv.moveId]).toBe(0); - } - }); - } - ); - - it( - "should not select Last Resort if it would fail, even if the move KOs otherwise", - async () => { - game.override - .enemySpecies(Species.KANGASKHAN) - .enemyMoveset([ Moves.LAST_RESORT, Moves.GIGA_IMPACT, Moves.SPLASH, Moves.SWORDS_DANCE ]) - .startingLevel(1) - .enemyLevel(100); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - enemyPokemon.aiType = AiType.SMART_RANDOM; - - const moveChoices: MoveChoiceSet = {}; - const enemyMoveset = enemyPokemon.getMoveset(); - enemyMoveset.forEach(mv => moveChoices[mv!.moveId] = 0); - getEnemyMoveChoices(enemyPokemon, moveChoices); - - enemyMoveset.forEach(mv => { - if (mv?.getMove().category === MoveCategory.STATUS || mv?.moveId === Moves.LAST_RESORT) { - expect(moveChoices[mv.moveId]).toBe(0); - } - }); - } - ); -}); diff --git a/src/test/moves/autotomize.test.ts b/src/test/moves/autotomize.test.ts deleted file mode 100644 index e15642b7ce5..00000000000 --- a/src/test/moves/autotomize.test.ts +++ /dev/null @@ -1,98 +0,0 @@ -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; - -describe("Moves - Autotomize", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - const TIMEOUT = 20 * 1000; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override - .moveset([ Moves.AUTOTOMIZE, Moves.KINGS_SHIELD, Moves.FALSE_SWIPE ]) - .battleType("single") - .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(Moves.SPLASH); - }); - - it("Autotomize should reduce weight", async () => { - const baseDracozoltWeight = 190; - const oneAutotomizeDracozoltWeight = 90; - const twoAutotomizeDracozoltWeight = 0.1; - const threeAutotomizeDracozoltWeight = 0.1; - - await game.classicMode.startBattle([ Species.DRACOZOLT ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - expect(playerPokemon.getWeight()).toBe(baseDracozoltWeight); - game.move.select(Moves.AUTOTOMIZE); - await game.toNextTurn(); - expect(playerPokemon.getWeight()).toBe(oneAutotomizeDracozoltWeight); - - game.move.select(Moves.AUTOTOMIZE); - await game.toNextTurn(); - expect(playerPokemon.getWeight()).toBe(twoAutotomizeDracozoltWeight); - - - game.move.select(Moves.AUTOTOMIZE); - await game.toNextTurn(); - expect(playerPokemon.getWeight()).toBe(threeAutotomizeDracozoltWeight); - }, TIMEOUT); - - it("Changing forms should revert weight", async () => { - const baseAegislashWeight = 53; - const autotomizeAegislashWeight = 0.1; - - await game.classicMode.startBattle([ Species.AEGISLASH ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - - expect(playerPokemon.getWeight()).toBe(baseAegislashWeight); - - game.move.select(Moves.AUTOTOMIZE); - await game.toNextTurn(); - expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight); - - // Transform to sword form - game.move.select(Moves.FALSE_SWIPE); - await game.toNextTurn(); - expect(playerPokemon.getWeight()).toBe(baseAegislashWeight); - - game.move.select(Moves.AUTOTOMIZE); - await game.toNextTurn(); - expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight); - - // Transform to shield form - game.move.select(Moves.KINGS_SHIELD); - await game.toNextTurn(); - expect(playerPokemon.getWeight()).toBe(baseAegislashWeight); - - game.move.select(Moves.AUTOTOMIZE); - await game.toNextTurn(); - expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight); - }, TIMEOUT); - - it("Autotomize should interact with light metal correctly", async () => { - const baseLightGroudonWeight = 475; - const autotomizeLightGroudonWeight = 425; - game.override.ability(Abilities.LIGHT_METAL); - await game.classicMode.startBattle([ Species.GROUDON ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - expect(playerPokemon.getWeight()).toBe(baseLightGroudonWeight); - game.move.select(Moves.AUTOTOMIZE); - await game.toNextTurn(); - expect(playerPokemon.getWeight()).toBe(autotomizeLightGroudonWeight); - }, TIMEOUT); -}); diff --git a/src/test/moves/baneful_bunker.test.ts b/src/test/moves/baneful_bunker.test.ts deleted file mode 100644 index a0fc0f21ee2..00000000000 --- a/src/test/moves/baneful_bunker.test.ts +++ /dev/null @@ -1,92 +0,0 @@ -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import GameManager from "../utils/gameManager"; -import { Species } from "#enums/species"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { BattlerIndex } from "#app/battle"; -import { StatusEffect } from "#app/enums/status-effect"; - - -describe("Moves - Baneful Bunker", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override.battleType("single"); - - game.override.moveset(Moves.SLASH); - - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyAbility(Abilities.INSOMNIA); - game.override.enemyMoveset(Moves.BANEFUL_BUNKER); - - game.override.startingLevel(100); - game.override.enemyLevel(100); - }); - test( - "should protect the user and poison attackers that make contact", - async () => { - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.SLASH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); - await game.phaseInterceptor.to("BerryPhase", false); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeTruthy(); - } - ); - test( - "should protect the user and poison attackers that make contact, regardless of accuracy checks", - async () => { - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.SLASH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); - await game.phaseInterceptor.to("MoveEffectPhase"); - - await game.move.forceMiss(); - await game.phaseInterceptor.to("BerryPhase", false); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeTruthy(); - } - ); - - test( - "should not poison attackers that don't make contact", - async () => { - game.override.moveset(Moves.FLASH_CANNON); - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.FLASH_CANNON); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); - await game.phaseInterceptor.to("MoveEffectPhase"); - - await game.move.forceMiss(); - await game.phaseInterceptor.to("BerryPhase", false); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeFalsy(); - } - ); -}); diff --git a/src/test/moves/beak_blast.test.ts b/src/test/moves/beak_blast.test.ts deleted file mode 100644 index 0c1e7bbeed9..00000000000 --- a/src/test/moves/beak_blast.test.ts +++ /dev/null @@ -1,135 +0,0 @@ -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { StatusEffect } from "#app/enums/status-effect"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - - -describe("Moves - Beak Blast", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override - .battleType("single") - .ability(Abilities.UNNERVE) - .moveset([ Moves.BEAK_BLAST ]) - .enemySpecies(Species.SNORLAX) - .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset([ Moves.TACKLE ]) - .startingLevel(100) - .enemyLevel(100); - }); - - it( - "should add a charge effect that burns attackers on contact", - async () => { - await game.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.BEAK_BLAST); - - await game.phaseInterceptor.to(MovePhase, false); - expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined(); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.status?.effect).toBe(StatusEffect.BURN); - } - ); - - it( - "should still charge and burn opponents if the user is sleeping", - async () => { - game.override.statusEffect(StatusEffect.SLEEP); - - await game.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.BEAK_BLAST); - - await game.phaseInterceptor.to(MovePhase, false); - expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined(); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.status?.effect).toBe(StatusEffect.BURN); - } - ); - - it( - "should not burn attackers that don't make contact", - async () => { - game.override.enemyMoveset([ Moves.WATER_GUN ]); - - await game.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.BEAK_BLAST); - - await game.phaseInterceptor.to(MovePhase, false); - expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined(); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.BURN); - } - ); - - it( - "should only hit twice with Multi-Lens", - async () => { - game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); - - await game.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.BEAK_BLAST); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(leadPokemon.turnData.hitCount).toBe(2); - } - ); - - it( - "should be blocked by Protect", - async () => { - game.override.enemyMoveset([ Moves.PROTECT ]); - - await game.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.BEAK_BLAST); - - await game.phaseInterceptor.to(MovePhase, false); - expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined(); - - await game.phaseInterceptor.to(TurnEndPhase); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeUndefined(); - } - ); -}); diff --git a/src/test/moves/beat_up.test.ts b/src/test/moves/beat_up.test.ts deleted file mode 100644 index 41e5b63471f..00000000000 --- a/src/test/moves/beat_up.test.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { Abilities } from "#app/enums/abilities"; -import { Moves } from "#app/enums/moves"; -import { Species } from "#app/enums/species"; -import { StatusEffect } from "#app/enums/status-effect"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - -describe("Moves - Beat Up", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyLevel(100); - game.override.enemyMoveset([ Moves.SPLASH ]); - game.override.enemyAbility(Abilities.INSOMNIA); - - game.override.startingLevel(100); - game.override.moveset([ Moves.BEAT_UP ]); - }); - - it( - "should hit once for each healthy player Pokemon", - async () => { - await game.startBattle([ Species.MAGIKARP, Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.PIKACHU, Species.EEVEE ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - let enemyStartingHp = enemyPokemon.hp; - - game.move.select(Moves.BEAT_UP); - - await game.phaseInterceptor.to(MoveEffectPhase); - - expect(playerPokemon.turnData.hitCount).toBe(6); - expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); - - while (playerPokemon.turnData.hitsLeft > 0) { - enemyStartingHp = enemyPokemon.hp; - await game.phaseInterceptor.to(MoveEffectPhase); - expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); - } - } - ); - - it( - "should not count player Pokemon with status effects towards hit count", - async () => { - await game.startBattle([ Species.MAGIKARP, Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.PIKACHU, Species.EEVEE ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - - game.scene.getPlayerParty()[1].trySetStatus(StatusEffect.BURN); - - game.move.select(Moves.BEAT_UP); - - await game.phaseInterceptor.to(MoveEffectPhase); - - expect(playerPokemon.turnData.hitCount).toBe(5); - } - ); -}); diff --git a/src/test/moves/belly_drum.test.ts b/src/test/moves/belly_drum.test.ts deleted file mode 100644 index 0bed1248e7e..00000000000 --- a/src/test/moves/belly_drum.test.ts +++ /dev/null @@ -1,111 +0,0 @@ -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { toDmgValue } from "#app/utils"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import { Abilities } from "#app/enums/abilities"; - - -// RATIO : HP Cost of Move -const RATIO = 2; -// PREDAMAGE : Amount of extra HP lost -const PREDAMAGE = 15; - -describe("Moves - BELLY DRUM", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override - .starterSpecies(Species.MAGIKARP) - .enemySpecies(Species.SNORLAX) - .startingLevel(100) - .enemyLevel(100) - .moveset([ Moves.BELLY_DRUM ]) - .enemyMoveset(Moves.SPLASH) - .enemyAbility(Abilities.BALL_FETCH); - }); - - // Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Belly_Drum_(move) - - test("raises the user's ATK stat stage to its max, at the cost of 1/2 of its maximum HP", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); - - game.move.select(Moves.BELLY_DRUM); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); - } - ); - - test("will still take effect if an uninvolved stat stage is at max", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); - - // Here - Stat.ATK -> -3 and Stat.SPATK -> 6 - leadPokemon.setStatStage(Stat.ATK, -3); - leadPokemon.setStatStage(Stat.SPATK, 6); - - game.move.select(Moves.BELLY_DRUM); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); - expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6); - } - ); - - test("fails if the pokemon's ATK stat stage is at its maximum", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - leadPokemon.setStatStage(Stat.ATK, 6); - - game.move.select(Moves.BELLY_DRUM); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); - } - ); - - test("fails if the user's health is less than 1/2", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); - leadPokemon.hp = hpLost - PREDAMAGE; - - game.move.select(Moves.BELLY_DRUM); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); - } - ); -}); diff --git a/src/test/moves/ceaseless_edge.test.ts b/src/test/moves/ceaseless_edge.test.ts deleted file mode 100644 index 3fbbb7b0aaf..00000000000 --- a/src/test/moves/ceaseless_edge.test.ts +++ /dev/null @@ -1,118 +0,0 @@ -import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag"; -import { allMoves } from "#app/data/move"; -import { Abilities } from "#app/enums/abilities"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; - - -describe("Moves - Ceaseless Edge", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - game.override.enemySpecies(Species.RATTATA); - game.override.enemyAbility(Abilities.RUN_AWAY); - game.override.enemyPassiveAbility(Abilities.RUN_AWAY); - game.override.startingLevel(100); - game.override.enemyLevel(100); - game.override.moveset([ Moves.CEASELESS_EDGE, Moves.SPLASH, Moves.ROAR ]); - game.override.enemyMoveset(Moves.SPLASH); - vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100); - - }); - - test( - "move should hit and apply spikes", - async () => { - await game.classicMode.startBattle([ Species.ILLUMISE ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - const enemyStartingHp = enemyPokemon.hp; - - game.move.select(Moves.CEASELESS_EDGE); - - await game.phaseInterceptor.to(MoveEffectPhase, false); - // Spikes should not have any layers before move effect is applied - const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; - expect(tagBefore instanceof ArenaTrapTag).toBeFalsy(); - - await game.phaseInterceptor.to(TurnEndPhase); - const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; - expect(tagAfter instanceof ArenaTrapTag).toBeTruthy(); - expect(tagAfter.layers).toBe(1); - expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); - } - ); - - test( - "move should hit twice with multi lens and apply two layers of spikes", - async () => { - game.override.startingHeldItems([{ name: "MULTI_LENS" }]); - await game.classicMode.startBattle([ Species.ILLUMISE ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - const enemyStartingHp = enemyPokemon.hp; - - game.move.select(Moves.CEASELESS_EDGE); - - await game.phaseInterceptor.to(MoveEffectPhase, false); - // Spikes should not have any layers before move effect is applied - const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; - expect(tagBefore instanceof ArenaTrapTag).toBeFalsy(); - - await game.phaseInterceptor.to(TurnEndPhase); - const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; - expect(tagAfter instanceof ArenaTrapTag).toBeTruthy(); - expect(tagAfter.layers).toBe(2); - expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); - } - ); - - test( - "trainer - move should hit twice, apply two layers of spikes, force switch opponent - opponent takes damage", - async () => { - game.override.startingHeldItems([{ name: "MULTI_LENS" }]); - game.override.startingWave(25); - - await game.classicMode.startBattle([ Species.ILLUMISE ]); - - game.move.select(Moves.CEASELESS_EDGE); - await game.phaseInterceptor.to(MoveEffectPhase, false); - // Spikes should not have any layers before move effect is applied - const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; - expect(tagBefore instanceof ArenaTrapTag).toBeFalsy(); - - await game.toNextTurn(); - const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; - expect(tagAfter instanceof ArenaTrapTag).toBeTruthy(); - expect(tagAfter.layers).toBe(2); - - const hpBeforeSpikes = game.scene.currentBattle.enemyParty[1].hp; - // Check HP of pokemon that WILL BE switched in (index 1) - game.forceEnemyToSwitch(); - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase, false); - expect(game.scene.currentBattle.enemyParty[0].hp).toBeLessThan(hpBeforeSpikes); - } - ); -}); diff --git a/src/test/moves/clangorous_soul.test.ts b/src/test/moves/clangorous_soul.test.ts deleted file mode 100644 index 52e980cc4fa..00000000000 --- a/src/test/moves/clangorous_soul.test.ts +++ /dev/null @@ -1,128 +0,0 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/utils/gameManager"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { Stat } from "#enums/stat"; - - -/** HP Cost of Move */ -const RATIO = 3; -/** Amount of extra HP lost */ -const PREDAMAGE = 15; - -describe("Moves - Clangorous Soul", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.starterSpecies(Species.MAGIKARP); - game.override.enemySpecies(Species.SNORLAX); - game.override.startingLevel(100); - game.override.enemyLevel(100); - game.override.moveset([ Moves.CLANGOROUS_SOUL ]); - game.override.enemyMoveset(Moves.SPLASH); - }); - - //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Clangorous_Soul_(move) - - it("raises the user's ATK, DEF, SPATK, SPDEF, and SPD stat stages by 1 each at the cost of 1/3 of its maximum HP", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO); - - game.move.select(Moves.CLANGOROUS_SOUL); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(1); - expect(leadPokemon.getStatStage(Stat.DEF)).toBe(1); - expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(1); - expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(1); - expect(leadPokemon.getStatStage(Stat.SPD)).toBe(1); - } - ); - - it("will still take effect if one or more of the involved stat stages are not at max", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO); - - //Here - Stat.SPD -> 0 and Stat.SPDEF -> 4 - leadPokemon.setStatStage(Stat.ATK, 6); - leadPokemon.setStatStage(Stat.DEF, 6); - leadPokemon.setStatStage(Stat.SPATK, 6); - leadPokemon.setStatStage(Stat.SPDEF, 4); - - game.move.select(Moves.CLANGOROUS_SOUL); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); - expect(leadPokemon.getStatStage(Stat.DEF)).toBe(6); - expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6); - expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(5); - expect(leadPokemon.getStatStage(Stat.SPD)).toBe(1); - } - ); - - it("fails if all stat stages involved are at max", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - leadPokemon.setStatStage(Stat.ATK, 6); - leadPokemon.setStatStage(Stat.DEF, 6); - leadPokemon.setStatStage(Stat.SPATK, 6); - leadPokemon.setStatStage(Stat.SPDEF, 6); - leadPokemon.setStatStage(Stat.SPD, 6); - - game.move.select(Moves.CLANGOROUS_SOUL); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); - expect(leadPokemon.getStatStage(Stat.DEF)).toBe(6); - expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6); - expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(6); - expect(leadPokemon.getStatStage(Stat.SPD)).toBe(6); - } - ); - - it("fails if the user's health is less than 1/3", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO); - leadPokemon.hp = hpLost - PREDAMAGE; - - game.move.select(Moves.CLANGOROUS_SOUL); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); - expect(leadPokemon.getStatStage(Stat.DEF)).toBe(0); - expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(0); - expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(0); - expect(leadPokemon.getStatStage(Stat.SPD)).toBe(0); - } - ); -}); diff --git a/src/test/moves/crafty_shield.test.ts b/src/test/moves/crafty_shield.test.ts deleted file mode 100644 index 93dd4a02538..00000000000 --- a/src/test/moves/crafty_shield.test.ts +++ /dev/null @@ -1,123 +0,0 @@ -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import GameManager from "../utils/gameManager"; -import { Species } from "#enums/species"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Stat } from "#enums/stat"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CommandPhase } from "#app/phases/command-phase"; - - -describe("Moves - Crafty Shield", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override.battleType("double"); - - game.override.moveset([ Moves.CRAFTY_SHIELD, Moves.SPLASH, Moves.SWORDS_DANCE ]); - - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset([ Moves.GROWL ]); - game.override.enemyAbility(Abilities.INSOMNIA); - - game.override.startingLevel(100); - game.override.enemyLevel(100); - }); - - test( - "should protect the user and allies from status moves", - async () => { - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.CRAFTY_SHIELD); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0)); - } - ); - - test( - "should not protect the user and allies from attack moves", - async () => { - game.override.enemyMoveset([ Moves.TACKLE ]); - - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.CRAFTY_SHIELD); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(leadPokemon.some(p => p.hp < p.getMaxHp())).toBeTruthy(); - } - ); - - test( - "should protect the user and allies from moves that ignore other protection", - async () => { - game.override.enemySpecies(Species.DUSCLOPS); - game.override.enemyMoveset([ Moves.CURSE ]); - - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.CRAFTY_SHIELD); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - leadPokemon.forEach(p => expect(p.getTag(BattlerTagType.CURSED)).toBeUndefined()); - } - ); - - test( - "should not block allies' self-targeted moves", - async () => { - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.CRAFTY_SHIELD); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SWORDS_DANCE, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(leadPokemon[0].getStatStage(Stat.ATK)).toBe(0); - expect(leadPokemon[1].getStatStage(Stat.ATK)).toBe(2); - } - ); -}); diff --git a/src/test/moves/effectiveness.test.ts b/src/test/moves/effectiveness.test.ts deleted file mode 100644 index c78416b1237..00000000000 --- a/src/test/moves/effectiveness.test.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { allMoves } from "#app/data/move"; -import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { TrainerSlot } from "#app/data/trainer-config"; -import { Type } from "#enums/type"; -import { Abilities } from "#app/enums/abilities"; -import { Moves } from "#app/enums/moves"; -import { Species } from "#app/enums/species"; -import * as Messages from "#app/messages"; -import { TerastallizeModifier, overrideHeldItems } from "#app/modifier/modifier"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, describe, expect, it, vi } from "vitest"; - -function testMoveEffectiveness(game: GameManager, move: Moves, targetSpecies: Species, - expected: number, targetAbility: Abilities = Abilities.BALL_FETCH, teraType?: Type): void { - // Suppress getPokemonNameWithAffix because it calls on a null battle spec - vi.spyOn(Messages, "getPokemonNameWithAffix").mockReturnValue(""); - game.override - .enemyAbility(targetAbility) - .enemyHeldItems([{ name:"TERA_SHARD", type: teraType }]); - - const user = game.scene.addPlayerPokemon(getPokemonSpecies(Species.SNORLAX), 5); - const target = game.scene.addEnemyPokemon(getPokemonSpecies(targetSpecies), 5, TrainerSlot.NONE); - - if (teraType !== undefined) { - overrideHeldItems(target, false); - } - - expect(target.getMoveEffectiveness(user, allMoves[move])).toBe(expected); - user.destroy(); - target.destroy(); -} - -describe("Moves - Type Effectiveness", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - game = new GameManager(phaserGame); - TerastallizeModifier.prototype.apply = (args) => true; - - game.override.ability(Abilities.BALL_FETCH); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - it("Normal-type attacks are neutrally effective against Normal-type Pokemon", - () => testMoveEffectiveness(game, Moves.TACKLE, Species.SNORLAX, 1) - ); - - it("Normal-type attacks are not very effective against Steel-type Pokemon", - () => testMoveEffectiveness(game, Moves.TACKLE, Species.REGISTEEL, 0.5) - ); - - it("Normal-type attacks are doubly resisted by Steel/Rock-type Pokemon", - () => testMoveEffectiveness(game, Moves.TACKLE, Species.AGGRON, 0.25) - ); - - it("Normal-type attacks have no effect on Ghost-type Pokemon", - () => testMoveEffectiveness(game, Moves.TACKLE, Species.DUSCLOPS, 0) - ); - - it("Normal-type status moves are not affected by type matchups", - () => testMoveEffectiveness(game, Moves.GROWL, Species.DUSCLOPS, 1) - ); - - it("Electric-type attacks are super-effective against Water-type Pokemon", - () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.BLASTOISE, 2) - ); - - it("Ghost-type attacks have no effect on Normal-type Pokemon", - () => testMoveEffectiveness(game, Moves.SHADOW_BALL, Species.URSALUNA, 0) - ); - - it("Electric-type attacks are doubly super-effective against Water/Flying-type Pokemon", - () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 4) - ); - - it("Electric-type attacks are negated by Volt Absorb", - () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 0, Abilities.VOLT_ABSORB) - ); - - it("Electric-type attacks are super-effective against Tera-Water Pokemon", - () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.EXCADRILL, 2, Abilities.BALL_FETCH, Type.WATER) - ); - - it("Powder moves have no effect on Grass-type Pokemon", - () => testMoveEffectiveness(game, Moves.SLEEP_POWDER, Species.AMOONGUSS, 0) - ); - - it("Powder moves have no effect on Tera-Grass Pokemon", - () => testMoveEffectiveness(game, Moves.SLEEP_POWDER, Species.SNORLAX, 0, Abilities.BALL_FETCH, Type.GRASS) - ); - - it("Prankster-boosted status moves have no effect on Dark-type Pokemon", - () => { - game.override.ability(Abilities.PRANKSTER); - testMoveEffectiveness(game, Moves.BABY_DOLL_EYES, Species.MIGHTYENA, 0); - } - ); - - it("Prankster-boosted status moves have no effect on Tera-Dark Pokemon", - () => { - game.override.ability(Abilities.PRANKSTER); - testMoveEffectiveness(game, Moves.BABY_DOLL_EYES, Species.SNORLAX, 0, Abilities.BALL_FETCH, Type.DARK); - } - ); -}); diff --git a/src/test/moves/fillet_away.test.ts b/src/test/moves/fillet_away.test.ts deleted file mode 100644 index aa3243270cb..00000000000 --- a/src/test/moves/fillet_away.test.ts +++ /dev/null @@ -1,117 +0,0 @@ -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { toDmgValue } from "#app/utils"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -/** HP Cost of Move */ -const RATIO = 2; -/** Amount of extra HP lost */ -const PREDAMAGE = 15; - -describe("Moves - FILLET AWAY", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.starterSpecies(Species.MAGIKARP); - game.override.enemySpecies(Species.SNORLAX); - game.override.startingLevel(100); - game.override.enemyLevel(100); - game.override.moveset([ Moves.FILLET_AWAY ]); - game.override.enemyMoveset(Moves.SPLASH); - }); - - //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/fillet_away_(move) - - test("raises the user's ATK, SPATK, and SPD stat stages by 2 each, at the cost of 1/2 of its maximum HP", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); - - game.move.select(Moves.FILLET_AWAY); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); - expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(2); - expect(leadPokemon.getStatStage(Stat.SPD)).toBe(2); - } - ); - - test("still takes effect if one or more of the involved stat stages are not at max", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); - - //Here - Stat.SPD -> 0 and Stat.SPATK -> 3 - leadPokemon.setStatStage(Stat.ATK, 6); - leadPokemon.setStatStage(Stat.SPATK, 3); - - game.move.select(Moves.FILLET_AWAY); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); - expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(5); - expect(leadPokemon.getStatStage(Stat.SPD)).toBe(2); - } - ); - - test("fails if all stat stages involved are at max", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - leadPokemon.setStatStage(Stat.ATK, 6); - leadPokemon.setStatStage(Stat.SPATK, 6); - leadPokemon.setStatStage(Stat.SPD, 6); - - game.move.select(Moves.FILLET_AWAY); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); - expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6); - expect(leadPokemon.getStatStage(Stat.SPD)).toBe(6); - } - ); - - test("fails if the user's health is less than 1/2", - async() => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); - leadPokemon.hp = hpLost - PREDAMAGE; - - game.move.select(Moves.FILLET_AWAY); - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); - expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(0); - expect(leadPokemon.getStatStage(Stat.SPD)).toBe(0); - } - ); -}); diff --git a/src/test/moves/focus_punch.test.ts b/src/test/moves/focus_punch.test.ts deleted file mode 100644 index 352e3b60aa4..00000000000 --- a/src/test/moves/focus_punch.test.ts +++ /dev/null @@ -1,133 +0,0 @@ -import { BerryPhase } from "#app/phases/berry-phase"; -import { MessagePhase } from "#app/phases/message-phase"; -import { MoveHeaderPhase } from "#app/phases/move-header-phase"; -import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; -import { TurnStartPhase } from "#app/phases/turn-start-phase"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - - -describe("Moves - Focus Punch", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override - .battleType("single") - .ability(Abilities.UNNERVE) - .moveset([ Moves.FOCUS_PUNCH ]) - .enemySpecies(Species.GROUDON) - .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset(Moves.SPLASH) - .startingLevel(100) - .enemyLevel(100); - }); - - it( - "should deal damage at the end of turn if uninterrupted", - async () => { - await game.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - const enemyStartingHp = enemyPokemon.hp; - - game.move.select(Moves.FOCUS_PUNCH); - - await game.phaseInterceptor.to(MessagePhase); - - expect(enemyPokemon.hp).toBe(enemyStartingHp); - expect(leadPokemon.getMoveHistory().length).toBe(0); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); - expect(leadPokemon.getMoveHistory().length).toBe(1); - expect(leadPokemon.turnData.totalDamageDealt).toBe(enemyStartingHp - enemyPokemon.hp); - } - ); - - it( - "should fail if the user is hit", - async () => { - game.override.enemyMoveset([ Moves.TACKLE ]); - - await game.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - const enemyStartingHp = enemyPokemon.hp; - - game.move.select(Moves.FOCUS_PUNCH); - - await game.phaseInterceptor.to(MessagePhase); - - expect(enemyPokemon.hp).toBe(enemyStartingHp); - expect(leadPokemon.getMoveHistory().length).toBe(0); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(enemyPokemon.hp).toBe(enemyStartingHp); - expect(leadPokemon.getMoveHistory().length).toBe(1); - expect(leadPokemon.turnData.totalDamageDealt).toBe(0); - } - ); - - it( - "should be cancelled if the user falls asleep mid-turn", - async () => { - game.override.enemyMoveset([ Moves.SPORE ]); - - await game.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.FOCUS_PUNCH); - - await game.phaseInterceptor.to(MessagePhase); // Header message - - expect(leadPokemon.getMoveHistory().length).toBe(0); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(leadPokemon.getMoveHistory().length).toBe(1); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - } - ); - - it( - "should not queue its pre-move message before an enemy switches", - async () => { - /** Guarantee a Trainer battle with multiple enemy Pokemon */ - game.override.startingWave(25); - - await game.startBattle([ Species.CHARIZARD ]); - - game.forceEnemyToSwitch(); - game.move.select(Moves.FOCUS_PUNCH); - - await game.phaseInterceptor.to(TurnStartPhase); - - expect(game.scene.getCurrentPhase() instanceof SwitchSummonPhase).toBeTruthy(); - expect(game.scene.phaseQueue.find(phase => phase instanceof MoveHeaderPhase)).toBeDefined(); - } - ); -}); diff --git a/src/test/moves/follow_me.test.ts b/src/test/moves/follow_me.test.ts deleted file mode 100644 index fba7937f812..00000000000 --- a/src/test/moves/follow_me.test.ts +++ /dev/null @@ -1,129 +0,0 @@ -import { Stat } from "#enums/stat"; -import { BattlerIndex } from "#app/battle"; -import { Abilities } from "#app/enums/abilities"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -describe("Moves - Follow Me", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("double"); - game.override.starterSpecies(Species.AMOONGUSS); - game.override.ability(Abilities.BALL_FETCH); - game.override.enemySpecies(Species.SNORLAX); - game.override.startingLevel(100); - game.override.enemyLevel(100); - game.override.moveset([ Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK ]); - game.override.enemyMoveset([ Moves.TACKLE, Moves.FOLLOW_ME, Moves.SPLASH ]); - }); - - test( - "move should redirect enemy attacks to the user", - async () => { - await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.FOLLOW_ME); - game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY); - - // Force both enemies to target the player Pokemon that did not use Follow Me - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); - - await game.phaseInterceptor.to(TurnEndPhase, false); - - expect(playerPokemon[0].hp).toBeLessThan(playerPokemon[0].getMaxHp()); - expect(playerPokemon[1].hp).toBe(playerPokemon[1].getMaxHp()); - } - ); - - test( - "move should redirect enemy attacks to the first ally that uses it", - async () => { - await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.FOLLOW_ME); - game.move.select(Moves.FOLLOW_ME, 1); - - // Each player is targeted by an enemy - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); - - await game.phaseInterceptor.to(TurnEndPhase, false); - - playerPokemon.sort((a, b) => a.getEffectiveStat(Stat.SPD) - b.getEffectiveStat(Stat.SPD)); - - expect(playerPokemon[1].hp).toBeLessThan(playerPokemon[1].getMaxHp()); - expect(playerPokemon[0].hp).toBe(playerPokemon[0].getMaxHp()); - } - ); - - test( - "move effect should be bypassed by Stalwart", - async () => { - game.override.ability(Abilities.STALWART); - game.override.moveset([ Moves.QUICK_ATTACK ]); - - await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY); - game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); - - // Target doesn't need to be specified if the move is self-targeted - await game.forceEnemyMove(Moves.FOLLOW_ME); - await game.forceEnemyMove(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase, false); - - // If redirection was bypassed, both enemies should be damaged - expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); - expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp()); - } - ); - - test( - "move effect should be bypassed by Snipe Shot", - async () => { - game.override.moveset([ Moves.SNIPE_SHOT ]); - - await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.SNIPE_SHOT, 0, BattlerIndex.ENEMY); - game.move.select(Moves.SNIPE_SHOT, 1, BattlerIndex.ENEMY_2); - - await game.forceEnemyMove(Moves.FOLLOW_ME); - await game.forceEnemyMove(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase, false); - - // If redirection was bypassed, both enemies should be damaged - expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); - expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp()); - } - ); -}); diff --git a/src/test/moves/freezy_frost.test.ts b/src/test/moves/freezy_frost.test.ts deleted file mode 100644 index 09d7779474f..00000000000 --- a/src/test/moves/freezy_frost.test.ts +++ /dev/null @@ -1,105 +0,0 @@ -import { Stat } from "#enums/stat"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves } from "#app/data/move"; -import { CommandPhase } from "#app/phases/command-phase"; - -describe("Moves - Freezy Frost", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ type: Phaser.HEADLESS }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override - .battleType("single") - .enemySpecies(Species.RATTATA) - .enemyLevel(100) - .enemyMoveset([ Moves.HOWL, Moves.HOWL, Moves.HOWL, Moves.HOWL ]) - .enemyAbility(Abilities.BALL_FETCH) - .startingLevel(100) - .moveset([ Moves.FREEZY_FROST, Moves.HOWL, Moves.SPLASH ]) - .ability(Abilities.BALL_FETCH); - - vi.spyOn(allMoves[Moves.FREEZY_FROST], "accuracy", "get").mockReturnValue(100); - }); - - it( - "should clear stat changes of user and opponent", - async () => { - await game.classicMode.startBattle([ Species.SHUCKLE ]); - const user = game.scene.getPlayerPokemon()!; - const enemy = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.HOWL); - await game.toNextTurn(); - - expect(user.getStatStage(Stat.ATK)).toBe(1); - expect(enemy.getStatStage(Stat.ATK)).toBe(1); - - game.move.select(Moves.FREEZY_FROST); - await game.toNextTurn(); - - expect(user.getStatStage(Stat.ATK)).toBe(0); - expect(enemy.getStatStage(Stat.ATK)).toBe(0); - }); - - it( - "should clear all stat changes even when enemy uses the move", - async () => { - game.override.enemyMoveset([ Moves.FREEZY_FROST, Moves.FREEZY_FROST, Moves.FREEZY_FROST, Moves.FREEZY_FROST ]); - await game.classicMode.startBattle([ Species.SHUCKLE ]); // Shuckle for slower Howl on first turn so Freezy Frost doesn't affect it. - const user = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.HOWL); - await game.toNextTurn(); - - const userAtkBefore = user.getStatStage(Stat.ATK); - expect(userAtkBefore).toBe(1); - - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - expect(user.getStatStage(Stat.ATK)).toBe(0); - }); - - it( - "should clear all stat changes in double battle", - async () => { - game.override.battleType("double"); - await game.classicMode.startBattle([ Species.SHUCKLE, Species.RATTATA ]); - const [ leftPlayer, rightPlayer ] = game.scene.getPlayerField(); - const [ leftOpp, rightOpp ] = game.scene.getEnemyField(); - - game.move.select(Moves.HOWL, 0); - await game.phaseInterceptor.to(CommandPhase); - game.move.select(Moves.SPLASH, 1); - await game.toNextTurn(); - - expect(leftPlayer.getStatStage(Stat.ATK)).toBe(1); - expect(rightPlayer.getStatStage(Stat.ATK)).toBe(1); - expect(leftOpp.getStatStage(Stat.ATK)).toBe(2); // Both enemies use Howl - expect(rightOpp.getStatStage(Stat.ATK)).toBe(2); - - game.move.select(Moves.FREEZY_FROST, 0, leftOpp.getBattlerIndex()); - await game.phaseInterceptor.to(CommandPhase); - game.move.select(Moves.SPLASH, 1); - await game.toNextTurn(); - - expect(leftPlayer.getStatStage(Stat.ATK)).toBe(0); - expect(rightPlayer.getStatStage(Stat.ATK)).toBe(0); - expect(leftOpp.getStatStage(Stat.ATK)).toBe(0); - expect(rightOpp.getStatStage(Stat.ATK)).toBe(0); - }); -}); diff --git a/src/test/moves/hyper_beam.test.ts b/src/test/moves/hyper_beam.test.ts deleted file mode 100644 index af8440a0911..00000000000 --- a/src/test/moves/hyper_beam.test.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { allMoves } from "#app/data/move"; -import { Abilities } from "#app/enums/abilities"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { Moves } from "#app/enums/moves"; -import { Species } from "#app/enums/species"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - -describe("Moves - Hyper Beam", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override.battleType("single"); - game.override.ability(Abilities.BALL_FETCH); - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset([ Moves.SPLASH ]); - game.override.enemyLevel(100); - - game.override.moveset([ Moves.HYPER_BEAM, Moves.TACKLE ]); - vi.spyOn(allMoves[Moves.HYPER_BEAM], "accuracy", "get").mockReturnValue(100); - }); - - it( - "should force the user to recharge on the next turn (and only that turn)", - async () => { - await game.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.HYPER_BEAM); - - await game.phaseInterceptor.to(TurnEndPhase); - - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeDefined(); - - const enemyPostAttackHp = enemyPokemon.hp; - - /** Game should progress without a new command from the player */ - await game.phaseInterceptor.to(TurnEndPhase); - - expect(enemyPokemon.hp).toBe(enemyPostAttackHp); - expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeUndefined(); - - game.move.select(Moves.TACKLE); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(enemyPokemon.hp).toBeLessThan(enemyPostAttackHp); - } - ); -}); diff --git a/src/test/moves/jaw_lock.test.ts b/src/test/moves/jaw_lock.test.ts deleted file mode 100644 index 30dbcac64a8..00000000000 --- a/src/test/moves/jaw_lock.test.ts +++ /dev/null @@ -1,169 +0,0 @@ -import { BattlerIndex } from "#app/battle"; -import { Abilities } from "#app/enums/abilities"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { FaintPhase } from "#app/phases/faint-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import GameManager from "#app/test/utils/gameManager"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - - -describe("Moves - Jaw Lock", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override - .battleType("single") - .enemySpecies(Species.SNORLAX) - .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset(Moves.SPLASH) - .moveset([ Moves.JAW_LOCK, Moves.SPLASH ]) - .startingLevel(100) - .enemyLevel(100) - .disableCrits(); - }); - - it( - "should trap the move's user and target", - async () => { - await game.startBattle([ Species.BULBASAUR ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.JAW_LOCK); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - - await game.phaseInterceptor.to(MoveEffectPhase, false); - - expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - - await game.phaseInterceptor.to(TurnEndPhase); - - expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); - } - ); - - it( - "should not trap either pokemon if the target faints", - async () => { - game.override.enemyLevel(1); - await game.startBattle([ Species.BULBASAUR ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.JAW_LOCK); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - - await game.phaseInterceptor.to(MoveEffectPhase, false); - - expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - - await game.phaseInterceptor.to(MoveEffectPhase); - - expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - - await game.phaseInterceptor.to(FaintPhase); - - expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - } - ); - - it( - "should only trap the user until the target faints", - async () => { - await game.startBattle([ Species.BULBASAUR ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.JAW_LOCK); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - - await game.phaseInterceptor.to(MoveEffectPhase); - - expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); - - await game.phaseInterceptor.to(TurnEndPhase); - - await game.doKillOpponents(); - - expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - } - ); - - it( - "should not trap other targets after the first target is trapped", - async () => { - game.override.battleType("double"); - - await game.startBattle([ Species.CHARMANDER, Species.BULBASAUR ]); - - const playerPokemon = game.scene.getPlayerField(); - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.JAW_LOCK, 0, BattlerIndex.ENEMY); - game.move.select(Moves.SPLASH, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); - - await game.phaseInterceptor.to(MoveEffectPhase); - - expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined(); - expect(enemyPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined(); - - await game.toNextTurn(); - - game.move.select(Moves.JAW_LOCK, 0, BattlerIndex.ENEMY_2); - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(MoveEffectPhase); - - expect(enemyPokemon[1].getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined(); - expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)?.sourceId).toBe(enemyPokemon[0].id); - } - ); - - it( - "should not trap either pokemon if the target is protected", - async () => { - game.override.enemyMoveset([ Moves.PROTECT ]); - - await game.startBattle([ Species.BULBASAUR ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.JAW_LOCK); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(playerPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - } - ); -}); diff --git a/src/test/moves/lucky_chant.test.ts b/src/test/moves/lucky_chant.test.ts deleted file mode 100644 index 02e9dd24465..00000000000 --- a/src/test/moves/lucky_chant.test.ts +++ /dev/null @@ -1,112 +0,0 @@ -import { Abilities } from "#app/enums/abilities"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { Moves } from "#app/enums/moves"; -import { Species } from "#app/enums/species"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import GameManager from "../utils/gameManager"; - - -describe("Moves - Lucky Chant", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override - .battleType("single") - .moveset([ Moves.LUCKY_CHANT, Moves.SPLASH, Moves.FOLLOW_ME ]) - .enemySpecies(Species.SNORLAX) - .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset([ Moves.FLOWER_TRICK ]) - .startingLevel(100) - .enemyLevel(100); - }); - - it( - "should prevent critical hits from moves", - async () => { - await game.startBattle([ Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase); - - const firstTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp; - - game.move.select(Moves.LUCKY_CHANT); - - await game.phaseInterceptor.to(BerryPhase, false); - - const secondTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp - firstTurnDamage; - expect(secondTurnDamage).toBeLessThan(firstTurnDamage); - } - ); - - it( - "should prevent critical hits against the user's ally", - async () => { - game.override.battleType("double"); - - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const playerPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.FOLLOW_ME); - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(TurnEndPhase); - - const firstTurnDamage = playerPokemon[0].getMaxHp() - playerPokemon[0].hp; - - game.move.select(Moves.FOLLOW_ME); - game.move.select(Moves.LUCKY_CHANT, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - const secondTurnDamage = playerPokemon[0].getMaxHp() - playerPokemon[0].hp - firstTurnDamage; - expect(secondTurnDamage).toBeLessThan(firstTurnDamage); - } - ); - - it( - "should prevent critical hits from field effects", - async () => { - game.override.enemyMoveset([ Moves.TACKLE ]); - - await game.startBattle([ Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - enemyPokemon.addTag(BattlerTagType.ALWAYS_CRIT, 2, Moves.NONE, 0); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase); - - const firstTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp; - - game.move.select(Moves.LUCKY_CHANT); - - await game.phaseInterceptor.to(BerryPhase, false); - - const secondTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp - firstTurnDamage; - expect(secondTurnDamage).toBeLessThan(firstTurnDamage); - } - ); -}); diff --git a/src/test/moves/mat_block.test.ts b/src/test/moves/mat_block.test.ts deleted file mode 100644 index a4d9177cbdc..00000000000 --- a/src/test/moves/mat_block.test.ts +++ /dev/null @@ -1,107 +0,0 @@ -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import GameManager from "../utils/gameManager"; -import { Species } from "#enums/species"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Stat } from "#enums/stat"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CommandPhase } from "#app/phases/command-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; - - -describe("Moves - Mat Block", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override.battleType("double"); - - game.override.moveset([ Moves.MAT_BLOCK, Moves.SPLASH ]); - - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset([ Moves.TACKLE ]); - game.override.enemyAbility(Abilities.INSOMNIA); - - game.override.startingLevel(100); - game.override.enemyLevel(100); - }); - - test( - "should protect the user and allies from attack moves", - async () => { - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.MAT_BLOCK); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); - } - ); - - test( - "should not protect the user and allies from status moves", - async () => { - game.override.enemyMoveset([ Moves.GROWL ]); - - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.MAT_BLOCK); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(-2)); - } - ); - - test( - "should fail when used after the first turn", - async () => { - await game.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(CommandPhase); - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(TurnEndPhase); - - const leadStartingHp = leadPokemon.map(p => p.hp); - - await game.phaseInterceptor.to(CommandPhase, false); - game.move.select(Moves.MAT_BLOCK); - await game.phaseInterceptor.to(CommandPhase); - game.move.select(Moves.MAT_BLOCK, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(leadPokemon.some((p, i) => p.hp < leadStartingHp[i])).toBeTruthy(); - } - ); -}); diff --git a/src/test/moves/pledge_moves.test.ts b/src/test/moves/pledge_moves.test.ts deleted file mode 100644 index 64d586e7ba4..00000000000 --- a/src/test/moves/pledge_moves.test.ts +++ /dev/null @@ -1,337 +0,0 @@ -import { BattlerIndex } from "#app/battle"; -import { allAbilities } from "#app/data/ability"; -import { ArenaTagSide } from "#app/data/arena-tag"; -import { allMoves, FlinchAttr } from "#app/data/move"; -import { Type } from "#enums/type"; -import { ArenaTagType } from "#enums/arena-tag-type"; -import { Stat } from "#enums/stat"; -import { toDmgValue } from "#app/utils"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; - -describe("Moves - Pledge Moves", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override - .battleType("double") - .startingLevel(100) - .moveset([ Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE, Moves.WATER_PLEDGE, Moves.SPLASH ]) - .enemySpecies(Species.SNORLAX) - .enemyLevel(100) - .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(Moves.SPLASH); - }); - - it( - "Fire Pledge - should be an 80-power Fire-type attack outside of combination", - async () => { - await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - const firePledge = allMoves[Moves.FIRE_PLEDGE]; - vi.spyOn(firePledge, "calculateBattlePower"); - - const playerPokemon = game.scene.getPlayerField(); - vi.spyOn(playerPokemon[0], "getMoveType"); - - game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY); - game.move.select(Moves.SPLASH, 1); - - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); - await game.phaseInterceptor.to("MoveEndPhase", false); - - expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80); - expect(playerPokemon[0].getMoveType).toHaveLastReturnedWith(Type.FIRE); - } - ); - - it( - "Fire Pledge - should not combine with an ally using Fire Pledge", - async () => { - await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - const firePledge = allMoves[Moves.FIRE_PLEDGE]; - vi.spyOn(firePledge, "calculateBattlePower"); - - const playerPokemon = game.scene.getPlayerField(); - playerPokemon.forEach(p => vi.spyOn(p, "getMoveType")); - - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY); - game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY_2); - - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); - - await game.phaseInterceptor.to("MoveEndPhase"); - expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80); - expect(playerPokemon[0].getMoveType).toHaveLastReturnedWith(Type.FIRE); - - await game.phaseInterceptor.to("BerryPhase", false); - expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80); - expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(Type.FIRE); - - enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp())); - } - ); - - it( - "Fire Pledge - should not combine with an enemy's Pledge move", - async () => { - game.override - .battleType("single") - .enemyMoveset(Moves.GRASS_PLEDGE); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.FIRE_PLEDGE); - - await game.toNextTurn(); - - // Neither Pokemon should defer their move's effects as they would - // if they combined moves, so both should be damaged. - expect(playerPokemon.hp).toBeLessThan(playerPokemon.getMaxHp()); - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - expect(game.scene.arena.getTag(ArenaTagType.FIRE_GRASS_PLEDGE)).toBeUndefined(); - } - ); - - it( - "Grass Pledge - should combine with Fire Pledge to form a 150-power Fire-type attack that creates a 'sea of fire'", - async () => { - await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const grassPledge = allMoves[Moves.GRASS_PLEDGE]; - vi.spyOn(grassPledge, "calculateBattlePower"); - - const playerPokemon = game.scene.getPlayerField(); - const enemyPokemon = game.scene.getEnemyField(); - - vi.spyOn(playerPokemon[1], "getMoveType"); - const baseDmgMock = vi.spyOn(enemyPokemon[0], "getBaseDamage"); - - game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY_2); - game.move.select(Moves.GRASS_PLEDGE, 1, BattlerIndex.ENEMY); - - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); - // advance to the end of PLAYER_2's move this turn - for (let i = 0; i < 2; i++) { - await game.phaseInterceptor.to("MoveEndPhase"); - } - expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(Type.FIRE); - expect(grassPledge.calculateBattlePower).toHaveLastReturnedWith(150); - - const baseDmg = baseDmgMock.mock.results[baseDmgMock.mock.results.length - 1].value; - expect(enemyPokemon[0].getMaxHp() - enemyPokemon[0].hp).toBe(toDmgValue(baseDmg * 1.5)); - expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); // PLAYER should not have attacked - expect(game.scene.arena.getTagOnSide(ArenaTagType.FIRE_GRASS_PLEDGE, ArenaTagSide.ENEMY)).toBeDefined(); - - const enemyStartingHp = enemyPokemon.map(p => p.hp); - await game.toNextTurn(); - enemyPokemon.forEach((p, i) => expect(enemyStartingHp[i] - p.hp).toBe(toDmgValue(p.getMaxHp() / 8))); - } - ); - - it( - "Fire Pledge - should combine with Water Pledge to form a 150-power Water-type attack that creates a 'rainbow'", - async () => { - game.override.moveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.FIERY_DANCE, Moves.SPLASH ]); - - await game.classicMode.startBattle([ Species.BLASTOISE, Species.VENUSAUR ]); - - const firePledge = allMoves[Moves.FIRE_PLEDGE]; - vi.spyOn(firePledge, "calculateBattlePower"); - - const playerPokemon = game.scene.getPlayerField(); - const enemyPokemon = game.scene.getEnemyField(); - - vi.spyOn(playerPokemon[1], "getMoveType"); - - game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY_2); - game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY); - - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); - // advance to the end of PLAYER_2's move this turn - for (let i = 0; i < 2; i++) { - await game.phaseInterceptor.to("MoveEndPhase"); - } - expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(Type.WATER); - expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(150); - expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); // PLAYER should not have attacked - expect(game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER)).toBeDefined(); - - await game.toNextTurn(); - - game.move.select(Moves.FIERY_DANCE, 0, BattlerIndex.ENEMY_2); - game.move.select(Moves.SPLASH, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); - await game.phaseInterceptor.to("MoveEndPhase"); - - // Rainbow effect should increase Fiery Dance's chance of raising Sp. Atk to 100% - expect(playerPokemon[0].getStatStage(Stat.SPATK)).toBe(1); - } - ); - - it( - "Water Pledge - should combine with Grass Pledge to form a 150-power Grass-type attack that creates a 'swamp'", - async () => { - await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - const waterPledge = allMoves[Moves.WATER_PLEDGE]; - vi.spyOn(waterPledge, "calculateBattlePower"); - - const playerPokemon = game.scene.getPlayerField(); - const enemyPokemon = game.scene.getEnemyField(); - const enemyStartingSpd = enemyPokemon.map(p => p.getEffectiveStat(Stat.SPD)); - - vi.spyOn(playerPokemon[1], "getMoveType"); - - game.move.select(Moves.GRASS_PLEDGE, 0, BattlerIndex.ENEMY_2); - game.move.select(Moves.WATER_PLEDGE, 1, BattlerIndex.ENEMY); - - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); - // advance to the end of PLAYER_2's move this turn - for (let i = 0; i < 2; i++) { - await game.phaseInterceptor.to("MoveEndPhase"); - } - - expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(Type.GRASS); - expect(waterPledge.calculateBattlePower).toHaveLastReturnedWith(150); - expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); - - expect(game.scene.arena.getTagOnSide(ArenaTagType.GRASS_WATER_PLEDGE, ArenaTagSide.ENEMY)).toBeDefined(); - enemyPokemon.forEach((p, i) => expect(p.getEffectiveStat(Stat.SPD)).toBe(Math.floor(enemyStartingSpd[i] / 4))); - } - ); - - it( - "Pledge Moves - should alter turn order when used in combination", - async () => { - await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); - game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2); - - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2 ]); - // PLAYER_2 should act with a combined move immediately after PLAYER as the second move in the turn - for (let i = 0; i < 2; i++) { - await game.phaseInterceptor.to("MoveEndPhase"); - } - expect(enemyPokemon[0].hp).toBe(enemyPokemon[0].getMaxHp()); - expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp()); - } - ); - - it( - "Pledge Moves - 'rainbow' effect should not stack with Serene Grace when applied to flinching moves", - async () => { - game.override - .ability(Abilities.SERENE_GRACE) - .moveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.IRON_HEAD, Moves.SPLASH ]); - - await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - const ironHeadFlinchAttr = allMoves[Moves.IRON_HEAD].getAttrs(FlinchAttr)[0]; - vi.spyOn(ironHeadFlinchAttr, "getMoveChance"); - - game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); - game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2); - - await game.phaseInterceptor.to("TurnEndPhase"); - - expect(game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER)).toBeDefined(); - - game.move.select(Moves.IRON_HEAD, 0, BattlerIndex.ENEMY); - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(ironHeadFlinchAttr.getMoveChance).toHaveLastReturnedWith(60); - } - ); - - it( - "Pledge Moves - should have no effect when the second ally's move is cancelled", - async () => { - game.override - .enemyMoveset([ Moves.SPLASH, Moves.SPORE ]); - - await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY); - game.move.select(Moves.GRASS_PLEDGE, 1, BattlerIndex.ENEMY_2); - - await game.forceEnemyMove(Moves.SPORE, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); - - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2 ]); - - await game.phaseInterceptor.to("BerryPhase", false); - - enemyPokemon.forEach((p) => expect(p.hp).toBe(p.getMaxHp())); - } - ); - - it( - "Pledge Moves - should ignore redirection from another Pokemon's Storm Drain", - async () => { - await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyField(); - vi.spyOn(enemyPokemon[1], "getAbility").mockReturnValue(allAbilities[Abilities.STORM_DRAIN]); - - game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); - game.move.select(Moves.SPLASH, 1); - - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); - - await game.phaseInterceptor.to("MoveEndPhase", false); - - expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); - expect(enemyPokemon[1].getStatStage(Stat.SPATK)).toBe(0); - } - ); - - it( - "Pledge Moves - should not ignore redirection from another Pokemon's Follow Me", - async () => { - game.override.enemyMoveset([ Moves.FOLLOW_ME, Moves.SPLASH ]); - await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); - game.move.select(Moves.SPLASH, 1); - - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.FOLLOW_ME); - - await game.phaseInterceptor.to("BerryPhase", false); - - const enemyPokemon = game.scene.getEnemyField(); - expect(enemyPokemon[0].hp).toBe(enemyPokemon[0].getMaxHp()); - expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp()); - } - ); -}); diff --git a/src/test/moves/powder.test.ts b/src/test/moves/powder.test.ts deleted file mode 100644 index a1db2bced3a..00000000000 --- a/src/test/moves/powder.test.ts +++ /dev/null @@ -1,318 +0,0 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/utils/gameManager"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { MoveResult, PokemonMove } from "#app/field/pokemon"; -import { Type } from "#enums/type"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { StatusEffect } from "#enums/status-effect"; -import { BattlerIndex } from "#app/battle"; - -describe("Moves - Powder", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - - game.override - .enemySpecies(Species.SNORLAX) - .enemyLevel(100) - .enemyMoveset(Moves.EMBER) - .enemyAbility(Abilities.INSOMNIA) - .startingLevel(100) - .moveset([ Moves.POWDER, Moves.SPLASH, Moves.FIERY_DANCE, Moves.ROAR ]); - }); - - it( - "should cancel the target's Fire-type move, damage the target, and still consume the target's PP", - async () => { - // Cannot use enemy moveset override for this test, since it interferes with checking PP - game.override.enemyMoveset([]); - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - enemyPokemon.moveset = [ new PokemonMove(Moves.EMBER) ]; - - game.move.select(Moves.POWDER); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4)); - expect(enemyPokemon.moveset[0]!.ppUsed).toBe(1); - - await game.toNextTurn(); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); - expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4)); - expect(enemyPokemon.moveset[0]!.ppUsed).toBe(2); - }); - - it( - "should have no effect against Grass-type Pokemon", - async () => { - game.override.enemySpecies(Species.AMOONGUSS); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - }); - - it( - "should have no effect against Pokemon with Overcoat", - async () => { - game.override.enemyAbility(Abilities.OVERCOAT); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - }); - - it( - "should not damage the target if the target has Magic Guard", - async () => { - game.override.enemyAbility(Abilities.MAGIC_GUARD); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - }); - - it( - "should not damage the target if Primordial Sea is active", - async () => { - game.override.enemyAbility(Abilities.PRIMORDIAL_SEA); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - }); - - it( - "should not prevent the target from thawing out with Flame Wheel", - async () => { - game.override - .enemyMoveset(Array(4).fill(Moves.FLAME_WHEEL)) - .enemyStatusEffect(StatusEffect.FREEZE); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.FREEZE); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4)); - } - ); - - it( - "should not allow a target with Protean to change to Fire type", - async () => { - game.override.enemyAbility(Abilities.PROTEAN); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - expect(enemyPokemon.summonData?.types).not.toBe(Type.FIRE); - }); - - it( - "should cancel Fire-type moves generated by the target's Dancer ability", - async () => { - game.override - .battleType("double") - .enemySpecies(Species.BLASTOISE) - .enemyAbility(Abilities.DANCER); - - await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - // Turn 1: Roar away 1 opponent - game.move.select(Moves.ROAR, 0, BattlerIndex.ENEMY_2); - game.move.select(Moves.SPLASH, 1); - await game.toNextTurn(); - await game.toNextTurn(); // Requires game.toNextTurn() twice due to double battle - - // Turn 2: Enemy should activate Powder twice: From using Ember, and from copying Fiery Dance via Dancer - playerPokemon.hp = playerPokemon.getMaxHp(); - game.move.select(Moves.FIERY_DANCE, 0, BattlerIndex.ENEMY); - game.move.select(Moves.POWDER, 1, BattlerIndex.ENEMY); - - await game.phaseInterceptor.to(MoveEffectPhase); - const enemyStartingHp = enemyPokemon.hp; - - await game.phaseInterceptor.to(BerryPhase, false); - - - // player should not take damage - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp()); - // enemy should have taken damage from player's Fiery Dance + 2 Powder procs - expect(enemyPokemon.hp).toBe(enemyStartingHp - playerPokemon.turnData.totalDamageDealt - 2 * Math.floor(enemyPokemon.getMaxHp() / 4)); - }); - - it( - "should cancel Fiery Dance, then prevent it from triggering Dancer", - async () => { - game.override.ability(Abilities.DANCER) - .enemyMoveset(Moves.FIERY_DANCE); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4)); - expect(playerPokemon.getLastXMoves()[0].move).toBe(Moves.POWDER); - }); - - it( - "should cancel Revelation Dance if it becomes a Fire-type move", - async () => { - game.override - .enemySpecies(Species.CHARIZARD) - .enemyMoveset(Array(4).fill(Moves.REVELATION_DANCE)); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4)); - }); - - it( - "should cancel Shell Trap and damage the target, even if the move would fail", - async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SHELL_TRAP)); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4)); - }); - - it( - "should cancel Grass Pledge if used after ally's Fire Pledge", - async () => { - game.override.enemyMoveset([ Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE ]) - .battleType("double"); - - await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]); - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY); - game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.GRASS_PLEDGE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY ]); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4)); - }); - - it( - "should cancel Fire Pledge if used before ally's Water Pledge", - async () => { - game.override.enemyMoveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE ]) - .battleType("double"); - - await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]); - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY); - game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4)); - }); - - it( - "should NOT cancel Fire Pledge if used after ally's Water Pledge", - async () => { - game.override.enemyMoveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE ]) - .battleType("double"); - - await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]); - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY); - game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY ]); - - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - }); -}); diff --git a/src/test/moves/protect.test.ts b/src/test/moves/protect.test.ts deleted file mode 100644 index e639969ddf0..00000000000 --- a/src/test/moves/protect.test.ts +++ /dev/null @@ -1,133 +0,0 @@ -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; -import GameManager from "../utils/gameManager"; -import { Species } from "#enums/species"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Stat } from "#enums/stat"; -import { allMoves } from "#app/data/move"; -import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag"; -import { BattlerIndex } from "#app/battle"; -import { MoveResult } from "#app/field/pokemon"; - - -describe("Moves - Protect", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override.battleType("single"); - - game.override.moveset([ Moves.PROTECT ]); - game.override.enemySpecies(Species.SNORLAX); - - game.override.enemyAbility(Abilities.INSOMNIA); - game.override.enemyMoveset([ Moves.TACKLE ]); - - game.override.startingLevel(100); - game.override.enemyLevel(100); - }); - - test( - "should protect the user from attacks", - async () => { - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.PROTECT); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - } - ); - - test( - "should prevent secondary effects from the opponent's attack", - async () => { - game.override.enemyMoveset([ Moves.CEASELESS_EDGE ]); - vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.PROTECT); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(game.scene.arena.getTagOnSide(ArenaTrapTag, ArenaTagSide.ENEMY)).toBeUndefined(); - } - ); - - test( - "should protect the user from status moves", - async () => { - game.override.enemyMoveset([ Moves.CHARM ]); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.PROTECT); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); - } - ); - - test( - "should stop subsequent hits of a multi-hit move", - async () => { - game.override.enemyMoveset([ Moves.TACHYON_CUTTER ]); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.PROTECT); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(enemyPokemon.turnData.hitCount).toBe(1); - } - ); - - test( - "should fail if the user is the last to move in the turn", - async () => { - game.override.enemyMoveset([ Moves.PROTECT ]); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.PROTECT); - - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); - expect(leadPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - } - ); -}); diff --git a/src/test/moves/purify.test.ts b/src/test/moves/purify.test.ts deleted file mode 100644 index d72b4a87d2a..00000000000 --- a/src/test/moves/purify.test.ts +++ /dev/null @@ -1,78 +0,0 @@ -import { BattlerIndex } from "#app/battle"; -import { Status } from "#app/data/status-effect"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -describe("Moves - Purify", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - - game.override.starterSpecies(Species.PYUKUMUKU); - game.override.startingLevel(10); - game.override.moveset([ Moves.PURIFY, Moves.SIZZLY_SLIDE ]); - - game.override.enemySpecies(Species.MAGIKARP); - game.override.enemyLevel(10); - game.override.enemyMoveset([ Moves.SPLASH, Moves.NONE, Moves.NONE, Moves.NONE ]); - }); - - test( - "Purify heals opponent status effect and restores user hp", - async () => { - await game.startBattle(); - - const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!; - const playerPokemon: PlayerPokemon = game.scene.getPlayerPokemon()!; - - playerPokemon.hp = playerPokemon.getMaxHp() - 1; - enemyPokemon.status = new Status(StatusEffect.BURN); - - game.move.select(Moves.PURIFY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to(MoveEndPhase); - - expect(enemyPokemon.status).toBeNull(); - expect(playerPokemon.isFullHp()).toBe(true); - }, - ); - - test( - "Purify does not heal if opponent doesnt have any status effect", - async () => { - await game.startBattle(); - - const playerPokemon: PlayerPokemon = game.scene.getPlayerPokemon()!; - - playerPokemon.hp = playerPokemon.getMaxHp() - 1; - const playerInitialHp = playerPokemon.hp; - - game.move.select(Moves.PURIFY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to(MoveEndPhase); - - expect(playerPokemon.hp).toBe(playerInitialHp); - }, - ); - -}); diff --git a/src/test/moves/quick_guard.test.ts b/src/test/moves/quick_guard.test.ts deleted file mode 100644 index 7bda71782aa..00000000000 --- a/src/test/moves/quick_guard.test.ts +++ /dev/null @@ -1,117 +0,0 @@ -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import GameManager from "../utils/gameManager"; -import { Species } from "#enums/species"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Stat } from "#enums/stat"; -import { BattlerIndex } from "#app/battle"; -import { MoveResult } from "#app/field/pokemon"; - - -describe("Moves - Quick Guard", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override.battleType("double"); - - game.override.moveset([ Moves.QUICK_GUARD, Moves.SPLASH, Moves.FOLLOW_ME ]); - - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset([ Moves.QUICK_ATTACK ]); - game.override.enemyAbility(Abilities.INSOMNIA); - - game.override.startingLevel(100); - game.override.enemyLevel(100); - }); - - test( - "should protect the user and allies from priority moves", - async () => { - await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const playerPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.QUICK_GUARD); - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to("BerryPhase", false); - - playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); - } - ); - - test( - "should protect the user and allies from Prankster-boosted moves", - async () => { - game.override.enemyAbility(Abilities.PRANKSTER); - game.override.enemyMoveset([ Moves.GROWL ]); - - await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const playerPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.QUICK_GUARD); - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to("BerryPhase", false); - - playerPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0)); - } - ); - - test( - "should stop subsequent hits of a multi-hit priority move", - async () => { - game.override.enemyMoveset([ Moves.WATER_SHURIKEN ]); - - await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const playerPokemon = game.scene.getPlayerField(); - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.QUICK_GUARD); - game.move.select(Moves.FOLLOW_ME, 1); - - await game.phaseInterceptor.to("BerryPhase", false); - - playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); - enemyPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1)); - } - ); - - test( - "should fail if the user is the last to move in the turn", - async () => { - game.override.battleType("single"); - game.override.enemyMoveset([ Moves.QUICK_GUARD ]); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.QUICK_GUARD); - - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); - expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - } - ); -}); diff --git a/src/test/moves/rage_powder.test.ts b/src/test/moves/rage_powder.test.ts deleted file mode 100644 index 1b73a7f0f5f..00000000000 --- a/src/test/moves/rage_powder.test.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { BattlerIndex } from "#app/battle"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -describe("Moves - Rage Powder", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("double"); - game.override.enemySpecies(Species.SNORLAX); - game.override.startingLevel(100); - game.override.enemyLevel(100); - game.override.moveset([ Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK ]); - game.override.enemyMoveset([ Moves.RAGE_POWDER, Moves.TACKLE, Moves.SPLASH ]); - }); - - test( - "move effect should be bypassed by Grass type", - async () => { - await game.classicMode.startBattle([ Species.AMOONGUSS, Species.VENUSAUR ]); - - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY); - game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); - - await game.forceEnemyMove(Moves.RAGE_POWDER); - await game.forceEnemyMove(Moves.SPLASH); - - await game.phaseInterceptor.to("BerryPhase", false); - - // If redirection was bypassed, both enemies should be damaged - expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); - expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); - } - ); - - test( - "move effect should be bypassed by Overcoat", - async () => { - game.override.ability(Abilities.OVERCOAT); - - // Test with two non-Grass type player Pokemon - await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyField(); - - const enemyStartingHp = enemyPokemon.map(p => p.hp); - - game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY); - game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); - - await game.forceEnemyMove(Moves.RAGE_POWDER); - await game.forceEnemyMove(Moves.SPLASH); - - await game.phaseInterceptor.to("BerryPhase", false); - - // If redirection was bypassed, both enemies should be damaged - expect(enemyPokemon[0].hp).toBeLessThan(enemyStartingHp[0]); - expect(enemyPokemon[1].hp).toBeLessThan(enemyStartingHp[1]); - } - ); -}); diff --git a/src/test/moves/roost.test.ts b/src/test/moves/roost.test.ts deleted file mode 100644 index 69301dc86cf..00000000000 --- a/src/test/moves/roost.test.ts +++ /dev/null @@ -1,268 +0,0 @@ -import { BattlerIndex } from "#app/battle"; -import { Type } from "#enums/type"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { Moves } from "#app/enums/moves"; -import { Species } from "#app/enums/species"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -describe("Moves - Roost", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - game.override.enemySpecies(Species.RELICANTH); - game.override.startingLevel(100); - game.override.enemyLevel(100); - game.override.enemyMoveset(Moves.EARTHQUAKE); - game.override.moveset([ Moves.ROOST, Moves.BURN_UP, Moves.DOUBLE_SHOCK ]); - }); - - /** - * Roost's behavior should be defined as: - * The pokemon loses its flying type for a turn. If the pokemon was ungroundd solely due to being a flying type, it will be grounded until end of turn. - * 1. Pure Flying type pokemon -> become normal type until end of turn - * 2. Dual Flying/X type pokemon -> become type X until end of turn - * 3. Pokemon that use burn up into roost (ex. Moltres) -> become flying due to burn up, then typeless until end of turn after using roost - * 4. If a pokemon is afflicted with Forest's Curse or Trick or treat, dual type pokemon will become 3 type pokemon after the flying type is regained - * Pure flying types become (Grass or Ghost) and then back to flying/ (Grass or Ghost), - * and pokemon post Burn up become () - * 5. If a pokemon is also ungrounded due to other reasons (such as levitate), it will stay ungrounded post roost, despite not being flying type. - * 6. Non flying types using roost (such as dunsparce) are already grounded, so this move will only heal and have no other effects. - */ - - test( - "Non flying type uses roost -> no type change, took damage", - async () => { - await game.classicMode.startBattle([ Species.DUNSPARCE ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - const playerPokemonStartingHP = playerPokemon.hp; - game.move.select(Moves.ROOST); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to(MoveEffectPhase); - - // Should only be normal type, and NOT flying type - let playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemonTypes[0] === Type.NORMAL).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeTruthy(); - - await game.phaseInterceptor.to(TurnEndPhase); - - // Lose HP, still normal type - playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP); - expect(playerPokemonTypes[0] === Type.NORMAL).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeTruthy(); - } - ); - - test( - "Pure flying type -> becomes normal after roost and takes damage from ground moves -> regains flying", - async () => { - await game.classicMode.startBattle([ Species.TORNADUS ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - const playerPokemonStartingHP = playerPokemon.hp; - game.move.select(Moves.ROOST); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to(MoveEffectPhase); - - // Should only be normal type, and NOT flying type - let playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemonTypes[0] === Type.NORMAL).toBeTruthy(); - expect(playerPokemonTypes[0] === Type.FLYING).toBeFalsy(); - expect(playerPokemon.isGrounded()).toBeTruthy(); - - await game.phaseInterceptor.to(TurnEndPhase); - - // Should have lost HP and is now back to being pure flying - playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP); - expect(playerPokemonTypes[0] === Type.NORMAL).toBeFalsy(); - expect(playerPokemonTypes[0] === Type.FLYING).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeFalsy(); - - } - ); - - test( - "Dual X/flying type -> becomes type X after roost and takes damage from ground moves -> regains flying", - async () => { - await game.classicMode.startBattle([ Species.HAWLUCHA ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - const playerPokemonStartingHP = playerPokemon.hp; - game.move.select(Moves.ROOST); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to(MoveEffectPhase); - - // Should only be pure fighting type and grounded - let playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemonTypes[0] === Type.FIGHTING).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeTruthy(); - - await game.phaseInterceptor.to(TurnEndPhase); - - // Should have lost HP and is now back to being fighting/flying - playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP); - expect(playerPokemonTypes[0] === Type.FIGHTING).toBeTruthy(); - expect(playerPokemonTypes[1] === Type.FLYING).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeFalsy(); - - } - ); - - test( - "Pokemon with levitate after using roost should lose flying type but still be unaffected by ground moves", - async () => { - game.override.starterForms({ [Species.ROTOM]: 4 }); - await game.classicMode.startBattle([ Species.ROTOM ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - const playerPokemonStartingHP = playerPokemon.hp; - game.move.select(Moves.ROOST); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to(MoveEffectPhase); - - // Should only be pure eletric type and grounded - let playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemonTypes[0] === Type.ELECTRIC).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeFalsy(); - - await game.phaseInterceptor.to(TurnEndPhase); - - // Should have lost HP and is now back to being electric/flying - playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemon.hp).toBe(playerPokemonStartingHP); - expect(playerPokemonTypes[0] === Type.ELECTRIC).toBeTruthy(); - expect(playerPokemonTypes[1] === Type.FLYING).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeFalsy(); - - } - ); - - test( - "A fire/flying type that uses burn up, then roost should be typeless until end of turn", - async () => { - await game.classicMode.startBattle([ Species.MOLTRES ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - const playerPokemonStartingHP = playerPokemon.hp; - game.move.select(Moves.BURN_UP); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to(MoveEffectPhase); - - // Should only be pure flying type after burn up - let playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemonTypes[0] === Type.FLYING).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - - await game.phaseInterceptor.to(TurnEndPhase); - game.move.select(Moves.ROOST); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to(MoveEffectPhase); - - // Should only be typeless type after roost and is grounded - playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemon.getTag(BattlerTagType.ROOSTED)).toBeDefined(); - expect(playerPokemonTypes[0] === Type.UNKNOWN).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeTruthy(); - - await game.phaseInterceptor.to(TurnEndPhase); - - // Should go back to being pure flying and have taken damage from earthquake, and is ungrounded again - playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP); - expect(playerPokemonTypes[0] === Type.FLYING).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeFalsy(); - - } - ); - - test( - "An electric/flying type that uses double shock, then roost should be typeless until end of turn", - async () => { - game.override.enemySpecies(Species.ZEKROM); - await game.classicMode.startBattle([ Species.ZAPDOS ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - const playerPokemonStartingHP = playerPokemon.hp; - game.move.select(Moves.DOUBLE_SHOCK); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to(MoveEffectPhase); - - // Should only be pure flying type after burn up - let playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemonTypes[0] === Type.FLYING).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - - await game.phaseInterceptor.to(TurnEndPhase); - game.move.select(Moves.ROOST); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to(MoveEffectPhase); - - // Should only be typeless type after roost and is grounded - playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemon.getTag(BattlerTagType.ROOSTED)).toBeDefined(); - expect(playerPokemonTypes[0] === Type.UNKNOWN).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeTruthy(); - - await game.phaseInterceptor.to(TurnEndPhase); - - // Should go back to being pure flying and have taken damage from earthquake, and is ungrounded again - playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP); - expect(playerPokemonTypes[0] === Type.FLYING).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeFalsy(); - - } - ); - - test( - "Dual Type Pokemon afflicted with Forests Curse/Trick or Treat and post roost will become dual type and then become 3 type at end of turn", - async () => { - game.override.enemyMoveset([ Moves.TRICK_OR_TREAT, Moves.TRICK_OR_TREAT, Moves.TRICK_OR_TREAT, Moves.TRICK_OR_TREAT ]); - await game.classicMode.startBattle([ Species.MOLTRES ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - game.move.select(Moves.ROOST); - await game.phaseInterceptor.to(MoveEffectPhase); - - let playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemonTypes[0] === Type.FIRE).toBeTruthy(); - expect(playerPokemonTypes.length === 1).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeTruthy(); - - await game.phaseInterceptor.to(TurnEndPhase); - - // Should be fire/flying/ghost - playerPokemonTypes = playerPokemon.getTypes(); - expect(playerPokemonTypes.filter(type => type === Type.FLYING)).toHaveLength(1); - expect(playerPokemonTypes.filter(type => type === Type.FIRE)).toHaveLength(1); - expect(playerPokemonTypes.filter(type => type === Type.GHOST)).toHaveLength(1); - expect(playerPokemonTypes.length === 3).toBeTruthy(); - expect(playerPokemon.isGrounded()).toBeFalsy(); - - } - ); - -}); diff --git a/src/test/moves/shell_trap.test.ts b/src/test/moves/shell_trap.test.ts deleted file mode 100644 index 04d3cf998b1..00000000000 --- a/src/test/moves/shell_trap.test.ts +++ /dev/null @@ -1,162 +0,0 @@ -import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; -import { Moves } from "#app/enums/moves"; -import { Species } from "#app/enums/species"; -import { MoveResult } from "#app/field/pokemon"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - - -describe("Moves - Shell Trap", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override - .battleType("double") - .moveset([ Moves.SHELL_TRAP, Moves.SPLASH, Moves.BULLDOZE ]) - .enemySpecies(Species.SNORLAX) - .enemyMoveset([ Moves.RAZOR_LEAF ]) - .startingLevel(100) - .enemyLevel(100); - - vi.spyOn(allMoves[Moves.RAZOR_LEAF], "accuracy", "get").mockReturnValue(100); - }); - - it( - "should activate after the user is hit by a physical attack", - async () => { - await game.startBattle([ Species.CHARIZARD, Species.TURTONATOR ]); - - const playerPokemon = game.scene.getPlayerField(); - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.SPLASH); - game.move.select(Moves.SHELL_TRAP, 1); - - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]); - - await game.phaseInterceptor.to(MoveEndPhase); - - const movePhase = game.scene.getCurrentPhase(); - expect(movePhase instanceof MovePhase).toBeTruthy(); - expect((movePhase as MovePhase).pokemon).toBe(playerPokemon[1]); - - await game.phaseInterceptor.to(MoveEndPhase); - enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp())); - } - ); - - it( - "should fail if the user is only hit by special attacks", - async () => { - game.override.enemyMoveset([ Moves.SWIFT ]); - - await game.startBattle([ Species.CHARIZARD, Species.TURTONATOR ]); - - const playerPokemon = game.scene.getPlayerField(); - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.SPLASH); - game.move.select(Moves.SHELL_TRAP, 1); - - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]); - - await game.phaseInterceptor.to(MoveEndPhase); - - const movePhase = game.scene.getCurrentPhase(); - expect(movePhase instanceof MovePhase).toBeTruthy(); - expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]); - - await game.phaseInterceptor.to(BerryPhase, false); - enemyPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); - } - ); - - it( - "should fail if the user isn't hit with any attack", - async () => { - game.override.enemyMoveset(Moves.SPLASH); - - await game.startBattle([ Species.CHARIZARD, Species.TURTONATOR ]); - - const playerPokemon = game.scene.getPlayerField(); - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.SPLASH); - game.move.select(Moves.SHELL_TRAP, 1); - - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]); - - await game.phaseInterceptor.to(MoveEndPhase); - - const movePhase = game.scene.getCurrentPhase(); - expect(movePhase instanceof MovePhase).toBeTruthy(); - expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]); - - await game.phaseInterceptor.to(BerryPhase, false); - enemyPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); - } - ); - - it( - "should not activate from an ally's attack", - async () => { - game.override.enemyMoveset(Moves.SPLASH); - - await game.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerField(); - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.SHELL_TRAP); - game.move.select(Moves.BULLDOZE, 1); - - await game.phaseInterceptor.to(MoveEndPhase); - - const movePhase = game.scene.getCurrentPhase(); - expect(movePhase instanceof MovePhase).toBeTruthy(); - expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]); - - const enemyStartingHp = enemyPokemon.map(p => p.hp); - - await game.phaseInterceptor.to(BerryPhase, false); - enemyPokemon.forEach((p, i) => expect(p.hp).toBe(enemyStartingHp[i])); - } - ); - - it( - "should not activate from a subsequent physical attack", - async () => { - game.override.battleType("single"); - vi.spyOn(allMoves[Moves.RAZOR_LEAF], "priority", "get").mockReturnValue(-4); - - await game.startBattle([ Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.SHELL_TRAP); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - } - ); -}); diff --git a/src/test/moves/spotlight.test.ts b/src/test/moves/spotlight.test.ts deleted file mode 100644 index 095f7d80bfe..00000000000 --- a/src/test/moves/spotlight.test.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { BattlerIndex } from "#app/battle"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; - - -describe("Moves - Spotlight", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("double"); - game.override.starterSpecies(Species.AMOONGUSS); - game.override.enemySpecies(Species.SNORLAX); - game.override.startingLevel(100); - game.override.enemyLevel(100); - game.override.moveset([ Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK ]); - game.override.enemyMoveset([ Moves.FOLLOW_ME, Moves.SPLASH ]); - }); - - test( - "move should redirect attacks to the target", - async () => { - await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.SPOTLIGHT, 0, BattlerIndex.ENEMY); - game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); - - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); - - await game.phaseInterceptor.to(TurnEndPhase, false); - - expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); - expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); - } - ); - - test( - "move should cause other redirection moves to fail", - async () => { - await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]); - - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.SPOTLIGHT, 0, BattlerIndex.ENEMY); - game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); - - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.FOLLOW_ME); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); - expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); - } - ); -}); diff --git a/src/test/moves/substitute.test.ts b/src/test/moves/substitute.test.ts deleted file mode 100644 index 18b0c6ea536..00000000000 --- a/src/test/moves/substitute.test.ts +++ /dev/null @@ -1,602 +0,0 @@ -import { BattlerIndex } from "#app/battle"; -import { ArenaTagSide } from "#app/data/arena-tag"; -import { SubstituteTag, TrappedTag } from "#app/data/battler-tags"; -import { allMoves, StealHeldItemChanceAttr } from "#app/data/move"; -import { MoveResult } from "#app/field/pokemon"; -import type { CommandPhase } from "#app/phases/command-phase"; -import GameManager from "#app/test/utils/gameManager"; -import { Command } from "#app/ui/command-ui-handler"; -import { Mode } from "#app/ui/ui"; -import { Abilities } from "#enums/abilities"; -import { ArenaTagType } from "#enums/arena-tag-type"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { BerryType } from "#enums/berry-type"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { Stat } from "#enums/stat"; -import { StatusEffect } from "#enums/status-effect"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - - -describe("Moves - Substitute", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override - .battleType("single") - .moveset([ Moves.SUBSTITUTE, Moves.SWORDS_DANCE, Moves.TACKLE, Moves.SPLASH ]) - .enemySpecies(Species.SNORLAX) - .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset(Moves.SPLASH) - .startingLevel(100) - .enemyLevel(100); - }); - - it( - "should cause the user to take damage", - async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SUBSTITUTE); - - await game.phaseInterceptor.to("MoveEndPhase", false); - - expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() * 3 / 4)); - } - ); - - it( - "should redirect enemy attack damage to the Substitute doll", - async () => { - game.override.enemyMoveset(Moves.TACKLE); - - await game.classicMode.startBattle([ Species.SKARMORY ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SUBSTITUTE); - - await game.phaseInterceptor.to("MoveEndPhase", false); - - expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() * 3 / 4)); - expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); - const postSubHp = leadPokemon.hp; - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.hp).toBe(postSubHp); - expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); - } - ); - - it( - "should fade after redirecting more damage than its remaining HP", - async () => { - // Giga Impact OHKOs Magikarp if substitute isn't up - game.override.enemyMoveset(Moves.GIGA_IMPACT); - vi.spyOn(allMoves[Moves.GIGA_IMPACT], "accuracy", "get").mockReturnValue(100); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SUBSTITUTE); - - await game.phaseInterceptor.to("MoveEndPhase", false); - - expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() * 3 / 4)); - expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); - const postSubHp = leadPokemon.hp; - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.hp).toBe(postSubHp); - expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeUndefined(); - } - ); - - it( - "should block stat changes from status moves", - async () => { - game.override.enemyMoveset(Moves.CHARM); - - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SUBSTITUTE); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); - expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); - } - ); - - it( - "should be bypassed by sound-based moves", - async () => { - game.override.enemyMoveset(Moves.ECHOED_VOICE); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SUBSTITUTE); - - await game.phaseInterceptor.to("MoveEndPhase"); - - expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); - const postSubHp = leadPokemon.hp; - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); - expect(leadPokemon.hp).toBeLessThan(postSubHp); - } - ); - - it( - "should be bypassed by attackers with Infiltrator", - async () => { - game.override.enemyMoveset(Moves.TACKLE); - game.override.enemyAbility(Abilities.INFILTRATOR); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SUBSTITUTE); - - await game.phaseInterceptor.to("MoveEndPhase"); - - expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); - const postSubHp = leadPokemon.hp; - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); - expect(leadPokemon.hp).toBeLessThan(postSubHp); - } - ); - - it( - "shouldn't block the user's own status moves", - async () => { - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SUBSTITUTE); - - await game.phaseInterceptor.to("MoveEndPhase"); - await game.toNextTurn(); - - game.move.select(Moves.SWORDS_DANCE); - - await game.phaseInterceptor.to("MoveEndPhase", false); - - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); - } - ); - - it( - "shouldn't block moves that target the user's side of the field", - async () => { - game.override.moveset(Moves.LIGHT_SCREEN); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - vi.spyOn(leadPokemon, "getMoveEffectiveness"); - - leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); - - game.move.select(Moves.LIGHT_SCREEN); - - await game.toNextTurn(); - - expect(leadPokemon.getMoveEffectiveness).not.toHaveReturnedWith(0); - expect(game.scene.arena.getTagOnSide(ArenaTagType.LIGHT_SCREEN, ArenaTagSide.PLAYER)).toBeDefined(); - } - ); - - it( - "shouldn't block the opponent from setting hazards", - async () => { - game.override.enemyMoveset(Moves.STEALTH_ROCK); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - vi.spyOn(leadPokemon, "getMoveEffectiveness"); - - game.move.select(Moves.SUBSTITUTE); - - await game.toNextTurn(); - - expect(leadPokemon.getMoveEffectiveness).not.toHaveReturnedWith(0); - expect(game.scene.arena.getTagOnSide(ArenaTagType.STEALTH_ROCK, ArenaTagSide.PLAYER)).toBeDefined(); - } - ); - - it( - "shouldn't block moves that target both sides of the field", - async () => { - game.override - .moveset(Moves.TRICK_ROOM) - .enemyMoveset(Moves.GRAVITY); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const pokemon = game.scene.getField(true); - pokemon.forEach(p => { - vi.spyOn(p, "getMoveEffectiveness"); - p.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, p.id); - }); - - game.move.select(Moves.TRICK_ROOM); - - await game.toNextTurn(); - - pokemon.forEach(p => expect(p.getMoveEffectiveness).not.toHaveReturnedWith(0)); - expect(game.scene.arena.getTag(ArenaTagType.TRICK_ROOM)).toBeDefined(); - expect(game.scene.arena.getTag(ArenaTagType.GRAVITY)).toBeDefined(); - } - ); - - it( - "should protect the user from flinching", - async () => { - game.override.enemyMoveset(Moves.FAKE_OUT); - game.override.startingLevel(1); // Ensures the Substitute will break - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); - - game.move.select(Moves.TACKLE); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - } - ); - - it( - "should protect the user from being trapped", - async () => { - vi.spyOn(allMoves[Moves.SAND_TOMB], "accuracy", "get").mockReturnValue(100); - game.override.enemyMoveset(Moves.SAND_TOMB); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getTag(TrappedTag)).toBeUndefined(); - } - ); - - it( - "should prevent the user's stats from being lowered", - async () => { - vi.spyOn(allMoves[Moves.LIQUIDATION], "chance", "get").mockReturnValue(100); - game.override.enemyMoveset(Moves.LIQUIDATION); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getStatStage(Stat.DEF)).toBe(0); - } - ); - - it( - "should protect the user from being afflicted with status effects", - async () => { - game.override.enemyMoveset(Moves.NUZZLE); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.status?.effect).not.toBe(StatusEffect.PARALYSIS); - } - ); - - it( - "should prevent the user's items from being stolen", - async () => { - game.override.enemyMoveset(Moves.THIEF); - vi.spyOn(allMoves[Moves.THIEF], "attrs", "get").mockReturnValue([ new StealHeldItemChanceAttr(1.0) ]); // give Thief 100% steal rate - game.override.startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); - - game.move.select(Moves.SPLASH); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getHeldItems().length).toBe(1); - } - ); - - it( - "should prevent the user's items from being removed", - async () => { - game.override.moveset([ Moves.KNOCK_OFF ]); - game.override.enemyHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - enemyPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, enemyPokemon.id); - const enemyNumItems = enemyPokemon.getHeldItems().length; - - game.move.select(Moves.KNOCK_OFF); - - await game.phaseInterceptor.to("MoveEndPhase", false); - - expect(enemyPokemon.getHeldItems().length).toBe(enemyNumItems); - } - ); - - it( - "move effect should prevent the user's berries from being stolen and eaten", - async () => { - game.override.enemyMoveset(Moves.BUG_BITE); - game.override.startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); - - game.move.select(Moves.TACKLE); - - await game.phaseInterceptor.to("MoveEndPhase", false); - const enemyPostAttackHp = enemyPokemon.hp; - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getHeldItems().length).toBe(1); - expect(enemyPokemon.hp).toBe(enemyPostAttackHp); - } - ); - - it( - "should prevent the user's stats from being reset by Clear Smog", - async () => { - game.override.enemyMoveset(Moves.CLEAR_SMOG); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); - - game.move.select(Moves.SWORDS_DANCE); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); - } - ); - - it( - "should prevent the user from becoming confused", - async () => { - game.override.enemyMoveset(Moves.MAGICAL_TORQUE); - vi.spyOn(allMoves[Moves.MAGICAL_TORQUE], "chance", "get").mockReturnValue(100); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); - - game.move.select(Moves.SWORDS_DANCE); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(leadPokemon.getTag(BattlerTagType.CONFUSED)).toBeUndefined(); - expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); - } - ); - - it( - "should transfer to the switched in Pokemon when the source uses Baton Pass", - async () => { - game.override.moveset([ Moves.SUBSTITUTE, Moves.BATON_PASS ]); - - await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - - leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); - - // Simulate a Baton switch for the player this turn - game.onNextPrompt("CommandPhase", Mode.COMMAND, () => { - (game.scene.getCurrentPhase() as CommandPhase).handleCommand(Command.POKEMON, 1, true); - }); - - await game.phaseInterceptor.to("MovePhase", false); - - const switchedPokemon = game.scene.getPlayerPokemon()!; - const subTag = switchedPokemon.getTag(SubstituteTag)!; - expect(subTag).toBeDefined(); - expect(subTag.hp).toBe(Math.floor(leadPokemon.getMaxHp() * 1 / 4)); - } - ); - - it( - "should prevent the source's Rough Skin from activating when hit", - async () => { - game.override.enemyMoveset(Moves.TACKLE); - game.override.ability(Abilities.ROUGH_SKIN); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.SUBSTITUTE); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - } - ); - - it( - "should prevent the source's Focus Punch from failing when hit", - async () => { - game.override.enemyMoveset(Moves.TACKLE); - game.override.moveset([ Moves.FOCUS_PUNCH ]); - - // Make Focus Punch 40 power to avoid a KO - vi.spyOn(allMoves[Moves.FOCUS_PUNCH], "calculateBattlePower").mockReturnValue(40); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id); - - game.move.select(Moves.FOCUS_PUNCH); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - } - ); - - it( - "should not allow Shell Trap to activate when attacked", - async () => { - game.override.enemyMoveset(Moves.TACKLE); - game.override.moveset([ Moves.SHELL_TRAP ]); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - - playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id); - - game.move.select(Moves.SHELL_TRAP); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - } - ); - - it( - "should not allow Beak Blast to burn opponents when hit", - async () => { - game.override.enemyMoveset(Moves.TACKLE); - game.override.moveset([ Moves.BEAK_BLAST ]); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id); - - game.move.select(Moves.BEAK_BLAST); - - await game.phaseInterceptor.to("MoveEndPhase"); - - expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.BURN); - } - ); - - it( - "should cause incoming attacks to not activate Counter", - async () => { - game.override.enemyMoveset(Moves.TACKLE); - game.override.moveset([ Moves.COUNTER ]); - - await game.classicMode.startBattle([ Species.BLASTOISE ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; - - playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id); - - game.move.select(Moves.COUNTER); - - await game.phaseInterceptor.to("BerryPhase", false); - - expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); - expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); - } - ); - - it( - "should prevent Sappy Seed from applying its Leech Seed effect to the user", - async () => { - game.override.enemyMoveset(Moves.SAPPY_SEED); - - await game.classicMode.startBattle([ Species.CHARIZARD ]); - - const playerPokemon = game.scene.getPlayerPokemon()!; - - playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id); - - game.move.select(Moves.SPLASH); - - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); // enemy uses Sappy Seed first - await game.move.forceHit(); // forces Sappy Seed to hit - await game.phaseInterceptor.to("MoveEndPhase"); - - expect(playerPokemon.getTag(BattlerTagType.SEEDED)).toBeUndefined(); - } - ); -}); diff --git a/src/test/moves/syrup_bomb.test.ts b/src/test/moves/syrup_bomb.test.ts deleted file mode 100644 index ea2f8b6bab3..00000000000 --- a/src/test/moves/syrup_bomb.test.ts +++ /dev/null @@ -1,96 +0,0 @@ -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { Abilities } from "#enums/abilities"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { BattlerIndex } from "#app/battle"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - -describe("Moves - SYRUP BOMB", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override - .battleType("single") - .enemySpecies(Species.SNORLAX) - .enemyAbility(Abilities.BALL_FETCH) - .ability(Abilities.BALL_FETCH) - .startingLevel(30) - .enemyLevel(100) - .moveset([ Moves.SYRUP_BOMB, Moves.SPLASH ]) - .enemyMoveset(Moves.SPLASH); - }); - - //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/syrup_bomb_(move) - - it("decreases the target Pokemon's speed stat once per turn for 3 turns", - async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const targetPokemon = game.scene.getEnemyPokemon()!; - expect(targetPokemon.getStatStage(Stat.SPD)).toBe(0); - - game.move.select(Moves.SYRUP_BOMB); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.move.forceHit(); - await game.toNextTurn(); - expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeDefined(); - expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-1); - - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeDefined(); - expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-2); - - game.move.select(Moves.SPLASH); - await game.toNextTurn(); - expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeUndefined(); - expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-3); - } - ); - - it("does not affect Pokemon with the ability Bulletproof", - async () => { - game.override.enemyAbility(Abilities.BULLETPROOF); - await game.classicMode.startBattle([ Species.MAGIKARP ]); - - const targetPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.SYRUP_BOMB); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.move.forceHit(); - await game.toNextTurn(); - expect(targetPokemon.isFullHp()).toBe(true); - expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeUndefined(); - expect(targetPokemon.getStatStage(Stat.SPD)).toBe(0); - } - ); - - it("stops lowering the target's speed if the user leaves the field", async () => { - await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]); - - game.move.select(Moves.SYRUP_BOMB); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.move.forceHit(); - await game.toNextTurn(); - - game.doSwitchPokemon(1); - await game.toNextTurn(); - - expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.SPD)).toBe(-1); - }); -}); diff --git a/src/test/moves/tera_blast.test.ts b/src/test/moves/tera_blast.test.ts deleted file mode 100644 index 44dc29f68b5..00000000000 --- a/src/test/moves/tera_blast.test.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { BattlerIndex } from "#app/battle"; -import { Stat } from "#enums/stat"; -import { allMoves } from "#app/data/move"; -import { Type } from "#enums/type"; -import { Abilities } from "#app/enums/abilities"; -import { HitResult } from "#app/field/pokemon"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - -describe("Moves - Tera Blast", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - const moveToCheck = allMoves[Moves.TERA_BLAST]; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override - .battleType("single") - .disableCrits() - .starterSpecies(Species.FEEBAS) - .moveset([ Moves.TERA_BLAST ]) - .ability(Abilities.BALL_FETCH) - .startingHeldItems([{ name: "TERA_SHARD", type: Type.FIRE }]) - .enemySpecies(Species.MAGIKARP) - .enemyMoveset(Moves.SPLASH) - .enemyAbility(Abilities.BALL_FETCH) - .enemyLevel(20); - - vi.spyOn(moveToCheck, "calculateBattlePower"); - }); - - it("changes type to match user's tera type", async () => { - game.override - .enemySpecies(Species.FURRET) - .startingHeldItems([{ name: "TERA_SHARD", type: Type.FIGHTING }]); - await game.startBattle(); - const enemyPokemon = game.scene.getEnemyPokemon()!; - vi.spyOn(enemyPokemon, "apply"); - - game.move.select(Moves.TERA_BLAST); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to("MoveEffectPhase"); - - expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.SUPER_EFFECTIVE); - }, 20000); - - it("increases power if user is Stellar tera type", async () => { - game.override.startingHeldItems([{ name: "TERA_SHARD", type: Type.STELLAR }]); - - await game.startBattle(); - - game.move.select(Moves.TERA_BLAST); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to("MoveEffectPhase"); - - expect(moveToCheck.calculateBattlePower).toHaveReturnedWith(100); - }, 20000); - - it("is super effective against terastallized targets if user is Stellar tera type", async () => { - game.override.startingHeldItems([{ name: "TERA_SHARD", type: Type.STELLAR }]); - - await game.startBattle(); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - vi.spyOn(enemyPokemon, "apply"); - vi.spyOn(enemyPokemon, "isTerastallized").mockReturnValue(true); - - game.move.select(Moves.TERA_BLAST); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to("MoveEffectPhase"); - - expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.SUPER_EFFECTIVE); - }); - - // Currently abilities are bugged and can't see when a move's category is changed - it.todo("uses the higher stat of the user's Atk and SpAtk for damage calculation", async () => { - game.override.enemyAbility(Abilities.TOXIC_DEBRIS); - await game.startBattle(); - - const playerPokemon = game.scene.getPlayerPokemon()!; - playerPokemon.stats[Stat.ATK] = 100; - playerPokemon.stats[Stat.SPATK] = 1; - - game.move.select(Moves.TERA_BLAST); - await game.phaseInterceptor.to("TurnEndPhase"); - expect(game.scene.getEnemyPokemon()!.battleData.abilityRevealed).toBe(true); - }, 20000); - - it("causes stat drops if user is Stellar tera type", async () => { - game.override.startingHeldItems([{ name: "TERA_SHARD", type: Type.STELLAR }]); - await game.startBattle(); - - const playerPokemon = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.TERA_BLAST); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); - await game.phaseInterceptor.to("MoveEndPhase"); - - expect(playerPokemon.getStatStage(Stat.SPATK)).toBe(-1); - expect(playerPokemon.getStatStage(Stat.ATK)).toBe(-1); - }, 20000); -}); diff --git a/src/test/moves/thousand_arrows.test.ts b/src/test/moves/thousand_arrows.test.ts deleted file mode 100644 index 976b4352ee4..00000000000 --- a/src/test/moves/thousand_arrows.test.ts +++ /dev/null @@ -1,99 +0,0 @@ -import { Abilities } from "#app/enums/abilities"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - - -describe("Moves - Thousand Arrows", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - game.override.battleType("single"); - game.override.enemySpecies(Species.TOGETIC); - game.override.startingLevel(100); - game.override.enemyLevel(100); - game.override.moveset([ Moves.THOUSAND_ARROWS ]); - game.override.enemyMoveset([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]); - }); - - it( - "move should hit and ground Flying-type targets", - async () => { - await game.startBattle([ Species.ILLUMISE ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.THOUSAND_ARROWS); - - await game.phaseInterceptor.to(MoveEffectPhase, false); - // Enemy should not be grounded before move effect is applied - expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined(); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined(); - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - } - ); - - it( - "move should hit and ground targets with Levitate", - async () => { - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyAbility(Abilities.LEVITATE); - - await game.startBattle([ Species.ILLUMISE ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - game.move.select(Moves.THOUSAND_ARROWS); - - await game.phaseInterceptor.to(MoveEffectPhase, false); - // Enemy should not be grounded before move effect is applied - expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined(); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined(); - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - } - ); - - it( - "move should hit and ground targets under the effects of Magnet Rise", - async () => { - game.override.enemySpecies(Species.SNORLAX); - - await game.startBattle([ Species.ILLUMISE ]); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - - enemyPokemon.addTag(BattlerTagType.FLOATING, undefined, Moves.MAGNET_RISE); - - game.move.select(Moves.THOUSAND_ARROWS); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(enemyPokemon.getTag(BattlerTagType.FLOATING)).toBeUndefined(); - expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined(); - expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); - } - ); -}); diff --git a/src/test/moves/wide_guard.test.ts b/src/test/moves/wide_guard.test.ts deleted file mode 100644 index c25a700c981..00000000000 --- a/src/test/moves/wide_guard.test.ts +++ /dev/null @@ -1,124 +0,0 @@ -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import GameManager from "../utils/gameManager"; -import { Species } from "#enums/species"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Stat } from "#enums/stat"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CommandPhase } from "#app/phases/command-phase"; - - -describe("Moves - Wide Guard", () => { - let phaserGame: Phaser.Game; - let game: GameManager; - - beforeAll(() => { - phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS, - }); - }); - - afterEach(() => { - game.phaseInterceptor.restoreOg(); - }); - - beforeEach(() => { - game = new GameManager(phaserGame); - - game.override.battleType("double"); - - game.override.moveset([ Moves.WIDE_GUARD, Moves.SPLASH, Moves.SURF ]); - - game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset([ Moves.SWIFT ]); - game.override.enemyAbility(Abilities.INSOMNIA); - - game.override.startingLevel(100); - game.override.enemyLevel(100); - }); - - test( - "should protect the user and allies from multi-target attack moves", - async () => { - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.WIDE_GUARD); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); - } - ); - - test( - "should protect the user and allies from multi-target status moves", - async () => { - game.override.enemyMoveset([ Moves.GROWL ]); - - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.WIDE_GUARD); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0)); - } - ); - - test( - "should not protect the user and allies from single-target moves", - async () => { - game.override.enemyMoveset([ Moves.TACKLE ]); - - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerField(); - - game.move.select(Moves.WIDE_GUARD); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SPLASH, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(leadPokemon.some(p => p.hp < p.getMaxHp())).toBeTruthy(); - } - ); - - test( - "should protect the user from its ally's multi-target move", - async () => { - game.override.enemyMoveset([ Moves.SPLASH ]); - - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); - - const leadPokemon = game.scene.getPlayerField(); - const enemyPokemon = game.scene.getEnemyField(); - - game.move.select(Moves.WIDE_GUARD); - - await game.phaseInterceptor.to(CommandPhase); - - game.move.select(Moves.SURF, 1); - - await game.phaseInterceptor.to(BerryPhase, false); - - expect(leadPokemon[0].hp).toBe(leadPokemon[0].getMaxHp()); - enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp())); - } - ); -}); diff --git a/src/test/utils/mocks/mocksContainer/mockPolygon.ts b/src/test/utils/mocks/mocksContainer/mockPolygon.ts deleted file mode 100644 index 12b60904a96..00000000000 --- a/src/test/utils/mocks/mocksContainer/mockPolygon.ts +++ /dev/null @@ -1,9 +0,0 @@ -import MockContainer from "#test/utils/mocks/mocksContainer/mockContainer"; - - -export default class MockPolygon extends MockContainer { - constructor(textureManager, x, y, content, fillColor, fillAlpha) { - super(textureManager, x, y); - } -} - diff --git a/src/timed-event-manager.ts b/src/timed-event-manager.ts index 7a9f0e59993..80667b033ad 100644 --- a/src/timed-event-manager.ts +++ b/src/timed-event-manager.ts @@ -13,7 +13,7 @@ import { MysteryEncounterTier } from "./enums/mystery-encounter-tier"; export enum EventType { SHINY, NO_TIMER_DISPLAY, - LUCK + LUCK, } interface EventBanner { @@ -27,6 +27,7 @@ interface EventBanner { interface EventEncounter { species: Species; blockEvolution?: boolean; + formIndex?: number; } interface EventMysteryEncounterTier { @@ -49,6 +50,7 @@ interface TimedEvent extends EventBanner { weather?: WeatherPoolEntry[]; mysteryEncounterTierChanges?: EventMysteryEncounterTier[]; luckBoostedSpecies?: Species[]; + boostFusions?: boolean; //MODIFIER REWORK PLEASE } const timedEvents: TimedEvent[] = [ @@ -61,7 +63,7 @@ const timedEvents: TimedEvent[] = [ endDate: new Date(Date.UTC(2025, 0, 4, 0)), bannerKey: "winter_holidays2024-event-", scale: 0.21, - availableLangs: [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ], + availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN"], eventEncounters: [ { species: Species.GIMMIGHOUL, blockEvolution: true }, { species: Species.DELIBIRD }, @@ -82,17 +84,26 @@ const timedEvents: TimedEvent[] = [ { species: Species.SMOLIV }, { species: Species.ALOLA_VULPIX }, { species: Species.GALAR_DARUMAKA }, - { species: Species.IRON_BUNDLE } + { species: Species.IRON_BUNDLE }, ], - delibirdyBuff: [ "CATCHING_CHARM", "SHINY_CHARM", "ABILITY_CHARM", "EXP_CHARM", "SUPER_EXP_CHARM", "HEALING_CHARM" ], + delibirdyBuff: ["CATCHING_CHARM", "SHINY_CHARM", "ABILITY_CHARM", "EXP_CHARM", "SUPER_EXP_CHARM", "HEALING_CHARM"], weather: [{ weatherType: WeatherType.SNOW, weight: 1 }], mysteryEncounterTierChanges: [ - { mysteryEncounter: MysteryEncounterType.DELIBIRDY, tier: MysteryEncounterTier.COMMON }, + { + mysteryEncounter: MysteryEncounterType.DELIBIRDY, + tier: MysteryEncounterTier.COMMON, + }, { mysteryEncounter: MysteryEncounterType.PART_TIMER, disable: true }, - { mysteryEncounter: MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, disable: true }, + { + mysteryEncounter: MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, + disable: true, + }, { mysteryEncounter: MysteryEncounterType.FIELD_TRIP, disable: true }, - { mysteryEncounter: MysteryEncounterType.DEPARTMENT_STORE_SALE, disable: true } - ] + { + mysteryEncounter: MysteryEncounterType.DEPARTMENT_STORE_SALE, + disable: true, + }, + ], }, { name: "Year of the Snake", @@ -102,7 +113,7 @@ const timedEvents: TimedEvent[] = [ endDate: new Date(Date.UTC(2025, 1, 3, 0)), bannerKey: "yearofthesnakeevent-", scale: 0.21, - availableLangs: [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ], + availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN"], eventEncounters: [ { species: Species.EKANS }, { species: Species.ONIX }, @@ -118,43 +129,131 @@ const timedEvents: TimedEvent[] = [ { species: Species.DARUMAKA }, { species: Species.DRAMPA }, { species: Species.SILICOBRA }, - { species: Species.BLOODMOON_URSALUNA } + { species: Species.BLOODMOON_URSALUNA }, ], luckBoostedSpecies: [ - Species.EKANS, Species.ARBOK, - Species.ONIX, Species.STEELIX, - Species.DRATINI, Species.DRAGONAIR, Species.DRAGONITE, - Species.CLEFFA, Species.CLEFAIRY, Species.CLEFABLE, + Species.EKANS, + Species.ARBOK, + Species.ONIX, + Species.STEELIX, + Species.DRATINI, + Species.DRAGONAIR, + Species.DRAGONITE, + Species.CLEFFA, + Species.CLEFAIRY, + Species.CLEFABLE, Species.UMBREON, - Species.DUNSPARCE, Species.DUDUNSPARCE, - Species.TEDDIURSA, Species.URSARING, Species.URSALUNA, + Species.DUNSPARCE, + Species.DUDUNSPARCE, + Species.TEDDIURSA, + Species.URSARING, + Species.URSALUNA, Species.SEVIPER, Species.LUNATONE, Species.RAYQUAZA, - Species.CHINGLING, Species.CHIMECHO, + Species.CHINGLING, + Species.CHIMECHO, Species.CRESSELIA, Species.DARKRAI, - Species.SNIVY, Species.SERVINE, Species.SERPERIOR, - Species.DARUMAKA, Species.DARMANITAN, + Species.SNIVY, + Species.SERVINE, + Species.SERPERIOR, + Species.DARUMAKA, + Species.DARMANITAN, Species.ZYGARDE, Species.DRAMPA, Species.LUNALA, Species.BLACEPHALON, - Species.SILICOBRA, Species.SANDACONDA, + Species.SILICOBRA, + Species.SANDACONDA, Species.ROARING_MOON, - Species.BLOODMOON_URSALUNA - ] - } + Species.BLOODMOON_URSALUNA, + ], + }, + { + name: "Valentine", + eventType: EventType.SHINY, + startDate: new Date(Date.UTC(2025, 1, 10)), + endDate: new Date(Date.UTC(2025, 1, 21)), + boostFusions: true, + shinyMultiplier: 2, + bannerKey: "valentines2025event-", + scale: 0.21, + availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN"], + eventEncounters: [ + { species: Species.NIDORAN_F }, + { species: Species.NIDORAN_M }, + { species: Species.IGGLYBUFF }, + { species: Species.SMOOCHUM }, + { species: Species.VOLBEAT }, + { species: Species.ILLUMISE }, + { species: Species.ROSELIA }, + { species: Species.LUVDISC }, + { species: Species.WOOBAT }, + { species: Species.FRILLISH }, + { species: Species.ALOMOMOLA }, + { species: Species.FURFROU, formIndex: 1 }, // Heart Trim + { species: Species.ESPURR }, + { species: Species.SPRITZEE }, + { species: Species.SWIRLIX }, + { species: Species.APPLIN }, + { species: Species.MILCERY }, + { species: Species.INDEEDEE }, + { species: Species.TANDEMAUS }, + { species: Species.ENAMORUS }, + ], + luckBoostedSpecies: [Species.LUVDISC], + }, + { + name: "PKMNDAY2025", + eventType: EventType.LUCK, + startDate: new Date(Date.UTC(2025, 1, 27)), + endDate: new Date(Date.UTC(2025, 2, 4)), + classicFriendshipMultiplier: 4, + bannerKey: "pkmnday2025event-", + scale: 0.21, + availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN"], + eventEncounters: [ + { species: Species.PIKACHU, formIndex: 1, blockEvolution: true }, // Partner Form + { species: Species.EEVEE, formIndex: 1, blockEvolution: true }, // Partner Form + { species: Species.CHIKORITA }, + { species: Species.TOTODILE }, + { species: Species.TEPIG }, + ], + luckBoostedSpecies: [ + Species.PICHU, + Species.PIKACHU, + Species.RAICHU, + Species.ALOLA_RAICHU, + Species.PSYDUCK, + Species.GOLDUCK, + Species.EEVEE, + Species.FLAREON, + Species.JOLTEON, + Species.VAPOREON, + Species.ESPEON, + Species.UMBREON, + Species.LEAFEON, + Species.GLACEON, + Species.SYLVEON, + Species.CHIKORITA, + Species.BAYLEEF, + Species.MEGANIUM, + Species.TOTODILE, + Species.CROCONAW, + Species.FERALIGATR, + Species.TEPIG, + Species.PIGNITE, + Species.EMBOAR, + Species.ZYGARDE, + Species.ETERNAL_FLOETTE, + ], + }, ]; export class TimedEventManager { - constructor() {} - isActive(event: TimedEvent) { - return ( - event.startDate < new Date() && - new Date() < event.endDate - ); + return event.startDate < new Date() && new Date() < event.endDate; } activeEvent(): TimedEvent | undefined { @@ -166,16 +265,16 @@ export class TimedEventManager { } activeEventHasBanner(): boolean { - const activeEvents = timedEvents.filter((te) => this.isActive(te) && te.hasOwnProperty("bannerFilename")); + const activeEvents = timedEvents.filter(te => this.isActive(te) && te.hasOwnProperty("bannerFilename")); return activeEvents.length > 0; } getShinyMultiplier(): number { let multiplier = 1; - const shinyEvents = timedEvents.filter((te) => te.eventType === EventType.SHINY && this.isActive(te)); - shinyEvents.forEach((se) => { + const shinyEvents = timedEvents.filter(te => te.eventType === EventType.SHINY && this.isActive(te)); + for (const se of shinyEvents) { multiplier *= se.shinyMultiplier ?? 1; - }); + } return multiplier; } @@ -186,11 +285,13 @@ export class TimedEventManager { getEventEncounters(): EventEncounter[] { const ret: EventEncounter[] = []; - timedEvents.filter((te) => this.isActive(te)).map((te) => { - if (!isNullOrUndefined(te.eventEncounters)) { - ret.push(...te.eventEncounters); - } - }); + timedEvents + .filter(te => this.isActive(te)) + .map(te => { + if (!isNullOrUndefined(te.eventEncounters)) { + ret.push(...te.eventEncounters); + } + }); return ret; } @@ -200,12 +301,12 @@ export class TimedEventManager { */ getClassicFriendshipMultiplier(): number { let multiplier = CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER; - const classicFriendshipEvents = timedEvents.filter((te) => this.isActive(te)); - classicFriendshipEvents.forEach((fe) => { + const classicFriendshipEvents = timedEvents.filter(te => this.isActive(te)); + for (const fe of classicFriendshipEvents) { if (!isNullOrUndefined(fe.classicFriendshipMultiplier) && fe.classicFriendshipMultiplier > multiplier) { multiplier = fe.classicFriendshipMultiplier; } - }); + } return multiplier; } @@ -214,7 +315,7 @@ export class TimedEventManager { * @returns Whether vouchers should be upgraded */ getUpgradeUnlockedVouchers(): boolean { - return timedEvents.some((te) => this.isActive(te) && (te.upgradeUnlockedVouchers ?? false)); + return timedEvents.some(te => this.isActive(te) && (te.upgradeUnlockedVouchers ?? false)); } /** @@ -223,11 +324,13 @@ export class TimedEventManager { */ getDelibirdyBuff(): string[] { const ret: string[] = []; - timedEvents.filter((te) => this.isActive(te)).map((te) => { - if (!isNullOrUndefined(te.delibirdyBuff)) { - ret.push(...te.delibirdyBuff); - } - }); + timedEvents + .filter(te => this.isActive(te)) + .map(te => { + if (!isNullOrUndefined(te.delibirdyBuff)) { + ret.push(...te.delibirdyBuff); + } + }); return ret; } @@ -237,66 +340,83 @@ export class TimedEventManager { */ getWeather(): WeatherPoolEntry[] { const ret: WeatherPoolEntry[] = []; - timedEvents.filter((te) => this.isActive(te)).map((te) => { - if (!isNullOrUndefined(te.weather)) { - ret.push(...te.weather); - } - }); + timedEvents + .filter(te => this.isActive(te)) + .map(te => { + if (!isNullOrUndefined(te.weather)) { + ret.push(...te.weather); + } + }); return ret; } getAllMysteryEncounterChanges(): EventMysteryEncounterTier[] { const ret: EventMysteryEncounterTier[] = []; - timedEvents.filter((te) => this.isActive(te)).map((te) => { - if (!isNullOrUndefined(te.mysteryEncounterTierChanges)) { - ret.push(...te.mysteryEncounterTierChanges); - } - }); + timedEvents + .filter(te => this.isActive(te)) + .map(te => { + if (!isNullOrUndefined(te.mysteryEncounterTierChanges)) { + ret.push(...te.mysteryEncounterTierChanges); + } + }); return ret; } getEventMysteryEncountersDisabled(): MysteryEncounterType[] { const ret: MysteryEncounterType[] = []; - timedEvents.filter((te) => this.isActive(te) && !isNullOrUndefined(te.mysteryEncounterTierChanges)).map((te) => { - te.mysteryEncounterTierChanges?.map((metc) => { - if (metc.disable) { - ret.push(metc.mysteryEncounter); - } + timedEvents + .filter(te => this.isActive(te) && !isNullOrUndefined(te.mysteryEncounterTierChanges)) + .map(te => { + te.mysteryEncounterTierChanges?.map(metc => { + if (metc.disable) { + ret.push(metc.mysteryEncounter); + } + }); }); - }); return ret; } - getMysteryEncounterTierForEvent(encounterType: MysteryEncounterType, normal: MysteryEncounterTier): MysteryEncounterTier { + getMysteryEncounterTierForEvent( + encounterType: MysteryEncounterType, + normal: MysteryEncounterTier, + ): MysteryEncounterTier { let ret = normal; - timedEvents.filter((te) => this.isActive(te) && !isNullOrUndefined(te.mysteryEncounterTierChanges)).map((te) => { - te.mysteryEncounterTierChanges?.map((metc) => { - if (metc.mysteryEncounter === encounterType) { - ret = metc.tier ?? normal; - } + timedEvents + .filter(te => this.isActive(te) && !isNullOrUndefined(te.mysteryEncounterTierChanges)) + .map(te => { + te.mysteryEncounterTierChanges?.map(metc => { + if (metc.mysteryEncounter === encounterType) { + ret = metc.tier ?? normal; + } + }); }); - }); return ret; } getEventLuckBoost(): number { let ret = 0; - const luckEvents = timedEvents.filter((te) => this.isActive(te) && !isNullOrUndefined(te.luckBoost)); - luckEvents.forEach((le) => { + const luckEvents = timedEvents.filter(te => this.isActive(te) && !isNullOrUndefined(te.luckBoost)); + for (const le of luckEvents) { ret += le.luckBoost!; - }); + } return ret; } getEventLuckBoostedSpecies(): Species[] { const ret: Species[] = []; - timedEvents.filter((te) => this.isActive(te)).map((te) => { - if (!isNullOrUndefined(te.luckBoostedSpecies)) { - ret.push(...te.luckBoostedSpecies.filter(s => !ret.includes(s))); - } - }); + timedEvents + .filter(te => this.isActive(te)) + .map(te => { + if (!isNullOrUndefined(te.luckBoostedSpecies)) { + ret.push(...te.luckBoostedSpecies.filter(s => !ret.includes(s))); + } + }); return ret; } + + areFusionsBoosted(): boolean { + return timedEvents.some(te => this.isActive(te) && te.boostFusions); + } } export class TimedEventDisplay extends Phaser.GameObjects.Container { @@ -332,7 +452,7 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container { setup() { const lang = i18next.resolvedLanguage; - if (this.event && this.event.bannerKey) { + if (this.event?.bannerKey) { let key = this.event.bannerKey; if (lang && this.event.availableLangs && this.event.availableLangs.length > 0) { if (this.event.availableLangs.includes(lang)) { @@ -354,7 +474,7 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container { this.banner.x, this.banner.y + 2, this.timeToGo(this.event.endDate), - TextStyle.WINDOW + TextStyle.WINDOW, ); this.eventTimerText.setName("text-event-timer"); this.eventTimerText.setScale(0.15); @@ -382,7 +502,6 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container { } private timeToGo(date: Date) { - // Utility to add leading zero function z(n) { return (n < 10 ? "0" : "") + n; @@ -394,13 +513,18 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container { diff = Math.abs(diff); // Get time components - const days = diff / 8.64e7 | 0; - const hours = diff % 8.64e7 / 3.6e6 | 0; - const mins = diff % 3.6e6 / 6e4 | 0; - const secs = Math.round(diff % 6e4 / 1e3); + const days = (diff / 8.64e7) | 0; + const hours = ((diff % 8.64e7) / 3.6e6) | 0; + const mins = ((diff % 3.6e6) / 6e4) | 0; + const secs = Math.round((diff % 6e4) / 1e3); // Return formatted string - return i18next.t("menu:eventTimer", { days: z(days), hours: z(hours), mins: z(mins), secs: z(secs) }); + return i18next.t("menu:eventTimer", { + days: z(days), + hours: z(hours), + mins: z(mins), + secs: z(secs), + }); } updateCountdown() { diff --git a/src/touch-controls.ts b/src/touch-controls.ts index db2ae223d3f..e2b5ad05baa 100644 --- a/src/touch-controls.ts +++ b/src/touch-controls.ts @@ -9,9 +9,9 @@ export default class TouchControl { private buttonLock: string[] = new Array(); private inputInterval: NodeJS.Timeout[] = new Array(); /** Whether touch controls are disabled */ - private disabled: boolean = false; + private disabled = false; /** Whether the last touch event has finished before disabling */ - private finishedLastTouch: boolean = false; + private finishedLastTouch = false; constructor() { this.events = globalScene.game.events; @@ -23,12 +23,12 @@ export default class TouchControl { */ disable() { this.disabled = true; - this.finishedLastTouch = false; + this.finishedLastTouch = false; } /** * Enable touch controls - */ + */ enable() { this.disabled = false; this.finishedLastTouch = false; @@ -39,7 +39,7 @@ export default class TouchControl { */ init() { this.preventElementZoom(document.querySelector("#dpad")); - document.querySelectorAll(".apad-button").forEach((element) => this.preventElementZoom(element as HTMLElement)); + document.querySelectorAll(".apad-button").forEach(element => this.preventElementZoom(element as HTMLElement)); // Select all elements with the 'data-key' attribute and bind keys to them for (const button of document.querySelectorAll("[data-key]")) { // @ts-ignore - Bind the key to the button using the dataset key @@ -87,11 +87,10 @@ export default class TouchControl { }, repeatInputDelayMillis); this.buttonLock.push(key); node.classList.add("active"); - } touchButtonUp(node: HTMLElement, key: string, id: string) { - if (!this.buttonLock.includes(key) || this.disabled && this.finishedLastTouch) { + if (!this.buttonLock.includes(key) || (this.disabled && this.finishedLastTouch)) { return; } this.finishedLastTouch = true; @@ -126,14 +125,14 @@ export default class TouchControl { this.events.emit("input_down", { controller_type: "keyboard", button: button, - isTouch: true + isTouch: true, }); break; case "keyup": this.events.emit("input_up", { controller_type: "keyboard", button: button, - isTouch: true + isTouch: true, }); break; } @@ -151,7 +150,6 @@ export default class TouchControl { return; } element.addEventListener("touchstart", (event: TouchEvent) => { - if (!(event.currentTarget instanceof HTMLElement)) { return; } @@ -175,8 +173,8 @@ export default class TouchControl { } /** - * Deactivates all currently pressed keys. - */ + * Deactivates all currently pressed keys. + */ deactivatePressedKey(): void { for (const key of Object.keys(this.inputInterval)) { clearInterval(this.inputInterval[key]); @@ -204,9 +202,16 @@ export function hasTouchscreen(): boolean { */ export function isMobile(): boolean { let ret = false; - (function (a) { + (a => { // Check the user agent string against a regex for mobile devices - if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) { + if ( + /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test( + a, + ) || + /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test( + a.substr(0, 4), + ) + ) { ret = true; } })(navigator.userAgent || navigator.vendor || window["opera"]); diff --git a/src/tutorial.ts b/src/tutorial.ts index b5f688c11fb..82912f73979 100644 --- a/src/tutorial.ts +++ b/src/tutorial.ts @@ -10,10 +10,11 @@ export enum Tutorial { Access_Menu = "ACCESS_MENU", Menu = "MENU", Starter_Select = "STARTER_SELECT", + Pokedex = "POKEDEX", Pokerus = "POKERUS", Stat_Change = "STAT_CHANGE", Select_Item = "SELECT_ITEM", - Egg_Gacha = "EGG_GACHA" + Egg_Gacha = "EGG_GACHA", } const tutorialHandlers = { @@ -27,40 +28,93 @@ const tutorialHandlers = { if (globalScene.enableTouchControls) { return resolve(); } - globalScene.showFieldOverlay(1000).then(() => globalScene.ui.showText(i18next.t("tutorial:accessMenu"), null, () => globalScene.hideFieldOverlay(1000).then(() => resolve()), null, true)); + globalScene + .showFieldOverlay(1000) + .then(() => + globalScene.ui.showText( + i18next.t("tutorial:accessMenu"), + null, + () => globalScene.hideFieldOverlay(1000).then(() => resolve()), + null, + true, + ), + ); }); }, [Tutorial.Menu]: () => { return new Promise(resolve => { globalScene.gameData.saveTutorialFlag(Tutorial.Access_Menu, true); - globalScene.ui.showText(i18next.t("tutorial:menu"), null, () => globalScene.ui.showText("", null, () => resolve()), null, true); + globalScene.ui.showText( + i18next.t("tutorial:menu"), + null, + () => globalScene.ui.showText("", null, () => resolve()), + null, + true, + ); }); }, [Tutorial.Starter_Select]: () => { return new Promise(resolve => { - globalScene.ui.showText(i18next.t("tutorial:starterSelect"), null, () => globalScene.ui.showText("", null, () => resolve()), null, true); + globalScene.ui.showText( + i18next.t("tutorial:starterSelect"), + null, + () => globalScene.ui.showText("", null, () => resolve()), + null, + true, + ); }); }, [Tutorial.Pokerus]: () => { return new Promise(resolve => { - globalScene.ui.showText(i18next.t("tutorial:pokerus"), null, () => globalScene.ui.showText("", null, () => resolve()), null, true); + globalScene.ui.showText( + i18next.t("tutorial:pokerus"), + null, + () => globalScene.ui.showText("", null, () => resolve()), + null, + true, + ); }); }, [Tutorial.Stat_Change]: () => { return new Promise(resolve => { - globalScene.showFieldOverlay(1000).then(() => globalScene.ui.showText(i18next.t("tutorial:statChange"), null, () => globalScene.ui.showText("", null, () => globalScene.hideFieldOverlay(1000).then(() => resolve())), null, true)); + globalScene + .showFieldOverlay(1000) + .then(() => + globalScene.ui.showText( + i18next.t("tutorial:statChange"), + null, + () => globalScene.ui.showText("", null, () => globalScene.hideFieldOverlay(1000).then(() => resolve())), + null, + true, + ), + ); }); }, [Tutorial.Select_Item]: () => { return new Promise(resolve => { globalScene.ui.setModeWithoutClear(Mode.MESSAGE).then(() => { - globalScene.ui.showText(i18next.t("tutorial:selectItem"), null, () => globalScene.ui.showText("", null, () => globalScene.ui.setModeWithoutClear(Mode.MODIFIER_SELECT).then(() => resolve())), null, true); + globalScene.ui.showText( + i18next.t("tutorial:selectItem"), + null, + () => + globalScene.ui.showText("", null, () => + globalScene.ui.setModeWithoutClear(Mode.MODIFIER_SELECT).then(() => resolve()), + ), + null, + true, + ); }); }); }, [Tutorial.Egg_Gacha]: () => { return new Promise(resolve => { - globalScene.ui.showText(i18next.t("tutorial:eggGacha"), null, () => globalScene.ui.showText("", null, () => resolve()), null, true); + globalScene.ui.showText( + i18next.t("tutorial:eggGacha"), + null, + () => globalScene.ui.showText("", null, () => resolve()), + null, + true, + ); }); }, }; @@ -118,7 +172,7 @@ async function showTutorialOverlay(handler: UiHandler) { ease: "Sine.easeOut", onComplete: () => { return true; - } + }, }); } else { return true; @@ -139,10 +193,9 @@ async function hideTutorialOverlay(handler: UiHandler) { ease: "Sine.easeOut", onComplete: () => { return true; - } + }, }); } else { return true; } } - diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts index 25ad9d87701..c9898f9b71e 100644 --- a/src/ui-inputs.ts +++ b/src/ui-inputs.ts @@ -12,6 +12,8 @@ import { globalScene } from "#app/global-scene"; import SettingsDisplayUiHandler from "./ui/settings/settings-display-ui-handler"; import SettingsAudioUiHandler from "./ui/settings/settings-audio-ui-handler"; import RunInfoUiHandler from "./ui/run-info-ui-handler"; +import PokedexUiHandler from "./ui/pokedex-ui-handler"; +import PokedexPageUiHandler from "./ui/pokedex-page-ui-handler"; type ActionKeys = Record void>; @@ -43,23 +45,31 @@ export class UiInputs { } listenInputs(): void { - this.events.on("input_down", (event) => { - this.detectInputMethod(event); + this.events.on( + "input_down", + event => { + this.detectInputMethod(event); - const actions = this.getActionsKeyDown(); - if (!actions.hasOwnProperty(event.button)) { - return; - } - actions[event.button](); - }, this); + const actions = this.getActionsKeyDown(); + if (!actions.hasOwnProperty(event.button)) { + return; + } + actions[event.button](); + }, + this, + ); - this.events.on("input_up", (event) => { - const actions = this.getActionsKeyUp(); - if (!actions.hasOwnProperty(event.button)) { - return; - } - actions[event.button](); - }, this); + this.events.on( + "input_up", + event => { + const actions = this.getActionsKeyUp(); + if (!actions.hasOwnProperty(event.button)) { + return; + } + actions[event.button](); + }, + this, + ); } doVibration(inputSuccess: boolean, vibrationLength: number): void { @@ -70,46 +80,46 @@ export class UiInputs { getActionsKeyDown(): ActionKeys { const actions: ActionKeys = { - [Button.UP]: () => this.buttonDirection(Button.UP), - [Button.DOWN]: () => this.buttonDirection(Button.DOWN), - [Button.LEFT]: () => this.buttonDirection(Button.LEFT), - [Button.RIGHT]: () => this.buttonDirection(Button.RIGHT), - [Button.SUBMIT]: () => this.buttonTouch(), - [Button.ACTION]: () => this.buttonAb(Button.ACTION), - [Button.CANCEL]: () => this.buttonAb(Button.CANCEL), - [Button.MENU]: () => this.buttonMenu(), - [Button.STATS]: () => this.buttonGoToFilter(Button.STATS), - [Button.CYCLE_SHINY]: () => this.buttonCycleOption(Button.CYCLE_SHINY), - [Button.CYCLE_FORM]: () => this.buttonCycleOption(Button.CYCLE_FORM), - [Button.CYCLE_GENDER]: () => this.buttonCycleOption(Button.CYCLE_GENDER), - [Button.CYCLE_ABILITY]: () => this.buttonCycleOption(Button.CYCLE_ABILITY), - [Button.CYCLE_NATURE]: () => this.buttonCycleOption(Button.CYCLE_NATURE), - [Button.V]: () => this.buttonCycleOption(Button.V), - [Button.SPEED_UP]: () => this.buttonSpeedChange(), - [Button.SLOW_DOWN]: () => this.buttonSpeedChange(false), + [Button.UP]: () => this.buttonDirection(Button.UP), + [Button.DOWN]: () => this.buttonDirection(Button.DOWN), + [Button.LEFT]: () => this.buttonDirection(Button.LEFT), + [Button.RIGHT]: () => this.buttonDirection(Button.RIGHT), + [Button.SUBMIT]: () => this.buttonTouch(), + [Button.ACTION]: () => this.buttonAb(Button.ACTION), + [Button.CANCEL]: () => this.buttonAb(Button.CANCEL), + [Button.MENU]: () => this.buttonMenu(), + [Button.STATS]: () => this.buttonGoToFilter(Button.STATS), + [Button.CYCLE_SHINY]: () => this.buttonCycleOption(Button.CYCLE_SHINY), + [Button.CYCLE_FORM]: () => this.buttonCycleOption(Button.CYCLE_FORM), + [Button.CYCLE_GENDER]: () => this.buttonCycleOption(Button.CYCLE_GENDER), + [Button.CYCLE_ABILITY]: () => this.buttonCycleOption(Button.CYCLE_ABILITY), + [Button.CYCLE_NATURE]: () => this.buttonCycleOption(Button.CYCLE_NATURE), + [Button.CYCLE_TERA]: () => this.buttonCycleOption(Button.CYCLE_TERA), + [Button.SPEED_UP]: () => this.buttonSpeedChange(), + [Button.SLOW_DOWN]: () => this.buttonSpeedChange(false), }; return actions; } getActionsKeyUp(): ActionKeys { const actions: ActionKeys = { - [Button.UP]: () => undefined, - [Button.DOWN]: () => undefined, - [Button.LEFT]: () => undefined, - [Button.RIGHT]: () => undefined, - [Button.SUBMIT]: () => undefined, - [Button.ACTION]: () => undefined, - [Button.CANCEL]: () => undefined, - [Button.MENU]: () => undefined, - [Button.STATS]: () => this.buttonStats(false), - [Button.CYCLE_SHINY]: () => undefined, - [Button.CYCLE_FORM]: () => undefined, - [Button.CYCLE_GENDER]: () => undefined, - [Button.CYCLE_ABILITY]: () => undefined, - [Button.CYCLE_NATURE]: () => undefined, - [Button.V]: () => this.buttonInfo(false), - [Button.SPEED_UP]: () => undefined, - [Button.SLOW_DOWN]: () => undefined, + [Button.UP]: () => undefined, + [Button.DOWN]: () => undefined, + [Button.LEFT]: () => undefined, + [Button.RIGHT]: () => undefined, + [Button.SUBMIT]: () => undefined, + [Button.ACTION]: () => undefined, + [Button.CANCEL]: () => undefined, + [Button.MENU]: () => undefined, + [Button.STATS]: () => this.buttonStats(false), + [Button.CYCLE_SHINY]: () => undefined, + [Button.CYCLE_FORM]: () => undefined, + [Button.CYCLE_GENDER]: () => undefined, + [Button.CYCLE_ABILITY]: () => undefined, + [Button.CYCLE_NATURE]: () => undefined, + [Button.CYCLE_TERA]: () => this.buttonInfo(false), + [Button.SPEED_UP]: () => undefined, + [Button.SLOW_DOWN]: () => undefined, }; return actions; } @@ -128,7 +138,7 @@ export class UiInputs { globalScene.ui.processInput(Button.SUBMIT) || globalScene.ui.processInput(Button.ACTION); } - buttonStats(pressed: boolean = true): void { + buttonStats(pressed = true): void { // allow access to Button.STATS as a toggle for other elements for (const t of globalScene.getInfoToggles(true)) { t.toggleInfo(pressed); @@ -140,7 +150,7 @@ export class UiInputs { } buttonGoToFilter(button: Button): void { - const whitelist = [ StarterSelectUiHandler ]; + const whitelist = [StarterSelectUiHandler, PokedexUiHandler, PokedexPageUiHandler]; const uiHandler = globalScene.ui?.getHandler(); if (whitelist.some(handler => uiHandler instanceof handler)) { globalScene.ui.processInput(button); @@ -149,8 +159,8 @@ export class UiInputs { } } - buttonInfo(pressed: boolean = true): void { - if (globalScene.showMovesetFlyout ) { + buttonInfo(pressed = true): void { + if (globalScene.showMovesetFlyout) { for (const p of globalScene.getField().filter(p => p?.isActive(true))) { p.toggleFlyout(pressed); } @@ -178,6 +188,7 @@ export class UiInputs { globalScene.ui.setOverlayMode(Mode.MENU); break; case Mode.STARTER_SELECT: + case Mode.POKEDEX_PAGE: this.buttonTouch(); break; case Mode.MENU: @@ -190,11 +201,21 @@ export class UiInputs { } buttonCycleOption(button: Button): void { - const whitelist = [ StarterSelectUiHandler, SettingsUiHandler, RunInfoUiHandler, SettingsDisplayUiHandler, SettingsAudioUiHandler, SettingsGamepadUiHandler, SettingsKeyboardUiHandler ]; + const whitelist = [ + StarterSelectUiHandler, + PokedexUiHandler, + PokedexPageUiHandler, + SettingsUiHandler, + RunInfoUiHandler, + SettingsDisplayUiHandler, + SettingsAudioUiHandler, + SettingsGamepadUiHandler, + SettingsKeyboardUiHandler, + ]; const uiHandler = globalScene.ui?.getHandler(); if (whitelist.some(handler => uiHandler instanceof handler)) { globalScene.ui.processInput(button); - } else if (button === Button.V) { + } else if (button === Button.CYCLE_TERA) { this.buttonInfo(true); } } @@ -202,16 +223,24 @@ export class UiInputs { buttonSpeedChange(up = true): void { const settingGameSpeed = settingIndex(SettingKeys.Game_Speed); if (up && globalScene.gameSpeed < 5) { - globalScene.gameData.saveSetting(SettingKeys.Game_Speed, Setting[settingGameSpeed].options.findIndex((item) => item.label === `${globalScene.gameSpeed}x`) + 1); + globalScene.gameData.saveSetting( + SettingKeys.Game_Speed, + Setting[settingGameSpeed].options.findIndex(item => item.label === `${globalScene.gameSpeed}x`) + 1, + ); if (globalScene.ui?.getMode() === Mode.SETTINGS) { (globalScene.ui.getHandler() as SettingsUiHandler).show([]); } } else if (!up && globalScene.gameSpeed > 1) { - globalScene.gameData.saveSetting(SettingKeys.Game_Speed, Math.max(Setting[settingGameSpeed].options.findIndex((item) => item.label === `${globalScene.gameSpeed}x`) - 1, 0)); + globalScene.gameData.saveSetting( + SettingKeys.Game_Speed, + Math.max( + Setting[settingGameSpeed].options.findIndex(item => item.label === `${globalScene.gameSpeed}x`) - 1, + 0, + ), + ); if (globalScene.ui?.getMode() === Mode.SETTINGS) { (globalScene.ui.getHandler() as SettingsUiHandler).show([]); } } } - } diff --git a/src/ui/ability-bar.ts b/src/ui/ability-bar.ts index 8335f7b517c..5481791de64 100644 --- a/src/ui/ability-bar.ts +++ b/src/ui/ability-bar.ts @@ -1,101 +1,114 @@ -import { getPokemonNameWithAffix } from "#app/messages"; import { globalScene } from "#app/global-scene"; -import type Pokemon from "../field/pokemon"; import { TextStyle, addTextObject } from "./text"; import i18next from "i18next"; -const hiddenX = -118; -const shownX = 0; +const barWidth = 118; +const screenLeft = 0; const baseY = -116; export default class AbilityBar extends Phaser.GameObjects.Container { - private bg: Phaser.GameObjects.Image; + private abilityBars: Phaser.GameObjects.Image[]; private abilityBarText: Phaser.GameObjects.Text; - - private tween: Phaser.Tweens.Tween | null; - private autoHideTimer: NodeJS.Timeout | null; - - public shown: boolean; + private player: boolean; + private screenRight: number; // hold screenRight in case size changes between show and hide + private shown: boolean; constructor() { - super(globalScene, hiddenX, baseY); + super(globalScene, barWidth, baseY); + this.abilityBars = []; + this.player = true; + this.shown = false; } setup(): void { - this.bg = globalScene.add.image(0, 0, "ability_bar_left"); - this.bg.setOrigin(0, 0); + for (const key of ["ability_bar_right", "ability_bar_left"]) { + const bar = globalScene.add.image(0, 0, key); + bar.setOrigin(0, 0); + bar.setVisible(false); + this.add(bar); + this.abilityBars.push(bar); + } - this.add(this.bg); - - this.abilityBarText = addTextObject(15, 3, "", TextStyle.MESSAGE, { fontSize: "72px" }); + this.abilityBarText = addTextObject(15, 3, "", TextStyle.MESSAGE, { + fontSize: "72px", + }); this.abilityBarText.setOrigin(0, 0); this.abilityBarText.setWordWrapWidth(600, true); this.add(this.abilityBarText); + this.bringToTop(this.abilityBarText); this.setVisible(false); - this.shown = false; + this.setX(-barWidth); // start hidden (right edge of bar at x=0) } - showAbility(pokemon: Pokemon, passive: boolean = false): void { - this.abilityBarText.setText(`${i18next.t("fightUiHandler:abilityFlyInText", { pokemonName: getPokemonNameWithAffix(pokemon), passive: passive ? i18next.t("fightUiHandler:passive") : "", abilityName: !passive ? pokemon.getAbility().name : pokemon.getPassiveAbility().name })}`); + public override setVisible(value: boolean): this { + this.abilityBars[+this.player].setVisible(value); + this.shown = value; + return this; + } - if (this.shown) { - return; + public async startTween(config: any, text?: string): Promise { + this.setVisible(true); + if (text) { + this.abilityBarText.setText(text); } + return new Promise(resolve => { + globalScene.tweens.add({ + ...config, + onComplete: () => { + if (config.onComplete) { + config.onComplete(); + } + resolve(); + }, + }); + }); + } + public async showAbility(pokemonName: string, abilityName: string, passive = false, player = true): Promise { + const text = `${i18next.t("fightUiHandler:abilityFlyInText", { pokemonName: pokemonName, passive: passive ? i18next.t("fightUiHandler:passive") : "", abilityName: abilityName })}`; + this.screenRight = globalScene.scaledCanvas.width; + if (player !== this.player) { + // Move the bar if it has changed from the player to enemy side (or vice versa) + this.setX(player ? -barWidth : this.screenRight); + this.player = player; + } globalScene.fieldUI.bringToTop(this); + let y = baseY; + if (this.player) { + y += globalScene.currentBattle.double ? 14 : 0; + } else { + y -= globalScene.currentBattle.double ? 28 : 14; + } - this.y = baseY + (globalScene.currentBattle.double ? 14 : 0); - this.tween = globalScene.tweens.add({ - targets: this, - x: shownX, - duration: 500, - ease: "Sine.easeOut", - onComplete: () => { - this.tween = null; - this.resetAutoHideTimer(); - } - }); + this.setY(y); - this.setVisible(true); - this.shown = true; + return this.startTween( + { + targets: this, + x: this.player ? screenLeft : this.screenRight - barWidth, + duration: 500, + ease: "Sine.easeOut", + hold: 1000, + }, + text, + ); } - hide(): void { - if (!this.shown) { - return; - } - - if (this.autoHideTimer) { - clearInterval(this.autoHideTimer); - } - - if (this.tween) { - this.tween.stop(); - } - - this.tween = globalScene.tweens.add({ + public async hide(): Promise { + return this.startTween({ targets: this, - x: -91, - duration: 500, + x: this.player ? -barWidth : this.screenRight, + duration: 200, ease: "Sine.easeIn", onComplete: () => { - this.tween = null; this.setVisible(false); - } + }, }); - - this.shown = false; } - resetAutoHideTimer(): void { - if (this.autoHideTimer) { - clearInterval(this.autoHideTimer); - } - this.autoHideTimer = setTimeout(() => { - this.hide(); - this.autoHideTimer = null; - }, 2500); + public isVisible(): boolean { + return this.shown; } } diff --git a/src/ui/abstact-option-select-ui-handler.ts b/src/ui/abstact-option-select-ui-handler.ts index df592fc45b1..f605f73e171 100644 --- a/src/ui/abstact-option-select-ui-handler.ts +++ b/src/ui/abstact-option-select-ui-handler.ts @@ -1,18 +1,19 @@ import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject, getTextStyleOptions } from "./text"; +import { TextStyle, addBBCodeTextObject, getTextColor, getTextStyleOptions } from "./text"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import { addWindow } from "./ui-theme"; import * as Utils from "../utils"; import { argbFromRgba } from "@material/material-color-utilities"; import { Button } from "#enums/buttons"; +import BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText"; export interface OptionSelectConfig { xOffset?: number; yOffset?: number; options: OptionSelectItem[]; - maxOptions?: integer; - delay?: integer; + maxOptions?: number; + delay?: number; noCancel?: boolean; supportHover?: boolean; } @@ -21,8 +22,10 @@ export interface OptionSelectItem { label: string; handler: () => boolean; onHover?: () => void; + skip?: boolean; keepOpen?: boolean; overrideSound?: boolean; + style?: TextStyle; item?: string; itemArgs?: any[]; } @@ -32,34 +35,41 @@ const scrollDownLabel = "↓"; export default abstract class AbstractOptionSelectUiHandler extends UiHandler { protected optionSelectContainer: Phaser.GameObjects.Container; + protected optionSelectTextContainer: Phaser.GameObjects.Container; protected optionSelectBg: Phaser.GameObjects.NineSlice; - protected optionSelectText: Phaser.GameObjects.Text; + protected optionSelectText: BBCodeText; protected optionSelectIcons: Phaser.GameObjects.Sprite[]; protected config: OptionSelectConfig | null; protected blockInput: boolean; - protected scrollCursor: integer = 0; + protected scrollCursor = 0; + protected fullCursor = 0; - protected scale: number = 0.1666666667; + protected scale = 0.1666666667; private cursorObj: Phaser.GameObjects.Image | null; + protected unskippedIndices: number[] = []; + + protected defaultTextStyle: TextStyle = TextStyle.WINDOW; + protected textContent: string; + constructor(mode: Mode | null) { super(mode); } - abstract getWindowWidth(): integer; + abstract getWindowWidth(): number; - getWindowHeight(): integer { + getWindowHeight(): number { return (Math.min((this.config?.options || []).length, this.config?.maxOptions || 99) + 1) * 96 * this.scale; } setup() { const ui = this.getUi(); - this.optionSelectContainer = globalScene.add.container((globalScene.game.canvas.width / 6) - 1, -48); + this.optionSelectContainer = globalScene.add.container(globalScene.game.canvas.width / 6 - 1, -48); this.optionSelectContainer.setName(`option-select-${this.mode ? Mode[this.mode] : "UNKNOWN"}`); this.optionSelectContainer.setVisible(false); ui.add(this.optionSelectContainer); @@ -69,6 +79,9 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { this.optionSelectBg.setOrigin(1, 1); this.optionSelectContainer.add(this.optionSelectBg); + this.optionSelectTextContainer = globalScene.add.container(0, 0); + this.optionSelectContainer.add(this.optionSelectTextContainer); + this.optionSelectIcons = []; this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale; @@ -79,52 +92,79 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { protected setupOptions() { const configOptions = this.config?.options ?? []; - let options: OptionSelectItem[]; + const options: OptionSelectItem[] = configOptions; - // for performance reasons, this limits how many options we can see at once. Without this, it would try to make text options for every single options - // which makes the performance take a hit. If there's not enough options to do this (set to 10 at the moment) and the ui mode !== Mode.AUTO_COMPLETE, - // this is ignored and the original code is untouched, with the options array being all the options from the config - if (configOptions.length >= 10 && globalScene.ui.getMode() === Mode.AUTO_COMPLETE) { - const optionsScrollTotal = configOptions.length; - const optionStartIndex = this.scrollCursor; - const optionEndIndex = Math.min(optionsScrollTotal, optionStartIndex + (!optionStartIndex || this.scrollCursor + (this.config?.maxOptions! - 1) >= optionsScrollTotal ? this.config?.maxOptions! - 1 : this.config?.maxOptions! - 2)); - options = configOptions.slice(optionStartIndex, optionEndIndex + 2); - } else { - options = configOptions; - } + this.unskippedIndices = this.getUnskippedIndices(configOptions); if (this.optionSelectText) { - this.optionSelectText.destroy(); + if (this.optionSelectText instanceof BBCodeText) { + try { + this.optionSelectText.destroy(); + } catch (error) { + console.error("Error while destroying optionSelectText:", error); + } + } else { + console.warn("optionSelectText is not an instance of BBCodeText."); + } } + if (this.optionSelectIcons?.length) { this.optionSelectIcons.map(i => i.destroy()); this.optionSelectIcons.splice(0, this.optionSelectIcons.length); } - this.optionSelectText = addTextObject(0, 0, options.map(o => o.item ? ` ${o.label}` : o.label).join("\n"), TextStyle.WINDOW, { maxLines: options.length }); - this.optionSelectText.setLineSpacing(this.scale * 72); + const optionsWithScroll = + this.config?.options && this.config?.options.length > this.config?.maxOptions! + ? this.getOptionsWithScroll() + : options; + + // Setting the initial text to establish the width of the select object. We consider all options, even ones that are not displayed, + // Except in the case of autocomplete, where we don't want to set up a text element with potentially hundreds of lines. + const optionsForWidth = globalScene.ui.getMode() === Mode.AUTO_COMPLETE ? optionsWithScroll : options; + this.optionSelectText = addBBCodeTextObject( + 0, + 0, + optionsForWidth + .map(o => + o.item + ? `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}] ${o.label}[/color][/shadow]` + : `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]${o.label}[/color][/shadow]`, + ) + .join("\n"), + TextStyle.WINDOW, + { maxLines: options.length, lineSpacing: 12 }, + ); + this.optionSelectText.setOrigin(0, 0); this.optionSelectText.setName("text-option-select"); - this.optionSelectText.setLineSpacing(12); - this.optionSelectContainer.add(this.optionSelectText); - this.optionSelectContainer.setPosition((globalScene.game.canvas.width / 6) - 1 - (this.config?.xOffset || 0), -48 + (this.config?.yOffset || 0)); - + this.optionSelectTextContainer.add(this.optionSelectText); + this.optionSelectContainer.setPosition( + globalScene.game.canvas.width / 6 - 1 - (this.config?.xOffset || 0), + -48 + (this.config?.yOffset || 0), + ); this.optionSelectBg.width = Math.max(this.optionSelectText.displayWidth + 24, this.getWindowWidth()); - - if (this.config?.options && this.config?.options.length > (this.config?.maxOptions!)) { // TODO: is this bang correct? - this.optionSelectText.setText(this.getOptionsWithScroll().map(o => o.label).join("\n")); - } - this.optionSelectBg.height = this.getWindowHeight(); + this.optionSelectTextContainer.setPosition( + this.optionSelectBg.x - this.optionSelectBg.width + 12 + 24 * this.scale, + this.optionSelectBg.y - this.optionSelectBg.height + 2 + 42 * this.scale, + ); - this.optionSelectText.setPositionRelative(this.optionSelectBg, 12 + 24 * this.scale, 2 + 42 * this.scale); + // Now that the container and background widths are established, we can set up the proper text restricted to visible options + this.textContent = optionsWithScroll + .map(o => + o.item + ? `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}] ${o.label}[/color][/shadow]` + : `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]${o.label}[/color][/shadow]`, + ) + .join("\n"); + this.optionSelectText.setText(this.textContent); - options.forEach((option: OptionSelectItem, i: integer) => { + options.forEach((option: OptionSelectItem, i: number) => { if (option.item) { const itemIcon = globalScene.add.sprite(0, 0, "items", option.item); itemIcon.setScale(3 * this.scale); this.optionSelectIcons.push(itemIcon); - this.optionSelectContainer.add(itemIcon); + this.optionSelectTextContainer.add(itemIcon); itemIcon.setPositionRelative(this.optionSelectText, 36 * this.scale, 7 + i * (114 * this.scale - 3)); @@ -133,7 +173,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { itemOverlayIcon.setScale(3 * this.scale); this.optionSelectIcons.push(itemOverlayIcon); - this.optionSelectContainer.add(itemOverlayIcon); + this.optionSelectTextContainer.add(itemOverlayIcon); itemOverlayIcon.setPositionRelative(this.optionSelectText, 36 * this.scale, 7 + i * (114 * this.scale - 3)); @@ -160,15 +200,21 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { this.optionSelectContainer.setVisible(true); this.scrollCursor = 0; + this.fullCursor = 0; this.setCursor(0); if (this.config.delay) { this.blockInput = true; - this.optionSelectText.setAlpha(0.5); + this.optionSelectTextContainer.setAlpha(0.5); this.cursorObj?.setAlpha(0.8); globalScene.time.delayedCall(Utils.fixedInt(this.config.delay), () => this.unblockInput()); } + if (this.config?.supportHover) { + // handle hover code if the element supports hover-handlers and the option has the optional hover-handler set. + this.config?.options[this.unskippedIndices[this.fullCursor]]?.onHover?.(); + } + return true; } @@ -177,8 +223,6 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { let success = false; - const options = this.getOptionsWithScroll(); - let playSound = true; if (button === Button.ACTION || button === Button.CANCEL) { @@ -190,15 +234,14 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { success = true; if (button === Button.CANCEL) { if (this.config?.maxOptions && this.config.options.length > this.config.maxOptions) { - this.scrollCursor = (this.config.options.length - this.config.maxOptions) + 1; - this.cursor = options.length - 1; + this.setCursor(this.unskippedIndices.length - 1); } else if (!this.config?.noCancel) { - this.setCursor(options.length - 1); + this.setCursor(this.unskippedIndices.length - 1); } else { return false; } } - const option = this.config?.options[this.cursor + (this.scrollCursor - (this.scrollCursor ? 1 : 0))]; + const option = this.config?.options[this.unskippedIndices[this.fullCursor]]; if (option?.handler()) { if (!option.keepOpen) { this.clear(); @@ -211,7 +254,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { // this is here to differentiate between a Button.SUBMIT vs Button.ACTION within the autocomplete handler // this is here because Button.ACTION is picked up as z on the keyboard, meaning if you're typing and hit z, it'll select the option you've chosen success = true; - const option = this.config?.options[this.cursor + (this.scrollCursor - (this.scrollCursor ? 1 : 0))]; + const option = this.config?.options[this.unskippedIndices[this.fullCursor]]; if (option?.handler()) { if (!option.keepOpen) { this.clear(); @@ -223,15 +266,15 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { } else { switch (button) { case Button.UP: - if (this.cursor) { - success = this.setCursor(this.cursor - 1); - } else if (this.cursor === 0) { - success = this.setCursor(options.length - 1); + if (this.fullCursor === 0) { + success = this.setCursor(this.unskippedIndices.length - 1); + } else if (this.fullCursor) { + success = this.setCursor(this.fullCursor - 1); } break; case Button.DOWN: - if (this.cursor < options.length - 1) { - success = this.setCursor(this.cursor + 1); + if (this.fullCursor < this.unskippedIndices.length - 1) { + success = this.setCursor(this.fullCursor + 1); } else { success = this.setCursor(0); } @@ -239,7 +282,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { } if (this.config?.supportHover) { // handle hover code if the element supports hover-handlers and the option has the optional hover-handler set. - this.config?.options[this.cursor + (this.scrollCursor - (this.scrollCursor ? 1 : 0))]?.onHover?.(); + this.config?.options[this.unskippedIndices[this.fullCursor]]?.onHover?.(); } } @@ -256,7 +299,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { } this.blockInput = false; - this.optionSelectText.setAlpha(1); + this.optionSelectTextContainer.setAlpha(1); this.cursorObj?.setAlpha(1); } @@ -273,7 +316,13 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { const optionsScrollTotal = options.length; const optionStartIndex = this.scrollCursor; - const optionEndIndex = Math.min(optionsScrollTotal, optionStartIndex + (!optionStartIndex || this.scrollCursor + (this.config.maxOptions - 1) >= optionsScrollTotal ? this.config.maxOptions - 1 : this.config.maxOptions - 2)); + const optionEndIndex = Math.min( + optionsScrollTotal, + optionStartIndex + + (!optionStartIndex || this.scrollCursor + (this.config.maxOptions - 1) >= optionsScrollTotal + ? this.config.maxOptions - 1 + : this.config.maxOptions - 2), + ); if (this.config?.maxOptions && options.length > this.config.maxOptions) { options.splice(optionEndIndex, optionsScrollTotal); @@ -281,13 +330,15 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { if (optionStartIndex) { options.unshift({ label: scrollUpLabel, - handler: () => true + handler: () => true, + style: this.defaultTextStyle, }); } if (optionEndIndex < optionsScrollTotal) { options.push({ label: scrollDownLabel, - handler: () => true + handler: () => true, + style: this.defaultTextStyle, }); } } @@ -295,49 +346,74 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { return options; } - setCursor(cursor: integer): boolean { - const changed = this.cursor !== cursor; + getUnskippedIndices(options: OptionSelectItem[]) { + const unskippedIndices = options + .map((option, index) => (option.skip ? null : index)) // Map to index or null if skipped + .filter(index => index !== null) as number[]; + return unskippedIndices; + } + + setCursor(fullCursor: number): boolean { + const changed = this.fullCursor !== fullCursor; - let isScroll = false; - const options = this.getOptionsWithScroll(); if (changed && this.config?.maxOptions && this.config.options.length > this.config.maxOptions) { - if (Math.abs(cursor - this.cursor) === options.length - 1) { - // Wrap around the list - const optionsScrollTotal = this.config.options.length; - this.scrollCursor = cursor ? optionsScrollTotal - (this.config.maxOptions - 1) : 0; - this.setupOptions(); + // If the fullCursor is the last possible value, we go to the bottom + if (fullCursor === this.unskippedIndices.length - 1) { + this.fullCursor = fullCursor; + this.cursor = this.config.maxOptions - (this.config.options.length - this.unskippedIndices[fullCursor]); + this.scrollCursor = this.config.options.length - this.config.maxOptions + 1; + // If the fullCursor is the first possible value, we go to the top + } else if (fullCursor === 0) { + this.fullCursor = fullCursor; + this.cursor = this.unskippedIndices[fullCursor]; + this.scrollCursor = 0; } else { - // Move the cursor up or down by 1 - const isDown = cursor && cursor > this.cursor; + const isDown = fullCursor && fullCursor > this.fullCursor; + if (isDown) { - if (options[cursor].label === scrollDownLabel) { - isScroll = true; - this.scrollCursor++; + // If there are skipped options under the next selection, we show them + const jumpFromCurrent = this.unskippedIndices[fullCursor] - this.unskippedIndices[this.fullCursor]; + const skipsFromNext = this.unskippedIndices[fullCursor + 1] - this.unskippedIndices[fullCursor] - 1; + + if (this.cursor + jumpFromCurrent + skipsFromNext >= this.config.maxOptions - 1) { + this.fullCursor = fullCursor; + this.cursor = this.config.maxOptions - 2 - skipsFromNext; + this.scrollCursor = this.unskippedIndices[this.fullCursor] - this.cursor + 1; + } else { + this.fullCursor = fullCursor; + this.cursor = this.unskippedIndices[fullCursor] - this.scrollCursor + (this.scrollCursor ? 1 : 0); } } else { - if (!cursor && this.scrollCursor) { - isScroll = true; - this.scrollCursor--; + const jumpFromPrevious = this.unskippedIndices[fullCursor] - this.unskippedIndices[fullCursor - 1]; + + if (this.cursor - jumpFromPrevious < 1) { + this.fullCursor = fullCursor; + this.cursor = 1; + this.scrollCursor = this.unskippedIndices[this.fullCursor] - this.cursor + 1; + } else { + this.fullCursor = fullCursor; + this.cursor = this.unskippedIndices[fullCursor] - this.scrollCursor + (this.scrollCursor ? 1 : 0); } } - if (isScroll && this.scrollCursor === 1) { - this.scrollCursor += isDown ? 1 : -1; - } } - } - if (isScroll) { - this.setupOptions(); } else { - this.cursor = cursor; + this.fullCursor = fullCursor; + this.cursor = this.unskippedIndices[fullCursor]; } + this.setupOptions(); + if (!this.cursorObj) { this.cursorObj = globalScene.add.image(0, 0, "cursor"); this.optionSelectContainer.add(this.cursorObj); } this.cursorObj.setScale(this.scale * 6); - this.cursorObj.setPositionRelative(this.optionSelectBg, 12, 102 * this.scale + this.cursor * (114 * this.scale - 3)); + this.cursorObj.setPositionRelative( + this.optionSelectBg, + 12, + 102 * this.scale + this.cursor * (114 * this.scale - 3), + ); return changed; } @@ -346,6 +422,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler { super.clear(); this.config = null; this.optionSelectContainer.setVisible(false); + this.fullCursor = 0; this.scrollCursor = 0; this.eraseCursor(); } diff --git a/src/ui/achv-bar.ts b/src/ui/achv-bar.ts index 9196399f40f..1e068157afa 100644 --- a/src/ui/achv-bar.ts +++ b/src/ui/achv-bar.ts @@ -28,7 +28,18 @@ export default class AchvBar extends Phaser.GameObjects.Container { this.defaultWidth = 200; this.defaultHeight = 40; - this.bg = globalScene.add.nineslice(0, 0, "achv_bar", undefined, this.defaultWidth, this.defaultHeight, 41, 6, 16, 4); + this.bg = globalScene.add.nineslice( + 0, + 0, + "achv_bar", + undefined, + this.defaultWidth, + this.defaultHeight, + 41, + 6, + 16, + 4, + ); this.bg.setOrigin(0, 0); this.add(this.bg); @@ -37,15 +48,21 @@ export default class AchvBar extends Phaser.GameObjects.Container { this.icon.setOrigin(0, 0); this.add(this.icon); - this.titleText = addTextObject(40, 3, "", TextStyle.MESSAGE, { fontSize: "72px" }); + this.titleText = addTextObject(40, 3, "", TextStyle.MESSAGE, { + fontSize: "72px", + }); this.titleText.setOrigin(0, 0); this.add(this.titleText); - this.scoreText = addTextObject(150, 3, "", TextStyle.MESSAGE, { fontSize: "72px" }); + this.scoreText = addTextObject(150, 3, "", TextStyle.MESSAGE, { + fontSize: "72px", + }); this.scoreText.setOrigin(1, 0); this.add(this.scoreText); - this.descriptionText = addTextObject(43, 16, "", TextStyle.WINDOW_ALT, { fontSize: "72px" }); + this.descriptionText = addTextObject(43, 16, "", TextStyle.WINDOW_ALT, { + fontSize: "72px", + }); this.descriptionText.setOrigin(0, 0); this.add(this.descriptionText); @@ -80,23 +97,29 @@ export default class AchvBar extends Phaser.GameObjects.Container { } // Take the width of the default interface or the title if longest - this.bg.width = Math.max(this.defaultWidth, this.icon.displayWidth + this.titleText.displayWidth + this.scoreText.displayWidth + 16); + this.bg.width = Math.max( + this.defaultWidth, + this.icon.displayWidth + this.titleText.displayWidth + this.scoreText.displayWidth + 16, + ); this.scoreText.x = this.bg.width - 2; this.descriptionText.width = this.bg.width - this.icon.displayWidth - 16; this.descriptionText.setWordWrapWidth(this.descriptionText.width * 6); // Take the height of the default interface or the description if longest - this.bg.height = Math.max(this.defaultHeight, this.titleText.displayHeight + this.descriptionText.displayHeight + 8); - this.icon.y = (this.bg.height / 2) - (this.icon.height / 2); + this.bg.height = Math.max( + this.defaultHeight, + this.titleText.displayHeight + this.descriptionText.displayHeight + 8, + ); + this.icon.y = this.bg.height / 2 - this.icon.height / 2; globalScene.playSound("se/achv"); globalScene.tweens.add({ targets: this, - x: (globalScene.game.canvas.width / 6) - (this.bg.width / 2), + x: globalScene.game.canvas.width / 6 - this.bg.width / 2, duration: 500, - ease: "Sine.easeOut" + ease: "Sine.easeOut", }); globalScene.time.delayedCall(10000, () => this.hide(this.playerGender)); @@ -105,14 +128,14 @@ export default class AchvBar extends Phaser.GameObjects.Container { this.shown = true; } - protected hide(playerGender: PlayerGender): void { + protected hide(_playerGender: PlayerGender): void { if (!this.shown) { return; } globalScene.tweens.add({ targets: this, - x: (globalScene.game.canvas.width / 6), + x: globalScene.game.canvas.width / 6, duration: 500, ease: "Sine.easeIn", onComplete: () => { @@ -122,7 +145,7 @@ export default class AchvBar extends Phaser.GameObjects.Container { const shifted = this.queue.shift(); shifted && this.showAchv(shifted); } - } + }, }); } } diff --git a/src/ui/achvs-ui-handler.ts b/src/ui/achvs-ui-handler.ts index ff1e2ee9184..8b5a4dbd395 100644 --- a/src/ui/achvs-ui-handler.ts +++ b/src/ui/achvs-ui-handler.ts @@ -14,17 +14,17 @@ import { globalScene } from "#app/global-scene"; enum Page { ACHIEVEMENTS, - VOUCHERS + VOUCHERS, } interface LanguageSetting { - TextSize: string, + TextSize: string; } const languageSettings: { [key: string]: LanguageSetting } = { - "de":{ - TextSize: "80px" - } + de: { + TextSize: "80px", + }, }; export default class AchvsUiHandler extends MessageUiHandler { @@ -72,9 +72,12 @@ export default class AchvsUiHandler extends MessageUiHandler { this.mainContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1); - this.mainContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains); + this.mainContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), + Phaser.Geom.Rectangle.Contains, + ); - this.headerBg = addWindow(0, 0, (globalScene.game.canvas.width / 6) - 2, 24); + this.headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6 - 2, 24); this.headerBg.setOrigin(0, 0); this.headerText = addTextObject(0, 0, "", TextStyle.SETTINGS_LABEL); @@ -83,7 +86,9 @@ export default class AchvsUiHandler extends MessageUiHandler { this.headerActionButton = new Phaser.GameObjects.Sprite(globalScene, 0, 0, "keyboard", "ACTION.png"); this.headerActionButton.setOrigin(0, 0); this.headerActionButton.setPositionRelative(this.headerBg, 236, 6); - this.headerActionText = addTextObject(0, 0, "", TextStyle.WINDOW, { fontSize:"60px" }); + this.headerActionText = addTextObject(0, 0, "", TextStyle.WINDOW, { + fontSize: "60px", + }); this.headerActionText.setOrigin(0, 0); this.headerActionText.setPositionRelative(this.headerBg, 264, 8); @@ -91,14 +96,27 @@ export default class AchvsUiHandler extends MessageUiHandler { const genderIndex = globalScene.gameData.gender ?? PlayerGender.MALE; const genderStr = PlayerGender[genderIndex].toLowerCase(); - this.achvsName = i18next.t("achv:Achievements.name", { context: genderStr }); + this.achvsName = i18next.t("achv:Achievements.name", { + context: genderStr, + }); this.vouchersName = i18next.t("voucher:vouchers"); - this.iconsBg = addWindow(0, this.headerBg.height, (globalScene.game.canvas.width / 6) - 2, (globalScene.game.canvas.height / 6) - this.headerBg.height - 68); + this.iconsBg = addWindow( + 0, + this.headerBg.height, + globalScene.game.canvas.width / 6 - 2, + globalScene.game.canvas.height / 6 - this.headerBg.height - 68, + ); this.iconsBg.setOrigin(0, 0); const yOffset = 6; - this.scrollBar = new ScrollBar(this.iconsBg.width - 9, this.iconsBg.y + yOffset, 4, this.iconsBg.height - yOffset * 2, this.ROWS); + this.scrollBar = new ScrollBar( + this.iconsBg.width - 9, + this.iconsBg.y + yOffset, + 4, + this.iconsBg.height - yOffset * 2, + this.ROWS, + ); this.iconsContainer = globalScene.add.container(5, this.headerBg.height + 8); @@ -144,10 +162,12 @@ export default class AchvsUiHandler extends MessageUiHandler { this.unlockText.setOrigin(0.5, 0.5); this.unlockText.setPositionRelative(unlockBg, unlockBg.width / 2, unlockBg.height / 2); - const descriptionBg = addWindow(0, titleBg.y + titleBg.height, (globalScene.game.canvas.width / 6) - 2, 42); + const descriptionBg = addWindow(0, titleBg.y + titleBg.height, globalScene.game.canvas.width / 6 - 2, 42); descriptionBg.setOrigin(0, 0); - const descriptionText = addTextObject(0, 0, "", TextStyle.WINDOW, { maxLines: 2 }); + const descriptionText = addTextObject(0, 0, "", TextStyle.WINDOW, { + maxLines: 2, + }); descriptionText.setWordWrapWidth(1870); descriptionText.setOrigin(0, 0); descriptionText.setPositionRelative(descriptionBg, 8, 4); @@ -200,7 +220,9 @@ export default class AchvsUiHandler extends MessageUiHandler { const genderIndex = globalScene.gameData.gender ?? PlayerGender.MALE; const genderStr = PlayerGender[genderIndex].toLowerCase(); - achv.name = i18next.t(`achv:${achv.localizationKey}.name`, { context: genderStr }); + achv.name = i18next.t(`achv:${achv.localizationKey}.name`, { + context: genderStr, + }); achv.description = getAchievementDescription(achv.localizationKey); const achvUnlocks = globalScene.gameData.achvUnlocks; const unlocked = achvUnlocks.hasOwnProperty(achv.id); @@ -208,7 +230,9 @@ export default class AchvsUiHandler extends MessageUiHandler { this.titleText.setText(unlocked ? achv.name : "???"); this.showText(!hidden ? achv.description : ""); this.scoreText.setText(`${achv.score}pt`); - this.unlockText.setText(unlocked ? new Date(achvUnlocks[achv.id]).toLocaleDateString() : i18next.t("achv:Locked.name")); + this.unlockText.setText( + unlocked ? new Date(achvUnlocks[achv.id]).toLocaleDateString() : i18next.t("achv:Locked.name"), + ); } protected showVoucher(voucher: Voucher) { @@ -217,7 +241,9 @@ export default class AchvsUiHandler extends MessageUiHandler { this.titleText.setText(getVoucherTypeName(voucher.voucherType)); this.showText(voucher.description); - this.unlockText.setText(unlocked ? new Date(voucherUnlocks[voucher.id]).toLocaleDateString() : i18next.t("voucher:locked")); + this.unlockText.setText( + unlocked ? new Date(voucherUnlocks[voucher.id]).toLocaleDateString() : i18next.t("voucher:locked"), + ); } processInput(button: Button): boolean { @@ -245,14 +271,14 @@ export default class AchvsUiHandler extends MessageUiHandler { globalScene.ui.revertMode(); } else { const rowIndex = Math.floor(this.cursor / this.COLS); - const itemOffset = (this.scrollCursor * this.COLS); + const itemOffset = this.scrollCursor * this.COLS; switch (button) { case Button.UP: if (this.cursor < this.COLS) { if (this.scrollCursor) { success = this.setScrollCursor(this.scrollCursor - 1); } else { - // Wrap around to the last row + // Wrap around to the last row success = this.setScrollCursor(Math.ceil(this.currentTotal / this.COLS) - this.ROWS); let newCursorIndex = this.cursor + (this.ROWS - 1) * this.COLS; if (newCursorIndex > this.currentTotal - this.scrollCursor * this.COLS - 1) { @@ -268,10 +294,10 @@ export default class AchvsUiHandler extends MessageUiHandler { const canMoveDown = itemOffset + 1 < this.currentTotal; if (rowIndex >= this.ROWS - 1) { if (this.scrollCursor < Math.ceil(this.currentTotal / this.COLS) - this.ROWS && canMoveDown) { - // scroll down one row + // scroll down one row success = this.setScrollCursor(this.scrollCursor + 1); } else { - // wrap back to the first row + // wrap back to the first row success = this.setScrollCursor(0) && this.setCursor(this.cursor % this.COLS); } } else if (canMoveDown) { @@ -286,8 +312,8 @@ export default class AchvsUiHandler extends MessageUiHandler { } break; case Button.RIGHT: - if ((this.cursor + 1) % this.COLS === 0 || (this.cursor + itemOffset) === (this.currentTotal - 1)) { - success = this.setCursor(this.cursor - this.cursor % this.COLS); + if ((this.cursor + 1) % this.COLS === 0 || this.cursor + itemOffset === this.currentTotal - 1) { + success = this.setCursor(this.cursor - (this.cursor % this.COLS)); } else { success = this.setCursor(this.cursor + 1); } @@ -302,7 +328,7 @@ export default class AchvsUiHandler extends MessageUiHandler { return success; } - setCursor(cursor: integer, pageChange?: boolean): boolean { + setCursor(cursor: number, pageChange?: boolean): boolean { const ret = super.setCursor(cursor); let update = ret; @@ -340,12 +366,12 @@ export default class AchvsUiHandler extends MessageUiHandler { } /** - * setScrollCursor(scrollCursor: integer) : boolean + * setScrollCursor(scrollCursor: number) : boolean * scrollCursor refers to the page's position within the entire sum of the data, unlike cursor, which refers to a user's position within displayed data - * @param takes a scrollCursor that has been updated based on user behavior + * @param scrollCursor takes a value that has been updated based on user behavior * @returns returns a boolean that indicates whether the updated scrollCursor led to an update in the data displayed. */ - setScrollCursor(scrollCursor: integer): boolean { + setScrollCursor(scrollCursor: number): boolean { if (scrollCursor === this.scrollCursor) { return false; } @@ -372,7 +398,6 @@ export default class AchvsUiHandler extends MessageUiHandler { return true; } - /** * updateAchvIcons(): void * Determines what data is to be displayed on the UI and updates it accordingly based on the current value of this.scrollCursor @@ -391,7 +416,7 @@ export default class AchvsUiHandler extends MessageUiHandler { const achvRange = Object.values(achvs).slice(itemOffset, itemLimit + itemOffset); - achvRange.forEach((achv: Achv, i: integer) => { + achvRange.forEach((achv: Achv, i: number) => { const icon = this.icons[i]; const unlocked = achvUnlocks.hasOwnProperty(achv.id); const hidden = !unlocked && achv.secret && (!achv.parentId || !achvUnlocks.hasOwnProperty(achv.parentId)); @@ -431,7 +456,7 @@ export default class AchvsUiHandler extends MessageUiHandler { const voucherRange = Object.values(vouchers).slice(itemOffset, itemLimit + itemOffset); - voucherRange.forEach((voucher: Voucher, i: integer) => { + voucherRange.forEach((voucher: Voucher, i: number) => { const icon = this.icons[i]; const unlocked = voucherUnlocks.hasOwnProperty(voucher.id); diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts index e31acda6fa2..34b6e59145f 100644 --- a/src/ui/admin-ui-handler.ts +++ b/src/ui/admin-ui-handler.ts @@ -12,7 +12,6 @@ type AdminUiHandlerService = "discord" | "google"; type AdminUiHandlerServiceMode = "Link" | "Unlink"; export default class AdminUiHandler extends FormModalUiHandler { - private adminMode: AdminMode; private adminResult: AdminSearchInfo; private config: ModalConfig; @@ -23,9 +22,8 @@ export default class AdminUiHandler extends FormModalUiHandler { private readonly ERR_REQUIRED_FIELD = (field: string) => { if (field === "username") { return `${formatText(field)} is required`; - } else { - return `${formatText(field)} Id is required`; } + return `${formatText(field)} Id is required`; }; // returns a string saying whether a username has been successfully linked/unlinked to discord/google private readonly SUCCESS_SERVICE_MODE = (service: string, mode: string) => { @@ -45,19 +43,19 @@ export default class AdminUiHandler extends FormModalUiHandler { } override getMargin(): [number, number, number, number] { - return [ 0, 0, 0, 0 ]; + return [0, 0, 0, 0]; } override getButtonLabels(): string[] { switch (this.adminMode) { case AdminMode.LINK: - return [ "Link Account", "Cancel" ]; + return ["Link Account", "Cancel"]; case AdminMode.SEARCH: - return [ "Find account", "Cancel" ]; + return ["Find account", "Cancel"]; case AdminMode.ADMIN: - return [ "Back to search", "Cancel" ]; + return ["Back to search", "Cancel"]; default: - return [ "Activate ADMIN", "Cancel" ]; + return ["Activate ADMIN", "Cancel"]; } } @@ -65,20 +63,32 @@ export default class AdminUiHandler extends FormModalUiHandler { const inputFieldConfigs: InputFieldConfig[] = []; switch (this.adminMode) { case AdminMode.LINK: - inputFieldConfigs.push( { label: "Username" }); - inputFieldConfigs.push( { label: "Discord ID" }); + inputFieldConfigs.push({ label: "Username" }); + inputFieldConfigs.push({ label: "Discord ID" }); break; case AdminMode.SEARCH: - inputFieldConfigs.push( { label: "Username" }); + inputFieldConfigs.push({ label: "Username" }); break; case AdminMode.ADMIN: - const adminResult = this.adminResult ?? { username: "", discordId: "", googleId: "", lastLoggedIn: "", registered: "" }; + const adminResult = this.adminResult ?? { + username: "", + discordId: "", + googleId: "", + lastLoggedIn: "", + registered: "", + }; // Discord and Google ID fields that are not empty get locked, other fields are all locked - inputFieldConfigs.push( { label: "Username", isReadOnly: true }); - inputFieldConfigs.push( { label: "Discord ID", isReadOnly: adminResult.discordId !== "" }); - inputFieldConfigs.push( { label: "Google ID", isReadOnly: adminResult.googleId !== "" }); - inputFieldConfigs.push( { label: "Last played", isReadOnly: true }); - inputFieldConfigs.push( { label: "Registered", isReadOnly: true }); + inputFieldConfigs.push({ label: "Username", isReadOnly: true }); + inputFieldConfigs.push({ + label: "Discord ID", + isReadOnly: adminResult.discordId !== "", + }); + inputFieldConfigs.push({ + label: "Google ID", + isReadOnly: adminResult.googleId !== "", + }); + inputFieldConfigs.push({ label: "Last played", isReadOnly: true }); + inputFieldConfigs.push({ label: "Registered", isReadOnly: true }); break; } return inputFieldConfigs; @@ -96,7 +106,13 @@ export default class AdminUiHandler extends FormModalUiHandler { show(args: any[]): boolean { this.config = args[0] as ModalConfig; // config this.adminMode = args[1] as AdminMode; // admin mode - this.adminResult = args[2] ?? { username: "", discordId: "", googleId: "", lastLoggedIn: "", registered: "" }; // admin result, if any + this.adminResult = args[2] ?? { + username: "", + discordId: "", + googleId: "", + lastLoggedIn: "", + registered: "", + }; // admin result, if any const isMessageError = args[3]; // is the message shown a success or error const fields = this.getInputFieldConfigs(); @@ -122,23 +138,22 @@ export default class AdminUiHandler extends FormModalUiHandler { if (super.show(args)) { this.populateFields(this.adminMode, this.adminResult); const originalSubmitAction = this.submitAction; - this.submitAction = (_) => { + this.submitAction = _ => { this.submitAction = originalSubmitAction; const adminSearchResult: AdminSearchInfo = this.convertInputsToAdmin(); // this converts the input texts into a single object for use later const validFields = this.areFieldsValid(this.adminMode); if (validFields.error) { - globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); // this is here to force a loading screen to allow the admin tool to reopen again if there's an error + globalScene.ui.setMode(Mode.LOADING, { buttonActions: [] }); // this is here to force a loading screen to allow the admin tool to reopen again if there's an error return this.showMessage(validFields.errorMessage ?? "", adminSearchResult, true); } - globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); + globalScene.ui.setMode(Mode.LOADING, { buttonActions: [] }); if (this.adminMode === AdminMode.LINK) { this.adminLinkUnlink(adminSearchResult, "discord", "Link") // calls server to link discord .then(response => { if (response.error) { return this.showMessage(response.errorType, adminSearchResult, true); // error or some kind - } else { - return this.showMessage(this.SUCCESS_SERVICE_MODE("discord", "link"), adminSearchResult, false); // success } + return this.showMessage(this.SUCCESS_SERVICE_MODE("discord", "link"), adminSearchResult, false); // success }); } else if (this.adminMode === AdminMode.SEARCH) { this.adminSearch(adminSearchResult) // admin search for username @@ -158,7 +173,13 @@ export default class AdminUiHandler extends FormModalUiHandler { } showMessage(message: string, adminResult: AdminSearchInfo, isError: boolean) { - globalScene.ui.setMode(Mode.ADMIN, Object.assign(this.config, { errorMessage: message?.trim() }), this.adminMode, adminResult, isError); + globalScene.ui.setMode( + Mode.ADMIN, + Object.assign(this.config, { errorMessage: message?.trim() }), + this.adminMode, + adminResult, + isError, + ); if (isError) { globalScene.ui.playError(); } else { @@ -184,9 +205,14 @@ export default class AdminUiHandler extends FormModalUiHandler { case AdminMode.ADMIN: Object.keys(adminResult).forEach((aR, i) => { this.inputs[i].setText(adminResult[aR]); - if (aR === "discordId" || aR === "googleId") { // this is here to add the icons for linking/unlinking of google/discord IDs + if (aR === "discordId" || aR === "googleId") { + // this is here to add the icons for linking/unlinking of google/discord IDs const nineSlice = this.inputContainers[i].list.find(iC => iC.type === "NineSlice"); - const img = globalScene.add.image(this.inputContainers[i].x + nineSlice!.width + this.buttonGap, this.inputContainers[i].y + (Math.floor(nineSlice!.height / 2)), adminResult[aR] === "" ? "link_icon" : "unlink_icon"); + const img = globalScene.add.image( + this.inputContainers[i].x + nineSlice!.width + this.buttonGap, + this.inputContainers[i].y + Math.floor(nineSlice!.height / 2), + adminResult[aR] === "" ? "link_icon" : "unlink_icon", + ); img.setName(`adminBtn_${aR}`); img.setOrigin(0.5, 0.5); img.setInteractive(); @@ -195,24 +221,30 @@ export default class AdminUiHandler extends FormModalUiHandler { const mode = adminResult[aR] === "" ? "Link" : "Unlink"; // this figures out if we're linking or unlinking a service const validFields = this.areFieldsValid(this.adminMode, service); if (validFields.error) { - globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); // this is here to force a loading screen to allow the admin tool to reopen again if there's an error + globalScene.ui.setMode(Mode.LOADING, { buttonActions: [] }); // this is here to force a loading screen to allow the admin tool to reopen again if there's an error return this.showMessage(validFields.errorMessage ?? "", adminResult, true); } - this.adminLinkUnlink(this.convertInputsToAdmin(), service as AdminUiHandlerService, mode).then(response => { // attempts to link/unlink depending on the service - if (response.error) { - globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); - return this.showMessage(response.errorType, adminResult, true); // fail - } else { // success, reload panel with new results - globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); - this.adminSearch(adminResult) - .then(response => { - if (response.error) { - return this.showMessage(response.errorType, adminResult, true); - } - return this.showMessage(this.SUCCESS_SERVICE_MODE(service, mode), response.adminSearchResult ?? adminResult, false); - }); - } - }); + this.adminLinkUnlink(this.convertInputsToAdmin(), service as AdminUiHandlerService, mode).then( + response => { + // attempts to link/unlink depending on the service + if (response.error) { + globalScene.ui.setMode(Mode.LOADING, { buttonActions: [] }); + return this.showMessage(response.errorType, adminResult, true); // fail + } + // success, reload panel with new results + globalScene.ui.setMode(Mode.LOADING, { buttonActions: [] }); + this.adminSearch(adminResult).then(response => { + if (response.error) { + return this.showMessage(response.errorType, adminResult, true); + } + return this.showMessage( + this.SUCCESS_SERVICE_MODE(service, mode), + response.adminSearchResult ?? adminResult, + false, + ); + }); + }, + ); }); this.addInteractionHoverEffect(img); this.modalContainer.add(img); @@ -222,47 +254,52 @@ export default class AdminUiHandler extends FormModalUiHandler { } } - private areFieldsValid(adminMode: AdminMode, service?: string): { error: boolean; errorMessage?: string; } { + private areFieldsValid(adminMode: AdminMode, service?: string): { error: boolean; errorMessage?: string } { switch (adminMode) { case AdminMode.LINK: - if (!this.inputs[0].text) { // username missing from link panel + if (!this.inputs[0].text) { + // username missing from link panel return { error: true, - errorMessage: this.ERR_REQUIRED_FIELD("username") + errorMessage: this.ERR_REQUIRED_FIELD("username"), }; } - if (!this.inputs[1].text) { // discordId missing from linking panel + if (!this.inputs[1].text) { + // discordId missing from linking panel return { error: true, - errorMessage: this.ERR_REQUIRED_FIELD("discord") + errorMessage: this.ERR_REQUIRED_FIELD("discord"), }; } break; case AdminMode.SEARCH: - if (!this.inputs[0].text) { // username missing from search panel + if (!this.inputs[0].text) { + // username missing from search panel return { error: true, - errorMessage: this.ERR_REQUIRED_FIELD("username") + errorMessage: this.ERR_REQUIRED_FIELD("username"), }; } break; case AdminMode.ADMIN: - if (!this.inputs[1].text && service === "discord") { // discordId missing from admin panel + if (!this.inputs[1].text && service === "discord") { + // discordId missing from admin panel return { error: true, - errorMessage: this.ERR_REQUIRED_FIELD(service) + errorMessage: this.ERR_REQUIRED_FIELD(service), }; } - if (!this.inputs[2].text && service === "google") { // googleId missing from admin panel + if (!this.inputs[2].text && service === "google") { + // googleId missing from admin panel return { error: true, - errorMessage: this.ERR_REQUIRED_FIELD(service) + errorMessage: this.ERR_REQUIRED_FIELD(service), }; } break; } return { - error: false + error: false, }; } @@ -272,25 +309,32 @@ export default class AdminUiHandler extends FormModalUiHandler { discordId: this.inputs[1]?.node ? this.inputs[1]?.text : "", googleId: this.inputs[2]?.node ? this.inputs[2]?.text : "", lastLoggedIn: this.inputs[3]?.node ? this.inputs[3]?.text : "", - registered: this.inputs[4]?.node ? this.inputs[4]?.text : "" + registered: this.inputs[4]?.node ? this.inputs[4]?.text : "", }; } private async adminSearch(adminSearchResult: AdminSearchInfo) { try { - const [ adminInfo, errorType ] = await pokerogueApi.admin.searchAccount({ username: adminSearchResult.username }); - if (errorType || !adminInfo) { // error - if adminInfo.status === this.httpUserNotFoundErrorCode that means the username can't be found in the db + const [adminInfo, errorType] = await pokerogueApi.admin.searchAccount({ + username: adminSearchResult.username, + }); + if (errorType || !adminInfo) { + // error - if adminInfo.status === this.httpUserNotFoundErrorCode that means the username can't be found in the db return { adminSearchResult: adminSearchResult, error: true, errorType }; - } else { // success - return { adminSearchResult: adminInfo, error: false }; } + // success + return { adminSearchResult: adminInfo, error: false }; } catch (err) { console.error(err); return { error: true, errorType: err }; } } - private async adminLinkUnlink(adminSearchResult: AdminSearchInfo, service: AdminUiHandlerService, mode: AdminUiHandlerServiceMode) { + private async adminLinkUnlink( + adminSearchResult: AdminSearchInfo, + service: AdminUiHandlerService, + mode: AdminUiHandlerServiceMode, + ) { try { let errorType: string | null = null; @@ -329,10 +373,9 @@ export default class AdminUiHandler extends FormModalUiHandler { if (errorType) { // error - if response.status === this.httpUserNotFoundErrorCode that means the username can't be found in the db return { adminSearchResult: adminSearchResult, error: true, errorType }; - } else { - // success! - return { adminSearchResult: adminSearchResult, error: false }; } + // success! + return { adminSearchResult: adminSearchResult, error: false }; } catch (err) { console.error(err); return { error: true, errorType: err }; @@ -341,19 +384,24 @@ export default class AdminUiHandler extends FormModalUiHandler { private updateAdminPanelInfo(adminSearchResult: AdminSearchInfo, mode?: AdminMode) { mode = mode ?? AdminMode.ADMIN; - globalScene.ui.setMode(Mode.ADMIN, { - buttonActions: [ - // we double revert here and below to go back 2 layers of menus - () => { - globalScene.ui.revertMode(); - globalScene.ui.revertMode(); - }, - () => { - globalScene.ui.revertMode(); - globalScene.ui.revertMode(); - } - ] - }, mode, adminSearchResult); + globalScene.ui.setMode( + Mode.ADMIN, + { + buttonActions: [ + // we double revert here and below to go back 2 layers of menus + () => { + globalScene.ui.revertMode(); + globalScene.ui.revertMode(); + }, + () => { + globalScene.ui.revertMode(); + globalScene.ui.revertMode(); + }, + ], + }, + mode, + adminSearchResult, + ); } clear(): void { @@ -361,7 +409,7 @@ export default class AdminUiHandler extends FormModalUiHandler { // this is used to remove the existing fields on the admin panel so they can be updated - const itemsToRemove: string[] = [ "formLabel", "adminBtn" ]; // this is the start of the names for each element we want to remove + const itemsToRemove: string[] = ["formLabel", "adminBtn"]; // this is the start of the names for each element we want to remove const removeArray: any[] = []; const mC = this.modalContainer.list; for (let i = mC.length - 1; i >= 0; i--) { @@ -370,7 +418,11 @@ export default class AdminUiHandler extends FormModalUiHandler { * It then also checks for any containers that are within this.modalContainer, and checks if any of its child elements are of type rexInputText * and if either of these conditions are met, the element is destroyed. */ - if (itemsToRemove.some(iTR => mC[i].name.includes(iTR)) || (mC[i].type === "Container" && (mC[i] as Phaser.GameObjects.Container).list.find(m => m.type === "rexInputText"))) { + if ( + itemsToRemove.some(iTR => mC[i].name.includes(iTR)) || + (mC[i].type === "Container" && + (mC[i] as Phaser.GameObjects.Container).list.find(m => m.type === "rexInputText")) + ) { removeArray.push(mC[i]); } } @@ -384,7 +436,7 @@ export default class AdminUiHandler extends FormModalUiHandler { export enum AdminMode { LINK, SEARCH, - ADMIN + ADMIN, } export function getAdminModeName(adminMode: AdminMode): string { diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index 7e9b24d1d97..36a44eb5aa0 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -5,7 +5,13 @@ import { WeatherType } from "#enums/weather-type"; import { TerrainType } from "#app/data/terrain"; import { addWindow, WindowVariant } from "./ui-theme"; import type { ArenaEvent } from "#app/events/arena"; -import { ArenaEventType, TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena"; +import { + ArenaEventType, + TagAddedEvent, + TagRemovedEvent, + TerrainChangedEvent, + WeatherChangedEvent, +} from "#app/events/arena"; import type { TurnEndEvent } from "../events/battle-scene"; import { BattleSceneEventType } from "../events/battle-scene"; import { ArenaTagType } from "#enums/arena-tag-type"; @@ -27,7 +33,7 @@ interface ArenaEffectInfo { /** The enum string representation of the effect */ name: string; /** {@linkcode ArenaEffectType} type of effect */ - effecType: ArenaEffectType, + effecType: ArenaEffectType; /** The maximum duration set by the effect */ maxDuration: number; @@ -44,7 +50,7 @@ export function getFieldEffectText(arenaTagType: string): string { const effectName = Utils.toCamelCaseString(arenaTagType); const i18nKey = `arenaFlyout:${effectName}` as ParseKeys; const resultName = i18next.t(i18nKey); - return (!resultName || resultName === i18nKey) ? Utils.formatText(arenaTagType) : resultName; + return !resultName || resultName === i18nKey ? Utils.formatText(arenaTagType) : resultName; } export class ArenaFlyout extends Phaser.GameObjects.Container { @@ -93,8 +99,8 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { private readonly fieldEffectInfo: ArenaEffectInfo[] = []; // Stores callbacks in a variable so they can be unsubscribed from when destroyed - private readonly onNewArenaEvent = (event: Event) => this.onNewArena(event); - private readonly onTurnEndEvent = (event: Event) => this.onTurnEnd(event); + private readonly onNewArenaEvent = (event: Event) => this.onNewArena(event); + private readonly onTurnEndEvent = (event: Event) => this.onTurnEnd(event); private readonly onFieldEffectChangedEvent = (event: Event) => this.onFieldEffectChanged(event); @@ -116,19 +122,34 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { this.flyoutWindow = addWindow(0, 0, this.flyoutWidth, this.flyoutHeight, false, false, 0, 0, WindowVariant.THIN); this.flyoutContainer.add(this.flyoutWindow); - this.flyoutWindowHeader = addWindow(this.flyoutWidth / 2, 0, this.flyoutWidth / 2, 14, false, false, 0, 0, WindowVariant.XTHIN); + this.flyoutWindowHeader = addWindow( + this.flyoutWidth / 2, + 0, + this.flyoutWidth / 2, + 14, + false, + false, + 0, + 0, + WindowVariant.XTHIN, + ); this.flyoutWindowHeader.setOrigin(); this.flyoutContainer.add(this.flyoutWindowHeader); - this.flyoutTextHeader = addTextObject(this.flyoutWidth / 2, 0, i18next.t("arenaFlyout:activeBattleEffects"), TextStyle.BATTLE_INFO); + this.flyoutTextHeader = addTextObject( + this.flyoutWidth / 2, + 0, + i18next.t("arenaFlyout:activeBattleEffects"), + TextStyle.BATTLE_INFO, + ); this.flyoutTextHeader.setFontSize(54); this.flyoutTextHeader.setAlign("center"); this.flyoutTextHeader.setOrigin(); this.flyoutContainer.add(this.flyoutTextHeader); - this.timeOfDayWidget = new TimeOfDayWidget((this.flyoutWidth / 2) + (this.flyoutWindowHeader.displayWidth / 2)); + this.timeOfDayWidget = new TimeOfDayWidget(this.flyoutWidth / 2 + this.flyoutWindowHeader.displayWidth / 2); this.flyoutContainer.add(this.timeOfDayWidget); this.flyoutTextHeaderPlayer = addTextObject(6, 5, i18next.t("arenaFlyout:player"), TextStyle.SUMMARY_BLUE); @@ -138,14 +159,24 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { this.flyoutContainer.add(this.flyoutTextHeaderPlayer); - this.flyoutTextHeaderField = addTextObject(this.flyoutWidth / 2, 5, i18next.t("arenaFlyout:neutral"), TextStyle.SUMMARY_GREEN); + this.flyoutTextHeaderField = addTextObject( + this.flyoutWidth / 2, + 5, + i18next.t("arenaFlyout:neutral"), + TextStyle.SUMMARY_GREEN, + ); this.flyoutTextHeaderField.setFontSize(54); this.flyoutTextHeaderField.setAlign("center"); this.flyoutTextHeaderField.setOrigin(0.5, 0); this.flyoutContainer.add(this.flyoutTextHeaderField); - this.flyoutTextHeaderEnemy = addTextObject(this.flyoutWidth - 6, 5, i18next.t("arenaFlyout:enemy"), TextStyle.SUMMARY_RED); + this.flyoutTextHeaderEnemy = addTextObject( + this.flyoutWidth - 6, + 5, + i18next.t("arenaFlyout:enemy"), + TextStyle.SUMMARY_RED, + ); this.flyoutTextHeaderEnemy.setFontSize(54); this.flyoutTextHeaderEnemy.setAlign("right"); this.flyoutTextHeaderEnemy.setOrigin(1, 0); @@ -181,20 +212,19 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { // Subscribes to required events available on game start globalScene.eventTarget.addEventListener(BattleSceneEventType.NEW_ARENA, this.onNewArenaEvent); - globalScene.eventTarget.addEventListener(BattleSceneEventType.TURN_END, this.onTurnEndEvent); + globalScene.eventTarget.addEventListener(BattleSceneEventType.TURN_END, this.onTurnEndEvent); } - private onNewArena(event: Event) { + private onNewArena(_event: Event) { this.fieldEffectInfo.length = 0; // Subscribes to required events available on battle start globalScene.arena.eventTarget.addEventListener(ArenaEventType.WEATHER_CHANGED, this.onFieldEffectChangedEvent); globalScene.arena.eventTarget.addEventListener(ArenaEventType.TERRAIN_CHANGED, this.onFieldEffectChangedEvent); - globalScene.arena.eventTarget.addEventListener(ArenaEventType.TAG_ADDED, this.onFieldEffectChangedEvent); - globalScene.arena.eventTarget.addEventListener(ArenaEventType.TAG_REMOVED, this.onFieldEffectChangedEvent); + globalScene.arena.eventTarget.addEventListener(ArenaEventType.TAG_ADDED, this.onFieldEffectChangedEvent); + globalScene.arena.eventTarget.addEventListener(ArenaEventType.TAG_REMOVED, this.onFieldEffectChangedEvent); } - /** Clears out the current string stored in all arena effect texts */ private clearText() { this.flyoutTextPlayer.text = ""; @@ -252,7 +282,7 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { let foundIndex: number; switch (arenaEffectChangedEvent.constructor) { - case TagAddedEvent: + case TagAddedEvent: { const tagAddedEvent = arenaEffectChangedEvent as TagAddedEvent; const isArenaTrapTag = globalScene.arena.getTag(tagAddedEvent.arenaTagType) instanceof ArenaTrapTag; let arenaEffectType: ArenaEffectType; @@ -265,15 +295,20 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { arenaEffectType = ArenaEffectType.ENEMY; } - const existingTrapTagIndex = isArenaTrapTag ? this.fieldEffectInfo.findIndex(e => tagAddedEvent.arenaTagType === e.tagType && arenaEffectType === e.effecType) : -1; - let name: string = getFieldEffectText(ArenaTagType[tagAddedEvent.arenaTagType]); + const existingTrapTagIndex = isArenaTrapTag + ? this.fieldEffectInfo.findIndex( + e => tagAddedEvent.arenaTagType === e.tagType && arenaEffectType === e.effecType, + ) + : -1; + let name: string = getFieldEffectText(ArenaTagType[tagAddedEvent.arenaTagType]); if (isArenaTrapTag) { if (existingTrapTagIndex !== -1) { const layers = tagAddedEvent.arenaTagMaxLayers > 1 ? ` (${tagAddedEvent.arenaTagLayers})` : ""; this.fieldEffectInfo[existingTrapTagIndex].name = `${name}${layers}`; break; - } else if (tagAddedEvent.arenaTagMaxLayers > 1) { + } + if (tagAddedEvent.arenaTagMaxLayers > 1) { name = `${name} (${tagAddedEvent.arenaTagLayers})`; } } @@ -283,40 +318,45 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { effecType: arenaEffectType, maxDuration: tagAddedEvent.duration, duration: tagAddedEvent.duration, - tagType: tagAddedEvent.arenaTagType + tagType: tagAddedEvent.arenaTagType, }); break; - case TagRemovedEvent: + } + case TagRemovedEvent: { const tagRemovedEvent = arenaEffectChangedEvent as TagRemovedEvent; foundIndex = this.fieldEffectInfo.findIndex(info => info.tagType === tagRemovedEvent.arenaTagType); - if (foundIndex !== -1) { // If the tag was being tracked, remove it + if (foundIndex !== -1) { + // If the tag was being tracked, remove it this.fieldEffectInfo.splice(foundIndex, 1); } break; + } case WeatherChangedEvent: - case TerrainChangedEvent: + case TerrainChangedEvent: { const fieldEffectChangedEvent = arenaEffectChangedEvent as WeatherChangedEvent | TerrainChangedEvent; // Stores the old Weather/Terrain name in case it's in the array already - const oldName = - getFieldEffectText(fieldEffectChangedEvent instanceof WeatherChangedEvent - ? WeatherType[fieldEffectChangedEvent.oldWeatherType] - : TerrainType[fieldEffectChangedEvent.oldTerrainType]); + const oldName = getFieldEffectText( + fieldEffectChangedEvent instanceof WeatherChangedEvent + ? WeatherType[fieldEffectChangedEvent.oldWeatherType] + : TerrainType[fieldEffectChangedEvent.oldTerrainType], + ); // Stores the new Weather/Terrain info const newInfo = { - name: - getFieldEffectText(fieldEffectChangedEvent instanceof WeatherChangedEvent - ? WeatherType[fieldEffectChangedEvent.newWeatherType] - : TerrainType[fieldEffectChangedEvent.newTerrainType]), - effecType: fieldEffectChangedEvent instanceof WeatherChangedEvent - ? ArenaEffectType.WEATHER - : ArenaEffectType.TERRAIN, + name: getFieldEffectText( + fieldEffectChangedEvent instanceof WeatherChangedEvent + ? WeatherType[fieldEffectChangedEvent.newWeatherType] + : TerrainType[fieldEffectChangedEvent.newTerrainType], + ), + effecType: + fieldEffectChangedEvent instanceof WeatherChangedEvent ? ArenaEffectType.WEATHER : ArenaEffectType.TERRAIN, maxDuration: fieldEffectChangedEvent.duration, - duration: fieldEffectChangedEvent.duration }; + duration: fieldEffectChangedEvent.duration, + }; - foundIndex = this.fieldEffectInfo.findIndex(info => [ newInfo.name, oldName ].includes(info.name)); + foundIndex = this.fieldEffectInfo.findIndex(info => [newInfo.name, oldName].includes(info.name)); if (foundIndex === -1) { if (newInfo.name !== undefined) { this.fieldEffectInfo.push(newInfo); // Adds the info to the array if it doesn't already exist and is defined @@ -327,6 +367,7 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { this.fieldEffectInfo[foundIndex] = newInfo; // Otherwise, replace the old info } break; + } } this.updateFieldText(); @@ -353,7 +394,8 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { } --info.duration; - if (info.duration <= 0) { // Removes the item if the duration has expired + if (info.duration <= 0) { + // Removes the item if the duration has expired this.fieldEffectInfo.splice(this.fieldEffectInfo.indexOf(info), 1); } } @@ -372,18 +414,18 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { duration: Utils.fixedInt(125), ease: "Sine.easeInOut", alpha: visible ? 1 : 0, - onComplete: () => this.timeOfDayWidget.parentVisible = visible, + onComplete: () => (this.timeOfDayWidget.parentVisible = visible), }); } public destroy(fromScene?: boolean): void { globalScene.eventTarget.removeEventListener(BattleSceneEventType.NEW_ARENA, this.onNewArenaEvent); - globalScene.eventTarget.removeEventListener(BattleSceneEventType.TURN_END, this.onTurnEndEvent); + globalScene.eventTarget.removeEventListener(BattleSceneEventType.TURN_END, this.onTurnEndEvent); globalScene.arena.eventTarget.removeEventListener(ArenaEventType.WEATHER_CHANGED, this.onFieldEffectChangedEvent); globalScene.arena.eventTarget.removeEventListener(ArenaEventType.TERRAIN_CHANGED, this.onFieldEffectChangedEvent); - globalScene.arena.eventTarget.removeEventListener(ArenaEventType.TAG_ADDED, this.onFieldEffectChangedEvent); - globalScene.arena.eventTarget.removeEventListener(ArenaEventType.TAG_REMOVED, this.onFieldEffectChangedEvent); + globalScene.arena.eventTarget.removeEventListener(ArenaEventType.TAG_ADDED, this.onFieldEffectChangedEvent); + globalScene.arena.eventTarget.removeEventListener(ArenaEventType.TAG_REMOVED, this.onFieldEffectChangedEvent); super.destroy(fromScene); } diff --git a/src/ui/autocomplete-ui-handler.ts b/src/ui/autocomplete-ui-handler.ts index 8754e65db77..a170ae43f23 100644 --- a/src/ui/autocomplete-ui-handler.ts +++ b/src/ui/autocomplete-ui-handler.ts @@ -8,7 +8,7 @@ export default class AutoCompleteUiHandler extends AbstractOptionSelectUiHandler super(mode); } - getWindowWidth(): integer { + getWindowWidth(): number { return 64; } @@ -27,8 +27,15 @@ export default class AutoCompleteUiHandler extends AbstractOptionSelectUiHandler protected setupOptions() { super.setupOptions(); if (this.modalContainer) { - this.optionSelectContainer.setSize(this.optionSelectContainer.height, Math.max(this.optionSelectText.displayWidth + 24, this.getWindowWidth())); - this.optionSelectContainer.setPositionRelative(this.modalContainer, this.optionSelectBg.width, this.optionSelectBg.height + 50); + this.optionSelectContainer.setSize( + this.optionSelectContainer.height, + Math.max(this.optionSelectText.displayWidth + 24, this.getWindowWidth()), + ); + this.optionSelectContainer.setPositionRelative( + this.modalContainer, + this.optionSelectBg.width, + this.optionSelectBg.height + 50, + ); } } diff --git a/src/ui/awaitable-ui-handler.ts b/src/ui/awaitable-ui-handler.ts index cc970358cb2..890e2884fd5 100644 --- a/src/ui/awaitable-ui-handler.ts +++ b/src/ui/awaitable-ui-handler.ts @@ -6,7 +6,7 @@ import { globalScene } from "#app/global-scene"; export default abstract class AwaitableUiHandler extends UiHandler { protected awaitingActionInput: boolean; protected onActionInput: Function | null; - public tutorialActive: boolean = false; + public tutorialActive = false; public tutorialOverlay: Phaser.GameObjects.Rectangle; constructor(mode: Mode | null = null) { @@ -32,7 +32,14 @@ export default abstract class AwaitableUiHandler extends UiHandler { */ initTutorialOverlay(container: Phaser.GameObjects.Container) { if (!this.tutorialOverlay) { - this.tutorialOverlay = new Phaser.GameObjects.Rectangle(globalScene, -1, -1, globalScene.scaledCanvas.width, globalScene.scaledCanvas.height, 0x070707); + this.tutorialOverlay = new Phaser.GameObjects.Rectangle( + globalScene, + -1, + -1, + globalScene.scaledCanvas.width, + globalScene.scaledCanvas.height, + 0x070707, + ); this.tutorialOverlay.setName("tutorial-overlay"); this.tutorialOverlay.setOrigin(0, 0); this.tutorialOverlay.setAlpha(0); diff --git a/src/ui/ball-ui-handler.ts b/src/ui/ball-ui-handler.ts index 2c1a53a9a52..cfa44832824 100644 --- a/src/ui/ball-ui-handler.ts +++ b/src/ui/ball-ui-handler.ts @@ -15,7 +15,7 @@ export default class BallUiHandler extends UiHandler { private cursorObj: Phaser.GameObjects.Image | null; - private scale: number = 0.1666666667; + private scale = 0.1666666667; constructor() { super(Mode.BALL); @@ -34,7 +34,10 @@ export default class BallUiHandler extends UiHandler { optionsTextContent += "Cancel"; const optionsText = addTextObject(0, 0, optionsTextContent, TextStyle.WINDOW, { align: "right", maxLines: 6 }); const optionsTextWidth = optionsText.displayWidth; - this.pokeballSelectContainer = globalScene.add.container((globalScene.game.canvas.width / 6) - 51 - Math.max(64, optionsTextWidth), -49); + this.pokeballSelectContainer = globalScene.add.container( + globalScene.game.canvas.width / 6 - 51 - Math.max(64, optionsTextWidth), + -49, + ); this.pokeballSelectContainer.setVisible(false); ui.add(this.pokeballSelectContainer); @@ -46,7 +49,9 @@ export default class BallUiHandler extends UiHandler { optionsText.setPositionRelative(this.pokeballSelectBg, 42, 9); optionsText.setLineSpacing(this.scale * 72); - this.countsText = addTextObject(0, 0, "", TextStyle.WINDOW, { maxLines: 5 }); + this.countsText = addTextObject(0, 0, "", TextStyle.WINDOW, { + maxLines: 5, + }); this.countsText.setPositionRelative(this.pokeballSelectBg, 18, 9); this.countsText.setLineSpacing(this.scale * 72); this.pokeballSelectContainer.add(this.countsText); @@ -107,10 +112,14 @@ export default class BallUiHandler extends UiHandler { } updateCounts() { - this.countsText.setText(Object.values(globalScene.pokeballCounts).map(c => `x${c}`).join("\n")); + this.countsText.setText( + Object.values(globalScene.pokeballCounts) + .map(c => `x${c}`) + .join("\n"), + ); } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const ret = super.setCursor(cursor); if (!this.cursorObj) { diff --git a/src/ui/base-stats-overlay.ts b/src/ui/base-stats-overlay.ts new file mode 100644 index 00000000000..5a6c67cae7b --- /dev/null +++ b/src/ui/base-stats-overlay.ts @@ -0,0 +1,118 @@ +import type { InfoToggle } from "../battle-scene"; +import { TextStyle, addTextObject } from "./text"; +import { addWindow } from "./ui-theme"; +import * as Utils from "../utils"; +import i18next from "i18next"; +import { globalScene } from "#app/global-scene"; + +interface BaseStatsOverlaySettings { + scale?: number; // scale the box? A scale of 0.5 is recommended + x?: number; + y?: number; + /** Default is always half the screen, regardless of scale */ + width?: number; +} + +const HEIGHT = 120; +const BORDER = 8; +const GLOBAL_SCALE = 6; +const shortStats = ["HP", "ATK", "DEF", "SPATK", "SPDEF", "SPD"]; + +export class BaseStatsOverlay extends Phaser.GameObjects.Container implements InfoToggle { + public active = false; + + private statsLabels: Phaser.GameObjects.Text[] = []; + private statsRectangles: Phaser.GameObjects.Rectangle[] = []; + private statsShadows: Phaser.GameObjects.Rectangle[] = []; + private statsTotalLabel: Phaser.GameObjects.Text; + + private statsBg: Phaser.GameObjects.NineSlice; + + public scale: number; + public width: number; + + constructor(options?: BaseStatsOverlaySettings) { + super(globalScene, options?.x, options?.y); + this.scale = options?.scale || 1; // set up the scale + this.setScale(this.scale); + + // prepare the description box + this.width = (options?.width || BaseStatsOverlay.getWidth(this.scale)) / this.scale; // divide by scale as we always want this to be half a window wide + this.statsBg = addWindow(0, 0, this.width, HEIGHT); + this.statsBg.setOrigin(0, 0); + this.add(this.statsBg); + + for (let i = 0; i < 6; i++) { + const shadow = globalScene.add.rectangle(this.width - BORDER + 1, BORDER + 3 + i * 15, 100, 5, 0x006860); + shadow.setOrigin(1, 0); + this.statsShadows.push(shadow); + this.add(shadow); + + const rectangle = globalScene.add.rectangle(this.width - BORDER, BORDER + 2 + i * 15, 100, 5, 0x66aa99); + rectangle.setOrigin(1, 0); + this.statsRectangles.push(rectangle); + this.add(rectangle); + + const label = addTextObject(BORDER, BORDER - 2 + i * 15, "A", TextStyle.BATTLE_INFO); + this.statsLabels.push(label); + this.add(label); + } + + this.statsTotalLabel = addTextObject(BORDER, BORDER + 6 * 15, "A", TextStyle.MONEY_WINDOW); + this.add(this.statsTotalLabel); + + // hide this component for now + this.setVisible(false); + } + + // show this component with infos for the specific move + show(values: number[], total: number): boolean { + for (let i = 0; i < 6; i++) { + this.statsLabels[i].setText(i18next.t(`pokemonInfo:Stat.${shortStats[i]}shortened`) + ": " + `${values[i]}`); + // This accounts for base stats up to 200, might not be enough. + // TODO: change color based on value. + this.statsShadows[i].setSize(values[i] / 2, 5); + this.statsRectangles[i].setSize(values[i] / 2, 5); + } + + this.statsTotalLabel.setText(i18next.t("pokedexUiHandler:baseTotal") + ": " + `${total}`); + + this.setVisible(true); + this.active = true; + return true; + } + + clear() { + this.setVisible(false); + this.active = false; + } + + toggleInfo(visible: boolean): void { + if (visible) { + this.setVisible(true); + } + globalScene.tweens.add({ + targets: this.statsLabels, + duration: Utils.fixedInt(125), + ease: "Sine.easeInOut", + alpha: visible ? 1 : 0, + }); + if (!visible) { + this.setVisible(false); + } + } + + isActive(): boolean { + return this.active; + } + + // width of this element + static getWidth(_scale: number): number { + return globalScene.game.canvas.width / GLOBAL_SCALE / 2; + } + + // height of this element + static getHeight(scale: number, _onSide?: boolean): number { + return HEIGHT * scale; + } +} diff --git a/src/ui/battle-flyout.ts b/src/ui/battle-flyout.ts index c716705452c..206546ad9cb 100644 --- a/src/ui/battle-flyout.ts +++ b/src/ui/battle-flyout.ts @@ -2,7 +2,7 @@ import type { default as Pokemon } from "../field/pokemon"; import { addTextObject, TextStyle } from "./text"; import * as Utils from "../utils"; import { globalScene } from "#app/global-scene"; -import type Move from "#app/data/move"; +import type Move from "#app/data/moves/move"; import type { BerryUsedEvent, MoveUsedEvent } from "../events/battle-scene"; import { BattleSceneEventType } from "../events/battle-scene"; import { BerryType } from "#enums/berry-type"; @@ -13,12 +13,12 @@ import { getPokemonNameWithAffix } from "#app/messages"; /** Container for info about a {@linkcode Move} */ interface MoveInfo { /** The {@linkcode Move} itself */ - move: Move, + move: Move; /** The maximum PP of the {@linkcode Move} */ - maxPp: number, + maxPp: number; /** The amount of PP used by the {@linkcode Move} */ - ppUsed: number, + ppUsed: number; } /** A Flyout Menu attached to each {@linkcode BattleInfo} object on the field UI */ @@ -55,7 +55,7 @@ export default class BattleFlyout extends Phaser.GameObjects.Container { private moveInfo: MoveInfo[] = new Array(); /** Current state of the flyout's visibility */ - public flyoutVisible: boolean = false; + public flyoutVisible = false; // Stores callbacks in a variable so they can be unsubscribed from when destroyed private readonly onMoveUsedEvent = (event: Event) => this.onMoveUsed(event); @@ -68,7 +68,7 @@ export default class BattleFlyout extends Phaser.GameObjects.Container { this.player = player; this.translationX = this.player ? -this.flyoutWidth : this.flyoutWidth; - this.anchorX = (this.player ? -130 : -40); + this.anchorX = this.player ? -130 : -40; this.anchorY = -2.5 + (this.player ? -18.5 : -13); this.flyoutParent = globalScene.add.container(this.anchorX - this.translationX, this.anchorY); @@ -87,8 +87,11 @@ export default class BattleFlyout extends Phaser.GameObjects.Container { // Loops through and sets the position of each text object according to the width and height of the flyout for (let i = 0; i < 4; i++) { this.flyoutText[i] = addTextObject( - (this.flyoutWidth / 4) + (this.flyoutWidth / 2) * (i % 2), - (this.flyoutHeight / 4) + (this.flyoutHeight / 2) * (i < 2 ? 0 : 1), "???", TextStyle.BATTLE_INFO); + this.flyoutWidth / 4 + (this.flyoutWidth / 2) * (i % 2), + this.flyoutHeight / 4 + (this.flyoutHeight / 2) * (i < 2 ? 0 : 1), + "???", + TextStyle.BATTLE_INFO, + ); this.flyoutText[i].setFontSize(45); this.flyoutText[i].setLineSpacing(-10); this.flyoutText[i].setAlign("center"); @@ -98,9 +101,25 @@ export default class BattleFlyout extends Phaser.GameObjects.Container { this.flyoutContainer.add(this.flyoutText); this.flyoutContainer.add( - new Phaser.GameObjects.Rectangle(globalScene, this.flyoutWidth / 2, 0, 1, this.flyoutHeight + (globalScene.uiTheme === UiTheme.LEGACY ? 1 : 0), 0x212121).setOrigin(0.5, 0)); + new Phaser.GameObjects.Rectangle( + globalScene, + this.flyoutWidth / 2, + 0, + 1, + this.flyoutHeight + (globalScene.uiTheme === UiTheme.LEGACY ? 1 : 0), + 0x212121, + ).setOrigin(0.5, 0), + ); this.flyoutContainer.add( - new Phaser.GameObjects.Rectangle(globalScene, 0, this.flyoutHeight / 2, this.flyoutWidth + 6, 1, 0x212121).setOrigin(0, 0.5)); + new Phaser.GameObjects.Rectangle( + globalScene, + 0, + this.flyoutHeight / 2, + this.flyoutWidth + 6, + 1, + 0x212121, + ).setOrigin(0, 0.5), + ); } /** @@ -135,9 +154,8 @@ export default class BattleFlyout extends Phaser.GameObjects.Container { /** Updates all of the {@linkcode MoveInfo} objects in the moveInfo array */ private onMoveUsed(event: Event) { const moveUsedEvent = event as MoveUsedEvent; - if (!moveUsedEvent - || moveUsedEvent.pokemonId !== this.pokemon?.id - || moveUsedEvent.move.id === Moves.STRUGGLE) { // Ignore Struggle + if (!moveUsedEvent || moveUsedEvent.pokemonId !== this.pokemon?.id || moveUsedEvent.move.id === Moves.STRUGGLE) { + // Ignore Struggle return; } @@ -145,7 +163,11 @@ export default class BattleFlyout extends Phaser.GameObjects.Container { if (foundInfo) { foundInfo.ppUsed = moveUsedEvent.ppUsed; } else { - this.moveInfo.push({ move: moveUsedEvent.move, maxPp: moveUsedEvent.move.pp, ppUsed: moveUsedEvent.ppUsed }); + this.moveInfo.push({ + move: moveUsedEvent.move, + maxPp: moveUsedEvent.move.pp, + ppUsed: moveUsedEvent.ppUsed, + }); } this.setText(); @@ -153,14 +175,18 @@ export default class BattleFlyout extends Phaser.GameObjects.Container { private onBerryUsed(event: Event) { const berryUsedEvent = event as BerryUsedEvent; - if (!berryUsedEvent - || berryUsedEvent.berryModifier.pokemonId !== this.pokemon?.id - || berryUsedEvent.berryModifier.berryType !== BerryType.LEPPA) { // We only care about Leppa berries + if ( + !berryUsedEvent || + berryUsedEvent.berryModifier.pokemonId !== this.pokemon?.id || + berryUsedEvent.berryModifier.berryType !== BerryType.LEPPA + ) { + // We only care about Leppa berries return; } const foundInfo = this.moveInfo.find(info => info.ppUsed === info.maxPp); - if (!foundInfo) { // This will only happen on a de-sync of PP tracking + if (!foundInfo) { + // This will only happen on a de-sync of PP tracking return; } foundInfo.ppUsed = Math.max(foundInfo.ppUsed - 10, 0); diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts index ca98d4c9d10..355ab9167a1 100644 --- a/src/ui/battle-info.ts +++ b/src/ui/battle-info.ts @@ -6,7 +6,7 @@ import { getGenderSymbol, getGenderColor, Gender } from "../data/gender"; import { StatusEffect } from "#enums/status-effect"; import { globalScene } from "#app/global-scene"; import { getTypeRgb } from "#app/data/type"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { getVariantTint } from "#app/data/variant"; import { Stat } from "#enums/stat"; import BattleFlyout from "./battle-flyout"; @@ -22,17 +22,17 @@ export default class BattleInfo extends Phaser.GameObjects.Container { private player: boolean; private mini: boolean; private boss: boolean; - private bossSegments: integer; + private bossSegments: number; private offset: boolean; private lastName: string | null; - private lastTeraType: Type; + private lastTeraType: PokemonType; private lastStatus: StatusEffect; - private lastHp: integer; - private lastMaxHp: integer; + private lastHp: number; + private lastMaxHp: number; private lastHpFrame: string | null; - private lastExp: integer; - private lastLevelExp: integer; - private lastLevel: integer; + private lastExp: number; + private lastLevelExp: number; + private lastLevel: number; private lastLevelCapped: boolean; private lastStats: string; @@ -73,8 +73,8 @@ export default class BattleInfo extends Phaser.GameObjects.Container { public flyoutMenu?: BattleFlyout; private statOrder: Stat[]; - private readonly statOrderPlayer = [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD ]; - private readonly statOrderEnemy = [ Stat.HP, Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD ]; + private readonly statOrderPlayer = [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD]; + private readonly statOrderEnemy = [Stat.HP, Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD]; constructor(x: number, y: number, player: boolean) { super(globalScene, x, y); @@ -84,7 +84,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.boss = false; this.offset = false; this.lastName = null; - this.lastTeraType = Type.UNKNOWN; + this.lastTeraType = PokemonType.UNKNOWN; this.lastStatus = StatusEffect.NONE; this.lastHp = -1; this.lastMaxHp = -1; @@ -200,7 +200,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { const expMaskRect = globalScene.make.graphics({}); expMaskRect.setScale(6); - expMaskRect.fillStyle(0xFFFFFF); + expMaskRect.fillStyle(0xffffff); expMaskRect.beginPath(); expMaskRect.fillRect(127, 126, 85, 2); @@ -239,7 +239,10 @@ export default class BattleInfo extends Phaser.GameObjects.Container { // we do a check for i > statOverflow to see when the stat labels go onto the next column // For enemies, we have HP (i=0) by itself then a new column, so we check for i > 0 // For players, we don't have HP, so we start with i = 0 and i = 1 for our first column, and so need to check for i > 1 - const statX = i > statOverflow ? this.statNumbers[Math.max(i - 2, 0)].x + this.statNumbers[Math.max(i - 2, 0)].width + paddingX : startingX; // we have the Math.max(i - 2, 0) in there so for i===1 to not return a negative number; since this is now based on anything >0 instead of >1, we need to allow for i-2 < 0 + const statX = + i > statOverflow + ? this.statNumbers[Math.max(i - 2, 0)].x + this.statNumbers[Math.max(i - 2, 0)].width + paddingX + : startingX; // we have the Math.max(i - 2, 0) in there so for i===1 to not return a negative number; since this is now based on anything >0 instead of >1, we need to allow for i-2 < 0 const baseY = -this.statsBox.height / 2 + 4; // this is the baseline for the y-axis let statY: number; // this will be the y-axis placement for the labels @@ -255,7 +258,12 @@ export default class BattleInfo extends Phaser.GameObjects.Container { statLabels.push(statLabel); this.statValuesContainer.add(statLabel); - const statNumber = globalScene.add.sprite(statX + statLabel.width, statY, "pbinfo_stat_numbers", this.statOrder[i] !== Stat.HP ? "3" : "empty"); + const statNumber = globalScene.add.sprite( + statX + statLabel.width, + statY, + "pbinfo_stat_numbers", + this.statOrder[i] !== Stat.HP ? "3" : "empty", + ); statNumber.setName("icon_stat_number_" + i.toString()); statNumber.setOrigin(0, 0); this.statNumbers.push(statNumber); @@ -265,7 +273,6 @@ export default class BattleInfo extends Phaser.GameObjects.Container { statLabel.setVisible(false); statNumber.setVisible(false); } - }); if (!this.player) { @@ -275,17 +282,29 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.moveBelow(this.flyoutMenu, this.box); } - this.type1Icon = globalScene.add.sprite(player ? -139 : -15, player ? -17 : -15.5, `pbinfo_${player ? "player" : "enemy"}_type1`); + this.type1Icon = globalScene.add.sprite( + player ? -139 : -15, + player ? -17 : -15.5, + `pbinfo_${player ? "player" : "enemy"}_type1`, + ); this.type1Icon.setName("icon_type_1"); this.type1Icon.setOrigin(0, 0); this.add(this.type1Icon); - this.type2Icon = globalScene.add.sprite(player ? -139 : -15, player ? -1 : -2.5, `pbinfo_${player ? "player" : "enemy"}_type2`); + this.type2Icon = globalScene.add.sprite( + player ? -139 : -15, + player ? -1 : -2.5, + `pbinfo_${player ? "player" : "enemy"}_type2`, + ); this.type2Icon.setName("icon_type_2"); this.type2Icon.setOrigin(0, 0); this.add(this.type2Icon); - this.type3Icon = globalScene.add.sprite(player ? -154 : 0, player ? -17 : -15.5, `pbinfo_${player ? "player" : "enemy"}_type`); + this.type3Icon = globalScene.add.sprite( + player ? -154 : 0, + player ? -17 : -15.5, + `pbinfo_${player ? "player" : "enemy"}_type`, + ); this.type3Icon.setName("icon_type_3"); this.type3Icon.setOrigin(0, 0); this.add(this.type3Icon); @@ -324,35 +343,63 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.lastTeraType = pokemon.getTeraType(); this.teraIcon.setPositionRelative(this.nameText, nameTextWidth + this.genderText.displayWidth + 1, 2); - this.teraIcon.setVisible(this.lastTeraType !== Type.UNKNOWN); + this.teraIcon.setVisible(pokemon.isTerastallized); this.teraIcon.on("pointerover", () => { - if (this.lastTeraType !== Type.UNKNOWN) { - globalScene.ui.showTooltip("", i18next.t("fightUiHandler:teraHover", { type: i18next.t(`pokemonInfo:Type.${Type[this.lastTeraType]}`) })); + if (pokemon.isTerastallized) { + globalScene.ui.showTooltip( + "", + i18next.t("fightUiHandler:teraHover", { + type: i18next.t(`pokemonInfo:Type.${PokemonType[this.lastTeraType]}`), + }), + ); } }); this.teraIcon.on("pointerout", () => globalScene.ui.hideTooltip()); const isFusion = pokemon.isFusion(); - this.splicedIcon.setPositionRelative(this.nameText, nameTextWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), 2.5); + this.splicedIcon.setPositionRelative( + this.nameText, + nameTextWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), + 2.5, + ); this.splicedIcon.setVisible(isFusion); if (this.splicedIcon.visible) { - this.splicedIcon.on("pointerover", () => globalScene.ui.showTooltip("", `${pokemon.species.getName(pokemon.formIndex)}/${pokemon.fusionSpecies?.getName(pokemon.fusionFormIndex)}`)); + this.splicedIcon.on("pointerover", () => + globalScene.ui.showTooltip( + "", + `${pokemon.species.getName(pokemon.formIndex)}/${pokemon.fusionSpecies?.getName(pokemon.fusionFormIndex)}`, + ), + ); this.splicedIcon.on("pointerout", () => globalScene.ui.hideTooltip()); } const doubleShiny = isFusion && pokemon.shiny && pokemon.fusionShiny; const baseVariant = !doubleShiny ? pokemon.getVariant() : pokemon.variant; - this.shinyIcon.setPositionRelative(this.nameText, nameTextWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), 2.5); + this.shinyIcon.setPositionRelative( + this.nameText, + nameTextWidth + + this.genderText.displayWidth + + 1 + + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), + 2.5, + ); this.shinyIcon.setTexture(`shiny_star${doubleShiny ? "_1" : ""}`); this.shinyIcon.setVisible(pokemon.isShiny()); this.shinyIcon.setTint(getVariantTint(baseVariant)); if (this.shinyIcon.visible) { - const shinyDescriptor = doubleShiny || baseVariant ? - `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}` - : ""; - this.shinyIcon.on("pointerover", () => globalScene.ui.showTooltip("", `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`)); + const shinyDescriptor = + doubleShiny || baseVariant + ? `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}` + : ""; + this.shinyIcon.on("pointerover", () => + globalScene.ui.showTooltip( + "", + `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, + ), + ); this.shinyIcon.on("pointerout", () => globalScene.ui.hideTooltip()); } @@ -364,7 +411,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container { if (!this.player) { if (this.nameText.visible) { - this.nameText.on("pointerover", () => globalScene.ui.showTooltip("", i18next.t("battleInfo:generation", { generation: i18next.t(`starterSelectUiHandler:gen${pokemon.species.generation}`) }))); + this.nameText.on("pointerover", () => + globalScene.ui.showTooltip( + "", + i18next.t("battleInfo:generation", { + generation: i18next.t(`starterSelectUiHandler:gen${pokemon.species.generation}`), + }), + ), + ); this.nameText.on("pointerout", () => globalScene.ui.hideTooltip()); } @@ -372,13 +426,16 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.ownedIcon.setVisible(!!dexEntry.caughtAttr); const opponentPokemonDexAttr = pokemon.getDexAttr(); if (globalScene.gameMode.isClassic) { - if (globalScene.gameData.starterData[pokemon.species.getRootSpeciesId()].classicWinCount > 0 && globalScene.gameData.starterData[pokemon.species.getRootSpeciesId(true)].classicWinCount > 0) { + if ( + globalScene.gameData.starterData[pokemon.species.getRootSpeciesId()].classicWinCount > 0 && + globalScene.gameData.starterData[pokemon.species.getRootSpeciesId(true)].classicWinCount > 0 + ) { this.championRibbon.setVisible(true); } } // Check if Player owns all genders and forms of the Pokemon - const missingDexAttrs = ((dexEntry.caughtAttr & opponentPokemonDexAttr) < opponentPokemonDexAttr); + const missingDexAttrs = (dexEntry.caughtAttr & opponentPokemonDexAttr) < opponentPokemonDexAttr; const ownedAbilityAttrs = globalScene.gameData.starterData[pokemon.species.getRootSpeciesId()].abilityAttr; @@ -410,14 +467,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container { const types = pokemon.getTypes(true); this.type1Icon.setTexture(`pbinfo_${this.player ? "player" : "enemy"}_type${types.length > 1 ? "1" : ""}`); - this.type1Icon.setFrame(Type[types[0]].toLowerCase()); + this.type1Icon.setFrame(PokemonType[types[0]].toLowerCase()); this.type2Icon.setVisible(types.length > 1); this.type3Icon.setVisible(types.length > 2); if (types.length > 1) { - this.type2Icon.setFrame(Type[types[1]].toLowerCase()); + this.type2Icon.setFrame(PokemonType[types[1]].toLowerCase()); } if (types.length > 2) { - this.type3Icon.setFrame(Type[types[2]].toLowerCase()); + this.type3Icon.setFrame(PokemonType[types[2]].toLowerCase()); } if (this.player) { @@ -453,10 +510,18 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.baseY = this.y; } - const offsetElements = [ this.nameText, this.genderText, this.teraIcon, this.splicedIcon, this.shinyIcon, this.statusIndicator, this.levelContainer ]; - offsetElements.forEach(el => el.y += 1.5 * (mini ? -1 : 1)); + const offsetElements = [ + this.nameText, + this.genderText, + this.teraIcon, + this.splicedIcon, + this.shinyIcon, + this.statusIndicator, + this.levelContainer, + ]; + offsetElements.forEach(el => (el.y += 1.5 * (mini ? -1 : 1))); - [ this.type1Icon, this.type2Icon, this.type3Icon ].forEach(el => { + [this.type1Icon, this.type2Icon, this.type3Icon].forEach(el => { el.x += 4 * (mini ? 1 : -1); el.y += -8 * (mini ? 1 : -1); }); @@ -464,7 +529,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.statValuesContainer.x += 2 * (mini ? 1 : -1); this.statValuesContainer.y += -7 * (mini ? 1 : -1); - const toggledElements = [ this.hpNumbersContainer, this.expBar ]; + const toggledElements = [this.hpNumbersContainer, this.expBar]; toggledElements.forEach(el => el.setVisible(!mini)); } @@ -473,7 +538,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { targets: this.statsContainer, duration: Utils.fixedInt(125), ease: "Sine.easeInOut", - alpha: visible ? 1 : 0 + alpha: visible ? 1 : 0, }); } @@ -483,7 +548,18 @@ export default class BattleInfo extends Phaser.GameObjects.Container { if (boss !== this.boss) { this.boss = boss; - [ this.nameText, this.genderText, this.teraIcon, this.splicedIcon, this.shinyIcon, this.ownedIcon, this.championRibbon, this.statusIndicator, this.levelContainer, this.statValuesContainer ].map(e => e.x += 48 * (boss ? -1 : 1)); + [ + this.nameText, + this.genderText, + this.teraIcon, + this.splicedIcon, + this.shinyIcon, + this.ownedIcon, + this.championRibbon, + this.statusIndicator, + this.levelContainer, + this.statValuesContainer, + ].map(e => (e.x += 48 * (boss ? -1 : 1))); this.hpBar.x += 38 * (boss ? -1 : 1); this.hpBar.y += 2 * (this.boss ? -1 : 1); this.hpBar.setTexture(`overlay_hp${boss ? "_boss" : ""}`); @@ -504,8 +580,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container { const uiTheme = globalScene.uiTheme; const maxHp = pokemon.getMaxHp(); for (let s = 1; s < this.bossSegments; s++) { - const dividerX = (Math.round((maxHp / this.bossSegments) * s) / maxHp) * this.hpBar.width; - const divider = globalScene.add.rectangle(0, 0, 1, this.hpBar.height - (uiTheme ? 0 : 1), pokemon.bossSegmentIndex >= s ? 0xFFFFFF : 0x404040); + const dividerX = (Math.round((maxHp / this.bossSegments) * s) / maxHp) * this.hpBar.width; + const divider = globalScene.add.rectangle( + 0, + 0, + 1, + this.hpBar.height - (uiTheme ? 0 : 1), + pokemon.bossSegmentIndex >= s ? 0xffffff : 0x404040, + ); divider.setOrigin(0.5, 0); divider.setName("hpBar_divider_" + s.toString()); this.add(divider); @@ -542,12 +624,16 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.genderText.setPositionRelative(this.nameText, this.nameText.displayWidth, 0); } - const teraType = pokemon.getTeraType(); + const teraType = pokemon.isTerastallized ? pokemon.getTeraType() : PokemonType.UNKNOWN; const teraTypeUpdated = this.lastTeraType !== teraType; if (teraTypeUpdated) { - this.teraIcon.setVisible(teraType !== Type.UNKNOWN); - this.teraIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1, 2); + this.teraIcon.setVisible(teraType !== PokemonType.UNKNOWN); + this.teraIcon.setPositionRelative( + this.nameText, + this.nameText.displayWidth + this.genderText.displayWidth + 1, + 2, + ); this.teraIcon.setTintFill(Phaser.Display.Color.GetColor(...getTypeRgb(teraType))); this.lastTeraType = teraType; } @@ -555,9 +641,28 @@ export default class BattleInfo extends Phaser.GameObjects.Container { if (nameUpdated || teraTypeUpdated) { this.splicedIcon.setVisible(!!pokemon.fusionSpecies); - this.teraIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1, 2); - this.splicedIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), 1.5); - this.shinyIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), 2.5); + this.teraIcon.setPositionRelative( + this.nameText, + this.nameText.displayWidth + this.genderText.displayWidth + 1, + 2, + ); + this.splicedIcon.setPositionRelative( + this.nameText, + this.nameText.displayWidth + + this.genderText.displayWidth + + 1 + + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), + 1.5, + ); + this.shinyIcon.setPositionRelative( + this.nameText, + this.nameText.displayWidth + + this.genderText.displayWidth + + 1 + + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), + 2.5, + ); } if (this.lastStatus !== (pokemon.status?.effect || StatusEffect.NONE)) { @@ -575,14 +680,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container { const types = pokemon.getTypes(true); this.type1Icon.setTexture(`pbinfo_${this.player ? "player" : "enemy"}_type${types.length > 1 ? "1" : ""}`); - this.type1Icon.setFrame(Type[types[0]].toLowerCase()); + this.type1Icon.setFrame(PokemonType[types[0]].toLowerCase()); this.type2Icon.setVisible(types.length > 1); this.type3Icon.setVisible(types.length > 2); if (types.length > 1) { - this.type2Icon.setFrame(Type[types[1]].toLowerCase()); + this.type2Icon.setFrame(PokemonType[types[1]].toLowerCase()); } if (types.length > 2) { - this.type3Icon.setFrame(Type[types[2]].toLowerCase()); + this.type3Icon.setFrame(PokemonType[types[2]].toLowerCase()); } const updateHpFrame = () => { @@ -594,7 +699,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { }; const updatePokemonHp = () => { - let duration = !instant ? Phaser.Math.Clamp(Math.abs((this.lastHp) - pokemon.hp) * 5, 250, 5000) : 0; + let duration = !instant ? Phaser.Math.Clamp(Math.abs(this.lastHp - pokemon.hp) * 5, 250, 5000) : 0; const speed = globalScene.hpBarSpeed; if (speed) { duration = speed >= 3 ? 0 : duration / Math.pow(2, speed); @@ -616,7 +721,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { onComplete: () => { updateHpFrame(); resolve(); - } + }, }); if (!this.player) { this.lastHp = pokemon.hp; @@ -627,9 +732,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container { if (this.player) { const isLevelCapped = pokemon.level >= globalScene.getMaxExpLevel(); - if ((this.lastExp !== pokemon.exp || this.lastLevel !== pokemon.level)) { + if (this.lastExp !== pokemon.exp || this.lastLevel !== pokemon.level) { const originalResolve = resolve; - const durationMultipler = Math.max(Phaser.Tweens.Builders.GetEaseFunction("Cubic.easeIn")(1 - (Math.min(pokemon.level - this.lastLevel, 10) / 10)), 0.1); + const durationMultipler = Math.max( + Phaser.Tweens.Builders.GetEaseFunction("Cubic.easeIn")( + 1 - Math.min(pokemon.level - this.lastLevel, 10) / 10, + ), + 0.1, + ); resolve = () => this.updatePokemonExp(pokemon, false, durationMultipler).then(() => originalResolve()); } else if (isLevelCapped !== this.lastLevelCapped) { this.setLevel(pokemon.level); @@ -640,7 +750,8 @@ export default class BattleInfo extends Phaser.GameObjects.Container { if (this.lastHp !== pokemon.hp || this.lastMaxHp !== pokemon.getMaxHp()) { return updatePokemonHp(); - } else if (!this.player && this.lastLevel !== pokemon.level) { + } + if (!this.player && this.lastLevel !== pokemon.level) { this.setLevel(pokemon.level); this.lastLevel = pokemon.level; } @@ -666,7 +777,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container { const nameSizeTest = addTextObject(0, 0, displayName, TextStyle.BATTLE_INFO); nameTextWidth = nameSizeTest.displayWidth; - while (nameTextWidth > (this.player || !this.boss ? 60 : 98) - ((pokemon.gender !== Gender.GENDERLESS ? 6 : 0) + (pokemon.fusionSpecies ? 8 : 0) + (pokemon.isShiny() ? 8 : 0) + (Math.min(pokemon.level.toString().length, 3) - 3) * 8)) { + while ( + nameTextWidth > + (this.player || !this.boss ? 60 : 98) - + ((pokemon.gender !== Gender.GENDERLESS ? 6 : 0) + + (pokemon.fusionSpecies ? 8 : 0) + + (pokemon.isShiny() ? 8 : 0) + + (Math.min(pokemon.level.toString().length, 3) - 3) * 8) + ) { displayName = `${displayName.slice(0, displayName.endsWith(".") ? -2 : -1).trimEnd()}.`; nameSizeTest.setText(displayName); nameTextWidth = nameSizeTest.displayWidth; @@ -678,11 +796,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.lastName = pokemon.getNameToRender(); if (this.nameText.visible) { - this.nameText.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.nameText.width, this.nameText.height), Phaser.Geom.Rectangle.Contains); + this.nameText.setInteractive( + new Phaser.Geom.Rectangle(0, 0, this.nameText.width, this.nameText.height), + Phaser.Geom.Rectangle.Contains, + ); } } - updatePokemonExp(pokemon: Pokemon, instant?: boolean, levelDurationMultiplier: number = 1): Promise { + updatePokemonExp(pokemon: Pokemon, instant?: boolean, levelDurationMultiplier = 1): Promise { return new Promise(resolve => { const levelUp = this.lastLevel < pokemon.level; const relLevelExp = getLevelRelExp(this.lastLevel + 1, pokemon.species.growthRate); @@ -696,8 +817,16 @@ export default class BattleInfo extends Phaser.GameObjects.Container { } instant = true; } - const durationMultiplier = Phaser.Tweens.Builders.GetEaseFunction("Sine.easeIn")(1 - (Math.max(this.lastLevel - 100, 0) / 150)); - let duration = this.visible && !instant ? (((levelExp - this.lastLevelExp) / relLevelExp) * BattleInfo.EXP_GAINS_DURATION_BASE) * durationMultiplier * levelDurationMultiplier : 0; + const durationMultiplier = Phaser.Tweens.Builders.GetEaseFunction("Sine.easeIn")( + 1 - Math.max(this.lastLevel - 100, 0) / 150, + ); + let duration = + this.visible && !instant + ? ((levelExp - this.lastLevelExp) / relLevelExp) * + BattleInfo.EXP_GAINS_DURATION_BASE * + durationMultiplier * + levelDurationMultiplier + : 0; const speed = globalScene.expGainsSpeed; if (speed && speed >= ExpGainsSpeed.DEFAULT) { duration = speed >= ExpGainsSpeed.SKIP ? ExpGainsSpeed.DEFAULT : duration / Math.pow(2, speed); @@ -734,22 +863,24 @@ export default class BattleInfo extends Phaser.GameObjects.Container { return; } resolve(); - } + }, }); }); } - setLevel(level: integer): void { + setLevel(level: number): void { const isCapped = level >= globalScene.getMaxExpLevel(); this.levelNumbersContainer.removeAll(true); const levelStr = level.toString(); for (let i = 0; i < levelStr.length; i++) { - this.levelNumbersContainer.add(globalScene.add.image(i * 8, 0, `numbers${isCapped && this.player ? "_red" : ""}`, levelStr[i])); + this.levelNumbersContainer.add( + globalScene.add.image(i * 8, 0, `numbers${isCapped && this.player ? "_red" : ""}`, levelStr[i]), + ); } this.levelContainer.setX((this.player ? -41 : -50) - 8 * Math.max(levelStr.length - 3, 0)); } - setHpNumbers(hp: integer, maxHp: integer): void { + setHpNumbers(hp: number, maxHp: number): void { if (!this.player || !globalScene) { return; } @@ -766,7 +897,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { } } - updateStats(stats: integer[]): void { + updateStats(stats: number[]): void { this.statOrder.map((s, i) => { if (s !== Stat.HP) { this.statNumbers[i].setFrame(stats[s - 1].toString()); @@ -827,5 +958,5 @@ export class EnemyBattleInfo extends BattleInfo { super(140, -141, false); } - setMini(mini: boolean): void { } // Always mini + setMini(_mini: boolean): void {} // Always mini } diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts index 2c0998b79ab..ccb9378c688 100644 --- a/src/ui/battle-message-ui-handler.ts +++ b/src/ui/battle-message-ui-handler.ts @@ -6,7 +6,6 @@ import { addWindow } from "./ui-theme"; import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { Button } from "#enums/buttons"; import i18next from "i18next"; -import type { Stat } from "#app/enums/stat"; import { PERMANENT_STATS, getStatKey } from "#app/enums/stat"; export default class BattleMessageUiHandler extends MessageUiHandler { @@ -56,7 +55,7 @@ export default class BattleMessageUiHandler extends MessageUiHandler { moveDetailsWindow.setName("move-details-window"); moveDetailsWindow.setOrigin(0, 1); - this.movesWindowContainer.add([ movesWindow, moveDetailsWindow ]); + this.movesWindowContainer.add([movesWindow, moveDetailsWindow]); ui.add(this.movesWindowContainer); const messageContainer = globalScene.add.container(12, -39); @@ -65,8 +64,8 @@ export default class BattleMessageUiHandler extends MessageUiHandler { const message = addTextObject(0, 0, "", TextStyle.MESSAGE, { maxLines: 2, wordWrap: { - width: this.wordWrapWidth - } + width: this.wordWrapWidth, + }, }); messageContainer.add(message); @@ -78,7 +77,9 @@ export default class BattleMessageUiHandler extends MessageUiHandler { this.nameBox = globalScene.add.nineslice(0, 0, "namebox", globalScene.windowType, 72, 16, 8, 8, 5, 5); this.nameBox.setOrigin(0, 0); - this.nameText = addTextObject(8, 0, "Rival", TextStyle.MESSAGE, { maxLines: 1 }); + this.nameText = addTextObject(8, 0, "Rival", TextStyle.MESSAGE, { + maxLines: 1, + }); this.nameBoxContainer.add(this.nameBox); this.nameBoxContainer.add(this.nameText); @@ -92,7 +93,9 @@ export default class BattleMessageUiHandler extends MessageUiHandler { this.levelUpStatsContainer = levelUpStatsContainer; - const levelUpStatsLabelsContent = addTextObject((globalScene.game.canvas.width / 6) - 73, -94, "", TextStyle.WINDOW, { maxLines: 6 }); + const levelUpStatsLabelsContent = addTextObject(globalScene.game.canvas.width / 6 - 73, -94, "", TextStyle.WINDOW, { + maxLines: 6, + }); levelUpStatsLabelsContent.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5); let levelUpStatsLabelText = ""; @@ -102,19 +105,36 @@ export default class BattleMessageUiHandler extends MessageUiHandler { levelUpStatsLabelsContent.text = levelUpStatsLabelText; levelUpStatsLabelsContent.x -= levelUpStatsLabelsContent.displayWidth; - const levelUpStatsBg = addWindow((globalScene.game.canvas.width / 6), -100, 80 + levelUpStatsLabelsContent.displayWidth, 100); + const levelUpStatsBg = addWindow( + globalScene.game.canvas.width / 6, + -100, + 80 + levelUpStatsLabelsContent.displayWidth, + 100, + ); levelUpStatsBg.setOrigin(1, 0); levelUpStatsContainer.add(levelUpStatsBg); levelUpStatsContainer.add(levelUpStatsLabelsContent); - const levelUpStatsIncrContent = addTextObject((globalScene.game.canvas.width / 6) - 50, -94, "+\n+\n+\n+\n+\n+", TextStyle.WINDOW, { maxLines: 6 }); + const levelUpStatsIncrContent = addTextObject( + globalScene.game.canvas.width / 6 - 50, + -94, + "+\n+\n+\n+\n+\n+", + TextStyle.WINDOW, + { maxLines: 6 }, + ); levelUpStatsIncrContent.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5); levelUpStatsContainer.add(levelUpStatsIncrContent); this.levelUpStatsIncrContent = levelUpStatsIncrContent; - const levelUpStatsValuesContent = addBBCodeTextObject((globalScene.game.canvas.width / 6) - 7, -94, "", TextStyle.WINDOW, { maxLines: 6, lineSpacing: 5 }); + const levelUpStatsValuesContent = addBBCodeTextObject( + globalScene.game.canvas.width / 6 - 7, + -94, + "", + TextStyle.WINDOW, + { maxLines: 6, lineSpacing: 5 }, + ); levelUpStatsValuesContent.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5); levelUpStatsValuesContent.setOrigin(1, 0); levelUpStatsValuesContent.setAlign("right"); @@ -154,19 +174,34 @@ export default class BattleMessageUiHandler extends MessageUiHandler { super.clear(); } - showText(text: string, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null) { + showText( + text: string, + delay?: number | null, + callback?: Function | null, + callbackDelay?: number | null, + prompt?: boolean | null, + promptDelay?: number | null, + ) { this.hideNameText(); super.showText(text, delay, callback, callbackDelay, prompt, promptDelay); } - showDialogue(text: string, name?: string, delay?: integer | null, callback?: Function, callbackDelay?: integer, prompt?: boolean, promptDelay?: integer) { + showDialogue( + text: string, + name?: string, + delay?: number | null, + callback?: Function, + callbackDelay?: number, + prompt?: boolean, + promptDelay?: number, + ) { if (name) { this.showNameText(name); } super.showDialogue(text, name, delay, callback, callbackDelay, prompt, promptDelay); } - promptLevelUpStats(partyMemberIndex: integer, prevStats: integer[], showTotals: boolean): Promise { + promptLevelUpStats(partyMemberIndex: number, prevStats: number[], showTotals: boolean): Promise { return new Promise(resolve => { if (!globalScene.showLevelUpStats) { return resolve(); @@ -183,21 +218,19 @@ export default class BattleMessageUiHandler extends MessageUiHandler { this.onActionInput = () => { if (!showTotals) { return this.promptLevelUpStats(partyMemberIndex, [], true).then(() => resolve()); - } else { - this.levelUpStatsContainer.setVisible(false); - resolve(); } + this.levelUpStatsContainer.setVisible(false); + resolve(); }; }); } - promptIvs(pokemonId: integer, ivs: integer[], shownIvsCount: integer): Promise { + promptIvs(pokemonId: number, ivs: number[]): Promise { return new Promise(resolve => { globalScene.executeWithSeedOffset(() => { let levelUpStatsValuesText = ""; - const shownStats = this.getTopIvs(ivs, shownIvsCount); for (const s of PERMANENT_STATS) { - levelUpStatsValuesText += `${shownStats.includes(s) ? this.getIvDescriptor(ivs[s], s, pokemonId) : "???"}\n`; + levelUpStatsValuesText += `${this.getIvDescriptor(ivs[s], s, pokemonId)}\n`; } this.levelUpStatsValuesContent.text = levelUpStatsValuesText; this.levelUpStatsIncrContent.setVisible(false); @@ -211,22 +244,7 @@ export default class BattleMessageUiHandler extends MessageUiHandler { }); } - getTopIvs(ivs: integer[], shownIvsCount: integer): Stat[] { - let shownStats: Stat[] = []; - if (shownIvsCount < 6) { - const statsPool = PERMANENT_STATS.slice(); - // Sort the stats from highest to lowest iv - statsPool.sort((s1, s2) => ivs[s2] - ivs[s1]); - for (let i = 0; i < shownIvsCount; i++) { - shownStats.push(statsPool[i]); - } - } else { - shownStats = PERMANENT_STATS.slice(); - } - return shownStats; - } - - getIvDescriptor(value: integer, typeIv: integer, pokemonId: integer): string { + getIvDescriptor(value: number, typeIv: number, pokemonId: number): string { const starterSpecies = globalScene.getPokemonById(pokemonId)!.species.getRootSpeciesId(); // we are using getRootSpeciesId() here because we want to check against the baby form, not the mid form if it exists const starterIvs: number[] = globalScene.gameData.dexData[starterSpecies].ivs; const uiTheme = globalScene.uiTheme; // Assuming uiTheme is accessible diff --git a/src/ui/bgm-bar.ts b/src/ui/bgm-bar.ts index 0cd3da71248..45ed766c7fa 100644 --- a/src/ui/bgm-bar.ts +++ b/src/ui/bgm-bar.ts @@ -24,7 +24,18 @@ export default class BgmBar extends Phaser.GameObjects.Container { this.defaultWidth = 230; this.defaultHeight = 100; - this.bg = globalScene.add.nineslice(-5, -5, "bgm_bar", undefined, this.defaultWidth, this.defaultHeight, 0, 0, 10, 10); + this.bg = globalScene.add.nineslice( + -5, + -5, + "bgm_bar", + undefined, + this.defaultWidth, + this.defaultHeight, + 0, + 0, + 10, + 10, + ); this.bg.setOrigin(0, 0); this.add(this.bg); @@ -40,8 +51,8 @@ export default class BgmBar extends Phaser.GameObjects.Container { } /* - * Set the BGM Name to the BGM bar. - * @param {string} bgmName The name of the BGM to set. + * Set the BGM Name to the BGM bar. + * @param {string} bgmName The name of the BGM to set. */ setBgmToBgmBar(bgmName: string): void { this.musicText.setText(`${i18next.t("bgmName:music")}${this.getRealBgmName(bgmName)}`); @@ -83,11 +94,13 @@ export default class BgmBar extends Phaser.GameObjects.Container { ease: "Sine.easeInOut", onComplete: () => { this.setVisible(true); - } + }, }); } getRealBgmName(bgmName: string): string { - return i18next.t([ `bgmName:${bgmName}`, "bgmName:missing_entries" ], { name: Utils.formatText(bgmName) }); + return i18next.t([`bgmName:${bgmName}`, "bgmName:missing_entries"], { + name: Utils.formatText(bgmName), + }); } } diff --git a/src/ui/candy-bar.ts b/src/ui/candy-bar.ts index 81478f6fa7c..ba85ed7fef3 100644 --- a/src/ui/candy-bar.ts +++ b/src/ui/candy-bar.ts @@ -18,7 +18,7 @@ export default class CandyBar extends Phaser.GameObjects.Container { public shown: boolean; constructor() { - super(globalScene, (globalScene.game.canvas.width / 6), -((globalScene.game.canvas.height) / 6) + 15); + super(globalScene, globalScene.game.canvas.width / 6, -(globalScene.game.canvas.height / 6) + 15); } setup(): void { @@ -47,14 +47,15 @@ export default class CandyBar extends Phaser.GameObjects.Container { this.shown = false; } - showStarterSpeciesCandy(starterSpeciesId: Species, count: integer): Promise { + showStarterSpeciesCandy(starterSpeciesId: Species, count: number): Promise { return new Promise(resolve => { if (this.shown) { if (this.speciesId === starterSpeciesId) { return resolve(); - } else { - return this.hide().then(() => this.showStarterSpeciesCandy(starterSpeciesId, count)).then(() => resolve()); } + return this.hide() + .then(() => this.showStarterSpeciesCandy(starterSpeciesId, count)) + .then(() => resolve()); } const colorScheme = starterColors[starterSpeciesId]; @@ -62,7 +63,9 @@ export default class CandyBar extends Phaser.GameObjects.Container { this.candyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0]))); this.candyOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1]))); - this.countText.setText(`${globalScene.gameData.starterData[starterSpeciesId].candyCount + count} (+${count.toString()})`); + this.countText.setText( + `${globalScene.gameData.starterData[starterSpeciesId].candyCount + count} (+${count.toString()})`, + ); this.bg.width = this.countText.displayWidth + 28; @@ -76,14 +79,14 @@ export default class CandyBar extends Phaser.GameObjects.Container { this.tween = globalScene.tweens.add({ targets: this, - x: (globalScene.game.canvas.width / 6) - (this.bg.width - 5), + x: globalScene.game.canvas.width / 6 - (this.bg.width - 5), duration: 500, ease: "Sine.easeOut", onComplete: () => { this.tween = null; this.resetAutoHideTimer(); resolve(); - } + }, }); this.setVisible(true); @@ -107,7 +110,7 @@ export default class CandyBar extends Phaser.GameObjects.Container { this.tween = globalScene.tweens.add({ targets: this, - x: (globalScene.game.canvas.width / 6), + x: globalScene.game.canvas.width / 6, duration: 500, ease: "Sine.easeIn", onComplete: () => { @@ -115,7 +118,7 @@ export default class CandyBar extends Phaser.GameObjects.Container { this.shown = false; this.setVisible(false); resolve(); - } + }, }); }); } diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/challenges-select-ui-handler.ts index 9c13d54bf55..61989cd594e 100644 --- a/src/ui/challenges-select-ui-handler.ts +++ b/src/ui/challenges-select-ui-handler.ts @@ -20,7 +20,7 @@ export default class GameChallengesUiHandler extends UiHandler { private challengesContainer: Phaser.GameObjects.Container; private valuesContainer: Phaser.GameObjects.Container; - private scrollCursor: integer; + private scrollCursor: number; private optionsBg: Phaser.GameObjects.NineSlice; @@ -28,7 +28,12 @@ export default class GameChallengesUiHandler extends UiHandler { private descriptionText: BBCodeText; - private challengeLabels: Array<{ label: Phaser.GameObjects.Text, value: Phaser.GameObjects.Text, leftArrow: Phaser.GameObjects.Image, rightArrow: Phaser.GameObjects.Image }>; + private challengeLabels: Array<{ + label: Phaser.GameObjects.Text; + value: Phaser.GameObjects.Text; + leftArrow: Phaser.GameObjects.Image; + rightArrow: Phaser.GameObjects.Image; + }>; private monoTypeValue: Phaser.GameObjects.Sprite; private cursorObj: Phaser.GameObjects.NineSlice | null; @@ -57,15 +62,25 @@ export default class GameChallengesUiHandler extends UiHandler { this.challengesContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1); this.challengesContainer.setName("challenges"); - this.challengesContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains); + this.challengesContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), + Phaser.Geom.Rectangle.Contains, + ); - const bgOverlay = globalScene.add.rectangle(-1, -1, globalScene.scaledCanvas.width, globalScene.scaledCanvas.height, 0x424242, 0.8); + const bgOverlay = globalScene.add.rectangle( + -1, + -1, + globalScene.scaledCanvas.width, + globalScene.scaledCanvas.height, + 0x424242, + 0.8, + ); bgOverlay.setName("rect-challenge-overlay"); bgOverlay.setOrigin(0, 0); this.challengesContainer.add(bgOverlay); // TODO: Change this back to /9 when adding in difficulty - const headerBg = addWindow(0, 0, (globalScene.game.canvas.width / 6), 24); + const headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6, 24); headerBg.setName("window-header-bg"); headerBg.setOrigin(0, 0); @@ -75,11 +90,21 @@ export default class GameChallengesUiHandler extends UiHandler { headerText.setPositionRelative(headerBg, 8, 4); this.optionsWidth = globalScene.scaledCanvas.width * 0.6; - this.optionsBg = addWindow(0, headerBg.height, this.optionsWidth, globalScene.scaledCanvas.height - headerBg.height - 2); + this.optionsBg = addWindow( + 0, + headerBg.height, + this.optionsWidth, + globalScene.scaledCanvas.height - headerBg.height - 2, + ); this.optionsBg.setName("window-options-bg"); this.optionsBg.setOrigin(0, 0); - const descriptionBg = addWindow(0, headerBg.height, globalScene.scaledCanvas.width - this.optionsWidth, globalScene.scaledCanvas.height - headerBg.height - 26); + const descriptionBg = addWindow( + 0, + headerBg.height, + globalScene.scaledCanvas.width - this.optionsWidth, + globalScene.scaledCanvas.height - headerBg.height - 26, + ); descriptionBg.setName("window-desc-bg"); descriptionBg.setOrigin(0, 0); descriptionBg.setPositionRelative(this.optionsBg, this.optionsBg.width, 0); @@ -89,12 +114,12 @@ export default class GameChallengesUiHandler extends UiHandler { fontSize: 84, color: Color.ORANGE, padding: { - bottom: 6 + bottom: 6, }, wrap: { mode: "word", width: (descriptionBg.width - 12) * 6, - } + }, }); this.descriptionText.setName("text-desc"); globalScene.add.existing(this.descriptionText); @@ -112,7 +137,18 @@ export default class GameChallengesUiHandler extends UiHandler { this.startText.setOrigin(0, 0); this.startText.setPositionRelative(this.startBg, (this.startBg.width - this.startText.displayWidth) / 2, 4); - this.startCursor = globalScene.add.nineslice(0, 0, "summary_moves_cursor", undefined, descriptionBg.width - 8, 16, 1, 1, 1, 1); + this.startCursor = globalScene.add.nineslice( + 0, + 0, + "summary_moves_cursor", + undefined, + descriptionBg.width - 8, + 16, + 1, + 1, + 1, + 1, + ); this.startCursor.setName("9s-start-cursor"); this.startCursor.setOrigin(0, 0); this.startCursor.setPositionRelative(this.startBg, 4, 3); @@ -153,7 +189,7 @@ export default class GameChallengesUiHandler extends UiHandler { label: label, value: value, leftArrow: leftArrow, - rightArrow: rightArrow + rightArrow: rightArrow, }; } @@ -208,7 +244,8 @@ export default class GameChallengesUiHandler extends UiHandler { const tempText = addTextObject(0, 0, "", TextStyle.SETTINGS_LABEL); // this is added here to get the widest text object for this language, which will be used for the arrow placement - for (let j = 0; j <= globalScene.gameMode.challenges[i].maxValue; j++) { // this goes through each challenge's value to find out what the max width will be + for (let j = 0; j <= globalScene.gameMode.challenges[i].maxValue; j++) { + // this goes through each challenge's value to find out what the max width will be if (globalScene.gameMode.challenges[i].id !== Challenges.SINGLE_TYPE) { tempText.setText(globalScene.gameMode.challenges[i].getValue(j)); if (tempText.displayWidth > this.widestTextBox) { @@ -234,17 +271,28 @@ export default class GameChallengesUiHandler extends UiHandler { challengeLabel.label.setText(challenge.getName()); challengeLabel.leftArrow.setPositionRelative(challengeLabel.label, this.leftArrowGap, 4.5); challengeLabel.leftArrow.setVisible(challenge.value !== 0); - challengeLabel.rightArrow.setPositionRelative(challengeLabel.leftArrow, Math.max(this.monoTypeValue.width, this.widestTextBox) + challengeLabel.leftArrow.displayWidth + 2 * this.arrowSpacing, 0); + challengeLabel.rightArrow.setPositionRelative( + challengeLabel.leftArrow, + Math.max(this.monoTypeValue.width, this.widestTextBox) + + challengeLabel.leftArrow.displayWidth + + 2 * this.arrowSpacing, + 0, + ); challengeLabel.rightArrow.setVisible(challenge.value !== challenge.maxValue); // this check looks to make sure that the arrows and value textbox don't take up too much space that they'll clip the right edge of the options background - if (challengeLabel.rightArrow.x + challengeLabel.rightArrow.width + this.optionsBg.rightWidth + this.arrowSpacing > this.optionsWidth) { + if ( + challengeLabel.rightArrow.x + challengeLabel.rightArrow.width + this.optionsBg.rightWidth + this.arrowSpacing > + this.optionsWidth + ) { // if we go out of bounds of the box, set the x position as far right as we can without going past the box, with this.arrowSpacing to allow a small gap between the arrow and border challengeLabel.rightArrow.setX(this.optionsWidth - this.arrowSpacing - this.optionsBg.rightWidth); } // this line of code gets the center point between the left and right arrows from their left side (Arrow.x gives middle point), taking into account the width of the arrows - const xLocation = Math.round((challengeLabel.leftArrow.x + challengeLabel.rightArrow.x + challengeLabel.leftArrow.displayWidth) / 2); + const xLocation = Math.round( + (challengeLabel.leftArrow.x + challengeLabel.rightArrow.x + challengeLabel.leftArrow.displayWidth) / 2, + ); if (challenge.id === Challenges.SINGLE_TYPE) { this.monoTypeValue.setX(xLocation); this.monoTypeValue.setY(challengeLabel.label.y + 8); @@ -266,12 +314,10 @@ export default class GameChallengesUiHandler extends UiHandler { // This checks if a challenge has been selected by the user and updates the text/its opacity accordingly. this.hasSelectedChallenge = globalScene.gameMode.challenges.some(c => c.value !== 0); if (this.hasSelectedChallenge) { - this.startText.setText(i18next.t("common:start")); this.startText.setAlpha(1); this.startText.setPositionRelative(this.startBg, (this.startBg.width - this.startText.displayWidth) / 2, 4); } else { - this.startText.setText(i18next.t("challenges:noneSelected")); this.startText.setAlpha(0.5); this.startText.setPositionRelative(this.startBg, (this.startBg.width - this.startText.displayWidth) / 2, 4); @@ -362,14 +408,16 @@ export default class GameChallengesUiHandler extends UiHandler { case Button.UP: if (this.cursor === 0) { if (this.scrollCursor === 0) { - // When at the top of the menu and pressing UP, move to the bottommost item. - if (globalScene.gameMode.challenges.length > rowsToDisplay) { // If there are more than 9 challenges, scroll to the bottom - // First, set the cursor to the last visible element, preparing for the scroll to the end. + // When at the top of the menu and pressing UP, move to the bottommost item. + if (globalScene.gameMode.challenges.length > rowsToDisplay) { + // If there are more than 9 challenges, scroll to the bottom + // First, set the cursor to the last visible element, preparing for the scroll to the end. const successA = this.setCursor(rowsToDisplay - 1); // Then, adjust the scroll to display the bottommost elements of the menu. const successB = this.setScrollCursor(globalScene.gameMode.challenges.length - rowsToDisplay); success = successA && successB; // success is just there to play the little validation sound effect - } else { // If there are 9 or less challenges, just move to the bottom one + } else { + // If there are 9 or less challenges, just move to the bottom one success = this.setCursor(globalScene.gameMode.challenges.length - 1); } } else { @@ -385,18 +433,21 @@ export default class GameChallengesUiHandler extends UiHandler { case Button.DOWN: if (this.cursor === rowsToDisplay - 1) { if (this.scrollCursor < globalScene.gameMode.challenges.length - rowsToDisplay) { - // When at the bottom and pressing DOWN, scroll if possible. + // When at the bottom and pressing DOWN, scroll if possible. success = this.setScrollCursor(this.scrollCursor + 1); } else { - // When at the bottom of a scrolling menu and pressing DOWN, move to the topmost item. - // First, set the cursor to the first visible element, preparing for the scroll to the top. + // When at the bottom of a scrolling menu and pressing DOWN, move to the topmost item. + // First, set the cursor to the first visible element, preparing for the scroll to the top. const successA = this.setCursor(0); // Then, adjust the scroll to display the topmost elements of the menu. const successB = this.setScrollCursor(0); success = successA && successB; // success is just there to play the little validation sound effect } - } else if (globalScene.gameMode.challenges.length < rowsToDisplay && this.cursor === globalScene.gameMode.challenges.length - 1) { - // When at the bottom of a non-scrolling menu and pressing DOWN, move to the topmost item. + } else if ( + globalScene.gameMode.challenges.length < rowsToDisplay && + this.cursor === globalScene.gameMode.challenges.length - 1 + ) { + // When at the bottom of a non-scrolling menu and pressing DOWN, move to the topmost item. success = this.setCursor(0); } else { success = this.setCursor(this.cursor + 1); @@ -406,14 +457,14 @@ export default class GameChallengesUiHandler extends UiHandler { } break; case Button.LEFT: - // Moves the option cursor left, if possible. + // Moves the option cursor left, if possible. success = this.getActiveChallenge().decreaseValue(); if (success) { this.updateText(); } break; case Button.RIGHT: - // Moves the option cursor right, if possible. + // Moves the option cursor right, if possible. success = this.getActiveChallenge().increaseValue(); if (success) { this.updateText(); @@ -430,11 +481,22 @@ export default class GameChallengesUiHandler extends UiHandler { return success; } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { let ret = super.setCursor(cursor); if (!this.cursorObj) { - this.cursorObj = globalScene.add.nineslice(0, 0, "summary_moves_cursor", undefined, this.optionsWidth - 8, 16, 1, 1, 1, 1); + this.cursorObj = globalScene.add.nineslice( + 0, + 0, + "summary_moves_cursor", + undefined, + this.optionsWidth - 8, + 16, + 1, + 1, + 1, + 1, + ); this.cursorObj.setOrigin(0, 0); this.valuesContainer.add(this.cursorObj); } @@ -447,7 +509,7 @@ export default class GameChallengesUiHandler extends UiHandler { return ret; } - setScrollCursor(scrollCursor: integer): boolean { + setScrollCursor(scrollCursor: number): boolean { if (scrollCursor === this.scrollCursor) { return false; } diff --git a/src/ui/char-sprite.ts b/src/ui/char-sprite.ts index ccd97e2c8e4..74c021a65b8 100644 --- a/src/ui/char-sprite.ts +++ b/src/ui/char-sprite.ts @@ -10,11 +10,11 @@ export default class CharSprite extends Phaser.GameObjects.Container { public shown: boolean; constructor() { - super(globalScene, (globalScene.game.canvas.width / 6) + 32, -42); + super(globalScene, globalScene.game.canvas.width / 6 + 32, -42); } setup(): void { - [ this.sprite, this.transitionSprite ] = new Array(2).fill(null).map(() => { + [this.sprite, this.transitionSprite] = new Array(2).fill(null).map(() => { const ret = globalScene.add.sprite(0, 0, "", ""); ret.setOrigin(0.5, 1); this.add(ret); @@ -49,12 +49,12 @@ export default class CharSprite extends Phaser.GameObjects.Container { globalScene.tweens.add({ targets: this, - x: (globalScene.game.canvas.width / 6) - 102, + x: globalScene.game.canvas.width / 6 - 102, duration: 750, ease: "Cubic.easeOut", onComplete: () => { resolve(); - } + }, }); this.setVisible(globalScene.textures.get(key).key !== Utils.MissingTextureKey); @@ -81,7 +81,7 @@ export default class CharSprite extends Phaser.GameObjects.Container { this.sprite.setTexture(this.key, variant); this.transitionSprite.setVisible(false); resolve(); - } + }, }); this.variant = variant; }); @@ -95,7 +95,7 @@ export default class CharSprite extends Phaser.GameObjects.Container { globalScene.tweens.add({ targets: this, - x: (globalScene.game.canvas.width / 6) + 32, + x: globalScene.game.canvas.width / 6 + 32, duration: 750, ease: "Cubic.easeIn", onComplete: () => { @@ -103,7 +103,7 @@ export default class CharSprite extends Phaser.GameObjects.Container { this.setVisible(false); } resolve(); - } + }, }); this.shown = false; diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts index 32a3bb764a9..55937bb8b00 100644 --- a/src/ui/command-ui-handler.ts +++ b/src/ui/command-ui-handler.ts @@ -7,20 +7,27 @@ import { Button } from "#enums/buttons"; import { getPokemonNameWithAffix } from "#app/messages"; import { CommandPhase } from "#app/phases/command-phase"; import { globalScene } from "#app/global-scene"; +import { TerastallizeAccessModifier } from "#app/modifier/modifier"; +import { PokemonType } from "#enums/pokemon-type"; +import { getTypeRgb } from "#app/data/type"; +import { Species } from "#enums/species"; export enum Command { FIGHT = 0, BALL, POKEMON, - RUN + RUN, + TERA, } export default class CommandUiHandler extends UiHandler { private commandsContainer: Phaser.GameObjects.Container; private cursorObj: Phaser.GameObjects.Image | null; - protected fieldIndex: integer = 0; - protected cursor2: integer = 0; + private teraButton: Phaser.GameObjects.Sprite; + + protected fieldIndex = 0; + protected cursor2 = 0; constructor() { super(Mode.COMMAND); @@ -32,7 +39,7 @@ export default class CommandUiHandler extends UiHandler { i18next.t("commandUiHandler:fight"), i18next.t("commandUiHandler:ball"), i18next.t("commandUiHandler:pokemon"), - i18next.t("commandUiHandler:run") + i18next.t("commandUiHandler:run"), ]; this.commandsContainer = globalScene.add.container(217, -38.7); @@ -40,6 +47,18 @@ export default class CommandUiHandler extends UiHandler { this.commandsContainer.setVisible(false); ui.add(this.commandsContainer); + this.teraButton = globalScene.add.sprite(-32, 15, "button_tera"); + this.teraButton.setName("terrastallize-button"); + this.teraButton.setScale(1.3); + this.teraButton.setFrame("fire"); + this.teraButton.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + teraColor: getTypeRgb(PokemonType.FIRE), + isTerastallized: false, + }); + this.commandsContainer.add(this.teraButton); + for (let c = 0; c < commands.length; c++) { const commandText = addTextObject(c % 2 === 0 ? 0 : 55.8, c < 2 ? 0 : 16, commands[c], TextStyle.WINDOW); commandText.setName(commands[c]); @@ -50,7 +69,7 @@ export default class CommandUiHandler extends UiHandler { show(args: any[]): boolean { super.show(args); - this.fieldIndex = args.length ? args[0] as integer : 0; + this.fieldIndex = args.length ? (args[0] as number) : 0; this.commandsContainer.setVisible(true); @@ -62,12 +81,28 @@ export default class CommandUiHandler extends UiHandler { commandPhase = globalScene.getStandbyPhase() as CommandPhase; } + if (this.canTera()) { + this.teraButton.setVisible(true); + this.teraButton.setFrame(PokemonType[globalScene.getField()[this.fieldIndex].getTeraType()].toLowerCase()); + } else { + this.teraButton.setVisible(false); + if (this.cursor === Command.TERA) { + this.setCursor(Command.FIGHT); + } + } + this.toggleTeraButton(); + const messageHandler = this.getUi().getMessageHandler(); messageHandler.bg.setVisible(true); messageHandler.commandWindow.setVisible(true); messageHandler.movesWindowContainer.setVisible(false); - messageHandler.message.setWordWrapWidth(1110); - messageHandler.showText(i18next.t("commandUiHandler:actionMessage", { pokemonName: getPokemonNameWithAffix(commandPhase.getPokemon()) }), 0); + messageHandler.message.setWordWrapWidth(this.canTera() ? 910 : 1110); + messageHandler.showText( + i18next.t("commandUiHandler:actionMessage", { + pokemonName: getPokemonNameWithAffix(commandPhase.getPokemon()), + }), + 0, + ); if (this.getCursor() === Command.POKEMON) { this.setCursor(Command.FIGHT); } else { @@ -85,10 +120,9 @@ export default class CommandUiHandler extends UiHandler { const cursor = this.getCursor(); if (button === Button.CANCEL || button === Button.ACTION) { - if (button === Button.ACTION) { switch (cursor) { - // Fight + // Fight case Command.FIGHT: ui.setMode(Mode.FIGHT, (globalScene.getCurrentPhase() as CommandPhase).getFieldIndex()); success = true; @@ -100,7 +134,13 @@ export default class CommandUiHandler extends UiHandler { break; // Pokemon case Command.POKEMON: - ui.setMode(Mode.PARTY, PartyUiMode.SWITCH, (globalScene.getCurrentPhase() as CommandPhase).getPokemon().getFieldIndex(), null, PartyUiHandler.FilterNonFainted); + ui.setMode( + Mode.PARTY, + PartyUiMode.SWITCH, + (globalScene.getCurrentPhase() as CommandPhase).getPokemon().getFieldIndex(), + null, + PartyUiHandler.FilterNonFainted, + ); success = true; break; // Run @@ -108,6 +148,10 @@ export default class CommandUiHandler extends UiHandler { (globalScene.getCurrentPhase() as CommandPhase).handleCommand(Command.RUN, 0); success = true; break; + case Command.TERA: + ui.setMode(Mode.FIGHT, (globalScene.getCurrentPhase() as CommandPhase).getFieldIndex(), Command.TERA); + success = true; + break; } } else { (globalScene.getCurrentPhase() as CommandPhase).cancel(); @@ -115,23 +159,29 @@ export default class CommandUiHandler extends UiHandler { } else { switch (button) { case Button.UP: - if (cursor >= 2) { + if (cursor === Command.POKEMON || cursor === Command.RUN) { success = this.setCursor(cursor - 2); } break; case Button.DOWN: - if (cursor < 2) { + if (cursor === Command.FIGHT || cursor === Command.BALL) { success = this.setCursor(cursor + 2); } break; case Button.LEFT: - if (cursor % 2 === 1) { + if (cursor === Command.BALL || cursor === Command.RUN) { success = this.setCursor(cursor - 1); + } else if ((cursor === Command.FIGHT || cursor === Command.POKEMON) && this.canTera()) { + success = this.setCursor(Command.TERA); + this.toggleTeraButton(); } break; case Button.RIGHT: - if (cursor % 2 === 0) { + if (cursor === Command.FIGHT || cursor === Command.POKEMON) { success = this.setCursor(cursor + 1); + } else if (cursor === Command.TERA) { + success = this.setCursor(Command.FIGHT); + this.toggleTeraButton(); } break; } @@ -144,11 +194,31 @@ export default class CommandUiHandler extends UiHandler { return success; } - getCursor(): integer { + canTera(): boolean { + const hasTeraMod = !!globalScene.getModifiers(TerastallizeAccessModifier).length; + const activePokemon = globalScene.getField()[this.fieldIndex]; + const isBlockedForm = + activePokemon.isMega() || activePokemon.isMax() || activePokemon.hasSpecies(Species.NECROZMA, "ultra"); + const currentTeras = globalScene.arena.playerTerasUsed; + const plannedTera = + globalScene.currentBattle.preTurnCommands[0]?.command === Command.TERA && this.fieldIndex > 0 ? 1 : 0; + return hasTeraMod && !isBlockedForm && currentTeras + plannedTera < 1; + } + + toggleTeraButton() { + this.teraButton.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + teraColor: getTypeRgb(globalScene.getField()[this.fieldIndex].getTeraType()), + isTerastallized: this.getCursor() === Command.TERA, + }); + } + + getCursor(): number { return !this.fieldIndex ? this.cursor : this.cursor2; } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const changed = this.getCursor() !== cursor; if (changed) { if (!this.fieldIndex) { @@ -163,7 +233,12 @@ export default class CommandUiHandler extends UiHandler { this.commandsContainer.add(this.cursorObj); } - this.cursorObj.setPosition(-5 + (cursor % 2 === 1 ? 56 : 0), 8 + (cursor >= 2 ? 16 : 0)); + if (cursor === Command.TERA) { + this.cursorObj.setVisible(false); + } else { + this.cursorObj.setPosition(-5 + (cursor % 2 === 1 ? 56 : 0), 8 + (cursor >= 2 ? 16 : 0)); + this.cursorObj.setVisible(true); + } return changed; } diff --git a/src/ui/confirm-ui-handler.ts b/src/ui/confirm-ui-handler.ts index b53a350cce0..a8710b0ab01 100644 --- a/src/ui/confirm-ui-handler.ts +++ b/src/ui/confirm-ui-handler.ts @@ -5,24 +5,28 @@ import i18next from "i18next"; import { Button } from "#enums/buttons"; import { globalScene } from "#app/global-scene"; - export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler { - - public static readonly windowWidth: integer = 48; + public static readonly windowWidth: number = 48; private switchCheck: boolean; - private switchCheckCursor: integer; + private switchCheckCursor: number; constructor() { super(Mode.CONFIRM); } - getWindowWidth(): integer { + getWindowWidth(): number { return ConfirmUiHandler.windowWidth; } show(args: any[]): boolean { - if (args.length === 4 && args[0] instanceof Function && args[1] instanceof Function && args[2] instanceof Function && args[3] === "fullParty") { + if ( + args.length === 4 && + args[0] instanceof Function && + args[1] instanceof Function && + args[2] instanceof Function && + args[3] === "fullParty" + ) { const config: OptionSelectConfig = { options: [ { @@ -31,35 +35,38 @@ export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler { args[0](); return true; }, - }, { + }, + { label: i18next.t("menu:yes"), handler: () => { args[1](); return true; - } - }, { + }, + }, + { label: i18next.t("menu:no"), handler: () => { args[2](); return true; - } - } + }, + }, ], - delay: args.length >= 8 && args[7] !== null ? args[7] as integer : 0 + delay: args.length >= 8 && args[7] !== null ? (args[7] as number) : 0, }; - super.show([ config ]); + super.show([config]); - this.switchCheck = args.length >= 5 && args[4] !== null && args[4] as boolean; + this.switchCheck = args.length >= 5 && args[4] !== null && (args[4] as boolean); - const xOffset = (args.length >= 6 && args[5] !== null ? args[5] as number : 0); - const yOffset = (args.length >= 7 && args[6] !== null ? args[6] as number : 0); + const xOffset = args.length >= 6 && args[5] !== null ? (args[5] as number) : 0; + const yOffset = args.length >= 7 && args[6] !== null ? (args[6] as number) : 0; - this.optionSelectContainer.setPosition((globalScene.game.canvas.width / 6) - 1 + xOffset, -48 + yOffset); + this.optionSelectContainer.setPosition(globalScene.game.canvas.width / 6 - 1 + xOffset, -48 + yOffset); this.setCursor(this.switchCheck ? this.switchCheckCursor : 0); return true; - } else if (args.length >= 2 && args[0] instanceof Function && args[1] instanceof Function) { + } + if (args.length >= 2 && args[0] instanceof Function && args[1] instanceof Function) { const config: OptionSelectConfig = { options: [ { @@ -67,28 +74,28 @@ export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler { handler: () => { args[0](); return true; - } + }, }, { label: i18next.t("menu:no"), handler: () => { args[1](); return true; - } - } + }, + }, ], - delay: args.length >= 6 && args[5] !== null ? args[5] as number : 0, - noCancel: args.length >= 7 && args[6] !== null ? args[6] as boolean : false, + delay: args.length >= 6 && args[5] !== null ? (args[5] as number) : 0, + noCancel: args.length >= 7 && args[6] !== null ? (args[6] as boolean) : false, }; - super.show([ config ]); + super.show([config]); - this.switchCheck = args.length >= 3 && args[2] !== null && args[2] as boolean; + this.switchCheck = args.length >= 3 && args[2] !== null && (args[2] as boolean); - const xOffset = (args.length >= 4 && args[3] !== null ? args[3] as number : 0); - const yOffset = (args.length >= 5 && args[4] !== null ? args[4] as number : 0); + const xOffset = args.length >= 4 && args[3] !== null ? (args[3] as number) : 0; + const yOffset = args.length >= 5 && args[4] !== null ? (args[4] as number) : 0; - this.optionSelectContainer.setPosition((globalScene.game.canvas.width / 6) - 1 + xOffset, -48 + yOffset); + this.optionSelectContainer.setPosition(globalScene.game.canvas.width / 6 - 1 + xOffset, -48 + yOffset); this.setCursor(this.switchCheck ? this.switchCheckCursor : 0); @@ -105,7 +112,7 @@ export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler { return super.processInput(button); } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const ret = super.setCursor(cursor); if (ret && this.switchCheck) { diff --git a/src/ui/daily-run-scoreboard.ts b/src/ui/daily-run-scoreboard.ts index 0c7ac0d60b3..53c737898e7 100644 --- a/src/ui/daily-run-scoreboard.ts +++ b/src/ui/daily-run-scoreboard.ts @@ -6,16 +6,16 @@ import { WindowVariant, addWindow } from "./ui-theme"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; export interface RankingEntry { - rank: integer, - username: string, - score: integer, - wave: integer + rank: number; + username: string; + score: number; + wave: number; } // Don't forget to update translations when adding a new category export enum ScoreboardCategory { DAILY, - WEEKLY + WEEKLY, } export class DailyRunScoreboard extends Phaser.GameObjects.Container { @@ -28,8 +28,8 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { private pageNumberLabel: Phaser.GameObjects.Text; private nextPageButton: Phaser.GameObjects.Sprite; - private pageCount: integer; - private page: integer; + private pageCount: number; + private page: number; private category: ScoreboardCategory; private _isUpdating: boolean; @@ -63,7 +63,13 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { const titleWindow = addWindow(0, 0, 114, 18, false, false, undefined, undefined, WindowVariant.THIN); this.add(titleWindow); - this.titleLabel = addTextObject(titleWindow.displayWidth / 2, titleWindow.displayHeight / 2, i18next.t("menu:loading"), TextStyle.WINDOW, { fontSize: "64px" }); + this.titleLabel = addTextObject( + titleWindow.displayWidth / 2, + titleWindow.displayHeight / 2, + i18next.t("menu:loading"), + TextStyle.WINDOW, + { fontSize: "64px" }, + ); this.titleLabel.setOrigin(0.5, 0.5); this.add(this.titleLabel); @@ -95,7 +101,11 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { this.update(this.category < Utils.getEnumKeys(ScoreboardCategory).length - 1 ? this.category + 1 : 0); }); - this.prevPageButton = globalScene.add.sprite(window.displayWidth / 2 - 16, titleWindow.displayHeight + window.displayHeight - 15, "cursor_reverse"); + this.prevPageButton = globalScene.add.sprite( + window.displayWidth / 2 - 16, + titleWindow.displayHeight + window.displayHeight - 15, + "cursor_reverse", + ); this.prevPageButton.setOrigin(0, 0); this.prevPageButton.setAlpha(0.5); this.add(this.prevPageButton); @@ -107,11 +117,21 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { } }); - this.pageNumberLabel = addTextObject(window.displayWidth / 2, titleWindow.displayHeight + window.displayHeight - 16, "1", TextStyle.WINDOW, { fontSize: "64px" }); + this.pageNumberLabel = addTextObject( + window.displayWidth / 2, + titleWindow.displayHeight + window.displayHeight - 16, + "1", + TextStyle.WINDOW, + { fontSize: "64px" }, + ); this.pageNumberLabel.setOrigin(0.5, 0); this.add(this.pageNumberLabel); - this.nextPageButton = globalScene.add.sprite(window.displayWidth / 2 + 16, titleWindow.displayHeight + window.displayHeight - 15, "cursor"); + this.nextPageButton = globalScene.add.sprite( + window.displayWidth / 2 + 16, + titleWindow.displayHeight + window.displayHeight - 15, + "cursor", + ); this.nextPageButton.setOrigin(1, 0); this.nextPageButton.setAlpha(0.5); this.add(this.nextPageButton); @@ -133,18 +153,26 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { const getEntry = (rank: string, username: string, score: string, wave: string) => { const entryContainer = globalScene.add.container(0, 0); - const rankLabel = addTextObject(0, 0, rank, TextStyle.WINDOW, { fontSize: "54px" }); + const rankLabel = addTextObject(0, 0, rank, TextStyle.WINDOW, { + fontSize: "54px", + }); entryContainer.add(rankLabel); - const usernameLabel = addTextObject(12, 0, username, TextStyle.WINDOW, { fontSize: "54px" }); + const usernameLabel = addTextObject(12, 0, username, TextStyle.WINDOW, { + fontSize: "54px", + }); entryContainer.add(usernameLabel); - const scoreLabel = addTextObject(84, 0, score, TextStyle.WINDOW, { fontSize: "54px" }); + const scoreLabel = addTextObject(84, 0, score, TextStyle.WINDOW, { + fontSize: "54px", + }); entryContainer.add(scoreLabel); switch (this.category) { case ScoreboardCategory.DAILY: - const waveLabel = addTextObject(68, 0, wave, TextStyle.WINDOW, { fontSize: "54px" }); + const waveLabel = addTextObject(68, 0, wave, TextStyle.WINDOW, { + fontSize: "54px", + }); entryContainer.add(waveLabel); break; case ScoreboardCategory.WEEKLY: @@ -155,9 +183,16 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { return entryContainer; }; - this.rankingsContainer.add(getEntry(i18next.t("menu:positionIcon"), i18next.t("menu:usernameScoreboard"), i18next.t("menu:score"), i18next.t("menu:wave"))); + this.rankingsContainer.add( + getEntry( + i18next.t("menu:positionIcon"), + i18next.t("menu:usernameScoreboard"), + i18next.t("menu:score"), + i18next.t("menu:wave"), + ), + ); - rankings.forEach((r: RankingEntry, i: integer) => { + rankings.forEach((r: RankingEntry, i: number) => { const entryContainer = getEntry(r.rank.toString(), r.username, r.score.toString(), r.wave.toString()); entryContainer.setY((i + 1) * 9); this.rankingsContainer.add(entryContainer); @@ -175,8 +210,8 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { * * @param {ScoreboardCategory} [category=this.category] - The category to fetch rankings for. Defaults to the current category. * @param {number} [page=this.page] - The page number to fetch. Defaults to the current page. - */ - update(category: ScoreboardCategory = this.category, page: integer = this.page) { + */ + update(category: ScoreboardCategory = this.category, page: number = this.page) { if (this.isUpdating) { return; } @@ -191,39 +226,49 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { this.page = page = 1; } - Utils.executeIf(category !== this.category || this.pageCount === undefined, - () => pokerogueApi.daily.getRankingsPageCount({ category }).then(count => this.pageCount = count) - ).then(() => { - pokerogueApi.daily.getRankings({ category, page }) - .then(rankings => { - this.page = page; - this.category = category; - this.titleLabel.setText(`${i18next.t(`menu:${ScoreboardCategory[category].toLowerCase()}Rankings`)}`); - this.pageNumberLabel.setText(page.toString()); - if (rankings) { - this.loadingLabel.setVisible(false); - this.updateRankings(rankings); - } else { - this.loadingLabel.setText(i18next.t("menu:noRankings")); - } - }).finally(() => { - this.isUpdating = false; - }); - }).catch(err => { - console.error("Failed to load daily rankings:\n", err); - }); + Utils.executeIf(category !== this.category || this.pageCount === undefined, () => + pokerogueApi.daily.getRankingsPageCount({ category }).then(count => (this.pageCount = count)), + ) + .then(() => { + pokerogueApi.daily + .getRankings({ category, page }) + .then(rankings => { + this.page = page; + this.category = category; + this.titleLabel.setText(`${i18next.t(`menu:${ScoreboardCategory[category].toLowerCase()}Rankings`)}`); + this.pageNumberLabel.setText(page.toString()); + if (rankings) { + this.loadingLabel.setVisible(false); + this.updateRankings(rankings); + } else { + this.loadingLabel.setText(i18next.t("menu:noRankings")); + } + }) + .finally(() => { + this.isUpdating = false; + }); + }) + .catch(err => { + console.error("Failed to load daily rankings:\n", err); + }); } /** * Sets the state of the navigation buttons. * @param {boolean} [enabled=true] - Whether the buttons should be enabled or disabled. */ - setButtonsState(enabled: boolean = true) { + setButtonsState(enabled = true) { const buttons = [ - { button: this.prevPageButton, alphaValue: enabled ? (this.page > 1 ? 1 : 0.5) : 0.5 }, - { button: this.nextPageButton, alphaValue: enabled ? (this.page < this.pageCount ? 1 : 0.5) : 0.5 }, + { + button: this.prevPageButton, + alphaValue: enabled ? (this.page > 1 ? 1 : 0.5) : 0.5, + }, + { + button: this.nextPageButton, + alphaValue: enabled ? (this.page < this.pageCount ? 1 : 0.5) : 0.5, + }, { button: this.nextCategoryButton, alphaValue: enabled ? 1 : 0.5 }, - { button: this.prevCategoryButton, alphaValue: enabled ? 1 : 0.5 } + { button: this.prevCategoryButton, alphaValue: enabled ? 1 : 0.5 }, ]; buttons.forEach(({ button, alphaValue }) => { diff --git a/src/ui/dropdown.ts b/src/ui/dropdown.ts index 8c318b29d64..2cbd1f0dfa9 100644 --- a/src/ui/dropdown.ts +++ b/src/ui/dropdown.ts @@ -1,27 +1,28 @@ import { globalScene } from "#app/global-scene"; import { addTextObject, TextStyle } from "./text"; import { addWindow, WindowVariant } from "./ui-theme"; +import { ScrollBar } from "#app/ui/scroll-bar"; import i18next from "i18next"; export enum DropDownState { - ON = 0, - OFF = 1, - EXCLUDE = 2, - UNLOCKABLE = 3, - ONE = 4, - TWO = 5 + ON = 0, + OFF = 1, + EXCLUDE = 2, + UNLOCKABLE = 3, + ONE = 4, + TWO = 5, } export enum DropDownType { - SINGLE = 0, - MULTI = 1, - HYBRID = 2, - RADIAL = 3 + SINGLE = 0, + MULTI = 1, + HYBRID = 2, + RADIAL = 3, } export enum SortDirection { ASC = -1, - DESC = 1 + DESC = 1, } export enum SortCriteria { @@ -31,7 +32,7 @@ export enum SortCriteria { IV = 3, NAME = 4, CAUGHT = 5, - HATCHED = 6 + HATCHED = 6, } export class DropDownLabel { @@ -46,7 +47,6 @@ export class DropDownLabel { } } - export class DropDownOption extends Phaser.GameObjects.Container { public state: DropDownState = DropDownState.ON; public toggle: Phaser.GameObjects.Sprite; @@ -69,7 +69,7 @@ export class DropDownOption extends Phaser.GameObjects.Container { if (Array.isArray(labels)) { this.labels = labels; } else { - this.labels = labels ? [ labels ] : [ new DropDownLabel("") ]; + this.labels = labels ? [labels] : [new DropDownLabel("")]; } this.currentLabelIndex = 0; const currentLabel = this.labels[this.currentLabelIndex]; @@ -104,7 +104,7 @@ export class DropDownOption extends Phaser.GameObjects.Container { this.toggle = globalScene.add.sprite(0, 0, "cursor"); this.toggle.setScale(0.5); this.toggle.setOrigin(0, 0.5); - this.toggle.setRotation(Math.PI / 180 * -90); + this.toggle.setRotation((Math.PI / 180) * -90); } else { this.toggle = globalScene.add.sprite(0, 0, "candy"); this.toggle.setScale(0.3); @@ -278,45 +278,80 @@ export class DropDownOption extends Phaser.GameObjects.Container { this.text.setText(currentText); return w; } - } - export class DropDown extends Phaser.GameObjects.Container { public options: DropDownOption[]; private window: Phaser.GameObjects.NineSlice; private cursorObj: Phaser.GameObjects.Image; public dropDownType: DropDownType = DropDownType.MULTI; - public cursor: number = 0; - private lastCursor: number = -1; - public defaultCursor: number = 0; + public cursor = 0; + private lastCursor = -1; + public defaultCursor = 0; private onChange: () => void; private lastDir: SortDirection = SortDirection.ASC; private defaultSettings: any[]; + private dropDownScrollBar: ScrollBar; + private totalOptions = 0; + private maxOptions = 0; + private shownOptions = 0; + private tooManyOptions = false; + private firstShown = 0; + private optionHeight = 0; + private optionSpacing = 0; + private optionPaddingX = 4; + private optionPaddingY = 6; + private optionWidth = 100; + private cursorOffset = 0; - constructor(x: number, y: number, options: DropDownOption[], onChange: () => void, type: DropDownType = DropDownType.MULTI, optionSpacing: number = 2) { + constructor( + x: number, + y: number, + options: DropDownOption[], + onChange: () => void, + type: DropDownType = DropDownType.MULTI, + optionSpacing = 2, + ) { const windowPadding = 5; - const optionHeight = 7; - const optionPaddingX = 4; - const optionPaddingY = 6; const cursorOffset = 7; - const optionWidth = 100; super(globalScene, x - cursorOffset - windowPadding, y); + + this.optionWidth = 100; + this.optionHeight = 7; + this.optionSpacing = optionSpacing; + this.optionPaddingX = 4; + this.optionPaddingY = 6; + this.cursorOffset = cursorOffset; + this.options = options; this.dropDownType = type; this.onChange = onChange; - this.cursorObj = globalScene.add.image(optionPaddingX + 3, 0, "cursor"); + this.cursorObj = globalScene.add.image(this.optionPaddingX + 3, 0, "cursor"); this.cursorObj.setScale(0.5); this.cursorObj.setOrigin(0, 0.5); this.cursorObj.setVisible(false); // For MULTI and HYBRID filter, add an ALL option at the top if (this.dropDownType === DropDownType.MULTI || this.dropDownType === DropDownType.HYBRID) { - this.options.unshift(new DropDownOption("ALL", new DropDownLabel(i18next.t("filterBar:all"), undefined, this.checkForAllOn() ? DropDownState.ON : DropDownState.OFF))); + this.options.unshift( + new DropDownOption( + "ALL", + new DropDownLabel( + i18next.t("filterBar:all"), + undefined, + this.checkForAllOn() ? DropDownState.ON : DropDownState.OFF, + ), + ), + ); } + this.maxOptions = 19; + this.totalOptions = this.options.length; + this.tooManyOptions = this.totalOptions > this.maxOptions; + this.shownOptions = this.tooManyOptions ? this.maxOptions : this.totalOptions; + this.defaultSettings = this.getSettings(); // Place ui elements in the correct spot @@ -324,24 +359,48 @@ export class DropDown extends Phaser.GameObjects.Container { const toggleVisibility = type !== DropDownType.SINGLE || option.state === DropDownState.ON; option.setupToggleIcon(type, toggleVisibility); - option.width = optionWidth; - option.y = index * optionHeight + index * optionSpacing + optionPaddingY; + option.width = this.optionWidth; + option.y = index * this.optionHeight + index * optionSpacing + this.optionPaddingY; - const baseX = cursorOffset + optionPaddingX + 3; - const baseY = optionHeight / 2; + const baseX = cursorOffset + this.optionPaddingX + 3; + const baseY = this.optionHeight / 2; option.setLabelPosition(baseX + 8, baseY); if (type === DropDownType.SINGLE) { option.setTogglePosition(baseX + 3, baseY + 1); } else { option.setTogglePosition(baseX, baseY); } + + if (index >= this.shownOptions) { + option.visible = false; + } + + this.firstShown = 0; }); - this.window = addWindow(0, 0, optionWidth, options[options.length - 1].y + optionHeight + optionPaddingY, false, false, undefined, undefined, WindowVariant.XTHIN); + this.window = addWindow( + 0, + 0, + this.optionWidth, + options[this.shownOptions - 1].y + this.optionHeight + this.optionPaddingY, + false, + false, + undefined, + undefined, + WindowVariant.XTHIN, + ); this.add(this.window); this.add(options); this.add(this.cursorObj); this.setVisible(false); + + if (this.tooManyOptions) { + // Setting the last parameter to 1 turns out to be optimal in all cases. + this.dropDownScrollBar = new ScrollBar(this.window.width - 3, 5, 5, this.window.height - 10, 1); + this.add(this.dropDownScrollBar); + this.dropDownScrollBar.setTotalRows(this.totalOptions); + this.dropDownScrollBar.setScrollCursor(0); + } } getWidth(): number { @@ -370,29 +429,66 @@ export class DropDown extends Phaser.GameObjects.Container { return this.setCursor(this.defaultCursor); } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { + if (this.tooManyOptions) { + this.setLabels(cursor); + } + this.cursor = cursor; if (cursor < 0) { cursor = 0; this.cursorObj.setVisible(false); return false; - } else if (cursor >= this.options.length) { + } + if (cursor >= this.options.length) { cursor = this.options.length - 1; this.cursorObj.y = this.options[cursor].y + 3.5; this.cursorObj.setVisible(true); return false; - } else { - this.cursorObj.y = this.options[cursor].y + 3.5; - this.cursorObj.setVisible(true); - // If hydrid type, we need to update the filters when going up/down in the list - if (this.dropDownType === DropDownType.HYBRID) { - this.lastCursor = cursor; - this.onChange(); - } + } + this.cursorObj.y = this.options[cursor].y + 3.5; + this.cursorObj.setVisible(true); + // If hydrid type, we need to update the filters when going up/down in the list + if (this.dropDownType === DropDownType.HYBRID) { + this.lastCursor = cursor; + this.onChange(); } return true; } + setLabels(cursor: number) { + if (cursor === 0 && this.lastCursor === this.totalOptions - 1) { + this.firstShown = 0; + } else if (cursor === this.totalOptions - 1 && this.lastCursor === 0) { + this.firstShown = this.totalOptions - this.shownOptions; + } else if (cursor - this.firstShown >= this.shownOptions && cursor > this.lastCursor) { + this.firstShown += 1; + } else if (cursor < this.firstShown && cursor < this.lastCursor) { + this.firstShown -= 1; + } + + this.options.forEach((option, index) => { + option.y = (index - this.firstShown) * (this.optionHeight + this.optionSpacing) + this.optionPaddingY; + + const baseX = this.cursorOffset + this.optionPaddingX + 3; + const baseY = this.optionHeight / 2; + option.setLabelPosition(baseX + 8, baseY); + if (this.dropDownType === DropDownType.SINGLE) { + option.setTogglePosition(baseX + 3, baseY + 1); + } else { + option.setTogglePosition(baseX, baseY); + } + + if (index < this.firstShown || index >= this.firstShown + this.shownOptions) { + option.visible = false; + } else { + option.visible = true; + } + }); + + this.dropDownScrollBar.setScrollCursor(cursor); + } + /** * Switch the option at the provided index to its next state and update visuals * Update accordingly the other options if needed: @@ -417,7 +513,7 @@ export class DropDown extends Phaser.GameObjects.Container { } } else if (this.dropDownType === DropDownType.SINGLE) { if (option.state === DropDownState.OFF) { - this.options.forEach((option) => { + this.options.forEach(option => { option.setOptionState(DropDownState.OFF); option.setDirection(SortDirection.ASC); option.toggle.setVisible(false); @@ -460,9 +556,12 @@ export class DropDown extends Phaser.GameObjects.Container { */ getVals(): any[] { if (this.dropDownType === DropDownType.MULTI) { - return this.options.filter((option, i) => i > 0 && option.state === DropDownState.ON).map((option) => option.val); - } else if (this.dropDownType === DropDownType.HYBRID) { - const selected = this.options.filter((option, i) => i > 0 && option.state === DropDownState.ON).map((option) => option.val); + return this.options.filter((option, i) => i > 0 && option.state === DropDownState.ON).map(option => option.val); + } + if (this.dropDownType === DropDownType.HYBRID) { + const selected = this.options + .filter((option, i) => i > 0 && option.state === DropDownState.ON) + .map(option => option.val); if (selected.length > 0) { return selected; } @@ -471,16 +570,18 @@ export class DropDown extends Phaser.GameObjects.Container { return this.options.filter((_, i) => i > 0).map(option => option.val); } // if nothing is selected and a single option is hovered, return that one - return [ this.options[this.cursor].val ]; - } else if (this.dropDownType === DropDownType.RADIAL) { - return this.options.map((option) => { + return [this.options[this.cursor].val]; + } + if (this.dropDownType === DropDownType.RADIAL) { + return this.options.map(option => { return { val: option.val, state: option.state }; }); - } else { - return this.options.filter(option => option.state === DropDownState.ON).map((option) => { + } + return this.options + .filter(option => option.state === DropDownState.ON) + .map(option => { return { val: option.val, dir: option.dir }; }); - } } /** @@ -489,9 +590,14 @@ export class DropDown extends Phaser.GameObjects.Container { * - the settings dictionary is like this { val: any, state: DropDownState, cursor: boolean, dir: SortDirection } */ private getSettings(): any[] { - const settings : any[] = []; + const settings: any[] = []; for (let i = 0; i < this.options.length; i++) { - settings.push({ val: this.options[i].val, state: this.options[i].state, cursor: (this.cursor === i), dir: this.options[i].dir }); + settings.push({ + val: this.options[i].val, + state: this.options[i].state, + cursor: this.cursor === i, + dir: this.options[i].dir, + }); } return settings; } @@ -504,22 +610,22 @@ export class DropDown extends Phaser.GameObjects.Container { const currentValues = this.getSettings(); const compareValues = (keys: string[]): boolean => { - return currentValues.length === this.defaultSettings.length && - currentValues.every((value, index) => - keys.every(key => value[key] === this.defaultSettings[index][key]) - ); + return ( + currentValues.length === this.defaultSettings.length && + currentValues.every((value, index) => keys.every(key => value[key] === this.defaultSettings[index][key])) + ); }; switch (this.dropDownType) { case DropDownType.MULTI: case DropDownType.RADIAL: - return compareValues([ "val", "state" ]); + return compareValues(["val", "state"]); case DropDownType.HYBRID: - return compareValues([ "val", "state", "cursor" ]); + return compareValues(["val", "state", "cursor"]); case DropDownType.SINGLE: - return compareValues([ "val", "state", "dir" ]); + return compareValues(["val", "state", "dir"]); default: return false; @@ -552,6 +658,8 @@ export class DropDown extends Phaser.GameObjects.Container { } } } + + this.onChange(); } } @@ -559,7 +667,7 @@ export class DropDown extends Phaser.GameObjects.Container { * Set all options to a specific state * @param state the DropDownState to assign to each option */ - private setAllOptions(state: DropDownState) : void { + private setAllOptions(state: DropDownState): void { // For single type dropdown, setting all options is not relevant if (this.dropDownType === DropDownType.SINGLE) { return; @@ -597,11 +705,15 @@ export class DropDown extends Phaser.GameObjects.Container { x = this.options[i].getCurrentLabelX() ?? 0; } } - this.window.width = maxWidth + x - this.window.x + 6; + this.window.width = maxWidth + x - this.window.x + 9; + + if (this.tooManyOptions) { + this.window.width += 6; + this.dropDownScrollBar.x = this.window.width - 9; + } if (this.x + this.window.width > this.parentContainer.width) { this.x = this.parentContainer.width - this.window.width; } } - } diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/egg-gacha-ui-handler.ts index 82e361fac39..cb6a474f01d 100644 --- a/src/ui/egg-gacha-ui-handler.ts +++ b/src/ui/egg-gacha-ui-handler.ts @@ -30,7 +30,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { private voucherCountLabels: Phaser.GameObjects.Text[]; - private gachaCursor: integer; + private gachaCursor: number; private cursorObj: Phaser.GameObjects.Image; private transitioning: boolean; @@ -38,7 +38,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { private summaryFinished: boolean; private defaultText: string; - private scale: number = 0.1666666667; + private scale = 0.1666666667; constructor() { super(Mode.EGG_GACHA); @@ -68,18 +68,18 @@ export default class EggGachaUiHandler extends MessageUiHandler { this.eggGachaContainer.add(bg); const hatchFrameNames = globalScene.anims.generateFrameNames("gacha_hatch", { suffix: ".png", start: 1, end: 4 }); - if (!(globalScene.anims.exists("open"))) { + if (!globalScene.anims.exists("open")) { globalScene.anims.create({ key: "open", frames: hatchFrameNames, - frameRate: 12 + frameRate: 12, }); } - if (!(globalScene.anims.exists("close"))) { + if (!globalScene.anims.exists("close")) { globalScene.anims.create({ key: "close", frames: hatchFrameNames.reverse(), - frameRate: 12 + frameRate: 12, }); } @@ -108,7 +108,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { let pokemonIconX = -20; let pokemonIconY = 6; - if ([ "de", "es-ES", "fr", "ko", "pt-BR" ].includes(currentLanguage)) { + if (["de", "es-ES", "fr", "ko", "pt-BR"].includes(currentLanguage)) { gachaTextStyle = TextStyle.SMALLER_WINDOW_ALT; gachaX = 2; gachaY = 2; @@ -116,7 +116,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { let legendaryLabelX = gachaX; let legendaryLabelY = gachaY; - if ([ "de", "es-ES" ].includes(currentLanguage)) { + if (["de", "es-ES"].includes(currentLanguage)) { pokemonIconX = -25; pokemonIconY = 10; legendaryLabelX = -6; @@ -129,11 +129,11 @@ export default class EggGachaUiHandler extends MessageUiHandler { switch (gachaType as GachaType) { case GachaType.LEGENDARY: - if ([ "de", "es-ES" ].includes(currentLanguage)) { + if (["de", "es-ES"].includes(currentLanguage)) { gachaUpLabel.setAlign("center"); gachaUpLabel.setY(0); } - if ([ "pt-BR" ].includes(currentLanguage)) { + if (["pt-BR"].includes(currentLanguage)) { gachaUpLabel.setX(legendaryLabelX - 2); } else { gachaUpLabel.setX(legendaryLabelX); @@ -141,7 +141,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { gachaUpLabel.setY(legendaryLabelY); const pokemonIcon = globalScene.add.sprite(pokemonIconX, pokemonIconY, "pokemon_icons_0"); - if ([ "pt-BR" ].includes(currentLanguage)) { + if (["pt-BR"].includes(currentLanguage)) { pokemonIcon.setX(pokemonIconX - 2); } pokemonIcon.setScale(0.5); @@ -150,7 +150,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { gachaInfoContainer.add(pokemonIcon); break; case GachaType.MOVE: - if ([ "de", "es-ES", "fr", "pt-BR" ].includes(currentLanguage)) { + if (["de", "es-ES", "fr", "pt-BR"].includes(currentLanguage)) { gachaUpLabel.setAlign("center"); gachaUpLabel.setY(0); } @@ -160,7 +160,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { gachaUpLabel.setOrigin(0.5, 0); break; case GachaType.SHINY: - if ([ "de", "fr", "ko" ].includes(currentLanguage)) { + if (["de", "fr", "ko"].includes(currentLanguage)) { gachaUpLabel.setAlign("center"); gachaUpLabel.setY(0); } @@ -187,7 +187,9 @@ export default class EggGachaUiHandler extends MessageUiHandler { gachaGlass.setAlpha(0.5); gachaHatch.setAlpha(0.9); - gachaHatch.on("animationupdate", (_anim, frame) => gachaUnderlay.setFrame(frame.textureFrame === "4.png" ? "open_hatch" : "default")); + gachaHatch.on("animationupdate", (_anim, frame) => + gachaUnderlay.setFrame(frame.textureFrame === "4.png" ? "open_hatch" : "default"), + ); this.gachaContainers.push(gachaContainer); this.gachaKnobs.push(gachaKnob); @@ -201,10 +203,9 @@ export default class EggGachaUiHandler extends MessageUiHandler { this.eggGachaOptionsContainer = globalScene.add.container(); - this.eggGachaOptionsContainer = globalScene.add.container((globalScene.game.canvas.width / 6), 148); + this.eggGachaOptionsContainer = globalScene.add.container(globalScene.game.canvas.width / 6, 148); this.eggGachaContainer.add(this.eggGachaOptionsContainer); - this.eggGachaOptionSelectBg = addWindow(0, 0, 96, 16 + 576 * this.scale); this.eggGachaOptionSelectBg.setOrigin(1, 1); this.eggGachaOptionsContainer.add(this.eggGachaOptionSelectBg); @@ -212,31 +213,48 @@ export default class EggGachaUiHandler extends MessageUiHandler { const multiplierOne = "x1"; const multiplierTen = "x10"; const pullOptions = [ - { multiplier: multiplierOne, description: `1 ${i18next.t("egg:pull")}`, icon: getVoucherTypeIcon(VoucherType.REGULAR) }, - { multiplier: multiplierTen, description: `10 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.REGULAR) }, - { multiplier: multiplierOne, description: `5 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.PLUS) }, - { multiplier: multiplierOne, description: `10 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.PREMIUM) }, - { multiplier: multiplierOne, description: `25 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.GOLDEN) } + { + multiplier: multiplierOne, + description: `1 ${i18next.t("egg:pull")}`, + icon: getVoucherTypeIcon(VoucherType.REGULAR), + }, + { + multiplier: multiplierTen, + description: `10 ${i18next.t("egg:pulls")}`, + icon: getVoucherTypeIcon(VoucherType.REGULAR), + }, + { + multiplier: multiplierOne, + description: `5 ${i18next.t("egg:pulls")}`, + icon: getVoucherTypeIcon(VoucherType.PLUS), + }, + { + multiplier: multiplierOne, + description: `10 ${i18next.t("egg:pulls")}`, + icon: getVoucherTypeIcon(VoucherType.PREMIUM), + }, + { + multiplier: multiplierOne, + description: `25 ${i18next.t("egg:pulls")}`, + icon: getVoucherTypeIcon(VoucherType.GOLDEN), + }, ]; const resolvedLanguage = i18next.resolvedLanguage ?? "en"; - const pullOptionsText = pullOptions.map(option =>{ - const desc = option.description.split(" "); - if (desc[0].length < 2) { - desc[0] += [ "zh", "ko" ].includes(resolvedLanguage.substring(0, 2)) ? " " : " "; - } - if (option.multiplier === multiplierOne) { - desc[0] = " " + desc[0]; - } - return ` ${option.multiplier.padEnd(5)}${desc.join(" ")}`; - }).join("\n"); + const pullOptionsText = pullOptions + .map(option => { + const desc = option.description.split(" "); + if (desc[0].length < 2) { + desc[0] += ["zh", "ko"].includes(resolvedLanguage.substring(0, 2)) ? " " : " "; + } + if (option.multiplier === multiplierOne) { + desc[0] = " " + desc[0]; + } + return ` ${option.multiplier.padEnd(5)}${desc.join(" ")}`; + }) + .join("\n"); - const optionText = addTextObject( - 0, - 0, - `${pullOptionsText}\n${i18next.t("menu:cancel")}`, - TextStyle.WINDOW, - ); + const optionText = addTextObject(0, 0, `${pullOptionsText}\n${i18next.t("menu:cancel")}`, TextStyle.WINDOW); optionText.setLineSpacing(28); optionText.setFontSize("80px"); @@ -255,7 +273,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { this.eggGachaContainer.add(this.eggGachaOptionsContainer); new Array(Utils.getEnumKeys(VoucherType).length).fill(null).map((_, i) => { - const container = globalScene.add.container((globalScene.game.canvas.width / 6) - 56 * i, 0); + const container = globalScene.add.container(globalScene.game.canvas.width / 6 - 56 * i, 0); const bg = addWindow(0, 0, 56, 22); bg.setOrigin(1, 0); @@ -295,7 +313,9 @@ export default class EggGachaUiHandler extends MessageUiHandler { this.eggGachaMessageBox = gachaMessageBox; - const gachaMessageText = addTextObject(8, 8, "", TextStyle.WINDOW, { maxLines: 2 }); + const gachaMessageText = addTextObject(8, 8, "", TextStyle.WINDOW, { + maxLines: 2, + }); gachaMessageText.setOrigin(0, 0); gachaMessageBoxContainer.add(gachaMessageText); @@ -331,14 +351,14 @@ export default class EggGachaUiHandler extends MessageUiHandler { return true; } - getDelayValue(delay: integer) { + getDelayValue(delay: number) { if (this.transitioning && this.transitionCancelled) { delay = Math.ceil(delay / 5); } return Utils.fixedInt(delay); } - pull(pullCount: integer = 0, count: integer = 0, eggs?: Egg[]): void { + pull(pullCount = 0, count = 0, eggs?: Egg[]): void { if (Overrides.EGG_GACHA_PULL_COUNT_OVERRIDE && !count) { pullCount = Overrides.EGG_GACHA_PULL_COUNT_OVERRIDE; } @@ -376,7 +396,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { targets: egg, duration: this.getDelayValue(350), scale: 0.75, - ease: "Sine.easeIn" + ease: "Sine.easeIn", }); globalScene.tweens.add({ targets: egg, @@ -396,12 +416,12 @@ export default class EggGachaUiHandler extends MessageUiHandler { } else { this.showSummary(eggs!); } - } + }, }); - } + }, }); }); - } + }, }); }); }); @@ -419,10 +439,10 @@ export default class EggGachaUiHandler extends MessageUiHandler { targets: this.gachaKnobs[this.gachaCursor], duration: this.getDelayValue(350), angle: 0, - ease: "Sine.easeInOut" + ease: "Sine.easeInOut", }); globalScene.time.delayedCall(this.getDelayValue(350), doPullAnim); - } + }, }); } else { doPullAnim(); @@ -438,7 +458,10 @@ export default class EggGachaUiHandler extends MessageUiHandler { if (!eggs) { eggs = []; for (let i = 1; i <= pullCount; i++) { - const eggOptions: IEggOptions = { pulled: true, sourceType: this.gachaCursor }; + const eggOptions: IEggOptions = { + pulled: true, + sourceType: this.gachaCursor, + }; // Before creating the last egg, check if the guaranteed egg tier was already generated // if not, override the egg tier @@ -455,8 +478,10 @@ export default class EggGachaUiHandler extends MessageUiHandler { // Shuffle the eggs in case the guaranteed one got added as last egg eggs = Utils.randSeedShuffle(eggs); - - (globalScene.currentBattle ? globalScene.gameData.saveAll(true, true, true) : globalScene.gameData.saveSystem()).then(success => { + (globalScene.currentBattle + ? globalScene.gameData.saveAll(true, true, true) + : globalScene.gameData.saveSystem() + ).then(success => { if (!success) { return globalScene.reset(true); } @@ -507,8 +532,11 @@ export default class EggGachaUiHandler extends MessageUiHandler { const row = Math.floor(t / rowItems); const sliceWidth = this.eggGachaOverlay.displayWidth / (cols + 2); const sliceHeight = height / (rows + 2); - const yOffset = (sliceHeight / 2 * (row / Math.max(rows - 1, 1))) + sliceHeight / 4; - const ret = globalScene.add.container(sliceWidth * (col + 1) + (sliceWidth * 0.5), sliceHeight * (row + 1) + yOffset); + const yOffset = (sliceHeight / 2) * (row / Math.max(rows - 1, 1)) + sliceHeight / 4; + const ret = globalScene.add.container( + sliceWidth * (col + 1) + sliceWidth * 0.5, + sliceHeight * (row + 1) + yOffset, + ); ret.setScale(0.0001); const eggSprite = globalScene.add.sprite(0, 0, "egg", `egg_${egg.getKey()}`); @@ -538,18 +566,18 @@ export default class EggGachaUiHandler extends MessageUiHandler { this.setTransitioning(false); this.summaryFinished = true; } - } - })); - + }, + }), + ); }); - } + }, }); } hideSummary() { this.setTransitioning(true); globalScene.tweens.add({ - targets: [ this.eggGachaOverlay, this.eggGachaSummaryContainer ], + targets: [this.eggGachaOverlay, this.eggGachaSummaryContainer], alpha: 0, duration: this.getDelayValue(250), ease: "Cubic.easeIn", @@ -560,7 +588,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { this.setTransitioning(false); this.summaryFinished = false; this.eggGachaOptionsContainer.setVisible(true); - } + }, }); } @@ -575,8 +603,11 @@ export default class EggGachaUiHandler extends MessageUiHandler { } } - consumeVouchers(voucherType: VoucherType, count: integer): void { - globalScene.gameData.voucherCounts[voucherType] = Math.max(globalScene.gameData.voucherCounts[voucherType] - count, 0); + consumeVouchers(voucherType: VoucherType, count: number): void { + globalScene.gameData.voucherCounts[voucherType] = Math.max( + globalScene.gameData.voucherCounts[voucherType] - count, + 0, + ); this.updateVoucherCounts(); } @@ -586,7 +617,14 @@ export default class EggGachaUiHandler extends MessageUiHandler { }); } - showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number): void { + showText( + text: string, + delay?: number, + callback?: Function, + callbackDelay?: number, + prompt?: boolean, + promptDelay?: number, + ): void { if (!text) { text = this.defaultText; } @@ -630,7 +668,6 @@ export default class EggGachaUiHandler extends MessageUiHandler { return false; } } else { - if (this.eggGachaSummaryContainer.visible) { if (this.summaryFinished && (button === Button.ACTION || button === Button.CANCEL)) { this.hideSummary(); @@ -641,7 +678,10 @@ export default class EggGachaUiHandler extends MessageUiHandler { case Button.ACTION: switch (this.cursor) { case 0: - if (!globalScene.gameData.voucherCounts[VoucherType.REGULAR] && !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) { + if ( + !globalScene.gameData.voucherCounts[VoucherType.REGULAR] && + !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE + ) { error = true; this.showError(i18next.t("egg:notEnoughVouchers")); } else if (globalScene.gameData.eggs.length < 99 || Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) { @@ -672,8 +712,14 @@ export default class EggGachaUiHandler extends MessageUiHandler { break; case 1: case 3: - if ((this.cursor === 1 && globalScene.gameData.voucherCounts[VoucherType.REGULAR] < 10 && !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) - || (this.cursor === 3 && !globalScene.gameData.voucherCounts[VoucherType.PREMIUM] && !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE)) { + if ( + (this.cursor === 1 && + globalScene.gameData.voucherCounts[VoucherType.REGULAR] < 10 && + !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) || + (this.cursor === 3 && + !globalScene.gameData.voucherCounts[VoucherType.PREMIUM] && + !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) + ) { error = true; this.showError(i18next.t("egg:notEnoughVouchers")); } else if (globalScene.gameData.eggs.length < 90 || Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) { @@ -694,7 +740,10 @@ export default class EggGachaUiHandler extends MessageUiHandler { } break; case 4: - if (!globalScene.gameData.voucherCounts[VoucherType.GOLDEN] && !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) { + if ( + !globalScene.gameData.voucherCounts[VoucherType.GOLDEN] && + !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE + ) { error = true; this.showError(i18next.t("egg:notEnoughVouchers")); } else if (globalScene.gameData.eggs.length < 75 || Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) { @@ -751,7 +800,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { return success || error; } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const ret = super.setCursor(cursor); if (!this.cursorObj) { @@ -765,7 +814,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { return ret; } - setGachaCursor(cursor: integer): boolean { + setGachaCursor(cursor: number): boolean { const oldCursor = this.gachaCursor; const changed = oldCursor !== cursor; @@ -780,7 +829,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { duration: this.eggGachaContainer.visible ? 500 : 0, x: (_target, _key, _value, index) => 180 * (index - cursor), ease: "Cubic.easeInOut", - onComplete: () => this.setTransitioning(false) + onComplete: () => this.setTransitioning(false), }); } diff --git a/src/ui/egg-hatch-scene-handler.ts b/src/ui/egg-hatch-scene-handler.ts index 189d2f295d1..6ede68b7ae6 100644 --- a/src/ui/egg-hatch-scene-handler.ts +++ b/src/ui/egg-hatch-scene-handler.ts @@ -24,11 +24,11 @@ export default class EggHatchSceneHandler extends UiHandler { globalScene.fieldUI.add(this.eggHatchContainer); const eggLightraysAnimFrames = globalScene.anims.generateFrameNames("egg_lightrays", { start: 0, end: 3 }); - if (!(globalScene.anims.exists("egg_lightrays"))) { + if (!globalScene.anims.exists("egg_lightrays")) { globalScene.anims.create({ key: "egg_lightrays", frames: eggLightraysAnimFrames, - frameRate: 32 + frameRate: 32, }); } } @@ -54,7 +54,7 @@ export default class EggHatchSceneHandler extends UiHandler { return globalScene.ui.getMessageHandler().processInput(button); } - setCursor(_cursor: integer): boolean { + setCursor(_cursor: number): boolean { return false; } diff --git a/src/ui/egg-list-ui-handler.ts b/src/ui/egg-list-ui-handler.ts index 1b25d55d96d..cf3326bec13 100644 --- a/src/ui/egg-list-ui-handler.ts +++ b/src/ui/egg-list-ui-handler.ts @@ -24,7 +24,7 @@ export default class EggListUiHandler extends MessageUiHandler { private eggListMessageBoxContainer: Phaser.GameObjects.Container; private cursorObj: Phaser.GameObjects.Image; - private scrollGridHandler : ScrollableGridUiHandler; + private scrollGridHandler: ScrollableGridUiHandler; private iconAnimHandler: PokemonIconAnimHandler; @@ -39,7 +39,13 @@ export default class EggListUiHandler extends MessageUiHandler { this.eggListContainer.setVisible(false); ui.add(this.eggListContainer); - const bgColor = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0x006860); + const bgColor = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6, + 0x006860, + ); bgColor.setOrigin(0, 0); this.eggListContainer.add(bgColor); @@ -86,7 +92,7 @@ export default class EggListUiHandler extends MessageUiHandler { this.scrollGridHandler = new ScrollableGridUiHandler(this, this.ROWS, this.COLUMNS) .withScrollBar(scrollBar) .withUpdateGridCallBack(() => this.updateEggIcons()) - .withUpdateSingleElementCallback((i:number) => this.setEggDetails(i)); + .withUpdateSingleElementCallback((i: number) => this.setEggDetails(i)); this.eggListMessageBoxContainer = globalScene.add.container(0, globalScene.game.canvas.height / 6); this.eggListMessageBoxContainer.setVisible(false); @@ -170,8 +176,8 @@ export default class EggListUiHandler extends MessageUiHandler { weekday: "short", year: "numeric", month: "2-digit", - day: "numeric" - }) + day: "numeric", + }), ); this.eggHatchWavesText.setText(egg.getEggHatchWavesMessage()); this.eggGachaInfoText.setText(egg.getEggTypeDescriptor()); diff --git a/src/ui/egg-summary-ui-handler.ts b/src/ui/egg-summary-ui-handler.ts index 04b31ab9ca8..f335f83d8bf 100644 --- a/src/ui/egg-summary-ui-handler.ts +++ b/src/ui/egg-summary-ui-handler.ts @@ -39,7 +39,7 @@ export default class EggSummaryUiHandler extends MessageUiHandler { private eggHatchBg: Phaser.GameObjects.Image; private eggHatchData: EggHatchData[]; - private scrollGridHandler : ScrollableGridUiHandler; + private scrollGridHandler: ScrollableGridUiHandler; private cursorObj: Phaser.GameObjects.Image; /** used to add a delay before which it is not possible to exit the summary */ @@ -89,7 +89,13 @@ export default class EggSummaryUiHandler extends MessageUiHandler { this.infoContainer.setVisible(true); this.summaryContainer.add(this.infoContainer); - const scrollBar = new ScrollBar(iconContainerX + numCols * iconSize, iconContainerY + 3, 4, globalScene.game.canvas.height / 6 - 20, numRows); + const scrollBar = new ScrollBar( + iconContainerX + numCols * iconSize, + iconContainerY + 3, + 4, + globalScene.game.canvas.height / 6 - 20, + numRows, + ); this.summaryContainer.add(scrollBar); this.scrollGridHandler = new ScrollableGridUiHandler(this, numRows, numCols) @@ -146,17 +152,17 @@ export default class EggSummaryUiHandler extends MessageUiHandler { const speciesB = b.pokemon.species; if (getEggTierForSpecies(speciesA) < getEggTierForSpecies(speciesB)) { return -1; - } else if (getEggTierForSpecies(speciesA) > getEggTierForSpecies(speciesB)) { - return 1; - } else { - if (speciesA.speciesId < speciesB.speciesId) { - return -1; - } else if (speciesA.speciesId > speciesB.speciesId) { - return 1; - } else { - return 0; - } } + if (getEggTierForSpecies(speciesA) > getEggTierForSpecies(speciesB)) { + return 1; + } + if (speciesA.speciesId < speciesB.speciesId) { + return -1; + } + if (speciesA.speciesId > speciesB.speciesId) { + return 1; + } + return 0; }); } @@ -174,9 +180,9 @@ export default class EggSummaryUiHandler extends MessageUiHandler { // Prevent exiting the egg summary for 2 seconds if the egg hatching // was skipped automatically and for 1 second otherwise - const exitBlockingDuration = (globalScene.eggSkipPreference === 2) ? 2000 : 1000; + const exitBlockingDuration = globalScene.eggSkipPreference === 2 ? 2000 : 1000; this.blockExit = true; - globalScene.time.delayedCall(exitBlockingDuration, () => this.blockExit = false); + globalScene.time.delayedCall(exitBlockingDuration, () => (this.blockExit = false)); return true; } @@ -245,7 +251,10 @@ export default class EggSummaryUiHandler extends MessageUiHandler { changed = super.setCursor(cursor); if (changed) { - this.cursorObj.setPosition(iconContainerX - 1 + iconSize * (cursor % numCols), iconContainerY + 1 + iconSize * Math.floor(cursor / numCols)); + this.cursorObj.setPosition( + iconContainerX - 1 + iconSize * (cursor % numCols), + iconContainerY + 1 + iconSize * Math.floor(cursor / numCols), + ); if (lastCursor > -1) { this.iconAnimHandler.addOrUpdate(this.pokemonContainers[lastCursor].icon, PokemonIconAnimMode.NONE); @@ -257,5 +266,4 @@ export default class EggSummaryUiHandler extends MessageUiHandler { return changed; } - } diff --git a/src/ui/evolution-scene-handler.ts b/src/ui/evolution-scene-handler.ts index e7866dfea53..91f3360a3d4 100644 --- a/src/ui/evolution-scene-handler.ts +++ b/src/ui/evolution-scene-handler.ts @@ -38,8 +38,8 @@ export default class EvolutionSceneHandler extends MessageUiHandler { const message = addTextObject(0, 0, "", TextStyle.MESSAGE, { maxLines: 2, wordWrap: { - width: 1780 - } + width: 1780, + }, }); this.messageContainer.add(message); @@ -82,7 +82,7 @@ export default class EvolutionSceneHandler extends MessageUiHandler { return false; } - setCursor(_cursor: integer): boolean { + setCursor(_cursor: number): boolean { return false; } diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 220e5d817ef..a4f02e13303 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -2,12 +2,12 @@ import type { InfoToggle } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; import { addTextObject, TextStyle } from "./text"; import { getTypeDamageMultiplierColor } from "#app/data/type"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Command } from "./command-ui-handler"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import * as Utils from "../utils"; -import { MoveCategory } from "#app/data/move"; +import { MoveCategory } from "#enums/MoveCategory"; import i18next from "i18next"; import { Button } from "#enums/buttons"; import type { PokemonMove } from "#app/field/pokemon"; @@ -30,10 +30,11 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { private accuracyText: Phaser.GameObjects.Text; private cursorObj: Phaser.GameObjects.Image | null; private moveCategoryIcon: Phaser.GameObjects.Sprite; - private moveInfoOverlay : MoveInfoOverlay; + private moveInfoOverlay: MoveInfoOverlay; - protected fieldIndex: integer = 0; - protected cursor2: integer = 0; + protected fieldIndex = 0; + protected fromCommand: Command = Command.FIGHT; + protected cursor2 = 0; constructor() { super(Mode.FIGHT); @@ -50,7 +51,12 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { this.moveInfoContainer.setName("move-info"); ui.add(this.moveInfoContainer); - this.typeIcon = globalScene.add.sprite(globalScene.scaledCanvas.width - 57, -36, Utils.getLocalizedSpriteKey("types"), "unknown"); + this.typeIcon = globalScene.add.sprite( + globalScene.scaledCanvas.width - 57, + -36, + Utils.getLocalizedSpriteKey("types"), + "unknown", + ); this.typeIcon.setVisible(false); this.moveInfoContainer.add(this.typeIcon); @@ -100,9 +106,9 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { right: true, x: 0, y: -MoveInfoOverlay.getHeight(overlayScale, true), - width: (globalScene.game.canvas.width / 6) + 4, + width: globalScene.game.canvas.width / 6 + 4, hideEffectBox: true, - hideBg: true + hideBg: true, }); ui.add(this.moveInfoOverlay); // register the overlay to receive toggle events @@ -113,7 +119,8 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { show(args: any[]): boolean { super.show(args); - this.fieldIndex = args.length ? args[0] as integer : 0; + this.fieldIndex = args.length ? (args[0] as number) : 0; + this.fromCommand = args.length > 1 ? (args[1] as Command) : Command.FIGHT; const messageHandler = this.getUi().getMessageHandler(); messageHandler.bg.setVisible(false); @@ -140,7 +147,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { if (button === Button.CANCEL || button === Button.ACTION) { if (button === Button.ACTION) { - if ((globalScene.getCurrentPhase() as CommandPhase).handleCommand(Command.FIGHT, cursor, false)) { + if ((globalScene.getCurrentPhase() as CommandPhase).handleCommand(this.fromCommand, cursor, false)) { success = true; } else { ui.playError(); @@ -191,10 +198,10 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { this.cursorObj?.setVisible(false); } globalScene.tweens.add({ - targets: [ this.movesContainer, this.cursorObj ], + targets: [this.movesContainer, this.cursorObj], duration: Utils.fixedInt(125), ease: "Sine.easeInOut", - alpha: visible ? 0 : 1 + alpha: visible ? 0 : 1, }); if (!visible) { this.movesContainer.setVisible(true); @@ -206,11 +213,11 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { return this.active; } - getCursor(): integer { + getCursor(): number { return !this.fieldIndex ? this.cursor : this.cursor2; } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const ui = this.getUi(); this.moveInfoOverlay.clear(); @@ -224,7 +231,9 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { } if (!this.cursorObj) { - this.cursorObj = globalScene.add.image(0, 0, "cursor"); + const isTera = this.fromCommand === Command.TERA; + this.cursorObj = globalScene.add.image(0, 0, isTera ? "cursor_tera" : "cursor"); + this.cursorObj.setScale(isTera ? 0.7 : 1); ui.add(this.cursorObj); } @@ -237,7 +246,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { const pokemonMove = moveset[cursor]!; // TODO: is the bang correct? const moveType = pokemon.getMoveType(pokemonMove.getMove()); const textureKey = Utils.getLocalizedSpriteKey("types"); - this.typeIcon.setTexture(textureKey, Type[moveType].toLowerCase()).setScale(0.8); + this.typeIcon.setTexture(textureKey, PokemonType[moveType].toLowerCase()).setScale(0.8); const moveCategory = pokemonMove.getMove().category; this.moveCategoryIcon.setTexture("categories", MoveCategory[moveCategory].toLowerCase()).setScale(1.0); @@ -269,7 +278,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { this.ppText.setShadowColor(this.getTextColor(ppColorStyle, true)); this.moveInfoOverlay.show(pokemonMove.getMove()); - pokemon.getOpponents().forEach((opponent) => { + pokemon.getOpponents().forEach(opponent => { opponent.updateEffectiveness(this.getEffectivenessText(pokemon, opponent, pokemonMove)); }); } @@ -293,7 +302,11 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { * Returns undefined if it's a status move */ private getEffectivenessText(pokemon: Pokemon, opponent: Pokemon, pokemonMove: PokemonMove): string | undefined { - const effectiveness = opponent.getMoveEffectiveness(pokemon, pokemonMove.getMove(), !opponent.battleData?.abilityRevealed); + const effectiveness = opponent.getMoveEffectiveness( + pokemon, + pokemonMove.getMove(), + !opponent.battleData?.abilityRevealed, + ); if (effectiveness === undefined) { return undefined; } @@ -336,9 +349,11 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { } const moveColors = opponents - .map((opponent) => opponent.getMoveEffectiveness(pokemon, pokemonMove.getMove(), !opponent.battleData.abilityRevealed)) + .map(opponent => + opponent.getMoveEffectiveness(pokemon, pokemonMove.getMove(), !opponent.battleData.abilityRevealed), + ) .sort((a, b) => b - a) - .map((effectiveness) => getTypeDamageMultiplierColor(effectiveness ?? 0, "offense")); + .map(effectiveness => getTypeDamageMultiplierColor(effectiveness ?? 0, "offense")); return moveColors[0]; } @@ -365,7 +380,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { this.movesContainer.removeAll(true); const opponents = (globalScene.getCurrentPhase() as CommandPhase).getPokemon().getOpponents(); - opponents.forEach((opponent) => { + opponents.forEach(opponent => { opponent.updateEffectiveness(undefined); }); } diff --git a/src/ui/filter-bar.ts b/src/ui/filter-bar.ts index a6f9f66efe2..2aade130ed1 100644 --- a/src/ui/filter-bar.ts +++ b/src/ui/filter-bar.ts @@ -9,29 +9,45 @@ import { globalScene } from "#app/global-scene"; export enum DropDownColumn { GEN, TYPES, + BIOME, CAUGHT, UNLOCKS, MISC, - SORT + SORT, } export class FilterBar extends Phaser.GameObjects.Container { private window: Phaser.GameObjects.NineSlice; - private labels: Phaser.GameObjects.Text[] = []; + private labels: Phaser.GameObjects.Text[] = []; private dropDowns: DropDown[] = []; private columns: DropDownColumn[] = []; public cursorObj: Phaser.GameObjects.Image; - public numFilters: number = 0; - public openDropDown: boolean = false; - private lastCursor: number = -1; + public numFilters = 0; + public openDropDown = false; + private lastCursor = -1; private uiTheme: UiTheme; + private leftPaddingX: number; + private rightPaddingX: number; + private cursorOffset: number; - constructor(x: number, y: number, width: number, height: number) { + constructor( + x: number, + y: number, + width: number, + height: number, + leftPaddingX = 6, + rightPaddingX = 6, + cursorOffset = 8, + ) { super(globalScene, x, y); this.width = width; this.height = height; + this.leftPaddingX = leftPaddingX; + this.rightPaddingX = rightPaddingX; + this.cursorOffset = cursorOffset; + this.window = addWindow(0, 0, width, height, false, false, undefined, undefined, WindowVariant.THIN); this.add(this.window); @@ -40,8 +56,6 @@ export class FilterBar extends Phaser.GameObjects.Container { this.cursorObj.setVisible(false); this.cursorObj.setOrigin(0, 0); this.add(this.cursorObj); - - this.uiTheme = globalScene.uiTheme; } /** @@ -76,19 +90,28 @@ export class FilterBar extends Phaser.GameObjects.Container { * @param col the DropDownColumn used to register the filter to retrieve * @returns the associated DropDown if it exists, undefined otherwise */ - getFilter(col: DropDownColumn) : DropDown { + getFilter(col: DropDownColumn): DropDown { return this.dropDowns[this.columns.indexOf(col)]; } + /** + * Get the DropDownColumn associated to a given index + * @param index the index of the column to retrieve + * @returns the associated DropDownColumn if it exists, undefined otherwise + */ + public getColumn(index: number): DropDownColumn { + return this.columns[index]; + } + /** * Highlight the labels of the FilterBar if the filters are different from their default values */ updateFilterLabels(): void { for (let i = 0; i < this.numFilters; i++) { if (this.dropDowns[i].hasDefaultValues()) { - this.labels[i].setColor(getTextColor(TextStyle.TOOLTIP_CONTENT, false, this.uiTheme)); + this.labels[i].setColor(getTextColor(TextStyle.TOOLTIP_CONTENT, false, globalScene.uiTheme)); } else { - this.labels[i].setColor(getTextColor(TextStyle.STATS_LABEL, false, this.uiTheme)); + this.labels[i].setColor(getTextColor(TextStyle.STATS_LABEL, false, globalScene.uiTheme)); } } } @@ -97,23 +120,20 @@ export class FilterBar extends Phaser.GameObjects.Container { * Position the filter dropdowns evenly across the width of the container */ private calcFilterPositions(): void { - const paddingX = 6; - const cursorOffset = 8; - - let totalWidth = paddingX * 2 + cursorOffset; + let totalWidth = this.leftPaddingX + this.rightPaddingX + this.cursorOffset; this.labels.forEach(label => { - totalWidth += label.displayWidth + cursorOffset; + totalWidth += label.displayWidth + this.cursorOffset; }); const spacing = (this.width - totalWidth) / (this.labels.length - 1); for (let i = 0; i < this.labels.length; i++) { if (i === 0) { - this.labels[i].x = paddingX + cursorOffset; + this.labels[i].x = this.leftPaddingX + this.cursorOffset; } else { const lastRight = this.labels[i - 1].x + this.labels[i - 1].displayWidth; - this.labels[i].x = lastRight + spacing + cursorOffset; + this.labels[i].x = lastRight + spacing + this.cursorOffset; } - this.dropDowns[i].x = this.labels[i].x - cursorOffset - paddingX; + this.dropDowns[i].x = this.labels[i].x - this.cursorOffset - this.leftPaddingX; this.dropDowns[i].y = this.height; } } @@ -125,7 +145,7 @@ export class FilterBar extends Phaser.GameObjects.Container { for (let i = 0; i < this.dropDowns.length; i++) { if (this.dropDowns[i].dropDownType === DropDownType.HYBRID) { this.dropDowns[i].autoSize(); - this.dropDowns[i].x = - this.dropDowns[i].getWidth(); + this.dropDowns[i].x = -this.dropDowns[i].getWidth(); this.dropDowns[i].y = 0; } } @@ -140,8 +160,7 @@ export class FilterBar extends Phaser.GameObjects.Container { } } - const cursorOffset = 8; - this.cursorObj.setPosition(this.labels[cursor].x - cursorOffset + 2, 6); + this.cursorObj.setPosition(this.labels[cursor].x - this.cursorOffset + 2, 6); this.lastCursor = cursor; } @@ -159,19 +178,19 @@ export class FilterBar extends Phaser.GameObjects.Container { } incDropDownCursor(): boolean { - if (this.dropDowns[this.lastCursor].cursor === this.dropDowns[this.lastCursor].options.length - 1) {// if at the bottom of the list, wrap around + if (this.dropDowns[this.lastCursor].cursor === this.dropDowns[this.lastCursor].options.length - 1) { + // if at the bottom of the list, wrap around return this.dropDowns[this.lastCursor].setCursor(0); - } else { - return this.dropDowns[this.lastCursor].setCursor(this.dropDowns[this.lastCursor].cursor + 1); } + return this.dropDowns[this.lastCursor].setCursor(this.dropDowns[this.lastCursor].cursor + 1); } decDropDownCursor(): boolean { - if (this.dropDowns[this.lastCursor].cursor === 0) {// if at the top of the list, wrap around + if (this.dropDowns[this.lastCursor].cursor === 0) { + // if at the top of the list, wrap around return this.dropDowns[this.lastCursor].setCursor(this.dropDowns[this.lastCursor].options.length - 1); - } else { - return this.dropDowns[this.lastCursor].setCursor(this.dropDowns[this.lastCursor].cursor - 1); } + return this.dropDowns[this.lastCursor].setCursor(this.dropDowns[this.lastCursor].cursor - 1); } toggleOptionState(): void { @@ -182,6 +201,11 @@ export class FilterBar extends Phaser.GameObjects.Container { return this.getFilter(col).getVals(); } + public resetSelection(col: DropDownColumn): void { + this.dropDowns[col].resetToDefault(); + this.updateFilterLabels(); + } + setValsToDefault(): void { for (const dropDown of this.dropDowns) { dropDown.resetToDefault(); @@ -194,7 +218,6 @@ export class FilterBar extends Phaser.GameObjects.Container { * @returns the index of the closest filter */ getNearestFilter(container: StarterContainer): number { - const midx = container.x + container.icon.displayWidth / 2; let nearest = 0; let nearestDist = 1000; @@ -208,5 +231,4 @@ export class FilterBar extends Phaser.GameObjects.Container { return nearest; } - } diff --git a/src/ui/filter-text.ts b/src/ui/filter-text.ts new file mode 100644 index 00000000000..a6b01ba39e6 --- /dev/null +++ b/src/ui/filter-text.ts @@ -0,0 +1,226 @@ +import type { StarterContainer } from "./starter-container"; +import { addTextObject, getTextColor, TextStyle } from "./text"; +import type { UiTheme } from "#enums/ui-theme"; +import { addWindow, WindowVariant } from "./ui-theme"; +import i18next from "i18next"; +import type AwaitableUiHandler from "./awaitable-ui-handler"; +import type UI from "./ui"; +import { Mode } from "./ui"; +import { globalScene } from "#app/global-scene"; + +export enum FilterTextRow { + NAME, + MOVE_1, + MOVE_2, + ABILITY_1, + ABILITY_2, +} + +export class FilterText extends Phaser.GameObjects.Container { + private window: Phaser.GameObjects.NineSlice; + private labels: Phaser.GameObjects.Text[] = []; + private selections: Phaser.GameObjects.Text[] = []; + private selectionStrings: string[] = []; + private rows: FilterTextRow[] = []; + public cursorObj: Phaser.GameObjects.Image; + public numFilters = 0; + private lastCursor = -1; + private uiTheme: UiTheme; + + private menuMessageBoxContainer: Phaser.GameObjects.Container; + private dialogueMessageBox: Phaser.GameObjects.NineSlice; + message: any; + private readonly textPadding = 8; + private readonly defaultWordWrapWidth = 1224; + + private onChange: () => void; + + public defaultText = "---"; + + constructor(x: number, y: number, width: number, height: number, onChange: () => void) { + super(globalScene, x, y); + + this.onChange = onChange; + + this.width = width; + this.height = height; + + this.window = addWindow(0, 0, width, height, false, false, undefined, undefined, WindowVariant.THIN); + this.add(this.window); + + this.cursorObj = globalScene.add.image(1, 1, "cursor"); + this.cursorObj.setScale(0.5); + this.cursorObj.setVisible(false); + this.cursorObj.setOrigin(0, 0); + this.add(this.cursorObj); + + this.menuMessageBoxContainer = globalScene.add.container(0, 130); + this.menuMessageBoxContainer.setName("menu-message-box"); + this.menuMessageBoxContainer.setVisible(false); + + // Full-width window used for testing dialog messages in debug mode + this.dialogueMessageBox = addWindow( + -this.textPadding, + 0, + globalScene.game.canvas.width / 6 + this.textPadding * 2, + 49, + false, + false, + 0, + 0, + WindowVariant.THIN, + ); + this.dialogueMessageBox.setOrigin(0, 0); + this.menuMessageBoxContainer.add(this.dialogueMessageBox); + + const menuMessageText = addTextObject(this.textPadding, this.textPadding, "", TextStyle.WINDOW, { maxLines: 2 }); + menuMessageText.setName("menu-message"); + menuMessageText.setOrigin(0, 0); + this.menuMessageBoxContainer.add(menuMessageText); + + this.message = menuMessageText; + } + + /** + * Add a new filter to the FilterBar, as long that a unique DropDownColumn is provided + * @param column the DropDownColumn that will be used to access the filter values + * @param title the string that will get displayed in the filter bar + * @param dropDown the DropDown with all options for this filter + * @returns true if successful, false if the provided column was already in use for another filter + */ + addFilter(row: FilterTextRow, title: string): boolean { + const paddingX = 6; + const cursorOffset = 8; + const extraSpaceX = 40; + + if (this.rows.includes(row)) { + return false; + } + + this.rows.push(row); + + const filterTypesLabel = addTextObject(paddingX + cursorOffset, 3, title, TextStyle.TOOLTIP_CONTENT); + this.labels.push(filterTypesLabel); + this.add(filterTypesLabel); + + const filterTypesSelection = addTextObject( + paddingX + cursorOffset + extraSpaceX, + 3, + this.defaultText, + TextStyle.TOOLTIP_CONTENT, + ); + this.selections.push(filterTypesSelection); + this.add(filterTypesSelection); + + this.selectionStrings.push(""); + + this.calcFilterPositions(); + this.numFilters++; + + return true; + } + + resetSelection(index: number): void { + this.selections[index].setText(this.defaultText); + this.selectionStrings[index] = ""; + this.onChange(); + } + + setValsToDefault(): void { + for (let i = 0; i < this.numFilters; i++) { + this.resetSelection(i); + } + } + + startSearch(index: number, ui: UI): void { + ui.playSelect(); + const prefilledText = ""; + const buttonAction: any = {}; + buttonAction["buttonActions"] = [ + (sanitizedName: string) => { + ui.playSelect(); + const dialogueTestName = sanitizedName; + //TODO: Is it really necessary to encode and decode? + const dialogueName = decodeURIComponent(escape(atob(dialogueTestName))); + const handler = ui.getHandler() as AwaitableUiHandler; + handler.tutorialActive = true; + // Switch to the dialog test window + this.selections[index].setText(dialogueName === "" ? this.defaultText : String(i18next.t(dialogueName))); + ui.revertMode(); + this.onChange(); + }, + () => { + ui.revertMode(); + this.onChange; + }, + ]; + ui.setOverlayMode(Mode.POKEDEX_SCAN, buttonAction, prefilledText, index); + } + + setCursor(cursor: number): void { + const cursorOffset = 8; + + this.cursorObj.setPosition(cursorOffset, this.labels[cursor].y + 3); + this.lastCursor = cursor; + } + + /** + * Highlight the labels of the FilterBar if the filters are different from their default values + */ + updateFilterLabels(): void { + for (let i = 0; i < this.numFilters; i++) { + if (this.selections[i].text === this.defaultText) { + this.labels[i].setColor(getTextColor(TextStyle.TOOLTIP_CONTENT, false, globalScene.uiTheme)); + } else { + this.labels[i].setColor(getTextColor(TextStyle.STATS_LABEL, false, globalScene.uiTheme)); + } + } + } + + /** + * Position the filter dropdowns evenly across the width of the container + */ + private calcFilterPositions(): void { + const paddingY = 8; + + let totalHeight = paddingY * 2; + this.labels.forEach(label => { + totalHeight += label.displayHeight; + }); + const spacing = (this.height - totalHeight) / (this.labels.length - 1); + for (let i = 0; i < this.labels.length; i++) { + if (i === 0) { + this.labels[i].y = paddingY; + this.selections[i].y = paddingY; + } else { + const lastBottom = this.labels[i - 1].y + this.labels[i - 1].displayHeight; + this.labels[i].y = lastBottom + spacing; + this.selections[i].y = lastBottom + spacing; + } + } + } + + getValue(row: number): string { + return this.selections[row].getWrappedText()[0]; + } + + /** + * Find the nearest filter to the provided container on the y-axis + * @param container the StarterContainer to compare position against + * @returns the index of the closest filter + */ + getNearestFilter(container: StarterContainer): number { + const midy = container.y + container.icon.displayHeight / 2; + let nearest = 0; + let nearestDist = 1000; + for (let i = 0; i < this.labels.length; i++) { + const dist = Math.abs(midy - (this.labels[i].y + this.labels[i].displayHeight / 3)); + if (dist < nearestDist) { + nearest = i; + nearestDist = dist; + } + } + + return nearest; + } +} diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts index 53b66a022ac..5ff271a6ebf 100644 --- a/src/ui/form-modal-ui-handler.ts +++ b/src/ui/form-modal-ui-handler.ts @@ -38,7 +38,13 @@ export abstract class FormModalUiHandler extends ModalUiHandler { abstract getInputFieldConfigs(): InputFieldConfig[]; getHeight(config?: ModalConfig): number { - return 20 * this.getInputFieldConfigs().length + (this.getModalTitle() ? 26 : 0) + ((config as FormModalConfig)?.errorMessage ? 12 : 0) + this.getButtonTopMargin() + 28; + return ( + 20 * this.getInputFieldConfigs().length + + (this.getModalTitle() ? 26 : 0) + + ((config as FormModalConfig)?.errorMessage ? 12 : 0) + + this.getButtonTopMargin() + + 28 + ); } getReadableErrorMessage(error: string): string { @@ -60,7 +66,12 @@ export abstract class FormModalUiHandler extends ModalUiHandler { this.updateFields(config, hasTitle); } - this.errorMessage = addTextObject(10, (hasTitle ? 31 : 5) + 20 * (config.length - 1) + 16 + this.getButtonTopMargin(), "", TextStyle.TOOLTIP_CONTENT); + this.errorMessage = addTextObject( + 10, + (hasTitle ? 31 : 5) + 20 * (config.length - 1) + 16 + this.getButtonTopMargin(), + "", + TextStyle.TOOLTIP_CONTENT, + ); this.errorMessage.setColor(this.getTextColor(TextStyle.SUMMARY_PINK)); this.errorMessage.setShadowColor(this.getTextColor(TextStyle.SUMMARY_PINK, true)); this.errorMessage.setVisible(false); @@ -85,7 +96,11 @@ export abstract class FormModalUiHandler extends ModalUiHandler { const isPassword = config?.isPassword; const isReadOnly = config?.isReadOnly; - const input = addTextInputObject(4, -2, 440, 116, TextStyle.TOOLTIP_CONTENT, { type: isPassword ? "password" : "text", maxLength: isPassword ? 64 : 20, readOnly: isReadOnly }); + const input = addTextInputObject(4, -2, 440, 116, TextStyle.TOOLTIP_CONTENT, { + type: isPassword ? "password" : "text", + maxLength: isPassword ? 64 : 20, + readOnly: isReadOnly, + }); input.setOrigin(0, 0); inputContainer.add(inputBg); @@ -104,9 +119,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler { const config = args[0] as FormModalConfig; - this.submitAction = config.buttonActions.length - ? config.buttonActions[0] - : null; + this.submitAction = config.buttonActions.length ? config.buttonActions[0] : null; if (this.buttonBgs.length) { this.buttonBgs[0].off("pointerdown"); @@ -125,7 +138,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler { duration: Utils.fixedInt(1000), ease: "Sine.easeInOut", y: "-=24", - alpha: 1 + alpha: 1, }); return true; @@ -171,7 +184,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler { } export interface InputFieldConfig { - label: string, - isPassword?: boolean, - isReadOnly?: boolean + label: string; + isPassword?: boolean; + isReadOnly?: boolean; } diff --git a/src/ui/game-stats-ui-handler.ts b/src/ui/game-stats-ui-handler.ts index 2fa5b54ac76..7d3decf0c4c 100644 --- a/src/ui/game-stats-ui-handler.ts +++ b/src/ui/game-stats-ui-handler.ts @@ -19,13 +19,13 @@ interface DisplayStat { } interface DisplayStats { - [key: string]: DisplayStat | string + [key: string]: DisplayStat | string; } const displayStats: DisplayStats = { playTime: { label_key: "playTime", - sourceFunc: gameData => Utils.getPlayTimeString(gameData.gameStats.playTime) + sourceFunc: gameData => Utils.getPlayTimeString(gameData.gameStats.playTime), }, battles: { label_key: "totalBattles", @@ -36,34 +36,34 @@ const displayStats: DisplayStats = { sourceFunc: gameData => { const starterCount = gameData.getStarterCount(d => !!d.caughtAttr); return `${starterCount} (${Math.floor((starterCount / Object.keys(speciesStarterCosts).length) * 1000) / 10}%)`; - } + }, }, shinyStartersUnlocked: { label_key: "shinyStarters", sourceFunc: gameData => { const starterCount = gameData.getStarterCount(d => !!(d.caughtAttr & DexAttr.SHINY)); return `${starterCount} (${Math.floor((starterCount / Object.keys(speciesStarterCosts).length) * 1000) / 10}%)`; - } + }, }, dexSeen: { label_key: "speciesSeen", sourceFunc: gameData => { const seenCount = gameData.getSpeciesCount(d => !!d.seenAttr); return `${seenCount} (${Math.floor((seenCount / Object.keys(gameData.dexData).length) * 1000) / 10}%)`; - } + }, }, dexCaught: { label_key: "speciesCaught", sourceFunc: gameData => { const caughtCount = gameData.getSpeciesCount(d => !!d.caughtAttr); return `${caughtCount} (${Math.floor((caughtCount / Object.keys(gameData.dexData).length) * 1000) / 10}%)`; - } + }, }, ribbonsOwned: { label_key: "ribbonsOwned", sourceFunc: gameData => gameData.gameStats.ribbonsOwned.toString(), }, - classicSessionsPlayed:{ + classicSessionsPlayed: { label_key: "classicRuns", sourceFunc: gameData => gameData.gameStats.classicSessionsPlayed.toString(), }, @@ -82,12 +82,12 @@ const displayStats: DisplayStats = { endlessSessionsPlayed: { label_key: "endlessRuns", sourceFunc: gameData => gameData.gameStats.endlessSessionsPlayed.toString(), - hidden: true + hidden: true, }, highestEndlessWave: { label_key: "highestWaveEndless", sourceFunc: gameData => gameData.gameStats.highestEndlessWave.toString(), - hidden: true + hidden: true, }, highestMoney: { label_key: "highestMoney", @@ -120,67 +120,67 @@ const displayStats: DisplayStats = { subLegendaryPokemonSeen: { label_key: "subLegendsSeen", sourceFunc: gameData => gameData.gameStats.subLegendaryPokemonSeen.toString(), - hidden: true + hidden: true, }, subLegendaryPokemonCaught: { label_key: "subLegendsCaught", sourceFunc: gameData => gameData.gameStats.subLegendaryPokemonCaught.toString(), - hidden: true + hidden: true, }, subLegendaryPokemonHatched: { label_key: "subLegendsHatched", sourceFunc: gameData => gameData.gameStats.subLegendaryPokemonHatched.toString(), - hidden: true + hidden: true, }, legendaryPokemonSeen: { label_key: "legendsSeen", sourceFunc: gameData => gameData.gameStats.legendaryPokemonSeen.toString(), - hidden: true + hidden: true, }, legendaryPokemonCaught: { label_key: "legendsCaught", sourceFunc: gameData => gameData.gameStats.legendaryPokemonCaught.toString(), - hidden: true + hidden: true, }, legendaryPokemonHatched: { label_key: "legendsHatched", sourceFunc: gameData => gameData.gameStats.legendaryPokemonHatched.toString(), - hidden: true + hidden: true, }, mythicalPokemonSeen: { label_key: "mythicalsSeen", sourceFunc: gameData => gameData.gameStats.mythicalPokemonSeen.toString(), - hidden: true + hidden: true, }, mythicalPokemonCaught: { label_key: "mythicalsCaught", sourceFunc: gameData => gameData.gameStats.mythicalPokemonCaught.toString(), - hidden: true + hidden: true, }, mythicalPokemonHatched: { label_key: "mythicalsHatched", sourceFunc: gameData => gameData.gameStats.mythicalPokemonHatched.toString(), - hidden: true + hidden: true, }, shinyPokemonSeen: { label_key: "shiniesSeen", sourceFunc: gameData => gameData.gameStats.shinyPokemonSeen.toString(), - hidden: true + hidden: true, }, shinyPokemonCaught: { label_key: "shiniesCaught", sourceFunc: gameData => gameData.gameStats.shinyPokemonCaught.toString(), - hidden: true + hidden: true, }, shinyPokemonHatched: { label_key: "shiniesHatched", sourceFunc: gameData => gameData.gameStats.shinyPokemonHatched.toString(), - hidden: true + hidden: true, }, pokemonFused: { label_key: "pokemonFused", sourceFunc: gameData => gameData.gameStats.pokemonFused.toString(), - hidden: true + hidden: true, }, trainersDefeated: { label_key: "trainersDefeated", @@ -189,27 +189,27 @@ const displayStats: DisplayStats = { eggsPulled: { label_key: "eggsPulled", sourceFunc: gameData => gameData.gameStats.eggsPulled.toString(), - hidden: true + hidden: true, }, rareEggsPulled: { label_key: "rareEggsPulled", sourceFunc: gameData => gameData.gameStats.rareEggsPulled.toString(), - hidden: true + hidden: true, }, epicEggsPulled: { label_key: "epicEggsPulled", sourceFunc: gameData => gameData.gameStats.epicEggsPulled.toString(), - hidden: true + hidden: true, }, legendaryEggsPulled: { label_key: "legendaryEggsPulled", sourceFunc: gameData => gameData.gameStats.legendaryEggsPulled.toString(), - hidden: true + hidden: true, }, manaphyEggsPulled: { label_key: "manaphyEggsPulled", sourceFunc: gameData => gameData.gameStats.manaphyEggsPulled.toString(), - hidden: true + hidden: true, }, }; @@ -235,35 +235,50 @@ export default class GameStatsUiHandler extends UiHandler { this.gameStatsContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1); - this.gameStatsContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains); + this.gameStatsContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), + Phaser.Geom.Rectangle.Contains, + ); - const headerBg = addWindow(0, 0, (globalScene.game.canvas.width / 6) - 2, 24); + const headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6 - 2, 24); headerBg.setOrigin(0, 0); const headerText = addTextObject(0, 0, i18next.t("gameStatsUiHandler:stats"), TextStyle.SETTINGS_LABEL); headerText.setOrigin(0, 0); headerText.setPositionRelative(headerBg, 8, 4); - const statsBgWidth = ((globalScene.game.canvas.width / 6) - 2) / 2; - const [ statsBgLeft, statsBgRight ] = new Array(2).fill(null).map((_, i) => { + const statsBgWidth = (globalScene.game.canvas.width / 6 - 2) / 2; + const [statsBgLeft, statsBgRight] = new Array(2).fill(null).map((_, i) => { const width = statsBgWidth + 2; - const height = Math.floor((globalScene.game.canvas.height / 6) - headerBg.height - 2); - const statsBg = addWindow((statsBgWidth - 2) * i, headerBg.height, width, height, false, false, i > 0 ? -3 : 0, 1); + const height = Math.floor(globalScene.game.canvas.height / 6 - headerBg.height - 2); + const statsBg = addWindow( + (statsBgWidth - 2) * i, + headerBg.height, + width, + height, + false, + false, + i > 0 ? -3 : 0, + 1, + ); statsBg.setOrigin(0, 0); return statsBg; }); this.statsContainer = globalScene.add.container(0, 0); - new Array(18).fill(null).map((_, s) => { - - const statLabel = addTextObject(8 + (s % 2 === 1 ? statsBgWidth : 0), 28 + Math.floor(s / 2) * 16, "", TextStyle.STATS_LABEL); + const statLabel = addTextObject( + 8 + (s % 2 === 1 ? statsBgWidth : 0), + 28 + Math.floor(s / 2) * 16, + "", + TextStyle.STATS_LABEL, + ); statLabel.setOrigin(0, 0); this.statsContainer.add(statLabel); this.statLabels.push(statLabel); - const statValue = addTextObject((statsBgWidth * ((s % 2) + 1)) - 8, statLabel.y, "", TextStyle.STATS_VALUE); + const statValue = addTextObject(statsBgWidth * ((s % 2) + 1) - 8, statLabel.y, "", TextStyle.STATS_VALUE); statValue.setOrigin(1, 0); this.statsContainer.add(statValue); this.statValues.push(statValue); @@ -277,7 +292,11 @@ export default class GameStatsUiHandler extends UiHandler { // arrows to show that we can scroll through the stats const isLegacyTheme = globalScene.uiTheme === UiTheme.LEGACY; - this.arrowDown = globalScene.add.sprite(statsBgWidth, globalScene.game.canvas.height / 6 - (isLegacyTheme ? 9 : 5), "prompt"); + this.arrowDown = globalScene.add.sprite( + statsBgWidth, + globalScene.game.canvas.height / 6 - (isLegacyTheme ? 9 : 5), + "prompt", + ); this.gameStatsContainer.add(this.arrowDown); this.arrowUp = globalScene.add.sprite(statsBgWidth, headerBg.height + (isLegacyTheme ? 7 : 3), "prompt"); this.arrowUp.flipY = true; @@ -320,7 +339,11 @@ export default class GameStatsUiHandler extends UiHandler { statKeys.forEach((key, s) => { const stat = displayStats[key] as DisplayStat; const value = stat.sourceFunc!(globalScene.gameData); // TODO: is this bang correct? - this.statLabels[s].setText(!stat.hidden || isNaN(parseInt(value)) || parseInt(value) ? i18next.t(`gameStatsUiHandler:${stat.label_key}`) : "???"); + this.statLabels[s].setText( + !stat.hidden || Number.isNaN(Number.parseInt(value)) || Number.parseInt(value) + ? i18next.t(`gameStatsUiHandler:${stat.label_key}`) + : "???", + ); this.statValues[s].setText(value); }); if (statKeys.length < 18) { @@ -372,7 +395,7 @@ export default class GameStatsUiHandler extends UiHandler { return success; } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const ret = super.setCursor(cursor); if (ret) { @@ -403,16 +426,18 @@ export function initStatsKeys() { displayStats[key] = { label_key: label, sourceFunc: gameData => gameData.gameStats[key].toString(), - hidden: hidden + hidden: hidden, }; } else if (displayStats[key] === null) { displayStats[key] = { - sourceFunc: gameData => gameData.gameStats[key].toString() + sourceFunc: gameData => gameData.gameStats[key].toString(), }; } if (!(displayStats[key] as DisplayStat).label_key) { const splittableKey = key.replace(/([a-z]{2,})([A-Z]{1}(?:[^A-Z]|$))/g, "$1_$2"); - (displayStats[key] as DisplayStat).label_key = Utils.toReadableString(`${splittableKey[0].toUpperCase()}${splittableKey.slice(1)}`); + (displayStats[key] as DisplayStat).label_key = Utils.toReadableString( + `${splittableKey[0].toUpperCase()}${splittableKey.slice(1)}`, + ); } } } diff --git a/src/ui/hatched-pokemon-container.ts b/src/ui/hatched-pokemon-container.ts index f006002617a..0b283c2e063 100644 --- a/src/ui/hatched-pokemon-container.ts +++ b/src/ui/hatched-pokemon-container.ts @@ -91,8 +91,8 @@ export class HatchedPokemonContainer extends Phaser.GameObjects.Container { const caughtAttr = dexEntry.caughtAttr; const newShiny = BigInt(1 << (displayPokemon.shiny ? 1 : 0)); const newVariant = BigInt(1 << (displayPokemon.variant + 4)); - const newShinyOrVariant = ((newShiny & caughtAttr) === BigInt(0)) || ((newVariant & caughtAttr) === BigInt(0)); - const newForm = (BigInt(1 << displayPokemon.formIndex) * DexAttr.DEFAULT_FORM & caughtAttr) === BigInt(0); + const newShinyOrVariant = (newShiny & caughtAttr) === BigInt(0) || (newVariant & caughtAttr) === BigInt(0); + const newForm = ((BigInt(1 << displayPokemon.formIndex) * DexAttr.DEFAULT_FORM) & caughtAttr) === BigInt(0); const female = displayPokemon.gender === Gender.FEMALE; const formIndex = displayPokemon.formIndex; diff --git a/src/ui/loading-modal-ui-handler.ts b/src/ui/loading-modal-ui-handler.ts index 7ee0949c71e..9626276245d 100644 --- a/src/ui/loading-modal-ui-handler.ts +++ b/src/ui/loading-modal-ui-handler.ts @@ -21,11 +21,11 @@ export default class LoadingModalUiHandler extends ModalUiHandler { } getMargin(): [number, number, number, number] { - return [ 0, 0, 48, 0 ]; + return [0, 0, 48, 0]; } getButtonLabels(): string[] { - return [ ]; + return []; } setup(): void { diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/login-form-ui-handler.ts index fbed98910e2..bee3863a452 100644 --- a/src/ui/login-form-ui-handler.ts +++ b/src/ui/login-form-ui-handler.ts @@ -47,7 +47,10 @@ export default class LoginFormUiHandler extends FormModalUiHandler { private buildExternalPartyContainer() { this.externalPartyContainer = globalScene.add.container(0, 0); - this.externalPartyContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 12, globalScene.game.canvas.height / 12), Phaser.Geom.Rectangle.Contains); + this.externalPartyContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 12, globalScene.game.canvas.height / 12), + Phaser.Geom.Rectangle.Contains, + ); this.externalPartyTitle = addTextObject(0, 4, "", TextStyle.SETTINGS_LABEL); this.externalPartyTitle.setOrigin(0.5, 0); this.externalPartyBg = addWindow(0, 0, 0, 0); @@ -70,12 +73,12 @@ export default class LoginFormUiHandler extends FormModalUiHandler { this.usernameInfoImage = this.buildInteractableImage("settings_icon", "username-info-icon", { x: 20, - scale: 0.5 + scale: 0.5, }); this.saveDownloadImage = this.buildInteractableImage("saving_icon", "save-download-icon", { x: 0, - scale: 0.75 + scale: 0.75, }); this.infoContainer.add(this.usernameInfoImage); @@ -98,11 +101,11 @@ export default class LoginFormUiHandler extends FormModalUiHandler { } override getMargin(_config?: ModalConfig): [number, number, number, number] { - return [ 0, 0, 48, 0 ]; + return [0, 0, 48, 0]; } override getButtonLabels(_config?: ModalConfig): string[] { - return [ i18next.t("menu:login"), i18next.t("menu:register") ]; + return [i18next.t("menu:login"), i18next.t("menu:register")]; } override getReadableErrorMessage(error: string): string { @@ -131,22 +134,24 @@ export default class LoginFormUiHandler extends FormModalUiHandler { override getInputFieldConfigs(): InputFieldConfig[] { const inputFieldConfigs: InputFieldConfig[] = []; inputFieldConfigs.push({ label: i18next.t("menu:username") }); - inputFieldConfigs.push({ label: i18next.t("menu:password"), isPassword: true }); + inputFieldConfigs.push({ + label: i18next.t("menu:password"), + isPassword: true, + }); return inputFieldConfigs; } override show(args: any[]): boolean { if (super.show(args)) { - const config = args[0] as ModalConfig; this.processExternalProvider(config); const originalLoginAction = this.submitAction; - this.submitAction = (_) => { + this.submitAction = _ => { if (globalScene.tweens.getTweensOf(this.modalContainer).length === 0) { // Prevent overlapping overrides on action modification this.submitAction = originalLoginAction; this.sanitizeInputs(); - globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); + globalScene.ui.setMode(Mode.LOADING, { buttonActions: [] }); const onFail = error => { globalScene.ui.setMode(Mode.LOGIN_FORM, Object.assign(config, { errorMessage: error?.trim() })); globalScene.ui.playError(); @@ -155,16 +160,15 @@ export default class LoginFormUiHandler extends FormModalUiHandler { return onFail(i18next.t("menu:emptyUsername")); } - const [ usernameInput, passwordInput ] = this.inputs; + const [usernameInput, passwordInput] = this.inputs; - pokerogueApi.account.login({ username: usernameInput.text, password: passwordInput.text }).then(error => { - if (!error) { - originalLoginAction && originalLoginAction(); - } else { - onFail(error); - } - }); - } + pokerogueApi.account.login({ username: usernameInput.text, password: passwordInput.text }).then(error => { + if (!error && originalLoginAction) { + originalLoginAction(); + } else { + onFail(error); + } + }); }; return true; @@ -179,7 +183,9 @@ export default class LoginFormUiHandler extends FormModalUiHandler { this.infoContainer.setVisible(false); this.setMouseCursorStyle("default"); //reset cursor - [ this.discordImage, this.googleImage, this.usernameInfoImage, this.saveDownloadImage ].forEach((img) => img.off("pointerdown")); + [this.discordImage, this.googleImage, this.usernameInfoImage, this.saveDownloadImage].forEach(img => + img.off("pointerdown"), + ); } private processExternalProvider(config: ModalConfig): void { @@ -214,7 +220,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler { }); const onFail = error => { - globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); + globalScene.ui.setMode(Mode.LOADING, { buttonActions: [] }); globalScene.ui.setModeForceTransition(Mode.LOGIN_FORM, Object.assign(config, { errorMessage: error?.trim() })); globalScene.ui.playError(); }; @@ -233,20 +239,22 @@ export default class LoginFormUiHandler extends FormModalUiHandler { globalScene.ui.revertMode(); this.infoContainer.disableInteractive(); return true; - } + }, }); } globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, { options: options, - delay: 1000 + delay: 1000, }); - this.infoContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width, globalScene.game.canvas.height), Phaser.Geom.Rectangle.Contains); + this.infoContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width, globalScene.game.canvas.height), + Phaser.Geom.Rectangle.Contains, + ); } else { if (dataKeys.length > 2) { return onFail(this.ERR_TOO_MANY_SAVES); - } else { - return onFail(this.ERR_NO_SAVES); } + return onFail(this.ERR_NO_SAVES); } } }); @@ -285,7 +293,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler { duration: Utils.fixedInt(1000), ease: "Sine.easeInOut", y: "-=24", - alpha: 1 + alpha: 1, }); this.infoContainer.setAlpha(0); @@ -294,17 +302,12 @@ export default class LoginFormUiHandler extends FormModalUiHandler { duration: Utils.fixedInt(1000), ease: "Sine.easeInOut", y: "-=24", - alpha: 1 + alpha: 1, }); } private buildInteractableImage(texture: string, name: string, opts: BuildInteractableImageOpts = {}) { - const { - scale = 0.07, - x = 0, - y = 0, - origin = { x: 0, y: 0 } - } = opts; + const { scale = 0.07, x = 0, y = 0, origin = { x: 0, y: 0 } } = opts; const img = globalScene.add.image(x, y, texture); img.setName(name); img.setOrigin(origin.x, origin.y); diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts index 1a1070122ab..b83ae24c9e0 100644 --- a/src/ui/menu-ui-handler.ts +++ b/src/ui/menu-ui-handler.ts @@ -23,6 +23,7 @@ enum MenuOptions { STATS, EGG_LIST, EGG_GACHA, + POKEDEX, MANAGE_DATA, COMMUNITY, SAVE_AND_QUIT, @@ -59,7 +60,7 @@ export default class MenuUiHandler extends MessageUiHandler { private menuMessageBox: Phaser.GameObjects.NineSlice; private dialogueMessageBox: Phaser.GameObjects.NineSlice; - protected scale: number = 0.1666666667; + protected scale = 0.1666666667; public bgmBar: BgmBar; @@ -67,12 +68,15 @@ export default class MenuUiHandler extends MessageUiHandler { super(mode); this.excludedMenus = () => [ - { condition: [ Mode.COMMAND, Mode.TITLE ].includes(mode ?? Mode.TITLE), options: [ MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST ]}, - { condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]} + { + condition: [Mode.COMMAND, Mode.TITLE].includes(mode ?? Mode.TITLE), + options: [MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST], + }, + { condition: bypassLogin, options: [MenuOptions.LOG_OUT] }, ]; this.menuOptions = Utils.getEnumKeys(MenuOptions) - .map(m => parseInt(MenuOptions[m]) as MenuOptions) + .map(m => Number.parseInt(MenuOptions[m]) as MenuOptions) .filter(m => { return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m)); }); @@ -82,7 +86,7 @@ export default class MenuUiHandler extends MessageUiHandler { const ui = this.getUi(); // wiki url directs based on languges available on wiki const lang = i18next.resolvedLanguage?.substring(0, 2)!; // TODO: is this bang correct? - if ([ "de", "fr", "ko", "zh" ].includes(lang)) { + if (["de", "fr", "ko", "zh"].includes(lang)) { wikiUrl = `https://wiki.pokerogue.net/${lang}:start`; } @@ -93,9 +97,20 @@ export default class MenuUiHandler extends MessageUiHandler { this.menuContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1); this.menuContainer.setName("menu"); - this.menuContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains); + this.menuContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), + Phaser.Geom.Rectangle.Contains, + ); - this.menuOverlay = new Phaser.GameObjects.Rectangle(globalScene, -1, -1, globalScene.scaledCanvas.width, globalScene.scaledCanvas.height, 0xffffff, 0.3); + this.menuOverlay = new Phaser.GameObjects.Rectangle( + globalScene, + -1, + -1, + globalScene.scaledCanvas.width, + globalScene.scaledCanvas.height, + 0xffffff, + 0.3, + ); this.menuOverlay.setName("menu-overlay"); this.menuOverlay.setOrigin(0, 0); this.menuContainer.add(this.menuOverlay); @@ -103,32 +118,39 @@ export default class MenuUiHandler extends MessageUiHandler { this.menuContainer.add(this.bgmBar); this.menuContainer.setVisible(false); - } - render() { const ui = this.getUi(); this.excludedMenus = () => [ - { condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, options: [ MenuOptions.EGG_GACHA ]}, - { condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]} + { + condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, + options: [MenuOptions.EGG_GACHA], + }, + { condition: bypassLogin, options: [MenuOptions.LOG_OUT] }, ]; this.menuOptions = Utils.getEnumKeys(MenuOptions) - .map(m => parseInt(MenuOptions[m]) as MenuOptions) + .map(m => Number.parseInt(MenuOptions[m]) as MenuOptions) .filter(m => { return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m)); }); - this.optionSelectText = addTextObject(0, 0, this.menuOptions.map(o => `${i18next.t(`menuUiHandler:${MenuOptions[o]}`)}`).join("\n"), TextStyle.WINDOW, { maxLines: this.menuOptions.length }); + this.optionSelectText = addTextObject( + 0, + 0, + this.menuOptions.map(o => `${i18next.t(`menuUiHandler:${MenuOptions[o]}`)}`).join("\n"), + TextStyle.WINDOW, + { maxLines: this.menuOptions.length }, + ); this.optionSelectText.setLineSpacing(12); this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale; this.menuBg = addWindow( - (globalScene.game.canvas.width / 6) - (this.optionSelectText.displayWidth + 25), + globalScene.game.canvas.width / 6 - (this.optionSelectText.displayWidth + 25), 0, this.optionSelectText.displayWidth + 19 + 24 * this.scale, - (globalScene.game.canvas.height / 6) - 2 + globalScene.game.canvas.height / 6 - 2, ); this.menuBg.setOrigin(0, 0); @@ -150,7 +172,17 @@ export default class MenuUiHandler extends MessageUiHandler { this.menuMessageBoxContainer.add(this.menuMessageBox); // Full-width window used for testing dialog messages in debug mode - this.dialogueMessageBox = addWindow(-this.textPadding, 0, globalScene.game.canvas.width / 6 + this.textPadding * 2, 49, false, false, 0, 0, WindowVariant.THIN); + this.dialogueMessageBox = addWindow( + -this.textPadding, + 0, + globalScene.game.canvas.width / 6 + this.textPadding * 2, + 49, + false, + false, + 0, + 0, + WindowVariant.THIN, + ); this.dialogueMessageBox.setOrigin(0, 0); this.menuMessageBoxContainer.add(this.dialogueMessageBox); @@ -171,29 +203,36 @@ export default class MenuUiHandler extends MessageUiHandler { const manageDataOptions: any[] = []; // TODO: proper type - const confirmSlot = (message: string, slotFilter: (i: integer) => boolean, callback: (i: integer) => void) => { + const confirmSlot = (message: string, slotFilter: (i: number) => boolean, callback: (i: number) => void) => { ui.revertMode(); ui.showText(message, null, () => { const config: OptionSelectConfig = { - options: new Array(5).fill(null).map((_, i) => i).filter(slotFilter).map(i => { - return { - label: i18next.t("menuUiHandler:slot", { slotNumber: i + 1 }), - handler: () => { - callback(i); - ui.revertMode(); - ui.showText("", 0); - return true; - } - }; - }).concat([{ - label: i18next.t("menuUiHandler:cancel"), - handler: () => { - ui.revertMode(); - ui.showText("", 0); - return true; - } - }]), - xOffset: 98 + options: new Array(5) + .fill(null) + .map((_, i) => i) + .filter(slotFilter) + .map(i => { + return { + label: i18next.t("menuUiHandler:slot", { slotNumber: i + 1 }), + handler: () => { + callback(i); + ui.revertMode(); + ui.showText("", 0); + return true; + }, + }; + }) + .concat([ + { + label: i18next.t("menuUiHandler:cancel"), + handler: () => { + ui.revertMode(); + ui.showText("", 0); + return true; + }, + }, + ]), + xOffset: 98, }; ui.setOverlayMode(Mode.MENU_OPTION_SELECT, config); }); @@ -203,16 +242,20 @@ export default class MenuUiHandler extends MessageUiHandler { manageDataOptions.push({ label: i18next.t("menuUiHandler:importSession"), handler: () => { - confirmSlot(i18next.t("menuUiHandler:importSlotSelect"), () => true, slotId => globalScene.gameData.importData(GameDataType.SESSION, slotId)); + confirmSlot( + i18next.t("menuUiHandler:importSlotSelect"), + () => true, + slotId => globalScene.gameData.importData(GameDataType.SESSION, slotId), + ); return true; }, - keepOpen: true + keepOpen: true, }); } manageDataOptions.push({ label: i18next.t("menuUiHandler:exportSession"), handler: () => { - const dataSlots: integer[] = []; + const dataSlots: number[] = []; Promise.all( new Array(5).fill(null).map((_, i) => { const slotId = i; @@ -221,14 +264,17 @@ export default class MenuUiHandler extends MessageUiHandler { dataSlots.push(slotId); } }); - })).then(() => { - confirmSlot(i18next.t("menuUiHandler:exportSlotSelect"), + }), + ).then(() => { + confirmSlot( + i18next.t("menuUiHandler:exportSlotSelect"), i => dataSlots.indexOf(i) > -1, - slotId => globalScene.gameData.tryExportData(GameDataType.SESSION, slotId)); + slotId => globalScene.gameData.tryExportData(GameDataType.SESSION, slotId), + ); }); return true; }, - keepOpen: true + keepOpen: true, }); manageDataOptions.push({ label: i18next.t("menuUiHandler:importRunHistory"), @@ -236,7 +282,7 @@ export default class MenuUiHandler extends MessageUiHandler { globalScene.gameData.importData(GameDataType.RUN_HISTORY); return true; }, - keepOpen: true + keepOpen: true, }); manageDataOptions.push({ label: i18next.t("menuUiHandler:exportRunHistory"), @@ -244,7 +290,7 @@ export default class MenuUiHandler extends MessageUiHandler { globalScene.gameData.tryExportData(GameDataType.RUN_HISTORY); return true; }, - keepOpen: true + keepOpen: true, }); if (Utils.isLocal || Utils.isBeta) { manageDataOptions.push({ @@ -254,33 +300,36 @@ export default class MenuUiHandler extends MessageUiHandler { globalScene.gameData.importData(GameDataType.SYSTEM); return true; }, - keepOpen: true + keepOpen: true, }); } - manageDataOptions.push({ - label: i18next.t("menuUiHandler:exportData"), - handler: () => { - globalScene.gameData.tryExportData(GameDataType.SYSTEM); - return true; + manageDataOptions.push( + { + label: i18next.t("menuUiHandler:exportData"), + handler: () => { + globalScene.gameData.tryExportData(GameDataType.SYSTEM); + return true; + }, + keepOpen: true, }, - keepOpen: true - }, - { - label: i18next.t("menuUiHandler:consentPreferences"), - handler: () => { - const consentLink = document.querySelector(".termly-display-preferences") as HTMLInputElement; - const clickEvent = new MouseEvent("click", { - view: window, - bubbles: true, - cancelable: true - }); - consentLink.dispatchEvent(clickEvent); - consentLink.focus(); - return true; + { + label: i18next.t("menuUiHandler:consentPreferences"), + handler: () => { + const consentLink = document.querySelector(".termly-display-preferences") as HTMLInputElement; + const clickEvent = new MouseEvent("click", { + view: window, + bubbles: true, + cancelable: true, + }); + consentLink.dispatchEvent(clickEvent); + consentLink.focus(); + return true; + }, + keepOpen: true, }, - keepOpen: true - }); - if (Utils.isLocal || Utils.isBeta) { // this should make sure we don't have this option in live + ); + if (Utils.isLocal || Utils.isBeta) { + // this should make sure we don't have this option in live manageDataOptions.push({ label: "Test Dialogue", handler: () => { @@ -298,7 +347,7 @@ export default class MenuUiHandler extends MessageUiHandler { const interpolatorOptions: any = {}; const splitArr = dialogueName.split(" "); // this splits our inputted text into words to cycle through later const translatedString = splitArr[0]; // this is our outputted i18 string - const regex = RegExp("\\{\\{(\\w*)\\}\\}", "g"); // this is a regex expression to find all the text between {{ }} in the i18 output + const regex = /\{\{(\w*)\}\}/g; // this is a regex expression to find all the text between {{ }} in the i18 output const matches = i18next.t(translatedString).match(regex) ?? []; if (matches.length > 0) { for (let match = 0; match < matches.length; match++) { @@ -311,20 +360,27 @@ export default class MenuUiHandler extends MessageUiHandler { } // Switch to the dialog test window this.setDialogTestMode(true); - ui.showText(String(i18next.t(translatedString, interpolatorOptions)), null, () => globalScene.ui.showText("", 0, () => { - handler.tutorialActive = false; - // Go back to the default message window - this.setDialogTestMode(false); - }), null, true); + ui.showText( + String(i18next.t(translatedString, interpolatorOptions)), + null, + () => + globalScene.ui.showText("", 0, () => { + handler.tutorialActive = false; + // Go back to the default message window + this.setDialogTestMode(false); + }), + null, + true, + ); }, () => { ui.revertMode(); - } + }, ]; ui.setMode(Mode.TEST_DIALOGUE, buttonAction, prefilledText); return true; }, - keepOpen: true + keepOpen: true, }); } manageDataOptions.push({ @@ -333,14 +389,14 @@ export default class MenuUiHandler extends MessageUiHandler { globalScene.ui.revertMode(); return true; }, - keepOpen: true + keepOpen: true, }); //Thank you Vassiat this.manageDataConfig = { xOffset: 98, options: manageDataOptions, - maxOptions: 7 + maxOptions: 7, }; const communityOptions: OptionSelectItem[] = [ @@ -350,7 +406,7 @@ export default class MenuUiHandler extends MessageUiHandler { window.open(wikiUrl, "_blank")?.focus(); return true; }, - keepOpen: true + keepOpen: true, }, { label: "Discord", @@ -358,7 +414,7 @@ export default class MenuUiHandler extends MessageUiHandler { window.open(discordUrl, "_blank")?.focus(); return true; }, - keepOpen: true + keepOpen: true, }, { label: "GitHub", @@ -366,7 +422,7 @@ export default class MenuUiHandler extends MessageUiHandler { window.open(githubUrl, "_blank")?.focus(); return true; }, - keepOpen: true + keepOpen: true, }, { label: "Reddit", @@ -374,7 +430,7 @@ export default class MenuUiHandler extends MessageUiHandler { window.open(redditUrl, "_blank")?.focus(); return true; }, - keepOpen: true + keepOpen: true, }, { label: i18next.t("menuUiHandler:donate"), @@ -382,52 +438,58 @@ export default class MenuUiHandler extends MessageUiHandler { window.open(donateUrl, "_blank")?.focus(); return true; }, - keepOpen: true - } + keepOpen: true, + }, ]; if (!bypassLogin && loggedInUser?.hasAdminRole) { communityOptions.push({ label: "Admin", handler: () => { - - const skippedAdminModes: AdminMode[] = [ AdminMode.ADMIN ]; // this is here so that we can skip the menu populating enums that aren't meant for the menu, such as the AdminMode.ADMIN + const skippedAdminModes: AdminMode[] = [AdminMode.ADMIN]; // this is here so that we can skip the menu populating enums that aren't meant for the menu, such as the AdminMode.ADMIN const options: OptionSelectItem[] = []; - Object.values(AdminMode).filter((v) => !isNaN(Number(v)) && !skippedAdminModes.includes(v as AdminMode)).forEach((mode) => { // this gets all the enums in a way we can use - options.push({ - label: getAdminModeName(mode as AdminMode), - handler: () => { - ui.playSelect(); - ui.setOverlayMode(Mode.ADMIN, { - buttonActions: [ - // we double revert here and below to go back 2 layers of menus - () => { - ui.revertMode(); - ui.revertMode(); + Object.values(AdminMode) + .filter(v => !Number.isNaN(Number(v)) && !skippedAdminModes.includes(v as AdminMode)) + .forEach(mode => { + // this gets all the enums in a way we can use + options.push({ + label: getAdminModeName(mode as AdminMode), + handler: () => { + ui.playSelect(); + ui.setOverlayMode( + Mode.ADMIN, + { + buttonActions: [ + // we double revert here and below to go back 2 layers of menus + () => { + ui.revertMode(); + ui.revertMode(); + }, + () => { + ui.revertMode(); + ui.revertMode(); + }, + ], }, - () => { - ui.revertMode(); - ui.revertMode(); - } - ] - }, mode); // mode is our AdminMode enum - return true; - } + mode, + ); // mode is our AdminMode enum + return true; + }, + }); }); - }); options.push({ label: "Cancel", handler: () => { ui.revertMode(); return true; - } + }, }); globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, { options: options, - delay: 0 + delay: 0, }); return true; }, - keepOpen: true + keepOpen: true, }); } communityOptions.push({ @@ -435,11 +497,11 @@ export default class MenuUiHandler extends MessageUiHandler { handler: () => { globalScene.ui.revertMode(); return true; - } + }, }); this.communityConfig = { xOffset: 98, - options: communityOptions + options: communityOptions, }; this.setCursor(0); } @@ -449,7 +511,7 @@ export default class MenuUiHandler extends MessageUiHandler { super.show(args); this.menuOptions = Utils.getEnumKeys(MenuOptions) - .map(m => parseInt(MenuOptions[m]) as MenuOptions) + .map(m => Number.parseInt(MenuOptions[m]) as MenuOptions) .filter(m => { return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m)); }); @@ -470,7 +532,6 @@ export default class MenuUiHandler extends MessageUiHandler { this.bgmBar.toggleBgmBar(true); - return true; } @@ -522,11 +583,28 @@ export default class MenuUiHandler extends MessageUiHandler { ui.setOverlayMode(Mode.EGG_GACHA); success = true; break; + case MenuOptions.POKEDEX: + ui.revertMode(); + ui.setOverlayMode(Mode.POKEDEX); + success = true; + break; case MenuOptions.MANAGE_DATA: - if (!bypassLogin && !this.manageDataConfig.options.some(o => o.label === i18next.t("menuUiHandler:linkDiscord") || o.label === i18next.t("menuUiHandler:unlinkDiscord"))) { - this.manageDataConfig.options.splice(this.manageDataConfig.options.length - 1, 0, + if ( + !bypassLogin && + !this.manageDataConfig.options.some( + o => + o.label === i18next.t("menuUiHandler:linkDiscord") || + o.label === i18next.t("menuUiHandler:unlinkDiscord"), + ) + ) { + this.manageDataConfig.options.splice( + this.manageDataConfig.options.length - 1, + 0, { - label: loggedInUser?.discordId === "" ? i18next.t("menuUiHandler:linkDiscord") : i18next.t("menuUiHandler:unlinkDiscord"), + label: + loggedInUser?.discordId === "" + ? i18next.t("menuUiHandler:linkDiscord") + : i18next.t("menuUiHandler:unlinkDiscord"), handler: () => { if (loggedInUser?.discordId === "") { const token = Utils.getCookie(Utils.sessionIdKey); @@ -535,16 +613,18 @@ export default class MenuUiHandler extends MessageUiHandler { const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&state=${token}&prompt=none`; window.open(discordUrl, "_self"); return true; - } else { - pokerogueApi.unlinkDiscord().then(_isSuccess => { - updateUserInfo().then(() => globalScene.reset(true, true)); - }); - return true; } - } + pokerogueApi.unlinkDiscord().then(_isSuccess => { + updateUserInfo().then(() => globalScene.reset(true, true)); + }); + return true; + }, }, { - label: loggedInUser?.googleId === "" ? i18next.t("menuUiHandler:linkGoogle") : i18next.t("menuUiHandler:unlinkGoogle"), + label: + loggedInUser?.googleId === "" + ? i18next.t("menuUiHandler:linkGoogle") + : i18next.t("menuUiHandler:unlinkGoogle"), handler: () => { if (loggedInUser?.googleId === "") { const token = Utils.getCookie(Utils.sessionIdKey); @@ -553,14 +633,14 @@ export default class MenuUiHandler extends MessageUiHandler { const googleUrl = `https://accounts.google.com/o/oauth2/auth?client_id=${googleId}&response_type=code&redirect_uri=${redirectUri}&scope=openid&state=${token}`; window.open(googleUrl, "_self"); return true; - } else { - pokerogueApi.unlinkGoogle().then(_isSuccess => { - updateUserInfo().then(() => globalScene.reset(true, true)); - }); - return true; } - } - }); + pokerogueApi.unlinkGoogle().then(_isSuccess => { + updateUserInfo().then(() => globalScene.reset(true, true)); + }); + return true; + }, + }, + ); } ui.setOverlayMode(Mode.MENU_OPTION_SELECT, this.manageDataConfig); success = true; @@ -574,11 +654,11 @@ export default class MenuUiHandler extends MessageUiHandler { success = true; const doSaveQuit = () => { ui.setMode(Mode.LOADING, { - buttonActions: [], fadeOut: () => + buttonActions: [], + fadeOut: () => globalScene.gameData.saveAll(true, true, true, true).then(() => { - globalScene.reset(true); - }) + }), }); }; if (globalScene.currentBattle.turn > 1) { @@ -587,10 +667,16 @@ export default class MenuUiHandler extends MessageUiHandler { this.showText("", 0); return; } - ui.setOverlayMode(Mode.CONFIRM, doSaveQuit, () => { - ui.revertMode(); - this.showText("", 0); - }, false, -98); + ui.setOverlayMode( + Mode.CONFIRM, + doSaveQuit, + () => { + ui.revertMode(); + this.showText("", 0); + }, + false, + -98, + ); }); } else { doSaveQuit(); @@ -603,9 +689,11 @@ export default class MenuUiHandler extends MessageUiHandler { success = true; const doLogout = () => { ui.setMode(Mode.LOADING, { - buttonActions: [], fadeOut: () => pokerogueApi.account.logout().then(() => { - updateUserInfo().then(() => globalScene.reset(true, true)); - }) + buttonActions: [], + fadeOut: () => + pokerogueApi.account.logout().then(() => { + updateUserInfo().then(() => globalScene.reset(true, true)); + }), }); }; if (globalScene.currentBattle) { @@ -614,10 +702,16 @@ export default class MenuUiHandler extends MessageUiHandler { this.showText("", 0); return; } - ui.setOverlayMode(Mode.CONFIRM, doLogout, () => { - ui.revertMode(); - this.showText("", 0); - }, false, -98); + ui.setOverlayMode( + Mode.CONFIRM, + doLogout, + () => { + ui.revertMode(); + this.showText("", 0); + }, + false, + -98, + ); }); } else { doLogout(); @@ -669,18 +763,27 @@ export default class MenuUiHandler extends MessageUiHandler { this.menuMessageBox.setVisible(!isDialogMode); this.dialogueMessageBox.setVisible(isDialogMode); // If we're testing dialog, we use the same word wrapping as the battle message handler - this.message.setWordWrapWidth(isDialogMode ? globalScene.ui.getMessageHandler().wordWrapWidth : this.defaultWordWrapWidth); + this.message.setWordWrapWidth( + isDialogMode ? globalScene.ui.getMessageHandler().wordWrapWidth : this.defaultWordWrapWidth, + ); this.message.setX(isDialogMode ? this.textPadding + 1 : this.textPadding); this.message.setY(isDialogMode ? this.textPadding + 0.4 : this.textPadding); } - showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number): void { + showText( + text: string, + delay?: number, + callback?: Function, + callbackDelay?: number, + prompt?: boolean, + promptDelay?: number, + ): void { this.menuMessageBoxContainer.setVisible(!!text); super.showText(text, delay, callback, callbackDelay, prompt, promptDelay); } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const ret = super.setCursor(cursor); if (!this.cursorObj) { diff --git a/src/ui/message-ui-handler.ts b/src/ui/message-ui-handler.ts index 81a09e90167..50522152021 100644 --- a/src/ui/message-ui-handler.ts +++ b/src/ui/message-ui-handler.ts @@ -34,24 +34,46 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler { } } - showText(text: string, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null) { + showText( + text: string, + delay?: number | null, + callback?: Function | null, + callbackDelay?: number | null, + prompt?: boolean | null, + promptDelay?: number | null, + ) { this.showTextInternal(text, delay, callback, callbackDelay, prompt, promptDelay); } - showDialogue(text: string, name?: string, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null) { + showDialogue( + text: string, + _name?: string, + delay?: number | null, + callback?: Function | null, + callbackDelay?: number | null, + prompt?: boolean | null, + promptDelay?: number | null, + ) { this.showTextInternal(text, delay, callback, callbackDelay, prompt, promptDelay); } - private showTextInternal(text: string, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null) { + private showTextInternal( + text: string, + delay?: number | null, + callback?: Function | null, + callbackDelay?: number | null, + prompt?: boolean | null, + promptDelay?: number | null, + ) { if (delay === null || delay === undefined) { delay = 20; } // Pattern matching regex that checks for @c{}, @f{}, @s{}, and @f{} patterns within message text and parses them to their respective behaviors. - const charVarMap = new Map(); - const delayMap = new Map(); - const soundMap = new Map(); - const fadeMap = new Map(); + const charVarMap = new Map(); + const delayMap = new Map(); + const soundMap = new Map(); + const fadeMap = new Map(); const actionPattern = /@(c|d|s|f)\{(.*?)\}/; let actionMatch: RegExpExecArray | null; while ((actionMatch = actionPattern.exec(text))) { @@ -60,13 +82,13 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler { charVarMap.set(actionMatch.index, actionMatch[2]); break; case "d": - delayMap.set(actionMatch.index, parseInt(actionMatch[2])); + delayMap.set(actionMatch.index, Number.parseInt(actionMatch[2])); break; case "s": soundMap.set(actionMatch.index, actionMatch[2]); break; case "f": - fadeMap.set(actionMatch.index, parseInt(actionMatch[2])); + fadeMap.set(actionMatch.index, Number.parseInt(actionMatch[2])); break; } text = text.slice(0, actionMatch.index) + text.slice(actionMatch.index + actionMatch[2].length + 4); @@ -122,7 +144,7 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler { this.textTimer = globalScene.time.addEvent({ delay: delay, callback: () => { - const charIndex = text.length - (this.textTimer?.repeatCount!); // TODO: is this bang correct? + const charIndex = text.length - this.textTimer?.repeatCount!; // TODO: is this bang correct? const charVar = charVarMap.get(charIndex); const charSound = soundMap.get(charIndex); const charDelay = delayMap.get(charIndex); @@ -156,7 +178,7 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler { onComplete: () => { this.textTimer!.paused = false; // TODO: is the bang correct? advance(); - } + }, }); } else if (charFade) { this.textTimer!.paused = true; @@ -175,7 +197,7 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler { advance(); } }, - repeat: text.length + repeat: text.length, }); } else { this.message.setText(text); @@ -188,11 +210,13 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler { } } - showPrompt(callback?: Function | null, callbackDelay?: integer | null) { + showPrompt(callback?: Function | null, callbackDelay?: number | null) { const wrappedTextLines = this.message.runWordWrap(this.message.text).split(/\n/g); const textLinesCount = wrappedTextLines.length; const lastTextLine = wrappedTextLines[wrappedTextLines.length - 1]; - const lastLineTest = globalScene.add.text(0, 0, lastTextLine, { font: "96px emerald" }); + const lastLineTest = globalScene.add.text(0, 0, lastTextLine, { + font: "96px emerald", + }); lastLineTest.setScale(this.message.scale); const lastLineWidth = lastLineTest.displayWidth; lastLineTest.destroy(); diff --git a/src/ui/modal-ui-handler.ts b/src/ui/modal-ui-handler.ts index 2c3228e42a9..f634e682b50 100644 --- a/src/ui/modal-ui-handler.ts +++ b/src/ui/modal-ui-handler.ts @@ -44,7 +44,10 @@ export abstract class ModalUiHandler extends UiHandler { this.modalContainer = globalScene.add.container(0, 0); - this.modalContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains); + this.modalContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), + Phaser.Geom.Rectangle.Contains, + ); this.modalBg = addWindow(0, 0, 0, 0); @@ -73,7 +76,10 @@ export abstract class ModalUiHandler extends UiHandler { const buttonBg = addWindow(0, 0, buttonLabel.getBounds().width + 8, 16, false, false, 0, 0, WindowVariant.THIN); buttonBg.setOrigin(0.5, 0); - buttonBg.setInteractive(new Phaser.Geom.Rectangle(0, 0, buttonBg.width, buttonBg.height), Phaser.Geom.Rectangle.Contains); + buttonBg.setInteractive( + new Phaser.Geom.Rectangle(0, 0, buttonBg.width, buttonBg.height), + Phaser.Geom.Rectangle.Contains, + ); const buttonContainer = globalScene.add.container(0, buttonTopMargin); @@ -93,9 +99,15 @@ export abstract class ModalUiHandler extends UiHandler { if (args.length >= 1 && "buttonActions" in args[0]) { super.show(args); if (args[0].hasOwnProperty("fadeOut") && typeof args[0].fadeOut === "function") { - const [ marginTop, marginRight, marginBottom, marginLeft ] = this.getMargin(); + const [marginTop, marginRight, marginBottom, marginLeft] = this.getMargin(); - const overlay = globalScene.add.rectangle(( this.getWidth() + marginLeft + marginRight) / 2, (this.getHeight() + marginTop + marginBottom) / 2, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0); + const overlay = globalScene.add.rectangle( + (this.getWidth() + marginLeft + marginRight) / 2, + (this.getHeight() + marginTop + marginBottom) / 2, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6, + 0, + ); overlay.setOrigin(0.5, 0.5); overlay.setName("rect-ui-overlay-modal"); overlay.setAlpha(0); @@ -108,7 +120,7 @@ export abstract class ModalUiHandler extends UiHandler { alpha: 1, duration: 250, ease: "Sine.easeOut", - onComplete: args[0].fadeOut + onComplete: args[0].fadeOut, }); } @@ -122,7 +134,7 @@ export abstract class ModalUiHandler extends UiHandler { for (let a = 0; a < this.buttonBgs.length; a++) { if (a < this.buttonBgs.length) { - this.buttonBgs[a].on("pointerdown", (_) => { + this.buttonBgs[a].on("pointerdown", _ => { if (globalScene.tweens.getTweensOf(this.modalContainer).length === 0) { config.buttonActions[a](); } @@ -137,10 +149,13 @@ export abstract class ModalUiHandler extends UiHandler { } updateContainer(config?: ModalConfig): void { - const [ marginTop, marginRight, marginBottom, marginLeft ] = this.getMargin(config); + const [marginTop, marginRight, marginBottom, marginLeft] = this.getMargin(config); - const [ width, height ] = [ this.getWidth(config), this.getHeight(config) ]; - this.modalContainer.setPosition((((globalScene.game.canvas.width / 6) - (width + (marginRight - marginLeft))) / 2), (((-globalScene.game.canvas.height / 6) - (height + (marginBottom - marginTop))) / 2)); + const [width, height] = [this.getWidth(config), this.getHeight(config)]; + this.modalContainer.setPosition( + (globalScene.game.canvas.width / 6 - (width + (marginRight - marginLeft))) / 2, + (-globalScene.game.canvas.height / 6 - (height + (marginBottom - marginTop))) / 2, + ); this.modalBg.setSize(width, height); @@ -157,7 +172,7 @@ export abstract class ModalUiHandler extends UiHandler { } } - processInput(button: Button): boolean { + processInput(_button: Button): boolean { return false; } @@ -172,7 +187,9 @@ export abstract class ModalUiHandler extends UiHandler { * Adds a hover effect to a game object which changes the cursor to a `pointer` and tints it slighly * @param gameObject the game object to add hover events/effects to */ - protected addInteractionHoverEffect(gameObject: Phaser.GameObjects.Image | Phaser.GameObjects.NineSlice | Phaser.GameObjects.Sprite) { + protected addInteractionHoverEffect( + gameObject: Phaser.GameObjects.Image | Phaser.GameObjects.NineSlice | Phaser.GameObjects.Sprite, + ) { gameObject.on("pointerover", () => { this.setMouseCursorStyle("pointer"); gameObject.setTint(0xbbbbbb); diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts index 0cca087ce8d..e5d8f858782 100644 --- a/src/ui/modifier-select-ui-handler.ts +++ b/src/ui/modifier-select-ui-handler.ts @@ -9,12 +9,12 @@ import { LockModifierTiersModifier, PokemonHeldItemModifier, HealShopCostModifie import { handleTutorial, Tutorial } from "../tutorial"; import { Button } from "#enums/buttons"; import MoveInfoOverlay from "./move-info-overlay"; -import { allMoves } from "../data/move"; +import { allMoves } from "../data/moves/move"; import * as Utils from "./../utils"; import Overrides from "#app/overrides"; import i18next from "i18next"; import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; -import { IntegerHolder } from "./../utils"; +import { NumberHolder } from "./../utils"; import Phaser from "phaser"; import type { PokeballType } from "#enums/pokeball"; @@ -33,17 +33,17 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { private rerollCostText: Phaser.GameObjects.Text; private lockRarityButtonText: Phaser.GameObjects.Text; private moveInfoOverlay: MoveInfoOverlay; - private moveInfoOverlayActive: boolean = false; + private moveInfoOverlayActive = false; - private rowCursor: integer = 0; + private rowCursor = 0; private player: boolean; /** * If reroll cost is negative, it is assumed there are 0 items in the shop. * It will cause reroll button to be disabled, and a "Continue" button to show in the place of shop items */ - private rerollCost: integer; - private transferButtonWidth: integer; - private checkButtonWidth: integer; + private rerollCost: number; + private transferButtonWidth: number; + private checkButtonWidth: number; public options: ModifierOption[]; public shopOptionsRows: ModifierOption[][]; @@ -73,7 +73,10 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { this.checkButtonWidth = context.measureText(i18next.t("modifierSelectUiHandler:checkTeam")).width; } - this.transferButtonContainer = globalScene.add.container((globalScene.game.canvas.width - this.checkButtonWidth) / 6 - 21, OPTION_BUTTON_YPOSITION); + this.transferButtonContainer = globalScene.add.container( + (globalScene.game.canvas.width - this.checkButtonWidth) / 6 - 21, + OPTION_BUTTON_YPOSITION, + ); this.transferButtonContainer.setName("transfer-btn"); this.transferButtonContainer.setVisible(false); ui.add(this.transferButtonContainer); @@ -83,7 +86,10 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { transferButtonText.setOrigin(1, 0); this.transferButtonContainer.add(transferButtonText); - this.checkButtonContainer = globalScene.add.container((globalScene.game.canvas.width) / 6 - 1, OPTION_BUTTON_YPOSITION); + this.checkButtonContainer = globalScene.add.container( + globalScene.game.canvas.width / 6 - 1, + OPTION_BUTTON_YPOSITION, + ); this.checkButtonContainer.setName("use-btn"); this.checkButtonContainer.setVisible(false); ui.add(this.checkButtonContainer); @@ -113,16 +119,29 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { this.lockRarityButtonContainer.setVisible(false); ui.add(this.lockRarityButtonContainer); - this.lockRarityButtonText = addTextObject(-4, -2, i18next.t("modifierSelectUiHandler:lockRarities"), TextStyle.PARTY); + this.lockRarityButtonText = addTextObject( + -4, + -2, + i18next.t("modifierSelectUiHandler:lockRarities"), + TextStyle.PARTY, + ); this.lockRarityButtonText.setOrigin(0, 0); this.lockRarityButtonContainer.add(this.lockRarityButtonText); - this.continueButtonContainer = globalScene.add.container((globalScene.game.canvas.width / 12), -(globalScene.game.canvas.height / 12)); + this.continueButtonContainer = globalScene.add.container( + globalScene.game.canvas.width / 12, + -(globalScene.game.canvas.height / 12), + ); this.continueButtonContainer.setVisible(false); ui.add(this.continueButtonContainer); // Create continue button - const continueButtonText = addTextObject(-24, 5, i18next.t("modifierSelectUiHandler:continueNextWaveButton"), TextStyle.MESSAGE); + const continueButtonText = addTextObject( + -24, + 5, + i18next.t("modifierSelectUiHandler:continueNextWaveButton"), + TextStyle.MESSAGE, + ); continueButtonText.setName("text-continue-btn"); this.continueButtonContainer.add(continueButtonText); @@ -135,7 +154,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { right: true, x: 1, y: -MoveInfoOverlay.getHeight(overlayScale, true) - 1, - width: (globalScene.game.canvas.width / 6) - 2, + width: globalScene.game.canvas.width / 6 - 2, }); ui.add(this.moveInfoOverlay); // register the overlay to receive toggle events @@ -143,7 +162,6 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { } show(args: any[]): boolean { - globalScene.disableMenu = false; if (this.active) { @@ -155,7 +173,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { return false; } - if (args.length !== 4 || !(args[1] instanceof Array) || !(args[2] instanceof Function)) { + if (args.length !== 4 || !Array.isArray(args[1]) || !(args[2] instanceof Function)) { return false; } @@ -165,7 +183,8 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { this.player = args[0]; - const partyHasHeldItem = this.player && !!globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.isTransferable).length; + const partyHasHeldItem = + this.player && !!globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.isTransferable).length; const canLockRarities = !!globalScene.findModifier(m => m instanceof LockModifierTiersModifier); this.transferButtonContainer.setVisible(false); @@ -185,22 +204,27 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { this.rerollButtonContainer.setPositionRelative(this.lockRarityButtonContainer, 0, canLockRarities ? -12 : 0); - this.rerollCost = args[3] as integer; + this.rerollCost = args[3] as number; this.updateRerollCostText(); const typeOptions = args[1] as ModifierTypeOption[]; const removeHealShop = globalScene.gameMode.hasNoShop; - const baseShopCost = new IntegerHolder(globalScene.getWaveMoneyAmount(1)); + const baseShopCost = new NumberHolder(globalScene.getWaveMoneyAmount(1)); globalScene.applyModifier(HealShopCostModifier, true, baseShopCost); const shopTypeOptions = !removeHealShop ? getPlayerShopModifierTypeOptionsForWave(globalScene.currentBattle.waveIndex, baseShopCost.value) : []; - const optionsYOffset = shopTypeOptions.length > SHOP_OPTIONS_ROW_LIMIT ? -SINGLE_SHOP_ROW_YOFFSET : -DOUBLE_SHOP_ROW_YOFFSET; + const optionsYOffset = + shopTypeOptions.length > SHOP_OPTIONS_ROW_LIMIT ? -SINGLE_SHOP_ROW_YOFFSET : -DOUBLE_SHOP_ROW_YOFFSET; for (let m = 0; m < typeOptions.length; m++) { - const sliceWidth = (globalScene.game.canvas.width / 6) / (typeOptions.length + 2); - const option = new ModifierOption(sliceWidth * (m + 1) + (sliceWidth * 0.5), -globalScene.game.canvas.height / 12 + optionsYOffset, typeOptions[m]); + const sliceWidth = globalScene.game.canvas.width / 6 / (typeOptions.length + 2); + const option = new ModifierOption( + sliceWidth * (m + 1) + sliceWidth * 0.5, + -globalScene.game.canvas.height / 12 + optionsYOffset, + typeOptions[m], + ); option.setScale(0.5); globalScene.add.existing(option); this.modifierContainer.add(option); @@ -215,9 +239,16 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { for (let m = 0; m < shopTypeOptions.length; m++) { const row = m < SHOP_OPTIONS_ROW_LIMIT ? 0 : 1; const col = m < SHOP_OPTIONS_ROW_LIMIT ? m : m - SHOP_OPTIONS_ROW_LIMIT; - const rowOptions = shopTypeOptions.slice(row ? SHOP_OPTIONS_ROW_LIMIT : 0, row ? undefined : SHOP_OPTIONS_ROW_LIMIT); - const sliceWidth = (globalScene.game.canvas.width / 6) / (rowOptions.length + 2); - const option = new ModifierOption(sliceWidth * (col + 1) + (sliceWidth * 0.5), ((-globalScene.game.canvas.height / 12) - (globalScene.game.canvas.height / 32) - (42 - (28 * row - 1))), shopTypeOptions[m]); + const rowOptions = shopTypeOptions.slice( + row ? SHOP_OPTIONS_ROW_LIMIT : 0, + row ? undefined : SHOP_OPTIONS_ROW_LIMIT, + ); + const sliceWidth = globalScene.game.canvas.width / 6 / (rowOptions.length + 2); + const option = new ModifierOption( + sliceWidth * (col + 1) + sliceWidth * 0.5, + -globalScene.game.canvas.height / 12 - globalScene.game.canvas.height / 32 - (42 - (28 * row - 1)), + shopTypeOptions[m], + ); option.setScale(0.375); globalScene.add.existing(option); this.modifierContainer.add(option); @@ -249,10 +280,13 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { const index = Math.floor(value * typeOptions.length); if (index > i && index <= typeOptions.length) { const option = this.options[i]; - option?.show(Math.floor((1 - value) * 1250) * 0.325 + 2000 * maxUpgradeCount, -(maxUpgradeCount - typeOptions[i].upgradeCount)); + option?.show( + Math.floor((1 - value) * 1250) * 0.325 + 2000 * maxUpgradeCount, + -(maxUpgradeCount - typeOptions[i].upgradeCount), + ); i++; } - } + }, }); globalScene.time.delayedCall(1000 + maxUpgradeCount * 2000, () => { @@ -268,7 +302,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { globalScene.tweens.add({ targets: this.transferButtonContainer, alpha: 1, - duration: 250 + duration: 250, }); } @@ -282,22 +316,22 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { this.lockRarityButtonContainer.setVisible(canLockRarities); globalScene.tweens.add({ - targets: [ this.checkButtonContainer, this.continueButtonContainer ], + targets: [this.checkButtonContainer, this.continueButtonContainer], alpha: 1, - duration: 250 + duration: 250, }); globalScene.tweens.add({ - targets: [ this.rerollButtonContainer, this.lockRarityButtonContainer ], + targets: [this.rerollButtonContainer, this.lockRarityButtonContainer], alpha: this.rerollCost < 0 ? 0.5 : 1, - duration: 250 + duration: 250, }); const updateCursorTarget = () => { if (globalScene.shopCursorTarget === ShopCursorTarget.CHECK_TEAM) { this.setRowCursor(0); this.setCursor(2); - } else if ((globalScene.shopCursorTarget === ShopCursorTarget.SHOP) && globalScene.gameMode.hasNoShop) { + } else if (globalScene.shopCursorTarget === ShopCursorTarget.SHOP && globalScene.gameMode.hasNoShop) { this.setRowCursor(ShopCursorTarget.REWARDS); this.setCursor(0); } else { @@ -308,7 +342,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { updateCursorTarget(); - handleTutorial(Tutorial.Select_Item).then((res) => { + handleTutorial(Tutorial.Select_Item).then(res => { if (res) { updateCursorTarget(); } @@ -460,7 +494,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { return success; } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const ui = this.getUi(); const ret = super.setCursor(cursor); @@ -469,7 +503,8 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { this.modifierContainer.add(this.cursorObj); } - const options = (this.rowCursor === 1 ? this.options : this.shopOptionsRows[this.shopOptionsRows.length - (this.rowCursor - 1)]); + const options = + this.rowCursor === 1 ? this.options : this.shopOptionsRows[this.shopOptionsRows.length - (this.rowCursor - 1)]; this.cursorObj.setScale(this.rowCursor === 1 ? 2 : this.rowCursor >= 2 ? 1.5 : 1); @@ -479,18 +514,31 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { if (this.rowCursor === 1 && options.length === 0) { // Continue button when no shop items this.cursorObj.setScale(1.25); - this.cursorObj.setPosition((globalScene.game.canvas.width / 18) + 23, (-globalScene.game.canvas.height / 12) - (this.shopOptionsRows.length > 1 ? SINGLE_SHOP_ROW_YOFFSET - 2 : DOUBLE_SHOP_ROW_YOFFSET - 2)); + this.cursorObj.setPosition( + globalScene.game.canvas.width / 18 + 23, + -globalScene.game.canvas.height / 12 - + (this.shopOptionsRows.length > 1 ? SINGLE_SHOP_ROW_YOFFSET - 2 : DOUBLE_SHOP_ROW_YOFFSET - 2), + ); ui.showText(i18next.t("modifierSelectUiHandler:continueNextWaveDescription")); return ret; } - const sliceWidth = (globalScene.game.canvas.width / 6) / (options.length + 2); + const sliceWidth = globalScene.game.canvas.width / 6 / (options.length + 2); if (this.rowCursor < 2) { // Cursor on free items - this.cursorObj.setPosition(sliceWidth * (cursor + 1) + (sliceWidth * 0.5) - 20, (-globalScene.game.canvas.height / 12) - (this.shopOptionsRows.length > 1 ? SINGLE_SHOP_ROW_YOFFSET - 2 : DOUBLE_SHOP_ROW_YOFFSET - 2)); + this.cursorObj.setPosition( + sliceWidth * (cursor + 1) + sliceWidth * 0.5 - 20, + -globalScene.game.canvas.height / 12 - + (this.shopOptionsRows.length > 1 ? SINGLE_SHOP_ROW_YOFFSET - 2 : DOUBLE_SHOP_ROW_YOFFSET - 2), + ); } else { // Cursor on paying items - this.cursorObj.setPosition(sliceWidth * (cursor + 1) + (sliceWidth * 0.5) - 16, (-globalScene.game.canvas.height / 12 - globalScene.game.canvas.height / 32) - (-14 + 28 * (this.rowCursor - (this.shopOptionsRows.length - 1)))); + this.cursorObj.setPosition( + sliceWidth * (cursor + 1) + sliceWidth * 0.5 - 16, + -globalScene.game.canvas.height / 12 - + globalScene.game.canvas.height / 32 - + (-14 + 28 * (this.rowCursor - (this.shopOptionsRows.length - 1))), + ); } const type = options[this.cursor].modifierTypeOption.type; @@ -500,13 +548,22 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { this.moveInfoOverlay.show(allMoves[type.moveId]); } } else if (cursor === 0) { - this.cursorObj.setPosition(6, this.lockRarityButtonContainer.visible ? OPTION_BUTTON_YPOSITION - 8 : OPTION_BUTTON_YPOSITION + 4); + this.cursorObj.setPosition( + 6, + this.lockRarityButtonContainer.visible ? OPTION_BUTTON_YPOSITION - 8 : OPTION_BUTTON_YPOSITION + 4, + ); ui.showText(i18next.t("modifierSelectUiHandler:rerollDesc")); } else if (cursor === 1) { - this.cursorObj.setPosition((globalScene.game.canvas.width - this.transferButtonWidth - this.checkButtonWidth) / 6 - 30, OPTION_BUTTON_YPOSITION + 4); + this.cursorObj.setPosition( + (globalScene.game.canvas.width - this.transferButtonWidth - this.checkButtonWidth) / 6 - 30, + OPTION_BUTTON_YPOSITION + 4, + ); ui.showText(i18next.t("modifierSelectUiHandler:transferDesc")); } else if (cursor === 2) { - this.cursorObj.setPosition((globalScene.game.canvas.width - this.checkButtonWidth) / 6 - 10, OPTION_BUTTON_YPOSITION + 4); + this.cursorObj.setPosition( + (globalScene.game.canvas.width - this.checkButtonWidth) / 6 - 10, + OPTION_BUTTON_YPOSITION + 4, + ); ui.showText(i18next.t("modifierSelectUiHandler:checkTeamDesc")); } else { this.cursorObj.setPosition(6, OPTION_BUTTON_YPOSITION + 4); @@ -516,12 +573,14 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { return ret; } - setRowCursor(rowCursor: integer): boolean { + setRowCursor(rowCursor: number): boolean { const lastRowCursor = this.rowCursor; if (rowCursor !== lastRowCursor) { this.rowCursor = rowCursor; - let newCursor = Math.round(this.cursor / Math.max(this.getRowItems(lastRowCursor) - 1, 1) * (this.getRowItems(rowCursor) - 1)); + let newCursor = Math.round( + (this.cursor / Math.max(this.getRowItems(lastRowCursor) - 1, 1)) * (this.getRowItems(rowCursor) - 1), + ); if (rowCursor === 1 && this.options.length === 0) { // Handle empty shop newCursor = 0; @@ -553,7 +612,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { return false; } - private getRowItems(rowCursor: integer): integer { + private getRowItems(rowCursor: number): number { switch (rowCursor) { case 0: return 3; @@ -564,7 +623,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { } } - setRerollCost(rerollCost: integer): void { + setRerollCost(rerollCost: number): void { this.rerollCost = rerollCost; } @@ -582,9 +641,8 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { if (rerollDisabled) { this.rerollCostText.setVisible(false); return; - } else { - this.rerollCostText.setVisible(true); } + this.rerollCostText.setVisible(true); const canReroll = globalScene.money >= this.rerollCost; const formattedMoney = Utils.formatMoney(globalScene.moneyFormat, this.rerollCost); @@ -630,10 +688,16 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { scale: 0.01, duration: 250, ease: "Cubic.easeIn", - onComplete: () => options.forEach(o => o.destroy()) + onComplete: () => options.forEach(o => o.destroy()), }); - [ this.rerollButtonContainer, this.checkButtonContainer, this.transferButtonContainer, this.lockRarityButtonContainer, this.continueButtonContainer ].forEach(container => { + [ + this.rerollButtonContainer, + this.checkButtonContainer, + this.transferButtonContainer, + this.lockRarityButtonContainer, + this.continueButtonContainer, + ].forEach(container => { if (container.visible) { globalScene.tweens.add({ targets: container, @@ -646,7 +710,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { } else { container.setAlpha(1); } - } + }, }); } }); @@ -716,11 +780,15 @@ class ModifierOption extends Phaser.GameObjects.Container { this.itemText = addTextObject(0, 35, this.modifierTypeOption.type?.name!, TextStyle.PARTY, { align: "center" }); // TODO: is this bang correct? this.itemText.setOrigin(0.5, 0); this.itemText.setAlpha(0); - this.itemText.setTint(this.modifierTypeOption.type?.tier ? getModifierTierTextTint(this.modifierTypeOption.type?.tier) : undefined); + this.itemText.setTint( + this.modifierTypeOption.type?.tier ? getModifierTierTextTint(this.modifierTypeOption.type?.tier) : undefined, + ); this.add(this.itemText); if (this.modifierTypeOption.cost) { - this.itemCostText = addTextObject(0, 45, "", TextStyle.MONEY, { align: "center" }); + this.itemCostText = addTextObject(0, 45, "", TextStyle.MONEY, { + align: "center", + }); this.itemCostText.setOrigin(0.5, 0); this.itemCostText.setAlpha(0); @@ -730,13 +798,13 @@ class ModifierOption extends Phaser.GameObjects.Container { } } - show(remainingDuration: integer, upgradeCountOffset: integer) { + show(remainingDuration: number, upgradeCountOffset: number) { if (!this.modifierTypeOption.cost) { globalScene.tweens.add({ targets: this.pb, y: 0, duration: 1250, - ease: "Bounce.Out" + ease: "Bounce.Out", }); let lastValue = 1; @@ -754,42 +822,52 @@ class ModifierOption extends Phaser.GameObjects.Container { } const value = t.getValue(); if (!bounce && value > lastValue) { - globalScene.playSound("se/pb_bounce_1", { volume: 1 / ++bounceCount }); + globalScene.playSound("se/pb_bounce_1", { + volume: 1 / ++bounceCount, + }); bounce = true; } else if (bounce && value < lastValue) { bounce = false; } lastValue = value; - } + }, }); for (let u = 0; u < this.modifierTypeOption.upgradeCount; u++) { const upgradeIndex = u; - globalScene.time.delayedCall(remainingDuration - 2000 * (this.modifierTypeOption.upgradeCount - (upgradeIndex + 1 + upgradeCountOffset)), () => { - globalScene.playSound("se/upgrade", { rate: 1 + 0.25 * upgradeIndex }); - this.pbTint.setPosition(this.pb.x, this.pb.y); - this.pbTint.setTintFill(0xFFFFFF); - this.pbTint.setAlpha(0); - this.pbTint.setVisible(true); - globalScene.tweens.add({ - targets: this.pbTint, - alpha: 1, - duration: 1000, - ease: "Sine.easeIn", - onComplete: () => { - this.pb.setTexture("pb", this.getPbAtlasKey(-this.modifierTypeOption.upgradeCount + (upgradeIndex + 1))); - globalScene.tweens.add({ - targets: this.pbTint, - alpha: 0, - duration: 750, - ease: "Sine.easeOut", - onComplete: () => { - this.pbTint.setVisible(false); - } - }); - } - }); - }); + globalScene.time.delayedCall( + remainingDuration - 2000 * (this.modifierTypeOption.upgradeCount - (upgradeIndex + 1 + upgradeCountOffset)), + () => { + globalScene.playSound("se/upgrade", { + rate: 1 + 0.25 * upgradeIndex, + }); + this.pbTint.setPosition(this.pb.x, this.pb.y); + this.pbTint.setTintFill(0xffffff); + this.pbTint.setAlpha(0); + this.pbTint.setVisible(true); + globalScene.tweens.add({ + targets: this.pbTint, + alpha: 1, + duration: 1000, + ease: "Sine.easeIn", + onComplete: () => { + this.pb.setTexture( + "pb", + this.getPbAtlasKey(-this.modifierTypeOption.upgradeCount + (upgradeIndex + 1)), + ); + globalScene.tweens.add({ + targets: this.pbTint, + alpha: 0, + duration: 750, + ease: "Sine.easeOut", + onComplete: () => { + this.pbTint.setVisible(false); + }, + }); + }, + }); + }, + ); } } @@ -808,7 +886,7 @@ class ModifierOption extends Phaser.GameObjects.Container { delay: 250, ease: "Sine.easeIn", alpha: 0, - onComplete: () => this.pb.destroy() + onComplete: () => this.pb.destroy(), }); } @@ -817,7 +895,7 @@ class ModifierOption extends Phaser.GameObjects.Container { duration: 500, ease: "Elastic.Out", scale: 2, - alpha: 1 + alpha: 1, }); if (!this.modifierTypeOption.cost) { globalScene.tweens.add({ @@ -825,7 +903,7 @@ class ModifierOption extends Phaser.GameObjects.Container { alpha: 0, duration: 500, ease: "Sine.easeIn", - onComplete: () => this.itemTint.destroy() + onComplete: () => this.itemTint.destroy(), }); } globalScene.tweens.add({ @@ -833,7 +911,7 @@ class ModifierOption extends Phaser.GameObjects.Container { duration: 500, alpha: 1, y: 25, - ease: "Cubic.easeInOut" + ease: "Cubic.easeInOut", }); if (this.itemCostText) { globalScene.tweens.add({ @@ -841,14 +919,14 @@ class ModifierOption extends Phaser.GameObjects.Container { duration: 500, alpha: 1, y: 35, - ease: "Cubic.easeInOut" + ease: "Cubic.easeInOut", }); } }); } - getPbAtlasKey(tierOffset: integer = 0) { - return getPokeballAtlasKey((this.modifierTypeOption.type?.tier! + tierOffset) as integer as PokeballType); // TODO: is this bang correct? + getPbAtlasKey(tierOffset = 0) { + return getPokeballAtlasKey((this.modifierTypeOption.type?.tier! + tierOffset) as number as PokeballType); // TODO: is this bang correct? } updateCostText(): void { diff --git a/src/ui/move-info-overlay.ts b/src/ui/move-info-overlay.ts index 5b3b30b14dd..6fc99beb0ae 100644 --- a/src/ui/move-info-overlay.ts +++ b/src/ui/move-info-overlay.ts @@ -3,25 +3,25 @@ import { globalScene } from "#app/global-scene"; import { TextStyle, addTextObject } from "./text"; import { addWindow } from "./ui-theme"; import * as Utils from "../utils"; -import type Move from "../data/move"; -import { MoveCategory } from "../data/move"; -import { Type } from "#enums/type"; +import type Move from "../data/moves/move"; +import { MoveCategory } from "#enums/MoveCategory"; +import { PokemonType } from "#enums/pokemon-type"; import i18next from "i18next"; export interface MoveInfoOverlaySettings { - delayVisibility?: boolean; // if true, showing the overlay will only set it to active and populate the fields and the handler using this field has to manually call setVisible later. - scale?:number; // scale the box? A scale of 0.5 is recommended - top?: boolean; // should the effect box be on top? - right?: boolean; // should the effect box be on the right? - onSide?: boolean; // should the effect be on the side? ignores top argument if true - //location and width of the component; unaffected by scaling - x?: number; - y?: number; - /** Default is always half the screen, regardless of scale */ - width?: number; - /** Determines whether to display the small secondary box */ - hideEffectBox?: boolean; - hideBg?: boolean; + delayVisibility?: boolean; // if true, showing the overlay will only set it to active and populate the fields and the handler using this field has to manually call setVisible later. + scale?: number; // scale the box? A scale of 0.5 is recommended + top?: boolean; // should the effect box be on top? + right?: boolean; // should the effect box be on the right? + onSide?: boolean; // should the effect be on the side? ignores top argument if true + //location and width of the component; unaffected by scaling + x?: number; + y?: number; + /** Default is always half the screen, regardless of scale */ + width?: number; + /** Determines whether to display the small secondary box */ + hideEffectBox?: boolean; + hideBg?: boolean; } const EFF_HEIGHT = 48; @@ -31,22 +31,22 @@ const BORDER = 8; const GLOBAL_SCALE = 6; export default class MoveInfoOverlay extends Phaser.GameObjects.Container implements InfoToggle { - public active: boolean = false; + public active = false; private move: Move; private desc: Phaser.GameObjects.Text; - private descScroll : Phaser.Tweens.Tween | null = null; + private descScroll: Phaser.Tweens.Tween | null = null; private val: Phaser.GameObjects.Container; - private pp: Phaser.GameObjects.Text; + private pp: Phaser.GameObjects.Text; private pow: Phaser.GameObjects.Text; private acc: Phaser.GameObjects.Text; private typ: Phaser.GameObjects.Sprite; private cat: Phaser.GameObjects.Sprite; private descBg: Phaser.GameObjects.NineSlice; - private options : MoveInfoOverlaySettings; + private options: MoveInfoOverlaySettings; constructor(options?: MoveInfoOverlaySettings) { if (options?.onSide) { @@ -59,18 +59,33 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem // prepare the description box const width = (options?.width || MoveInfoOverlay.getWidth(scale)) / scale; // divide by scale as we always want this to be half a window wide - this.descBg = addWindow( (options?.onSide && !options?.right ? EFF_WIDTH : 0), options?.top ? EFF_HEIGHT : 0, width - (options?.onSide ? EFF_WIDTH : 0), DESC_HEIGHT); + this.descBg = addWindow( + options?.onSide && !options?.right ? EFF_WIDTH : 0, + options?.top ? EFF_HEIGHT : 0, + width - (options?.onSide ? EFF_WIDTH : 0), + DESC_HEIGHT, + ); this.descBg.setOrigin(0, 0); this.add(this.descBg); // set up the description; wordWrap uses true pixels, unaffected by any scaling, while other values are affected - this.desc = addTextObject((options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER, (options?.top ? EFF_HEIGHT : 0) + BORDER - 2, "", TextStyle.BATTLE_INFO, { wordWrap: { width: (width - (BORDER - 2) * 2 - (options?.onSide ? EFF_WIDTH : 0)) * GLOBAL_SCALE }}); + this.desc = addTextObject( + (options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER, + (options?.top ? EFF_HEIGHT : 0) + BORDER - 2, + "", + TextStyle.BATTLE_INFO, + { + wordWrap: { + width: (width - (BORDER - 2) * 2 - (options?.onSide ? EFF_WIDTH : 0)) * GLOBAL_SCALE, + }, + }, + ); this.desc.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5); // limit the text rendering, required for scrolling later on const maskPointOrigin = { - x: (options?.x || 0), - y: (options?.y || 0), + x: options?.x || 0, + y: options?.y || 0, }; if (maskPointOrigin.x < 0) { maskPointOrigin.x += globalScene.game.canvas.width / GLOBAL_SCALE; @@ -80,10 +95,13 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem } const moveDescriptionTextMaskRect = globalScene.make.graphics(); - moveDescriptionTextMaskRect.fillStyle(0xFF0000); + moveDescriptionTextMaskRect.fillStyle(0xff0000); moveDescriptionTextMaskRect.fillRect( - maskPointOrigin.x + ((options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER) * scale, maskPointOrigin.y + ((options?.top ? EFF_HEIGHT : 0) + BORDER - 2) * scale, - width - ((options?.onSide ? EFF_WIDTH : 0) - BORDER * 2) * scale, (DESC_HEIGHT - (BORDER - 2) * 2) * scale); + maskPointOrigin.x + ((options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER) * scale, + maskPointOrigin.y + ((options?.top ? EFF_HEIGHT : 0) + BORDER - 2) * scale, + width - ((options?.onSide ? EFF_WIDTH : 0) - BORDER * 2) * scale, + (DESC_HEIGHT - (BORDER - 2) * 2) * scale, + ); moveDescriptionTextMaskRect.setScale(6); const moveDescriptionTextMask = this.createGeometryMask(moveDescriptionTextMaskRect); @@ -91,7 +109,11 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem this.desc.setMask(moveDescriptionTextMask); // prepare the effect box - this.val = new Phaser.GameObjects.Container(globalScene, options?.right ? width - EFF_WIDTH : 0, options?.top || options?.onSide ? 0 : DESC_HEIGHT); + this.val = new Phaser.GameObjects.Container( + globalScene, + options?.right ? width - EFF_WIDTH : 0, + options?.top || options?.onSide ? 0 : DESC_HEIGHT, + ); this.add(this.val); const valuesBg = addWindow(0, 0, EFF_WIDTH, EFF_HEIGHT); @@ -145,7 +167,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem } // show this component with infos for the specific move - show(move : Move):boolean { + show(move: Move): boolean { if (!globalScene.enableMoveInfo) { return false; // move infos have been disabled // TODO:: is `false` correct? i used to be `undeefined` } @@ -153,7 +175,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem this.pow.setText(move.power >= 0 ? move.power.toString() : "---"); this.acc.setText(move.accuracy >= 0 ? move.accuracy.toString() : "---"); this.pp.setText(move.pp >= 0 ? move.pp.toString() : "---"); - this.typ.setTexture(Utils.getLocalizedSpriteKey("types"), Type[move.type].toLowerCase()); + this.typ.setTexture(Utils.getLocalizedSpriteKey("types"), PokemonType[move.type].toLowerCase()); this.cat.setFrame(MoveCategory[move.category].toLowerCase()); this.desc.setText(move?.effect || ""); @@ -166,7 +188,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem } // determine if we need to add new scrolling effects - const moveDescriptionLineCount = Math.floor(this.desc.displayHeight * (96 / 72) / 14.83); + const moveDescriptionLineCount = Math.floor((this.desc.displayHeight * (96 / 72)) / 14.83); if (moveDescriptionLineCount > 3) { // generate scrolling effects this.descScroll = globalScene.tweens.add({ @@ -175,7 +197,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem loop: -1, hold: Utils.fixedInt(2000), duration: Utils.fixedInt((moveDescriptionLineCount - 3) * 2000), - y: `-=${14.83 * (72 / 96) * (moveDescriptionLineCount - 3)}` + y: `-=${14.83 * (72 / 96) * (moveDescriptionLineCount - 3)}`, }); } @@ -199,7 +221,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem targets: this.desc, duration: Utils.fixedInt(125), ease: "Sine.easeInOut", - alpha: visible ? 1 : 0 + alpha: visible ? 1 : 0, }); if (!visible) { this.setVisible(false); @@ -211,12 +233,12 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem } // width of this element - static getWidth(scale:number):number { + static getWidth(_scale: number): number { return globalScene.game.canvas.width / GLOBAL_SCALE / 2; } // height of this element - static getHeight(scale:number, onSide?: boolean):number { - return (onSide ? Math.max(EFF_HEIGHT, DESC_HEIGHT) : (EFF_HEIGHT + DESC_HEIGHT)) * scale; + static getHeight(scale: number, onSide?: boolean): number { + return (onSide ? Math.max(EFF_HEIGHT, DESC_HEIGHT) : EFF_HEIGHT + DESC_HEIGHT) * scale; } } diff --git a/src/ui/mystery-encounter-ui-handler.ts b/src/ui/mystery-encounter-ui-handler.ts index 383f4ab73d3..87d2e2ba28c 100644 --- a/src/ui/mystery-encounter-ui-handler.ts +++ b/src/ui/mystery-encounter-ui-handler.ts @@ -36,16 +36,16 @@ export default class MysteryEncounterUiHandler extends UiHandler { private dexProgressWindow: Phaser.GameObjects.NineSlice; private dexProgressContainer: Phaser.GameObjects.Container; - private showDexProgress: boolean = false; + private showDexProgress = false; private overrideSettings?: OptionSelectSettings; private encounterOptions: MysteryEncounterOption[] = []; private optionsMeetsReqs: boolean[]; - protected viewPartyIndex: number = 0; - protected viewPartyXPosition: number = 0; + protected viewPartyIndex = 0; + protected viewPartyXPosition = 0; - protected blockInput: boolean = true; + protected blockInput = true; constructor() { super(Mode.MYSTERY_ENCOUNTER); @@ -86,7 +86,7 @@ export default class MysteryEncounterUiHandler extends UiHandler { this.descriptionContainer.add(this.rarityBall); const dexProgressIndicator = globalScene.add.sprite(12, 10, "encounter_radar"); - dexProgressIndicator.setScale(0.80); + dexProgressIndicator.setScale(0.8); this.dexProgressContainer.add(dexProgressIndicator); this.dexProgressContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, 24, 28), Phaser.Geom.Rectangle.Contains); } @@ -94,9 +94,13 @@ export default class MysteryEncounterUiHandler extends UiHandler { override show(args: any[]): boolean { super.show(args); - this.overrideSettings = args[0] as OptionSelectSettings ?? {}; - const showDescriptionContainer = isNullOrUndefined(this.overrideSettings?.hideDescription) ? true : !this.overrideSettings.hideDescription; - const slideInDescription = isNullOrUndefined(this.overrideSettings?.slideInDescription) ? true : this.overrideSettings.slideInDescription; + this.overrideSettings = (args[0] as OptionSelectSettings) ?? {}; + const showDescriptionContainer = isNullOrUndefined(this.overrideSettings?.hideDescription) + ? true + : !this.overrideSettings.hideDescription; + const slideInDescription = isNullOrUndefined(this.overrideSettings?.slideInDescription) + ? true + : this.overrideSettings.slideInDescription; const startingCursorIndex = this.overrideSettings?.startingCursorIndex ?? 0; this.cursorContainer.setVisible(true); @@ -136,7 +140,7 @@ export default class MysteryEncounterUiHandler extends UiHandler { success = true; const overrideSettings: OptionSelectSettings = { ...this.overrideSettings, - slideInDescription: false + slideInDescription: false, }; globalScene.ui.setMode(Mode.PARTY, PartyUiMode.CHECK, -1, () => { globalScene.ui.setMode(Mode.MYSTERY_ENCOUNTER, overrideSettings); @@ -145,7 +149,12 @@ export default class MysteryEncounterUiHandler extends UiHandler { this.unblockInput(); }, 300); }); - } else if (this.blockInput || (!this.optionsMeetsReqs[cursor] && (selected.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || selected.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL))) { + } else if ( + this.blockInput || + (!this.optionsMeetsReqs[cursor] && + (selected.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || + selected.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)) + ) { success = false; } else { if ((globalScene.getCurrentPhase() as MysteryEncounterPhase).handleOptionSelect(selected, cursor)) { @@ -159,6 +168,7 @@ export default class MysteryEncounterUiHandler extends UiHandler { } } else { switch (this.optionsContainer.getAll()?.length) { + // biome-ignore lint/suspicious/useDefaultSwitchClauseLast: Default shares logic with case 3 and it makes more sense for the statements to be ordered by the case value default: case 3: success = this.handleTwoOptionMoveInput(button); @@ -293,7 +303,11 @@ export default class MysteryEncounterUiHandler extends UiHandler { this.blockInput = false; for (let i = 0; i < this.optionsContainer.length - 1; i++) { const optionMode = this.encounterOptions[i].optionMode; - if (!this.optionsMeetsReqs[i] && (optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)) { + if ( + !this.optionsMeetsReqs[i] && + (optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || + optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + ) { continue; } (this.optionsContainer.getAt(i) as Phaser.GameObjects.Text).setAlpha(1); @@ -321,26 +335,38 @@ export default class MysteryEncounterUiHandler extends UiHandler { if (cursor === this.viewPartyIndex) { this.cursorObj.setPosition(this.viewPartyXPosition, -17); - } else if (this.optionsContainer.getAll()?.length === 3) { // 2 Options + } else if (this.optionsContainer.getAll()?.length === 3) { + // 2 Options this.cursorObj.setPosition(-10.5 + (cursor % 2 === 1 ? 100 : 0), 15); - } else if (this.optionsContainer.getAll()?.length === 4) { // 3 Options + } else if (this.optionsContainer.getAll()?.length === 4) { + // 3 Options this.cursorObj.setPosition(-10.5 + (cursor % 2 === 1 ? 100 : 0), 7 + (cursor > 1 ? 16 : 0)); - } else if (this.optionsContainer.getAll()?.length === 5) { // 4 Options + } else if (this.optionsContainer.getAll()?.length === 5) { + // 4 Options this.cursorObj.setPosition(-10.5 + (cursor % 2 === 1 ? 100 : 0), 7 + (cursor > 1 ? 16 : 0)); } return changed; } - displayEncounterOptions(slideInDescription: boolean = true): void { + displayEncounterOptions(slideInDescription = true): void { this.getUi().clearText(); const mysteryEncounter = globalScene.currentBattle.mysteryEncounter!; this.encounterOptions = this.overrideSettings?.overrideOptions ?? mysteryEncounter.options; this.optionsMeetsReqs = []; - const titleText: string | null = getEncounterText(mysteryEncounter.dialogue.encounterOptionsDialogue?.title, TextStyle.TOOLTIP_TITLE); - const descriptionText: string | null = getEncounterText(mysteryEncounter.dialogue.encounterOptionsDialogue?.description, TextStyle.TOOLTIP_CONTENT); - const queryText: string | null = getEncounterText(mysteryEncounter.dialogue.encounterOptionsDialogue?.query, TextStyle.TOOLTIP_CONTENT); + const titleText: string | null = getEncounterText( + mysteryEncounter.dialogue.encounterOptionsDialogue?.title, + TextStyle.TOOLTIP_TITLE, + ); + const descriptionText: string | null = getEncounterText( + mysteryEncounter.dialogue.encounterOptionsDialogue?.description, + TextStyle.TOOLTIP_CONTENT, + ); + const queryText: string | null = getEncounterText( + mysteryEncounter.dialogue.encounterOptionsDialogue?.query, + TextStyle.TOOLTIP_CONTENT, + ); // Clear options container (except cursor) this.optionsContainer.removeAll(true); @@ -351,23 +377,41 @@ export default class MysteryEncounterUiHandler extends UiHandler { let optionText: BBCodeText; switch (this.encounterOptions.length) { + // biome-ignore lint/suspicious/useDefaultSwitchClauseLast: default shares logic with case 2 and it makes more sense for the statements to be ordered by the case number default: case 2: - optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, 8, "-", TextStyle.WINDOW, { fontSize: "80px", lineSpacing: -8 }); + optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, 8, "-", TextStyle.WINDOW, { + fontSize: "80px", + lineSpacing: -8, + }); break; case 3: - optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, i < 2 ? 0 : 16, "-", TextStyle.WINDOW, { fontSize: "80px", lineSpacing: -8 }); + optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, i < 2 ? 0 : 16, "-", TextStyle.WINDOW, { + fontSize: "80px", + lineSpacing: -8, + }); break; case 4: - optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, i < 2 ? 0 : 16, "-", TextStyle.WINDOW, { fontSize: "80px", lineSpacing: -8 }); + optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, i < 2 ? 0 : 16, "-", TextStyle.WINDOW, { + fontSize: "80px", + lineSpacing: -8, + }); break; } this.optionsMeetsReqs.push(option.meetsRequirements()); const optionDialogue = option.dialogue!; - const label = !this.optionsMeetsReqs[i] && optionDialogue.disabledButtonLabel ? optionDialogue.disabledButtonLabel : optionDialogue.buttonLabel; + const label = + !this.optionsMeetsReqs[i] && optionDialogue.disabledButtonLabel + ? optionDialogue.disabledButtonLabel + : optionDialogue.buttonLabel; let text: string | null; - if (option.hasRequirements() && this.optionsMeetsReqs[i] && (option.optionMode === MysteryEncounterOptionMode.DEFAULT_OR_SPECIAL || option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)) { + if ( + option.hasRequirements() && + this.optionsMeetsReqs[i] && + (option.optionMode === MysteryEncounterOptionMode.DEFAULT_OR_SPECIAL || + option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + ) { // Options with special requirements that are met are automatically colored green text = getEncounterText(label, TextStyle.ME_OPTION_SPECIAL); } else { @@ -378,7 +422,11 @@ export default class MysteryEncounterUiHandler extends UiHandler { optionText.setText(text); } - if (!this.optionsMeetsReqs[i] && (option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)) { + if ( + !this.optionsMeetsReqs[i] && + (option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || + option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) + ) { optionText.setAlpha(0.5); } if (this.blockInput) { @@ -389,7 +437,7 @@ export default class MysteryEncounterUiHandler extends UiHandler { const nonScrollWidth = 90; const optionTextMaskRect = globalScene.make.graphics({}); optionTextMaskRect.setScale(6); - optionTextMaskRect.fillStyle(0xFFFFFF); + optionTextMaskRect.fillStyle(0xffffff); optionTextMaskRect.beginPath(); optionTextMaskRect.fillRect(optionText.x + 11, optionText.y + 140, nonScrollWidth, 18); @@ -411,8 +459,8 @@ export default class MysteryEncounterUiHandler extends UiHandler { delay: Utils.fixedInt(2000), loop: -1, hold: Utils.fixedInt(2000), - duration: Utils.fixedInt((optionTextWidth - nonScrollWidth) / 15 * 2000), - x: `-=${(optionTextWidth - nonScrollWidth)}` + duration: Utils.fixedInt(((optionTextWidth - nonScrollWidth) / 15) * 2000), + x: `-=${optionTextWidth - nonScrollWidth}`, }); } @@ -420,30 +468,47 @@ export default class MysteryEncounterUiHandler extends UiHandler { } // View Party Button - const viewPartyText = addBBCodeTextObject((globalScene.game.canvas.width) / 6, -24, getBBCodeFrag(i18next.t("mysteryEncounterMessages:view_party_button"), TextStyle.PARTY), TextStyle.PARTY); + const viewPartyText = addBBCodeTextObject( + globalScene.game.canvas.width / 6, + -24, + getBBCodeFrag(i18next.t("mysteryEncounterMessages:view_party_button"), TextStyle.PARTY), + TextStyle.PARTY, + ); this.optionsContainer.add(viewPartyText); - viewPartyText.x -= (viewPartyText.displayWidth + 16); + viewPartyText.x -= viewPartyText.displayWidth + 16; this.viewPartyXPosition = viewPartyText.x - 10; // Description Window - const titleTextObject = addBBCodeTextObject(0, 0, titleText ?? "", TextStyle.TOOLTIP_TITLE, { wordWrap: { width: 750 }, align: "center", lineSpacing: -8 }); + const titleTextObject = addBBCodeTextObject(0, 0, titleText ?? "", TextStyle.TOOLTIP_TITLE, { + wordWrap: { width: 750 }, + align: "center", + lineSpacing: -8, + }); this.descriptionContainer.add(titleTextObject); titleTextObject.setPosition(72 - titleTextObject.displayWidth / 2, 5.5); // Rarity of encounter - const index = mysteryEncounter.encounterTier === MysteryEncounterTier.COMMON ? 0 : - mysteryEncounter.encounterTier === MysteryEncounterTier.GREAT ? 1 : - mysteryEncounter.encounterTier === MysteryEncounterTier.ULTRA ? 2 : - mysteryEncounter.encounterTier === MysteryEncounterTier.ROGUE ? 3 : 4; + const index = + mysteryEncounter.encounterTier === MysteryEncounterTier.COMMON + ? 0 + : mysteryEncounter.encounterTier === MysteryEncounterTier.GREAT + ? 1 + : mysteryEncounter.encounterTier === MysteryEncounterTier.ULTRA + ? 2 + : mysteryEncounter.encounterTier === MysteryEncounterTier.ROGUE + ? 3 + : 4; const ballType = getPokeballAtlasKey(index); this.rarityBall.setTexture("pb", ballType); - const descriptionTextObject = addBBCodeTextObject(6, 25, descriptionText ?? "", TextStyle.TOOLTIP_CONTENT, { wordWrap: { width: 830 }}); + const descriptionTextObject = addBBCodeTextObject(6, 25, descriptionText ?? "", TextStyle.TOOLTIP_CONTENT, { + wordWrap: { width: 830 }, + }); // Sets up the mask that hides the description text to give an illusion of scrolling const descriptionTextMaskRect = globalScene.make.graphics({}); descriptionTextMaskRect.setScale(6); - descriptionTextMaskRect.fillStyle(0xFFFFFF); + descriptionTextMaskRect.fillStyle(0xffffff); descriptionTextMaskRect.beginPath(); descriptionTextMaskRect.fillRect(6, 53, 206, 57); @@ -466,13 +531,15 @@ export default class MysteryEncounterUiHandler extends UiHandler { loop: -1, hold: Utils.fixedInt(2000), duration: Utils.fixedInt((descriptionLineCount - 6) * 2000), - y: `-=${10 * (descriptionLineCount - 6)}` + y: `-=${10 * (descriptionLineCount - 6)}`, }); } this.descriptionContainer.add(descriptionTextObject); - const queryTextObject = addBBCodeTextObject(0, 0, queryText ?? "", TextStyle.TOOLTIP_CONTENT, { wordWrap: { width: 830 }}); + const queryTextObject = addBBCodeTextObject(0, 0, queryText ?? "", TextStyle.TOOLTIP_CONTENT, { + wordWrap: { width: 830 }, + }); this.descriptionContainer.add(queryTextObject); queryTextObject.setPosition(75 - queryTextObject.displayWidth / 2, 90); @@ -483,7 +550,7 @@ export default class MysteryEncounterUiHandler extends UiHandler { targets: this.descriptionContainer, x: "+=150", ease: "Sine.easeInOut", - duration: 1000 + duration: 1000, }); } } @@ -510,7 +577,12 @@ export default class MysteryEncounterUiHandler extends UiHandler { let text: string | null; const cursorOption = this.encounterOptions[cursor]; const optionDialogue = cursorOption.dialogue!; - if (!this.optionsMeetsReqs[cursor] && (cursorOption.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || cursorOption.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) && optionDialogue.disabledButtonTooltip) { + if ( + !this.optionsMeetsReqs[cursor] && + (cursorOption.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || + cursorOption.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) && + optionDialogue.disabledButtonTooltip + ) { text = getEncounterText(optionDialogue.disabledButtonTooltip, TextStyle.TOOLTIP_CONTENT); } else { text = getEncounterText(optionDialogue.buttonTooltip, TextStyle.TOOLTIP_CONTENT); @@ -518,19 +590,36 @@ export default class MysteryEncounterUiHandler extends UiHandler { // Auto-color options green/blue for good/bad by looking for (+)/(-) if (text) { - const primaryStyleString = [ ...text.match(new RegExp(/\[color=[^\[]*\]\[shadow=[^\[]*\]/i))! ][0]; - text = text.replace(/(\(\+\)[^\(\[]*)/gi, substring => "[/color][/shadow]" + getBBCodeFrag(substring, TextStyle.SUMMARY_GREEN) + "[/color][/shadow]" + primaryStyleString); - text = text.replace(/(\(\-\)[^\(\[]*)/gi, substring => "[/color][/shadow]" + getBBCodeFrag(substring, TextStyle.SUMMARY_BLUE) + "[/color][/shadow]" + primaryStyleString); + const primaryStyleString = [...text.match(new RegExp(/\[color=[^\[]*\]\[shadow=[^\[]*\]/i))!][0]; + text = text.replace( + /(\(\+\)[^\(\[]*)/gi, + substring => + "[/color][/shadow]" + + getBBCodeFrag(substring, TextStyle.SUMMARY_GREEN) + + "[/color][/shadow]" + + primaryStyleString, + ); + text = text.replace( + /(\(\-\)[^\(\[]*)/gi, + substring => + "[/color][/shadow]" + + getBBCodeFrag(substring, TextStyle.SUMMARY_BLUE) + + "[/color][/shadow]" + + primaryStyleString, + ); } if (text) { - const tooltipTextObject = addBBCodeTextObject(6, 7, text, TextStyle.TOOLTIP_CONTENT, { wordWrap: { width: 600 }, fontSize: "72px" }); + const tooltipTextObject = addBBCodeTextObject(6, 7, text, TextStyle.TOOLTIP_CONTENT, { + wordWrap: { width: 600 }, + fontSize: "72px", + }); this.tooltipContainer.add(tooltipTextObject); // Sets up the mask that hides the description text to give an illusion of scrolling const tooltipTextMaskRect = globalScene.make.graphics({}); tooltipTextMaskRect.setScale(6); - tooltipTextMaskRect.fillStyle(0xFFFFFF); + tooltipTextMaskRect.fillStyle(0xffffff); tooltipTextMaskRect.beginPath(); tooltipTextMaskRect.fillRect(this.tooltipContainer.x, this.tooltipContainer.y + 188.5, 150, 32); @@ -552,7 +641,7 @@ export default class MysteryEncounterUiHandler extends UiHandler { loop: -1, hold: Utils.fixedInt(1200), duration: Utils.fixedInt((tooltipLineCount - 3) * 1200), - y: `-=${11.2 * (tooltipLineCount - 3)}` + y: `-=${11.2 * (tooltipLineCount - 3)}`, }); } } @@ -606,7 +695,7 @@ export default class MysteryEncounterUiHandler extends UiHandler { this.dexProgressContainer.on("pointerout", () => { globalScene.ui.hideTooltip(); }); - } + }, }); } else if (!show && this.showDexProgress) { this.showDexProgress = false; @@ -619,7 +708,7 @@ export default class MysteryEncounterUiHandler extends UiHandler { onComplete: () => { this.dexProgressContainer.off("pointerover"); this.dexProgressContainer.off("pointerout"); - } + }, }); } } diff --git a/src/ui/party-exp-bar.ts b/src/ui/party-exp-bar.ts index 93e4117157a..7b7f5277ca1 100644 --- a/src/ui/party-exp-bar.ts +++ b/src/ui/party-exp-bar.ts @@ -1,6 +1,7 @@ import { globalScene } from "#app/global-scene"; import type Pokemon from "../field/pokemon"; import { TextStyle, addTextObject } from "./text"; +import i18next from "i18next"; export default class PartyExpBar extends Phaser.GameObjects.Container { private bg: Phaser.GameObjects.NineSlice; @@ -12,7 +13,7 @@ export default class PartyExpBar extends Phaser.GameObjects.Container { public shown: boolean; constructor() { - super(globalScene, (globalScene.game.canvas.width / 6), -((globalScene.game.canvas.height) / 6) + 15); + super(globalScene, globalScene.game.canvas.width / 6, -(globalScene.game.canvas.height / 6) + 15); } setup(): void { @@ -29,7 +30,7 @@ export default class PartyExpBar extends Phaser.GameObjects.Container { this.shown = false; } - showPokemonExp(pokemon: Pokemon, expValue: integer, showOnlyLevelUp: boolean, newLevel: number): Promise { + showPokemonExp(pokemon: Pokemon, expValue: number, showOnlyLevelUp: boolean, newLevel: number): Promise { return new Promise(resolve => { if (this.shown) { return resolve(); @@ -42,10 +43,12 @@ export default class PartyExpBar extends Phaser.GameObjects.Container { // if we want to only display the level in the small frame if (showOnlyLevelUp) { - if (newLevel > 200) { // if the level is greater than 200, we only display Lv. UP - this.expText.setText("Lv. UP"); - } else { // otherwise we display Lv. Up and the new level - this.expText.setText(`Lv. UP: ${newLevel.toString()}`); + if (newLevel > 200) { + // if the level is greater than 200, we only display Lv. UP + this.expText.setText(i18next.t("battleScene:levelUp")); + } else { + // otherwise we display Lv. Up and the new level + this.expText.setText(i18next.t("battleScene:levelUpWithLevel", { level: newLevel })); } } else { // if we want to display the exp @@ -62,13 +65,13 @@ export default class PartyExpBar extends Phaser.GameObjects.Container { this.tween = globalScene.tweens.add({ targets: this, - x: (globalScene.game.canvas.width / 6) - (this.bg.width - 5), + x: globalScene.game.canvas.width / 6 - (this.bg.width - 5), duration: 500 / Math.pow(2, globalScene.expGainsSpeed), ease: "Sine.easeOut", onComplete: () => { this.tween = null; resolve(); - } + }, }); this.setVisible(true); @@ -88,7 +91,7 @@ export default class PartyExpBar extends Phaser.GameObjects.Container { this.tween = globalScene.tweens.add({ targets: this, - x: (globalScene.game.canvas.width / 6), + x: globalScene.game.canvas.width / 6, duration: 500, ease: "Sine.easeIn", onComplete: () => { @@ -97,7 +100,7 @@ export default class PartyExpBar extends Phaser.GameObjects.Container { this.setVisible(false); this.pokemonIcon?.destroy(); resolve(); - } + }, }); }); } diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 4a7716f7e62..21e5f9077f4 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -6,9 +6,13 @@ import { Command } from "#app/ui/command-ui-handler"; import MessageUiHandler from "#app/ui/message-ui-handler"; import { Mode } from "#app/ui/ui"; import * as Utils from "#app/utils"; -import { PokemonFormChangeItemModifier, PokemonHeldItemModifier, SwitchEffectTransferModifier } from "#app/modifier/modifier"; -import { allMoves, ForceSwitchOutAttr } from "#app/data/move"; -import { getGenderColor, getGenderSymbol } from "#app/data/gender"; +import { + PokemonFormChangeItemModifier, + PokemonHeldItemModifier, + SwitchEffectTransferModifier, +} from "#app/modifier/modifier"; +import { allMoves, ForceSwitchOutAttr } from "#app/data/moves/move"; +import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender"; import { StatusEffect } from "#enums/status-effect"; import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler"; import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; @@ -97,7 +101,7 @@ export enum PartyUiMode { * Indicates that the party UI is open to select a party member for an arbitrary effect. * This is generally used in for Mystery Encounter or special effects that require the player to select a Pokemon */ - SELECT + SELECT, } export enum PartyOption { @@ -109,6 +113,7 @@ export enum PartyOption { TEACH, TRANSFER, SUMMARY, + POKEDEX, UNPAUSE_EVOLUTION, SPLICE, UNSPLICE, @@ -125,16 +130,24 @@ export enum PartyOption { ALL = 4000, } -export type PartySelectCallback = (cursor: integer, option: PartyOption) => void; -export type PartyModifierTransferSelectCallback = (fromCursor: integer, index: integer, itemQuantity?: integer, toCursor?: integer) => void; -export type PartyModifierSpliceSelectCallback = (fromCursor: integer, toCursor?: integer) => void; +export type PartySelectCallback = (cursor: number, option: PartyOption) => void; +export type PartyModifierTransferSelectCallback = ( + fromCursor: number, + index: number, + itemQuantity?: number, + toCursor?: number, +) => void; +export type PartyModifierSpliceSelectCallback = (fromCursor: number, toCursor?: number) => void; export type PokemonSelectFilter = (pokemon: PlayerPokemon) => string | null; -export type PokemonModifierTransferSelectFilter = (pokemon: PlayerPokemon, modifier: PokemonHeldItemModifier) => string | null; +export type PokemonModifierTransferSelectFilter = ( + pokemon: PlayerPokemon, + modifier: PokemonHeldItemModifier, +) => string | null; export type PokemonMoveSelectFilter = (pokemonMove: PokemonMove) => string | null; export default class PartyUiHandler extends MessageUiHandler { private partyUiMode: PartyUiMode; - private fieldIndex: integer; + private fieldIndex: number; private partyBg: Phaser.GameObjects.Image; private partyContainer: Phaser.GameObjects.Container; @@ -146,26 +159,26 @@ export default class PartyUiHandler extends MessageUiHandler { private optionsMode: boolean; private optionsScroll: boolean; - private optionsCursor: integer = 0; - private optionsScrollCursor: integer = 0; - private optionsScrollTotal: integer = 0; + private optionsCursor = 0; + private optionsScrollCursor = 0; + private optionsScrollTotal = 0; /** This is only public for test/ui/transfer-item.test.ts */ public optionsContainer: Phaser.GameObjects.Container; private optionsBg: Phaser.GameObjects.NineSlice; private optionsCursorObj: Phaser.GameObjects.Image | null; - private options: integer[]; + private options: number[]; private transferMode: boolean; - private transferOptionCursor: integer; - private transferCursor: integer; + private transferOptionCursor: number; + private transferCursor: number; /** Current quantity selection for every item held by the pokemon selected for the transfer */ - private transferQuantities: integer[]; + private transferQuantities: number[]; /** Stack size of every item that the selected pokemon is holding */ - private transferQuantitiesMax: integer[]; + private transferQuantitiesMax: number[]; /** Whether to transfer all items */ private transferAll: boolean; - private lastCursor: integer = 0; + private lastCursor = 0; private selectCallback: PartySelectCallback | PartyModifierTransferSelectCallback | null; private selectFilter: PokemonSelectFilter | PokemonModifierTransferSelectFilter; private moveSelectFilter: PokemonMoveSelectFilter; @@ -180,14 +193,18 @@ export default class PartyUiHandler extends MessageUiHandler { public static FilterNonFainted = (pokemon: PlayerPokemon) => { if (pokemon.isFainted()) { - return i18next.t("partyUiHandler:noEnergy", { pokemonName: getPokemonNameWithAffix(pokemon) }); + return i18next.t("partyUiHandler:noEnergy", { + pokemonName: getPokemonNameWithAffix(pokemon), + }); } return null; }; public static FilterFainted = (pokemon: PlayerPokemon) => { if (!pokemon.isFainted()) { - return i18next.t("partyUiHandler:hasEnergy", { pokemonName: getPokemonNameWithAffix(pokemon) }); + return i18next.t("partyUiHandler:hasEnergy", { + pokemonName: getPokemonNameWithAffix(pokemon), + }); } return null; }; @@ -201,7 +218,9 @@ export default class PartyUiHandler extends MessageUiHandler { const challengeAllowed = new Utils.BooleanHolder(true); applyChallenges(globalScene.gameMode, ChallengeType.POKEMON_IN_BATTLE, pokemon, challengeAllowed); if (!challengeAllowed.value) { - return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: getPokemonNameWithAffix(pokemon) }); + return i18next.t("partyUiHandler:cantBeUsed", { + pokemonName: getPokemonNameWithAffix(pokemon), + }); } return null; }; @@ -209,16 +228,36 @@ export default class PartyUiHandler extends MessageUiHandler { private static FilterAllMoves = (_pokemonMove: PokemonMove) => null; public static FilterItemMaxStacks = (pokemon: PlayerPokemon, modifier: PokemonHeldItemModifier) => { - const matchingModifier = globalScene.findModifier(m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id && m.matchType(modifier)) as PokemonHeldItemModifier; + const matchingModifier = globalScene.findModifier( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id && m.matchType(modifier), + ) as PokemonHeldItemModifier; if (matchingModifier && matchingModifier.stackCount === matchingModifier.getMaxStackCount()) { - return i18next.t("partyUiHandler:tooManyItems", { pokemonName: getPokemonNameWithAffix(pokemon) }); + return i18next.t("partyUiHandler:tooManyItems", { + pokemonName: getPokemonNameWithAffix(pokemon), + }); } return null; }; public static NoEffectMessage = i18next.t("partyUiHandler:anyEffect"); - private localizedOptions = [ PartyOption.SEND_OUT, PartyOption.SUMMARY, PartyOption.CANCEL, PartyOption.APPLY, PartyOption.RELEASE, PartyOption.TEACH, PartyOption.SPLICE, PartyOption.UNSPLICE, PartyOption.REVIVE, PartyOption.TRANSFER, PartyOption.UNPAUSE_EVOLUTION, PartyOption.PASS_BATON, PartyOption.RENAME, PartyOption.SELECT ]; + private localizedOptions = [ + PartyOption.SEND_OUT, + PartyOption.SUMMARY, + PartyOption.POKEDEX, + PartyOption.CANCEL, + PartyOption.APPLY, + PartyOption.RELEASE, + PartyOption.TEACH, + PartyOption.SPLICE, + PartyOption.UNSPLICE, + PartyOption.REVIVE, + PartyOption.TRANSFER, + PartyOption.UNPAUSE_EVOLUTION, + PartyOption.PASS_BATON, + PartyOption.RENAME, + PartyOption.SELECT, + ]; constructor() { super(Mode.PARTY); @@ -270,7 +309,7 @@ export default class PartyUiHandler extends MessageUiHandler { this.partyCancelButton = partyCancelButton; - this.optionsContainer = globalScene.add.container((globalScene.game.canvas.width / 6) - 1, -1); + this.optionsContainer = globalScene.add.container(globalScene.game.canvas.width / 6 - 1, -1); partyContainer.add(this.optionsContainer); this.iconAnimHandler = new PokemonIconAnimHandler(); @@ -304,15 +343,15 @@ export default class PartyUiHandler extends MessageUiHandler { this.partyUiMode = args[0] as PartyUiMode; - this.fieldIndex = args.length > 1 ? args[1] as integer : -1; + this.fieldIndex = args.length > 1 ? (args[1] as number) : -1; this.selectCallback = args.length > 2 && args[2] instanceof Function ? args[2] : undefined; - this.selectFilter = args.length > 3 && args[3] instanceof Function - ? args[3] as PokemonSelectFilter - : PartyUiHandler.FilterAll; - this.moveSelectFilter = args.length > 4 && args[4] instanceof Function - ? args[4] as PokemonMoveSelectFilter - : PartyUiHandler.FilterAllMoves; + this.selectFilter = + args.length > 3 && args[3] instanceof Function ? (args[3] as PokemonSelectFilter) : PartyUiHandler.FilterAll; + this.moveSelectFilter = + args.length > 4 && args[4] instanceof Function + ? (args[4] as PokemonMoveSelectFilter) + : PartyUiHandler.FilterAllMoves; this.tmMoveId = args.length > 5 && args[5] ? args[5] : Moves.NONE; this.showMovePp = args.length > 6 && args[6]; @@ -353,25 +392,42 @@ export default class PartyUiHandler extends MessageUiHandler { this.startTransfer(); let ableToTransfer: string; - for (let p = 0; p < globalScene.getPlayerParty().length; p++) { // this for look goes through each of the party pokemon + for (let p = 0; p < globalScene.getPlayerParty().length; p++) { + // this for look goes through each of the party pokemon const newPokemon = globalScene.getPlayerParty()[p]; // this next line gets all of the transferable items from pokemon [p]; it does this by getting all the held modifiers that are transferable and checking to see if they belong to pokemon [p] const getTransferrableItemsFromPokemon = (newPokemon: PlayerPokemon) => - globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).isTransferable && (m as PokemonHeldItemModifier).pokemonId === newPokemon.id) as PokemonHeldItemModifier[]; + globalScene.findModifiers( + m => + m instanceof PokemonHeldItemModifier && + (m as PokemonHeldItemModifier).isTransferable && + (m as PokemonHeldItemModifier).pokemonId === newPokemon.id, + ) as PokemonHeldItemModifier[]; // this next bit checks to see if the the selected item from the original transfer pokemon exists on the new pokemon [p]; this returns undefined if the new pokemon doesn't have the item at all, otherwise it returns the pokemonHeldItemModifier for that item - const matchingModifier = globalScene.findModifier(m => m instanceof PokemonHeldItemModifier && m.pokemonId === newPokemon.id && m.matchType(getTransferrableItemsFromPokemon(pokemon)[this.transferOptionCursor])) as PokemonHeldItemModifier; + const matchingModifier = globalScene.findModifier( + m => + m instanceof PokemonHeldItemModifier && + m.pokemonId === newPokemon.id && + m.matchType(getTransferrableItemsFromPokemon(pokemon)[this.transferOptionCursor]), + ) as PokemonHeldItemModifier; const partySlot = this.partySlots.filter(m => m.getPokemon() === newPokemon)[0]; // this gets pokemon [p] for us - if (p !== this.transferCursor) { // this skips adding the able/not able labels on the pokemon doing the transfer - if (matchingModifier) { // if matchingModifier exists then the item exists on the new pokemon - if (matchingModifier.getMaxStackCount() === matchingModifier.stackCount) { // checks to see if the stack of items is at max stack; if so, set the description label to "Not able" + if (p !== this.transferCursor) { + // this skips adding the able/not able labels on the pokemon doing the transfer + if (matchingModifier) { + // if matchingModifier exists then the item exists on the new pokemon + if (matchingModifier.getMaxStackCount() === matchingModifier.stackCount) { + // checks to see if the stack of items is at max stack; if so, set the description label to "Not able" ableToTransfer = i18next.t("partyUiHandler:notAble"); - } else { // if the pokemon isn't at max stack, make the label "Able" + } else { + // if the pokemon isn't at max stack, make the label "Able" ableToTransfer = i18next.t("partyUiHandler:able"); } - } else { // if matchingModifier doesn't exist, that means the pokemon doesn't have any of the item, and we need to show "Able" + } else { + // if matchingModifier doesn't exist, that means the pokemon doesn't have any of the item, and we need to show "Able" ableToTransfer = i18next.t("partyUiHandler:able"); } - } else { // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text + } else { + // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text ableToTransfer = ""; } partySlot.slotHpBar.setVisible(false); @@ -384,7 +440,8 @@ export default class PartyUiHandler extends MessageUiHandler { this.clearOptions(); ui.playSelect(); return true; - } else if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER && option !== PartyOption.CANCEL) { + } + if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER && option !== PartyOption.CANCEL) { // clear overlay on cancel this.moveInfoOverlay.clear(); const filterResult = (this.selectFilter as PokemonSelectFilter)(pokemon); @@ -397,11 +454,24 @@ export default class PartyUiHandler extends MessageUiHandler { } ui.playSelect(); return true; - } else if ((option !== PartyOption.SUMMARY && option !== PartyOption.UNPAUSE_EVOLUTION && option !== PartyOption.UNSPLICE && option !== PartyOption.RELEASE && option !== PartyOption.CANCEL && option !== PartyOption.RENAME) - || (option === PartyOption.RELEASE && this.partyUiMode === PartyUiMode.RELEASE)) { + } + if ( + ![ + PartyOption.SUMMARY, + PartyOption.POKEDEX, + PartyOption.UNPAUSE_EVOLUTION, + PartyOption.UNSPLICE, + PartyOption.RELEASE, + PartyOption.CANCEL, + PartyOption.RENAME, + ].includes(option) || + (option === PartyOption.RELEASE && this.partyUiMode === PartyUiMode.RELEASE) + ) { let filterResult: string | null; const getTransferrableItemsFromPokemon = (pokemon: PlayerPokemon) => - globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id) as PokemonHeldItemModifier[]; + globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id, + ) as PokemonHeldItemModifier[]; if (option !== PartyOption.TRANSFER && option !== PartyOption.SPLICE) { filterResult = (this.selectFilter as PokemonSelectFilter)(pokemon); if (filterResult === null && (option === PartyOption.SEND_OUT || option === PartyOption.PASS_BATON)) { @@ -411,7 +481,12 @@ export default class PartyUiHandler extends MessageUiHandler { filterResult = this.moveSelectFilter(pokemon.moveset[this.optionsCursor]!); // TODO: is this bang correct? } } else { - filterResult = (this.selectFilter as PokemonModifierTransferSelectFilter)(pokemon, getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor])[this.transferOptionCursor]); + filterResult = (this.selectFilter as PokemonModifierTransferSelectFilter)( + pokemon, + getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor])[ + this.transferOptionCursor + ], + ); } if (filterResult === null) { if (this.partyUiMode !== PartyUiMode.SPLICE) { @@ -421,9 +496,24 @@ export default class PartyUiHandler extends MessageUiHandler { if (option === PartyOption.TRANSFER) { if (this.transferCursor !== this.cursor) { if (this.transferAll) { - getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor]).forEach((_, i) => (this.selectCallback as PartyModifierTransferSelectCallback)(this.transferCursor, i, this.transferQuantitiesMax[i], this.cursor)); + getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor]).forEach( + (_, i, array) => { + const invertedIndex = array.length - 1 - i; + (this.selectCallback as PartyModifierTransferSelectCallback)( + this.transferCursor, + invertedIndex, + this.transferQuantitiesMax[invertedIndex], + this.cursor, + ); + }, + ); } else { - (this.selectCallback as PartyModifierTransferSelectCallback)(this.transferCursor, this.transferOptionCursor, this.transferQuantities[this.transferOptionCursor], this.cursor); + (this.selectCallback as PartyModifierTransferSelectCallback)( + this.transferCursor, + this.transferOptionCursor, + this.transferQuantities[this.transferOptionCursor], + this.cursor, + ); } } this.clearTransfer(); @@ -443,7 +533,10 @@ export default class PartyUiHandler extends MessageUiHandler { selectCallback(this.cursor, option); } } else { - if (option >= PartyOption.FORM_CHANGE_ITEM && globalScene.getCurrentPhase() instanceof SelectModifierPhase) { + if ( + option >= PartyOption.FORM_CHANGE_ITEM && + globalScene.getCurrentPhase() instanceof SelectModifierPhase + ) { if (this.partyUiMode === PartyUiMode.CHECK) { const formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon); const modifier = formChangeItemModifiers[option - PartyOption.FORM_CHANGE_ITEM]; @@ -451,61 +544,119 @@ export default class PartyUiHandler extends MessageUiHandler { globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeItemTrigger, false, true); } } else if (this.cursor) { - (globalScene.getCurrentPhase() as CommandPhase).handleCommand(Command.POKEMON, this.cursor, option === PartyOption.PASS_BATON); + (globalScene.getCurrentPhase() as CommandPhase).handleCommand( + Command.POKEMON, + this.cursor, + option === PartyOption.PASS_BATON, + ); } } - if (this.partyUiMode !== PartyUiMode.MODIFIER && this.partyUiMode !== PartyUiMode.TM_MODIFIER && this.partyUiMode !== PartyUiMode.MOVE_MODIFIER) { + if ( + this.partyUiMode !== PartyUiMode.MODIFIER && + this.partyUiMode !== PartyUiMode.TM_MODIFIER && + this.partyUiMode !== PartyUiMode.MOVE_MODIFIER + ) { ui.playSelect(); } return true; - } else { - this.clearOptions(); - this.showText(filterResult as string, undefined, () => this.showText("", 0), undefined, true); } + this.clearOptions(); + this.showText(filterResult as string, undefined, () => this.showText("", 0), undefined, true); } else if (option === PartyOption.SUMMARY) { ui.playSelect(); - ui.setModeWithoutClear(Mode.SUMMARY, pokemon).then(() => this.clearOptions()); + ui.setModeWithoutClear(Mode.SUMMARY, pokemon).then(() => this.clearOptions()); + return true; + } else if (option === PartyOption.POKEDEX) { + ui.playSelect(); + const attributes = { + shiny: pokemon.shiny, + variant: pokemon.variant, + form: pokemon.formIndex, + female: pokemon.gender === Gender.FEMALE, + }; + ui.setOverlayMode(Mode.POKEDEX_PAGE, pokemon.species, pokemon.formIndex, attributes).then(() => + this.clearOptions(), + ); return true; } else if (option === PartyOption.UNPAUSE_EVOLUTION) { this.clearOptions(); ui.playSelect(); pokemon.pauseEvolutions = !pokemon.pauseEvolutions; - this.showText(i18next.t(pokemon.pauseEvolutions ? "partyUiHandler:pausedEvolutions" : "partyUiHandler:unpausedEvolutions", { pokemonName: getPokemonNameWithAffix(pokemon) }), undefined, () => this.showText("", 0), null, true); + this.showText( + i18next.t( + pokemon.pauseEvolutions ? "partyUiHandler:pausedEvolutions" : "partyUiHandler:unpausedEvolutions", + { pokemonName: getPokemonNameWithAffix(pokemon) }, + ), + undefined, + () => this.showText("", 0), + null, + true, + ); } else if (option === PartyOption.UNSPLICE) { this.clearOptions(); ui.playSelect(); - this.showText(i18next.t("partyUiHandler:unspliceConfirmation", { fusionName: pokemon.fusionSpecies?.name, pokemonName: pokemon.name }), null, () => { - ui.setModeWithoutClear(Mode.CONFIRM, () => { - const fusionName = pokemon.name; - pokemon.unfuse().then(() => { - this.clearPartySlots(); - this.populatePartySlots(); - ui.setMode(Mode.PARTY); - this.showText(i18next.t("partyUiHandler:wasReverted", { fusionName: fusionName, pokemonName: pokemon.name }), undefined, () => { + this.showText( + i18next.t("partyUiHandler:unspliceConfirmation", { + fusionName: pokemon.fusionSpecies?.name, + pokemonName: pokemon.name, + }), + null, + () => { + ui.setModeWithoutClear( + Mode.CONFIRM, + () => { + const fusionName = pokemon.name; + pokemon.unfuse().then(() => { + this.clearPartySlots(); + this.populatePartySlots(); + ui.setMode(Mode.PARTY); + this.showText( + i18next.t("partyUiHandler:wasReverted", { + fusionName: fusionName, + pokemonName: pokemon.name, + }), + undefined, + () => { + ui.setMode(Mode.PARTY); + this.showText("", 0); + }, + null, + true, + ); + }); + }, + () => { ui.setMode(Mode.PARTY); this.showText("", 0); - }, null, true); - }); - }, () => { - ui.setMode(Mode.PARTY); - this.showText("", 0); - }); - }); + }, + ); + }, + ); } else if (option === PartyOption.RELEASE) { this.clearOptions(); ui.playSelect(); if (this.cursor >= globalScene.currentBattle.getBattlerCount() || !pokemon.isAllowedInBattle()) { this.blockInput = true; - this.showText(i18next.t("partyUiHandler:releaseConfirmation", { pokemonName: getPokemonNameWithAffix(pokemon) }), null, () => { - this.blockInput = false; - ui.setModeWithoutClear(Mode.CONFIRM, () => { - ui.setMode(Mode.PARTY); - this.doRelease(this.cursor); - }, () => { - ui.setMode(Mode.PARTY); - this.showText("", 0); - }); - }); + this.showText( + i18next.t("partyUiHandler:releaseConfirmation", { + pokemonName: getPokemonNameWithAffix(pokemon), + }), + null, + () => { + this.blockInput = false; + ui.setModeWithoutClear( + Mode.CONFIRM, + () => { + ui.setMode(Mode.PARTY); + this.doRelease(this.cursor); + }, + () => { + ui.setMode(Mode.PARTY); + this.showText("", 0); + }, + ); + }, + ); } else { this.showText(i18next.t("partyUiHandler:releaseInBattle"), null, () => this.showText("", 0), null, true); } @@ -513,21 +664,25 @@ export default class PartyUiHandler extends MessageUiHandler { } else if (option === PartyOption.RENAME) { this.clearOptions(); ui.playSelect(); - ui.setModeWithoutClear(Mode.RENAME_POKEMON, { - buttonActions: [ - (nickname: string) => { - ui.playSelect(); - pokemon.nickname = nickname; - pokemon.updateInfo(); - this.clearPartySlots(); - this.populatePartySlots(); - ui.setMode(Mode.PARTY); - }, - () => { - ui.setMode(Mode.PARTY); - } - ] - }, pokemon); + ui.setModeWithoutClear( + Mode.RENAME_POKEMON, + { + buttonActions: [ + (nickname: string) => { + ui.playSelect(); + pokemon.nickname = nickname; + pokemon.updateInfo(); + this.clearPartySlots(); + this.populatePartySlots(); + ui.setMode(Mode.PARTY); + }, + () => { + ui.setMode(Mode.PARTY); + }, + ], + }, + pokemon, + ); return true; } else if (option === PartyOption.CANCEL) { return this.processInput(Button.CANCEL); @@ -542,40 +697,54 @@ export default class PartyUiHandler extends MessageUiHandler { } else { switch (button) { case Button.LEFT: - /** Decrease quantity for the current item and update UI */ + /** Decrease quantity for the current item and update UI */ if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { - this.transferQuantities[option] = this.transferQuantities[option] === 1 ? this.transferQuantitiesMax[option] : this.transferQuantities[option] - 1; + this.transferQuantities[option] = + this.transferQuantities[option] === 1 + ? this.transferQuantitiesMax[option] + : this.transferQuantities[option] - 1; this.updateOptions(); - success = this.setCursor(this.optionsCursor); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */ + success = this.setCursor( + this.optionsCursor, + ); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */ } break; case Button.RIGHT: - /** Increase quantity for the current item and update UI */ + /** Increase quantity for the current item and update UI */ if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { - this.transferQuantities[option] = this.transferQuantities[option] === this.transferQuantitiesMax[option] ? 1 : this.transferQuantities[option] + 1; + this.transferQuantities[option] = + this.transferQuantities[option] === this.transferQuantitiesMax[option] + ? 1 + : this.transferQuantities[option] + 1; this.updateOptions(); - success = this.setCursor(this.optionsCursor); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */ + success = this.setCursor( + this.optionsCursor, + ); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */ } break; case Button.UP: - /** If currently selecting items to transfer, reset quantity selection */ + /** If currently selecting items to transfer, reset quantity selection */ if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { if (option !== PartyOption.ALL) { this.transferQuantities[option] = this.transferQuantitiesMax[option]; } this.updateOptions(); } - success = this.setCursor(this.optionsCursor ? this.optionsCursor - 1 : this.options.length - 1); /** Move cursor */ + success = this.setCursor( + this.optionsCursor ? this.optionsCursor - 1 : this.options.length - 1, + ); /** Move cursor */ break; case Button.DOWN: - /** If currently selecting items to transfer, reset quantity selection */ + /** If currently selecting items to transfer, reset quantity selection */ if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { if (option !== PartyOption.ALL) { this.transferQuantities[option] = this.transferQuantitiesMax[option]; } this.updateOptions(); } - success = this.setCursor(this.optionsCursor < this.options.length - 1 ? this.optionsCursor + 1 : 0); /** Move cursor */ + success = this.setCursor( + this.optionsCursor < this.options.length - 1 ? this.optionsCursor + 1 : 0, + ); /** Move cursor */ break; } @@ -597,8 +766,12 @@ export default class PartyUiHandler extends MessageUiHandler { if (this.cursor < 6) { if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode) { /** Initialize item quantities for the selected Pokemon */ - const itemModifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.isTransferable && m.pokemonId === globalScene.getPlayerParty()[this.cursor].id) as PokemonHeldItemModifier[]; + const itemModifiers = globalScene.findModifiers( + m => + m instanceof PokemonHeldItemModifier && + m.isTransferable && + m.pokemonId === globalScene.getPlayerParty()[this.cursor].id, + ) as PokemonHeldItemModifier[]; this.transferQuantities = itemModifiers.map(item => item.getStackCount()); this.transferQuantitiesMax = itemModifiers.map(item => item.getStackCount()); } @@ -610,8 +783,12 @@ export default class PartyUiHandler extends MessageUiHandler { return this.processInput(Button.CANCEL); } return true; - } else if (button === Button.CANCEL) { - if ((this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER || this.partyUiMode === PartyUiMode.SPLICE) && this.transferMode) { + } + if (button === Button.CANCEL) { + if ( + (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER || this.partyUiMode === PartyUiMode.SPLICE) && + this.transferMode + ) { this.clearTransfer(); ui.playSelect(); } else if (this.partyUiMode !== PartyUiMode.FAINT_SWITCH && this.partyUiMode !== PartyUiMode.REVIVAL_BLESSING) { @@ -634,10 +811,10 @@ export default class PartyUiHandler extends MessageUiHandler { switch (button) { case Button.UP: - success = this.setCursor(this.cursor ? this.cursor < 6 ? this.cursor - 1 : slotCount - 1 : 6); + success = this.setCursor(this.cursor ? (this.cursor < 6 ? this.cursor - 1 : slotCount - 1) : 6); break; case Button.DOWN: - success = this.setCursor(this.cursor < 6 ? this.cursor < slotCount - 1 ? this.cursor + 1 : 6 : 0); + success = this.setCursor(this.cursor < 6 ? (this.cursor < slotCount - 1 ? this.cursor + 1 : 6) : 0); break; case Button.LEFT: if (this.cursor >= battlerCount && this.cursor <= 6) { @@ -648,11 +825,13 @@ export default class PartyUiHandler extends MessageUiHandler { if (slotCount === battlerCount) { success = this.setCursor(6); break; - } else if (battlerCount >= 2 && slotCount > battlerCount && this.getCursor() === 0 && this.lastCursor === 1) { + } + if (battlerCount >= 2 && slotCount > battlerCount && this.getCursor() === 0 && this.lastCursor === 1) { success = this.setCursor(2); break; - } else if (slotCount > battlerCount && this.cursor < battlerCount) { - success = this.setCursor(this.lastCursor < 6 ? this.lastCursor || battlerCount : battlerCount); + } + if (slotCount > battlerCount && this.cursor < battlerCount) { + success = this.setCursor(this.lastCursor < 6 ? this.lastCursor || battlerCount : battlerCount); break; } } @@ -678,7 +857,7 @@ export default class PartyUiHandler extends MessageUiHandler { } for (const p in party) { - const slotIndex = parseInt(p); + const slotIndex = Number.parseInt(p); const partySlot = new PartySlot(slotIndex, party[p], this.iconAnimHandler, this.partyUiMode, this.tmMoveId); globalScene.add.existing(partySlot); this.partySlotsContainer.add(partySlot); @@ -689,7 +868,7 @@ export default class PartyUiHandler extends MessageUiHandler { } } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { let changed: boolean; if (this.optionsMode) { @@ -700,7 +879,7 @@ export default class PartyUiHandler extends MessageUiHandler { this.optionsScrollCursor = cursor ? this.optionsScrollTotal - 8 : 0; this.updateOptions(); } else { - const isDown = cursor && cursor > this.optionsCursor; + const isDown = cursor && cursor > this.optionsCursor; if (isDown) { if (this.options[cursor] === PartyOption.SCROLL_DOWN) { isScroll = true; @@ -727,7 +906,10 @@ export default class PartyUiHandler extends MessageUiHandler { this.optionsCursorObj.setOrigin(0, 0); this.optionsContainer.add(this.optionsCursorObj); } - this.optionsCursorObj.setPosition(8 - this.optionsBg.displayWidth, -19 - (16 * ((this.options.length - 1) - this.optionsCursor))); + this.optionsCursorObj.setPosition( + 8 - this.optionsBg.displayWidth, + -19 - 16 * (this.options.length - 1 - this.optionsCursor), + ); } else { changed = this.cursor !== cursor; if (changed) { @@ -749,7 +931,14 @@ export default class PartyUiHandler extends MessageUiHandler { return changed; } - showText(text: string, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null) { + showText( + text: string, + delay?: number | null, + callback?: Function | null, + callbackDelay?: number | null, + prompt?: boolean | null, + promptDelay?: number | null, + ) { if (text.length === 0) { text = defaultMessage; } @@ -807,19 +996,20 @@ export default class PartyUiHandler extends MessageUiHandler { updateOptions(): void { const pokemon = globalScene.getPlayerParty()[this.cursor]; - const learnableLevelMoves = this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER - ? pokemon.getLearnableLevelMoves() - : []; + const learnableLevelMoves = + this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER ? pokemon.getLearnableLevelMoves() : []; if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER && learnableLevelMoves?.length) { // show the move overlay with info for the first move this.moveInfoOverlay.show(allMoves[learnableLevelMoves[0]]); } - const itemModifiers = this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER - ? globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.isTransferable && m.pokemonId === pokemon.id) as PokemonHeldItemModifier[] - : []; + const itemModifiers = + this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER + ? (globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id, + ) as PokemonHeldItemModifier[]) + : []; if (this.options.length) { this.options.splice(0, this.options.length); @@ -829,27 +1019,40 @@ export default class PartyUiHandler extends MessageUiHandler { let formChangeItemModifiers: PokemonFormChangeItemModifier[] | undefined; - if (this.partyUiMode !== PartyUiMode.MOVE_MODIFIER && this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER && (this.transferMode || this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER)) { + if ( + this.partyUiMode !== PartyUiMode.MOVE_MODIFIER && + this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER && + (this.transferMode || this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER) + ) { switch (this.partyUiMode) { case PartyUiMode.SWITCH: case PartyUiMode.FAINT_SWITCH: case PartyUiMode.POST_BATTLE_SWITCH: if (this.cursor >= globalScene.currentBattle.getBattlerCount()) { const allowBatonModifierSwitch = - this.partyUiMode !== PartyUiMode.FAINT_SWITCH - && globalScene.findModifier(m => m instanceof SwitchEffectTransferModifier - && (m as SwitchEffectTransferModifier).pokemonId === globalScene.getPlayerField()[this.fieldIndex].id); + this.partyUiMode !== PartyUiMode.FAINT_SWITCH && + globalScene.findModifier( + m => + m instanceof SwitchEffectTransferModifier && + (m as SwitchEffectTransferModifier).pokemonId === globalScene.getPlayerField()[this.fieldIndex].id, + ); const moveHistory = globalScene.getPlayerField()[this.fieldIndex].getMoveHistory(); - const isBatonPassMove = this.partyUiMode === PartyUiMode.FAINT_SWITCH && moveHistory.length && allMoves[moveHistory[moveHistory.length - 1].move].getAttrs(ForceSwitchOutAttr)[0]?.isBatonPass() && moveHistory[moveHistory.length - 1].result === MoveResult.SUCCESS; + const isBatonPassMove = + this.partyUiMode === PartyUiMode.FAINT_SWITCH && + moveHistory.length && + allMoves[moveHistory[moveHistory.length - 1].move].getAttrs(ForceSwitchOutAttr)[0]?.isBatonPass() && + moveHistory[moveHistory.length - 1].result === MoveResult.SUCCESS; // isBatonPassMove and allowBatonModifierSwitch shouldn't ever be true // at the same time, because they both explicitly check for a mutually // exclusive partyUiMode. But better safe than sorry. - this.options.push(isBatonPassMove && !allowBatonModifierSwitch ? PartyOption.PASS_BATON : PartyOption.SEND_OUT); + this.options.push( + isBatonPassMove && !allowBatonModifierSwitch ? PartyOption.PASS_BATON : PartyOption.SEND_OUT, + ); if (allowBatonModifierSwitch && !isBatonPassMove) { - // the BATON modifier gives an extra switch option for - // pokemon-command switches, allowing buffs to be optionally passed + // the BATON modifier gives an extra switch option for + // pokemon-command switches, allowing buffs to be optionally passed this.options.push(PartyOption.PASS_BATON); } } @@ -892,9 +1095,15 @@ export default class PartyUiHandler extends MessageUiHandler { } this.options.push(PartyOption.SUMMARY); + this.options.push(PartyOption.POKEDEX); this.options.push(PartyOption.RENAME); - if ((pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) || (pokemon.isFusion() && pokemon.fusionSpecies && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId)))) { + if ( + pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) || + (pokemon.isFusion() && + pokemon.fusionSpecies && + pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId)) + ) { this.options.push(PartyOption.UNPAUSE_EVOLUTION); } @@ -926,7 +1135,10 @@ export default class PartyUiHandler extends MessageUiHandler { this.optionsScrollTotal = this.options.length; let optionStartIndex = this.optionsScrollCursor; - let optionEndIndex = Math.min(this.optionsScrollTotal, optionStartIndex + (!optionStartIndex || this.optionsScrollCursor + 8 >= this.optionsScrollTotal ? 8 : 7)); + let optionEndIndex = Math.min( + this.optionsScrollTotal, + optionStartIndex + (!optionStartIndex || this.optionsScrollCursor + 8 >= this.optionsScrollTotal ? 8 : 7), + ); this.optionsScroll = this.optionsScrollTotal > 9; @@ -962,7 +1174,11 @@ export default class PartyUiHandler extends MessageUiHandler { optionName = "↑"; } else if (option === PartyOption.SCROLL_DOWN) { optionName = "↓"; - } else if ((this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER && (this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER || this.transferMode)) || option === PartyOption.CANCEL) { + } else if ( + (this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER && + (this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER || this.transferMode)) || + option === PartyOption.CANCEL + ) { switch (option) { case PartyOption.MOVE_1: case PartyOption.MOVE_2: @@ -995,7 +1211,10 @@ export default class PartyUiHandler extends MessageUiHandler { } else if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) { const move = learnableLevelMoves[option]; optionName = allMoves[move].name; - altText = !pokemon.getSpeciesForm().getLevelMoves().find(plm => plm[1] === move); + altText = !pokemon + .getSpeciesForm() + .getLevelMoves() + .find(plm => plm[1] === move); } else if (option === PartyOption.ALL) { optionName = i18next.t("partyUiHandler:ALL"); } else { @@ -1013,7 +1232,13 @@ export default class PartyUiHandler extends MessageUiHandler { /** For every item that has stack bigger than 1, display the current quantity selection */ const itemModifier = itemModifiers[option]; - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && this.transferQuantitiesMax[option] > 1 && !this.transferMode && itemModifier !== undefined && itemModifier.type.name === optionName) { + if ( + this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && + this.transferQuantitiesMax[option] > 1 && + !this.transferMode && + itemModifier !== undefined && + itemModifier.type.name === optionName + ) { let amountText = ` (${this.transferQuantities[option]})`; /** If the amount held is the maximum, display the count in red */ @@ -1060,69 +1285,104 @@ export default class PartyUiHandler extends MessageUiHandler { } } - doRelease(slotIndex: integer): void { - this.showText(this.getReleaseMessage(getPokemonNameWithAffix(globalScene.getPlayerParty()[slotIndex])), null, () => { - this.clearPartySlots(); - globalScene.removePartyMemberModifiers(slotIndex); - const releasedPokemon = globalScene.getPlayerParty().splice(slotIndex, 1)[0]; - releasedPokemon.destroy(); - this.populatePartySlots(); - if (this.cursor >= globalScene.getPlayerParty().length) { - this.setCursor(this.cursor - 1); - } - if (this.partyUiMode === PartyUiMode.RELEASE) { - const selectCallback = this.selectCallback; - this.selectCallback = null; - selectCallback && selectCallback(this.cursor, PartyOption.RELEASE); - } - this.showText("", 0); - }, null, true); + doRelease(slotIndex: number): void { + this.showText( + this.getReleaseMessage(getPokemonNameWithAffix(globalScene.getPlayerParty()[slotIndex])), + null, + () => { + this.clearPartySlots(); + globalScene.removePartyMemberModifiers(slotIndex); + const releasedPokemon = globalScene.getPlayerParty().splice(slotIndex, 1)[0]; + releasedPokemon.destroy(); + this.populatePartySlots(); + if (this.cursor >= globalScene.getPlayerParty().length) { + this.setCursor(this.cursor - 1); + } + if (this.partyUiMode === PartyUiMode.RELEASE) { + const selectCallback = this.selectCallback; + this.selectCallback = null; + selectCallback?.(this.cursor, PartyOption.RELEASE); + } + this.showText("", 0); + }, + null, + true, + ); } getReleaseMessage(pokemonName: string): string { const rand = Utils.randInt(128); if (rand < 20) { return i18next.t("partyUiHandler:goodbye", { pokemonName: pokemonName }); - } else if (rand < 40) { - return i18next.t("partyUiHandler:byebye", { pokemonName: pokemonName }); - } else if (rand < 60) { - return i18next.t("partyUiHandler:farewell", { pokemonName: pokemonName }); - } else if (rand < 80) { - return i18next.t("partyUiHandler:soLong", { pokemonName: pokemonName }); - } else if (rand < 100) { - return i18next.t("partyUiHandler:thisIsWhereWePart", { pokemonName: pokemonName }); - } else if (rand < 108) { - return i18next.t("partyUiHandler:illMissYou", { pokemonName: pokemonName }); - } else if (rand < 116) { - return i18next.t("partyUiHandler:illNeverForgetYou", { pokemonName: pokemonName }); - } else if (rand < 124) { - return i18next.t("partyUiHandler:untilWeMeetAgain", { pokemonName: pokemonName }); - } else if (rand < 127) { - return i18next.t("partyUiHandler:sayonara", { pokemonName: pokemonName }); - } else { - return i18next.t("partyUiHandler:smellYaLater", { pokemonName: pokemonName }); } + if (rand < 40) { + return i18next.t("partyUiHandler:byebye", { pokemonName: pokemonName }); + } + if (rand < 60) { + return i18next.t("partyUiHandler:farewell", { pokemonName: pokemonName }); + } + if (rand < 80) { + return i18next.t("partyUiHandler:soLong", { pokemonName: pokemonName }); + } + if (rand < 100) { + return i18next.t("partyUiHandler:thisIsWhereWePart", { + pokemonName: pokemonName, + }); + } + if (rand < 108) { + return i18next.t("partyUiHandler:illMissYou", { + pokemonName: pokemonName, + }); + } + if (rand < 116) { + return i18next.t("partyUiHandler:illNeverForgetYou", { + pokemonName: pokemonName, + }); + } + if (rand < 124) { + return i18next.t("partyUiHandler:untilWeMeetAgain", { + pokemonName: pokemonName, + }); + } + if (rand < 127) { + return i18next.t("partyUiHandler:sayonara", { pokemonName: pokemonName }); + } + return i18next.t("partyUiHandler:smellYaLater", { + pokemonName: pokemonName, + }); } getFormChangeItemsModifiers(pokemon: Pokemon) { - let formChangeItemModifiers = globalScene.findModifiers(m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id) as PokemonFormChangeItemModifier[]; - const ultraNecrozmaModifiers = formChangeItemModifiers.filter(m => m.active && m.formChangeItem === FormChangeItem.ULTRANECROZIUM_Z); + let formChangeItemModifiers = globalScene.findModifiers( + m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id, + ) as PokemonFormChangeItemModifier[]; + const ultraNecrozmaModifiers = formChangeItemModifiers.filter( + m => m.active && m.formChangeItem === FormChangeItem.ULTRANECROZIUM_Z, + ); if (ultraNecrozmaModifiers.length > 0) { // ULTRANECROZIUM_Z is active and deactivating it should be the only option return ultraNecrozmaModifiers; } if (formChangeItemModifiers.find(m => m.active)) { // a form is currently active. the user has to disable the form or activate ULTRANECROZIUM_Z - formChangeItemModifiers = formChangeItemModifiers.filter(m => m.active || m.formChangeItem === FormChangeItem.ULTRANECROZIUM_Z); + formChangeItemModifiers = formChangeItemModifiers.filter( + m => m.active || m.formChangeItem === FormChangeItem.ULTRANECROZIUM_Z, + ); } else if (pokemon.species.speciesId === Species.NECROZMA) { // no form is currently active. the user has to activate some form, except ULTRANECROZIUM_Z - formChangeItemModifiers = formChangeItemModifiers.filter(m => m.formChangeItem !== FormChangeItem.ULTRANECROZIUM_Z); + formChangeItemModifiers = formChangeItemModifiers.filter( + m => m.formChangeItem !== FormChangeItem.ULTRANECROZIUM_Z, + ); } return formChangeItemModifiers; } - getOptionsCursorWithScroll(): integer { - return this.optionsCursor + this.optionsScrollCursor + (this.options && this.options[0] === PartyOption.SCROLL_UP ? -1 : 0); + getOptionsCursorWithScroll(): number { + return ( + this.optionsCursor + + this.optionsScrollCursor + + (this.options && this.options[0] === PartyOption.SCROLL_UP ? -1 : 0) + ); } clearOptions() { @@ -1164,7 +1424,7 @@ export default class PartyUiHandler extends MessageUiHandler { class PartySlot extends Phaser.GameObjects.Container { private selected: boolean; private transfer: boolean; - private slotIndex: integer; + private slotIndex: number; private pokemon: PlayerPokemon; private slotBg: Phaser.GameObjects.Image; @@ -1175,14 +1435,25 @@ class PartySlot extends Phaser.GameObjects.Container { public slotHpText: Phaser.GameObjects.Text; public slotDescriptionLabel: Phaser.GameObjects.Text; // this is used to show text instead of the HP bar i.e. for showing "Able"/"Not Able" for TMs when you try to learn them - private pokemonIcon: Phaser.GameObjects.Container; private iconAnimHandler: PokemonIconAnimHandler; - constructor(slotIndex: integer, pokemon: PlayerPokemon, iconAnimHandler: PokemonIconAnimHandler, partyUiMode: PartyUiMode, tmMoveId: Moves) { - super(globalScene, slotIndex >= globalScene.currentBattle.getBattlerCount() ? 230.5 : 64, - slotIndex >= globalScene.currentBattle.getBattlerCount() ? -184 + (globalScene.currentBattle.double ? -40 : 0) - + (28 + (globalScene.currentBattle.double ? 8 : 0)) * slotIndex : -124 + (globalScene.currentBattle.double ? -8 : 0) + slotIndex * 64); + constructor( + slotIndex: number, + pokemon: PlayerPokemon, + iconAnimHandler: PokemonIconAnimHandler, + partyUiMode: PartyUiMode, + tmMoveId: Moves, + ) { + super( + globalScene, + slotIndex >= globalScene.currentBattle.getBattlerCount() ? 230.5 : 64, + slotIndex >= globalScene.currentBattle.getBattlerCount() + ? -184 + + (globalScene.currentBattle.double ? -40 : 0) + + (28 + (globalScene.currentBattle.double ? 8 : 0)) * slotIndex + : -124 + (globalScene.currentBattle.double ? -8 : 0) + slotIndex * 64, + ); this.slotIndex = slotIndex; this.pokemon = pokemon; @@ -1196,6 +1467,9 @@ class PartySlot extends Phaser.GameObjects.Container { } setup(partyUiMode: PartyUiMode, tmMoveId: Moves) { + const currentLanguage = i18next.resolvedLanguage ?? "en"; + const offsetJa = currentLanguage === "ja"; + const battlerCount = globalScene.currentBattle.getBattlerCount(); const slotKey = `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}`; @@ -1205,7 +1479,11 @@ class PartySlot extends Phaser.GameObjects.Container { this.add(slotBg); - const slotPb = globalScene.add.sprite(this.slotIndex >= battlerCount ? -85.5 : -51, this.slotIndex >= battlerCount ? 0 : -20.5, "party_pb"); + const slotPb = globalScene.add.sprite( + this.slotIndex >= battlerCount ? -85.5 : -51, + this.slotIndex >= battlerCount ? 0 : -20.5, + "party_pb", + ); this.slotPb = slotPb; this.add(slotPb); @@ -1225,7 +1503,7 @@ class PartySlot extends Phaser.GameObjects.Container { const nameSizeTest = addTextObject(0, 0, displayName, TextStyle.PARTY); nameTextWidth = nameSizeTest.displayWidth; - while (nameTextWidth > (this.slotIndex >= battlerCount ? 52 : (76 - (this.pokemon.fusionSpecies ? 8 : 0)))) { + while (nameTextWidth > (this.slotIndex >= battlerCount ? 52 : 76 - (this.pokemon.fusionSpecies ? 8 : 0))) { displayName = `${displayName.slice(0, displayName.endsWith(".") ? -2 : -1).trimEnd()}.`; nameSizeTest.setText(displayName); nameTextWidth = nameSizeTest.displayWidth; @@ -1234,18 +1512,31 @@ class PartySlot extends Phaser.GameObjects.Container { nameSizeTest.destroy(); this.slotName = addTextObject(0, 0, displayName, TextStyle.PARTY); - this.slotName.setPositionRelative(slotBg, this.slotIndex >= battlerCount ? 21 : 24, this.slotIndex >= battlerCount ? 2 : 10); + this.slotName.setPositionRelative( + slotBg, + this.slotIndex >= battlerCount ? 21 : 24, + (this.slotIndex >= battlerCount ? 2 : 10) + (offsetJa ? 2 : 0), + ); this.slotName.setOrigin(0, 0); const slotLevelLabel = globalScene.add.image(0, 0, "party_slot_overlay_lv"); - slotLevelLabel.setPositionRelative(this.slotName, 8, 12); + slotLevelLabel.setPositionRelative( + slotBg, + (this.slotIndex >= battlerCount ? 21 : 24) + 8, + (this.slotIndex >= battlerCount ? 2 : 10) + 12, + ); slotLevelLabel.setOrigin(0, 0); - const slotLevelText = addTextObject(0, 0, this.pokemon.level.toString(), this.pokemon.level < globalScene.getMaxExpLevel() ? TextStyle.PARTY : TextStyle.PARTY_RED); - slotLevelText.setPositionRelative(slotLevelLabel, 9, 0); + const slotLevelText = addTextObject( + 0, + 0, + this.pokemon.level.toString(), + this.pokemon.level < globalScene.getMaxExpLevel() ? TextStyle.PARTY : TextStyle.PARTY_RED, + ); + slotLevelText.setPositionRelative(slotLevelLabel, 9, offsetJa ? 1.5 : 0); slotLevelText.setOrigin(0, 0.25); - slotInfoContainer.add([ this.slotName, slotLevelLabel, slotLevelText ]); + slotInfoContainer.add([this.slotName, slotLevelLabel, slotLevelText]); const genderSymbol = getGenderSymbol(this.pokemon.getGender(true)); @@ -1306,29 +1597,46 @@ class PartySlot extends Phaser.GameObjects.Container { } this.slotHpBar = globalScene.add.image(0, 0, "party_slot_hp_bar"); - this.slotHpBar.setPositionRelative(slotBg, this.slotIndex >= battlerCount ? 72 : 8, this.slotIndex >= battlerCount ? 6 : 31); + this.slotHpBar.setPositionRelative( + slotBg, + this.slotIndex >= battlerCount ? 72 : 8, + this.slotIndex >= battlerCount ? 6 : 31, + ); this.slotHpBar.setOrigin(0, 0); this.slotHpBar.setVisible(false); const hpRatio = this.pokemon.getHpRatio(); - this.slotHpOverlay = globalScene.add.sprite(0, 0, "party_slot_hp_overlay", hpRatio > 0.5 ? "high" : hpRatio > 0.25 ? "medium" : "low"); + this.slotHpOverlay = globalScene.add.sprite( + 0, + 0, + "party_slot_hp_overlay", + hpRatio > 0.5 ? "high" : hpRatio > 0.25 ? "medium" : "low", + ); this.slotHpOverlay.setPositionRelative(this.slotHpBar, 16, 2); this.slotHpOverlay.setOrigin(0, 0); this.slotHpOverlay.setScale(hpRatio, 1); this.slotHpOverlay.setVisible(false); this.slotHpText = addTextObject(0, 0, `${this.pokemon.hp}/${this.pokemon.getMaxHp()}`, TextStyle.PARTY); - this.slotHpText.setPositionRelative(this.slotHpBar, this.slotHpBar.width - 3, this.slotHpBar.height - 2); + this.slotHpText.setPositionRelative( + this.slotHpBar, + this.slotHpBar.width - 3, + this.slotHpBar.height - 2 + (offsetJa ? 2 : 0), + ); this.slotHpText.setOrigin(1, 0); this.slotHpText.setVisible(false); this.slotDescriptionLabel = addTextObject(0, 0, "", TextStyle.MESSAGE); - this.slotDescriptionLabel.setPositionRelative(slotBg, this.slotIndex >= battlerCount ? 94 : 32, this.slotIndex >= battlerCount ? 16 : 46); + this.slotDescriptionLabel.setPositionRelative( + slotBg, + this.slotIndex >= battlerCount ? 94 : 32, + this.slotIndex >= battlerCount ? 16 : 46, + ); this.slotDescriptionLabel.setOrigin(0, 1); this.slotDescriptionLabel.setVisible(false); - slotInfoContainer.add([ this.slotHpBar, this.slotHpOverlay, this.slotHpText, this.slotDescriptionLabel ]); + slotInfoContainer.add([this.slotHpBar, this.slotHpOverlay, this.slotHpText, this.slotDescriptionLabel]); if (partyUiMode !== PartyUiMode.TM_MODIFIER) { this.slotDescriptionLabel.setVisible(false); @@ -1351,7 +1659,6 @@ class PartySlot extends Phaser.GameObjects.Container { this.slotDescriptionLabel.setText(slotTmText); this.slotDescriptionLabel.setVisible(true); - } } @@ -1390,8 +1697,10 @@ class PartySlot extends Phaser.GameObjects.Container { private updateSlotTexture(): void { const battlerCount = globalScene.currentBattle.getBattlerCount(); - this.slotBg.setTexture(`party_slot${this.slotIndex >= battlerCount ? "" : "_main"}`, - `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}${this.transfer ? "_swap" : this.pokemon.hp ? "" : "_fnt"}${this.selected ? "_sel" : ""}`); + this.slotBg.setTexture( + `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}`, + `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}${this.transfer ? "_swap" : this.pokemon.hp ? "" : "_fnt"}${this.selected ? "_sel" : ""}`, + ); } } diff --git a/src/ui/pokeball-tray.ts b/src/ui/pokeball-tray.ts index 0c913d195a9..0bf47699cdb 100644 --- a/src/ui/pokeball-tray.ts +++ b/src/ui/pokeball-tray.ts @@ -10,17 +10,39 @@ export default class PokeballTray extends Phaser.GameObjects.Container { public shown: boolean; constructor(player: boolean) { - super(globalScene, player ? (globalScene.game.canvas.width / 6) : 0, player ? -72 : -144); + super(globalScene, player ? globalScene.game.canvas.width / 6 : 0, player ? -72 : -144); this.player = player; } setup(): void { - this.bg = globalScene.add.nineslice(0, 0, `pb_tray_overlay_${this.player ? "player" : "enemy"}`, undefined, 104, 4, 48, 8, 0, 0); + this.bg = globalScene.add.nineslice( + 0, + 0, + `pb_tray_overlay_${this.player ? "player" : "enemy"}`, + undefined, + 104, + 4, + 48, + 8, + 0, + 0, + ); this.bg.setOrigin(this.player ? 1 : 0, 0); this.add(this.bg); - this.balls = new Array(6).fill(null).map((_, i) => globalScene.add.sprite((this.player ? -83 : 76) + (globalScene.game.canvas.width / 6) * (this.player ? -1 : 1) + 10 * i * (this.player ? 1 : -1), -8, "pb_tray_ball", "empty")); + this.balls = new Array(6) + .fill(null) + .map((_, i) => + globalScene.add.sprite( + (this.player ? -83 : 76) + + (globalScene.game.canvas.width / 6) * (this.player ? -1 : 1) + + 10 * i * (this.player ? 1 : -1), + -8, + "pb_tray_ball", + "empty", + ), + ); for (const ball of this.balls) { ball.setOrigin(0, 0); @@ -71,10 +93,10 @@ export default class PokeballTray extends Phaser.GameObjects.Container { x: `${this.player ? "-" : "+"}=104`, duration: b * 100, ease: "Sine.easeIn", - onComplete: () => globalScene.playSound(`se/${(b < party.length ? "pb_tray_ball" : "pb_tray_empty")}`) + onComplete: () => globalScene.playSound(`se/${b < party.length ? "pb_tray_ball" : "pb_tray_empty"}`), }); }); - } + }, }); this.setVisible(true); @@ -96,7 +118,7 @@ export default class PokeballTray extends Phaser.GameObjects.Container { x: `${this.player ? "-" : "+"}=${globalScene.game.canvas.width / 6}`, duration: 250, delay: b * 100, - ease: "Sine.easeIn" + ease: "Sine.easeIn", }); }); @@ -105,7 +127,7 @@ export default class PokeballTray extends Phaser.GameObjects.Container { width: 144, alpha: 0, duration: 500, - ease: "Sine.easeIn" + ease: "Sine.easeIn", }); globalScene.time.delayedCall(850, () => { diff --git a/src/ui/pokedex-info-overlay.ts b/src/ui/pokedex-info-overlay.ts new file mode 100644 index 00000000000..7dfa3745cb7 --- /dev/null +++ b/src/ui/pokedex-info-overlay.ts @@ -0,0 +1,179 @@ +import type { InfoToggle } from "../battle-scene"; +import { TextStyle, addTextObject } from "./text"; +import { addWindow } from "./ui-theme"; +import * as Utils from "../utils"; +import i18next from "i18next"; +import { globalScene } from "#app/global-scene"; + +export interface PokedexInfoOverlaySettings { + delayVisibility?: boolean; // if true, showing the overlay will only set it to active and populate the fields and the handler using this field has to manually call setVisible later. + scale?: number; // scale the box? A scale of 0.5 is recommended + //location and width of the component; unaffected by scaling + x?: number; + y?: number; + /** Default is always half the screen, regardless of scale */ + width?: number; + /** Determines whether to display the small secondary box */ + hideEffectBox?: boolean; + hideBg?: boolean; +} + +const DESC_HEIGHT = 48; +const BORDER = 8; +const GLOBAL_SCALE = 6; + +export default class PokedexInfoOverlay extends Phaser.GameObjects.Container implements InfoToggle { + public active = false; + + private desc: Phaser.GameObjects.Text; + private descScroll: Phaser.Tweens.Tween | null = null; + + private descBg: Phaser.GameObjects.NineSlice; + + private options: PokedexInfoOverlaySettings; + + private textMaskRect: Phaser.GameObjects.Graphics; + + private maskPointOriginX: number; + private maskPointOriginY: number; + public scale: number; + public width: number; + + constructor(options?: PokedexInfoOverlaySettings) { + super(globalScene, options?.x, options?.y); + this.scale = options?.scale || 1; // set up the scale + this.setScale(this.scale); + this.options = options || {}; + + // prepare the description box + this.width = (options?.width || PokedexInfoOverlay.getWidth(this.scale)) / this.scale; // divide by scale as we always want this to be half a window wide + this.descBg = addWindow(0, 0, this.width, DESC_HEIGHT); + this.descBg.setOrigin(0, 0); + this.add(this.descBg); + + // set up the description; wordWrap uses true pixels, unaffected by any scaling, while other values are affected + this.desc = addTextObject(BORDER, BORDER - 2, "", TextStyle.BATTLE_INFO, { + wordWrap: { width: (this.width - (BORDER - 2) * 2) * GLOBAL_SCALE }, + }); + this.desc.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5); + + // limit the text rendering, required for scrolling later on + this.maskPointOriginX = options?.x || 0; + this.maskPointOriginY = options?.y || 0; + + if (this.maskPointOriginX < 0) { + this.maskPointOriginX += globalScene.game.canvas.width / GLOBAL_SCALE; + } + if (this.maskPointOriginY < 0) { + this.maskPointOriginY += globalScene.game.canvas.height / GLOBAL_SCALE; + } + + this.textMaskRect = globalScene.make.graphics(); + this.textMaskRect.fillStyle(0xff0000); + this.textMaskRect.fillRect( + this.maskPointOriginX + BORDER * this.scale, + this.maskPointOriginY + (BORDER - 2) * this.scale, + this.width - BORDER * 2 * this.scale, + (DESC_HEIGHT - (BORDER - 2) * 2) * this.scale, + ); + this.textMaskRect.setScale(6); + const textMask = this.createGeometryMask(this.textMaskRect); + + this.add(this.desc); + this.desc.setMask(textMask); + + if (options?.hideBg) { + this.descBg.setVisible(false); + } + + // hide this component for now + this.setVisible(false); + } + + // show this component with infos for the specific move + show(text: string): boolean { + if (!globalScene.enableMoveInfo) { + return false; // move infos have been disabled // TODO:: is `false` correct? i used to be `undeefined` + } + + this.desc.setText(text ?? ""); + + // stop previous scrolling effects and reset y position + if (this.descScroll) { + this.descScroll.remove(); + this.descScroll = null; + this.desc.y = BORDER - 2; + } + + // determine if we need to add new scrolling effects + const lineCount = Math.floor((this.desc.displayHeight * (96 / 72)) / 14.83); + + const newHeight = lineCount >= 3 ? 48 : lineCount === 2 ? 36 : 24; + this.textMaskRect.clear(); + this.textMaskRect.fillStyle(0xff0000); + this.textMaskRect.fillRect( + this.maskPointOriginX + BORDER * this.scale, + this.maskPointOriginY + (BORDER - 2) * this.scale + (48 - newHeight), + this.width - BORDER * 2 * this.scale, + (newHeight - (BORDER - 2) * 2) * this.scale, + ); + const updatedMask = this.createGeometryMask(this.textMaskRect); + this.desc.setMask(updatedMask); + + this.descBg.setSize(this.descBg.width, newHeight); + this.descBg.setY(48 - newHeight); + this.desc.setY(BORDER - 2 + (48 - newHeight)); + + if (lineCount > 3) { + // generate scrolling effects + this.descScroll = globalScene.tweens.add({ + targets: this.desc, + delay: Utils.fixedInt(2000), + loop: -1, + hold: Utils.fixedInt(2000), + duration: Utils.fixedInt((lineCount - 3) * 2000), + y: `-=${14.83 * (72 / 96) * (lineCount - 3)}`, + }); + } + + if (!this.options.delayVisibility) { + this.setVisible(true); + } + this.active = true; + return true; + } + + clear() { + this.setVisible(false); + this.active = false; + } + + toggleInfo(visible: boolean): void { + if (visible) { + this.setVisible(true); + } + globalScene.tweens.add({ + targets: this.desc, + duration: Utils.fixedInt(125), + ease: "Sine.easeInOut", + alpha: visible ? 1 : 0, + }); + if (!visible) { + this.setVisible(false); + } + } + + isActive(): boolean { + return this.active; + } + + // width of this element + static getWidth(_scale: number): number { + return globalScene.game.canvas.width / GLOBAL_SCALE / 2; + } + + // height of this element + static getHeight(scale: number, _onSide?: boolean): number { + return DESC_HEIGHT * scale; + } +} diff --git a/src/ui/pokedex-mon-container.ts b/src/ui/pokedex-mon-container.ts new file mode 100644 index 00000000000..e61da86e95e --- /dev/null +++ b/src/ui/pokedex-mon-container.ts @@ -0,0 +1,219 @@ +import type { Variant } from "#app/data/variant"; +import { globalScene } from "#app/global-scene"; +import { isNullOrUndefined } from "#app/utils"; +import type PokemonSpecies from "../data/pokemon-species"; +import { addTextObject, TextStyle } from "./text"; + +interface SpeciesDetails { + shiny?: boolean; + formIndex?: number; + female?: boolean; + variant?: Variant; +} + +export class PokedexMonContainer extends Phaser.GameObjects.Container { + public species: PokemonSpecies; + public icon: Phaser.GameObjects.Sprite; + public shinyIcons: Phaser.GameObjects.Image[] = []; + public label: Phaser.GameObjects.Text; + public starterPassiveBgs: Phaser.GameObjects.Image; + public hiddenAbilityIcon: Phaser.GameObjects.Image; + public favoriteIcon: Phaser.GameObjects.Image; + public classicWinIcon: Phaser.GameObjects.Image; + public candyUpgradeIcon: Phaser.GameObjects.Image; + public candyUpgradeOverlayIcon: Phaser.GameObjects.Image; + public eggMove1Icon: Phaser.GameObjects.Image; + public tmMove1Icon: Phaser.GameObjects.Image; + public eggMove2Icon: Phaser.GameObjects.Image; + public tmMove2Icon: Phaser.GameObjects.Image; + public passive1Icon: Phaser.GameObjects.Image; + public passive2Icon: Phaser.GameObjects.Image; + public passive1OverlayIcon: Phaser.GameObjects.Image; + public passive2OverlayIcon: Phaser.GameObjects.Image; + public cost = 0; + + constructor(species: PokemonSpecies, options: SpeciesDetails = {}) { + super(globalScene, 0, 0); + + this.setSpecies(species, options); + + // starter passive bg + const starterPassiveBg = globalScene.add.image(2, 5, "passive_bg"); + starterPassiveBg.setOrigin(0, 0); + starterPassiveBg.setScale(0.75); + starterPassiveBg.setVisible(false); + this.add(starterPassiveBg); + this.starterPassiveBgs = starterPassiveBg; + + // shiny icons + for (let i = 0; i < 3; i++) { + const shinyIcon = globalScene.add.image(i * -3 + 12, 2, "shiny_star_small"); + shinyIcon.setScale(0.5); + shinyIcon.setOrigin(0, 0); + shinyIcon.setVisible(false); + this.shinyIcons.push(shinyIcon); + } + this.add(this.shinyIcons); + + // value label + const label = addTextObject(1, 2, "0", TextStyle.WINDOW, { + fontSize: "32px", + }); + label.setShadowOffset(2, 2); + label.setOrigin(0, 0); + label.setVisible(false); + this.add(label); + this.label = label; + + // hidden ability icon + const abilityIcon = globalScene.add.image(12, 7, "ha_capsule"); + abilityIcon.setOrigin(0, 0); + abilityIcon.setScale(0.5); + abilityIcon.setVisible(false); + this.add(abilityIcon); + this.hiddenAbilityIcon = abilityIcon; + + // favorite icon + const favoriteIcon = globalScene.add.image(0, 7, "favorite"); + favoriteIcon.setOrigin(0, 0); + favoriteIcon.setScale(0.5); + favoriteIcon.setVisible(false); + this.add(favoriteIcon); + this.favoriteIcon = favoriteIcon; + + // classic win icon + const classicWinIcon = globalScene.add.image(0, 12, "champion_ribbon"); + classicWinIcon.setOrigin(0, 0); + classicWinIcon.setScale(0.5); + classicWinIcon.setVisible(false); + this.add(classicWinIcon); + this.classicWinIcon = classicWinIcon; + + // candy upgrade icon + const candyUpgradeIcon = globalScene.add.image(12, 12, "candy"); + candyUpgradeIcon.setOrigin(0, 0); + candyUpgradeIcon.setScale(0.25); + candyUpgradeIcon.setVisible(false); + this.add(candyUpgradeIcon); + this.candyUpgradeIcon = candyUpgradeIcon; + + // candy upgrade overlay icon + const candyUpgradeOverlayIcon = globalScene.add.image(12, 12, "candy_overlay"); + candyUpgradeOverlayIcon.setOrigin(0, 0); + candyUpgradeOverlayIcon.setScale(0.25); + candyUpgradeOverlayIcon.setVisible(false); + this.add(candyUpgradeOverlayIcon); + this.candyUpgradeOverlayIcon = candyUpgradeOverlayIcon; + + // move icons + const eggMove1Icon = globalScene.add.image(0, 12, "mystery_egg"); + eggMove1Icon.setOrigin(0, 0); + eggMove1Icon.setScale(0.25); + eggMove1Icon.setVisible(false); + this.add(eggMove1Icon); + this.eggMove1Icon = eggMove1Icon; + + // move icons + const tmMove1Icon = globalScene.add.image(0, 12, "normal_memory"); + tmMove1Icon.setOrigin(0, 0); + tmMove1Icon.setScale(0.25); + tmMove1Icon.setVisible(false); + this.add(tmMove1Icon); + this.tmMove1Icon = tmMove1Icon; + + // move icons + const eggMove2Icon = globalScene.add.image(7, 12, "mystery_egg"); + eggMove2Icon.setOrigin(0, 0); + eggMove2Icon.setScale(0.25); + eggMove2Icon.setVisible(false); + this.add(eggMove2Icon); + this.eggMove2Icon = eggMove2Icon; + + // move icons + const tmMove2Icon = globalScene.add.image(7, 12, "normal_memory"); + tmMove2Icon.setOrigin(0, 0); + tmMove2Icon.setScale(0.25); + tmMove2Icon.setVisible(false); + this.add(tmMove2Icon); + this.tmMove2Icon = tmMove2Icon; + + // passive icons + const passive1Icon = globalScene.add.image(3, 3, "candy"); + passive1Icon.setOrigin(0, 0); + passive1Icon.setScale(0.25); + passive1Icon.setVisible(false); + this.add(passive1Icon); + this.passive1Icon = passive1Icon; + + const passive1OverlayIcon = globalScene.add.image(12, 12, "candy_overlay"); + passive1OverlayIcon.setOrigin(0, 0); + passive1OverlayIcon.setScale(0.25); + passive1OverlayIcon.setVisible(false); + this.add(passive1OverlayIcon); + this.passive1OverlayIcon = passive1OverlayIcon; + + // passive icons + const passive2Icon = globalScene.add.image(12, 3, "candy"); + passive2Icon.setOrigin(0, 0); + passive2Icon.setScale(0.25); + passive2Icon.setVisible(false); + this.add(passive2Icon); + this.passive2Icon = passive2Icon; + + const passive2OverlayIcon = globalScene.add.image(12, 12, "candy_overlay"); + passive2OverlayIcon.setOrigin(0, 0); + passive2OverlayIcon.setScale(0.25); + passive2OverlayIcon.setVisible(false); + this.add(passive2OverlayIcon); + this.passive2OverlayIcon = passive2OverlayIcon; + } + + setSpecies(species: PokemonSpecies, options: SpeciesDetails = {}) { + this.species = species; + + const { shiny, formIndex, female, variant } = options; + + const defaultDexAttr = globalScene.gameData.getSpeciesDefaultDexAttr(species, false, true); + const defaultProps = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr); + + if (!isNullOrUndefined(formIndex)) { + defaultProps.formIndex = formIndex; + } + if (!isNullOrUndefined(shiny)) { + defaultProps.shiny = shiny; + } + if (!isNullOrUndefined(variant)) { + defaultProps.variant = variant; + } + if (!isNullOrUndefined(female)) { + defaultProps.female = female; + } + + if (this.icon) { + this.remove(this.icon); + this.icon.destroy(); // Properly removes the sprite from memory + } + + // icon + this.icon = globalScene.add.sprite( + -2, + 2, + species.getIconAtlasKey(defaultProps.formIndex, defaultProps.shiny, defaultProps.variant), + ); + this.icon.setScale(0.5); + this.icon.setOrigin(0, 0); + this.icon.setFrame( + species.getIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant), + ); + this.checkIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant); + this.add(this.icon); + } + + checkIconId(female, formIndex, shiny, variant) { + if (this.icon.frame.name !== this.species.getIconId(female, formIndex, shiny, variant)) { + console.log(`${this.species.name}'s variant icon does not exist. Replacing with default.`); + this.icon.setTexture(this.species.getIconAtlasKey(formIndex, false, variant)); + this.icon.setFrame(this.species.getIconId(female, formIndex, false, variant)); + } + } +} diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts new file mode 100644 index 00000000000..74921f13683 --- /dev/null +++ b/src/ui/pokedex-page-ui-handler.ts @@ -0,0 +1,2763 @@ +import type { SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions"; +import { pokemonEvolutions, pokemonPrevolutions, pokemonStarters } from "#app/data/balance/pokemon-evolutions"; +import type { Variant } from "#app/data/variant"; +import { getVariantTint, getVariantIcon } from "#app/data/variant"; +import { argbFromRgba } from "@material/material-color-utilities"; +import i18next from "i18next"; +import { starterColors } from "#app/battle-scene"; +import { allAbilities } from "#app/data/ability"; +import { speciesEggMoves } from "#app/data/balance/egg-moves"; +import { GrowthRate, getGrowthRateColor } from "#app/data/exp"; +import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender"; +import { allMoves } from "#app/data/moves/move"; +import { getNatureName } from "#app/data/nature"; +import type { SpeciesFormChange } from "#app/data/pokemon-forms"; +import { pokemonFormChanges } from "#app/data/pokemon-forms"; +import type { LevelMoves } from "#app/data/balance/pokemon-level-moves"; +import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves"; +import type PokemonSpecies from "#app/data/pokemon-species"; +import { allSpecies, getPokemonSpecies, getPokemonSpeciesForm, normalForm } from "#app/data/pokemon-species"; +import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; +import { starterPassiveAbilities } from "#app/data/balance/passives"; +import { PokemonType } from "#enums/pokemon-type"; +import { GameModes } from "#app/game-mode"; +import type { DexEntry, StarterAttributes } from "#app/system/game-data"; +import { AbilityAttr, DexAttr } from "#app/system/game-data"; +import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; +import MessageUiHandler from "#app/ui/message-ui-handler"; +import { StatsContainer } from "#app/ui/stats-container"; +import { TextStyle, addTextObject, getTextStyleOptions } from "#app/ui/text"; +import { Mode } from "#app/ui/ui"; +import { addWindow } from "#app/ui/ui-theme"; +import { Egg } from "#app/data/egg"; +import Overrides from "#app/overrides"; +import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; +import { Passive as PassiveAttr } from "#enums/passive"; +import * as Challenge from "#app/data/challenge"; +import MoveInfoOverlay from "#app/ui/move-info-overlay"; +import PokedexInfoOverlay from "#app/ui/pokedex-info-overlay"; +import { getEggTierForSpecies } from "#app/data/egg"; +import { Device } from "#enums/devices"; +import type { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { Button } from "#enums/buttons"; +import { EggSourceType } from "#enums/egg-source-types"; +import { + getPassiveCandyCount, + getValueReductionCandyCounts, + getSameSpeciesEggCandyCounts, +} from "#app/data/balance/starters"; +import { + BooleanHolder, + getLocalizedSpriteKey, + isNullOrUndefined, + NumberHolder, + padInt, + rgbHexToRgba, + toReadableString, +} from "#app/utils"; +import type { Nature } from "#enums/nature"; +import * as Utils from "../utils"; +import { speciesTmMoves } from "#app/data/balance/tms"; +import type { BiomeTierTod } from "#app/data/balance/biomes"; +import { BiomePoolTier, catchableSpecies } from "#app/data/balance/biomes"; +import { Biome } from "#app/enums/biome"; +import { TimeOfDay } from "#app/enums/time-of-day"; +import type { Abilities } from "#app/enums/abilities"; +import { BaseStatsOverlay } from "#app/ui/base-stats-overlay"; +import { globalScene } from "#app/global-scene"; + +interface LanguageSetting { + starterInfoTextSize: string; + instructionTextSize: string; + starterInfoXPos?: number; + starterInfoYOffset?: number; +} + +const languageSettings: { [key: string]: LanguageSetting } = { + en: { + starterInfoTextSize: "56px", + instructionTextSize: "38px", + }, + de: { + starterInfoTextSize: "48px", + instructionTextSize: "35px", + starterInfoXPos: 33, + }, + "es-ES": { + starterInfoTextSize: "56px", + instructionTextSize: "35px", + }, + fr: { + starterInfoTextSize: "54px", + instructionTextSize: "38px", + }, + it: { + starterInfoTextSize: "56px", + instructionTextSize: "38px", + }, + pt_BR: { + starterInfoTextSize: "47px", + instructionTextSize: "38px", + starterInfoXPos: 33, + }, + zh: { + starterInfoTextSize: "47px", + instructionTextSize: "38px", + starterInfoYOffset: 1, + starterInfoXPos: 24, + }, + pt: { + starterInfoTextSize: "48px", + instructionTextSize: "42px", + starterInfoXPos: 33, + }, + ko: { + starterInfoTextSize: "52px", + instructionTextSize: "38px", + }, + ja: { + starterInfoTextSize: "51px", + instructionTextSize: "38px", + }, + "ca-ES": { + starterInfoTextSize: "56px", + instructionTextSize: "38px", + }, +}; + +const valueReductionMax = 2; + +// Position of UI elements +const speciesContainerX = 109; + +interface SpeciesDetails { + shiny?: boolean; + formIndex?: number; + female?: boolean; + variant?: number; +} + +enum MenuOptions { + BASE_STATS, + ABILITIES, + LEVEL_MOVES, + EGG_MOVES, + TM_MOVES, + BIOMES, + NATURES, + TOGGLE_IVS, + EVOLUTIONS, +} + +export default class PokedexPageUiHandler extends MessageUiHandler { + private starterSelectContainer: Phaser.GameObjects.Container; + private shinyOverlay: Phaser.GameObjects.Image; + private pokemonNumberText: Phaser.GameObjects.Text; + private pokemonSprite: Phaser.GameObjects.Sprite; + private pokemonNameText: Phaser.GameObjects.Text; + private pokemonGrowthRateLabelText: Phaser.GameObjects.Text; + private pokemonGrowthRateText: Phaser.GameObjects.Text; + private type1Icon: Phaser.GameObjects.Sprite; + private type2Icon: Phaser.GameObjects.Sprite; + private pokemonLuckLabelText: Phaser.GameObjects.Text; + private pokemonLuckText: Phaser.GameObjects.Text; + private pokemonGenderText: Phaser.GameObjects.Text; + private pokemonUncaughtText: Phaser.GameObjects.Text; + private pokemonCandyContainer: Phaser.GameObjects.Container; + private pokemonCandyIcon: Phaser.GameObjects.Sprite; + private pokemonCandyDarknessOverlay: Phaser.GameObjects.Sprite; + private pokemonCandyOverlayIcon: Phaser.GameObjects.Sprite; + private pokemonCandyCountText: Phaser.GameObjects.Text; + private pokemonCaughtHatchedContainer: Phaser.GameObjects.Container; + private pokemonCaughtCountText: Phaser.GameObjects.Text; + private pokemonFormText: Phaser.GameObjects.Text; + private pokemonHatchedIcon: Phaser.GameObjects.Sprite; + private pokemonHatchedCountText: Phaser.GameObjects.Text; + private pokemonShinyIcons: Phaser.GameObjects.Sprite[]; + + private activeTooltip: "ABILITY" | "PASSIVE" | "CANDY" | undefined; + private instructionsContainer: Phaser.GameObjects.Container; + private filterInstructionsContainer: Phaser.GameObjects.Container; + private shinyIconElement: Phaser.GameObjects.Sprite; + private formIconElement: Phaser.GameObjects.Sprite; + private genderIconElement: Phaser.GameObjects.Sprite; + private variantIconElement: Phaser.GameObjects.Sprite; + private shinyLabel: Phaser.GameObjects.Text; + private formLabel: Phaser.GameObjects.Text; + private genderLabel: Phaser.GameObjects.Text; + private variantLabel: Phaser.GameObjects.Text; + private candyUpgradeIconElement: Phaser.GameObjects.Sprite; + private candyUpgradeLabel: Phaser.GameObjects.Text; + private showBackSpriteIconElement: Phaser.GameObjects.Sprite; + private showBackSpriteLabel: Phaser.GameObjects.Text; + + private starterSelectMessageBox: Phaser.GameObjects.NineSlice; + private starterSelectMessageBoxContainer: Phaser.GameObjects.Container; + private statsContainer: StatsContainer; + private moveInfoOverlay: MoveInfoOverlay; + private infoOverlay: PokedexInfoOverlay; + private baseStatsOverlay: BaseStatsOverlay; + + private statsMode: boolean; + + private allSpecies: PokemonSpecies[] = []; + private species: PokemonSpecies; + private starterId: number; + private formIndex: number; + private speciesLoaded: Map = new Map(); + private levelMoves: LevelMoves; + private eggMoves: Moves[] = []; + private hasEggMoves: boolean[] = []; + private tmMoves: Moves[] = []; + private ability1: Abilities; + private ability2: Abilities | undefined; + private abilityHidden: Abilities | undefined; + private passive: Abilities; + private hasPassive: boolean; + private hasAbilities: number[]; + private biomes: BiomeTierTod[]; + private preBiomes: BiomeTierTod[]; + private baseStats: number[]; + private baseTotal: number; + private evolutions: SpeciesFormEvolution[]; + private battleForms: SpeciesFormChange[]; + private prevolutions: SpeciesFormEvolution[]; + + private speciesStarterDexEntry: DexEntry | null; + private canCycleShiny: boolean; + private canCycleForm: boolean; + private canCycleGender: boolean; + + private assetLoadCancelled: BooleanHolder | null; + public cursorObj: Phaser.GameObjects.Image; + + // variables to keep track of the dynamically rendered list of instruction prompts for starter select + private instructionRowX = 0; + private instructionRowY = 0; + private instructionRowTextOffset = 9; + private filterInstructionRowX = 0; + private filterInstructionRowY = 0; + + private starterAttributes: StarterAttributes; + private savedStarterAttributes: StarterAttributes; + + protected blockInput = false; + protected blockInputOverlay = false; + + private showBackSprite = false; + + // Menu + private menuContainer: Phaser.GameObjects.Container; + private menuBg: Phaser.GameObjects.NineSlice; + protected optionSelectText: Phaser.GameObjects.Text; + private menuOptions: MenuOptions[]; + protected scale = 0.1666666667; + private menuDescriptions: string[]; + private isFormGender: boolean; + private filteredIndices: Species[] | null = null; + + private availableVariants: number; + private unlockedVariants: boolean[]; + + private canUseCandies: boolean; + + constructor() { + super(Mode.POKEDEX_PAGE); + } + + setup() { + const ui = this.getUi(); + const currentLanguage = i18next.resolvedLanguage ?? "en"; + const langSettingKey = Object.keys(languageSettings).find(lang => currentLanguage.includes(lang)) ?? "en"; + const textSettings = languageSettings[langSettingKey]; + + this.starterSelectContainer = globalScene.add.container(0, -globalScene.game.canvas.height / 6); + this.starterSelectContainer.setVisible(false); + ui.add(this.starterSelectContainer); + + const bgColor = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6, + 0x006860, + ); + bgColor.setOrigin(0, 0); + this.starterSelectContainer.add(bgColor); + + const starterSelectBg = globalScene.add.image(0, 0, "pokedex_summary_bg"); + starterSelectBg.setOrigin(0, 0); + this.starterSelectContainer.add(starterSelectBg); + + this.shinyOverlay = globalScene.add.image(6, 6, "summary_overlay_shiny"); + this.shinyOverlay.setOrigin(0, 0); + this.shinyOverlay.setVisible(false); + this.starterSelectContainer.add(this.shinyOverlay); + + this.pokemonNumberText = addTextObject(17, 1, "0000", TextStyle.SUMMARY); + this.pokemonNumberText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonNumberText); + + this.pokemonNameText = addTextObject(6, 112, "", TextStyle.SUMMARY); + this.pokemonNameText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonNameText); + + this.pokemonGrowthRateLabelText = addTextObject( + 8, + 106, + i18next.t("pokedexUiHandler:growthRate"), + TextStyle.SUMMARY_ALT, + { fontSize: "36px" }, + ); + this.pokemonGrowthRateLabelText.setOrigin(0, 0); + this.pokemonGrowthRateLabelText.setVisible(false); + this.starterSelectContainer.add(this.pokemonGrowthRateLabelText); + + this.pokemonGrowthRateText = addTextObject(34, 106, "", TextStyle.SUMMARY_PINK, { fontSize: "36px" }); + this.pokemonGrowthRateText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonGrowthRateText); + + this.pokemonGenderText = addTextObject(96, 112, "", TextStyle.SUMMARY_ALT); + this.pokemonGenderText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonGenderText); + + this.pokemonUncaughtText = addTextObject(6, 127, i18next.t("pokedexUiHandler:uncaught"), TextStyle.WINDOW, { + fontSize: "56px", + }); + this.pokemonUncaughtText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonUncaughtText); + + const starterBoxContainer = globalScene.add.container(speciesContainerX + 6, 9); //115 + + for (const species of allSpecies) { + if (!speciesStarterCosts.hasOwnProperty(species.speciesId) || !species.isObtainable()) { + continue; + } + + this.speciesLoaded.set(species.speciesId, false); + this.allSpecies.push(species); + } + + this.starterSelectContainer.add(starterBoxContainer); + + this.pokemonSprite = globalScene.add.sprite(53, 63, "pkmn__sub"); + this.pokemonSprite.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + }); + this.starterSelectContainer.add(this.pokemonSprite); + + this.type1Icon = globalScene.add.sprite(8, 98, getLocalizedSpriteKey("types")); + this.type1Icon.setScale(0.5); + this.type1Icon.setOrigin(0, 0); + this.starterSelectContainer.add(this.type1Icon); + + this.type2Icon = globalScene.add.sprite(26, 98, getLocalizedSpriteKey("types")); + this.type2Icon.setScale(0.5); + this.type2Icon.setOrigin(0, 0); + this.starterSelectContainer.add(this.type2Icon); + + this.pokemonLuckLabelText = addTextObject(8, 89, i18next.t("common:luckIndicator"), TextStyle.WINDOW_ALT, { + fontSize: "56px", + }); + this.pokemonLuckLabelText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonLuckLabelText); + + this.pokemonLuckText = addTextObject(8 + this.pokemonLuckLabelText.displayWidth + 2, 89, "0", TextStyle.WINDOW, { + fontSize: "56px", + }); + this.pokemonLuckText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonLuckText); + + // Candy icon and count + this.pokemonCandyContainer = globalScene.add.container(4.5, 18); + + this.pokemonCandyIcon = globalScene.add.sprite(0, 0, "candy"); + this.pokemonCandyIcon.setScale(0.5); + this.pokemonCandyIcon.setOrigin(0, 0); + this.pokemonCandyContainer.add(this.pokemonCandyIcon); + + this.pokemonCandyOverlayIcon = globalScene.add.sprite(0, 0, "candy_overlay"); + this.pokemonCandyOverlayIcon.setScale(0.5); + this.pokemonCandyOverlayIcon.setOrigin(0, 0); + this.pokemonCandyContainer.add(this.pokemonCandyOverlayIcon); + + this.pokemonCandyDarknessOverlay = globalScene.add.sprite(0, 0, "candy"); + this.pokemonCandyDarknessOverlay.setScale(0.5); + this.pokemonCandyDarknessOverlay.setOrigin(0, 0); + this.pokemonCandyDarknessOverlay.setTint(0x000000); + this.pokemonCandyDarknessOverlay.setAlpha(0.5); + this.pokemonCandyContainer.add(this.pokemonCandyDarknessOverlay); + + this.pokemonCandyCountText = addTextObject(9.5, 0, "x0", TextStyle.WINDOW_ALT, { fontSize: "56px" }); + this.pokemonCandyCountText.setOrigin(0, 0); + this.pokemonCandyContainer.add(this.pokemonCandyCountText); + + this.pokemonCandyContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, 30, 20), Phaser.Geom.Rectangle.Contains); + this.starterSelectContainer.add(this.pokemonCandyContainer); + + this.pokemonFormText = addTextObject(6, 42, "Form", TextStyle.WINDOW_ALT, { + fontSize: "42px", + }); + this.pokemonFormText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonFormText); + + this.pokemonCaughtHatchedContainer = globalScene.add.container(2, 25); + this.pokemonCaughtHatchedContainer.setScale(0.5); + this.starterSelectContainer.add(this.pokemonCaughtHatchedContainer); + + const pokemonCaughtIcon = globalScene.add.sprite(1, 0, "items", "pb"); + pokemonCaughtIcon.setOrigin(0, 0); + pokemonCaughtIcon.setScale(0.75); + this.pokemonCaughtHatchedContainer.add(pokemonCaughtIcon); + + this.pokemonCaughtCountText = addTextObject(24, 4, "0", TextStyle.SUMMARY_ALT); + this.pokemonCaughtCountText.setOrigin(0, 0); + this.pokemonCaughtHatchedContainer.add(this.pokemonCaughtCountText); + + this.pokemonHatchedIcon = globalScene.add.sprite(1, 14, "egg_icons"); + this.pokemonHatchedIcon.setOrigin(0.15, 0.2); + this.pokemonHatchedIcon.setScale(0.8); + this.pokemonCaughtHatchedContainer.add(this.pokemonHatchedIcon); + + this.pokemonShinyIcons = []; + for (let i = 0; i < 3; i++) { + const pokemonShinyIcon = globalScene.add.sprite(153 + i * 13, 160, "shiny_icons"); + pokemonShinyIcon.setOrigin(0.15, 0.2); + pokemonShinyIcon.setScale(1); + pokemonShinyIcon.setFrame(getVariantIcon(i as Variant)); + pokemonShinyIcon.setVisible(false); + this.pokemonCaughtHatchedContainer.add(pokemonShinyIcon); + this.pokemonShinyIcons.push(pokemonShinyIcon); + } + + this.pokemonHatchedCountText = addTextObject(24, 19, "0", TextStyle.SUMMARY_ALT); + this.pokemonHatchedCountText.setOrigin(0, 0); + this.pokemonCaughtHatchedContainer.add(this.pokemonHatchedCountText); + + // The font size should be set per language + const instructionTextSize = textSettings.instructionTextSize; + + this.instructionsContainer = globalScene.add.container(4, 128); + this.instructionsContainer.setVisible(true); + this.starterSelectContainer.add(this.instructionsContainer); + + this.candyUpgradeIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "C.png", + ); + this.candyUpgradeIconElement.setName("sprite-candyUpgrade-icon-element"); + this.candyUpgradeIconElement.setScale(0.675); + this.candyUpgradeIconElement.setOrigin(0.0, 0.0); + this.candyUpgradeLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("pokedexUiHandler:candyUpgrade"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); + this.candyUpgradeLabel.setName("text-candyUpgrade-label"); + + // instruction rows that will be pushed into the container dynamically based on need + // creating new sprites since they will be added to the scene later + this.shinyIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "R.png", + ); + this.shinyIconElement.setName("sprite-shiny-icon-element"); + this.shinyIconElement.setScale(0.675); + this.shinyIconElement.setOrigin(0.0, 0.0); + this.shinyLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("pokedexUiHandler:cycleShiny"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); + this.shinyLabel.setName("text-shiny-label"); + + this.formIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "F.png", + ); + this.formIconElement.setName("sprite-form-icon-element"); + this.formIconElement.setScale(0.675); + this.formIconElement.setOrigin(0.0, 0.0); + this.formLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("pokedexUiHandler:cycleForm"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); + this.formLabel.setName("text-form-label"); + + this.genderIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "G.png", + ); + this.genderIconElement.setName("sprite-gender-icon-element"); + this.genderIconElement.setScale(0.675); + this.genderIconElement.setOrigin(0.0, 0.0); + this.genderLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("pokedexUiHandler:cycleGender"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); + this.genderLabel.setName("text-gender-label"); + + this.variantIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "V.png", + ); + this.variantIconElement.setName("sprite-variant-icon-element"); + this.variantIconElement.setScale(0.675); + this.variantIconElement.setOrigin(0.0, 0.0); + this.variantLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("pokedexUiHandler:cycleVariant"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); + this.variantLabel.setName("text-variant-label"); + + this.showBackSpriteIconElement = new Phaser.GameObjects.Sprite(globalScene, 50, 7, "keyboard", "E.png"); + this.showBackSpriteIconElement.setName("show-backSprite-icon-element"); + this.showBackSpriteIconElement.setScale(0.675); + this.showBackSpriteIconElement.setOrigin(0.0, 0.0); + this.showBackSpriteLabel = addTextObject(60, 7, i18next.t("pokedexUiHandler:showBackSprite"), TextStyle.PARTY, { + fontSize: instructionTextSize, + }); + this.showBackSpriteLabel.setName("show-backSprite-label"); + this.starterSelectContainer.add(this.showBackSpriteIconElement); + this.starterSelectContainer.add(this.showBackSpriteLabel); + + this.hideInstructions(); + + this.filterInstructionsContainer = globalScene.add.container(50, 5); + this.filterInstructionsContainer.setVisible(true); + this.starterSelectContainer.add(this.filterInstructionsContainer); + + this.starterSelectMessageBoxContainer = globalScene.add.container(0, globalScene.game.canvas.height / 6); + this.starterSelectMessageBoxContainer.setVisible(false); + this.starterSelectContainer.add(this.starterSelectMessageBoxContainer); + + this.starterSelectMessageBox = addWindow(1, -1, 318, 28); + this.starterSelectMessageBox.setOrigin(0, 1); + this.starterSelectMessageBoxContainer.add(this.starterSelectMessageBox); + + this.message = addTextObject(8, 8, "", TextStyle.WINDOW, { maxLines: 2 }); + this.message.setOrigin(0, 0); + this.starterSelectMessageBoxContainer.add(this.message); + + // arrow icon for the message box + this.initPromptSprite(this.starterSelectMessageBoxContainer); + + this.statsContainer = new StatsContainer(6, 16); + + globalScene.add.existing(this.statsContainer); + + this.statsContainer.setVisible(false); + + this.starterSelectContainer.add(this.statsContainer); + + // Adding menu container + this.menuContainer = globalScene.add.container(-130, 0); + this.menuContainer.setName("menu"); + this.menuContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), + Phaser.Geom.Rectangle.Contains, + ); + + this.menuContainer.setVisible(false); + + this.menuOptions = Utils.getEnumKeys(MenuOptions).map(m => Number.parseInt(MenuOptions[m]) as MenuOptions); + + this.optionSelectText = addTextObject( + 0, + 0, + this.menuOptions.map(o => `${i18next.t(`pokedexUiHandler:${MenuOptions[o]}`)}`).join("\n"), + TextStyle.WINDOW, + { maxLines: this.menuOptions.length }, + ); + this.optionSelectText.setLineSpacing(12); + + this.menuDescriptions = [ + i18next.t("pokedexUiHandler:showBaseStats"), + i18next.t("pokedexUiHandler:showAbilities"), + i18next.t("pokedexUiHandler:showLevelMoves"), + i18next.t("pokedexUiHandler:showEggMoves"), + i18next.t("pokedexUiHandler:showTmMoves"), + i18next.t("pokedexUiHandler:showBiomes"), + i18next.t("pokedexUiHandler:showNatures"), + i18next.t("pokedexUiHandler:toggleIVs"), + i18next.t("pokedexUiHandler:showEvolutions"), + ]; + + this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale; + this.menuBg = addWindow( + globalScene.game.canvas.width / 6 - 83, + 0, + this.optionSelectText.displayWidth + 19 + 24 * this.scale, + globalScene.game.canvas.height / 6 - 2, + ); + this.menuBg.setOrigin(0, 0); + + this.optionSelectText.setPositionRelative(this.menuBg, 10 + 24 * this.scale, 6); + + this.menuContainer.add(this.menuBg); + + this.menuContainer.add(this.optionSelectText); + + ui.add(this.menuContainer); + + this.starterSelectContainer.add(this.menuContainer); + + // adding base stats + this.baseStatsOverlay = new BaseStatsOverlay({ x: 317, y: 0, width: 133 }); + this.menuContainer.add(this.baseStatsOverlay); + this.menuContainer.bringToTop(this.baseStatsOverlay); + + // add the info overlay last to be the top most ui element and prevent the IVs from overlaying this + const overlayScale = 1; + this.moveInfoOverlay = new MoveInfoOverlay({ + scale: overlayScale, + top: true, + x: 1, + y: globalScene.game.canvas.height / 6 - MoveInfoOverlay.getHeight(overlayScale) - 29, + }); + this.starterSelectContainer.add(this.moveInfoOverlay); + + this.infoOverlay = new PokedexInfoOverlay({ + scale: overlayScale, + x: 1, + y: globalScene.game.canvas.height / 6 - PokedexInfoOverlay.getHeight(overlayScale) - 29, + }); + this.starterSelectContainer.add(this.infoOverlay); + + // Filter bar sits above everything, except the message box + this.starterSelectContainer.bringToTop(this.starterSelectMessageBoxContainer); + } + + show(args: any[]): boolean { + // Allow the use of candies if we are in one of the whitelisted phases + this.canUseCandies = ["TitlePhase", "SelectStarterPhase", "CommandPhase"].includes( + globalScene.getCurrentPhase()?.constructor.name ?? "", + ); + + if (args.length >= 1 && args[0] === "refresh") { + return false; + } + this.species = args[0]; + this.formIndex = args[1] ?? 0; + this.savedStarterAttributes = args[2] ?? { + shiny: false, + female: true, + variant: 0, + form: 0, + }; + this.filteredIndices = args[3] ?? null; + this.starterSetup(); + + this.moveInfoOverlay.clear(); // clear this when removing a menu; the cancel button doesn't seem to trigger this automatically on controllers + this.infoOverlay.clear(); + + super.show(args); + + this.starterSelectContainer.setVisible(true); + this.getUi().bringToTop(this.starterSelectContainer); + + this.starterAttributes = this.initStarterPrefs(); + + this.menuOptions = Utils.getEnumKeys(MenuOptions).map(m => Number.parseInt(MenuOptions[m]) as MenuOptions); + + this.menuContainer.setVisible(true); + + this.speciesStarterDexEntry = this.species ? globalScene.gameData.dexData[this.species.speciesId] : null; + this.setSpecies(); + this.updateInstructions(); + + this.setCursor(0); + + return true; + } + + starterSetup(): void { + this.evolutions = []; + this.prevolutions = []; + this.battleForms = []; + + const species = this.species; + + let formKey = this.species?.forms.length > 0 ? this.species.forms[this.formIndex].formKey : ""; + this.isFormGender = formKey === "male" || formKey === "female"; + if ( + this.isFormGender && + ((this.savedStarterAttributes.female === true && formKey === "male") || + (this.savedStarterAttributes.female === false && formKey === "female")) + ) { + this.formIndex = (this.formIndex + 1) % 2; + formKey = this.species.forms[this.formIndex].formKey; + } + + const formIndex = this.formIndex ?? 0; + + this.starterId = this.getStarterSpeciesId(this.species.speciesId); + + const allEvolutions = pokemonEvolutions.hasOwnProperty(species.speciesId) + ? pokemonEvolutions[species.speciesId] + : []; + + if (species.forms.length > 0) { + const form = species.forms[formIndex]; + + // If this form has a specific set of moves, we get them. + this.levelMoves = + formIndex > 0 && + pokemonFormLevelMoves.hasOwnProperty(species.speciesId) && + pokemonFormLevelMoves[species.speciesId].hasOwnProperty(formIndex) + ? pokemonFormLevelMoves[species.speciesId][formIndex] + : pokemonSpeciesLevelMoves[species.speciesId]; + this.ability1 = form.ability1; + this.ability2 = form.ability2 === form.ability1 ? undefined : form.ability2; + this.abilityHidden = form.abilityHidden === form.ability1 ? undefined : form.abilityHidden; + + this.evolutions = allEvolutions.filter(e => e.preFormKey === form.formKey || e.preFormKey === null); + this.baseStats = form.baseStats; + this.baseTotal = form.baseTotal; + } else { + this.levelMoves = pokemonSpeciesLevelMoves[species.speciesId]; + this.ability1 = species.ability1; + this.ability2 = species.ability2 === species.ability1 ? undefined : species.ability2; + this.abilityHidden = species.abilityHidden === species.ability1 ? undefined : species.abilityHidden; + + this.evolutions = allEvolutions; + this.baseStats = species.baseStats; + this.baseTotal = species.baseTotal; + } + + this.eggMoves = speciesEggMoves[this.starterId] ?? []; + this.hasEggMoves = Array.from( + { length: 4 }, + (_, em) => (globalScene.gameData.starterData[this.starterId].eggMoves & (1 << em)) !== 0, + ); + + this.tmMoves = + speciesTmMoves[species.speciesId] + ?.filter(m => (Array.isArray(m) ? m[0] === formKey : true)) + .map(m => (Array.isArray(m) ? m[1] : m)) + .sort((a, b) => (allMoves[a].name > allMoves[b].name ? 1 : -1)) ?? []; + + const passiveId = starterPassiveAbilities.hasOwnProperty(species.speciesId) + ? species.speciesId + : starterPassiveAbilities.hasOwnProperty(this.starterId) + ? this.starterId + : pokemonPrevolutions[this.starterId]; + const passives = starterPassiveAbilities[passiveId]; + this.passive = this.formIndex in passives ? passives[formIndex] : passives[0]; + + const starterData = globalScene.gameData.starterData[this.starterId]; + const abilityAttr = starterData.abilityAttr; + this.hasPassive = starterData.passiveAttr > 0; + + const hasAbility1 = abilityAttr & AbilityAttr.ABILITY_1; + const hasAbility2 = abilityAttr & AbilityAttr.ABILITY_2; + const hasHiddenAbility = abilityAttr & AbilityAttr.ABILITY_HIDDEN; + + this.hasAbilities = [hasAbility1, hasAbility2, hasHiddenAbility]; + + const allBiomes = catchableSpecies[species.speciesId] ?? []; + this.preBiomes = this.sanitizeBiomes( + (catchableSpecies[this.starterId] ?? []).filter( + b => !allBiomes.some(bm => b.biome === bm.biome && b.tier === bm.tier) && !(b.biome === Biome.TOWN), + ), + this.starterId, + ); + this.biomes = this.sanitizeBiomes(allBiomes, species.speciesId); + + const allFormChanges = pokemonFormChanges.hasOwnProperty(species.speciesId) + ? pokemonFormChanges[species.speciesId] + : []; + this.battleForms = allFormChanges.filter(f => f.preFormKey === this.species.forms[this.formIndex].formKey); + + const preSpecies = pokemonPrevolutions.hasOwnProperty(this.species.speciesId) + ? allSpecies.find(sp => sp.speciesId === pokemonPrevolutions[this.species.speciesId]) + : null; + if (preSpecies) { + const preEvolutions = pokemonEvolutions.hasOwnProperty(preSpecies.speciesId) + ? pokemonEvolutions[preSpecies.speciesId] + : []; + this.prevolutions = preEvolutions.filter( + e => + e.speciesId === species.speciesId && + (((e.evoFormKey === "" || e.evoFormKey === null) && + // This takes care of Cosplay Pikachu (Pichu is not shown) + (preSpecies.forms.some(form => form.formKey === species.forms[formIndex]?.formKey) || + // This takes care of Gholdengo + (preSpecies.forms.length > 0 && species.forms.length === 0) || + // This takes care of everything else + (preSpecies.forms.length === 0 && + (species.forms.length === 0 || species.forms[formIndex]?.formKey === "")))) || + // This takes care of Burmy, Shellos etc + e.evoFormKey === species.forms[formIndex]?.formKey), + ); + } + + this.availableVariants = species.getFullUnlocksData() & DexAttr.VARIANT_3 ? 3 : 1; + } + + // Function to ensure that forms appear in the appropriate biome and tod + sanitizeBiomes(biomes: BiomeTierTod[], speciesId: number): BiomeTierTod[] { + if (speciesId === Species.BURMY || speciesId === Species.WORMADAM) { + return biomes.filter(b => { + const formIndex = (() => { + switch (b.biome) { + case Biome.BEACH: + return 1; + case Biome.SLUM: + return 2; + default: + return 0; + } + })(); + return this.formIndex === formIndex; + }); + } + if (speciesId === Species.ROTOM) { + return biomes.filter(b => { + const formIndex = (() => { + switch (b.biome) { + case Biome.VOLCANO: + return 1; + case Biome.SEA: + return 2; + case Biome.ICE_CAVE: + return 3; + case Biome.MOUNTAIN: + return 4; + case Biome.TALL_GRASS: + return 5; + default: + return 0; + } + })(); + return this.formIndex === formIndex; + }); + } + if (speciesId === Species.LYCANROC) { + return biomes.filter(b => { + const formIndex = (() => { + switch (b.tod[0]) { + case TimeOfDay.DAY: + case TimeOfDay.DAWN: + return 0; + case TimeOfDay.DUSK: + return 2; + case TimeOfDay.NIGHT: + return 1; + default: + return 0; + } + })(); + return this.formIndex === formIndex; + }); + } + + return biomes; + } + + isCaught(otherSpecies?: PokemonSpecies): bigint { + if (globalScene.dexForDevs) { + return 255n; + } + + const species = otherSpecies ? otherSpecies : this.species; + const dexEntry = globalScene.gameData.dexData[species.speciesId]; + const starterDexEntry = globalScene.gameData.dexData[this.getStarterSpeciesId(species.speciesId)]; + + return (dexEntry?.caughtAttr ?? 0n) & (starterDexEntry?.caughtAttr ?? 0n) & species.getFullUnlocksData(); + } + /** + * Check whether a given form is caught for a given species. + * All forms that can be reached through a form change during battle are considered caught and show up in the dex as such. + * + * @param otherSpecies The species to check; defaults to current species + * @param otherFormIndex The form index of the form to check; defaults to current form + * @returns StarterAttributes for the species + */ + isFormCaught(otherSpecies?: PokemonSpecies, otherFormIndex?: number | undefined): boolean { + if (globalScene.dexForDevs) { + return true; + } + const species = otherSpecies ? otherSpecies : this.species; + const formIndex = otherFormIndex !== undefined ? otherFormIndex : this.formIndex; + const caughtAttr = this.isCaught(species); + + if (caughtAttr && (!species.forms.length || species.forms.length === 1)) { + return true; + } + + const isFormCaught = (caughtAttr & globalScene.gameData.getFormAttr(formIndex ?? 0)) > 0n; + return isFormCaught; + } + + /** + * Get the starter attributes for the given PokemonSpecies, after sanitizing them. + * If somehow a preference is set for a form, variant, gender, ability or nature + * that wasn't actually unlocked or is invalid it will be cleared here + * + * @param species The species to get Starter Preferences for + * @returns StarterAttributes for the species + */ + initStarterPrefs(): StarterAttributes { + const starterAttributes: StarterAttributes | null = this.species ? { ...this.savedStarterAttributes } : null; + const caughtAttr = this.isCaught(); + + // no preferences or Pokemon wasn't caught, return empty attribute + if (!starterAttributes || !caughtAttr) { + return {}; + } + + const hasShiny = caughtAttr & DexAttr.SHINY; + const hasNonShiny = caughtAttr & DexAttr.NON_SHINY; + if (!hasShiny || (starterAttributes.shiny === undefined && hasNonShiny)) { + // shiny form wasn't unlocked, purging shiny and variant setting + starterAttributes.shiny = false; + starterAttributes.variant = 0; + } else if (!hasNonShiny || (starterAttributes.shiny === undefined && hasShiny)) { + starterAttributes.shiny = true; + starterAttributes.variant = 0; + } + + this.unlockedVariants = [ + !!(hasShiny && caughtAttr & DexAttr.DEFAULT_VARIANT), + !!(hasShiny && caughtAttr & DexAttr.VARIANT_2), + !!(hasShiny && caughtAttr & DexAttr.VARIANT_3), + ]; + if ( + starterAttributes.variant === undefined || + Number.isNaN(starterAttributes.variant) || + starterAttributes.variant < 0 + ) { + starterAttributes.variant = 0; + } else if (!this.unlockedVariants[starterAttributes.variant]) { + let highestValidIndex = -1; + for (let i = 0; i <= starterAttributes.variant && i < this.unlockedVariants.length; i++) { + if (this.unlockedVariants[i]) { + highestValidIndex = i; + } + } + // Set to the highest valid index found or default to 0 + starterAttributes.variant = highestValidIndex !== -1 ? highestValidIndex : 0; + } + + if (starterAttributes.female !== undefined) { + if ( + (starterAttributes.female && !(caughtAttr & DexAttr.FEMALE)) || + (!starterAttributes.female && !(caughtAttr & DexAttr.MALE)) + ) { + starterAttributes.female = !starterAttributes.female; + } + } else { + if (caughtAttr & DexAttr.FEMALE) { + starterAttributes.female = true; + } else if (caughtAttr & DexAttr.MALE) { + starterAttributes.female = false; + } + } + + return starterAttributes; + } + + showText( + text: string, + delay?: number, + callback?: Function, + callbackDelay?: number, + prompt?: boolean, + promptDelay?: number, + moveToTop?: boolean, + ) { + super.showText(text, delay, callback, callbackDelay, prompt, promptDelay); + + const singleLine = text?.indexOf("\n") === -1; + + this.starterSelectMessageBox.setSize(318, singleLine ? 28 : 42); + + if (moveToTop) { + this.starterSelectMessageBox.setOrigin(0, 0); + this.starterSelectMessageBoxContainer.setY(0); + this.message.setY(4); + } else { + this.starterSelectMessageBoxContainer.setY(globalScene.game.canvas.height / 6); + this.starterSelectMessageBox.setOrigin(0, 1); + this.message.setY(singleLine ? -22 : -37); + } + + this.starterSelectMessageBoxContainer.setVisible(!!text?.length); + } + + /** + * Determines if 'Icon' based upgrade notifications should be shown + * @returns true if upgrade notifications are enabled and set to display an 'Icon' + */ + isUpgradeIconEnabled(): boolean { + return globalScene.candyUpgradeNotification !== 0 && globalScene.candyUpgradeDisplay === 0; + } + /** + * Determines if 'Animation' based upgrade notifications should be shown + * @returns true if upgrade notifications are enabled and set to display an 'Animation' + */ + isUpgradeAnimationEnabled(): boolean { + return globalScene.candyUpgradeNotification !== 0 && globalScene.candyUpgradeDisplay === 1; + } + + /** + * If the pokemon is an evolution, find speciesId of its starter. + * @param speciesId the id of the species to check + * @returns the id of the corresponding starter + */ + getStarterSpeciesId(speciesId): number { + if (speciesId === Species.PIKACHU) { + if ([0, 1, 8].includes(this.formIndex)) { + return Species.PICHU; + } + return Species.PIKACHU; + } + if (speciesStarterCosts.hasOwnProperty(speciesId)) { + return speciesId; + } + return pokemonStarters[speciesId]; + } + + getStarterSpecies(species): PokemonSpecies { + if (speciesStarterCosts.hasOwnProperty(species.speciesId)) { + return species; + } + return allSpecies.find(sp => sp.speciesId === pokemonStarters[species.speciesId]) ?? species; + } + + processInput(button: Button): boolean { + if (this.blockInput) { + return false; + } + + const ui = this.getUi(); + + let success = false; + let error = false; + + const isCaught = this.isCaught(); + const isFormCaught = this.isFormCaught(); + + if (this.blockInputOverlay) { + if (button === Button.CANCEL || button === Button.ACTION) { + this.blockInputOverlay = false; + this.baseStatsOverlay.clear(); + ui.showText(""); + return true; + } + if (button === Button.UP || button === Button.DOWN) { + this.blockInputOverlay = false; + this.baseStatsOverlay.clear(); + ui.showText(""); + } else { + return false; + } + } + + if (button === Button.SUBMIT) { + success = true; + } else if (button === Button.CANCEL) { + if (this.statsMode) { + this.toggleStatsMode(false); + success = true; + } else { + this.getUi().revertMode(); + success = true; + } + } else { + const starterData = globalScene.gameData.starterData[this.starterId]; + // prepare persistent starter data to store changes + const starterAttributes = this.starterAttributes; + + if (button === Button.ACTION) { + switch (this.cursor) { + case MenuOptions.BASE_STATS: + if (!isCaught || !isFormCaught) { + error = true; + } else { + this.blockInput = true; + + ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => { + ui.showText(i18next.t("pokedexUiHandler:showBaseStats"), null, () => { + this.baseStatsOverlay.show(this.baseStats, this.baseTotal); + + this.blockInput = false; + this.blockInputOverlay = true; + + return true; + }); + success = true; + }); + } + break; + + case MenuOptions.LEVEL_MOVES: + if (!isCaught || !isFormCaught) { + error = true; + } else { + this.blockInput = true; + + ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => { + ui.showText(i18next.t("pokedexUiHandler:showLevelMoves"), null, () => { + this.moveInfoOverlay.show(allMoves[this.levelMoves[0][1]]); + + ui.setModeWithoutClear(Mode.OPTION_SELECT, { + options: this.levelMoves + .map(m => { + const levelNumber = m[0] > 0 ? String(m[0]) : ""; + const option: OptionSelectItem = { + label: levelNumber.padEnd(4, " ") + allMoves[m[1]].name, + handler: () => { + return false; + }, + onHover: () => { + this.moveInfoOverlay.show(allMoves[m[1]]); + if (m[0] === 0) { + this.showText(i18next.t("pokedexUiHandler:onlyEvolutionMove")); + } else if (m[0] === -1) { + this.showText(i18next.t("pokedexUiHandler:onlyRecallMove")); + } else if (m[0] <= 5) { + this.showText(i18next.t("pokedexUiHandler:onStarterSelectMove")); + } else { + this.showText(i18next.t("pokedexUiHandler:byLevelUpMove")); + } + }, + }; + return option; + }) + .concat({ + label: i18next.t("menu:cancel"), + handler: () => { + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + return true; + }, + onHover: () => { + this.moveInfoOverlay.clear(); + }, + }), + supportHover: true, + maxOptions: 8, + yOffset: 19, + }); + + this.blockInput = false; + }); + }); + success = true; + } + break; + + case MenuOptions.EGG_MOVES: + if (!isCaught || !isFormCaught) { + error = true; + } else { + this.blockInput = true; + + ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => { + if (this.eggMoves.length === 0) { + ui.showText(i18next.t("pokedexUiHandler:noEggMoves")); + this.blockInput = false; + return true; + } + + ui.showText(i18next.t("pokedexUiHandler:showEggMoves"), null, () => { + this.moveInfoOverlay.show(allMoves[this.eggMoves[0]]); + + ui.setModeWithoutClear(Mode.OPTION_SELECT, { + options: [ + { + label: i18next.t("pokedexUiHandler:common"), + skip: true, + style: TextStyle.MONEY_WINDOW, + handler: () => false, // Non-selectable, but handler is required + onHover: () => this.moveInfoOverlay.clear(), // No hover behavior for titles + }, + ...this.eggMoves.slice(0, 3).map((m, i) => ({ + label: allMoves[m].name, + style: this.hasEggMoves[i] ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT, + handler: () => false, + onHover: () => this.moveInfoOverlay.show(allMoves[m]), + })), + { + label: i18next.t("pokedexUiHandler:rare"), + skip: true, + style: TextStyle.MONEY_WINDOW, + handler: () => false, + onHover: () => this.moveInfoOverlay.clear(), + }, + { + label: allMoves[this.eggMoves[3]].name, + style: this.hasEggMoves[3] ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT, + handler: () => false, + onHover: () => this.moveInfoOverlay.show(allMoves[this.eggMoves[3]]), + }, + { + label: i18next.t("menu:cancel"), + handler: () => { + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + return true; + }, + onHover: () => this.moveInfoOverlay.clear(), + }, + ], + supportHover: true, + maxOptions: 8, + yOffset: 19, + }); + + this.blockInput = false; + }); + }); + success = true; + } + break; + + case MenuOptions.TM_MOVES: + if (!isCaught || !isFormCaught) { + error = true; + } else if (this.tmMoves.length < 1) { + ui.showText(i18next.t("pokedexUiHandler:noTmMoves")); + error = true; + } else { + this.blockInput = true; + + ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => { + ui.showText(i18next.t("pokedexUiHandler:showTmMoves"), null, () => { + this.moveInfoOverlay.show(allMoves[this.tmMoves[0]]); + + ui.setModeWithoutClear(Mode.OPTION_SELECT, { + options: this.tmMoves + .map(m => { + const option: OptionSelectItem = { + label: allMoves[m].name, + handler: () => { + return false; + }, + onHover: () => { + this.moveInfoOverlay.show(allMoves[m]); + }, + }; + return option; + }) + .concat({ + label: i18next.t("menu:cancel"), + handler: () => { + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + return true; + }, + onHover: () => { + this.moveInfoOverlay.clear(); + }, + }), + supportHover: true, + maxOptions: 8, + yOffset: 19, + }); + + this.blockInput = false; + }); + }); + success = true; + } + break; + + case MenuOptions.ABILITIES: + if (!isCaught || !isFormCaught) { + error = true; + } else { + this.blockInput = true; + + ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => { + ui.showText(i18next.t("pokedexUiHandler:showAbilities"), null, () => { + this.infoOverlay.show(allAbilities[this.ability1].description); + + const options: any[] = []; + + if (this.ability1) { + options.push({ + label: allAbilities[this.ability1].name, + style: this.hasAbilities[0] > 0 ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT, + handler: () => false, + onHover: () => this.infoOverlay.show(allAbilities[this.ability1].description), + }); + } + if (this.ability2) { + const ability = allAbilities[this.ability2]; + options.push({ + label: ability?.name, + style: this.hasAbilities[1] > 0 ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT, + handler: () => false, + onHover: () => this.infoOverlay.show(ability?.description), + }); + } + + if (this.abilityHidden) { + options.push({ + label: i18next.t("pokedexUiHandler:hidden"), + skip: true, + style: TextStyle.MONEY_WINDOW, + handler: () => false, + onHover: () => this.infoOverlay.clear(), + }); + const ability = allAbilities[this.abilityHidden]; + options.push({ + label: allAbilities[this.abilityHidden].name, + style: this.hasAbilities[2] > 0 ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT, + handler: () => false, + onHover: () => this.infoOverlay.show(ability?.description), + }); + } + + if (this.passive) { + options.push({ + label: i18next.t("pokedexUiHandler:passive"), + skip: true, + style: TextStyle.MONEY_WINDOW, + handler: () => false, + onHover: () => this.infoOverlay.clear(), + }); + options.push({ + label: allAbilities[this.passive].name, + style: this.hasPassive ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT, + handler: () => false, + onHover: () => this.infoOverlay.show(allAbilities[this.passive].description), + }); + } + + options.push({ + label: i18next.t("menu:cancel"), + handler: () => { + this.infoOverlay.clear(); + this.clearText(); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + return true; + }, + onHover: () => this.infoOverlay.clear(), + }); + + ui.setModeWithoutClear(Mode.OPTION_SELECT, { + options: options, + supportHover: true, + maxOptions: 8, + yOffset: 19, + }); + + this.blockInput = false; + }); + }); + success = true; + } + break; + + case MenuOptions.BIOMES: + if (!(isCaught || this.speciesStarterDexEntry?.seenAttr)) { + error = true; + } else { + this.blockInput = true; + + ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => { + if ((!this.biomes || this.biomes?.length === 0) && (!this.preBiomes || this.preBiomes?.length === 0)) { + ui.showText(i18next.t("pokedexUiHandler:noBiomes")); + ui.playError(); + this.blockInput = false; + return true; + } + + const options: any[] = []; + + ui.showText(i18next.t("pokedexUiHandler:showBiomes"), null, () => { + this.biomes.map(b => { + options.push({ + label: + i18next.t(`biome:${Biome[b.biome].toUpperCase()}`) + + " - " + + i18next.t(`biome:${BiomePoolTier[b.tier].toUpperCase()}`) + + (b.tod.length === 1 && b.tod[0] === -1 + ? "" + : " (" + + b.tod.map(tod => i18next.t(`biome:${TimeOfDay[tod].toUpperCase()}`)).join(", ") + + ")"), + handler: () => false, + }); + }); + + if (this.preBiomes.length > 0) { + options.push({ + label: i18next.t("pokedexUiHandler:preBiomes"), + skip: true, + handler: () => false, + }); + this.preBiomes.map(b => { + options.push({ + label: + i18next.t(`biome:${Biome[b.biome].toUpperCase()}`) + + " - " + + i18next.t(`biome:${BiomePoolTier[b.tier].toUpperCase()}`) + + (b.tod.length === 1 && b.tod[0] === -1 + ? "" + : " (" + + b.tod.map(tod => i18next.t(`biome:${TimeOfDay[tod].toUpperCase()}`)).join(", ") + + ")"), + handler: () => false, + }); + }); + } + + options.push({ + label: i18next.t("menu:cancel"), + handler: () => { + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + return true; + }, + onHover: () => this.moveInfoOverlay.clear(), + }); + + ui.setModeWithoutClear(Mode.OPTION_SELECT, { + options: options, + supportHover: true, + maxOptions: 8, + yOffset: 19, + }); + + this.blockInput = false; + }); + }); + success = true; + } + break; + + case MenuOptions.EVOLUTIONS: + if (!isCaught || !isFormCaught) { + error = true; + } else { + this.blockInput = true; + + ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => { + const options: any[] = []; + + if ( + (!this.prevolutions || this.prevolutions?.length === 0) && + (!this.evolutions || this.evolutions?.length === 0) && + (!this.battleForms || this.battleForms?.length === 0) + ) { + ui.showText(i18next.t("pokedexUiHandler:noEvolutions")); + ui.playError(); + this.blockInput = false; + return true; + } + + ui.showText(i18next.t("pokedexUiHandler:showEvolutions"), null, () => { + if (this.prevolutions?.length > 0) { + options.push({ + label: i18next.t("pokedexUiHandler:prevolutions"), + style: TextStyle.MONEY_WINDOW, + skip: true, + handler: () => false, + }); + this.prevolutions.map(pre => { + const preSpecies = allSpecies.find( + species => species.speciesId === pokemonPrevolutions[this.species.speciesId], + ); + const preFormIndex: number = + preSpecies?.forms.find(f => f.formKey === pre.preFormKey)?.formIndex ?? 0; + + const conditionText: string = pre.description; + + options.push({ + label: pre.preFormKey + ? (preSpecies ?? this.species).getFormNameToDisplay(preFormIndex, true) + : (preSpecies ?? this.species).getExpandedSpeciesName(), + handler: () => { + const newSpecies = allSpecies.find( + species => species.speciesId === pokemonPrevolutions[pre.speciesId], + ); + // Attempts to find the formIndex of the prevolved species + const newFormKey = pre.preFormKey + ? pre.preFormKey + : this.species.forms.length > 0 + ? this.species.forms[this.formIndex].formKey + : ""; + const matchingForm = newSpecies?.forms.find(form => form.formKey === newFormKey); + const newFormIndex = matchingForm ? matchingForm.formIndex : 0; + this.starterAttributes.form = newFormIndex; + this.savedStarterAttributes.form = newFormIndex; + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setMode(Mode.POKEDEX_PAGE, newSpecies, newFormIndex, this.savedStarterAttributes); + return true; + }, + onHover: () => this.showText(conditionText), + }); + }); + } + + if (this.evolutions.length > 0) { + options.push({ + label: i18next.t("pokedexUiHandler:evolutions"), + style: TextStyle.MONEY_WINDOW, + skip: true, + handler: () => false, + }); + this.evolutions.map(evo => { + const evoSpecies = allSpecies.find(species => species.speciesId === evo.speciesId); + const isCaughtEvo = !!this.isCaught(evoSpecies); + // Attempts to find the formIndex of the evolved species + const newFormKey = evo.evoFormKey + ? evo.evoFormKey + : this.species.forms.length > 0 + ? this.species.forms[this.formIndex].formKey + : ""; + const matchingForm = evoSpecies?.forms.find(form => form.formKey === newFormKey); + const newFormIndex = matchingForm ? matchingForm.formIndex : 0; + const isFormCaughtEvo = this.isFormCaught(evoSpecies, newFormIndex); + + const conditionText: string = evo.description; + + options.push({ + label: evo.evoFormKey + ? (evoSpecies ?? this.species).getFormNameToDisplay(newFormIndex, true) + : (evoSpecies ?? this.species).getExpandedSpeciesName(), + style: isCaughtEvo && isFormCaughtEvo ? TextStyle.WINDOW : TextStyle.SHADOW_TEXT, + handler: () => { + this.starterAttributes.form = newFormIndex; + this.savedStarterAttributes.form = newFormIndex; + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setMode(Mode.POKEDEX_PAGE, evoSpecies, newFormIndex, this.savedStarterAttributes); + return true; + }, + onHover: () => this.showText(conditionText), + }); + }); + } + + if (this.battleForms.length > 0) { + options.push({ + label: i18next.t("pokedexUiHandler:forms"), + style: TextStyle.MONEY_WINDOW, + skip: true, + handler: () => false, + }); + this.battleForms.map(bf => { + const matchingForm = this.species?.forms.find(form => form.formKey === bf.formKey); + const newFormIndex = matchingForm ? matchingForm.formIndex : 0; + + let conditionText = ""; + if (bf.trigger) { + conditionText = bf.trigger.description; + } else { + conditionText = ""; + } + let label: string = this.species.getFormNameToDisplay(newFormIndex); + if (label === "") { + label = this.species.name; + } + const isFormCaught = this.isFormCaught(this.species, newFormIndex); + + if (conditionText) { + options.push({ + label: label, + style: isFormCaught ? TextStyle.WINDOW : TextStyle.SHADOW_TEXT, + handler: () => { + const newSpecies = this.species; + const newFormIndex = this.species.forms.find(f => f.formKey === bf.formKey)?.formIndex; + this.starterAttributes.form = newFormIndex; + this.savedStarterAttributes.form = newFormIndex; + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setMode( + Mode.POKEDEX_PAGE, + newSpecies, + newFormIndex, + this.savedStarterAttributes, + this.filteredIndices, + ); + return true; + }, + onHover: () => this.showText(conditionText), + }); + } + }); + } + + options.push({ + label: i18next.t("menu:cancel"), + handler: () => { + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + return true; + }, + onHover: () => this.moveInfoOverlay.clear(), + }); + + ui.setModeWithoutClear(Mode.OPTION_SELECT, { + options: options, + supportHover: true, + maxOptions: 8, + yOffset: 19, + }); + + this.blockInput = false; + }); + }); + success = true; + } + break; + + case MenuOptions.TOGGLE_IVS: + if (!isCaught || !isFormCaught) { + error = true; + } else { + this.toggleStatsMode(); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + success = true; + } + break; + + case MenuOptions.NATURES: + if (!isCaught || !isFormCaught) { + error = true; + } else { + this.blockInput = true; + ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => { + ui.showText(i18next.t("pokedexUiHandler:showNature"), null, () => { + const natures = globalScene.gameData.getNaturesForAttr(this.speciesStarterDexEntry?.natureAttr); + ui.setModeWithoutClear(Mode.OPTION_SELECT, { + options: natures + .map((n: Nature, _i: number) => { + const option: OptionSelectItem = { + label: getNatureName(n, true, true, true, globalScene.uiTheme), + handler: () => { + return false; + }, + }; + return option; + }) + .concat({ + label: i18next.t("menu:cancel"), + handler: () => { + this.clearText(); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + this.blockInput = false; + return true; + }, + }), + maxOptions: 8, + yOffset: 19, + }); + }); + }); + success = true; + } + break; + } + } else { + const props = globalScene.gameData.getSpeciesDexAttrProps( + this.species, + this.getCurrentDexProps(this.species.speciesId), + ); + switch (button) { + case Button.CYCLE_SHINY: + if (this.canCycleShiny) { + if (!starterAttributes.shiny) { + // Change to shiny, we need to get the proper default variant + const newVariant = starterAttributes.variant ? (starterAttributes.variant as Variant) : 0; + this.setSpeciesDetails(this.species, { + shiny: true, + variant: newVariant, + }); + + globalScene.playSound("se/sparkle"); + + starterAttributes.shiny = true; + this.savedStarterAttributes.shiny = starterAttributes.shiny; + } else { + let newVariant = props.variant; + do { + newVariant = (newVariant + 1) % 3; + if (newVariant === 0) { + if (this.isCaught() & DexAttr.DEFAULT_VARIANT) { + break; + } + } else if (newVariant === 1) { + if (this.isCaught() & DexAttr.VARIANT_2) { + break; + } + } else { + if (this.isCaught() & DexAttr.VARIANT_3) { + break; + } + } + } while (newVariant !== props.variant); + + starterAttributes.variant = newVariant; // store the selected variant + this.savedStarterAttributes.variant = starterAttributes.variant; + if (this.isCaught() & DexAttr.NON_SHINY && newVariant <= props.variant) { + this.setSpeciesDetails(this.species, { + shiny: false, + variant: 0, + }); + success = true; + starterAttributes.shiny = false; + this.savedStarterAttributes.shiny = starterAttributes.shiny; + } else { + this.setSpeciesDetails(this.species, { + variant: newVariant as Variant, + }); + success = true; + } + } + } + break; + case Button.CYCLE_FORM: + if (this.canCycleForm) { + const formCount = this.species.forms.length; + let newFormIndex = this.formIndex; + do { + newFormIndex = (newFormIndex + 1) % formCount; + if (this.species.forms[newFormIndex].isStarterSelectable || globalScene.dexForDevs) { + // TODO: are those bangs correct? + break; + } + } while (newFormIndex !== props.formIndex || this.species.forms[newFormIndex].isUnobtainable); + starterAttributes.form = newFormIndex; // store the selected form + this.savedStarterAttributes.form = starterAttributes.form; + this.formIndex = newFormIndex; + // Some forms are tied to the gender and should change accordingly + let newFemale = props.female; + if (this.isFormGender) { + newFemale = !props.female; + } + starterAttributes.female = newFemale; + this.savedStarterAttributes.female = starterAttributes.female; + this.starterSetup(); + this.setSpeciesDetails(this.species, { + formIndex: newFormIndex, + female: newFemale, + }); + success = this.setCursor(this.cursor); + } + break; + case Button.CYCLE_GENDER: + if (this.canCycleGender) { + starterAttributes.female = !props.female; + this.savedStarterAttributes.female = starterAttributes.female; + let newFormIndex = this.formIndex; + // Some forms are tied to the gender and should change accordingly + if (this.isFormGender) { + newFormIndex = this.formIndex === 0 ? 1 : 0; + } + starterAttributes.form = newFormIndex; // store the selected form + this.savedStarterAttributes.form = starterAttributes.form; + this.formIndex = newFormIndex; + this.starterSetup(); + this.setSpeciesDetails(this.species, { + female: !props.female, + formIndex: newFormIndex, + }); + success = true; + } + break; + case Button.STATS: + if (!isCaught || !isFormCaught || !this.canUseCandies) { + error = true; + } else { + const ui = this.getUi(); + ui.showText(""); + const options: any[] = []; // TODO: add proper type + + const passiveAttr = starterData.passiveAttr; + const candyCount = starterData.candyCount; + + if (!(passiveAttr & PassiveAttr.UNLOCKED)) { + const passiveCost = getPassiveCandyCount(speciesStarterCosts[this.starterId]); + options.push({ + label: `x${passiveCost} ${i18next.t("pokedexUiHandler:unlockPassive")} (${allAbilities[this.passive].name})`, + handler: () => { + if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= passiveCost) { + starterData.passiveAttr |= PassiveAttr.UNLOCKED | PassiveAttr.ENABLED; + if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) { + starterData.candyCount -= passiveCost; + } + this.pokemonCandyCountText.setText(`x${starterData.candyCount}`); + globalScene.gameData.saveSystem().then(success => { + if (!success) { + return globalScene.reset(true); + } + }); + this.setSpeciesDetails(this.species); + globalScene.playSound("se/buy"); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + + return true; + } + return false; + }, + style: this.isPassiveAvailable() ? TextStyle.WINDOW : TextStyle.SHADOW_TEXT, + item: "candy", + itemArgs: this.isPassiveAvailable() ? starterColors[this.starterId] : ["808080", "808080"], + }); + } + + // Reduce cost option + const valueReduction = starterData.valueReduction; + if (valueReduction < valueReductionMax) { + const reductionCost = getValueReductionCandyCounts(speciesStarterCosts[this.starterId])[valueReduction]; + options.push({ + label: `x${reductionCost} ${i18next.t("pokedexUiHandler:reduceCost")}`, + handler: () => { + if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= reductionCost) { + starterData.valueReduction++; + if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) { + starterData.candyCount -= reductionCost; + } + this.pokemonCandyCountText.setText(`x${starterData.candyCount}`); + globalScene.gameData.saveSystem().then(success => { + if (!success) { + return globalScene.reset(true); + } + }); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + globalScene.playSound("se/buy"); + + return true; + } + return false; + }, + style: this.isValueReductionAvailable() ? TextStyle.WINDOW : TextStyle.SHADOW_TEXT, + item: "candy", + itemArgs: this.isValueReductionAvailable() ? starterColors[this.starterId] : ["808080", "808080"], + }); + } + + // Same species egg menu option. + const sameSpeciesEggCost = getSameSpeciesEggCandyCounts(speciesStarterCosts[this.starterId]); + options.push({ + label: `x${sameSpeciesEggCost} ${i18next.t("pokedexUiHandler:sameSpeciesEgg")}`, + handler: () => { + if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= sameSpeciesEggCost) { + if (globalScene.gameData.eggs.length >= 99 && !Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) { + // Egg list full, show error message at the top of the screen and abort + this.showText( + i18next.t("egg:tooManyEggs"), + undefined, + () => this.showText("", 0, () => (this.tutorialActive = false)), + 2000, + false, + undefined, + true, + ); + return false; + } + if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) { + starterData.candyCount -= sameSpeciesEggCost; + } + this.pokemonCandyCountText.setText(`x${starterData.candyCount}`); + + const egg = new Egg({ + scene: globalScene, + species: this.starterId, + sourceType: EggSourceType.SAME_SPECIES_EGG, + }); + egg.addEggToGameData(); + + globalScene.gameData.saveSystem().then(success => { + if (!success) { + return globalScene.reset(true); + } + }); + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + globalScene.playSound("se/buy"); + + return true; + } + return false; + }, + style: this.isSameSpeciesEggAvailable() ? TextStyle.WINDOW : TextStyle.SHADOW_TEXT, + item: "candy", + itemArgs: this.isSameSpeciesEggAvailable() ? starterColors[this.starterId] : ["808080", "808080"], + }); + options.push({ + label: i18next.t("menu:cancel"), + handler: () => { + ui.setMode(Mode.POKEDEX_PAGE, "refresh"); + return true; + }, + }); + ui.setModeWithoutClear(Mode.OPTION_SELECT, { + options: options, + yOffset: 47, + }); + success = true; + } + break; + case Button.CYCLE_ABILITY: + this.showBackSprite = !this.showBackSprite; + if (this.showBackSprite) { + this.showBackSpriteLabel.setText(i18next.t("pokedexUiHandler:showFrontSprite")); + } else { + this.showBackSpriteLabel.setText(i18next.t("pokedexUiHandler:showBackSprite")); + } + this.setSpeciesDetails(this.species, {}, true); + success = true; + break; + case Button.UP: + if (this.cursor) { + success = this.setCursor(this.cursor - 1); + } else { + success = this.setCursor(this.menuOptions.length - 1); + } + break; + case Button.DOWN: + if (this.cursor + 1 < this.menuOptions.length) { + success = this.setCursor(this.cursor + 1); + } else { + success = this.setCursor(0); + } + break; + case Button.LEFT: + this.blockInput = true; + ui.setModeWithoutClear(Mode.OPTION_SELECT).then(() => { + let newSpecies: PokemonSpecies; + if (this.filteredIndices) { + const index = this.filteredIndices.findIndex(id => id === this.species.speciesId); + const newIndex = index <= 0 ? this.filteredIndices.length - 1 : index - 1; + newSpecies = getPokemonSpecies(this.filteredIndices[newIndex]); + } else { + const index = allSpecies.findIndex(species => species.speciesId === this.species.speciesId); + const newIndex = index <= 0 ? allSpecies.length - 1 : index - 1; + newSpecies = allSpecies[newIndex]; + } + const matchingForm = newSpecies?.forms.find( + form => form.formKey === this.species?.forms[this.formIndex]?.formKey, + ); + const newFormIndex = matchingForm ? matchingForm.formIndex : 0; + this.starterAttributes.form = newFormIndex; + this.savedStarterAttributes.form = newFormIndex; + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setModeForceTransition( + Mode.POKEDEX_PAGE, + newSpecies, + newFormIndex, + this.savedStarterAttributes, + this.filteredIndices, + ); + }); + this.blockInput = false; + break; + case Button.RIGHT: + ui.setModeWithoutClear(Mode.OPTION_SELECT).then(() => { + let newSpecies: PokemonSpecies; + if (this.filteredIndices) { + const index = this.filteredIndices.findIndex(id => id === this.species.speciesId); + const newIndex = index >= this.filteredIndices.length - 1 ? 0 : index + 1; + newSpecies = getPokemonSpecies(this.filteredIndices[newIndex]); + } else { + const index = allSpecies.findIndex(species => species.speciesId === this.species.speciesId); + const newIndex = index >= allSpecies.length - 1 ? 0 : index + 1; + newSpecies = allSpecies[newIndex]; + } + const matchingForm = newSpecies?.forms.find( + form => form.formKey === this.species?.forms[this.formIndex]?.formKey, + ); + const newFormIndex = matchingForm ? matchingForm.formIndex : 0; + this.starterAttributes.form = newFormIndex; + this.savedStarterAttributes.form = newFormIndex; + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setModeForceTransition( + Mode.POKEDEX_PAGE, + newSpecies, + newFormIndex, + this.savedStarterAttributes, + this.filteredIndices, + ); + }); + break; + } + } + } + + if (success) { + ui.playSelect(); + } else if (error) { + ui.playError(); + } + + return success || error; + } + + updateButtonIcon(iconSetting, gamepadType, iconElement, controlLabel): void { + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO + let iconPath; + // touch controls cannot be rebound as is, and are just emulating a keyboard event. + // Additionally, since keyboard controls can be rebound (and will be displayed when they are), we need to have special handling for the touch controls + if (gamepadType === "touch") { + gamepadType = "keyboard"; + switch (iconSetting) { + case SettingKeyboard.Button_Cycle_Shiny: + iconPath = "R.png"; + break; + case SettingKeyboard.Button_Cycle_Form: + iconPath = "F.png"; + break; + case SettingKeyboard.Button_Cycle_Gender: + iconPath = "G.png"; + break; + case SettingKeyboard.Button_Cycle_Ability: + iconPath = "E.png"; + break; + default: + break; + } + } else { + iconPath = globalScene.inputController?.getIconForLatestInputRecorded(iconSetting); + } + iconElement.setTexture(gamepadType, iconPath); + iconElement.setPosition(this.instructionRowX, this.instructionRowY); + controlLabel.setPosition(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY); + iconElement.setVisible(true); + controlLabel.setVisible(true); + this.instructionsContainer.add([iconElement, controlLabel]); + this.instructionRowY += 8; + if (this.instructionRowY >= 24) { + this.instructionRowY = 8; + this.instructionRowX += 50; + } + } + + updateInstructions(): void { + this.instructionRowX = 0; + this.instructionRowY = 0; + this.filterInstructionRowX = 0; + this.filterInstructionRowY = 0; + this.hideInstructions(); + this.instructionsContainer.removeAll(); + this.filterInstructionsContainer.removeAll(); + + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO + let gamepadType; + if (globalScene.inputMethod === "gamepad") { + gamepadType = globalScene.inputController.getConfig( + globalScene.inputController.selectedDevice[Device.GAMEPAD], + ).padType; + } else { + gamepadType = globalScene.inputMethod; + } + + if (!gamepadType) { + return; + } + + const isFormCaught = this.isFormCaught(); + + if (this.isCaught()) { + if (isFormCaught) { + if (this.canUseCandies) { + this.updateButtonIcon( + SettingKeyboard.Button_Stats, + gamepadType, + this.candyUpgradeIconElement, + this.candyUpgradeLabel, + ); + } + if (this.canCycleShiny) { + this.updateButtonIcon( + SettingKeyboard.Button_Cycle_Shiny, + gamepadType, + this.shinyIconElement, + this.shinyLabel, + ); + } + if (this.canCycleGender) { + this.updateButtonIcon( + SettingKeyboard.Button_Cycle_Gender, + gamepadType, + this.genderIconElement, + this.genderLabel, + ); + } + } else { + // Making space for "Uncaught" text + this.instructionRowY += 8; + } + if (this.canCycleForm) { + this.updateButtonIcon(SettingKeyboard.Button_Cycle_Form, gamepadType, this.formIconElement, this.formLabel); + } + } + } + + getValueLimit(): number { + const valueLimit = new NumberHolder(0); + switch (globalScene.gameMode.modeId) { + case GameModes.ENDLESS: + case GameModes.SPLICED_ENDLESS: + valueLimit.value = 15; + break; + default: + valueLimit.value = 10; + } + + Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_POINTS, valueLimit); + + return valueLimit.value; + } + + setCursor(cursor: number): boolean { + const ret = super.setCursor(cursor); + + if (!this.cursorObj) { + this.cursorObj = globalScene.add.image(0, 0, "cursor"); + this.cursorObj.setOrigin(0, 0); + this.menuContainer.add(this.cursorObj); + } + + this.cursorObj.setScale(this.scale * 6); + this.cursorObj.setPositionRelative(this.menuBg, 7, 6 + (18 + this.cursor * 96) * this.scale); + + const ui = this.getUi(); + + const isFormCaught = this.isFormCaught(); + + if ((this.isCaught() && isFormCaught) || (this.speciesStarterDexEntry?.seenAttr && cursor === 5)) { + ui.showText(this.menuDescriptions[cursor]); + } else { + ui.showText(""); + } + + return ret; + } + + getFriendship(_speciesId: number) { + let currentFriendship = globalScene.gameData.starterData[this.starterId].friendship; + if (!currentFriendship || currentFriendship === undefined) { + currentFriendship = 0; + } + + const friendshipCap = getStarterValueFriendshipCap(speciesStarterCosts[this.starterId]); + + return { currentFriendship, friendshipCap }; + } + + /** + * Determines if a passive upgrade is available for the current species + * @returns true if the user has enough candies and a passive has not been unlocked already + */ + isPassiveAvailable(): boolean { + // Get this species ID's starter data + const starterData = globalScene.gameData.starterData[this.starterId]; + + return ( + starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[this.starterId]) && + !(starterData.passiveAttr & PassiveAttr.UNLOCKED) + ); + } + + /** + * Determines if a value reduction upgrade is available for the current species + * @returns true if the user has enough candies and all value reductions have not been unlocked already + */ + isValueReductionAvailable(): boolean { + // Get this species ID's starter data + const starterData = globalScene.gameData.starterData[this.starterId]; + + return ( + starterData.candyCount >= + getValueReductionCandyCounts(speciesStarterCosts[this.starterId])[starterData.valueReduction] && + starterData.valueReduction < valueReductionMax + ); + } + + /** + * Determines if an same species egg can be bought for the current species + * @returns true if the user has enough candies + */ + isSameSpeciesEggAvailable(): boolean { + // Get this species ID's starter data + const starterData = globalScene.gameData.starterData[this.starterId]; + + return starterData.candyCount >= getSameSpeciesEggCandyCounts(speciesStarterCosts[this.starterId]); + } + + setSpecies() { + const species = this.species; + const starterAttributes: StarterAttributes | null = species ? { ...this.starterAttributes } : null; + + if (!species && globalScene.ui.getTooltip().visible) { + globalScene.ui.hideTooltip(); + } + + if (this.statsMode) { + if (this.isCaught()) { + this.statsContainer.setVisible(true); + this.showStats(); + } else { + this.statsContainer.setVisible(false); + //@ts-ignore + this.statsContainer.updateIvs(null); // TODO: resolve ts-ignore. what. how? huh? + } + } + + if (species && (this.speciesStarterDexEntry?.seenAttr || this.isCaught())) { + this.pokemonNumberText.setText(padInt(species.speciesId, 4)); + + if (this.isCaught()) { + const defaultDexAttr = this.getCurrentDexProps(species.speciesId); + // Set default attributes if for some reason starterAttributes does not exist or attributes missing + const props: StarterAttributes = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr); + if (starterAttributes?.variant && !Number.isNaN(starterAttributes.variant)) { + if (props.shiny) { + props.variant = starterAttributes.variant as Variant; + } + } + props.form = starterAttributes?.form ?? props.form; + props.female = starterAttributes?.female ?? props.female; + + this.setSpeciesDetails(species, { + shiny: props.shiny, + formIndex: props.form, + female: props.female, + variant: props.variant ?? 0, + }); + } else { + this.pokemonGrowthRateText.setText(""); + this.pokemonGrowthRateLabelText.setVisible(false); + this.type1Icon.setVisible(true); + this.type2Icon.setVisible(true); + this.pokemonLuckLabelText.setVisible(false); + this.pokemonLuckText.setVisible(false); + for (const icon of this.pokemonShinyIcons) { + icon.setVisible(false); + } + this.pokemonUncaughtText.setVisible(true); + this.pokemonCaughtHatchedContainer.setVisible(true); + this.pokemonCandyContainer.setVisible(false); + this.pokemonFormText.setVisible(false); + + const defaultDexAttr = globalScene.gameData.getSpeciesDefaultDexAttr(species, true, true); + const props = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr); + + this.setSpeciesDetails(species, { + shiny: props.shiny, + formIndex: props.formIndex, + female: props.female, + variant: props.variant, + }); + this.pokemonSprite.setTint(0x808080); + } + } else { + this.pokemonNumberText.setText(species ? padInt(species.speciesId, 4) : ""); + this.pokemonNameText.setText(species ? "???" : ""); + this.pokemonGrowthRateText.setText(""); + this.pokemonGrowthRateLabelText.setVisible(false); + this.type1Icon.setVisible(false); + this.type2Icon.setVisible(false); + this.pokemonLuckLabelText.setVisible(false); + this.pokemonLuckText.setVisible(false); + for (const icon of this.pokemonShinyIcons) { + icon.setVisible(false); + } + this.pokemonUncaughtText.setVisible(!!species); + this.pokemonCaughtHatchedContainer.setVisible(false); + this.pokemonCandyContainer.setVisible(false); + this.pokemonFormText.setVisible(false); + + this.setSpeciesDetails(species!, { + // TODO: is this bang correct? + shiny: false, + formIndex: 0, + female: false, + variant: 0, + }); + this.pokemonSprite.setTint(0x000000); + } + } + + setSpeciesDetails(species: PokemonSpecies, options: SpeciesDetails = {}, forceUpdate?: boolean): void { + let { shiny, formIndex, female, variant } = options; + const oldProps = species ? this.starterAttributes : null; + + // We will only update the sprite if there is a change to form, shiny/variant + // or gender for species with gender sprite differences + const shouldUpdateSprite = + (species?.genderDiffs && !isNullOrUndefined(female)) || + !isNullOrUndefined(formIndex) || + !isNullOrUndefined(shiny) || + !isNullOrUndefined(variant) || + forceUpdate; + + if (this.activeTooltip === "CANDY") { + if (this.species && this.pokemonCandyContainer.visible) { + const { currentFriendship, friendshipCap } = this.getFriendship(this.species.speciesId); + globalScene.ui.editTooltip("", `${currentFriendship}/${friendshipCap}`); + } else { + globalScene.ui.hideTooltip(); + } + } + + if (species?.forms?.find(f => f.formKey === "female")) { + if (female !== undefined) { + formIndex = female ? 1 : 0; + } else if (formIndex !== undefined) { + female = formIndex === 1; + } + } + + if (species) { + // Only assign shiny, female, and variant if they are undefined + if (shiny === undefined) { + shiny = oldProps?.shiny ?? false; + } + if (female === undefined) { + female = oldProps?.female ?? false; + } + if (variant === undefined) { + variant = oldProps?.variant ?? 0; + } + if (formIndex === undefined) { + formIndex = oldProps?.form ?? 0; + } + } + + this.pokemonSprite.setVisible(false); + + if (this.assetLoadCancelled) { + this.assetLoadCancelled.value = true; + this.assetLoadCancelled = null; + } + + if (species) { + const dexEntry = globalScene.gameData.dexData[species.speciesId]; + + const caughtAttr = this.isCaught(species); + + if (!caughtAttr) { + const props = this.starterAttributes; + + if (shiny === undefined || shiny !== props.shiny) { + shiny = props.shiny; + } + if (formIndex === undefined || formIndex !== props.form) { + formIndex = props.form; + } + if (female === undefined || female !== props.female) { + female = props.female; + } + if (variant === undefined || variant !== props.variant) { + variant = props.variant; + } + } + + const isFormCaught = this.isFormCaught(); + const isFormSeen = dexEntry ? (dexEntry.seenAttr & globalScene.gameData.getFormAttr(formIndex ?? 0)) > 0n : false; + + this.shinyOverlay.setVisible(shiny ?? false); // TODO: is false the correct default? + this.pokemonNumberText.setColor(this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, false)); + this.pokemonNumberText.setShadowColor( + this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, true), + ); + + const assetLoadCancelled = new BooleanHolder(false); + this.assetLoadCancelled = assetLoadCancelled; + + if (shouldUpdateSprite) { + const back = !!this.showBackSprite; + species.loadAssets(female!, formIndex, shiny, variant as Variant, true, back).then(() => { + // TODO: is this bang correct? + if (assetLoadCancelled.value) { + return; + } + this.assetLoadCancelled = null; + this.speciesLoaded.set(species.speciesId, true); + this.pokemonSprite.play(species.getSpriteKey(female!, formIndex, shiny, variant, back)); // TODO: is this bang correct? + this.pokemonSprite.setPipelineData("shiny", shiny); + this.pokemonSprite.setPipelineData("variant", variant); + this.pokemonSprite.setPipelineData( + "spriteKey", + species.getSpriteKey(female!, formIndex, shiny, variant, back), + ); // TODO: is this bang correct? + this.pokemonSprite.setVisible(!this.statsMode); + }); + } else { + this.pokemonSprite.setVisible(!this.statsMode); + } + + const isNonShinyCaught = !!(caughtAttr & DexAttr.NON_SHINY); + const isShinyCaught = !!(caughtAttr & DexAttr.SHINY); + + const caughtVariants = [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter( + v => caughtAttr & v, + ); + this.canCycleShiny = (isNonShinyCaught && isShinyCaught) || (isShinyCaught && caughtVariants.length > 1); + + const isMaleCaught = !!(caughtAttr & DexAttr.MALE); + const isFemaleCaught = !!(caughtAttr & DexAttr.FEMALE); + this.canCycleGender = isMaleCaught && isFemaleCaught; + + // If the dev option for the dex is selected, all forms can be cycled through + this.canCycleForm = globalScene.dexForDevs + ? species.forms.length > 1 + : species.forms.filter(f => f.isStarterSelectable).filter(f => f).length > 1; + + if (caughtAttr && species.malePercent !== null) { + const gender = !female ? Gender.MALE : Gender.FEMALE; + this.pokemonGenderText.setText(getGenderSymbol(gender)); + this.pokemonGenderText.setColor(getGenderColor(gender)); + this.pokemonGenderText.setShadowColor(getGenderColor(gender, true)); + } else { + this.pokemonGenderText.setText(""); + } + + // Setting the name + if (isFormCaught || isFormSeen) { + this.pokemonNameText.setText(species.name); + } else { + this.pokemonNameText.setText(species ? "???" : ""); + } + + // Setting tint of the sprite + if (isFormCaught) { + this.species.loadAssets(female!, formIndex, shiny, variant as Variant, true).then(() => { + const crier = + this.species.forms && this.species.forms.length > 0 + ? this.species.forms[formIndex ?? this.formIndex] + : this.species; + crier.cry(); + }); + this.pokemonSprite.clearTint(); + } else if (isFormSeen) { + this.pokemonSprite.setTint(0x808080); + } else { + this.pokemonSprite.setTint(0); + } + + // Setting luck text and sparks + if (isFormCaught) { + const luck = globalScene.gameData.getDexAttrLuck(this.isCaught()); + this.pokemonLuckText.setVisible(!!luck); + this.pokemonLuckText.setText(luck.toString()); + this.pokemonLuckText.setTint(getVariantTint(Math.min(luck - 1, 2) as Variant)); + this.pokemonLuckLabelText.setVisible(this.pokemonLuckText.visible); + } else { + this.pokemonLuckText.setVisible(false); + this.pokemonLuckLabelText.setVisible(false); + } + + // Setting growth rate text + if (isFormCaught) { + let growthReadable = toReadableString(GrowthRate[species.growthRate]); + const growthAux = growthReadable.replace(" ", "_"); + if (i18next.exists("growth:" + growthAux)) { + growthReadable = i18next.t(("growth:" + growthAux) as any); + } + this.pokemonGrowthRateText.setText(growthReadable); + + this.pokemonGrowthRateText.setColor(getGrowthRateColor(species.growthRate)); + this.pokemonGrowthRateText.setShadowColor(getGrowthRateColor(species.growthRate, true)); + this.pokemonGrowthRateLabelText.setVisible(true); + } else { + this.pokemonGrowthRateText.setText(""); + this.pokemonGrowthRateLabelText.setVisible(false); + } + + // Caught and hatched + if (isFormCaught) { + const colorScheme = starterColors[this.starterId]; + + this.pokemonUncaughtText.setVisible(false); + this.pokemonCaughtCountText.setText(`${this.speciesStarterDexEntry?.caughtCount}`); + if (species.speciesId === Species.MANAPHY || species.speciesId === Species.PHIONE) { + this.pokemonHatchedIcon.setFrame("manaphy"); + } else { + this.pokemonHatchedIcon.setFrame(getEggTierForSpecies(species)); + } + this.pokemonHatchedCountText.setText(`${this.speciesStarterDexEntry?.hatchedCount}`); + + const defaultDexAttr = this.getCurrentDexProps(species.speciesId); + const defaultProps = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr); + + const variant = defaultProps.variant; + for (let v = 0; v < 3; v++) { + const icon = this.pokemonShinyIcons[v]; + if (v < this.availableVariants) { + if (!this.unlockedVariants[v]) { + icon.setTint(0x000000); + } else if (shiny && v === variant) { + const tint = getVariantTint(v as Variant); + icon.setTint(tint); + } else { + icon.setTint(0x808080); + } + icon.setVisible(true); + } else { + icon.setVisible(false); + } + } + + this.pokemonCaughtHatchedContainer.setVisible(true); + this.pokemonCaughtHatchedContainer.setY(25); + this.pokemonCandyIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[0]))); + this.pokemonCandyOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1]))); + this.pokemonCandyCountText.setText( + `x${species.speciesId === Species.PIKACHU ? 0 : globalScene.gameData.starterData[this.starterId].candyCount}`, + ); + this.pokemonCandyContainer.setVisible(true); + + if (pokemonPrevolutions.hasOwnProperty(species.speciesId)) { + this.pokemonHatchedIcon.setVisible(false); + this.pokemonHatchedCountText.setVisible(false); + this.pokemonFormText.setY(36); + } else { + this.pokemonHatchedIcon.setVisible(true); + this.pokemonHatchedCountText.setVisible(true); + this.pokemonFormText.setY(42); + + const { currentFriendship, friendshipCap } = this.getFriendship(this.species.speciesId); + const candyCropY = 16 - 16 * (currentFriendship / friendshipCap); + this.pokemonCandyDarknessOverlay.setCrop(0, 0, 16, candyCropY); + + this.pokemonCandyContainer.on("pointerover", () => { + globalScene.ui.showTooltip("", `${currentFriendship}/${friendshipCap}`, true); + this.activeTooltip = "CANDY"; + }); + this.pokemonCandyContainer.on("pointerout", () => { + globalScene.ui.hideTooltip(); + this.activeTooltip = undefined; + }); + } + } else { + this.pokemonUncaughtText.setVisible(true); + this.pokemonCaughtHatchedContainer.setVisible(false); + this.pokemonCandyContainer.setVisible(false); + for (const icon of this.pokemonShinyIcons) { + icon.setVisible(false); + } + } + + // Setting type icons and form text + if (isFormCaught || isFormSeen) { + const speciesForm = getPokemonSpeciesForm(species.speciesId, formIndex!); // TODO: is the bang correct? + this.setTypeIcons(speciesForm.type1, speciesForm.type2); + // TODO: change this once forms are refactored + if (normalForm.includes(species.speciesId) && !formIndex) { + this.pokemonFormText.setText(""); + } else { + this.pokemonFormText.setText(species.getFormNameToDisplay(formIndex)); + } + this.pokemonFormText.setVisible(true); + if (!isFormCaught) { + this.pokemonFormText.setY(18); + } + } else { + this.setTypeIcons(null, null); + this.pokemonFormText.setText(""); + this.pokemonFormText.setVisible(false); + } + } else { + this.shinyOverlay.setVisible(false); + this.pokemonNumberText.setColor(this.getTextColor(TextStyle.SUMMARY)); + this.pokemonNumberText.setShadowColor(this.getTextColor(TextStyle.SUMMARY, true)); + this.pokemonGenderText.setText(""); + this.setTypeIcons(null, null); + } + + this.updateInstructions(); + } + + setTypeIcons(type1: PokemonType | null, type2: PokemonType | null): void { + if (type1 !== null) { + this.type1Icon.setVisible(true); + this.type1Icon.setFrame(PokemonType[type1].toLowerCase()); + } else { + this.type1Icon.setVisible(false); + } + if (type2 !== null) { + this.type2Icon.setVisible(true); + this.type2Icon.setFrame(PokemonType[type2].toLowerCase()); + } else { + this.type2Icon.setVisible(false); + } + } + + /** + * Creates a temporary dex attr props that will be used to display the correct shiny, variant, and form based on this.starterAttributes + * + * @param speciesId the id of the species to get props for + * @returns the dex props + */ + getCurrentDexProps(speciesId: number): bigint { + let props = 0n; + const species = allSpecies.find(sp => sp.speciesId === speciesId); + const caughtAttr = + globalScene.gameData.dexData[speciesId].caughtAttr & + globalScene.gameData.dexData[this.getStarterSpeciesId(speciesId)].caughtAttr & + (species?.getFullUnlocksData() ?? 0n); + + /* this checks the gender of the pokemon; this works by checking a) that the starter preferences for the species exist, and if so, is it female. If so, it'll add DexAttr.FEMALE to our temp props + * It then checks b) if the caughtAttr for the pokemon is female and NOT male - this means that the ONLY gender we've gotten is female, and we need to add DexAttr.FEMALE to our temp props + * If neither of these pass, we add DexAttr.MALE to our temp props + */ + if (this.starterAttributes?.female || ((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n)) { + props += DexAttr.FEMALE; + } else { + props += DexAttr.MALE; + } + /* This part is very similar to above, but instead of for gender, it checks for shiny within starter preferences. + * If they're not there, it enables shiny state by default if any shiny was caught + */ + if ( + this.starterAttributes?.shiny || + ((caughtAttr & DexAttr.SHINY) > 0n && this.starterAttributes?.shiny !== false) + ) { + props += DexAttr.SHINY; + if (this.starterAttributes?.variant !== undefined) { + props += BigInt(Math.pow(2, this.starterAttributes?.variant)) * DexAttr.DEFAULT_VARIANT; + } else { + /* This calculates the correct variant if there's no starter preferences for it. + * This gets the highest tier variant that you've caught and adds it to the temp props + */ + if ((caughtAttr & DexAttr.VARIANT_3) > 0) { + props += DexAttr.VARIANT_3; + } else if ((caughtAttr & DexAttr.VARIANT_2) > 0) { + props += DexAttr.VARIANT_2; + } else { + props += DexAttr.DEFAULT_VARIANT; + } + } + } else { + props += DexAttr.NON_SHINY; + props += DexAttr.DEFAULT_VARIANT; // we add the default variant here because non shiny versions are listed as default variant + } + if (this.starterAttributes?.form) { + // this checks for the form of the pokemon + props += BigInt(Math.pow(2, this.starterAttributes?.form)) * DexAttr.DEFAULT_FORM; + } else { + // Get the first unlocked form + props += globalScene.gameData.getFormAttr(globalScene.gameData.getFormIndex(caughtAttr)); + } + + return props; + } + + toggleStatsMode(on?: boolean): void { + if (on === undefined) { + on = !this.statsMode; + } + if (on) { + this.showStats(); + this.statsMode = true; + this.pokemonSprite.setVisible(false); + } else { + this.statsMode = false; + this.statsContainer.setVisible(false); + this.pokemonSprite.setVisible(true); + //@ts-ignore + this.statsContainer.updateIvs(null); // TODO: resolve ts-ignore. !?!? + } + } + + showStats(): void { + if (!this.speciesStarterDexEntry) { + return; + } + + this.statsContainer.setVisible(true); + + this.statsContainer.updateIvs(this.speciesStarterDexEntry.ivs); + } + + clearText() { + this.starterSelectMessageBoxContainer.setVisible(false); + super.clearText(); + } + + hideInstructions(): void { + this.candyUpgradeIconElement.setVisible(false); + this.candyUpgradeLabel.setVisible(false); + this.shinyIconElement.setVisible(false); + this.shinyLabel.setVisible(false); + this.formIconElement.setVisible(false); + this.formLabel.setVisible(false); + this.genderIconElement.setVisible(false); + this.genderLabel.setVisible(false); + this.variantIconElement.setVisible(false); + this.variantLabel.setVisible(false); + } + + clear(): void { + super.clear(); + + this.cursor = -1; + this.hideInstructions(); + this.activeTooltip = undefined; + globalScene.ui.hideTooltip(); + + this.starterSelectContainer.setVisible(false); + this.blockInput = false; + + this.showBackSprite = false; + this.showBackSpriteLabel.setText(i18next.t("pokedexUiHandler:showBackSprite")); + + if (this.statsMode) { + this.toggleStatsMode(false); + } + } + + checkIconId( + icon: Phaser.GameObjects.Sprite, + species: PokemonSpecies, + female: boolean, + formIndex: number, + shiny: boolean, + variant: number, + ) { + if (icon.frame.name !== species.getIconId(female, formIndex, shiny, variant)) { + console.log( + `${species.name}'s icon ${icon.frame.name} does not match getIconId with female: ${female}, formIndex: ${formIndex}, shiny: ${shiny}, variant: ${variant}`, + ); + icon.setTexture(species.getIconAtlasKey(formIndex, false, variant)); + icon.setFrame(species.getIconId(female, formIndex, false, variant)); + } + } +} diff --git a/src/ui/pokedex-scan-ui-handler.ts b/src/ui/pokedex-scan-ui-handler.ts new file mode 100644 index 00000000000..b34246b97d1 --- /dev/null +++ b/src/ui/pokedex-scan-ui-handler.ts @@ -0,0 +1,193 @@ +import type { InputFieldConfig } from "./form-modal-ui-handler"; +import { FormModalUiHandler } from "./form-modal-ui-handler"; +import type { ModalConfig } from "./modal-ui-handler"; +import type { PlayerPokemon } from "#app/field/pokemon"; +import type { OptionSelectItem } from "./abstact-option-select-ui-handler"; +import { isNullOrUndefined } from "#app/utils"; +import { Mode } from "./ui"; +import { FilterTextRow } from "./filter-text"; +import { allAbilities } from "#app/data/ability"; +import { allMoves } from "#app/data/moves/move"; +import { allSpecies } from "#app/data/pokemon-species"; +import i18next from "i18next"; + +export default class PokedexScanUiHandler extends FormModalUiHandler { + keys: string[]; + reducedKeys: string[]; + parallelKeys: string[]; + nameKeys: string[]; + moveKeys: string[]; + abilityKeys: string[]; + row: number; + + setup() { + super.setup(); + + this.nameKeys = allSpecies.map(a => a.name).filter((value, index, self) => self.indexOf(value) === index); + this.moveKeys = allMoves.map(a => a.name); + this.abilityKeys = allAbilities.map(a => a.name); + } + + getModalTitle(_config?: ModalConfig): string { + return i18next.t("pokedexUiHandler:scanChooseOption"); + } + + getWidth(_config?: ModalConfig): number { + return 300; + } + + getMargin(_config?: ModalConfig): [number, number, number, number] { + return [0, 0, 48, 0]; + } + + getButtonLabels(_config?: ModalConfig): string[] { + return [i18next.t("pokedexUiHandler:scanSelect"), i18next.t("pokedexUiHandler:scanCancel")]; + } + + getReadableErrorMessage(error: string): string { + const colonIndex = error?.indexOf(":"); + if (colonIndex > 0) { + error = error.slice(0, colonIndex); + } + + return super.getReadableErrorMessage(error); + } + + override getInputFieldConfigs(): InputFieldConfig[] { + switch (this.row) { + case FilterTextRow.NAME: { + return [{ label: i18next.t("pokedexUiHandler:scanLabelName") }]; + } + case FilterTextRow.MOVE_1: + case FilterTextRow.MOVE_2: { + return [{ label: i18next.t("pokedexUiHandler:scanLabelMove") }]; + } + case FilterTextRow.ABILITY_1: { + return [{ label: i18next.t("pokedexUiHandler:scanLabelAbility") }]; + } + case FilterTextRow.ABILITY_2: { + return [{ label: i18next.t("pokedexUiHandler:scanLabelPassive") }]; + } + default: { + return [{ label: "" }]; + } + } + } + + reduceKeys(): void { + switch (this.row) { + case FilterTextRow.NAME: { + this.reducedKeys = this.nameKeys; + break; + } + case FilterTextRow.MOVE_1: + case FilterTextRow.MOVE_2: { + this.reducedKeys = this.moveKeys; + break; + } + case FilterTextRow.ABILITY_1: + case FilterTextRow.ABILITY_2: { + this.reducedKeys = this.abilityKeys; + break; + } + default: { + this.reducedKeys = this.keys; + } + } + } + + // args[2] is an index of FilterTextRow + show(args: any[]): boolean { + this.row = args[2]; + const ui = this.getUi(); + const hasTitle = !!this.getModalTitle(); + this.updateFields(this.getInputFieldConfigs(), hasTitle); + this.updateContainer(args[0] as ModalConfig); + const input = this.inputs[0]; + input.setMaxLength(255); + + this.reduceKeys(); + + setTimeout(() => { + input.setFocus(); // Focus after a short delay to avoid unwanted input + }, 50); + + input.on("keydown", (inputObject, evt: KeyboardEvent) => { + if ( + ["escape", "space"].some(v => v === evt.key.toLowerCase() || v === evt.code.toLowerCase()) && + ui.getMode() === Mode.AUTO_COMPLETE + ) { + // Delete autocomplete list and recovery focus. + inputObject.on("blur", () => inputObject.node.focus(), { once: true }); + ui.revertMode(); + } + }); + + input.on("textchange", (inputObject, evt: InputEvent) => { + // Delete autocomplete. + if (ui.getMode() === Mode.AUTO_COMPLETE) { + ui.revertMode(); + } + + let options: OptionSelectItem[] = []; + const filteredKeys = this.reducedKeys.filter(command => + command.toLowerCase().includes(inputObject.text.toLowerCase()), + ); + if (inputObject.text !== "" && filteredKeys.length > 0) { + options = filteredKeys.slice(0).map(value => { + return { + label: value, + handler: () => { + if (!isNullOrUndefined(evt.data) || evt.inputType?.toLowerCase() === "deletecontentbackward") { + inputObject.setText(value); + } + ui.revertMode(); + return true; + }, + }; + }); + } + + if (options.length > 0) { + const modalOpts = { + options: options, + maxOptions: 5, + modalContainer: this.modalContainer, + }; + ui.setOverlayMode(Mode.AUTO_COMPLETE, modalOpts); + } + }); + + if (super.show(args)) { + const config = args[0] as ModalConfig; + this.inputs[0].resize(1150, 116); + this.inputContainers[0].list[0].width = 200; + if (args[1] && typeof (args[1] as PlayerPokemon).getNameToRender === "function") { + this.inputs[0].text = (args[1] as PlayerPokemon).getNameToRender(); + } else { + this.inputs[0].text = args[1]; + } + this.submitAction = _ => { + if (ui.getMode() === Mode.POKEDEX_SCAN) { + this.sanitizeInputs(); + const outputName = this.reducedKeys.includes(this.inputs[0].text) ? this.inputs[0].text : ""; + const sanitizedName = btoa(unescape(encodeURIComponent(outputName))); + config.buttonActions[0](sanitizedName); + return true; + } + return false; + }; + return true; + } + return false; + } + + clear(): void { + super.clear(); + + // Clearing the labels so they don't appear again and overlap + this.formLabels.forEach(label => { + label.destroy(); + }); + } +} diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts new file mode 100644 index 00000000000..f4cb9f51c16 --- /dev/null +++ b/src/ui/pokedex-ui-handler.ts @@ -0,0 +1,2394 @@ +import type { Variant } from "#app/data/variant"; +import { getVariantTint, getVariantIcon } from "#app/data/variant"; +import { argbFromRgba } from "@material/material-color-utilities"; +import i18next from "i18next"; +import { starterColors } from "#app/battle-scene"; +import { speciesEggMoves } from "#app/data/balance/egg-moves"; +import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves"; +import type { PokemonForm } from "#app/data/pokemon-species"; +import type PokemonSpecies from "#app/data/pokemon-species"; +import { allSpecies, getPokemonSpeciesForm, getPokerusStarters, normalForm } from "#app/data/pokemon-species"; +import { getStarterValueFriendshipCap, speciesStarterCosts, POKERUS_STARTER_COUNT } from "#app/data/balance/starters"; +import { catchableSpecies } from "#app/data/balance/biomes"; +import { PokemonType } from "#enums/pokemon-type"; +import type { DexAttrProps, DexEntry, StarterAttributes, StarterPreferences } from "#app/system/game-data"; +import { AbilityAttr, DexAttr, loadStarterPreferences, saveStarterPreferences } from "#app/system/game-data"; +import MessageUiHandler from "#app/ui/message-ui-handler"; +import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler"; +import { TextStyle, addTextObject } from "#app/ui/text"; +import { Mode } from "#app/ui/ui"; +import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; +import { Passive as PassiveAttr } from "#enums/passive"; +import type { Species } from "#enums/species"; +import { Button } from "#enums/buttons"; +import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#app/ui/dropdown"; +import { PokedexMonContainer } from "#app/ui/pokedex-mon-container"; +import { DropDownColumn, FilterBar } from "#app/ui/filter-bar"; +import { ScrollBar } from "#app/ui/scroll-bar"; +import { Abilities } from "#enums/abilities"; +import { + getPassiveCandyCount, + getValueReductionCandyCounts, + getSameSpeciesEggCandyCounts, +} from "#app/data/balance/starters"; +import { BooleanHolder, fixedInt, getLocalizedSpriteKey, padInt, randIntRange, rgbHexToRgba } from "#app/utils"; +import type { Nature } from "#enums/nature"; +import { addWindow } from "./ui-theme"; +import type { OptionSelectConfig } from "./abstact-option-select-ui-handler"; +import { FilterText, FilterTextRow } from "./filter-text"; +import { allAbilities } from "#app/data/ability"; +import type { PassiveAbilities } from "#app/data/balance/passives"; +import { starterPassiveAbilities } from "#app/data/balance/passives"; +import { allMoves } from "#app/data/moves/move"; +import { speciesTmMoves } from "#app/data/balance/tms"; +import { pokemonStarters } from "#app/data/balance/pokemon-evolutions"; +import { Biome } from "#enums/biome"; +import { globalScene } from "#app/global-scene"; + +interface LanguageSetting { + starterInfoTextSize: string; + instructionTextSize: string; + starterInfoXPos?: number; + starterInfoYOffset?: number; +} + +const languageSettings: { [key: string]: LanguageSetting } = { + en: { + starterInfoTextSize: "56px", + instructionTextSize: "38px", + }, + de: { + starterInfoTextSize: "48px", + instructionTextSize: "35px", + starterInfoXPos: 33, + }, + "es-ES": { + starterInfoTextSize: "56px", + instructionTextSize: "35px", + }, + fr: { + starterInfoTextSize: "54px", + instructionTextSize: "38px", + }, + it: { + starterInfoTextSize: "56px", + instructionTextSize: "38px", + }, + pt_BR: { + starterInfoTextSize: "47px", + instructionTextSize: "38px", + starterInfoXPos: 33, + }, + zh: { + starterInfoTextSize: "47px", + instructionTextSize: "38px", + starterInfoYOffset: 1, + starterInfoXPos: 24, + }, + pt: { + starterInfoTextSize: "48px", + instructionTextSize: "42px", + starterInfoXPos: 33, + }, + ko: { + starterInfoTextSize: "52px", + instructionTextSize: "38px", + }, + ja: { + starterInfoTextSize: "51px", + instructionTextSize: "38px", + }, + "ca-ES": { + starterInfoTextSize: "56px", + instructionTextSize: "38px", + }, +}; + +enum FilterTextOptions { + NAME, + MOVE_1, + MOVE_2, + ABILITY_1, + ABILITY_2, +} + +interface ContainerData { + species: PokemonSpecies; + cost: number; + props: DexAttrProps; + eggMove1?: boolean; + eggMove2?: boolean; + tmMove1?: boolean; + tmMove2?: boolean; + passive1?: boolean; + passive2?: boolean; +} + +const valueReductionMax = 2; + +// Position of UI elements +const filterBarHeight = 17; +const speciesContainerX = 143; + +/** + * Calculates the starter position for a Pokemon of a given UI index + * @param index UI index to calculate the starter position of + * @returns An interface with an x and y property + */ +function calcStarterPosition(index: number): { x: number; y: number } { + const yOffset = 13; + const height = 17; + const x = (index % 9) * 18; + const y = yOffset + Math.floor(index / 9) * height; + + return { x: x, y: y }; +} + +interface SpeciesDetails { + shiny?: boolean; + formIndex?: number; + female?: boolean; + variant?: Variant; + abilityIndex?: number; + natureIndex?: number; +} + +export default class PokedexUiHandler extends MessageUiHandler { + private starterSelectContainer: Phaser.GameObjects.Container; + private starterSelectScrollBar: ScrollBar; + private filterBarContainer: Phaser.GameObjects.Container; + private filterBar: FilterBar; + private pokemonContainers: PokedexMonContainer[] = []; + private filteredPokemonData: ContainerData[] = []; + private pokemonNumberText: Phaser.GameObjects.Text; + private pokemonSprite: Phaser.GameObjects.Sprite; + private pokemonNameText: Phaser.GameObjects.Text; + private pokemonFormText: Phaser.GameObjects.Text; + private type1Icon: Phaser.GameObjects.Sprite; + private type2Icon: Phaser.GameObjects.Sprite; + + private starterSelectMessageBox: Phaser.GameObjects.NineSlice; + private starterSelectMessageBoxContainer: Phaser.GameObjects.Container; + + private filterMode: boolean; + private filterBarCursor = 0; + private scrollCursor: number; + private oldCursor = -1; + + private allSpecies: PokemonSpecies[] = []; + private lastSpecies: PokemonSpecies; + private speciesLoaded: Map = new Map(); + private pokerusSpecies: PokemonSpecies[] = []; + private speciesStarterDexEntry: DexEntry | null; + + private assetLoadCancelled: BooleanHolder | null; + public cursorObj: Phaser.GameObjects.Image; + private pokerusCursorObjs: Phaser.GameObjects.Image[]; + + private iconAnimHandler: PokemonIconAnimHandler; + + private starterPreferences: StarterPreferences; + + protected blockInput = false; + + // for text filters + private readonly textPadding = 8; + private readonly defaultMessageBoxWidth = 220; + private readonly defaultWordWrapWidth = 1224; + private menuMessageBoxContainer: Phaser.GameObjects.Container; + private menuMessageBox: Phaser.GameObjects.NineSlice; + private dialogueMessageBox: Phaser.GameObjects.NineSlice; + protected manageDataConfig: OptionSelectConfig; + private filterTextOptions: FilterTextOptions[]; + protected optionSelectText: Phaser.GameObjects.Text; + protected scale = 0.1666666667; + private menuBg: Phaser.GameObjects.NineSlice; + + private filterTextContainer: Phaser.GameObjects.Container; + private filterText: FilterText; + private filterTextMode: boolean; + private filterTextCursor = 0; + + private showDecorations = false; + private goFilterIconElement1: Phaser.GameObjects.Sprite; + private goFilterIconElement2: Phaser.GameObjects.Sprite; + private goFilterLabel: Phaser.GameObjects.Text; + private toggleDecorationsIconElement: Phaser.GameObjects.Sprite; + private toggleDecorationsLabel: Phaser.GameObjects.Text; + + private formTrayContainer: Phaser.GameObjects.Container; + private trayBg: Phaser.GameObjects.NineSlice; + private trayForms: PokemonForm[]; + private trayContainers: PokedexMonContainer[] = []; + private trayNumIcons: number; + private trayRows: number; + private trayColumns: number; + private trayCursorObj: Phaser.GameObjects.Image; + private trayCursor = 0; + private showingTray = false; + private showFormTrayIconElement: Phaser.GameObjects.Sprite; + private showFormTrayLabel: Phaser.GameObjects.Text; + private canShowFormTray: boolean; + private filteredIndices: Species[]; + + constructor() { + super(Mode.POKEDEX); + } + + setup() { + const ui = this.getUi(); + const currentLanguage = i18next.resolvedLanguage ?? "en"; + const langSettingKey = Object.keys(languageSettings).find(lang => currentLanguage.includes(lang)) ?? "en"; + const textSettings = languageSettings[langSettingKey]; + + this.starterSelectContainer = globalScene.add.container(0, -globalScene.game.canvas.height / 6); + this.starterSelectContainer.setVisible(false); + ui.add(this.starterSelectContainer); + + const bgColor = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6, + 0x006860, + ); + bgColor.setOrigin(0, 0); + this.starterSelectContainer.add(bgColor); + + const pokemonContainerWindow = addWindow(speciesContainerX, filterBarHeight + 1, 175, 161); + const pokemonContainerBg = globalScene.add.image( + speciesContainerX + 1, + filterBarHeight + 2, + "starter_container_bg", + ); + pokemonContainerBg.setOrigin(0, 0); + this.starterSelectContainer.add(pokemonContainerBg); + this.starterSelectContainer.add(pokemonContainerWindow); + + // Create and initialise filter text fields + this.filterTextContainer = globalScene.add.container(0, 0); + this.filterText = new FilterText(1, filterBarHeight + 2, 140, 100, this.updateStarters); + + this.filterText.addFilter(FilterTextRow.NAME, i18next.t("filterText:nameField")); + this.filterText.addFilter(FilterTextRow.MOVE_1, i18next.t("filterText:move1Field")); + this.filterText.addFilter(FilterTextRow.MOVE_2, i18next.t("filterText:move2Field")); + this.filterText.addFilter(FilterTextRow.ABILITY_1, i18next.t("filterText:ability1Field")); + this.filterText.addFilter(FilterTextRow.ABILITY_2, i18next.t("filterText:ability2Field")); + + this.filterTextContainer.add(this.filterText); + this.starterSelectContainer.add(this.filterTextContainer); + + // Create and initialise filter bar + this.filterBarContainer = globalScene.add.container(0, 0); + this.filterBar = new FilterBar(speciesContainerX, 1, 175, filterBarHeight, 2, 0, 6); + + // gen filter + const genOptions: DropDownOption[] = [ + new DropDownOption(1, new DropDownLabel(i18next.t("pokedexUiHandler:gen1"))), + new DropDownOption(2, new DropDownLabel(i18next.t("pokedexUiHandler:gen2"))), + new DropDownOption(3, new DropDownLabel(i18next.t("pokedexUiHandler:gen3"))), + new DropDownOption(4, new DropDownLabel(i18next.t("pokedexUiHandler:gen4"))), + new DropDownOption(5, new DropDownLabel(i18next.t("pokedexUiHandler:gen5"))), + new DropDownOption(6, new DropDownLabel(i18next.t("pokedexUiHandler:gen6"))), + new DropDownOption(7, new DropDownLabel(i18next.t("pokedexUiHandler:gen7"))), + new DropDownOption(8, new DropDownLabel(i18next.t("pokedexUiHandler:gen8"))), + new DropDownOption(9, new DropDownLabel(i18next.t("pokedexUiHandler:gen9"))), + ]; + const genDropDown: DropDown = new DropDown(0, 0, genOptions, this.updateStarters, DropDownType.HYBRID); + this.filterBar.addFilter(DropDownColumn.GEN, i18next.t("filterBar:genFilter"), genDropDown); + + // type filter + const typeKeys = Object.keys(PokemonType).filter(v => Number.isNaN(Number(v))); + const typeOptions: DropDownOption[] = []; + typeKeys.forEach((type, index) => { + if (index === 0 || index === 19) { + return; + } + const typeSprite = globalScene.add.sprite(0, 0, getLocalizedSpriteKey("types")); + typeSprite.setScale(0.5); + typeSprite.setFrame(type.toLowerCase()); + typeOptions.push(new DropDownOption(index, new DropDownLabel("", typeSprite))); + }); + this.filterBar.addFilter( + DropDownColumn.TYPES, + i18next.t("filterBar:typeFilter"), + new DropDown(0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5), + ); + + // biome filter, making an entry in the dropdown for each biome + const biomeOptions = Object.values(Biome) + .filter(value => typeof value === "number") // Filter numeric values from the enum + .map( + (biomeValue, index) => + new DropDownOption(index, new DropDownLabel(i18next.t(`biome:${Biome[biomeValue].toUpperCase()}`))), + ); + biomeOptions.push(new DropDownOption(biomeOptions.length, new DropDownLabel(i18next.t("filterBar:uncatchable")))); + const biomeDropDown: DropDown = new DropDown(0, 0, biomeOptions, this.updateStarters, DropDownType.HYBRID); + this.filterBar.addFilter(DropDownColumn.BIOME, i18next.t("filterBar:biomeFilter"), biomeDropDown); + + // caught filter + const shiny1Sprite = globalScene.add.sprite(0, 0, "shiny_icons"); + shiny1Sprite.setOrigin(0.15, 0.2); + shiny1Sprite.setScale(0.6); + shiny1Sprite.setFrame(getVariantIcon(0)); + shiny1Sprite.setTint(getVariantTint(0)); + const shiny2Sprite = globalScene.add.sprite(0, 0, "shiny_icons"); + shiny2Sprite.setOrigin(0.15, 0.2); + shiny2Sprite.setScale(0.6); + shiny2Sprite.setFrame(getVariantIcon(1)); + shiny2Sprite.setTint(getVariantTint(1)); + const shiny3Sprite = globalScene.add.sprite(0, 0, "shiny_icons"); + shiny3Sprite.setOrigin(0.15, 0.2); + shiny3Sprite.setScale(0.6); + shiny3Sprite.setFrame(getVariantIcon(2)); + shiny3Sprite.setTint(getVariantTint(2)); + + const caughtOptions = [ + new DropDownOption("SHINY3", new DropDownLabel("", shiny3Sprite)), + new DropDownOption("SHINY2", new DropDownLabel("", shiny2Sprite)), + new DropDownOption("SHINY", new DropDownLabel("", shiny1Sprite)), + new DropDownOption("NORMAL", new DropDownLabel(i18next.t("filterBar:normal"))), + new DropDownOption("UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught"))), + ]; + + this.filterBar.addFilter( + DropDownColumn.CAUGHT, + i18next.t("filterBar:caughtFilter"), + new DropDown(0, 0, caughtOptions, this.updateStarters, DropDownType.HYBRID), + ); + + // unlocks filter + const passiveLabels = [ + new DropDownLabel(i18next.t("filterBar:passive"), undefined, DropDownState.OFF), + new DropDownLabel(i18next.t("filterBar:passiveUnlocked"), undefined, DropDownState.ON), + new DropDownLabel(i18next.t("filterBar:passiveUnlockable"), undefined, DropDownState.UNLOCKABLE), + new DropDownLabel(i18next.t("filterBar:passiveLocked"), undefined, DropDownState.EXCLUDE), + ]; + + const costReductionLabels = [ + new DropDownLabel(i18next.t("filterBar:costReduction"), undefined, DropDownState.OFF), + new DropDownLabel(i18next.t("filterBar:costReductionUnlocked"), undefined, DropDownState.ON), + new DropDownLabel(i18next.t("filterBar:costReductionUnlockedOne"), undefined, DropDownState.ONE), + new DropDownLabel(i18next.t("filterBar:costReductionUnlockedTwo"), undefined, DropDownState.TWO), + new DropDownLabel(i18next.t("filterBar:costReductionUnlockable"), undefined, DropDownState.UNLOCKABLE), + new DropDownLabel(i18next.t("filterBar:costReductionLocked"), undefined, DropDownState.EXCLUDE), + ]; + + const unlocksOptions = [ + new DropDownOption("PASSIVE", passiveLabels), + new DropDownOption("COST_REDUCTION", costReductionLabels), + ]; + + this.filterBar.addFilter( + DropDownColumn.UNLOCKS, + i18next.t("filterBar:unlocksFilter"), + new DropDown(0, 0, unlocksOptions, this.updateStarters, DropDownType.RADIAL), + ); + + // misc filter + const starters = [ + new DropDownLabel(i18next.t("filterBar:starter"), undefined, DropDownState.OFF), + new DropDownLabel(i18next.t("filterBar:isStarter"), undefined, DropDownState.ON), + new DropDownLabel(i18next.t("filterBar:notStarter"), undefined, DropDownState.EXCLUDE), + ]; + const favoriteLabels = [ + new DropDownLabel(i18next.t("filterBar:favorite"), undefined, DropDownState.OFF), + new DropDownLabel(i18next.t("filterBar:isFavorite"), undefined, DropDownState.ON), + new DropDownLabel(i18next.t("filterBar:notFavorite"), undefined, DropDownState.EXCLUDE), + ]; + const winLabels = [ + new DropDownLabel(i18next.t("filterBar:ribbon"), undefined, DropDownState.OFF), + new DropDownLabel(i18next.t("filterBar:hasWon"), undefined, DropDownState.ON), + new DropDownLabel(i18next.t("filterBar:hasNotWon"), undefined, DropDownState.EXCLUDE), + ]; + const hiddenAbilityLabels = [ + new DropDownLabel(i18next.t("filterBar:hiddenAbility"), undefined, DropDownState.OFF), + new DropDownLabel(i18next.t("filterBar:hasHiddenAbility"), undefined, DropDownState.ON), + new DropDownLabel(i18next.t("filterBar:noHiddenAbility"), undefined, DropDownState.EXCLUDE), + ]; + const eggLabels = [ + new DropDownLabel(i18next.t("filterBar:egg"), undefined, DropDownState.OFF), + new DropDownLabel(i18next.t("filterBar:eggPurchasable"), undefined, DropDownState.ON), + ]; + const pokerusLabels = [ + new DropDownLabel(i18next.t("filterBar:pokerus"), undefined, DropDownState.OFF), + new DropDownLabel(i18next.t("filterBar:hasPokerus"), undefined, DropDownState.ON), + ]; + const miscOptions = [ + new DropDownOption("STARTER", starters), + new DropDownOption("FAVORITE", favoriteLabels), + new DropDownOption("WIN", winLabels), + new DropDownOption("HIDDEN_ABILITY", hiddenAbilityLabels), + new DropDownOption("EGG", eggLabels), + new DropDownOption("POKERUS", pokerusLabels), + ]; + this.filterBar.addFilter( + DropDownColumn.MISC, + i18next.t("filterBar:miscFilter"), + new DropDown(0, 0, miscOptions, this.updateStarters, DropDownType.RADIAL), + ); + + // sort filter + const sortOptions = [ + new DropDownOption( + SortCriteria.NUMBER, + new DropDownLabel(i18next.t("filterBar:sortByNumber"), undefined, DropDownState.ON), + ), + new DropDownOption(SortCriteria.COST, new DropDownLabel(i18next.t("filterBar:sortByCost"))), + new DropDownOption(SortCriteria.CANDY, new DropDownLabel(i18next.t("filterBar:sortByCandies"))), + new DropDownOption(SortCriteria.IV, new DropDownLabel(i18next.t("filterBar:sortByIVs"))), + new DropDownOption(SortCriteria.NAME, new DropDownLabel(i18next.t("filterBar:sortByName"))), + new DropDownOption(SortCriteria.CAUGHT, new DropDownLabel(i18next.t("filterBar:sortByNumCaught"))), + new DropDownOption(SortCriteria.HATCHED, new DropDownLabel(i18next.t("filterBar:sortByNumHatched"))), + ]; + this.filterBar.addFilter( + DropDownColumn.SORT, + i18next.t("filterBar:sortFilter"), + new DropDown(0, 0, sortOptions, this.updateStarters, DropDownType.SINGLE), + ); + this.filterBarContainer.add(this.filterBar); + + this.starterSelectContainer.add(this.filterBarContainer); + + // Offset the generation filter dropdown to avoid covering the filtered pokemon + this.filterBar.offsetHybridFilters(); + + if (!globalScene.uiTheme) { + pokemonContainerWindow.setVisible(false); + } + + this.iconAnimHandler = new PokemonIconAnimHandler(); + this.iconAnimHandler.setup(); + + this.pokemonNumberText = addTextObject(6, 141, "", TextStyle.SUMMARY); + this.pokemonNumberText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonNumberText); + + this.pokemonNameText = addTextObject(6, 128, "", TextStyle.SUMMARY); + this.pokemonNameText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonNameText); + + this.pokemonFormText = addTextObject(6, 121, "", TextStyle.PARTY, { + fontSize: textSettings.instructionTextSize, + }); + this.pokemonFormText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonFormText); + + const starterBoxContainer = globalScene.add.container(speciesContainerX + 6, 9); //115 + + this.starterSelectScrollBar = new ScrollBar(161, 12, 5, pokemonContainerWindow.height - 6, 9); + + starterBoxContainer.add(this.starterSelectScrollBar); + + this.pokerusCursorObjs = new Array(POKERUS_STARTER_COUNT).fill(null).map(() => { + const cursorObj = globalScene.add.image(0, 0, "select_cursor_pokerus"); + cursorObj.setVisible(false); + cursorObj.setOrigin(0, 0); + starterBoxContainer.add(cursorObj); + return cursorObj; + }); + + this.cursorObj = globalScene.add.image(0, 0, "select_cursor"); + this.cursorObj.setOrigin(0, 0); + starterBoxContainer.add(this.cursorObj); + + for (const species of allSpecies) { + this.speciesLoaded.set(species.speciesId, false); + this.allSpecies.push(species); + } + + // Here code to declare 81 containers + for (let i = 0; i < 81; i++) { + const pokemonContainer = new PokedexMonContainer(this.allSpecies[i]).setVisible(false); + const pos = calcStarterPosition(i); + pokemonContainer.setPosition(pos.x, pos.y); + this.iconAnimHandler.addOrUpdate(pokemonContainer.icon, PokemonIconAnimMode.NONE); + this.pokemonContainers.push(pokemonContainer); + starterBoxContainer.add(pokemonContainer); + } + + // Tray to display forms + this.formTrayContainer = globalScene.add.container(0, 0); + + this.trayBg = addWindow(0, 0, 0, 0); + this.trayBg.setOrigin(0, 0); + this.formTrayContainer.add(this.trayBg); + + this.trayCursorObj = globalScene.add.image(0, 0, "select_cursor"); + this.trayCursorObj.setOrigin(0, 0); + this.formTrayContainer.add(this.trayCursorObj); + starterBoxContainer.add(this.formTrayContainer); + starterBoxContainer.bringToTop(this.formTrayContainer); + this.formTrayContainer.setVisible(false); + + this.starterSelectContainer.add(starterBoxContainer); + + this.pokemonSprite = globalScene.add.sprite(96, 143, "pkmn__sub"); + this.pokemonSprite.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + }); + this.starterSelectContainer.add(this.pokemonSprite); + + this.type1Icon = globalScene.add.sprite(10, 158, getLocalizedSpriteKey("types")); + this.type1Icon.setScale(0.5); + this.type1Icon.setOrigin(0, 0); + this.starterSelectContainer.add(this.type1Icon); + + this.type2Icon = globalScene.add.sprite(28, 158, getLocalizedSpriteKey("types")); + this.type2Icon.setScale(0.5); + this.type2Icon.setOrigin(0, 0); + this.starterSelectContainer.add(this.type2Icon); + + this.starterSelectMessageBoxContainer = globalScene.add.container(0, globalScene.game.canvas.height / 6); + this.starterSelectMessageBoxContainer.setVisible(false); + this.starterSelectContainer.add(this.starterSelectMessageBoxContainer); + + this.starterSelectMessageBox = addWindow(1, -1, 318, 28); + this.starterSelectMessageBox.setOrigin(0, 1); + this.starterSelectMessageBoxContainer.add(this.starterSelectMessageBox); + + // Instruction for "C" button to toggle showDecorations + const instructionTextSize = textSettings.instructionTextSize; + + this.goFilterIconElement1 = new Phaser.GameObjects.Sprite(globalScene, 10, 2, "keyboard", "C.png"); + this.goFilterIconElement1.setName("sprite-goFilter1-icon-element"); + this.goFilterIconElement1.setScale(0.675); + this.goFilterIconElement1.setOrigin(0.0, 0.0); + this.goFilterIconElement2 = new Phaser.GameObjects.Sprite(globalScene, 20, 2, "keyboard", "V.png"); + this.goFilterIconElement2.setName("sprite-goFilter2-icon-element"); + this.goFilterIconElement2.setScale(0.675); + this.goFilterIconElement2.setOrigin(0.0, 0.0); + this.goFilterLabel = addTextObject(30, 2, i18next.t("pokedexUiHandler:goFilters"), TextStyle.PARTY, { + fontSize: instructionTextSize, + }); + this.goFilterLabel.setName("text-goFilter-label"); + this.starterSelectContainer.add(this.goFilterIconElement1); + this.starterSelectContainer.add(this.goFilterIconElement2); + this.starterSelectContainer.add(this.goFilterLabel); + + this.toggleDecorationsIconElement = new Phaser.GameObjects.Sprite(globalScene, 10, 10, "keyboard", "R.png"); + this.toggleDecorationsIconElement.setName("sprite-toggleDecorations-icon-element"); + this.toggleDecorationsIconElement.setScale(0.675); + this.toggleDecorationsIconElement.setOrigin(0.0, 0.0); + this.toggleDecorationsLabel = addTextObject( + 20, + 10, + i18next.t("pokedexUiHandler:toggleDecorations"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); + this.toggleDecorationsLabel.setName("text-toggleDecorations-label"); + this.starterSelectContainer.add(this.toggleDecorationsIconElement); + this.starterSelectContainer.add(this.toggleDecorationsLabel); + + this.showFormTrayIconElement = new Phaser.GameObjects.Sprite(globalScene, 6, 168, "keyboard", "F.png"); + this.showFormTrayIconElement.setName("sprite-showFormTray-icon-element"); + this.showFormTrayIconElement.setScale(0.675); + this.showFormTrayIconElement.setOrigin(0.0, 0.0); + this.showFormTrayLabel = addTextObject(16, 168, i18next.t("pokedexUiHandler:showForms"), TextStyle.PARTY, { + fontSize: instructionTextSize, + }); + this.showFormTrayLabel.setName("text-showFormTray-label"); + this.showFormTrayIconElement.setVisible(false); + this.showFormTrayLabel.setVisible(false); + this.starterSelectContainer.add(this.showFormTrayIconElement); + this.starterSelectContainer.add(this.showFormTrayLabel); + + this.message = addTextObject(8, 8, "", TextStyle.WINDOW, { maxLines: 2 }); + this.message.setOrigin(0, 0); + this.starterSelectMessageBoxContainer.add(this.message); + + // arrow icon for the message box + this.initPromptSprite(this.starterSelectMessageBoxContainer); + + // Filter bar sits above everything, except the tutorial overlay and message box + this.starterSelectContainer.bringToTop(this.filterBarContainer); + this.initTutorialOverlay(this.starterSelectContainer); + this.starterSelectContainer.bringToTop(this.starterSelectMessageBoxContainer); + this.starterSelectContainer.bringToTop(this.pokemonNameText); + this.starterSelectContainer.bringToTop(this.pokemonFormText); + } + + show(args: any[]): boolean { + if (!this.starterPreferences) { + this.starterPreferences = loadStarterPreferences(); + } + + this.pokerusSpecies = getPokerusStarters(); + + // When calling with "refresh", we do not reset the cursor and filters + if (args.length >= 1 && args[0] === "refresh") { + return false; + } + + super.show(args); + + this.starterSelectContainer.setVisible(true); + + this.getUi().bringToTop(this.starterSelectContainer); + + this.pokemonContainers.forEach(container => { + const icon = container.icon; + const species = container.species; + + this.starterPreferences[species.speciesId] = this.initStarterPrefs(species); + + this.setUpgradeAnimation(icon, species); + }); + + this.resetFilters(); + this.updateStarters(); + + this.setFilterMode(false); + this.filterBarCursor = 0; + this.setFilterTextMode(false); + this.filterTextCursor = 0; + this.setCursor(0); + + this.filterTextContainer.setVisible(true); + + return true; + } + + /** + * Get the starter attributes for the given PokemonSpecies, after sanitizing them. + * If somehow a preference is set for a form, variant, gender, ability or nature + * that wasn't actually unlocked or is invalid it will be cleared here + * + * @param species The species to get Starter Preferences for + * @returns StarterAttributes for the species + */ + initStarterPrefs(species: PokemonSpecies): StarterAttributes { + const starterAttributes = this.starterPreferences[species.speciesId]; + const dexEntry = globalScene.gameData.dexData[species.speciesId]; + const starterData = globalScene.gameData.starterData[species.speciesId]; + + // no preferences or Pokemon wasn't caught, return empty attribute + if (!starterAttributes || !dexEntry.caughtAttr) { + return {}; + } + + const caughtAttr = dexEntry.caughtAttr & species.getFullUnlocksData(); + + const hasShiny = caughtAttr & DexAttr.SHINY; + const hasNonShiny = caughtAttr & DexAttr.NON_SHINY; + if (starterAttributes.shiny && !hasShiny) { + // shiny form wasn't unlocked, purging shiny and variant setting + + starterAttributes.shiny = undefined; + starterAttributes.variant = undefined; + } else if (starterAttributes.shiny === false && !hasNonShiny) { + // non shiny form wasn't unlocked, purging shiny setting + starterAttributes.shiny = undefined; + } + + if (starterAttributes.variant !== undefined) { + const unlockedVariants = [ + hasShiny && caughtAttr & DexAttr.DEFAULT_VARIANT, + hasShiny && caughtAttr & DexAttr.VARIANT_2, + hasShiny && caughtAttr & DexAttr.VARIANT_3, + ]; + if ( + Number.isNaN(starterAttributes.variant) || + starterAttributes.variant < 0 || + !unlockedVariants[starterAttributes.variant] + ) { + // variant value is invalid or requested variant wasn't unlocked, purging setting + starterAttributes.variant = undefined; + } + } + + if (starterAttributes.female !== undefined) { + if (!(starterAttributes.female ? caughtAttr & DexAttr.FEMALE : caughtAttr & DexAttr.MALE)) { + // requested gender wasn't unlocked, purging setting + starterAttributes.female = undefined; + } + } + + if (starterAttributes.ability !== undefined) { + const speciesHasSingleAbility = species.ability2 === species.ability1; + const abilityAttr = starterData.abilityAttr; + const hasAbility1 = abilityAttr & AbilityAttr.ABILITY_1; + const hasAbility2 = abilityAttr & AbilityAttr.ABILITY_2; + const hasHiddenAbility = abilityAttr & AbilityAttr.ABILITY_HIDDEN; + // Due to a past bug it is possible that some Pokemon with a single ability have the ability2 flag + // In this case, we only count ability2 as valid if ability1 was not unlocked, otherwise we ignore it + const unlockedAbilities = [ + hasAbility1, + speciesHasSingleAbility ? hasAbility2 && !hasAbility1 : hasAbility2, + hasHiddenAbility, + ]; + if (!unlockedAbilities[starterAttributes.ability]) { + // requested ability wasn't unlocked, purging setting + starterAttributes.ability = undefined; + } + } + + const selectedForm = starterAttributes.form; + if ( + selectedForm !== undefined && + (!species.forms[selectedForm]?.isStarterSelectable || + !(caughtAttr & globalScene.gameData.getFormAttr(selectedForm))) + ) { + // requested form wasn't unlocked/isn't a starter form, purging setting + starterAttributes.form = undefined; + } + + if (starterAttributes.nature !== undefined) { + const unlockedNatures = globalScene.gameData.getNaturesForAttr(dexEntry.natureAttr); + if (unlockedNatures.indexOf(starterAttributes.nature as unknown as Nature) < 0) { + // requested nature wasn't unlocked, purging setting + starterAttributes.nature = undefined; + } + } + + return starterAttributes; + } + + /** + * Set the selections for all filters to their default starting value + */ + resetFilters(): void { + this.filterBar.setValsToDefault(); + this.filterText.setValsToDefault(); + } + + showText( + text: string, + delay?: number, + callback?: Function, + callbackDelay?: number, + prompt?: boolean, + promptDelay?: number, + moveToTop?: boolean, + ) { + super.showText(text, delay, callback, callbackDelay, prompt, promptDelay); + + const singleLine = text?.indexOf("\n") === -1; + + this.starterSelectMessageBox.setSize(318, singleLine ? 28 : 42); + + if (moveToTop) { + this.starterSelectMessageBox.setOrigin(0, 0); + this.starterSelectMessageBoxContainer.setY(0); + this.message.setY(4); + } else { + this.starterSelectMessageBoxContainer.setY(globalScene.game.canvas.height / 6); + this.starterSelectMessageBox.setOrigin(0, 1); + this.message.setY(singleLine ? -22 : -37); + } + + this.starterSelectMessageBoxContainer.setVisible(!!text?.length); + } + + /** + * Determines if 'Icon' based upgrade notifications should be shown + * @returns true if upgrade notifications are enabled and set to display an 'Icon' + */ + isUpgradeIconEnabled(): boolean { + return globalScene.candyUpgradeNotification !== 0 && globalScene.candyUpgradeDisplay === 0; + } + /** + * Determines if 'Animation' based upgrade notifications should be shown + * @returns true if upgrade notifications are enabled and set to display an 'Animation' + */ + isUpgradeAnimationEnabled(): boolean { + return globalScene.candyUpgradeNotification !== 0 && globalScene.candyUpgradeDisplay === 1; + } + + getStarterSpeciesId(speciesId): number { + if (speciesStarterCosts.hasOwnProperty(speciesId)) { + return speciesId; + } + return pokemonStarters[speciesId]; + } + + /** + * Determines if a passive upgrade is available for the given species ID + * @param speciesId The ID of the species to check the passive of + * @returns true if the user has enough candies and a passive has not been unlocked already + */ + isPassiveAvailable(speciesId: number): boolean { + // Get this species ID's starter data + const starterData = globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)]; + + return ( + starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[this.getStarterSpeciesId(speciesId)]) && + !(starterData.passiveAttr & PassiveAttr.UNLOCKED) + ); + } + + /** + * Determines if a value reduction upgrade is available for the given species ID + * @param speciesId The ID of the species to check the value reduction of + * @returns true if the user has enough candies and all value reductions have not been unlocked already + */ + isValueReductionAvailable(speciesId: number): boolean { + // Get this species ID's starter data + const starterData = globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)]; + + return ( + starterData.candyCount >= + getValueReductionCandyCounts(speciesStarterCosts[this.getStarterSpeciesId(speciesId)])[ + starterData.valueReduction + ] && starterData.valueReduction < valueReductionMax + ); + } + + /** + * Determines if an same species egg can be bought for the given species ID + * @param speciesId The ID of the species to check the value reduction of + * @returns true if the user has enough candies + */ + isSameSpeciesEggAvailable(speciesId: number): boolean { + // Get this species ID's starter data + const starterData = globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)]; + + return ( + starterData.candyCount >= getSameSpeciesEggCandyCounts(speciesStarterCosts[this.getStarterSpeciesId(speciesId)]) + ); + } + + /** + * Sets a bounce animation if enabled and the Pokemon has an upgrade + * @param icon {@linkcode Phaser.GameObjects.GameObject} to animate + * @param species {@linkcode PokemonSpecies} of the icon used to check for upgrades + * @param startPaused Should this animation be paused after it is added? + */ + setUpgradeAnimation(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, startPaused = false): void { + globalScene.tweens.killTweensOf(icon); + // Skip animations if they are disabled + if (globalScene.candyUpgradeDisplay === 0 || species.speciesId !== species.getRootSpeciesId(false)) { + return; + } + + icon.y = 2; + + const tweenChain: Phaser.Types.Tweens.TweenChainBuilderConfig = { + targets: icon, + loop: -1, + // Make the initial bounce a little randomly delayed + delay: randIntRange(0, 50) * 5, + loopDelay: 1000, + tweens: [ + { + targets: icon, + y: 2 - 5, + duration: fixedInt(125), + ease: "Cubic.easeOut", + yoyo: true, + }, + { + targets: icon, + y: 2 - 3, + duration: fixedInt(150), + ease: "Cubic.easeOut", + yoyo: true, + }, + ], + }; + + const isPassiveAvailable = this.isPassiveAvailable(species.speciesId); + const isValueReductionAvailable = this.isValueReductionAvailable(species.speciesId); + const isSameSpeciesEggAvailable = this.isSameSpeciesEggAvailable(species.speciesId); + + // 'Passives Only' mode + if (globalScene.candyUpgradeNotification === 1) { + if (isPassiveAvailable) { + globalScene.tweens.chain(tweenChain).paused = startPaused; + } + // 'On' mode + } else if (globalScene.candyUpgradeNotification === 2) { + if (isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable) { + globalScene.tweens.chain(tweenChain).paused = startPaused; + } + } + } + + /** + * Sets the visibility of a Candy Upgrade Icon + */ + setUpgradeIcon(starter: PokedexMonContainer): void { + const species = starter.species; + const slotVisible = !!species?.speciesId; + + if ( + !species || + globalScene.candyUpgradeNotification === 0 || + species.speciesId !== species.getRootSpeciesId(false) + ) { + starter.candyUpgradeIcon.setVisible(false); + starter.candyUpgradeOverlayIcon.setVisible(false); + return; + } + + const isPassiveAvailable = this.isPassiveAvailable(species.speciesId); + const isValueReductionAvailable = this.isValueReductionAvailable(species.speciesId); + const isSameSpeciesEggAvailable = this.isSameSpeciesEggAvailable(species.speciesId); + + // 'Passive Only' mode + if (globalScene.candyUpgradeNotification === 1) { + starter.candyUpgradeIcon.setVisible(slotVisible && isPassiveAvailable); + starter.candyUpgradeOverlayIcon.setVisible(slotVisible && starter.candyUpgradeIcon.visible); + + // 'On' mode + } else if (globalScene.candyUpgradeNotification === 2) { + starter.candyUpgradeIcon.setVisible( + slotVisible && (isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable), + ); + starter.candyUpgradeOverlayIcon.setVisible(slotVisible && starter.candyUpgradeIcon.visible); + } + } + + /** + * Update the display of candy upgrade icons or animations for the given PokedexMonContainer + * @param pokemonContainer the container for the Pokemon to update + */ + updateCandyUpgradeDisplay(pokemonContainer: PokedexMonContainer) { + if (this.isUpgradeIconEnabled()) { + this.setUpgradeIcon(pokemonContainer); + } + if (this.isUpgradeAnimationEnabled()) { + this.setUpgradeAnimation(pokemonContainer.icon, this.lastSpecies, true); + } + } + + processInput(button: Button): boolean { + if (this.blockInput) { + return false; + } + + const maxColumns = 9; + const numberOfStarters = this.filteredPokemonData.length; + const numOfRows = Math.ceil(numberOfStarters / maxColumns); + const onScreenFirstIndex = this.scrollCursor * maxColumns; // this is first index on the screen + // TODO: check if in some places we need to use one or the other + const currentRow = Math.floor((onScreenFirstIndex + this.cursor) / maxColumns); + + const ui = this.getUi(); + + let success = false; + let error = false; + + if (button === Button.SUBMIT) { + error = true; + } else if (button === Button.CANCEL) { + if (this.filterMode && this.filterBar.openDropDown) { + // CANCEL with a filter menu open > close it + this.filterBar.toggleDropDown(this.filterBarCursor); + success = true; + } else if (this.filterMode && !this.filterBar.getFilter(this.filterBarCursor).hasDefaultValues()) { + this.filterBar.resetSelection(this.filterBarCursor); + this.updateStarters(); + success = true; + } else if ( + this.filterTextMode && + !(this.filterText.getValue(this.filterTextCursor) === this.filterText.defaultText) + ) { + this.filterText.resetSelection(this.filterTextCursor); + success = true; + } else if (this.showingTray) { + success = this.closeFormTray(); + } else { + this.tryExit(); + success = true; + } + } else if (button === Button.STATS) { + if (!this.filterMode && !this.showingTray) { + this.cursorObj.setVisible(false); + this.setSpecies(null); + this.filterText.cursorObj.setVisible(false); + this.filterTextMode = false; + this.filterBarCursor = 0; + this.setFilterMode(true); + } else { + error = true; + } + } else if (button === Button.CYCLE_TERA) { + if (!this.filterTextMode && !this.showingTray) { + this.cursorObj.setVisible(false); + this.setSpecies(null); + this.filterBar.cursorObj.setVisible(false); + this.filterMode = false; + this.filterTextCursor = 0; + this.setFilterTextMode(true); + } else { + error = true; + } + } else if (button === Button.CYCLE_SHINY) { + if (!this.showingTray) { + this.showDecorations = !this.showDecorations; + this.updateScroll(); + success = true; + } else { + error = true; + } + } else if (this.filterMode) { + switch (button) { + case Button.LEFT: + if (this.filterBarCursor > 0) { + success = this.setCursor(this.filterBarCursor - 1); + } else { + success = this.setCursor(this.filterBar.numFilters - 1); + } + break; + case Button.RIGHT: + if (this.filterBarCursor < this.filterBar.numFilters - 1) { + success = this.setCursor(this.filterBarCursor + 1); + } else { + success = this.setCursor(0); + } + break; + case Button.UP: + if (this.filterBar.openDropDown) { + success = this.filterBar.decDropDownCursor(); + } else if (numberOfStarters > 0) { + // UP from filter bar to bottom of Pokemon list + this.setFilterMode(false); + this.scrollCursor = Math.max(0, numOfRows - 9); + this.updateScroll(); + const proportion = this.filterBarCursor / Math.max(1, this.filterBar.numFilters - 1); + const targetCol = Math.min(8, proportion < 0.5 ? Math.floor(proportion * 8) : Math.ceil(proportion * 8)); + if (numberOfStarters % 9 > targetCol) { + this.setCursor(numberOfStarters - (numberOfStarters % 9) + targetCol - this.scrollCursor * 9); + } else { + this.setCursor( + Math.max(numberOfStarters - (numberOfStarters % 9) + targetCol - 9 - this.scrollCursor * 9, 0), + ); + } + success = true; + } + break; + case Button.DOWN: + if (this.filterBar.openDropDown) { + success = this.filterBar.incDropDownCursor(); + } else if (numberOfStarters > 0) { + // DOWN from filter bar to top of Pokemon list + this.setFilterMode(false); + this.scrollCursor = 0; + this.updateScroll(); + const proportion = this.filterBarCursor / Math.max(1, this.filterBar.numFilters - 1); + const targetCol = Math.min(8, proportion < 0.5 ? Math.floor(proportion * 8) : Math.ceil(proportion * 8)); + this.setCursor(Math.min(targetCol, numberOfStarters - 1)); + success = true; + } + break; + case Button.ACTION: + if (!this.filterBar.openDropDown) { + this.filterBar.toggleDropDown(this.filterBarCursor); + } else { + this.filterBar.toggleOptionState(); + } + success = true; + break; + } + } else if (this.filterTextMode) { + switch (button) { + case Button.LEFT: + // LEFT from filter bar, move to right of Pokemon list + if (numberOfStarters > 0) { + this.setFilterTextMode(false); + const rowIndex = this.filterTextCursor; + this.setCursor(rowIndex < numOfRows - 1 ? (rowIndex + 1) * maxColumns - 1 : numberOfStarters - 1); + success = true; + } + break; + case Button.RIGHT: + // RIGHT from filter bar, move to left of Pokemon list + if (numberOfStarters > 0) { + this.setFilterTextMode(false); + const rowIndex = this.filterTextCursor; + this.setCursor(rowIndex < numOfRows ? rowIndex * maxColumns : (numOfRows - 1) * maxColumns); + success = true; + } + break; + case Button.UP: + if (this.filterTextCursor > 0) { + success = this.setCursor(this.filterTextCursor - 1); + } else { + success = this.setCursor(this.filterText.numFilters - 1); + } + break; + case Button.DOWN: + if (this.filterTextCursor < this.filterText.numFilters - 1) { + success = this.setCursor(this.filterTextCursor + 1); + } else { + success = this.setCursor(0); + } + break; + case Button.ACTION: + this.filterText.startSearch(this.filterTextCursor, this.getUi()); + success = true; + break; + } + } else if (this.showingTray) { + if (button === Button.ACTION) { + const formIndex = this.trayForms[this.trayCursor].formIndex; + ui.setOverlayMode(Mode.POKEDEX_PAGE, this.lastSpecies, formIndex, { form: formIndex }, this.filteredIndices); + success = true; + } else { + const numberOfForms = this.trayContainers.length; + const numOfRows = Math.ceil(numberOfForms / maxColumns); + const currentTrayRow = Math.floor(this.trayCursor / maxColumns); + switch (button) { + case Button.UP: + if (currentTrayRow > 0) { + success = this.setTrayCursor(this.trayCursor - 9); + } else { + const targetCol = this.trayCursor; + if (numberOfForms % 9 > targetCol) { + success = this.setTrayCursor(numberOfForms - (numberOfForms % 9) + targetCol); + } else { + success = this.setTrayCursor(Math.max(numberOfForms - (numberOfForms % 9) + targetCol - 9, 0)); + } + } + break; + case Button.DOWN: + if (currentTrayRow < numOfRows - 1) { + success = this.setTrayCursor(this.trayCursor + 9); + } else { + success = this.setTrayCursor(this.trayCursor % 9); + } + break; + case Button.LEFT: + if (this.trayCursor % 9 !== 0) { + success = this.setTrayCursor(this.trayCursor - 1); + } else { + success = this.setTrayCursor( + currentTrayRow < numOfRows - 1 ? (currentTrayRow + 1) * maxColumns - 1 : numberOfForms - 1, + ); + } + break; + case Button.RIGHT: + if (this.trayCursor % 9 < (currentTrayRow < numOfRows - 1 ? 8 : (numberOfForms - 1) % 9)) { + success = this.setTrayCursor(this.trayCursor + 1); + } else { + success = this.setTrayCursor(currentTrayRow * 9); + } + break; + case Button.CYCLE_FORM: + success = this.closeFormTray(); + break; + } + } + } else { + if (button === Button.ACTION) { + ui.setOverlayMode(Mode.POKEDEX_PAGE, this.lastSpecies, 0, null, this.filteredIndices); + success = true; + } else { + switch (button) { + case Button.UP: + if (currentRow > 0) { + if (this.scrollCursor > 0 && currentRow - this.scrollCursor === 0) { + this.scrollCursor--; + this.updateScroll(); + success = this.setCursor(this.cursor); + } else { + success = this.setCursor(this.cursor - 9); + } + } else { + this.filterBarCursor = this.filterBar.getNearestFilter(this.pokemonContainers[this.cursor]); + this.setFilterMode(true); + success = true; + } + break; + case Button.DOWN: + if (currentRow < numOfRows - 1 && this.cursor + 9 < this.filteredPokemonData.length) { + // not last row + if (currentRow - this.scrollCursor === 8) { + // last row of visible pokemon + this.scrollCursor++; + this.updateScroll(); + success = this.setCursor(this.cursor); + } else { + success = this.setCursor(this.cursor + 9); + } + } else if (numOfRows > 1) { + // DOWN from last row of pokemon > Wrap around to first row + this.scrollCursor = 0; + this.updateScroll(); + success = this.setCursor(this.cursor % 9); + } else { + // DOWN from single row of pokemon > Go to filters + this.filterBarCursor = this.filterBar.getNearestFilter(this.pokemonContainers[this.cursor]); + this.setFilterMode(true); + success = true; + } + break; + case Button.LEFT: + if (this.cursor % 9 !== 0) { + success = this.setCursor(this.cursor - 1); + } else { + // LEFT from filtered pokemon, on the left edge + this.filterTextCursor = this.filterText.getNearestFilter(this.pokemonContainers[this.cursor]); + this.setFilterTextMode(true); + success = true; + } + break; + case Button.RIGHT: + // is not right edge + if (this.cursor % 9 < (currentRow < numOfRows - 1 ? 8 : (numberOfStarters - 1) % 9)) { + success = this.setCursor(this.cursor + 1); + } else { + // RIGHT from filtered pokemon, on the right edge + this.filterTextCursor = this.filterText.getNearestFilter(this.pokemonContainers[this.cursor]); + this.setFilterTextMode(true); + success = true; + } + break; + case Button.CYCLE_FORM: { + const species = this.pokemonContainers[this.cursor].species; + if (this.canShowFormTray) { + success = this.openFormTray(species); + } + break; + } + } + } + } + + if (success) { + ui.playSelect(); + } else if (error) { + ui.playError(); + } + + return success || error; + } + + updateButtonIcon(iconSetting, gamepadType, iconElement, controlLabel): void { + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO + let iconPath; + // touch controls cannot be rebound as is, and are just emulating a keyboard event. + // Additionally, since keyboard controls can be rebound (and will be displayed when they are), we need to have special handling for the touch controls + if (gamepadType === "touch") { + gamepadType = "keyboard"; + switch (iconSetting) { + case SettingKeyboard.Button_Cycle_Shiny: + iconPath = "R.png"; + break; + case SettingKeyboard.Button_Cycle_Form: + iconPath = "F.png"; + break; + case SettingKeyboard.Button_Stats: + iconPath = "C.png"; + break; + default: + break; + } + } else { + iconPath = globalScene.inputController?.getIconForLatestInputRecorded(iconSetting); + } + iconElement.setTexture(gamepadType, iconPath); + iconElement.setVisible(true); + controlLabel.setVisible(true); + } + + updateFilterButtonIcon(iconSetting, gamepadType, iconElement, controlLabel): void { + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO + let iconPath; + // touch controls cannot be rebound as is, and are just emulating a keyboard event. + // Additionally, since keyboard controls can be rebound (and will be displayed when they are), we need to have special handling for the touch controls + if (gamepadType === "touch") { + gamepadType = "keyboard"; + iconPath = "C.png"; + } else { + iconPath = globalScene.inputController?.getIconForLatestInputRecorded(iconSetting); + } + iconElement.setTexture(gamepadType, iconPath); + iconElement.setVisible(true); + controlLabel.setVisible(true); + } + + getSanitizedProps(props: DexAttrProps): DexAttrProps { + const sanitizedProps: DexAttrProps = { + shiny: false, + female: props.female, + variant: 0, + formIndex: props.formIndex, + }; + return sanitizedProps; + } + + // Returns true if one of the forms has the requested move + hasFormLevelMove(form: PokemonForm, selectedMove: string): boolean { + if ( + !pokemonFormLevelMoves.hasOwnProperty(form.speciesId) || + !pokemonFormLevelMoves[form.speciesId].hasOwnProperty(form.formIndex) + ) { + return false; + } + const levelMoves = pokemonFormLevelMoves[form.speciesId][form.formIndex].map(m => allMoves[m[1]].name); + return levelMoves.includes(selectedMove); + } + + updateStarters = () => { + this.scrollCursor = 0; + this.filteredPokemonData = []; + + this.pokerusCursorObjs.forEach(cursor => cursor.setVisible(false)); + + this.filterBar.updateFilterLabels(); + this.filterText.updateFilterLabels(); + + this.filteredPokemonData = []; + + this.allSpecies.forEach(species => { + const starterId = this.getStarterSpeciesId(species.speciesId); + + const currentDexAttr = this.getCurrentDexProps(species.speciesId); + const props = this.getSanitizedProps(globalScene.gameData.getSpeciesDexAttrProps(species, currentDexAttr)); + + const data: ContainerData = { + species: species, + cost: globalScene.gameData.getSpeciesStarterValue(starterId), + props: props, + }; + + // First, ensure you have the caught attributes for the species else default to bigint 0 + // TODO: This might be removed depending on how accessible we want the pokedex function to be + const caughtAttr = + (globalScene.gameData.dexData[species.speciesId]?.caughtAttr || BigInt(0)) & + (globalScene.gameData.dexData[this.getStarterSpeciesId(species.speciesId)]?.caughtAttr || BigInt(0)) & + species.getFullUnlocksData(); + const starterData = globalScene.gameData.starterData[starterId]; + const isStarterProgressable = speciesEggMoves.hasOwnProperty(starterId); + + // Name filter + const selectedName = this.filterText.getValue(FilterTextRow.NAME); + const fitsName = species.name === selectedName || selectedName === this.filterText.defaultText; + + // Move filter + // TODO: There can be fringe cases where the two moves belong to mutually exclusive forms, these must be handled separately (Pikachu); + // On the other hand, in some cases it is possible to switch between different forms and combine (Deoxys) + const levelMoves = pokemonSpeciesLevelMoves[species.speciesId].map(m => allMoves[m[1]].name); + // This always gets egg moves from the starter + const eggMoves = speciesEggMoves[starterId]?.map(m => allMoves[m].name) ?? []; + const tmMoves = speciesTmMoves[starterId]?.map(m => allMoves[Array.isArray(m) ? m[1] : m].name) ?? []; + const selectedMove1 = this.filterText.getValue(FilterTextRow.MOVE_1); + const selectedMove2 = this.filterText.getValue(FilterTextRow.MOVE_2); + + const fitsFormMove1 = species.forms.some(form => this.hasFormLevelMove(form, selectedMove1)); + const fitsFormMove2 = species.forms.some(form => this.hasFormLevelMove(form, selectedMove2)); + const fitsLevelMove1 = levelMoves.includes(selectedMove1) || fitsFormMove1; + const fitsEggMove1 = eggMoves.includes(selectedMove1); + const fitsTmMove1 = tmMoves.includes(selectedMove1); + const fitsLevelMove2 = levelMoves.includes(selectedMove2) || fitsFormMove2; + const fitsEggMove2 = eggMoves.includes(selectedMove2); + const fitsTmMove2 = tmMoves.includes(selectedMove2); + const fitsMove1 = fitsLevelMove1 || fitsEggMove1 || fitsTmMove1 || selectedMove1 === this.filterText.defaultText; + const fitsMove2 = fitsLevelMove2 || fitsEggMove2 || fitsTmMove2 || selectedMove2 === this.filterText.defaultText; + const fitsMoves = fitsMove1 && fitsMove2; + + if (fitsEggMove1 && !fitsLevelMove1) { + const em1 = eggMoves.findIndex(name => name === selectedMove1); + if ((starterData.eggMoves & (1 << em1)) === 0) { + data.eggMove1 = false; + } else { + data.eggMove1 = true; + } + } else if (fitsTmMove1 && !fitsLevelMove1) { + data.tmMove1 = true; + } + if (fitsEggMove2 && !fitsLevelMove2) { + const em2 = eggMoves.findIndex(name => name === selectedMove2); + if ((starterData.eggMoves & (1 << em2)) === 0) { + data.eggMove2 = false; + } else { + data.eggMove2 = true; + } + } else if (fitsTmMove2 && !fitsLevelMove2) { + data.tmMove2 = true; + } + + // Ability filter + const abilities = [species.ability1, species.ability2, species.abilityHidden].map(a => allAbilities[a].name); + const passives = starterPassiveAbilities[starterId] ?? ({} as PassiveAbilities); + + const selectedAbility1 = this.filterText.getValue(FilterTextRow.ABILITY_1); + const fitsFormAbility1 = species.forms.some(form => + [form.ability1, form.ability2, form.abilityHidden].map(a => allAbilities[a].name).includes(selectedAbility1), + ); + const fitsAbility1 = + abilities.includes(selectedAbility1) || fitsFormAbility1 || selectedAbility1 === this.filterText.defaultText; + const fitsPassive1 = Object.values(passives).some(p => allAbilities[p].name === selectedAbility1); + + const selectedAbility2 = this.filterText.getValue(FilterTextRow.ABILITY_2); + const fitsFormAbility2 = species.forms.some(form => + [form.ability1, form.ability2, form.abilityHidden].map(a => allAbilities[a].name).includes(selectedAbility2), + ); + const fitsAbility2 = + abilities.includes(selectedAbility2) || fitsFormAbility2 || selectedAbility2 === this.filterText.defaultText; + const fitsPassive2 = Object.values(passives).some(p => allAbilities[p].name === selectedAbility2); + + // If both fields have been set to the same ability, show both ability and passive + const fitsAbilities = + (fitsAbility1 && (fitsPassive2 || selectedAbility2 === this.filterText.defaultText)) || + (fitsAbility2 && (fitsPassive1 || selectedAbility1 === this.filterText.defaultText)); + + if (fitsPassive1 || fitsPassive2) { + if (fitsPassive1) { + if (starterData.passiveAttr > 0) { + data.passive1 = true; + } else { + data.passive1 = false; + } + } else { + if (starterData.passiveAttr > 0) { + data.passive2 = true; + } else { + data.passive2 = false; + } + } + } + + // Gen filter + const fitsGen = this.filterBar.getVals(DropDownColumn.GEN).includes(species.generation); + + // Type filter + const fitsType = this.filterBar + .getVals(DropDownColumn.TYPES) + .some(type => species.isOfType((type as number) - 1)); + + // Biome filter + const indexToBiome = new Map( + Object.values(Biome) + .map((value, index) => (typeof value === "string" ? [index, value] : undefined)) + .filter((entry): entry is [number, string] => entry !== undefined), + ); + indexToBiome.set(35, "Uncatchable"); + + // We get biomes for both the mon and its starters to ensure that evolutions get the correct filters. + // TODO: We might also need to do it the other way around. + const biomes = catchableSpecies[species.speciesId].concat(catchableSpecies[starterId]).map(b => Biome[b.biome]); + if (biomes.length === 0) { + biomes.push("Uncatchable"); + } + const showNoBiome = !!(biomes.length === 0 && this.filterBar.getVals(DropDownColumn.BIOME).length === 36); + const fitsBiome = + this.filterBar.getVals(DropDownColumn.BIOME).some(item => biomes.includes(indexToBiome.get(item) ?? "")) || + showNoBiome; + + // Caught / Shiny filter + const isNonShinyCaught = !!(caughtAttr & DexAttr.NON_SHINY); + const isShinyCaught = !!(caughtAttr & DexAttr.SHINY); + const isVariant1Caught = isShinyCaught && !!(caughtAttr & DexAttr.DEFAULT_VARIANT); + const isVariant2Caught = isShinyCaught && !!(caughtAttr & DexAttr.VARIANT_2); + const isVariant3Caught = isShinyCaught && !!(caughtAttr & DexAttr.VARIANT_3); + const isUncaught = !isNonShinyCaught && !isVariant1Caught && !isVariant2Caught && !isVariant3Caught; + const fitsCaught = this.filterBar.getVals(DropDownColumn.CAUGHT).some(caught => { + if (caught === "SHINY3") { + return isVariant3Caught; + } + if (caught === "SHINY2") { + return isVariant2Caught && !isVariant3Caught; + } + if (caught === "SHINY") { + return isVariant1Caught && !isVariant2Caught && !isVariant3Caught; + } + if (caught === "NORMAL") { + return isNonShinyCaught && !isVariant1Caught && !isVariant2Caught && !isVariant3Caught; + } + if (caught === "UNCAUGHT") { + return isUncaught; + } + }); + + // Passive Filter + const isPassiveUnlocked = starterData.passiveAttr > 0; + const isPassiveUnlockable = this.isPassiveAvailable(species.speciesId) && !isPassiveUnlocked; + const fitsPassive = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => { + if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.ON) { + return isPassiveUnlocked; + } + if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.EXCLUDE) { + return isStarterProgressable && !isPassiveUnlocked; + } + if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.UNLOCKABLE) { + return isPassiveUnlockable; + } + if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.OFF) { + return true; + } + }); + + // Cost Reduction Filter + const isCostReducedByOne = starterData.valueReduction === 1; + const isCostReducedByTwo = starterData.valueReduction === 2; + const isCostReductionUnlockable = this.isValueReductionAvailable(species.speciesId); + const fitsCostReduction = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => { + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ON) { + return isCostReducedByOne || isCostReducedByTwo; + } + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ONE) { + return isCostReducedByOne; + } + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.TWO) { + return isCostReducedByTwo; + } + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.EXCLUDE) { + return isStarterProgressable && !(isCostReducedByOne || isCostReducedByTwo); + } + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.UNLOCKABLE) { + return isCostReductionUnlockable; + } + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.OFF) { + return true; + } + }); + + // Starter Filter + const isStarter = this.getStarterSpeciesId(species.speciesId) === species.speciesId; + const fitsStarter = this.filterBar.getVals(DropDownColumn.MISC).some(misc => { + if (misc.val === "STARTER" && misc.state === DropDownState.ON) { + return isStarter; + } + if (misc.val === "STARTER" && misc.state === DropDownState.EXCLUDE) { + return !isStarter; + } + if (misc.val === "STARTER" && misc.state === DropDownState.OFF) { + return true; + } + }); + + // Favorite Filter + const isFavorite = this.starterPreferences[species.speciesId]?.favorite ?? false; + const fitsFavorite = this.filterBar.getVals(DropDownColumn.MISC).some(misc => { + if (misc.val === "FAVORITE" && misc.state === DropDownState.ON) { + return isFavorite; + } + if (misc.val === "FAVORITE" && misc.state === DropDownState.EXCLUDE) { + return !isFavorite; + } + if (misc.val === "FAVORITE" && misc.state === DropDownState.OFF) { + return true; + } + }); + + // Ribbon / Classic Win Filter + const hasWon = starterData.classicWinCount > 0; + const hasNotWon = starterData.classicWinCount === 0; + const isUndefined = starterData.classicWinCount === undefined; + const fitsWin = this.filterBar.getVals(DropDownColumn.MISC).some(misc => { + if (misc.val === "WIN" && misc.state === DropDownState.ON) { + return hasWon; + } + if (misc.val === "WIN" && misc.state === DropDownState.EXCLUDE) { + return hasNotWon || isUndefined; + } + if (misc.val === "WIN" && misc.state === DropDownState.OFF) { + return true; + } + }); + + // HA Filter + const speciesHasHiddenAbility = + species.abilityHidden !== species.ability1 && species.abilityHidden !== Abilities.NONE; + const hasHA = starterData.abilityAttr & AbilityAttr.ABILITY_HIDDEN; + const fitsHA = this.filterBar.getVals(DropDownColumn.MISC).some(misc => { + if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.ON) { + return hasHA; + } + if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.EXCLUDE) { + return speciesHasHiddenAbility && !hasHA; + } + if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.OFF) { + return true; + } + }); + + // Egg Purchasable Filter + const isEggPurchasable = this.isSameSpeciesEggAvailable(species.speciesId); + const fitsEgg = this.filterBar.getVals(DropDownColumn.MISC).some(misc => { + if (misc.val === "EGG" && misc.state === DropDownState.ON) { + return isEggPurchasable; + } + if (misc.val === "EGG" && misc.state === DropDownState.EXCLUDE) { + return isStarterProgressable && !isEggPurchasable; + } + if (misc.val === "EGG" && misc.state === DropDownState.OFF) { + return true; + } + }); + + // Pokerus Filter + const fitsPokerus = this.filterBar.getVals(DropDownColumn.MISC).some(misc => { + if (misc.val === "POKERUS" && misc.state === DropDownState.ON) { + return this.pokerusSpecies.includes(species); + } + if (misc.val === "POKERUS" && misc.state === DropDownState.EXCLUDE) { + return !this.pokerusSpecies.includes(species); + } + if (misc.val === "POKERUS" && misc.state === DropDownState.OFF) { + return true; + } + }); + + if ( + fitsName && + fitsAbilities && + fitsMoves && + fitsGen && + fitsBiome && + fitsType && + fitsCaught && + fitsPassive && + fitsCostReduction && + fitsStarter && + fitsFavorite && + fitsWin && + fitsHA && + fitsEgg && + fitsPokerus + ) { + this.filteredPokemonData.push(data); + } + }); + + this.starterSelectScrollBar.setTotalRows(Math.max(Math.ceil(this.filteredPokemonData.length / 9), 1)); + this.starterSelectScrollBar.setScrollCursor(0); + + // sort + const sort = this.filterBar.getVals(DropDownColumn.SORT)[0]; + this.filteredPokemonData.sort((a, b) => { + switch (sort.val) { + case SortCriteria.NUMBER: + return (a.species.speciesId - b.species.speciesId) * -sort.dir; + case SortCriteria.COST: + return (a.cost - b.cost) * -sort.dir; + case SortCriteria.CANDY: { + const candyCountA = + globalScene.gameData.starterData[this.getStarterSpeciesId(a.species.speciesId)].candyCount; + const candyCountB = + globalScene.gameData.starterData[this.getStarterSpeciesId(b.species.speciesId)].candyCount; + return (candyCountA - candyCountB) * -sort.dir; + } + case SortCriteria.IV: { + const avgIVsA = + globalScene.gameData.dexData[a.species.speciesId].ivs.reduce((a, b) => a + b, 0) / + globalScene.gameData.dexData[a.species.speciesId].ivs.length; + const avgIVsB = + globalScene.gameData.dexData[b.species.speciesId].ivs.reduce((a, b) => a + b, 0) / + globalScene.gameData.dexData[b.species.speciesId].ivs.length; + return (avgIVsA - avgIVsB) * -sort.dir; + } + case SortCriteria.NAME: + return a.species.name.localeCompare(b.species.name) * -sort.dir; + case SortCriteria.CAUGHT: + return ( + (globalScene.gameData.dexData[a.species.speciesId].caughtCount - + globalScene.gameData.dexData[b.species.speciesId].caughtCount) * + -sort.dir + ); + case SortCriteria.HATCHED: + return ( + (globalScene.gameData.dexData[this.getStarterSpeciesId(a.species.speciesId)].hatchedCount - + globalScene.gameData.dexData[this.getStarterSpeciesId(b.species.speciesId)].hatchedCount) * + -sort.dir + ); + default: + break; + } + return 0; + }); + + this.filteredIndices = this.filteredPokemonData.map(c => c.species.speciesId); + + this.updateScroll(); + }; + + updateScroll = () => { + const maxColumns = 9; + const onScreenFirstIndex = this.scrollCursor * maxColumns; + + this.starterSelectScrollBar.setScrollCursor(this.scrollCursor); + + this.pokerusCursorObjs.forEach(cursorObj => cursorObj.setVisible(false)); + + let pokerusCursorIndex = 0; + this.pokemonContainers.forEach((container, i) => { + const i_data = i + onScreenFirstIndex; + + if (i_data >= this.filteredPokemonData.length) { + container.setVisible(false); + } else { + container.setVisible(true); + + const data = this.filteredPokemonData[i_data]; + const props = data.props; + + container.setSpecies(data.species, props); + + const starterSprite = container.icon as Phaser.GameObjects.Sprite; + starterSprite.setTexture( + data.species.getIconAtlasKey(props.formIndex, props.shiny, props.variant), + container.species.getIconId(props.female!, props.formIndex, props.shiny, props.variant), + ); + container.checkIconId(props.female, props.formIndex, props.shiny, props.variant); + + const speciesId = data.species.speciesId; + const dexEntry = globalScene.gameData.dexData[speciesId]; + const caughtAttr = + dexEntry.caughtAttr & + globalScene.gameData.dexData[this.getStarterSpeciesId(speciesId)].caughtAttr & + data.species.getFullUnlocksData(); + + if (caughtAttr & data.species.getFullUnlocksData() || globalScene.dexForDevs) { + container.icon.clearTint(); + } else if (dexEntry.seenAttr) { + container.icon.setTint(0x808080); + } else { + container.icon.setTint(0); + } + + if (data.eggMove1) { + container.eggMove1Icon.setVisible(true); + } else { + container.eggMove1Icon.setVisible(false); + } + if (data.eggMove2) { + container.eggMove2Icon.setVisible(true); + } else { + container.eggMove2Icon.setVisible(false); + } + if (data.tmMove1) { + container.tmMove1Icon.setVisible(true); + } else { + container.tmMove1Icon.setVisible(false); + } + if (data.tmMove2) { + container.tmMove2Icon.setVisible(true); + } else { + container.tmMove2Icon.setVisible(false); + } + if (data.passive1) { + container.passive1Icon.setVisible(true); + } else { + container.passive1Icon.setVisible(false); + } + if (data.passive2) { + container.passive2Icon.setVisible(true); + } else { + container.passive2Icon.setVisible(false); + } + + if (this.showDecorations) { + if (this.pokerusSpecies.includes(data.species)) { + this.pokerusCursorObjs[pokerusCursorIndex].setPosition(container.x - 1, container.y + 1); + this.pokerusCursorObjs[pokerusCursorIndex].setVisible(true); + pokerusCursorIndex++; + } + + this.updateStarterValueLabel(container); + + container.label.setVisible(true); + const speciesVariants = + speciesId && caughtAttr & DexAttr.SHINY + ? [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter(v => !!(caughtAttr & v)) + : []; + for (let v = 0; v < 3; v++) { + const hasVariant = speciesVariants.length > v; + container.shinyIcons[v].setVisible(hasVariant); + if (hasVariant) { + container.shinyIcons[v].setTint( + getVariantTint( + speciesVariants[v] === DexAttr.DEFAULT_VARIANT ? 0 : speciesVariants[v] === DexAttr.VARIANT_2 ? 1 : 2, + ), + ); + } + } + + container.starterPassiveBgs.setVisible( + !!globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].passiveAttr, + ); + container.hiddenAbilityIcon.setVisible( + !!caughtAttr && !!(globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].abilityAttr & 4), + ); + container.classicWinIcon.setVisible( + globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].classicWinCount > 0, + ); + container.favoriteIcon.setVisible(this.starterPreferences[speciesId]?.favorite ?? false); + + // 'Candy Icon' mode + if (globalScene.candyUpgradeDisplay === 0) { + if (!starterColors[this.getStarterSpeciesId(speciesId)]) { + // Default to white if no colors are found + starterColors[this.getStarterSpeciesId(speciesId)] = ["ffffff", "ffffff"]; + } + + // Set the candy colors + container.candyUpgradeIcon.setTint( + argbFromRgba(rgbHexToRgba(starterColors[this.getStarterSpeciesId(speciesId)][0])), + ); + container.candyUpgradeOverlayIcon.setTint( + argbFromRgba(rgbHexToRgba(starterColors[this.getStarterSpeciesId(speciesId)][1])), + ); + } else if (globalScene.candyUpgradeDisplay === 1) { + container.candyUpgradeIcon.setVisible(false); + container.candyUpgradeOverlayIcon.setVisible(false); + } + } else { + container.label.setVisible(false); + for (let v = 0; v < 3; v++) { + container.shinyIcons[v].setVisible(false); + } + container.starterPassiveBgs.setVisible(false); + container.hiddenAbilityIcon.setVisible(false); + container.classicWinIcon.setVisible(false); + container.favoriteIcon.setVisible(false); + + container.candyUpgradeIcon.setVisible(false); + container.candyUpgradeOverlayIcon.setVisible(false); + } + } + }); + }; + + setCursor(cursor: number): boolean { + let changed = false; + this.oldCursor = this.cursor; + + if (this.filterMode) { + changed = this.filterBarCursor !== cursor; + this.filterBarCursor = cursor; + this.filterBar.setCursor(cursor); + } else if (this.filterTextMode) { + changed = this.filterTextCursor !== cursor; + this.filterTextCursor = cursor; + this.filterText.setCursor(cursor); + } else { + cursor = Math.max(Math.min(this.pokemonContainers.length - 1, cursor), 0); + changed = super.setCursor(cursor); + + const pos = calcStarterPosition(cursor); + this.cursorObj.setPosition(pos.x - 1, pos.y + 1); + + const species = this.pokemonContainers[cursor]?.species; + + if (species) { + this.setSpecies(species); + return true; + } + } + + return changed; + } + + setFilterMode(filterMode: boolean): boolean { + this.cursorObj.setVisible(!filterMode); + this.filterBar.cursorObj.setVisible(filterMode); + this.pokemonSprite.setVisible(false); + this.showFormTrayIconElement.setVisible(false); + this.showFormTrayLabel.setVisible(false); + + if (filterMode !== this.filterMode) { + this.filterMode = filterMode; + this.setCursor(filterMode ? this.filterBarCursor : this.cursor); + if (filterMode) { + this.setSpecies(null); + } + return true; + } + return false; + } + + setFilterTextMode(filterTextMode: boolean): boolean { + this.cursorObj.setVisible(!filterTextMode); + this.filterText.cursorObj.setVisible(filterTextMode); + this.pokemonSprite.setVisible(false); + this.showFormTrayIconElement.setVisible(false); + this.showFormTrayLabel.setVisible(false); + + if (filterTextMode !== this.filterTextMode) { + this.filterTextMode = filterTextMode; + this.setCursor(filterTextMode ? this.filterTextCursor : this.cursor); + if (filterTextMode) { + this.setSpecies(null); + } + return true; + } + return false; + } + + openFormTray(species: PokemonSpecies): boolean { + this.trayForms = species.forms.filter(f => !f.isUnobtainable); + + this.trayNumIcons = this.trayForms.length; + this.trayRows = Math.floor(this.trayNumIcons / 9) + (this.trayNumIcons % 9 === 0 ? 0 : 1); + this.trayColumns = Math.min(this.trayNumIcons, 9); + + const maxColumns = 9; + const boxCursor = this.cursor; + const boxCursorY = Math.floor(boxCursor / maxColumns); + const boxCursorX = boxCursor - boxCursorY * 9; + const spaceBelow = 9 - 1 - boxCursorY; + const spaceRight = 9 - boxCursorX; + const boxPos = calcStarterPosition(this.cursor); + const goUp = this.trayRows <= spaceBelow - 1 ? 0 : 1; + const goLeft = this.trayColumns <= spaceRight ? 0 : 1; + + this.trayBg.setSize(13 + this.trayColumns * 17, 8 + this.trayRows * 18); + this.formTrayContainer.setX((goLeft ? boxPos.x - 18 * (this.trayColumns - spaceRight) : boxPos.x) - 3); + this.formTrayContainer.setY(goUp ? boxPos.y - this.trayBg.height : boxPos.y + 17); + + const dexEntry = globalScene.gameData.dexData[species.speciesId]; + const dexAttr = this.getCurrentDexProps(species.speciesId); + const props = this.getSanitizedProps(globalScene.gameData.getSpeciesDexAttrProps(this.lastSpecies, dexAttr)); + + this.trayContainers = []; + this.trayForms.map((f, index) => { + const isFormCaught = dexEntry + ? (dexEntry.caughtAttr & species.getFullUnlocksData() & globalScene.gameData.getFormAttr(f.formIndex ?? 0)) > 0n + : false; + const isFormSeen = dexEntry + ? (dexEntry.seenAttr & globalScene.gameData.getFormAttr(f.formIndex ?? 0)) > 0n + : false; + const formContainer = new PokedexMonContainer(species, { + formIndex: f.formIndex, + female: props.female, + shiny: props.shiny, + variant: props.variant, + }); + this.iconAnimHandler.addOrUpdate(formContainer.icon, PokemonIconAnimMode.NONE); + // Setting tint, for all saves some caught forms may only show up as seen + if (isFormCaught || globalScene.dexForDevs) { + formContainer.icon.clearTint(); + } else if (isFormSeen) { + formContainer.icon.setTint(0x808080); + } else { + formContainer.icon.setTint(0); + } + formContainer.setPosition(5 + (index % 9) * 18, 4 + Math.floor(index / 9) * 17); + this.formTrayContainer.add(formContainer); + this.trayContainers.push(formContainer); + }); + + this.showingTray = true; + + this.setTrayCursor(0); + + this.formTrayContainer.setVisible(true); + + this.showFormTrayIconElement.setVisible(false); + this.showFormTrayLabel.setVisible(false); + + return true; + } + + closeFormTray(): boolean { + this.trayContainers.forEach(obj => { + this.formTrayContainer.remove(obj, true); // Removes from container and destroys it + }); + + this.trayContainers = []; + this.formTrayContainer.setVisible(false); + this.showingTray = false; + + this.setSpeciesDetails(this.lastSpecies); + return true; + } + + setTrayCursor(cursor: number): boolean { + if (!this.showingTray) { + return false; + } + + cursor = Phaser.Math.Clamp(this.trayContainers.length - 1, cursor, 0); + const changed = this.trayCursor !== cursor; + if (changed) { + this.trayCursor = cursor; + } + + this.trayCursorObj.setPosition(5 + (cursor % 9) * 18, 4 + Math.floor(cursor / 9) * 17); + + const species = this.lastSpecies; + const formIndex = this.trayForms[cursor].formIndex; + + this.setSpeciesDetails(species, { formIndex: formIndex }); + + return changed; + } + + getFriendship(speciesId: number) { + let currentFriendship = globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].friendship; + if (!currentFriendship || currentFriendship === undefined) { + currentFriendship = 0; + } + + const friendshipCap = getStarterValueFriendshipCap(speciesStarterCosts[speciesId]); + + return { currentFriendship, friendshipCap }; + } + + startIconAnimation(cursor: number) { + const container = this.pokemonContainers[cursor]; + const icon = container.icon; + if (this.isUpgradeAnimationEnabled()) { + globalScene.tweens.getTweensOf(icon).forEach(tween => tween.pause()); + // Reset the position of the icon + icon.x = -2; + icon.y = 2; + } + // Initiates the small up and down idle animation + this.iconAnimHandler.addOrUpdate(icon, PokemonIconAnimMode.PASSIVE); + } + + stopIconAnimation(cursor: number) { + const container = this.pokemonContainers[cursor]; + if (container) { + const lastSpeciesIcon = container.icon; + const dexAttr = this.getCurrentDexProps(container.species.speciesId); + const props = this.getSanitizedProps(globalScene.gameData.getSpeciesDexAttrProps(container.species, dexAttr)); + this.checkIconId(lastSpeciesIcon, container.species, props.female, props.formIndex, props.shiny, props.variant); + this.iconAnimHandler.addOrUpdate(lastSpeciesIcon, PokemonIconAnimMode.NONE); + // Resume the animation for the previously selected species + globalScene.tweens.getTweensOf(lastSpeciesIcon).forEach(tween => tween.resume()); + } + } + + setSpecies(species: PokemonSpecies | null) { + this.speciesStarterDexEntry = species ? globalScene.gameData.dexData[species.speciesId] : null; + + if (!species && globalScene.ui.getTooltip().visible) { + globalScene.ui.hideTooltip(); + } + + if (this.lastSpecies) { + this.stopIconAnimation(this.oldCursor); + } + + if (species) { + this.lastSpecies = species; + } + + if ( + species && + (this.speciesStarterDexEntry?.seenAttr || this.speciesStarterDexEntry?.caughtAttr || globalScene.dexForDevs) + ) { + this.pokemonNumberText.setText(i18next.t("pokedexUiHandler:pokemonNumber") + padInt(species.speciesId, 4)); + + this.pokemonNameText.setText(species.name); + + if (this.speciesStarterDexEntry?.caughtAttr || globalScene.dexForDevs) { + this.startIconAnimation(this.cursor); + + const speciesForm = getPokemonSpeciesForm(species.speciesId, 0); + this.setTypeIcons(speciesForm.type1, speciesForm.type2); + + this.setSpeciesDetails(species, {}); + + this.pokemonSprite.clearTint(); + + this.type1Icon.clearTint(); + this.type2Icon.clearTint(); + } else { + this.type1Icon.setVisible(true); + this.type2Icon.setVisible(true); + + this.setSpeciesDetails(species); + this.pokemonSprite.setTint(0x808080); + } + } else { + this.pokemonNumberText.setText( + species ? i18next.t("pokedexUiHandler:pokemonNumber") + padInt(species.speciesId, 4) : "", + ); + this.pokemonNameText.setText(species ? "???" : ""); + this.pokemonFormText.setText(""); + this.type1Icon.setVisible(false); + this.type2Icon.setVisible(false); + if (species) { + this.pokemonSprite.setTint(0x000000); + this.setSpeciesDetails(species, {}); + } + } + } + + setSpeciesDetails(species: PokemonSpecies, options: SpeciesDetails = {}): void { + let { shiny, formIndex, female, variant } = options; + + // We will only update the sprite if there is a change to form, shiny/variant + // or gender for species with gender sprite differences + const shouldUpdateSprite = true; + + if (species?.forms?.find(f => f.formKey === "female")) { + if (female !== undefined) { + formIndex = female ? 1 : 0; + } else if (formIndex !== undefined) { + female = formIndex === 1; + } + } + + this.pokemonSprite.setVisible(false); + + if (this.assetLoadCancelled) { + this.assetLoadCancelled.value = true; + this.assetLoadCancelled = null; + } + + if (species) { + const dexEntry = globalScene.gameData.dexData[species.speciesId]; + const caughtAttr = + dexEntry.caughtAttr & + globalScene.gameData.dexData[this.getStarterSpeciesId(species.speciesId)].caughtAttr & + species.getFullUnlocksData(); + + if (caughtAttr) { + const props = this.getSanitizedProps( + globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), + ); + + if (shiny === undefined) { + shiny = props.shiny; + } + if (formIndex === undefined) { + formIndex = props.formIndex; + } + if (female === undefined) { + female = props.female; + } + if (variant === undefined) { + variant = props.variant; + } + } + + const isFormCaught = dexEntry ? (caughtAttr & globalScene.gameData.getFormAttr(formIndex ?? 0)) > 0n : false; + const isFormSeen = dexEntry ? (dexEntry.seenAttr & globalScene.gameData.getFormAttr(formIndex ?? 0)) > 0n : false; + + const assetLoadCancelled = new BooleanHolder(false); + this.assetLoadCancelled = assetLoadCancelled; + + if (shouldUpdateSprite) { + species.loadAssets(female!, formIndex, shiny, variant, true).then(() => { + // TODO: is this bang correct? + if (assetLoadCancelled.value) { + return; + } + this.assetLoadCancelled = null; + this.speciesLoaded.set(species.speciesId, true); + this.pokemonSprite.play(species.getSpriteKey(female!, formIndex, shiny, variant)); // TODO: is this bang correct? + this.pokemonSprite.setPipelineData("shiny", shiny); + this.pokemonSprite.setPipelineData("variant", variant); + this.pokemonSprite.setPipelineData("spriteKey", species.getSpriteKey(female!, formIndex, shiny, variant)); // TODO: is this bang correct? + this.pokemonSprite.setVisible(true); + }); + } else { + this.pokemonSprite.setVisible(!(this.filterMode || this.filterTextMode)); + } + + if (isFormCaught || globalScene.dexForDevs) { + this.pokemonSprite.clearTint(); + } else if (isFormSeen) { + this.pokemonSprite.setTint(0x808080); + } else { + this.pokemonSprite.setTint(0); + } + + if (isFormCaught || isFormSeen || globalScene.dexForDevs) { + // TODO: change this once forms are refactored + if (normalForm.includes(species.speciesId) && !formIndex) { + this.pokemonFormText.setText(""); + } else { + this.pokemonFormText.setText(species.getFormNameToDisplay(formIndex, false)); + } + } else { + this.pokemonFormText.setText(""); + } + + if (isFormCaught || isFormSeen || globalScene.dexForDevs) { + const speciesForm = getPokemonSpeciesForm(species.speciesId, formIndex ?? 0); // TODO: always selecting the first form + this.setTypeIcons(speciesForm.type1, speciesForm.type2); + } else { + this.setTypeIcons(null, null); + } + + if (species?.forms?.filter(f => !f.isUnobtainable).length > 1) { + if (!this.showingTray) { + this.showFormTrayIconElement.setVisible(true); + this.showFormTrayLabel.setVisible(true); + } + this.canShowFormTray = true; + } else { + this.showFormTrayIconElement.setVisible(false); + this.showFormTrayLabel.setVisible(false); + this.canShowFormTray = false; + } + } else { + this.setTypeIcons(null, null); + } + } + + setTypeIcons(type1: PokemonType | null, type2: PokemonType | null): void { + if (type1 !== null) { + this.type1Icon.setVisible(true); + this.type1Icon.setFrame(PokemonType[type1].toLowerCase()); + } else { + this.type1Icon.setVisible(false); + } + if (type2 !== null) { + this.type2Icon.setVisible(true); + this.type2Icon.setFrame(PokemonType[type2].toLowerCase()); + } else { + this.type2Icon.setVisible(false); + } + } + + updateStarterValueLabel(starter: PokedexMonContainer): void { + const speciesId = starter.species.speciesId; + const baseStarterValue = speciesStarterCosts[speciesId]; + const starterValue = globalScene.gameData.getSpeciesStarterValue(this.getStarterSpeciesId(speciesId)); + starter.cost = starterValue; + let valueStr = starterValue.toString(); + if (valueStr.startsWith("0.")) { + valueStr = valueStr.slice(1); + } + starter.label.setText(valueStr); + let textStyle: TextStyle; + switch (baseStarterValue - starterValue) { + case 0: + textStyle = TextStyle.WINDOW; + break; + case 1: + case 0.5: + textStyle = TextStyle.SUMMARY_BLUE; + break; + default: + textStyle = TextStyle.SUMMARY_GOLD; + break; + } + if (baseStarterValue - starterValue > 0) { + starter.label.setColor(this.getTextColor(textStyle)); + starter.label.setShadowColor(this.getTextColor(textStyle, true)); + } + } + + tryExit(): boolean { + this.blockInput = true; + const ui = this.getUi(); + + const cancel = () => { + ui.setMode(Mode.POKEDEX, "refresh"); + this.clearText(); + this.blockInput = false; + }; + ui.showText(i18next.t("pokedexUiHandler:confirmExit"), null, () => { + ui.setModeWithoutClear( + Mode.CONFIRM, + () => { + ui.setMode(Mode.POKEDEX, "refresh"); + this.clearText(); + this.clear(); + ui.revertMode(); + }, + cancel, + null, + null, + 19, + ); + }); + + return true; + } + + /** + * Creates a temporary dex attr props that will be used to + * display the correct shiny, variant, and form based on the StarterPreferences + * + * @param speciesId the id of the species to get props for + * @returns the dex props + */ + getCurrentDexProps(speciesId: number): bigint { + let props = 0n; + const species = allSpecies.find(sp => sp.speciesId === speciesId); + const caughtAttr = + globalScene.gameData.dexData[speciesId].caughtAttr & + globalScene.gameData.dexData[this.getStarterSpeciesId(speciesId)].caughtAttr & + (species?.getFullUnlocksData() ?? 0n); + + /* this checks the gender of the pokemon; this works by checking a) that the starter preferences for the species exist, and if so, is it female. If so, it'll add DexAttr.FEMALE to our temp props + * It then checks b) if the caughtAttr for the pokemon is female and NOT male - this means that the ONLY gender we've gotten is female, and we need to add DexAttr.FEMALE to our temp props + * If neither of these pass, we add DexAttr.MALE to our temp props + */ + if ( + this.starterPreferences[speciesId]?.female || + ((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n) + ) { + props += DexAttr.FEMALE; + } else { + props += DexAttr.MALE; + } + /* This part is very similar to above, but instead of for gender, it checks for shiny within starter preferences. + * If they're not there, it enables shiny state by default if any shiny was caught + */ + if ( + this.starterPreferences[speciesId]?.shiny || + ((caughtAttr & DexAttr.SHINY) > 0n && this.starterPreferences[speciesId]?.shiny !== false) + ) { + props += DexAttr.SHINY; + if (this.starterPreferences[speciesId]?.variant !== undefined) { + props += BigInt(Math.pow(2, this.starterPreferences[speciesId]?.variant)) * DexAttr.DEFAULT_VARIANT; + } else { + /* This calculates the correct variant if there's no starter preferences for it. + * This gets the highest tier variant that you've caught and adds it to the temp props + */ + if ((caughtAttr & DexAttr.VARIANT_3) > 0) { + props += DexAttr.VARIANT_3; + } else if ((caughtAttr & DexAttr.VARIANT_2) > 0) { + props += DexAttr.VARIANT_2; + } else { + props += DexAttr.DEFAULT_VARIANT; + } + } + } else { + props += DexAttr.NON_SHINY; + props += DexAttr.DEFAULT_VARIANT; // we add the default variant here because non shiny versions are listed as default variant + } + if (this.starterPreferences[speciesId]?.form) { + // this checks for the form of the pokemon + props += BigInt(Math.pow(2, this.starterPreferences[speciesId]?.form)) * DexAttr.DEFAULT_FORM; + } else { + // Get the first unlocked form + props += globalScene.gameData.getFormAttr(globalScene.gameData.getFormIndex(caughtAttr)); + } + + return props; + } + + override destroy(): void { + this.pokemonContainers = []; + this.filteredPokemonData = []; + } + + clearText() { + this.starterSelectMessageBoxContainer.setVisible(false); + super.clearText(); + } + + clear(): void { + super.clear(); + + this.cursor = -1; + this.oldCursor = -1; + globalScene.ui.hideTooltip(); + + this.starterSelectContainer.setVisible(false); + this.blockInput = false; + } + + checkIconId( + icon: Phaser.GameObjects.Sprite, + species: PokemonSpecies, + female: boolean, + formIndex: number, + shiny: boolean, + variant: number, + ) { + if (icon.frame.name !== species.getIconId(female, formIndex, shiny, variant)) { + console.log( + `${species.name}'s icon ${icon.frame.name} does not match getIconId with female: ${female}, formIndex: ${formIndex}, shiny: ${shiny}, variant: ${variant}`, + ); + icon.setTexture(species.getIconAtlasKey(formIndex, false, variant)); + icon.setFrame(species.getIconId(female, formIndex, false, variant)); + } + } +} diff --git a/src/ui/pokemon-hatch-info-container.ts b/src/ui/pokemon-hatch-info-container.ts index a9b8e260b34..99940b92351 100644 --- a/src/ui/pokemon-hatch-info-container.ts +++ b/src/ui/pokemon-hatch-info-container.ts @@ -1,10 +1,10 @@ import PokemonInfoContainer from "#app/ui/pokemon-info-container"; import { Gender } from "#app/data/gender"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import * as Utils from "#app/utils"; import { TextStyle, addTextObject } from "#app/ui/text"; import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Species } from "#enums/species"; import { getEggTierForSpecies } from "#app/data/egg"; import { starterColors } from "#app/battle-scene"; @@ -26,16 +26,15 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer { private pokemonEggMoveContainers: Phaser.GameObjects.Container[]; private pokemonEggMoveBgs: Phaser.GameObjects.NineSlice[]; private pokemonEggMoveLabels: Phaser.GameObjects.Text[]; - private pokemonHatchedIcon : Phaser.GameObjects.Sprite; + private pokemonHatchedIcon: Phaser.GameObjects.Sprite; private pokemonListContainer: Phaser.GameObjects.Container; private pokemonCandyIcon: Phaser.GameObjects.Sprite; private pokemonCandyOverlayIcon: Phaser.GameObjects.Sprite; private pokemonCandyCountText: Phaser.GameObjects.Text; - constructor(listContainer : Phaser.GameObjects.Container, x: number = 115, y: number = 9,) { + constructor(listContainer: Phaser.GameObjects.Container, x = 115, y = 9) { super(x, y); this.pokemonListContainer = listContainer; - } setup(): void { super.setup(); @@ -43,7 +42,10 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer { this.currentPokemonSprite = globalScene.add.sprite(54, 80, "pkmn__sub"); this.currentPokemonSprite.setScale(0.8); - this.currentPokemonSprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true }); + this.currentPokemonSprite.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + }); this.pokemonListContainer.add(this.currentPokemonSprite); // setup name and number @@ -51,7 +53,9 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer { this.pokemonNumberText.setOrigin(0, 0); this.pokemonListContainer.add(this.pokemonNumberText); - this.pokemonNameText = addTextObject(7, 107.5, "", TextStyle.SUMMARY, { fontSize: 74 }); + this.pokemonNameText = addTextObject(7, 107.5, "", TextStyle.SUMMARY, { + fontSize: 74, + }); this.pokemonNameText.setOrigin(0, 0); this.pokemonListContainer.add(this.pokemonNameText); @@ -105,7 +109,6 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer { } super.add(this.pokemonEggMoveContainers); - } /** @@ -127,7 +130,6 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer { const variant = pokemon.variant; this.currentPokemonSprite.setVisible(false); species.loadAssets(female, formIndex, shiny, variant, true).then(() => { - getPokemonSpeciesForm(species.speciesId, pokemon.formIndex).cry(); this.currentPokemonSprite.play(species.getSpriteKey(female, formIndex, shiny, variant)); this.currentPokemonSprite.setPipelineData("shiny", shiny); @@ -167,7 +169,9 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer { for (let em = 0; em < 4; em++) { const eggMove = hasEggMoves ? allMoves[speciesEggMoves[species.speciesId][em]] : null; const eggMoveUnlocked = eggMove && globalScene.gameData.starterData[species.speciesId].eggMoves & Math.pow(2, em); - this.pokemonEggMoveBgs[em].setFrame(Type[eggMove ? eggMove.type : Type.UNKNOWN].toString().toLowerCase()); + this.pokemonEggMoveBgs[em].setFrame( + PokemonType[eggMove ? eggMove.type : PokemonType.UNKNOWN].toString().toLowerCase(), + ); this.pokemonEggMoveLabels[em].setText(eggMove && eggMoveUnlocked ? eggMove.name : "???"); if (!(eggMove && hatchInfo.starterDataEntryBeforeUpdate.eggMoves & Math.pow(2, em)) && eggMoveUnlocked) { @@ -183,7 +187,5 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer { } else { this.pokemonHatchedIcon.setFrame(getEggTierForSpecies(species)); } - } - } diff --git a/src/ui/pokemon-icon-anim-handler.ts b/src/ui/pokemon-icon-anim-handler.ts index 010d23315f2..c84ee2a0f9a 100644 --- a/src/ui/pokemon-icon-anim-handler.ts +++ b/src/ui/pokemon-icon-anim-handler.ts @@ -4,7 +4,7 @@ import * as Utils from "../utils"; export enum PokemonIconAnimMode { NONE, PASSIVE, - ACTIVE + ACTIVE, } type PokemonIcon = Phaser.GameObjects.Container | Phaser.GameObjects.Sprite; @@ -33,7 +33,7 @@ export default class PokemonIconAnimHandler { yoyo: true, repeat: -1, onRepeat: onAlternate, - onYoyo: onAlternate + onYoyo: onAlternate, }); } @@ -50,16 +50,14 @@ export default class PokemonIconAnimHandler { addOrUpdate(icons: PokemonIcon | PokemonIcon[], mode: PokemonIconAnimMode): void { if (!Array.isArray(icons)) { - icons = [ icons ]; + icons = [icons]; } for (const i of icons) { if (this.icons.has(i) && this.icons.get(i) === mode) { continue; } if (this.toggled) { - const lastYDelta = this.icons.has(i) - ? this.icons.get(i)! - : 0; + const lastYDelta = this.icons.has(i) ? this.icons.get(i)! : 0; const yDelta = this.getModeYDelta(mode); i.y += yDelta + lastYDelta; } @@ -69,7 +67,7 @@ export default class PokemonIconAnimHandler { remove(icons: PokemonIcon | PokemonIcon[]): void { if (!Array.isArray(icons)) { - icons = [ icons ]; + icons = [icons]; } for (const i of icons) { if (this.toggled) { diff --git a/src/ui/pokemon-info-container.ts b/src/ui/pokemon-info-container.ts index 4f7a28f1d6d..64c743ec88d 100644 --- a/src/ui/pokemon-info-container.ts +++ b/src/ui/pokemon-info-container.ts @@ -3,7 +3,7 @@ import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { globalScene } from "#app/global-scene"; import { Gender, getGenderColor, getGenderSymbol } from "../data/gender"; import { getNatureName } from "../data/nature"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import type Pokemon from "../field/pokemon"; import i18next from "i18next"; import type { DexEntry, StarterDataEntry } from "../system/game-data"; @@ -13,16 +13,15 @@ import ConfirmUiHandler from "./confirm-ui-handler"; import { StatsContainer } from "./stats-container"; import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text"; import { addWindow } from "./ui-theme"; -import { Species } from "#enums/species"; interface LanguageSetting { infoContainerTextSize: string; - infoContainerLabelXPos?: integer; - infoContainerTextXPos?: integer; + infoContainerLabelXPos?: number; + infoContainerTextXPos?: number; } const languageSettings: { [key: string]: LanguageSetting } = { - "pt": { + pt: { infoContainerTextSize: "60px", infoContainerLabelXPos: -15, infoContainerTextXPos: -12, @@ -58,7 +57,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { public shown: boolean; - constructor(x: number = 372, y: number = 66) { + constructor(x = 372, y = 66) { super(globalScene, x, y); this.initialX = x; } @@ -86,7 +85,13 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { movesBg.setName("window-moves-bg"); this.pokemonMovesContainer.add(movesBg); - const movesLabel = addTextObject(-movesBg.width / 2, 6, i18next.t("pokemonInfoContainer:moveset"), TextStyle.WINDOW, { fontSize: "64px" }); + const movesLabel = addTextObject( + -movesBg.width / 2, + 6, + i18next.t("pokemonInfoContainer:moveset"), + TextStyle.WINDOW, + { fontSize: "64px" }, + ); movesLabel.setOrigin(0.5, 0); movesLabel.setName("text-moves"); this.pokemonMovesContainer.add(movesLabel); @@ -128,44 +133,74 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { // The font size should be set by language const infoContainerTextSize = textSettings?.infoContainerTextSize || "64px"; - this.pokemonFormLabelText = addTextObject(infoContainerLabelXPos, 19, i18next.t("pokemonInfoContainer:form"), TextStyle.WINDOW, { fontSize: infoContainerTextSize }); + this.pokemonFormLabelText = addTextObject( + infoContainerLabelXPos, + 19, + i18next.t("pokemonInfoContainer:form"), + TextStyle.WINDOW, + { fontSize: infoContainerTextSize }, + ); this.pokemonFormLabelText.setOrigin(1, 0); this.pokemonFormLabelText.setVisible(false); this.add(this.pokemonFormLabelText); - this.pokemonFormText = addTextObject(infoContainerTextXPos, 19, "", TextStyle.WINDOW, { fontSize: infoContainerTextSize }); + this.pokemonFormText = addTextObject(infoContainerTextXPos, 19, "", TextStyle.WINDOW, { + fontSize: infoContainerTextSize, + }); this.pokemonFormText.setOrigin(0, 0); this.pokemonFormText.setVisible(false); this.add(this.pokemonFormText); - this.pokemonGenderText = addTextObject(-42, -61, "", TextStyle.WINDOW, { fontSize: infoContainerTextSize }); + this.pokemonGenderText = addTextObject(-42, -61, "", TextStyle.WINDOW, { + fontSize: infoContainerTextSize, + }); this.pokemonGenderText.setOrigin(0, 0); this.pokemonGenderText.setVisible(false); this.pokemonGenderText.setName("text-pkmn-gender"); this.add(this.pokemonGenderText); - this.pokemonGenderNewText = addTextObject(-36, -61, "", TextStyle.WINDOW, { fontSize: "64px" }); + this.pokemonGenderNewText = addTextObject(-36, -61, "", TextStyle.WINDOW, { + fontSize: "64px", + }); this.pokemonGenderNewText.setOrigin(0, 0); this.pokemonGenderNewText.setVisible(false); this.pokemonGenderNewText.setName("text-pkmn-new-gender"); this.add(this.pokemonGenderNewText); - this.pokemonAbilityLabelText = addTextObject(infoContainerLabelXPos, 29, i18next.t("pokemonInfoContainer:ability"), TextStyle.WINDOW, { fontSize: infoContainerTextSize }); + this.pokemonAbilityLabelText = addTextObject( + infoContainerLabelXPos, + 29, + i18next.t("pokemonInfoContainer:ability"), + TextStyle.WINDOW, + { fontSize: infoContainerTextSize }, + ); this.pokemonAbilityLabelText.setOrigin(1, 0); this.pokemonAbilityLabelText.setName("text-pkmn-ability-label"); this.add(this.pokemonAbilityLabelText); - this.pokemonAbilityText = addTextObject(infoContainerTextXPos, 29, "", TextStyle.WINDOW, { fontSize: infoContainerTextSize }); + this.pokemonAbilityText = addTextObject(infoContainerTextXPos, 29, "", TextStyle.WINDOW, { + fontSize: infoContainerTextSize, + }); this.pokemonAbilityText.setOrigin(0, 0); this.pokemonAbilityText.setName("text-pkmn-ability"); this.add(this.pokemonAbilityText); - this.pokemonNatureLabelText = addTextObject(infoContainerLabelXPos, 39, i18next.t("pokemonInfoContainer:nature"), TextStyle.WINDOW, { fontSize: infoContainerTextSize }); + this.pokemonNatureLabelText = addTextObject( + infoContainerLabelXPos, + 39, + i18next.t("pokemonInfoContainer:nature"), + TextStyle.WINDOW, + { fontSize: infoContainerTextSize }, + ); this.pokemonNatureLabelText.setOrigin(1, 0); this.pokemonNatureLabelText.setName("text-pkmn-nature-label"); this.add(this.pokemonNatureLabelText); - this.pokemonNatureText = addBBCodeTextObject(infoContainerTextXPos, 39, "", TextStyle.WINDOW, { fontSize: infoContainerTextSize, lineSpacing: 3, maxLines: 2 }); + this.pokemonNatureText = addBBCodeTextObject(infoContainerTextXPos, 39, "", TextStyle.WINDOW, { + fontSize: infoContainerTextSize, + lineSpacing: 3, + maxLines: 2, + }); this.pokemonNatureText.setOrigin(0, 0); this.pokemonNatureText.setName("text-pkmn-nature"); this.add(this.pokemonNatureText); @@ -177,13 +212,23 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.pokemonShinyIcon.setName("img-pkmn-shiny-icon"); this.add(this.pokemonShinyIcon); - this.pokemonShinyNewIcon = addTextObject(this.pokemonShinyIcon.x + 12, this.pokemonShinyIcon.y, "", TextStyle.WINDOW, { fontSize: infoContainerTextSize }); + this.pokemonShinyNewIcon = addTextObject( + this.pokemonShinyIcon.x + 12, + this.pokemonShinyIcon.y, + "", + TextStyle.WINDOW, + { fontSize: infoContainerTextSize }, + ); this.pokemonShinyNewIcon.setOrigin(0, 0); this.pokemonShinyNewIcon.setName("text-pkmn-shiny-new-icon"); this.add(this.pokemonShinyNewIcon); this.pokemonShinyNewIcon.setVisible(false); - this.pokemonFusionShinyIcon = globalScene.add.image(this.pokemonShinyIcon.x, this.pokemonShinyIcon.y, "shiny_star_2"); + this.pokemonFusionShinyIcon = globalScene.add.image( + this.pokemonShinyIcon.x, + this.pokemonShinyIcon.y, + "shiny_star_2", + ); this.pokemonFusionShinyIcon.setOrigin(0, 0); this.pokemonFusionShinyIcon.setScale(0.75); this.pokemonFusionShinyIcon.setName("img-pkmn-fusion-shiny-icon"); @@ -192,7 +237,14 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.setVisible(false); } - show(pokemon: Pokemon, showMoves: boolean = false, speedMultiplier: number = 1, dexEntry?: DexEntry, starterEntry?: StarterDataEntry, eggInfo = false): Promise { + show( + pokemon: Pokemon, + showMoves = false, + speedMultiplier = 1, + dexEntry?: DexEntry, + starterEntry?: StarterDataEntry, + eggInfo = false, + ): Promise { return new Promise(resolve => { if (!dexEntry) { dexEntry = globalScene.gameData.dexData[pokemon.species.speciesId]; @@ -218,23 +270,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.pokemonGenderText.setVisible(false); } - const formKey = (pokemon.species?.forms?.[pokemon.formIndex!]?.formKey); - const formText = Utils.capitalizeString(formKey, "-", false, false) || ""; - const speciesName = Utils.capitalizeString(Species[pokemon.species.speciesId], "_", true, false); - - let formName = ""; - if (pokemon.species.speciesId === Species.ARCEUS) { - formName = i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`); - } else { - const i18key = `pokemonForm:${speciesName}${formText}`; - if (i18next.exists(i18key)) { - formName = i18next.t(i18key); - } else { - const rootSpeciesName = Utils.capitalizeString(Species[pokemon.species.getRootSpeciesId()], "_", true, false); - const i18RootKey = `pokemonForm:${rootSpeciesName}${formText}`; - formName = i18next.exists(i18RootKey) ? i18next.t(i18RootKey) : formText; - } - } + const formName = pokemon.species.getFormNameToDisplay(pokemon.formIndex); if (formName) { this.pokemonFormLabelText.setVisible(true); @@ -249,9 +285,16 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.pokemonFormLabelText.setShadowColor(getTextColor(TextStyle.WINDOW, true, globalScene.uiTheme)); } - this.pokemonFormText.setText(formName.length > this.numCharsBeforeCutoff ? formName.substring(0, this.numCharsBeforeCutoff - 3) + "..." : formName); + this.pokemonFormText.setText( + formName.length > this.numCharsBeforeCutoff + ? `${formName.substring(0, this.numCharsBeforeCutoff - 3)}...` + : formName, + ); if (formName.length > this.numCharsBeforeCutoff) { - this.pokemonFormText.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.pokemonFormText.width, this.pokemonFormText.height), Phaser.Geom.Rectangle.Contains); + this.pokemonFormText.setInteractive( + new Phaser.Geom.Rectangle(0, 0, this.pokemonFormText.width, this.pokemonFormText.height), + Phaser.Geom.Rectangle.Contains, + ); this.pokemonFormText.on("pointerover", () => globalScene.ui.showTooltip("", formName, true)); this.pokemonFormText.on("pointerout", () => globalScene.ui.hideTooltip()); } else { @@ -300,10 +343,17 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.pokemonShinyIcon.setVisible(pokemon.isShiny()); this.pokemonShinyIcon.setTint(getVariantTint(baseVariant)); if (this.pokemonShinyIcon.visible) { - const shinyDescriptor = doubleShiny || baseVariant ? - `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}` - : ""; - this.pokemonShinyIcon.on("pointerover", () => globalScene.ui.showTooltip("", `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, true)); + const shinyDescriptor = + doubleShiny || baseVariant + ? `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}` + : ""; + this.pokemonShinyIcon.on("pointerover", () => + globalScene.ui.showTooltip( + "", + `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, + true, + ), + ); this.pokemonShinyIcon.on("pointerout", () => globalScene.ui.hideTooltip()); const newShiny = BigInt(1 << (pokemon.shiny ? 1 : 0)); @@ -312,9 +362,10 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.pokemonShinyNewIcon.setText("(+)"); this.pokemonShinyNewIcon.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme)); this.pokemonShinyNewIcon.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true, globalScene.uiTheme)); - const newShinyOrVariant = ((newShiny & caughtAttr) === BigInt(0)) || ((newVariant & caughtAttr) === BigInt(0)); + const newShinyOrVariant = (newShiny & caughtAttr) === BigInt(0) || (newVariant & caughtAttr) === BigInt(0); this.pokemonShinyNewIcon.setVisible(!!newShinyOrVariant); - } else if ((caughtAttr & DexAttr.NON_SHINY) === BigInt(0) && ((caughtAttr & DexAttr.SHINY) === DexAttr.SHINY)) { //If the player has *only* caught any shiny variant of this species, not a non-shiny + } else if ((caughtAttr & DexAttr.NON_SHINY) === BigInt(0) && (caughtAttr & DexAttr.SHINY) === DexAttr.SHINY) { + //If the player has *only* caught any shiny variant of this species, not a non-shiny this.pokemonShinyNewIcon.setVisible(true); this.pokemonShinyNewIcon.setText("(+)"); this.pokemonShinyNewIcon.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme)); @@ -330,8 +381,13 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { } const starterSpeciesId = pokemon.species.getRootSpeciesId(); - const originalIvs: integer[] | null = eggInfo ? (dexEntry.caughtAttr ? dexEntry.ivs : null) : (globalScene.gameData.dexData[starterSpeciesId].caughtAttr - ? globalScene.gameData.dexData[starterSpeciesId].ivs : null); + const originalIvs: number[] | null = eggInfo + ? dexEntry.caughtAttr + ? dexEntry.ivs + : null + : globalScene.gameData.dexData[starterSpeciesId].caughtAttr + ? globalScene.gameData.dexData[starterSpeciesId].ivs + : null; this.statsContainer.updateIvs(pokemon.ivs, originalIvs!); // TODO: is this bang correct? if (!eggInfo) { @@ -342,7 +398,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { x: this.initialX - this.infoWindowWidth, onComplete: () => { resolve(); - } + }, }); if (showMoves) { @@ -352,14 +408,14 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { duration: Utils.fixedInt(Math.floor(325 / speedMultiplier)), ease: "Cubic.easeInOut", x: this.movesContainerInitialX - 57, - onComplete: () => resolve() + onComplete: () => resolve(), }); } } for (let m = 0; m < 4; m++) { const move = m < pokemon.moveset.length && pokemon.moveset[m] ? pokemon.moveset[m]!.getMove() : null; - this.pokemonMoveBgs[m].setFrame(Type[move ? move.type : Type.UNKNOWN].toString().toLowerCase()); + this.pokemonMoveBgs[m].setFrame(PokemonType[move ? move.type : PokemonType.UNKNOWN].toString().toLowerCase()); this.pokemonMoveLabels[m].setText(move ? move.name : "-"); this.pokemonMovesContainers[m].setVisible(!!move); } @@ -400,8 +456,10 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.pokemonMovesContainer.setVisible(false); } - makeRoomForConfirmUi(speedMultiplier: number = 1, fromCatch: boolean = false): Promise { - const xPosition = fromCatch ? this.initialX - this.infoWindowWidth - 65 : this.initialX - this.infoWindowWidth - ConfirmUiHandler.windowWidth; + makeRoomForConfirmUi(speedMultiplier = 1, fromCatch = false): Promise { + const xPosition = fromCatch + ? this.initialX - this.infoWindowWidth - 65 + : this.initialX - this.infoWindowWidth - ConfirmUiHandler.windowWidth; return new Promise(resolve => { globalScene.tweens.add({ targets: this, @@ -410,12 +468,12 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { x: xPosition, onComplete: () => { resolve(); - } + }, }); }); } - hide(speedMultiplier: number = 1): Promise { + hide(speedMultiplier = 1): Promise { return new Promise(resolve => { if (!this.shown) { globalScene.showEnemyModifierBar(); @@ -426,7 +484,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { targets: this.pokemonMovesContainer, duration: Utils.fixedInt(Math.floor(750 / speedMultiplier)), ease: "Cubic.easeInOut", - x: this.movesContainerInitialX + x: this.movesContainerInitialX, }); globalScene.tweens.add({ @@ -441,7 +499,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { globalScene.ui.hideTooltip(); globalScene.showEnemyModifierBar(); resolve(); - } + }, }); this.shown = false; diff --git a/src/ui/registration-form-ui-handler.ts b/src/ui/registration-form-ui-handler.ts index 2283ab0047a..72d7ac8375c 100644 --- a/src/ui/registration-form-ui-handler.ts +++ b/src/ui/registration-form-ui-handler.ts @@ -7,39 +7,38 @@ import i18next from "i18next"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; import { globalScene } from "#app/global-scene"; - interface LanguageSetting { - inputFieldFontSize?: string, - warningMessageFontSize?: string, - errorMessageFontSize?: string, + inputFieldFontSize?: string; + warningMessageFontSize?: string; + errorMessageFontSize?: string; } const languageSettings: { [key: string]: LanguageSetting } = { "es-ES": { inputFieldFontSize: "50px", errorMessageFontSize: "40px", - } + }, }; export default class RegistrationFormUiHandler extends FormModalUiHandler { - getModalTitle(config?: ModalConfig): string { + getModalTitle(_config?: ModalConfig): string { return i18next.t("menu:register"); } - getWidth(config?: ModalConfig): number { + getWidth(_config?: ModalConfig): number { return 160; } - getMargin(config?: ModalConfig): [number, number, number, number] { - return [ 0, 0, 48, 0 ]; + getMargin(_config?: ModalConfig): [number, number, number, number] { + return [0, 0, 48, 0]; } getButtonTopMargin(): number { return 8; } - getButtonLabels(config?: ModalConfig): string[] { - return [ i18next.t("menu:register"), i18next.t("menu:backToLogin") ]; + getButtonLabels(_config?: ModalConfig): string[] { + return [i18next.t("menu:register"), i18next.t("menu:backToLogin")]; } getReadableErrorMessage(error: string): string { @@ -62,8 +61,14 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler { override getInputFieldConfigs(): InputFieldConfig[] { const inputFieldConfigs: InputFieldConfig[] = []; inputFieldConfigs.push({ label: i18next.t("menu:username") }); - inputFieldConfigs.push({ label: i18next.t("menu:password"), isPassword: true }); - inputFieldConfigs.push({ label: i18next.t("menu:confirmPassword"), isPassword: true }); + inputFieldConfigs.push({ + label: i18next.t("menu:password"), + isPassword: true, + }); + inputFieldConfigs.push({ + label: i18next.t("menu:confirmPassword"), + isPassword: true, + }); return inputFieldConfigs; } @@ -80,7 +85,9 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler { }); const warningMessageFontSize = languageSettings[i18next.resolvedLanguage!]?.warningMessageFontSize ?? "42px"; - const label = addTextObject(10, 87, i18next.t("menu:registrationAgeWarning"), TextStyle.TOOLTIP_CONTENT, { fontSize: warningMessageFontSize }); + const label = addTextObject(10, 87, i18next.t("menu:registrationAgeWarning"), TextStyle.TOOLTIP_CONTENT, { + fontSize: warningMessageFontSize, + }); this.modalContainer.add(label); } @@ -90,12 +97,12 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler { const config = args[0] as ModalConfig; const originalRegistrationAction = this.submitAction; - this.submitAction = (_) => { + this.submitAction = _ => { if (globalScene.tweens.getTweensOf(this.modalContainer).length === 0) { // Prevent overlapping overrides on action modification this.submitAction = originalRegistrationAction; this.sanitizeInputs(); - globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); + globalScene.ui.setMode(Mode.LOADING, { buttonActions: [] }); const onFail = error => { globalScene.ui.setMode(Mode.REGISTRATION_FORM, Object.assign(config, { errorMessage: error?.trim() })); globalScene.ui.playError(); @@ -113,14 +120,22 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler { if (this.inputs[1].text !== this.inputs[2].text) { return onFail(i18next.t("menu:passwordNotMatchingConfirmPassword")); } - const [ usernameInput, passwordInput ] = this.inputs; - pokerogueApi.account.register({ username: usernameInput.text, password: passwordInput.text }) + const [usernameInput, passwordInput] = this.inputs; + pokerogueApi.account + .register({ + username: usernameInput.text, + password: passwordInput.text, + }) .then(registerError => { if (!registerError) { - pokerogueApi.account.login({ username: usernameInput.text, password: passwordInput.text }) + pokerogueApi.account + .login({ + username: usernameInput.text, + password: passwordInput.text, + }) .then(loginError => { if (!loginError) { - originalRegistrationAction && originalRegistrationAction(); + originalRegistrationAction?.(); } else { onFail(loginError); } diff --git a/src/ui/rename-form-ui-handler.ts b/src/ui/rename-form-ui-handler.ts index 3004530063e..91c0025d283 100644 --- a/src/ui/rename-form-ui-handler.ts +++ b/src/ui/rename-form-ui-handler.ts @@ -5,20 +5,20 @@ import i18next from "i18next"; import type { PlayerPokemon } from "#app/field/pokemon"; export default class RenameFormUiHandler extends FormModalUiHandler { - getModalTitle(config?: ModalConfig): string { + getModalTitle(_config?: ModalConfig): string { return i18next.t("menu:renamePokemon"); } - getWidth(config?: ModalConfig): number { + getWidth(_config?: ModalConfig): number { return 160; } - getMargin(config?: ModalConfig): [number, number, number, number] { - return [ 0, 0, 48, 0 ]; + getMargin(_config?: ModalConfig): [number, number, number, number] { + return [0, 0, 48, 0]; } - getButtonLabels(config?: ModalConfig): string[] { - return [ i18next.t("menu:rename"), i18next.t("menu:cancel") ]; + getButtonLabels(_config?: ModalConfig): string[] { + return [i18next.t("menu:rename"), i18next.t("menu:cancel")]; } getReadableErrorMessage(error: string): string { @@ -42,7 +42,7 @@ export default class RenameFormUiHandler extends FormModalUiHandler { } else { this.inputs[0].text = args[1]; } - this.submitAction = (_) => { + this.submitAction = _ => { this.sanitizeInputs(); const sanitizedName = btoa(unescape(encodeURIComponent(this.inputs[0].text))); config.buttonActions[0](sanitizedName); diff --git a/src/ui/run-history-ui-handler.ts b/src/ui/run-history-ui-handler.ts index 2a498f77b8d..85ea1e93e8d 100644 --- a/src/ui/run-history-ui-handler.ts +++ b/src/ui/run-history-ui-handler.ts @@ -25,7 +25,6 @@ export const RUN_HISTORY_LIMIT: number = 25; * The only valid input buttons are Button.ACTION and Button.CANCEL. */ export default class RunHistoryUiHandler extends MessageUiHandler { - private readonly maxRows = 3; private runSelectContainer: Phaser.GameObjects.Container; @@ -34,7 +33,7 @@ export default class RunHistoryUiHandler extends MessageUiHandler { private runSelectCallback: RunSelectCallback | null; - private scrollCursor: number = 0; + private scrollCursor = 0; private cursorObj: Phaser.GameObjects.NineSlice | null; @@ -51,7 +50,13 @@ export default class RunHistoryUiHandler extends MessageUiHandler { this.runSelectContainer.setVisible(false); ui.add(this.runSelectContainer); - const loadSessionBg = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, -globalScene.game.canvas.height / 6, 0x006860); + const loadSessionBg = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width / 6, + -globalScene.game.canvas.height / 6, + 0x006860, + ); loadSessionBg.setOrigin(0, 0); this.runSelectContainer.add(loadSessionBg); @@ -101,7 +106,7 @@ export default class RunHistoryUiHandler extends MessageUiHandler { let success = false; const error = false; - if ([ Button.ACTION, Button.CANCEL ].includes(button)) { + if ([Button.ACTION, Button.CANCEL].includes(button)) { if (button === Button.ACTION) { const cursor = this.cursor + this.scrollCursor; if (this.runs[cursor]) { @@ -111,11 +116,10 @@ export default class RunHistoryUiHandler extends MessageUiHandler { } success = true; return success; - } else { - this.runSelectCallback = null; - success = true; - globalScene.ui.revertMode(); } + this.runSelectCallback = null; + success = true; + globalScene.ui.revertMode(); } else if (this.runs.length > 0) { switch (button) { case Button.UP: @@ -124,7 +128,7 @@ export default class RunHistoryUiHandler extends MessageUiHandler { } else if (this.scrollCursor) { success = this.setScrollCursor(this.scrollCursor - 1); } else if (this.runs.length > 1) { - // wrap around to the bottom + // wrap around to the bottom success = this.setCursor(Math.min(this.runs.length - 1, this.maxRows - 1)); success = this.setScrollCursor(Math.max(0, this.runs.length - this.maxRows)) || success; } @@ -135,7 +139,7 @@ export default class RunHistoryUiHandler extends MessageUiHandler { } else if (this.scrollCursor < this.runs.length - this.maxRows) { success = this.setScrollCursor(this.scrollCursor + 1); } else if (this.runs.length > 1) { - // wrap around to the top + // wrap around to the top success = this.setCursor(0); success = this.setScrollCursor(0) || success; } @@ -186,7 +190,9 @@ export default class RunHistoryUiHandler extends MessageUiHandler { const emptyWindow = addWindow(0, 0, 304, 165); this.runsContainer.add(emptyWindow); const emptyWindowCoordinates = emptyWindow.getCenter(); - const emptyText = addTextObject(0, 0, i18next.t("saveSlotSelectUiHandler:empty"), TextStyle.WINDOW, { fontSize: "128px" }); + const emptyText = addTextObject(0, 0, i18next.t("saveSlotSelectUiHandler:empty"), TextStyle.WINDOW, { + fontSize: "128px", + }); emptyText.setPosition(emptyWindowCoordinates.x - 18, emptyWindowCoordinates.y - 15); this.runsContainer.add(emptyText); } @@ -213,7 +219,7 @@ export default class RunHistoryUiHandler extends MessageUiHandler { targets: this.runsContainer, y: this.runContainerInitialY - 56 * scrollCursor, duration: Utils.fixedInt(325), - ease: "Sine.easeInOut" + ease: "Sine.easeInOut", }); } return changed; @@ -261,7 +267,6 @@ class RunEntryContainer extends Phaser.GameObjects.Container { this.entryData = entryData; this.setup(this.entryData); - } /** @@ -275,7 +280,6 @@ class RunEntryContainer extends Phaser.GameObjects.Container { * The player's party and their levels at the time of the last wave of the run are also displayed. */ private setup(run: RunEntry) { - const victory = run.isVictory; const data = globalScene.gameData.parseSessionData(JSON.stringify(run.entry)); @@ -286,22 +290,34 @@ class RunEntryContainer extends Phaser.GameObjects.Container { if (victory) { const gameOutcomeLabel = addTextObject(8, 5, `${i18next.t("runHistory:victory")}`, TextStyle.WINDOW); this.add(gameOutcomeLabel); - } else { // Run Result: Defeats + } else { + // Run Result: Defeats const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET; const genderStr = PlayerGender[genderIndex].toLowerCase(); // Defeats from wild Pokemon battles will show the Pokemon responsible by the text of the run result. if (data.battleType === BattleType.WILD || (data.battleType === BattleType.MYSTERY_ENCOUNTER && !data.trainer)) { const enemyContainer = globalScene.add.container(8, 5); - const gameOutcomeLabel = addTextObject(0, 0, `${i18next.t("runHistory:defeatedWild", { context: genderStr })}`, TextStyle.WINDOW); + const gameOutcomeLabel = addTextObject( + 0, + 0, + `${i18next.t("runHistory:defeatedWild", { context: genderStr })}`, + TextStyle.WINDOW, + ); enemyContainer.add(gameOutcomeLabel); data.enemyParty.forEach((enemyData, e) => { - const enemyIconContainer = globalScene.add.container(65 + (e * 25), -8); + const enemyIconContainer = globalScene.add.container(65 + e * 25, -8); enemyIconContainer.setScale(0.75); enemyData.boss = false; enemyData["player"] = true; const enemy = enemyData.toPokemon(); const enemyIcon = globalScene.addPokemonIcon(enemy, 0, 0, 0, 0); - const enemyLevel = addTextObject(32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" }); + const enemyLevel = addTextObject( + 32, + 20, + `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, + TextStyle.PARTY, + { fontSize: "54px", color: "#f8f8f8" }, + ); enemyLevel.setShadow(0, 0, undefined); enemyLevel.setStroke("#424242", 14); enemyLevel.setOrigin(1, 0); @@ -311,16 +327,30 @@ class RunEntryContainer extends Phaser.GameObjects.Container { enemy.destroy(); }); this.add(enemyContainer); - } else if (data.battleType === BattleType.TRAINER || (data.battleType === BattleType.MYSTERY_ENCOUNTER && data.trainer)) { // Defeats from Trainers show the trainer's title and name + } else if ( + data.battleType === BattleType.TRAINER || + (data.battleType === BattleType.MYSTERY_ENCOUNTER && data.trainer) + ) { + // Defeats from Trainers show the trainer's title and name const tObj = data.trainer.toTrainer(); // Because of the interesting mechanics behind rival names, the rival name and title have to be retrieved differently const RIVAL_TRAINER_ID_THRESHOLD = 375; if (data.trainer.trainerType >= RIVAL_TRAINER_ID_THRESHOLD) { - const rivalName = (tObj.variant === TrainerVariant.FEMALE) ? "trainerNames:rival_female" : "trainerNames:rival"; - const gameOutcomeLabel = addTextObject(8, 5, `${i18next.t("runHistory:defeatedRival", { context: genderStr })} ${i18next.t(rivalName)}`, TextStyle.WINDOW); + const rivalName = tObj.variant === TrainerVariant.FEMALE ? "trainerNames:rival_female" : "trainerNames:rival"; + const gameOutcomeLabel = addTextObject( + 8, + 5, + `${i18next.t("runHistory:defeatedRival", { context: genderStr })} ${i18next.t(rivalName)}`, + TextStyle.WINDOW, + ); this.add(gameOutcomeLabel); } else { - const gameOutcomeLabel = addTextObject(8, 5, `${i18next.t("runHistory:defeatedTrainer", { context: genderStr })}${tObj.getName(0, true)}`, TextStyle.WINDOW); + const gameOutcomeLabel = addTextObject( + 8, + 5, + `${i18next.t("runHistory:defeatedTrainer", { context: genderStr })}${tObj.getName(0, true)}`, + TextStyle.WINDOW, + ); this.add(gameOutcomeLabel); } } @@ -375,7 +405,13 @@ class RunEntryContainer extends Phaser.GameObjects.Container { const pokemon = p.toPokemon(); const icon = globalScene.addPokemonIcon(pokemon, 0, 0, 0, 0); - const text = addTextObject(32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(pokemon.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" }); + const text = addTextObject( + 32, + 20, + `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(pokemon.level, 1000)}`, + TextStyle.PARTY, + { fontSize: "54px", color: "#f8f8f8" }, + ); text.setShadow(0, 0, undefined); text.setStroke("#424242", 14); text.setOrigin(1, 0); diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/run-info-ui-handler.ts index 43b95cb3793..364cb8e4003 100644 --- a/src/ui/run-info-ui-handler.ts +++ b/src/ui/run-info-ui-handler.ts @@ -15,7 +15,7 @@ import { Challenges } from "#enums/challenges"; import { getLuckString, getLuckTextTint } from "../modifier/modifier-type"; import RoundRectangle from "phaser3-rex-plugins/plugins/roundrectangle"; import { getTypeRgb } from "#app/data/type"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { TypeColor, TypeShadow } from "#app/enums/color"; import { getNatureStatMultiplier, getNatureName } from "../data/nature"; import { getVariantTint } from "#app/data/variant"; @@ -35,12 +35,12 @@ import { globalScene } from "#app/global-scene"; enum RunInfoUiMode { MAIN, HALL_OF_FAME, - ENDING_ART + ENDING_ART, } export enum RunDisplayMode { RUN_HISTORY, - SESSION_PREVIEW + SESSION_PREVIEW, } /** @@ -59,12 +59,12 @@ export default class RunInfoUiHandler extends UiHandler { private runResultContainer: Phaser.GameObjects.Container; private runInfoContainer: Phaser.GameObjects.Container; private partyContainer: Phaser.GameObjects.Container; - private statsBgWidth: integer; + private statsBgWidth: number; private hallofFameContainer: Phaser.GameObjects.Container; private endCardContainer: Phaser.GameObjects.Container; - private partyVisibility: Boolean; + private partyVisibility: boolean; private modifiersModule: any; constructor() { @@ -72,12 +72,12 @@ export default class RunInfoUiHandler extends UiHandler { } override async setup() { - this.runContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1); + this.runContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1); // The import of the modifiersModule is loaded here to sidestep async/await issues. this.modifiersModule = Modifier; this.runContainer.setVisible(false); globalScene.loadImage("encounter_exclaim", "mystery-encounters"); - } + } /** * This takes a run's RunEntry and uses the information provided to display essential information about the player's run. @@ -90,10 +90,16 @@ export default class RunInfoUiHandler extends UiHandler { * Party Container: * this.isVictory === true --> Hall of Fame Container: */ - override show(args: any[]): boolean { - super.show(args); + override show(args: any[]): boolean { + super.show(args); - const gameStatsBg = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width, globalScene.game.canvas.height, 0x006860); + const gameStatsBg = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width, + globalScene.game.canvas.height, + 0x006860, + ); gameStatsBg.setOrigin(0, 0); this.runContainer.add(gameStatsBg); @@ -112,7 +118,7 @@ export default class RunInfoUiHandler extends UiHandler { // Creates Header and adds to this.runContainer this.addHeader(); - this.statsBgWidth = ((globalScene.game.canvas.width / 6) - 2) / 3; + this.statsBgWidth = (globalScene.game.canvas.width / 6 - 2) / 3; // Creates Run Result Container this.runResultContainer = globalScene.add.container(0, 24); @@ -131,14 +137,17 @@ export default class RunInfoUiHandler extends UiHandler { const runInfoWindow = addWindow(0, 0, this.statsBgWidth - 11, 90); const runInfoWindowCoords = runInfoWindow.getBottomRight(); this.runInfoContainer.add(runInfoWindow); - this.parseRunInfo(runInfoWindowCoords.x, runInfoWindowCoords.y); + this.parseRunInfo(runInfoWindowCoords.x, runInfoWindowCoords.y); // Creates Player Party Container this.partyContainer = globalScene.add.container(this.statsBgWidth - 10, 23); this.parsePartyInfo(); this.showParty(true); - this.runContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains); + this.runContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), + Phaser.Geom.Rectangle.Contains, + ); this.getUi().bringToTop(this.runContainer); this.runContainer.setVisible(true); @@ -155,7 +164,7 @@ export default class RunInfoUiHandler extends UiHandler { this.getUi().hideTooltip(); return true; - } + } /** * Creates and adds the header background, title text, and important buttons to RunInfoUiHandler @@ -163,22 +172,33 @@ export default class RunInfoUiHandler extends UiHandler { * It does not check if the run has any PokemonHeldItemModifiers though. */ private addHeader() { - const headerBg = addWindow(0, 0, (globalScene.game.canvas.width / 6) - 2, 24); + const headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6 - 2, 24); headerBg.setOrigin(0, 0); this.runContainer.add(headerBg); if (this.runInfo.modifiers.length !== 0) { const headerBgCoords = headerBg.getTopRight(); const abilityButtonContainer = globalScene.add.container(0, 0); - const abilityButtonText = addTextObject(8, 0, i18next.t("runHistory:viewHeldItems"), TextStyle.WINDOW, { fontSize:"34px" }); + const abilityButtonText = addTextObject(8, 0, i18next.t("runHistory:viewHeldItems"), TextStyle.WINDOW, { + fontSize: "34px", + }); const gamepadType = this.getUi().getGamepadType(); let abilityButtonElement: Phaser.GameObjects.Sprite; if (gamepadType === "touch") { abilityButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 2, "keyboard", "E.png"); } else { - abilityButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 2, gamepadType, globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Ability)); + abilityButtonElement = new Phaser.GameObjects.Sprite( + globalScene, + 0, + 2, + gamepadType, + globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Ability), + ); } - abilityButtonContainer.add([ abilityButtonText, abilityButtonElement ]); - abilityButtonContainer.setPosition(headerBgCoords.x - abilityButtonText.displayWidth - abilityButtonElement.displayWidth - 8, 10); + abilityButtonContainer.add([abilityButtonText, abilityButtonElement]); + abilityButtonContainer.setPosition( + headerBgCoords.x - abilityButtonText.displayWidth - abilityButtonElement.displayWidth - 8, + 10, + ); this.runContainer.add(abilityButtonContainer); } const headerText = addTextObject(0, 0, i18next.t("runHistory:runInfo"), TextStyle.SETTINGS_LABEL); @@ -199,13 +219,25 @@ export default class RunInfoUiHandler extends UiHandler { const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET; const genderStr = PlayerGender[genderIndex]; const runResultTextStyle = this.isVictory ? TextStyle.PERFECT_IV : TextStyle.SUMMARY_RED; - const runResultTitle = this.isVictory ? i18next.t("runHistory:victory") : i18next.t("runHistory:defeated", { context: genderStr }); - const runResultText = addTextObject(6, 5, `${runResultTitle} - ${i18next.t("saveSlotSelectUiHandler:wave")} ${this.runInfo.waveIndex}`, runResultTextStyle, { fontSize : "65px", lineSpacing: 0.1 }); + const runResultTitle = this.isVictory + ? i18next.t("runHistory:victory") + : i18next.t("runHistory:defeated", { context: genderStr }); + const runResultText = addTextObject( + 6, + 5, + `${runResultTitle} - ${i18next.t("saveSlotSelectUiHandler:wave")} ${this.runInfo.waveIndex}`, + runResultTextStyle, + { fontSize: "65px", lineSpacing: 0.1 }, + ); if (this.isVictory) { const hallofFameInstructionContainer = globalScene.add.container(0, 0); - const shinyButtonText = addTextObject(8, 0, i18next.t("runHistory:viewHallOfFame"), TextStyle.WINDOW, { fontSize:"65px" }); - const formButtonText = addTextObject(8, 12, i18next.t("runHistory:viewEndingSplash"), TextStyle.WINDOW, { fontSize:"65px" }); + const shinyButtonText = addTextObject(8, 0, i18next.t("runHistory:viewHallOfFame"), TextStyle.WINDOW, { + fontSize: "65px", + }); + const formButtonText = addTextObject(8, 12, i18next.t("runHistory:viewEndingSplash"), TextStyle.WINDOW, { + fontSize: "65px", + }); const gamepadType = this.getUi().getGamepadType(); let shinyButtonElement: Phaser.GameObjects.Sprite; let formButtonElement: Phaser.GameObjects.Sprite; @@ -213,12 +245,24 @@ export default class RunInfoUiHandler extends UiHandler { shinyButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 4, "keyboard", "R.png"); formButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 16, "keyboard", "F.png"); } else { - shinyButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 4, gamepadType, globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Shiny)); - formButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 16, gamepadType, globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Form)); + shinyButtonElement = new Phaser.GameObjects.Sprite( + globalScene, + 0, + 4, + gamepadType, + globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Shiny), + ); + formButtonElement = new Phaser.GameObjects.Sprite( + globalScene, + 0, + 16, + gamepadType, + globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Form), + ); } - hallofFameInstructionContainer.add([ shinyButtonText, shinyButtonElement ]); + hallofFameInstructionContainer.add([shinyButtonText, shinyButtonElement]); - hallofFameInstructionContainer.add([ formButtonText, formButtonElement ]); + hallofFameInstructionContainer.add([formButtonText, formButtonElement]); hallofFameInstructionContainer.setPosition(12, 25); this.runResultContainer.add(hallofFameInstructionContainer); @@ -229,18 +273,24 @@ export default class RunInfoUiHandler extends UiHandler { if (!this.isVictory) { const enemyContainer = globalScene.add.container(0, 0); // Wild - Single and Doubles - if (this.runInfo.battleType === BattleType.WILD || (this.runInfo.battleType === BattleType.MYSTERY_ENCOUNTER && !this.runInfo.trainer)) { + if ( + this.runInfo.battleType === BattleType.WILD || + (this.runInfo.battleType === BattleType.MYSTERY_ENCOUNTER && !this.runInfo.trainer) + ) { switch (this.runInfo.enemyParty.length) { case 1: - // Wild - Singles + // Wild - Singles this.parseWildSingleDefeat(enemyContainer); break; case 2: - //Wild - Doubles + //Wild - Doubles this.parseWildDoubleDefeat(enemyContainer); break; } - } else if (this.runInfo.battleType === BattleType.TRAINER || (this.runInfo.battleType === BattleType.MYSTERY_ENCOUNTER && this.runInfo.trainer)) { + } else if ( + this.runInfo.battleType === BattleType.TRAINER || + (this.runInfo.battleType === BattleType.MYSTERY_ENCOUNTER && this.runInfo.trainer) + ) { this.parseTrainerDefeat(enemyContainer); } this.runResultContainer.add(enemyContainer); @@ -270,20 +320,30 @@ export default class RunInfoUiHandler extends UiHandler { const pokeball = globalScene.add.sprite(0, 0, "pb"); pokeball.setFrame(getPokeballAtlasKey(p.pokeball)); pokeball.setScale(0.5); - pokeball.setPosition(58 + ((i % row_limit) * 8), (i <= 2) ? 18 : 25); + pokeball.setPosition(58 + (i % row_limit) * 8, i <= 2 ? 18 : 25); enemyContainer.add(pokeball); }); const trainerObj = this.runInfo.trainer.toTrainer(); const RIVAL_TRAINER_ID_THRESHOLD = 375; let trainerName = ""; if (this.runInfo.trainer.trainerType >= RIVAL_TRAINER_ID_THRESHOLD) { - trainerName = (trainerObj.variant === TrainerVariant.FEMALE) ? i18next.t("trainerNames:rival_female") : i18next.t("trainerNames:rival"); + trainerName = + trainerObj.variant === TrainerVariant.FEMALE + ? i18next.t("trainerNames:rival_female") + : i18next.t("trainerNames:rival"); } else { trainerName = trainerObj.getName(0, true); } - const boxString = i18next.t(trainerObj.variant !== TrainerVariant.DOUBLE ? "battle:trainerAppeared" : "battle:trainerAppearedDouble", { trainerName: trainerName }).replace(/\n/g, " "); + const boxString = i18next + .t(trainerObj.variant !== TrainerVariant.DOUBLE ? "battle:trainerAppeared" : "battle:trainerAppearedDouble", { + trainerName: trainerName, + }) + .replace(/\n/g, " "); const descContainer = globalScene.add.container(0, 0); - const textBox = addTextObject(0, 0, boxString, TextStyle.WINDOW, { fontSize : "35px", wordWrap: { width: 200 }}); + const textBox = addTextObject(0, 0, boxString, TextStyle.WINDOW, { + fontSize: "35px", + wordWrap: { width: 200 }, + }); descContainer.add(textBox); descContainer.setPosition(55, 32); this.runResultContainer.add(descContainer); @@ -294,25 +354,43 @@ export default class RunInfoUiHandler extends UiHandler { const subSprite = globalScene.add.sprite(56, -106, "pkmn__sub"); subSprite.setScale(0.65); subSprite.setPosition(34, 46); - const mysteryEncounterTitle = i18next.t(globalScene.getMysteryEncounter(this.runInfo.mysteryEncounterType as MysteryEncounterType, true).localizationKey + ":title"); + const mysteryEncounterTitle = i18next.t( + globalScene.getMysteryEncounter(this.runInfo.mysteryEncounterType as MysteryEncounterType, true) + .localizationKey + ":title", + ); const descContainer = globalScene.add.container(0, 0); - const textBox = addTextObject(0, 0, mysteryEncounterTitle, TextStyle.WINDOW, { fontSize : "45px", wordWrap: { width: 160 }}); + const textBox = addTextObject(0, 0, mysteryEncounterTitle, TextStyle.WINDOW, { + fontSize: "45px", + wordWrap: { width: 160 }, + }); descContainer.add(textBox); descContainer.setPosition(47, 37); - this.runResultContainer.add([ encounterExclaim, subSprite, descContainer ]); + this.runResultContainer.add([encounterExclaim, subSprite, descContainer]); } const runResultWindow = this.runResultContainer.getByName("Run_Result_Window") as Phaser.GameObjects.Image; const windowCenterX = runResultWindow.getTopCenter().x; const windowBottomY = runResultWindow.getBottomCenter().y; - const runStatusText = addTextObject(windowCenterX, 5, `${i18next.t("saveSlotSelectUiHandler:wave")} ${this.runInfo.waveIndex}`, TextStyle.WINDOW, { fontSize : "60px", lineSpacing: 0.1 }); + const runStatusText = addTextObject( + windowCenterX, + 5, + `${i18next.t("saveSlotSelectUiHandler:wave")} ${this.runInfo.waveIndex}`, + TextStyle.WINDOW, + { fontSize: "60px", lineSpacing: 0.1 }, + ); runStatusText.setOrigin(0.5, 0); - const currentBiomeText = addTextObject(windowCenterX, windowBottomY - 5, `${getBiomeName(this.runInfo.arena.biome)}`, TextStyle.WINDOW, { fontSize: "60px" }); + const currentBiomeText = addTextObject( + windowCenterX, + windowBottomY - 5, + `${getBiomeName(this.runInfo.arena.biome)}`, + TextStyle.WINDOW, + { fontSize: "60px" }, + ); currentBiomeText.setOrigin(0.5, 1); - this.runResultContainer.add([ runStatusText, currentBiomeText ]); + this.runResultContainer.add([runStatusText, currentBiomeText]); this.runContainer.add(this.runResultContainer); } @@ -330,7 +408,13 @@ export default class RunInfoUiHandler extends UiHandler { const enemy = enemyData.toPokemon(); const enemyIcon = globalScene.addPokemonIcon(enemy, 0, 0, 0, 0); const enemyLevelStyle = bossStatus ? TextStyle.PARTY_RED : TextStyle.PARTY; - const enemyLevel = addTextObject(36, 26, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, enemyLevelStyle, { fontSize: "44px", color: "#f8f8f8" }); + const enemyLevel = addTextObject( + 36, + 26, + `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, + enemyLevelStyle, + { fontSize: "44px", color: "#f8f8f8" }, + ); enemyLevel.setShadow(0, 0, undefined); enemyLevel.setStroke("#424242", 14); enemyLevel.setOrigin(1, 0); @@ -354,7 +438,13 @@ export default class RunInfoUiHandler extends UiHandler { enemyData["player"] = true; const enemy = enemyData.toPokemon(); const enemyIcon = globalScene.addPokemonIcon(enemy, 0, 0, 0, 0); - const enemyLevel = addTextObject(36, 26, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, bossStatus ? TextStyle.PARTY_RED : TextStyle.PARTY, { fontSize: "44px", color: "#f8f8f8" }); + const enemyLevel = addTextObject( + 36, + 26, + `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, + bossStatus ? TextStyle.PARTY_RED : TextStyle.PARTY, + { fontSize: "44px", color: "#f8f8f8" }, + ); enemyLevel.setShadow(0, 0, undefined); enemyLevel.setStroke("#424242", 14); enemyLevel.setOrigin(1, 0); @@ -386,8 +476,8 @@ export default class RunInfoUiHandler extends UiHandler { const tObjPartnerSprite = globalScene.add.sprite(5, -3, tObjPartnerSpriteKey); // Double Trainers have smaller sprites than Single Trainers if (this.runDisplayMode === RunDisplayMode.RUN_HISTORY) { - tObjPartnerSprite.setScale(0.20); - tObjSprite.setScale(0.20); + tObjPartnerSprite.setScale(0.2); + tObjSprite.setScale(0.2); doubleContainer.add(tObjSprite); doubleContainer.add(tObjPartnerSprite); doubleContainer.setPosition(12, 38); @@ -395,13 +485,13 @@ export default class RunInfoUiHandler extends UiHandler { tObjSprite.setScale(0.55); tObjSprite.setPosition(-9, -3); tObjPartnerSprite.setScale(0.55); - doubleContainer.add([ tObjSprite, tObjPartnerSprite ]); + doubleContainer.add([tObjSprite, tObjPartnerSprite]); doubleContainer.setPosition(28, 34); } enemyContainer.add(doubleContainer); } else { - const scale = (this.runDisplayMode === RunDisplayMode.RUN_HISTORY) ? 0.35 : 0.55; - const position = (this.runDisplayMode === RunDisplayMode.RUN_HISTORY) ? [ 12, 28 ] : [ 30, 32 ]; + const scale = this.runDisplayMode === RunDisplayMode.RUN_HISTORY ? 0.35 : 0.55; + const position = this.runDisplayMode === RunDisplayMode.RUN_HISTORY ? [12, 28] : [30, 32]; tObjSprite.setScale(scale, scale); tObjSprite.setPosition(position[0], position[1]); enemyContainer.add(tObjSprite); @@ -420,17 +510,6 @@ export default class RunInfoUiHandler extends UiHandler { private parseTrainerDefeat(enemyContainer: Phaser.GameObjects.Container) { // Loads and adds trainer sprites to the UI this.showTrainerSprites(enemyContainer); - // Determining which Terastallize Modifier belongs to which Pokemon - // Creates a dictionary {PokemonId: TeraShardType} - const teraPokemon = {}; - this.runInfo.enemyModifiers.forEach((m) => { - const modifier = m.toModifier(this.modifiersModule[m.className]); - if (modifier instanceof Modifier.TerastallizeModifier) { - const teraDetails = modifier?.getArgs(); - const pkmnId = teraDetails[0]; - teraPokemon[pkmnId] = teraDetails[1]; - } - }); // Creates the Pokemon icons + level information and adds it to enemyContainer // 2 Rows x 3 Columns @@ -444,20 +523,14 @@ export default class RunInfoUiHandler extends UiHandler { enemyData["player"] = true; const enemy = enemyData.toPokemon(); const enemyIcon = globalScene.addPokemonIcon(enemy, 0, 0, 0, 0); - // Applying Terastallizing Type tint to Pokemon icon - // If the Pokemon is a fusion, it has two sprites and so, the tint has to be applied to each icon separately - const enemySprite1 = enemyIcon.list[0] as Phaser.GameObjects.Sprite; - const enemySprite2 = (enemyIcon.list.length > 1) ? enemyIcon.list[1] as Phaser.GameObjects.Sprite : undefined; - if (teraPokemon[enemyData.id]) { - const teraTint = getTypeRgb(teraPokemon[enemyData.id]); - const teraColor = new Phaser.Display.Color(teraTint[0], teraTint[1], teraTint[2]); - enemySprite1.setTint(teraColor.color); - if (enemySprite2) { - enemySprite2.setTint(teraColor.color); - } - } - enemyIcon.setPosition(39 * (e % 3) + 5, (35 * pokemonRowHeight)); - const enemyLevel = addTextObject(43 * (e % 3), (27 * (pokemonRowHeight + 1)), `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, isBoss ? TextStyle.PARTY_RED : TextStyle.PARTY, { fontSize: "54px" }); + enemyIcon.setPosition(39 * (e % 3) + 5, 35 * pokemonRowHeight); + const enemyLevel = addTextObject( + 43 * (e % 3), + 27 * (pokemonRowHeight + 1), + `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, + isBoss ? TextStyle.PARTY_RED : TextStyle.PARTY, + { fontSize: "54px" }, + ); enemyLevel.setShadow(0, 0, undefined); enemyLevel.setStroke("#424242", 14); enemyLevel.setOrigin(0, 0); @@ -480,7 +553,10 @@ export default class RunInfoUiHandler extends UiHandler { private async parseRunInfo(windowX: number, windowY: number) { // Parsing and displaying the mode. // In the future, parsing Challenges + Challenge Rules may have to be reworked as PokeRogue adds additional challenges and users can stack these challenges in various ways. - const modeText = addBBCodeTextObject(7, 0, "", TextStyle.WINDOW, { fontSize : "50px", lineSpacing:3 }); + const modeText = addBBCodeTextObject(7, 0, "", TextStyle.WINDOW, { + fontSize: "50px", + lineSpacing: 3, + }); modeText.setPosition(7, 5); modeText.appendText(i18next.t("runHistory:mode") + ": ", false); switch (this.runInfo.gameMode) { @@ -514,7 +590,10 @@ export default class RunInfoUiHandler extends UiHandler { } // If the player achieves a personal best in Endless, the mode text will be tinted similarly to SSS luck to celebrate their achievement. - if ((this.runInfo.gameMode === GameModes.ENDLESS || this.runInfo.gameMode === GameModes.SPLICED_ENDLESS) && this.runInfo.waveIndex === globalScene.gameData.gameStats.highestEndlessWave) { + if ( + (this.runInfo.gameMode === GameModes.ENDLESS || this.runInfo.gameMode === GameModes.SPLICED_ENDLESS) && + this.runInfo.waveIndex === globalScene.gameData.gameStats.highestEndlessWave + ) { modeText.appendText(` [${i18next.t("runHistory:personalBest")}]`); modeText.setTint(0xffef5c, 0x47ff69, 0x6b6bff, 0xff6969); } @@ -522,22 +601,35 @@ export default class RunInfoUiHandler extends UiHandler { // Duration + Money const runInfoTextContainer = globalScene.add.container(0, 0); // Japanese is set to a greater line spacing of 35px in addBBCodeTextObject() if lineSpacing < 12. - const lineSpacing = (i18next.resolvedLanguage === "ja") ? 12 : 3; - const runInfoText = addBBCodeTextObject(7, 0, "", TextStyle.WINDOW, { fontSize: "50px", lineSpacing: lineSpacing }); + const lineSpacing = i18next.resolvedLanguage === "ja" ? 12 : 3; + const runInfoText = addBBCodeTextObject(7, 0, "", TextStyle.WINDOW, { + fontSize: "50px", + lineSpacing: lineSpacing, + }); const runTime = Utils.getPlayTimeString(this.runInfo.playTime); runInfoText.appendText(`${i18next.t("runHistory:runLength")}: ${runTime}`, false); const runMoney = Utils.formatMoney(globalScene.moneyFormat, this.runInfo.money); const moneyTextColor = getTextColor(TextStyle.MONEY_WINDOW, false, globalScene.uiTheme); - runInfoText.appendText(`[color=${moneyTextColor}]${i18next.t("battleScene:moneyOwned", { formattedMoney : runMoney })}[/color]`); + runInfoText.appendText( + `[color=${moneyTextColor}]${i18next.t("battleScene:moneyOwned", { formattedMoney: runMoney })}[/color]`, + ); runInfoText.setPosition(7, 70); runInfoTextContainer.add(runInfoText); // Luck // Uses the parameters windowX and windowY to dynamically position the luck value neatly into the bottom right corner - const luckText = addBBCodeTextObject(0, 0, "", TextStyle.WINDOW, { fontSize: "55px" }); - const luckValue = Phaser.Math.Clamp(this.runInfo.party.map(p => p.toPokemon().getLuck()).reduce((total: integer, value: integer) => total += value, 0), 0, 14); + const luckText = addBBCodeTextObject(0, 0, "", TextStyle.WINDOW, { + fontSize: "55px", + }); + const luckValue = Phaser.Math.Clamp( + this.runInfo.party + .map(p => p.toPokemon().getLuck()) + .reduce((total: number, value: number) => (total += value), 0), + 0, + 14, + ); let luckInfo = i18next.t("runHistory:luck") + ": " + getLuckString(luckValue); if (luckValue < 14) { - luckInfo = "[color=#" + (getLuckTextTint(luckValue)).toString(16) + "]" + luckInfo + "[/color]"; + luckInfo = "[color=#" + getLuckTextTint(luckValue).toString(16) + "]" + luckInfo + "[/color]"; } else { luckText.setTint(0xffef5c, 0x47ff69, 0x6b6bff, 0xff6969); } @@ -550,7 +642,10 @@ export default class RunInfoUiHandler extends UiHandler { if (this.runInfo.modifiers.length) { let visibleModifierIndex = 0; - const modifierIconsContainer = globalScene.add.container(8, (this.runInfo.gameMode === GameModes.CHALLENGE) ? 20 : 15); + const modifierIconsContainer = globalScene.add.container( + 8, + this.runInfo.gameMode === GameModes.CHALLENGE ? 20 : 15, + ); modifierIconsContainer.setScale(0.45); for (const m of this.runInfo.modifiers) { const modifier = m.toModifier(this.modifiersModule[m.className]); @@ -560,7 +655,7 @@ export default class RunInfoUiHandler extends UiHandler { const icon = modifier?.getIcon(false); if (icon) { const rowHeightModifier = Math.floor(visibleModifierIndex / 7); - icon.setPosition(24 * (visibleModifierIndex % 7), 20 + (35 * rowHeightModifier)); + icon.setPosition(24 * (visibleModifierIndex % 7), 20 + 35 * rowHeightModifier); modifierIconsContainer.add(icon); } @@ -592,17 +687,21 @@ export default class RunInfoUiHandler extends UiHandler { rules.push(i18next.t(`runHistory:challengeMonoGen${this.runInfo.challenges[i].value}`)); break; case Challenges.SINGLE_TYPE: - const typeRule = Type[this.runInfo.challenges[i].value - 1]; + const typeRule = PokemonType[this.runInfo.challenges[i].value - 1]; const typeTextColor = `[color=${TypeColor[typeRule]}]`; const typeShadowColor = `[shadow=${TypeShadow[typeRule]}]`; - const typeText = typeTextColor + typeShadowColor + i18next.t(`pokemonInfo:Type.${typeRule}`)! + "[/color]" + "[/shadow]"; + const typeText = + typeTextColor + typeShadowColor + i18next.t(`pokemonInfo:Type.${typeRule}`)! + "[/color]" + "[/shadow]"; rules.push(typeText); break; case Challenges.INVERSE_BATTLE: rules.push(i18next.t("challenges:inverseBattle.shortName")); break; default: - const localisationKey = Challenges[this.runInfo.challenges[i].id].split("_").map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join(""); + const localisationKey = Challenges[this.runInfo.challenges[i].id] + .split("_") + .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase())) + .join(""); rules.push(i18next.t(`challenges:${localisationKey}.name`)); break; } @@ -616,22 +715,22 @@ export default class RunInfoUiHandler extends UiHandler { * Default Information: Icon, Level, Nature, Ability, Passive, Shiny Status, Fusion Status, Stats, and Moves. * B-Side Information: Icon + Held Items (Can be displayed to the user through pressing the abilityButton) */ - private parsePartyInfo(): void { + private parsePartyInfo(): void { const party = this.runInfo.party; const currentLanguage = i18next.resolvedLanguage ?? "en"; - const windowHeight = ((globalScene.game.canvas.height / 6) - 23) / 6; + const windowHeight = (globalScene.game.canvas.height / 6 - 23) / 6; - party.forEach((p: PokemonData, i: integer) => { - const pokemonInfoWindow = new RoundRectangle(globalScene, 0, 14, (this.statsBgWidth * 2) + 10, windowHeight - 2, 3); + party.forEach((p: PokemonData, i: number) => { + const pokemonInfoWindow = new RoundRectangle(globalScene, 0, 14, this.statsBgWidth * 2 + 10, windowHeight - 2, 3); - const pokemon = p.toPokemon(); - const pokemonInfoContainer = globalScene.add.container(this.statsBgWidth + 5, (windowHeight - 0.5) * i); + const pokemon = p.toPokemon(); + const pokemonInfoContainer = globalScene.add.container(this.statsBgWidth + 5, (windowHeight - 0.5) * i); - const types = pokemon.getTypes(); - const type1 = getTypeRgb(types[0]); - const type1Color = new Phaser.Display.Color(type1[0], type1[1], type1[2]); + const types = pokemon.getTypes(); + const type1 = getTypeRgb(types[0]); + const type1Color = new Phaser.Display.Color(type1[0], type1[1], type1[2]); - const bgColor = type1Color.clone().darken(45); + const bgColor = type1Color.clone().darken(45); pokemonInfoWindow.setFillStyle(bgColor.color); const iconContainer = globalScene.add.container(0, 0); @@ -640,7 +739,9 @@ export default class RunInfoUiHandler extends UiHandler { icon.setPosition(-99, 1); const type2 = types[1] ? getTypeRgb(types[1]) : undefined; const type2Color = type2 ? new Phaser.Display.Color(type2[0], type2[1], type2[2]) : undefined; - type2Color ? pokemonInfoWindow.setStrokeStyle(1, type2Color.color, 0.95) : pokemonInfoWindow.setStrokeStyle(1, type1Color.color, 0.95); + type2Color + ? pokemonInfoWindow.setStrokeStyle(1, type2Color.color, 0.95) + : pokemonInfoWindow.setStrokeStyle(1, type1Color.color, 0.95); this.getUi().bringToTop(icon); @@ -653,7 +754,7 @@ export default class RunInfoUiHandler extends UiHandler { const pName = pokemon.getNameToRender(); //With the exception of Korean/Traditional Chinese/Simplified Chinese, the code shortens the terms for ability and passive to their first letter. //These languages are exempted because they are already short enough. - const exemptedLanguages = [ "ko", "zh_CN", "zh_TW" ]; + const exemptedLanguages = ["ko", "zh_CN", "zh_TW"]; let passiveLabel = i18next.t("starterSelectUiHandler:passive") ?? "-"; let abilityLabel = i18next.t("starterSelectUiHandler:ability") ?? "-"; if (!exemptedLanguages.includes(currentLanguage)) { @@ -663,9 +764,14 @@ export default class RunInfoUiHandler extends UiHandler { const pPassiveInfo = pokemon.passive ? passiveLabel + ": " + pokemon.getPassiveAbility().name : ""; const pAbilityInfo = abilityLabel + ": " + pokemon.getAbility().name; // Japanese is set to a greater line spacing of 35px in addBBCodeTextObject() if lineSpacing < 12. - const lineSpacing = (i18next.resolvedLanguage === "ja") ? 12 : 3; - const pokeInfoText = addBBCodeTextObject(0, 0, pName, TextStyle.SUMMARY, { fontSize: textContainerFontSize, lineSpacing: lineSpacing }); - pokeInfoText.appendText(`${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatFancyLargeNumber(pokemon.level, 1)} - ${pNatureName}`); + const lineSpacing = i18next.resolvedLanguage === "ja" ? 12 : 3; + const pokeInfoText = addBBCodeTextObject(0, 0, pName, TextStyle.SUMMARY, { + fontSize: textContainerFontSize, + lineSpacing: lineSpacing, + }); + pokeInfoText.appendText( + `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatFancyLargeNumber(pokemon.level, 1)} - ${pNatureName}`, + ); pokeInfoText.appendText(pAbilityInfo); pokeInfoText.appendText(pPassiveInfo); pokeInfoTextContainer.add(pokeInfoText); @@ -673,27 +779,36 @@ export default class RunInfoUiHandler extends UiHandler { // Pokemon Stats // Colored Arrows (Red/Blue) are placed by stats that are boosted from natures const pokeStatTextContainer = globalScene.add.container(-35, 6); - const pStats : string[] = []; - pokemon.stats.forEach((element) => pStats.push(Utils.formatFancyLargeNumber(element, 1))); + const pStats: string[] = []; + pokemon.stats.forEach(element => pStats.push(Utils.formatFancyLargeNumber(element, 1))); for (let i = 0; i < pStats.length; i++) { const isMult = getNatureStatMultiplier(pNature, i); - pStats[i] = (isMult < 1) ? pStats[i] + "[color=#40c8f8]↓[/color]" : pStats[i]; - pStats[i] = (isMult > 1) ? pStats[i] + "[color=#f89890]↑[/color]" : pStats[i]; + pStats[i] = isMult < 1 ? pStats[i] + "[color=#40c8f8]↓[/color]" : pStats[i]; + pStats[i] = isMult > 1 ? pStats[i] + "[color=#f89890]↑[/color]" : pStats[i]; } const hp = i18next.t("pokemonInfo:Stat.HPshortened") + ": " + pStats[0]; const atk = i18next.t("pokemonInfo:Stat.ATKshortened") + ": " + pStats[1]; const def = i18next.t("pokemonInfo:Stat.DEFshortened") + ": " + pStats[2]; const spatk = i18next.t("pokemonInfo:Stat.SPATKshortened") + ": " + pStats[3]; const spdef = i18next.t("pokemonInfo:Stat.SPDEFshortened") + ": " + pStats[4]; - const speedLabel = (currentLanguage === "es-ES" || currentLanguage === "pt_BR") ? i18next.t("runHistory:SPDshortened") : i18next.t("pokemonInfo:Stat.SPDshortened"); + const speedLabel = + currentLanguage === "es-ES" || currentLanguage === "pt_BR" + ? i18next.t("runHistory:SPDshortened") + : i18next.t("pokemonInfo:Stat.SPDshortened"); const speed = speedLabel + ": " + pStats[5]; // Column 1: HP Atk Def - const pokeStatText1 = addBBCodeTextObject(-5, 0, hp, TextStyle.SUMMARY, { fontSize: textContainerFontSize, lineSpacing: lineSpacing }); + const pokeStatText1 = addBBCodeTextObject(-5, 0, hp, TextStyle.SUMMARY, { + fontSize: textContainerFontSize, + lineSpacing: lineSpacing, + }); pokeStatText1.appendText(atk); pokeStatText1.appendText(def); pokeStatTextContainer.add(pokeStatText1); // Column 2: SpAtk SpDef Speed - const pokeStatText2 = addBBCodeTextObject(25, 0, spatk, TextStyle.SUMMARY, { fontSize: textContainerFontSize, lineSpacing: lineSpacing }); + const pokeStatText2 = addBBCodeTextObject(25, 0, spatk, TextStyle.SUMMARY, { + fontSize: textContainerFontSize, + lineSpacing: lineSpacing, + }); pokeStatText2.appendText(spdef); pokeStatText2.appendText(speed); pokeStatTextContainer.add(pokeStatText2); @@ -704,7 +819,9 @@ export default class RunInfoUiHandler extends UiHandler { const splicedIcon = globalScene.add.image(0, 0, "icon_spliced"); splicedIcon.setScale(0.35); splicedIcon.setOrigin(0, 0); - pokemon.isShiny() ? splicedIcon.setPositionRelative(pokeInfoTextContainer, 35, 0) : splicedIcon.setPositionRelative(pokeInfoTextContainer, 28, 0); + pokemon.isShiny() + ? splicedIcon.setPositionRelative(pokeInfoTextContainer, 35, 0) + : splicedIcon.setPositionRelative(pokeInfoTextContainer, 28, 0); marksContainer.add(splicedIcon); this.getUi().bringToTop(splicedIcon); } @@ -732,32 +849,38 @@ export default class RunInfoUiHandler extends UiHandler { // Need to check if dynamically typed moves const pokemonMoveset = pokemon.getMoveset(); const movesetContainer = globalScene.add.container(70, -29); - const pokemonMoveBgs : Phaser.GameObjects.NineSlice[] = []; - const pokemonMoveLabels : Phaser.GameObjects.Text[] = []; - const movePos = [[ -6.5, 35.5 ], [ 37, 35.5 ], [ -6.5, 43.5 ], [ 37, 43.5 ]]; + const pokemonMoveBgs: Phaser.GameObjects.NineSlice[] = []; + const pokemonMoveLabels: Phaser.GameObjects.Text[] = []; + const movePos = [ + [-6.5, 35.5], + [37, 35.5], + [-6.5, 43.5], + [37, 43.5], + ]; for (let m = 0; m < pokemonMoveset?.length; m++) { - const moveContainer = globalScene.add.container(movePos[m][0], movePos[m][1]); + const moveContainer = globalScene.add.container(movePos[m][0], movePos[m][1]); moveContainer.setScale(0.5); - const moveBg = globalScene.add.nineslice(0, 0, "type_bgs", "unknown", 85, 15, 2, 2, 2, 2); - moveBg.setOrigin(1, 0); - const moveLabel = addTextObject(-moveBg.width / 2, 2, "-", TextStyle.PARTY); - moveLabel.setOrigin(0.5, 0); - moveLabel.setName("text-move-label"); - pokemonMoveBgs.push(moveBg); - pokemonMoveLabels.push(moveLabel); - moveContainer.add(moveBg); - moveContainer.add(moveLabel); - movesetContainer.add(moveContainer); - const move = pokemonMoveset[m]?.getMove(); - pokemonMoveBgs[m].setFrame(Type[move ? move.type : Type.UNKNOWN].toString().toLowerCase()); + const moveBg = globalScene.add.nineslice(0, 0, "type_bgs", "unknown", 85, 15, 2, 2, 2, 2); + moveBg.setOrigin(1, 0); + const moveLabel = addTextObject(-moveBg.width / 2, 2, "-", TextStyle.PARTY); + moveLabel.setOrigin(0.5, 0); + moveLabel.setName("text-move-label"); + pokemonMoveBgs.push(moveBg); + pokemonMoveLabels.push(moveLabel); + moveContainer.add(moveBg); + moveContainer.add(moveLabel); + movesetContainer.add(moveContainer); + const move = pokemonMoveset[m]?.getMove(); + pokemonMoveBgs[m].setFrame(PokemonType[move ? move.type : PokemonType.UNKNOWN].toString().toLowerCase()); pokemonMoveLabels[m].setText(move ? move.name : "-"); - } + } // Pokemon Held Items - not displayed by default // Endless/Endless Spliced have a different scale because Pokemon tend to accumulate more items in these runs. - const heldItemsScale = (this.runInfo.gameMode === GameModes.SPLICED_ENDLESS || this.runInfo.gameMode === GameModes.ENDLESS) ? 0.25 : 0.5; + const heldItemsScale = + this.runInfo.gameMode === GameModes.SPLICED_ENDLESS || this.runInfo.gameMode === GameModes.ENDLESS ? 0.25 : 0.5; const heldItemsContainer = globalScene.add.container(-82, 2); - const heldItemsList : Modifier.PokemonHeldItemModifier[] = []; + const heldItemsList: Modifier.PokemonHeldItemModifier[] = []; if (this.runInfo.modifiers.length) { for (const m of this.runInfo.modifiers) { const modifier = m.toModifier(this.modifiersModule[m.className]); @@ -769,14 +892,17 @@ export default class RunInfoUiHandler extends UiHandler { if (heldItemsList.length > 0) { (heldItemsList as Modifier.PokemonHeldItemModifier[]).sort(Modifier.modifierSortFunc); let row = 0; - for (const [ index, item ] of heldItemsList.entries()) { - if ( index > 36 ) { + for (const [index, item] of heldItemsList.entries()) { + if (index > 36) { const overflowIcon = addTextObject(182, 4, "+", TextStyle.WINDOW); heldItemsContainer.add(overflowIcon); break; } const itemIcon = item?.getIcon(true); - if (item?.stackCount < item?.getMaxHeldItemCount(pokemon) && itemIcon.list[1] instanceof Phaser.GameObjects.BitmapText) { + if ( + item?.stackCount < item?.getMaxHeldItemCount(pokemon) && + itemIcon.list[1] instanceof Phaser.GameObjects.BitmapText + ) { itemIcon.list[1].clearTint(); } itemIcon.setScale(heldItemsScale); @@ -807,9 +933,9 @@ export default class RunInfoUiHandler extends UiHandler { pokemonInfoContainer.setName("PkmnInfo"); this.partyContainer.add(pokemonInfoContainer); pokemon.destroy(); - }); + }); this.runContainer.add(this.partyContainer); - } + } /** * Changes what is displayed of the Pokemon's held items @@ -839,7 +965,13 @@ export default class RunInfoUiHandler extends UiHandler { const endCard = globalScene.add.image(0, 0, `end_${isFemale ? "f" : "m"}`); endCard.setOrigin(0); endCard.setScale(0.5); - const text = addTextObject(globalScene.game.canvas.width / 12, (globalScene.game.canvas.height / 6) - 16, i18next.t("battle:congratulations"), TextStyle.SUMMARY, { fontSize: "128px" }); + const text = addTextObject( + globalScene.game.canvas.width / 12, + globalScene.game.canvas.height / 6 - 16, + i18next.t("battle:congratulations"), + TextStyle.SUMMARY, + { fontSize: "128px" }, + ); text.setOrigin(0.5); this.endCardContainer.add(endCard); this.endCardContainer.add(text); @@ -870,8 +1002,13 @@ export default class RunInfoUiHandler extends UiHandler { this.hallofFameContainer.add(endCard); this.hallofFameContainer.add(hallofFameBg); - const hallofFameText = addTextObject(0, 0, i18next.t("runHistory:hallofFameText", { context: genderStr }), TextStyle.WINDOW); - hallofFameText.setPosition(endCardCoords.x - (hallofFameText.displayWidth / 2), 164); + const hallofFameText = addTextObject( + 0, + 0, + i18next.t("runHistory:hallofFameText", { context: genderStr }), + TextStyle.WINDOW, + ); + hallofFameText.setPosition(endCardCoords.x - hallofFameText.displayWidth / 2, 164); this.hallofFameContainer.add(hallofFameText); this.runInfo.party.forEach((p, i) => { const pkmn = p.toPokemon(); @@ -881,8 +1018,11 @@ export default class RunInfoUiHandler extends UiHandler { const formIndex = pkmn.formIndex; const variant = pkmn.variant; const species = pkmn.getSpeciesForm(); - const pokemonSprite: Phaser.GameObjects.Sprite = globalScene.add.sprite(60 + 40 * i, 40 + row * 80, "pkmn__sub"); - pokemonSprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true }); + const pokemonSprite: Phaser.GameObjects.Sprite = globalScene.add.sprite(60 + 40 * i, 40 + row * 80, "pkmn__sub"); + pokemonSprite.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + }); this.hallofFameContainer.add(pokemonSprite); const speciesLoaded: Map = new Map(); speciesLoaded.set(id, false); @@ -897,7 +1037,7 @@ export default class RunInfoUiHandler extends UiHandler { pokemonSprite.setVisible(true); }); if (pkmn.isFusion()) { - const fusionIcon = globalScene.add.sprite(80 + 40 * i, 50 + row * 80, pkmn.getFusionIconAtlasKey()); + const fusionIcon = globalScene.add.sprite(80 + 40 * i, 50 + row * 80, pkmn.getFusionIconAtlasKey()); fusionIcon.setName("sprite-fusion-icon"); fusionIcon.setOrigin(0.5, 0); fusionIcon.setFrame(pkmn.getFusionIconId(true)); @@ -912,10 +1052,10 @@ export default class RunInfoUiHandler extends UiHandler { /** * Takes input from the user to perform a desired action. * @param button - Button object to be processed - * Button.CANCEL - removes all containers related to RunInfo and returns the user to Run History + * Button.CANCEL, Button.LEFT - removes all containers related to RunInfo and returns the user to Run History * Button.CYCLE_FORM, Button.CYCLE_SHINY, Button.CYCLE_ABILITY - runs the function buttonCycleOption() */ - override processInput(button: Button): boolean { + override processInput(button: Button): boolean { const ui = this.getUi(); let success = false; @@ -923,6 +1063,7 @@ export default class RunInfoUiHandler extends UiHandler { switch (button) { case Button.CANCEL: + case Button.LEFT: success = true; if (this.pageMode === RunInfoUiMode.MAIN) { this.runInfoContainer.removeAll(true); @@ -1008,4 +1149,3 @@ export default class RunInfoUiHandler extends UiHandler { } } } - diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/save-slot-select-ui-handler.ts index fe2ac9e1221..a1e9e5219b4 100644 --- a/src/ui/save-slot-select-ui-handler.ts +++ b/src/ui/save-slot-select-ui-handler.ts @@ -17,13 +17,12 @@ const SLOTS_ON_SCREEN = 3; export enum SaveSlotUiMode { LOAD, - SAVE + SAVE, } -export type SaveSlotSelectCallback = (cursor: integer) => void; +export type SaveSlotSelectCallback = (cursor: number) => void; export default class SaveSlotSelectUiHandler extends MessageUiHandler { - private saveSlotSelectContainer: Phaser.GameObjects.Container; private sessionSlotsContainer: Phaser.GameObjects.Container; private saveSlotSelectMessageBox: Phaser.GameObjects.NineSlice; @@ -33,7 +32,7 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { private uiMode: SaveSlotUiMode; private saveSlotSelectCallback: SaveSlotSelectCallback | null; - private scrollCursor: integer = 0; + private scrollCursor = 0; private cursorObj: Phaser.GameObjects.Container | null; @@ -50,7 +49,13 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { this.saveSlotSelectContainer.setVisible(false); ui.add(this.saveSlotSelectContainer); - const loadSessionBg = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, -globalScene.game.canvas.height / 6, 0x006860); + const loadSessionBg = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width / 6, + -globalScene.game.canvas.height / 6, + 0x006860, + ); loadSessionBg.setOrigin(0, 0); this.saveSlotSelectContainer.add(loadSessionBg); @@ -75,7 +80,7 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { } show(args: any[]): boolean { - if ((args.length < 2 || !(args[1] instanceof Function))) { + if (args.length < 2 || !(args[1] instanceof Function)) { return false; } @@ -108,31 +113,39 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { switch (this.uiMode) { case SaveSlotUiMode.LOAD: this.saveSlotSelectCallback = null; - originalCallback && originalCallback(cursor); + originalCallback?.(cursor); break; - case SaveSlotUiMode.SAVE: + case SaveSlotUiMode.SAVE: { const saveAndCallback = () => { const originalCallback = this.saveSlotSelectCallback; this.saveSlotSelectCallback = null; ui.revertMode(); ui.showText("", 0); ui.setMode(Mode.MESSAGE); - originalCallback && originalCallback(cursor); + originalCallback?.(cursor); }; if (this.sessionSlots[cursor].hasData) { ui.showText(i18next.t("saveSlotSelectUiHandler:overwriteData"), null, () => { - ui.setOverlayMode(Mode.CONFIRM, () => { - globalScene.gameData.deleteSession(cursor).then(response => { - if (response === false) { - globalScene.reset(true); - } else { - saveAndCallback(); - } - }); - }, () => { - ui.revertMode(); - ui.showText("", 0); - }, false, 0, 19, import.meta.env.DEV ? 300 : 2000); + ui.setOverlayMode( + Mode.CONFIRM, + () => { + globalScene.gameData.deleteSession(cursor).then(response => { + if (response === false) { + globalScene.reset(true); + } else { + saveAndCallback(); + } + }); + }, + () => { + ui.revertMode(); + ui.showText("", 0); + }, + false, + 0, + 19, + import.meta.env.DEV ? 300 : 2000, + ); }); } else if (this.sessionSlots[cursor].hasData === false) { saveAndCallback(); @@ -140,12 +153,13 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { return false; } break; + } } success = true; } } else { this.saveSlotSelectCallback = null; - originalCallback && originalCallback(-1); + originalCallback?.(-1); success = true; } } else { @@ -153,11 +167,11 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { switch (button) { case Button.UP: if (this.cursor) { - // Check to prevent cursor from accessing a negative index - success = (this.cursor === 0) ? this.setCursor(this.cursor) : this.setCursor(this.cursor - 1, cursorPosition); + // Check to prevent cursor from accessing a negative index + success = this.cursor === 0 ? this.setCursor(this.cursor) : this.setCursor(this.cursor - 1, cursorPosition); } else if (this.scrollCursor) { success = this.setScrollCursor(this.scrollCursor - 1, cursorPosition); - } else if ((this.cursor === 0) && (this.scrollCursor === 0)) { + } else if (this.cursor === 0 && this.scrollCursor === 0) { this.setScrollCursor(SESSION_SLOTS_COUNT - SLOTS_ON_SCREEN); // Revert to avoid an extra session slot sticking out this.revertSessionSlot(SESSION_SLOTS_COUNT - SLOTS_ON_SCREEN); @@ -166,11 +180,14 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { } break; case Button.DOWN: - if (this.cursor < (SLOTS_ON_SCREEN - 1)) { + if (this.cursor < SLOTS_ON_SCREEN - 1) { success = this.setCursor(this.cursor + 1, cursorPosition); } else if (this.scrollCursor < SESSION_SLOTS_COUNT - SLOTS_ON_SCREEN) { success = this.setScrollCursor(this.scrollCursor + 1, cursorPosition); - } else if ((this.cursor === SLOTS_ON_SCREEN - 1) && (this.scrollCursor === SESSION_SLOTS_COUNT - SLOTS_ON_SCREEN)) { + } else if ( + this.cursor === SLOTS_ON_SCREEN - 1 && + this.scrollCursor === SESSION_SLOTS_COUNT - SLOTS_ON_SCREEN + ) { this.setScrollCursor(0); this.revertSessionSlot(SLOTS_ON_SCREEN - 1); this.setCursor(0); @@ -179,7 +196,11 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { break; case Button.RIGHT: if (this.sessionSlots[cursorPosition].hasData && this.sessionSlots[cursorPosition].saveData) { - globalScene.ui.setOverlayMode(Mode.RUN_INFO, this.sessionSlots[cursorPosition].saveData, RunDisplayMode.SESSION_PREVIEW); + globalScene.ui.setOverlayMode( + Mode.RUN_INFO, + this.sessionSlots[cursorPosition].saveData, + RunDisplayMode.SESSION_PREVIEW, + ); success = true; } } @@ -200,17 +221,24 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { globalScene.add.existing(sessionSlot); this.sessionSlotsContainer.add(sessionSlot); this.sessionSlots.push(sessionSlot); - sessionSlot.load().then((success) => { + sessionSlot.load().then(success => { // If the cursor was moved to this slot while the session was loading // call setCursor again to shift the slot position and show the arrow for save preview - if (success && (this.cursor + this.scrollCursor) === s) { + if (success && this.cursor + this.scrollCursor === s) { this.setCursor(s); } }); } } - showText(text: string, delay?: integer, callback?: Function, callbackDelay?: integer, prompt?: boolean, promptDelay?: integer) { + showText( + text: string, + delay?: number, + callback?: Function, + callbackDelay?: number, + prompt?: boolean, + promptDelay?: number, + ) { super.showText(text, delay, callback, callbackDelay, prompt, promptDelay); if (text?.indexOf("\n") === -1) { @@ -230,16 +258,27 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { * @param prevSlotIndex index of the previous session occupied by the cursor, between `0` and `SESSION_SLOTS_COUNT - 1` - optional * @returns `true` if the cursor position has changed | `false` if it has not */ - override setCursor(cursor: integer, prevSlotIndex?: integer): boolean { + override setCursor(cursor: number, prevSlotIndex?: number): boolean { const changed = super.setCursor(cursor); if (!this.cursorObj) { this.cursorObj = globalScene.add.container(0, 0); - const cursorBox = globalScene.add.nineslice(0, 0, "select_cursor_highlight_thick", undefined, 296, 44, 6, 6, 6, 6); + const cursorBox = globalScene.add.nineslice( + 0, + 0, + "select_cursor_highlight_thick", + undefined, + 296, + 44, + 6, + 6, + 6, + 6, + ); const rightArrow = globalScene.add.image(0, 0, "cursor"); rightArrow.setPosition(160, 0); rightArrow.setName("rightArrow"); - this.cursorObj.add([ cursorBox, rightArrow ]); + this.cursorObj.add([cursorBox, rightArrow]); this.sessionSlotsContainer.add(this.cursorObj); } const cursorPosition = cursor + this.scrollCursor; @@ -267,7 +306,7 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { /** * Helper function that resets the given session slot to its default central position */ - revertSessionSlot(slotIndex: integer): void { + revertSessionSlot(slotIndex: number): void { const sessionSlot = this.sessionSlots[slotIndex]; if (sessionSlot) { sessionSlot.setPosition(0, slotIndex * 56); @@ -291,7 +330,7 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { * @param prevSlotIndex index of the previous slot occupied by the cursor, between `0` and `SESSION_SLOTS_COUNT-1` - optional * @returns `true` if the cursor position has changed | `false` if it has not */ - setScrollCursor(scrollCursor: integer, prevSlotIndex?: integer): boolean { + setScrollCursor(scrollCursor: number, prevSlotIndex?: number): boolean { const changed = scrollCursor !== this.scrollCursor; if (changed) { @@ -301,7 +340,7 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { targets: this.sessionSlotsContainer, y: this.sessionSlotsContainerInitialY - 56 * scrollCursor, duration: Utils.fixedInt(325), - ease: "Sine.easeInOut" + ease: "Sine.easeInOut", }); } @@ -331,13 +370,13 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler { } class SessionSlot extends Phaser.GameObjects.Container { - public slotId: integer; + public slotId: number; public hasData: boolean; private loadingLabel: Phaser.GameObjects.Text; public saveData: SessionSaveData; - constructor(slotId: integer) { + constructor(slotId: number) { super(globalScene, 0, slotId * 56); this.slotId = slotId; @@ -357,7 +396,12 @@ class SessionSlot extends Phaser.GameObjects.Container { async setupWithData(data: SessionSaveData) { this.remove(this.loadingLabel, true); - const gameModeLabel = addTextObject(8, 5, `${GameMode.getModeName(data.gameMode) || i18next.t("gameMode:unkown")} - ${i18next.t("saveSlotSelectUiHandler:wave")} ${data.waveIndex}`, TextStyle.WINDOW); + const gameModeLabel = addTextObject( + 8, + 5, + `${GameMode.getModeName(data.gameMode) || i18next.t("gameMode:unkown")} - ${i18next.t("saveSlotSelectUiHandler:wave")} ${data.waveIndex}`, + TextStyle.WINDOW, + ); this.add(gameModeLabel); const timestampLabel = addTextObject(8, 19, new Date(data.timestamp).toLocaleString(), TextStyle.WINDOW); @@ -367,14 +411,20 @@ class SessionSlot extends Phaser.GameObjects.Container { this.add(playTimeLabel); const pokemonIconsContainer = globalScene.add.container(144, 4); - data.party.forEach((p: PokemonData, i: integer) => { + data.party.forEach((p: PokemonData, i: number) => { const iconContainer = globalScene.add.container(26 * i, 0); iconContainer.setScale(0.75); const pokemon = p.toPokemon(); const icon = globalScene.addPokemonIcon(pokemon, 0, 0, 0, 0); - const text = addTextObject(32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(pokemon.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" }); + const text = addTextObject( + 32, + 20, + `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(pokemon.level, 1000)}`, + TextStyle.PARTY, + { fontSize: "54px", color: "#f8f8f8" }, + ); text.setShadow(0, 0, undefined); text.setStroke("#424242", 14); text.setOrigin(1, 0); diff --git a/src/ui/saving-icon-handler.ts b/src/ui/saving-icon-handler.ts index ca7b1fb1aa8..4404ea423b1 100644 --- a/src/ui/saving-icon-handler.ts +++ b/src/ui/saving-icon-handler.ts @@ -45,7 +45,7 @@ export default class SavingIconHandler extends Phaser.GameObjects.Container { this.hide(); } }); - } + }, }); this.setVisible(true); @@ -72,7 +72,7 @@ export default class SavingIconHandler extends Phaser.GameObjects.Container { if (this.shown) { this.show(); } - } + }, }); this.shown = false; diff --git a/src/ui/scroll-bar.ts b/src/ui/scroll-bar.ts index eb74bfddfde..404553025e3 100644 --- a/src/ui/scroll-bar.ts +++ b/src/ui/scroll-bar.ts @@ -29,7 +29,18 @@ export class ScrollBar extends Phaser.GameObjects.Container { const borderSize = 2; width = Math.max(width, 4); - this.bg = globalScene.add.nineslice(0, 0, "scroll_bar", undefined, width, height, borderSize, borderSize, borderSize, borderSize); + this.bg = globalScene.add.nineslice( + 0, + 0, + "scroll_bar", + undefined, + width, + height, + borderSize, + borderSize, + borderSize, + borderSize, + ); this.bg.setOrigin(0, 0); this.add(this.bg); @@ -60,14 +71,16 @@ export class ScrollBar extends Phaser.GameObjects.Container { */ setTotalRows(rows: number): void { this.totalRows = rows; - this.handleBody.height = (this.bg.displayHeight - 1 - this.handleBottom.displayHeight) * this.maxRows / this.totalRows; + this.handleBody.height = + ((this.bg.displayHeight - 1 - this.handleBottom.displayHeight) * this.maxRows) / this.totalRows; this.updateHandlePosition(); this.setVisible(this.totalRows > this.maxRows); } private updateHandlePosition(): void { - this.handleBody.y = 1 + (this.bg.displayHeight - 1 - this.handleBottom.displayHeight) / this.totalRows * this.currentRow; + this.handleBody.y = + 1 + ((this.bg.displayHeight - 1 - this.handleBottom.displayHeight) / this.totalRows) * this.currentRow; this.handleBottom.y = this.handleBody.y + this.handleBody.displayHeight; } } diff --git a/src/ui/scrollable-grid-handler.ts b/src/ui/scrollable-grid-handler.ts index 04851ec002f..54f07d69fb7 100644 --- a/src/ui/scrollable-grid-handler.ts +++ b/src/ui/scrollable-grid-handler.ts @@ -111,7 +111,7 @@ export default class ScrollableGridUiHandler { } else if (this.scrollCursor > 0) { success = this.setScrollCursor(this.scrollCursor - 1); } else { - // wrap around to the last row + // wrap around to the last row let newCursor = this.cursor + (onScreenRows - 1) * this.COLUMNS; if (newCursor > lastVisibleIndex) { newCursor -= this.COLUMNS; @@ -121,13 +121,13 @@ export default class ScrollableGridUiHandler { break; case Button.DOWN: if (currentRowIndex < onScreenRows - 1) { - // Go down one row + // Go down one row success = this.setCursor(Math.min(this.cursor + this.COLUMNS, this.totalElements - itemOffset - 1)); } else if (this.scrollCursor < maxScrollCursor) { - // Scroll down one row + // Scroll down one row success = this.setScrollCursor(this.scrollCursor + 1); } else { - // Wrap around to the top row + // Wrap around to the top row success = this.setScrollCursor(0, this.cursor % this.COLUMNS); } break; @@ -192,5 +192,4 @@ export default class ScrollableGridUiHandler { return scrollChanged || cursorChanged; } - } diff --git a/src/ui/session-reload-modal-ui-handler.ts b/src/ui/session-reload-modal-ui-handler.ts index 640268f0480..d3b88da9e63 100644 --- a/src/ui/session-reload-modal-ui-handler.ts +++ b/src/ui/session-reload-modal-ui-handler.ts @@ -21,27 +21,33 @@ export default class SessionReloadModalUiHandler extends ModalUiHandler { } getMargin(): [number, number, number, number] { - return [ 0, 0, 48, 0 ]; + return [0, 0, 48, 0]; } getButtonLabels(): string[] { - return [ ]; + return []; } setup(): void { super.setup(); - const label = addTextObject(this.getWidth() / 2, this.getHeight() / 2, "Your session is out of date.\nYour data will be reloaded…", TextStyle.WINDOW, { fontSize: "48px", align: "center" }); + const label = addTextObject( + this.getWidth() / 2, + this.getHeight() / 2, + "Your session is out of date.\nYour data will be reloaded…", + TextStyle.WINDOW, + { fontSize: "48px", align: "center" }, + ); label.setOrigin(0.5, 0.5); this.modalContainer.add(label); } - show(args: any[]): boolean { + show(_args: any[]): boolean { const config: ModalConfig = { - buttonActions: [] + buttonActions: [], }; - return super.show([ config ]); + return super.show([config]); } } diff --git a/src/ui/settings/abstract-binding-ui-handler.ts b/src/ui/settings/abstract-binding-ui-handler.ts index d0f9a5c8a90..62f78da89f5 100644 --- a/src/ui/settings/abstract-binding-ui-handler.ts +++ b/src/ui/settings/abstract-binding-ui-handler.ts @@ -29,7 +29,7 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { protected actionLabel: Phaser.GameObjects.Text; protected cancelLabel: Phaser.GameObjects.Text; - protected listening: boolean = false; + protected listening = false; protected buttonPressed: number | null = null; // Icons for displaying current and new button assignments. @@ -40,24 +40,24 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { protected cancelFn: CancelFn | null; abstract swapAction(): boolean; - protected timeLeftAutoClose: number = 5; + protected timeLeftAutoClose = 5; protected countdownTimer; // The specific setting being modified. protected target; /** - * Constructor for the AbstractBindingUiHandler. - * - * @param mode - The UI mode. - */ + * Constructor for the AbstractBindingUiHandler. + * + * @param mode - The UI mode. + */ constructor(mode: Mode | null = null) { super(mode); } /** - * Setup UI elements. - */ + * Setup UI elements. + */ setup() { const ui = this.getUi(); this.optionSelectContainer = globalScene.add.container(0, 0); @@ -71,11 +71,21 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { ui.add(this.actionsContainer); // Setup backgrounds and text objects for UI. - this.titleBg = addWindow((globalScene.game.canvas.width / 6) - this.getWindowWidth(), -(globalScene.game.canvas.height / 6) + 28 + 21, this.getWindowWidth(), 24); + this.titleBg = addWindow( + globalScene.game.canvas.width / 6 - this.getWindowWidth(), + -(globalScene.game.canvas.height / 6) + 28 + 21, + this.getWindowWidth(), + 24, + ); this.titleBg.setOrigin(0.5); this.optionSelectContainer.add(this.titleBg); - this.actionBg = addWindow((globalScene.game.canvas.width / 6) - this.getWindowWidth(), -(globalScene.game.canvas.height / 6) + this.getWindowHeight() + 28 + 21 + 21, this.getWindowWidth(), 24); + this.actionBg = addWindow( + globalScene.game.canvas.width / 6 - this.getWindowWidth(), + -(globalScene.game.canvas.height / 6) + this.getWindowHeight() + 28 + 21 + 21, + this.getWindowWidth(), + 24, + ); this.actionBg.setOrigin(0.5); this.actionsContainer.add(this.actionBg); @@ -87,10 +97,15 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { this.timerText = addTextObject(0, 0, "(5)", TextStyle.WINDOW); this.timerText.setOrigin(0, 0); - this.timerText.setPositionRelative(this.unlockText, (this.unlockText.width / 6) + 5, 0); + this.timerText.setPositionRelative(this.unlockText, this.unlockText.width / 6 + 5, 0); this.optionSelectContainer.add(this.timerText); - this.optionSelectBg = addWindow((globalScene.game.canvas.width / 6) - this.getWindowWidth(), -(globalScene.game.canvas.height / 6) + this.getWindowHeight() + 28, this.getWindowWidth(), this.getWindowHeight()); + this.optionSelectBg = addWindow( + globalScene.game.canvas.width / 6 - this.getWindowWidth(), + -(globalScene.game.canvas.height / 6) + this.getWindowHeight() + 28, + this.getWindowWidth(), + this.getWindowHeight(), + ); this.optionSelectBg.setOrigin(0.5); this.optionSelectContainer.add(this.optionSelectBg); @@ -108,17 +123,17 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { if (this.timeLeftAutoClose >= 0) { this.manageAutoCloseTimer(); } else { - this.cancelFn && this.cancelFn(); + this.cancelFn?.(); } }, 1000); } /** - * Show the UI with the provided arguments. - * - * @param args - Arguments to be passed to the show method. - * @returns `true` if successful. - */ + * Show the UI with the provided arguments. + * + * @param args - Arguments to be passed to the show method. + * @returns `true` if successful. + */ show(args: any[]): boolean { super.show(args); this.buttonPressed = null; @@ -139,29 +154,29 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { } /** - * Get the width of the window. - * - * @returns The window width. - */ + * Get the width of the window. + * + * @returns The window width. + */ getWindowWidth(): number { return 160; } /** - * Get the height of the window. - * - * @returns The window height. - */ + * Get the height of the window. + * + * @returns The window height. + */ getWindowHeight(): number { return 64; } /** - * Process the input for the given button. - * - * @param button - The button to process. - * @returns `true` if the input was processed successfully. - */ + * Process the input for the given button. + * + * @param button - The button to process. + * @returns `true` if the input was processed successfully. + */ processInput(button: Button): boolean { if (this.buttonPressed === null) { return false; // TODO: is false correct as default? (previously was `undefined`) @@ -170,19 +185,19 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { let success = false; switch (button) { case Button.LEFT: - case Button.RIGHT: - // Toggle between action and cancel options. - const cursor = this.cursor ? 0 : 1; - success = this.setCursor(cursor); + case Button.RIGHT: { + // Toggle between action and cancel options. + success = this.setCursor(this.cursor ? 0 : 1); break; + } case Button.ACTION: - // Process actions based on current cursor position. + // Process actions based on current cursor position. if (this.cursor === 0) { - this.cancelFn && this.cancelFn(); + this.cancelFn?.(); } else { success = this.swapAction(); NavigationManager.getInstance().updateIcons(); - this.cancelFn && this.cancelFn(success); + this.cancelFn?.(success); } break; } @@ -198,12 +213,12 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { } /** - * Set the cursor to the specified position. - * - * @param cursor - The cursor position to set. - * @returns `true` if the cursor was set successfully. - */ - setCursor(cursor: integer): boolean { + * Set the cursor to the specified position. + * + * @param cursor - The cursor position to set. + * @returns `true` if the cursor was set successfully. + */ + setCursor(cursor: number): boolean { this.cursor = cursor; if (cursor === 1) { this.actionLabel.setColor(this.getTextColor(TextStyle.SETTINGS_SELECTED)); @@ -220,8 +235,8 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { } /** - * Clear the UI elements and state. - */ + * Clear the UI elements and state. + */ clear() { super.clear(); clearTimeout(this.countdownTimer); @@ -237,12 +252,12 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { } /** - * Handle input down events. - * - * @param buttonIcon - The icon of the button that was pressed. - * @param assignedButtonIcon - The icon of the button that is assigned. - * @param type - The type of button press. - */ + * Handle input down events. + * + * @param buttonIcon - The icon of the button that was pressed. + * @param assignedButtonIcon - The icon of the button that is assigned. + * @param type - The type of button press. + */ onInputDown(buttonIcon: string, assignedButtonIcon: string | null, type: string): void { clearTimeout(this.countdownTimer); this.timerText.setText(""); diff --git a/src/ui/settings/abstract-control-settings-ui-handler.ts b/src/ui/settings/abstract-control-settings-ui-handler.ts index 59af1abba2a..2c634e2c5bf 100644 --- a/src/ui/settings/abstract-control-settings-ui-handler.ts +++ b/src/ui/settings/abstract-control-settings-ui-handler.ts @@ -12,17 +12,17 @@ import i18next from "i18next"; import { globalScene } from "#app/global-scene"; export interface InputsIcons { - [key: string]: Phaser.GameObjects.Sprite; + [key: string]: Phaser.GameObjects.Sprite; } export interface LayoutConfig { - optionsContainer: Phaser.GameObjects.Container; - inputsIcons: InputsIcons; - settingLabels: Phaser.GameObjects.Text[]; - optionValueLabels: Phaser.GameObjects.Text[][]; - optionCursors: number[]; - keys: string[]; - bindingSettings: Array; + optionsContainer: Phaser.GameObjects.Container; + inputsIcons: InputsIcons; + settingLabels: Phaser.GameObjects.Text[]; + optionValueLabels: Phaser.GameObjects.Text[][]; + optionCursors: number[]; + keys: string[]; + bindingSettings: Array; } /** * Abstract class for handling UI elements related to control settings. @@ -49,10 +49,10 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler protected inputsIcons: InputsIcons; protected navigationIcons: InputsIcons; // list all the setting keys used in the selected layout (because dualshock has more buttons than xbox) - protected keys: Array; + protected keys: Array; // Store the specific settings related to key bindings for the current gamepad configuration. - protected bindingSettings: Array; + protected bindingSettings: Array; protected setting; protected settingBlacklisted; @@ -81,14 +81,16 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler getLocalStorageSetting(): object { // Retrieve the settings from local storage or use an empty object if none exist. - const settings: object = localStorage.hasOwnProperty(this.localStoragePropertyName) ? JSON.parse(localStorage.getItem(this.localStoragePropertyName)!) : {}; // TODO: is this bang correct? + const settings: object = localStorage.hasOwnProperty(this.localStoragePropertyName) + ? JSON.parse(localStorage.getItem(this.localStoragePropertyName)!) + : {}; // TODO: is this bang correct? return settings; } private camelize(string: string): string { - return string.replace(/(?:^\w|[A-Z]|\b\w)/g, function(word, index) { - return index === 0 ? word.toLowerCase() : word.toUpperCase(); - }).replace(/\s+/g, ""); + return string + .replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => (index === 0 ? word.toLowerCase() : word.toUpperCase())) + .replace(/\s+/g, ""); } /** @@ -101,15 +103,27 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler this.settingsContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1); this.settingsContainer.setName(`settings-${this.titleSelected}`); - this.settingsContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains); + this.settingsContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), + Phaser.Geom.Rectangle.Contains, + ); this.navigationContainer = new NavigationMenu(0, 0); - this.optionsBg = addWindow(0, this.navigationContainer.height, (globalScene.game.canvas.width / 6) - 2, (globalScene.game.canvas.height / 6) - 16 - this.navigationContainer.height - 2); + this.optionsBg = addWindow( + 0, + this.navigationContainer.height, + globalScene.game.canvas.width / 6 - 2, + globalScene.game.canvas.height / 6 - 16 - this.navigationContainer.height - 2, + ); this.optionsBg.setOrigin(0, 0); - - this.actionsBg = addWindow(0, (globalScene.game.canvas.height / 6) - this.navigationContainer.height, (globalScene.game.canvas.width / 6) - 2, 22); + this.actionsBg = addWindow( + 0, + globalScene.game.canvas.height / 6 - this.navigationContainer.height, + globalScene.game.canvas.width / 6 - 2, + 22, + ); this.actionsBg.setOrigin(0, 0); const iconAction = globalScene.add.sprite(0, 0, "keyboard"); @@ -171,13 +185,21 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler const inputsIcons: InputsIcons = {}; // Fetch common setting keys such as 'Controller' and 'Gamepad Support' from gamepad settings. - const commonSettingKeys = Object.keys(this.setting).slice(0, this.commonSettingsCount).map(key => this.setting[key]); + const commonSettingKeys = Object.keys(this.setting) + .slice(0, this.commonSettingsCount) + .map(key => this.setting[key]); // Combine common and specific bindings into a single array. - const specificBindingKeys = [ ...commonSettingKeys, ...Object.keys(config.settings) ]; + const specificBindingKeys = [...commonSettingKeys, ...Object.keys(config.settings)]; // Fetch default values for these settings and prepare to highlight selected options. - const optionCursors = Object.values(Object.keys(this.settingDeviceDefaults).filter(s => specificBindingKeys.includes(s)).map(k => this.settingDeviceDefaults[k])); + const optionCursors = Object.values( + Object.keys(this.settingDeviceDefaults) + .filter(s => specificBindingKeys.includes(s)) + .map(k => this.settingDeviceDefaults[k]), + ); // Filter out settings that are not relevant to the current gamepad configuration. - const settingFiltered = Object.keys(this.setting).filter(_key => specificBindingKeys.includes(this.setting[_key])); + const settingFiltered = Object.keys(this.setting).filter(_key => + specificBindingKeys.includes(this.setting[_key]), + ); // Loop through the filtered settings to manage display and options. settingFiltered.forEach((setting, s) => { @@ -202,7 +224,7 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler const valueLabels: Phaser.GameObjects.GameObject[] = []; // Process each option for the current setting. - for (const [ o, option ] of this.settingDeviceOptions[this.setting[setting]].entries()) { + for (const [o, option] of this.settingDeviceOptions[this.setting[setting]].entries()) { // Check if the current setting is for binding keys. if (bindingSettings.includes(this.setting[setting])) { // Create a label for non-null options, typically indicating actionable options like 'change'. @@ -222,7 +244,12 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler continue; } // For regular settings like 'Gamepad support', create a label and determine if it is selected. - const valueLabel = addTextObject(0, 0, option, this.settingDeviceDefaults[this.setting[setting]] === o ? TextStyle.SETTINGS_SELECTED : TextStyle.WINDOW); + const valueLabel = addTextObject( + 0, + 0, + option, + this.settingDeviceDefaults[this.setting[setting]] === o ? TextStyle.SETTINGS_SELECTED : TextStyle.WINDOW, + ); valueLabel.setOrigin(0, 0); optionsContainer.add(valueLabel); @@ -235,14 +262,16 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler // Calculate the total width of all option labels within a specific setting // This is achieved by summing the width of each option label - const totalWidth = optionValueLabels[s].map((o) => (o as Phaser.GameObjects.Text).width).reduce((total, width) => total += width, 0); + const totalWidth = optionValueLabels[s] + .map(o => (o as Phaser.GameObjects.Text).width) + .reduce((total, width) => (total += width), 0); // Define the minimum width for a label, ensuring it's at least 78 pixels wide or the width of the setting label plus some padding const labelWidth = Math.max(130, settingLabels[s].displayWidth + 8); // Calculate the total available space for placing option labels next to their setting label // We reserve space for the setting label and then distribute the remaining space evenly - const totalSpace = (297 - labelWidth) - totalWidth / 6; + const totalSpace = 297 - labelWidth - totalWidth / 6; // Calculate the spacing between options based on the available space divided by the number of gaps between labels const optionSpacing = Math.floor(totalSpace / (optionValueLabels[s].length - 1)); @@ -272,7 +301,13 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler } // Add vertical scrollbar - this.scrollBar = new ScrollBar(this.optionsBg.width - 9, this.optionsBg.y + 5, 4, this.optionsBg.height - 11, this.rowsToDisplay); + this.scrollBar = new ScrollBar( + this.optionsBg.width - 9, + this.optionsBg.y + 5, + 4, + this.optionsBg.height - 11, + this.rowsToDisplay, + ); this.settingsContainer.add(this.scrollBar); // Add the settings container to the UI. @@ -296,7 +331,7 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler */ updateBindings(): void { // Hide the options container for all layouts to reset the UI visibility. - Object.keys(this.layout).forEach((key) => this.layout[key].optionsContainer.setVisible(false)); + Object.keys(this.layout).forEach(key => this.layout[key].optionsContainer.setVisible(false)); // Fetch the active gamepad configuration from the input controller. const activeConfig = this.getActiveConfig(); @@ -310,7 +345,10 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler // Update the cursor for each key based on the stored settings or default cursors. this.keys.forEach((key, index) => { - this.setOptionCursor(index, settings.hasOwnProperty(key as string) ? settings[key as string] : this.optionCursors[index]); + this.setOptionCursor( + index, + settings.hasOwnProperty(key as string) ? settings[key as string] : this.optionCursors[index], + ); }); // If the active configuration has no custom bindings set, exit the function early. @@ -338,8 +376,8 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler updateNavigationDisplay() { const specialIcons = { - "BUTTON_HOME": "HOME.png", - "BUTTON_DELETE": "DEL.png", + BUTTON_HOME: "HOME.png", + BUTTON_DELETE: "DEL.png", }; for (const settingName of Object.keys(this.navigationIcons)) { if (Object.keys(specialIcons).includes(settingName)) { @@ -462,15 +500,17 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler if (!this.optionValueLabels) { return false; } - if (cursor) { // If not at the top, move the cursor up. + if (cursor) { + // If not at the top, move the cursor up. if (this.cursor) { success = this.setCursor(this.cursor - 1); - } else {// If at the top of the visible items, scroll up. + } else { + // If at the top of the visible items, scroll up. success = this.setScrollCursor(this.scrollCursor - 1); } } else { - // When at the top of the menu and pressing UP, move to the bottommost item. - // First, set the cursor to the last visible element, preparing for the scroll to the end. + // When at the top of the menu and pressing UP, move to the bottommost item. + // First, set the cursor to the last visible element, preparing for the scroll to the end. const successA = this.setCursor(this.rowsToDisplay - 1); // Then, adjust the scroll to display the bottommost elements of the menu. const successB = this.setScrollCursor(this.optionValueLabels.length - this.rowsToDisplay); @@ -488,8 +528,8 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler success = this.setScrollCursor(this.scrollCursor + 1); } } else { - // When at the bottom of the menu and pressing DOWN, move to the topmost item. - // First, set the cursor to the first visible element, resetting the scroll to the top. + // When at the bottom of the menu and pressing DOWN, move to the topmost item. + // First, set the cursor to the first visible element, resetting the scroll to the top. const successA = this.setCursor(0); // Then, reset the scroll to start from the first element of the menu. const successB = this.setScrollCursor(0); @@ -555,7 +595,7 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler // Check if the cursor object exists, if not, create it. if (!this.cursorObj) { - const cursorWidth = (globalScene.game.canvas.width / 6) - (this.scrollBar.visible ? 16 : 10); + const cursorWidth = globalScene.game.canvas.width / 6 - (this.scrollBar.visible ? 16 : 10); this.cursorObj = globalScene.add.nineslice(0, 0, "summary_moves_cursor", undefined, cursorWidth, 16, 1, 1, 1, 1); this.cursorObj.setOrigin(0, 0); // Set the origin to the top-left corner. this.optionsContainer.add(this.cursorObj); // Add the cursor to the options container. @@ -681,5 +721,4 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler // Set the cursor object reference to null to fully dereference it. this.cursorObj = null; } - } diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts index a0287f80f79..0c14b91251e 100644 --- a/src/ui/settings/abstract-settings-ui-handler.ts +++ b/src/ui/settings/abstract-settings-ui-handler.ts @@ -11,7 +11,6 @@ import { Setting, SettingKeys } from "#app/system/settings/settings"; import i18next from "i18next"; import { globalScene } from "#app/global-scene"; - /** * Abstract class for handling UI elements related to settings. */ @@ -58,17 +57,30 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler { this.settingsContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1); this.settingsContainer.setName(`settings-${this.title}`); - this.settingsContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6 - 20), Phaser.Geom.Rectangle.Contains); + this.settingsContainer.setInteractive( + new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6 - 20), + Phaser.Geom.Rectangle.Contains, + ); this.navigationIcons = {}; this.navigationContainer = new NavigationMenu(0, 0); - this.optionsBg = addWindow(0, this.navigationContainer.height, (globalScene.game.canvas.width / 6) - 2, (globalScene.game.canvas.height / 6) - 16 - this.navigationContainer.height - 2); + this.optionsBg = addWindow( + 0, + this.navigationContainer.height, + globalScene.game.canvas.width / 6 - 2, + globalScene.game.canvas.height / 6 - 16 - this.navigationContainer.height - 2, + ); this.optionsBg.setName("window-options-bg"); this.optionsBg.setOrigin(0, 0); - const actionsBg = addWindow(0, (globalScene.game.canvas.height / 6) - this.navigationContainer.height, (globalScene.game.canvas.width / 6) - 2, 22); + const actionsBg = addWindow( + 0, + globalScene.game.canvas.height / 6 - this.navigationContainer.height, + globalScene.game.canvas.width / 6 - 2, + 22, + ); actionsBg.setOrigin(0, 0); const iconAction = globalScene.add.sprite(0, 0, "keyboard"); @@ -96,44 +108,56 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler { this.reloadSettings = this.settings.filter(s => s?.requireReload); - this.settings - .forEach((setting, s) => { - let settingName = setting.label; - if (setting?.requireReload) { - settingName += ` (${i18next.t("settings:requireReload")})`; - } + this.settings.forEach((setting, s) => { + let settingName = setting.label; + if (setting?.requireReload) { + settingName += ` (${i18next.t("settings:requireReload")})`; + } - this.settingLabels[s] = addTextObject(8, 28 + s * 16, settingName, TextStyle.SETTINGS_LABEL); - this.settingLabels[s].setOrigin(0, 0); + this.settingLabels[s] = addTextObject(8, 28 + s * 16, settingName, TextStyle.SETTINGS_LABEL); + this.settingLabels[s].setOrigin(0, 0); - this.optionsContainer.add(this.settingLabels[s]); - this.optionValueLabels.push(setting.options.map((option, o) => { - const valueLabel = addTextObject(0, 0, option.label, setting.default === o ? TextStyle.SETTINGS_SELECTED : TextStyle.SETTINGS_VALUE); + this.optionsContainer.add(this.settingLabels[s]); + this.optionValueLabels.push( + setting.options.map((option, o) => { + const valueLabel = addTextObject( + 0, + 0, + option.label, + setting.default === o ? TextStyle.SETTINGS_SELECTED : TextStyle.SETTINGS_VALUE, + ); valueLabel.setOrigin(0, 0); this.optionsContainer.add(valueLabel); return valueLabel; - })); + }), + ); - const totalWidth = this.optionValueLabels[s].map(o => o.width).reduce((total, width) => total += width, 0); + const totalWidth = this.optionValueLabels[s].map(o => o.width).reduce((total, width) => (total += width), 0); - const labelWidth = Math.max(78, this.settingLabels[s].displayWidth + 8); + const labelWidth = Math.max(78, this.settingLabels[s].displayWidth + 8); - const totalSpace = (297 - labelWidth) - totalWidth / 6; - const optionSpacing = Math.floor(totalSpace / (this.optionValueLabels[s].length - 1)); + const totalSpace = 297 - labelWidth - totalWidth / 6; + const optionSpacing = Math.floor(totalSpace / (this.optionValueLabels[s].length - 1)); - let xOffset = 0; + let xOffset = 0; - for (const value of this.optionValueLabels[s]) { - value.setPositionRelative(this.settingLabels[s], labelWidth + xOffset, 0); - xOffset += value.width / 6 + optionSpacing; - } - }); + for (const value of this.optionValueLabels[s]) { + value.setPositionRelative(this.settingLabels[s], labelWidth + xOffset, 0); + xOffset += value.width / 6 + optionSpacing; + } + }); this.optionCursors = this.settings.map(setting => setting.default); - this.scrollBar = new ScrollBar(this.optionsBg.width - 9, this.optionsBg.y + 5, 4, this.optionsBg.height - 11, this.rowsToDisplay); + this.scrollBar = new ScrollBar( + this.optionsBg.width - 9, + this.optionsBg.y + 5, + 4, + this.optionsBg.height - 11, + this.rowsToDisplay, + ); this.scrollBar.setTotalRows(this.settings.length); // Two-lines message box @@ -145,7 +169,9 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler { settingsMessageBox.setOrigin(0, 1); this.messageBoxContainer.add(settingsMessageBox); - const messageText = addTextObject(8, -40, "", TextStyle.WINDOW, { maxLines: 2 }); + const messageText = addTextObject(8, -40, "", TextStyle.WINDOW, { + maxLines: 2, + }); messageText.setWordWrapWidth(globalScene.game.canvas.width - 60); messageText.setName("settings-message"); messageText.setOrigin(0, 0); @@ -200,14 +226,18 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler { * * @param args - Arguments to be passed to the show method. * @returns `true` if successful. - */ + */ show(args: any[]): boolean { super.show(args); this.updateBindings(); - const settings: object = localStorage.hasOwnProperty(this.localStorageKey) ? JSON.parse(localStorage.getItem(this.localStorageKey)!) : {}; // TODO: is this bang correct? + const settings: object = localStorage.hasOwnProperty(this.localStorageKey) + ? JSON.parse(localStorage.getItem(this.localStorageKey)!) + : {}; // TODO: is this bang correct? - this.settings.forEach((setting, s) => this.setOptionCursor(s, settings.hasOwnProperty(setting.key) ? settings[setting.key] : this.settings[s].default)); + this.settings.forEach((setting, s) => + this.setOptionCursor(s, settings.hasOwnProperty(setting.key) ? settings[setting.key] : this.settings[s].default), + ); this.settingsContainer.setVisible(true); this.setCursor(0); @@ -251,8 +281,8 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler { success = this.setScrollCursor(this.scrollCursor - 1); } } else { - // When at the top of the menu and pressing UP, move to the bottommost item. - // First, set the cursor to the last visible element, preparing for the scroll to the end. + // When at the top of the menu and pressing UP, move to the bottommost item. + // First, set the cursor to the last visible element, preparing for the scroll to the end. const successA = this.setCursor(this.rowsToDisplay - 1); // Then, adjust the scroll to display the bottommost elements of the menu. const successB = this.setScrollCursor(this.optionValueLabels.length - this.rowsToDisplay); @@ -261,14 +291,15 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler { break; case Button.DOWN: if (cursor < this.optionValueLabels.length - 1) { - if (this.cursor < this.rowsToDisplay - 1) {// if the visual cursor is in the frame of 0 to 8 + if (this.cursor < this.rowsToDisplay - 1) { + // if the visual cursor is in the frame of 0 to 8 success = this.setCursor(this.cursor + 1); } else if (this.scrollCursor < this.optionValueLabels.length - this.rowsToDisplay) { success = this.setScrollCursor(this.scrollCursor + 1); } } else { - // When at the bottom of the menu and pressing DOWN, move to the topmost item. - // First, set the cursor to the first visible element, resetting the scroll to the top. + // When at the bottom of the menu and pressing DOWN, move to the topmost item. + // First, set the cursor to the first visible element, resetting the scroll to the top. const successA = this.setCursor(0); // Then, reset the scroll to start from the first element of the menu. const successB = this.setScrollCursor(0); @@ -276,12 +307,13 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler { } break; case Button.LEFT: - if (this.optionCursors[cursor]) {// Moves the option cursor left, if possible. + if (this.optionCursors[cursor]) { + // Moves the option cursor left, if possible. success = this.setOptionCursor(cursor, this.optionCursors[cursor] - 1, true); } break; case Button.RIGHT: - // Moves the option cursor right, if possible. + // Moves the option cursor right, if possible. if (this.optionCursors[cursor] < this.optionValueLabels[cursor].length - 1) { success = this.setOptionCursor(cursor, this.optionCursors[cursor] + 1, true); } @@ -331,7 +363,7 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler { const ret = super.setCursor(cursor); if (!this.cursorObj) { - const cursorWidth = (globalScene.game.canvas.width / 6) - (this.scrollBar.visible ? 16 : 10); + const cursorWidth = globalScene.game.canvas.width / 6 - (this.scrollBar.visible ? 16 : 10); this.cursorObj = globalScene.add.nineslice(0, 0, "summary_moves_cursor", undefined, cursorWidth, 16, 1, 1, 1, 1); this.cursorObj.setOrigin(0, 0); this.optionsContainer.add(this.cursorObj); @@ -390,7 +422,8 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler { this.setOptionCursor(settingIndex, lastCursor, false); }; - const confirmationMessage = setting.options[cursor].confirmationMessage ?? i18next.t("settings:defaultConfirmMessage"); + const confirmationMessage = + setting.options[cursor].confirmationMessage ?? i18next.t("settings:defaultConfirmMessage"); globalScene.ui.showText(confirmationMessage, null, () => { globalScene.ui.setOverlayMode(Mode.CONFIRM, confirmUpdateSetting, cancelUpdateSetting, null, null, 1, 750); }); @@ -463,7 +496,14 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler { this.cursorObj = null; } - override showText(text: string, delay?: integer, callback?: Function, callbackDelay?: integer, prompt?: boolean, promptDelay?: integer) { + override showText( + text: string, + delay?: number, + callback?: Function, + callbackDelay?: number, + prompt?: boolean, + promptDelay?: number, + ) { this.messageBoxContainer.setVisible(!!text?.length); super.showText(text, delay, callback, callbackDelay, prompt, promptDelay); } diff --git a/src/ui/settings/gamepad-binding-ui-handler.ts b/src/ui/settings/gamepad-binding-ui-handler.ts index b69c2f34e06..62bc2db7825 100644 --- a/src/ui/settings/gamepad-binding-ui-handler.ts +++ b/src/ui/settings/gamepad-binding-ui-handler.ts @@ -5,9 +5,7 @@ import { getIconWithSettingName, getKeyWithKeycode } from "#app/configs/inputs/c import { addTextObject, TextStyle } from "#app/ui/text"; import { globalScene } from "#app/global-scene"; - export default class GamepadBindingUiHandler extends AbstractBindingUiHandler { - constructor(mode: Mode | null = null) { super(mode); globalScene.input.gamepad?.on("down", this.gamepadButtonDown, this); @@ -23,7 +21,11 @@ export default class GamepadBindingUiHandler extends AbstractBindingUiHandler { this.swapText = addTextObject(0, 0, "will swap with", TextStyle.WINDOW); this.swapText.setOrigin(0.5); - this.swapText.setPositionRelative(this.optionSelectBg, this.optionSelectBg.width / 2 - 2, this.optionSelectBg.height / 2 - 2); + this.swapText.setPositionRelative( + this.optionSelectBg, + this.optionSelectBg.width / 2 - 2, + this.optionSelectBg.height / 2 - 2, + ); this.swapText.setVisible(false); this.targetButtonIcon = globalScene.add.sprite(0, 0, "xbox"); @@ -45,10 +47,15 @@ export default class GamepadBindingUiHandler extends AbstractBindingUiHandler { return globalScene.inputController?.selectedDevice[Device.GAMEPAD]; } - gamepadButtonDown(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, value: number): void { - const blacklist = [ 12, 13, 14, 15 ]; // d-pad buttons are blacklisted. + gamepadButtonDown(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, _value: number): void { + const blacklist = [12, 13, 14, 15]; // d-pad buttons are blacklisted. // Check conditions before processing the button press. - if (!this.listening || pad.id.toLowerCase() !== this.getSelectedDevice() || blacklist.includes(button.index) || this.buttonPressed !== null) { + if ( + !this.listening || + pad.id.toLowerCase() !== this.getSelectedDevice() || + blacklist.includes(button.index) || + this.buttonPressed !== null + ) { return; } const activeConfig = globalScene.inputController.getActiveConfig(Device.GAMEPAD); @@ -73,8 +80,8 @@ export default class GamepadBindingUiHandler extends AbstractBindingUiHandler { } /** - * Clear the UI elements and state. - */ + * Clear the UI elements and state. + */ clear() { super.clear(); this.targetButtonIcon.setVisible(false); diff --git a/src/ui/settings/keyboard-binding-ui-handler.ts b/src/ui/settings/keyboard-binding-ui-handler.ts index ddc60a15631..8735faeaaab 100644 --- a/src/ui/settings/keyboard-binding-ui-handler.ts +++ b/src/ui/settings/keyboard-binding-ui-handler.ts @@ -5,9 +5,7 @@ import { Device } from "#enums/devices"; import { addTextObject, TextStyle } from "#app/ui/text"; import { globalScene } from "#app/global-scene"; - export default class KeyboardBindingUiHandler extends AbstractBindingUiHandler { - constructor(mode: Mode | null = null) { super(mode); // Listen to gamepad button down events to initiate binding. @@ -70,5 +68,4 @@ export default class KeyboardBindingUiHandler extends AbstractBindingUiHandler { } return false; } - } diff --git a/src/ui/settings/move-touch-controls-handler.ts b/src/ui/settings/move-touch-controls-handler.ts index 6128f5954e8..44377c8c2ab 100644 --- a/src/ui/settings/move-touch-controls-handler.ts +++ b/src/ui/settings/move-touch-controls-handler.ts @@ -1,31 +1,30 @@ import { globalScene } from "#app/global-scene"; import type TouchControl from "#app/touch-controls"; import type UI from "#app/ui/ui"; +import i18next from "i18next"; export const TOUCH_CONTROL_POSITIONS_LANDSCAPE = "touchControlPositionsLandscape"; export const TOUCH_CONTROL_POSITIONS_PORTRAIT = "touchControlPositionsPortrait"; - -type ControlPosition = { id: string, x: number, y: number }; +type ControlPosition = { id: string; x: number; y: number }; type ConfigurationEventListeners = { - "touchstart": EventListener[] - "touchmove": EventListener[] - "touchend": EventListener[] + touchstart: EventListener[]; + touchmove: EventListener[]; + touchend: EventListener[]; }; type ToolbarRefs = { - toolbar: HTMLDivElement, - saveButton: HTMLDivElement - resetButton: HTMLDivElement - cancelButton: HTMLDivElement + toolbar: HTMLDivElement; + saveButton: HTMLDivElement; + resetButton: HTMLDivElement; + cancelButton: HTMLDivElement; }; /** * Handles the dragging of touch controls around the screen. */ export default class MoveTouchControlsHandler { - /** The element that is currently being dragged */ private draggingElement: HTMLElement | null = null; @@ -40,9 +39,9 @@ export default class MoveTouchControlsHandler { * These are used to remove the event listeners when the configuration mode is disabled. */ private configurationEventListeners: ConfigurationEventListeners = { - "touchstart": [], - "touchmove": [], - "touchend": [] + touchstart: [], + touchmove: [], + touchend: [], }; private overlay: Phaser.GameObjects.Container; @@ -54,7 +53,7 @@ export default class MoveTouchControlsHandler { this.touchControls = touchControls; this.inConfigurationMode = false; this.setPositions(this.getSavedPositionsOfCurrentOrientation() ?? []); - window.addEventListener("resize", (event) => { + window.addEventListener("resize", _event => { const screenSize = this.getScreenSize(); if (screenSize.width > screenSize.height !== this.isLandscapeMode) { this.changeOrientation(screenSize.width > screenSize.height); @@ -71,7 +70,9 @@ export default class MoveTouchControlsHandler { if (this.inConfigurationMode) { const orientation = document.querySelector("#touchControls #orientation"); if (orientation) { - orientation.textContent = this.isLandscapeMode ? "Landscape" : "Portrait"; + orientation.textContent = this.isLandscapeMode + ? i18next.t("settings:landscape") + : i18next.t("settings:portrait"); } } const positions = this.getSavedPositionsOfCurrentOrientation() ?? []; @@ -90,19 +91,22 @@ export default class MoveTouchControlsHandler { const toolbar = document.createElement("div"); toolbar.id = "configToolbar"; toolbar.innerHTML = ` -
-
-
Reset
-
Save & close
-
Cancel
-
-
-
- Orientation: ${this.isLandscapeMode ? "Landscape" : "Portrait"} -
+
+
+
${i18next.t("settings:touchReset")}
+
${i18next.t("settings:touchSaveClose")}
+
${i18next.t("settings:touchCancel")}
+
+
+
+ ${i18next.t("settings:orientation")} + + ${this.isLandscapeMode ? i18next.t("settings:landscape") : i18next.t("settings:portrait")} +
- `; +
+ `; return toolbar; } @@ -146,7 +150,7 @@ export default class MoveTouchControlsHandler { toolbar, saveButton: toolbar.querySelector("#saveButton")!, resetButton: toolbar.querySelector("#resetButton")!, - cancelButton: toolbar.querySelector("#cancelButton")! + cancelButton: toolbar.querySelector("#cancelButton")!, }; } @@ -178,7 +182,9 @@ export default class MoveTouchControlsHandler { } const rect = this.draggingElement.getBoundingClientRect(); // Map the touch position to the center of the dragged element. - const xOffset = this.isLeft(this.draggingElement) ? touch.clientX - rect.width / 2 : window.innerWidth - touch.clientX - rect.width / 2; + const xOffset = this.isLeft(this.draggingElement) + ? touch.clientX - rect.width / 2 + : window.innerWidth - touch.clientX - rect.width / 2; const yOffset = window.innerHeight - touch.clientY - rect.height / 2; this.setPosition(this.draggingElement, xOffset, yOffset); }; @@ -200,8 +206,8 @@ export default class MoveTouchControlsHandler { .map((controlGroup: HTMLElement) => { return { id: controlGroup.id, - x: parseFloat(this.isLeft(controlGroup) ? controlGroup.style.left : controlGroup.style.right), - y: parseFloat(controlGroup.style.bottom), + x: Number.parseFloat(this.isLeft(controlGroup) ? controlGroup.style.left : controlGroup.style.right), + y: Number.parseFloat(controlGroup.style.bottom), }; }); } @@ -287,7 +293,7 @@ export default class MoveTouchControlsHandler { * @returns All control groups of the touch controls. */ private getControlGroupElements(): HTMLDivElement[] { - return [ ...document.querySelectorAll("#touchControls .control-group") ] as HTMLDivElement[]; + return [...document.querySelectorAll("#touchControls .control-group")] as HTMLDivElement[]; } /** @@ -297,21 +303,21 @@ export default class MoveTouchControlsHandler { */ private createConfigurationEventListeners(controlGroups: HTMLDivElement[]): ConfigurationEventListeners { return { - "touchstart": controlGroups.map((element: HTMLDivElement) => { + touchstart: controlGroups.map((element: HTMLDivElement) => { const startDrag = () => this.startDrag(element); element.addEventListener("touchstart", startDrag, { passive: true }); return startDrag; }), - "touchmove": controlGroups.map(() => { - const drag = (event) => this.drag(event.touches[0]); + touchmove: controlGroups.map(() => { + const drag = event => this.drag(event.touches[0]); window.addEventListener("touchmove", drag, { passive: true }); return drag; }), - "touchend": controlGroups.map(() => { + touchend: controlGroups.map(() => { const stopDrag = () => this.stopDrag(); window.addEventListener("touchend", stopDrag, { passive: true }); return stopDrag; - }) + }), }; } @@ -322,7 +328,15 @@ export default class MoveTouchControlsHandler { */ private createOverlay(ui: UI) { const container = new Phaser.GameObjects.Container(globalScene, 0, 0); - const overlay = new Phaser.GameObjects.Rectangle(globalScene, 0, 0, globalScene.game.canvas.width, globalScene.game.canvas.height, 0x000000, 0.5); + const overlay = new Phaser.GameObjects.Rectangle( + globalScene, + 0, + 0, + globalScene.game.canvas.width, + globalScene.game.canvas.height, + 0x000000, + 0.5, + ); overlay.setInteractive(); container.add(overlay); ui.add(container); @@ -333,9 +347,9 @@ export default class MoveTouchControlsHandler { } /** - * Allows the user to configure the touch controls by dragging buttons around the screen. - * @param ui The UI of the game. - */ + * Allows the user to configure the touch controls by dragging buttons around the screen. + * @param ui The UI of the game. + */ public enableConfigurationMode(ui: UI) { if (this.inConfigurationMode) { return; @@ -360,9 +374,11 @@ export default class MoveTouchControlsHandler { // Remove event listeners const { touchstart, touchmove, touchend } = this.configurationEventListeners; - this.getControlGroupElements().forEach((element, index) => element.removeEventListener("touchstart", touchstart[index])); - touchmove.forEach((listener) => window.removeEventListener("touchmove", listener)); - touchend.forEach((listener) => window.removeEventListener("touchend", listener)); + this.getControlGroupElements().forEach((element, index) => + element.removeEventListener("touchstart", touchstart[index]), + ); + touchmove.forEach(listener => window.removeEventListener("touchmove", listener)); + touchend.forEach(listener => window.removeEventListener("touchend", listener)); // Remove configuration toolbar const toolbar = document.querySelector("#touchControls #configToolbar"); @@ -373,5 +389,4 @@ export default class MoveTouchControlsHandler { document.querySelector("#touchControls")?.classList.remove("config-mode"); this.touchControls.enable(); } - } diff --git a/src/ui/settings/navigationMenu.ts b/src/ui/settings/navigationMenu.ts index 5fa53b7c270..1d2d71e1e20 100644 --- a/src/ui/settings/navigationMenu.ts +++ b/src/ui/settings/navigationMenu.ts @@ -33,7 +33,13 @@ export class NavigationManager { Mode.SETTINGS_GAMEPAD, Mode.SETTINGS_KEYBOARD, ]; - this.labels = [ i18next.t("settings:general"), i18next.t("settings:display"), i18next.t("settings:audio"), i18next.t("settings:gamepad"), i18next.t("settings:keyboard") ]; + this.labels = [ + i18next.t("settings:general"), + i18next.t("settings:display"), + i18next.t("settings:audio"), + i18next.t("settings:gamepad"), + i18next.t("settings:keyboard"), + ]; } public reset() { @@ -95,7 +101,6 @@ export class NavigationManager { public clearNavigationMenus() { this.navigationMenus.length = 0; } - } export default class NavigationMenu extends Phaser.GameObjects.Container { @@ -118,7 +123,7 @@ export default class NavigationMenu extends Phaser.GameObjects.Container { */ setup() { const navigationManager = NavigationManager.getInstance(); - const headerBg = addWindow(0, 0, (globalScene.game.canvas.width / 6) - 2, 24); + const headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6 - 2, 24); headerBg.setOrigin(0, 0); this.add(headerBg); this.width = headerBg.width; @@ -161,7 +166,7 @@ export default class NavigationMenu extends Phaser.GameObjects.Container { const navigationManager = NavigationManager.getInstance(); const posSelected = navigationManager.modes.indexOf(navigationManager.selectedMode); - for (const [ index, title ] of this.headerTitles.entries()) { + for (const [index, title] of this.headerTitles.entries()) { setTextStyle(title, index === posSelected ? TextStyle.SETTINGS_SELECTED : TextStyle.SETTINGS_LABEL); } } @@ -171,8 +176,8 @@ export default class NavigationMenu extends Phaser.GameObjects.Container { */ updateIcons() { const specialIcons = { - "BUTTON_HOME": "HOME.png", - "BUTTON_DELETE": "DEL.png", + BUTTON_HOME: "HOME.png", + BUTTON_DELETE: "DEL.png", }; for (const settingName of Object.keys(this.navigationIcons)) { if (Object.keys(specialIcons).includes(settingName)) { diff --git a/src/ui/settings/option-select-ui-handler.ts b/src/ui/settings/option-select-ui-handler.ts index 5deaba5cfc5..b3d1735dc19 100644 --- a/src/ui/settings/option-select-ui-handler.ts +++ b/src/ui/settings/option-select-ui-handler.ts @@ -6,7 +6,7 @@ export default class OptionSelectUiHandler extends AbstractOptionSelectUiHandler super(mode); } - getWindowWidth(): integer { + getWindowWidth(): number { return 64; } } diff --git a/src/ui/settings/settings-audio-ui-handler.ts b/src/ui/settings/settings-audio-ui-handler.ts index 3b591eab4b9..f8cb4da4ba2 100644 --- a/src/ui/settings/settings-audio-ui-handler.ts +++ b/src/ui/settings/settings-audio-ui-handler.ts @@ -1,7 +1,7 @@ import type { Mode } from "../ui"; import AbstractSettingsUiHandler from "./abstract-settings-ui-handler"; import { SettingType } from "#app/system/settings/settings"; -"#app/inputs-controller"; +("#app/inputs-controller"); export default class SettingsAudioUiHandler extends AbstractSettingsUiHandler { /** diff --git a/src/ui/settings/settings-display-ui-handler.ts b/src/ui/settings/settings-display-ui-handler.ts index 98fc16e2f96..b3505fe90f2 100644 --- a/src/ui/settings/settings-display-ui-handler.ts +++ b/src/ui/settings/settings-display-ui-handler.ts @@ -1,7 +1,7 @@ import type { Mode } from "../ui"; import AbstractSettingsUiHandler from "./abstract-settings-ui-handler"; import { SettingKeys, SettingType } from "#app/system/settings/settings"; -"#app/inputs-controller"; +("#app/inputs-controller"); export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler { /** diff --git a/src/ui/settings/settings-gamepad-ui-handler.ts b/src/ui/settings/settings-gamepad-ui-handler.ts index 3d23b7e99bb..0b3a7241ff2 100644 --- a/src/ui/settings/settings-gamepad-ui-handler.ts +++ b/src/ui/settings/settings-gamepad-ui-handler.ts @@ -5,7 +5,7 @@ import { SettingGamepad, settingGamepadBlackList, settingGamepadDefaults, - settingGamepadOptions + settingGamepadOptions, } from "../../system/settings/settings-gamepad"; import pad_xbox360 from "#app/configs/inputs/pad_xbox360"; import pad_dualshock from "#app/configs/inputs/pad_dualshock"; @@ -24,19 +24,18 @@ import { globalScene } from "#app/global-scene"; */ export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiHandler { - /** - * Creates an instance of SettingsGamepadUiHandler. - * - * @param mode - The UI mode, optional. - */ + * Creates an instance of SettingsGamepadUiHandler. + * + * @param mode - The UI mode, optional. + */ constructor(mode: Mode | null = null) { super(mode); this.titleSelected = "Gamepad"; this.setting = SettingGamepad; this.settingDeviceDefaults = settingGamepadDefaults; this.settingDeviceOptions = settingGamepadOptions; - this.configs = [ pad_xbox360, pad_dualshock, pad_unlicensedSNES ]; + this.configs = [pad_xbox360, pad_dualshock, pad_unlicensedSNES]; this.commonSettingsCount = 2; this.localStoragePropertyName = "settingsGamepad"; this.settingBlacklisted = settingGamepadBlackList; @@ -46,8 +45,8 @@ export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiH setSetting = setSettingGamepad; /** - * Setup UI elements. - */ + * Setup UI elements. + */ setup() { super.setup(); // If no gamepads are detected, set up a default UI prompt in the settings container. @@ -65,11 +64,11 @@ export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiH } /** - * Set the layout for the active configuration. - * - * @param activeConfig - The active gamepad configuration. - * @returns `true` if the layout was successfully applied, otherwise `false`. - */ + * Set the layout for the active configuration. + * + * @param activeConfig - The active gamepad configuration. + * @returns `true` if the layout was successfully applied, otherwise `false`. + */ setLayout(activeConfig: InterfaceConfig): boolean { // Check if there is no active configuration (e.g., no gamepad connected). if (!activeConfig) { @@ -85,15 +84,15 @@ export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiH } /** - * Update the display of the chosen gamepad. - */ + * Update the display of the chosen gamepad. + */ updateChosenGamepadDisplay(): void { // Update any bindings that might have changed since the last update. this.updateBindings(); this.resetScroll(); // Iterate over the keys in the settingDevice enumeration. - for (const [ index, key ] of Object.keys(this.setting).entries()) { + for (const [index, key] of Object.keys(this.setting).entries()) { const setting = this.setting[key]; // Get the actual setting value using the key. // Check if the current setting corresponds to the controller setting. @@ -106,21 +105,29 @@ export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiH // Update the text of the first option label under the current setting to the name of the chosen gamepad, // truncating the name to 30 characters if necessary. - this.layout[_key].optionValueLabels[index][0].setText(truncateString(globalScene.inputController.selectedDevice[Device.GAMEPAD], 20)); + this.layout[_key].optionValueLabels[index][0].setText( + truncateString(globalScene.inputController.selectedDevice[Device.GAMEPAD], 20), + ); } } } } /** - * Save the setting to local storage. - * - * @param settingName - The setting to save. - * @param cursor - The cursor position to save. - */ + * Save the setting to local storage. + * + * @param settingName - The setting to save. + * @param cursor - The cursor position to save. + */ saveSettingToLocalStorage(settingName, cursor): void { if (this.setting[settingName] !== this.setting.Controller) { - globalScene.gameData.saveControlSetting(this.device, this.localStoragePropertyName, settingName, this.settingDeviceDefaults, cursor); + globalScene.gameData.saveControlSetting( + this.device, + this.localStoragePropertyName, + settingName, + this.settingDeviceDefaults, + cursor, + ); } } } diff --git a/src/ui/settings/settings-keyboard-ui-handler.ts b/src/ui/settings/settings-keyboard-ui-handler.ts index ad9f23cc0d9..a7837c8961e 100644 --- a/src/ui/settings/settings-keyboard-ui-handler.ts +++ b/src/ui/settings/settings-keyboard-ui-handler.ts @@ -5,7 +5,7 @@ import { SettingKeyboard, settingKeyboardBlackList, settingKeyboardDefaults, - settingKeyboardOptions + settingKeyboardOptions, } from "#app/system/settings/settings-keyboard"; import { reverseValueToKeySetting, truncateString } from "#app/utils"; import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler"; @@ -24,17 +24,17 @@ import { globalScene } from "#app/global-scene"; */ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUiHandler { /** - * Creates an instance of SettingsKeyboardUiHandler. - * - * @param mode - The UI mode, optional. - */ + * Creates an instance of SettingsKeyboardUiHandler. + * + * @param mode - The UI mode, optional. + */ constructor(mode: Mode | null = null) { super(mode); this.titleSelected = "Keyboard"; this.setting = SettingKeyboard; this.settingDeviceDefaults = settingKeyboardDefaults; this.settingDeviceOptions = settingKeyboardOptions; - this.configs = [ cfg_keyboard_qwerty ]; + this.configs = [cfg_keyboard_qwerty]; this.commonSettingsCount = 0; this.textureOverride = "keyboard"; this.localStoragePropertyName = "settingsKeyboard"; @@ -43,15 +43,15 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi const deleteEvent = globalScene.input.keyboard?.addKey(Phaser.Input.Keyboard.KeyCodes.DELETE); const restoreDefaultEvent = globalScene.input.keyboard?.addKey(Phaser.Input.Keyboard.KeyCodes.HOME); - deleteEvent && deleteEvent.on("up", this.onDeleteDown, this); - restoreDefaultEvent && restoreDefaultEvent.on("up", this.onHomeDown, this); + deleteEvent?.on("up", this.onDeleteDown, this); + restoreDefaultEvent?.on("up", this.onHomeDown, this); } setSetting = setSettingKeyboard; /** - * Setup UI elements. - */ + * Setup UI elements. + */ setup() { super.setup(); // If no gamepads are detected, set up a default UI prompt in the settings container. @@ -75,17 +75,16 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi this.settingsContainer.add(iconDelete); this.settingsContainer.add(deleteText); - // Map the 'noKeyboard' layout options for easy access. this.layout["noKeyboard"].optionsContainer = optionsContainer; this.layout["noKeyboard"].label = label; } /** - * Handle the home key press event. - */ + * Handle the home key press event. + */ onHomeDown(): void { - if (![ Mode.SETTINGS_KEYBOARD, Mode.SETTINGS_GAMEPAD ].includes(globalScene.ui.getMode())) { + if (![Mode.SETTINGS_KEYBOARD, Mode.SETTINGS_GAMEPAD].includes(globalScene.ui.getMode())) { return; } globalScene.gameData.resetMappingToFactory(); @@ -93,8 +92,8 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi } /** - * Handle the delete key press event. - */ + * Handle the delete key press event. + */ onDeleteDown(): void { if (globalScene.ui.getMode() !== Mode.SETTINGS_KEYBOARD) { return; @@ -113,11 +112,11 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi } /** - * Set the layout for the active configuration. - * - * @param activeConfig - The active keyboard configuration. - * @returns `true` if the layout was successfully applied, otherwise `false`. - */ + * Set the layout for the active configuration. + * + * @param activeConfig - The active keyboard configuration. + * @returns `true` if the layout was successfully applied, otherwise `false`. + */ setLayout(activeConfig: InterfaceConfig): boolean { // Check if there is no active configuration (e.g., no gamepad connected). if (!activeConfig) { @@ -133,14 +132,14 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi } /** - * Update the display of the chosen keyboard layout. - */ + * Update the display of the chosen keyboard layout. + */ updateChosenKeyboardDisplay(): void { // Update any bindings that might have changed since the last update. this.updateBindings(); // Iterate over the keys in the settingDevice enumeration. - for (const [ index, key ] of Object.keys(this.setting).entries()) { + for (const [index, key] of Object.keys(this.setting).entries()) { const setting = this.setting[key]; // Get the actual setting value using the key. // Check if the current setting corresponds to the layout setting. @@ -152,31 +151,38 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi } // Skip updating the no gamepad layout. // Update the text of the first option label under the current setting to the name of the chosen gamepad, // truncating the name to 30 characters if necessary. - this.layout[_key].optionValueLabels[index][0].setText(truncateString(globalScene.inputController.selectedDevice[Device.KEYBOARD], 22)); + this.layout[_key].optionValueLabels[index][0].setText( + truncateString(globalScene.inputController.selectedDevice[Device.KEYBOARD], 22), + ); } } } - } /** - * Save the custom keyboard mapping to local storage. - * - * @param config - The configuration to save. - */ + * Save the custom keyboard mapping to local storage. + * + * @param config - The configuration to save. + */ saveCustomKeyboardMappingToLocalStorage(config): void { globalScene.gameData.saveMappingConfigs(globalScene.inputController?.selectedDevice[Device.KEYBOARD], config); } /** - * Save the setting to local storage. - * - * @param settingName - The name of the setting to save. - * @param cursor - The cursor position to save. - */ + * Save the setting to local storage. + * + * @param settingName - The name of the setting to save. + * @param cursor - The cursor position to save. + */ saveSettingToLocalStorage(settingName, cursor): void { if (this.setting[settingName] !== this.setting.Default_Layout) { - globalScene.gameData.saveControlSetting(this.device, this.localStoragePropertyName, settingName, this.settingDeviceDefaults, cursor); + globalScene.gameData.saveControlSetting( + this.device, + this.localStoragePropertyName, + settingName, + this.settingDeviceDefaults, + cursor, + ); } } } diff --git a/src/ui/settings/shiny_icons.json b/src/ui/settings/shiny_icons.json index d6465cf2c3a..f40c606ca47 100644 --- a/src/ui/settings/shiny_icons.json +++ b/src/ui/settings/shiny_icons.json @@ -1,41 +1,41 @@ { - "textures": [ - { - "image": "shiny_icons.png", - "format": "RGBA8888", - "size": { - "w": 45, - "h": 14 - }, - "scale": 1, - "frames": [ - { - "filename": "0", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 45, - "h": 14 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 15, - "h": 14 - }, - "frame": { - "x": 0, - "y": 0, - "w": 15, - "h": 14 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a3275c7504a9b35b288265e191b1d14c:420725f3fb73c2cac0ab3bbc0a46f2e1:3a8b8ca0f0e4be067dd46c07b78ee013$" - } + "textures": [ + { + "image": "shiny_icons.png", + "format": "RGBA8888", + "size": { + "w": 45, + "h": 14 + }, + "scale": 1, + "frames": [ + { + "filename": "0", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 45, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 15, + "h": 14 + }, + "frame": { + "x": 0, + "y": 0, + "w": 15, + "h": 14 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:a3275c7504a9b35b288265e191b1d14c:420725f3fb73c2cac0ab3bbc0a46f2e1:3a8b8ca0f0e4be067dd46c07b78ee013$" + } } diff --git a/src/ui/starter-container.ts b/src/ui/starter-container.ts index 792ce97e103..71e40844f38 100644 --- a/src/ui/starter-container.ts +++ b/src/ui/starter-container.ts @@ -13,7 +13,7 @@ export class StarterContainer extends Phaser.GameObjects.Container { public classicWinIcon: Phaser.GameObjects.Image; public candyUpgradeIcon: Phaser.GameObjects.Image; public candyUpgradeOverlayIcon: Phaser.GameObjects.Image; - public cost: number = 0; + public cost = 0; constructor(species: PokemonSpecies) { super(globalScene, 0, 0); @@ -32,10 +32,16 @@ export class StarterContainer extends Phaser.GameObjects.Container { this.starterPassiveBgs = starterPassiveBg; // icon - this.icon = globalScene.add.sprite(-2, 2, species.getIconAtlasKey(defaultProps.formIndex, defaultProps.shiny, defaultProps.variant)); + this.icon = globalScene.add.sprite( + -2, + 2, + species.getIconAtlasKey(defaultProps.formIndex, defaultProps.shiny, defaultProps.variant), + ); this.icon.setScale(0.5); this.icon.setOrigin(0, 0); - this.icon.setFrame(species.getIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant)); + this.icon.setFrame( + species.getIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant), + ); this.checkIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant); this.icon.setTint(0); this.add(this.icon); @@ -51,7 +57,9 @@ export class StarterContainer extends Phaser.GameObjects.Container { this.add(this.shinyIcons); // value label - const label = addTextObject(1, 2, "0", TextStyle.WINDOW, { fontSize: "32px" }); + const label = addTextObject(1, 2, "0", TextStyle.WINDOW, { + fontSize: "32px", + }); label.setShadowOffset(2, 2); label.setOrigin(0, 0); label.setVisible(false); diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index de7b182c5c1..ccc56f38368 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -8,11 +8,12 @@ import i18next from "i18next"; import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { starterColors } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; +import type { Ability } from "#app/data/ability"; import { allAbilities } from "#app/data/ability"; import { speciesEggMoves } from "#app/data/balance/egg-moves"; import { GrowthRate, getGrowthRateColor } from "#app/data/exp"; import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { getNatureName } from "#app/data/nature"; import { pokemonFormChanges } from "#app/data/pokemon-forms"; import type { LevelMoves } from "#app/data/balance/pokemon-level-moves"; @@ -20,10 +21,16 @@ import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balan import type PokemonSpecies from "#app/data/pokemon-species"; import { allSpecies, getPokemonSpeciesForm, getPokerusStarters } from "#app/data/pokemon-species"; import { getStarterValueFriendshipCap, speciesStarterCosts, POKERUS_STARTER_COUNT } from "#app/data/balance/starters"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { GameModes } from "#app/game-mode"; -import type { DexAttrProps, DexEntry, StarterMoveset, StarterAttributes, StarterPreferences } from "#app/system/game-data"; -import { AbilityAttr, DexAttr, StarterPrefs } from "#app/system/game-data"; +import type { + DexAttrProps, + DexEntry, + StarterMoveset, + StarterAttributes, + StarterPreferences, +} from "#app/system/game-data"; +import { AbilityAttr, DexAttr, loadStarterPreferences, saveStarterPreferences } from "#app/system/game-data"; import { Tutorial, handleTutorial } from "#app/tutorial"; import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import MessageUiHandler from "#app/ui/message-ui-handler"; @@ -52,78 +59,96 @@ import { SelectChallengePhase } from "#app/phases/select-challenge-phase"; import { EncounterPhase } from "#app/phases/encounter-phase"; import { TitlePhase } from "#app/phases/title-phase"; import { Abilities } from "#enums/abilities"; -import { getPassiveCandyCount, getValueReductionCandyCounts, getSameSpeciesEggCandyCounts } from "#app/data/balance/starters"; -import { BooleanHolder, capitalizeString, fixedInt, getLocalizedSpriteKey, isNullOrUndefined, NumberHolder, padInt, randIntRange, rgbHexToRgba, toReadableString } from "#app/utils"; +import { + getPassiveCandyCount, + getValueReductionCandyCounts, + getSameSpeciesEggCandyCounts, +} from "#app/data/balance/starters"; +import { + BooleanHolder, + fixedInt, + getLocalizedSpriteKey, + isNullOrUndefined, + NumberHolder, + padInt, + randIntRange, + rgbHexToRgba, + toReadableString, +} from "#app/utils"; import type { Nature } from "#enums/nature"; import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; +import { achvs } from "#app/system/achv"; +import * as Utils from "../utils"; +import type { GameObjects } from "phaser"; export type StarterSelectCallback = (starters: Starter[]) => void; export interface Starter { species: PokemonSpecies; dexAttr: bigint; - abilityIndex: integer, + abilityIndex: number; passive: boolean; nature: Nature; moveset?: StarterMoveset; pokerus: boolean; nickname?: string; + teraType?: PokemonType; } interface LanguageSetting { - starterInfoTextSize: string, - instructionTextSize: string, - starterInfoXPos?: integer, - starterInfoYOffset?: integer + starterInfoTextSize: string; + instructionTextSize: string; + starterInfoXPos?: number; + starterInfoYOffset?: number; } const languageSettings: { [key: string]: LanguageSetting } = { - "en":{ + en: { starterInfoTextSize: "56px", instructionTextSize: "38px", }, - "de":{ + de: { starterInfoTextSize: "48px", instructionTextSize: "35px", starterInfoXPos: 33, }, - "es-ES":{ - starterInfoTextSize: "56px", + "es-ES": { + starterInfoTextSize: "52px", instructionTextSize: "35px", }, - "fr":{ + fr: { starterInfoTextSize: "54px", instructionTextSize: "38px", }, - "it":{ + it: { starterInfoTextSize: "56px", instructionTextSize: "38px", }, - "pt_BR":{ + pt_BR: { starterInfoTextSize: "47px", instructionTextSize: "38px", starterInfoXPos: 33, }, - "zh":{ + zh: { starterInfoTextSize: "47px", instructionTextSize: "38px", starterInfoYOffset: 1, starterInfoXPos: 24, }, - "pt":{ + pt: { starterInfoTextSize: "48px", instructionTextSize: "42px", starterInfoXPos: 33, }, - "ko":{ + ko: { starterInfoTextSize: "52px", instructionTextSize: "38px", }, - "ja":{ + ja: { starterInfoTextSize: "51px", instructionTextSize: "38px", }, - "ca-ES":{ + "ca-ES": { starterInfoTextSize: "56px", instructionTextSize: "38px", }, @@ -145,7 +170,7 @@ const randomSelectionWindowHeight = 20; * @param index UI index to calculate the starter position of * @returns An interface with an x and y property */ -function calcStarterPosition(index: number, scrollCursor:number = 0): {x: number, y: number} { +function calcStarterPosition(index: number, scrollCursor = 0): { x: number; y: number } { const yOffset = 13; const height = 17; const x = (index % 9) * 18; @@ -171,7 +196,7 @@ function calcStarterIconY(index: number) { * @param teamSize how many Pokemon are in the team (0-6) * @returns index of the closest Pokemon in the team container */ -function findClosestStarterIndex(y: number, teamSize: number = 6): number { +function findClosestStarterIndex(y: number, teamSize = 6): number { let smallestDistance = teamWindowHeight; let closestStarterIndex = 0; for (let i = 0; i < teamSize; i++) { @@ -205,13 +230,14 @@ function findClosestStarterRow(index: number, numberOfRows: number) { } interface SpeciesDetails { - shiny?: boolean, - formIndex?: integer - female?: boolean, - variant?: Variant, - abilityIndex?: integer, - natureIndex?: integer, - forSeen?: boolean, // default = false + shiny?: boolean; + formIndex?: number; + female?: boolean; + variant?: Variant; + abilityIndex?: number; + natureIndex?: number; + forSeen?: boolean; // default = false + teraType?: PokemonType; } export default class StarterSelectUiHandler extends MessageUiHandler { @@ -257,11 +283,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler { private pokemonCaughtHatchedContainer: Phaser.GameObjects.Container; private pokemonCaughtCountText: Phaser.GameObjects.Text; private pokemonFormText: Phaser.GameObjects.Text; - private pokemonHatchedIcon : Phaser.GameObjects.Sprite; + private pokemonHatchedIcon: Phaser.GameObjects.Sprite; private pokemonHatchedCountText: Phaser.GameObjects.Text; private pokemonShinyIcon: Phaser.GameObjects.Sprite; private pokemonPassiveDisabledIcon: Phaser.GameObjects.Sprite; private pokemonPassiveLockedIcon: Phaser.GameObjects.Sprite; + private teraIcon: Phaser.GameObjects.Sprite; private activeTooltip: "ABILITY" | "PASSIVE" | "CANDY" | undefined; private instructionsContainer: Phaser.GameObjects.Container; @@ -271,28 +298,31 @@ export default class StarterSelectUiHandler extends MessageUiHandler { private abilityIconElement: Phaser.GameObjects.Sprite; private genderIconElement: Phaser.GameObjects.Sprite; private natureIconElement: Phaser.GameObjects.Sprite; + private teraIconElement: Phaser.GameObjects.Sprite; private goFilterIconElement: Phaser.GameObjects.Sprite; private shinyLabel: Phaser.GameObjects.Text; private formLabel: Phaser.GameObjects.Text; private genderLabel: Phaser.GameObjects.Text; private abilityLabel: Phaser.GameObjects.Text; private natureLabel: Phaser.GameObjects.Text; + private teraLabel: Phaser.GameObjects.Text; private goFilterLabel: Phaser.GameObjects.Text; private starterSelectMessageBox: Phaser.GameObjects.NineSlice; private starterSelectMessageBoxContainer: Phaser.GameObjects.Container; private statsContainer: StatsContainer; - private moveInfoOverlay : MoveInfoOverlay; + private moveInfoOverlay: MoveInfoOverlay; private statsMode: boolean; - private starterIconsCursorXOffset: number = -3; - private starterIconsCursorYOffset: number = 1; + private starterIconsCursorXOffset = -3; + private starterIconsCursorYOffset = 1; private starterIconsCursorIndex: number; private filterMode: boolean; - private dexAttrCursor: bigint = 0n; - private abilityCursor: number = -1; - private natureCursor: number = -1; - private filterBarCursor: integer = 0; + private dexAttrCursor = 0n; + private abilityCursor = -1; + private natureCursor = -1; + private teraCursor: PokemonType = PokemonType.UNKNOWN; + private filterBarCursor = 0; private starterMoveset: StarterMoveset | null; private scrollCursor: number; @@ -302,8 +332,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { public starterSpecies: PokemonSpecies[] = []; private pokerusSpecies: PokemonSpecies[] = []; private starterAttr: bigint[] = []; - private starterAbilityIndexes: integer[] = []; + private starterAbilityIndexes: number[] = []; private starterNatures: Nature[] = []; + private starterTeras: PokemonType[] = []; private starterMovesets: StarterMoveset[] = []; private speciesStarterDexEntry: DexEntry | null; private speciesStarterMoves: Moves[]; @@ -312,6 +343,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { private canCycleGender: boolean; private canCycleAbility: boolean; private canCycleNature: boolean; + private canCycleTera: boolean; private assetLoadCancelled: BooleanHolder | null; public cursorObj: Phaser.GameObjects.Image; @@ -336,7 +368,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { private starterPreferences: StarterPreferences; - protected blockInput: boolean = false; + protected blockInput = false; constructor() { super(Mode.STARTER_SELECT); @@ -352,7 +384,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.starterSelectContainer.setVisible(false); ui.add(this.starterSelectContainer); - const bgColor = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0x006860); + const bgColor = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6, + 0x006860, + ); bgColor.setOrigin(0, 0); this.starterSelectContainer.add(bgColor); @@ -366,13 +404,27 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.starterSelectContainer.add(this.shinyOverlay); const starterContainerWindow = addWindow(speciesContainerX, filterBarHeight + 1, 175, 161); - const starterContainerBg = globalScene.add.image(speciesContainerX + 1, filterBarHeight + 2, "starter_container_bg"); + const starterContainerBg = globalScene.add.image( + speciesContainerX + 1, + filterBarHeight + 2, + "starter_container_bg", + ); starterContainerBg.setOrigin(0, 0); this.starterSelectContainer.add(starterContainerBg); - this.starterSelectContainer.add(addWindow(teamWindowX, teamWindowY - randomSelectionWindowHeight, teamWindowWidth, randomSelectionWindowHeight, true)); - this.starterSelectContainer.add(addWindow(teamWindowX, teamWindowY, teamWindowWidth, teamWindowHeight )); - this.starterSelectContainer.add(addWindow(teamWindowX, teamWindowY + teamWindowHeight, teamWindowWidth, teamWindowWidth, true)); + this.starterSelectContainer.add( + addWindow( + teamWindowX, + teamWindowY - randomSelectionWindowHeight, + teamWindowWidth, + randomSelectionWindowHeight, + true, + ), + ); + this.starterSelectContainer.add(addWindow(teamWindowX, teamWindowY, teamWindowWidth, teamWindowHeight)); + this.starterSelectContainer.add( + addWindow(teamWindowX, teamWindowY + teamWindowHeight, teamWindowWidth, teamWindowWidth, true), + ); this.starterSelectContainer.add(starterContainerWindow); // Create and initialise filter bar @@ -395,7 +447,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.filterBar.addFilter(DropDownColumn.GEN, i18next.t("filterBar:genFilter"), genDropDown); // type filter - const typeKeys = Object.keys(Type).filter(v => isNaN(Number(v))); + const typeKeys = Object.keys(PokemonType).filter(v => Number.isNaN(Number(v))); const typeOptions: DropDownOption[] = []; typeKeys.forEach((type, index) => { if (index === 0 || index === 19) { @@ -406,7 +458,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler { typeSprite.setFrame(type.toLowerCase()); typeOptions.push(new DropDownOption(index, new DropDownLabel("", typeSprite))); }); - this.filterBar.addFilter(DropDownColumn.TYPES, i18next.t("filterBar:typeFilter"), new DropDown(0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5)); + this.filterBar.addFilter( + DropDownColumn.TYPES, + i18next.t("filterBar:typeFilter"), + new DropDown(0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5), + ); // caught filter const shiny1Sprite = globalScene.add.sprite(0, 0, "shiny_icons"); @@ -430,10 +486,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler { new DropDownOption("SHINY2", new DropDownLabel("", shiny2Sprite)), new DropDownOption("SHINY", new DropDownLabel("", shiny1Sprite)), new DropDownOption("NORMAL", new DropDownLabel(i18next.t("filterBar:normal"))), - new DropDownOption("UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught"))) + new DropDownOption("UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught"))), ]; - this.filterBar.addFilter(DropDownColumn.CAUGHT, i18next.t("filterBar:caughtFilter"), new DropDown(0, 0, caughtOptions, this.updateStarters, DropDownType.HYBRID)); + this.filterBar.addFilter( + DropDownColumn.CAUGHT, + i18next.t("filterBar:caughtFilter"), + new DropDown(0, 0, caughtOptions, this.updateStarters, DropDownType.HYBRID), + ); // unlocks filter const passiveLabels = [ @@ -457,7 +517,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler { new DropDownOption("COST_REDUCTION", costReductionLabels), ]; - this.filterBar.addFilter(DropDownColumn.UNLOCKS, i18next.t("filterBar:unlocksFilter"), new DropDown(0, 0, unlocksOptions, this.updateStarters, DropDownType.RADIAL)); + this.filterBar.addFilter( + DropDownColumn.UNLOCKS, + i18next.t("filterBar:unlocksFilter"), + new DropDown(0, 0, unlocksOptions, this.updateStarters, DropDownType.RADIAL), + ); // misc filter const favoriteLabels = [ @@ -490,19 +554,30 @@ export default class StarterSelectUiHandler extends MessageUiHandler { new DropDownOption("EGG", eggLabels), new DropDownOption("POKERUS", pokerusLabels), ]; - this.filterBar.addFilter(DropDownColumn.MISC, i18next.t("filterBar:miscFilter"), new DropDown(0, 0, miscOptions, this.updateStarters, DropDownType.RADIAL)); + this.filterBar.addFilter( + DropDownColumn.MISC, + i18next.t("filterBar:miscFilter"), + new DropDown(0, 0, miscOptions, this.updateStarters, DropDownType.RADIAL), + ); // sort filter const sortOptions = [ - new DropDownOption(SortCriteria.NUMBER, new DropDownLabel(i18next.t("filterBar:sortByNumber"), undefined, DropDownState.ON)), + new DropDownOption( + SortCriteria.NUMBER, + new DropDownLabel(i18next.t("filterBar:sortByNumber"), undefined, DropDownState.ON), + ), new DropDownOption(SortCriteria.COST, new DropDownLabel(i18next.t("filterBar:sortByCost"))), new DropDownOption(SortCriteria.CANDY, new DropDownLabel(i18next.t("filterBar:sortByCandies"))), new DropDownOption(SortCriteria.IV, new DropDownLabel(i18next.t("filterBar:sortByIVs"))), new DropDownOption(SortCriteria.NAME, new DropDownLabel(i18next.t("filterBar:sortByName"))), new DropDownOption(SortCriteria.CAUGHT, new DropDownLabel(i18next.t("filterBar:sortByNumCaught"))), - new DropDownOption(SortCriteria.HATCHED, new DropDownLabel(i18next.t("filterBar:sortByNumHatched"))) + new DropDownOption(SortCriteria.HATCHED, new DropDownLabel(i18next.t("filterBar:sortByNumHatched"))), ]; - this.filterBar.addFilter(DropDownColumn.SORT, i18next.t("filterBar:sortFilter"), new DropDown(0, 0, sortOptions, this.updateStarters, DropDownType.SINGLE)); + this.filterBar.addFilter( + DropDownColumn.SORT, + i18next.t("filterBar:sortFilter"), + new DropDown(0, 0, sortOptions, this.updateStarters, DropDownType.SINGLE), + ); this.filterBarContainer.add(this.filterBar); this.starterSelectContainer.add(this.filterBarContainer); @@ -525,7 +600,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonNameText.setOrigin(0, 0); this.starterSelectContainer.add(this.pokemonNameText); - this.pokemonGrowthRateLabelText = addTextObject(8, 106, i18next.t("starterSelectUiHandler:growthRate"), TextStyle.SUMMARY_ALT, { fontSize: "36px" }); + this.pokemonGrowthRateLabelText = addTextObject( + 8, + 106, + i18next.t("starterSelectUiHandler:growthRate"), + TextStyle.SUMMARY_ALT, + { fontSize: "36px" }, + ); this.pokemonGrowthRateLabelText.setOrigin(0, 0); this.pokemonGrowthRateLabelText.setVisible(false); this.starterSelectContainer.add(this.pokemonGrowthRateLabelText); @@ -538,11 +619,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonGenderText.setOrigin(0, 0); this.starterSelectContainer.add(this.pokemonGenderText); - this.pokemonUncaughtText = addTextObject(6, 127, i18next.t("starterSelectUiHandler:uncaught"), TextStyle.SUMMARY_ALT, { fontSize: "56px" }); + this.pokemonUncaughtText = addTextObject( + 6, + 127, + i18next.t("starterSelectUiHandler:uncaught"), + TextStyle.SUMMARY_ALT, + { fontSize: "56px" }, + ); this.pokemonUncaughtText.setOrigin(0, 0); this.starterSelectContainer.add(this.pokemonUncaughtText); - // The position should be set per language const starterInfoXPos = textSettings?.starterInfoXPos || 31; const starterInfoYOffset = textSettings?.starterInfoYOffset || 0; @@ -550,24 +636,40 @@ export default class StarterSelectUiHandler extends MessageUiHandler { // The font size should be set per language const starterInfoTextSize = textSettings?.starterInfoTextSize || 56; - this.pokemonAbilityLabelText = addTextObject(6, 127 + starterInfoYOffset, i18next.t("starterSelectUiHandler:ability"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize }); + this.pokemonAbilityLabelText = addTextObject( + 6, + 127 + starterInfoYOffset, + i18next.t("starterSelectUiHandler:ability"), + TextStyle.SUMMARY_ALT, + { fontSize: starterInfoTextSize }, + ); this.pokemonAbilityLabelText.setOrigin(0, 0); this.pokemonAbilityLabelText.setVisible(false); this.starterSelectContainer.add(this.pokemonAbilityLabelText); - this.pokemonAbilityText = addTextObject(starterInfoXPos, 127 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize }); + this.pokemonAbilityText = addTextObject(starterInfoXPos, 127 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { + fontSize: starterInfoTextSize, + }); this.pokemonAbilityText.setOrigin(0, 0); this.pokemonAbilityText.setInteractive(new Phaser.Geom.Rectangle(0, 0, 250, 55), Phaser.Geom.Rectangle.Contains); this.starterSelectContainer.add(this.pokemonAbilityText); - this.pokemonPassiveLabelText = addTextObject(6, 136 + starterInfoYOffset, i18next.t("starterSelectUiHandler:passive"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize }); + this.pokemonPassiveLabelText = addTextObject( + 6, + 136 + starterInfoYOffset, + i18next.t("starterSelectUiHandler:passive"), + TextStyle.SUMMARY_ALT, + { fontSize: starterInfoTextSize }, + ); this.pokemonPassiveLabelText.setOrigin(0, 0); this.pokemonPassiveLabelText.setVisible(false); this.starterSelectContainer.add(this.pokemonPassiveLabelText); - this.pokemonPassiveText = addTextObject(starterInfoXPos, 136 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize }); + this.pokemonPassiveText = addTextObject(starterInfoXPos, 136 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { + fontSize: starterInfoTextSize, + }); this.pokemonPassiveText.setOrigin(0, 0); this.pokemonPassiveText.setInteractive(new Phaser.Geom.Rectangle(0, 0, 250, 55), Phaser.Geom.Rectangle.Contains); this.starterSelectContainer.add(this.pokemonPassiveText); @@ -584,12 +686,20 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonPassiveLockedIcon.setVisible(false); this.starterSelectContainer.add(this.pokemonPassiveLockedIcon); - this.pokemonNatureLabelText = addTextObject(6, 145 + starterInfoYOffset, i18next.t("starterSelectUiHandler:nature"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize }); + this.pokemonNatureLabelText = addTextObject( + 6, + 145 + starterInfoYOffset, + i18next.t("starterSelectUiHandler:nature"), + TextStyle.SUMMARY_ALT, + { fontSize: starterInfoTextSize }, + ); this.pokemonNatureLabelText.setOrigin(0, 0); this.pokemonNatureLabelText.setVisible(false); this.starterSelectContainer.add(this.pokemonNatureLabelText); - this.pokemonNatureText = addBBCodeTextObject(starterInfoXPos, 145 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize }); + this.pokemonNatureText = addBBCodeTextObject(starterInfoXPos, 145 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { + fontSize: starterInfoTextSize, + }); this.pokemonNatureText.setOrigin(0, 0); this.starterSelectContainer.add(this.pokemonNatureText); @@ -609,16 +719,43 @@ export default class StarterSelectUiHandler extends MessageUiHandler { startLabel.setOrigin(0.5, 0); this.starterSelectContainer.add(startLabel); - this.startCursorObj = globalScene.add.nineslice(teamWindowX + 4, 160, "select_cursor", undefined, 26, 15, 6, 6, 6, 6); + this.startCursorObj = globalScene.add.nineslice( + teamWindowX + 4, + 160, + "select_cursor", + undefined, + 26, + 15, + 6, + 6, + 6, + 6, + ); this.startCursorObj.setVisible(false); this.startCursorObj.setOrigin(0, 0); this.starterSelectContainer.add(this.startCursorObj); - const randomSelectLabel = addTextObject(teamWindowX + 17, 23, i18next.t("starterSelectUiHandler:randomize"), TextStyle.TOOLTIP_CONTENT); + const randomSelectLabel = addTextObject( + teamWindowX + 17, + 23, + i18next.t("starterSelectUiHandler:randomize"), + TextStyle.TOOLTIP_CONTENT, + ); randomSelectLabel.setOrigin(0.5, 0); this.starterSelectContainer.add(randomSelectLabel); - this.randomCursorObj = globalScene.add.nineslice(teamWindowX + 4, 21, "select_cursor", undefined, 26, 15, 6, 6, 6, 6); + this.randomCursorObj = globalScene.add.nineslice( + teamWindowX + 4, + 21, + "select_cursor", + undefined, + 26, + 15, + 6, + 6, + 6, + 6, + ); this.randomCursorObj.setVisible(false); this.randomCursorObj.setOrigin(0, 0); this.starterSelectContainer.add(this.randomCursorObj); @@ -685,7 +822,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler { }); this.pokemonSprite = globalScene.add.sprite(53, 63, "pkmn__sub"); - this.pokemonSprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true }); + this.pokemonSprite.setPipeline(globalScene.spritePipeline, { + tone: [0.0, 0.0, 0.0, 0.0], + ignoreTimeTint: true, + }); this.starterSelectContainer.add(this.pokemonSprite); this.type1Icon = globalScene.add.sprite(8, 98, getLocalizedSpriteKey("types")); @@ -698,11 +838,15 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.type2Icon.setOrigin(0, 0); this.starterSelectContainer.add(this.type2Icon); - this.pokemonLuckLabelText = addTextObject(8, 89, i18next.t("common:luckIndicator"), TextStyle.WINDOW_ALT, { fontSize: "56px" }); + this.pokemonLuckLabelText = addTextObject(8, 89, i18next.t("common:luckIndicator"), TextStyle.WINDOW_ALT, { + fontSize: "56px", + }); this.pokemonLuckLabelText.setOrigin(0, 0); this.starterSelectContainer.add(this.pokemonLuckLabelText); - this.pokemonLuckText = addTextObject(8 + this.pokemonLuckLabelText.displayWidth + 2, 89, "0", TextStyle.WINDOW, { fontSize: "56px" }); + this.pokemonLuckText = addTextObject(8 + this.pokemonLuckLabelText.displayWidth + 2, 89, "0", TextStyle.WINDOW, { + fontSize: "56px", + }); this.pokemonLuckText.setOrigin(0, 0); this.starterSelectContainer.add(this.pokemonLuckText); @@ -723,7 +867,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonCandyDarknessOverlay.setScale(0.5); this.pokemonCandyDarknessOverlay.setOrigin(0, 0); this.pokemonCandyDarknessOverlay.setTint(0x000000); - this.pokemonCandyDarknessOverlay.setAlpha(0.50); + this.pokemonCandyDarknessOverlay.setAlpha(0.5); this.pokemonCandyContainer.add(this.pokemonCandyDarknessOverlay); this.pokemonCandyCountText = addTextObject(9.5, 0, "x0", TextStyle.WINDOW_ALT, { fontSize: "56px" }); @@ -733,7 +877,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonCandyContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, 30, 20), Phaser.Geom.Rectangle.Contains); this.starterSelectContainer.add(this.pokemonCandyContainer); - this.pokemonFormText = addTextObject(6, 42, "Form", TextStyle.WINDOW_ALT, { fontSize: "42px" }); + this.pokemonFormText = addTextObject(6, 42, "Form", TextStyle.WINDOW_ALT, { + fontSize: "42px", + }); this.pokemonFormText.setOrigin(0, 0); this.starterSelectContainer.add(this.pokemonFormText); @@ -786,7 +932,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonMovesContainer.add(moveContainer); } - this.pokemonAdditionalMoveCountLabel = addTextObject(-this.pokemonMoveBgs[0].width / 2, 56, "(+0)", TextStyle.PARTY); + this.pokemonAdditionalMoveCountLabel = addTextObject( + -this.pokemonMoveBgs[0].width / 2, + 56, + "(+0)", + TextStyle.PARTY, + ); this.pokemonAdditionalMoveCountLabel.setOrigin(0.5, 0); this.pokemonMovesContainer.add(this.pokemonAdditionalMoveCountLabel); @@ -823,6 +974,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.starterSelectContainer.add(this.pokemonEggMovesContainer); + this.teraIcon = globalScene.add.sprite(85, 63, "button_tera"); + this.teraIcon.setName("terrastallize-icon"); + this.teraIcon.setFrame("fire"); + this.starterSelectContainer.add(this.teraIcon); + // The font size should be set per language const instructionTextSize = textSettings.instructionTextSize; @@ -832,46 +988,137 @@ export default class StarterSelectUiHandler extends MessageUiHandler { // instruction rows that will be pushed into the container dynamically based on need // creating new sprites since they will be added to the scene later - this.shinyIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "R.png"); + this.shinyIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "R.png", + ); this.shinyIconElement.setName("sprite-shiny-icon-element"); this.shinyIconElement.setScale(0.675); this.shinyIconElement.setOrigin(0.0, 0.0); - this.shinyLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("starterSelectUiHandler:cycleShiny"), TextStyle.PARTY, { fontSize: instructionTextSize }); + this.shinyLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("starterSelectUiHandler:cycleShiny"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); this.shinyLabel.setName("text-shiny-label"); - this.formIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "F.png"); + this.formIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "F.png", + ); this.formIconElement.setName("sprite-form-icon-element"); this.formIconElement.setScale(0.675); this.formIconElement.setOrigin(0.0, 0.0); - this.formLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("starterSelectUiHandler:cycleForm"), TextStyle.PARTY, { fontSize: instructionTextSize }); + this.formLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("starterSelectUiHandler:cycleForm"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); this.formLabel.setName("text-form-label"); - this.genderIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "G.png"); + this.genderIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "G.png", + ); this.genderIconElement.setName("sprite-gender-icon-element"); this.genderIconElement.setScale(0.675); this.genderIconElement.setOrigin(0.0, 0.0); - this.genderLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("starterSelectUiHandler:cycleGender"), TextStyle.PARTY, { fontSize: instructionTextSize }); + this.genderLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("starterSelectUiHandler:cycleGender"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); this.genderLabel.setName("text-gender-label"); - this.abilityIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "E.png"); + this.abilityIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "E.png", + ); this.abilityIconElement.setName("sprite-ability-icon-element"); this.abilityIconElement.setScale(0.675); this.abilityIconElement.setOrigin(0.0, 0.0); - this.abilityLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("starterSelectUiHandler:cycleAbility"), TextStyle.PARTY, { fontSize: instructionTextSize }); + this.abilityLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("starterSelectUiHandler:cycleAbility"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); this.abilityLabel.setName("text-ability-label"); - this.natureIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "N.png"); + this.natureIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "N.png", + ); this.natureIconElement.setName("sprite-nature-icon-element"); this.natureIconElement.setScale(0.675); this.natureIconElement.setOrigin(0.0, 0.0); - this.natureLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("starterSelectUiHandler:cycleNature"), TextStyle.PARTY, { fontSize: instructionTextSize }); + this.natureLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("starterSelectUiHandler:cycleNature"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); this.natureLabel.setName("text-nature-label"); - this.goFilterIconElement = new Phaser.GameObjects.Sprite(globalScene, this.filterInstructionRowX, this.filterInstructionRowY, "keyboard", "C.png"); + this.teraIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.instructionRowX, + this.instructionRowY, + "keyboard", + "V.png", + ); + this.teraIconElement.setName("sprite-tera-icon-element"); + this.teraIconElement.setScale(0.675); + this.teraIconElement.setOrigin(0.0, 0.0); + this.teraLabel = addTextObject( + this.instructionRowX + this.instructionRowTextOffset, + this.instructionRowY, + i18next.t("starterSelectUiHandler:cycleTera"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); + this.teraLabel.setName("text-tera-label"); + + this.goFilterIconElement = new Phaser.GameObjects.Sprite( + globalScene, + this.filterInstructionRowX, + this.filterInstructionRowY, + "keyboard", + "C.png", + ); this.goFilterIconElement.setName("sprite-goFilter-icon-element"); this.goFilterIconElement.setScale(0.675); this.goFilterIconElement.setOrigin(0.0, 0.0); - this.goFilterLabel = addTextObject(this.filterInstructionRowX + this.instructionRowTextOffset, this.filterInstructionRowY, i18next.t("starterSelectUiHandler:goFilter"), TextStyle.PARTY, { fontSize: instructionTextSize }); + this.goFilterLabel = addTextObject( + this.filterInstructionRowX + this.instructionRowTextOffset, + this.filterInstructionRowY, + i18next.t("starterSelectUiHandler:goFilter"), + TextStyle.PARTY, + { fontSize: instructionTextSize }, + ); this.goFilterLabel.setName("text-goFilter-label"); this.hideInstructions(); @@ -918,7 +1165,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.initTutorialOverlay(this.starterSelectContainer); this.starterSelectContainer.bringToTop(this.starterSelectMessageBoxContainer); - globalScene.eventTarget.addEventListener(BattleSceneEventType.CANDY_UPGRADE_NOTIFICATION_CHANGED, (e) => this.onCandyUpgradeDisplayChanged(e)); + globalScene.eventTarget.addEventListener(BattleSceneEventType.CANDY_UPGRADE_NOTIFICATION_CHANGED, e => + this.onCandyUpgradeDisplayChanged(e), + ); this.updateInstructions(); } @@ -926,7 +1175,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { show(args: any[]): boolean { if (!this.starterPreferences) { // starterPreferences haven't been loaded yet - this.starterPreferences = StarterPrefs.load(); + this.starterPreferences = loadStarterPreferences(); } this.moveInfoOverlay.clear(); // clear this when removing a menu; the cancel button doesn't seem to trigger this automatically on controllers this.pokerusSpecies = getPokerusStarters(); @@ -993,29 +1242,33 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const hasNonShiny = caughtAttr & DexAttr.NON_SHINY; if (starterAttributes.shiny && !hasShiny) { // shiny form wasn't unlocked, purging shiny and variant setting - delete starterAttributes.shiny; - delete starterAttributes.variant; + starterAttributes.shiny = undefined; + starterAttributes.variant = undefined; } else if (starterAttributes.shiny === false && !hasNonShiny) { // non shiny form wasn't unlocked, purging shiny setting - delete starterAttributes.shiny; + starterAttributes.shiny = undefined; } if (starterAttributes.variant !== undefined) { const unlockedVariants = [ hasShiny && caughtAttr & DexAttr.DEFAULT_VARIANT, hasShiny && caughtAttr & DexAttr.VARIANT_2, - hasShiny && caughtAttr & DexAttr.VARIANT_3 + hasShiny && caughtAttr & DexAttr.VARIANT_3, ]; - if (isNaN(starterAttributes.variant) || starterAttributes.variant < 0 || !unlockedVariants[starterAttributes.variant]) { + if ( + Number.isNaN(starterAttributes.variant) || + starterAttributes.variant < 0 || + !unlockedVariants[starterAttributes.variant] + ) { // variant value is invalid or requested variant wasn't unlocked, purging setting - delete starterAttributes.variant; + starterAttributes.variant = undefined; } } if (starterAttributes.female !== undefined) { if (!(starterAttributes.female ? caughtAttr & DexAttr.FEMALE : caughtAttr & DexAttr.MALE)) { // requested gender wasn't unlocked, purging setting - delete starterAttributes.female; + starterAttributes.female = undefined; } } @@ -1030,25 +1283,29 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const unlockedAbilities = [ hasAbility1, speciesHasSingleAbility ? hasAbility2 && !hasAbility1 : hasAbility2, - hasHiddenAbility + hasHiddenAbility, ]; if (!unlockedAbilities[starterAttributes.ability]) { // requested ability wasn't unlocked, purging setting - delete starterAttributes.ability; + starterAttributes.ability = undefined; } } const selectedForm = starterAttributes.form; - if (selectedForm !== undefined && (!species.forms[selectedForm]?.isStarterSelectable || !(caughtAttr & globalScene.gameData.getFormAttr(selectedForm)))) { + if ( + selectedForm !== undefined && + (!species.forms[selectedForm]?.isStarterSelectable || + !(caughtAttr & globalScene.gameData.getFormAttr(selectedForm))) + ) { // requested form wasn't unlocked/isn't a starter form, purging setting - delete starterAttributes.form; + starterAttributes.form = undefined; } if (starterAttributes.nature !== undefined) { const unlockedNatures = globalScene.gameData.getNaturesForAttr(dexEntry.natureAttr); if (unlockedNatures.indexOf(starterAttributes.nature as unknown as Nature) < 0) { // requested nature wasn't unlocked, purging setting - delete starterAttributes.nature; + starterAttributes.nature = undefined; } } @@ -1058,10 +1315,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler { /** * Set the selections for all filters to their default starting value */ - resetFilters() : void { + public resetFilters(): void { + this.filterBar.setValsToDefault(); + this.resetCaughtDropdown(); + } + + /** + * Set default value for the caught dropdown, which only shows caught mons + */ + public resetCaughtDropdown(): void { const caughtDropDown: DropDown = this.filterBar.getFilter(DropDownColumn.CAUGHT); - this.filterBar.setValsToDefault(); + caughtDropDown.resetToDefault(); // initial setting, in caught filter, select the options excluding the uncaught option for (let i = 0; i < caughtDropDown.options.length; i++) { @@ -1072,7 +1337,15 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } } - showText(text: string, delay?: integer, callback?: Function, callbackDelay?: integer, prompt?: boolean, promptDelay?: integer, moveToTop?: boolean) { + showText( + text: string, + delay?: number, + callback?: Function, + callbackDelay?: number, + prompt?: boolean, + promptDelay?: number, + moveToTop?: boolean, + ) { super.showText(text, delay, callback, callbackDelay, prompt, promptDelay); const singleLine = text?.indexOf("\n") === -1; @@ -1116,8 +1389,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler { // Get this species ID's starter data const starterData = globalScene.gameData.starterData[speciesId]; - return starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[speciesId]) - && !(starterData.passiveAttr & PassiveAttr.UNLOCKED); + return ( + starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[speciesId]) && + !(starterData.passiveAttr & PassiveAttr.UNLOCKED) + ); } /** @@ -1129,8 +1404,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler { // Get this species ID's starter data const starterData = globalScene.gameData.starterData[speciesId]; - return starterData.candyCount >= getValueReductionCandyCounts(speciesStarterCosts[speciesId])[starterData.valueReduction] - && starterData.valueReduction < valueReductionMax; + return ( + starterData.candyCount >= + getValueReductionCandyCounts(speciesStarterCosts[speciesId])[starterData.valueReduction] && + starterData.valueReduction < valueReductionMax + ); } /** @@ -1151,7 +1429,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { * @param species {@linkcode PokemonSpecies} of the icon used to check for upgrades * @param startPaused Should this animation be paused after it is added? */ - setUpgradeAnimation(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, startPaused: boolean = false): void { + setUpgradeAnimation(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, startPaused = false): void { globalScene.tweens.killTweensOf(icon); // Skip animations if they are disabled if (globalScene.candyUpgradeDisplay === 0 || species.speciesId !== species.getRootSpeciesId(false)) { @@ -1172,16 +1450,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler { y: 2 - 5, duration: fixedInt(125), ease: "Cubic.easeOut", - yoyo: true + yoyo: true, }, { targets: icon, y: 2 - 3, duration: fixedInt(150), ease: "Cubic.easeOut", - yoyo: true - } - ], }; + yoyo: true, + }, + ], + }; const isPassiveAvailable = this.isPassiveAvailable(species.speciesId); const isValueReductionAvailable = this.isValueReductionAvailable(species.speciesId); @@ -1192,7 +1471,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { if (isPassiveAvailable) { globalScene.tweens.chain(tweenChain).paused = startPaused; } - // 'On' mode + // 'On' mode } else if (globalScene.candyUpgradeNotification === 2) { if (isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable) { globalScene.tweens.chain(tweenChain).paused = startPaused; @@ -1207,7 +1486,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const species = starter.species; const slotVisible = !!species?.speciesId; - if (!species || globalScene.candyUpgradeNotification === 0 || species.speciesId !== species.getRootSpeciesId(false)) { + if ( + !species || + globalScene.candyUpgradeNotification === 0 || + species.speciesId !== species.getRootSpeciesId(false) + ) { starter.candyUpgradeIcon.setVisible(false); starter.candyUpgradeOverlayIcon.setVisible(false); return; @@ -1225,7 +1508,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { // 'On' mode } else if (globalScene.candyUpgradeNotification === 2) { starter.candyUpgradeIcon.setVisible( - slotVisible && ( isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable )); + slotVisible && (isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable), + ); starter.candyUpgradeOverlayIcon.setVisible(slotVisible && starter.candyUpgradeIcon.visible); } } @@ -1235,7 +1519,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { * @param starterContainer the container for the Pokemon to update */ updateCandyUpgradeDisplay(starterContainer: StarterContainer) { - if (this.isUpgradeIconEnabled() ) { + if (this.isUpgradeIconEnabled()) { this.setUpgradeIcon(starterContainer); } if (this.isUpgradeAnimationEnabled()) { @@ -1255,7 +1539,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { // Loop through all visible candy icons when set to 'Icon' mode if (globalScene.candyUpgradeDisplay === 0) { - this.filteredStarterContainers.forEach((starter) => { + this.filteredStarterContainers.forEach(starter => { this.setUpgradeIcon(starter); }); @@ -1281,7 +1565,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const numOfRows = Math.ceil(numberOfStarters / maxColumns); const currentRow = Math.floor(this.cursor / maxColumns); const onScreenFirstIndex = this.scrollCursor * maxColumns; // this is first starter index on the screen - const onScreenLastIndex = Math.min(this.filteredStarterContainers.length - 1, onScreenFirstIndex + maxRows * maxColumns - 1); // this is the last starter index on the screen + const onScreenLastIndex = Math.min( + this.filteredStarterContainers.length - 1, + onScreenFirstIndex + maxRows * maxColumns - 1, + ); // this is the last starter index on the screen const onScreenNumberOfStarters = onScreenLastIndex - onScreenFirstIndex + 1; const onScreenNumberOfRows = Math.ceil(onScreenNumberOfStarters / maxColumns); const onScreenCurrentRow = Math.floor((this.cursor - onScreenFirstIndex) / maxColumns); @@ -1301,16 +1588,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler { if (this.filterMode && this.filterBar.openDropDown) { // CANCEL with a filter menu open > close it this.filterBar.toggleDropDown(this.filterBarCursor); - - // if there are possible starters go the first one of the list - if (numberOfStarters > 0) { - this.setFilterMode(false); - this.scrollCursor = 0; - this.updateScroll(); - this.setCursor(0); - } success = true; - + } else if ( + this.filterMode && + !this.filterBar.getFilter(this.filterBar.getColumn(this.filterBarCursor)).hasDefaultValues() + ) { + if (this.filterBar.getColumn(this.filterBarCursor) === DropDownColumn.CAUGHT) { + this.resetCaughtDropdown(); + } else { + this.filterBar.resetSelection(this.filterBarCursor); + } + this.updateStarters(); + success = true; } else if (this.statsMode) { this.toggleStatsMode(false); success = true; @@ -1332,7 +1621,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.setFilterMode(true); this.filterBar.toggleDropDown(this.filterBarCursor); } - } else if (this.startCursorObj.visible) { // this checks to see if the start button is selected + } else if (this.startCursorObj.visible) { + // this checks to see if the start button is selected switch (button) { case Button.ACTION: if (this.tryStart(true)) { @@ -1342,7 +1632,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } break; case Button.UP: - // UP from start button: go to pokemon in team if any, otherwise filter + // UP from start button: go to pokemon in team if any, otherwise filter this.startCursorObj.setVisible(false); if (this.starterSpecies.length > 0) { this.starterIconsCursorIndex = this.starterSpecies.length - 1; @@ -1355,7 +1645,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { success = true; break; case Button.DOWN: - // DOWN from start button: Go to filters + // DOWN from start button: Go to filters this.startCursorObj.setVisible(false); this.filterBarCursor = Math.max(1, this.filterBar.numFilters - 1); this.setFilterMode(true); @@ -1397,8 +1687,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { case Button.UP: if (this.filterBar.openDropDown) { success = this.filterBar.decDropDownCursor(); - } else if (this.filterBarCursor === this.filterBar.numFilters - 1 ) { - // UP from the last filter, move to start button + } else if (this.filterBarCursor === this.filterBar.numFilters - 1) { + // UP from the last filter, move to start button this.setFilterMode(false); this.cursorObj.setVisible(false); if (this.starterSpecies.length > 0) { @@ -1415,9 +1705,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const proportion = (this.filterBarCursor + 0.5) / this.filterBar.numFilters; const targetCol = Math.min(8, Math.floor(proportion * 11)); if (numberOfStarters % 9 > targetCol) { - this.setCursor(numberOfStarters - (numberOfStarters) % 9 + targetCol); + this.setCursor(numberOfStarters - (numberOfStarters % 9) + targetCol); } else { - this.setCursor(Math.max(numberOfStarters - (numberOfStarters) % 9 + targetCol - 9, 0)); + this.setCursor(Math.max(numberOfStarters - (numberOfStarters % 9) + targetCol - 9, 0)); } success = true; } @@ -1426,13 +1716,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler { if (this.filterBar.openDropDown) { success = this.filterBar.incDropDownCursor(); } else if (this.filterBarCursor === this.filterBar.numFilters - 1) { - // DOWN from the last filter, move to random selection label + // DOWN from the last filter, move to random selection label this.setFilterMode(false); this.cursorObj.setVisible(false); this.randomCursorObj.setVisible(true); success = true; } else if (numberOfStarters > 0) { - // DOWN from filter bar to top of Pokemon list + // DOWN from filter bar to top of Pokemon list this.setFilterMode(false); this.scrollCursor = 0; this.updateScroll(); @@ -1458,11 +1748,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler { error = true; break; } - const currentPartyValue = this.starterSpecies.map(s => s.generation).reduce((total: number, _gen: number, i: number ) => total + globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId), 0); + const currentPartyValue = this.starterSpecies + .map(s => s.generation) + .reduce( + (total: number, _gen: number, i: number) => + total + globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId), + 0, + ); // Filter valid starters const validStarters = this.filteredStarterContainers.filter(starter => { const species = starter.species; - const [ isDupe ] = this.isInParty(species); + const [isDupe] = this.isInParty(species); const starterCost = globalScene.gameData.getSpeciesStarterValue(species.speciesId); const isValidForChallenge = new BooleanHolder(true); Challenge.applyChallenges( @@ -1470,11 +1766,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { Challenge.ChallengeType.STARTER_CHOICE, species, isValidForChallenge, - globalScene.gameData.getSpeciesDexAttrProps( - species, - this.getCurrentDexProps(species.speciesId) - ), - this.isPartyValid() + globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), + this.isPartyValid(), ); const isCaught = globalScene.gameData.dexData[species.speciesId].caughtAttr; return ( @@ -1497,18 +1790,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const props = globalScene.gameData.getSpeciesDexAttrProps(randomSpecies, dexAttr); const abilityIndex = this.abilityCursor; const nature = this.natureCursor as unknown as Nature; + const teraType = this.teraCursor; const moveset = this.starterMoveset?.slice(0) as StarterMoveset; const starterCost = globalScene.gameData.getSpeciesStarterValue(randomSpecies.speciesId); const speciesForm = getPokemonSpeciesForm(randomSpecies.speciesId, props.formIndex); // Load assets and add to party - speciesForm - .loadAssets(props.female, props.formIndex, props.shiny, props.variant, true) - .then(() => { - if (this.tryUpdateValue(starterCost, true)) { - this.addToParty(randomSpecies, dexAttr, abilityIndex, nature, moveset, true); - ui.playSelect(); - } - }); + speciesForm.loadAssets(props.female, props.formIndex, props.shiny, props.variant, true).then(() => { + if (this.tryUpdateValue(starterCost, true)) { + this.addToParty(randomSpecies, dexAttr, abilityIndex, nature, moveset, teraType, true); + ui.playSelect(); + } + }); break; case Button.UP: this.randomCursorObj.setVisible(false); @@ -1545,7 +1837,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { break; } } else { - let starterContainer; + let starterContainer: StarterContainer; const starterData = globalScene.gameData.starterData[this.lastSpecies.speciesId]; // prepare persistent starter data to store changes let starterAttributes = this.starterPreferences[this.lastSpecies.speciesId]; @@ -1555,68 +1847,110 @@ export default class StarterSelectUiHandler extends MessageUiHandler { starterContainer = this.filteredStarterContainers[this.cursor]; } else { // if species is in filtered starters, get the starter container from the filtered starters, it can be undefined if the species is not in the filtered starters - starterContainer = this.filteredStarterContainers[this.filteredStarterContainers.findIndex(container => container.species === this.lastSpecies)]; + starterContainer = + this.filteredStarterContainers[ + this.filteredStarterContainers.findIndex(container => container.species === this.lastSpecies) + ]; } if (button === Button.ACTION) { if (!this.speciesStarterDexEntry?.caughtAttr) { error = true; - } else if (this.starterSpecies.length <= 6) { // checks to see if the party has 6 or fewer pokemon + } else if (this.starterSpecies.length <= 6) { + // checks to see if the party has 6 or fewer pokemon const ui = this.getUi(); let options: any[] = []; // TODO: add proper type - const [ isDupe, removeIndex ]: [boolean, number] = this.isInParty(this.lastSpecies); // checks to see if the pokemon is a duplicate; if it is, returns the index that will be removed + const [isDupe, removeIndex]: [boolean, number] = this.isInParty(this.lastSpecies); // checks to see if the pokemon is a duplicate; if it is, returns the index that will be removed const isPartyValid = this.isPartyValid(); const isValidForChallenge = new BooleanHolder(true); - Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, this.lastSpecies, isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(this.lastSpecies, this.getCurrentDexProps(this.lastSpecies.speciesId)), isPartyValid); + Challenge.applyChallenges( + globalScene.gameMode, + Challenge.ChallengeType.STARTER_CHOICE, + this.lastSpecies, + isValidForChallenge, + globalScene.gameData.getSpeciesDexAttrProps( + this.lastSpecies, + this.getCurrentDexProps(this.lastSpecies.speciesId), + ), + isPartyValid, + ); - const currentPartyValue = this.starterSpecies.map(s => s.generation).reduce((total: number, _gen: number, i: number) => total += globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId), 0); + const currentPartyValue = this.starterSpecies + .map(s => s.generation) + .reduce( + (total: number, _gen: number, i: number) => + (total += globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId)), + 0, + ); const newCost = globalScene.gameData.getSpeciesStarterValue(this.lastSpecies.speciesId); - if (!isDupe && isValidForChallenge.value && currentPartyValue + newCost <= this.getValueLimit() && this.starterSpecies.length < PLAYER_PARTY_MAX_SIZE) { // this checks to make sure the pokemon doesn't exist in your party, it's valid for the challenge and that it won't go over the cost limit; if it meets all these criteria it will add it to your party + if ( + !isDupe && + isValidForChallenge.value && + currentPartyValue + newCost <= this.getValueLimit() && + this.starterSpecies.length < PLAYER_PARTY_MAX_SIZE + ) { + // this checks to make sure the pokemon doesn't exist in your party, it's valid for the challenge and that it won't go over the cost limit; if it meets all these criteria it will add it to your party options = [ { label: i18next.t("starterSelectUiHandler:addToParty"), handler: () => { ui.setMode(Mode.STARTER_SELECT); - const isOverValueLimit = this.tryUpdateValue(globalScene.gameData.getSpeciesStarterValue(this.lastSpecies.speciesId), true); + const isOverValueLimit = this.tryUpdateValue( + globalScene.gameData.getSpeciesStarterValue(this.lastSpecies.speciesId), + true, + ); if (!isDupe && isValidForChallenge.value && isOverValueLimit) { const cursorObj = this.starterCursorObjs[this.starterSpecies.length]; cursorObj.setVisible(true); cursorObj.setPosition(this.cursorObj.x, this.cursorObj.y); - this.addToParty(this.lastSpecies, this.dexAttrCursor, this.abilityCursor, this.natureCursor as unknown as Nature, this.starterMoveset?.slice(0) as StarterMoveset); + this.addToParty( + this.lastSpecies, + this.dexAttrCursor, + this.abilityCursor, + this.natureCursor as unknown as Nature, + this.starterMoveset?.slice(0) as StarterMoveset, + this.teraCursor, + ); ui.playSelect(); } else { ui.playError(); // this should be redundant as there is now a trigger for when a pokemon can't be added to party } return true; }, - overrideSound: true - }]; - } else if (isDupe) { // if it already exists in your party, it will give you the option to remove from your party - options = [{ - label: i18next.t("starterSelectUiHandler:removeFromParty"), - handler: () => { - this.popStarter(removeIndex); - ui.setMode(Mode.STARTER_SELECT); - return true; - } - }]; + overrideSound: true, + }, + ]; + } else if (isDupe) { + // if it already exists in your party, it will give you the option to remove from your party + options = [ + { + label: i18next.t("starterSelectUiHandler:removeFromParty"), + handler: () => { + this.popStarter(removeIndex); + ui.setMode(Mode.STARTER_SELECT); + return true; + }, + }, + ]; } - options.push( // this shows the IVs for the pokemon + options.push( + // this shows the IVs for the pokemon { label: i18next.t("starterSelectUiHandler:toggleIVs"), handler: () => { this.toggleStatsMode(); ui.setMode(Mode.STARTER_SELECT); return true; - } - }); - if (this.speciesStarterMoves.length > 1) { // this lets you change the pokemon moves + }, + }, + ); + if (this.speciesStarterMoves.length > 1) { + // this lets you change the pokemon moves const showSwapOptions = (moveset: StarterMoveset) => { - this.blockInput = true; ui.setMode(Mode.STARTER_SELECT).then(() => { @@ -1624,70 +1958,78 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.moveInfoOverlay.show(allMoves[moveset[0]]); ui.setModeWithoutClear(Mode.OPTION_SELECT, { - options: moveset.map((m: Moves, i: number) => { - const option: OptionSelectItem = { - label: allMoves[m].name, - handler: () => { - this.blockInput = true; - ui.setMode(Mode.STARTER_SELECT).then(() => { - ui.showText(`${i18next.t("starterSelectUiHandler:selectMoveSwapWith")} ${allMoves[m].name}.`, null, () => { - const possibleMoves = this.speciesStarterMoves.filter((sm: Moves) => sm !== m); - this.moveInfoOverlay.show(allMoves[possibleMoves[0]]); + options: moveset + .map((m: Moves, i: number) => { + const option: OptionSelectItem = { + label: allMoves[m].name, + handler: () => { + this.blockInput = true; + ui.setMode(Mode.STARTER_SELECT).then(() => { + ui.showText( + `${i18next.t("starterSelectUiHandler:selectMoveSwapWith")} ${allMoves[m].name}.`, + null, + () => { + const possibleMoves = this.speciesStarterMoves.filter((sm: Moves) => sm !== m); + this.moveInfoOverlay.show(allMoves[possibleMoves[0]]); - ui.setModeWithoutClear(Mode.OPTION_SELECT, { - options: possibleMoves.map(sm => { - // make an option for each available starter move - const option = { - label: allMoves[sm].name, - handler: () => { - this.switchMoveHandler(i, sm, m); - showSwapOptions(this.starterMoveset!); // TODO: is this bang correct? - return true; - }, - onHover: () => { - this.moveInfoOverlay.show(allMoves[sm]); - }, - }; - return option; - }).concat({ - label: i18next.t("menu:cancel"), - handler: () => { - showSwapOptions(this.starterMoveset!); // TODO: is this bang correct? - return true; - }, - onHover: () => { - this.moveInfoOverlay.clear(); - }, - }), - supportHover: true, - maxOptions: 8, - yOffset: 19 - }); - this.blockInput = false; + ui.setModeWithoutClear(Mode.OPTION_SELECT, { + options: possibleMoves + .map(sm => { + // make an option for each available starter move + const option = { + label: allMoves[sm].name, + handler: () => { + this.switchMoveHandler(i, sm, m); + showSwapOptions(this.starterMoveset!); // TODO: is this bang correct? + return true; + }, + onHover: () => { + this.moveInfoOverlay.show(allMoves[sm]); + }, + }; + return option; + }) + .concat({ + label: i18next.t("menu:cancel"), + handler: () => { + showSwapOptions(this.starterMoveset!); // TODO: is this bang correct? + return true; + }, + onHover: () => { + this.moveInfoOverlay.clear(); + }, + }), + supportHover: true, + maxOptions: 8, + yOffset: 19, + }); + this.blockInput = false; + }, + ); }); - }); + return true; + }, + onHover: () => { + this.moveInfoOverlay.show(allMoves[m]); + }, + }; + return option; + }) + .concat({ + label: i18next.t("menu:cancel"), + handler: () => { + this.moveInfoOverlay.clear(); + this.clearText(); + ui.setMode(Mode.STARTER_SELECT); return true; }, onHover: () => { - this.moveInfoOverlay.show(allMoves[m]); + this.moveInfoOverlay.clear(); }, - }; - return option; - }).concat({ - label: i18next.t("menu:cancel"), - handler: () => { - this.moveInfoOverlay.clear(); - this.clearText(); - ui.setMode(Mode.STARTER_SELECT); - return true; - }, - onHover: () => { - this.moveInfoOverlay.clear(); - }, - }), + }), supportHover: true, maxOptions: 8, - yOffset: 19 + yOffset: 19, }); this.blockInput = false; }); @@ -1698,48 +2040,51 @@ export default class StarterSelectUiHandler extends MessageUiHandler { handler: () => { showSwapOptions(this.starterMoveset!); // TODO: is this bang correct? return true; - } + }, }); } if (this.canCycleNature) { // if we could cycle natures, enable the improved nature menu const showNatureOptions = () => { - this.blockInput = true; ui.setMode(Mode.STARTER_SELECT).then(() => { ui.showText(i18next.t("starterSelectUiHandler:selectNature"), null, () => { const natures = globalScene.gameData.getNaturesForAttr(this.speciesStarterDexEntry?.natureAttr); ui.setModeWithoutClear(Mode.OPTION_SELECT, { - options: natures.map((n: Nature, _i: number) => { - const option: OptionSelectItem = { - label: getNatureName(n, true, true, true, globalScene.uiTheme), + options: natures + .map((n: Nature, _i: number) => { + const option: OptionSelectItem = { + label: getNatureName(n, true, true, true, globalScene.uiTheme), + handler: () => { + // update default nature in starter save data + if (!starterAttributes) { + starterAttributes = this.starterPreferences[this.lastSpecies.speciesId] = {}; + } + starterAttributes.nature = n; + this.clearText(); + ui.setMode(Mode.STARTER_SELECT); + // set nature for starter + this.setSpeciesDetails(this.lastSpecies, { + natureIndex: n, + }); + this.blockInput = false; + return true; + }, + }; + return option; + }) + .concat({ + label: i18next.t("menu:cancel"), handler: () => { - // update default nature in starter save data - if (!starterAttributes) { - starterAttributes = this.starterPreferences[this.lastSpecies.speciesId] = {}; - } - starterAttributes.nature = n; this.clearText(); ui.setMode(Mode.STARTER_SELECT); - // set nature for starter - this.setSpeciesDetails(this.lastSpecies, { natureIndex: n }); this.blockInput = false; return true; - } - }; - return option; - }).concat({ - label: i18next.t("menu:cancel"), - handler: () => { - this.clearText(); - ui.setMode(Mode.STARTER_SELECT); - this.blockInput = false; - return true; - } - }), + }, + }), maxOptions: 8, - yOffset: 19 + yOffset: 19, }); }); }); @@ -1749,12 +2094,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler { handler: () => { showNatureOptions(); return true; - } + }, }); } const passiveAttr = starterData.passiveAttr; - if (passiveAttr & PassiveAttr.UNLOCKED) { // this is for enabling and disabling the passive + if (passiveAttr & PassiveAttr.UNLOCKED) { + // this is for enabling and disabling the passive if (!(passiveAttr & PassiveAttr.ENABLED)) { options.push({ label: i18next.t("starterSelectUiHandler:enablePassive"), @@ -1763,7 +2109,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { ui.setMode(Mode.STARTER_SELECT); this.setSpeciesDetails(this.lastSpecies); return true; - } + }, }); } else { options.push({ @@ -1773,7 +2119,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { ui.setMode(Mode.STARTER_SELECT); this.setSpeciesDetails(this.lastSpecies); return true; - } + }, }); } } @@ -1790,7 +2136,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } ui.setMode(Mode.STARTER_SELECT); return true; - } + }, }); } else { options.push({ @@ -1803,7 +2149,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } ui.setMode(Mode.STARTER_SELECT); return true; - } + }, }); } options.push({ @@ -1812,26 +2158,30 @@ export default class StarterSelectUiHandler extends MessageUiHandler { ui.playSelect(); let nickname = starterAttributes.nickname ? String(starterAttributes.nickname) : ""; nickname = decodeURIComponent(escape(atob(nickname))); - ui.setModeWithoutClear(Mode.RENAME_POKEMON, { - buttonActions: [ - (sanitizedName: string) => { - ui.playSelect(); - starterAttributes.nickname = sanitizedName; - const name = decodeURIComponent(escape(atob(starterAttributes.nickname))); - if (name.length > 0) { - this.pokemonNameText.setText(name); - } else { - this.pokemonNameText.setText(this.lastSpecies.name); - } - ui.setMode(Mode.STARTER_SELECT); - }, - () => { - ui.setMode(Mode.STARTER_SELECT); - } - ] - }, nickname); + ui.setModeWithoutClear( + Mode.RENAME_POKEMON, + { + buttonActions: [ + (sanitizedName: string) => { + ui.playSelect(); + starterAttributes.nickname = sanitizedName; + const name = decodeURIComponent(escape(atob(starterAttributes.nickname))); + if (name.length > 0) { + this.pokemonNameText.setText(name); + } else { + this.pokemonNameText.setText(this.lastSpecies.name); + } + ui.setMode(Mode.STARTER_SELECT); + }, + () => { + ui.setMode(Mode.STARTER_SELECT); + }, + ], + }, + nickname, + ); return true; - } + }, }); // Purchases with Candy @@ -1863,21 +2213,25 @@ export default class StarterSelectUiHandler extends MessageUiHandler { // update the passive background and icon/animation for available upgrade if (starterContainer) { this.updateCandyUpgradeDisplay(starterContainer); - starterContainer.starterPassiveBgs.setVisible(!!globalScene.gameData.starterData[this.lastSpecies.speciesId].passiveAttr); + starterContainer.starterPassiveBgs.setVisible( + !!globalScene.gameData.starterData[this.lastSpecies.speciesId].passiveAttr, + ); } return true; } return false; }, item: "candy", - itemArgs: starterColors[this.lastSpecies.speciesId] + itemArgs: starterColors[this.lastSpecies.speciesId], }); } // Reduce cost option const valueReduction = starterData.valueReduction; if (valueReduction < valueReductionMax) { - const reductionCost = getValueReductionCandyCounts(speciesStarterCosts[this.lastSpecies.speciesId])[valueReduction]; + const reductionCost = getValueReductionCandyCounts(speciesStarterCosts[this.lastSpecies.speciesId])[ + valueReduction + ]; options.push({ label: `x${reductionCost} ${i18next.t("starterSelectUiHandler:reduceCost")}`, handler: () => { @@ -1906,7 +2260,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { return false; }, item: "candy", - itemArgs: starterColors[this.lastSpecies.speciesId] + itemArgs: starterColors[this.lastSpecies.speciesId], }); } @@ -1918,7 +2272,15 @@ export default class StarterSelectUiHandler extends MessageUiHandler { if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= sameSpeciesEggCost) { if (globalScene.gameData.eggs.length >= 99 && !Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) { // Egg list full, show error message at the top of the screen and abort - this.showText(i18next.t("egg:tooManyEggs"), undefined, () => this.showText("", 0, () => this.tutorialActive = false), 2000, false, undefined, true); + this.showText( + i18next.t("egg:tooManyEggs"), + undefined, + () => this.showText("", 0, () => (this.tutorialActive = false)), + 2000, + false, + undefined, + true, + ); return false; } if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) { @@ -1926,7 +2288,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } this.pokemonCandyCountText.setText(`x${starterData.candyCount}`); - const egg = new Egg({ species: this.lastSpecies.speciesId, sourceType: EggSourceType.SAME_SPECIES_EGG }); + const egg = new Egg({ + species: this.lastSpecies.speciesId, + sourceType: EggSourceType.SAME_SPECIES_EGG, + }); egg.addEggToGameData(); globalScene.gameData.saveSystem().then(success => { @@ -1947,27 +2312,42 @@ export default class StarterSelectUiHandler extends MessageUiHandler { return false; }, item: "candy", - itemArgs: starterColors[this.lastSpecies.speciesId] + itemArgs: starterColors[this.lastSpecies.speciesId], }); options.push({ label: i18next.t("menu:cancel"), handler: () => { ui.setMode(Mode.STARTER_SELECT); return true; - } + }, }); ui.setModeWithoutClear(Mode.OPTION_SELECT, { options: options, - yOffset: 47 + yOffset: 47, }); }; + options.push({ + label: i18next.t("menuUiHandler:POKEDEX"), + handler: () => { + ui.setMode(Mode.STARTER_SELECT).then(() => { + const attributes = { + shiny: starterAttributes.shiny, + variant: starterAttributes.variant, + form: starterAttributes.form, + female: starterAttributes.female, + }; + ui.setOverlayMode(Mode.POKEDEX_PAGE, this.lastSpecies, starterAttributes.form, attributes); + }); + return true; + }, + }); if (!pokemonPrevolutions.hasOwnProperty(this.lastSpecies.speciesId)) { options.push({ label: i18next.t("starterSelectUiHandler:useCandies"), handler: () => { ui.setMode(Mode.STARTER_SELECT).then(() => showUseCandies()); return true; - } + }, }); } options.push({ @@ -1975,24 +2355,35 @@ export default class StarterSelectUiHandler extends MessageUiHandler { handler: () => { ui.setMode(Mode.STARTER_SELECT); return true; - } + }, }); ui.setModeWithoutClear(Mode.OPTION_SELECT, { options: options, - yOffset: 47 + yOffset: 47, }); success = true; } } else { - const props = globalScene.gameData.getSpeciesDexAttrProps(this.lastSpecies, this.getCurrentDexProps(this.lastSpecies.speciesId)); + const props = globalScene.gameData.getSpeciesDexAttrProps( + this.lastSpecies, + this.getCurrentDexProps(this.lastSpecies.speciesId), + ); switch (button) { case Button.CYCLE_SHINY: if (this.canCycleShiny) { if (starterAttributes.shiny === false) { // If not shiny, we change to shiny and get the proper default variant - const newProps = globalScene.gameData.getSpeciesDexAttrProps(this.lastSpecies, this.getCurrentDexProps(this.lastSpecies.speciesId)); - const newVariant = starterAttributes.variant ? starterAttributes.variant as Variant : newProps.variant; - this.setSpeciesDetails(this.lastSpecies, { shiny: true, variant: newVariant }); + const newProps = globalScene.gameData.getSpeciesDexAttrProps( + this.lastSpecies, + this.getCurrentDexProps(this.lastSpecies.speciesId), + ); + const newVariant = starterAttributes.variant + ? (starterAttributes.variant as Variant) + : newProps.variant; + this.setSpeciesDetails(this.lastSpecies, { + shiny: true, + variant: newVariant, + }); globalScene.playSound("se/sparkle"); // Cycle tint based on current sprite tint @@ -2008,34 +2399,42 @@ export default class StarterSelectUiHandler extends MessageUiHandler { do { newVariant = (newVariant + 1) % 3; if (newVariant === 0) { - if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.DEFAULT_VARIANT) { // TODO: is this bang correct? + if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.DEFAULT_VARIANT) { + // TODO: is this bang correct? break; } } else if (newVariant === 1) { - if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_2) { // TODO: is this bang correct? + if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_2) { + // TODO: is this bang correct? break; } } else { - if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_3) { // TODO: is this bang correct? + if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_3) { + // TODO: is this bang correct? break; } } } while (newVariant !== props.variant); starterAttributes.variant = newVariant; // store the selected variant - // If going to a higher variant, display that - if (newVariant > props.variant) { - this.setSpeciesDetails(this.lastSpecies, { variant: newVariant as Variant }); + if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.NON_SHINY && newVariant <= props.variant) { + // If we have run out of variants, go back to non shiny + this.setSpeciesDetails(this.lastSpecies, { + shiny: false, + variant: 0, + }); + this.pokemonShinyIcon.setVisible(false); + success = true; + starterAttributes.shiny = false; + } else { + // If going to a higher variant, or only shiny forms are caught, go to next variant + this.setSpeciesDetails(this.lastSpecies, { + variant: newVariant as Variant, + }); // Cycle tint based on current sprite tint const tint = getVariantTint(newVariant as Variant); this.pokemonShinyIcon.setFrame(getVariantIcon(newVariant as Variant)); this.pokemonShinyIcon.setTint(tint); success = true; - // If we have run out of variants, go back to non shiny - } else { - this.setSpeciesDetails(this.lastSpecies, { shiny: false, variant: 0 }); - this.pokemonShinyIcon.setVisible(false); - success = true; - starterAttributes.shiny = false; } } } @@ -2046,19 +2445,29 @@ export default class StarterSelectUiHandler extends MessageUiHandler { let newFormIndex = props.formIndex; do { newFormIndex = (newFormIndex + 1) % formCount; - if (this.lastSpecies.forms[newFormIndex].isStarterSelectable && this.speciesStarterDexEntry!.caughtAttr! & globalScene.gameData.getFormAttr(newFormIndex)) { // TODO: are those bangs correct? + if ( + this.lastSpecies.forms[newFormIndex].isStarterSelectable && + this.speciesStarterDexEntry!.caughtAttr! & globalScene.gameData.getFormAttr(newFormIndex) + ) { + // TODO: are those bangs correct? break; } } while (newFormIndex !== props.formIndex); starterAttributes.form = newFormIndex; // store the selected form - this.setSpeciesDetails(this.lastSpecies, { formIndex: newFormIndex }); + starterAttributes.tera = this.lastSpecies.forms[newFormIndex].type1; + this.setSpeciesDetails(this.lastSpecies, { + formIndex: newFormIndex, + teraType: starterAttributes.tera, + }); success = true; } break; case Button.CYCLE_GENDER: if (this.canCycleGender) { starterAttributes.female = !props.female; - this.setSpeciesDetails(this.lastSpecies, { female: !props.female }); + this.setSpeciesDetails(this.lastSpecies, { + female: !props.female, + }); success = true; } break; @@ -2075,7 +2484,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { break; } } else if (newAbilityIndex === 1) { - // If ability 1 and 2 are the same and ability 1 is unlocked, skip over ability 2 + // If ability 1 and 2 are the same and ability 1 is unlocked, skip over ability 2 if (this.lastSpecies.ability1 === this.lastSpecies.ability2 && hasAbility1) { newAbilityIndex = (newAbilityIndex + 1) % abilityCount; } @@ -2095,7 +2504,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { globalScene.ui.editTooltip(`${newAbility.name}`, `${newAbility.description}`); } - this.setSpeciesDetails(this.lastSpecies, { abilityIndex: newAbilityIndex }); + this.setSpeciesDetails(this.lastSpecies, { + abilityIndex: newAbilityIndex, + }); success = true; } break; @@ -2105,8 +2516,27 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const natureIndex = natures.indexOf(this.natureCursor); const newNature = natures[natureIndex < natures.length - 1 ? natureIndex + 1 : 0]; // store cycled nature as default - starterAttributes.nature = newNature as unknown as integer; - this.setSpeciesDetails(this.lastSpecies, { natureIndex: newNature }); + starterAttributes.nature = newNature as unknown as number; + this.setSpeciesDetails(this.lastSpecies, { + natureIndex: newNature, + }); + success = true; + } + break; + case Button.CYCLE_TERA: + if (this.canCycleTera) { + const speciesForm = getPokemonSpeciesForm(this.lastSpecies.speciesId, starterAttributes.form ?? 0); + if (speciesForm.type1 === this.teraCursor && !Utils.isNullOrUndefined(speciesForm.type2)) { + starterAttributes.tera = speciesForm.type2!; + this.setSpeciesDetails(this.lastSpecies, { + teraType: speciesForm.type2!, + }); + } else { + starterAttributes.tera = speciesForm.type1; + this.setSpeciesDetails(this.lastSpecies, { + teraType: speciesForm.type1, + }); + } success = true; } break; @@ -2125,7 +2555,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } } else { if (this.starterIconsCursorIndex === 0) { - // Up from first Pokemon in the team > go to Random selection + // Up from first Pokemon in the team > go to Random selection this.starterIconsCursorObj.setVisible(false); this.setSpecies(null); this.randomCursorObj.setVisible(true); @@ -2138,19 +2568,21 @@ export default class StarterSelectUiHandler extends MessageUiHandler { break; case Button.DOWN: if (!this.starterIconsCursorObj.visible) { - if (currentRow < numOfRows - 1) { // not last row - if (currentRow - this.scrollCursor === 8) { // last row of visible starters + if (currentRow < numOfRows - 1) { + // not last row + if (currentRow - this.scrollCursor === 8) { + // last row of visible starters this.scrollCursor++; } success = this.setCursor(this.cursor + 9); this.updateScroll(); } else if (numOfRows > 1) { - // DOWN from last row of Pokemon > Wrap around to first row + // DOWN from last row of Pokemon > Wrap around to first row this.scrollCursor = 0; this.updateScroll(); success = this.setCursor(this.cursor % 9); } else { - // DOWN from single row of Pokemon > Go to filters + // DOWN from single row of Pokemon > Go to filters this.filterBarCursor = this.filterBar.getNearestFilter(this.filteredStarterContainers[this.cursor]); this.setFilterMode(true); success = true; @@ -2172,23 +2604,24 @@ export default class StarterSelectUiHandler extends MessageUiHandler { if (this.cursor % 9 !== 0) { success = this.setCursor(this.cursor - 1); } else { - // LEFT from filtered Pokemon, on the left edge - if ( onScreenCurrentRow === 0 ) { + // LEFT from filtered Pokemon, on the left edge + if (onScreenCurrentRow === 0) { // from the first row of starters we go to the random selection this.cursorObj.setVisible(false); this.randomCursorObj.setVisible(true); } else if (this.starterSpecies.length === 0) { - // no starter in team and not on first row > wrap around to the last column + // no starter in team and not on first row > wrap around to the last column success = this.setCursor(this.cursor + Math.min(8, numberOfStarters - this.cursor)); - } else if (onScreenCurrentRow < 7) { - // at least one pokemon in team > for the first 7 rows, go to closest starter + // at least one pokemon in team > for the first 7 rows, go to closest starter this.cursorObj.setVisible(false); - this.starterIconsCursorIndex = findClosestStarterIndex(this.cursorObj.y - 1, this.starterSpecies.length); + this.starterIconsCursorIndex = findClosestStarterIndex( + this.cursorObj.y - 1, + this.starterSpecies.length, + ); this.moveStarterIconsCursor(this.starterIconsCursorIndex); - } else { - // at least one pokemon in team > from the bottom 2 rows, go to start run button + // at least one pokemon in team > from the bottom 2 rows, go to start run button this.cursorObj.setVisible(false); this.setSpecies(null); this.startCursorObj.setVisible(true); @@ -2196,40 +2629,41 @@ export default class StarterSelectUiHandler extends MessageUiHandler { success = true; } } else if (numberOfStarters > 0) { - // LEFT from team > Go to closest filtered Pokemon + // LEFT from team > Go to closest filtered Pokemon const closestRowIndex = findClosestStarterRow(this.starterIconsCursorIndex, onScreenNumberOfRows); this.starterIconsCursorObj.setVisible(false); this.cursorObj.setVisible(true); this.setCursor(Math.min(onScreenFirstIndex + closestRowIndex * 9 + 8, onScreenLastIndex)); success = true; } else { - // LEFT from team and no Pokemon in filter > do nothing + // LEFT from team and no Pokemon in filter > do nothing success = false; } break; case Button.RIGHT: if (!this.starterIconsCursorObj.visible) { - // is not right edge + // is not right edge if (this.cursor % 9 < (currentRow < numOfRows - 1 ? 8 : (numberOfStarters - 1) % 9)) { success = this.setCursor(this.cursor + 1); } else { - // RIGHT from filtered Pokemon, on the right edge - if ( onScreenCurrentRow === 0 ) { + // RIGHT from filtered Pokemon, on the right edge + if (onScreenCurrentRow === 0) { // from the first row of starters we go to the random selection this.cursorObj.setVisible(false); this.randomCursorObj.setVisible(true); } else if (this.starterSpecies.length === 0) { - // no selected starter in team > wrap around to the first column + // no selected starter in team > wrap around to the first column success = this.setCursor(this.cursor - Math.min(8, this.cursor % 9)); - } else if (onScreenCurrentRow < 7) { - // at least one pokemon in team > for the first 7 rows, go to closest starter + // at least one pokemon in team > for the first 7 rows, go to closest starter this.cursorObj.setVisible(false); - this.starterIconsCursorIndex = findClosestStarterIndex(this.cursorObj.y - 1, this.starterSpecies.length); + this.starterIconsCursorIndex = findClosestStarterIndex( + this.cursorObj.y - 1, + this.starterSpecies.length, + ); this.moveStarterIconsCursor(this.starterIconsCursorIndex); - } else { - // at least one pokemon in team > from the bottom 2 rows, go to start run button + // at least one pokemon in team > from the bottom 2 rows, go to start run button this.cursorObj.setVisible(false); this.setSpecies(null); this.startCursorObj.setVisible(true); @@ -2237,14 +2671,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler { success = true; } } else if (numberOfStarters > 0) { - // RIGHT from team > Go to closest filtered Pokemon + // RIGHT from team > Go to closest filtered Pokemon const closestRowIndex = findClosestStarterRow(this.starterIconsCursorIndex, onScreenNumberOfRows); this.starterIconsCursorObj.setVisible(false); this.cursorObj.setVisible(true); - this.setCursor(Math.min(onScreenFirstIndex + closestRowIndex * 9, onScreenLastIndex - (onScreenLastIndex % 9))); + this.setCursor( + Math.min(onScreenFirstIndex + closestRowIndex * 9, onScreenLastIndex - (onScreenLastIndex % 9)), + ); success = true; } else { - // RIGHT from team and no Pokemon in filter > do nothing + // RIGHT from team and no Pokemon in filter > do nothing success = false; } break; @@ -2271,21 +2707,41 @@ export default class StarterSelectUiHandler extends MessageUiHandler { break; } } - return [ isDupe, removeIndex ]; + return [isDupe, removeIndex]; } - addToParty(species: PokemonSpecies, dexAttr: bigint, abilityIndex: integer, nature: Nature, moveset: StarterMoveset, randomSelection: boolean = false) { + addToParty( + species: PokemonSpecies, + dexAttr: bigint, + abilityIndex: number, + nature: Nature, + moveset: StarterMoveset, + teraType: PokemonType, + randomSelection = false, + ) { const props = globalScene.gameData.getSpeciesDexAttrProps(species, dexAttr); - this.starterIcons[this.starterSpecies.length].setTexture(species.getIconAtlasKey(props.formIndex, props.shiny, props.variant)); - this.starterIcons[this.starterSpecies.length].setFrame(species.getIconId(props.female, props.formIndex, props.shiny, props.variant)); - this.checkIconId(this.starterIcons[this.starterSpecies.length], species, props.female, props.formIndex, props.shiny, props.variant); + this.starterIcons[this.starterSpecies.length].setTexture( + species.getIconAtlasKey(props.formIndex, props.shiny, props.variant), + ); + this.starterIcons[this.starterSpecies.length].setFrame( + species.getIconId(props.female, props.formIndex, props.shiny, props.variant), + ); + this.checkIconId( + this.starterIcons[this.starterSpecies.length], + species, + props.female, + props.formIndex, + props.shiny, + props.variant, + ); this.starterSpecies.push(species); this.starterAttr.push(dexAttr); this.starterAbilityIndexes.push(abilityIndex); this.starterNatures.push(nature); + this.starterTeras.push(teraType); this.starterMovesets.push(moveset); - if (this.speciesLoaded.get(species.speciesId) || randomSelection ) { + if (this.speciesLoaded.get(species.speciesId) || randomSelection) { getPokemonSpeciesForm(species.speciesId, props.formIndex).cry(); } this.updateInstructions(); @@ -2309,21 +2765,30 @@ export default class StarterSelectUiHandler extends MessageUiHandler { // species has different forms if (pokemonFormLevelMoves.hasOwnProperty(speciesId)) { // starterMoveData doesn't have base form moves or is using the single form format - if (!globalScene.gameData.starterData[speciesId].moveset || Array.isArray(globalScene.gameData.starterData[speciesId].moveset)) { - globalScene.gameData.starterData[speciesId].moveset = { [props.formIndex]: this.starterMoveset?.slice(0) as StarterMoveset }; + if ( + !globalScene.gameData.starterData[speciesId].moveset || + Array.isArray(globalScene.gameData.starterData[speciesId].moveset) + ) { + globalScene.gameData.starterData[speciesId].moveset = { + [props.formIndex]: this.starterMoveset?.slice(0) as StarterMoveset, + }; } const starterMoveData = globalScene.gameData.starterData[speciesId].moveset; // starterMoveData doesn't have active form moves if (!starterMoveData.hasOwnProperty(props.formIndex)) { - globalScene.gameData.starterData[speciesId].moveset[props.formIndex] = this.starterMoveset?.slice(0) as StarterMoveset; + globalScene.gameData.starterData[speciesId].moveset[props.formIndex] = this.starterMoveset?.slice( + 0, + ) as StarterMoveset; } // does the species' starter move data have its form's starter moves and has it been updated if (starterMoveData.hasOwnProperty(props.formIndex)) { // active form move hasn't been updated if (starterMoveData[props.formIndex][existingMoveIndex] !== newMove) { - globalScene.gameData.starterData[speciesId].moveset[props.formIndex] = this.starterMoveset?.slice(0) as StarterMoveset; + globalScene.gameData.starterData[speciesId].moveset[props.formIndex] = this.starterMoveset?.slice( + 0, + ) as StarterMoveset; } } } else { @@ -2342,8 +2807,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } } - updateButtonIcon(iconSetting, gamepadType, iconElement, controlLabel): void { - let iconPath; + updateButtonIcon( + iconSetting: SettingKeyboard, + gamepadType: string, + iconElement: GameObjects.Sprite, + controlLabel: GameObjects.Text, + ): void { + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO + let iconPath: string; // touch controls cannot be rebound as is, and are just emulating a keyboard event. // Additionally, since keyboard controls can be rebound (and will be displayed when they are), we need to have special handling for the touch controls if (gamepadType === "touch") { @@ -2364,6 +2835,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { case SettingKeyboard.Button_Cycle_Nature: iconPath = "N.png"; break; + case SettingKeyboard.Button_Cycle_Tera: + iconPath = "V.png"; + break; case SettingKeyboard.Button_Stats: iconPath = "C.png"; break; @@ -2373,12 +2847,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } else { iconPath = globalScene.inputController?.getIconForLatestInputRecorded(iconSetting); } + // @ts-ignore: TODO can iconPath actually be undefined? iconElement.setTexture(gamepadType, iconPath); iconElement.setPosition(this.instructionRowX, this.instructionRowY); controlLabel.setPosition(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY); iconElement.setVisible(true); controlLabel.setVisible(true); - this.instructionsContainer.add([ iconElement, controlLabel ]); + this.instructionsContainer.add([iconElement, controlLabel]); this.instructionRowY += 8; if (this.instructionRowY >= 24) { this.instructionRowY = 0; @@ -2386,8 +2861,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } } - updateFilterButtonIcon(iconSetting, gamepadType, iconElement, controlLabel): void { - let iconPath; + updateFilterButtonIcon( + iconSetting: SettingKeyboard, + gamepadType: string, + iconElement: GameObjects.Sprite, + controlLabel: GameObjects.Text, + ): void { + let iconPath: string; // touch controls cannot be rebound as is, and are just emulating a keyboard event. // Additionally, since keyboard controls can be rebound (and will be displayed when they are), we need to have special handling for the touch controls if (gamepadType === "touch") { @@ -2401,7 +2881,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { controlLabel.setPosition(this.filterInstructionRowX + this.instructionRowTextOffset, this.filterInstructionRowY); iconElement.setVisible(true); controlLabel.setVisible(true); - this.filterInstructionsContainer.add([ iconElement, controlLabel ]); + this.filterInstructionsContainer.add([iconElement, controlLabel]); this.filterInstructionRowY += 8; if (this.filterInstructionRowY >= 24) { this.filterInstructionRowY = 0; @@ -2417,9 +2897,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.hideInstructions(); this.instructionsContainer.removeAll(); this.filterInstructionsContainer.removeAll(); - let gamepadType; + let gamepadType: string; if (globalScene.inputMethod === "gamepad") { - gamepadType = globalScene.inputController.getConfig(globalScene.inputController.selectedDevice[Device.GAMEPAD]).padType; + gamepadType = globalScene.inputController.getConfig( + globalScene.inputController.selectedDevice[Device.GAMEPAD], + ).padType; } else { gamepadType = globalScene.inputMethod; } @@ -2436,21 +2918,43 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.updateButtonIcon(SettingKeyboard.Button_Cycle_Form, gamepadType, this.formIconElement, this.formLabel); } if (this.canCycleGender) { - this.updateButtonIcon(SettingKeyboard.Button_Cycle_Gender, gamepadType, this.genderIconElement, this.genderLabel); + this.updateButtonIcon( + SettingKeyboard.Button_Cycle_Gender, + gamepadType, + this.genderIconElement, + this.genderLabel, + ); } if (this.canCycleAbility) { - this.updateButtonIcon(SettingKeyboard.Button_Cycle_Ability, gamepadType, this.abilityIconElement, this.abilityLabel); + this.updateButtonIcon( + SettingKeyboard.Button_Cycle_Ability, + gamepadType, + this.abilityIconElement, + this.abilityLabel, + ); } if (this.canCycleNature) { - this.updateButtonIcon(SettingKeyboard.Button_Cycle_Nature, gamepadType, this.natureIconElement, this.natureLabel); + this.updateButtonIcon( + SettingKeyboard.Button_Cycle_Nature, + gamepadType, + this.natureIconElement, + this.natureLabel, + ); + } + if (this.canCycleTera) { + this.updateButtonIcon(SettingKeyboard.Button_Cycle_Tera, gamepadType, this.teraIconElement, this.teraLabel); } } // if filter mode is inactivated and gamepadType is not undefined, update the button icons if (!this.filterMode) { - this.updateFilterButtonIcon(SettingKeyboard.Button_Stats, gamepadType, this.goFilterIconElement, this.goFilterLabel); + this.updateFilterButtonIcon( + SettingKeyboard.Button_Stats, + gamepadType, + this.goFilterIconElement, + this.goFilterLabel, + ); } - } getValueLimit(): number { @@ -2487,16 +2991,33 @@ export default class StarterSelectUiHandler extends MessageUiHandler { if (species.forms?.length > 0) { for (let i = 0; i < species.forms.length; i++) { /* Here we are making a fake form index dex props for challenges - * Since some pokemon rely on forms to be valid (i.e. blaze tauros for fire challenges), we make a fake form and dex props to use in the challenge - */ + * Since some pokemon rely on forms to be valid (i.e. blaze tauros for fire challenges), we make a fake form and dex props to use in the challenge + */ const tempFormProps = BigInt(Math.pow(2, i)) * DexAttr.DEFAULT_FORM; const isValidForChallenge = new BooleanHolder(true); - Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, container.species, isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(species, tempFormProps), true); + Challenge.applyChallenges( + globalScene.gameMode, + Challenge.ChallengeType.STARTER_CHOICE, + container.species, + isValidForChallenge, + globalScene.gameData.getSpeciesDexAttrProps(species, tempFormProps), + true, + ); allFormsValid = allFormsValid || isValidForChallenge.value; } } else { const isValidForChallenge = new BooleanHolder(true); - Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, container.species, isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(species, globalScene.gameData.getSpeciesDefaultDexAttr(container.species, false, true)), true); + Challenge.applyChallenges( + globalScene.gameMode, + Challenge.ChallengeType.STARTER_CHOICE, + container.species, + isValidForChallenge, + globalScene.gameData.getSpeciesDexAttrProps( + species, + globalScene.gameData.getSpeciesDefaultDexAttr(container.species, false, true), + ), + true, + ); allFormsValid = isValidForChallenge.value; } if (allFormsValid) { @@ -2517,7 +3038,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const currentDexAttr = this.getCurrentDexProps(currentFilteredContainer.species.speciesId); const props = globalScene.gameData.getSpeciesDexAttrProps(currentFilteredContainer.species, currentDexAttr); - starterSprite.setTexture(currentFilteredContainer.species.getIconAtlasKey(props.formIndex, props.shiny, props.variant), currentFilteredContainer.species.getIconId(props.female!, props.formIndex, props.shiny, props.variant)); + starterSprite.setTexture( + currentFilteredContainer.species.getIconAtlasKey(props.formIndex, props.shiny, props.variant), + currentFilteredContainer.species.getIconId(props.female!, props.formIndex, props.shiny, props.variant), + ); currentFilteredContainer.checkIconId(props.female, props.formIndex, props.shiny, props.variant); } @@ -2533,10 +3057,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const isStarterProgressable = speciesEggMoves.hasOwnProperty(container.species.speciesId); // Gen filter - const fitsGen = this.filterBar.getVals(DropDownColumn.GEN).includes(container.species.generation); + const fitsGen = this.filterBar.getVals(DropDownColumn.GEN).includes(container.species.generation); // Type filter - const fitsType = this.filterBar.getVals(DropDownColumn.TYPES).some(type => container.species.isOfType((type as number) - 1)); + const fitsType = this.filterBar + .getVals(DropDownColumn.TYPES) + .some(type => container.species.isOfType((type as number) - 1)); // Caught / Shiny filter const isNonShinyCaught = !!(caughtAttr & DexAttr.NON_SHINY); @@ -2548,13 +3074,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const fitsCaught = this.filterBar.getVals(DropDownColumn.CAUGHT).some(caught => { if (caught === "SHINY3") { return isVariant3Caught; - } else if (caught === "SHINY2") { + } + if (caught === "SHINY2") { return isVariant2Caught && !isVariant3Caught; - } else if (caught === "SHINY") { + } + if (caught === "SHINY") { return isVariant1Caught && !isVariant2Caught && !isVariant3Caught; - } else if (caught === "NORMAL") { + } + if (caught === "NORMAL") { return isNonShinyCaught && !isVariant1Caught && !isVariant2Caught && !isVariant3Caught; - } else if (caught === "UNCAUGHT") { + } + if (caught === "UNCAUGHT") { return isUncaught; } }); @@ -2565,11 +3095,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const fitsPassive = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => { if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.ON) { return isPassiveUnlocked; - } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.EXCLUDE) { + } + if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.EXCLUDE) { return isStarterProgressable && !isPassiveUnlocked; - } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.UNLOCKABLE) { + } + if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.UNLOCKABLE) { return isPassiveUnlockable; - } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.OFF) { + } + if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.OFF) { return true; } }); @@ -2581,15 +3114,20 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const fitsCostReduction = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => { if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ON) { return isCostReducedByOne || isCostReducedByTwo; - } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ONE) { + } + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ONE) { return isCostReducedByOne; - } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.TWO) { + } + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.TWO) { return isCostReducedByTwo; - } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.EXCLUDE) { + } + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.EXCLUDE) { return isStarterProgressable && !(isCostReducedByOne || isCostReducedByTwo); - } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.UNLOCKABLE) { + } + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.UNLOCKABLE) { return isCostReductionUnlockable; - } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.OFF) { + } + if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.OFF) { return true; } }); @@ -2615,22 +3153,28 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const fitsWin = this.filterBar.getVals(DropDownColumn.MISC).some(misc => { if (misc.val === "WIN" && misc.state === DropDownState.ON) { return hasWon; - } else if (misc.val === "WIN" && misc.state === DropDownState.EXCLUDE) { + } + if (misc.val === "WIN" && misc.state === DropDownState.EXCLUDE) { return hasNotWon || isUndefined; - } else if (misc.val === "WIN" && misc.state === DropDownState.OFF) { + } + if (misc.val === "WIN" && misc.state === DropDownState.OFF) { return true; } }); // HA Filter - const speciesHasHiddenAbility = container.species.abilityHidden !== container.species.ability1 && container.species.abilityHidden !== Abilities.NONE; + const speciesHasHiddenAbility = + container.species.abilityHidden !== container.species.ability1 && + container.species.abilityHidden !== Abilities.NONE; const hasHA = starterData.abilityAttr & AbilityAttr.ABILITY_HIDDEN; const fitsHA = this.filterBar.getVals(DropDownColumn.MISC).some(misc => { if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.ON) { return hasHA; - } else if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.EXCLUDE) { + } + if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.EXCLUDE) { return speciesHasHiddenAbility && !hasHA; - } else if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.OFF) { + } + if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.OFF) { return true; } }); @@ -2640,9 +3184,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const fitsEgg = this.filterBar.getVals(DropDownColumn.MISC).some(misc => { if (misc.val === "EGG" && misc.state === DropDownState.ON) { return isEggPurchasable; - } else if (misc.val === "EGG" && misc.state === DropDownState.EXCLUDE) { + } + if (misc.val === "EGG" && misc.state === DropDownState.EXCLUDE) { return isStarterProgressable && !isEggPurchasable; - } else if (misc.val === "EGG" && misc.state === DropDownState.OFF) { + } + if (misc.val === "EGG" && misc.state === DropDownState.OFF) { return true; } }); @@ -2651,14 +3197,27 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const fitsPokerus = this.filterBar.getVals(DropDownColumn.MISC).some(misc => { if (misc.val === "POKERUS" && misc.state === DropDownState.ON) { return this.pokerusSpecies.includes(container.species); - } else if (misc.val === "POKERUS" && misc.state === DropDownState.EXCLUDE) { + } + if (misc.val === "POKERUS" && misc.state === DropDownState.EXCLUDE) { return !this.pokerusSpecies.includes(container.species); - } else if (misc.val === "POKERUS" && misc.state === DropDownState.OFF) { + } + if (misc.val === "POKERUS" && misc.state === DropDownState.OFF) { return true; } }); - if (fitsGen && fitsType && fitsCaught && fitsPassive && fitsCostReduction && fitsFavorite && fitsWin && fitsHA && fitsEgg && fitsPokerus) { + if ( + fitsGen && + fitsType && + fitsCaught && + fitsPassive && + fitsCostReduction && + fitsFavorite && + fitsWin && + fitsHA && + fitsEgg && + fitsPokerus + ) { this.filteredStarterContainers.push(container); } }); @@ -2670,26 +3229,38 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const sort = this.filterBar.getVals(DropDownColumn.SORT)[0]; this.filteredStarterContainers.sort((a, b) => { switch (sort.val) { - default: - break; case SortCriteria.NUMBER: return (a.species.speciesId - b.species.speciesId) * -sort.dir; case SortCriteria.COST: return (a.cost - b.cost) * -sort.dir; - case SortCriteria.CANDY: + case SortCriteria.CANDY: { const candyCountA = globalScene.gameData.starterData[a.species.speciesId].candyCount; const candyCountB = globalScene.gameData.starterData[b.species.speciesId].candyCount; return (candyCountA - candyCountB) * -sort.dir; - case SortCriteria.IV: - const avgIVsA = globalScene.gameData.dexData[a.species.speciesId].ivs.reduce((a, b) => a + b, 0) / globalScene.gameData.dexData[a.species.speciesId].ivs.length; - const avgIVsB = globalScene.gameData.dexData[b.species.speciesId].ivs.reduce((a, b) => a + b, 0) / globalScene.gameData.dexData[b.species.speciesId].ivs.length; + } + case SortCriteria.IV: { + const avgIVsA = + globalScene.gameData.dexData[a.species.speciesId].ivs.reduce((a, b) => a + b, 0) / + globalScene.gameData.dexData[a.species.speciesId].ivs.length; + const avgIVsB = + globalScene.gameData.dexData[b.species.speciesId].ivs.reduce((a, b) => a + b, 0) / + globalScene.gameData.dexData[b.species.speciesId].ivs.length; return (avgIVsA - avgIVsB) * -sort.dir; + } case SortCriteria.NAME: return a.species.name.localeCompare(b.species.name) * -sort.dir; case SortCriteria.CAUGHT: - return (globalScene.gameData.dexData[a.species.speciesId].caughtCount - globalScene.gameData.dexData[b.species.speciesId].caughtCount) * -sort.dir; + return ( + (globalScene.gameData.dexData[a.species.speciesId].caughtCount - + globalScene.gameData.dexData[b.species.speciesId].caughtCount) * + -sort.dir + ); case SortCriteria.HATCHED: - return (globalScene.gameData.dexData[a.species.speciesId].hatchedCount - globalScene.gameData.dexData[b.species.speciesId].hatchedCount) * -sort.dir; + return ( + (globalScene.gameData.dexData[a.species.speciesId].hatchedCount - + globalScene.gameData.dexData[b.species.speciesId].hatchedCount) * + -sort.dir + ); } return 0; }); @@ -2706,7 +3277,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const maxColumns = 9; const maxRows = 9; const onScreenFirstIndex = this.scrollCursor * maxColumns; - const onScreenLastIndex = Math.min(this.filteredStarterContainers.length - 1, onScreenFirstIndex + maxRows * maxColumns - 1); + const onScreenLastIndex = Math.min( + this.filteredStarterContainers.length - 1, + onScreenFirstIndex + maxRows * maxColumns - 1, + ); this.starterSelectScrollBar.setScrollCursor(this.scrollCursor); @@ -2728,62 +3302,70 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.starterCursorObjs[this.starterSpecies.indexOf(container.species)].setVisible(false); } return; - } else { - container.setVisible(true); + } + container.setVisible(true); - if (this.pokerusSpecies.includes(container.species)) { - this.pokerusCursorObjs[pokerusCursorIndex].setPosition(pos.x - 1, pos.y + 1); - this.pokerusCursorObjs[pokerusCursorIndex].setVisible(true); - pokerusCursorIndex++; - } + if (this.pokerusSpecies.includes(container.species)) { + this.pokerusCursorObjs[pokerusCursorIndex].setPosition(pos.x - 1, pos.y + 1); + this.pokerusCursorObjs[pokerusCursorIndex].setVisible(true); + pokerusCursorIndex++; + } - if (this.starterSpecies.includes(container.species)) { - this.starterCursorObjs[this.starterSpecies.indexOf(container.species)].setPosition(pos.x - 1, pos.y + 1); - this.starterCursorObjs[this.starterSpecies.indexOf(container.species)].setVisible(true); - } + if (this.starterSpecies.includes(container.species)) { + this.starterCursorObjs[this.starterSpecies.indexOf(container.species)].setPosition(pos.x - 1, pos.y + 1); + this.starterCursorObjs[this.starterSpecies.indexOf(container.species)].setVisible(true); + } - const speciesId = container.species.speciesId; - this.updateStarterValueLabel(container); + const speciesId = container.species.speciesId; + this.updateStarterValueLabel(container); - container.label.setVisible(true); - const speciesVariants = speciesId && globalScene.gameData.dexData[speciesId].caughtAttr & DexAttr.SHINY - ? [ DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3 ].filter(v => !!(globalScene.gameData.dexData[speciesId].caughtAttr & v)) + container.label.setVisible(true); + const speciesVariants = + speciesId && globalScene.gameData.dexData[speciesId].caughtAttr & DexAttr.SHINY + ? [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter( + v => !!(globalScene.gameData.dexData[speciesId].caughtAttr & v), + ) : []; - for (let v = 0; v < 3; v++) { - const hasVariant = speciesVariants.length > v; - container.shinyIcons[v].setVisible(hasVariant); - if (hasVariant) { - container.shinyIcons[v].setTint(getVariantTint(speciesVariants[v] === DexAttr.DEFAULT_VARIANT ? 0 : speciesVariants[v] === DexAttr.VARIANT_2 ? 1 : 2)); - } + for (let v = 0; v < 3; v++) { + const hasVariant = speciesVariants.length > v; + container.shinyIcons[v].setVisible(hasVariant); + if (hasVariant) { + container.shinyIcons[v].setTint( + getVariantTint( + speciesVariants[v] === DexAttr.DEFAULT_VARIANT ? 0 : speciesVariants[v] === DexAttr.VARIANT_2 ? 1 : 2, + ), + ); + } + } + + container.starterPassiveBgs.setVisible(!!globalScene.gameData.starterData[speciesId].passiveAttr); + container.hiddenAbilityIcon.setVisible( + !!globalScene.gameData.dexData[speciesId].caughtAttr && + !!(globalScene.gameData.starterData[speciesId].abilityAttr & 4), + ); + container.classicWinIcon.setVisible(globalScene.gameData.starterData[speciesId].classicWinCount > 0); + container.favoriteIcon.setVisible(this.starterPreferences[speciesId]?.favorite ?? false); + + // 'Candy Icon' mode + if (globalScene.candyUpgradeDisplay === 0) { + if (!starterColors[speciesId]) { + // Default to white if no colors are found + starterColors[speciesId] = ["ffffff", "ffffff"]; } - container.starterPassiveBgs.setVisible(!!globalScene.gameData.starterData[speciesId].passiveAttr); - container.hiddenAbilityIcon.setVisible(!!globalScene.gameData.dexData[speciesId].caughtAttr && !!(globalScene.gameData.starterData[speciesId].abilityAttr & 4)); - container.classicWinIcon.setVisible(globalScene.gameData.starterData[speciesId].classicWinCount > 0); - container.favoriteIcon.setVisible(this.starterPreferences[speciesId]?.favorite ?? false); + // Set the candy colors + container.candyUpgradeIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[speciesId][0]))); + container.candyUpgradeOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[speciesId][1]))); - // 'Candy Icon' mode - if (globalScene.candyUpgradeDisplay === 0) { - - if (!starterColors[speciesId]) { - // Default to white if no colors are found - starterColors[speciesId] = [ "ffffff", "ffffff" ]; - } - - // Set the candy colors - container.candyUpgradeIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[speciesId][0]))); - container.candyUpgradeOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[speciesId][1]))); - - this.setUpgradeIcon(container); - } else if (globalScene.candyUpgradeDisplay === 1) { - container.candyUpgradeIcon.setVisible(false); - container.candyUpgradeOverlayIcon.setVisible(false); - } + this.setUpgradeIcon(container); + } else if (globalScene.candyUpgradeDisplay === 1) { + container.candyUpgradeIcon.setVisible(false); + container.candyUpgradeOverlayIcon.setVisible(false); } }); }; - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { let changed = false; if (this.filterMode) { @@ -2803,7 +3385,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { if (species) { const defaultDexAttr = this.getCurrentDexProps(species.speciesId); const defaultProps = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr); - const variant = this.starterPreferences[species.speciesId]?.variant ? this.starterPreferences[species.speciesId].variant as Variant : defaultProps.variant; + const variant = this.starterPreferences[species.speciesId]?.variant + ? (this.starterPreferences[species.speciesId].variant as Variant) + : defaultProps.variant; const tint = getVariantTint(variant); this.pokemonShinyIcon.setFrame(getVariantIcon(variant)); this.pokemonShinyIcon.setTint(tint); @@ -2861,6 +3445,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.dexAttrCursor = species ? this.getCurrentDexProps(species.speciesId) : 0n; this.abilityCursor = species ? globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species) : 0; this.natureCursor = species ? globalScene.gameData.getSpeciesDefaultNature(species) : 0; + this.teraCursor = species ? species.type1 : PokemonType.UNKNOWN; if (!species && globalScene.ui.getTooltip().visible) { globalScene.ui.hideTooltip(); @@ -2869,16 +3454,22 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonAbilityText.off("pointerover"); this.pokemonPassiveText.off("pointerover"); - const starterAttributes : StarterAttributes | null = species ? { ...this.starterPreferences[species.speciesId] } : null; + const starterAttributes: StarterAttributes | null = species + ? { ...this.starterPreferences[species.speciesId] } + : null; if (starterAttributes?.nature) { // load default nature from stater save data, if set this.natureCursor = starterAttributes.nature; } - if (starterAttributes?.ability && !isNaN(starterAttributes.ability)) { + if (starterAttributes?.ability && !Number.isNaN(starterAttributes.ability)) { // load default ability from stater save data, if set this.abilityCursor = starterAttributes.ability; } + if (starterAttributes?.tera) { + // load default tera from starter save data, if set + this.teraCursor = starterAttributes.tera; + } if (this.statsMode) { if (this.speciesStarterDexEntry?.caughtAttr) { @@ -2928,7 +3519,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { let growthReadable = toReadableString(GrowthRate[species.growthRate]); const growthAux = growthReadable.replace(" ", "_"); if (i18next.exists("growth:" + growthAux)) { - growthReadable = i18next.t("growth:" + growthAux as any); + growthReadable = i18next.t(("growth:" + growthAux) as any); } this.pokemonGrowthRateText.setText(growthReadable); @@ -2961,11 +3552,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonCaughtHatchedContainer.setY(16); this.pokemonShinyIcon.setY(135); this.pokemonShinyIcon.setFrame(getVariantIcon(variant)); - [ - this.pokemonCandyContainer, - this.pokemonHatchedIcon, - this.pokemonHatchedCountText - ].map(c => c.setVisible(false)); + [this.pokemonCandyContainer, this.pokemonHatchedIcon, this.pokemonHatchedCountText].map(c => + c.setVisible(false), + ); this.pokemonFormText.setY(25); } else { this.pokemonCaughtHatchedContainer.setY(25); @@ -2979,7 +3568,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonHatchedCountText.setVisible(true); const { currentFriendship, friendshipCap } = this.getFriendship(this.lastSpecies.speciesId); - const candyCropY = 16 - (16 * (currentFriendship / friendshipCap)); + const candyCropY = 16 - 16 * (currentFriendship / friendshipCap); this.pokemonCandyDarknessOverlay.setCrop(0, 0, 16, candyCropY); this.pokemonCandyContainer.on("pointerover", () => { @@ -2990,10 +3579,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { globalScene.ui.hideTooltip(); this.activeTooltip = undefined; }); - } - // Pause the animation when the species is selected const speciesIndex = this.allSpecies.indexOf(species); const icon = this.starterContainers[speciesIndex].icon; @@ -3020,15 +3607,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler { female: props.female, variant: props.variant, abilityIndex: this.starterAbilityIndexes[starterIndex], - natureIndex: this.starterNatures[starterIndex] + natureIndex: this.starterNatures[starterIndex], + teraType: this.starterTeras[starterIndex], }); } else { const defaultDexAttr = this.getCurrentDexProps(species.speciesId); - const defaultAbilityIndex = starterAttributes?.ability ?? globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species); + const defaultAbilityIndex = + starterAttributes?.ability ?? globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species); // load default nature from stater save data, if set const defaultNature = starterAttributes?.nature || globalScene.gameData.getSpeciesDefaultNature(species); props = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr); - if (starterAttributes?.variant && !isNaN(starterAttributes.variant)) { + if (starterAttributes?.variant && !Number.isNaN(starterAttributes.variant)) { if (props.shiny) { props.variant = starterAttributes.variant as Variant; } @@ -3042,7 +3631,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { female: props.female, variant: props.variant, abilityIndex: defaultAbilityIndex, - natureIndex: defaultNature + natureIndex: defaultNature, }); } @@ -3068,6 +3657,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonCaughtHatchedContainer.setVisible(false); this.pokemonCandyContainer.setVisible(false); this.pokemonFormText.setVisible(false); + this.teraIcon.setVisible(false); const defaultDexAttr = globalScene.gameData.getSpeciesDefaultDexAttr(species, true, true); const defaultAbilityIndex = globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species); @@ -3081,7 +3671,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { variant: props.variant, abilityIndex: defaultAbilityIndex, natureIndex: defaultNature, - forSeen: true + forSeen: true, }); this.pokemonSprite.setTint(0x808080); } @@ -3102,32 +3692,40 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonCaughtHatchedContainer.setVisible(false); this.pokemonCandyContainer.setVisible(false); this.pokemonFormText.setVisible(false); + this.teraIcon.setVisible(false); - this.setSpeciesDetails(species!, { // TODO: is this bang correct? + this.setSpeciesDetails(species!, { + // TODO: is this bang correct? shiny: false, formIndex: 0, female: false, variant: 0, abilityIndex: 0, - natureIndex: 0 + natureIndex: 0, }); this.pokemonSprite.clearTint(); } } setSpeciesDetails(species: PokemonSpecies, options: SpeciesDetails = {}): void { - let { shiny, formIndex, female, variant, abilityIndex, natureIndex } = options; + let { shiny, formIndex, female, variant, abilityIndex, natureIndex, teraType } = options; const forSeen: boolean = options.forSeen ?? false; const oldProps = species ? globalScene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor) : null; - const oldAbilityIndex = this.abilityCursor > -1 ? this.abilityCursor : globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species); - const oldNatureIndex = this.natureCursor > -1 ? this.natureCursor : globalScene.gameData.getSpeciesDefaultNature(species); + const oldAbilityIndex = + this.abilityCursor > -1 ? this.abilityCursor : globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species); + const oldNatureIndex = + this.natureCursor > -1 ? this.natureCursor : globalScene.gameData.getSpeciesDefaultNature(species); this.dexAttrCursor = 0n; this.abilityCursor = -1; this.natureCursor = -1; + this.teraCursor = PokemonType.UNKNOWN; // We will only update the sprite if there is a change to form, shiny/variant // or gender for species with gender sprite differences - const shouldUpdateSprite = (species?.genderDiffs && !isNullOrUndefined(female)) - || !isNullOrUndefined(formIndex) || !isNullOrUndefined(shiny) || !isNullOrUndefined(variant); + const shouldUpdateSprite = + (species?.genderDiffs && !isNullOrUndefined(female)) || + !isNullOrUndefined(formIndex) || + !isNullOrUndefined(shiny) || + !isNullOrUndefined(variant); if (this.activeTooltip === "CANDY") { if (this.lastSpecies && this.pokemonCandyContainer.visible) { @@ -3147,13 +3745,24 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } if (species) { - this.dexAttrCursor |= (shiny !== undefined ? !shiny : !(shiny = oldProps?.shiny)) ? DexAttr.NON_SHINY : DexAttr.SHINY; - this.dexAttrCursor |= (female !== undefined ? !female : !(female = oldProps?.female)) ? DexAttr.MALE : DexAttr.FEMALE; - this.dexAttrCursor |= (variant !== undefined ? !variant : !(variant = oldProps?.variant)) ? DexAttr.DEFAULT_VARIANT : variant === 1 ? DexAttr.VARIANT_2 : DexAttr.VARIANT_3; - this.dexAttrCursor |= globalScene.gameData.getFormAttr(formIndex !== undefined ? formIndex : (formIndex = oldProps!.formIndex)); // TODO: is this bang correct? + this.dexAttrCursor |= (shiny !== undefined ? !shiny : !(shiny = oldProps?.shiny)) + ? DexAttr.NON_SHINY + : DexAttr.SHINY; + this.dexAttrCursor |= (female !== undefined ? !female : !(female = oldProps?.female)) + ? DexAttr.MALE + : DexAttr.FEMALE; + this.dexAttrCursor |= (variant !== undefined ? !variant : !(variant = oldProps?.variant)) + ? DexAttr.DEFAULT_VARIANT + : variant === 1 + ? DexAttr.VARIANT_2 + : DexAttr.VARIANT_3; + this.dexAttrCursor |= globalScene.gameData.getFormAttr( + formIndex !== undefined ? formIndex : (formIndex = oldProps!.formIndex), + ); // TODO: is this bang correct? this.abilityCursor = abilityIndex !== undefined ? abilityIndex : (abilityIndex = oldAbilityIndex); this.natureCursor = natureIndex !== undefined ? natureIndex : (natureIndex = oldNatureIndex); - const [ isInParty, partyIndex ]: [boolean, number] = this.isInParty(species); // we use this to firstly check if the pokemon is in the party, and if so, to get the party index in order to update the icon image + this.teraCursor = !Utils.isNullOrUndefined(teraType) ? teraType : (teraType = species.type1); + const [isInParty, partyIndex]: [boolean, number] = this.isInParty(species); // we use this to firstly check if the pokemon is in the party, and if so, to get the party index in order to update the icon image if (isInParty) { this.updatePartyIcon(species, partyIndex); } @@ -3164,6 +3773,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonPassiveText.setVisible(false); this.pokemonPassiveDisabledIcon.setVisible(false); this.pokemonPassiveLockedIcon.setVisible(false); + this.teraIcon.setVisible(false); if (this.assetLoadCancelled) { this.assetLoadCancelled.value = true; @@ -3206,7 +3816,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.shinyOverlay.setVisible(shiny ?? false); // TODO: is false the correct default? this.pokemonNumberText.setColor(this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, false)); - this.pokemonNumberText.setShadowColor(this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, true)); + this.pokemonNumberText.setShadowColor( + this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, true), + ); if (forSeen ? this.speciesStarterDexEntry?.seenAttr : this.speciesStarterDexEntry?.caughtAttr) { const starterIndex = this.starterSpecies.indexOf(species); @@ -3215,13 +3827,15 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.starterAttr[starterIndex] = this.dexAttrCursor; this.starterAbilityIndexes[starterIndex] = this.abilityCursor; this.starterNatures[starterIndex] = this.natureCursor; + this.starterTeras[starterIndex] = this.teraCursor; } const assetLoadCancelled = new BooleanHolder(false); this.assetLoadCancelled = assetLoadCancelled; if (shouldUpdateSprite) { - species.loadAssets(female!, formIndex, shiny, variant, true).then(() => { // TODO: is this bang correct? + species.loadAssets(female!, formIndex, shiny, variant, true).then(() => { + // TODO: is this bang correct? if (assetLoadCancelled.value) { return; } @@ -3238,18 +3852,33 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } const isValidForChallenge = new BooleanHolder(true); - Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor), !!this.starterSpecies.length); - const currentFilteredContainer = this.filteredStarterContainers.find(p => p.species.speciesId === species.speciesId); + Challenge.applyChallenges( + globalScene.gameMode, + Challenge.ChallengeType.STARTER_CHOICE, + species, + isValidForChallenge, + globalScene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor), + !!this.starterSpecies.length, + ); + const currentFilteredContainer = this.filteredStarterContainers.find( + p => p.species.speciesId === species.speciesId, + ); if (currentFilteredContainer) { const starterSprite = currentFilteredContainer.icon as Phaser.GameObjects.Sprite; - starterSprite.setTexture(species.getIconAtlasKey(formIndex, shiny, variant), species.getIconId(female!, formIndex, shiny, variant)); + starterSprite.setTexture( + species.getIconAtlasKey(formIndex, shiny, variant), + species.getIconId(female!, formIndex, shiny, variant), + ); currentFilteredContainer.checkIconId(female, formIndex, shiny, variant); } const isNonShinyCaught = !!(caughtAttr & DexAttr.NON_SHINY); const isShinyCaught = !!(caughtAttr & DexAttr.SHINY); - this.canCycleShiny = isNonShinyCaught && isShinyCaught; + const caughtVariants = [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter( + v => caughtAttr & v, + ); + this.canCycleShiny = (isNonShinyCaught && isShinyCaught) || (isShinyCaught && caughtVariants.length > 1); const isMaleCaught = !!(caughtAttr & DexAttr.MALE); const isFemaleCaught = !!(caughtAttr & DexAttr.FEMALE); @@ -3268,12 +3897,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler { hasAbility2 = 0; } - this.canCycleAbility = [ hasAbility1, hasAbility2, hasHiddenAbility ].filter(a => a).length > 1; + this.canCycleAbility = [hasAbility1, hasAbility2, hasHiddenAbility].filter(a => a).length > 1; - this.canCycleForm = species.forms.filter(f => f.isStarterSelectable || !pokemonFormChanges[species.speciesId]?.find(fc => fc.formKey)) - .map((_, f) => dexEntry.caughtAttr & globalScene.gameData.getFormAttr(f)).filter(f => f).length > 1; + this.canCycleForm = + species.forms + .filter(f => f.isStarterSelectable || !pokemonFormChanges[species.speciesId]?.find(fc => fc.formKey)) + .map((_, f) => dexEntry.caughtAttr & globalScene.gameData.getFormAttr(f)) + .filter(f => f).length > 1; this.canCycleNature = globalScene.gameData.getNaturesForAttr(dexEntry.natureAttr).length > 1; - + this.canCycleTera = + !this.statsMode && + globalScene.gameData.achvUnlocks.hasOwnProperty(achvs.TERASTALLIZE.id) && + !Utils.isNullOrUndefined(getPokemonSpeciesForm(species.speciesId, formIndex ?? 0).type2); } if (dexEntry.caughtAttr && species.malePercent !== null) { @@ -3286,12 +3921,19 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } if (dexEntry.caughtAttr) { - const ability = allAbilities[this.lastSpecies.getAbility(abilityIndex!)]; // TODO: is this bang correct? + let ability: Ability; + if (this.lastSpecies.forms?.length > 1) { + ability = allAbilities[this.lastSpecies.forms[formIndex ?? 0].getAbility(abilityIndex!)]; + } else { + ability = allAbilities[this.lastSpecies.getAbility(abilityIndex!)]; // TODO: is this bang correct? + } this.pokemonAbilityText.setText(ability.name); const isHidden = abilityIndex === (this.lastSpecies.ability2 ? 2 : 1); this.pokemonAbilityText.setColor(this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD)); - this.pokemonAbilityText.setShadowColor(this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD, true)); + this.pokemonAbilityText.setShadowColor( + this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD, true), + ); const passiveAttr = globalScene.gameData.starterData[species.speciesId].passiveAttr; const passiveAbility = allAbilities[this.lastSpecies.getPassiveAbility(formIndex)]; @@ -3344,22 +3986,27 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const iconPosition = { x: this.pokemonPassiveText.x + this.pokemonPassiveText.displayWidth + 1, - y: this.pokemonPassiveText.y + this.pokemonPassiveText.displayHeight / 2 + y: this.pokemonPassiveText.y + this.pokemonPassiveText.displayHeight / 2, }; this.pokemonPassiveDisabledIcon.setVisible(isUnlocked && !isEnabled); this.pokemonPassiveDisabledIcon.setPosition(iconPosition.x, iconPosition.y); this.pokemonPassiveLockedIcon.setVisible(!isUnlocked); this.pokemonPassiveLockedIcon.setPosition(iconPosition.x, iconPosition.y); - } else if (this.activeTooltip === "PASSIVE") { // No passive and passive tooltip is active > hide it globalScene.ui.hideTooltip(); } - this.pokemonNatureText.setText(getNatureName(natureIndex as unknown as Nature, true, true, false, globalScene.uiTheme)); + this.pokemonNatureText.setText( + getNatureName(natureIndex as unknown as Nature, true, true, false, globalScene.uiTheme), + ); let levelMoves: LevelMoves; - if (pokemonFormLevelMoves.hasOwnProperty(species.speciesId) && formIndex && pokemonFormLevelMoves[species.speciesId].hasOwnProperty(formIndex)) { + if ( + pokemonFormLevelMoves.hasOwnProperty(species.speciesId) && + formIndex && + pokemonFormLevelMoves[species.speciesId].hasOwnProperty(formIndex) + ) { levelMoves = pokemonFormLevelMoves[species.speciesId][formIndex]; } else { levelMoves = pokemonSpeciesLevelMoves[species.speciesId]; @@ -3379,35 +4026,45 @@ export default class StarterSelectUiHandler extends MessageUiHandler { ? speciesMoveData : speciesMoveData[formIndex!] // TODO: is this bang correct? : null; - const availableStarterMoves = this.speciesStarterMoves.concat(speciesEggMoves.hasOwnProperty(species.speciesId) ? speciesEggMoves[species.speciesId].filter((_, em: integer) => globalScene.gameData.starterData[species.speciesId].eggMoves & (1 << em)) : []); - this.starterMoveset = (moveData || (this.speciesStarterMoves.slice(0, 4) as StarterMoveset)).filter(m => availableStarterMoves.find(sm => sm === m)) as StarterMoveset; + const availableStarterMoves = this.speciesStarterMoves.concat( + speciesEggMoves.hasOwnProperty(species.speciesId) + ? speciesEggMoves[species.speciesId].filter( + (_: any, em: number) => globalScene.gameData.starterData[species.speciesId].eggMoves & (1 << em), + ) + : [], + ); + this.starterMoveset = (moveData || (this.speciesStarterMoves.slice(0, 4) as StarterMoveset)).filter(m => + availableStarterMoves.find(sm => sm === m), + ) as StarterMoveset; // Consolidate move data if it contains an incompatible move if (this.starterMoveset.length < 4 && this.starterMoveset.length < availableStarterMoves.length) { - this.starterMoveset.push(...availableStarterMoves.filter(sm => this.starterMoveset?.indexOf(sm) === -1).slice(0, 4 - this.starterMoveset.length)); + this.starterMoveset.push( + ...availableStarterMoves + .filter(sm => this.starterMoveset?.indexOf(sm) === -1) + .slice(0, 4 - this.starterMoveset.length), + ); } // Remove duplicate moves - this.starterMoveset = this.starterMoveset.filter( - (move, i) => { - return this.starterMoveset?.indexOf(move) === i; - }) as StarterMoveset; + this.starterMoveset = this.starterMoveset.filter((move, i) => { + return this.starterMoveset?.indexOf(move) === i; + }) as StarterMoveset; const speciesForm = getPokemonSpeciesForm(species.speciesId, formIndex!); // TODO: is the bang correct? - const formText = capitalizeString(species?.forms[formIndex!]?.formKey, "-", false, false); // TODO: is the bang correct? - - const speciesName = capitalizeString(Species[species.speciesId], "_", true, false); - - if (species.speciesId === Species.ARCEUS) { - this.pokemonFormText.setText(i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`)); - } else { - this.pokemonFormText.setText(formText ? i18next.t(`pokemonForm:${speciesName}${formText}`) : ""); - } + const formText = species.getFormNameToDisplay(formIndex); + this.pokemonFormText.setText(formText); this.setTypeIcons(speciesForm.type1, speciesForm.type2); + + this.teraIcon.setFrame(PokemonType[this.teraCursor].toLowerCase()); + this.teraIcon.setVisible( + !this.statsMode && globalScene.gameData.achvUnlocks.hasOwnProperty(achvs.TERASTALLIZE.id), + ); } else { this.pokemonAbilityText.setText(""); this.pokemonPassiveText.setText(""); this.pokemonNatureText.setText(""); + this.teraIcon.setVisible(false); this.setTypeIcons(null, null); } } else { @@ -3418,6 +4075,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonAbilityText.setText(""); this.pokemonPassiveText.setText(""); this.pokemonNatureText.setText(""); + this.teraIcon.setVisible(false); this.setTypeIcons(null, null); } @@ -3427,7 +4085,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { for (let m = 0; m < 4; m++) { const move = m < this.starterMoveset.length ? allMoves[this.starterMoveset[m]] : null; - this.pokemonMoveBgs[m].setFrame(Type[move ? move.type : Type.UNKNOWN].toString().toLowerCase()); + this.pokemonMoveBgs[m].setFrame(PokemonType[move ? move.type : PokemonType.UNKNOWN].toString().toLowerCase()); this.pokemonMoveLabels[m].setText(move ? move.name : "-"); this.pokemonMoveContainers[m].setVisible(!!move); } @@ -3437,7 +4095,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { for (let em = 0; em < 4; em++) { const eggMove = hasEggMoves ? allMoves[speciesEggMoves[species.speciesId][em]] : null; const eggMoveUnlocked = eggMove && globalScene.gameData.starterData[species.speciesId].eggMoves & (1 << em); - this.pokemonEggMoveBgs[em].setFrame(Type[eggMove ? eggMove.type : Type.UNKNOWN].toString().toLowerCase()); + this.pokemonEggMoveBgs[em].setFrame( + PokemonType[eggMove ? eggMove.type : PokemonType.UNKNOWN].toString().toLowerCase(), + ); this.pokemonEggMoveLabels[em].setText(eggMove && eggMoveUnlocked ? eggMove.name : "???"); } @@ -3451,16 +4111,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.updateInstructions(); } - setTypeIcons(type1: Type | null, type2: Type | null): void { + setTypeIcons(type1: PokemonType | null, type2: PokemonType | null): void { if (type1 !== null) { this.type1Icon.setVisible(true); - this.type1Icon.setFrame(Type[type1].toLowerCase()); + this.type1Icon.setFrame(PokemonType[type1].toLowerCase()); } else { this.type1Icon.setVisible(false); } if (type2 !== null) { this.type2Icon.setVisible(true); - this.type2Icon.setFrame(Type[type2].toLowerCase()); + this.type2Icon.setFrame(PokemonType[type2].toLowerCase()); } else { this.type2Icon.setVisible(false); } @@ -3471,6 +4131,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.starterAttr.splice(index, 1); this.starterAbilityIndexes.splice(index, 1); this.starterNatures.splice(index, 1); + this.starterTeras.splice(index, 1); this.starterMovesets.splice(index, 1); for (let s = 0; s < this.starterSpecies.length; s++) { @@ -3548,8 +4209,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } } - tryUpdateValue(add?: integer, addingToParty?: boolean): boolean { - const value = this.starterSpecies.map(s => s.generation).reduce((total: integer, _gen: integer, i: integer) => total += globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId), 0); + tryUpdateValue(add?: number, addingToParty?: boolean): boolean { + const value = this.starterSpecies + .map(s => s.generation) + .reduce( + (total: number, _gen: number, i: number) => + (total += globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId)), + 0, + ); const newValue = value + (add || 0); const valueLimit = this.getValueLimit(); const overLimit = newValue > valueLimit; @@ -3559,16 +4226,26 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } this.valueLimitLabel.setText(`${newValueStr}/${valueLimit}`); this.valueLimitLabel.setColor(this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK)); - this.valueLimitLabel.setShadowColor(this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK, true)); + this.valueLimitLabel.setShadowColor( + this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK, true), + ); if (overLimit) { globalScene.time.delayedCall(fixedInt(500), () => this.tryUpdateValue()); return false; } let isPartyValid: boolean = this.isPartyValid(); // this checks to see if the party is valid - if (addingToParty) { // this does a check to see if the pokemon being added is valid; if so, it will update the isPartyValid boolean + if (addingToParty) { + // this does a check to see if the pokemon being added is valid; if so, it will update the isPartyValid boolean const isNewPokemonValid = new BooleanHolder(true); const species = this.filteredStarterContainers[this.cursor].species; - Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isNewPokemonValid, globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), false); + Challenge.applyChallenges( + globalScene.gameMode, + Challenge.ChallengeType.STARTER_CHOICE, + species, + isNewPokemonValid, + globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), + false, + ); isPartyValid = isPartyValid || isNewPokemonValid.value; } @@ -3594,19 +4271,29 @@ export default class StarterSelectUiHandler extends MessageUiHandler { * we change to can AddParty value to true since the user has enough cost to choose this pokemon and this pokemon registered too. */ const isValidForChallenge = new BooleanHolder(true); - Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, this.allSpecies[s], isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(this.allSpecies[s], this.getCurrentDexProps(this.allSpecies[s].speciesId)), isPartyValid); + Challenge.applyChallenges( + globalScene.gameMode, + Challenge.ChallengeType.STARTER_CHOICE, + this.allSpecies[s], + isValidForChallenge, + globalScene.gameData.getSpeciesDexAttrProps( + this.allSpecies[s], + this.getCurrentDexProps(this.allSpecies[s].speciesId), + ), + isPartyValid, + ); const canBeChosen = remainValue >= speciesStarterValue && isValidForChallenge.value; const isPokemonInParty = this.isInParty(this.allSpecies[s])[0]; // this will get the valud of isDupe from isInParty. This will let us see if the pokemon in question is in our party already so we don't grey out the sprites if they're invalid /* This code does a check to tell whether or not a sprite should be lit up or greyed out. There are 3 ways a pokemon's sprite should be lit up: - * 1) If it's in your party, it's a valid pokemon (i.e. for challenge) and you have enough points to have it - * 2) If it's in your party, it's not valid (i.e. for challenges), and you have enough points to have it - * 3) If it's not in your party, but it's a valid pokemon and you have enough points for it - * Any other time, the sprite should be greyed out. - * For example, if it's in your party, valid, but costs too much, or if it's not in your party and not valid, regardless of cost - */ + * 1) If it's in your party, it's a valid pokemon (i.e. for challenge) and you have enough points to have it + * 2) If it's in your party, it's not valid (i.e. for challenges), and you have enough points to have it + * 3) If it's not in your party, but it's a valid pokemon and you have enough points for it + * Any other time, the sprite should be greyed out. + * For example, if it's in your party, valid, but costs too much, or if it's not in your party and not valid, regardless of cost + */ if (canBeChosen || (isPokemonInParty && remainValue >= speciesStarterValue)) { speciesSprite.setAlpha(1); } else { @@ -3631,24 +4318,31 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.blockInput = false; }; ui.showText(i18next.t("starterSelectUiHandler:confirmExit"), null, () => { - ui.setModeWithoutClear(Mode.CONFIRM, () => { - ui.setMode(Mode.STARTER_SELECT); - globalScene.clearPhaseQueue(); - if (globalScene.gameMode.isChallenge) { - globalScene.pushPhase(new SelectChallengePhase()); - globalScene.pushPhase(new EncounterPhase()); - } else { - globalScene.pushPhase(new TitlePhase()); - } - this.clearText(); - globalScene.getCurrentPhase()?.end(); - }, cancel, null, null, 19); + ui.setModeWithoutClear( + Mode.CONFIRM, + () => { + ui.setMode(Mode.STARTER_SELECT); + globalScene.clearPhaseQueue(); + if (globalScene.gameMode.isChallenge) { + globalScene.pushPhase(new SelectChallengePhase()); + globalScene.pushPhase(new EncounterPhase()); + } else { + globalScene.pushPhase(new TitlePhase()); + } + this.clearText(); + globalScene.getCurrentPhase()?.end(); + }, + cancel, + null, + null, + 19, + ); }); return true; } - tryStart(manualTrigger: boolean = false): boolean { + tryStart(manualTrigger = false): boolean { if (!this.starterSpecies.length) { return false; } @@ -3667,46 +4361,72 @@ export default class StarterSelectUiHandler extends MessageUiHandler { if (canStart) { ui.showText(i18next.t("starterSelectUiHandler:confirmStartTeam"), null, () => { - ui.setModeWithoutClear(Mode.CONFIRM, () => { - const startRun = () => { - globalScene.money = globalScene.gameMode.getStartingMoney(); - ui.setMode(Mode.STARTER_SELECT); - const thisObj = this; - const originalStarterSelectCallback = this.starterSelectCallback; - this.starterSelectCallback = null; - originalStarterSelectCallback && originalStarterSelectCallback(new Array(this.starterSpecies.length).fill(0).map(function (_, i) { - const starterSpecies = thisObj.starterSpecies[i]; - return { - species: starterSpecies, - dexAttr: thisObj.starterAttr[i], - abilityIndex: thisObj.starterAbilityIndexes[i], - passive: !(globalScene.gameData.starterData[starterSpecies.speciesId].passiveAttr ^ (PassiveAttr.ENABLED | PassiveAttr.UNLOCKED)), - nature: thisObj.starterNatures[i] as Nature, - moveset: thisObj.starterMovesets[i], - pokerus: thisObj.pokerusSpecies.includes(starterSpecies), - nickname: thisObj.starterPreferences[starterSpecies.speciesId]?.nickname, - }; - })); - }; - startRun(); - }, cancel, null, null, 19); + ui.setModeWithoutClear( + Mode.CONFIRM, + () => { + const startRun = () => { + globalScene.money = globalScene.gameMode.getStartingMoney(); + ui.setMode(Mode.STARTER_SELECT); + const thisObj = this; + const originalStarterSelectCallback = this.starterSelectCallback; + this.starterSelectCallback = null; + originalStarterSelectCallback?.( + new Array(this.starterSpecies.length).fill(0).map((_, i) => { + const starterSpecies = thisObj.starterSpecies[i]; + return { + species: starterSpecies, + dexAttr: thisObj.starterAttr[i], + abilityIndex: thisObj.starterAbilityIndexes[i], + passive: !( + globalScene.gameData.starterData[starterSpecies.speciesId].passiveAttr ^ + (PassiveAttr.ENABLED | PassiveAttr.UNLOCKED) + ), + nature: thisObj.starterNatures[i] as Nature, + teraType: thisObj.starterTeras[i] as PokemonType, + moveset: thisObj.starterMovesets[i], + pokerus: thisObj.pokerusSpecies.includes(starterSpecies), + nickname: thisObj.starterPreferences[starterSpecies.speciesId]?.nickname, + }; + }), + ); + }; + startRun(); + }, + cancel, + null, + null, + 19, + ); }); } else { this.tutorialActive = true; - this.showText(i18next.t("starterSelectUiHandler:invalidParty"), undefined, () => this.showText("", 0, () => this.tutorialActive = false), undefined, true); + this.showText( + i18next.t("starterSelectUiHandler:invalidParty"), + undefined, + () => this.showText("", 0, () => (this.tutorialActive = false)), + undefined, + true, + ); } return true; } /* This block checks to see if your party is valid * It checks each pokemon against the challenge - noting that due to monotype challenges it needs to check the pokemon while ignoring their evolutions/form change items - */ + */ isPartyValid(): boolean { let canStart = false; for (let s = 0; s < this.starterSpecies.length; s++) { const isValidForChallenge = new BooleanHolder(true); const species = this.starterSpecies[s]; - Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), false); + Challenge.applyChallenges( + globalScene.gameMode, + Challenge.ChallengeType.STARTER_CHOICE, + species, + isValidForChallenge, + globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), + false, + ); canStart = canStart || isValidForChallenge.value; } return canStart; @@ -3727,7 +4447,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler { * It then checks b) if the caughtAttr for the pokemon is female and NOT male - this means that the ONLY gender we've gotten is female, and we need to add DexAttr.FEMALE to our temp props * If neither of these pass, we add DexAttr.MALE to our temp props */ - if (this.starterPreferences[speciesId]?.female || ((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n)) { + if ( + this.starterPreferences[speciesId]?.female || + ((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n) + ) { props += DexAttr.FEMALE; } else { props += DexAttr.MALE; @@ -3735,7 +4458,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler { /* This part is very similar to above, but instead of for gender, it checks for shiny within starter preferences. * If they're not there, it enables shiny state by default if any shiny was caught */ - if (this.starterPreferences[speciesId]?.shiny || ((caughtAttr & DexAttr.SHINY) > 0n && this.starterPreferences[speciesId]?.shiny !== false)) { + if ( + this.starterPreferences[speciesId]?.shiny || + ((caughtAttr & DexAttr.SHINY) > 0n && this.starterPreferences[speciesId]?.shiny !== false) + ) { props += DexAttr.SHINY; if (this.starterPreferences[speciesId]?.variant !== undefined) { props += BigInt(Math.pow(2, this.starterPreferences[speciesId]?.variant)) * DexAttr.DEFAULT_VARIANT; @@ -3755,7 +4481,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { props += DexAttr.NON_SHINY; props += DexAttr.DEFAULT_VARIANT; // we add the default variant here because non shiny versions are listed as default variant } - if (this.starterPreferences[speciesId]?.form) { // this checks for the form of the pokemon + if (this.starterPreferences[speciesId]?.form) { + // this checks for the form of the pokemon props += BigInt(Math.pow(2, this.starterPreferences[speciesId]?.form)) * DexAttr.DEFAULT_FORM; } else { // Get the first unlocked form @@ -3773,12 +4500,26 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.showStats(); this.statsMode = true; this.pokemonSprite.setVisible(false); + this.teraIcon.setVisible(false); + this.canCycleTera = false; + this.updateInstructions(); } else { this.statsMode = false; this.statsContainer.setVisible(false); this.pokemonSprite.setVisible(!!this.speciesStarterDexEntry?.caughtAttr); //@ts-ignore this.statsContainer.updateIvs(null); // TODO: resolve ts-ignore. !?!? + this.teraIcon.setVisible(globalScene.gameData.achvUnlocks.hasOwnProperty(achvs.TERASTALLIZE.id)); + const props = globalScene.gameData.getSpeciesDexAttrProps( + this.lastSpecies, + this.getCurrentDexProps(this.lastSpecies.speciesId), + ); + const formIndex = props.formIndex; + this.canCycleTera = + !this.statsMode && + globalScene.gameData.achvUnlocks.hasOwnProperty(achvs.TERASTALLIZE.id) && + !Utils.isNullOrUndefined(getPokemonSpeciesForm(this.lastSpecies.speciesId, formIndex ?? 0).type2); + this.updateInstructions(); } } @@ -3808,6 +4549,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.abilityLabel.setVisible(false); this.natureIconElement.setVisible(false); this.natureLabel.setVisible(false); + this.teraIconElement.setVisible(false); + this.teraLabel.setVisible(false); this.goFilterIconElement.setVisible(false); this.goFilterLabel.setVisible(false); } @@ -3815,7 +4558,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { clear(): void { super.clear(); - StarterPrefs.save(this.starterPreferences); + saveStarterPreferences(this.starterPreferences); this.cursor = -1; this.hideInstructions(); this.activeTooltip = undefined; @@ -3833,9 +4576,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } } - checkIconId(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, female: boolean, formIndex: number, shiny: boolean, variant: number) { + checkIconId( + icon: Phaser.GameObjects.Sprite, + species: PokemonSpecies, + female: boolean, + formIndex: number, + shiny: boolean, + variant: number, + ) { if (icon.frame.name !== species.getIconId(female, formIndex, shiny, variant)) { - console.log(`${species.name}'s icon ${icon.frame.name} does not match getIconId with female: ${female}, formIndex: ${formIndex}, shiny: ${shiny}, variant: ${variant}`); + console.log( + `${species.name}'s icon ${icon.frame.name} does not match getIconId with female: ${female}, formIndex: ${formIndex}, shiny: ${shiny}, variant: ${variant}`, + ); icon.setTexture(species.getIconAtlasKey(formIndex, false, variant)); icon.setFrame(species.getIconId(female, formIndex, false, variant)); } diff --git a/src/ui/stats-container.ts b/src/ui/stats-container.ts index 8d8d3c101b2..8cc74e64e96 100644 --- a/src/ui/stats-container.ts +++ b/src/ui/stats-container.ts @@ -4,20 +4,26 @@ import { PERMANENT_STATS, getStatKey } from "#app/enums/stat"; import i18next from "i18next"; import { globalScene } from "#app/global-scene"; - const ivChartSize = 24; -const ivChartStatCoordMultipliers = [[ 0, -1 ], [ 0.825, -0.5 ], [ 0.825, 0.5 ], [ -0.825, -0.5 ], [ -0.825, 0.5 ], [ 0, 1 ]]; +const ivChartStatCoordMultipliers = [ + [0, -1], + [0.825, -0.5], + [0.825, 0.5], + [-0.825, -0.5], + [-0.825, 0.5], + [0, 1], +]; const speedLabelOffset = -3; const sideLabelOffset = 1; -const ivLabelOffset = [ 0, sideLabelOffset, -sideLabelOffset, sideLabelOffset, -sideLabelOffset, speedLabelOffset ]; -const ivChartLabelyOffset = [ 0, 5, 0, 5, 0, 0 ]; // doing this so attack does not overlap with (+N) -const ivChartStatIndexes = [ 0, 1, 2, 5, 4, 3 ]; // swap special attack and speed +const ivLabelOffset = [0, sideLabelOffset, -sideLabelOffset, sideLabelOffset, -sideLabelOffset, speedLabelOffset]; +const ivChartLabelyOffset = [0, 5, 0, 5, 0, 0]; // doing this so attack does not overlap with (+N) +const ivChartStatIndexes = [0, 1, 2, 5, 4, 3]; // swap special attack and speed const defaultIvChartData = new Array(12).fill(null).map(() => 0); export class StatsContainer extends Phaser.GameObjects.Container { private showDiff: boolean; - private statsIvsCache: integer[]; + private statsIvsCache: number[]; private ivChart: Phaser.GameObjects.Polygon; private ivStatValueTexts: BBCodeText[]; @@ -31,17 +37,33 @@ export class StatsContainer extends Phaser.GameObjects.Container { setup() { this.setName("stats"); - const ivChartBgData = new Array(6).fill(null).map((_, i: integer) => [ ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][0], ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][1] ] ).flat(); + const ivChartBgData = new Array(6) + .fill(null) + .flatMap((_, i: number) => [ + ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][0], + ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][1], + ]); const ivChartBg = globalScene.add.polygon(48, 44, ivChartBgData, 0xd8e0f0, 0.625); ivChartBg.setOrigin(0, 0); - const ivChartBorder = globalScene.add.polygon(ivChartBg.x, ivChartBg.y, ivChartBgData) - .setStrokeStyle(1, 0x484050); + const ivChartBorder = globalScene.add.polygon(ivChartBg.x, ivChartBg.y, ivChartBgData).setStrokeStyle(1, 0x484050); ivChartBorder.setOrigin(0, 0); - const ivChartBgLines = [[ 0, -1, 0, 1 ], [ -0.825, -0.5, 0.825, 0.5 ], [ 0.825, -0.5, -0.825, 0.5 ]].map(coords => { - const line = new Phaser.GameObjects.Line(globalScene, ivChartBg.x, ivChartBg.y, ivChartSize * coords[0], ivChartSize * coords[1], ivChartSize * coords[2], ivChartSize * coords[3], 0xffffff) - .setLineWidth(0.5); + const ivChartBgLines = [ + [0, -1, 0, 1], + [-0.825, -0.5, 0.825, 0.5], + [0.825, -0.5, -0.825, 0.5], + ].map(coords => { + const line = new Phaser.GameObjects.Line( + globalScene, + ivChartBg.x, + ivChartBg.y, + ivChartSize * coords[0], + ivChartSize * coords[1], + ivChartSize * coords[2], + ivChartSize * coords[3], + 0xffffff, + ).setLineWidth(0.5); line.setOrigin(0, 0); return line; }); @@ -58,30 +80,42 @@ export class StatsContainer extends Phaser.GameObjects.Container { for (const s of PERMANENT_STATS) { const statLabel = addTextObject( - ivChartBg.x + (ivChartSize) * ivChartStatCoordMultipliers[s][0] * 1.325 + (this.showDiff ? 0 : ivLabelOffset[s]), - ivChartBg.y + (ivChartSize) * ivChartStatCoordMultipliers[s][1] * 1.325 - 4 + (this.showDiff ? 0 : ivChartLabelyOffset[s]), + ivChartBg.x + ivChartSize * ivChartStatCoordMultipliers[s][0] * 1.325 + (this.showDiff ? 0 : ivLabelOffset[s]), + ivChartBg.y + + ivChartSize * ivChartStatCoordMultipliers[s][1] * 1.325 - + 4 + + (this.showDiff ? 0 : ivChartLabelyOffset[s]), i18next.t(getStatKey(s)), - TextStyle.TOOLTIP_CONTENT + TextStyle.TOOLTIP_CONTENT, ); statLabel.setOrigin(0.5); - this.ivStatValueTexts[s] = addBBCodeTextObject(statLabel.x - (this.showDiff ? 0 : ivLabelOffset[s]), statLabel.y + 8, "0", TextStyle.TOOLTIP_CONTENT); + this.ivStatValueTexts[s] = addBBCodeTextObject( + statLabel.x - (this.showDiff ? 0 : ivLabelOffset[s]), + statLabel.y + 8, + "0", + TextStyle.TOOLTIP_CONTENT, + ); this.ivStatValueTexts[s].setOrigin(0.5); - this.add(statLabel); this.add(this.ivStatValueTexts[s]); } } - updateIvs(ivs: integer[], originalIvs?: integer[]): void { + updateIvs(ivs: number[], originalIvs?: number[]): void { if (ivs) { - const ivChartData = new Array(6).fill(null).map((_, i) => [ (ivs[ivChartStatIndexes[i]] / 31) * ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][0], (ivs[ivChartStatIndexes[i]] / 31) * ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][1] ] ).flat(); + const ivChartData = new Array(6) + .fill(null) + .flatMap((_, i) => [ + (ivs[ivChartStatIndexes[i]] / 31) * ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][0], + (ivs[ivChartStatIndexes[i]] / 31) * ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][1], + ]); const lastIvChartData = this.statsIvsCache || defaultIvChartData; const perfectIVColor: string = getTextColor(TextStyle.SUMMARY_GOLD, false, globalScene.uiTheme); this.statsIvsCache = ivChartData.slice(0); - this.ivStatValueTexts.map((t: BBCodeText, i: integer) => { + this.ivStatValueTexts.map((t: BBCodeText, i: number) => { let label = ""; // Check to see if IVs are 31, if so change the text style to gold, otherwise leave them be. @@ -100,12 +134,12 @@ export class StatsContainer extends Phaser.GameObjects.Container { t.setText(`[shadow]${label}[/shadow]`); }); - const newColor = ivs.every(iv => iv === 31) ? parseInt(perfectIVColor.substr(1), 16) : 0x98d8a0; + const newColor = ivs.every(iv => iv === 31) ? Number.parseInt(perfectIVColor.substr(1), 16) : 0x98d8a0; const oldColor = this.ivChart.fillColor; - const interpolateColor = oldColor !== newColor ? [ - Phaser.Display.Color.IntegerToColor(oldColor), - Phaser.Display.Color.IntegerToColor(newColor) - ] : null; + const interpolateColor = + oldColor !== newColor + ? [Phaser.Display.Color.IntegerToColor(oldColor), Phaser.Display.Color.IntegerToColor(newColor)] + : null; globalScene.tweens.addCounter({ from: 0, @@ -114,16 +148,19 @@ export class StatsContainer extends Phaser.GameObjects.Container { ease: "Cubic.easeOut", onUpdate: (tween: Phaser.Tweens.Tween) => { const progress = tween.getValue(); - const interpolatedData = ivChartData.map((v: number, i: integer) => v * progress + (lastIvChartData[i] * (1 - progress))); + const interpolatedData = ivChartData.map( + (v: number, i: number) => v * progress + lastIvChartData[i] * (1 - progress), + ); if (interpolateColor) { this.ivChart.setFillStyle( Phaser.Display.Color.ValueToColor( - Phaser.Display.Color.Interpolate.ColorWithColor(interpolateColor[0], interpolateColor[1], 1, progress) + Phaser.Display.Color.Interpolate.ColorWithColor(interpolateColor[0], interpolateColor[1], 1, progress), ).color, - 0.75); + 0.75, + ); } this.ivChart.setTo(interpolatedData); - } + }, }); } else { this.statsIvsCache = defaultIvChartData; diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index 3fe6a372737..d42572cfef4 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -7,10 +7,10 @@ import type { PlayerPokemon, PokemonMove } from "#app/field/pokemon"; import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; import { argbFromRgba } from "@material/material-color-utilities"; import { getTypeRgb } from "#app/data/type"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { TextStyle, addBBCodeTextObject, addTextObject, getBBCodeFrag } from "#app/ui/text"; -import type Move from "#app/data/move"; -import { MoveCategory } from "#app/data/move"; +import type Move from "#app/data/moves/move"; +import { MoveCategory } from "#enums/MoveCategory"; import { getPokeballAtlasKey } from "#app/data/pokeball"; import { getGenderColor, getGenderSymbol } from "#app/data/gender"; import { getLevelRelExp, getLevelTotalExp } from "#app/data/exp"; @@ -28,28 +28,29 @@ import { modifierSortFunc } from "#app/modifier/modifier"; import { PlayerGender } from "#enums/player-gender"; import { Stat, PERMANENT_STATS, getStatKey } from "#enums/stat"; import { Nature } from "#enums/nature"; +import { achvs } from "#app/system/achv"; enum Page { PROFILE, STATS, - MOVES + MOVES, } export enum SummaryUiMode { DEFAULT, - LEARN_MOVE + LEARN_MOVE, } /** Holds all objects related to an ability for each iteration */ interface abilityContainer { /** An image displaying the summary label */ - labelImage: Phaser.GameObjects.Image, + labelImage: Phaser.GameObjects.Image; /** The ability object */ - ability: Ability | null, + ability: Ability | null; /** The text object displaying the name of the ability */ - nameText: Phaser.GameObjects.Text | null, + nameText: Phaser.GameObjects.Text | null; /** The text object displaying the description of the ability */ - descriptionText: Phaser.GameObjects.Text | null, + descriptionText: Phaser.GameObjects.Text | null; } export default class SummaryUiHandler extends UiHandler { @@ -96,6 +97,9 @@ export default class SummaryUiHandler extends UiHandler { private friendshipText: Phaser.GameObjects.Text; private friendshipIcon: Phaser.GameObjects.Sprite; private friendshipOverlay: Phaser.GameObjects.Sprite; + private permStatsContainer: Phaser.GameObjects.Container; + private ivContainer: Phaser.GameObjects.Container; + private statsContainer: Phaser.GameObjects.Container; private descriptionScrollTween: Phaser.Tweens.Tween | null; private moveCursorBlinkTimer: Phaser.Time.TimerEvent | null; @@ -110,8 +114,8 @@ export default class SummaryUiHandler extends UiHandler { private moveEffectsVisible: boolean; private moveSelect: boolean; - private moveCursor: integer; - private selectedMoveIndex: integer; + private moveCursor: number; + private selectedMoveIndex: number; private selectCallback: Function | null; constructor() { @@ -129,7 +133,7 @@ export default class SummaryUiHandler extends UiHandler { summaryBg.setOrigin(0, 1); this.summaryContainer.add(summaryBg); - this.tabSprite = globalScene.add.sprite(134, (-summaryBg.displayHeight) + 16, "summary_tabs_1"); + this.tabSprite = globalScene.add.sprite(134, -summaryBg.displayHeight + 16, "summary_tabs_1"); this.tabSprite.setOrigin(1, 1); this.summaryContainer.add(this.tabSprite); @@ -146,7 +150,12 @@ export default class SummaryUiHandler extends UiHandler { this.numberText.setOrigin(0, 1); this.summaryContainer.add(this.numberText); - this.pokemonSprite = globalScene.initPokemonSprite(globalScene.add.sprite(56, -106, "pkmn__sub"), undefined, false, true); + this.pokemonSprite = globalScene.initPokemonSprite( + globalScene.add.sprite(56, -106, "pkmn__sub"), + undefined, + false, + true, + ); this.summaryContainer.add(this.pokemonSprite); this.nameText = addTextObject(6, -54, "", TextStyle.SUMMARY); @@ -187,12 +196,14 @@ export default class SummaryUiHandler extends UiHandler { this.candyShadow = globalScene.add.sprite(13, -140, "candy"); this.candyShadow.setTint(0x000000); - this.candyShadow.setAlpha(0.50); + this.candyShadow.setAlpha(0.5); this.candyShadow.setScale(0.8); this.candyShadow.setInteractive(new Phaser.Geom.Rectangle(0, 0, 30, 16), Phaser.Geom.Rectangle.Contains); this.summaryContainer.add(this.candyShadow); - this.candyCountText = addTextObject(20, -146, "x0", TextStyle.WINDOW_ALT, { fontSize: "76px" }); + this.candyCountText = addTextObject(20, -146, "x0", TextStyle.WINDOW_ALT, { + fontSize: "76px", + }); this.candyCountText.setOrigin(0, 0); this.summaryContainer.add(this.candyCountText); @@ -206,12 +217,14 @@ export default class SummaryUiHandler extends UiHandler { this.friendshipShadow = globalScene.add.sprite(13, -60, "friendship"); this.friendshipShadow.setTint(0x000000); - this.friendshipShadow.setAlpha(0.50); + this.friendshipShadow.setAlpha(0.5); this.friendshipShadow.setScale(0.8); this.friendshipShadow.setInteractive(new Phaser.Geom.Rectangle(0, 0, 50, 16), Phaser.Geom.Rectangle.Contains); this.summaryContainer.add(this.friendshipShadow); - this.friendshipText = addTextObject(20, -66, "x0", TextStyle.WINDOW_ALT, { fontSize: "76px" }); + this.friendshipText = addTextObject(20, -66, "x0", TextStyle.WINDOW_ALT, { + fontSize: "76px", + }); this.friendshipText.setOrigin(0, 0); this.summaryContainer.add(this.friendshipText); @@ -222,7 +235,7 @@ export default class SummaryUiHandler extends UiHandler { this.summaryContainer.add(this.championRibbon); this.championRibbon.setVisible(false); - this.levelText = addTextObject(36, -17, "", TextStyle.SUMMARY_ALT); + this.levelText = addTextObject(24, -17, "", TextStyle.SUMMARY_ALT); this.levelText.setOrigin(0, 1); this.summaryContainer.add(this.levelText); @@ -289,7 +302,7 @@ export default class SummaryUiHandler extends UiHandler { this.summaryPageTransitionContainer.setVisible(false); } - getPageKey(page?: integer) { + getPageKey(page?: number) { if (page === undefined) { page = this.cursor; } @@ -300,14 +313,14 @@ export default class SummaryUiHandler extends UiHandler { super.show(args); /* args[] information - * args[0] : the Pokemon displayed in the Summary-UI - * args[1] : the summaryUiMode (defaults to 0) - * args[2] : the start page (defaults to Page.PROFILE) - * args[3] : contains the function executed when the user exits out of Summary UI - * args[4] : optional boolean used to determine if the Pokemon is part of the player's party or not (defaults to true, necessary for PR #2921 to display all relevant information) - */ + * args[0] : the Pokemon displayed in the Summary-UI + * args[1] : the summaryUiMode (defaults to 0) + * args[2] : the start page (defaults to Page.PROFILE) + * args[3] : contains the function executed when the user exits out of Summary UI + * args[4] : optional boolean used to determine if the Pokemon is part of the player's party or not (defaults to true, necessary for PR #2921 to display all relevant information) + */ this.pokemon = args[0] as PlayerPokemon; - this.summaryUiMode = args.length > 1 ? args[1] as SummaryUiMode : SummaryUiMode.DEFAULT; + this.summaryUiMode = args.length > 1 ? (args[1] as SummaryUiMode) : SummaryUiMode.DEFAULT; this.playerParty = args[4] ?? true; globalScene.ui.bringToTop(this.summaryContainer); @@ -320,10 +333,11 @@ export default class SummaryUiHandler extends UiHandler { this.candyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0]))); this.candyOverlay.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1]))); - this.numberText.setText(Utils.padInt(this.pokemon.species.speciesId, 4)); this.numberText.setColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD)); - this.numberText.setShadowColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true)); + this.numberText.setShadowColor( + this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true), + ); const spriteKey = this.pokemon.getSpriteKey(true); try { this.pokemonSprite.play(spriteKey); @@ -331,11 +345,12 @@ export default class SummaryUiHandler extends UiHandler { console.error(`Failed to play animation for ${spriteKey}`, err); } this.pokemonSprite.setPipelineData("teraColor", getTypeRgb(this.pokemon.getTeraType())); + this.pokemonSprite.setPipelineData("isTerastallized", this.pokemon.isTerastallized); this.pokemonSprite.setPipelineData("ignoreTimeTint", true); this.pokemonSprite.setPipelineData("spriteKey", this.pokemon.getSpriteKey()); this.pokemonSprite.setPipelineData("shiny", this.pokemon.shiny); this.pokemonSprite.setPipelineData("variant", this.pokemon.variant); - [ "spriteColors", "fusionSpriteColors" ].map(k => { + ["spriteColors", "fusionSpriteColors"].map(k => { delete this.pokemonSprite.pipelineData[`${k}Base`]; if (this.pokemon?.summonData?.speciesForm) { k += "Base"; @@ -351,11 +366,20 @@ export default class SummaryUiHandler extends UiHandler { this.splicedIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + 2, 3); this.splicedIcon.setVisible(isFusion); if (this.splicedIcon.visible) { - this.splicedIcon.on("pointerover", () => globalScene.ui.showTooltip("", `${this.pokemon?.species.getName(this.pokemon.formIndex)}/${this.pokemon?.fusionSpecies?.getName(this.pokemon?.fusionFormIndex)}`, true)); + this.splicedIcon.on("pointerover", () => + globalScene.ui.showTooltip( + "", + `${this.pokemon?.species.getName(this.pokemon.formIndex)}/${this.pokemon?.fusionSpecies?.getName(this.pokemon?.fusionFormIndex)}`, + true, + ), + ); this.splicedIcon.on("pointerout", () => globalScene.ui.hideTooltip()); } - if (globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId()].classicWinCount > 0 && globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId(true)].classicWinCount > 0) { + if ( + globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId()].classicWinCount > 0 && + globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId(true)].classicWinCount > 0 + ) { this.championRibbon.setVisible(true); } else { this.championRibbon.setVisible(false); @@ -367,38 +391,55 @@ export default class SummaryUiHandler extends UiHandler { } const friendshipCap = getStarterValueFriendshipCap(speciesStarterCosts[this.pokemon.species.getRootSpeciesId()]); - const candyCropY = 16 - (16 * (currentFriendship / friendshipCap)); + const candyCropY = 16 - 16 * (currentFriendship / friendshipCap); if (this.candyShadow.visible) { - this.candyShadow.on("pointerover", () => globalScene.ui.showTooltip("", `${currentFriendship}/${friendshipCap}`, true)); + this.candyShadow.on("pointerover", () => + globalScene.ui.showTooltip("", `${currentFriendship}/${friendshipCap}`, true), + ); this.candyShadow.on("pointerout", () => globalScene.ui.hideTooltip()); } - this.candyCountText.setText(`x${globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId()].candyCount}`); + this.candyCountText.setText( + `x${globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId()].candyCount}`, + ); this.candyShadow.setCrop(0, 0, 16, candyCropY); if (this.friendshipShadow.visible) { - this.friendshipShadow.on("pointerover", () => globalScene.ui.showTooltip("", `${i18next.t("pokemonSummary:friendship")}`, true)); + this.friendshipShadow.on("pointerover", () => + globalScene.ui.showTooltip("", `${i18next.t("pokemonSummary:friendship")}`, true), + ); this.friendshipShadow.on("pointerout", () => globalScene.ui.hideTooltip()); } this.friendshipText.setText(`${this.pokemon?.friendship || "0"} / 255`); - this.friendshipShadow.setCrop(0, 0, 16, 16 - (16 * ((this.pokemon?.friendship || 0) / 255))); + this.friendshipShadow.setCrop(0, 0, 16, 16 - 16 * ((this.pokemon?.friendship || 0) / 255)); const doubleShiny = isFusion && this.pokemon.shiny && this.pokemon.fusionShiny; const baseVariant = !doubleShiny ? this.pokemon.getVariant() : this.pokemon.variant; - this.shinyIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0) + 1, 3); + this.shinyIcon.setPositionRelative( + this.nameText, + this.nameText.displayWidth + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0) + 1, + 3, + ); this.shinyIcon.setTexture(`shiny_star${doubleShiny ? "_1" : ""}`); this.shinyIcon.setVisible(this.pokemon.isShiny()); this.shinyIcon.setTint(getVariantTint(baseVariant)); if (this.shinyIcon.visible) { - const shinyDescriptor = doubleShiny || baseVariant ? - `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${this.pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : this.pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}` - : ""; - this.shinyIcon.on("pointerover", () => globalScene.ui.showTooltip("", `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, true)); + const shinyDescriptor = + doubleShiny || baseVariant + ? `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${this.pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : this.pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}` + : ""; + this.shinyIcon.on("pointerover", () => + globalScene.ui.showTooltip( + "", + `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, + true, + ), + ); this.shinyIcon.on("pointerout", () => globalScene.ui.hideTooltip()); } @@ -409,20 +450,21 @@ export default class SummaryUiHandler extends UiHandler { } this.pokeball.setFrame(getPokeballAtlasKey(this.pokemon.pokeball)); - this.levelText.setText(this.pokemon.level.toString()); + this.levelText.setText(`${i18next.t("pokemonSummary:lv")}${this.pokemon.level.toString()}`); this.genderText.setText(getGenderSymbol(this.pokemon.getGender(true))); this.genderText.setColor(getGenderColor(this.pokemon.getGender(true))); this.genderText.setShadowColor(getGenderColor(this.pokemon.getGender(true), true)); switch (this.summaryUiMode) { - case SummaryUiMode.DEFAULT: - const page = args.length < 2 ? Page.PROFILE : args[2] as Page; + case SummaryUiMode.DEFAULT: { + const page = args.length < 2 ? Page.PROFILE : (args[2] as Page); this.hideMoveEffect(true); this.setCursor(page); if (args.length > 3) { this.selectCallback = args[3]; } break; + } case SummaryUiMode.LEARN_MOVE: this.newMove = args[2] as Move; this.moveSelectFunction = args[3] as Function; @@ -459,7 +501,7 @@ export default class SummaryUiHandler extends UiHandler { if (button === Button.ACTION) { if (this.pokemon && this.moveCursor < this.pokemon.moveset.length) { if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) { - this.moveSelectFunction && this.moveSelectFunction(this.moveCursor); + this.moveSelectFunction?.(this.moveCursor); } else { if (this.selectedMoveIndex === -1) { this.selectedMoveIndex = this.moveCursor; @@ -470,7 +512,9 @@ export default class SummaryUiHandler extends UiHandler { this.pokemon.moveset[this.selectedMoveIndex] = this.pokemon.moveset[this.moveCursor]; this.pokemon.moveset[this.moveCursor] = tempMove; - const selectedMoveRow = this.moveRowsContainer.getAt(this.selectedMoveIndex) as Phaser.GameObjects.Container; + const selectedMoveRow = this.moveRowsContainer.getAt( + this.selectedMoveIndex, + ) as Phaser.GameObjects.Container; const switchMoveRow = this.moveRowsContainer.getAt(this.moveCursor) as Phaser.GameObjects.Container; this.moveRowsContainer.moveTo(selectedMoveRow, this.moveCursor); @@ -512,11 +556,10 @@ export default class SummaryUiHandler extends UiHandler { this.destroyBlinkCursor(); success = true; break; - } else { - this.hideMoveSelect(); - success = true; - break; } + this.hideMoveSelect(); + success = true; + break; } } } else { @@ -534,6 +577,10 @@ export default class SummaryUiHandler extends UiHandler { this.passiveContainer.nameText?.setVisible(!this.passiveContainer.descriptionText?.visible); this.passiveContainer.descriptionText?.setVisible(!this.passiveContainer.descriptionText.visible); this.passiveContainer.labelImage.setVisible(!this.passiveContainer.labelImage.visible); + } else if (this.cursor === Page.STATS) { + //Show IVs + this.permStatsContainer.setVisible(!this.permStatsContainer.visible); + this.ivContainer.setVisible(!this.ivContainer.visible); } } else if (button === Button.CANCEL) { if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) { @@ -556,10 +603,11 @@ export default class SummaryUiHandler extends UiHandler { const pages = Utils.getEnumValues(Page); switch (button) { case Button.UP: - case Button.DOWN: + case Button.DOWN: { if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) { break; - } else if (!fromPartyMode) { + } + if (!fromPartyMode) { break; } const isDown = button === Button.DOWN; @@ -568,9 +616,10 @@ export default class SummaryUiHandler extends UiHandler { if ((isDown && partyMemberIndex < party.length - 1) || (!isDown && partyMemberIndex)) { const page = this.cursor; this.clear(); - this.show([ party[partyMemberIndex + (isDown ? 1 : -1)], this.summaryUiMode, page ]); + this.show([party[partyMemberIndex + (isDown ? 1 : -1)], this.summaryUiMode, page]); } break; + } case Button.LEFT: if (this.cursor) { success = this.setCursor(this.cursor - 1); @@ -597,7 +646,7 @@ export default class SummaryUiHandler extends UiHandler { return success || error; } - setCursor(cursor: integer, overrideChanged: boolean = false): boolean { + setCursor(cursor: number, overrideChanged = false): boolean { let changed: boolean = overrideChanged || this.moveCursor !== cursor; if (this.moveSelect) { @@ -630,7 +679,7 @@ export default class SummaryUiHandler extends UiHandler { loop: -1, hold: Utils.fixedInt(2000), duration: Utils.fixedInt((moveDescriptionLineCount - 3) * 2000), - y: `-=${14.83 * (moveDescriptionLineCount - 3)}` + y: `-=${14.83 * (moveDescriptionLineCount - 3)}`, }); } @@ -657,7 +706,7 @@ export default class SummaryUiHandler extends UiHandler { } this.moveCursorObj.setVisible(true); }); - } + }, }); if (this.selectedMoveIndex > -1) { if (!this.selectedMoveCursorObj) { @@ -704,7 +753,7 @@ export default class SummaryUiHandler extends UiHandler { } this.summaryPageTransitionContainer.setVisible(false); this.transitioning = false; - } + }, }); this.summaryPageTransitionContainer.setVisible(true); } else { @@ -730,7 +779,7 @@ export default class SummaryUiHandler extends UiHandler { }); pageContainer.removeBetween(1, undefined, true); } - const pageBg = (pageContainer.getAt(0) as Phaser.GameObjects.Sprite); + const pageBg = pageContainer.getAt(0) as Phaser.GameObjects.Sprite; pageBg.setTexture(this.getPageKey(page)); if (this.descriptionScrollTween) { @@ -739,16 +788,26 @@ export default class SummaryUiHandler extends UiHandler { } switch (page) { - case Page.PROFILE: + case Page.PROFILE: { const profileContainer = globalScene.add.container(0, -pageBg.height); pageContainer.add(profileContainer); // TODO: should add field for original trainer name to Pokemon object, to support gift/traded Pokemon from MEs - const trainerText = addBBCodeTextObject(7, 12, `${i18next.t("pokemonSummary:ot")}/${getBBCodeFrag(loggedInUser?.username || i18next.t("pokemonSummary:unknown"), globalScene.gameData.gender === PlayerGender.FEMALE ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY_BLUE)}`, TextStyle.SUMMARY_ALT); + const trainerText = addBBCodeTextObject( + 7, + 12, + `${i18next.t("pokemonSummary:ot")}/${getBBCodeFrag(loggedInUser?.username || i18next.t("pokemonSummary:unknown"), globalScene.gameData.gender === PlayerGender.FEMALE ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY_BLUE)}`, + TextStyle.SUMMARY_ALT, + ); trainerText.setOrigin(0, 0); profileContainer.add(trainerText); - const trainerIdText = addTextObject(174, 12, globalScene.gameData.trainerId.toString(), TextStyle.SUMMARY_ALT); + const trainerIdText = addTextObject( + 141, + 12, + `${i18next.t("pokemonSummary:idNo")}${globalScene.gameData.trainerId.toString()}`, + TextStyle.SUMMARY_ALT, + ); trainerIdText.setOrigin(0, 0); profileContainer.add(trainerIdText); @@ -756,10 +815,10 @@ export default class SummaryUiHandler extends UiHandler { typeLabel.setOrigin(0, 0); profileContainer.add(typeLabel); - const getTypeIcon = (index: integer, type: Type, tera: boolean = false) => { + const getTypeIcon = (index: number, type: PokemonType, tera = false) => { const xCoord = typeLabel.width * typeLabel.scale + 9 + 34 * index; const typeIcon = !tera - ? globalScene.add.sprite(xCoord, 42, Utils.getLocalizedSpriteKey("types"), Type[type].toLowerCase()) + ? globalScene.add.sprite(xCoord, 42, Utils.getLocalizedSpriteKey("types"), PokemonType[type].toLowerCase()) : globalScene.add.sprite(xCoord, 42, "type_tera"); if (tera) { typeIcon.setScale(0.5); @@ -775,39 +834,57 @@ export default class SummaryUiHandler extends UiHandler { if (types.length > 1) { profileContainer.add(getTypeIcon(1, types[1])); } - if (this.pokemon?.isTerastallized()) { - profileContainer.add(getTypeIcon(types.length, this.pokemon.getTeraType(), true)); - } if (this.pokemon?.getLuck()) { const luckLabelText = addTextObject(141, 28, i18next.t("common:luckIndicator"), TextStyle.SUMMARY_ALT); luckLabelText.setOrigin(0, 0); profileContainer.add(luckLabelText); - const luckText = addTextObject(141 + luckLabelText.displayWidth + 2, 28, this.pokemon.getLuck().toString(), TextStyle.SUMMARY); + const luckText = addTextObject( + 141 + luckLabelText.displayWidth + 2, + 28, + this.pokemon.getLuck().toString(), + TextStyle.SUMMARY, + ); luckText.setOrigin(0, 0); - luckText.setTint(getVariantTint((Math.min(this.pokemon.getLuck() - 1, 2)) as Variant)); + luckText.setTint(getVariantTint(Math.min(this.pokemon.getLuck() - 1, 2) as Variant)); profileContainer.add(luckText); } + if ( + globalScene.gameData.achvUnlocks.hasOwnProperty(achvs.TERASTALLIZE.id) && + !Utils.isNullOrUndefined(this.pokemon) + ) { + const teraIcon = globalScene.add.sprite(123, 26, "button_tera"); + teraIcon.setName("terrastallize-icon"); + teraIcon.setFrame(PokemonType[this.pokemon.getTeraType()].toLowerCase()); + profileContainer.add(teraIcon); + } + this.abilityContainer = { labelImage: globalScene.add.image(0, 0, "summary_profile_ability"), ability: this.pokemon?.getAbility(true)!, // TODO: is this bang correct? nameText: null, - descriptionText: null }; + descriptionText: null, + }; - const allAbilityInfo = [ this.abilityContainer ]; // Creates an array to iterate through + const allAbilityInfo = [this.abilityContainer]; // Creates an array to iterate through // Only add to the array and set up displaying a passive if it's unlocked if (this.pokemon?.hasPassive()) { this.passiveContainer = { labelImage: globalScene.add.image(0, 0, "summary_profile_passive"), ability: this.pokemon.getPassiveAbility(), nameText: null, - descriptionText: null }; + descriptionText: null, + }; allAbilityInfo.push(this.passiveContainer); // Sets up the pixel button prompt image - this.abilityPrompt = globalScene.add.image(0, 0, !globalScene.inputController?.gamepadSupport ? "summary_profile_prompt_z" : "summary_profile_prompt_a"); + this.abilityPrompt = globalScene.add.image( + 0, + 0, + !globalScene.inputController?.gamepadSupport ? "summary_profile_prompt_z" : "summary_profile_prompt_a", + ); this.abilityPrompt.setPosition(8, 43); this.abilityPrompt.setVisible(true); this.abilityPrompt.setOrigin(0, 0); @@ -824,14 +901,16 @@ export default class SummaryUiHandler extends UiHandler { abilityInfo.nameText.setOrigin(0, 1); profileContainer.add(abilityInfo.nameText); - abilityInfo.descriptionText = addTextObject(7, 69, abilityInfo.ability?.description!, TextStyle.WINDOW_ALT, { wordWrap: { width: 1224 }}); // TODO: is this bang correct? + abilityInfo.descriptionText = addTextObject(7, 69, abilityInfo.ability?.description!, TextStyle.WINDOW_ALT, { + wordWrap: { width: 1224 }, + }); // TODO: is this bang correct? abilityInfo.descriptionText.setOrigin(0, 0); profileContainer.add(abilityInfo.descriptionText); // Sets up the mask that hides the description text to give an illusion of scrolling const descriptionTextMaskRect = globalScene.make.graphics({}); descriptionTextMaskRect.setScale(6); - descriptionTextMaskRect.fillStyle(0xFFFFFF); + descriptionTextMaskRect.fillStyle(0xffffff); descriptionTextMaskRect.beginPath(); descriptionTextMaskRect.fillRect(110, 90.5, 206, 31); @@ -850,7 +929,7 @@ export default class SummaryUiHandler extends UiHandler { loop: -1, hold: Utils.fixedInt(2000), duration: Utils.fixedInt((abilityDescriptionLineCount - 2) * 2000), - y: `-=${14.83 * (abilityDescriptionLineCount - 2)}` + y: `-=${14.83 * (abilityDescriptionLineCount - 2)}`, }); } }); @@ -864,21 +943,30 @@ export default class SummaryUiHandler extends UiHandler { const nature = `${getBBCodeFrag(Utils.toReadableString(getNatureName(this.pokemon?.getNature()!)), TextStyle.SUMMARY_RED)}${closeFragment}`; // TODO: is this bang correct? const memoString = i18next.t("pokemonSummary:memoString", { - metFragment: i18next.t(`pokemonSummary:metFragment.${this.pokemon?.metBiome === -1 ? "apparently" : "normal"}`, { - biome: `${getBBCodeFrag(getBiomeName(this.pokemon?.metBiome!), TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct? - level: `${getBBCodeFrag(this.pokemon?.metLevel.toString()!, TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct? - wave: `${getBBCodeFrag((this.pokemon?.metWave ? this.pokemon.metWave.toString()! : i18next.t("pokemonSummary:unknownTrainer")), TextStyle.SUMMARY_RED)}${closeFragment}`, - }), - natureFragment: i18next.t(`pokemonSummary:natureFragment.${rawNature}`, { nature: nature }) + metFragment: i18next.t( + `pokemonSummary:metFragment.${this.pokemon?.metBiome === -1 ? "apparently" : "normal"}`, + { + biome: `${getBBCodeFrag(getBiomeName(this.pokemon?.metBiome!), TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct? + level: `${getBBCodeFrag(this.pokemon?.metLevel.toString()!, TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct? + wave: `${getBBCodeFrag(this.pokemon?.metWave ? this.pokemon.metWave.toString()! : i18next.t("pokemonSummary:unknownTrainer"), TextStyle.SUMMARY_RED)}${closeFragment}`, + }, + ), + natureFragment: i18next.t(`pokemonSummary:natureFragment.${rawNature}`, { nature: nature }), }); const memoText = addBBCodeTextObject(7, 113, String(memoString), TextStyle.WINDOW_ALT); memoText.setOrigin(0, 0); profileContainer.add(memoText); break; - case Page.STATS: - const statsContainer = globalScene.add.container(0, -pageBg.height); - pageContainer.add(statsContainer); + } + case Page.STATS: { + this.statsContainer = globalScene.add.container(0, -pageBg.height); + pageContainer.add(this.statsContainer); + this.permStatsContainer = globalScene.add.container(27, 56); + this.statsContainer.add(this.permStatsContainer); + this.ivContainer = globalScene.add.container(27, 56); + this.statsContainer.add(this.ivContainer); + this.statsContainer.setVisible(true); PERMANENT_STATS.forEach((stat, s) => { const statName = i18next.t(getStatKey(stat)); @@ -887,28 +975,55 @@ export default class SummaryUiHandler extends UiHandler { const natureStatMultiplier = getNatureStatMultiplier(this.pokemon?.getNature()!, s); // TODO: is this bang correct? - const statLabel = addTextObject(27 + 115 * colIndex + (colIndex === 1 ? 5 : 0), 56 + 16 * rowIndex, statName, natureStatMultiplier === 1 ? TextStyle.SUMMARY : natureStatMultiplier > 1 ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY_BLUE); + const statLabel = addTextObject( + 115 * colIndex + (colIndex === 1 ? 5 : 0), + 16 * rowIndex, + statName, + natureStatMultiplier === 1 + ? TextStyle.SUMMARY + : natureStatMultiplier > 1 + ? TextStyle.SUMMARY_PINK + : TextStyle.SUMMARY_BLUE, + ); + const ivLabel = addTextObject( + 115 * colIndex + (colIndex === 1 ? 5 : 0), + 16 * rowIndex, + statName, + this.pokemon?.ivs[stat] === 31 ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, + ); + statLabel.setOrigin(0.5, 0); - statsContainer.add(statLabel); + ivLabel.setOrigin(0.5, 0); + this.permStatsContainer.add(statLabel); + this.ivContainer.add(ivLabel); - const statValueText = stat !== Stat.HP - ? Utils.formatStat(this.pokemon?.getStat(stat)!) // TODO: is this bang correct? - : `${Utils.formatStat(this.pokemon?.hp!, true)}/${Utils.formatStat(this.pokemon?.getMaxHp()!, true)}`; // TODO: are those bangs correct? + const statValueText = + stat !== Stat.HP + ? Utils.formatStat(this.pokemon?.getStat(stat)!) // TODO: is this bang correct? + : `${Utils.formatStat(this.pokemon?.hp!, true)}/${Utils.formatStat(this.pokemon?.getMaxHp()!, true)}`; // TODO: are those bangs correct? + const ivText = `${this.pokemon?.ivs[stat]}/31`; - const statValue = addTextObject(120 + 88 * colIndex, 56 + 16 * rowIndex, statValueText, TextStyle.WINDOW_ALT); + const statValue = addTextObject(93 + 88 * colIndex, 16 * rowIndex, statValueText, TextStyle.WINDOW_ALT); statValue.setOrigin(1, 0); - statsContainer.add(statValue); + this.permStatsContainer.add(statValue); + const ivValue = addTextObject(93 + 88 * colIndex, 16 * rowIndex, ivText, TextStyle.WINDOW_ALT); + ivValue.setOrigin(1, 0); + this.ivContainer.add(ivValue); }); + this.ivContainer.setVisible(false); - const itemModifiers = (globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.pokemonId === this.pokemon?.id, this.playerParty) as PokemonHeldItemModifier[]) - .sort(modifierSortFunc); + const itemModifiers = ( + globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.pokemon?.id, + this.playerParty, + ) as PokemonHeldItemModifier[] + ).sort(modifierSortFunc); itemModifiers.forEach((item, i) => { const icon = item.getIcon(true); icon.setPosition((i % 17) * 12 + 3, 14 * Math.floor(i / 17) + 15); - statsContainer.add(icon); + this.statsContainer.add(icon); icon.setInteractive(new Phaser.Geom.Rectangle(0, 0, 32, 32), Phaser.Geom.Rectangle.Contains); icon.on("pointerover", () => globalScene.ui.showTooltip(item.type.name, item.type.getDescription(), true)); @@ -924,38 +1039,47 @@ export default class SummaryUiHandler extends UiHandler { const expLabel = addTextObject(6, 112, i18next.t("pokemonSummary:expPoints"), TextStyle.SUMMARY); expLabel.setOrigin(0, 0); - statsContainer.add(expLabel); + this.statsContainer.add(expLabel); const nextLvExpLabel = addTextObject(6, 128, i18next.t("pokemonSummary:nextLv"), TextStyle.SUMMARY); nextLvExpLabel.setOrigin(0, 0); - statsContainer.add(nextLvExpLabel); + this.statsContainer.add(nextLvExpLabel); const expText = addTextObject(208, 112, pkmExp.toString(), TextStyle.WINDOW_ALT); expText.setOrigin(1, 0); - statsContainer.add(expText); + this.statsContainer.add(expText); - const nextLvExp = pkmLvl < globalScene.getMaxExpLevel() - ? getLevelTotalExp(pkmLvl + 1, pkmSpeciesGrowthRate) - pkmExp - : 0; + const nextLvExp = + pkmLvl < globalScene.getMaxExpLevel() ? getLevelTotalExp(pkmLvl + 1, pkmSpeciesGrowthRate) - pkmExp : 0; const nextLvExpText = addTextObject(208, 128, nextLvExp.toString(), TextStyle.WINDOW_ALT); nextLvExpText.setOrigin(1, 0); - statsContainer.add(nextLvExpText); + this.statsContainer.add(nextLvExpText); const expOverlay = globalScene.add.image(140, 145, "summary_stats_overlay_exp"); expOverlay.setOrigin(0, 0); - statsContainer.add(expOverlay); + this.statsContainer.add(expOverlay); const expMaskRect = globalScene.make.graphics({}); expMaskRect.setScale(6); - expMaskRect.fillStyle(0xFFFFFF); + expMaskRect.fillStyle(0xffffff); expMaskRect.beginPath(); expMaskRect.fillRect(140 + pageContainer.x, 145 + pageContainer.y + 21, Math.floor(expRatio * 64), 3); const expMask = expMaskRect.createGeometryMask(); expOverlay.setMask(expMask); + this.abilityPrompt = globalScene.add.image( + 0, + 0, + !globalScene.inputController?.gamepadSupport ? "summary_profile_prompt_z" : "summary_profile_prompt_a", + ); + this.abilityPrompt.setPosition(8, 47); + this.abilityPrompt.setVisible(true); + this.abilityPrompt.setOrigin(0, 0); + this.statsContainer.add(this.abilityPrompt); break; - case Page.MOVES: + } + case Page.MOVES: { this.movesContainer = globalScene.add.container(5, -pageBg.height + 26); pageContainer.add(this.movesContainer); @@ -967,8 +1091,14 @@ export default class SummaryUiHandler extends UiHandler { extraRowOverlay.setOrigin(0, 1); this.extraMoveRowContainer.add(extraRowOverlay); - const extraRowText = addTextObject(35, 0, this.summaryUiMode === SummaryUiMode.LEARN_MOVE && this.newMove ? this.newMove.name : i18next.t("pokemonSummary:cancel"), - this.summaryUiMode === SummaryUiMode.LEARN_MOVE ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY); + const extraRowText = addTextObject( + 35, + 0, + this.summaryUiMode === SummaryUiMode.LEARN_MOVE && this.newMove + ? this.newMove.name + : i18next.t("pokemonSummary:cancel"), + this.summaryUiMode === SummaryUiMode.LEARN_MOVE ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY, + ); extraRowText.setOrigin(0, 1); this.extraMoveRowContainer.add(extraRowText); @@ -978,7 +1108,7 @@ export default class SummaryUiHandler extends UiHandler { if (this.newMove && this.pokemon) { const spriteKey = Utils.getLocalizedSpriteKey("types"); const moveType = this.pokemon.getMoveType(this.newMove); - const newMoveTypeIcon = globalScene.add.sprite(0, 0, spriteKey, Type[moveType].toLowerCase()); + const newMoveTypeIcon = globalScene.add.sprite(0, 0, spriteKey, PokemonType[moveType].toLowerCase()); newMoveTypeIcon.setOrigin(0, 1); this.extraMoveRowContainer.add(newMoveTypeIcon); } @@ -996,14 +1126,15 @@ export default class SummaryUiHandler extends UiHandler { this.movesContainer.add(this.moveRowsContainer); for (let m = 0; m < 4; m++) { - const move: PokemonMove | null = this.pokemon && this.pokemon.moveset.length > m ? this.pokemon?.moveset[m] : null; + const move: PokemonMove | null = + this.pokemon && this.pokemon.moveset.length > m ? this.pokemon?.moveset[m] : null; const moveRowContainer = globalScene.add.container(0, 16 * m); this.moveRowsContainer.add(moveRowContainer); if (move && this.pokemon) { const spriteKey = Utils.getLocalizedSpriteKey("types"); const moveType = this.pokemon.getMoveType(move.getMove()); - const typeIcon = globalScene.add.sprite(0, 0, spriteKey, Type[moveType].toLowerCase()); + const typeIcon = globalScene.add.sprite(0, 0, spriteKey, PokemonType[moveType].toLowerCase()); typeIcon.setOrigin(0, 1); moveRowContainer.add(typeIcon); } @@ -1028,12 +1159,12 @@ export default class SummaryUiHandler extends UiHandler { moveRowContainer.add(ppText); } - this.moveDescriptionText = addTextObject(2, 84, "", TextStyle.WINDOW_ALT, { wordWrap: { width: 1212 }}); + this.moveDescriptionText = addTextObject(2, 84, "", TextStyle.WINDOW_ALT, { wordWrap: { width: 1212 } }); this.movesContainer.add(this.moveDescriptionText); const moveDescriptionTextMaskRect = globalScene.make.graphics({}); moveDescriptionTextMaskRect.setScale(6); - moveDescriptionTextMaskRect.fillStyle(0xFFFFFF); + moveDescriptionTextMaskRect.fillStyle(0xffffff); moveDescriptionTextMaskRect.beginPath(); moveDescriptionTextMaskRect.fillRect(112, 130, 202, 46); @@ -1041,6 +1172,7 @@ export default class SummaryUiHandler extends UiHandler { this.moveDescriptionText.setMask(moveDescriptionTextMask); break; + } } } @@ -1053,7 +1185,7 @@ export default class SummaryUiHandler extends UiHandler { targets: this.statusContainer, x: 0, duration: instant ? 0 : 250, - ease: "Sine.easeOut" + ease: "Sine.easeOut", }); } @@ -1066,7 +1198,7 @@ export default class SummaryUiHandler extends UiHandler { targets: this.statusContainer, x: -106, duration: instant ? 0 : 250, - ease: "Sine.easeIn" + ease: "Sine.easeIn", }); } @@ -1077,7 +1209,8 @@ export default class SummaryUiHandler extends UiHandler { if (this.moveCursor < 4 && this.pokemon && this.moveCursor < this.pokemon.moveset.length) { return this.pokemon.moveset[this.moveCursor]!.getMove(); // TODO: is this bang correct? - } else if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE && this.moveCursor === 4) { + } + if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE && this.moveCursor === 4) { return this.newMove; } return null; @@ -1093,7 +1226,7 @@ export default class SummaryUiHandler extends UiHandler { hideMoveSelect() { if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) { - this.moveSelectFunction && this.moveSelectFunction(4); + this.moveSelectFunction?.(4); return; } @@ -1129,7 +1262,7 @@ export default class SummaryUiHandler extends UiHandler { targets: this.moveEffectContainer, x: 6, duration: instant ? 0 : 250, - ease: "Sine.easeOut" + ease: "Sine.easeOut", }); } @@ -1142,7 +1275,7 @@ export default class SummaryUiHandler extends UiHandler { targets: this.moveEffectContainer, x: 106, duration: instant ? 0 : 250, - ease: "Sine.easeIn" + ease: "Sine.easeIn", }); } diff --git a/src/ui/target-select-ui-handler.ts b/src/ui/target-select-ui-handler.ts index 232ec887b0a..d2f72ef4a4c 100644 --- a/src/ui/target-select-ui-handler.ts +++ b/src/ui/target-select-ui-handler.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "../battle"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import * as Utils from "../utils"; -import { getMoveTargets } from "../data/move"; +import { getMoveTargets } from "../data/moves/move"; import { Button } from "#enums/buttons"; import type { Moves } from "#enums/moves"; import type Pokemon from "#app/field/pokemon"; @@ -19,7 +19,7 @@ export default class TargetSelectUiHandler extends UiHandler { private cursor0: number; // associated with BattlerIndex.PLAYER private cursor1: number; // associated with BattlerIndex.PLAYER_2 - private isMultipleTargets: boolean = false; + private isMultipleTargets = false; private targets: BattlerIndex[]; private targetsHighlighted: Pokemon[]; private targetFlashTween: Phaser.Tweens.Tween | null; @@ -32,7 +32,7 @@ export default class TargetSelectUiHandler extends UiHandler { this.cursor = -1; } - setup(): void { } + setup(): void {} show(args: any[]): boolean { if (args.length < 3) { @@ -41,7 +41,7 @@ export default class TargetSelectUiHandler extends UiHandler { super.show(args); - this.fieldIndex = args[0] as integer; + this.fieldIndex = args[0] as number; this.move = args[1] as Moves; this.targetSelectCallback = args[2] as TargetSelectCallback; const user = globalScene.getPlayerField()[this.fieldIndex]; @@ -71,7 +71,7 @@ export default class TargetSelectUiHandler extends UiHandler { */ resetCursor(cursorN: number, user: Pokemon): void { if (!Utils.isNullOrUndefined(cursorN)) { - if ([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ].includes(cursorN) || user.battleSummonData.waveTurnCount === 1) { + if ([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2].includes(cursorN) || user.battleSummonData.waveTurnCount === 1) { // Reset cursor on the first turn of a fight or if an ally was targeted last turn cursorN = -1; } @@ -85,7 +85,7 @@ export default class TargetSelectUiHandler extends UiHandler { let success = false; if (button === Button.ACTION || button === Button.CANCEL) { - const targetIndexes: BattlerIndex[] = this.isMultipleTargets ? this.targets : [ this.cursor ]; + const targetIndexes: BattlerIndex[] = this.isMultipleTargets ? this.targets : [this.cursor]; this.targetSelectCallback(button === Button.ACTION ? targetIndexes : []); success = true; if (this.fieldIndex === BattlerIndex.PLAYER) { @@ -131,18 +131,18 @@ export default class TargetSelectUiHandler extends UiHandler { return success; } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const singleTarget = globalScene.getField()[cursor]; const multipleTargets = this.targets.map(index => globalScene.getField()[index]); - this.targetsHighlighted = this.isMultipleTargets ? multipleTargets : [ singleTarget ]; + this.targetsHighlighted = this.isMultipleTargets ? multipleTargets : [singleTarget]; const ret = super.setCursor(cursor); if (this.targetFlashTween) { this.targetFlashTween.stop(); for (const pokemon of multipleTargets) { - pokemon.setAlpha(!!pokemon.getTag(SubstituteTag) ? 0.5 : 1); + pokemon.setAlpha(pokemon.getTag(SubstituteTag) ? 0.5 : 1); this.highlightItems(pokemon.id, 1); } } @@ -160,7 +160,7 @@ export default class TargetSelectUiHandler extends UiHandler { target.setAlpha(t.getValue()); this.highlightItems(target.id, t.getValue()); } - } + }, }); if (this.targetBattleInfoMoveTween.length >= 1) { @@ -173,14 +173,16 @@ export default class TargetSelectUiHandler extends UiHandler { const targetsBattleInfo = this.targetsHighlighted.map(target => target.getBattleInfo()); targetsBattleInfo.map(info => { - this.targetBattleInfoMoveTween.push(globalScene.tweens.add({ - targets: [ info ], - y: { start: info.getBaseY(), to: info.getBaseY() + 1 }, - loop: -1, - duration: Utils.fixedInt(250), - ease: "Linear", - yoyo: true - })); + this.targetBattleInfoMoveTween.push( + globalScene.tweens.add({ + targets: [info], + y: { start: info.getBaseY(), to: info.getBaseY() + 1 }, + loop: -1, + duration: Utils.fixedInt(250), + ease: "Linear", + yoyo: true, + }), + ); }); return ret; } @@ -192,7 +194,7 @@ export default class TargetSelectUiHandler extends UiHandler { } for (const pokemon of this.targetsHighlighted) { - pokemon.setAlpha(!!pokemon.getTag(SubstituteTag) ? 0.5 : 1); + pokemon.setAlpha(pokemon.getTag(SubstituteTag) ? 0.5 : 1); this.highlightItems(pokemon.id, 1); } @@ -205,7 +207,7 @@ export default class TargetSelectUiHandler extends UiHandler { } } - private highlightItems(targetId: number, val: number) : void { + private highlightItems(targetId: number, val: number): void { const targetItems = this.enemyModifiers.getAll("name", targetId.toString()); for (const item of targetItems as Phaser.GameObjects.Container[]) { item.setAlpha(val); diff --git a/src/ui/test-dialogue-ui-handler.ts b/src/ui/test-dialogue-ui-handler.ts index c7693ec954d..9fbfc01a317 100644 --- a/src/ui/test-dialogue-ui-handler.ts +++ b/src/ui/test-dialogue-ui-handler.ts @@ -8,7 +8,6 @@ import { isNullOrUndefined } from "#app/utils"; import { Mode } from "./ui"; export default class TestDialogueUiHandler extends FormModalUiHandler { - keys: string[]; constructor(mode) { @@ -19,41 +18,50 @@ export default class TestDialogueUiHandler extends FormModalUiHandler { super.setup(); const flattenKeys = (object?: any, topKey?: string, midleKey?: string[]): Array => { - return Object.keys(object ?? {}).map((t, i) => { - const value = Object.values(object)[i]; + return Object.keys(object ?? {}) + .map((t, i) => { + const value = Object.values(object)[i]; - if (typeof value === "object" && !isNullOrUndefined(value)) { // we check for not null or undefined here because if the language json file has a null key, the typeof will still be an object, but that object will be null, causing issues - // If the value is an object, execute the same process - // si el valor es un objeto ejecuta el mismo proceso + if (typeof value === "object" && !isNullOrUndefined(value)) { + // we check for not null or undefined here because if the language json file has a null key, the typeof will still be an object, but that object will be null, causing issues + // If the value is an object, execute the same process + // si el valor es un objeto ejecuta el mismo proceso - return flattenKeys(value, topKey ?? t, topKey ? midleKey ? [ ...midleKey, t ] : [ t ] : undefined).filter((t) => t.length > 0); - } else if (typeof value === "string" || isNullOrUndefined(value)) { // we check for null or undefined here as per above - the typeof is still an object but the value is null so we need to exit out of this and pass the null key + return flattenKeys(value, topKey ?? t, topKey ? (midleKey ? [...midleKey, t] : [t]) : undefined).filter( + t => t.length > 0, + ); + } + if (typeof value === "string" || isNullOrUndefined(value)) { + // we check for null or undefined here as per above - the typeof is still an object but the value is null so we need to exit out of this and pass the null key - // Return in the format expected by i18next - return midleKey ? `${topKey}:${midleKey.map((m) => m).join(".")}.${t}` : `${topKey}:${t}`; - } - }).filter((t) => t); + // Return in the format expected by i18next + return midleKey ? `${topKey}:${midleKey.map(m => m).join(".")}.${t}` : `${topKey}:${t}`; + } + }) + .filter(t => t); }; - const keysInArrays = flattenKeys(i18next.getDataByLanguage(String(i18next.resolvedLanguage))).filter((t) => t.length > 0); // Array of arrays - const keys = keysInArrays.flat(Infinity).map(String); // One array of string + const keysInArrays = flattenKeys(i18next.getDataByLanguage(String(i18next.resolvedLanguage))).filter( + t => t.length > 0, + ); // Array of arrays + const keys = keysInArrays.flat(Number.POSITIVE_INFINITY).map(String); // One array of string this.keys = keys; } - getModalTitle(config?: ModalConfig): string { + getModalTitle(_config?: ModalConfig): string { return "Test Dialogue"; } - getWidth(config?: ModalConfig): number { + getWidth(_config?: ModalConfig): number { return 300; } - getMargin(config?: ModalConfig): [number, number, number, number] { - return [ 0, 0, 48, 0 ]; + getMargin(_config?: ModalConfig): [number, number, number, number] { + return [0, 0, 48, 0]; } - getButtonLabels(config?: ModalConfig): string[] { - return [ "Check", "Cancel" ]; + getButtonLabels(_config?: ModalConfig): string[] { + return ["Check", "Cancel"]; } getReadableErrorMessage(error: string): string { @@ -78,7 +86,10 @@ export default class TestDialogueUiHandler extends FormModalUiHandler { input.setMaxLength(255); input.on("keydown", (inputObject, evt: KeyboardEvent) => { - if ([ "escape", "space" ].some((v) => v === evt.key.toLowerCase() || v === evt.code.toLowerCase()) && ui.getMode() === Mode.AUTO_COMPLETE) { + if ( + ["escape", "space"].some(v => v === evt.key.toLowerCase() || v === evt.code.toLowerCase()) && + ui.getMode() === Mode.AUTO_COMPLETE + ) { // Delete autocomplete list and recovery focus. inputObject.on("blur", () => inputObject.node.focus(), { once: true }); ui.revertMode(); @@ -93,10 +104,12 @@ export default class TestDialogueUiHandler extends FormModalUiHandler { let options: OptionSelectItem[] = []; const splitArr = inputObject.text.split(" "); - const filteredKeys = this.keys.filter((command) => command.toLowerCase().includes(splitArr[splitArr.length - 1].toLowerCase())); + const filteredKeys = this.keys.filter(command => + command.toLowerCase().includes(splitArr[splitArr.length - 1].toLowerCase()), + ); if (inputObject.text !== "" && filteredKeys.length > 0) { // if performance is required, you could reduce the number of total results by changing the slice below to not have all ~8000 inputs going - options = filteredKeys.slice(0).map((value) => { + options = filteredKeys.slice(0).map(value => { return { label: value, handler: () => { @@ -109,7 +122,7 @@ export default class TestDialogueUiHandler extends FormModalUiHandler { } ui.revertMode(); return true; - } + }, }; }); } @@ -118,14 +131,12 @@ export default class TestDialogueUiHandler extends FormModalUiHandler { const modalOpts = { options: options, maxOptions: 5, - modalContainer: this.modalContainer + modalContainer: this.modalContainer, }; ui.setOverlayMode(Mode.AUTO_COMPLETE, modalOpts); } - }); - if (super.show(args)) { const config = args[0] as ModalConfig; this.inputs[0].resize(1150, 116); @@ -135,7 +146,7 @@ export default class TestDialogueUiHandler extends FormModalUiHandler { } else { this.inputs[0].text = args[1]; } - this.submitAction = (_) => { + this.submitAction = _ => { if (ui.getMode() === Mode.TEST_DIALOGUE) { this.sanitizeInputs(); const sanitizedName = btoa(unescape(encodeURIComponent(this.inputs[0].text))); diff --git a/src/ui/text.ts b/src/ui/text.ts index cdd1142e7ee..d3afdef666f 100644 --- a/src/ui/text.ts +++ b/src/ui/text.ts @@ -42,18 +42,29 @@ export enum TextStyle { PERFECT_IV, ME_OPTION_DEFAULT, // Default style for choices in ME ME_OPTION_SPECIAL, // Style for choices with special requirements in ME + SHADOW_TEXT, // To obscure unavailable options } export interface TextStyleOptions { - scale: number, - styleOptions: Phaser.Types.GameObjects.Text.TextStyle | InputText.IConfig, - shadowColor: string, - shadowXpos: number, - shadowYpos: number + scale: number; + styleOptions: Phaser.Types.GameObjects.Text.TextStyle | InputText.IConfig; + shadowColor: string; + shadowXpos: number; + shadowYpos: number; } -export function addTextObject(x: number, y: number, content: string, style: TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle): Phaser.GameObjects.Text { - const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(style, globalScene.uiTheme, extraStyleOptions); +export function addTextObject( + x: number, + y: number, + content: string, + style: TextStyle, + extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle, +): Phaser.GameObjects.Text { + const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions( + style, + globalScene.uiTheme, + extraStyleOptions, + ); const ret = globalScene.add.text(x, y, content, styleOptions); ret.setScale(scale); @@ -69,8 +80,16 @@ export function addTextObject(x: number, y: number, content: string, style: Text return ret; } -export function setTextStyle(obj: Phaser.GameObjects.Text, style: TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle) { - const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(style, globalScene.uiTheme, extraStyleOptions); +export function setTextStyle( + obj: Phaser.GameObjects.Text, + style: TextStyle, + extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle, +) { + const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions( + style, + globalScene.uiTheme, + extraStyleOptions, + ); obj.setScale(scale); obj.setShadow(shadowXpos, shadowYpos, shadowColor); if (!(styleOptions as Phaser.Types.GameObjects.Text.TextStyle).lineSpacing) { @@ -82,8 +101,18 @@ export function setTextStyle(obj: Phaser.GameObjects.Text, style: TextStyle, ext } } -export function addBBCodeTextObject(x: number, y: number, content: string, style: TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle): BBCodeText { - const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(style, globalScene.uiTheme, extraStyleOptions); +export function addBBCodeTextObject( + x: number, + y: number, + content: string, + style: TextStyle, + extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle, +): BBCodeText { + const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions( + style, + globalScene.uiTheme, + extraStyleOptions, + ); const ret = new BBCodeText(globalScene, x, y, content, styleOptions as BBCodeText.TextStyle); globalScene.add.existing(ret); @@ -100,7 +129,14 @@ export function addBBCodeTextObject(x: number, y: number, content: string, style return ret; } -export function addTextInputObject(x: number, y: number, width: number, height: number, style: TextStyle, extraStyleOptions?: InputText.IConfig): InputText { +export function addTextInputObject( + x: number, + y: number, + width: number, + height: number, + style: TextStyle, + extraStyleOptions?: InputText.IConfig, +): InputText { const { scale, styleOptions } = getTextStyleOptions(style, globalScene.uiTheme, extraStyleOptions); const ret = new InputText(globalScene, x, y, width, height, styleOptions as InputText.IConfig); @@ -110,7 +146,11 @@ export function addTextInputObject(x: number, y: number, width: number, height: return ret; } -export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle): TextStyleOptions { +export function getTextStyleOptions( + style: TextStyle, + uiTheme: UiTheme, + extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle, +): TextStyleOptions { const lang = i18next.resolvedLanguage; let shadowXpos = 4; let shadowYpos = 5; @@ -122,13 +162,13 @@ export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraSty fontSize: 96, color: getTextColor(style, false, uiTheme), padding: { - bottom: 6 - } + bottom: 6, + }, }; if (i18next.resolvedLanguage === "ja") { scale = 0.1388888889; - styleOptions.padding = { top:2, bottom:4 }; + styleOptions.padding = { top: 2, bottom: 4 }; } switch (style) { @@ -147,7 +187,7 @@ export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraSty shadowXpos = 3; shadowYpos = 3; break; - case TextStyle.STATS_LABEL: + case TextStyle.STATS_LABEL: { let fontSizeLabel = "96px"; switch (lang) { case "de": @@ -159,9 +199,10 @@ export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraSty fontSizeLabel = "96px"; break; } - styleOptions.fontSize = fontSizeLabel; + styleOptions.fontSize = fontSizeLabel; break; - case TextStyle.STATS_VALUE: + } + case TextStyle.STATS_VALUE: { shadowXpos = 3; shadowYpos = 3; let fontSizeValue = "96px"; @@ -173,8 +214,9 @@ export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraSty fontSizeValue = "96px"; break; } - styleOptions.fontSize = fontSizeValue; + styleOptions.fontSize = fontSizeValue; break; + } case TextStyle.MESSAGE: case TextStyle.SETTINGS_LABEL: case TextStyle.SETTINGS_LOCKED: @@ -219,7 +261,9 @@ export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraSty if (extraStyleOptions) { if (extraStyleOptions.fontSize) { - const sizeRatio = parseInt(extraStyleOptions.fontSize.toString().slice(0, -2)) / parseInt(styleOptions.fontSize?.toString().slice(0, -2) ?? "1"); + const sizeRatio = + Number.parseInt(extraStyleOptions.fontSize.toString().slice(0, -2)) / + Number.parseInt(styleOptions.fontSize?.toString().slice(0, -2) ?? "1"); shadowXpos *= sizeRatio; } styleOptions = Object.assign(styleOptions, extraStyleOptions); @@ -248,10 +292,15 @@ export function getBBCodeFrag(content: string, textStyle: TextStyle, uiTheme: Ui * @param forWindow set to `true` if the text is to be displayed in a window ({@linkcode BattleScene.addWindow}) * it will replace all instances of the default MONEY TextStyle by {@linkcode TextStyle.MONEY_WINDOW} */ -export function getTextWithColors(content: string, primaryStyle: TextStyle, uiTheme: UiTheme, forWindow?: boolean): string { +export function getTextWithColors( + content: string, + primaryStyle: TextStyle, + uiTheme: UiTheme, + forWindow?: boolean, +): string { // Apply primary styling before anything else let text = getBBCodeFrag(content, primaryStyle, uiTheme) + "[/color][/shadow]"; - const primaryStyleString = [ ...text.match(new RegExp(/\[color=[^\[]*\]\[shadow=[^\[]*\]/i))! ][0]; + const primaryStyleString = [...text.match(new RegExp(/\[color=[^\[]*\]\[shadow=[^\[]*\]/i))!][0]; /* For money text displayed in game windows, we can't use the default {@linkcode TextStyle.MONEY} * or it will look wrong in legacy mode because of the different window background color @@ -261,14 +310,20 @@ export function getTextWithColors(content: string, primaryStyle: TextStyle, uiTh } // Set custom colors - text = text.replace(/@\[([^{]*)\]{([^}]*)}/gi, (substring, textStyle: string, textToColor: string) => { - return "[/color][/shadow]" + getBBCodeFrag(textToColor, TextStyle[textStyle], uiTheme) + "[/color][/shadow]" + primaryStyleString; + text = text.replace(/@\[([^{]*)\]{([^}]*)}/gi, (_substring, textStyle: string, textToColor: string) => { + return ( + "[/color][/shadow]" + + getBBCodeFrag(textToColor, TextStyle[textStyle], uiTheme) + + "[/color][/shadow]" + + primaryStyleString + ); }); // Remove extra style block at the end return text.replace(/\[color=[^\[]*\]\[shadow=[^\[]*\]\[\/color\]\[\/shadow\]/gi, ""); } +// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: This is a giant switch which is the best option. export function getTextColor(textStyle: TextStyle, shadow?: boolean, uiTheme: UiTheme = UiTheme.DEFAULT): string { const isLegacyTheme = uiTheme === UiTheme.LEGACY; switch (textStyle) { @@ -359,10 +414,16 @@ export function getTextColor(textStyle: TextStyle, shadow?: boolean, uiTheme: Ui return !shadow ? "#f8b050" : "#c07800"; // Gold } return !shadow ? "#78c850" : "#306850"; // Green + // Leaving the logic in place, in case someone wants to pick an even darker hue for the shadow down the line + case TextStyle.SHADOW_TEXT: + if (isLegacyTheme) { + return !shadow ? "#d0d0c8" : "#d0d0c8"; + } + return !shadow ? "#6b5a73" : "#6b5a73"; } } -export function getModifierTierTextTint(tier: ModifierTier): integer { +export function getModifierTierTextTint(tier: ModifierTier): number { switch (tier) { case ModifierTier.COMMON: return 0xf8f8f8; @@ -379,7 +440,7 @@ export function getModifierTierTextTint(tier: ModifierTier): integer { } } -export function getEggTierTextTint(tier: EggTier): integer { +export function getEggTierTextTint(tier: EggTier): number { switch (tier) { case EggTier.COMMON: return getModifierTierTextTint(ModifierTier.COMMON); diff --git a/src/ui/time-of-day-widget.ts b/src/ui/time-of-day-widget.ts index 2a33b475385..bda1f750cb1 100644 --- a/src/ui/time-of-day-widget.ts +++ b/src/ui/time-of-day-widget.ts @@ -6,7 +6,6 @@ import { TimeOfDay } from "#enums/time-of-day"; /** A small self contained UI element that displays the time of day as an icon */ export default class TimeOfDayWidget extends Phaser.GameObjects.Container { - /** The {@linkcode Phaser.GameObjects.Sprite} that represents the foreground of the current time of day */ private readonly timeOfDayIconFgs: Phaser.GameObjects.Sprite[] = new Array(2); /** The {@linkcode Phaser.GameObjects.Sprite} that represents the middle-ground of the current time of day */ @@ -19,9 +18,10 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container { /** A map containing all timeOfDayIcon arrays with a matching string key for easier iteration */ private timeOfDayIconPairs: Map = new Map([ - [ "bg", this.timeOfDayIconBgs ], - [ "mg", this.timeOfDayIconMgs ], - [ "fg", this.timeOfDayIconFgs ],]); + ["bg", this.timeOfDayIconBgs], + ["mg", this.timeOfDayIconMgs], + ["fg", this.timeOfDayIconFgs], + ]); /** The current time of day */ private currentTime: TimeOfDay = TimeOfDay.ALL; @@ -38,16 +38,15 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container { } /** On set, resumes any paused tweens if true */ public set parentVisible(visible: boolean) { - if (visible && !this._parentVisible) { // Only resume the tweens if parent is newly visible - this.timeOfDayIcons?.forEach( - icon => globalScene.tweens.getTweensOf(icon).forEach( - tween => tween.resume())); + if (visible && !this._parentVisible) { + // Only resume the tweens if parent is newly visible + this.timeOfDayIcons?.forEach(icon => globalScene.tweens.getTweensOf(icon).forEach(tween => tween.resume())); } this._parentVisible = visible; } - constructor(x: number = 0, y: number = 0) { + constructor(x = 0, y = 0) { super(globalScene, x, y); this.setVisible(globalScene.showTimeOfDayWidget); @@ -56,14 +55,13 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container { } // Initialize all sprites - this.timeOfDayIconPairs.forEach( - (icons, key) => { - for (let i = 0; i < icons.length; i++) { - icons[i] = globalScene.add.sprite(0, 0, "dawn_icon_" + key).setOrigin(); - } - }); + this.timeOfDayIconPairs.forEach((icons, key) => { + for (let i = 0; i < icons.length; i++) { + icons[i] = globalScene.add.sprite(0, 0, "dawn_icon_" + key).setOrigin(); + } + }); // Store a flat array of all icons for later - this.timeOfDayIcons = [ this.timeOfDayIconBgs, this.timeOfDayIconMgs, this.timeOfDayIconFgs ].flat(); + this.timeOfDayIcons = [this.timeOfDayIconBgs, this.timeOfDayIconMgs, this.timeOfDayIconFgs].flat(); this.add(this.timeOfDayIcons); globalScene.eventTarget.addEventListener(BattleSceneEventType.ENCOUNTER_PHASE, this.onEncounterPhaseEvent); @@ -75,21 +73,21 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container { */ private getBackTween(): Phaser.Types.Tweens.TweenBuilderConfig[] { const rotate = { - targets: [ this.timeOfDayIconMgs[0], this.timeOfDayIconMgs[1] ], + targets: [this.timeOfDayIconMgs[0], this.timeOfDayIconMgs[1]], angle: "+=90", duration: Utils.fixedInt(1500), ease: "Back.easeOut", paused: !this.parentVisible, }; const fade = { - targets: [ this.timeOfDayIconBgs[1], this.timeOfDayIconMgs[1], this.timeOfDayIconFgs[1] ], + targets: [this.timeOfDayIconBgs[1], this.timeOfDayIconMgs[1], this.timeOfDayIconFgs[1]], alpha: 0, duration: Utils.fixedInt(500), ease: "Linear", paused: !this.parentVisible, }; - return [ rotate, fade ]; + return [rotate, fade]; } /** @@ -98,21 +96,21 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container { */ private getBounceTween(): Phaser.Types.Tweens.TweenBuilderConfig[] { const bounce = { - targets: [ this.timeOfDayIconMgs[0], this.timeOfDayIconMgs[1] ], + targets: [this.timeOfDayIconMgs[0], this.timeOfDayIconMgs[1]], angle: "+=90", duration: Utils.fixedInt(2000), ease: "Bounce.easeOut", paused: !this.parentVisible, }; const fade = { - targets: [ this.timeOfDayIconBgs[1], this.timeOfDayIconMgs[1], this.timeOfDayIconFgs[1] ], + targets: [this.timeOfDayIconBgs[1], this.timeOfDayIconMgs[1], this.timeOfDayIconFgs[1]], alpha: 0, duration: Utils.fixedInt(800), ease: "Linear", paused: !this.parentVisible, }; - return [ bounce, fade ]; + return [bounce, fade]; } /** Resets all icons to the proper depth, texture, and alpha so they are ready to tween */ @@ -121,11 +119,10 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container { this.moveBelow(this.timeOfDayIconMgs[0], this.timeOfDayIconBgs[1]); this.moveBelow(this.timeOfDayIconFgs[0], this.timeOfDayIconFgs[1]); - this.timeOfDayIconPairs.forEach( - (icons, key) => { - icons[0].setTexture(TimeOfDay[this.currentTime].toLowerCase() + "_icon_" + key); - icons[1].setTexture(TimeOfDay[this.previousTime].toLowerCase() + "_icon_" + key); - }); + this.timeOfDayIconPairs.forEach((icons, key) => { + icons[0].setTexture(TimeOfDay[this.currentTime].toLowerCase() + "_icon_" + key); + icons[1].setTexture(TimeOfDay[this.previousTime].toLowerCase() + "_icon_" + key); + }); this.timeOfDayIconMgs[0].setRotation(-90 * (3.14 / 180)); this.timeOfDayIcons.forEach(icon => icon.setAlpha(1)); @@ -138,23 +135,23 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container { this.resetIcons(); // Tween based on the player setting - (globalScene.timeOfDayAnimation === EaseType.BACK ? this.getBackTween() : this.getBounceTween()) - .forEach(tween => globalScene.tweens.add(tween)); + (globalScene.timeOfDayAnimation === EaseType.BACK ? this.getBackTween() : this.getBounceTween()).forEach(tween => + globalScene.tweens.add(tween), + ); // Swaps all elements of the icon arrays by shifting the first element onto the end of the array // This ensures index[0] is always the new time of day icon and index[1] is always the current one - this.timeOfDayIconPairs.forEach( - icons => { - const shifted = icons.shift(); - shifted && icons.push(shifted); - }); + this.timeOfDayIconPairs.forEach(icons => { + const shifted = icons.shift(); + shifted && icons.push(shifted); + }); } /** * Grabs the current time of day from the arena and calls {@linkcode tweenTimeOfDayIcon} - * @param event {@linkcode Event} being sent + * @param _event {@linkcode Event} being sent */ - private onEncounterPhase(event: Event) { + private onEncounterPhase(_event: Event) { const newTime = globalScene.arena.getTimeOfDay(); if (this.currentTime === newTime) { diff --git a/src/ui/title-ui-handler.ts b/src/ui/title-ui-handler.ts index 538f78e877e..2f797bb4bfb 100644 --- a/src/ui/title-ui-handler.ts +++ b/src/ui/title-ui-handler.ts @@ -1,7 +1,7 @@ import OptionSelectUiHandler from "./settings/option-select-ui-handler"; import { Mode } from "./ui"; import * as Utils from "../utils"; -import { TextStyle, addTextObject, getTextStyleOptions } from "./text"; +import { TextStyle, addTextObject } from "./text"; import { getSplashMessages } from "../data/splash-messages"; import i18next from "i18next"; import { TimedEventDisplay } from "#app/timed-event-manager"; @@ -36,7 +36,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler { this.titleContainer.setAlpha(0); ui.add(this.titleContainer); - const logo = globalScene.add.image((globalScene.game.canvas.width / 6) / 2, 8, "logo"); + const logo = globalScene.add.image(globalScene.game.canvas.width / 6 / 2, 8, "logo"); logo.setOrigin(0.5, 0); this.titleContainer.add(logo); @@ -47,16 +47,19 @@ export default class TitleUiHandler extends OptionSelectUiHandler { } this.playerCountLabel = addTextObject( - (globalScene.game.canvas.width / 6) - 2, - (globalScene.game.canvas.height / 6) - 13 - 576 * getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale, + // Actual y position will be determined after the title menu has been populated with options + globalScene.game.canvas.width / 6 - 2, + 0, `? ${i18next.t("menu:playersOnline")}`, TextStyle.MESSAGE, - { fontSize: "54px" } + { fontSize: "54px" }, ); this.playerCountLabel.setOrigin(1, 0); this.titleContainer.add(this.playerCountLabel); - this.splashMessageText = addTextObject(logo.x + 64, logo.y + logo.displayHeight - 8, "", TextStyle.MONEY, { fontSize: "54px" }); + this.splashMessageText = addTextObject(logo.x + 64, logo.y + logo.displayHeight - 8, "", TextStyle.MONEY, { + fontSize: "54px", + }); this.splashMessageText.setOrigin(0.5, 0.5); this.splashMessageText.setAngle(-20); this.titleContainer.add(this.splashMessageText); @@ -71,14 +74,17 @@ export default class TitleUiHandler extends OptionSelectUiHandler { yoyo: true, }); - this.appVersionText = addTextObject(logo.x - 60, logo.y + logo.displayHeight + 4, "", TextStyle.MONEY, { fontSize: "54px" }); + this.appVersionText = addTextObject(logo.x - 60, logo.y + logo.displayHeight + 4, "", TextStyle.MONEY, { + fontSize: "54px", + }); this.appVersionText.setOrigin(0.5, 0.5); this.appVersionText.setAngle(0); this.titleContainer.add(this.appVersionText); } updateTitleStats(): void { - pokerogueApi.getGameTitleStats() + pokerogueApi + .getGameTitleStats() .then(stats => { if (stats) { this.playerCountLabel.setText(`${stats.playerCount} ${i18next.t("menu:playersOnline")}`); @@ -96,8 +102,15 @@ export default class TitleUiHandler extends OptionSelectUiHandler { const ret = super.show(args); if (ret) { + // Moving player count to top of the menu + this.playerCountLabel.setY(globalScene.game.canvas.height / 6 - 13 - this.getWindowHeight()); + this.splashMessage = Utils.randItem(getSplashMessages()); - this.splashMessageText.setText(i18next.t(this.splashMessage, { count: TitleUiHandler.BATTLES_WON_FALLBACK })); + this.splashMessageText.setText( + i18next.t(this.splashMessage, { + count: TitleUiHandler.BATTLES_WON_FALLBACK, + }), + ); this.appVersionText.setText("v" + version); @@ -115,10 +128,10 @@ export default class TitleUiHandler extends OptionSelectUiHandler { }, 60000); globalScene.tweens.add({ - targets: [ this.titleContainer, ui.getMessageHandler().bg ], + targets: [this.titleContainer, ui.getMessageHandler().bg], duration: Utils.fixedInt(325), - alpha: (target: any) => target === this.titleContainer ? 1 : 0, - ease: "Sine.easeInOut" + alpha: (target: any) => (target === this.titleContainer ? 1 : 0), + ease: "Sine.easeInOut", }); } @@ -136,10 +149,10 @@ export default class TitleUiHandler extends OptionSelectUiHandler { this.titleStatsTimer = null; globalScene.tweens.add({ - targets: [ this.titleContainer, ui.getMessageHandler().bg ], + targets: [this.titleContainer, ui.getMessageHandler().bg], duration: Utils.fixedInt(325), - alpha: (target: any) => target === this.titleContainer ? 0 : 1, - ease: "Sine.easeInOut" + alpha: (target: any) => (target === this.titleContainer ? 0 : 1), + ease: "Sine.easeInOut", }); } } diff --git a/src/ui/ui-handler.ts b/src/ui/ui-handler.ts index 89f8d9e65b6..433f85d0f92 100644 --- a/src/ui/ui-handler.ts +++ b/src/ui/ui-handler.ts @@ -8,9 +8,9 @@ import type { Button } from "#enums/buttons"; * A basic abstract class to act as a holder and processor for UI elements. */ export default abstract class UiHandler { - protected mode: integer | null; - protected cursor: integer = 0; - public active: boolean = false; + protected mode: number | null; + protected cursor = 0; + public active = false; /** * @param mode The mode of the UI element. These should be unique. @@ -33,15 +33,15 @@ export default abstract class UiHandler { return globalScene.ui; } - getTextColor(style: TextStyle, shadow: boolean = false): string { + getTextColor(style: TextStyle, shadow = false): string { return getTextColor(style, shadow, globalScene.uiTheme); } - getCursor(): integer { + getCursor(): number { return this.cursor; } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const changed = this.cursor !== cursor; if (changed) { this.cursor = cursor; diff --git a/src/ui/ui-theme.ts b/src/ui/ui-theme.ts index 0d42815f842..c3931aea23b 100644 --- a/src/ui/ui-theme.ts +++ b/src/ui/ui-theme.ts @@ -5,7 +5,7 @@ import { globalScene } from "#app/global-scene"; export enum WindowVariant { NORMAL, THIN, - XTHIN + XTHIN, } export function getWindowVariantSuffix(windowVariant: WindowVariant): string { @@ -21,29 +21,50 @@ export function getWindowVariantSuffix(windowVariant: WindowVariant): string { const windowTypeControlColors = { [UiTheme.DEFAULT]: { - 0: [ "#6b5a73", "#DD5748", "#7E4955" ], - 1: [ "#6b5a73", "#48DDAA", "#4D7574" ], - 2: [ "#6b5a73", "#C5C5C5", "#766D7E" ], - 3: [ "#6b5a73", "#EBC07C", "#836C66" ], - 4: [ "#686868", "#E8E8E8", "#919191" ] + 0: ["#6b5a73", "#DD5748", "#7E4955"], + 1: ["#6b5a73", "#48DDAA", "#4D7574"], + 2: ["#6b5a73", "#C5C5C5", "#766D7E"], + 3: ["#6b5a73", "#EBC07C", "#836C66"], + 4: ["#686868", "#E8E8E8", "#919191"], }, [UiTheme.LEGACY]: { - 0: [ "#706880", "#8888c8", "#484868" ], - 1: [ "#d04028", "#e0a028", "#902008" ], - 2: [ "#48b840", "#88d880", "#089040" ], - 3: [ "#2068d0", "#80b0e0", "#104888" ], - 4: [ "#706880", "#8888c8", "#484868" ] - } + 0: ["#706880", "#8888c8", "#484868"], + 1: ["#d04028", "#e0a028", "#902008"], + 2: ["#48b840", "#88d880", "#089040"], + 3: ["#2068d0", "#80b0e0", "#104888"], + 4: ["#706880", "#8888c8", "#484868"], + }, }; -export function addWindow(x: number, y: number, width: number, height: number, mergeMaskTop?: boolean, mergeMaskLeft?: boolean, maskOffsetX?: number, maskOffsetY?: number, windowVariant?: WindowVariant): Phaser.GameObjects.NineSlice { +export function addWindow( + x: number, + y: number, + width: number, + height: number, + mergeMaskTop?: boolean, + mergeMaskLeft?: boolean, + maskOffsetX?: number, + maskOffsetY?: number, + windowVariant?: WindowVariant, +): Phaser.GameObjects.NineSlice { if (windowVariant === undefined) { windowVariant = WindowVariant.NORMAL; } const borderSize = globalScene.uiTheme ? 6 : 8; - const window = globalScene.add.nineslice(x, y, `window_${globalScene.windowType}${getWindowVariantSuffix(windowVariant)}`, undefined, width, height, borderSize, borderSize, borderSize, borderSize); + const window = globalScene.add.nineslice( + x, + y, + `window_${globalScene.windowType}${getWindowVariantSuffix(windowVariant)}`, + undefined, + width, + height, + borderSize, + borderSize, + borderSize, + borderSize, + ); window.setOrigin(0, 0); if (mergeMaskLeft || mergeMaskTop || maskOffsetX || maskOffsetY) { @@ -55,11 +76,11 @@ export function addWindow(x: number, y: number, width: number, height: number, m */ const maskRect = new Phaser.GameObjects.Rectangle( globalScene, - 6 * (x - (mergeMaskLeft ? 2 : 0) - (maskOffsetX || 0)), + 6 * (x - (mergeMaskLeft ? 2 : 0) - (maskOffsetX || 0)), 6 * (y + (mergeMaskTop ? 2 : 0) + (maskOffsetY || 0)), width - (mergeMaskLeft ? 2 : 0), height - (mergeMaskTop ? 2 : 0), - 0xffffff + 0xffffff, ); maskRect.setOrigin(0); maskRect.setScale(6); @@ -70,7 +91,7 @@ export function addWindow(x: number, y: number, width: number, height: number, m return window; } -export function updateWindowType(windowTypeIndex: integer): void { +export function updateWindowType(windowTypeIndex: number): void { const windowObjects: [Phaser.GameObjects.NineSlice, WindowVariant][] = []; const themedObjects: (Phaser.GameObjects.Image | Phaser.GameObjects.NineSlice)[] = []; const traverse = (object: any) => { @@ -85,7 +106,14 @@ export function updateWindowType(windowTypeIndex: integer): void { } } else if (object instanceof Phaser.GameObjects.NineSlice) { if (object.texture.key.startsWith("window_")) { - windowObjects.push([ object, object.texture.key.endsWith(getWindowVariantSuffix(WindowVariant.XTHIN)) ? WindowVariant.XTHIN : object.texture.key.endsWith(getWindowVariantSuffix(WindowVariant.THIN)) ? WindowVariant.THIN : WindowVariant.NORMAL ]); + windowObjects.push([ + object, + object.texture.key.endsWith(getWindowVariantSuffix(WindowVariant.XTHIN)) + ? WindowVariant.XTHIN + : object.texture.key.endsWith(getWindowVariantSuffix(WindowVariant.THIN)) + ? WindowVariant.THIN + : WindowVariant.NORMAL, + ]); } else if (object.texture?.key === "namebox") { themedObjects.push(object); } @@ -101,11 +129,13 @@ export function updateWindowType(windowTypeIndex: integer): void { globalScene.windowType = windowTypeIndex; const rootStyle = document.documentElement.style; - [ "base", "light", "dark" ].map((k, i) => rootStyle.setProperty(`--color-${k}`, windowTypeControlColors[globalScene.uiTheme][windowTypeIndex - 1][i])); + ["base", "light", "dark"].map((k, i) => + rootStyle.setProperty(`--color-${k}`, windowTypeControlColors[globalScene.uiTheme][windowTypeIndex - 1][i]), + ); const windowKey = `window_${windowTypeIndex}`; - for (const [ window, variant ] of windowObjects) { + for (const [window, variant] of windowObjects) { window.setTexture(`${windowKey}${getWindowVariantSuffix(variant)}`); } @@ -116,54 +146,91 @@ export function updateWindowType(windowTypeIndex: integer): void { export function addUiThemeOverrides(): void { const originalAddImage = globalScene.add.image; - globalScene.add.image = function (x: number, y: number, texture: string | Phaser.Textures.Texture, frame?: string | number): Phaser.GameObjects.Image { + globalScene.add.image = function ( + x: number, + y: number, + texture: string | Phaser.Textures.Texture, + frame?: string | number, + ): Phaser.GameObjects.Image { let legacy = false; if (typeof texture === "string" && globalScene.uiTheme && legacyCompatibleImages.includes(texture)) { legacy = true; texture += "_legacy"; } - const ret: Phaser.GameObjects.Image = originalAddImage.apply(this, [ x, y, texture, frame ]); + const ret: Phaser.GameObjects.Image = originalAddImage.apply(this, [x, y, texture, frame]); if (legacy) { const originalSetTexture = ret.setTexture; ret.setTexture = function (key: string, frame?: string | number) { key += "_legacy"; - return originalSetTexture.apply(this, [ key, frame ]); + return originalSetTexture.apply(this, [key, frame]); }; } return ret; }; const originalAddSprite = globalScene.add.sprite; - globalScene.add.sprite = function (x: number, y: number, texture: string | Phaser.Textures.Texture, frame?: string | number): Phaser.GameObjects.Sprite { + globalScene.add.sprite = function ( + x: number, + y: number, + texture: string | Phaser.Textures.Texture, + frame?: string | number, + ): Phaser.GameObjects.Sprite { let legacy = false; if (typeof texture === "string" && globalScene.uiTheme && legacyCompatibleImages.includes(texture)) { legacy = true; texture += "_legacy"; } - const ret: Phaser.GameObjects.Sprite = originalAddSprite.apply(this, [ x, y, texture, frame ]); + const ret: Phaser.GameObjects.Sprite = originalAddSprite.apply(this, [x, y, texture, frame]); if (legacy) { const originalSetTexture = ret.setTexture; ret.setTexture = function (key: string, frame?: string | number) { key += "_legacy"; - return originalSetTexture.apply(this, [ key, frame ]); + return originalSetTexture.apply(this, [key, frame]); }; } return ret; }; const originalAddNineslice = globalScene.add.nineslice; - globalScene.add.nineslice = function (x: number, y: number, texture: string | Phaser.Textures.Texture, frame?: string | number, width?: number, height?: number, leftWidth?: number, rightWidth?: number, topHeight?: number, bottomHeight?: number): Phaser.GameObjects.NineSlice { + globalScene.add.nineslice = function ( + x: number, + y: number, + texture: string | Phaser.Textures.Texture, + frame?: string | number, + width?: number, + height?: number, + leftWidth?: number, + rightWidth?: number, + topHeight?: number, + bottomHeight?: number, + ): Phaser.GameObjects.NineSlice { let legacy = false; if (typeof texture === "string" && globalScene.uiTheme && legacyCompatibleImages.includes(texture)) { legacy = true; texture += "_legacy"; } - const ret: Phaser.GameObjects.NineSlice = originalAddNineslice.apply(this, [ x, y, texture, frame, width, height, leftWidth, rightWidth, topHeight, bottomHeight ]); + const ret: Phaser.GameObjects.NineSlice = originalAddNineslice.apply(this, [ + x, + y, + texture, + frame, + width, + height, + leftWidth, + rightWidth, + topHeight, + bottomHeight, + ]); if (legacy) { const originalSetTexture = ret.setTexture; - ret.setTexture = function (key: string | Phaser.Textures.Texture, frame?: string | number, updateSize?: boolean, updateOrigin?: boolean) { + ret.setTexture = function ( + key: string | Phaser.Textures.Texture, + frame?: string | number, + updateSize?: boolean, + updateOrigin?: boolean, + ) { key += "_legacy"; - return originalSetTexture.apply(this, [ key, frame, updateSize, updateOrigin ]); + return originalSetTexture.apply(this, [key, frame, updateSize, updateOrigin]); }; } return ret; diff --git a/src/ui/ui.ts b/src/ui/ui.ts index 682ef836765..7c202e9210d 100644 --- a/src/ui/ui.ts +++ b/src/ui/ui.ts @@ -23,6 +23,7 @@ import OptionSelectUiHandler from "./settings/option-select-ui-handler"; import EggHatchSceneHandler from "./egg-hatch-scene-handler"; import EggListUiHandler from "./egg-list-ui-handler"; import EggGachaUiHandler from "./egg-gacha-ui-handler"; +import PokedexUiHandler from "./pokedex-ui-handler"; import { addWindow } from "./ui-theme"; import LoginFormUiHandler from "./login-form-ui-handler"; import RegistrationFormUiHandler from "./registration-form-ui-handler"; @@ -53,6 +54,8 @@ import TestDialogueUiHandler from "#app/ui/test-dialogue-ui-handler"; import AutoCompleteUiHandler from "./autocomplete-ui-handler"; import { Device } from "#enums/devices"; import MysteryEncounterUiHandler from "./mystery-encounter-ui-handler"; +import PokedexScanUiHandler from "./pokedex-scan-ui-handler"; +import PokedexPageUiHandler from "./pokedex-page-ui-handler"; import { NavigationManager } from "./settings/navigationMenu"; export enum Mode { @@ -85,6 +88,9 @@ export enum Mode { GAME_STATS, EGG_LIST, EGG_GACHA, + POKEDEX, + POKEDEX_SCAN, + POKEDEX_PAGE, LOGIN_FORM, REGISTRATION_FORM, LOADING, @@ -97,7 +103,7 @@ export enum Mode { TEST_DIALOGUE, AUTO_COMPLETE, ADMIN, - MYSTERY_ENCOUNTER + MYSTERY_ENCOUNTER, } const transitionModes = [ @@ -109,6 +115,8 @@ const transitionModes = [ Mode.EGG_HATCH_SCENE, Mode.EGG_LIST, Mode.EGG_GACHA, + Mode.POKEDEX, + Mode.POKEDEX_PAGE, Mode.CHALLENGE_SELECT, Mode.RUN_HISTORY, ]; @@ -128,6 +136,7 @@ const noTransitionModes = [ Mode.SETTINGS_KEYBOARD, Mode.ACHIEVEMENTS, Mode.GAME_STATS, + Mode.POKEDEX_SCAN, Mode.LOGIN_FORM, Mode.REGISTRATION_FORM, Mode.LOADING, @@ -138,7 +147,7 @@ const noTransitionModes = [ Mode.AUTO_COMPLETE, Mode.ADMIN, Mode.MYSTERY_ENCOUNTER, - Mode.RUN_INFO + Mode.RUN_INFO, ]; export default class UI extends Phaser.GameObjects.Container { @@ -193,6 +202,9 @@ export default class UI extends Phaser.GameObjects.Container { new GameStatsUiHandler(), new EggListUiHandler(), new EggGachaUiHandler(), + new PokedexUiHandler(), + new PokedexScanUiHandler(Mode.TEST_DIALOGUE), + new PokedexPageUiHandler(), new LoginFormUiHandler(), new RegistrationFormUiHandler(), new LoadingModalUiHandler(), @@ -214,19 +226,25 @@ export default class UI extends Phaser.GameObjects.Container { for (const handler of this.handlers) { handler.setup(); } - this.overlay = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0); + this.overlay = globalScene.add.rectangle( + 0, + 0, + globalScene.game.canvas.width / 6, + globalScene.game.canvas.height / 6, + 0, + ); this.overlay.setName("rect-ui-overlay"); this.overlay.setOrigin(0, 0); globalScene.uiContainer.add(this.overlay); this.overlay.setVisible(false); this.setupTooltip(); - this.achvBar = new AchvBar; + this.achvBar = new AchvBar(); this.achvBar.setup(); globalScene.uiContainer.add(this.achvBar); - this.savingIcon = new SavingIconHandler; + this.savingIcon = new SavingIconHandler(); this.savingIcon.setup(); globalScene.uiContainer.add(this.savingIcon); @@ -269,7 +287,7 @@ export default class UI extends Phaser.GameObjects.Container { return false; } - if ([ Mode.CONFIRM, Mode.COMMAND, Mode.FIGHT, Mode.MESSAGE, Mode.TARGET_SELECT ].includes(this.mode)) { + if ([Mode.CONFIRM, Mode.COMMAND, Mode.FIGHT, Mode.MESSAGE, Mode.TARGET_SELECT].includes(this.mode)) { globalScene?.processInfoButton(pressed); return true; } @@ -296,15 +314,23 @@ export default class UI extends Phaser.GameObjects.Container { return handler.processInput(button); } - showTextPromise(text: string, callbackDelay: number = 0, prompt: boolean = true, promptDelay?: integer | null): Promise { + showTextPromise(text: string, callbackDelay = 0, prompt = true, promptDelay?: number | null): Promise { return new Promise(resolve => { this.showText(text ?? "", null, () => resolve(), callbackDelay, prompt, promptDelay); }); } - showText(text: string, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null): void { + showText( + text: string, + delay?: number | null, + callback?: Function | null, + callbackDelay?: number | null, + prompt?: boolean | null, + promptDelay?: number | null, + ): void { if (prompt && text.indexOf("$") > -1) { const messagePages = text.split(/\$/g).map(m => m.trim()); + // biome-ignore lint/complexity/useOptionalChain: optional chain would change this to be null instead of undefined. let showMessageAndCallback = () => callback && callback(); for (let p = messagePages.length - 1; p >= 0; p--) { const originalFunc = showMessageAndCallback; @@ -318,18 +344,24 @@ export default class UI extends Phaser.GameObjects.Container { } else { this.getMessageHandler().showText(text, delay, callback, callbackDelay, prompt, promptDelay); } - } } - showDialogue(keyOrText: string, name: string | undefined, delay: integer | null = 0, callback: Function, callbackDelay?: integer, promptDelay?: integer): void { + showDialogue( + keyOrText: string, + name: string | undefined, + delay: number | null = 0, + callback: Function, + callbackDelay?: number, + promptDelay?: number, + ): void { // Get localized dialogue (if available) let hasi18n = false; let text = keyOrText; const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET; const genderStr = PlayerGender[genderIndex].toLowerCase(); - if (i18next.exists(keyOrText) ) { + if (i18next.exists(keyOrText)) { const i18nKey = keyOrText; hasi18n = true; @@ -356,15 +388,31 @@ export default class UI extends Phaser.GameObjects.Container { } else { const handler = this.getHandler(); if (handler instanceof MessageUiHandler) { - (handler as MessageUiHandler).showDialogue(text, name, delay, showMessageAndCallback, callbackDelay, true, promptDelay); + (handler as MessageUiHandler).showDialogue( + text, + name, + delay, + showMessageAndCallback, + callbackDelay, + true, + promptDelay, + ); } else { - this.getMessageHandler().showDialogue(text, name, delay, showMessageAndCallback, callbackDelay, true, promptDelay); + this.getMessageHandler().showDialogue( + text, + name, + delay, + showMessageAndCallback, + callbackDelay, + true, + promptDelay, + ); } } } shouldSkipDialogue(i18nKey: string): boolean { - if (i18next.exists(i18nKey) ) { + if (i18next.exists(i18nKey)) { if (globalScene.skipSeenDialogues && globalScene.gameData.getSeenDialogues()[i18nKey] === true) { return true; } @@ -373,7 +421,11 @@ export default class UI extends Phaser.GameObjects.Container { } getTooltip(): { visible: boolean; title: string; content: string } { - return { visible: this.tooltipContainer.visible, title: this.tooltipTitle.text, content: this.tooltipContent.text }; + return { + visible: this.tooltipContainer.visible, + title: this.tooltipTitle.text, + content: this.tooltipContent.text, + }; } showTooltip(title: string, content: string, overlap?: boolean): void { @@ -391,7 +443,10 @@ export default class UI extends Phaser.GameObjects.Container { const wrappedContent = this.tooltipContent.runWordWrap(content); this.tooltipContent.setText(wrappedContent); this.tooltipContent.y = title ? 16 : 4; - this.tooltipBg.width = Math.min(Math.max(this.tooltipTitle.displayWidth, this.tooltipContent.displayWidth) + 12, 838); + this.tooltipBg.width = Math.min( + Math.max(this.tooltipTitle.displayWidth, this.tooltipContent.displayWidth) + 12, + 838, + ); this.tooltipBg.height = (title ? 31 : 19) + 10.5 * (wrappedContent.split("\n").length - 1); this.tooltipTitle.x = this.tooltipBg.width / 2; } @@ -443,7 +498,7 @@ export default class UI extends Phaser.GameObjects.Container { } } - setCursor(cursor: integer): boolean { + setCursor(cursor: number): boolean { const changed = this.getHandler().setCursor(cursor); if (changed) { this.playSelect(); @@ -460,7 +515,7 @@ export default class UI extends Phaser.GameObjects.Container { globalScene.playSound("ui/error"); } - fadeOut(duration: integer): Promise { + fadeOut(duration: number): Promise { return new Promise(resolve => { if (this.overlayActive) { return resolve(); @@ -473,12 +528,12 @@ export default class UI extends Phaser.GameObjects.Container { alpha: 1, duration: duration, ease: "Sine.easeOut", - onComplete: () => resolve() + onComplete: () => resolve(), }); }); } - fadeIn(duration: integer): Promise { + fadeIn(duration: number): Promise { return new Promise(resolve => { if (!this.overlayActive) { return resolve(); @@ -491,13 +546,19 @@ export default class UI extends Phaser.GameObjects.Container { onComplete: () => { this.overlay.setVisible(false); resolve(); - } + }, }); this.overlayActive = false; }); } - private setModeInternal(mode: Mode, clear: boolean, forceTransition: boolean, chainMode: boolean, args: any[]): Promise { + private setModeInternal( + mode: Mode, + clear: boolean, + forceTransition: boolean, + chainMode: boolean, + args: any[], + ): Promise { return new Promise(resolve => { if (this.mode === mode && !forceTransition) { resolve(); @@ -521,9 +582,13 @@ export default class UI extends Phaser.GameObjects.Container { } resolve(); }; - if (((!chainMode && ((transitionModes.indexOf(this.mode) > -1 || transitionModes.indexOf(mode) > -1) - && (noTransitionModes.indexOf(this.mode) === -1 && noTransitionModes.indexOf(mode) === -1))) - || (chainMode && noTransitionModes.indexOf(mode) === -1))) { + if ( + (!chainMode && + (transitionModes.indexOf(this.mode) > -1 || transitionModes.indexOf(mode) > -1) && + noTransitionModes.indexOf(this.mode) === -1 && + noTransitionModes.indexOf(mode) === -1) || + (chainMode && noTransitionModes.indexOf(mode) === -1) + ) { this.fadeOut(250).then(() => { globalScene.time.delayedCall(100, () => { doSetMode(); @@ -616,9 +681,8 @@ export default class UI extends Phaser.GameObjects.Container { public getGamepadType(): string { if (globalScene.inputMethod === "gamepad") { return globalScene.inputController.getConfig(globalScene.inputController.selectedDevice[Device.GAMEPAD]).padType; - } else { - return globalScene.inputMethod; } + return globalScene.inputMethod; } /** diff --git a/src/ui/unavailable-modal-ui-handler.ts b/src/ui/unavailable-modal-ui-handler.ts index 36f1a191b77..3007f7247f1 100644 --- a/src/ui/unavailable-modal-ui-handler.ts +++ b/src/ui/unavailable-modal-ui-handler.ts @@ -35,17 +35,23 @@ export default class UnavailableModalUiHandler extends ModalUiHandler { } getMargin(): [number, number, number, number] { - return [ 0, 0, 48, 0 ]; + return [0, 0, 48, 0]; } getButtonLabels(): string[] { - return [ ]; + return []; } setup(): void { super.setup(); - const label = addTextObject(this.getWidth() / 2, this.getHeight() / 2, i18next.t("menu:errorServerDown"), TextStyle.WINDOW, { fontSize: "48px", align: "center" }); + const label = addTextObject( + this.getWidth() / 2, + this.getHeight() / 2, + i18next.t("menu:errorServerDown"), + TextStyle.WINDOW, + { fontSize: "48px", align: "center" }, + ); label.setOrigin(0.5, 0.5); this.modalContainer.add(label); @@ -53,7 +59,7 @@ export default class UnavailableModalUiHandler extends ModalUiHandler { tryReconnect(): void { updateUserInfo().then(response => { - if (response[0] || [ 200, 400 ].includes(response[1])) { + if (response[0] || [200, 400].includes(response[1])) { this.reconnectTimer = null; this.reconnectDuration = this.minTime; globalScene.playSound("se/pb_bounce_1"); @@ -63,11 +69,11 @@ export default class UnavailableModalUiHandler extends ModalUiHandler { globalScene.reset(true, true); } else { this.reconnectDuration = Math.min(this.reconnectDuration * 2, this.maxTime); // Set a max delay so it isn't infinite - this.reconnectTimer = - setTimeout( - () => this.tryReconnect(), - // Adds a random factor to avoid pendulum effect during long total breakdown - this.reconnectDuration + (Math.random() * this.randVarianceTime)); + this.reconnectTimer = setTimeout( + () => this.tryReconnect(), + // Adds a random factor to avoid pendulum effect during long total breakdown + this.reconnectDuration + Math.random() * this.randVarianceTime, + ); } }); } @@ -75,14 +81,14 @@ export default class UnavailableModalUiHandler extends ModalUiHandler { show(args: any[]): boolean { if (args.length >= 1 && args[0] instanceof Function) { const config: ModalConfig = { - buttonActions: [] + buttonActions: [], }; this.reconnectCallback = args[0]; this.reconnectDuration = this.minTime; this.reconnectTimer = setTimeout(() => this.tryReconnect(), this.reconnectDuration); - return super.show([ config ]); + return super.show([config]); } return false; diff --git a/src/utils.test.ts b/src/utils.test.ts index 3f5b835b03b..cc3f2bb1a04 100644 --- a/src/utils.test.ts +++ b/src/utils.test.ts @@ -4,7 +4,6 @@ import { randomString, padInt } from "./utils"; import Phaser from "phaser"; describe("utils", () => { - beforeAll(() => { new Phaser.Game({ type: Phaser.HEADLESS, diff --git a/src/utils.ts b/src/utils.ts index 2235fb69633..7d3dea0247e 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -8,10 +8,14 @@ export type nil = null | undefined; export const MissingTextureKey = "__MISSING"; export function toReadableString(str: string): string { - return str.replace(/\_/g, " ").split(" ").map(s => `${s.slice(0, 1)}${s.slice(1).toLowerCase()}`).join(" "); + return str + .replace(/\_/g, " ") + .split(" ") + .map(s => `${s.slice(0, 1)}${s.slice(1).toLowerCase()}`) + .join(" "); } -export function randomString(length: integer, seeded: boolean = false) { +export function randomString(length: number, seeded = false) { const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; let result = ""; @@ -23,7 +27,7 @@ export function randomString(length: integer, seeded: boolean = false) { return result; } -export function shiftCharCodes(str: string, shiftCount: integer) { +export function shiftCharCodes(str: string, shiftCount: number) { if (!shiftCount) { shiftCount = 0; } @@ -39,7 +43,7 @@ export function shiftCharCodes(str: string, shiftCount: integer) { return newStr; } -export function randGauss(stdev: number, mean: number = 0): number { +export function randGauss(stdev: number, mean = 0): number { if (!stdev) { return 0; } @@ -49,7 +53,7 @@ export function randGauss(stdev: number, mean: number = 0): number { return z * stdev + mean; } -export function randSeedGauss(stdev: number, mean: number = 0): number { +export function randSeedGauss(stdev: number, mean = 0): number { if (!stdev) { return 0; } @@ -59,7 +63,7 @@ export function randSeedGauss(stdev: number, mean: number = 0): number { return z * stdev + mean; } -export function padInt(value: integer, length: integer, padWith?: string): string { +export function padInt(value: number, length: number, padWith?: string): string { if (!padWith) { padWith = "0"; } @@ -71,11 +75,11 @@ export function padInt(value: integer, length: integer, padWith?: string): strin } /** -* Returns a random integer between min and min + range -* @param range The amount of possible numbers -* @param min The starting number -*/ -export function randInt(range: integer, min: integer = 0): integer { + * Returns a random integer between min and min + range + * @param range The amount of possible numbers + * @param min The starting number + */ +export function randInt(range: number, min = 0): number { if (range === 1) { return min; } @@ -88,38 +92,32 @@ export function randInt(range: integer, min: integer = 0): integer { * @param min The minimum integer to pick, default `0` * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1) */ -export function randSeedInt(range: integer, min: integer = 0): integer { +export function randSeedInt(range: number, min = 0): number { if (range <= 1) { return min; } - return Phaser.Math.RND.integerInRange(min, (range - 1) + min); + return Phaser.Math.RND.integerInRange(min, range - 1 + min); } /** -* Returns a random integer between min and max (non-inclusive) -* @param min The lowest number -* @param max The highest number -*/ -export function randIntRange(min: integer, max: integer): integer { + * Returns a random integer between min and max (non-inclusive) + * @param min The lowest number + * @param max The highest number + */ +export function randIntRange(min: number, max: number): number { return randInt(max - min, min); } export function randItem(items: T[]): T { - return items.length === 1 - ? items[0] - : items[randInt(items.length)]; + return items.length === 1 ? items[0] : items[randInt(items.length)]; } export function randSeedItem(items: T[]): T { - return items.length === 1 - ? items[0] - : Phaser.Math.RND.pick(items); + return items.length === 1 ? items[0] : Phaser.Math.RND.pick(items); } export function randSeedWeightedItem(items: T[]): T { - return items.length === 1 - ? items[0] - : Phaser.Math.RND.weightedPick(items); + return items.length === 1 ? items[0] : Phaser.Math.RND.weightedPick(items); } /** @@ -134,26 +132,26 @@ export function randSeedShuffle(items: T[]): T[] { const newArray = items.slice(0); for (let i = items.length - 1; i > 0; i--) { const j = Phaser.Math.RND.integerInRange(0, i); - [ newArray[i], newArray[j] ] = [ newArray[j], newArray[i] ]; + [newArray[i], newArray[j]] = [newArray[j], newArray[i]]; } return newArray; } -export function getFrameMs(frameCount: integer): integer { +export function getFrameMs(frameCount: number): number { return Math.floor((1 / 60) * 1000 * frameCount); } export function getCurrentTime(): number { const date = new Date(); - return (((date.getHours() * 60 + date.getMinutes()) / 1440) + 0.675) % 1; + return ((date.getHours() * 60 + date.getMinutes()) / 1440 + 0.675) % 1; } const secondsInHour = 3600; -export function getPlayTimeString(totalSeconds: integer): string { +export function getPlayTimeString(totalSeconds: number): string { const days = `${Math.floor(totalSeconds / (secondsInHour * 24))}`; - const hours = `${Math.floor(totalSeconds % (secondsInHour * 24) / secondsInHour)}`; - const minutes = `${Math.floor(totalSeconds % secondsInHour / 60)}`; + const hours = `${Math.floor((totalSeconds % (secondsInHour * 24)) / secondsInHour)}`; + const minutes = `${Math.floor((totalSeconds % secondsInHour) / 60)}`; const seconds = `${Math.floor(totalSeconds % 60)}`; return `${days.padStart(2, "0")}:${hours.padStart(2, "0")}:${minutes.padStart(2, "0")}:${seconds.padStart(2, "0")}`; @@ -167,16 +165,16 @@ export function getPlayTimeString(totalSeconds: integer): string { */ export function getIvsFromId(id: number): number[] { return [ - (id & 0x3E000000) >>> 25, - (id & 0x01F00000) >>> 20, - (id & 0x000F8000) >>> 15, - (id & 0x00007C00) >>> 10, - (id & 0x000003E0) >>> 5, - (id & 0x0000001F) + (id & 0x3e000000) >>> 25, + (id & 0x01f00000) >>> 20, + (id & 0x000f8000) >>> 15, + (id & 0x00007c00) >>> 10, + (id & 0x000003e0) >>> 5, + id & 0x0000001f, ]; } -export function formatLargeNumber(count: integer, threshold: integer): string { +export function formatLargeNumber(count: number, threshold: number): string { if (count < threshold) { return count.toString(); } @@ -210,9 +208,9 @@ export function formatLargeNumber(count: integer, threshold: integer): string { } // Abbreviations from 10^0 to 10^33 -const AbbreviationsLargeNumber: string[] = [ "", "K", "M", "B", "t", "q", "Q", "s", "S", "o", "n", "d" ]; +const AbbreviationsLargeNumber: string[] = ["", "K", "M", "B", "t", "q", "Q", "s", "S", "o", "n", "d"]; -export function formatFancyLargeNumber(number: number, rounded: number = 3): string { +export function formatFancyLargeNumber(number: number, rounded = 3): string { let exponent: number; if (number < 1000) { @@ -236,16 +234,20 @@ export function formatMoney(format: MoneyFormat, amount: number) { return amount.toLocaleString(); } -export function formatStat(stat: integer, forHp: boolean = false): string { +export function formatStat(stat: number, forHp = false): string { return formatLargeNumber(stat, forHp ? 100000 : 1000000); } export function getEnumKeys(enumType: any): string[] { - return Object.values(enumType).filter(v => isNaN(parseInt(v!.toString()))).map(v => v!.toString()); + return Object.values(enumType) + .filter(v => Number.isNaN(Number.parseInt(v!.toString()))) + .map(v => v!.toString()); } -export function getEnumValues(enumType: any): integer[] { - return Object.values(enumType).filter(v => !isNaN(parseInt(v!.toString()))).map(v => parseInt(v!.toString())); +export function getEnumValues(enumType: any): number[] { + return Object.values(enumType) + .filter(v => !Number.isNaN(Number.parseInt(v!.toString()))) + .map(v => Number.parseInt(v!.toString())); } export function executeIf(condition: boolean, promiseFunc: () => Promise): Promise { @@ -254,15 +256,16 @@ export function executeIf(condition: boolean, promiseFunc: () => Promise): export const sessionIdKey = "pokerogue_sessionId"; // Check if the current hostname is 'localhost' or an IP address, and ensure a port is specified -export const isLocal = ( - (window.location.hostname === "localhost" || - /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/.test(window.location.hostname)) && - window.location.port !== "") || window.location.hostname === ""; +export const isLocal = + ((window.location.hostname === "localhost" || /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/.test(window.location.hostname)) && + window.location.port !== "") || + window.location.hostname === ""; /** * @deprecated Refer to [pokerogue-api.ts](./plugins/api/pokerogue-api.ts) instead */ -export const localServerUrl = import.meta.env.VITE_SERVER_URL ?? `http://${window.location.hostname}:${window.location.port + 1}`; +export const localServerUrl = + import.meta.env.VITE_SERVER_URL ?? `http://${window.location.hostname}:${window.location.port + 1}`; /** * Set the server URL based on whether it's local or not @@ -277,7 +280,7 @@ export const isBeta = import.meta.env.MODE === "beta"; // this checks to see if export function setCookie(cName: string, cValue: string): void { const expiration = new Date(); - expiration.setTime(new Date().getTime() + 3600000 * 24 * 30 * 3/*7*/); + expiration.setTime(new Date().getTime() + 3600000 * 24 * 30 * 3 /*7*/); document.cookie = `${cName}=${cValue};Secure;SameSite=Strict;Domain=${window.location.hostname};Path=/;Expires=${expiration.toUTCString()}`; } @@ -324,7 +327,7 @@ export async function localPing() { } /** Alias for the constructor of a class */ -export type Constructor = new(...args: unknown[]) => T; +export type Constructor = new (...args: unknown[]) => T; export class BooleanHolder { public value: boolean; @@ -342,13 +345,6 @@ export class NumberHolder { } } -/** @deprecated Use {@linkcode NumberHolder} */ -export class IntegerHolder extends NumberHolder { - constructor(value: integer) { - super(value); - } -} - export class FixedInt { public readonly value: number; @@ -357,8 +353,8 @@ export class FixedInt { } } -export function fixedInt(value: integer): integer { - return new FixedInt(value) as unknown as integer; +export function fixedInt(value: number): number { + return new FixedInt(value) as unknown as number; } /** @@ -379,14 +375,18 @@ export function toCamelCaseString(unformattedText: string): string { if (!unformattedText) { return ""; } - return unformattedText.split(/[_ ]/).filter(f => f).map((f, i) => i ? `${f[0].toUpperCase()}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join(""); + return unformattedText + .split(/[_ ]/) + .filter(f => f) + .map((f, i) => (i ? `${f[0].toUpperCase()}${f.slice(1).toLowerCase()}` : f.toLowerCase())) + .join(""); } -export function rgbToHsv(r: integer, g: integer, b: integer) { +export function rgbToHsv(r: number, g: number, b: number) { const v = Math.max(r, g, b); const c = v - Math.min(r, g, b); - const h = c && ((v === r) ? (g - b) / c : ((v === g) ? 2 + (b - r) / c : 4 + (r - g) / c)); - return [ 60 * (h < 0 ? h + 6 : h), v && c / v, v ]; + const h = c && (v === r ? (g - b) / c : v === g ? 2 + (b - r) / c : 4 + (r - g) / c); + return [60 * (h < 0 ? h + 6 : h), v && c / v, v]; } /** @@ -394,28 +394,28 @@ export function rgbToHsv(r: integer, g: integer, b: integer) { * @param {Array} rgb1 First RGB color in array * @param {Array} rgb2 Second RGB color in array */ -export function deltaRgb(rgb1: integer[], rgb2: integer[]): integer { - const [ r1, g1, b1 ] = rgb1; - const [ r2, g2, b2 ] = rgb2; +export function deltaRgb(rgb1: number[], rgb2: number[]): number { + const [r1, g1, b1] = rgb1; + const [r2, g2, b2] = rgb2; const drp2 = Math.pow(r1 - r2, 2); const dgp2 = Math.pow(g1 - g2, 2); const dbp2 = Math.pow(b1 - b2, 2); const t = (r1 + r2) / 2; - return Math.ceil(Math.sqrt(2 * drp2 + 4 * dgp2 + 3 * dbp2 + t * (drp2 - dbp2) / 256)); + return Math.ceil(Math.sqrt(2 * drp2 + 4 * dgp2 + 3 * dbp2 + (t * (drp2 - dbp2)) / 256)); } export function rgbHexToRgba(hex: string) { - const color = hex.match(/^([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i) ?? [ "000000", "00", "00", "00" ]; + const color = hex.match(/^([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i) ?? ["000000", "00", "00", "00"]; return { - r: parseInt(color[1], 16), - g: parseInt(color[2], 16), - b: parseInt(color[3], 16), - a: 255 + r: Number.parseInt(color[1], 16), + g: Number.parseInt(color[2], 16), + b: Number.parseInt(color[3], 16), + a: 255, }; } -export function rgbaToInt(rgba: integer[]): integer { +export function rgbaToInt(rgba: number[]): number { return (rgba[0] << 24) + (rgba[1] << 16) + (rgba[2] << 8) + rgba[3]; } @@ -434,7 +434,9 @@ export function hslToHex(h: number, s: number, l: number): string { const f = (n: number) => { const k = (n + h / 30) % 12; const rgb = l - a * Math.max(-1, Math.min(k - 3, 9 - k, 1)); - return Math.round(rgb * 255).toString(16).padStart(2, "0"); + return Math.round(rgb * 255) + .toString(16) + .padStart(2, "0"); }; return `#${f(0)}${f(8)}${f(4)}`; } @@ -445,7 +447,7 @@ export function hslToHex(h: number, s: number, l: number): string { * If the lang is not in the function, it usually means that lang is going to use the default english version * * English itself counts as not available -*/ + */ export function hasAllLocalizedSprites(lang?: string): boolean { // IMPORTANT - ONLY ADD YOUR LANG HERE IF YOU'VE ALREADY ADDED ALL THE NECESSARY IMAGES if (!lang) { @@ -473,12 +475,13 @@ export function hasAllLocalizedSprites(lang?: string): boolean { * @param container container with game objects inside it */ export function printContainerList(container: Phaser.GameObjects.Container): void { - console.log(container.list.map(go => { - return { type: go.type, name: go.name }; - })); + console.log( + container.list.map(go => { + return { type: go.type, name: go.name }; + }), + ); } - /** * Truncate a string to a specified maximum length and add an ellipsis if it exceeds that length. * @@ -486,7 +489,7 @@ export function printContainerList(container: Phaser.GameObjects.Container): voi * @param maxLength - The maximum length of the truncated string, defaults to 10. * @returns The truncated string with an ellipsis if it was longer than maxLength. */ -export function truncateString(str: String, maxLength: number = 10) { +export function truncateString(str: string, maxLength = 10) { // Check if the string length exceeds the maximum length if (str.length > maxLength) { // Truncate the string and add an ellipsis @@ -531,7 +534,7 @@ export function reverseValueToKeySetting(input) { * @param returnWithSpaces - Whether the returned string should have spaces between the words or not. * @returns The capitalized string. */ -export function capitalizeString(str: string, sep: string, lowerFirstChar: boolean = true, returnWithSpaces: boolean = false) { +export function capitalizeString(str: string, sep: string, lowerFirstChar = true, returnWithSpaces = false) { if (str) { const splitedStr = str.toLowerCase().split(sep); @@ -565,7 +568,7 @@ export function capitalizeFirstLetter(str: string) { * @param minValue - The minimum integer value to return. Defaults to 1. * @returns The converted value as an integer. */ -export function toDmgValue(value: number, minValue: number = 1) { +export function toDmgValue(value: number, minValue = 1) { return Math.max(Math.floor(value), minValue); } diff --git a/src/test/abilities/ability_duplication.test.ts b/test/abilities/ability_duplication.test.ts similarity index 81% rename from src/test/abilities/ability_duplication.test.ts rename to test/abilities/ability_duplication.test.ts index f9122b3259c..08b74f682f2 100644 --- a/src/test/abilities/ability_duplication.test.ts +++ b/test/abilities/ability_duplication.test.ts @@ -2,7 +2,7 @@ import { Stat } from "#app/enums/stat"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; @@ -23,7 +23,7 @@ describe("Ability Duplication", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .battleType("single") .ability(Abilities.HUGE_POWER) .enemyAbility(Abilities.BALL_FETCH) @@ -33,9 +33,9 @@ describe("Ability Duplication", () => { it("huge power should only be applied once if both normal and passive", async () => { game.override.passiveAbility(Abilities.HUGE_POWER); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); - const [ magikarp ] = game.scene.getPlayerField(); + const [magikarp] = game.scene.getPlayerField(); const magikarpAttack = magikarp.getEffectiveStat(Stat.ATK); magikarp.summonData.abilitySuppressed = true; @@ -46,9 +46,9 @@ describe("Ability Duplication", () => { it("huge power should stack with pure power", async () => { game.override.passiveAbility(Abilities.PURE_POWER); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); - const [ magikarp ] = game.scene.getPlayerField(); + const [magikarp] = game.scene.getPlayerField(); const magikarpAttack = magikarp.getEffectiveStat(Stat.ATK); magikarp.summonData.abilitySuppressed = true; diff --git a/src/test/abilities/ability_timing.test.ts b/test/abilities/ability_timing.test.ts similarity index 77% rename from src/test/abilities/ability_timing.test.ts rename to test/abilities/ability_timing.test.ts index e3264c2c1a8..d59c4f7c38d 100644 --- a/src/test/abilities/ability_timing.test.ts +++ b/test/abilities/ability_timing.test.ts @@ -5,11 +5,10 @@ import i18next from "#app/plugins/i18n"; import { Mode } from "#app/ui/ui"; import { Abilities } from "#enums/abilities"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - describe("Ability Timing", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -37,12 +36,17 @@ describe("Ability Timing", () => { it("should trigger after switch check", async () => { game.settings.battleStyle = BattleStyle.SWITCH; - await game.classicMode.runToSummon([ Species.EEVEE, Species.FEEBAS ]); + await game.classicMode.runToSummon([Species.EEVEE, Species.FEEBAS]); - game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - game.setMode(Mode.MESSAGE); - game.endPhase(); - }, () => game.isCurrentPhase(CommandPhase) || game.isCurrentPhase(TurnInitPhase)); + game.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + game.setMode(Mode.MESSAGE); + game.endPhase(); + }, + () => game.isCurrentPhase(CommandPhase) || game.isCurrentPhase(TurnInitPhase), + ); await game.phaseInterceptor.to("MessagePhase"); expect(i18next.t).toHaveBeenCalledWith("battle:statFell", expect.objectContaining({ count: 1 })); diff --git a/src/test/abilities/analytic.test.ts b/test/abilities/analytic.test.ts similarity index 73% rename from src/test/abilities/analytic.test.ts rename to test/abilities/analytic.test.ts index 12777c545f0..e488b467ce0 100644 --- a/src/test/abilities/analytic.test.ts +++ b/test/abilities/analytic.test.ts @@ -3,7 +3,7 @@ import { isBetween, toDmgValue } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -24,7 +24,7 @@ describe("Abilities - Analytic", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH, Moves.TACKLE ]) + .moveset([Moves.SPLASH, Moves.TACKLE]) .ability(Abilities.ANALYTIC) .battleType("single") .disableCrits() @@ -36,45 +36,45 @@ describe("Abilities - Analytic", () => { }); it("should increase damage if the user moves last", async () => { - await game.classicMode.startBattle([ Species.ARCEUS ]); + await game.classicMode.startBattle([Species.ARCEUS]); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.TACKLE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); const damage1 = enemy.getInverseHp(); enemy.hp = enemy.getMaxHp(); game.move.select(Moves.TACKLE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(isBetween(enemy.getInverseHp(), toDmgValue(damage1 * 1.3) - 3, toDmgValue(damage1 * 1.3) + 3)).toBe(true); }); it("should increase damage only if the user moves last in doubles", async () => { game.override.battleType("double"); - await game.classicMode.startBattle([ Species.GENGAR, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.GENGAR, Species.SHUCKLE]); - const [ enemy, ] = game.scene.getEnemyField(); + const [enemy] = game.scene.getEnemyField(); game.move.select(Moves.TACKLE, 0, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.toNextTurn(); const damage1 = enemy.getInverseHp(); enemy.hp = enemy.getMaxHp(); game.move.select(Moves.TACKLE, 0, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(isBetween(enemy.getInverseHp(), toDmgValue(damage1 * 1.3) - 3, toDmgValue(damage1 * 1.3) + 3)).toBe(true); enemy.hp = enemy.getMaxHp(); game.move.select(Moves.TACKLE, 0, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); expect(enemy.getInverseHp()).toBe(damage1); }); diff --git a/src/test/abilities/arena_trap.test.ts b/test/abilities/arena_trap.test.ts similarity index 85% rename from src/test/abilities/arena_trap.test.ts rename to test/abilities/arena_trap.test.ts index 12b9673080d..e0d093a91aa 100644 --- a/src/test/abilities/arena_trap.test.ts +++ b/test/abilities/arena_trap.test.ts @@ -2,7 +2,7 @@ import { allAbilities } from "#app/data/ability"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; @@ -46,11 +46,7 @@ describe("Abilities - Arena Trap", () => { }); it("should guarantee double battle with any one LURE", async () => { - game.override - .startingModifier([ - { name: "LURE" }, - ]) - .startingWave(2); + game.override.startingModifier([{ name: "LURE" }]).startingWave(2); await game.classicMode.startBattle(); @@ -67,12 +63,12 @@ describe("Abilities - Arena Trap", () => { game.override .battleType("double") .enemyMoveset(Moves.SPLASH) - .moveset([ Moves.ROAR, Moves.SPLASH ]) + .moveset([Moves.ROAR, Moves.SPLASH]) .ability(Abilities.BALL_FETCH); - await game.classicMode.startBattle([ Species.MAGIKARP, Species.SUDOWOODO, Species.LUNATONE ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.SUDOWOODO, Species.LUNATONE]); - const [ enemy1, enemy2 ] = game.scene.getEnemyField(); - const [ player1, player2 ] = game.scene.getPlayerField(); + const [enemy1, enemy2] = game.scene.getEnemyField(); + const [player1, player2] = game.scene.getPlayerField(); vi.spyOn(enemy1, "getAbility").mockReturnValue(allAbilities[Abilities.ARENA_TRAP]); diff --git a/src/test/abilities/aroma_veil.test.ts b/test/abilities/aroma_veil.test.ts similarity index 85% rename from src/test/abilities/aroma_veil.test.ts rename to test/abilities/aroma_veil.test.ts index 4ba4d16504b..af8a0233a60 100644 --- a/src/test/abilities/aroma_veil.test.ts +++ b/test/abilities/aroma_veil.test.ts @@ -1,7 +1,7 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Abilities } from "#enums/abilities"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { BattlerTagType } from "#enums/battler-tag-type"; @@ -27,14 +27,14 @@ describe("Moves - Aroma Veil", () => { game.override .battleType("double") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.HEAL_BLOCK, Moves.IMPRISON, Moves.SPLASH ]) + .enemyMoveset([Moves.HEAL_BLOCK, Moves.IMPRISON, Moves.SPLASH]) .enemySpecies(Species.SHUCKLE) .ability(Abilities.AROMA_VEIL) - .moveset([ Moves.GROWL ]); + .moveset([Moves.GROWL]); }); it("Aroma Veil protects the Pokemon's side against most Move Restriction Battler Tags", async () => { - await game.classicMode.startBattle([ Species.REGIELEKI, Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.REGIELEKI, Species.BULBASAUR]); const party = game.scene.getPlayerParty()! as PlayerPokemon[]; @@ -48,7 +48,7 @@ describe("Moves - Aroma Veil", () => { }); it("Aroma Veil does not protect against Imprison", async () => { - await game.classicMode.startBattle([ Species.REGIELEKI, Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.REGIELEKI, Species.BULBASAUR]); const party = game.scene.getPlayerParty()! as PlayerPokemon[]; diff --git a/src/test/abilities/aura_break.test.ts b/test/abilities/aura_break.test.ts similarity index 83% rename from src/test/abilities/aura_break.test.ts rename to test/abilities/aura_break.test.ts index 137688d1f22..86b6c69ec8b 100644 --- a/src/test/abilities/aura_break.test.ts +++ b/test/abilities/aura_break.test.ts @@ -1,8 +1,8 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -10,7 +10,7 @@ describe("Abilities - Aura Break", () => { let phaserGame: Phaser.Game; let game: GameManager; - const auraBreakMultiplier = 9 / 16 * 4 / 3; + const auraBreakMultiplier = ((9 / 16) * 4) / 3; beforeAll(() => { phaserGame = new Phaser.Game({ @@ -25,7 +25,7 @@ describe("Abilities - Aura Break", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("single"); - game.override.moveset([ Moves.MOONBLAST, Moves.DARK_PULSE, Moves.MOONBLAST, Moves.DARK_PULSE ]); + game.override.moveset([Moves.MOONBLAST, Moves.DARK_PULSE, Moves.MOONBLAST, Moves.DARK_PULSE]); game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.AURA_BREAK); game.override.enemySpecies(Species.SHUCKLE); @@ -38,7 +38,7 @@ describe("Abilities - Aura Break", () => { game.override.ability(Abilities.FAIRY_AURA); vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.MOONBLAST); await game.phaseInterceptor.to("MoveEffectPhase"); @@ -52,7 +52,7 @@ describe("Abilities - Aura Break", () => { game.override.ability(Abilities.DARK_AURA); vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.DARK_PULSE); await game.phaseInterceptor.to("MoveEffectPhase"); @@ -66,7 +66,7 @@ describe("Abilities - Aura Break", () => { game.override.ability(Abilities.BALL_FETCH); vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.MOONBLAST); await game.phaseInterceptor.to("MoveEffectPhase"); diff --git a/src/test/abilities/battery.test.ts b/test/abilities/battery.test.ts similarity index 85% rename from src/test/abilities/battery.test.ts rename to test/abilities/battery.test.ts index 8abeca287f7..cc7570c3d31 100644 --- a/src/test/abilities/battery.test.ts +++ b/test/abilities/battery.test.ts @@ -1,10 +1,10 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -29,7 +29,7 @@ describe("Abilities - Battery", () => { game.override.battleType("double"); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.moveset([ Moves.TACKLE, Moves.BREAKING_SWIPE, Moves.SPLASH, Moves.DAZZLING_GLEAM ]); + game.override.moveset([Moves.TACKLE, Moves.BREAKING_SWIPE, Moves.SPLASH, Moves.DAZZLING_GLEAM]); game.override.enemyMoveset(Moves.SPLASH); }); @@ -39,7 +39,7 @@ describe("Abilities - Battery", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([ Species.PIKACHU, Species.CHARJABUG ]); + await game.startBattle([Species.PIKACHU, Species.CHARJABUG]); game.move.select(Moves.DAZZLING_GLEAM); game.move.select(Moves.SPLASH, 1); @@ -54,7 +54,7 @@ describe("Abilities - Battery", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([ Species.PIKACHU, Species.CHARJABUG ]); + await game.startBattle([Species.PIKACHU, Species.CHARJABUG]); game.move.select(Moves.BREAKING_SWIPE); game.move.select(Moves.SPLASH, 1); @@ -69,7 +69,7 @@ describe("Abilities - Battery", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([ Species.CHARJABUG, Species.PIKACHU ]); + await game.startBattle([Species.CHARJABUG, Species.PIKACHU]); game.move.select(Moves.DAZZLING_GLEAM); game.move.select(Moves.SPLASH, 1); diff --git a/src/test/abilities/battle_bond.test.ts b/test/abilities/battle_bond.test.ts similarity index 86% rename from src/test/abilities/battle_bond.test.ts rename to test/abilities/battle_bond.test.ts index db7ed01e7d9..6305d7dedc5 100644 --- a/src/test/abilities/battle_bond.test.ts +++ b/test/abilities/battle_bond.test.ts @@ -1,13 +1,13 @@ -import { allMoves, MultiHitAttr, MultiHitType } from "#app/data/move"; +import { allMoves, MultiHitAttr } from "#app/data/moves/move"; +import { MultiHitType } from "#enums/MultiHitType"; import { Status } from "#app/data/status-effect"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - describe("Abilities - BATTLE BOND", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -27,11 +27,12 @@ describe("Abilities - BATTLE BOND", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single") + game.override + .battleType("single") .startingWave(4) // Leads to arena reset on Wave 5 trainer battle .ability(Abilities.BATTLE_BOND) - .starterForms({ [Species.GRENINJA]: ashForm, }) - .moveset([ Moves.SPLASH, Moves.WATER_SHURIKEN ]) + .starterForms({ [Species.GRENINJA]: ashForm }) + .moveset([Moves.SPLASH, Moves.WATER_SHURIKEN]) .enemySpecies(Species.BULBASAUR) .enemyMoveset(Moves.SPLASH) .startingLevel(100) // Avoid levelling up @@ -39,7 +40,7 @@ describe("Abilities - BATTLE BOND", () => { }); it("check if fainted pokemon switches to base form on arena reset", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP, Species.GRENINJA ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.GRENINJA]); const greninja = game.scene.getPlayerParty()[1]; expect(greninja.formIndex).toBe(ashForm); @@ -58,7 +59,7 @@ describe("Abilities - BATTLE BOND", () => { }); it("should not keep buffing Water Shuriken after Greninja switches to base form", async () => { - await game.classicMode.startBattle([ Species.GRENINJA ]); + await game.classicMode.startBattle([Species.GRENINJA]); const waterShuriken = allMoves[Moves.WATER_SHURIKEN]; vi.spyOn(waterShuriken, "calculateBattlePower"); diff --git a/src/test/abilities/beast_boost.test.ts b/test/abilities/beast_boost.test.ts similarity index 72% rename from src/test/abilities/beast_boost.test.ts rename to test/abilities/beast_boost.test.ts index de31b979e32..b307a9eeeba 100644 --- a/src/test/abilities/beast_boost.test.ts +++ b/test/abilities/beast_boost.test.ts @@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -29,16 +29,16 @@ describe("Abilities - Beast Boost", () => { .enemyAbility(Abilities.BEAST_BOOST) .ability(Abilities.BEAST_BOOST) .startingLevel(2000) - .moveset([ Moves.FLAMETHROWER ]) + .moveset([Moves.FLAMETHROWER]) .enemyMoveset(Moves.SPLASH); }); - it("should prefer highest stat to boost its corresponding stat stage by 1 when winning a battle", async() => { - await game.classicMode.startBattle([ Species.SLOWBRO ]); + it("should prefer highest stat to boost its corresponding stat stage by 1 when winning a battle", async () => { + await game.classicMode.startBattle([Species.SLOWBRO]); const playerPokemon = game.scene.getPlayerPokemon()!; // Set the pokemon's highest stat to DEF, so it should be picked by Beast Boost - vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([ 10000, 100, 1000, 200, 100, 100 ]); + vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([10000, 100, 1000, 200, 100, 100]); console.log(playerPokemon.stats); expect(playerPokemon.getStatStage(Stat.DEF)).toBe(0); @@ -49,33 +49,33 @@ describe("Abilities - Beast Boost", () => { expect(playerPokemon.getStatStage(Stat.DEF)).toBe(1); }, 20000); - it("should use in-battle overriden stats when determining the stat stage to raise by 1", async() => { - game.override.enemyMoveset([ Moves.GUARD_SPLIT ]); + it("should use in-battle overriden stats when determining the stat stage to raise by 1", async () => { + game.override.enemyMoveset([Moves.GUARD_SPLIT]); - await game.classicMode.startBattle([ Species.SLOWBRO ]); + await game.classicMode.startBattle([Species.SLOWBRO]); const playerPokemon = game.scene.getPlayerPokemon()!; // If the opponent uses Guard Split, the pokemon's second highest stat (SPATK) should be chosen - vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([ 10000, 100, 201, 200, 100, 100 ]); + vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([10000, 100, 201, 200, 100, 100]); expect(playerPokemon.getStatStage(Stat.SPATK)).toBe(0); game.move.select(Moves.FLAMETHROWER); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("VictoryPhase"); expect(playerPokemon.getStatStage(Stat.SPATK)).toBe(1); }, 20000); - it("should have order preference in case of stat ties", async() => { + it("should have order preference in case of stat ties", async () => { // Order preference follows the order of EFFECTIVE_STAT - await game.classicMode.startBattle([ Species.SLOWBRO ]); + await game.classicMode.startBattle([Species.SLOWBRO]); const playerPokemon = game.scene.getPlayerPokemon()!; // Set up tie between SPATK, SPDEF, and SPD, where SPATK should win - vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([ 10000, 1, 1, 100, 100, 100 ]); + vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([10000, 1, 1, 100, 100, 100]); expect(playerPokemon.getStatStage(Stat.SPATK)).toBe(0); diff --git a/src/test/abilities/commander.test.ts b/test/abilities/commander.test.ts similarity index 78% rename from src/test/abilities/commander.test.ts rename to test/abilities/commander.test.ts index 70568639b61..9d16d474dd4 100644 --- a/src/test/abilities/commander.test.ts +++ b/test/abilities/commander.test.ts @@ -9,7 +9,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -32,7 +32,7 @@ describe("Abilities - Commander", () => { game.override .startingLevel(100) .enemyLevel(100) - .moveset([ Moves.LIQUIDATION, Moves.MEMENTO, Moves.SPLASH, Moves.FLIP_TURN ]) + .moveset([Moves.LIQUIDATION, Moves.MEMENTO, Moves.SPLASH, Moves.FLIP_TURN]) .ability(Abilities.COMMANDER) .battleType("double") .disableCrits() @@ -44,15 +44,15 @@ describe("Abilities - Commander", () => { }); it("causes the source to jump into Dondozo's mouth, granting a stat boost and hiding the source", async () => { - await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]); + await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]); - const [ tatsugiri, dondozo ] = game.scene.getPlayerField(); + const [tatsugiri, dondozo] = game.scene.getPlayerField(); - const affectedStats: EffectiveStat[] = [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ]; + const affectedStats: EffectiveStat[] = [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD]; expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY); expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined(); - affectedStats.forEach((stat) => expect(dondozo.getStatStage(stat)).toBe(2)); + affectedStats.forEach(stat => expect(dondozo.getStatStage(stat)).toBe(2)); game.move.select(Moves.SPLASH, 1); @@ -70,7 +70,7 @@ describe("Abilities - Commander", () => { it("should activate when a Dondozo switches in and cancel the source's move", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.TATSUGIRI, Species.MAGIKARP, Species.DONDOZO ]); + await game.classicMode.startBattle([Species.TATSUGIRI, Species.MAGIKARP, Species.DONDOZO]); const tatsugiri = game.scene.getPlayerField()[0]; @@ -89,9 +89,9 @@ describe("Abilities - Commander", () => { }); it("source should reenter the field when Dondozo faints", async () => { - await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]); + await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]); - const [ tatsugiri, dondozo ] = game.scene.getPlayerField(); + const [tatsugiri, dondozo] = game.scene.getPlayerField(); expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY); expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined(); @@ -103,7 +103,7 @@ describe("Abilities - Commander", () => { await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("FaintPhase", false); expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeUndefined(); @@ -114,13 +114,11 @@ describe("Abilities - Commander", () => { }); it("source should still take damage from Poison while hidden", async () => { - game.override - .statusEffect(StatusEffect.POISON) - .enemyMoveset(Moves.SPLASH); + game.override.statusEffect(StatusEffect.POISON).enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]); + await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]); - const [ tatsugiri, dondozo ] = game.scene.getPlayerField(); + const [tatsugiri, dondozo] = game.scene.getPlayerField(); expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY); expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined(); @@ -136,9 +134,9 @@ describe("Abilities - Commander", () => { it("source should still take damage from Salt Cure while hidden", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]); + await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]); - const [ tatsugiri, dondozo ] = game.scene.getPlayerField(); + const [tatsugiri, dondozo] = game.scene.getPlayerField(); expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY); expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined(); @@ -154,13 +152,11 @@ describe("Abilities - Commander", () => { }); it("source should still take damage from Sandstorm while hidden", async () => { - game.override - .weather(WeatherType.SANDSTORM) - .enemyMoveset(Moves.SPLASH); + game.override.weather(WeatherType.SANDSTORM).enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]); + await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]); - const [ tatsugiri, dondozo ] = game.scene.getPlayerField(); + const [tatsugiri, dondozo] = game.scene.getPlayerField(); expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY); expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined(); @@ -174,11 +170,11 @@ describe("Abilities - Commander", () => { }); it("should make Dondozo immune to being forced out", async () => { - game.override.enemyMoveset([ Moves.SPLASH, Moves.WHIRLWIND ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.WHIRLWIND]); - await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]); + await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]); - const [ tatsugiri, dondozo ] = game.scene.getPlayerField(); + const [tatsugiri, dondozo] = game.scene.getPlayerField(); expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY); expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined(); @@ -196,11 +192,9 @@ describe("Abilities - Commander", () => { }); it("should interrupt the source's semi-invulnerability", async () => { - game.override - .moveset([ Moves.SPLASH, Moves.DIVE ]) - .enemyMoveset(Moves.SPLASH); + game.override.moveset([Moves.SPLASH, Moves.DIVE]).enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.TATSUGIRI, Species.MAGIKARP, Species.DONDOZO ]); + await game.classicMode.startBattle([Species.TATSUGIRI, Species.MAGIKARP, Species.DONDOZO]); const tatsugiri = game.scene.getPlayerField()[0]; diff --git a/src/test/abilities/competitive.test.ts b/test/abilities/competitive.test.ts similarity index 86% rename from src/test/abilities/competitive.test.ts rename to test/abilities/competitive.test.ts index ecb276a1b8d..cad35be18f7 100644 --- a/src/test/abilities/competitive.test.ts +++ b/test/abilities/competitive.test.ts @@ -3,7 +3,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -24,16 +24,17 @@ describe("Abilities - Competitive", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single") + game.override + .battleType("single") .enemySpecies(Species.BEEDRILL) .enemyMoveset(Moves.TICKLE) .startingLevel(1) - .moveset([ Moves.SPLASH, Moves.CLOSE_COMBAT ]) + .moveset([Moves.SPLASH, Moves.CLOSE_COMBAT]) .ability(Abilities.COMPETITIVE); }); it("lower atk and def by 1 via tickle, then increase spatk by 4 via competitive", async () => { - await game.classicMode.startBattle([ Species.FLYGON ]); + await game.classicMode.startBattle([Species.FLYGON]); const playerPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.SPLASH); @@ -46,7 +47,7 @@ describe("Abilities - Competitive", () => { it("lowering your own stats should not trigger competitive", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.FLYGON ]); + await game.classicMode.startBattle([Species.FLYGON]); const playerPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.CLOSE_COMBAT); @@ -59,7 +60,7 @@ describe("Abilities - Competitive", () => { it("white herb should remove only the negative effects", async () => { game.override.startingHeldItems([{ name: "WHITE_HERB" }]); - await game.classicMode.startBattle([ Species.FLYGON ]); + await game.classicMode.startBattle([Species.FLYGON]); const playerPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.SPLASH); diff --git a/src/test/abilities/contrary.test.ts b/test/abilities/contrary.test.ts similarity index 76% rename from src/test/abilities/contrary.test.ts rename to test/abilities/contrary.test.ts index c838a5a098e..19041eb2801 100644 --- a/src/test/abilities/contrary.test.ts +++ b/test/abilities/contrary.test.ts @@ -2,7 +2,7 @@ import { Moves } from "#app/enums/moves"; import { Abilities } from "#enums/abilities"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -30,10 +30,8 @@ describe("Abilities - Contrary", () => { .enemyMoveset(Moves.SPLASH); }); - it("should invert stat changes when applied", async() => { - await game.classicMode.startBattle([ - Species.SLOWBRO - ]); + it("should invert stat changes when applied", async () => { + await game.classicMode.startBattle([Species.SLOWBRO]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -42,10 +40,8 @@ describe("Abilities - Contrary", () => { describe("With Clear Body", () => { it("should apply positive effects", async () => { - game.override - .enemyPassiveAbility(Abilities.CLEAR_BODY) - .moveset([ Moves.TAIL_WHIP ]); - await game.classicMode.startBattle([ Species.SLOWBRO ]); + game.override.enemyPassiveAbility(Abilities.CLEAR_BODY).moveset([Moves.TAIL_WHIP]); + await game.classicMode.startBattle([Species.SLOWBRO]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -60,9 +56,9 @@ describe("Abilities - Contrary", () => { it("should block negative effects", async () => { game.override .enemyPassiveAbility(Abilities.CLEAR_BODY) - .enemyMoveset([ Moves.HOWL, Moves.HOWL, Moves.HOWL, Moves.HOWL ]) - .moveset([ Moves.SPLASH ]); - await game.classicMode.startBattle([ Species.SLOWBRO ]); + .enemyMoveset([Moves.HOWL, Moves.HOWL, Moves.HOWL, Moves.HOWL]) + .moveset([Moves.SPLASH]); + await game.classicMode.startBattle([Species.SLOWBRO]); const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/src/test/abilities/corrosion.test.ts b/test/abilities/corrosion.test.ts similarity index 90% rename from src/test/abilities/corrosion.test.ts rename to test/abilities/corrosion.test.ts index e607e85defb..b7f316fbe2d 100644 --- a/src/test/abilities/corrosion.test.ts +++ b/test/abilities/corrosion.test.ts @@ -1,7 +1,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -22,7 +22,7 @@ describe("Abilities - Corrosion", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .battleType("single") .disableCrits() .enemySpecies(Species.GRIMER) @@ -32,7 +32,7 @@ describe("Abilities - Corrosion", () => { it("If a Poison- or Steel-type Pokémon with this Ability poisons a target with Synchronize, Synchronize does not gain the ability to poison Poison- or Steel-type Pokémon.", async () => { game.override.ability(Abilities.SYNCHRONIZE); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const playerPokemon = game.scene.getPlayerPokemon(); const enemyPokemon = game.scene.getEnemyPokemon(); diff --git a/test/abilities/costar.test.ts b/test/abilities/costar.test.ts new file mode 100644 index 00000000000..c6a44bffe54 --- /dev/null +++ b/test/abilities/costar.test.ts @@ -0,0 +1,77 @@ +import { Stat } from "#enums/stat"; +import { Abilities } from "#app/enums/abilities"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { CommandPhase } from "#app/phases/command-phase"; +import { MessagePhase } from "#app/phases/message-phase"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Abilities - COSTAR", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("double"); + game.override.ability(Abilities.COSTAR); + game.override.moveset([Moves.SPLASH, Moves.NASTY_PLOT]); + game.override.enemyMoveset(Moves.SPLASH); + }); + + test("ability copies positive stat stages", async () => { + game.override.enemyAbility(Abilities.BALL_FETCH); + + await game.startBattle([Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO]); + + let [leftPokemon, rightPokemon] = game.scene.getPlayerField(); + + game.move.select(Moves.NASTY_PLOT); + await game.phaseInterceptor.to(CommandPhase); + game.move.select(Moves.SPLASH, 1); + await game.toNextTurn(); + + expect(leftPokemon.getStatStage(Stat.SPATK)).toBe(2); + expect(rightPokemon.getStatStage(Stat.SPATK)).toBe(0); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(CommandPhase); + game.doSwitchPokemon(2); + await game.phaseInterceptor.to(MessagePhase); + + [leftPokemon, rightPokemon] = game.scene.getPlayerField(); + expect(leftPokemon.getStatStage(Stat.SPATK)).toBe(2); + expect(rightPokemon.getStatStage(Stat.SPATK)).toBe(2); + }); + + test("ability copies negative stat stages", async () => { + game.override.enemyAbility(Abilities.INTIMIDATE); + + await game.startBattle([Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO]); + + let [leftPokemon, rightPokemon] = game.scene.getPlayerField(); + + expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2); + expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(CommandPhase); + game.doSwitchPokemon(2); + await game.phaseInterceptor.to(MessagePhase); + + [leftPokemon, rightPokemon] = game.scene.getPlayerField(); + expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2); + expect(rightPokemon.getStatStage(Stat.ATK)).toBe(-2); + }); +}); diff --git a/src/test/abilities/dancer.test.ts b/test/abilities/dancer.test.ts similarity index 76% rename from src/test/abilities/dancer.test.ts rename to test/abilities/dancer.test.ts index 3a480316c96..56c357b2212 100644 --- a/src/test/abilities/dancer.test.ts +++ b/test/abilities/dancer.test.ts @@ -3,7 +3,7 @@ import type { MovePhase } from "#app/phases/move-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -29,19 +29,16 @@ describe("Abilities - Dancer", () => { // Reference Link: https://bulbapedia.bulbagarden.net/wiki/Dancer_(Ability) it("triggers when dance moves are used, doesn't consume extra PP", async () => { - game.override - .enemyAbility(Abilities.DANCER) - .enemySpecies(Species.MAGIKARP) - .enemyMoveset(Moves.VICTORY_DANCE); - await game.classicMode.startBattle([ Species.ORICORIO, Species.FEEBAS ]); + game.override.enemyAbility(Abilities.DANCER).enemySpecies(Species.MAGIKARP).enemyMoveset(Moves.VICTORY_DANCE); + await game.classicMode.startBattle([Species.ORICORIO, Species.FEEBAS]); - const [ oricorio, feebas ] = game.scene.getPlayerField(); - game.move.changeMoveset(oricorio, [ Moves.SWORDS_DANCE, Moves.VICTORY_DANCE, Moves.SPLASH ]); - game.move.changeMoveset(feebas, [ Moves.SWORDS_DANCE, Moves.SPLASH ]); + const [oricorio, feebas] = game.scene.getPlayerField(); + game.move.changeMoveset(oricorio, [Moves.SWORDS_DANCE, Moves.VICTORY_DANCE, Moves.SPLASH]); + game.move.changeMoveset(feebas, [Moves.SWORDS_DANCE, Moves.SPLASH]); game.move.select(Moves.SPLASH); game.move.select(Moves.SWORDS_DANCE, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("MovePhase"); // immediately copies ally move await game.phaseInterceptor.to("MovePhase", false); @@ -65,20 +62,20 @@ describe("Abilities - Dancer", () => { // TODO: Enable after Dancer rework to not push to move history it.todo("should not count as the last move used for mirror move/instruct", async () => { game.override - .moveset([ Moves.FIERY_DANCE, Moves.REVELATION_DANCE ]) - .enemyMoveset([ Moves.INSTRUCT, Moves.MIRROR_MOVE, Moves.SPLASH ]) + .moveset([Moves.FIERY_DANCE, Moves.REVELATION_DANCE]) + .enemyMoveset([Moves.INSTRUCT, Moves.MIRROR_MOVE, Moves.SPLASH]) .enemySpecies(Species.SHUCKLE) .enemyLevel(10); - await game.classicMode.startBattle([ Species.ORICORIO, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.ORICORIO, Species.FEEBAS]); - const [ oricorio ] = game.scene.getPlayerField(); - const [ , shuckle2 ] = game.scene.getEnemyField(); + const [oricorio] = game.scene.getPlayerField(); + const [, shuckle2] = game.scene.getEnemyField(); game.move.select(Moves.REVELATION_DANCE, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2); game.move.select(Moves.FIERY_DANCE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2); await game.forceEnemyMove(Moves.INSTRUCT, BattlerIndex.PLAYER); await game.forceEnemyMove(Moves.MIRROR_MOVE, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MovePhase"); // Oricorio rev dance await game.phaseInterceptor.to("MovePhase"); // Feebas fiery dance await game.phaseInterceptor.to("MovePhase"); // Oricorio fiery dance (from dancer) @@ -97,6 +94,5 @@ describe("Abilities - Dancer", () => { currentPhase = game.scene.getCurrentPhase() as MovePhase; expect(currentPhase.pokemon).toBe(oricorio); expect(currentPhase.move.moveId).toBe(Moves.REVELATION_DANCE); - }); }); diff --git a/src/test/abilities/defiant.test.ts b/test/abilities/defiant.test.ts similarity index 86% rename from src/test/abilities/defiant.test.ts rename to test/abilities/defiant.test.ts index aa8d250dad7..a73002d999c 100644 --- a/src/test/abilities/defiant.test.ts +++ b/test/abilities/defiant.test.ts @@ -3,7 +3,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -24,16 +24,17 @@ describe("Abilities - Defiant", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single") + game.override + .battleType("single") .enemySpecies(Species.BEEDRILL) .enemyMoveset(Moves.TICKLE) .startingLevel(1) - .moveset([ Moves.SPLASH, Moves.CLOSE_COMBAT ]) + .moveset([Moves.SPLASH, Moves.CLOSE_COMBAT]) .ability(Abilities.DEFIANT); }); it("lower atk and def by 1 via tickle, then increase atk by 4 via defiant", async () => { - await game.classicMode.startBattle([ Species.FLYGON ]); + await game.classicMode.startBattle([Species.FLYGON]); const playerPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.SPLASH); @@ -45,7 +46,7 @@ describe("Abilities - Defiant", () => { it("lowering your own stats should not trigger defiant", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.FLYGON ]); + await game.classicMode.startBattle([Species.FLYGON]); const playerPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.CLOSE_COMBAT); @@ -58,7 +59,7 @@ describe("Abilities - Defiant", () => { it("white herb should remove only the negative effects", async () => { game.override.startingHeldItems([{ name: "WHITE_HERB" }]); - await game.classicMode.startBattle([ Species.FLYGON ]); + await game.classicMode.startBattle([Species.FLYGON]); const playerPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.SPLASH); diff --git a/test/abilities/desolate-land.test.ts b/test/abilities/desolate-land.test.ts new file mode 100644 index 00000000000..67d9ac1cdf5 --- /dev/null +++ b/test/abilities/desolate-land.test.ts @@ -0,0 +1,134 @@ +import { PokeballType } from "#app/enums/pokeball"; +import { WeatherType } from "#app/enums/weather-type"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; + +describe("Abilities - Desolate Land", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset(Moves.SPLASH) + .hasPassiveAbility(true) + .enemySpecies(Species.RALTS) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + /** + * This checks that the weather has changed after the Enemy Pokemon with {@linkcode Abilities.DESOLATE_LAND} + * is forcefully moved out of the field from moves such as Roar {@linkcode Moves.ROAR} + */ + it("should lift only when all pokemon with this ability leave the field", async () => { + game.override.battleType("double").enemyMoveset([Moves.SPLASH, Moves.ROAR]); + await game.classicMode.startBattle([Species.MAGCARGO, Species.MAGCARGO, Species.MAGIKARP, Species.MAGIKARP]); + + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN); + + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { + return min; + }); + + game.move.select(Moves.SPLASH, 0, 2); + game.move.select(Moves.SPLASH, 1, 2); + + await game.forceEnemyMove(Moves.ROAR, 0); + await game.forceEnemyMove(Moves.SPLASH, 1); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN); + + await game.toNextTurn(); + + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { + return min + 1; + }); + + game.move.select(Moves.SPLASH, 0, 2); + game.move.select(Moves.SPLASH, 1, 2); + + await game.forceEnemyMove(Moves.ROAR, 1); + await game.forceEnemyMove(Moves.SPLASH, 0); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(game.scene.arena.weather?.weatherType).not.toBe(WeatherType.HARSH_SUN); + }); + + it("should lift when enemy faints", async () => { + game.override + .battleType("single") + .moveset([Moves.SHEER_COLD]) + .ability(Abilities.NO_GUARD) + .startingLevel(100) + .enemyLevel(1) + .enemyMoveset([Moves.SPLASH]) + .enemySpecies(Species.MAGCARGO) + .enemyHasPassiveAbility(true); + await game.classicMode.startBattle([Species.MAGIKARP]); + + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN); + + game.move.select(Moves.SHEER_COLD); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(game.scene.arena.weather?.weatherType).not.toBe(WeatherType.HARSH_SUN); + }); + + it("should lift when pokemon returns upon switching from double to single battle", async () => { + game.override.battleType("even-doubles").enemyMoveset([Moves.SPLASH, Moves.MEMENTO]).startingWave(12); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGCARGO]); + + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN); + + game.move.select(Moves.SPLASH, 0, 2); + game.move.select(Moves.SPLASH, 1, 2); + await game.forceEnemyMove(Moves.MEMENTO, 0); + await game.forceEnemyMove(Moves.MEMENTO, 1); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN); + + await game.toNextWave(); + + expect(game.scene.arena.weather?.weatherType).not.toBe(WeatherType.HARSH_SUN); + }); + + it("should lift when enemy is captured", async () => { + game.override + .battleType("single") + .enemyMoveset([Moves.SPLASH]) + .enemySpecies(Species.MAGCARGO) + .enemyHasPassiveAbility(true); + await game.classicMode.startBattle([Species.MAGIKARP]); + + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN); + + game.scene.pokeballCounts[PokeballType.MASTER_BALL] = 1; + + game.doThrowPokeball(PokeballType.MASTER_BALL); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(game.scene.arena.weather?.weatherType).not.toBe(WeatherType.HARSH_SUN); + }); +}); diff --git a/src/test/abilities/disguise.test.ts b/test/abilities/disguise.test.ts similarity index 88% rename from src/test/abilities/disguise.test.ts rename to test/abilities/disguise.test.ts index 07a84bd7a5a..a971f5c2733 100644 --- a/src/test/abilities/disguise.test.ts +++ b/test/abilities/disguise.test.ts @@ -5,10 +5,9 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Abilities - Disguise", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -32,7 +31,7 @@ describe("Abilities - Disguise", () => { .enemySpecies(Species.MIMIKYU) .enemyMoveset(Moves.SPLASH) .starterSpecies(Species.REGIELEKI) - .moveset([ Moves.SHADOW_SNEAK, Moves.VACUUM_WAVE, Moves.TOXIC_THREAD, Moves.SPLASH ]); + .moveset([Moves.SHADOW_SNEAK, Moves.VACUUM_WAVE, Moves.TOXIC_THREAD, Moves.SPLASH]); }); it("takes no damage from attacking move and transforms to Busted form, takes 1/8 max HP damage from the disguise breaking", async () => { @@ -67,7 +66,7 @@ describe("Abilities - Disguise", () => { }); it("takes no damage from the first hit of a multihit move and transforms to Busted form, then takes damage from the second hit", async () => { - game.override.moveset([ Moves.SURGING_STRIKES ]); + game.override.moveset([Moves.SURGING_STRIKES]); game.override.enemyLevel(5); await game.classicMode.startBattle(); @@ -107,10 +106,10 @@ describe("Abilities - Disguise", () => { }); it("persists form change when switched out", async () => { - game.override.enemyMoveset([ Moves.SHADOW_SNEAK ]); + game.override.enemyMoveset([Moves.SHADOW_SNEAK]); game.override.starterSpecies(0); - await game.classicMode.startBattle([ Species.MIMIKYU, Species.FURRET ]); + await game.classicMode.startBattle([Species.MIMIKYU, Species.FURRET]); const mimikyu = game.scene.getPlayerPokemon()!; const maxHp = mimikyu.getMaxHp(); @@ -134,9 +133,9 @@ describe("Abilities - Disguise", () => { it("persists form change when wave changes with no arena reset", async () => { game.override.starterSpecies(0); game.override.starterForms({ - [Species.MIMIKYU]: bustedForm + [Species.MIMIKYU]: bustedForm, }); - await game.classicMode.startBattle([ Species.FURRET, Species.MIMIKYU ]); + await game.classicMode.startBattle([Species.FURRET, Species.MIMIKYU]); const mimikyu = game.scene.getPlayerParty()[1]!; expect(mimikyu.formIndex).toBe(bustedForm); @@ -152,7 +151,7 @@ describe("Abilities - Disguise", () => { game.override.startingWave(4); game.override.starterSpecies(Species.MIMIKYU); game.override.starterForms({ - [Species.MIMIKYU]: bustedForm + [Species.MIMIKYU]: bustedForm, }); await game.classicMode.startBattle(); @@ -172,10 +171,10 @@ describe("Abilities - Disguise", () => { game.override.startingWave(10); game.override.starterSpecies(0); game.override.starterForms({ - [Species.MIMIKYU]: bustedForm + [Species.MIMIKYU]: bustedForm, }); - await game.classicMode.startBattle([ Species.MIMIKYU, Species.FURRET ]); + await game.classicMode.startBattle([Species.MIMIKYU, Species.FURRET]); const mimikyu1 = game.scene.getPlayerPokemon()!; @@ -193,7 +192,7 @@ describe("Abilities - Disguise", () => { }); it("doesn't faint twice when fainting due to Disguise break damage, nor prevent faint from Disguise break damage if using Endure", async () => { - game.override.enemyMoveset([ Moves.ENDURE ]); + game.override.enemyMoveset([Moves.ENDURE]); await game.classicMode.startBattle(); const mimikyu = game.scene.getEnemyPokemon()!; @@ -208,7 +207,7 @@ describe("Abilities - Disguise", () => { it("activates when Aerilate circumvents immunity to the move's base type", async () => { game.override.ability(Abilities.AERILATE); - game.override.moveset([ Moves.TACKLE ]); + game.override.moveset([Moves.TACKLE]); await game.classicMode.startBattle(); @@ -225,13 +224,11 @@ describe("Abilities - Disguise", () => { }); it("doesn't trigger if user is behind a substitute", async () => { - game.override - .enemyMoveset(Moves.SUBSTITUTE) - .moveset(Moves.POWER_TRIP); + game.override.enemyMoveset(Moves.SUBSTITUTE).moveset(Moves.POWER_TRIP); await game.classicMode.startBattle(); game.move.select(Moves.POWER_TRIP); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(game.scene.getEnemyPokemon()!.formIndex).toBe(disguisedForm); diff --git a/src/test/abilities/dry_skin.test.ts b/test/abilities/dry_skin.test.ts similarity index 93% rename from src/test/abilities/dry_skin.test.ts rename to test/abilities/dry_skin.test.ts index 314564df15c..9d8a29c431a 100644 --- a/src/test/abilities/dry_skin.test.ts +++ b/test/abilities/dry_skin.test.ts @@ -1,7 +1,7 @@ import { Species } from "#app/enums/species"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -28,7 +28,7 @@ describe("Abilities - Dry Skin", () => { .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.CHARMANDER) .ability(Abilities.BALL_FETCH) - .moveset([ Moves.SUNNY_DAY, Moves.RAIN_DANCE, Moves.SPLASH, Moves.WATER_GUN ]) + .moveset([Moves.SUNNY_DAY, Moves.RAIN_DANCE, Moves.SPLASH, Moves.WATER_GUN]) .starterSpecies(Species.CHANDELURE); }); @@ -69,7 +69,7 @@ describe("Abilities - Dry Skin", () => { }); it("opposing fire attacks do 25% more damage", async () => { - game.override.moveset([ Moves.FLAMETHROWER ]); + game.override.moveset([Moves.FLAMETHROWER]); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; @@ -105,7 +105,7 @@ describe("Abilities - Dry Skin", () => { }); it("opposing water attacks do not heal if they were protected from", async () => { - game.override.enemyMoveset([ Moves.PROTECT ]); + game.override.enemyMoveset([Moves.PROTECT]); await game.classicMode.startBattle(); @@ -119,7 +119,7 @@ describe("Abilities - Dry Skin", () => { }); it("multi-strike water attacks only heal once", async () => { - game.override.moveset([ Moves.WATER_GUN, Moves.WATER_SHURIKEN ]); + game.override.moveset([Moves.WATER_GUN, Moves.WATER_SHURIKEN]); await game.classicMode.startBattle(); diff --git a/src/test/abilities/early_bird.test.ts b/test/abilities/early_bird.test.ts similarity index 89% rename from src/test/abilities/early_bird.test.ts rename to test/abilities/early_bird.test.ts index a69290fa1e4..cc486672c95 100644 --- a/src/test/abilities/early_bird.test.ts +++ b/test/abilities/early_bird.test.ts @@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -25,7 +25,7 @@ describe("Abilities - Early Bird", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.REST, Moves.BELLY_DRUM, Moves.SPLASH ]) + .moveset([Moves.REST, Moves.BELLY_DRUM, Moves.SPLASH]) .ability(Abilities.EARLY_BIRD) .battleType("single") .disableCrits() @@ -35,7 +35,7 @@ describe("Abilities - Early Bird", () => { }); it("reduces Rest's sleep time to 1 turn", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const player = game.scene.getPlayerPokemon()!; @@ -60,7 +60,7 @@ describe("Abilities - Early Bird", () => { }); it("reduces 3-turn sleep to 1 turn", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const player = game.scene.getPlayerPokemon()!; player.status = new Status(StatusEffect.SLEEP, 0, 4); @@ -79,7 +79,7 @@ describe("Abilities - Early Bird", () => { }); it("reduces 1-turn sleep to 0 turns", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const player = game.scene.getPlayerPokemon()!; player.status = new Status(StatusEffect.SLEEP, 0, 2); diff --git a/src/test/abilities/flash_fire.test.ts b/test/abilities/flash_fire.test.ts similarity index 78% rename from src/test/abilities/flash_fire.test.ts rename to test/abilities/flash_fire.test.ts index 0ca55227ea4..3cec9cd9cb7 100644 --- a/src/test/abilities/flash_fire.test.ts +++ b/test/abilities/flash_fire.test.ts @@ -6,7 +6,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -35,10 +35,9 @@ describe("Abilities - Flash Fire", () => { .disableCrits(); }); - it("immune to Fire-type moves", async () => { - game.override.enemyMoveset([ Moves.EMBER ]).moveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.BLISSEY ]); + game.override.enemyMoveset([Moves.EMBER]).moveset(Moves.SPLASH); + await game.classicMode.startBattle([Species.BLISSEY]); const blissey = game.scene.getPlayerPokemon()!; @@ -48,8 +47,8 @@ describe("Abilities - Flash Fire", () => { }, 20000); it("not activate if the Pokémon is protected from the Fire-type move", async () => { - game.override.enemyMoveset([ Moves.EMBER ]).moveset([ Moves.PROTECT ]); - await game.classicMode.startBattle([ Species.BLISSEY ]); + game.override.enemyMoveset([Moves.EMBER]).moveset([Moves.PROTECT]); + await game.classicMode.startBattle([Species.BLISSEY]); const blissey = game.scene.getPlayerPokemon()!; @@ -59,8 +58,8 @@ describe("Abilities - Flash Fire", () => { }, 20000); it("activated by Will-O-Wisp", async () => { - game.override.enemyMoveset([ Moves.WILL_O_WISP ]).moveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.BLISSEY ]); + game.override.enemyMoveset([Moves.WILL_O_WISP]).moveset(Moves.SPLASH); + await game.classicMode.startBattle([Species.BLISSEY]); const blissey = game.scene.getPlayerPokemon()!; @@ -74,9 +73,9 @@ describe("Abilities - Flash Fire", () => { }, 20000); it("activated after being frozen", async () => { - game.override.enemyMoveset([ Moves.EMBER ]).moveset(Moves.SPLASH); + game.override.enemyMoveset([Moves.EMBER]).moveset(Moves.SPLASH); game.override.statusEffect(StatusEffect.FREEZE); - await game.classicMode.startBattle([ Species.BLISSEY ]); + await game.classicMode.startBattle([Species.BLISSEY]); const blissey = game.scene.getPlayerPokemon()!; @@ -87,12 +86,12 @@ describe("Abilities - Flash Fire", () => { }, 20000); it("not passing with baton pass", async () => { - game.override.enemyMoveset([ Moves.EMBER ]).moveset([ Moves.BATON_PASS ]); - await game.classicMode.startBattle([ Species.BLISSEY, Species.CHANSEY ]); + game.override.enemyMoveset([Moves.EMBER]).moveset([Moves.BATON_PASS]); + await game.classicMode.startBattle([Species.BLISSEY, Species.CHANSEY]); // ensure use baton pass after enemy moved game.move.select(Moves.BATON_PASS); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); game.doSelectPartyPokemon(1); @@ -103,16 +102,16 @@ describe("Abilities - Flash Fire", () => { }, 20000); it("boosts Fire-type move when the ability is activated", async () => { - game.override.enemyMoveset([ Moves.FIRE_PLEDGE ]).moveset([ Moves.EMBER, Moves.SPLASH ]); + game.override.enemyMoveset([Moves.FIRE_PLEDGE]).moveset([Moves.EMBER, Moves.SPLASH]); game.override.enemyAbility(Abilities.FLASH_FIRE).ability(Abilities.NONE); - await game.classicMode.startBattle([ Species.BLISSEY ]); + await game.classicMode.startBattle([Species.BLISSEY]); const blissey = game.scene.getPlayerPokemon()!; const initialHP = 1000; blissey.hp = initialHP; // first turn game.move.select(Moves.EMBER); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to(TurnEndPhase); const originalDmg = initialHP - blissey.hp; @@ -131,7 +130,7 @@ describe("Abilities - Flash Fire", () => { game.override.moveset(Moves.FIRE_PLEDGE).enemyMoveset(Moves.EMBER); game.override.enemyAbility(Abilities.NONE).ability(Abilities.FLASH_FIRE); game.override.enemySpecies(Species.BLISSEY); - await game.classicMode.startBattle([ Species.RATTATA ]); + await game.classicMode.startBattle([Species.RATTATA]); const blissey = game.scene.getEnemyPokemon()!; const initialHP = 1000; @@ -139,7 +138,7 @@ describe("Abilities - Flash Fire", () => { // first turn game.move.select(Moves.FIRE_PLEDGE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); await game.move.forceMiss(); await game.phaseInterceptor.to(TurnEndPhase); diff --git a/src/test/abilities/flower_gift.test.ts b/test/abilities/flower_gift.test.ts similarity index 83% rename from src/test/abilities/flower_gift.test.ts rename to test/abilities/flower_gift.test.ts index 04ada598f22..fff509a1f00 100644 --- a/src/test/abilities/flower_gift.test.ts +++ b/test/abilities/flower_gift.test.ts @@ -4,7 +4,7 @@ import { Stat } from "#app/enums/stat"; import { WeatherType } from "#app/enums/weather-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -21,7 +21,7 @@ describe("Abilities - Flower Gift", () => { */ const testRevertFormAgainstAbility = async (game: GameManager, ability: Abilities) => { game.override.starterForms({ [Species.CASTFORM]: SUNSHINE_FORM }).enemyAbility(ability); - await game.classicMode.startBattle([ Species.CASTFORM ]); + await game.classicMode.startBattle([Species.CASTFORM]); game.move.select(Moves.SPLASH); @@ -41,7 +41,7 @@ describe("Abilities - Flower Gift", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH, Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.SKILL_SWAP ]) + .moveset([Moves.SPLASH, Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.SKILL_SWAP]) .enemySpecies(Species.MAGIKARP) .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH); @@ -50,9 +50,9 @@ describe("Abilities - Flower Gift", () => { // TODO: Uncomment expect statements when the ability is implemented - currently does not increase stats of allies it("increases the ATK and SPDEF stat stages of the Pokémon with this Ability and its allies by 1.5× during Harsh Sunlight", async () => { game.override.battleType("double"); - await game.classicMode.startBattle([ Species.CHERRIM, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.CHERRIM, Species.MAGIKARP]); - const [ cherrim ] = game.scene.getPlayerField(); + const [cherrim] = game.scene.getPlayerField(); const cherrimAtkStat = cherrim.getEffectiveStat(Stat.ATK); const cherrimSpDefStat = cherrim.getEffectiveStat(Stat.SPDEF); @@ -62,7 +62,7 @@ describe("Abilities - Flower Gift", () => { game.move.select(Moves.SUNNY_DAY, 0); game.move.select(Moves.SPLASH, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("TurnEndPhase"); expect(cherrim.formIndex).toBe(SUNSHINE_FORM); @@ -74,7 +74,7 @@ describe("Abilities - Flower Gift", () => { it("changes the Pokemon's form during Harsh Sunlight", async () => { game.override.weather(WeatherType.HARSH_SUN); - await game.classicMode.startBattle([ Species.CHERRIM ]); + await game.classicMode.startBattle([Species.CHERRIM]); const cherrim = game.scene.getPlayerPokemon()!; expect(cherrim.formIndex).toBe(SUNSHINE_FORM); @@ -91,9 +91,9 @@ describe("Abilities - Flower Gift", () => { }); it("reverts to Overcast Form when the Pokémon loses Flower Gift, changes form under Harsh Sunlight/Sunny when it regains it", async () => { - game.override.enemyMoveset([ Moves.SKILL_SWAP ]).weather(WeatherType.HARSH_SUN); + game.override.enemyMoveset([Moves.SKILL_SWAP]).weather(WeatherType.HARSH_SUN); - await game.classicMode.startBattle([ Species.CHERRIM ]); + await game.classicMode.startBattle([Species.CHERRIM]); const cherrim = game.scene.getPlayerPokemon()!; @@ -110,16 +110,16 @@ describe("Abilities - Flower Gift", () => { }); it("reverts to Overcast Form when the Flower Gift is suppressed, changes form under Harsh Sunlight/Sunny when it regains it", async () => { - game.override.enemyMoveset([ Moves.GASTRO_ACID ]).weather(WeatherType.HARSH_SUN); + game.override.enemyMoveset([Moves.GASTRO_ACID]).weather(WeatherType.HARSH_SUN); - await game.classicMode.startBattle([ Species.CHERRIM, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.CHERRIM, Species.MAGIKARP]); const cherrim = game.scene.getPlayerPokemon()!; expect(cherrim.formIndex).toBe(SUNSHINE_FORM); game.move.select(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); expect(cherrim.summonData.abilitySuppressed).toBe(true); @@ -140,7 +140,7 @@ describe("Abilities - Flower Gift", () => { it("should be in Overcast Form after the user is switched out", async () => { game.override.weather(WeatherType.SUNNY); - await game.classicMode.startBattle([ Species.CASTFORM, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.CASTFORM, Species.MAGIKARP]); const cherrim = game.scene.getPlayerPokemon()!; expect(cherrim.formIndex).toBe(SUNSHINE_FORM); diff --git a/src/test/abilities/forecast.test.ts b/test/abilities/forecast.test.ts similarity index 54% rename from src/test/abilities/forecast.test.ts rename to test/abilities/forecast.test.ts index 6d1f776da16..bdc32604bba 100644 --- a/src/test/abilities/forecast.test.ts +++ b/test/abilities/forecast.test.ts @@ -9,7 +9,7 @@ import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -30,7 +30,7 @@ describe("Abilities - Forecast", () => { */ const testWeatherFormChange = async (game: GameManager, weather: WeatherType, form: number, initialForm?: number) => { game.override.weather(weather).starterForms({ [Species.CASTFORM]: initialForm }); - await game.startBattle([ Species.CASTFORM ]); + await game.startBattle([Species.CASTFORM]); game.move.select(Moves.SPLASH); @@ -44,7 +44,7 @@ describe("Abilities - Forecast", () => { */ const testRevertFormAgainstAbility = async (game: GameManager, ability: Abilities) => { game.override.starterForms({ [Species.CASTFORM]: SUNNY_FORM }).enemyAbility(ability); - await game.startBattle([ Species.CASTFORM ]); + await game.startBattle([Species.CASTFORM]); game.move.select(Moves.SPLASH); @@ -64,121 +64,132 @@ describe("Abilities - Forecast", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH, Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.TACKLE ]) + .moveset([Moves.SPLASH, Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.TACKLE]) .enemySpecies(Species.MAGIKARP) .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH); }); - it("changes form based on weather", async () => { - game.override - .moveset([ Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.SNOWSCAPE, Moves.SPLASH ]) - .battleType("double") - .starterForms({ - [Species.KYOGRE]: 1, - [Species.GROUDON]: 1, - [Species.RAYQUAZA]: 1 - }); - await game.startBattle([ Species.CASTFORM, Species.FEEBAS, Species.KYOGRE, Species.GROUDON, Species.RAYQUAZA, Species.ALTARIA ]); + it( + "changes form based on weather", + async () => { + game.override + .moveset([Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.SNOWSCAPE, Moves.SPLASH]) + .battleType("double") + .starterForms({ + [Species.KYOGRE]: 1, + [Species.GROUDON]: 1, + [Species.RAYQUAZA]: 1, + }); + await game.startBattle([ + Species.CASTFORM, + Species.FEEBAS, + Species.KYOGRE, + Species.GROUDON, + Species.RAYQUAZA, + Species.ALTARIA, + ]); - vi.spyOn(game.scene.getPlayerParty()[5], "getAbility").mockReturnValue(allAbilities[Abilities.CLOUD_NINE]); + vi.spyOn(game.scene.getPlayerParty()[5], "getAbility").mockReturnValue(allAbilities[Abilities.CLOUD_NINE]); - const castform = game.scene.getPlayerField()[0]; - expect(castform.formIndex).toBe(NORMAL_FORM); + const castform = game.scene.getPlayerField()[0]; + expect(castform.formIndex).toBe(NORMAL_FORM); - game.move.select(Moves.RAIN_DANCE); - game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.RAIN_DANCE); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(RAINY_FORM); + expect(castform.formIndex).toBe(RAINY_FORM); - game.move.select(Moves.SUNNY_DAY); - game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.SUNNY_DAY); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(SUNNY_FORM); + expect(castform.formIndex).toBe(SUNNY_FORM); - game.move.select(Moves.SNOWSCAPE); - game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.SNOWSCAPE); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(SNOWY_FORM); + expect(castform.formIndex).toBe(SNOWY_FORM); - game.override.moveset([ Moves.HAIL, Moves.SANDSTORM, Moves.SNOWSCAPE, Moves.SPLASH ]); + game.override.moveset([Moves.HAIL, Moves.SANDSTORM, Moves.SNOWSCAPE, Moves.SPLASH]); - game.move.select(Moves.SANDSTORM); - game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.SANDSTORM); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(NORMAL_FORM); + expect(castform.formIndex).toBe(NORMAL_FORM); - game.move.select(Moves.HAIL); - game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.HAIL); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(SNOWY_FORM); + expect(castform.formIndex).toBe(SNOWY_FORM); - game.move.select(Moves.SPLASH); - game.doSwitchPokemon(2); // Feebas now 2, Kyogre 1 - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.SPLASH); + game.doSwitchPokemon(2); // Feebas now 2, Kyogre 1 + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(RAINY_FORM); + expect(castform.formIndex).toBe(RAINY_FORM); - game.move.select(Moves.SPLASH); - game.doSwitchPokemon(3); // Kyogre now 3, Groudon 1 - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.SPLASH); + game.doSwitchPokemon(3); // Kyogre now 3, Groudon 1 + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(SUNNY_FORM); + expect(castform.formIndex).toBe(SUNNY_FORM); - game.move.select(Moves.SPLASH); - game.doSwitchPokemon(4); // Groudon now 4, Rayquaza 1 - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.SPLASH); + game.doSwitchPokemon(4); // Groudon now 4, Rayquaza 1 + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(NORMAL_FORM); + expect(castform.formIndex).toBe(NORMAL_FORM); - game.move.select(Moves.SPLASH); - game.doSwitchPokemon(2); // Rayquaza now 2, Feebas 1 - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.SPLASH); + game.doSwitchPokemon(2); // Rayquaza now 2, Feebas 1 + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(NORMAL_FORM); + expect(castform.formIndex).toBe(NORMAL_FORM); - game.move.select(Moves.SNOWSCAPE); - game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.SNOWSCAPE); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(SNOWY_FORM); + expect(castform.formIndex).toBe(SNOWY_FORM); - game.move.select(Moves.SPLASH); - game.doSwitchPokemon(5); // Feebas now 5, Altaria 1 - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.SPLASH); + game.doSwitchPokemon(5); // Feebas now 5, Altaria 1 + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(NORMAL_FORM); + expect(castform.formIndex).toBe(NORMAL_FORM); - game.move.select(Moves.SPLASH); - game.doSwitchPokemon(5); // Altaria now 5, Feebas 1 - await game.phaseInterceptor.to("MovePhase"); - await game.toNextTurn(); + game.move.select(Moves.SPLASH); + game.doSwitchPokemon(5); // Altaria now 5, Feebas 1 + await game.phaseInterceptor.to("MovePhase"); + await game.toNextTurn(); - expect(castform.formIndex).toBe(SNOWY_FORM); + expect(castform.formIndex).toBe(SNOWY_FORM); - game.scene.arena.trySetWeather(WeatherType.FOG, false); - game.move.select(Moves.SPLASH); - game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to("TurnStartPhase"); + game.scene.arena.trySetWeather(WeatherType.FOG, false); + game.move.select(Moves.SPLASH); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("TurnStartPhase"); - expect(castform.formIndex).toBe(NORMAL_FORM); - }, 30 * 1000); + expect(castform.formIndex).toBe(NORMAL_FORM); + }, + 30 * 1000, + ); it("reverts to Normal Form during Clear weather", async () => { await testWeatherFormChange(game, WeatherType.NONE, NORMAL_FORM, SUNNY_FORM); @@ -190,7 +201,7 @@ describe("Abilities - Forecast", () => { it("has no effect on Pokémon other than Castform", async () => { game.override.enemyAbility(Abilities.FORECAST).enemySpecies(Species.SHUCKLE); - await game.startBattle([ Species.CASTFORM ]); + await game.startBattle([Species.CASTFORM]); game.move.select(Moves.RAIN_DANCE); await game.phaseInterceptor.to(TurnEndPhase); @@ -200,8 +211,11 @@ describe("Abilities - Forecast", () => { }); it("reverts to Normal Form when Castform loses Forecast, changes form to match the weather when it regains it", async () => { - game.override.moveset([ Moves.SKILL_SWAP, Moves.WORRY_SEED, Moves.SPLASH ]).weather(WeatherType.RAIN).battleType("double"); - await game.startBattle([ Species.CASTFORM, Species.FEEBAS ]); + game.override + .moveset([Moves.SKILL_SWAP, Moves.WORRY_SEED, Moves.SPLASH]) + .weather(WeatherType.RAIN) + .battleType("double"); + await game.startBattle([Species.CASTFORM, Species.FEEBAS]); const castform = game.scene.getPlayerField()[0]; @@ -209,7 +223,7 @@ describe("Abilities - Forecast", () => { game.move.select(Moves.SKILL_SWAP, 0, BattlerIndex.PLAYER_2); game.move.select(Moves.SKILL_SWAP, 1, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("MoveEndPhase"); expect(castform.formIndex).toBe(NORMAL_FORM); @@ -221,22 +235,22 @@ describe("Abilities - Forecast", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.WORRY_SEED, 1, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("MoveEndPhase"); expect(castform.formIndex).toBe(NORMAL_FORM); }); it("reverts to Normal Form when Forecast is suppressed, changes form to match the weather when it regains it", async () => { - game.override.enemyMoveset([ Moves.GASTRO_ACID ]).weather(WeatherType.RAIN); - await game.startBattle([ Species.CASTFORM, Species.PIKACHU ]); + game.override.enemyMoveset([Moves.GASTRO_ACID]).weather(WeatherType.RAIN); + await game.startBattle([Species.CASTFORM, Species.PIKACHU]); const castform = game.scene.getPlayerPokemon()!; expect(castform.formIndex).toBe(RAINY_FORM); // First turn - Forecast is suppressed game.move.select(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.move.forceHit(); await game.phaseInterceptor.to(TurnEndPhase); @@ -259,8 +273,8 @@ describe("Abilities - Forecast", () => { }); it("does not change Castform's form until after Stealth Rock deals damage", async () => { - game.override.weather(WeatherType.RAIN).enemyMoveset([ Moves.STEALTH_ROCK ]); - await game.startBattle([ Species.PIKACHU, Species.CASTFORM ]); + game.override.weather(WeatherType.RAIN).enemyMoveset([Moves.STEALTH_ROCK]); + await game.startBattle([Species.PIKACHU, Species.CASTFORM]); // First turn - set up stealth rock game.move.select(Moves.SPLASH); @@ -284,7 +298,7 @@ describe("Abilities - Forecast", () => { it("should be in Normal Form after the user is switched out", async () => { game.override.weather(WeatherType.RAIN); - await game.startBattle([ Species.CASTFORM, Species.MAGIKARP ]); + await game.startBattle([Species.CASTFORM, Species.MAGIKARP]); const castform = game.scene.getPlayerPokemon()!; expect(castform.formIndex).toBe(RAINY_FORM); diff --git a/src/test/abilities/friend_guard.test.ts b/test/abilities/friend_guard.test.ts similarity index 82% rename from src/test/abilities/friend_guard.test.ts rename to test/abilities/friend_guard.test.ts index 4ce64468c43..30175fe37e0 100644 --- a/src/test/abilities/friend_guard.test.ts +++ b/test/abilities/friend_guard.test.ts @@ -1,12 +1,13 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Abilities } from "#enums/abilities"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { BattlerIndex } from "#app/battle"; import { allAbilities } from "#app/data/ability"; -import { allMoves, MoveCategory } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; +import { MoveCategory } from "#enums/MoveCategory"; describe("Moves - Friend Guard", () => { let phaserGame: Phaser.Game; @@ -27,15 +28,15 @@ describe("Moves - Friend Guard", () => { game.override .battleType("double") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.TACKLE, Moves.SPLASH, Moves.DRAGON_RAGE ]) + .enemyMoveset([Moves.TACKLE, Moves.SPLASH, Moves.DRAGON_RAGE]) .enemySpecies(Species.SHUCKLE) - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .startingLevel(100); }); it("should reduce damage that other allied Pokémon receive from attacks (from any Pokémon) by 25%", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER ]); - const [ player1, player2 ] = game.scene.getPlayerField(); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]); + const [player1, player2] = game.scene.getPlayerField(); const spy = vi.spyOn(player1, "getAttackDamage"); const enemy1 = game.scene.getEnemyField()[0]; @@ -62,13 +63,15 @@ describe("Moves - Friend Guard", () => { // Get the last return value from `getAttackDamage` const turn2Damage = spy.mock.results[spy.mock.results.length - 1].value.damage; // With the ally's Friend Guard, damage should have been reduced from base damage by 25% - expect(turn2Damage).toBe(Math.floor(player1.getBaseDamage(enemy1, allMoves[Moves.TACKLE], MoveCategory.PHYSICAL) * 0.75)); + expect(turn2Damage).toBe( + Math.floor(player1.getBaseDamage(enemy1, allMoves[Moves.TACKLE], MoveCategory.PHYSICAL) * 0.75), + ); }); it("should NOT reduce damage to pokemon with friend guard", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER ]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]); - const player2 = game.scene.getPlayerField()[1]; + const player2 = game.scene.getPlayerField()[1]; const spy = vi.spyOn(player2, "getAttackDamage"); game.move.select(Moves.SPLASH); @@ -92,9 +95,9 @@ describe("Moves - Friend Guard", () => { }); it("should NOT reduce damage from fixed damage attacks", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER ]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]); - const [ player1, player2 ] = game.scene.getPlayerField(); + const [player1, player2] = game.scene.getPlayerField(); const spy = vi.spyOn(player1, "getAttackDamage"); game.move.select(Moves.SPLASH); diff --git a/src/test/abilities/galvanize.test.ts b/test/abilities/galvanize.test.ts similarity index 85% rename from src/test/abilities/galvanize.test.ts rename to test/abilities/galvanize.test.ts index 80e767866ea..c1e02c6c8d8 100644 --- a/src/test/abilities/galvanize.test.ts +++ b/test/abilities/galvanize.test.ts @@ -1,15 +1,14 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; -import { Type } from "#enums/type"; +import { allMoves } from "#app/data/moves/move"; +import { PokemonType } from "#enums/pokemon-type"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { HitResult } from "#app/field/pokemon"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - describe("Abilities - Galvanize", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -31,7 +30,7 @@ describe("Abilities - Galvanize", () => { .battleType("single") .startingLevel(100) .ability(Abilities.GALVANIZE) - .moveset([ Moves.TACKLE, Moves.REVELATION_DANCE, Moves.FURY_SWIPES ]) + .moveset([Moves.TACKLE, Moves.REVELATION_DANCE, Moves.FURY_SWIPES]) .enemySpecies(Species.DUSCLOPS) .enemyAbility(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) @@ -54,7 +53,7 @@ describe("Abilities - Galvanize", () => { await game.phaseInterceptor.to("BerryPhase", false); - expect(playerPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC); + expect(playerPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC); expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.EFFECTIVE); expect(move.calculateBattlePower).toHaveReturnedWith(48); expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); @@ -77,7 +76,7 @@ describe("Abilities - Galvanize", () => { await game.phaseInterceptor.to("BerryPhase", false); - expect(playerPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC); + expect(playerPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC); expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.NO_EFFECT); expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); }); @@ -85,7 +84,7 @@ describe("Abilities - Galvanize", () => { it("should not change the type of variable-type moves", async () => { game.override.enemySpecies(Species.MIGHTYENA); - await game.startBattle([ Species.ESPEON ]); + await game.startBattle([Species.ESPEON]); const playerPokemon = game.scene.getPlayerPokemon()!; vi.spyOn(playerPokemon, "getMoveType"); @@ -96,7 +95,7 @@ describe("Abilities - Galvanize", () => { game.move.select(Moves.REVELATION_DANCE); await game.phaseInterceptor.to("BerryPhase", false); - expect(playerPokemon.getMoveType).not.toHaveLastReturnedWith(Type.ELECTRIC); + expect(playerPokemon.getMoveType).not.toHaveLastReturnedWith(PokemonType.ELECTRIC); expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.NO_EFFECT); expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); }); @@ -111,7 +110,7 @@ describe("Abilities - Galvanize", () => { vi.spyOn(enemyPokemon, "apply"); game.move.select(Moves.FURY_SWIPES); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); await game.phaseInterceptor.to("MoveEffectPhase"); @@ -122,7 +121,7 @@ describe("Abilities - Galvanize", () => { const enemyStartingHp = enemyPokemon.hp; await game.phaseInterceptor.to("MoveEffectPhase"); - expect(playerPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC); + expect(playerPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC); expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); } diff --git a/test/abilities/good_as_gold.test.ts b/test/abilities/good_as_gold.test.ts new file mode 100644 index 00000000000..7cc543c4a0d --- /dev/null +++ b/test/abilities/good_as_gold.test.ts @@ -0,0 +1,143 @@ +import { BattlerIndex } from "#app/battle"; +import { allAbilities } from "#app/data/ability"; +import { ArenaTagSide } from "#app/data/arena-tag"; +import { ArenaTagType } from "#app/enums/arena-tag-type"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { Stat } from "#app/enums/stat"; +import { StatusEffect } from "#app/enums/status-effect"; +import { WeatherType } from "#app/enums/weather-type"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Abilities - Good As Gold", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH]) + .ability(Abilities.GOOD_AS_GOLD) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should block normal status moves", async () => { + game.override.enemyMoveset([Moves.GROWL]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + const player = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SPLASH, 0); + + await game.phaseInterceptor.to("BerryPhase"); + + expect(player.battleData.abilitiesApplied[0]).toBe(Abilities.GOOD_AS_GOLD); + expect(player.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should block memento and prevent the user from fainting", async () => { + game.override.enemyMoveset([Moves.MEMENTO]); + await game.classicMode.startBattle([Species.MAGIKARP]); + game.move.select(Moves.MEMENTO); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.isFainted()).toBe(false); + expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should not block any status moves that target the field, one side, or all pokemon", async () => { + game.override.battleType("double"); + game.override.enemyMoveset([Moves.STEALTH_ROCK, Moves.HAZE]); + game.override.moveset([Moves.SWORDS_DANCE, Moves.SAFEGUARD]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); + const [good_as_gold, ball_fetch] = game.scene.getPlayerField(); + + // Force second pokemon to have ball fetch to isolate to a single mon. + vi.spyOn(ball_fetch, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]); + + game.move.select(Moves.SWORDS_DANCE, 0); + game.move.select(Moves.SAFEGUARD, 1); + await game.forceEnemyMove(Moves.STEALTH_ROCK); + await game.forceEnemyMove(Moves.HAZE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + await game.phaseInterceptor.to("BerryPhase"); + expect(good_as_gold.getAbility().id).toBe(Abilities.GOOD_AS_GOLD); + expect(good_as_gold.getStatStage(Stat.ATK)).toBe(0); + expect(game.scene.arena.getTagOnSide(ArenaTagType.STEALTH_ROCK, ArenaTagSide.PLAYER)).toBeDefined(); + expect(game.scene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, ArenaTagSide.PLAYER)).toBeDefined(); + }); + + it("should not block field targeted effects in singles", async () => { + game.override.battleType("single"); + game.override.enemyMoveset([Moves.SPIKES]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.SPLASH, 0); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.PLAYER)).toBeDefined(); + }); + + it("should block the ally's helping hand", async () => { + game.override.battleType("double"); + game.override.moveset([Moves.HELPING_HAND, Moves.TACKLE]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); + + game.move.select(Moves.HELPING_HAND, 0); + game.move.select(Moves.TACKLE, 1); + await game.phaseInterceptor.to("MoveEndPhase", true); + + expect(game.scene.getPlayerField()[1].getTag(BattlerTagType.HELPING_HAND)).toBeUndefined(); + }); + + it("should block the ally's heal bell, but only if the good as gold user is on the field", async () => { + game.override.battleType("double"); + game.override.moveset([Moves.HEAL_BELL, Moves.SPLASH]); + game.override.statusEffect(StatusEffect.BURN); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS, Species.ABRA]); + const [good_as_gold, ball_fetch] = game.scene.getPlayerField(); + + // Force second pokemon to have ball fetch to isolate to a single mon. + vi.spyOn(ball_fetch, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]); + + // turn 1 + game.move.select(Moves.SPLASH, 0); + game.move.select(Moves.HEAL_BELL, 1); + await game.toNextTurn(); + expect(good_as_gold.status?.effect).toBe(StatusEffect.BURN); + + game.doSwitchPokemon(2); + game.move.select(Moves.HEAL_BELL, 0); + await game.toNextTurn(); + expect(good_as_gold.status?.effect).toBeUndefined(); + }); + + it("should not block field targeted effects like rain dance", async () => { + game.override.battleType("single"); + game.override.enemyMoveset([Moves.RAIN_DANCE]); + game.override.weather(WeatherType.NONE); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.SPLASH, 0); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.RAIN); + }); +}); diff --git a/src/test/abilities/gorilla_tactics.test.ts b/test/abilities/gorilla_tactics.test.ts similarity index 83% rename from src/test/abilities/gorilla_tactics.test.ts rename to test/abilities/gorilla_tactics.test.ts index 8aee365eb8f..48dab262b82 100644 --- a/src/test/abilities/gorilla_tactics.test.ts +++ b/test/abilities/gorilla_tactics.test.ts @@ -3,7 +3,7 @@ import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; import { Abilities } from "#enums/abilities"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -25,15 +25,15 @@ describe("Abilities - Gorilla Tactics", () => { game.override .battleType("single") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.SPLASH, Moves.DISABLE ]) + .enemyMoveset([Moves.SPLASH, Moves.DISABLE]) .enemySpecies(Species.MAGIKARP) .enemyLevel(30) - .moveset([ Moves.SPLASH, Moves.TACKLE, Moves.GROWL ]) + .moveset([Moves.SPLASH, Moves.TACKLE, Moves.GROWL]) .ability(Abilities.GORILLA_TACTICS); }); it("boosts the Pokémon's Attack by 50%, but limits the Pokémon to using only one move", async () => { - await game.classicMode.startBattle([ Species.GALAR_DARMANITAN ]); + await game.classicMode.startBattle([Species.GALAR_DARMANITAN]); const darmanitan = game.scene.getPlayerPokemon()!; const initialAtkStat = darmanitan.getStat(Stat.ATK); @@ -50,7 +50,7 @@ describe("Abilities - Gorilla Tactics", () => { }); it("should struggle if the only usable move is disabled", async () => { - await game.classicMode.startBattle([ Species.GALAR_DARMANITAN ]); + await game.classicMode.startBattle([Species.GALAR_DARMANITAN]); const darmanitan = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -64,7 +64,7 @@ describe("Abilities - Gorilla Tactics", () => { game.move.select(Moves.GROWL); await game.forceEnemyMove(Moves.DISABLE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); expect(enemy.getStatStage(Stat.ATK)).toBe(-1); // Only the effect of the first Growl should be applied @@ -73,7 +73,7 @@ describe("Abilities - Gorilla Tactics", () => { await game.toNextTurn(); game.move.select(Moves.TACKLE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(darmanitan.hp).toBeLessThan(darmanitan.getMaxHp()); diff --git a/src/test/abilities/gulp_missile.test.ts b/test/abilities/gulp_missile.test.ts similarity index 83% rename from src/test/abilities/gulp_missile.test.ts rename to test/abilities/gulp_missile.test.ts index bbb103c63e6..8ebd583d3ab 100644 --- a/src/test/abilities/gulp_missile.test.ts +++ b/test/abilities/gulp_missile.test.ts @@ -6,7 +6,7 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -25,7 +25,7 @@ describe("Abilities - Gulp Missile", () => { * @returns The effect damage of Gulp Missile */ const getEffectDamage = (pokemon: Pokemon): number => { - return Math.max(1, Math.floor(pokemon.getMaxHp() * 1 / 4)); + return Math.max(1, Math.floor((pokemon.getMaxHp() * 1) / 4)); }; beforeAll(() => { @@ -43,7 +43,7 @@ describe("Abilities - Gulp Missile", () => { game.override .disableCrits() .battleType("single") - .moveset([ Moves.SURF, Moves.DIVE, Moves.SPLASH, Moves.SUBSTITUTE ]) + .moveset([Moves.SURF, Moves.DIVE, Moves.SPLASH, Moves.SUBSTITUTE]) .enemySpecies(Species.SNORLAX) .enemyAbility(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) @@ -51,7 +51,7 @@ describe("Abilities - Gulp Missile", () => { }); it("changes to Gulping Form if HP is over half when Surf or Dive is used", async () => { - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; game.move.select(Moves.DIVE); @@ -59,17 +59,17 @@ describe("Abilities - Gulp Missile", () => { game.move.select(Moves.DIVE); await game.phaseInterceptor.to("MoveEndPhase"); - expect(cramorant.getHpRatio()).toBeGreaterThanOrEqual(.5); + expect(cramorant.getHpRatio()).toBeGreaterThanOrEqual(0.5); expect(cramorant.getTag(BattlerTagType.GULP_MISSILE_ARROKUDA)).toBeDefined(); expect(cramorant.formIndex).toBe(GULPING_FORM); }); it("changes to Gorging Form if HP is under half when Surf or Dive is used", async () => { - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; - vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.49); - expect(cramorant.getHpRatio()).toBe(.49); + vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.49); + expect(cramorant.getHpRatio()).toBe(0.49); game.move.select(Moves.SURF); await game.phaseInterceptor.to("MoveEndPhase"); @@ -79,7 +79,7 @@ describe("Abilities - Gulp Missile", () => { }); it("changes to base form when switched out after Surf or Dive is used", async () => { - await game.classicMode.startBattle([ Species.CRAMORANT, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.CRAMORANT, Species.MAGIKARP]); const cramorant = game.scene.getPlayerPokemon()!; game.move.select(Moves.SURF); @@ -94,7 +94,7 @@ describe("Abilities - Gulp Missile", () => { }); it("changes form during Dive's charge turn", async () => { - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; game.move.select(Moves.DIVE); @@ -106,7 +106,7 @@ describe("Abilities - Gulp Missile", () => { it("deals 1/4 of the attacker's maximum HP when hit by a damaging attack", async () => { game.override.enemyMoveset(Moves.TACKLE); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "damageAndUpdate"); @@ -119,10 +119,10 @@ describe("Abilities - Gulp Missile", () => { it("does not have any effect when hit by non-damaging attack", async () => { game.override.enemyMoveset(Moves.TAIL_WHIP); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; - vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.55); + vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.55); game.move.select(Moves.SURF); await game.phaseInterceptor.to("MoveEndPhase"); @@ -138,13 +138,13 @@ describe("Abilities - Gulp Missile", () => { it("lowers attacker's DEF stat stage by 1 when hit in Gulping form", async () => { game.override.enemyMoveset(Moves.TACKLE); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "damageAndUpdate"); - vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.55); + vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.55); game.move.select(Moves.SURF); await game.phaseInterceptor.to("MoveEndPhase"); @@ -162,13 +162,13 @@ describe("Abilities - Gulp Missile", () => { it("paralyzes the enemy when hit in Gorging form", async () => { game.override.enemyMoveset(Moves.TACKLE); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "damageAndUpdate"); - vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.45); + vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.45); game.move.select(Moves.SURF); await game.phaseInterceptor.to("MoveEndPhase"); @@ -186,7 +186,7 @@ describe("Abilities - Gulp Missile", () => { it("does not activate the ability when underwater", async () => { game.override.enemyMoveset(Moves.SURF); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; @@ -199,12 +199,12 @@ describe("Abilities - Gulp Missile", () => { it("prevents effect damage but inflicts secondary effect on attacker with Magic Guard", async () => { game.override.enemyMoveset(Moves.TACKLE).enemyAbility(Abilities.MAGIC_GUARD); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; - vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.55); + vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.55); game.move.select(Moves.SURF); await game.phaseInterceptor.to("MoveEndPhase"); @@ -223,7 +223,7 @@ describe("Abilities - Gulp Missile", () => { it("activates on faint", async () => { game.override.enemyMoveset(Moves.THUNDERBOLT); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; @@ -237,10 +237,8 @@ describe("Abilities - Gulp Missile", () => { }); it("doesn't trigger if user is behind a substitute", async () => { - game.override - .enemyAbility(Abilities.STURDY) - .enemyMoveset([ Moves.SPLASH, Moves.POWER_TRIP ]); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + game.override.enemyAbility(Abilities.STURDY).enemyMoveset([Moves.SPLASH, Moves.POWER_TRIP]); + await game.classicMode.startBattle([Species.CRAMORANT]); game.move.select(Moves.SURF); await game.forceEnemyMove(Moves.SPLASH); @@ -250,7 +248,7 @@ describe("Abilities - Gulp Missile", () => { game.move.select(Moves.SUBSTITUTE); await game.forceEnemyMove(Moves.POWER_TRIP); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); expect(game.scene.getPlayerPokemon()!.formIndex).toBe(GULPING_FORM); @@ -258,10 +256,10 @@ describe("Abilities - Gulp Missile", () => { it("cannot be suppressed", async () => { game.override.enemyMoveset(Moves.GASTRO_ACID); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; - vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.55); + vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.55); game.move.select(Moves.SURF); await game.phaseInterceptor.to("MoveEndPhase"); @@ -278,10 +276,10 @@ describe("Abilities - Gulp Missile", () => { it("cannot be swapped with another ability", async () => { game.override.enemyMoveset(Moves.SKILL_SWAP); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; - vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.55); + vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.55); game.move.select(Moves.SURF); await game.phaseInterceptor.to("MoveEndPhase"); @@ -299,7 +297,7 @@ describe("Abilities - Gulp Missile", () => { it("cannot be copied", async () => { game.override.enemyAbility(Abilities.TRACE); - await game.classicMode.startBattle([ Species.CRAMORANT ]); + await game.classicMode.startBattle([Species.CRAMORANT]); game.move.select(Moves.SPLASH); await game.phaseInterceptor.to("TurnStartPhase"); diff --git a/src/test/abilities/heatproof.test.ts b/test/abilities/heatproof.test.ts similarity index 84% rename from src/test/abilities/heatproof.test.ts rename to test/abilities/heatproof.test.ts index bf4e99ce467..fa065d1ed03 100644 --- a/src/test/abilities/heatproof.test.ts +++ b/test/abilities/heatproof.test.ts @@ -4,7 +4,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { toDmgValue } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -33,7 +33,7 @@ describe("Abilities - Heatproof", () => { .enemyLevel(100) .starterSpecies(Species.CHANDELURE) .ability(Abilities.BALL_FETCH) - .moveset([ Moves.FLAMETHROWER, Moves.SPLASH ]) + .moveset([Moves.FLAMETHROWER, Moves.SPLASH]) .startingLevel(100); }); @@ -55,14 +55,12 @@ describe("Abilities - Heatproof", () => { await game.phaseInterceptor.to(TurnEndPhase); const regularDamage = initialHP - enemy.hp; - expect(heatproofDamage).toBeLessThanOrEqual((regularDamage / 2) + 1); - expect(heatproofDamage).toBeGreaterThanOrEqual((regularDamage / 2) - 1); + expect(heatproofDamage).toBeLessThanOrEqual(regularDamage / 2 + 1); + expect(heatproofDamage).toBeGreaterThanOrEqual(regularDamage / 2 - 1); }); it("reduces Burn damage by half", async () => { - game.override - .enemyStatusEffect(StatusEffect.BURN) - .enemySpecies(Species.ABRA); + game.override.enemyStatusEffect(StatusEffect.BURN).enemySpecies(Species.ABRA); await game.startBattle(); const enemy = game.scene.getEnemyPokemon()!; diff --git a/src/test/abilities/honey_gather.test.ts b/test/abilities/honey_gather.test.ts similarity index 87% rename from src/test/abilities/honey_gather.test.ts rename to test/abilities/honey_gather.test.ts index fc9d6cdd150..bea5c25c878 100644 --- a/src/test/abilities/honey_gather.test.ts +++ b/test/abilities/honey_gather.test.ts @@ -3,7 +3,7 @@ import { Command } from "#app/ui/command-ui-handler"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -24,7 +24,7 @@ describe("Abilities - Honey Gather", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH, Moves.ROAR, Moves.THUNDERBOLT ]) + .moveset([Moves.SPLASH, Moves.ROAR, Moves.THUNDERBOLT]) .startingLevel(100) .ability(Abilities.HONEY_GATHER) .passiveAbility(Abilities.RUN_AWAY) @@ -36,7 +36,7 @@ describe("Abilities - Honey Gather", () => { }); it("should give money when winning a battle", async () => { - await game.classicMode.startBattle([ Species.MILOTIC ]); + await game.classicMode.startBattle([Species.MILOTIC]); game.scene.money = 1000; game.move.select(Moves.THUNDERBOLT); @@ -46,7 +46,7 @@ describe("Abilities - Honey Gather", () => { }); it("should not give money when the enemy pokemon flees", async () => { - await game.classicMode.startBattle([ Species.MILOTIC ]); + await game.classicMode.startBattle([Species.MILOTIC]); game.scene.money = 1000; game.move.select(Moves.ROAR); @@ -57,7 +57,7 @@ describe("Abilities - Honey Gather", () => { }); it("should not give money when the player flees", async () => { - await game.classicMode.startBattle([ Species.MILOTIC ]); + await game.classicMode.startBattle([Species.MILOTIC]); game.scene.money = 1000; // something weird is going on with the test framework, so this is required to prevent a crash diff --git a/src/test/abilities/hustle.test.ts b/test/abilities/hustle.test.ts similarity index 87% rename from src/test/abilities/hustle.test.ts rename to test/abilities/hustle.test.ts index 08a441315fb..40197cf9e97 100644 --- a/src/test/abilities/hustle.test.ts +++ b/test/abilities/hustle.test.ts @@ -1,9 +1,9 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { Stat } from "#app/enums/stat"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -25,7 +25,7 @@ describe("Abilities - Hustle", () => { game = new GameManager(phaserGame); game.override .ability(Abilities.HUSTLE) - .moveset([ Moves.TACKLE, Moves.GIGA_DRAIN, Moves.FISSURE ]) + .moveset([Moves.TACKLE, Moves.GIGA_DRAIN, Moves.FISSURE]) .disableCrits() .battleType("single") .enemyMoveset(Moves.SPLASH) @@ -34,7 +34,7 @@ describe("Abilities - Hustle", () => { }); it("increases the user's Attack stat by 50%", async () => { - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const atk = pikachu.stats[Stat.ATK]; @@ -48,7 +48,7 @@ describe("Abilities - Hustle", () => { }); it("lowers the accuracy of the user's physical moves by 20%", async () => { - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; vi.spyOn(pikachu, "getAccuracyMultiplier"); @@ -60,7 +60,7 @@ describe("Abilities - Hustle", () => { }); it("does not affect non-physical moves", async () => { - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const spatk = pikachu.stats[Stat.SPATK]; @@ -78,7 +78,7 @@ describe("Abilities - Hustle", () => { game.override.startingLevel(100); game.override.enemyLevel(30); - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/src/test/abilities/hyper_cutter.test.ts b/test/abilities/hyper_cutter.test.ts similarity index 80% rename from src/test/abilities/hyper_cutter.test.ts rename to test/abilities/hyper_cutter.test.ts index e51fef6bd49..fe5623e4e0f 100644 --- a/src/test/abilities/hyper_cutter.test.ts +++ b/test/abilities/hyper_cutter.test.ts @@ -2,7 +2,7 @@ import { Stat } from "#enums/stat"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -24,7 +24,7 @@ describe("Abilities - Hyper Cutter", () => { game = new GameManager(phaserGame); game.override .battleType("single") - .moveset([ Moves.SAND_ATTACK, Moves.NOBLE_ROAR, Moves.DEFOG, Moves.OCTOLOCK ]) + .moveset([Moves.SAND_ATTACK, Moves.NOBLE_ROAR, Moves.DEFOG, Moves.OCTOLOCK]) .ability(Abilities.BALL_FETCH) .enemySpecies(Species.SHUCKLE) .enemyAbility(Abilities.HYPER_CUTTER) @@ -46,11 +46,13 @@ describe("Abilities - Hyper Cutter", () => { await game.toNextTurn(); game.move.select(Moves.SAND_ATTACK); await game.toNextTurn(); - game.override.moveset([ Moves.STRING_SHOT ]); + game.override.moveset([Moves.STRING_SHOT]); game.move.select(Moves.STRING_SHOT); await game.toNextTurn(); expect(enemy.getStatStage(Stat.ATK)).toEqual(0); - [ Stat.ACC, Stat.DEF, Stat.EVA, Stat.SPATK, Stat.SPDEF, Stat.SPD ].forEach((stat: number) => expect(enemy.getStatStage(stat)).toBeLessThan(0)); + [Stat.ACC, Stat.DEF, Stat.EVA, Stat.SPATK, Stat.SPDEF, Stat.SPD].forEach((stat: number) => + expect(enemy.getStatStage(stat)).toBeLessThan(0), + ); }); }); diff --git a/src/test/abilities/ice_face.test.ts b/test/abilities/ice_face.test.ts similarity index 82% rename from src/test/abilities/ice_face.test.ts rename to test/abilities/ice_face.test.ts index e31bee1c721..e85794928d6 100644 --- a/src/test/abilities/ice_face.test.ts +++ b/test/abilities/ice_face.test.ts @@ -8,7 +8,7 @@ import { Abilities } from "#enums/abilities"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -33,11 +33,11 @@ describe("Abilities - Ice Face", () => { game.override.battleType("single"); game.override.enemySpecies(Species.EISCUE); game.override.enemyAbility(Abilities.ICE_FACE); - game.override.moveset([ Moves.TACKLE, Moves.ICE_BEAM, Moves.TOXIC_THREAD, Moves.HAIL ]); + game.override.moveset([Moves.TACKLE, Moves.ICE_BEAM, Moves.TOXIC_THREAD, Moves.HAIL]); }); it("takes no damage from physical move and transforms to Noice", async () => { - await game.classicMode.startBattle([ Species.HITMONLEE ]); + await game.classicMode.startBattle([Species.HITMONLEE]); game.move.select(Moves.TACKLE); @@ -51,9 +51,9 @@ describe("Abilities - Ice Face", () => { }); it("takes no damage from the first hit of multihit physical move and transforms to Noice", async () => { - game.override.moveset([ Moves.SURGING_STRIKES ]); + game.override.moveset([Moves.SURGING_STRIKES]); game.override.enemyLevel(1); - await game.classicMode.startBattle([ Species.HITMONLEE ]); + await game.classicMode.startBattle([Species.HITMONLEE]); game.move.select(Moves.SURGING_STRIKES); @@ -79,7 +79,7 @@ describe("Abilities - Ice Face", () => { }); it("takes damage from special moves", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.ICE_BEAM); @@ -93,7 +93,7 @@ describe("Abilities - Ice Face", () => { }); it("takes effects from status moves", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.TOXIC_THREAD); @@ -106,10 +106,10 @@ describe("Abilities - Ice Face", () => { }); it("transforms to Ice Face when Hail or Snow starts", async () => { - game.override.moveset([ Moves.QUICK_ATTACK ]); - game.override.enemyMoveset([ Moves.HAIL, Moves.HAIL, Moves.HAIL, Moves.HAIL ]); + game.override.moveset([Moves.QUICK_ATTACK]); + game.override.enemyMoveset([Moves.HAIL, Moves.HAIL, Moves.HAIL, Moves.HAIL]); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.QUICK_ATTACK); @@ -128,10 +128,10 @@ describe("Abilities - Ice Face", () => { }); it("transforms to Ice Face when summoned on arena with active Snow or Hail", async () => { - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); - game.override.moveset([ Moves.SNOWSCAPE ]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); + game.override.moveset([Moves.SNOWSCAPE]); - await game.classicMode.startBattle([ Species.EISCUE, Species.NINJASK ]); + await game.classicMode.startBattle([Species.EISCUE, Species.NINJASK]); game.move.select(Moves.SNOWSCAPE); @@ -156,9 +156,9 @@ describe("Abilities - Ice Face", () => { it("will not revert to its Ice Face if there is already Hail when it changes into Noice", async () => { game.override.enemySpecies(Species.SHUCKLE); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); - await game.classicMode.startBattle([ Species.EISCUE ]); + await game.classicMode.startBattle([Species.EISCUE]); game.move.select(Moves.HAIL); const eiscue = game.scene.getPlayerPokemon()!; @@ -175,9 +175,9 @@ describe("Abilities - Ice Face", () => { }); it("persists form change when switched out", async () => { - game.override.enemyMoveset([ Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK ]); + game.override.enemyMoveset([Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK]); - await game.classicMode.startBattle([ Species.EISCUE, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.EISCUE, Species.MAGIKARP]); game.move.select(Moves.ICE_BEAM); @@ -206,7 +206,7 @@ describe("Abilities - Ice Face", () => { [Species.EISCUE]: noiceForm, }); - await game.classicMode.startBattle([ Species.EISCUE ]); + await game.classicMode.startBattle([Species.EISCUE]); const eiscue = game.scene.getPlayerPokemon()!; @@ -224,22 +224,20 @@ describe("Abilities - Ice Face", () => { }); it("doesn't trigger if user is behind a substitute", async () => { - game.override - .enemyMoveset(Moves.SUBSTITUTE) - .moveset(Moves.POWER_TRIP); + game.override.enemyMoveset(Moves.SUBSTITUTE).moveset(Moves.POWER_TRIP); await game.classicMode.startBattle(); game.move.select(Moves.POWER_TRIP); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(game.scene.getEnemyPokemon()!.formIndex).toBe(icefaceForm); }); it("cannot be suppressed", async () => { - game.override.moveset([ Moves.GASTRO_ACID ]); + game.override.moveset([Moves.GASTRO_ACID]); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.GASTRO_ACID); @@ -253,9 +251,9 @@ describe("Abilities - Ice Face", () => { }); it("cannot be swapped with another ability", async () => { - game.override.moveset([ Moves.SKILL_SWAP ]); + game.override.moveset([Moves.SKILL_SWAP]); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.SKILL_SWAP); @@ -271,7 +269,7 @@ describe("Abilities - Ice Face", () => { it("cannot be copied", async () => { game.override.ability(Abilities.TRACE); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.SIMPLE_BEAM); diff --git a/src/test/abilities/illuminate.test.ts b/test/abilities/illuminate.test.ts similarity index 89% rename from src/test/abilities/illuminate.test.ts rename to test/abilities/illuminate.test.ts index 4f7d3d83b51..6518fec989b 100644 --- a/src/test/abilities/illuminate.test.ts +++ b/test/abilities/illuminate.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#app/enums/stat"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; @@ -45,11 +45,7 @@ describe("Abilities - Illuminate", () => { }); it("should guarantee double battle with any one LURE", async () => { - game.override - .startingModifier([ - { name: "LURE" }, - ]) - .startingWave(2); + game.override.startingModifier([{ name: "LURE" }]).startingWave(2); await game.classicMode.startBattle(); diff --git a/src/test/abilities/imposter.test.ts b/test/abilities/imposter.test.ts similarity index 83% rename from src/test/abilities/imposter.test.ts rename to test/abilities/imposter.test.ts index 3445b3b322c..b4469cd9042 100644 --- a/src/test/abilities/imposter.test.ts +++ b/test/abilities/imposter.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; @@ -36,7 +36,7 @@ describe("Abilities - Imposter", () => { }); it("should copy species, ability, gender, all stats except HP, all stat stages, moveset, and types of target", async () => { - await game.classicMode.startBattle([ Species.DITTO ]); + await game.classicMode.startBattle([Species.DITTO]); game.move.select(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase); @@ -75,9 +75,9 @@ describe("Abilities - Imposter", () => { }); it("should copy in-battle overridden stats", async () => { - game.override.enemyMoveset([ Moves.POWER_SPLIT ]); + game.override.enemyMoveset([Moves.POWER_SPLIT]); - await game.classicMode.startBattle([ Species.DITTO ]); + await game.classicMode.startBattle([Species.DITTO]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -96,9 +96,9 @@ describe("Abilities - Imposter", () => { }); it("should set each move's pp to a maximum of 5", async () => { - game.override.enemyMoveset([ Moves.SWORDS_DANCE, Moves.GROWL, Moves.SKETCH, Moves.RECOVER ]); + game.override.enemyMoveset([Moves.SWORDS_DANCE, Moves.GROWL, Moves.SKETCH, Moves.RECOVER]); - await game.classicMode.startBattle([ Species.DITTO ]); + await game.classicMode.startBattle([Species.DITTO]); const player = game.scene.getPlayerPokemon()!; game.move.select(Moves.TACKLE); @@ -116,4 +116,15 @@ describe("Abilities - Imposter", () => { } }); }); + + it("should activate its ability if it copies one that activates on summon", async () => { + game.override.enemyAbility(Abilities.INTIMIDATE); + + await game.classicMode.startBattle([Species.DITTO]); + + game.move.select(Moves.TACKLE); + await game.phaseInterceptor.to("MoveEndPhase"); + + expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1); + }); }); diff --git a/src/test/abilities/infiltrator.test.ts b/test/abilities/infiltrator.test.ts similarity index 80% rename from src/test/abilities/infiltrator.test.ts rename to test/abilities/infiltrator.test.ts index 8ea72b55b0c..6278439651c 100644 --- a/src/test/abilities/infiltrator.test.ts +++ b/test/abilities/infiltrator.test.ts @@ -1,5 +1,5 @@ import { ArenaTagSide } from "#app/data/arena-tag"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Stat } from "#enums/stat"; @@ -7,7 +7,7 @@ import { StatusEffect } from "#enums/status-effect"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -28,7 +28,7 @@ describe("Abilities - Infiltrator", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.TACKLE, Moves.WATER_GUN, Moves.SPORE, Moves.BABY_DOLL_EYES ]) + .moveset([Moves.TACKLE, Moves.WATER_GUN, Moves.SPORE, Moves.BABY_DOLL_EYES]) .ability(Abilities.INFILTRATOR) .battleType("single") .disableCrits() @@ -40,11 +40,23 @@ describe("Abilities - Infiltrator", () => { }); it.each([ - { effectName: "Light Screen", tagType: ArenaTagType.LIGHT_SCREEN, move: Moves.WATER_GUN }, - { effectName: "Reflect", tagType: ArenaTagType.REFLECT, move: Moves.TACKLE }, - { effectName: "Aurora Veil", tagType: ArenaTagType.AURORA_VEIL, move: Moves.TACKLE } + { + effectName: "Light Screen", + tagType: ArenaTagType.LIGHT_SCREEN, + move: Moves.WATER_GUN, + }, + { + effectName: "Reflect", + tagType: ArenaTagType.REFLECT, + move: Moves.TACKLE, + }, + { + effectName: "Aurora Veil", + tagType: ArenaTagType.AURORA_VEIL, + move: Moves.TACKLE, + }, ])("should bypass the target's $effectName", async ({ tagType, move }) => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -60,7 +72,7 @@ describe("Abilities - Infiltrator", () => { }); it("should bypass the target's Safeguard", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -76,7 +88,7 @@ describe("Abilities - Infiltrator", () => { // TODO: fix this interaction to pass this test it.todo("should bypass the target's Mist", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -91,7 +103,7 @@ describe("Abilities - Infiltrator", () => { }); it("should bypass the target's Substitute", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/src/test/abilities/intimidate.test.ts b/test/abilities/intimidate.test.ts similarity index 84% rename from src/test/abilities/intimidate.test.ts rename to test/abilities/intimidate.test.ts index d5a37d06593..53286d354c8 100644 --- a/src/test/abilities/intimidate.test.ts +++ b/test/abilities/intimidate.test.ts @@ -1,9 +1,9 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Mode } from "#app/ui/ui"; import { Stat } from "#enums/stat"; -import { getMovePosition } from "#test/utils/gameManagerUtils"; +import { getMovePosition } from "#test/testUtils/gameManagerUtils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -24,7 +24,8 @@ describe("Abilities - Intimidate", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single") + game.override + .battleType("single") .enemySpecies(Species.RATTATA) .enemyAbility(Abilities.INTIMIDATE) .enemyPassiveAbility(Abilities.HYDRATION) @@ -34,7 +35,7 @@ describe("Abilities - Intimidate", () => { }); it("should lower ATK stat stage by 1 of enemy Pokemon on entry and player switch", async () => { - await game.classicMode.runToSummon([ Species.MIGHTYENA, Species.POOCHYENA ]); + await game.classicMode.runToSummon([Species.MIGHTYENA, Species.POOCHYENA]); game.onNextPrompt( "CheckSwitchPhase", Mode.CONFIRM, @@ -42,7 +43,7 @@ describe("Abilities - Intimidate", () => { game.setMode(Mode.MESSAGE); game.endPhase(); }, - () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("TurnInitPhase") + () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("TurnInitPhase"), ); await game.phaseInterceptor.to("CommandPhase", false); @@ -64,9 +65,8 @@ describe("Abilities - Intimidate", () => { }, 20000); it("should lower ATK stat stage by 1 for every enemy Pokemon in a double battle on entry", async () => { - game.override.battleType("double") - .startingWave(3); - await game.classicMode.runToSummon([ Species.MIGHTYENA, Species.POOCHYENA ]); + game.override.battleType("double").startingWave(3); + await game.classicMode.runToSummon([Species.MIGHTYENA, Species.POOCHYENA]); game.onNextPrompt( "CheckSwitchPhase", Mode.CONFIRM, @@ -74,7 +74,7 @@ describe("Abilities - Intimidate", () => { game.setMode(Mode.MESSAGE); game.endPhase(); }, - () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("TurnInitPhase") + () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("TurnInitPhase"), ); await game.phaseInterceptor.to("CommandPhase", false); @@ -89,8 +89,8 @@ describe("Abilities - Intimidate", () => { it("should not activate again if there is no switch or new entry", async () => { game.override.startingWave(2); - game.override.moveset([ Moves.SPLASH ]); - await game.classicMode.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]); + game.override.moveset([Moves.SPLASH]); + await game.classicMode.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -106,10 +106,8 @@ describe("Abilities - Intimidate", () => { }, 20000); it("should lower ATK stat stage by 1 for every switch", async () => { - game.override.moveset([ Moves.SPLASH ]) - .enemyMoveset([ Moves.VOLT_SWITCH ]) - .startingWave(5); - await game.classicMode.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]); + game.override.moveset([Moves.SPLASH]).enemyMoveset([Moves.VOLT_SWITCH]).startingWave(5); + await game.classicMode.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); const playerPokemon = game.scene.getPlayerPokemon()!; let enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/src/test/abilities/intrepid_sword.test.ts b/test/abilities/intrepid_sword.test.ts similarity index 85% rename from src/test/abilities/intrepid_sword.test.ts rename to test/abilities/intrepid_sword.test.ts index 7bf0654276c..28d0cd02c7f 100644 --- a/src/test/abilities/intrepid_sword.test.ts +++ b/test/abilities/intrepid_sword.test.ts @@ -1,12 +1,11 @@ import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Abilities - Intrepid Sword", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -29,10 +28,8 @@ describe("Abilities - Intrepid Sword", () => { game.override.ability(Abilities.INTREPID_SWORD); }); - it("should raise ATK stat stage by 1 on entry", async() => { - await game.classicMode.runToSummon([ - Species.ZACIAN, - ]); + it("should raise ATK stat stage by 1 on entry", async () => { + await game.classicMode.runToSummon([Species.ZACIAN]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/abilities/libero.test.ts b/test/abilities/libero.test.ts new file mode 100644 index 00000000000..22abf1c248f --- /dev/null +++ b/test/abilities/libero.test.ts @@ -0,0 +1,301 @@ +import { allMoves } from "#app/data/moves/move"; +import { PokemonType } from "#enums/pokemon-type"; +import { Weather } from "#app/data/weather"; +import type { PlayerPokemon } from "#app/field/pokemon"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Abilities } from "#enums/abilities"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Biome } from "#enums/biome"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { WeatherType } from "#enums/weather-type"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Abilities - Libero", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + game.override.ability(Abilities.LIBERO); + game.override.startingLevel(100); + game.override.enemySpecies(Species.RATTATA); + game.override.enemyMoveset([Moves.ENDURE, Moves.ENDURE, Moves.ENDURE, Moves.ENDURE]); + }); + + test("ability applies and changes a pokemon's type", async () => { + game.override.moveset([Moves.SPLASH]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); + }); + + // Test for Gen9+ functionality, we are using previous funcionality + test.skip("ability applies only once per switch in", async () => { + game.override.moveset([Moves.SPLASH, Moves.AGILITY]); + + await game.startBattle([Species.MAGIKARP, Species.BULBASAUR]); + + let leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); + + game.move.select(Moves.AGILITY); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied.filter(a => a === Abilities.LIBERO)).toHaveLength(1); + const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]]; + const moveType = PokemonType[allMoves[Moves.AGILITY].type]; + expect(leadPokemonType).not.toBe(moveType); + + await game.toNextTurn(); + game.doSwitchPokemon(1); + await game.toNextTurn(); + game.doSwitchPokemon(1); + await game.toNextTurn(); + + leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); + }); + + test("ability applies correctly even if the pokemon's move has a variable type", async () => { + game.override.moveset([Moves.WEATHER_BALL]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.scene.arena.weather = new Weather(WeatherType.SUNNY); + game.move.select(Moves.WEATHER_BALL); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.LIBERO); + expect(leadPokemon.getTypes()).toHaveLength(1); + const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]], + moveType = PokemonType[PokemonType.FIRE]; + expect(leadPokemonType).toBe(moveType); + }); + + test("ability applies correctly even if the type has changed by another ability", async () => { + game.override.moveset([Moves.TACKLE]); + game.override.passiveAbility(Abilities.REFRIGERATE); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.TACKLE); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.LIBERO); + expect(leadPokemon.getTypes()).toHaveLength(1); + const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]], + moveType = PokemonType[PokemonType.ICE]; + expect(leadPokemonType).toBe(moveType); + }); + + test("ability applies correctly even if the pokemon's move calls another move", async () => { + game.override.moveset([Moves.NATURE_POWER]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.scene.arena.biomeType = Biome.MOUNTAIN; + game.move.select(Moves.NATURE_POWER); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.AIR_SLASH); + }); + + test("ability applies correctly even if the pokemon's move is delayed / charging", async () => { + game.override.moveset([Moves.DIG]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.DIG); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.DIG); + }); + + test("ability applies correctly even if the pokemon's move misses", async () => { + game.override.moveset([Moves.TACKLE]); + game.override.enemyMoveset(Moves.SPLASH); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.TACKLE); + await game.move.forceMiss(); + await game.phaseInterceptor.to(TurnEndPhase); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + expect(enemyPokemon.isFullHp()).toBe(true); + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); + }); + + test("ability applies correctly even if the pokemon's move is protected against", async () => { + game.override.moveset([Moves.TACKLE]); + game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.TACKLE); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); + }); + + test("ability applies correctly even if the pokemon's move fails because of type immunity", async () => { + game.override.moveset([Moves.TACKLE]); + game.override.enemySpecies(Species.GASTLY); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.TACKLE); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); + }); + + test("ability is not applied if pokemon's type is the same as the move's type", async () => { + game.override.moveset([Moves.SPLASH]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + leadPokemon.summonData.types = [allMoves[Moves.SPLASH].type]; + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO); + }); + + test("ability is not applied if pokemon is terastallized", async () => { + game.override.moveset([Moves.SPLASH]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + leadPokemon.isTerastallized = true; + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO); + }); + + test("ability is not applied if pokemon uses struggle", async () => { + game.override.moveset([Moves.STRUGGLE]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.STRUGGLE); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO); + }); + + test("ability is not applied if the pokemon's move fails", async () => { + game.override.moveset([Moves.BURN_UP]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.BURN_UP); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO); + }); + + test("ability applies correctly even if the pokemon's Trick-or-Treat fails", async () => { + game.override.moveset([Moves.TRICK_OR_TREAT]); + game.override.enemySpecies(Species.GASTLY); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.TRICK_OR_TREAT); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TRICK_OR_TREAT); + }); + + test("ability applies correctly and the pokemon curses itself", async () => { + game.override.moveset([Moves.CURSE]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.CURSE); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.CURSE); + expect(leadPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined); + }); +}); + +function testPokemonTypeMatchesDefaultMoveType(pokemon: PlayerPokemon, move: Moves) { + expect(pokemon.summonData.abilitiesApplied).toContain(Abilities.LIBERO); + expect(pokemon.getTypes()).toHaveLength(1); + const pokemonType = PokemonType[pokemon.getTypes()[0]], + moveType = PokemonType[allMoves[move].type]; + expect(pokemonType).toBe(moveType); +} diff --git a/test/abilities/lightningrod.test.ts b/test/abilities/lightningrod.test.ts new file mode 100644 index 00000000000..1ca6c6b1e89 --- /dev/null +++ b/test/abilities/lightningrod.test.ts @@ -0,0 +1,115 @@ +import { BattlerIndex } from "#app/battle"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Abilities - Lightningrod", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([ Moves.SPLASH, Moves.SHOCK_WAVE ]) + .ability(Abilities.BALL_FETCH) + .battleType("double") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should redirect electric type moves", async () => { + await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + + const enemy1 = game.scene.getEnemyField()[0]; + const enemy2 = game.scene.getEnemyField()[1]; + + enemy2.summonData.ability = Abilities.LIGHTNING_ROD; + + game.move.select(Moves.SHOCK_WAVE, BattlerIndex.PLAYER, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemy1.isFullHp()).toBe(true); + }); + + it("should not redirect non-electric type moves", async () => { + game.override.moveset([ Moves.SPLASH, Moves.AERIAL_ACE ]); + await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + + const enemy1 = game.scene.getEnemyField()[0]; + const enemy2 = game.scene.getEnemyField()[1]; + + enemy2.summonData.ability = Abilities.LIGHTNING_ROD; + + game.move.select(Moves.AERIAL_ACE, BattlerIndex.PLAYER, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemy1.isFullHp()).toBe(false); + }); + + it("should boost the user's spatk without damaging", async () => { + await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + + const enemy2 = game.scene.getEnemyField()[1]; + + enemy2.summonData.ability = Abilities.LIGHTNING_ROD; + + game.move.select(Moves.SHOCK_WAVE, BattlerIndex.PLAYER, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemy2.isFullHp()).toBe(true); + expect(enemy2.getStatStage(Stat.SPATK)).toBe(1); + }); + + it("should not redirect moves changed from electric type via ability", async () => { + game.override.ability(Abilities.NORMALIZE); + await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + + const enemy1 = game.scene.getEnemyField()[0]; + const enemy2 = game.scene.getEnemyField()[1]; + + enemy2.summonData.ability = Abilities.LIGHTNING_ROD; + + game.move.select(Moves.SHOCK_WAVE, BattlerIndex.PLAYER, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemy1.isFullHp()).toBe(false); + }); + + it("should redirect moves changed to electric type via ability", async () => { + game.override.ability(Abilities.GALVANIZE) + .moveset(Moves.TACKLE); + await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + + const enemy1 = game.scene.getEnemyField()[0]; + const enemy2 = game.scene.getEnemyField()[1]; + + enemy2.summonData.ability = Abilities.LIGHTNING_ROD; + + game.move.select(Moves.TACKLE, BattlerIndex.PLAYER, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemy1.isFullHp()).toBe(true); + expect(enemy2.getStatStage(Stat.SPATK)).toBe(1); + }); +}); diff --git a/test/abilities/magic_bounce.test.ts b/test/abilities/magic_bounce.test.ts new file mode 100644 index 00000000000..f9a076776aa --- /dev/null +++ b/test/abilities/magic_bounce.test.ts @@ -0,0 +1,362 @@ +import { BattlerIndex } from "#app/battle"; +import { allAbilities } from "#app/data/ability"; +import { ArenaTagSide } from "#app/data/arena-tag"; +import { allMoves } from "#app/data/moves/move"; +import { ArenaTagType } from "#app/enums/arena-tag-type"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { Stat } from "#app/enums/stat"; +import { StatusEffect } from "#app/enums/status-effect"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Abilities - Magic Bounce", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .ability(Abilities.BALL_FETCH) + .battleType("single") + .moveset([Moves.GROWL, Moves.SPLASH]) + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.MAGIC_BOUNCE) + .enemyMoveset(Moves.SPLASH); + }); + + it("should reflect basic status moves", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should not bounce moves while the target is in the semi-invulnerable state", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + game.override.moveset([Moves.GROWL]); + game.override.enemyMoveset([Moves.FLY]); + + game.move.select(Moves.GROWL); + await game.forceEnemyMove(Moves.FLY); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should individually bounce back multi-target moves", async () => { + game.override.battleType("double"); + game.override.moveset([Moves.GROWL, Moves.SPLASH]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]); + + game.move.select(Moves.GROWL, 0); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("BerryPhase"); + + const user = game.scene.getPlayerField()[0]; + expect(user.getStatStage(Stat.ATK)).toBe(-2); + }); + + it("should still bounce back a move that would otherwise fail", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + game.scene.getEnemyPokemon()?.setStatStage(Stat.ATK, -6); + game.override.moveset([Moves.GROWL]); + + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should not bounce back a move that was just bounced", async () => { + game.override.ability(Abilities.MAGIC_BOUNCE); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should receive the stat change after reflecting a move back to a mirror armor user", async () => { + game.override.ability(Abilities.MIRROR_ARMOR); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should not bounce back a move from a mold breaker user", async () => { + game.override.ability(Abilities.MOLD_BREAKER); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should bounce back a spread status move against both pokemon", async () => { + game.override.battleType("double"); + game.override.moveset([Moves.GROWL, Moves.SPLASH]); + game.override.enemyMoveset([Moves.SPLASH]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]); + + game.move.select(Moves.GROWL, 0); + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerField().every(p => p.getStatStage(Stat.ATK) === -2)).toBeTruthy(); + }); + + it("should only bounce spikes back once in doubles when both targets have magic bounce", async () => { + game.override.battleType("double"); + await game.classicMode.startBattle([Species.MAGIKARP]); + game.override.moveset([Moves.SPIKES]); + + game.move.select(Moves.SPIKES); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.PLAYER)!["layers"]).toBe(1); + expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY)).toBeUndefined(); + }); + + it("should bounce spikes even when the target is protected", async () => { + game.override.moveset([Moves.SPIKES]); + game.override.enemyMoveset([Moves.PROTECT]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.SPIKES); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.PLAYER)!["layers"]).toBe(1); + }); + + it("should not bounce spikes when the target is in the semi-invulnerable state", async () => { + game.override.moveset([Moves.SPIKES]); + game.override.enemyMoveset([Moves.FLY]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.SPIKES); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY)!["layers"]).toBe(1); + }); + + it("should not bounce back curse", async () => { + game.override.starterSpecies(Species.GASTLY); + await game.classicMode.startBattle([Species.GASTLY]); + game.override.moveset([Moves.CURSE]); + + game.move.select(Moves.CURSE); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()!.getTag(BattlerTagType.CURSED)).toBeDefined(); + }); + + it("should not cause encore to be interrupted after bouncing", async () => { + game.override.moveset([Moves.SPLASH, Moves.GROWL, Moves.ENCORE]); + game.override.enemyMoveset([Moves.TACKLE, Moves.GROWL]); + // game.override.ability(Abilities.MOLD_BREAKER); + await game.classicMode.startBattle([Species.MAGIKARP]); + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + // Give the player MOLD_BREAKER for this turn to bypass Magic Bounce. + vi.spyOn(playerPokemon, "getAbility").mockReturnValue(allAbilities[Abilities.MOLD_BREAKER]); + + // turn 1 + game.move.select(Moves.ENCORE); + await game.forceEnemyMove(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE); + + // turn 2 + vi.spyOn(playerPokemon, "getAbility").mockRestore(); + game.move.select(Moves.GROWL); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("BerryPhase"); + expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE); + expect(enemyPokemon.getLastXMoves()[0].move).toBe(Moves.TACKLE); + }); + + // TODO: encore is failing if the last move was virtual. + it.todo("should not cause the bounced move to count for encore", async () => { + game.override.moveset([Moves.SPLASH, Moves.GROWL, Moves.ENCORE]); + game.override.enemyMoveset([Moves.GROWL, Moves.TACKLE]); + game.override.enemyAbility(Abilities.MAGIC_BOUNCE); + + await game.classicMode.startBattle([Species.MAGIKARP]); + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + // turn 1 + game.move.select(Moves.GROWL); + await game.forceEnemyMove(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + + // Give the player MOLD_BREAKER for this turn to bypass Magic Bounce. + vi.spyOn(playerPokemon, "getAbility").mockReturnValue(allAbilities[Abilities.MOLD_BREAKER]); + + // turn 2 + game.move.select(Moves.ENCORE); + await game.forceEnemyMove(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("BerryPhase"); + expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE); + expect(enemyPokemon.getLastXMoves()[0].move).toBe(Moves.TACKLE); + }); + + // TODO: stomping tantrum should consider moves that were bounced. + it.todo("should cause stomping tantrum to double in power when the last move was bounced", async () => { + game.override.battleType("single"); + await game.classicMode.startBattle([Species.MAGIKARP]); + game.override.moveset([Moves.STOMPING_TANTRUM, Moves.CHARM]); + + const stomping_tantrum = allMoves[Moves.STOMPING_TANTRUM]; + vi.spyOn(stomping_tantrum, "calculateBattlePower"); + + game.move.select(Moves.CHARM); + await game.toNextTurn(); + + game.move.select(Moves.STOMPING_TANTRUM); + await game.phaseInterceptor.to("BerryPhase"); + expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(150); + }); + + // TODO: stomping tantrum should consider moves that were bounced. + it.todo( + "should properly cause the enemy's stomping tantrum to be doubled in power after bouncing and failing", + async () => { + game.override.enemyMoveset([Moves.STOMPING_TANTRUM, Moves.SPLASH, Moves.CHARM]); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const stomping_tantrum = allMoves[Moves.STOMPING_TANTRUM]; + const enemy = game.scene.getEnemyPokemon()!; + vi.spyOn(stomping_tantrum, "calculateBattlePower"); + + game.move.select(Moves.SPORE); + await game.forceEnemyMove(Moves.CHARM); + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.getLastXMoves(1)[0].result).toBe("success"); + + await game.phaseInterceptor.to("BerryPhase"); + expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(75); + + await game.toNextTurn(); + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(75); + }, + ); + + it("should respect immunities when bouncing a move", async () => { + vi.spyOn(allMoves[Moves.THUNDER_WAVE], "accuracy", "get").mockReturnValue(100); + game.override.moveset([Moves.THUNDER_WAVE, Moves.GROWL]); + game.override.ability(Abilities.SOUNDPROOF); + await game.classicMode.startBattle([Species.PHANPY]); + + // Turn 1 - thunder wave immunity test + game.move.select(Moves.THUNDER_WAVE); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.status).toBeUndefined(); + + // Turn 2 - soundproof immunity test + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should bounce back a move before the accuracy check", async () => { + game.override.moveset([Moves.SPORE]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + const attacker = game.scene.getPlayerPokemon()!; + + vi.spyOn(attacker, "getAccuracyMultiplier").mockReturnValue(0.0); + game.move.select(Moves.SPORE); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.SLEEP); + }); + + it("should take the accuracy of the magic bounce user into account", async () => { + game.override.moveset([Moves.SPORE]); + await game.classicMode.startBattle([Species.MAGIKARP]); + const opponent = game.scene.getEnemyPokemon()!; + + vi.spyOn(opponent, "getAccuracyMultiplier").mockReturnValue(0); + game.move.select(Moves.SPORE); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.status).toBeUndefined(); + }); + + it("should always apply the leftmost available target's magic bounce when bouncing moves like sticky webs in doubles", async () => { + game.override.battleType("double"); + game.override.moveset([Moves.STICKY_WEB, Moves.SPLASH, Moves.TRICK_ROOM]); + + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]); + const [enemy_1, enemy_2] = game.scene.getEnemyField(); + // set speed just incase logic erroneously checks for speed order + enemy_1.setStat(Stat.SPD, enemy_2.getStat(Stat.SPD) + 1); + + // turn 1 + game.move.select(Moves.STICKY_WEB, 0); + game.move.select(Moves.TRICK_ROOM, 1); + await game.phaseInterceptor.to("TurnEndPhase"); + + expect( + game.scene.arena + .getTagOnSide(ArenaTagType.STICKY_WEB, ArenaTagSide.PLAYER) + ?.getSourcePokemon() + ?.getBattlerIndex(), + ).toBe(BattlerIndex.ENEMY); + game.scene.arena.removeTagOnSide(ArenaTagType.STICKY_WEB, ArenaTagSide.PLAYER, true); + + // turn 2 + game.move.select(Moves.STICKY_WEB, 0); + game.move.select(Moves.TRICK_ROOM, 1); + await game.phaseInterceptor.to("BerryPhase"); + expect( + game.scene.arena + .getTagOnSide(ArenaTagType.STICKY_WEB, ArenaTagSide.PLAYER) + ?.getSourcePokemon() + ?.getBattlerIndex(), + ).toBe(BattlerIndex.ENEMY); + }); + + it("should not bounce back status moves that hit through semi-invulnerable states", async () => { + game.override.moveset([Moves.TOXIC, Moves.CHARM]); + await game.classicMode.startBattle([Species.BULBASAUR]); + game.move.select(Moves.TOXIC); + await game.forceEnemyMove(Moves.FLY); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.TOXIC); + expect(game.scene.getPlayerPokemon()!.status).toBeUndefined(); + + game.override.ability(Abilities.NO_GUARD); + game.move.select(Moves.CHARM); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-2); + expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(0); + }); +}); diff --git a/test/abilities/magic_guard.test.ts b/test/abilities/magic_guard.test.ts new file mode 100644 index 00000000000..96a9f4dab74 --- /dev/null +++ b/test/abilities/magic_guard.test.ts @@ -0,0 +1,439 @@ +import { ArenaTagSide, getArenaTag } from "#app/data/arena-tag"; +import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Abilities } from "#enums/abilities"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { StatusEffect } from "#enums/status-effect"; +import { WeatherType } from "#enums/weather-type"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Abilities - Magic Guard", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + /** Player Pokemon overrides */ + game.override.ability(Abilities.MAGIC_GUARD); + game.override.moveset([Moves.SPLASH]); + game.override.startingLevel(100); + + /** Enemy Pokemon overrides */ + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyAbility(Abilities.INSOMNIA); + game.override.enemyMoveset(Moves.SPLASH); + game.override.enemyLevel(100); + }); + + //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Magic_Guard_(Ability) + + it("ability should prevent damage caused by weather", async () => { + game.override.weather(WeatherType.SANDSTORM); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + const enemyPokemon = game.scene.getEnemyPokemon()!; + expect(enemyPokemon).toBeDefined(); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) has not taken damage from weather + * - The enemy Pokemon (without Magic Guard) has taken damage from weather + */ + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + }); + + it("ability should prevent damage caused by status effects but other non-damage effects still apply", async () => { + //Toxic keeps track of the turn counters -> important that Magic Guard keeps track of post-Toxic turns + game.override.statusEffect(StatusEffect.POISON); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) has not taken damage from poison + * - The Pokemon's CatchRateMultiplier should be 1.5 + */ + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(getStatusEffectCatchRateMultiplier(leadPokemon.status!.effect)).toBe(1.5); + }); + + it("ability effect should not persist when the ability is replaced", async () => { + game.override.enemyMoveset([Moves.WORRY_SEED, Moves.WORRY_SEED, Moves.WORRY_SEED, Moves.WORRY_SEED]); + game.override.statusEffect(StatusEffect.POISON); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (that just lost its Magic Guard ability) has taken damage from poison + */ + expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp()); + }); + + it("Magic Guard prevents damage caused by burn but other non-damaging effects are still applied", async () => { + game.override.enemyStatusEffect(StatusEffect.BURN); + game.override.enemyAbility(Abilities.MAGIC_GUARD); + + await game.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.SPLASH); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The enemy Pokemon (with Magic Guard) has not taken damage from burn + * - The enemy Pokemon's physical attack damage is halved (TBD) + * - The enemy Pokemon's hypothetical CatchRateMultiplier should be 1.5 + */ + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + expect(getStatusEffectCatchRateMultiplier(enemyPokemon.status!.effect)).toBe(1.5); + }); + + it("Magic Guard prevents damage caused by toxic but other non-damaging effects are still applied", async () => { + game.override.enemyStatusEffect(StatusEffect.TOXIC); + game.override.enemyAbility(Abilities.MAGIC_GUARD); + + await game.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.SPLASH); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + const toxicStartCounter = enemyPokemon.status!.toxicTurnCount; + //should be 0 + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The enemy Pokemon (with Magic Guard) has not taken damage from toxic + * - The enemy Pokemon's status effect duration should be incremented + * - The enemy Pokemon's hypothetical CatchRateMultiplier should be 1.5 + */ + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + expect(enemyPokemon.status!.toxicTurnCount).toBeGreaterThan(toxicStartCounter); + expect(getStatusEffectCatchRateMultiplier(enemyPokemon.status!.effect)).toBe(1.5); + }); + + it("Magic Guard prevents damage caused by entry hazards", async () => { + //Adds and applies Spikes to both sides of the arena + const newTag = getArenaTag(ArenaTagType.SPIKES, 5, Moves.SPIKES, 0, 0, ArenaTagSide.BOTH)!; + game.scene.arena.tags.push(newTag); + + await game.startBattle([Species.MAGIKARP]); + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SPLASH); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) has not taken damage from spikes + * - The enemy Pokemon (without Magic Guard) has taken damage from spikes + */ + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + }); + + it("Magic Guard does not prevent poison from Toxic Spikes", async () => { + //Adds and applies Spikes to both sides of the arena + const playerTag = getArenaTag(ArenaTagType.TOXIC_SPIKES, 5, Moves.TOXIC_SPIKES, 0, 0, ArenaTagSide.PLAYER)!; + const enemyTag = getArenaTag(ArenaTagType.TOXIC_SPIKES, 5, Moves.TOXIC_SPIKES, 0, 0, ArenaTagSide.ENEMY)!; + game.scene.arena.tags.push(playerTag); + game.scene.arena.tags.push(enemyTag); + + await game.startBattle([Species.MAGIKARP]); + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SPLASH); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - Both Pokemon gain the poison status effect + * - The player Pokemon (with Magic Guard) has not taken damage from poison + * - The enemy Pokemon (without Magic Guard) has taken damage from poison + */ + expect(leadPokemon.status!.effect).toBe(StatusEffect.POISON); + expect(enemyPokemon.status!.effect).toBe(StatusEffect.POISON); + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + }); + + it("Magic Guard prevents against damage from volatile status effects", async () => { + await game.startBattle([Species.DUSKULL]); + game.override.moveset([Moves.CURSE]); + game.override.enemyAbility(Abilities.MAGIC_GUARD); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.CURSE); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) has cut its HP to inflict curse + * - The enemy Pokemon (with Magic Guard) is cursed + * - The enemy Pokemon (with Magic Guard) does not lose HP from being cursed + */ + expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp()); + expect(enemyPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); + + it("Magic Guard prevents crash damage", async () => { + game.override.moveset([Moves.HIGH_JUMP_KICK]); + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.HIGH_JUMP_KICK); + await game.move.forceMiss(); + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) misses High Jump Kick but does not lose HP as a result + */ + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + }); + + it("Magic Guard prevents damage from recoil", async () => { + game.override.moveset([Moves.TAKE_DOWN]); + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.TAKE_DOWN); + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) uses a recoil move but does not lose HP from recoil + */ + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + }); + + it("Magic Guard does not prevent damage from Struggle's recoil", async () => { + game.override.moveset([Moves.STRUGGLE]); + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.STRUGGLE); + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) uses Struggle but does lose HP from Struggle's recoil + */ + expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp()); + }); + + //This tests different move attributes than the recoil tests above + it("Magic Guard prevents self-damage from attacking moves", async () => { + game.override.moveset([Moves.STEEL_BEAM]); + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.STEEL_BEAM); + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) uses a move with an HP cost but does not lose HP from using it + */ + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + }); + + /* + it("Magic Guard does not prevent self-damage from confusion", async () => { + await game.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.CHARM); + + await game.phaseInterceptor.to(TurnEndPhase); + }); +*/ + + it("Magic Guard does not prevent self-damage from non-attacking moves", async () => { + game.override.moveset([Moves.BELLY_DRUM]); + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.BELLY_DRUM); + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) uses a non-attacking move with an HP cost and thus loses HP from using it + */ + expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp()); + }); + + it("Magic Guard prevents damage from abilities with PostTurnHurtIfSleepingAbAttr", async () => { + //Tests the ability Bad Dreams + game.override.statusEffect(StatusEffect.SLEEP); + //enemy pokemon is given Spore just in case player pokemon somehow awakens during test + game.override.enemyMoveset([Moves.SPORE, Moves.SPORE, Moves.SPORE, Moves.SPORE]); + game.override.enemyAbility(Abilities.BAD_DREAMS); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute + * - The player Pokemon is asleep + */ + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(leadPokemon.status!.effect).toBe(StatusEffect.SLEEP); + }); + + it("Magic Guard prevents damage from abilities with PostFaintContactDamageAbAttr", async () => { + //Tests the abilities Innards Out/Aftermath + game.override.moveset([Moves.TACKLE]); + game.override.enemyAbility(Abilities.AFTERMATH); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + const enemyPokemon = game.scene.getEnemyPokemon()!; + enemyPokemon.hp = 1; + + game.move.select(Moves.TACKLE); + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute + * - The enemy Pokemon has fainted + */ + expect(enemyPokemon.hp).toBe(0); + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + }); + + it("Magic Guard prevents damage from abilities with PostDefendContactDamageAbAttr", async () => { + //Tests the abilities Iron Barbs/Rough Skin + game.override.moveset([Moves.TACKLE]); + game.override.enemyAbility(Abilities.IRON_BARBS); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.TACKLE); + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute + * - The player Pokemon's move should have connected + */ + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + }); + + it("Magic Guard prevents damage from abilities with ReverseDrainAbAttr", async () => { + //Tests the ability Liquid Ooze + game.override.moveset([Moves.ABSORB]); + game.override.enemyAbility(Abilities.LIQUID_OOZE); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.ABSORB); + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute + * - The player Pokemon's move should have connected + */ + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + }); + + it("Magic Guard prevents HP loss from abilities with PostWeatherLapseDamageAbAttr", async () => { + //Tests the abilities Solar Power/Dry Skin + game.override.passiveAbility(Abilities.SOLAR_POWER); + game.override.weather(WeatherType.SUNNY); + + await game.startBattle([Species.MAGIKARP]); + const leadPokemon = game.scene.getPlayerPokemon()!; + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * Expect: + * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute + */ + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + }); +}); diff --git a/src/test/abilities/mimicry.test.ts b/test/abilities/mimicry.test.ts similarity index 67% rename from src/test/abilities/mimicry.test.ts rename to test/abilities/mimicry.test.ts index 29aa1d649d3..df6f7905c83 100644 --- a/src/test/abilities/mimicry.test.ts +++ b/test/abilities/mimicry.test.ts @@ -1,8 +1,8 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { Type } from "#enums/type"; -import GameManager from "#test/utils/gameManager"; +import { PokemonType } from "#enums/pokemon-type"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,7 +23,7 @@ describe("Abilities - Mimicry", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .ability(Abilities.MIMICRY) .battleType("single") .disableCrits() @@ -33,31 +33,31 @@ describe("Abilities - Mimicry", () => { it("Mimicry activates after the Pokémon with Mimicry is switched in while terrain is present, or whenever there is a change in terrain", async () => { game.override.enemyAbility(Abilities.MISTY_SURGE); - await game.classicMode.startBattle([ Species.FEEBAS, Species.ABRA ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.ABRA]); - const [ playerPokemon1, playerPokemon2 ] = game.scene.getPlayerParty(); + const [playerPokemon1, playerPokemon2] = game.scene.getPlayerParty(); game.move.select(Moves.SPLASH); await game.toNextTurn(); - expect(playerPokemon1.getTypes().includes(Type.FAIRY)).toBe(true); + expect(playerPokemon1.getTypes().includes(PokemonType.FAIRY)).toBe(true); game.doSwitchPokemon(1); await game.toNextTurn(); - expect(playerPokemon2.getTypes().includes(Type.FAIRY)).toBe(true); + expect(playerPokemon2.getTypes().includes(PokemonType.FAIRY)).toBe(true); }); it("Pokemon should revert back to its original, root type once terrain ends", async () => { game.override - .moveset([ Moves.SPLASH, Moves.TRANSFORM ]) + .moveset([Moves.SPLASH, Moves.TRANSFORM]) .enemyAbility(Abilities.MIMICRY) - .enemyMoveset([ Moves.SPLASH, Moves.PSYCHIC_TERRAIN ]); - await game.classicMode.startBattle([ Species.REGIELEKI ]); + .enemyMoveset([Moves.SPLASH, Moves.PSYCHIC_TERRAIN]); + await game.classicMode.startBattle([Species.REGIELEKI]); const playerPokemon = game.scene.getPlayerPokemon(); game.move.select(Moves.TRANSFORM); await game.forceEnemyMove(Moves.PSYCHIC_TERRAIN); await game.toNextTurn(); - expect(playerPokemon?.getTypes().includes(Type.PSYCHIC)).toBe(true); + expect(playerPokemon?.getTypes().includes(PokemonType.PSYCHIC)).toBe(true); if (game.scene.arena.terrain) { game.scene.arena.terrain.turnsLeft = 1; @@ -66,26 +66,25 @@ describe("Abilities - Mimicry", () => { game.move.select(Moves.SPLASH); await game.forceEnemyMove(Moves.SPLASH); await game.toNextTurn(); - expect(playerPokemon?.getTypes().includes(Type.ELECTRIC)).toBe(true); + expect(playerPokemon?.getTypes().includes(PokemonType.ELECTRIC)).toBe(true); }); it("If the Pokemon is under the effect of a type-adding move and an equivalent terrain activates, the move's effect disappears", async () => { - game.override - .enemyMoveset([ Moves.FORESTS_CURSE, Moves.GRASSY_TERRAIN ]); - await game.classicMode.startBattle([ Species.FEEBAS ]); + game.override.enemyMoveset([Moves.FORESTS_CURSE, Moves.GRASSY_TERRAIN]); + await game.classicMode.startBattle([Species.FEEBAS]); const playerPokemon = game.scene.getPlayerPokemon(); game.move.select(Moves.SPLASH); await game.forceEnemyMove(Moves.FORESTS_CURSE); await game.toNextTurn(); - expect(playerPokemon?.summonData.addedType).toBe(Type.GRASS); + expect(playerPokemon?.summonData.addedType).toBe(PokemonType.GRASS); game.move.select(Moves.SPLASH); await game.forceEnemyMove(Moves.GRASSY_TERRAIN); await game.phaseInterceptor.to("TurnEndPhase"); expect(playerPokemon?.summonData.addedType).toBeNull(); - expect(playerPokemon?.getTypes().includes(Type.GRASS)).toBe(true); + expect(playerPokemon?.getTypes().includes(PokemonType.GRASS)).toBe(true); }); }); diff --git a/test/abilities/mirror_armor.test.ts b/test/abilities/mirror_armor.test.ts new file mode 100644 index 00000000000..6b0c3f10c84 --- /dev/null +++ b/test/abilities/mirror_armor.test.ts @@ -0,0 +1,315 @@ +import { Stat } from "#enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import { BattlerIndex } from "#app/battle"; + +// TODO: When Magic Bounce is implemented, make a test for its interaction with mirror guard, use screech + +describe("Ability - Mirror Armor", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override + .battleType("single") + .enemySpecies(Species.RATTATA) + .enemyMoveset([Moves.SPLASH, Moves.STICKY_WEB, Moves.TICKLE, Moves.OCTOLOCK]) + .enemyAbility(Abilities.BALL_FETCH) + .startingLevel(2000) + .moveset([Moves.SPLASH, Moves.STICKY_WEB, Moves.TICKLE, Moves.OCTOLOCK]) + .ability(Abilities.BALL_FETCH); + }); + + it("Player side + single battle Intimidate - opponent loses stats", async () => { + game.override.ability(Abilities.MIRROR_ARMOR); + game.override.enemyAbility(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + const userPokemon = game.scene.getPlayerPokemon()!; + + // Enemy has intimidate, enemy should lose -1 atk + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.toNextTurn(); + + expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1); + expect(userPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("Enemy side + single battle Intimidate - player loses stats", async () => { + game.override.enemyAbility(Abilities.MIRROR_ARMOR); + game.override.ability(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + const userPokemon = game.scene.getPlayerPokemon()!; + + // Enemy has intimidate, enemy should lose -1 atk + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.toNextTurn(); + + expect(userPokemon.getStatStage(Stat.ATK)).toBe(-1); + expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("Player side + double battle Intimidate - opponents each lose -2 atk", async () => { + game.override.battleType("double"); + game.override.ability(Abilities.MIRROR_ARMOR); + game.override.enemyAbility(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]); + + const [enemy1, enemy2] = game.scene.getEnemyField(); + const [player1, player2] = game.scene.getPlayerField(); + + // Enemy has intimidate, enemy should lose -2 atk each + game.move.select(Moves.SPLASH); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.toNextTurn(); + + expect(enemy1.getStatStage(Stat.ATK)).toBe(-2); + expect(enemy2.getStatStage(Stat.ATK)).toBe(-2); + expect(player1.getStatStage(Stat.ATK)).toBe(0); + expect(player2.getStatStage(Stat.ATK)).toBe(0); + }); + + it("Enemy side + double battle Intimidate - players each lose -2 atk", async () => { + game.override.battleType("double"); + game.override.enemyAbility(Abilities.MIRROR_ARMOR); + game.override.ability(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]); + + const [enemy1, enemy2] = game.scene.getEnemyField(); + const [player1, player2] = game.scene.getPlayerField(); + + // Enemy has intimidate, enemy should lose -1 atk + game.move.select(Moves.SPLASH); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.toNextTurn(); + + expect(enemy1.getStatStage(Stat.ATK)).toBe(0); + expect(enemy2.getStatStage(Stat.ATK)).toBe(0); + expect(player1.getStatStage(Stat.ATK)).toBe(-2); + expect(player2.getStatStage(Stat.ATK)).toBe(-2); + }); + + it("Player side + single battle Intimidate + Tickle - opponent loses stats", async () => { + game.override.ability(Abilities.MIRROR_ARMOR); + game.override.enemyAbility(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + const userPokemon = game.scene.getPlayerPokemon()!; + + // Enemy has intimidate and uses tickle, enemy receives -2 atk and -1 defense + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER); + await game.toNextTurn(); + + expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(-1); + expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-2); + expect(userPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(userPokemon.getStatStage(Stat.DEF)).toBe(0); + }); + + it("Player side + double battle Intimidate + Tickle - opponents each lose -3 atk, -1 def", async () => { + game.override.battleType("double"); + game.override.ability(Abilities.MIRROR_ARMOR); + game.override.enemyAbility(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]); + + const [enemy1, enemy2] = game.scene.getEnemyField(); + const [player1, player2] = game.scene.getPlayerField(); + + game.move.select(Moves.SPLASH); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER_2); + await game.toNextTurn(); + + expect(player1.getStatStage(Stat.ATK)).toBe(0); + expect(player1.getStatStage(Stat.DEF)).toBe(0); + expect(player2.getStatStage(Stat.ATK)).toBe(0); + expect(player2.getStatStage(Stat.DEF)).toBe(0); + expect(enemy1.getStatStage(Stat.ATK)).toBe(-3); + expect(enemy1.getStatStage(Stat.DEF)).toBe(-1); + expect(enemy2.getStatStage(Stat.ATK)).toBe(-3); + expect(enemy2.getStatStage(Stat.DEF)).toBe(-1); + }); + + it("Enemy side + single battle Intimidate + Tickle - player loses stats", async () => { + game.override.enemyAbility(Abilities.MIRROR_ARMOR); + game.override.ability(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + const userPokemon = game.scene.getPlayerPokemon()!; + + // Enemy has intimidate and uses tickle, enemy receives -2 atk and -1 defense + game.move.select(Moves.TICKLE); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.toNextTurn(); + + expect(userPokemon.getStatStage(Stat.DEF)).toBe(-1); + expect(userPokemon.getStatStage(Stat.ATK)).toBe(-2); + expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0); + }); + + it("Player side + single battle Intimidate + oppoenent has white smoke - no one loses stats", async () => { + game.override.enemyAbility(Abilities.WHITE_SMOKE); + game.override.ability(Abilities.MIRROR_ARMOR); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + const userPokemon = game.scene.getPlayerPokemon()!; + + // Enemy has intimidate and uses tickle, enemy has white smoke, no one loses stats + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER); + await game.toNextTurn(); + + expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0); + expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(userPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(userPokemon.getStatStage(Stat.DEF)).toBe(0); + }); + + it("Enemy side + single battle Intimidate + player has white smoke - no one loses stats", async () => { + game.override.ability(Abilities.WHITE_SMOKE); + game.override.enemyAbility(Abilities.MIRROR_ARMOR); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + const userPokemon = game.scene.getPlayerPokemon()!; + + // Enemy has intimidate and uses tickle, enemy has white smoke, no one loses stats + game.move.select(Moves.TICKLE); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.toNextTurn(); + + expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0); + expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(userPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(userPokemon.getStatStage(Stat.DEF)).toBe(0); + }); + + it("Player side + single battle + opponent uses octolock - does not interact with mirror armor, player loses stats", async () => { + game.override.ability(Abilities.MIRROR_ARMOR); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + const userPokemon = game.scene.getPlayerPokemon()!; + + // Enemy uses octolock, player loses stats at end of turn + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.OCTOLOCK, BattlerIndex.PLAYER); + await game.toNextTurn(); + + expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0); + expect(enemyPokemon.getStatStage(Stat.SPDEF)).toBe(0); + expect(userPokemon.getStatStage(Stat.DEF)).toBe(-1); + expect(userPokemon.getStatStage(Stat.SPDEF)).toBe(-1); + }); + + it("Enemy side + single battle + player uses octolock - does not interact with mirror armor, opponent loses stats", async () => { + game.override.enemyAbility(Abilities.MIRROR_ARMOR); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + const userPokemon = game.scene.getPlayerPokemon()!; + + // Player uses octolock, enemy loses stats at end of turn + game.move.select(Moves.OCTOLOCK); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.toNextTurn(); + + expect(userPokemon.getStatStage(Stat.DEF)).toBe(0); + expect(userPokemon.getStatStage(Stat.SPDEF)).toBe(0); + expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(-1); + expect(enemyPokemon.getStatStage(Stat.SPDEF)).toBe(-1); + }); + + it("Both sides have mirror armor - does not loop, player loses attack", async () => { + game.override.enemyAbility(Abilities.MIRROR_ARMOR); + game.override.ability(Abilities.MIRROR_ARMOR); + game.override.ability(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + const userPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.toNextTurn(); + + expect(userPokemon.getStatStage(Stat.ATK)).toBe(-1); + expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("Single battle + sticky web applied player side - player switches out and enemy should lose -1 speed", async () => { + game.override.ability(Abilities.MIRROR_ARMOR); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + const userPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.STICKY_WEB, BattlerIndex.PLAYER); + await game.toNextTurn(); + + game.doSwitchPokemon(1); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.toNextTurn(); + + expect(userPokemon.getStatStage(Stat.SPD)).toBe(0); + expect(enemyPokemon.getStatStage(Stat.SPD)).toBe(-1); + }); + + it("Double battle + sticky web applied player side - player switches out and enemy 1 should lose -1 speed", async () => { + game.override.battleType("double"); + game.override.ability(Abilities.MIRROR_ARMOR); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + const [enemy1, enemy2] = game.scene.getEnemyField(); + const [player1, player2] = game.scene.getPlayerField(); + + game.move.select(Moves.SPLASH); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.STICKY_WEB, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.toNextTurn(); + + game.doSwitchPokemon(2); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.toNextTurn(); + + expect(enemy1.getStatStage(Stat.SPD)).toBe(-1); + expect(enemy2.getStatStage(Stat.SPD)).toBe(0); + expect(player1.getStatStage(Stat.SPD)).toBe(0); + expect(player2.getStatStage(Stat.SPD)).toBe(0); + }); +}); diff --git a/test/abilities/moody.test.ts b/test/abilities/moody.test.ts new file mode 100644 index 00000000000..da24899a4b0 --- /dev/null +++ b/test/abilities/moody.test.ts @@ -0,0 +1,87 @@ +import { BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Abilities - Moody", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override + .battleType("single") + .enemySpecies(Species.RATTATA) + .enemyAbility(Abilities.BALL_FETCH) + .ability(Abilities.MOODY) + .enemyMoveset(Moves.SPLASH) + .moveset(Moves.SPLASH); + }); + + it("should increase one stat stage by 2 and decrease a different stat stage by 1", async () => { + await game.classicMode.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + + // Find the increased and decreased stats, make sure they are different. + const changedStats = EFFECTIVE_STATS.filter( + s => playerPokemon.getStatStage(s) === 2 || playerPokemon.getStatStage(s) === -1, + ); + + expect(changedStats).toBeTruthy(); + expect(changedStats.length).toBe(2); + expect(changedStats[0] !== changedStats[1]).toBeTruthy(); + }); + + it("should only increase one stat stage by 2 if all stat stages are at -6", async () => { + await game.classicMode.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + + // Set all stat stages to -6 + vi.spyOn(playerPokemon.summonData, "statStages", "get").mockReturnValue(new Array(BATTLE_STATS.length).fill(-6)); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + + // Should increase one stat stage by 2 (from -6, meaning it will be -4) + const increasedStat = EFFECTIVE_STATS.filter(s => playerPokemon.getStatStage(s) === -4); + + expect(increasedStat).toBeTruthy(); + expect(increasedStat.length).toBe(1); + }); + + it("should only decrease one stat stage by 1 stage if all stat stages are at 6", async () => { + await game.classicMode.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + + // Set all stat stages to 6 + vi.spyOn(playerPokemon.summonData, "statStages", "get").mockReturnValue(new Array(BATTLE_STATS.length).fill(6)); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + + // Should decrease one stat stage by 1 (from 6, meaning it will be 5) + const decreasedStat = EFFECTIVE_STATS.filter(s => playerPokemon.getStatStage(s) === 5); + + expect(decreasedStat).toBeTruthy(); + expect(decreasedStat.length).toBe(1); + }); +}); diff --git a/src/test/abilities/moxie.test.ts b/test/abilities/moxie.test.ts similarity index 67% rename from src/test/abilities/moxie.test.ts rename to test/abilities/moxie.test.ts index 5f337fedabb..ec93aebd2c0 100644 --- a/src/test/abilities/moxie.test.ts +++ b/test/abilities/moxie.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -32,16 +32,13 @@ describe("Abilities - Moxie", () => { game.override.enemyAbility(Abilities.MOXIE); game.override.ability(Abilities.MOXIE); game.override.startingLevel(2000); - game.override.moveset([ moveToUse ]); + game.override.moveset([moveToUse]); game.override.enemyMoveset(Moves.SPLASH); }); - it("should raise ATK stat stage by 1 when winning a battle", async() => { + it("should raise ATK stat stage by 1 when winning a battle", async () => { const moveToUse = Moves.AERIAL_ACE; - await game.startBattle([ - Species.MIGHTYENA, - Species.MIGHTYENA, - ]); + await game.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -54,25 +51,26 @@ describe("Abilities - Moxie", () => { }, 20000); // TODO: Activate this test when MOXIE is corrected to work on faint and not on battle victory - it.todo("should raise ATK stat stage by 1 when defeating an ally Pokemon", async() => { - game.override.battleType("double"); - const moveToUse = Moves.AERIAL_ACE; - await game.startBattle([ - Species.MIGHTYENA, - Species.MIGHTYENA, - ]); + it.todo( + "should raise ATK stat stage by 1 when defeating an ally Pokemon", + async () => { + game.override.battleType("double"); + const moveToUse = Moves.AERIAL_ACE; + await game.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]); - const [ firstPokemon, secondPokemon ] = game.scene.getPlayerField(); + const [firstPokemon, secondPokemon] = game.scene.getPlayerField(); - expect(firstPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(firstPokemon.getStatStage(Stat.ATK)).toBe(0); - secondPokemon.hp = 1; + secondPokemon.hp = 1; - game.move.select(moveToUse); - game.selectTarget(BattlerIndex.PLAYER_2); + game.move.select(moveToUse); + game.selectTarget(BattlerIndex.PLAYER_2); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to(TurnEndPhase); - expect(firstPokemon.getStatStage(Stat.ATK)).toBe(1); - }, 20000); + expect(firstPokemon.getStatStage(Stat.ATK)).toBe(1); + }, + 20000, + ); }); diff --git a/test/abilities/mummy.test.ts b/test/abilities/mummy.test.ts new file mode 100644 index 00000000000..0971353c14d --- /dev/null +++ b/test/abilities/mummy.test.ts @@ -0,0 +1,52 @@ +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Abilities - Mummy", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH]) + .ability(Abilities.MUMMY) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.TACKLE); + }); + + it("should set the enemy's ability to mummy when hit by a contact move", async () => { + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.MUMMY); + }); + + it("should not change the enemy's ability hit by a non-contact move", async () => { + game.override.enemyMoveset(Moves.EARTHQUAKE); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH); + }); +}); diff --git a/src/test/abilities/mycelium_might.test.ts b/test/abilities/mycelium_might.test.ts similarity index 82% rename from src/test/abilities/mycelium_might.test.ts rename to test/abilities/mycelium_might.test.ts index 0c8e7b5a703..8c7796ec736 100644 --- a/src/test/abilities/mycelium_might.test.ts +++ b/test/abilities/mycelium_might.test.ts @@ -1,6 +1,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Abilities } from "#enums/abilities"; import { Stat } from "#enums/stat"; import { Moves } from "#enums/moves"; @@ -28,9 +28,9 @@ describe("Abilities - Mycelium Might", () => { game.override.disableCrits(); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.CLEAR_BODY); - game.override.enemyMoveset([ Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK ]); + game.override.enemyMoveset([Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK]); game.override.ability(Abilities.MYCELIUM_MIGHT); - game.override.moveset([ Moves.QUICK_ATTACK, Moves.BABY_DOLL_EYES ]); + game.override.moveset([Moves.QUICK_ATTACK, Moves.BABY_DOLL_EYES]); }); /** @@ -41,7 +41,7 @@ describe("Abilities - Mycelium Might", () => { **/ it("will move last in its priority bracket and ignore protective abilities", async () => { - await game.startBattle([ Species.REGIELEKI ]); + await game.startBattle([Species.REGIELEKI]); const enemyPokemon = game.scene.getEnemyPokemon(); const playerIndex = game.scene.getPlayerPokemon()?.getBattlerIndex(); @@ -55,8 +55,8 @@ describe("Abilities - Mycelium Might", () => { const commandOrder = phase.getCommandOrder(); // The opponent Pokemon (without Mycelium Might) goes first despite having lower speed than the player Pokemon. // The player Pokemon (with Mycelium Might) goes last despite having higher speed than the opponent. - expect(speedOrder).toEqual([ playerIndex, enemyIndex ]); - expect(commandOrder).toEqual([ enemyIndex, playerIndex ]); + expect(speedOrder).toEqual([playerIndex, enemyIndex]); + expect(commandOrder).toEqual([enemyIndex, playerIndex]); await game.phaseInterceptor.to(TurnEndPhase); // Despite the opponent's ability (Clear Body), its ATK stat stage is still reduced. @@ -64,8 +64,8 @@ describe("Abilities - Mycelium Might", () => { }, 20000); it("will still go first if a status move that is in a higher priority bracket than the opponent's move is used", async () => { - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); - await game.startBattle([ Species.REGIELEKI ]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); + await game.startBattle([Species.REGIELEKI]); const enemyPokemon = game.scene.getEnemyPokemon(); const playerIndex = game.scene.getPlayerPokemon()?.getBattlerIndex(); @@ -79,15 +79,15 @@ describe("Abilities - Mycelium Might", () => { const commandOrder = phase.getCommandOrder(); // The player Pokemon (with M.M.) goes first because its move is still within a higher priority bracket than its opponent. // The enemy Pokemon goes second because its move is in a lower priority bracket. - expect(speedOrder).toEqual([ playerIndex, enemyIndex ]); - expect(commandOrder).toEqual([ playerIndex, enemyIndex ]); + expect(speedOrder).toEqual([playerIndex, enemyIndex]); + expect(commandOrder).toEqual([playerIndex, enemyIndex]); await game.phaseInterceptor.to(TurnEndPhase); // Despite the opponent's ability (Clear Body), its ATK stat stage is still reduced. expect(enemyPokemon?.getStatStage(Stat.ATK)).toBe(-1); }, 20000); it("will not affect non-status moves", async () => { - await game.startBattle([ Species.REGIELEKI ]); + await game.startBattle([Species.REGIELEKI]); const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex(); const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex(); @@ -101,7 +101,7 @@ describe("Abilities - Mycelium Might", () => { // The player Pokemon (with M.M.) goes first because it has a higher speed and did not use a status move. // The enemy Pokemon (without M.M.) goes second because its speed is lower. // This means that the commandOrder should be identical to the speedOrder - expect(speedOrder).toEqual([ playerIndex, enemyIndex ]); - expect(commandOrder).toEqual([ playerIndex, enemyIndex ]); + expect(speedOrder).toEqual([playerIndex, enemyIndex]); + expect(commandOrder).toEqual([playerIndex, enemyIndex]); }, 20000); }); diff --git a/test/abilities/neutralizing_gas.test.ts b/test/abilities/neutralizing_gas.test.ts new file mode 100644 index 00000000000..08ab884d806 --- /dev/null +++ b/test/abilities/neutralizing_gas.test.ts @@ -0,0 +1,180 @@ +import { BattlerIndex } from "#app/battle"; +import { PostSummonWeatherChangeAbAttr } from "#app/data/ability"; +import { Abilities } from "#enums/abilities"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { Moves } from "#enums/moves"; +import { PokeballType } from "#enums/pokeball"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Abilities - Neutralizing Gas", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH]) + .ability(Abilities.NEUTRALIZING_GAS) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should prevent other abilities from activating", async () => { + game.override.enemyAbility(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("TurnEndPhase"); + + // Intimidate is suppressed, so the attack stat should not be lowered + expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should allow the user's passive to activate", async () => { + game.override.passiveAbility(Abilities.INTREPID_SWORD); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(1); + }); + + it.todo("should activate before other abilities", async () => { + game.override.enemySpecies(Species.ACCELGOR).enemyLevel(100).enemyAbility(Abilities.INTIMIDATE); + + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("TurnEndPhase"); + + // Intimidate is suppressed even when the user's speed is lower + expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should activate other abilities when removed", async () => { + game.override + .enemyAbility(Abilities.INTREPID_SWORD) + .enemyPassiveAbility(Abilities.DAUNTLESS_SHIELD) + .enemyMoveset(Moves.ENTRAINMENT); + + await game.classicMode.startBattle([Species.FEEBAS]); + + const enemyPokemon = game.scene.getEnemyPokemon(); + expect(enemyPokemon?.getStatStage(Stat.ATK)).toBe(0); + expect(enemyPokemon?.getStatStage(Stat.DEF)).toBe(0); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + // Enemy removes user's ability, so both abilities are activated + expect(enemyPokemon?.getStatStage(Stat.ATK)).toBe(1); + expect(enemyPokemon?.getStatStage(Stat.DEF)).toBe(1); + }); + + it("should not activate the user's other ability when removed", async () => { + game.override.passiveAbility(Abilities.INTIMIDATE).enemyMoveset(Moves.ENTRAINMENT); + + await game.classicMode.startBattle([Species.FEEBAS]); + // Neutralising gas user's passive is still active + const enemyPokemon = game.scene.getEnemyPokemon(); + expect(enemyPokemon?.getStatStage(Stat.ATK)).toBe(-1); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + // Intimidate did not reactivate after neutralizing gas was removed + expect(enemyPokemon?.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should only deactivate when all setters are off the field", async () => { + game.override.enemyMoveset([Moves.ENTRAINMENT, Moves.SPLASH]).battleType("double"); + + await game.classicMode.startBattle([Species.ACCELGOR, Species.ACCELGOR]); + game.move.select(Moves.SPLASH, 0); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.ENTRAINMENT, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.SPLASH); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined(); // Now one neut gas user is left + + game.move.select(Moves.SPLASH, 0); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.ENTRAINMENT, BattlerIndex.PLAYER_2); + await game.forceEnemyMove(Moves.SPLASH); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined(); // No neut gas users are left + }); + + it("should deactivate when suppressed by gastro acid", async () => { + game.override.enemyMoveset(Moves.GASTRO_ACID); + + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined(); + }); + + it("should deactivate when the pokemon faints", async () => { + game.override.ability(Abilities.BALL_FETCH).enemyAbility(Abilities.NEUTRALIZING_GAS); + + await game.classicMode.startBattle([Species.FEEBAS]); + game.move.select(Moves.SPLASH); + expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined(); + await game.doKillOpponents(); + + expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined(); + }); + + it("should deactivate upon catching a wild pokemon", async () => { + game.override.battleType("single").enemyAbility(Abilities.NEUTRALIZING_GAS).ability(Abilities.BALL_FETCH); + await game.classicMode.startBattle([Species.MAGIKARP]); + expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined(); + + game.scene.pokeballCounts[PokeballType.MASTER_BALL] = 1; + game.doThrowPokeball(PokeballType.MASTER_BALL); + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined(); + }); + + it("should not activate abilities of pokemon no longer on the field", async () => { + game.override + .battleType("single") + .ability(Abilities.NEUTRALIZING_GAS) + .enemyAbility(Abilities.DELTA_STREAM); + await game.classicMode.startBattle([ Species.MAGIKARP ]); + + const enemy = game.scene.getEnemyPokemon()!; + const weatherChangeAttr = enemy.getAbilityAttrs(PostSummonWeatherChangeAbAttr, false)[0]; + vi.spyOn(weatherChangeAttr, "applyPostSummon"); + + expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined(); + + game.move.select(Moves.SPLASH); + await game.killPokemon(enemy); + await game.killPokemon(game.scene.getPlayerPokemon()!); + + expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined(); + expect(weatherChangeAttr.applyPostSummon).not.toHaveBeenCalled(); + }); +}); diff --git a/src/test/abilities/no_guard.test.ts b/test/abilities/no_guard.test.ts similarity index 83% rename from src/test/abilities/no_guard.test.ts rename to test/abilities/no_guard.test.ts index b0b454dd560..41b8fbd27b9 100644 --- a/src/test/abilities/no_guard.test.ts +++ b/test/abilities/no_guard.test.ts @@ -4,7 +4,7 @@ import { MoveEndPhase } from "#app/phases/move-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; @@ -35,13 +35,11 @@ describe("Abilities - No Guard", () => { it("should make moves always hit regardless of move accuracy", async () => { game.override.battleType("single"); - await game.classicMode.startBattle([ - Species.REGIELEKI - ]); + await game.classicMode.startBattle([Species.REGIELEKI]); game.move.select(Moves.ZAP_CANNON); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(MoveEffectPhase, false); @@ -54,11 +52,7 @@ describe("Abilities - No Guard", () => { }); it("should guarantee double battle with any one LURE", async () => { - game.override - .startingModifier([ - { name: "LURE" }, - ]) - .startingWave(2); + game.override.startingModifier([{ name: "LURE" }]).startingWave(2); await game.classicMode.startBattle(); diff --git a/test/abilities/parental_bond.test.ts b/test/abilities/parental_bond.test.ts new file mode 100644 index 00000000000..2aa24e78d6e --- /dev/null +++ b/test/abilities/parental_bond.test.ts @@ -0,0 +1,429 @@ +import { PokemonType } from "#enums/pokemon-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { toDmgValue } from "#app/utils"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Abilities - Parental Bond", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + game.override.disableCrits(); + game.override.ability(Abilities.PARENTAL_BOND); + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyAbility(Abilities.FUR_COAT); + game.override.enemyMoveset(Moves.SPLASH); + game.override.startingLevel(100); + game.override.enemyLevel(100); + }); + + it("should add second strike to attack move", async () => { + game.override.moveset([Moves.TACKLE]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + let enemyStartingHp = enemyPokemon.hp; + + game.move.select(Moves.TACKLE); + + await game.phaseInterceptor.to("DamageAnimPhase"); + const firstStrikeDamage = enemyStartingHp - enemyPokemon.hp; + enemyStartingHp = enemyPokemon.hp; + + await game.phaseInterceptor.to("BerryPhase", false); + + const secondStrikeDamage = enemyStartingHp - enemyPokemon.hp; + + expect(leadPokemon.turnData.hitCount).toBe(2); + expect(secondStrikeDamage).toBe(toDmgValue(0.25 * firstStrikeDamage)); + }); + + it("should apply secondary effects to both strikes", async () => { + game.override.moveset([Moves.POWER_UP_PUNCH]); + game.override.enemySpecies(Species.AMOONGUSS); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.POWER_UP_PUNCH); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.turnData.hitCount).toBe(2); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); + }); + + it("should not apply to Status moves", async () => { + game.override.moveset([Moves.BABY_DOLL_EYES]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.BABY_DOLL_EYES); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should not apply to multi-hit moves", async () => { + game.override.moveset([Moves.DOUBLE_HIT]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.DOUBLE_HIT); + await game.move.forceHit(); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.turnData.hitCount).toBe(2); + }); + + it("should not apply to self-sacrifice moves", async () => { + game.override.moveset([Moves.SELF_DESTRUCT]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SELF_DESTRUCT); + + await game.phaseInterceptor.to("DamageAnimPhase", false); + + expect(leadPokemon.turnData.hitCount).toBe(1); + }); + + it("should not apply to Rollout", async () => { + game.override.moveset([Moves.ROLLOUT]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.ROLLOUT); + await game.move.forceHit(); + + await game.phaseInterceptor.to("DamageAnimPhase", false); + + expect(leadPokemon.turnData.hitCount).toBe(1); + }); + + it("should not apply multiplier to fixed-damage moves", async () => { + game.override.moveset([Moves.DRAGON_RAGE]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.DRAGON_RAGE); + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - 80); + }); + + it("should not apply multiplier to counter moves", async () => { + game.override.moveset([Moves.COUNTER]); + game.override.enemyMoveset([Moves.TACKLE]); + + await game.classicMode.startBattle([Species.SHUCKLE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.COUNTER); + await game.phaseInterceptor.to("DamageAnimPhase"); + + const playerDamage = leadPokemon.getMaxHp() - leadPokemon.hp; + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - 4 * playerDamage); + }); + + it("should not apply to multi-target moves", async () => { + game.override.battleType("double"); + game.override.moveset([Moves.EARTHQUAKE]); + game.override.passiveAbility(Abilities.LEVITATE); + + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); + + const playerPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.EARTHQUAKE); + game.move.select(Moves.EARTHQUAKE, 1); + + await game.phaseInterceptor.to("BerryPhase", false); + + playerPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1)); + }); + + it("should apply to multi-target moves when hitting only one target", async () => { + game.override.moveset([Moves.EARTHQUAKE]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.EARTHQUAKE); + await game.phaseInterceptor.to("DamageAnimPhase", false); + + expect(leadPokemon.turnData.hitCount).toBe(2); + }); + + it("should only trigger post-target move effects once", async () => { + game.override.moveset([Moves.MIND_BLOWN]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.MIND_BLOWN); + + await game.phaseInterceptor.to("DamageAnimPhase", false); + + expect(leadPokemon.turnData.hitCount).toBe(2); + + // This test will time out if the user faints + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() / 2)); + }); + + it("Burn Up only removes type after the second strike", async () => { + game.override.moveset([Moves.BURN_UP]); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.BURN_UP); + + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(leadPokemon.turnData.hitCount).toBe(2); + expect(enemyPokemon.hp).toBeGreaterThan(0); + expect(leadPokemon.isOfType(PokemonType.FIRE)).toBe(true); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.isOfType(PokemonType.FIRE)).toBe(false); + }); + + it("Moves boosted by this ability and Multi-Lens should strike 3 times", async () => { + game.override.moveset([Moves.TACKLE]); + game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.TACKLE); + + await game.phaseInterceptor.to("DamageAnimPhase"); + + expect(leadPokemon.turnData.hitCount).toBe(3); + }); + + it("Seismic Toss boosted by this ability and Multi-Lens should strike 3 times", async () => { + game.override.moveset([Moves.SEISMIC_TOSS]); + game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + const enemyStartingHp = enemyPokemon.hp; + + game.move.select(Moves.SEISMIC_TOSS); + await game.move.forceHit(); + + await game.phaseInterceptor.to("DamageAnimPhase"); + + expect(leadPokemon.turnData.hitCount).toBe(3); + + await game.phaseInterceptor.to("MoveEndPhase", false); + + expect(enemyPokemon.hp).toBe(enemyStartingHp - 200); + }); + + it("Hyper Beam boosted by this ability should strike twice, then recharge", async () => { + game.override.moveset([Moves.HYPER_BEAM]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.HYPER_BEAM); + await game.move.forceHit(); + + await game.phaseInterceptor.to("DamageAnimPhase"); + + expect(leadPokemon.turnData.hitCount).toBe(2); + expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeUndefined(); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeDefined(); + }); + + it("Anchor Shot boosted by this ability should only trap the target after the second hit", async () => { + game.override.moveset([Moves.ANCHOR_SHOT]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.ANCHOR_SHOT); + await game.move.forceHit(); + + await game.phaseInterceptor.to("DamageAnimPhase"); + + expect(leadPokemon.turnData.hitCount).toBe(2); + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); + }); + + it("Smack Down boosted by this ability should only ground the target after the second hit", async () => { + game.override.moveset([Moves.SMACK_DOWN]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.SMACK_DOWN); + await game.move.forceHit(); + + await game.phaseInterceptor.to("DamageAnimPhase"); + + expect(leadPokemon.turnData.hitCount).toBe(2); + expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined(); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined(); + }); + + it("U-turn boosted by this ability should strike twice before forcing a switch", async () => { + game.override.moveset([Moves.U_TURN]); + + await game.classicMode.startBattle([Species.MAGIKARP, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.U_TURN); + await game.move.forceHit(); + + await game.phaseInterceptor.to("MoveEffectPhase"); + expect(leadPokemon.turnData.hitCount).toBe(2); + + // This will cause this test to time out if the switch was forced on the first hit. + await game.phaseInterceptor.to("MoveEffectPhase", false); + }); + + it("Wake-Up Slap boosted by this ability should only wake up the target after the second hit", async () => { + game.override.moveset([Moves.WAKE_UP_SLAP]).enemyStatusEffect(StatusEffect.SLEEP); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.WAKE_UP_SLAP); + await game.move.forceHit(); + + await game.phaseInterceptor.to("DamageAnimPhase"); + + expect(leadPokemon.turnData.hitCount).toBe(2); + expect(enemyPokemon.status?.effect).toBe(StatusEffect.SLEEP); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.status?.effect).toBeUndefined(); + }); + + it("should not cause user to hit into King's Shield more than once", async () => { + game.override.moveset([Moves.TACKLE]); + game.override.enemyMoveset([Moves.KINGS_SHIELD]); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.TACKLE); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should not cause user to hit into Storm Drain more than once", async () => { + game.override.moveset([Moves.WATER_GUN]); + game.override.enemyAbility(Abilities.STORM_DRAIN); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.WATER_GUN); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(1); + }); + + it("should not allow Future Sight to hit infinitely many times if the user switches out", async () => { + game.override.enemyLevel(1000).moveset(Moves.FUTURE_SIGHT); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + vi.spyOn(enemyPokemon, "damageAndUpdate"); + + game.move.select(Moves.FUTURE_SIGHT); + await game.toNextTurn(); + + game.doSwitchPokemon(1); + await game.toNextTurn(); + + game.doSwitchPokemon(2); + await game.toNextTurn(); + + // TODO: Update hit count to 1 once Future Sight is fixed to not activate abilities if user is off the field + expect(enemyPokemon.damageAndUpdate).toHaveBeenCalledTimes(2); + }); +}); diff --git a/src/test/abilities/pastel_veil.test.ts b/test/abilities/pastel_veil.test.ts similarity index 89% rename from src/test/abilities/pastel_veil.test.ts rename to test/abilities/pastel_veil.test.ts index dd8360493a1..65e391b7c22 100644 --- a/src/test/abilities/pastel_veil.test.ts +++ b/test/abilities/pastel_veil.test.ts @@ -5,7 +5,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -27,14 +27,14 @@ describe("Abilities - Pastel Veil", () => { game = new GameManager(phaserGame); game.override .battleType("double") - .moveset([ Moves.TOXIC_THREAD, Moves.SPLASH ]) + .moveset([Moves.TOXIC_THREAD, Moves.SPLASH]) .enemyAbility(Abilities.BALL_FETCH) .enemySpecies(Species.SUNKERN) .enemyMoveset(Moves.SPLASH); }); it("prevents the user and its allies from being afflicted by poison", async () => { - await game.startBattle([ Species.MAGIKARP, Species.GALAR_PONYTA ]); + await game.startBattle([Species.MAGIKARP, Species.GALAR_PONYTA]); const ponyta = game.scene.getPlayerField()[1]; const magikarp = game.scene.getPlayerField()[0]; ponyta.abilityIndex = 1; @@ -50,7 +50,7 @@ describe("Abilities - Pastel Veil", () => { }); it("it heals the poisoned status condition of allies if user is sent out into battle", async () => { - await game.startBattle([ Species.MAGIKARP, Species.FEEBAS, Species.GALAR_PONYTA ]); + await game.startBattle([Species.MAGIKARP, Species.FEEBAS, Species.GALAR_PONYTA]); const ponyta = game.scene.getPlayerParty()[2]; const magikarp = game.scene.getPlayerField()[0]; ponyta.abilityIndex = 1; diff --git a/test/abilities/perish_body.test.ts b/test/abilities/perish_body.test.ts new file mode 100644 index 00000000000..424d35e2542 --- /dev/null +++ b/test/abilities/perish_body.test.ts @@ -0,0 +1,112 @@ +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Abilities - Perish Song", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + game.override.disableCrits(); + + game.override.enemySpecies(Species.MAGIKARP); + game.override.enemyAbility(Abilities.BALL_FETCH); + + game.override.starterSpecies(Species.CURSOLA); + game.override.ability(Abilities.PERISH_BODY); + game.override.moveset([Moves.SPLASH]); + }); + + it("should trigger when hit with damaging move", async () => { + game.override.enemyMoveset([Moves.AQUA_JET]); + await game.classicMode.startBattle(); + const cursola = game.scene.getPlayerPokemon(); + const magikarp = game.scene.getEnemyPokemon(); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + + expect(cursola?.summonData.tags[0].turnCount).toBe(3); + expect(magikarp?.summonData.tags[0].turnCount).toBe(3); + }); + + it("should trigger even when fainting", async () => { + game.override.enemyMoveset([Moves.AQUA_JET]).enemyLevel(100).startingLevel(1); + await game.classicMode.startBattle([Species.CURSOLA, Species.FEEBAS]); + const magikarp = game.scene.getEnemyPokemon(); + + game.move.select(Moves.SPLASH); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + expect(magikarp?.summonData.tags[0].turnCount).toBe(3); + }); + + it("should not activate if attacker already has perish song", async () => { + game.override.enemyMoveset([Moves.PERISH_SONG, Moves.AQUA_JET, Moves.SPLASH]); + await game.classicMode.startBattle([Species.FEEBAS, Species.CURSOLA]); + const feebas = game.scene.getPlayerPokemon(); + const magikarp = game.scene.getEnemyPokemon(); + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.PERISH_SONG); + await game.toNextTurn(); + + expect(feebas?.summonData.tags[0].turnCount).toBe(3); + expect(magikarp?.summonData.tags[0].turnCount).toBe(3); + + game.doSwitchPokemon(1); + await game.forceEnemyMove(Moves.SPLASH); + await game.toNextTurn(); + + const cursola = game.scene.getPlayerPokemon(); + expect(cursola?.summonData.tags.length).toBe(0); + expect(magikarp?.summonData.tags[0].turnCount).toBe(2); + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.AQUA_JET); + await game.toNextTurn(); + + expect(cursola?.summonData.tags.length).toBe(0); + expect(magikarp?.summonData.tags[0].turnCount).toBe(1); + }); + + it("should activate if cursola already has perish song, but not reset its counter", async () => { + game.override.enemyMoveset([Moves.PERISH_SONG, Moves.AQUA_JET, Moves.SPLASH]); + game.override.moveset([Moves.WHIRLWIND, Moves.SPLASH]); + game.override.startingWave(5); + await game.classicMode.startBattle([Species.CURSOLA]); + const cursola = game.scene.getPlayerPokemon(); + + game.move.select(Moves.WHIRLWIND); + await game.forceEnemyMove(Moves.PERISH_SONG); + await game.toNextTurn(); + + const magikarp = game.scene.getEnemyPokemon(); + expect(cursola?.summonData.tags[0].turnCount).toBe(3); + expect(magikarp?.summonData.tags.length).toBe(0); + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.AQUA_JET); + await game.toNextTurn(); + + expect(cursola?.summonData.tags[0].turnCount).toBe(2); + expect(magikarp?.summonData.tags.length).toBe(1); + expect(magikarp?.summonData.tags[0].turnCount).toBe(3); + }); +}); diff --git a/test/abilities/power_construct.test.ts b/test/abilities/power_construct.test.ts new file mode 100644 index 00000000000..c253f2ae4df --- /dev/null +++ b/test/abilities/power_construct.test.ts @@ -0,0 +1,87 @@ +import { Status } from "#app/data/status-effect"; +import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { StatusEffect } from "#enums/status-effect"; +import GameManager from "#test/testUtils/gameManager"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Abilities - POWER CONSTRUCT", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + const moveToUse = Moves.SPLASH; + game.override.battleType("single"); + game.override.ability(Abilities.POWER_CONSTRUCT); + game.override.moveset([moveToUse]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); + }); + + test("check if fainted 50% Power Construct Pokemon switches to base form on arena reset", async () => { + const baseForm = 2, + completeForm = 4; + game.override.startingWave(4); + game.override.starterForms({ + [Species.ZYGARDE]: completeForm, + }); + + await game.classicMode.startBattle([Species.MAGIKARP, Species.ZYGARDE]); + + const zygarde = game.scene.getPlayerParty().find(p => p.species.speciesId === Species.ZYGARDE); + expect(zygarde).not.toBe(undefined); + expect(zygarde!.formIndex).toBe(completeForm); + + zygarde!.hp = 0; + zygarde!.status = new Status(StatusEffect.FAINT); + expect(zygarde!.isFainted()).toBe(true); + + game.move.select(Moves.SPLASH); + await game.doKillOpponents(); + await game.phaseInterceptor.to(TurnEndPhase); + game.doSelectModifier(); + await game.phaseInterceptor.to(QuietFormChangePhase); + + expect(zygarde!.formIndex).toBe(baseForm); + }); + + test("check if fainted 10% Power Construct Pokemon switches to base form on arena reset", async () => { + const baseForm = 3, + completeForm = 5; + game.override.startingWave(4); + game.override.starterForms({ + [Species.ZYGARDE]: completeForm, + }); + + await game.classicMode.startBattle([Species.MAGIKARP, Species.ZYGARDE]); + + const zygarde = game.scene.getPlayerParty().find(p => p.species.speciesId === Species.ZYGARDE); + expect(zygarde).not.toBe(undefined); + expect(zygarde!.formIndex).toBe(completeForm); + + zygarde!.hp = 0; + zygarde!.status = new Status(StatusEffect.FAINT); + expect(zygarde!.isFainted()).toBe(true); + + game.move.select(Moves.SPLASH); + await game.doKillOpponents(); + await game.phaseInterceptor.to(TurnEndPhase); + game.doSelectModifier(); + await game.phaseInterceptor.to(QuietFormChangePhase); + + expect(zygarde!.formIndex).toBe(baseForm); + }); +}); diff --git a/src/test/abilities/power_spot.test.ts b/test/abilities/power_spot.test.ts similarity index 84% rename from src/test/abilities/power_spot.test.ts rename to test/abilities/power_spot.test.ts index a566c2277c3..e29b5ecf775 100644 --- a/src/test/abilities/power_spot.test.ts +++ b/test/abilities/power_spot.test.ts @@ -1,10 +1,10 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -27,7 +27,7 @@ describe("Abilities - Power Spot", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("double"); - game.override.moveset([ Moves.TACKLE, Moves.BREAKING_SWIPE, Moves.SPLASH, Moves.DAZZLING_GLEAM ]); + game.override.moveset([Moves.TACKLE, Moves.BREAKING_SWIPE, Moves.SPLASH, Moves.DAZZLING_GLEAM]); game.override.enemyMoveset(Moves.SPLASH); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.BALL_FETCH); @@ -39,7 +39,7 @@ describe("Abilities - Power Spot", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([ Species.REGIELEKI, Species.STONJOURNER ]); + await game.startBattle([Species.REGIELEKI, Species.STONJOURNER]); game.move.select(Moves.DAZZLING_GLEAM); game.move.select(Moves.SPLASH, 1); await game.phaseInterceptor.to(MoveEffectPhase); @@ -53,7 +53,7 @@ describe("Abilities - Power Spot", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([ Species.REGIELEKI, Species.STONJOURNER ]); + await game.startBattle([Species.REGIELEKI, Species.STONJOURNER]); game.move.select(Moves.BREAKING_SWIPE); game.move.select(Moves.SPLASH, 1); await game.phaseInterceptor.to(MoveEffectPhase); @@ -67,7 +67,7 @@ describe("Abilities - Power Spot", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([ Species.STONJOURNER, Species.REGIELEKI ]); + await game.startBattle([Species.STONJOURNER, Species.REGIELEKI]); game.move.select(Moves.BREAKING_SWIPE); game.move.select(Moves.SPLASH, 1); await game.phaseInterceptor.to(TurnEndPhase); diff --git a/test/abilities/protean.test.ts b/test/abilities/protean.test.ts new file mode 100644 index 00000000000..574033bb13f --- /dev/null +++ b/test/abilities/protean.test.ts @@ -0,0 +1,301 @@ +import { allMoves } from "#app/data/moves/move"; +import { PokemonType } from "#enums/pokemon-type"; +import { Weather } from "#app/data/weather"; +import type { PlayerPokemon } from "#app/field/pokemon"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Abilities } from "#enums/abilities"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Biome } from "#enums/biome"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { WeatherType } from "#enums/weather-type"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Abilities - Protean", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + game.override.ability(Abilities.PROTEAN); + game.override.startingLevel(100); + game.override.enemySpecies(Species.RATTATA); + game.override.enemyMoveset([Moves.ENDURE, Moves.ENDURE, Moves.ENDURE, Moves.ENDURE]); + }); + + test("ability applies and changes a pokemon's type", async () => { + game.override.moveset([Moves.SPLASH]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); + }); + + // Test for Gen9+ functionality, we are using previous funcionality + test.skip("ability applies only once per switch in", async () => { + game.override.moveset([Moves.SPLASH, Moves.AGILITY]); + + await game.startBattle([Species.MAGIKARP, Species.BULBASAUR]); + + let leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); + + game.move.select(Moves.AGILITY); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied.filter(a => a === Abilities.PROTEAN)).toHaveLength(1); + const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]]; + const moveType = PokemonType[allMoves[Moves.AGILITY].type]; + expect(leadPokemonType).not.toBe(moveType); + + await game.toNextTurn(); + game.doSwitchPokemon(1); + await game.toNextTurn(); + game.doSwitchPokemon(1); + await game.toNextTurn(); + + leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH); + }); + + test("ability applies correctly even if the pokemon's move has a variable type", async () => { + game.override.moveset([Moves.WEATHER_BALL]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.scene.arena.weather = new Weather(WeatherType.SUNNY); + game.move.select(Moves.WEATHER_BALL); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.PROTEAN); + expect(leadPokemon.getTypes()).toHaveLength(1); + const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]], + moveType = PokemonType[PokemonType.FIRE]; + expect(leadPokemonType).toBe(moveType); + }); + + test("ability applies correctly even if the type has changed by another ability", async () => { + game.override.moveset([Moves.TACKLE]); + game.override.passiveAbility(Abilities.REFRIGERATE); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.TACKLE); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.PROTEAN); + expect(leadPokemon.getTypes()).toHaveLength(1); + const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]], + moveType = PokemonType[PokemonType.ICE]; + expect(leadPokemonType).toBe(moveType); + }); + + test("ability applies correctly even if the pokemon's move calls another move", async () => { + game.override.moveset([Moves.NATURE_POWER]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.scene.arena.biomeType = Biome.MOUNTAIN; + game.move.select(Moves.NATURE_POWER); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.AIR_SLASH); + }); + + test("ability applies correctly even if the pokemon's move is delayed / charging", async () => { + game.override.moveset([Moves.DIG]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.DIG); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.DIG); + }); + + test("ability applies correctly even if the pokemon's move misses", async () => { + game.override.moveset([Moves.TACKLE]); + game.override.enemyMoveset(Moves.SPLASH); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.TACKLE); + await game.move.forceMiss(); + await game.phaseInterceptor.to(TurnEndPhase); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + expect(enemyPokemon.isFullHp()).toBe(true); + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); + }); + + test("ability applies correctly even if the pokemon's move is protected against", async () => { + game.override.moveset([Moves.TACKLE]); + game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.TACKLE); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); + }); + + test("ability applies correctly even if the pokemon's move fails because of type immunity", async () => { + game.override.moveset([Moves.TACKLE]); + game.override.enemySpecies(Species.GASTLY); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.TACKLE); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE); + }); + + test("ability is not applied if pokemon's type is the same as the move's type", async () => { + game.override.moveset([Moves.SPLASH]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + leadPokemon.summonData.types = [allMoves[Moves.SPLASH].type]; + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN); + }); + + test("ability is not applied if pokemon is terastallized", async () => { + game.override.moveset([Moves.SPLASH]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + leadPokemon.isTerastallized = true; + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN); + }); + + test("ability is not applied if pokemon uses struggle", async () => { + game.override.moveset([Moves.STRUGGLE]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.STRUGGLE); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN); + }); + + test("ability is not applied if the pokemon's move fails", async () => { + game.override.moveset([Moves.BURN_UP]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.BURN_UP); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN); + }); + + test("ability applies correctly even if the pokemon's Trick-or-Treat fails", async () => { + game.override.moveset([Moves.TRICK_OR_TREAT]); + game.override.enemySpecies(Species.GASTLY); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.TRICK_OR_TREAT); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TRICK_OR_TREAT); + }); + + test("ability applies correctly and the pokemon curses itself", async () => { + game.override.moveset([Moves.CURSE]); + + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + game.move.select(Moves.CURSE); + await game.phaseInterceptor.to(TurnEndPhase); + + testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.CURSE); + expect(leadPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined); + }); +}); + +function testPokemonTypeMatchesDefaultMoveType(pokemon: PlayerPokemon, move: Moves) { + expect(pokemon.summonData.abilitiesApplied).toContain(Abilities.PROTEAN); + expect(pokemon.getTypes()).toHaveLength(1); + const pokemonType = PokemonType[pokemon.getTypes()[0]], + moveType = PokemonType[allMoves[move].type]; + expect(pokemonType).toBe(moveType); +} diff --git a/test/abilities/protosynthesis.test.ts b/test/abilities/protosynthesis.test.ts new file mode 100644 index 00000000000..d0ae46cd951 --- /dev/null +++ b/test/abilities/protosynthesis.test.ts @@ -0,0 +1,67 @@ +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Nature } from "#enums/nature"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { BattlerIndex } from "#app/battle"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Abilities - Protosynthesis", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH, Moves.TACKLE]) + .ability(Abilities.PROTOSYNTHESIS) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should not consider temporary items when determining which stat to boost", async () => { + // Mew has uniform base stats + game.override + .startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.DEF }]) + .enemyMoveset(Moves.SUNNY_DAY) + .startingLevel(100) + .enemyLevel(100); + await game.classicMode.startBattle([Species.MEW]); + const mew = game.scene.getPlayerPokemon()!; + // Nature of starting mon is randomized. We need to fix it to a neutral nature for the automated test. + mew.setNature(Nature.HARDY); + const enemy = game.scene.getEnemyPokemon()!; + const def_before_boost = mew.getEffectiveStat(Stat.DEF, undefined, undefined, false, undefined, false, false, true); + const atk_before_boost = mew.getEffectiveStat(Stat.ATK, undefined, undefined, false, undefined, false, false, true); + const initialHp = enemy.hp; + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.toNextTurn(); + const unboosted_dmg = initialHp - enemy.hp; + enemy.hp = initialHp; + const def_after_boost = mew.getEffectiveStat(Stat.DEF, undefined, undefined, false, undefined, false, false, true); + const atk_after_boost = mew.getEffectiveStat(Stat.ATK, undefined, undefined, false, undefined, false, false, true); + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.toNextTurn(); + const boosted_dmg = initialHp - enemy.hp; + expect(boosted_dmg).toBeGreaterThan(unboosted_dmg); + expect(def_after_boost).toEqual(def_before_boost); + expect(atk_after_boost).toBeGreaterThan(atk_before_boost); + }); +}); diff --git a/src/test/abilities/quick_draw.test.ts b/test/abilities/quick_draw.test.ts similarity index 70% rename from src/test/abilities/quick_draw.test.ts rename to test/abilities/quick_draw.test.ts index 4979152f4d6..9969dc2aa75 100644 --- a/src/test/abilities/quick_draw.test.ts +++ b/test/abilities/quick_draw.test.ts @@ -3,7 +3,7 @@ import { FaintPhase } from "#app/phases/faint-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; @@ -27,14 +27,16 @@ describe("Abilities - Quick Draw", () => { game.override.starterSpecies(Species.MAGIKARP); game.override.ability(Abilities.QUICK_DRAW); - game.override.moveset([ Moves.TACKLE, Moves.TAIL_WHIP ]); + game.override.moveset([Moves.TACKLE, Moves.TAIL_WHIP]); game.override.enemyLevel(100); game.override.enemySpecies(Species.MAGIKARP); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset([ Moves.TACKLE ]); + game.override.enemyMoveset([Moves.TACKLE]); - vi.spyOn(allAbilities[Abilities.QUICK_DRAW].getAttrs(BypassSpeedChanceAbAttr)[0], "chance", "get").mockReturnValue(100); + vi.spyOn(allAbilities[Abilities.QUICK_DRAW].getAttrs(BypassSpeedChanceAbAttr)[0], "chance", "get").mockReturnValue( + 100, + ); }); test("makes pokemon going first in its priority bracket", async () => { @@ -54,28 +56,31 @@ describe("Abilities - Quick Draw", () => { expect(pokemon.battleData.abilitiesApplied).contain(Abilities.QUICK_DRAW); }, 20000); - test("does not triggered by non damage moves", { - retry: 5 - }, async () => { - await game.startBattle(); + test( + "does not triggered by non damage moves", + { + retry: 5, + }, + async () => { + await game.startBattle(); - const pokemon = game.scene.getPlayerPokemon()!; - const enemy = game.scene.getEnemyPokemon()!; + const pokemon = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; - pokemon.hp = 1; - enemy.hp = 1; + pokemon.hp = 1; + enemy.hp = 1; - game.move.select(Moves.TAIL_WHIP); - await game.phaseInterceptor.to(FaintPhase, false); + game.move.select(Moves.TAIL_WHIP); + await game.phaseInterceptor.to(FaintPhase, false); - expect(pokemon.isFainted()).toBe(true); - expect(enemy.isFainted()).toBe(false); - expect(pokemon.battleData.abilitiesApplied).not.contain(Abilities.QUICK_DRAW); - } + expect(pokemon.isFainted()).toBe(true); + expect(enemy.isFainted()).toBe(false); + expect(pokemon.battleData.abilitiesApplied).not.contain(Abilities.QUICK_DRAW); + }, ); test("does not increase priority", async () => { - game.override.enemyMoveset([ Moves.EXTREME_SPEED ]); + game.override.enemyMoveset([Moves.EXTREME_SPEED]); await game.startBattle(); diff --git a/src/test/abilities/sand_spit.test.ts b/test/abilities/sand_spit.test.ts similarity index 66% rename from src/test/abilities/sand_spit.test.ts rename to test/abilities/sand_spit.test.ts index 1c21cff3c14..6896c286eed 100644 --- a/src/test/abilities/sand_spit.test.ts +++ b/test/abilities/sand_spit.test.ts @@ -2,11 +2,10 @@ import { WeatherType } from "#app/enums/weather-type"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Abilities - Sand Spit", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -31,12 +30,12 @@ describe("Abilities - Sand Spit", () => { game.override.starterSpecies(Species.SILICOBRA); game.override.ability(Abilities.SAND_SPIT); - game.override.moveset([ Moves.SPLASH, Moves.COIL ]); + game.override.moveset([Moves.SPLASH, Moves.COIL]); }); it("should trigger when hit with damaging move", async () => { - game.override.enemyMoveset([ Moves.TACKLE ]); - await game.startBattle(); + game.override.enemyMoveset([Moves.TACKLE]); + await game.classicMode.startBattle(); game.move.select(Moves.SPLASH); await game.toNextTurn(); @@ -44,9 +43,20 @@ describe("Abilities - Sand Spit", () => { expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SANDSTORM); }, 20000); + it("should trigger even when fainting", async () => { + game.override.enemyMoveset([Moves.TACKLE]).enemyLevel(100).startingLevel(1); + await game.classicMode.startBattle([Species.SILICOBRA, Species.MAGIKARP]); + + game.move.select(Moves.SPLASH); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SANDSTORM); + }); + it("should not trigger when targetted with status moves", async () => { - game.override.enemyMoveset([ Moves.GROWL ]); - await game.startBattle(); + game.override.enemyMoveset([Moves.GROWL]); + await game.classicMode.startBattle(); game.move.select(Moves.COIL); await game.toNextTurn(); diff --git a/test/abilities/sand_veil.test.ts b/test/abilities/sand_veil.test.ts new file mode 100644 index 00000000000..5e0a3f567dd --- /dev/null +++ b/test/abilities/sand_veil.test.ts @@ -0,0 +1,73 @@ +import { StatMultiplierAbAttr, allAbilities } from "#app/data/ability"; +import { CommandPhase } from "#app/phases/command-phase"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { MoveEndPhase } from "#app/phases/move-end-phase"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import { WeatherType } from "#enums/weather-type"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; + +describe("Abilities - Sand Veil", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.moveset([Moves.SPLASH]); + game.override.enemySpecies(Species.MEOWSCARADA); + game.override.enemyAbility(Abilities.INSOMNIA); + game.override.enemyMoveset([Moves.TWISTER, Moves.TWISTER, Moves.TWISTER, Moves.TWISTER]); + game.override.startingLevel(100); + game.override.enemyLevel(100); + game.override.weather(WeatherType.SANDSTORM).battleType("double"); + }); + + test("ability should increase the evasiveness of the source", async () => { + await game.startBattle([Species.SNORLAX, Species.BLISSEY]); + + const leadPokemon = game.scene.getPlayerField(); + + vi.spyOn(leadPokemon[0], "getAbility").mockReturnValue(allAbilities[Abilities.SAND_VEIL]); + + const sandVeilAttr = allAbilities[Abilities.SAND_VEIL].getAttrs(StatMultiplierAbAttr)[0]; + vi.spyOn(sandVeilAttr, "applyStatStage").mockImplementation( + (_pokemon, _passive, _simulated, stat, statValue, _args) => { + if (stat === Stat.EVA && game.scene.arena.weather?.weatherType === WeatherType.SANDSTORM) { + statValue.value *= -1; // will make all attacks miss + return true; + } + return false; + }, + ); + + expect(leadPokemon[0].hasAbility(Abilities.SAND_VEIL)).toBe(true); + expect(leadPokemon[1].hasAbility(Abilities.SAND_VEIL)).toBe(false); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(MoveEffectPhase, false); + + await game.phaseInterceptor.to(MoveEndPhase, false); + + expect(leadPokemon[0].isFullHp()).toBe(true); + expect(leadPokemon[1].hp).toBeLessThan(leadPokemon[1].getMaxHp()); + }); +}); diff --git a/src/test/abilities/sap_sipper.test.ts b/test/abilities/sap_sipper.test.ts similarity index 86% rename from src/test/abilities/sap_sipper.test.ts rename to test/abilities/sap_sipper.test.ts index dc254a54b54..f4f02844cbc 100644 --- a/src/test/abilities/sap_sipper.test.ts +++ b/test/abilities/sap_sipper.test.ts @@ -6,10 +6,10 @@ import { Abilities } from "#enums/abilities"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves, RandomMoveAttr } from "#app/data/move"; +import { allMoves, RandomMoveAttr } from "#app/data/moves/move"; // See also: TypeImmunityAbAttr describe("Abilities - Sap Sipper", () => { @@ -28,7 +28,8 @@ describe("Abilities - Sap Sipper", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single") + game.override + .battleType("single") .disableCrits() .ability(Abilities.SAP_SIPPER) .enemySpecies(Species.RATTATA) @@ -36,12 +37,12 @@ describe("Abilities - Sap Sipper", () => { .enemyMoveset(Moves.SPLASH); }); - it("raises ATK stat stage by 1 and block effects when activated against a grass attack", async() => { + it("raises ATK stat stage by 1 and block effects when activated against a grass attack", async () => { const moveToUse = Moves.LEAFAGE; game.override.moveset(moveToUse); - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const enemyPokemon = game.scene.getEnemyPokemon()!; const initialEnemyHp = enemyPokemon.hp; @@ -54,12 +55,12 @@ describe("Abilities - Sap Sipper", () => { expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(1); }); - it("raises ATK stat stage by 1 and block effects when activated against a grass status move", async() => { + it("raises ATK stat stage by 1 and block effects when activated against a grass status move", async () => { const moveToUse = Moves.SPORE; game.override.moveset(moveToUse); - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -76,7 +77,7 @@ describe("Abilities - Sap Sipper", () => { game.override.moveset(moveToUse); - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); game.move.select(moveToUse); @@ -92,7 +93,7 @@ describe("Abilities - Sap Sipper", () => { game.override.moveset(moveToUse); - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const enemyPokemon = game.scene.getEnemyPokemon()!; const initialEnemyHp = enemyPokemon.hp; @@ -110,7 +111,7 @@ describe("Abilities - Sap Sipper", () => { game.override.moveset(moveToUse); - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -134,7 +135,7 @@ describe("Abilities - Sap Sipper", () => { game.override.moveset(moveToUse); - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const enemyPokemon = game.scene.getEnemyPokemon()!; const initialEnemyHp = enemyPokemon.hp; @@ -150,7 +151,7 @@ describe("Abilities - Sap Sipper", () => { it("still activates regardless of accuracy check", async () => { game.override.moveset(Moves.LEAF_BLADE); - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/abilities/schooling.test.ts b/test/abilities/schooling.test.ts new file mode 100644 index 00000000000..35244b08e4c --- /dev/null +++ b/test/abilities/schooling.test.ts @@ -0,0 +1,60 @@ +import { Status } from "#app/data/status-effect"; +import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { StatusEffect } from "#enums/status-effect"; +import GameManager from "#test/testUtils/gameManager"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Abilities - SCHOOLING", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + const moveToUse = Moves.SPLASH; + game.override.battleType("single"); + game.override.ability(Abilities.SCHOOLING); + game.override.moveset([moveToUse]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); + }); + + test("check if fainted pokemon switches to base form on arena reset", async () => { + const soloForm = 0, + schoolForm = 1; + game.override.startingWave(4); + game.override.starterForms({ + [Species.WISHIWASHI]: schoolForm, + }); + + await game.startBattle([Species.MAGIKARP, Species.WISHIWASHI]); + + const wishiwashi = game.scene.getPlayerParty().find(p => p.species.speciesId === Species.WISHIWASHI)!; + expect(wishiwashi).not.toBe(undefined); + expect(wishiwashi.formIndex).toBe(schoolForm); + + wishiwashi.hp = 0; + wishiwashi.status = new Status(StatusEffect.FAINT); + expect(wishiwashi.isFainted()).toBe(true); + + game.move.select(Moves.SPLASH); + await game.doKillOpponents(); + await game.phaseInterceptor.to(TurnEndPhase); + game.doSelectModifier(); + await game.phaseInterceptor.to(QuietFormChangePhase); + + expect(wishiwashi.formIndex).toBe(soloForm); + }); +}); diff --git a/src/test/abilities/screen_cleaner.test.ts b/test/abilities/screen_cleaner.test.ts similarity index 77% rename from src/test/abilities/screen_cleaner.test.ts rename to test/abilities/screen_cleaner.test.ts index c036aa90a77..d8be1d64697 100644 --- a/src/test/abilities/screen_cleaner.test.ts +++ b/test/abilities/screen_cleaner.test.ts @@ -4,7 +4,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -30,10 +30,10 @@ describe("Abilities - Screen Cleaner", () => { }); it("removes Aurora Veil", async () => { - game.override.moveset([ Moves.HAIL ]); - game.override.enemyMoveset([ Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL ]); + game.override.moveset([Moves.HAIL]); + game.override.enemyMoveset([Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL]); - await game.startBattle([ Species.MAGIKARP, Species.MAGIKARP ]); + await game.startBattle([Species.MAGIKARP, Species.MAGIKARP]); game.move.select(Moves.HAIL); await game.phaseInterceptor.to(TurnEndPhase); @@ -48,9 +48,9 @@ describe("Abilities - Screen Cleaner", () => { }); it("removes Light Screen", async () => { - game.override.enemyMoveset([ Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN ]); + game.override.enemyMoveset([Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN]); - await game.startBattle([ Species.MAGIKARP, Species.MAGIKARP ]); + await game.startBattle([Species.MAGIKARP, Species.MAGIKARP]); game.move.select(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase); @@ -65,9 +65,9 @@ describe("Abilities - Screen Cleaner", () => { }); it("removes Reflect", async () => { - game.override.enemyMoveset([ Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT ]); + game.override.enemyMoveset([Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT]); - await game.startBattle([ Species.MAGIKARP, Species.MAGIKARP ]); + await game.startBattle([Species.MAGIKARP, Species.MAGIKARP]); game.move.select(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase); diff --git a/test/abilities/seed_sower.test.ts b/test/abilities/seed_sower.test.ts new file mode 100644 index 00000000000..d78007f7500 --- /dev/null +++ b/test/abilities/seed_sower.test.ts @@ -0,0 +1,66 @@ +import { TerrainType } from "#app/data/terrain"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Abilities - Seed Sower", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + game.override.disableCrits(); + + game.override.enemySpecies(Species.MAGIKARP); + game.override.enemyAbility(Abilities.BALL_FETCH); + + game.override.starterSpecies(Species.ARBOLIVA); + game.override.ability(Abilities.SEED_SOWER); + game.override.moveset([Moves.SPLASH]); + }); + + it("should trigger when hit with damaging move", async () => { + game.override.enemyMoveset([Moves.TACKLE]); + await game.classicMode.startBattle(); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + + expect(game.scene.arena.terrain?.terrainType).toBe(TerrainType.GRASSY); + }); + + it("should trigger even when fainting", async () => { + game.override.enemyMoveset([Moves.TACKLE]).enemyLevel(100).startingLevel(1); + await game.classicMode.startBattle([Species.ARBOLIVA, Species.MAGIKARP]); + + game.move.select(Moves.SPLASH); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + expect(game.scene.arena.terrain?.terrainType).toBe(TerrainType.GRASSY); + }); + + it("should not trigger when targetted with status moves", async () => { + game.override.enemyMoveset([Moves.GROWL]); + await game.classicMode.startBattle(); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + + expect(game.scene.arena.terrain?.terrainType).not.toBe(TerrainType.GRASSY); + }); +}); diff --git a/src/test/abilities/serene_grace.test.ts b/test/abilities/serene_grace.test.ts similarity index 78% rename from src/test/abilities/serene_grace.test.ts rename to test/abilities/serene_grace.test.ts index 6f9b2195a9c..65ca96acbbc 100644 --- a/src/test/abilities/serene_grace.test.ts +++ b/test/abilities/serene_grace.test.ts @@ -2,11 +2,11 @@ import { BattlerIndex } from "#app/battle"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { FlinchAttr } from "#app/data/move"; +import { FlinchAttr } from "#app/data/moves/move"; describe("Abilities - Serene Grace", () => { let phaserGame: Phaser.Game; @@ -28,22 +28,22 @@ describe("Abilities - Serene Grace", () => { .disableCrits() .battleType("single") .ability(Abilities.SERENE_GRACE) - .moveset([ Moves.AIR_SLASH ]) + .moveset([Moves.AIR_SLASH]) .enemySpecies(Species.ALOLA_GEODUDE) .enemyLevel(10) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.SPLASH ]); + .enemyMoveset([Moves.SPLASH]); }); it("Serene Grace should double the secondary effect chance of a move", async () => { - await game.classicMode.startBattle([ Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE]); const airSlashMove = allMoves[Moves.AIR_SLASH]; const airSlashFlinchAttr = airSlashMove.getAttrs(FlinchAttr)[0]; vi.spyOn(airSlashFlinchAttr, "getMoveChance"); game.move.select(Moves.AIR_SLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); await game.phaseInterceptor.to("BerryPhase"); diff --git a/src/test/abilities/sheer_force.test.ts b/test/abilities/sheer_force.test.ts similarity index 77% rename from src/test/abilities/sheer_force.test.ts rename to test/abilities/sheer_force.test.ts index a0ddf5bb9c6..4a1c20cde5c 100644 --- a/src/test/abilities/sheer_force.test.ts +++ b/test/abilities/sheer_force.test.ts @@ -1,13 +1,13 @@ import { BattlerIndex } from "#app/battle"; -import { Type } from "#app/enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves, FlinchAttr } from "#app/data/move"; +import { allMoves, FlinchAttr } from "#app/data/moves/move"; describe("Abilities - Sheer Force", () => { let phaserGame: Phaser.Game; @@ -30,15 +30,15 @@ describe("Abilities - Sheer Force", () => { .ability(Abilities.SHEER_FORCE) .enemySpecies(Species.ONIX) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.SPLASH ]) + .enemyMoveset([Moves.SPLASH]) .disableCrits(); }); const SHEER_FORCE_MULT = 5461 / 4096; it("Sheer Force should boost the power of the move but disable secondary effects", async () => { - game.override.moveset([ Moves.AIR_SLASH ]); - await game.classicMode.startBattle([ Species.SHUCKLE ]); + game.override.moveset([Moves.AIR_SLASH]); + await game.classicMode.startBattle([Species.SHUCKLE]); const airSlashMove = allMoves[Moves.AIR_SLASH]; vi.spyOn(airSlashMove, "calculateBattlePower"); @@ -47,7 +47,7 @@ describe("Abilities - Sheer Force", () => { game.move.select(Moves.AIR_SLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); await game.phaseInterceptor.to("BerryPhase", false); @@ -56,15 +56,15 @@ describe("Abilities - Sheer Force", () => { }); it("Sheer Force does not affect the base damage or secondary effects of binding moves", async () => { - game.override.moveset([ Moves.BIND ]); - await game.classicMode.startBattle([ Species.SHUCKLE ]); + game.override.moveset([Moves.BIND]); + await game.classicMode.startBattle([Species.SHUCKLE]); const bindMove = allMoves[Moves.BIND]; vi.spyOn(bindMove, "calculateBattlePower"); game.move.select(Moves.BIND); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); await game.phaseInterceptor.to("BerryPhase", false); @@ -72,14 +72,14 @@ describe("Abilities - Sheer Force", () => { }, 20000); it("Sheer Force does not boost the base damage of moves with no secondary effect", async () => { - game.override.moveset([ Moves.TACKLE ]); - await game.classicMode.startBattle([ Species.PIDGEOT ]); + game.override.moveset([Moves.TACKLE]); + await game.classicMode.startBattle([Species.PIDGEOT]); const tackleMove = allMoves[Moves.TACKLE]; vi.spyOn(tackleMove, "calculateBattlePower"); game.move.select(Moves.TACKLE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); await game.phaseInterceptor.to("BerryPhase", false); @@ -88,12 +88,12 @@ describe("Abilities - Sheer Force", () => { it("Sheer Force can disable the on-hit activation of specific abilities", async () => { game.override - .moveset([ Moves.HEADBUTT ]) + .moveset([Moves.HEADBUTT]) .enemySpecies(Species.SQUIRTLE) .enemyLevel(10) .enemyAbility(Abilities.COLOR_CHANGE); - await game.classicMode.startBattle([ Species.PIDGEOT ]); + await game.classicMode.startBattle([Species.PIDGEOT]); const enemyPokemon = game.scene.getEnemyPokemon(); const headbuttMove = allMoves[Moves.HEADBUTT]; vi.spyOn(headbuttMove, "calculateBattlePower"); @@ -102,25 +102,24 @@ describe("Abilities - Sheer Force", () => { game.move.select(Moves.HEADBUTT); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); await game.phaseInterceptor.to("BerryPhase", false); - expect(enemyPokemon?.getTypes()[0]).toBe(Type.WATER); + expect(enemyPokemon?.getTypes()[0]).toBe(PokemonType.WATER); expect(headbuttMove.calculateBattlePower).toHaveLastReturnedWith(headbuttMove.power * SHEER_FORCE_MULT); expect(headbuttFlinchAttr.getMoveChance).toHaveLastReturnedWith(0); }); it("Two Pokemon with abilities disabled by Sheer Force hitting each other should not cause a crash", async () => { const moveToUse = Moves.CRUNCH; - game.override.enemyAbility(Abilities.COLOR_CHANGE) + game.override + .enemyAbility(Abilities.COLOR_CHANGE) .ability(Abilities.COLOR_CHANGE) .moveset(moveToUse) .enemyMoveset(moveToUse); - await game.classicMode.startBattle([ - Species.PIDGEOT - ]); + await game.classicMode.startBattle([Species.PIDGEOT]); const pidgeot = game.scene.getPlayerParty()[0]; const onix = game.scene.getEnemyParty()[0]; @@ -132,7 +131,7 @@ describe("Abilities - Sheer Force", () => { await game.toNextTurn(); // Check that both Pokemon's Color Change activated - const expectedTypes = [ allMoves[moveToUse].type ]; + const expectedTypes = [allMoves[moveToUse].type]; expect(pidgeot.getTypes()).toStrictEqual(expectedTypes); expect(onix.getTypes()).toStrictEqual(expectedTypes); }); @@ -140,10 +139,10 @@ describe("Abilities - Sheer Force", () => { it("Sheer Force should disable Meloetta's transformation from Relic Song", async () => { game.override .ability(Abilities.SHEER_FORCE) - .moveset([ Moves.RELIC_SONG ]) - .enemyMoveset([ Moves.SPLASH ]) + .moveset([Moves.RELIC_SONG]) + .enemyMoveset([Moves.SPLASH]) .enemyLevel(100); - await game.classicMode.startBattle([ Species.MELOETTA ]); + await game.classicMode.startBattle([Species.MELOETTA]); const playerPokemon = game.scene.getPlayerPokemon(); const formKeyStart = playerPokemon?.getFormKey(); diff --git a/src/test/abilities/shield_dust.test.ts b/test/abilities/shield_dust.test.ts similarity index 69% rename from src/test/abilities/shield_dust.test.ts rename to test/abilities/shield_dust.test.ts index 9f1e6aeb11d..8e02b5a7713 100644 --- a/src/test/abilities/shield_dust.test.ts +++ b/test/abilities/shield_dust.test.ts @@ -1,16 +1,20 @@ import { BattlerIndex } from "#app/battle"; -import { applyAbAttrs, applyPreDefendAbAttrs, IgnoreMoveEffectsAbAttr, MoveEffectChanceMultiplierAbAttr } from "#app/data/ability"; +import { + applyAbAttrs, + applyPreDefendAbAttrs, + IgnoreMoveEffectsAbAttr, + MoveEffectChanceMultiplierAbAttr, +} from "#app/data/ability"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { NumberHolder } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Abilities - Shield Dust", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -36,15 +40,14 @@ describe("Abilities - Shield Dust", () => { }); it("Shield Dust", async () => { - await game.classicMode.startBattle([ Species.PIDGEOT ]); - + await game.classicMode.startBattle([Species.PIDGEOT]); game.scene.getEnemyPokemon()!.stats[Stat.SPDEF] = 10000; expect(game.scene.getPlayerPokemon()!.formIndex).toBe(0); game.move.select(Moves.AIR_SLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(MoveEffectPhase, false); // Shield Dust negates secondary effect @@ -53,11 +56,27 @@ describe("Abilities - Shield Dust", () => { expect(move.id).toBe(Moves.AIR_SLASH); const chance = new NumberHolder(move.chance); - applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getFirstTarget(), false); - applyPreDefendAbAttrs(IgnoreMoveEffectsAbAttr, phase.getFirstTarget()!, phase.getUserPokemon()!, null, null, false, chance); + await applyAbAttrs( + MoveEffectChanceMultiplierAbAttr, + phase.getUserPokemon()!, + null, + false, + chance, + move, + phase.getFirstTarget(), + false, + ); + await applyPreDefendAbAttrs( + IgnoreMoveEffectsAbAttr, + phase.getFirstTarget()!, + phase.getUserPokemon()!, + null, + null, + false, + chance, + ); expect(chance.value).toBe(0); - - }, 20000); + }); //TODO King's Rock Interaction Unit Test }); diff --git a/test/abilities/shields_down.test.ts b/test/abilities/shields_down.test.ts new file mode 100644 index 00000000000..4bdf22869cb --- /dev/null +++ b/test/abilities/shields_down.test.ts @@ -0,0 +1,185 @@ +import { Status } from "#app/data/status-effect"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { StatusEffect } from "#enums/status-effect"; +import GameManager from "#test/testUtils/gameManager"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Abilities - SHIELDS DOWN", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + const moveToUse = Moves.SPLASH; + game.override.battleType("single"); + game.override.ability(Abilities.SHIELDS_DOWN); + game.override.moveset([moveToUse]); + game.override.enemyMoveset([Moves.TACKLE]); + }); + + test("check if fainted pokemon switched to base form on arena reset", async () => { + const meteorForm = 0, + coreForm = 7; + game.override.startingWave(4); + game.override.starterForms({ + [Species.MINIOR]: coreForm, + }); + + await game.classicMode.startBattle([Species.MAGIKARP, Species.MINIOR]); + + const minior = game.scene.getPlayerParty().find(p => p.species.speciesId === Species.MINIOR)!; + expect(minior).not.toBe(undefined); + expect(minior.formIndex).toBe(coreForm); + + minior.hp = 0; + minior.status = new Status(StatusEffect.FAINT); + expect(minior.isFainted()).toBe(true); + + game.move.select(Moves.SPLASH); + await game.doKillOpponents(); + await game.phaseInterceptor.to(TurnEndPhase); + game.doSelectModifier(); + await game.phaseInterceptor.to(QuietFormChangePhase); + + expect(minior.formIndex).toBe(meteorForm); + }); + + test("should ignore non-volatile status moves", async () => { + game.override.enemyMoveset([Moves.SPORE]); + + await game.classicMode.startBattle([Species.MINIOR]); + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(game.scene.getPlayerPokemon()!.status).toBe(undefined); + }); + + test("should still ignore non-volatile status moves used by a pokemon with mold breaker", async () => { + game.override.enemyAbility(Abilities.MOLD_BREAKER); + game.override.enemyMoveset([Moves.SPORE]); + + await game.classicMode.startBattle([Species.MINIOR]); + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.SPORE); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(game.scene.getPlayerPokemon()!.status).toBe(undefined); + }); + + test("should ignore non-volatile secondary status effects", async () => { + game.override.enemyMoveset([Moves.NUZZLE]); + + await game.classicMode.startBattle([Species.MINIOR]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(game.scene.getPlayerPokemon()!.status).toBe(undefined); + }); + + test("should ignore status moves even through mold breaker", async () => { + game.override.enemyMoveset([Moves.SPORE]); + game.override.enemyAbility(Abilities.MOLD_BREAKER); + + await game.classicMode.startBattle([Species.MINIOR]); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase); + + expect(game.scene.getPlayerPokemon()!.status).toBe(undefined); + }); + + // toxic spikes currently does not poison flying types when gravity is in effect + test.todo("should become poisoned by toxic spikes when grounded", async () => { + game.override.enemyMoveset([Moves.GRAVITY, Moves.TOXIC_SPIKES, Moves.SPLASH]); + game.override.moveset([Moves.GRAVITY, Moves.SPLASH]); + + await game.classicMode.startBattle([Species.MAGIKARP, Species.MINIOR]); + + // turn 1 + game.move.select(Moves.GRAVITY); + await game.forceEnemyMove(Moves.TOXIC_SPIKES); + await game.toNextTurn(); + + // turn 2 + game.doSwitchPokemon(1); + await game.forceEnemyMove(Moves.SPLASH); + await game.toNextTurn(); + + expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.MINIOR); + expect(game.scene.getPlayerPokemon()!.species.formIndex).toBe(0); + expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.POISON); + }); + + test("should ignore yawn", async () => { + game.override.enemyMoveset([Moves.YAWN]); + + await game.classicMode.startBattle([Species.MAGIKARP, Species.MINIOR]); + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.YAWN); + + await game.phaseInterceptor.to(TurnEndPhase); + expect(game.scene.getPlayerPokemon()!.findTag(tag => tag.tagType === BattlerTagType.DROWSY)).toBe(undefined); + }); + + test("should not ignore volatile status effects", async () => { + game.override.enemyMoveset([Moves.CONFUSE_RAY]); + + await game.classicMode.startBattle([Species.MINIOR]); + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.CONFUSE_RAY); + + await game.phaseInterceptor.to(TurnEndPhase); + + expect(game.scene.getPlayerPokemon()!.findTag(tag => tag.tagType === BattlerTagType.CONFUSED)).not.toBe(undefined); + }); + + // the `NoTransformAbilityAbAttr` attribute is not checked anywhere, so this test cannot pass. + test.todo("ditto should not be immune to status after transforming", async () => { + game.override.enemySpecies(Species.DITTO); + game.override.enemyAbility(Abilities.IMPOSTER); + game.override.moveset([Moves.SPLASH, Moves.SPORE]); + + await game.classicMode.startBattle([Species.MINIOR]); + + game.move.select(Moves.SPORE); + await game.forceEnemyMove(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase); + expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.SLEEP); + }); + + test("should not prevent minior from receiving the fainted status effect in trainer battles", async () => { + game.override.enemyMoveset([Moves.TACKLE]); + game.override.moveset([Moves.THUNDERBOLT]); + game.override.startingLevel(100); + game.override.startingWave(5); + game.override.enemySpecies(Species.MINIOR); + await game.classicMode.startBattle([Species.REGIELEKI]); + const minior = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.THUNDERBOLT); + await game.toNextTurn(); + expect(minior.isFainted()).toBe(true); + expect(minior.status?.effect).toBe(StatusEffect.FAINT); + }); +}); diff --git a/src/test/abilities/simple.test.ts b/test/abilities/simple.test.ts similarity index 84% rename from src/test/abilities/simple.test.ts rename to test/abilities/simple.test.ts index e5ca474d7c3..b6c5fd116c0 100644 --- a/src/test/abilities/simple.test.ts +++ b/test/abilities/simple.test.ts @@ -2,7 +2,7 @@ import { Moves } from "#app/enums/moves"; import { Abilities } from "#enums/abilities"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -30,10 +30,8 @@ describe("Abilities - Simple", () => { .enemyMoveset(Moves.SPLASH); }); - it("should double stat changes when applied", async() => { - await game.startBattle([ - Species.SLOWBRO - ]); + it("should double stat changes when applied", async () => { + await game.startBattle([Species.SLOWBRO]); const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/abilities/speed_boost.test.ts b/test/abilities/speed_boost.test.ts new file mode 100644 index 00000000000..fa20e74108f --- /dev/null +++ b/test/abilities/speed_boost.test.ts @@ -0,0 +1,115 @@ +import { Stat } from "#enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import type { CommandPhase } from "#app/phases/command-phase"; +import { Command } from "#app/ui/command-ui-handler"; +import { AttemptRunPhase } from "#app/phases/attempt-run-phase"; + +describe("Abilities - Speed Boost", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override + .battleType("single") + .enemySpecies(Species.SHUCKLE) + .enemyAbility(Abilities.BALL_FETCH) + .enemyLevel(100) + .ability(Abilities.SPEED_BOOST) + .enemyMoveset(Moves.SPLASH) + .moveset([Moves.SPLASH, Moves.U_TURN]); + }); + + it("should increase speed by 1 stage at end of turn", async () => { + await game.classicMode.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + + expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1); + }); + + it("should not trigger this turn if pokemon was switched into combat via attack, but the turn after", async () => { + await game.classicMode.startBattle([Species.SHUCKLE, Species.NINJASK]); + + game.move.select(Moves.U_TURN); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + const playerPokemon = game.scene.getPlayerPokemon()!; + expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1); + }); + + it("checking back to back swtiches", async () => { + await game.classicMode.startBattle([Species.SHUCKLE, Species.NINJASK]); + + const [shuckle, ninjask] = game.scene.getPlayerParty(); + + game.move.select(Moves.U_TURN); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + expect(game.scene.getPlayerPokemon()!).toBe(ninjask); + expect(ninjask.getStatStage(Stat.SPD)).toBe(0); + + game.move.select(Moves.U_TURN); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + expect(game.scene.getPlayerPokemon()!).toBe(shuckle); + expect(shuckle.getStatStage(Stat.SPD)).toBe(0); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + expect(shuckle.getStatStage(Stat.SPD)).toBe(1); + }); + + it("should not trigger this turn if pokemon was switched into combat via normal switch, but the turn after", async () => { + await game.classicMode.startBattle([Species.SHUCKLE, Species.NINJASK]); + + game.doSwitchPokemon(1); + await game.toNextTurn(); + const playerPokemon = game.scene.getPlayerPokemon()!; + expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1); + }); + + it("should not trigger if pokemon fails to escape", async () => { + await game.classicMode.startBattle([Species.SHUCKLE]); + + const commandPhase = game.scene.getCurrentPhase() as CommandPhase; + commandPhase.handleCommand(Command.RUN, 0); + const runPhase = game.scene.getCurrentPhase() as AttemptRunPhase; + runPhase.forceFailEscape = true; + await game.phaseInterceptor.to(AttemptRunPhase); + await game.toNextTurn(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1); + }); +}); diff --git a/src/test/abilities/stakeout.test.ts b/test/abilities/stakeout.test.ts similarity index 75% rename from src/test/abilities/stakeout.test.ts rename to test/abilities/stakeout.test.ts index 885169b284e..b464b3f1dfc 100644 --- a/src/test/abilities/stakeout.test.ts +++ b/test/abilities/stakeout.test.ts @@ -3,7 +3,7 @@ import { isBetween } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -24,7 +24,7 @@ describe("Abilities - Stakeout", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH, Moves.SURF ]) + .moveset([Moves.SPLASH, Moves.SURF]) .ability(Abilities.STAKEOUT) .battleType("single") .disableCrits() @@ -32,14 +32,14 @@ describe("Abilities - Stakeout", () => { .enemyLevel(100) .enemySpecies(Species.SNORLAX) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.SPLASH, Moves.FLIP_TURN ]) + .enemyMoveset([Moves.SPLASH, Moves.FLIP_TURN]) .startingWave(5); }); it("should do double damage to a pokemon that switched out", async () => { - await game.classicMode.startBattle([ Species.MILOTIC ]); + await game.classicMode.startBattle([Species.MILOTIC]); - const [ enemy1, ] = game.scene.getEnemyParty(); + const [enemy1] = game.scene.getEnemyParty(); game.move.select(Moves.SURF); await game.forceEnemyMove(Moves.SPLASH); @@ -56,13 +56,13 @@ describe("Abilities - Stakeout", () => { await game.toNextTurn(); expect(enemy1.isFainted()).toBe(false); - expect(isBetween(enemy1.getInverseHp(), (damage1 * 2) - 5, (damage1 * 2) + 5)).toBe(true); + expect(isBetween(enemy1.getInverseHp(), damage1 * 2 - 5, damage1 * 2 + 5)).toBe(true); }); it("should do double damage to a pokemon that switched out via U-Turn/etc", async () => { - await game.classicMode.startBattle([ Species.MILOTIC ]); + await game.classicMode.startBattle([Species.MILOTIC]); - const [ enemy1, ] = game.scene.getEnemyParty(); + const [enemy1] = game.scene.getEnemyParty(); game.move.select(Moves.SURF); await game.forceEnemyMove(Moves.SPLASH); @@ -76,10 +76,10 @@ describe("Abilities - Stakeout", () => { game.move.select(Moves.SURF); await game.forceEnemyMove(Moves.FLIP_TURN); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(enemy1.isFainted()).toBe(false); - expect(isBetween(enemy1.getInverseHp(), (damage1 * 2) - 5, (damage1 * 2) + 5)).toBe(true); + expect(isBetween(enemy1.getInverseHp(), damage1 * 2 - 5, damage1 * 2 + 5)).toBe(true); }); }); diff --git a/src/test/abilities/stall.test.ts b/test/abilities/stall.test.ts similarity index 80% rename from src/test/abilities/stall.test.ts rename to test/abilities/stall.test.ts index b51c56dbe1f..5b67e5f4b7a 100644 --- a/src/test/abilities/stall.test.ts +++ b/test/abilities/stall.test.ts @@ -1,7 +1,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; @@ -26,8 +26,8 @@ describe("Abilities - Stall", () => { game.override.disableCrits(); game.override.enemySpecies(Species.REGIELEKI); game.override.enemyAbility(Abilities.STALL); - game.override.enemyMoveset([ Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK ]); - game.override.moveset([ Moves.QUICK_ATTACK, Moves.TACKLE ]); + game.override.enemyMoveset([Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK]); + game.override.moveset([Moves.QUICK_ATTACK, Moves.TACKLE]); }); /** @@ -37,7 +37,7 @@ describe("Abilities - Stall", () => { **/ it("Pokemon with Stall should move last in its priority bracket regardless of speed", async () => { - await game.startBattle([ Species.SHUCKLE ]); + await game.startBattle([Species.SHUCKLE]); const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex(); const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex(); @@ -50,12 +50,12 @@ describe("Abilities - Stall", () => { const commandOrder = phase.getCommandOrder(); // The player Pokemon (without Stall) goes first despite having lower speed than the opponent. // The opponent Pokemon (with Stall) goes last despite having higher speed than the player Pokemon. - expect(speedOrder).toEqual([ enemyIndex, playerIndex ]); - expect(commandOrder).toEqual([ playerIndex, enemyIndex ]); + expect(speedOrder).toEqual([enemyIndex, playerIndex]); + expect(commandOrder).toEqual([playerIndex, enemyIndex]); }, 20000); it("Pokemon with Stall will go first if a move that is in a higher priority bracket than the opponent's move is used", async () => { - await game.startBattle([ Species.SHUCKLE ]); + await game.startBattle([Species.SHUCKLE]); const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex(); const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex(); @@ -68,13 +68,13 @@ describe("Abilities - Stall", () => { const commandOrder = phase.getCommandOrder(); // The opponent Pokemon (with Stall) goes first because its move is still within a higher priority bracket than its opponent. // The player Pokemon goes second because its move is in a lower priority bracket. - expect(speedOrder).toEqual([ enemyIndex, playerIndex ]); - expect(commandOrder).toEqual([ enemyIndex, playerIndex ]); + expect(speedOrder).toEqual([enemyIndex, playerIndex]); + expect(commandOrder).toEqual([enemyIndex, playerIndex]); }, 20000); it("If both Pokemon have stall and use the same move, speed is used to determine who goes first.", async () => { game.override.ability(Abilities.STALL); - await game.startBattle([ Species.SHUCKLE ]); + await game.startBattle([Species.SHUCKLE]); const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex(); const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex(); @@ -88,7 +88,7 @@ describe("Abilities - Stall", () => { // The opponent Pokemon (with Stall) goes first because it has a higher speed. // The player Pokemon (with Stall) goes second because its speed is lower. - expect(speedOrder).toEqual([ enemyIndex, playerIndex ]); - expect(commandOrder).toEqual([ enemyIndex, playerIndex ]); + expect(speedOrder).toEqual([enemyIndex, playerIndex]); + expect(commandOrder).toEqual([enemyIndex, playerIndex]); }, 20000); }); diff --git a/src/test/abilities/steely_spirit.test.ts b/test/abilities/steely_spirit.test.ts similarity index 85% rename from src/test/abilities/steely_spirit.test.ts rename to test/abilities/steely_spirit.test.ts index 61e76989060..9b4d32efcae 100644 --- a/src/test/abilities/steely_spirit.test.ts +++ b/test/abilities/steely_spirit.test.ts @@ -1,9 +1,9 @@ import { allAbilities } from "#app/data/ability"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -29,13 +29,13 @@ describe("Abilities - Steely Spirit", () => { game.override.battleType("double"); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.moveset([ Moves.IRON_HEAD, Moves.SPLASH ]); + game.override.moveset([Moves.IRON_HEAD, Moves.SPLASH]); game.override.enemyMoveset(Moves.SPLASH); vi.spyOn(allMoves[moveToCheck], "calculateBattlePower"); }); it("increases Steel-type moves' power used by the user and its allies by 50%", async () => { - await game.classicMode.startBattle([ Species.PIKACHU, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.PIKACHU, Species.SHUCKLE]); const boostSource = game.scene.getPlayerField()[1]; const enemyToCheck = game.scene.getEnemyPokemon()!; @@ -51,7 +51,7 @@ describe("Abilities - Steely Spirit", () => { }); it("stacks if multiple users with this ability are on the field.", async () => { - await game.classicMode.startBattle([ Species.PIKACHU, Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU, Species.PIKACHU]); const enemyToCheck = game.scene.getEnemyPokemon()!; game.scene.getPlayerField().forEach(p => { @@ -64,11 +64,13 @@ describe("Abilities - Steely Spirit", () => { game.move.select(moveToCheck, 1, enemyToCheck.getBattlerIndex()); await game.phaseInterceptor.to("MoveEffectPhase"); - expect(allMoves[moveToCheck].calculateBattlePower).toHaveReturnedWith(ironHeadPower * Math.pow(steelySpiritMultiplier, 2)); + expect(allMoves[moveToCheck].calculateBattlePower).toHaveReturnedWith( + ironHeadPower * Math.pow(steelySpiritMultiplier, 2), + ); }); it("does not take effect when suppressed", async () => { - await game.classicMode.startBattle([ Species.PIKACHU, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.PIKACHU, Species.SHUCKLE]); const boostSource = game.scene.getPlayerField()[1]; const enemyToCheck = game.scene.getEnemyPokemon()!; @@ -88,14 +90,12 @@ describe("Abilities - Steely Spirit", () => { }); it("affects variable-type moves if their resolved type is Steel", async () => { - game.override - .ability(Abilities.STEELY_SPIRIT) - .moveset([ Moves.REVELATION_DANCE ]); + game.override.ability(Abilities.STEELY_SPIRIT).moveset([Moves.REVELATION_DANCE]); const revelationDance = allMoves[Moves.REVELATION_DANCE]; vi.spyOn(revelationDance, "calculateBattlePower"); - await game.classicMode.startBattle([ Species.KLINKLANG ]); + await game.classicMode.startBattle([Species.KLINKLANG]); game.move.select(Moves.REVELATION_DANCE); diff --git a/test/abilities/storm_drain.test.ts b/test/abilities/storm_drain.test.ts new file mode 100644 index 00000000000..e2a7b3e212e --- /dev/null +++ b/test/abilities/storm_drain.test.ts @@ -0,0 +1,115 @@ +import { BattlerIndex } from "#app/battle"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Abilities - Storm Drain", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([ Moves.SPLASH, Moves.WATER_GUN ]) + .ability(Abilities.BALL_FETCH) + .battleType("double") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should redirect water type moves", async () => { + await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + + const enemy1 = game.scene.getEnemyField()[0]; + const enemy2 = game.scene.getEnemyField()[1]; + + enemy2.summonData.ability = Abilities.STORM_DRAIN; + + game.move.select(Moves.WATER_GUN, BattlerIndex.PLAYER, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemy1.isFullHp()).toBe(true); + }); + + it("should not redirect non-water type moves", async () => { + game.override.moveset([ Moves.SPLASH, Moves.AERIAL_ACE ]); + await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + + const enemy1 = game.scene.getEnemyField()[0]; + const enemy2 = game.scene.getEnemyField()[1]; + + enemy2.summonData.ability = Abilities.STORM_DRAIN; + + game.move.select(Moves.AERIAL_ACE, BattlerIndex.PLAYER, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemy1.isFullHp()).toBe(false); + }); + + it("should boost the user's spatk without damaging", async () => { + await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + + const enemy2 = game.scene.getEnemyField()[1]; + + enemy2.summonData.ability = Abilities.STORM_DRAIN; + + game.move.select(Moves.WATER_GUN, BattlerIndex.PLAYER, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemy2.isFullHp()).toBe(true); + expect(enemy2.getStatStage(Stat.SPATK)).toBe(1); + }); + + it("should not redirect moves changed from water type via ability", async () => { + game.override.ability(Abilities.NORMALIZE); + await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + + const enemy1 = game.scene.getEnemyField()[0]; + const enemy2 = game.scene.getEnemyField()[1]; + + enemy2.summonData.ability = Abilities.STORM_DRAIN; + + game.move.select(Moves.WATER_GUN, BattlerIndex.PLAYER, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemy1.isFullHp()).toBe(false); + }); + + it("should redirect moves changed to water type via ability", async () => { + game.override.ability(Abilities.LIQUID_VOICE) + .moveset(Moves.PSYCHIC_NOISE); + await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + + const enemy1 = game.scene.getEnemyField()[0]; + const enemy2 = game.scene.getEnemyField()[1]; + + enemy2.summonData.ability = Abilities.STORM_DRAIN; + + game.move.select(Moves.PSYCHIC_NOISE, BattlerIndex.PLAYER, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemy1.isFullHp()).toBe(true); + expect(enemy2.getStatStage(Stat.SPATK)).toBe(1); + }); +}); diff --git a/test/abilities/sturdy.test.ts b/test/abilities/sturdy.test.ts new file mode 100644 index 00000000000..7b7254cff15 --- /dev/null +++ b/test/abilities/sturdy.test.ts @@ -0,0 +1,78 @@ +import type { EnemyPokemon } from "#app/field/pokemon"; +import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; +import { MoveEndPhase } from "#app/phases/move-end-phase"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Abilities - Sturdy", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + + game.override.starterSpecies(Species.LUCARIO); + game.override.startingLevel(100); + game.override.moveset([Moves.CLOSE_COMBAT, Moves.FISSURE]); + + game.override.enemySpecies(Species.ARON); + game.override.enemyLevel(5); + game.override.enemyAbility(Abilities.STURDY); + }); + + test("Sturdy activates when user is at full HP", async () => { + await game.startBattle(); + game.move.select(Moves.CLOSE_COMBAT); + await game.phaseInterceptor.to(MoveEndPhase); + expect(game.scene.getEnemyParty()[0].hp).toBe(1); + }); + + test("Sturdy doesn't activate when user is not at full HP", async () => { + await game.startBattle(); + + const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0]; + enemyPokemon.hp = enemyPokemon.getMaxHp() - 1; + + game.move.select(Moves.CLOSE_COMBAT); + await game.phaseInterceptor.to(DamageAnimPhase); + + expect(enemyPokemon.hp).toBe(0); + expect(enemyPokemon.isFainted()).toBe(true); + }); + + test("Sturdy pokemon should be immune to OHKO moves", async () => { + await game.startBattle(); + game.move.select(Moves.FISSURE); + await game.phaseInterceptor.to(MoveEndPhase); + + const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0]; + expect(enemyPokemon.isFullHp()).toBe(true); + }); + + test("Sturdy is ignored by pokemon with `Abilities.MOLD_BREAKER`", async () => { + game.override.ability(Abilities.MOLD_BREAKER); + + await game.startBattle(); + game.move.select(Moves.CLOSE_COMBAT); + await game.phaseInterceptor.to(DamageAnimPhase); + + const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0]; + expect(enemyPokemon.hp).toBe(0); + expect(enemyPokemon.isFainted()).toBe(true); + }); +}); diff --git a/test/abilities/supreme_overlord.test.ts b/test/abilities/supreme_overlord.test.ts new file mode 100644 index 00000000000..b70acbd8d17 --- /dev/null +++ b/test/abilities/supreme_overlord.test.ts @@ -0,0 +1,166 @@ +import { Moves } from "#app/enums/moves"; +import { Abilities } from "#enums/abilities"; +import { Species } from "#enums/species"; +import { BattlerIndex } from "#app/battle"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { allMoves } from "#app/data/moves/move"; + +describe("Abilities - Supreme Overlord", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + const move = allMoves[Moves.TACKLE]; + const basePower = move.power; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("single") + .enemySpecies(Species.MAGIKARP) + .enemyLevel(100) + .startingLevel(1) + .enemyAbility(Abilities.BALL_FETCH) + .ability(Abilities.SUPREME_OVERLORD) + .enemyMoveset([Moves.SPLASH]) + .moveset([Moves.TACKLE, Moves.EXPLOSION, Moves.LUNAR_DANCE]); + + vi.spyOn(move, "calculateBattlePower"); + }); + + it("should increase Power by 20% if 2 Pokemon are fainted in the party", async () => { + await game.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + game.move.select(Moves.EXPLOSION); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + game.move.select(Moves.EXPLOSION); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(2); + await game.toNextTurn(); + + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + expect(move.calculateBattlePower).toHaveReturnedWith(basePower * 1.2); + }); + + it("should increase Power by 30% if an ally fainted twice and another one once", async () => { + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + /** + * Bulbasur faints once + */ + game.move.select(Moves.EXPLOSION); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + /** + * Charmander faints once + */ + game.doRevivePokemon(1); + game.move.select(Moves.EXPLOSION); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + /** + * Bulbasur faints twice + */ + game.move.select(Moves.EXPLOSION); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(2); + await game.toNextTurn(); + + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + expect(move.calculateBattlePower).toHaveReturnedWith(basePower * 1.3); + }); + + it("should maintain its power during next battle if it is within the same arena encounter", async () => { + game.override.enemySpecies(Species.MAGIKARP).startingWave(1).enemyLevel(1).startingLevel(100); + + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + /** + * The first Pokemon faints and another Pokemon in the party is selected. + */ + game.move.select(Moves.LUNAR_DANCE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + /** + * Enemy Pokemon faints and new wave is entered. + */ + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextWave(); + + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower * 1.1); + }); + + it("should reset playerFaints count if we enter new trainer battle", async () => { + game.override.enemySpecies(Species.MAGIKARP).startingWave(4).enemyLevel(1).startingLevel(100); + + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + game.move.select(Moves.LUNAR_DANCE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextWave(); + + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("BerryPhase", false); + + expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower); + }); + + it("should reset playerFaints count if we enter new biome", async () => { + game.override.enemySpecies(Species.MAGIKARP).startingWave(10).enemyLevel(1).startingLevel(100); + + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + game.move.select(Moves.LUNAR_DANCE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextWave(); + + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("BerryPhase", false); + + expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower); + }); +}); diff --git a/src/test/abilities/sweet_veil.test.ts b/test/abilities/sweet_veil.test.ts similarity index 81% rename from src/test/abilities/sweet_veil.test.ts rename to test/abilities/sweet_veil.test.ts index ef66cb1c68a..650ee53a474 100644 --- a/src/test/abilities/sweet_veil.test.ts +++ b/test/abilities/sweet_veil.test.ts @@ -5,7 +5,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -26,14 +26,14 @@ describe("Abilities - Sweet Veil", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("double"); - game.override.moveset([ Moves.SPLASH, Moves.REST, Moves.YAWN ]); + game.override.moveset([Moves.SPLASH, Moves.REST, Moves.YAWN]); game.override.enemySpecies(Species.MAGIKARP); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset([ Moves.POWDER, Moves.POWDER, Moves.POWDER, Moves.POWDER ]); + game.override.enemyMoveset([Moves.POWDER, Moves.POWDER, Moves.POWDER, Moves.POWDER]); }); it("prevents the user and its allies from falling asleep", async () => { - await game.startBattle([ Species.SWIRLIX, Species.MAGIKARP ]); + await game.startBattle([Species.SWIRLIX, Species.MAGIKARP]); game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); @@ -45,7 +45,7 @@ describe("Abilities - Sweet Veil", () => { it("causes Rest to fail when used by the user or its allies", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([ Species.SWIRLIX, Species.MAGIKARP ]); + await game.startBattle([Species.SWIRLIX, Species.MAGIKARP]); game.move.select(Moves.SPLASH); game.move.select(Moves.REST, 1); @@ -56,8 +56,8 @@ describe("Abilities - Sweet Veil", () => { }); it("causes Yawn to fail if used on the user or its allies", async () => { - game.override.enemyMoveset([ Moves.YAWN, Moves.YAWN, Moves.YAWN, Moves.YAWN ]); - await game.startBattle([ Species.SWIRLIX, Species.MAGIKARP ]); + game.override.enemyMoveset([Moves.YAWN, Moves.YAWN, Moves.YAWN, Moves.YAWN]); + await game.startBattle([Species.SWIRLIX, Species.MAGIKARP]); game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); @@ -73,7 +73,7 @@ describe("Abilities - Sweet Veil", () => { game.override.startingLevel(5); game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([ Species.SHUCKLE, Species.SHUCKLE, Species.SWIRLIX ]); + await game.startBattle([Species.SHUCKLE, Species.SHUCKLE, Species.SWIRLIX]); game.move.select(Moves.SPLASH); game.move.select(Moves.YAWN, 1, BattlerIndex.PLAYER); diff --git a/src/test/abilities/synchronize.test.ts b/test/abilities/synchronize.test.ts similarity index 88% rename from src/test/abilities/synchronize.test.ts rename to test/abilities/synchronize.test.ts index 2ae80ae9c7a..95ebf96f2fd 100644 --- a/src/test/abilities/synchronize.test.ts +++ b/test/abilities/synchronize.test.ts @@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -28,12 +28,12 @@ describe("Abilities - Synchronize", () => { .startingLevel(100) .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.SYNCHRONIZE) - .moveset([ Moves.SPLASH, Moves.THUNDER_WAVE, Moves.SPORE, Moves.PSYCHO_SHIFT ]) + .moveset([Moves.SPLASH, Moves.THUNDER_WAVE, Moves.SPORE, Moves.PSYCHO_SHIFT]) .ability(Abilities.NO_GUARD); }); it("does not trigger when no status is applied by opponent Pokemon", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.SPLASH); await game.phaseInterceptor.to("BerryPhase"); @@ -43,7 +43,7 @@ describe("Abilities - Synchronize", () => { }); it("sets the status of the source pokemon to Paralysis when paralyzed by it", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.THUNDER_WAVE); await game.phaseInterceptor.to("BerryPhase"); @@ -71,7 +71,7 @@ describe("Abilities - Synchronize", () => { .enemyAbility(Abilities.BALL_FETCH) .enemyMoveset(Array(4).fill(Moves.TOXIC_SPIKES)); - await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]); game.move.select(Moves.SPLASH); await game.toNextTurn(); @@ -85,7 +85,7 @@ describe("Abilities - Synchronize", () => { }); it("shows ability even if it fails to set the status of the opponent Pokemon", async () => { - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.THUNDER_WAVE); await game.phaseInterceptor.to("BerryPhase"); diff --git a/test/abilities/tera_shell.test.ts b/test/abilities/tera_shell.test.ts new file mode 100644 index 00000000000..a99ecfd4ce1 --- /dev/null +++ b/test/abilities/tera_shell.test.ts @@ -0,0 +1,117 @@ +import { BattlerIndex } from "#app/battle"; +import { Abilities } from "#app/enums/abilities"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { HitResult } from "#app/field/pokemon"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Abilities - Tera Shell", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("single") + .ability(Abilities.TERA_SHELL) + .moveset([Moves.SPLASH]) + .enemySpecies(Species.SNORLAX) + .enemyAbility(Abilities.INSOMNIA) + .enemyMoveset([Moves.MACH_PUNCH]) + .startingLevel(100) + .enemyLevel(100); + }); + + it("should change the effectiveness of non-resisted attacks when the source is at full HP", async () => { + await game.classicMode.startBattle([Species.SNORLAX]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + vi.spyOn(playerPokemon, "getMoveEffectiveness"); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0.5); + + await game.toNextTurn(); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(2); + }); + + it("should not override type immunities", async () => { + game.override.enemyMoveset([Moves.SHADOW_SNEAK]); + + await game.classicMode.startBattle([Species.SNORLAX]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + vi.spyOn(playerPokemon, "getMoveEffectiveness"); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0); + }); + + it("should not override type multipliers less than 0.5x", async () => { + game.override.enemyMoveset([Moves.QUICK_ATTACK]); + + await game.classicMode.startBattle([Species.AGGRON]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + vi.spyOn(playerPokemon, "getMoveEffectiveness"); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0.25); + }); + + it("should not affect the effectiveness of fixed-damage moves", async () => { + game.override.enemyMoveset([Moves.DRAGON_RAGE]); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + vi.spyOn(playerPokemon, "apply"); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("BerryPhase", false); + expect(playerPokemon.apply).toHaveLastReturnedWith(HitResult.EFFECTIVE); + expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp() - 40); + }); + + it("should change the effectiveness of all strikes of a multi-strike move", async () => { + game.override.enemyMoveset([Moves.DOUBLE_HIT]); + + await game.classicMode.startBattle([Species.SNORLAX]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + vi.spyOn(playerPokemon, "apply"); + + game.move.select(Moves.SPLASH); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.move.forceHit(); + for (let i = 0; i < 2; i++) { + await game.phaseInterceptor.to("MoveEffectPhase"); + expect(playerPokemon.apply).toHaveLastReturnedWith(HitResult.NOT_VERY_EFFECTIVE); + } + expect(playerPokemon.apply).toHaveReturnedTimes(2); + }); +}); diff --git a/test/abilities/trace.test.ts b/test/abilities/trace.test.ts new file mode 100644 index 00000000000..5d569208d33 --- /dev/null +++ b/test/abilities/trace.test.ts @@ -0,0 +1,53 @@ +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Abilities - Trace", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH]) + .ability(Abilities.TRACE) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should copy the opponent's ability", async () => { + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH); + }); + + it("should activate a copied post-summon ability", async () => { + game.override.enemyAbility(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1); + }); +}); diff --git a/src/test/abilities/unburden.test.ts b/test/abilities/unburden.test.ts similarity index 82% rename from src/test/abilities/unburden.test.ts rename to test/abilities/unburden.test.ts index a652f55d591..8f18604011c 100644 --- a/src/test/abilities/unburden.test.ts +++ b/test/abilities/unburden.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { PostItemLostAbAttr } from "#app/data/ability"; -import { allMoves, StealHeldItemChanceAttr } from "#app/data/move"; +import { allMoves, StealHeldItemChanceAttr } from "#app/data/moves/move"; import type Pokemon from "#app/field/pokemon"; import type { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier"; import { Abilities } from "#enums/abilities"; @@ -9,11 +9,10 @@ import { BerryType } from "#enums/berry-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - describe("Abilities - Unburden", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -25,9 +24,8 @@ describe("Abilities - Unburden", () => { const stackCounts = pokemon.getHeldItems().map(m => m.getStackCount()); if (stackCounts.length) { return stackCounts.reduce((a, b) => a + b); - } else { - return 0; } + return 0; } beforeAll(() => { @@ -46,7 +44,7 @@ describe("Abilities - Unburden", () => { .battleType("single") .startingLevel(1) .ability(Abilities.UNBURDEN) - .moveset([ Moves.SPLASH, Moves.KNOCK_OFF, Moves.PLUCK, Moves.FALSE_SWIPE ]) + .moveset([Moves.SPLASH, Moves.KNOCK_OFF, Moves.PLUCK, Moves.FALSE_SWIPE]) .startingHeldItems([ { name: "BERRY", count: 1, type: BerryType.SITRUS }, { name: "BERRY", count: 2, type: BerryType.APICOT }, @@ -62,12 +60,12 @@ describe("Abilities - Unburden", () => { { name: "BERRY", type: BerryType.LUM, count: 1 }, ]); // For the various tests that use Thief, give it a 100% steal rate - vi.spyOn(allMoves[Moves.THIEF], "attrs", "get").mockReturnValue([ new StealHeldItemChanceAttr(1.0) ]); + vi.spyOn(allMoves[Moves.THIEF], "attrs", "get").mockReturnValue([new StealHeldItemChanceAttr(1.0)]); }); it("should activate when a berry is eaten", async () => { game.override.enemyMoveset(Moves.FALSE_SWIPE); - await game.classicMode.startBattle([ Species.TREECKO ]); + await game.classicMode.startBattle([Species.TREECKO]); const playerPokemon = game.scene.getPlayerPokemon()!; const playerHeldItems = getHeldItemCount(playerPokemon); @@ -82,9 +80,8 @@ describe("Abilities - Unburden", () => { }); it("should activate when a berry is eaten, even if Berry Pouch preserves the berry", async () => { - game.override.enemyMoveset(Moves.FALSE_SWIPE) - .startingModifier([{ name: "BERRY_POUCH", count: 5850 }]); - await game.classicMode.startBattle([ Species.TREECKO ]); + game.override.enemyMoveset(Moves.FALSE_SWIPE).startingModifier([{ name: "BERRY_POUCH", count: 5850 }]); + await game.classicMode.startBattle([Species.TREECKO]); const playerPokemon = game.scene.getPlayerPokemon()!; const playerHeldItems = getHeldItemCount(playerPokemon); @@ -99,7 +96,7 @@ describe("Abilities - Unburden", () => { }); it("should activate for the target, and not the stealer, when a berry is stolen", async () => { - await game.classicMode.startBattle([ Species.TREECKO ]); + await game.classicMode.startBattle([Species.TREECKO]); const playerPokemon = game.scene.getPlayerPokemon()!; const initialPlayerSpeed = playerPokemon.getStat(Stat.SPD); @@ -117,7 +114,7 @@ describe("Abilities - Unburden", () => { }); it("should activate when an item is knocked off", async () => { - await game.classicMode.startBattle([ Species.TREECKO ]); + await game.classicMode.startBattle([Species.TREECKO]); const enemyPokemon = game.scene.getEnemyPokemon()!; const enemyHeldItemCt = getHeldItemCount(enemyPokemon); @@ -132,10 +129,8 @@ describe("Abilities - Unburden", () => { }); it("should activate when an item is stolen via attacking ability", async () => { - game.override - .ability(Abilities.MAGICIAN) - .startingHeldItems([]); // Remove player's full stacks of held items so it can steal opponent's held items - await game.classicMode.startBattle([ Species.TREECKO ]); + game.override.ability(Abilities.MAGICIAN).startingHeldItems([]); // Remove player's full stacks of held items so it can steal opponent's held items + await game.classicMode.startBattle([Species.TREECKO]); const enemyPokemon = game.scene.getEnemyPokemon()!; const enemyHeldItemCt = getHeldItemCount(enemyPokemon); @@ -150,10 +145,8 @@ describe("Abilities - Unburden", () => { }); it("should activate when an item is stolen via defending ability", async () => { - game.override - .enemyAbility(Abilities.PICKPOCKET) - .enemyHeldItems([]); // Remove opponent's full stacks of held items so it can steal player's held items - await game.classicMode.startBattle([ Species.TREECKO ]); + game.override.enemyAbility(Abilities.PICKPOCKET).enemyHeldItems([]); // Remove opponent's full stacks of held items so it can steal player's held items + await game.classicMode.startBattle([Species.TREECKO]); const playerPokemon = game.scene.getPlayerPokemon()!; const playerHeldItems = getHeldItemCount(playerPokemon); @@ -168,9 +161,8 @@ describe("Abilities - Unburden", () => { }); it("should activate when an item is stolen via move", async () => { - game.override.moveset(Moves.THIEF) - .startingHeldItems([]); // Remove player's full stacks of held items so it can steal opponent's held items - await game.classicMode.startBattle([ Species.TREECKO ]); + game.override.moveset(Moves.THIEF).startingHeldItems([]); // Remove player's full stacks of held items so it can steal opponent's held items + await game.classicMode.startBattle([Species.TREECKO]); const enemyPokemon = game.scene.getEnemyPokemon()!; const enemyHeldItemCt = getHeldItemCount(enemyPokemon); @@ -185,11 +177,8 @@ describe("Abilities - Unburden", () => { }); it("should activate when an item is stolen via grip claw", async () => { - game.override - .startingHeldItems([ - { name: "GRIP_CLAW", count: 1 }, - ]); - await game.classicMode.startBattle([ Species.TREECKO ]); + game.override.startingHeldItems([{ name: "GRIP_CLAW", count: 1 }]); + await game.classicMode.startBattle([Species.TREECKO]); const playerPokemon = game.scene.getPlayerPokemon()!; const gripClaw = playerPokemon.getHeldItems()[0] as ContactHeldItemTransferChanceModifier; @@ -208,9 +197,8 @@ describe("Abilities - Unburden", () => { }); it("should not activate when a neutralizing ability is present", async () => { - game.override.enemyAbility(Abilities.NEUTRALIZING_GAS) - .enemyMoveset(Moves.FALSE_SWIPE); - await game.classicMode.startBattle([ Species.TREECKO ]); + game.override.enemyAbility(Abilities.NEUTRALIZING_GAS).enemyMoveset(Moves.FALSE_SWIPE); + await game.classicMode.startBattle([Species.TREECKO]); const playerPokemon = game.scene.getPlayerPokemon()!; const playerHeldItems = getHeldItemCount(playerPokemon); @@ -227,7 +215,7 @@ describe("Abilities - Unburden", () => { it("should activate when a move that consumes a berry is used", async () => { game.override.moveset(Moves.STUFF_CHEEKS); - await game.classicMode.startBattle([ Species.TREECKO ]); + await game.classicMode.startBattle([Species.TREECKO]); const playerPokemon = game.scene.getPlayerPokemon()!; const playerHeldItemCt = getHeldItemCount(playerPokemon); @@ -243,13 +231,10 @@ describe("Abilities - Unburden", () => { }); it("should deactivate temporarily when a neutralizing gas user is on the field", async () => { - game.override - .battleType("double") - .ability(Abilities.NONE); // Disable ability override so that we can properly set abilities below - await game.classicMode.startBattle([ Species.TREECKO, Species.MEOWTH, Species.WEEZING ]); + game.override.battleType("double").ability(Abilities.NONE); // Disable ability override so that we can properly set abilities below + await game.classicMode.startBattle([Species.TREECKO, Species.MEOWTH, Species.WEEZING]); - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const [ treecko, _meowth, weezing ] = game.scene.getPlayerParty(); + const [treecko, _meowth, weezing] = game.scene.getPlayerParty(); treecko.abilityIndex = 2; // Treecko has Unburden weezing.abilityIndex = 1; // Weezing has Neutralizing Gas const playerHeldItems = getHeldItemCount(treecko); @@ -285,11 +270,10 @@ describe("Abilities - Unburden", () => { }); it("should not activate when passing a baton to a teammate switching in", async () => { - game.override.startingHeldItems([{ name: "BATON" }]) - .moveset(Moves.BATON_PASS); - await game.classicMode.startBattle([ Species.TREECKO, Species.PURRLOIN ]); + game.override.startingHeldItems([{ name: "BATON" }]).moveset(Moves.BATON_PASS); + await game.classicMode.startBattle([Species.TREECKO, Species.PURRLOIN]); - const [ treecko, purrloin ] = game.scene.getPlayerParty(); + const [treecko, purrloin] = game.scene.getPlayerParty(); const initialTreeckoSpeed = treecko.getStat(Stat.SPD); const initialPurrloinSpeed = purrloin.getStat(Stat.SPD); const unburdenAttr = treecko.getAbilityAttrs(PostItemLostAbAttr)[0]; @@ -308,8 +292,8 @@ describe("Abilities - Unburden", () => { }); it("should not speed up a Pokemon after it loses the ability Unburden", async () => { - game.override.enemyMoveset([ Moves.FALSE_SWIPE, Moves.WORRY_SEED ]); - await game.classicMode.startBattle([ Species.PURRLOIN ]); + game.override.enemyMoveset([Moves.FALSE_SWIPE, Moves.WORRY_SEED]); + await game.classicMode.startBattle([Species.PURRLOIN]); const playerPokemon = game.scene.getPlayerPokemon()!; const playerHeldItems = getHeldItemCount(playerPokemon); @@ -333,9 +317,8 @@ describe("Abilities - Unburden", () => { }); it("should activate when a reviver seed is used", async () => { - game.override.startingHeldItems([{ name: "REVIVER_SEED" }]) - .enemyMoveset([ Moves.WING_ATTACK ]); - await game.classicMode.startBattle([ Species.TREECKO ]); + game.override.startingHeldItems([{ name: "REVIVER_SEED" }]).enemyMoveset([Moves.WING_ATTACK]); + await game.classicMode.startBattle([Species.TREECKO]); const playerPokemon = game.scene.getPlayerPokemon()!; const playerHeldItems = getHeldItemCount(playerPokemon); @@ -351,8 +334,8 @@ describe("Abilities - Unburden", () => { // test for `.bypassFaint()` - singles it("shouldn't persist when revived normally if activated while fainting", async () => { - game.override.enemyMoveset([ Moves.SPLASH, Moves.THIEF ]); - await game.classicMode.startBattle([ Species.TREECKO, Species.FEEBAS ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.THIEF]); + await game.classicMode.startBattle([Species.TREECKO, Species.FEEBAS]); const treecko = game.scene.getPlayerPokemon()!; const treeckoInitialHeldItems = getHeldItemCount(treecko); @@ -377,10 +360,10 @@ describe("Abilities - Unburden", () => { it("shouldn't persist when revived by revival blessing if activated while fainting", async () => { game.override .battleType("double") - .enemyMoveset([ Moves.SPLASH, Moves.THIEF ]) - .moveset([ Moves.SPLASH, Moves.REVIVAL_BLESSING ]) + .enemyMoveset([Moves.SPLASH, Moves.THIEF]) + .moveset([Moves.SPLASH, Moves.REVIVAL_BLESSING]) .startingHeldItems([{ name: "WIDE_LENS" }]); - await game.classicMode.startBattle([ Species.TREECKO, Species.FEEBAS, Species.MILOTIC ]); + await game.classicMode.startBattle([Species.TREECKO, Species.FEEBAS, Species.MILOTIC]); const treecko = game.scene.getPlayerField()[0]; const treeckoInitialHeldItems = getHeldItemCount(treecko); @@ -390,8 +373,8 @@ describe("Abilities - Unburden", () => { game.move.select(Moves.REVIVAL_BLESSING, 1); await game.forceEnemyMove(Moves.THIEF, BattlerIndex.PLAYER); await game.forceEnemyMove(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2 ]); - game.doSelectPartyPokemon(0, "MoveEffectPhase"); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2]); + game.doSelectPartyPokemon(0, "RevivalBlessingPhase"); await game.toNextTurn(); expect(game.scene.getPlayerField()[0]).toBe(treecko); diff --git a/test/abilities/unseen_fist.test.ts b/test/abilities/unseen_fist.test.ts new file mode 100644 index 00000000000..73ae25ff3b0 --- /dev/null +++ b/test/abilities/unseen_fist.test.ts @@ -0,0 +1,97 @@ +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { BerryPhase } from "#app/phases/berry-phase"; + +describe("Abilities - Unseen Fist", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + game.override.starterSpecies(Species.URSHIFU); + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]); + game.override.startingLevel(100); + game.override.enemyLevel(100); + }); + + it("should cause a contact move to ignore Protect", () => + testUnseenFistHitResult(game, Moves.QUICK_ATTACK, Moves.PROTECT, true)); + + it("should not cause a non-contact move to ignore Protect", () => + testUnseenFistHitResult(game, Moves.ABSORB, Moves.PROTECT, false)); + + it("should not apply if the source has Long Reach", async () => { + game.override.passiveAbility(Abilities.LONG_REACH); + await testUnseenFistHitResult(game, Moves.QUICK_ATTACK, Moves.PROTECT, false); + }); + + it("should cause a contact move to ignore Wide Guard", () => + testUnseenFistHitResult(game, Moves.BREAKING_SWIPE, Moves.WIDE_GUARD, true)); + + it("should not cause a non-contact move to ignore Wide Guard", () => + testUnseenFistHitResult(game, Moves.BULLDOZE, Moves.WIDE_GUARD, false)); + + it("should cause a contact move to ignore Protect, but not Substitute", async () => { + game.override.enemyLevel(1); + game.override.moveset([Moves.TACKLE]); + + await game.classicMode.startBattle(); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + enemyPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, enemyPokemon.id); + + game.move.select(Moves.TACKLE); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(enemyPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeUndefined(); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); +}); + +async function testUnseenFistHitResult( + game: GameManager, + attackMove: Moves, + protectMove: Moves, + shouldSucceed = true, +): Promise { + game.override.moveset([attackMove]); + game.override.enemyMoveset([protectMove, protectMove, protectMove, protectMove]); + + await game.classicMode.startBattle(); + + const leadPokemon = game.scene.getPlayerPokemon()!; + expect(leadPokemon).not.toBe(undefined); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + expect(enemyPokemon).not.toBe(undefined); + + const enemyStartingHp = enemyPokemon.hp; + + game.move.select(attackMove); + await game.phaseInterceptor.to(TurnEndPhase, false); + + if (shouldSucceed) { + expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); + } else { + expect(enemyPokemon.hp).toBe(enemyStartingHp); + } +} diff --git a/src/test/abilities/volt_absorb.test.ts b/test/abilities/volt_absorb.test.ts similarity index 89% rename from src/test/abilities/volt_absorb.test.ts rename to test/abilities/volt_absorb.test.ts index 4fee7653b99..10735f31987 100644 --- a/src/test/abilities/volt_absorb.test.ts +++ b/test/abilities/volt_absorb.test.ts @@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { BattlerIndex } from "#app/battle"; @@ -34,9 +34,9 @@ describe("Abilities - Volt Absorb", () => { const moveToUse = Moves.CHARGE; const ability = Abilities.VOLT_ABSORB; - game.override.moveset([ moveToUse ]); + game.override.moveset([moveToUse]); game.override.ability(ability); - game.override.enemyMoveset([ Moves.SPLASH, Moves.NONE, Moves.NONE, Moves.NONE ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.NONE, Moves.NONE, Moves.NONE]); game.override.enemySpecies(Species.DUSKULL); game.override.enemyAbility(Abilities.BALL_FETCH); @@ -65,7 +65,7 @@ describe("Abilities - Volt Absorb", () => { game.move.select(Moves.THUNDERBOLT); enemyPokemon.hp = enemyPokemon.hp - 1; - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("MoveEffectPhase"); await game.move.forceMiss(); @@ -85,7 +85,7 @@ describe("Abilities - Volt Absorb", () => { game.move.select(Moves.THUNDERBOLT); enemyPokemon.hp = enemyPokemon.hp - 1; - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase", false); expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); diff --git a/test/abilities/wandering_spirit.test.ts b/test/abilities/wandering_spirit.test.ts new file mode 100644 index 00000000000..375faa41972 --- /dev/null +++ b/test/abilities/wandering_spirit.test.ts @@ -0,0 +1,65 @@ +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Abilities - Wandering Spirit", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH]) + .ability(Abilities.WANDERING_SPIRIT) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.TACKLE); + }); + + it("should exchange abilities when hit with a contact move", async () => { + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH); + expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.WANDERING_SPIRIT); + }); + + it("should not exchange abilities when hit with a non-contact move", async () => { + game.override.enemyMoveset(Moves.EARTHQUAKE); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.WANDERING_SPIRIT); + expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH); + }); + + it("should activate post-summon abilities", async () => { + game.override.enemyAbility(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1); + }); +}); diff --git a/src/test/abilities/wimp_out.test.ts b/test/abilities/wimp_out.test.ts similarity index 64% rename from src/test/abilities/wimp_out.test.ts rename to test/abilities/wimp_out.test.ts index bff68b54c75..ef201cbf8dd 100644 --- a/src/test/abilities/wimp_out.test.ts +++ b/test/abilities/wimp_out.test.ts @@ -1,7 +1,8 @@ import { BattlerIndex } from "#app/battle"; import { ArenaTagSide } from "#app/data/arena-tag"; -import { allMoves } from "#app/data/move"; -import GameManager from "#app/test/utils/gameManager"; +import { allMoves } from "#app/data/moves/move"; +import GameManager from "#test/testUtils/gameManager"; +import { toDmgValue } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; @@ -36,13 +37,13 @@ describe("Abilities - Wimp Out", () => { .enemyPassiveAbility(Abilities.NO_GUARD) .startingLevel(90) .enemyLevel(70) - .moveset([ Moves.SPLASH, Moves.FALSE_SWIPE, Moves.ENDURE ]) + .moveset([Moves.SPLASH, Moves.FALSE_SWIPE, Moves.ENDURE]) .enemyMoveset(Moves.FALSE_SWIPE) .disableCrits(); }); function confirmSwitch(): void { - const [ pokemon1, pokemon2 ] = game.scene.getPlayerParty(); + const [pokemon1, pokemon2] = game.scene.getPlayerParty(); expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase"); @@ -54,7 +55,7 @@ describe("Abilities - Wimp Out", () => { } function confirmNoSwitch(): void { - const [ pokemon1, pokemon2 ] = game.scene.getPlayerParty(); + const [pokemon1, pokemon2] = game.scene.getPlayerParty(); expect(game.phaseInterceptor.log).not.toContain("SwitchSummonPhase"); @@ -66,14 +67,8 @@ describe("Abilities - Wimp Out", () => { } it("triggers regenerator passive single time when switching out with wimp out", async () => { - game.override - .passiveAbility(Abilities.REGENERATOR) - .startingLevel(5) - .enemyLevel(100); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.passiveAbility(Abilities.REGENERATOR).startingLevel(5).enemyLevel(100); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); const wimpod = game.scene.getPlayerPokemon()!; @@ -87,10 +82,7 @@ describe("Abilities - Wimp Out", () => { it("It makes wild pokemon flee if triggered", async () => { game.override.enemyAbility(Abilities.WIMP_OUT); - await game.classicMode.startBattle([ - Species.GOLISOPOD, - Species.TYRUNT - ]); + await game.classicMode.startBattle([Species.GOLISOPOD, Species.TYRUNT]); const enemyPokemon = game.scene.getEnemyPokemon()!; enemyPokemon.hp *= 0.52; @@ -104,10 +96,7 @@ describe("Abilities - Wimp Out", () => { }); it("Does not trigger when HP already below half", async () => { - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); const wimpod = game.scene.getPlayerPokemon()!; wimpod.hp = 5; @@ -119,14 +108,8 @@ describe("Abilities - Wimp Out", () => { }); it("Trapping moves do not prevent Wimp Out from activating.", async () => { - game.override - .enemyMoveset([ Moves.SPIRIT_SHACKLE ]) - .startingLevel(53) - .enemyLevel(45); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemyMoveset([Moves.SPIRIT_SHACKLE]).startingLevel(53).enemyLevel(45); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.move.select(Moves.SPLASH); game.doSelectPartyPokemon(1); @@ -140,13 +123,8 @@ describe("Abilities - Wimp Out", () => { }); it("If this Ability activates due to being hit by U-turn or Volt Switch, the user of that move will not be switched out.", async () => { - game.override - .startingLevel(95) - .enemyMoveset([ Moves.U_TURN ]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.startingLevel(95).enemyMoveset([Moves.U_TURN]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.move.select(Moves.SPLASH); game.doSelectPartyPokemon(1); @@ -159,14 +137,8 @@ describe("Abilities - Wimp Out", () => { }); it("If this Ability does not activate due to being hit by U-turn or Volt Switch, the user of that move will be switched out.", async () => { - game.override - .startingLevel(190) - .startingWave(8) - .enemyMoveset([ Moves.U_TURN ]); - await game.classicMode.startBattle([ - Species.GOLISOPOD, - Species.TYRUNT - ]); + game.override.startingLevel(190).startingWave(8).enemyMoveset([Moves.U_TURN]); + await game.classicMode.startBattle([Species.GOLISOPOD, Species.TYRUNT]); const RIVAL_NINJASK1 = game.scene.getEnemyPokemon()?.id; game.move.select(Moves.SPLASH); await game.phaseInterceptor.to("BerryPhase", false); @@ -174,13 +146,8 @@ describe("Abilities - Wimp Out", () => { }); it("Dragon Tail and Circle Throw switch out Pokémon before the Ability activates.", async () => { - game.override - .startingLevel(69) - .enemyMoveset([ Moves.DRAGON_TAIL ]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.startingLevel(69).enemyMoveset([Moves.DRAGON_TAIL]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); const wimpod = game.scene.getPlayerPokemon()!; @@ -196,13 +163,8 @@ describe("Abilities - Wimp Out", () => { }); it("triggers when recoil damage is taken", async () => { - game.override - .moveset([ Moves.HEAD_SMASH ]) - .enemyMoveset([ Moves.SPLASH ]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.moveset([Moves.HEAD_SMASH]).enemyMoveset([Moves.SPLASH]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.move.select(Moves.HEAD_SMASH); game.doSelectPartyPokemon(1); @@ -212,13 +174,8 @@ describe("Abilities - Wimp Out", () => { }); it("It does not activate when the Pokémon cuts its own HP", async () => { - game.override - .moveset([ Moves.SUBSTITUTE ]) - .enemyMoveset([ Moves.SPLASH ]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.moveset([Moves.SUBSTITUTE]).enemyMoveset([Moves.SPLASH]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); const wimpod = game.scene.getPlayerPokemon()!; wimpod.hp *= 0.52; @@ -230,13 +187,8 @@ describe("Abilities - Wimp Out", () => { }); it("Does not trigger when neutralized", async () => { - game.override - .enemyAbility(Abilities.NEUTRALIZING_GAS) - .startingLevel(5); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemyAbility(Abilities.NEUTRALIZING_GAS).startingLevel(5); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.move.select(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); @@ -244,38 +196,36 @@ describe("Abilities - Wimp Out", () => { confirmNoSwitch(); }); - it("If it falls below half and recovers back above half from a Shell Bell, Wimp Out will activate even after the Shell Bell recovery", async () => { - game.override - .moveset([ Moves.DOUBLE_EDGE ]) - .enemyMoveset([ Moves.SPLASH ]) - .startingHeldItems([ - { name: "SHELL_BELL", count: 3 }, - { name: "HEALING_CHARM", count: 5 }, - ]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + // TODO: Enable when this behavior is fixed (currently Shell Bell won't activate if Wimp Out activates because + // the pokemon is removed from the field before the Shell Bell modifier is applied, so it can't see the + // damage dealt and doesn't heal the pokemon) + it.todo( + "If it falls below half and recovers back above half from a Shell Bell, Wimp Out will activate even after the Shell Bell recovery", + async () => { + game.override + .moveset([Moves.DOUBLE_EDGE]) + .enemyMoveset([Moves.SPLASH]) + .startingHeldItems([{ name: "SHELL_BELL", count: 4 }]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); - game.scene.getPlayerPokemon()!.hp *= 0.75; + const wimpod = game.scene.getPlayerPokemon()!; - game.move.select(Moves.DOUBLE_EDGE); - game.doSelectPartyPokemon(1); - await game.phaseInterceptor.to("TurnEndPhase"); + wimpod.damageAndUpdate(toDmgValue(wimpod.getMaxHp() * 0.4)); - expect(game.scene.getPlayerParty()[1].getHpRatio()).toBeGreaterThan(0.5); - expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase"); - expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.TYRUNT); - }); + game.move.select(Moves.DOUBLE_EDGE); + game.doSelectPartyPokemon(1); + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(game.scene.getPlayerParty()[1]).toBe(wimpod); + expect(wimpod.hp).toBeGreaterThan(toDmgValue(wimpod.getMaxHp() / 2)); + expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase"); + expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.TYRUNT); + }, + ); it("Wimp Out will activate due to weather damage", async () => { - game.override - .weather(WeatherType.HAIL) - .enemyMoveset([ Moves.SPLASH ]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.weather(WeatherType.HAIL).enemyMoveset([Moves.SPLASH]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.51; @@ -287,14 +237,8 @@ describe("Abilities - Wimp Out", () => { }); it("Does not trigger when enemy has sheer force", async () => { - game.override - .enemyAbility(Abilities.SHEER_FORCE) - .enemyMoveset(Moves.SLUDGE_BOMB) - .startingLevel(95); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemyAbility(Abilities.SHEER_FORCE).enemyMoveset(Moves.SLUDGE_BOMB).startingLevel(95); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.51; @@ -305,13 +249,8 @@ describe("Abilities - Wimp Out", () => { }); it("Wimp Out will activate due to post turn status damage", async () => { - game.override - .statusEffect(StatusEffect.POISON) - .enemyMoveset([ Moves.SPLASH ]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.statusEffect(StatusEffect.POISON).enemyMoveset([Moves.SPLASH]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.51; @@ -323,13 +262,8 @@ describe("Abilities - Wimp Out", () => { }); it("Wimp Out will activate due to bad dreams", async () => { - game.override - .statusEffect(StatusEffect.SLEEP) - .enemyAbility(Abilities.BAD_DREAMS); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.statusEffect(StatusEffect.SLEEP).enemyAbility(Abilities.BAD_DREAMS); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.52; @@ -341,12 +275,8 @@ describe("Abilities - Wimp Out", () => { }); it("Wimp Out will activate due to leech seed", async () => { - game.override - .enemyMoveset([ Moves.LEECH_SEED ]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemyMoveset([Moves.LEECH_SEED]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.52; game.move.select(Moves.SPLASH); @@ -357,13 +287,8 @@ describe("Abilities - Wimp Out", () => { }); it("Wimp Out will activate due to curse damage", async () => { - game.override - .enemySpecies(Species.DUSKNOIR) - .enemyMoveset([ Moves.CURSE ]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemySpecies(Species.DUSKNOIR).enemyMoveset([Moves.CURSE]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.52; game.move.select(Moves.SPLASH); @@ -374,15 +299,9 @@ describe("Abilities - Wimp Out", () => { }); it("Wimp Out will activate due to salt cure damage", async () => { - game.override - .enemySpecies(Species.NACLI) - .enemyMoveset([ Moves.SALT_CURE ]) - .enemyLevel(1); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); - game.scene.getPlayerPokemon()!.hp *= 0.70; + game.override.enemySpecies(Species.NACLI).enemyMoveset([Moves.SALT_CURE]).enemyLevel(1); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); + game.scene.getPlayerPokemon()!.hp *= 0.7; game.move.select(Moves.SPLASH); game.doSelectPartyPokemon(1); @@ -392,14 +311,8 @@ describe("Abilities - Wimp Out", () => { }); it("Wimp Out will activate due to damaging trap damage", async () => { - game.override - .enemySpecies(Species.MAGIKARP) - .enemyMoveset([ Moves.WHIRLPOOL ]) - .enemyLevel(1); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemySpecies(Species.MAGIKARP).enemyMoveset([Moves.WHIRLPOOL]).enemyLevel(1); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.55; game.move.select(Moves.SPLASH); @@ -414,13 +327,10 @@ describe("Abilities - Wimp Out", () => { game.scene.arena.addTag(ArenaTagType.SPIKES, 1, Moves.SPIKES, 0, ArenaTagSide.ENEMY); game.override .passiveAbility(Abilities.MAGIC_GUARD) - .enemyMoveset([ Moves.LEECH_SEED ]) + .enemyMoveset([Moves.LEECH_SEED]) .weather(WeatherType.HAIL) .statusEffect(StatusEffect.POISON); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.51; game.move.select(Moves.SPLASH); @@ -432,15 +342,8 @@ describe("Abilities - Wimp Out", () => { }); it("Wimp Out activating should not cancel a double battle", async () => { - game.override - .battleType("double") - .enemyAbility(Abilities.WIMP_OUT) - .enemyMoveset([ Moves.SPLASH ]) - .enemyLevel(1); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.battleType("double").enemyAbility(Abilities.WIMP_OUT).enemyMoveset([Moves.SPLASH]).enemyLevel(1); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); const enemyLeadPokemon = game.scene.getEnemyParty()[0]; const enemySecPokemon = game.scene.getEnemyParty()[1]; @@ -460,15 +363,12 @@ describe("Abilities - Wimp Out", () => { it("Wimp Out will activate due to aftermath", async () => { game.override - .moveset([ Moves.THUNDER_PUNCH ]) + .moveset([Moves.THUNDER_PUNCH]) .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.AFTERMATH) - .enemyMoveset([ Moves.SPLASH ]) + .enemyMoveset([Moves.SPLASH]) .enemyLevel(1); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.51; game.move.select(Moves.THUNDER_PUNCH); @@ -481,26 +381,16 @@ describe("Abilities - Wimp Out", () => { it("Activates due to entry hazards", async () => { game.scene.arena.addTag(ArenaTagType.STEALTH_ROCK, 1, Moves.STEALTH_ROCK, 0, ArenaTagSide.ENEMY); game.scene.arena.addTag(ArenaTagType.SPIKES, 1, Moves.SPIKES, 0, ArenaTagSide.ENEMY); - game.override - .enemySpecies(Species.CENTISKORCH) - .enemyAbility(Abilities.WIMP_OUT) - .startingWave(4); - await game.classicMode.startBattle([ - Species.TYRUNT - ]); + game.override.enemySpecies(Species.CENTISKORCH).enemyAbility(Abilities.WIMP_OUT).startingWave(4); + await game.classicMode.startBattle([Species.TYRUNT]); expect(game.phaseInterceptor.log).not.toContain("MovePhase"); expect(game.phaseInterceptor.log).toContain("BattleEndPhase"); }); it("Wimp Out will activate due to Nightmare", async () => { - game.override - .enemyMoveset([ Moves.NIGHTMARE ]) - .statusEffect(StatusEffect.SLEEP); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemyMoveset([Moves.NIGHTMARE]).statusEffect(StatusEffect.SLEEP); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.65; game.move.select(Moves.SPLASH); @@ -511,13 +401,8 @@ describe("Abilities - Wimp Out", () => { }); it("triggers status on the wimp out user before a new pokemon is switched in", async () => { - game.override - .enemyMoveset(Moves.SLUDGE_BOMB) - .startingLevel(80); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemyMoveset(Moves.SLUDGE_BOMB).startingLevel(80); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); vi.spyOn(allMoves[Moves.SLUDGE_BOMB], "chance", "get").mockReturnValue(100); game.move.select(Moves.SPLASH); @@ -529,13 +414,8 @@ describe("Abilities - Wimp Out", () => { }); it("triggers after last hit of multi hit move", async () => { - game.override - .enemyMoveset(Moves.BULLET_SEED) - .enemyAbility(Abilities.SKILL_LINK); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemyMoveset(Moves.BULLET_SEED).enemyAbility(Abilities.SKILL_LINK); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.51; @@ -550,13 +430,8 @@ describe("Abilities - Wimp Out", () => { }); it("triggers after last hit of multi hit move (multi lens)", async () => { - game.override - .enemyMoveset(Moves.TACKLE) - .enemyHeldItems([{ name: "MULTI_LENS", count: 1 }]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemyMoveset(Moves.TACKLE).enemyHeldItems([{ name: "MULTI_LENS", count: 1 }]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.51; @@ -570,13 +445,8 @@ describe("Abilities - Wimp Out", () => { confirmSwitch(); }); it("triggers after last hit of Parental Bond", async () => { - game.override - .enemyMoveset(Moves.TACKLE) - .enemyAbility(Abilities.PARENTAL_BOND); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); + game.override.enemyMoveset(Moves.TACKLE).enemyAbility(Abilities.PARENTAL_BOND); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); game.scene.getPlayerPokemon()!.hp *= 0.51; @@ -591,34 +461,30 @@ describe("Abilities - Wimp Out", () => { }); // TODO: This interaction is not implemented yet - it.todo("Wimp Out will not activate if the Pokémon's HP falls below half due to hurting itself in confusion", async () => { - game.override - .moveset([ Moves.SWORDS_DANCE ]) - .enemyMoveset([ Moves.SWAGGER ]); - await game.classicMode.startBattle([ - Species.WIMPOD, - Species.TYRUNT - ]); - const playerPokemon = game.scene.getPlayerPokemon()!; - playerPokemon.hp *= 0.51; - playerPokemon.setStatStage(Stat.ATK, 6); - playerPokemon.addTag(BattlerTagType.CONFUSED); + it.todo( + "Wimp Out will not activate if the Pokémon's HP falls below half due to hurting itself in confusion", + async () => { + game.override.moveset([Moves.SWORDS_DANCE]).enemyMoveset([Moves.SWAGGER]); + await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]); + const playerPokemon = game.scene.getPlayerPokemon()!; + playerPokemon.hp *= 0.51; + playerPokemon.setStatStage(Stat.ATK, 6); + playerPokemon.addTag(BattlerTagType.CONFUSED); - // TODO: add helper function to force confusion self-hits + // TODO: add helper function to force confusion self-hits - while (playerPokemon.getHpRatio() > 0.49) { - game.move.select(Moves.SWORDS_DANCE); - await game.phaseInterceptor.to("TurnEndPhase"); - } + while (playerPokemon.getHpRatio() > 0.49) { + game.move.select(Moves.SWORDS_DANCE); + await game.phaseInterceptor.to("TurnEndPhase"); + } - confirmNoSwitch(); - }); + confirmNoSwitch(); + }, + ); it("should not activate on wave X0 bosses", async () => { - game.override.enemyAbility(Abilities.WIMP_OUT) - .startingLevel(5850) - .startingWave(10); - await game.classicMode.startBattle([ Species.GOLISOPOD ]); + game.override.enemyAbility(Abilities.WIMP_OUT).startingLevel(5850).startingWave(10); + await game.classicMode.startBattle([Species.GOLISOPOD]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -638,20 +504,17 @@ describe("Abilities - Wimp Out", () => { .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.WIMPOD) .enemyAbility(Abilities.WIMP_OUT) - .moveset([ Moves.MATCHA_GOTCHA, Moves.FALSE_SWIPE ]) + .moveset([Moves.MATCHA_GOTCHA, Moves.FALSE_SWIPE]) .startingLevel(50) .enemyLevel(1) .battleType("double") .startingWave(wave); - await game.classicMode.startBattle([ - Species.RAICHU, - Species.PIKACHU - ]); - const [ wimpod0, wimpod1 ] = game.scene.getEnemyField(); + await game.classicMode.startBattle([Species.RAICHU, Species.PIKACHU]); + const [wimpod0, wimpod1] = game.scene.getEnemyField(); game.move.select(Moves.FALSE_SWIPE, 0, BattlerIndex.ENEMY); game.move.select(Moves.MATCHA_GOTCHA, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("TurnEndPhase"); expect(wimpod0.hp).toBeGreaterThan(0); diff --git a/src/test/abilities/wind_power.test.ts b/test/abilities/wind_power.test.ts similarity index 88% rename from src/test/abilities/wind_power.test.ts rename to test/abilities/wind_power.test.ts index 538b65f898b..b28ac3362eb 100644 --- a/src/test/abilities/wind_power.test.ts +++ b/test/abilities/wind_power.test.ts @@ -3,7 +3,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -26,12 +26,12 @@ describe("Abilities - Wind Power", () => { game.override.battleType("single"); game.override.enemySpecies(Species.SHIFTRY); game.override.enemyAbility(Abilities.WIND_POWER); - game.override.moveset([ Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM ]); + game.override.moveset([Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM]); game.override.enemyMoveset(Moves.SPLASH); }); it("it becomes charged when hit by wind moves", async () => { - await game.startBattle([ Species.MAGIKARP ]); + await game.startBattle([Species.MAGIKARP]); const shiftry = game.scene.getEnemyPokemon()!; expect(shiftry.getTag(BattlerTagType.CHARGED)).toBeUndefined(); @@ -46,7 +46,7 @@ describe("Abilities - Wind Power", () => { game.override.ability(Abilities.WIND_POWER); game.override.enemySpecies(Species.MAGIKARP); - await game.startBattle([ Species.SHIFTRY ]); + await game.startBattle([Species.SHIFTRY]); const shiftry = game.scene.getPlayerPokemon()!; expect(shiftry.getTag(BattlerTagType.CHARGED)).toBeUndefined(); @@ -61,7 +61,7 @@ describe("Abilities - Wind Power", () => { game.override.enemySpecies(Species.MAGIKARP); game.override.ability(Abilities.WIND_POWER); - await game.startBattle([ Species.SHIFTRY ]); + await game.startBattle([Species.SHIFTRY]); const magikarp = game.scene.getEnemyPokemon()!; const shiftry = game.scene.getPlayerPokemon()!; @@ -79,7 +79,7 @@ describe("Abilities - Wind Power", () => { it("does not interact with Sandstorm", async () => { game.override.enemySpecies(Species.MAGIKARP); - await game.startBattle([ Species.SHIFTRY ]); + await game.startBattle([Species.SHIFTRY]); const shiftry = game.scene.getPlayerPokemon()!; expect(shiftry.getTag(BattlerTagType.CHARGED)).toBeUndefined(); diff --git a/src/test/abilities/wind_rider.test.ts b/test/abilities/wind_rider.test.ts similarity index 80% rename from src/test/abilities/wind_rider.test.ts rename to test/abilities/wind_rider.test.ts index cd7094fb0a9..8fdae1b24ec 100644 --- a/src/test/abilities/wind_rider.test.ts +++ b/test/abilities/wind_rider.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -26,12 +26,12 @@ describe("Abilities - Wind Rider", () => { .battleType("single") .enemySpecies(Species.SHIFTRY) .enemyAbility(Abilities.WIND_RIDER) - .moveset([ Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM ]) + .moveset([Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM]) .enemyMoveset(Moves.SPLASH); }); it("takes no damage from wind moves and its ATK stat stage is raised by 1 when hit by one", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const shiftry = game.scene.getEnemyPokemon()!; expect(shiftry.getStatStage(Stat.ATK)).toBe(0); @@ -45,11 +45,9 @@ describe("Abilities - Wind Rider", () => { }); it("ATK stat stage is raised by 1 when Tailwind is present on its side", async () => { - game.override - .enemySpecies(Species.MAGIKARP) - .ability(Abilities.WIND_RIDER); + game.override.enemySpecies(Species.MAGIKARP).ability(Abilities.WIND_RIDER); - await game.classicMode.startBattle([ Species.SHIFTRY ]); + await game.classicMode.startBattle([Species.SHIFTRY]); const shiftry = game.scene.getPlayerPokemon()!; expect(shiftry.getStatStage(Stat.ATK)).toBe(0); @@ -62,11 +60,9 @@ describe("Abilities - Wind Rider", () => { }); it("does not raise ATK stat stage when Tailwind is present on opposing side", async () => { - game.override - .enemySpecies(Species.MAGIKARP) - .ability(Abilities.WIND_RIDER); + game.override.enemySpecies(Species.MAGIKARP).ability(Abilities.WIND_RIDER); - await game.classicMode.startBattle([ Species.SHIFTRY ]); + await game.classicMode.startBattle([Species.SHIFTRY]); const magikarp = game.scene.getEnemyPokemon()!; const shiftry = game.scene.getPlayerPokemon()!; @@ -82,11 +78,9 @@ describe("Abilities - Wind Rider", () => { }); it("does not raise ATK stat stage when Tailwind is present on opposing side", async () => { - game.override - .enemySpecies(Species.MAGIKARP) - .ability(Abilities.WIND_RIDER); + game.override.enemySpecies(Species.MAGIKARP).ability(Abilities.WIND_RIDER); - await game.classicMode.startBattle([ Species.SHIFTRY ]); + await game.classicMode.startBattle([Species.SHIFTRY]); const magikarp = game.scene.getEnemyPokemon()!; const shiftry = game.scene.getPlayerPokemon()!; @@ -104,7 +98,7 @@ describe("Abilities - Wind Rider", () => { it("does not interact with Sandstorm", async () => { game.override.enemySpecies(Species.MAGIKARP); - await game.classicMode.startBattle([ Species.SHIFTRY ]); + await game.classicMode.startBattle([Species.SHIFTRY]); const shiftry = game.scene.getPlayerPokemon()!; expect(shiftry.getStatStage(Stat.ATK)).toBe(0); diff --git a/src/test/abilities/wonder_skin.test.ts b/test/abilities/wonder_skin.test.ts similarity index 83% rename from src/test/abilities/wonder_skin.test.ts rename to test/abilities/wonder_skin.test.ts index 6b25701e36a..f2cb0faed72 100644 --- a/src/test/abilities/wonder_skin.test.ts +++ b/test/abilities/wonder_skin.test.ts @@ -1,10 +1,10 @@ import { allAbilities } from "#app/data/ability"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -25,7 +25,7 @@ describe("Abilities - Wonder Skin", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("single"); - game.override.moveset([ Moves.TACKLE, Moves.CHARM ]); + game.override.moveset([Moves.TACKLE, Moves.CHARM]); game.override.ability(Abilities.BALL_FETCH); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.WONDER_SKIN); @@ -37,7 +37,7 @@ describe("Abilities - Wonder Skin", () => { vi.spyOn(moveToCheck, "calculateBattleAccuracy"); - await game.startBattle([ Species.PIKACHU ]); + await game.startBattle([Species.PIKACHU]); game.move.select(Moves.CHARM); await game.phaseInterceptor.to(MoveEffectPhase); @@ -49,14 +49,14 @@ describe("Abilities - Wonder Skin", () => { vi.spyOn(moveToCheck, "calculateBattleAccuracy"); - await game.startBattle([ Species.PIKACHU ]); + await game.startBattle([Species.PIKACHU]); game.move.select(Moves.TACKLE); await game.phaseInterceptor.to(MoveEffectPhase); expect(moveToCheck.calculateBattleAccuracy).toHaveReturnedWith(100); }); - const bypassAbilities = [ Abilities.MOLD_BREAKER, Abilities.TERAVOLT, Abilities.TURBOBLAZE ]; + const bypassAbilities = [Abilities.MOLD_BREAKER, Abilities.TERAVOLT, Abilities.TURBOBLAZE]; bypassAbilities.forEach(ability => { it(`does not affect pokemon with ${allAbilities[ability].name}`, async () => { @@ -65,7 +65,7 @@ describe("Abilities - Wonder Skin", () => { game.override.ability(ability); vi.spyOn(moveToCheck, "calculateBattleAccuracy"); - await game.startBattle([ Species.PIKACHU ]); + await game.startBattle([Species.PIKACHU]); game.move.select(Moves.CHARM); await game.phaseInterceptor.to(MoveEffectPhase); diff --git a/src/test/abilities/zen_mode.test.ts b/test/abilities/zen_mode.test.ts similarity index 86% rename from src/test/abilities/zen_mode.test.ts rename to test/abilities/zen_mode.test.ts index e0cc457c4d5..d552d8c88ca 100644 --- a/src/test/abilities/zen_mode.test.ts +++ b/test/abilities/zen_mode.test.ts @@ -3,11 +3,10 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Abilities - ZEN MODE", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -38,7 +37,7 @@ describe("Abilities - ZEN MODE", () => { }); it("shouldn't change form when taking damage if not dropping below 50% HP", async () => { - await game.classicMode.startBattle([ Species.DARMANITAN ]); + await game.classicMode.startBattle([Species.DARMANITAN]); const darmanitan = game.scene.getPlayerPokemon()!; expect(darmanitan.formIndex).toBe(baseForm); @@ -51,10 +50,10 @@ describe("Abilities - ZEN MODE", () => { }); it("should change form when falling below 50% HP", async () => { - await game.classicMode.startBattle([ Species.DARMANITAN ]); + await game.classicMode.startBattle([Species.DARMANITAN]); const darmanitan = game.scene.getPlayerPokemon()!; - darmanitan.hp = (darmanitan.getMaxHp() / 2) + 1; + darmanitan.hp = darmanitan.getMaxHp() / 2 + 1; expect(darmanitan.formIndex).toBe(baseForm); game.move.select(Moves.SPLASH); @@ -65,9 +64,9 @@ describe("Abilities - ZEN MODE", () => { }); it("should stay zen mode when fainted", async () => { - await game.classicMode.startBattle([ Species.DARMANITAN, Species.CHARIZARD ]); + await game.classicMode.startBattle([Species.DARMANITAN, Species.CHARIZARD]); const darmanitan = game.scene.getPlayerPokemon()!; - darmanitan.hp = (darmanitan.getMaxHp() / 2) + 1; + darmanitan.hp = darmanitan.getMaxHp() / 2 + 1; expect(darmanitan.formIndex).toBe(baseForm); game.move.select(Moves.SPLASH); @@ -91,7 +90,7 @@ describe("Abilities - ZEN MODE", () => { [Species.DARMANITAN]: zenForm, }); - await game.classicMode.startBattle([ Species.MAGIKARP, Species.DARMANITAN ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.DARMANITAN]); const darmanitan = game.scene.getPlayerParty()[1]; darmanitan.hp = 1; diff --git a/src/test/abilities/zero_to_hero.test.ts b/test/abilities/zero_to_hero.test.ts similarity index 90% rename from src/test/abilities/zero_to_hero.test.ts rename to test/abilities/zero_to_hero.test.ts index 5702f73e6c4..4565aa3e8b2 100644 --- a/src/test/abilities/zero_to_hero.test.ts +++ b/test/abilities/zero_to_hero.test.ts @@ -5,10 +5,9 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Abilities - ZERO TO HERO", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -40,7 +39,7 @@ describe("Abilities - ZERO TO HERO", () => { [Species.PALAFIN]: heroForm, }); - await game.startBattle([ Species.FEEBAS, Species.PALAFIN, Species.PALAFIN ]); + await game.startBattle([Species.FEEBAS, Species.PALAFIN, Species.PALAFIN]); const palafin1 = game.scene.getPlayerParty()[1]; const palafin2 = game.scene.getPlayerParty()[2]; @@ -62,7 +61,7 @@ describe("Abilities - ZERO TO HERO", () => { }); it("should swap to Hero form when switching out during a battle", async () => { - await game.startBattle([ Species.PALAFIN, Species.FEEBAS ]); + await game.startBattle([Species.PALAFIN, Species.FEEBAS]); const palafin = game.scene.getPlayerPokemon()!; expect(palafin.formIndex).toBe(baseForm); @@ -73,7 +72,7 @@ describe("Abilities - ZERO TO HERO", () => { }); it("should not swap to Hero form if switching due to faint", async () => { - await game.startBattle([ Species.PALAFIN, Species.FEEBAS ]); + await game.startBattle([Species.PALAFIN, Species.FEEBAS]); const palafin = game.scene.getPlayerPokemon()!; expect(palafin.formIndex).toBe(baseForm); @@ -90,7 +89,7 @@ describe("Abilities - ZERO TO HERO", () => { [Species.PALAFIN]: heroForm, }); - await game.startBattle([ Species.PALAFIN, Species.FEEBAS ]); + await game.startBattle([Species.PALAFIN, Species.FEEBAS]); const palafin = game.scene.getPlayerPokemon()!; expect(palafin.formIndex).toBe(heroForm); diff --git a/src/test/account.test.ts b/test/account.test.ts similarity index 87% rename from src/test/account.test.ts rename to test/account.test.ts index 0f49014c377..3f6b9f3f80b 100644 --- a/src/test/account.test.ts +++ b/test/account.test.ts @@ -1,7 +1,7 @@ import * as battleScene from "#app/battle-scene"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; import { describe, expect, it, vi } from "vitest"; -import { initLoggedInUser, loggedInUser, updateUserInfo } from "../account"; +import { initLoggedInUser, loggedInUser, updateUserInfo } from "#app/account"; describe("account", () => { describe("initLoggedInUser", () => { @@ -17,7 +17,7 @@ describe("account", () => { it("should set loggedInUser! to Guest if bypassLogin is true", async () => { vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(true); - const [ success, status ] = await updateUserInfo(); + const [success, status] = await updateUserInfo(); expect(success).toBe(true); expect(status).toBe(200); @@ -38,7 +38,7 @@ describe("account", () => { 200, ]); - const [ success, status ] = await updateUserInfo(); + const [success, status] = await updateUserInfo(); expect(success).toBe(true); expect(status).toBe(200); @@ -48,9 +48,9 @@ describe("account", () => { it("should handle resolved API errors", async () => { vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(false); - vi.spyOn(pokerogueApi.account, "getInfo").mockResolvedValue([ null, 401 ]); + vi.spyOn(pokerogueApi.account, "getInfo").mockResolvedValue([null, 401]); - const [ success, status ] = await updateUserInfo(); + const [success, status] = await updateUserInfo(); expect(success).toBe(false); expect(status).toBe(401); @@ -58,9 +58,9 @@ describe("account", () => { it("should handle 500 API errors", async () => { vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(false); - vi.spyOn(pokerogueApi.account, "getInfo").mockResolvedValue([ null, 500 ]); + vi.spyOn(pokerogueApi.account, "getInfo").mockResolvedValue([null, 500]); - const [ success, status ] = await updateUserInfo(); + const [success, status] = await updateUserInfo(); expect(success).toBe(false); expect(status).toBe(500); diff --git a/src/test/achievements/achievement.test.ts b/test/achievements/achievement.test.ts similarity index 88% rename from src/test/achievements/achievement.test.ts rename to test/achievements/achievement.test.ts index b515c6bafa8..26d33adb00a 100644 --- a/src/test/achievements/achievement.test.ts +++ b/test/achievements/achievement.test.ts @@ -1,19 +1,28 @@ import { TurnHeldItemTransferModifier } from "#app/modifier/modifier"; -import { Achv, AchvTier, DamageAchv, HealAchv, LevelAchv, ModifierAchv, MoneyAchv, RibbonAchv, achvs } from "#app/system/achv"; -import { IntegerHolder, NumberHolder } from "#app/utils"; -import GameManager from "#test/utils/gameManager"; +import { + Achv, + AchvTier, + DamageAchv, + HealAchv, + LevelAchv, + ModifierAchv, + MoneyAchv, + RibbonAchv, + achvs, +} from "#app/system/achv"; +import { NumberHolder } from "#app/utils"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import BattleScene from "../../battle-scene"; +import BattleScene from "#app/battle-scene"; describe("check some Achievement related stuff", () => { - it ("should check Achievement creation", () => { + it("should check Achievement creation", () => { const ach = new MoneyAchv("", "Achievement", 1000, null!, 100); expect(ach.name).toBe("Achievement"); }); }); - describe("Achv", () => { let achv: Achv; @@ -61,8 +70,8 @@ describe("Achv", () => { const conditionFunc = vi.fn((args: any[]) => args[0] === 10); const achv = new Achv("", "Test Achievement", "Test Description", "test_icon", 10, conditionFunc); - expect(achv.validate([ 5 ])).toBe(false); - expect(achv.validate([ 10 ])).toBe(true); + expect(achv.validate([5])).toBe(false); + expect(achv.validate([10])).toBe(true); expect(conditionFunc).toHaveBeenCalledTimes(2); }); }); @@ -140,10 +149,10 @@ describe("DamageAchv", () => { const damageAchv = new DamageAchv("", "Test Damage Achievement", 250, "damage_icon", 10); const numberHolder = new NumberHolder(200); - expect(damageAchv.validate([ numberHolder ])).toBe(false); + expect(damageAchv.validate([numberHolder])).toBe(false); numberHolder.value = 300; - expect(damageAchv.validate([ numberHolder ])).toBe(true); + expect(damageAchv.validate([numberHolder])).toBe(true); }); }); @@ -158,10 +167,10 @@ describe("HealAchv", () => { const healAchv = new HealAchv("", "Test Heal Achievement", 250, "heal_icon", 10); const numberHolder = new NumberHolder(200); - expect(healAchv.validate([ numberHolder ])).toBe(false); + expect(healAchv.validate([numberHolder])).toBe(false); numberHolder.value = 300; - expect(healAchv.validate([ numberHolder ])).toBe(true); + expect(healAchv.validate([numberHolder])).toBe(true); }); }); @@ -174,27 +183,41 @@ describe("LevelAchv", () => { it("should validate the achievement based on the level", () => { const levelAchv = new LevelAchv("", "Test Level Achievement", 100, "level_icon", 10); - const integerHolder = new IntegerHolder(50); + const integerHolder = new NumberHolder(50); - expect(levelAchv.validate([ integerHolder ])).toBe(false); + expect(levelAchv.validate([integerHolder])).toBe(false); integerHolder.value = 150; - expect(levelAchv.validate([ integerHolder ])).toBe(true); + expect(levelAchv.validate([integerHolder])).toBe(true); }); }); describe("ModifierAchv", () => { it("should create an instance of ModifierAchv", () => { - const modifierAchv = new ModifierAchv("", "Test Modifier Achievement", "Test Description", "modifier_icon", 10, () => true); + const modifierAchv = new ModifierAchv( + "", + "Test Modifier Achievement", + "Test Description", + "modifier_icon", + 10, + () => true, + ); expect(modifierAchv).toBeInstanceOf(ModifierAchv); expect(modifierAchv instanceof Achv).toBe(true); }); it("should validate the achievement based on the modifier function", () => { - const modifierAchv = new ModifierAchv("", "Test Modifier Achievement", "Test Description", "modifier_icon", 10, () => true); + const modifierAchv = new ModifierAchv( + "", + "Test Modifier Achievement", + "Test Description", + "modifier_icon", + 10, + () => true, + ); const modifier = new TurnHeldItemTransferModifier(null!, 3, 1); - expect(modifierAchv.validate([ modifier ])).toBe(true); + expect(modifierAchv.validate([modifier])).toBe(true); }); }); @@ -243,7 +266,6 @@ describe("achvs", () => { }); it("should initialize the achievements with IDs and parent IDs", () => { - expect(achvs._10K_MONEY.id).toBe("_10K_MONEY"); expect(achvs._10K_MONEY.hasParent).toBe(undefined); expect(achvs._100K_MONEY.id).toBe("_100K_MONEY"); diff --git a/src/test/arena/arena_gravity.test.ts b/test/arena/arena_gravity.test.ts similarity index 83% rename from src/test/arena/arena_gravity.test.ts rename to test/arena/arena_gravity.test.ts index 13e9c23a35c..a5ce84667f0 100644 --- a/src/test/arena/arena_gravity.test.ts +++ b/test/arena/arena_gravity.test.ts @@ -1,11 +1,11 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -27,7 +27,7 @@ describe("Arena - Gravity", () => { game = new GameManager(phaserGame); game.override .battleType("single") - .moveset([ Moves.TACKLE, Moves.GRAVITY, Moves.FISSURE ]) + .moveset([Moves.TACKLE, Moves.GRAVITY, Moves.FISSURE]) .ability(Abilities.UNNERVE) .enemyAbility(Abilities.BALL_FETCH) .enemySpecies(Species.SHUCKLE) @@ -43,7 +43,7 @@ describe("Arena - Gravity", () => { vi.spyOn(moveToCheck, "calculateBattleAccuracy"); // Setup Gravity on first turn - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.GRAVITY); await game.phaseInterceptor.to("TurnEndPhase"); @@ -64,7 +64,7 @@ describe("Arena - Gravity", () => { vi.spyOn(moveToCheck, "calculateBattleAccuracy"); // Setup Gravity on first turn - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.GRAVITY); await game.phaseInterceptor.to("TurnEndPhase"); @@ -80,11 +80,9 @@ describe("Arena - Gravity", () => { describe("Against flying types", () => { it("can be hit by ground-type moves now", async () => { - game.override - .enemySpecies(Species.PIDGEOT) - .moveset([ Moves.GRAVITY, Moves.EARTHQUAKE ]); + game.override.enemySpecies(Species.PIDGEOT).moveset([Moves.GRAVITY, Moves.EARTHQUAKE]); - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const pidgeot = game.scene.getEnemyPokemon()!; vi.spyOn(pidgeot, "getAttackTypeEffectiveness"); @@ -111,11 +109,9 @@ describe("Arena - Gravity", () => { }); it("keeps super-effective moves super-effective after using gravity", async () => { - game.override - .enemySpecies(Species.PIDGEOT) - .moveset([ Moves.GRAVITY, Moves.THUNDERBOLT ]); + game.override.enemySpecies(Species.PIDGEOT).moveset([Moves.GRAVITY, Moves.THUNDERBOLT]); - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const pidgeot = game.scene.getEnemyPokemon()!; vi.spyOn(pidgeot, "getAttackTypeEffectiveness"); @@ -136,12 +132,9 @@ describe("Arena - Gravity", () => { }); it("cancels Fly if its user is semi-invulnerable", async () => { - game.override - .enemySpecies(Species.SNORLAX) - .enemyMoveset(Moves.FLY) - .moveset([ Moves.GRAVITY, Moves.SPLASH ]); + game.override.enemySpecies(Species.SNORLAX).enemyMoveset(Moves.FLY).moveset([Moves.GRAVITY, Moves.SPLASH]); - await game.classicMode.startBattle([ Species.CHARIZARD ]); + await game.classicMode.startBattle([Species.CHARIZARD]); const charizard = game.scene.getPlayerPokemon()!; const snorlax = game.scene.getEnemyPokemon()!; @@ -152,7 +145,7 @@ describe("Arena - Gravity", () => { expect(snorlax.getTag(BattlerTagType.FLYING)).toBeDefined(); game.move.select(Moves.GRAVITY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(snorlax.getTag(BattlerTagType.INTERRUPTED)).toBeDefined(); diff --git a/src/test/arena/grassy_terrain.test.ts b/test/arena/grassy_terrain.test.ts similarity index 86% rename from src/test/arena/grassy_terrain.test.ts rename to test/arena/grassy_terrain.test.ts index ead4467925b..d92fb24be5a 100644 --- a/src/test/arena/grassy_terrain.test.ts +++ b/test/arena/grassy_terrain.test.ts @@ -1,8 +1,8 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,12 +28,12 @@ describe("Arena - Grassy Terrain", () => { .enemySpecies(Species.SHUCKLE) .enemyAbility(Abilities.STURDY) .enemyMoveset(Moves.FLY) - .moveset([ Moves.GRASSY_TERRAIN, Moves.EARTHQUAKE ]) + .moveset([Moves.GRASSY_TERRAIN, Moves.EARTHQUAKE]) .ability(Abilities.NO_GUARD); }); it("halves the damage of Earthquake", async () => { - await game.classicMode.startBattle([ Species.TAUROS ]); + await game.classicMode.startBattle([Species.TAUROS]); const eq = allMoves[Moves.EARTHQUAKE]; vi.spyOn(eq, "calculateBattlePower"); @@ -53,7 +53,7 @@ describe("Arena - Grassy Terrain", () => { }); it("Does not halve the damage of Earthquake if opponent is not grounded", async () => { - await game.classicMode.startBattle([ Species.NINJASK ]); + await game.classicMode.startBattle([Species.NINJASK]); const eq = allMoves[Moves.EARTHQUAKE]; vi.spyOn(eq, "calculateBattlePower"); diff --git a/src/test/arena/weather_fog.test.ts b/test/arena/weather_fog.test.ts similarity index 78% rename from src/test/arena/weather_fog.test.ts rename to test/arena/weather_fog.test.ts index 8c1fcb1e3a4..784c4886648 100644 --- a/src/test/arena/weather_fog.test.ts +++ b/test/arena/weather_fog.test.ts @@ -1,10 +1,10 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -24,14 +24,12 @@ describe("Weather - Fog", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override - .weather(WeatherType.FOG) - .battleType("single"); - game.override.moveset([ Moves.TACKLE ]); + game.override.weather(WeatherType.FOG).battleType("single"); + game.override.moveset([Moves.TACKLE]); game.override.ability(Abilities.BALL_FETCH); game.override.enemyAbility(Abilities.BALL_FETCH); game.override.enemySpecies(Species.MAGIKARP); - game.override.enemyMoveset([ Moves.SPLASH ]); + game.override.enemyMoveset([Moves.SPLASH]); }); it("move accuracy is multiplied by 90%", async () => { @@ -39,7 +37,7 @@ describe("Weather - Fog", () => { vi.spyOn(moveToCheck, "calculateBattleAccuracy"); - await game.startBattle([ Species.MAGIKARP ]); + await game.startBattle([Species.MAGIKARP]); game.move.select(Moves.TACKLE); await game.phaseInterceptor.to(MoveEffectPhase); diff --git a/src/test/arena/weather_hail.test.ts b/test/arena/weather_hail.test.ts similarity index 83% rename from src/test/arena/weather_hail.test.ts rename to test/arena/weather_hail.test.ts index 0b267550d75..7af2edf26f2 100644 --- a/src/test/arena/weather_hail.test.ts +++ b/test/arena/weather_hail.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -31,10 +31,10 @@ describe("Weather - Hail", () => { }); it("inflicts damage equal to 1/16 of Pokemon's max HP at turn end", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); @@ -44,11 +44,11 @@ describe("Weather - Hail", () => { }); it("does not inflict damage to a Pokemon that is underwater (Dive) or underground (Dig)", async () => { - game.override.moveset([ Moves.DIG ]); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + game.override.moveset([Moves.DIG]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.DIG); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); @@ -60,7 +60,7 @@ describe("Weather - Hail", () => { }); it("does not inflict damage to Ice type Pokemon", async () => { - await game.classicMode.startBattle([ Species.CLOYSTER ]); + await game.classicMode.startBattle([Species.CLOYSTER]); game.move.select(Moves.SPLASH); diff --git a/src/test/arena/weather_sandstorm.test.ts b/test/arena/weather_sandstorm.test.ts similarity index 88% rename from src/test/arena/weather_sandstorm.test.ts rename to test/arena/weather_sandstorm.test.ts index 17ccfdee94b..d43983c4c01 100644 --- a/src/test/arena/weather_sandstorm.test.ts +++ b/test/arena/weather_sandstorm.test.ts @@ -3,7 +3,7 @@ import { Stat } from "#app/enums/stat"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -32,7 +32,7 @@ describe("Weather - Sandstorm", () => { }); it("inflicts damage equal to 1/16 of Pokemon's max HP at turn end", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.SPLASH); @@ -44,8 +44,8 @@ describe("Weather - Sandstorm", () => { }); it("does not inflict damage to a Pokemon that is underwater (Dive) or underground (Dig)", async () => { - game.override.moveset([ Moves.DIVE ]); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + game.override.moveset([Moves.DIVE]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.DIVE); @@ -65,7 +65,7 @@ describe("Weather - Sandstorm", () => { .ability(Abilities.BALL_FETCH) .enemyAbility(Abilities.BALL_FETCH); - await game.classicMode.startBattle([ Species.ROCKRUFF, Species.KLINK ]); + await game.classicMode.startBattle([Species.ROCKRUFF, Species.KLINK]); game.move.select(Moves.SPLASH, 0); game.move.select(Moves.SPLASH, 1); @@ -78,7 +78,7 @@ describe("Weather - Sandstorm", () => { }); it("increases Rock type Pokemon Sp.Def by 50%", async () => { - await game.classicMode.startBattle([ Species.ROCKRUFF ]); + await game.classicMode.startBattle([Species.ROCKRUFF]); const playerPokemon = game.scene.getPlayerPokemon()!; const playerSpdef = playerPokemon.getStat(Stat.SPDEF); diff --git a/src/test/arena/weather_strong_winds.test.ts b/test/arena/weather_strong_winds.test.ts similarity index 85% rename from src/test/arena/weather_strong_winds.test.ts rename to test/arena/weather_strong_winds.test.ts index 557de93d644..3a9235d9eb9 100644 --- a/src/test/arena/weather_strong_winds.test.ts +++ b/test/arena/weather_strong_winds.test.ts @@ -1,10 +1,10 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { StatusEffect } from "#app/enums/status-effect"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -28,13 +28,13 @@ describe("Weather - Strong Winds", () => { game.override.startingLevel(10); game.override.enemySpecies(Species.TAILLOW); game.override.enemyAbility(Abilities.DELTA_STREAM); - game.override.moveset([ Moves.THUNDERBOLT, Moves.ICE_BEAM, Moves.ROCK_SLIDE ]); + game.override.moveset([Moves.THUNDERBOLT, Moves.ICE_BEAM, Moves.ROCK_SLIDE]); }); it("electric type move is not very effective on Rayquaza", async () => { game.override.enemySpecies(Species.RAYQUAZA); - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -45,7 +45,7 @@ describe("Weather - Strong Winds", () => { }); it("electric type move is neutral for flying type pokemon", async () => { - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -56,7 +56,7 @@ describe("Weather - Strong Winds", () => { }); it("ice type move is neutral for flying type pokemon", async () => { - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -67,7 +67,7 @@ describe("Weather - Strong Winds", () => { }); it("rock type move is neutral for flying type pokemon", async () => { - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -80,7 +80,7 @@ describe("Weather - Strong Winds", () => { it("weather goes away when last trainer pokemon dies to indirect damage", async () => { game.override.enemyStatusEffect(StatusEffect.POISON); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemy = game.scene.getEnemyPokemon()!; enemy.hp = 1; diff --git a/src/test/battle-scene.test.ts b/test/battle-scene.test.ts similarity index 93% rename from src/test/battle-scene.test.ts rename to test/battle-scene.test.ts index 4da75cea197..44f1364441b 100644 --- a/src/test/battle-scene.test.ts +++ b/test/battle-scene.test.ts @@ -1,6 +1,6 @@ import { LoadingScene } from "#app/loading-scene"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import GameManager from "./utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; describe("BattleScene", () => { let phaserGame: Phaser.Game; diff --git a/test/battle/ability_swap.test.ts b/test/battle/ability_swap.test.ts new file mode 100644 index 00000000000..b9c609e89f6 --- /dev/null +++ b/test/battle/ability_swap.test.ts @@ -0,0 +1,67 @@ +import { allAbilities } from "#app/data/ability"; +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Test Ability Swapping", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + 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(Moves.SPLASH); + }); + + it("should activate post-summon abilities", async () => { + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + game.scene.getPlayerPokemon()?.setTempAbility(allAbilities[Abilities.INTIMIDATE]); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should remove primal weather when the setter's ability is removed", async () => { + game.override.ability(Abilities.DESOLATE_LAND); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + game.scene.getPlayerPokemon()?.setTempAbility(allAbilities[Abilities.BALL_FETCH]); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.arena.weather?.weatherType).toBeUndefined(); + }); + + it("should not activate passive abilities", async () => { + game.override.passiveAbility(Abilities.INTREPID_SWORD); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SPLASH); + game.scene.getPlayerPokemon()?.setTempAbility(allAbilities[Abilities.BALL_FETCH]); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(1); // would be 2 if passive activated again + }); +}); diff --git a/src/test/battle/battle-order.test.ts b/test/battle/battle-order.test.ts similarity index 73% rename from src/test/battle/battle-order.test.ts rename to test/battle/battle-order.test.ts index d4e9950dec9..012f1ecd4bd 100644 --- a/src/test/battle/battle-order.test.ts +++ b/test/battle/battle-order.test.ts @@ -4,7 +4,7 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,18 +28,16 @@ describe("Battle order", () => { game.override.enemySpecies(Species.MEWTWO); game.override.enemyAbility(Abilities.INSOMNIA); game.override.ability(Abilities.INSOMNIA); - game.override.moveset([ Moves.TACKLE ]); + game.override.moveset([Moves.TACKLE]); }); it("opponent faster than player 50 vs 150", async () => { - await game.startBattle([ - Species.BULBASAUR, - ]); + await game.startBattle([Species.BULBASAUR]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; - vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 50 ]); // set playerPokemon's speed to 50 - vi.spyOn(enemyPokemon, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ]); // set enemyPokemon's speed to 150 + vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 50]); // set playerPokemon's speed to 50 + vi.spyOn(enemyPokemon, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150]); // set enemyPokemon's speed to 150 game.move.select(Moves.TACKLE); await game.phaseInterceptor.run(EnemyCommandPhase); @@ -53,14 +51,12 @@ describe("Battle order", () => { }, 20000); it("Player faster than opponent 150 vs 50", async () => { - await game.startBattle([ - Species.BULBASAUR, - ]); + await game.startBattle([Species.BULBASAUR]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; - vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ]); // set playerPokemon's speed to 150 - vi.spyOn(enemyPokemon, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 50 ]); // set enemyPokemon's speed to 50 + vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150]); // set playerPokemon's speed to 150 + vi.spyOn(enemyPokemon, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 50]); // set enemyPokemon's speed to 50 game.move.select(Moves.TACKLE); await game.phaseInterceptor.run(EnemyCommandPhase); @@ -75,16 +71,13 @@ describe("Battle order", () => { it("double - both opponents faster than player 50/50 vs 150/150", async () => { game.override.battleType("double"); - await game.startBattle([ - Species.BULBASAUR, - Species.BLASTOISE, - ]); + await game.startBattle([Species.BULBASAUR, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); - playerPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 50 ])); // set both playerPokemons' speed to 50 - enemyPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ])); // set both enemyPokemons' speed to 150 + playerPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 50])); // set both playerPokemons' speed to 50 + enemyPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150])); // set both enemyPokemons' speed to 150 const playerIndices = playerPokemon.map(p => p?.getBattlerIndex()); const enemyIndices = enemyPokemon.map(p => p?.getBattlerIndex()); @@ -102,16 +95,13 @@ describe("Battle order", () => { it("double - speed tie except 1 - 100/100 vs 100/150", async () => { game.override.battleType("double"); - await game.startBattle([ - Species.BULBASAUR, - Species.BLASTOISE, - ]); + await game.startBattle([Species.BULBASAUR, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); - playerPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 100 ])); //set both playerPokemons' speed to 100 - vi.spyOn(enemyPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 100 ]); // set enemyPokemon's speed to 100 - vi.spyOn(enemyPokemon[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ]); // set enemyPokemon's speed to 150 + playerPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 100])); //set both playerPokemons' speed to 100 + vi.spyOn(enemyPokemon[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 100]); // set enemyPokemon's speed to 100 + vi.spyOn(enemyPokemon[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150]); // set enemyPokemon's speed to 150 const playerIndices = playerPokemon.map(p => p?.getBattlerIndex()); const enemyIndices = enemyPokemon.map(p => p?.getBattlerIndex()); @@ -129,17 +119,14 @@ describe("Battle order", () => { it("double - speed tie 100/150 vs 100/150", async () => { game.override.battleType("double"); - await game.startBattle([ - Species.BULBASAUR, - Species.BLASTOISE, - ]); + await game.startBattle([Species.BULBASAUR, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); - vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 100 ]); // set one playerPokemon's speed to 100 - vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ]); // set other playerPokemon's speed to 150 - vi.spyOn(enemyPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 100 ]); // set one enemyPokemon's speed to 100 - vi.spyOn(enemyPokemon[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ]); // set other enemyPokemon's speed to 150 + vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 100]); // set one playerPokemon's speed to 100 + vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150]); // set other playerPokemon's speed to 150 + vi.spyOn(enemyPokemon[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 100]); // set one enemyPokemon's speed to 100 + vi.spyOn(enemyPokemon[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150]); // set other enemyPokemon's speed to 150 const playerIndices = playerPokemon.map(p => p?.getBattlerIndex()); const enemyIndices = enemyPokemon.map(p => p?.getBattlerIndex()); diff --git a/src/test/battle/battle.test.ts b/test/battle/battle.test.ts similarity index 82% rename from src/test/battle/battle.test.ts rename to test/battle/battle.test.ts index bd84cb2fd3b..36d197d1289 100644 --- a/src/test/battle/battle.test.ts +++ b/test/battle/battle.test.ts @@ -16,8 +16,8 @@ import { SwitchPhase } from "#app/phases/switch-phase"; import { TitlePhase } from "#app/phases/title-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { VictoryPhase } from "#app/phases/victory-phase"; -import GameManager from "#app/test/utils/gameManager"; -import { generateStarter } from "#app/test/utils/gameManagerUtils"; +import GameManager from "#test/testUtils/gameManager"; +import { generateStarter } from "#test/testUtils/gameManagerUtils"; import { Mode } from "#app/ui/ui"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; @@ -59,7 +59,6 @@ describe("Test Battle Phase", () => { await game.phaseInterceptor.run(TitlePhase); await game.waitMode(Mode.TITLE); - expect(game.scene.ui?.getMode()).toBe(Mode.TITLE); expect(game.scene.gameData.gender).toBe(PlayerGender.MALE); }, 20000); @@ -81,7 +80,6 @@ describe("Test Battle Phase", () => { await game.phaseInterceptor.run(TitlePhase); await game.waitMode(Mode.TITLE); - expect(game.scene.ui?.getMode()).toBe(Mode.TITLE); expect(game.scene.gameData.gender).toBe(PlayerGender.MALE); }, 20000); @@ -96,12 +94,10 @@ describe("Test Battle Phase", () => { game.override.starterSpecies(Species.MEWTWO); game.override.enemySpecies(Species.RATTATA); game.override.startingLevel(2000); - game.override - .startingWave(3) - .battleType("single"); - game.override.moveset([ Moves.TACKLE ]); + game.override.startingWave(3).battleType("single"); + game.override.moveset([Moves.TACKLE]); game.override.enemyAbility(Abilities.HYDRATION); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); await game.startBattle(); game.move.select(Moves.TACKLE); await game.phaseInterceptor.runFrom(EnemyCommandPhase).to(SelectModifierPhase, false); @@ -112,9 +108,9 @@ describe("Test Battle Phase", () => { game.override.enemySpecies(Species.RATTATA); game.override.startingLevel(5); game.override.startingWave(3); - game.override.moveset([ Moves.TACKLE ]); + game.override.moveset([Moves.TACKLE]); game.override.enemyAbility(Abilities.HYDRATION); - game.override.enemyMoveset([ Moves.TAIL_WHIP, Moves.TAIL_WHIP, Moves.TAIL_WHIP, Moves.TAIL_WHIP ]); + game.override.enemyMoveset([Moves.TAIL_WHIP, Moves.TAIL_WHIP, Moves.TAIL_WHIP, Moves.TAIL_WHIP]); game.override.battleType("single"); await game.startBattle(); game.move.select(Moves.TACKLE); @@ -122,8 +118,8 @@ describe("Test Battle Phase", () => { }, 20000); it("load 100% data file", async () => { - await game.importData("src/test/utils/saves/everything.prsv"); - const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => { + await game.importData("./test/testUtils/saves/everything.prsv"); + const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => { const species = game.scene.gameData.dexData[key]; return species.caughtAttr !== 0n; }).length; @@ -131,11 +127,7 @@ describe("Test Battle Phase", () => { }, 20000); it("start battle with selected team", async () => { - await game.startBattle([ - Species.CHARIZARD, - Species.CHANSEY, - Species.MEW - ]); + await game.startBattle([Species.CHARIZARD, Species.CHANSEY, Species.MEW]); expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.CHARIZARD); expect(game.scene.getPlayerParty()[1].species.speciesId).toBe(Species.CHANSEY); expect(game.scene.getPlayerParty()[2].species.speciesId).toBe(Species.MEW); @@ -150,7 +142,7 @@ describe("Test Battle Phase", () => { it("wrong phase", async () => { await game.phaseInterceptor.run(LoginPhase); - await game.phaseInterceptor.run(LoginPhase).catch((e) => { + await game.phaseInterceptor.run(LoginPhase).catch(e => { expect(e).toBe("Wrong phase: this is SelectGenderPhase and not LoginPhase"); }); }, 20000); @@ -162,29 +154,44 @@ describe("Test Battle Phase", () => { it("good run", async () => { await game.phaseInterceptor.run(LoginPhase); - game.onNextPrompt("SelectGenderPhase", Mode.OPTION_SELECT, () => { - game.scene.gameData.gender = PlayerGender.MALE; - game.endPhase(); - }, () => game.isCurrentPhase(TitlePhase)); + game.onNextPrompt( + "SelectGenderPhase", + Mode.OPTION_SELECT, + () => { + game.scene.gameData.gender = PlayerGender.MALE; + game.endPhase(); + }, + () => game.isCurrentPhase(TitlePhase), + ); await game.phaseInterceptor.run(SelectGenderPhase, () => game.isCurrentPhase(TitlePhase)); await game.phaseInterceptor.run(TitlePhase); }, 20000); it("good run from select gender to title", async () => { await game.phaseInterceptor.run(LoginPhase); - game.onNextPrompt("SelectGenderPhase", Mode.OPTION_SELECT, () => { - game.scene.gameData.gender = PlayerGender.MALE; - game.endPhase(); - }, () => game.isCurrentPhase(TitlePhase)); + game.onNextPrompt( + "SelectGenderPhase", + Mode.OPTION_SELECT, + () => { + game.scene.gameData.gender = PlayerGender.MALE; + game.endPhase(); + }, + () => game.isCurrentPhase(TitlePhase), + ); await game.phaseInterceptor.runFrom(SelectGenderPhase).to(TitlePhase); }, 20000); it("good run to SummonPhase phase", async () => { await game.phaseInterceptor.run(LoginPhase); - game.onNextPrompt("SelectGenderPhase", Mode.OPTION_SELECT, () => { - game.scene.gameData.gender = PlayerGender.MALE; - game.endPhase(); - }, () => game.isCurrentPhase(TitlePhase)); + game.onNextPrompt( + "SelectGenderPhase", + Mode.OPTION_SELECT, + () => { + game.scene.gameData.gender = PlayerGender.MALE; + game.endPhase(); + }, + () => game.isCurrentPhase(TitlePhase), + ); game.onNextPrompt("TitlePhase", Mode.TITLE, () => { game.scene.gameMode = getGameMode(GameModes.CLASSIC); const starters = generateStarter(game.scene); @@ -200,10 +207,7 @@ describe("Test Battle Phase", () => { game.override.enemySpecies(Species.MIGHTYENA); game.override.enemyAbility(Abilities.HYDRATION); game.override.ability(Abilities.HYDRATION); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - ]); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); @@ -213,9 +217,7 @@ describe("Test Battle Phase", () => { game.override.enemySpecies(Species.MIGHTYENA); game.override.enemyAbility(Abilities.HYDRATION); game.override.ability(Abilities.HYDRATION); - await game.startBattle([ - Species.BLASTOISE, - ]); + await game.startBattle([Species.BLASTOISE]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); @@ -226,10 +228,7 @@ describe("Test Battle Phase", () => { game.override.enemyAbility(Abilities.HYDRATION); game.override.ability(Abilities.HYDRATION); game.override.startingWave(3); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - ]); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); @@ -240,12 +239,7 @@ describe("Test Battle Phase", () => { game.override.enemyAbility(Abilities.HYDRATION); game.override.ability(Abilities.HYDRATION); game.override.startingWave(3); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - Species.DARKRAI, - Species.GABITE, - ]); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD, Species.DARKRAI, Species.GABITE]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); @@ -259,12 +253,9 @@ describe("Test Battle Phase", () => { game.override.ability(Abilities.ZEN_MODE); game.override.startingLevel(2000); game.override.startingWave(3); - game.override.moveset([ moveToUse ]); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); - await game.startBattle([ - Species.DARMANITAN, - Species.CHARIZARD, - ]); + game.override.moveset([moveToUse]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); + await game.startBattle([Species.DARMANITAN, Species.CHARIZARD]); game.move.select(moveToUse); await game.phaseInterceptor.to(DamageAnimPhase, false); @@ -282,8 +273,8 @@ describe("Test Battle Phase", () => { game.override.ability(Abilities.ZEN_MODE); game.override.startingLevel(2000); game.override.startingWave(3); - game.override.moveset([ moveToUse ]); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); + game.override.moveset([moveToUse]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); await game.startBattle(); const turn = game.scene.currentBattle.turn; game.move.select(moveToUse); @@ -302,8 +293,8 @@ describe("Test Battle Phase", () => { .startingLevel(2000) .startingWave(3) .startingBiome(Biome.LAKE) - .moveset([ moveToUse ]); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); + .moveset([moveToUse]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); await game.classicMode.startBattle(); const waveIndex = game.scene.currentBattle.waveIndex; game.move.select(moveToUse); @@ -323,7 +314,7 @@ describe("Test Battle Phase", () => { .enemySpecies(Species.RATTATA) .startingWave(1) .startingLevel(100) - .moveset([ moveToUse ]) + .moveset([moveToUse]) .enemyMoveset(Moves.SPLASH) .startingHeldItems([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }]); @@ -335,10 +326,14 @@ describe("Test Battle Phase", () => { game.doRevivePokemon(0); // pretend max revive was picked game.doSelectModifier(); - game.onNextPrompt("SwitchPhase", Mode.PARTY, () => { - expect.fail("Switch was forced"); - }, () => game.isCurrentPhase(NextEncounterPhase)); + game.onNextPrompt( + "SwitchPhase", + Mode.PARTY, + () => { + expect.fail("Switch was forced"); + }, + () => game.isCurrentPhase(NextEncounterPhase), + ); await game.phaseInterceptor.to(SwitchPhase); }, 20000); }); - diff --git a/src/test/battle/damage_calculation.test.ts b/test/battle/damage_calculation.test.ts similarity index 62% rename from src/test/battle/damage_calculation.test.ts rename to test/battle/damage_calculation.test.ts index e6aca828156..dab1fc81caa 100644 --- a/src/test/battle/damage_calculation.test.ts +++ b/test/battle/damage_calculation.test.ts @@ -1,9 +1,11 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; +import type { EnemyPersistentModifier } from "#app/modifier/modifier"; +import { modifierTypes } from "#app/modifier/modifier-type"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -31,11 +33,11 @@ describe("Battle Mechanics - Damage Calculation", () => { .startingLevel(100) .enemyLevel(100) .disableCrits() - .moveset([ Moves.TACKLE, Moves.DRAGON_RAGE, Moves.FISSURE, Moves.JUMP_KICK ]); + .moveset([Moves.TACKLE, Moves.DRAGON_RAGE, Moves.FISSURE, Moves.JUMP_KICK]); }); it("Tackle deals expected base damage", async () => { - await game.classicMode.startBattle([ Species.CHARIZARD ]); + await game.classicMode.startBattle([Species.CHARIZARD]); const playerPokemon = game.scene.getPlayerPokemon()!; vi.spyOn(playerPokemon, "getEffectiveStat").mockReturnValue(80); @@ -49,11 +51,9 @@ describe("Battle Mechanics - Damage Calculation", () => { }); it("Attacks deal 1 damage at minimum", async () => { - game.override - .startingLevel(1) - .enemySpecies(Species.AGGRON); + game.override.startingLevel(1).enemySpecies(Species.AGGRON); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const aggron = game.scene.getEnemyPokemon()!; @@ -65,12 +65,28 @@ describe("Battle Mechanics - Damage Calculation", () => { expect(aggron.hp).toBe(aggron.getMaxHp() - 1); }); - it("Fixed-damage moves ignore damage multipliers", async () => { - game.override - .enemySpecies(Species.DRAGONITE) - .enemyAbility(Abilities.MULTISCALE); + it("Attacks deal 1 damage at minimum even with many tokens", async () => { + game.override.startingLevel(1).enemySpecies(Species.AGGRON).enemyAbility(Abilities.STURDY).enemyLevel(10000); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.SHUCKLE]); + + const dmg_redux_modifier = modifierTypes.ENEMY_DAMAGE_REDUCTION().newModifier() as EnemyPersistentModifier; + dmg_redux_modifier.stackCount = 1000; + await game.scene.addEnemyModifier(modifierTypes.ENEMY_DAMAGE_REDUCTION().newModifier() as EnemyPersistentModifier); + + const aggron = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.TACKLE); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(aggron.hp).toBe(aggron.getMaxHp() - 1); + }); + + it("Fixed-damage moves ignore damage multipliers", async () => { + game.override.enemySpecies(Species.DRAGONITE).enemyAbility(Abilities.MULTISCALE); + + await game.classicMode.startBattle([Species.MAGIKARP]); const magikarp = game.scene.getPlayerPokemon()!; const dragonite = game.scene.getEnemyPokemon()!; @@ -79,11 +95,9 @@ describe("Battle Mechanics - Damage Calculation", () => { }); it("One-hit KO moves ignore damage multipliers", async () => { - game.override - .enemySpecies(Species.AGGRON) - .enemyAbility(Abilities.MULTISCALE); + game.override.enemySpecies(Species.AGGRON).enemyAbility(Abilities.MULTISCALE); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const magikarp = game.scene.getPlayerPokemon()!; const aggron = game.scene.getEnemyPokemon()!; @@ -92,11 +106,9 @@ describe("Battle Mechanics - Damage Calculation", () => { }); it("When the user fails to use Jump Kick with Wonder Guard ability, the damage should be 1.", async () => { - game.override - .enemySpecies(Species.GASTLY) - .ability(Abilities.WONDER_GUARD); + game.override.enemySpecies(Species.GASTLY).ability(Abilities.WONDER_GUARD); - await game.classicMode.startBattle([ Species.SHEDINJA ]); + await game.classicMode.startBattle([Species.SHEDINJA]); const shedinja = game.scene.getPlayerPokemon()!; @@ -107,15 +119,11 @@ describe("Battle Mechanics - Damage Calculation", () => { expect(shedinja.hp).toBe(shedinja.getMaxHp() - 1); }); - it("Charizard with odd HP survives Stealth Rock damage twice", async () => { game.scene.arena.addTag(ArenaTagType.STEALTH_ROCK, 1, Moves.STEALTH_ROCK, 0); - game.override - .seed("Charizard Stealth Rock test") - .enemySpecies(Species.CHARIZARD) - .enemyAbility(Abilities.BLAZE); + game.override.seed("Charizard Stealth Rock test").enemySpecies(Species.CHARIZARD).enemyAbility(Abilities.BLAZE); - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const charizard = game.scene.getEnemyPokemon()!; diff --git a/src/test/battle/double_battle.test.ts b/test/battle/double_battle.test.ts similarity index 92% rename from src/test/battle/double_battle.test.ts rename to test/battle/double_battle.test.ts index b48f2a96a5b..21d27573d22 100644 --- a/src/test/battle/double_battle.test.ts +++ b/test/battle/double_battle.test.ts @@ -6,7 +6,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -34,11 +34,7 @@ describe("Double Battles", () => { // (There were bugs that either only summon one when can summon two, player stuck in switchPhase etc) it("3v2 edge case: player summons 2 pokemon on the next battle after being fainted and revived", async () => { game.override.battleType("double").enemyMoveset(Moves.SPLASH).moveset(Moves.SPLASH); - await game.startBattle([ - Species.BULBASAUR, - Species.CHARIZARD, - Species.SQUIRTLE, - ]); + await game.startBattle([Species.BULBASAUR, Species.CHARIZARD, Species.SQUIRTLE]); game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); @@ -70,13 +66,14 @@ describe("Double Battles", () => { return rngSweepProgress * (max - min) + min; }); - game.override.enemyMoveset(Moves.SPLASH) + game.override + .enemyMoveset(Moves.SPLASH) .moveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) .ability(Abilities.BALL_FETCH); // Play through endless, waves 1 to 9, counting number of double battles from waves 2 to 9 - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); game.scene.gameMode = getGameMode(GameModes.ENDLESS); for (let i = 0; i < DOUBLE_CHANCE; i++) { diff --git a/src/test/battle/inverse_battle.test.ts b/test/battle/inverse_battle.test.ts similarity index 70% rename from src/test/battle/inverse_battle.test.ts rename to test/battle/inverse_battle.test.ts index 0bda678bbd3..83109c35740 100644 --- a/src/test/battle/inverse_battle.test.ts +++ b/test/battle/inverse_battle.test.ts @@ -1,16 +1,15 @@ import { BattlerIndex } from "#app/battle"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Challenges } from "#enums/challenges"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - describe("Inverse Battle", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -40,10 +39,7 @@ describe("Inverse Battle", () => { }); it("Immune types are 2x effective - Thunderbolt against Ground Type", async () => { - game.override - .moveset([ Moves.THUNDERBOLT ]) - .enemySpecies(Species.SANDSHREW); - + game.override.moveset([Moves.THUNDERBOLT]).enemySpecies(Species.SANDSHREW); await game.challengeMode.startBattle(); @@ -51,16 +47,14 @@ describe("Inverse Battle", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.THUNDERBOLT); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); }); it("2x effective types are 0.5x effective - Thunderbolt against Flying Type", async () => { - game.override - .moveset([ Moves.THUNDERBOLT ]) - .enemySpecies(Species.PIDGEY); + game.override.moveset([Moves.THUNDERBOLT]).enemySpecies(Species.PIDGEY); await game.challengeMode.startBattle(); @@ -68,16 +62,14 @@ describe("Inverse Battle", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.THUNDERBOLT); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(0.5); }); it("0.5x effective types are 2x effective - Thunderbolt against Electric Type", async () => { - game.override - .moveset([ Moves.THUNDERBOLT ]) - .enemySpecies(Species.CHIKORITA); + game.override.moveset([Moves.THUNDERBOLT]).enemySpecies(Species.CHIKORITA); await game.challengeMode.startBattle(); @@ -85,7 +77,7 @@ describe("Inverse Battle", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.THUNDERBOLT); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); @@ -93,9 +85,7 @@ describe("Inverse Battle", () => { it("Stealth Rock follows the inverse matchups - Stealth Rock against Charizard deals 1/32 of max HP", async () => { game.scene.arena.addTag(ArenaTagType.STEALTH_ROCK, 1, Moves.STEALTH_ROCK, 0); - game.override - .enemySpecies(Species.CHARIZARD) - .enemyLevel(100); + game.override.enemySpecies(Species.CHARIZARD).enemyLevel(100); await game.challengeMode.startBattle(); @@ -107,14 +97,17 @@ describe("Inverse Battle", () => { const currentHp = charizard.hp; const expectedHP = maxHp - damage_prediction; - console.log("Charizard's max HP: " + maxHp, "Damage: " + damage_prediction, "Current HP: " + currentHp, "Expected HP: " + expectedHP); - expect(currentHp).toBeGreaterThan(maxHp * 31 / 32 - 1); + console.log( + "Charizard's max HP: " + maxHp, + "Damage: " + damage_prediction, + "Current HP: " + currentHp, + "Expected HP: " + expectedHP, + ); + expect(currentHp).toBeGreaterThan((maxHp * 31) / 32 - 1); }); it("Freeze Dry is 2x effective against Water Type like other Ice type Move - Freeze Dry against Squirtle", async () => { - game.override - .moveset([ Moves.FREEZE_DRY ]) - .enemySpecies(Species.SQUIRTLE); + game.override.moveset([Moves.FREEZE_DRY]).enemySpecies(Species.SQUIRTLE); await game.challengeMode.startBattle(); @@ -122,39 +115,35 @@ describe("Inverse Battle", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); }); it("Water Absorb should heal against water moves - Water Absorb against Water gun", async () => { - game.override - .moveset([ Moves.WATER_GUN ]) - .enemyAbility(Abilities.WATER_ABSORB); + game.override.moveset([Moves.WATER_GUN]).enemyAbility(Abilities.WATER_ABSORB); await game.challengeMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; enemy.hp = enemy.getMaxHp() - 1; game.move.select(Moves.WATER_GUN); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.hp).toBe(enemy.getMaxHp()); }); it("Fire type does not get burned - Will-O-Wisp against Charmander", async () => { - game.override - .moveset([ Moves.WILL_O_WISP ]) - .enemySpecies(Species.CHARMANDER); + game.override.moveset([Moves.WILL_O_WISP]).enemySpecies(Species.CHARMANDER); await game.challengeMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.WILL_O_WISP); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); await game.phaseInterceptor.to("MoveEndPhase"); @@ -162,45 +151,36 @@ describe("Inverse Battle", () => { }); it("Electric type does not get paralyzed - Nuzzle against Pikachu", async () => { - game.override - .moveset([ Moves.NUZZLE ]) - .enemySpecies(Species.PIKACHU) - .enemyLevel(50); + game.override.moveset([Moves.NUZZLE]).enemySpecies(Species.PIKACHU).enemyLevel(50); await game.challengeMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.NUZZLE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.status?.effect).not.toBe(StatusEffect.PARALYSIS); }); it("Ground type is not immune to Thunder Wave - Thunder Wave against Sandshrew", async () => { - game.override - .moveset([ Moves.THUNDER_WAVE ]) - .enemySpecies(Species.SANDSHREW); + game.override.moveset([Moves.THUNDER_WAVE]).enemySpecies(Species.SANDSHREW); await game.challengeMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.THUNDER_WAVE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.status?.effect).toBe(StatusEffect.PARALYSIS); }); - it("Anticipation should trigger on 2x effective moves - Anticipation against Thunderbolt", async () => { - game.override - .moveset([ Moves.THUNDERBOLT ]) - .enemySpecies(Species.SANDSHREW) - .enemyAbility(Abilities.ANTICIPATION); + game.override.moveset([Moves.THUNDERBOLT]).enemySpecies(Species.SANDSHREW).enemyAbility(Abilities.ANTICIPATION); await game.challengeMode.startBattle(); @@ -209,25 +189,23 @@ describe("Inverse Battle", () => { it("Conversion 2 should change the type to the resistive type - Conversion 2 against Dragonite", async () => { game.override - .moveset([ Moves.CONVERSION_2 ]) - .enemyMoveset([ Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW ]); + .moveset([Moves.CONVERSION_2]) + .enemyMoveset([Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW]); await game.challengeMode.startBattle(); const player = game.scene.getPlayerPokemon()!; game.move.select(Moves.CONVERSION_2); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); - expect(player.getTypes()[0]).toBe(Type.DRAGON); + expect(player.getTypes()[0]).toBe(PokemonType.DRAGON); }); it("Flying Press should be 0.25x effective against Grass + Dark Type - Flying Press against Meowscarada", async () => { - game.override - .moveset([ Moves.FLYING_PRESS ]) - .enemySpecies(Species.MEOWSCARADA); + game.override.moveset([Moves.FLYING_PRESS]).enemySpecies(Species.MEOWSCARADA); await game.challengeMode.startBattle(); @@ -235,17 +213,14 @@ describe("Inverse Battle", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FLYING_PRESS); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(0.25); }); it("Scrappy ability has no effect - Tackle against Ghost Type still 2x effective with Scrappy", async () => { - game.override - .moveset([ Moves.TACKLE ]) - .ability(Abilities.SCRAPPY) - .enemySpecies(Species.GASTLY); + game.override.moveset([Moves.TACKLE]).ability(Abilities.SCRAPPY).enemySpecies(Species.GASTLY); await game.challengeMode.startBattle(); @@ -253,16 +228,14 @@ describe("Inverse Battle", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.TACKLE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); }); it("FORESIGHT has no effect - Tackle against Ghost Type still 2x effective with Foresight", async () => { - game.override - .moveset([ Moves.FORESIGHT, Moves.TACKLE ]) - .enemySpecies(Species.GASTLY); + game.override.moveset([Moves.FORESIGHT, Moves.TACKLE]).enemySpecies(Species.GASTLY); await game.challengeMode.startBattle(); @@ -270,11 +243,11 @@ describe("Inverse Battle", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FORESIGHT); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); game.move.select(Moves.TACKLE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); diff --git a/src/test/battle/special_battle.test.ts b/test/battle/special_battle.test.ts similarity index 52% rename from src/test/battle/special_battle.test.ts rename to test/battle/special_battle.test.ts index af9e3dddbec..cf7f3733484 100644 --- a/src/test/battle/special_battle.test.ts +++ b/test/battle/special_battle.test.ts @@ -3,7 +3,7 @@ import { Mode } from "#app/ui/ui"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -25,119 +25,72 @@ describe("Test Battle Phase", () => { game = new GameManager(phaserGame); game.override.enemySpecies(Species.RATTATA); game.override.startingLevel(2000); - game.override.moveset([ Moves.TACKLE ]); + game.override.moveset([Moves.TACKLE]); game.override.enemyAbility(Abilities.HYDRATION); game.override.ability(Abilities.HYDRATION); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); }); - it("startBattle 2vs1 boss", async() => { - game.override - .battleType("single") - .startingWave(10); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - ]); + it("startBattle 2vs1 boss", async () => { + game.override.battleType("single").startingWave(10); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); - it("startBattle 2vs2 boss", async() => { - game.override - .battleType("double") - .startingWave(10); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - ]); + it("startBattle 2vs2 boss", async () => { + game.override.battleType("double").startingWave(10); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); - it("startBattle 2vs2 trainer", async() => { - game.override - .battleType("double") - .startingWave(5); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - ]); + it("startBattle 2vs2 trainer", async () => { + game.override.battleType("double").startingWave(5); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); - it("startBattle 2vs1 trainer", async() => { - game.override - .battleType("single") - .startingWave(5); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - ]); + it("startBattle 2vs1 trainer", async () => { + game.override.battleType("single").startingWave(5); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); - it("startBattle 2vs1 rival", async() => { - game.override - .battleType("single") - .startingWave(8); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - ]); + it("startBattle 2vs1 rival", async () => { + game.override.battleType("single").startingWave(8); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); - it("startBattle 2vs2 rival", async() => { - game.override - .battleType("double") - .startingWave(8); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - ]); + it("startBattle 2vs2 rival", async () => { + game.override.battleType("double").startingWave(8); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); - it("startBattle 1vs1 trainer", async() => { - game.override - .battleType("single") - .startingWave(5); - await game.startBattle([ - Species.BLASTOISE, - ]); + it("startBattle 1vs1 trainer", async () => { + game.override.battleType("single").startingWave(5); + await game.startBattle([Species.BLASTOISE]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); - it("startBattle 2vs2 trainer", async() => { - game.override - .battleType("double") - .startingWave(5); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - ]); + it("startBattle 2vs2 trainer", async () => { + game.override.battleType("double").startingWave(5); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); - it("startBattle 4vs2 trainer", async() => { - game.override - .battleType("double") - .startingWave(5); - await game.startBattle([ - Species.BLASTOISE, - Species.CHARIZARD, - Species.DARKRAI, - Species.GABITE, - ]); + it("startBattle 4vs2 trainer", async () => { + game.override.battleType("double").startingWave(5); + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD, Species.DARKRAI, Species.GABITE]); expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); }); - diff --git a/src/test/battlerTags/octolock.test.ts b/test/battlerTags/octolock.test.ts similarity index 90% rename from src/test/battlerTags/octolock.test.ts rename to test/battlerTags/octolock.test.ts index 4bf0257af8f..6189bd7febe 100644 --- a/src/test/battlerTags/octolock.test.ts +++ b/test/battlerTags/octolock.test.ts @@ -3,7 +3,7 @@ import type Pokemon from "#app/field/pokemon"; import { BattlerTagLapseType, OctolockTag, TrappedTag } from "#app/data/battler-tags"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; describe("BattlerTag - OctolockTag", () => { describe("lapse behavior", () => { @@ -31,7 +31,7 @@ describe("BattlerTag - OctolockTag", () => { vi.spyOn(game.scene, "unshiftPhase").mockImplementation(phase => { expect(phase).toBeInstanceOf(StatStageChangePhase); expect((phase as StatStageChangePhase)["stages"]).toEqual(-1); - expect((phase as StatStageChangePhase)["stats"]).toEqual([ Stat.DEF, Stat.SPDEF ]); + expect((phase as StatStageChangePhase)["stats"]).toEqual([Stat.DEF, Stat.SPDEF]); }); subject.lapse(mockPokemon, BattlerTagLapseType.TURN_END); @@ -40,7 +40,7 @@ describe("BattlerTag - OctolockTag", () => { }); }); - it ("traps its target (extends TrappedTag)", async () => { + it("traps its target (extends TrappedTag)", async () => { expect(new OctolockTag(1)).toBeInstanceOf(TrappedTag); }); }); diff --git a/src/test/battlerTags/stockpiling.test.ts b/test/battlerTags/stockpiling.test.ts similarity index 90% rename from src/test/battlerTags/stockpiling.test.ts rename to test/battlerTags/stockpiling.test.ts index 13a4227853d..20fade13d92 100644 --- a/src/test/battlerTags/stockpiling.test.ts +++ b/test/battlerTags/stockpiling.test.ts @@ -4,7 +4,7 @@ import { PokemonSummonData } from "#app/field/pokemon"; import * as messages from "#app/messages"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; beforeEach(() => { @@ -39,9 +39,9 @@ describe("BattlerTag - StockpilingTag", () => { vi.spyOn(game.scene, "unshiftPhase").mockImplementation(phase => { expect(phase).toBeInstanceOf(StatStageChangePhase); expect((phase as StatStageChangePhase)["stages"]).toEqual(1); - expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ])); + expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF])); - (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [ Stat.DEF, Stat.SPDEF ], [ 1, 1 ]); + (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [Stat.DEF, Stat.SPDEF], [1, 1]); }); subject.onAdd(mockPokemon); @@ -65,9 +65,9 @@ describe("BattlerTag - StockpilingTag", () => { vi.spyOn(game.scene, "unshiftPhase").mockImplementation(phase => { expect(phase).toBeInstanceOf(StatStageChangePhase); expect((phase as StatStageChangePhase)["stages"]).toEqual(1); - expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ])); + expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF])); - (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [ Stat.DEF, Stat.SPDEF ], [ 1, 1 ]); + (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [Stat.DEF, Stat.SPDEF], [1, 1]); }); subject.onAdd(mockPokemon); @@ -89,9 +89,9 @@ describe("BattlerTag - StockpilingTag", () => { vi.spyOn(game.scene, "unshiftPhase").mockImplementation(phase => { expect(phase).toBeInstanceOf(StatStageChangePhase); expect((phase as StatStageChangePhase)["stages"]).toEqual(1); - expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ])); + expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF])); - (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [ Stat.DEF, Stat.SPDEF ], [ 1, 1 ]); + (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [Stat.DEF, Stat.SPDEF], [1, 1]); }); subject.onOverlap(mockPokemon); @@ -117,10 +117,10 @@ describe("BattlerTag - StockpilingTag", () => { vi.spyOn(game.scene, "unshiftPhase").mockImplementationOnce(phase => { expect(phase).toBeInstanceOf(StatStageChangePhase); expect((phase as StatStageChangePhase)["stages"]).toEqual(1); - expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ])); + expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF])); // def doesn't change - (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [ Stat.SPDEF ], [ 1 ]); + (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [Stat.SPDEF], [1]); }); subject.onAdd(mockPokemon); @@ -129,10 +129,10 @@ describe("BattlerTag - StockpilingTag", () => { vi.spyOn(game.scene, "unshiftPhase").mockImplementationOnce(phase => { expect(phase).toBeInstanceOf(StatStageChangePhase); expect((phase as StatStageChangePhase)["stages"]).toEqual(1); - expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ])); + expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF])); // def doesn't change - (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [ Stat.SPDEF ], [ 1 ]); + (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [Stat.SPDEF], [1]); }); subject.onOverlap(mockPokemon); @@ -141,7 +141,7 @@ describe("BattlerTag - StockpilingTag", () => { vi.spyOn(game.scene, "unshiftPhase").mockImplementationOnce(phase => { expect(phase).toBeInstanceOf(StatStageChangePhase); expect((phase as StatStageChangePhase)["stages"]).toEqual(1); - expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ])); + expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF])); // neither stat changes, stack count should still increase }); @@ -156,13 +156,16 @@ describe("BattlerTag - StockpilingTag", () => { // fourth stack should not be applied subject.onOverlap(mockPokemon); expect(subject.stockpiledCount).toBe(3); - expect(subject.statChangeCounts).toMatchObject({ [Stat.DEF]: 0, [Stat.SPDEF]: 2 }); + expect(subject.statChangeCounts).toMatchObject({ + [Stat.DEF]: 0, + [Stat.SPDEF]: 2, + }); // removing tag should reverse stat changes vi.spyOn(game.scene, "unshiftPhase").mockImplementationOnce(phase => { expect(phase).toBeInstanceOf(StatStageChangePhase); expect((phase as StatStageChangePhase)["stages"]).toEqual(-2); - expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.SPDEF ])); + expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.SPDEF])); }); subject.onRemove(mockPokemon); diff --git a/test/battlerTags/substitute.test.ts b/test/battlerTags/substitute.test.ts new file mode 100644 index 00000000000..e80453d2933 --- /dev/null +++ b/test/battlerTags/substitute.test.ts @@ -0,0 +1,210 @@ +import { beforeEach, describe, expect, it, vi } from "vitest"; +import type { PokemonTurnData, TurnMove, PokemonMove } from "#app/field/pokemon"; +import type Pokemon from "#app/field/pokemon"; +import { MoveResult } from "#app/field/pokemon"; +import BattleScene from "#app/battle-scene"; +import { BattlerTagLapseType, BindTag, SubstituteTag } from "#app/data/battler-tags"; +import { Moves } from "#app/enums/moves"; +import { PokemonAnimType } from "#app/enums/pokemon-anim-type"; +import * as messages from "#app/messages"; +import { allMoves } from "#app/data/moves/move"; +import type { MoveEffectPhase } from "#app/phases/move-effect-phase"; + +describe("BattlerTag - SubstituteTag", () => { + let mockPokemon: Pokemon; + + describe("onAdd behavior", () => { + beforeEach(() => { + mockPokemon = { + scene: new BattleScene(), + hp: 101, + id: 0, + getMaxHp: vi.fn().mockReturnValue(101) as Pokemon["getMaxHp"], + findAndRemoveTags: vi.fn().mockImplementation(tagFilter => { + // simulate a Trapped tag set by another Pokemon, then expect the filter to catch it. + const trapTag = new BindTag(5, 0); + expect(tagFilter(trapTag)).toBeTruthy(); + return true; + }) as Pokemon["findAndRemoveTags"], + } as unknown as Pokemon; + + vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue(""); + vi.spyOn(mockPokemon.scene as BattleScene, "getPokemonById").mockImplementation(pokemonId => + mockPokemon.id === pokemonId ? mockPokemon : null, + ); + }); + + it("sets the tag's HP to 1/4 of the source's max HP (rounded down)", async () => { + const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); + + vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true); + vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); + + subject.onAdd(mockPokemon); + + expect(subject.hp).toBe(25); + }); + + it("triggers on-add effects that bring the source out of focus", async () => { + const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); + + vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation( + (_pokemon, battleAnimType, _fieldAssets?, _delayed?) => { + expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_ADD); + return true; + }, + ); + + vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); + + subject.onAdd(mockPokemon); + + expect(subject.sourceInFocus).toBeFalsy(); + expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1); + expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1); + }); + + it("removes effects that trap the source", async () => { + const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); + + vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); + + subject.onAdd(mockPokemon); + expect(mockPokemon.findAndRemoveTags).toHaveBeenCalledTimes(1); + }); + }); + + describe("onRemove behavior", () => { + beforeEach(() => { + mockPokemon = { + scene: new BattleScene(), + hp: 101, + id: 0, + isFainted: vi.fn().mockReturnValue(false) as Pokemon["isFainted"], + } as unknown as Pokemon; + + vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue(""); + }); + + it("triggers on-remove animation and message", async () => { + const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); + subject.sourceInFocus = false; + + vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation( + (_pokemon, battleAnimType, _fieldAssets?, _delayed?) => { + expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_REMOVE); + return true; + }, + ); + + vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); + + subject.onRemove(mockPokemon); + + expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1); + expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1); + }); + }); + + describe("lapse behavior", () => { + beforeEach(() => { + mockPokemon = { + scene: new BattleScene(), + hp: 101, + id: 0, + turnData: { acted: true } as PokemonTurnData, + getLastXMoves: vi + .fn() + .mockReturnValue([ + { move: Moves.TACKLE, result: MoveResult.SUCCESS } as TurnMove, + ]) as Pokemon["getLastXMoves"], + } as unknown as Pokemon; + + vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue(""); + }); + + it("PRE_MOVE lapse triggers pre-move animation", async () => { + const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); + + vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation( + (_pokemon, battleAnimType, _fieldAssets?, _delayed?) => { + expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_PRE_MOVE); + return true; + }, + ); + + vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); + + expect(subject.lapse(mockPokemon, BattlerTagLapseType.PRE_MOVE)).toBeTruthy(); + + expect(subject.sourceInFocus).toBeTruthy(); + expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1); + expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled(); + }); + + it("AFTER_MOVE lapse triggers post-move animation", async () => { + const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); + + vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation( + (_pokemon, battleAnimType, _fieldAssets?, _delayed?) => { + expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_POST_MOVE); + return true; + }, + ); + + vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); + + expect(subject.lapse(mockPokemon, BattlerTagLapseType.AFTER_MOVE)).toBeTruthy(); + + expect(subject.sourceInFocus).toBeFalsy(); + expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1); + expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled(); + }); + + // TODO: Figure out how to mock a MoveEffectPhase correctly for this test + it.todo("HIT lapse triggers on-hit message", async () => { + const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); + + vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true); + vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); + + const pokemonMove = { + getMove: vi.fn().mockReturnValue(allMoves[Moves.TACKLE]) as PokemonMove["getMove"], + } as PokemonMove; + + const moveEffectPhase = { + move: pokemonMove, + getUserPokemon: vi.fn().mockReturnValue(undefined) as MoveEffectPhase["getUserPokemon"], + } as MoveEffectPhase; + + vi.spyOn(mockPokemon.scene as BattleScene, "getCurrentPhase").mockReturnValue(moveEffectPhase); + vi.spyOn(allMoves[Moves.TACKLE], "hitsSubstitute").mockReturnValue(true); + + expect(subject.lapse(mockPokemon, BattlerTagLapseType.HIT)).toBeTruthy(); + + expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).not.toHaveBeenCalled(); + expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1); + }); + + it("CUSTOM lapse flags the tag for removal", async () => { + const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); + + vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true); + vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); + + expect(subject.lapse(mockPokemon, BattlerTagLapseType.CUSTOM)).toBeFalsy(); + }); + + it("Unsupported lapse type does nothing", async () => { + const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id); + + vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true); + vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue(); + + expect(subject.lapse(mockPokemon, BattlerTagLapseType.TURN_END)).toBeTruthy(); + + expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).not.toHaveBeenCalled(); + expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled(); + }); + }); +}); diff --git a/src/test/boss-pokemon.test.ts b/test/boss-pokemon.test.ts similarity index 91% rename from src/test/boss-pokemon.test.ts rename to test/boss-pokemon.test.ts index 389b42a2963..6b150de2d2b 100644 --- a/src/test/boss-pokemon.test.ts +++ b/test/boss-pokemon.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import GameManager from "./utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#app/enums/species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { Abilities } from "#app/enums/abilities"; @@ -33,7 +33,7 @@ describe("Boss Pokemon / Shields", () => { .enemyMoveset(Moves.SPLASH) .enemyHeldItems([]) .startingLevel(1000) - .moveset([ Moves.FALSE_SWIPE, Moves.SUPER_FANG, Moves.SPLASH, Moves.PSYCHIC ]) + .moveset([Moves.FALSE_SWIPE, Moves.SUPER_FANG, Moves.SPLASH, Moves.PSYCHIC]) .ability(Abilities.NO_GUARD); }); @@ -63,11 +63,9 @@ describe("Boss Pokemon / Shields", () => { }); it("should reduce the number of shields if we are in a double battle", async () => { - game.override - .battleType("double") - .startingWave(150); // Floor 150 > 2 shields / 3 health segments + game.override.battleType("double").startingWave(150); // Floor 150 > 2 shields / 3 health segments - await game.classicMode.startBattle([ Species.MEWTWO ]); + await game.classicMode.startBattle([Species.MEWTWO]); const boss1: EnemyPokemon = game.scene.getEnemyParty()[0]!; const boss2: EnemyPokemon = game.scene.getEnemyParty()[1]!; @@ -80,7 +78,7 @@ describe("Boss Pokemon / Shields", () => { it("shields should stop overflow damage and give stat stage boosts when broken", async () => { game.override.startingWave(150); // Floor 150 > 2 shields / 3 health segments - await game.classicMode.startBattle([ Species.MEWTWO ]); + await game.classicMode.startBattle([Species.MEWTWO]); const enemyPokemon = game.scene.getEnemyPokemon()!; const segmentHp = enemyPokemon.getMaxHp() / enemyPokemon.bossSegments; @@ -104,15 +102,12 @@ describe("Boss Pokemon / Shields", () => { expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - toDmgValue(2 * segmentHp)); // Breaking the last shield gives a +2 boost to ATK, DEF, SP ATK, SP DEF or SPD expect(getTotalStatStageBoosts(enemyPokemon)).toBe(3); - }); it("breaking multiple shields at once requires extra damage", async () => { - game.override - .battleType("double") - .enemyHealthSegments(5); + game.override.battleType("double").enemyHealthSegments(5); - await game.classicMode.startBattle([ Species.MEWTWO ]); + await game.classicMode.startBattle([Species.MEWTWO]); // In this test we want to break through 3 shields at once const brokenShields = 3; @@ -140,17 +135,14 @@ describe("Boss Pokemon / Shields", () => { boss2.damageAndUpdate(Math.ceil(requiredDamageBoss2)); expect(boss2.bossSegmentIndex).toBe(0); expect(boss2.hp).toBe(boss2.getMaxHp() - toDmgValue(boss2SegmentHp * 4)); - }); it("the number of stat stage boosts is consistent when several shields are broken at once", async () => { const shieldsToBreak = 4; - game.override - .battleType("double") - .enemyHealthSegments(shieldsToBreak + 1); + game.override.battleType("double").enemyHealthSegments(shieldsToBreak + 1); - await game.classicMode.startBattle([ Species.MEWTWO ]); + await game.classicMode.startBattle([Species.MEWTWO]); const boss1: EnemyPokemon = game.scene.getEnemyParty()[0]!; const boss1SegmentHp = boss1.getMaxHp() / boss1.bossSegments; @@ -160,7 +152,6 @@ describe("Boss Pokemon / Shields", () => { expect(boss1.bossSegmentIndex).toBe(shieldsToBreak); expect(getTotalStatStageBoosts(boss1)).toBe(0); - let totalStatStages = 0; // Break the shields one by one @@ -193,15 +184,12 @@ describe("Boss Pokemon / Shields", () => { game.move.select(Moves.SPLASH); await game.toNextTurn(); expect(getTotalStatStageBoosts(boss2)).toBe(totalStatStages); - }); it("the boss enduring does not proc an extra stat boost", async () => { - game.override - .enemyHealthSegments(2) - .enemyAbility(Abilities.STURDY); + game.override.enemyHealthSegments(2).enemyAbility(Abilities.STURDY); - await game.classicMode.startBattle([ Species.MEWTWO ]); + await game.classicMode.startBattle([Species.MEWTWO]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon.isBoss()).toBe(true); @@ -215,7 +203,6 @@ describe("Boss Pokemon / Shields", () => { expect(enemyPokemon.bossSegmentIndex).toBe(0); expect(enemyPokemon.hp).toBe(1); expect(getTotalStatStageBoosts(enemyPokemon)).toBe(1); - }); /** @@ -231,4 +218,3 @@ describe("Boss Pokemon / Shields", () => { return boosts; } }); - diff --git a/src/test/daily_mode.test.ts b/test/daily_mode.test.ts similarity index 85% rename from src/test/daily_mode.test.ts rename to test/daily_mode.test.ts index 3e70cc2d8a7..c530fca61a6 100644 --- a/src/test/daily_mode.test.ts +++ b/test/daily_mode.test.ts @@ -6,7 +6,7 @@ import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { Species } from "#enums/species"; import { Mode } from "#app/ui/ui"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; //const TIMEOUT = 20 * 1000; @@ -34,7 +34,7 @@ describe("Daily Mode", () => { const party = game.scene.getPlayerParty(); expect(party).toHaveLength(3); - party.forEach((pkm) => { + party.forEach(pkm => { expect(pkm.level).toBe(20); expect(pkm.moveset.length).toBeGreaterThan(0); }); @@ -60,11 +60,9 @@ describe("Shop modifications", async () => { .battleType("single") .startingLevel(100) // Avoid levelling up .disableTrainerWaves() - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .enemyMoveset(Moves.SPLASH); - game.modifiers - .addCheck("EVIOLITE") - .addCheck("MINI_BLACK_HOLE"); + game.modifiers.addCheck("EVIOLITE").addCheck("MINI_BLACK_HOLE"); vi.spyOn(pokerogueApi.daily, "getSeed").mockResolvedValue("test-seed"); }); @@ -74,15 +72,13 @@ describe("Shop modifications", async () => { }); it("should not have Eviolite and Mini Black Hole available in Classic if not unlocked", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); game.move.select(Moves.SPLASH); await game.doKillOpponents(); await game.phaseInterceptor.to("BattleEndPhase"); game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => { expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler); - game.modifiers - .testCheck("EVIOLITE", false) - .testCheck("MINI_BLACK_HOLE", false); + game.modifiers.testCheck("EVIOLITE", false).testCheck("MINI_BLACK_HOLE", false); }); }); @@ -93,9 +89,7 @@ describe("Shop modifications", async () => { await game.phaseInterceptor.to("BattleEndPhase"); game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => { expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler); - game.modifiers - .testCheck("EVIOLITE", true) - .testCheck("MINI_BLACK_HOLE", true); + game.modifiers.testCheck("EVIOLITE", true).testCheck("MINI_BLACK_HOLE", true); }); }); }); diff --git a/src/test/data/splash_messages.test.ts b/test/data/splash_messages.test.ts similarity index 89% rename from src/test/data/splash_messages.test.ts rename to test/data/splash_messages.test.ts index b9ed5b9d365..8ae13366670 100644 --- a/src/test/data/splash_messages.test.ts +++ b/test/data/splash_messages.test.ts @@ -9,7 +9,7 @@ describe("Data - Splash Messages", () => { // make sure to adjust this test if the weight it changed! it("should add contain 10 `battlesWon` splash messages", () => { - const battlesWonMessages = getSplashMessages().filter((message) => message === "splashMessages:battlesWon"); + const battlesWonMessages = getSplashMessages().filter(message => message === "splashMessages:battlesWon"); expect(battlesWonMessages).toHaveLength(10); }); @@ -51,8 +51,8 @@ function testSeason(startDate: Date, endDate: Date, prefix: string) { const afterDate = new Date(endDate); afterDate.setDate(endDate.getDate() + 1); - const dates: Date[] = [ beforeDate, startDate, endDate, afterDate ]; - const [ before, start, end, after ] = dates.map((date) => { + const dates: Date[] = [beforeDate, startDate, endDate, afterDate]; + const [before, start, end, after] = dates.map(date => { vi.setSystemTime(date); console.log("System time set to", date); const count = getSplashMessages().filter(filterFn).length; diff --git a/src/test/data/status_effect.test.ts b/test/data/status_effect.test.ts similarity index 96% rename from src/test/data/status_effect.test.ts rename to test/data/status_effect.test.ts index 7948549b8e8..61dafc1c9b8 100644 --- a/src/test/data/status_effect.test.ts +++ b/test/data/status_effect.test.ts @@ -11,8 +11,8 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; -import { mockI18next } from "#test/utils/testUtils"; +import GameManager from "#test/testUtils/gameManager"; +import { mockI18next } from "#test/testUtils/testUtils"; import i18next from "i18next"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -20,8 +20,8 @@ const pokemonName = "PKM"; const sourceText = "SOURCE"; describe("Status Effect Messages", () => { - beforeAll(() => { - i18next.init(); + beforeAll(async () => { + await i18next.init(); }); describe("NONE", () => { @@ -328,13 +328,13 @@ describe("Status Effects", () => { .enemySpecies(Species.MAGIKARP) .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) - .moveset([ Moves.QUICK_ATTACK ]) + .moveset([Moves.QUICK_ATTACK]) .ability(Abilities.BALL_FETCH) .statusEffect(StatusEffect.PARALYSIS); }); it("causes the pokemon's move to fail when activated", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.QUICK_ATTACK); await game.move.forceStatusActivation(true); @@ -362,7 +362,7 @@ describe("Status Effects", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -372,7 +372,7 @@ describe("Status Effects", () => { }); it("should last the appropriate number of turns", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const player = game.scene.getPlayerPokemon()!; player.status = new Status(StatusEffect.SLEEP, 0, 4); @@ -418,7 +418,7 @@ describe("Status Effects", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -429,7 +429,7 @@ describe("Status Effects", () => { }); it("should not inflict a 0 HP mon with a status", async () => { - await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]); const player = game.scene.getPlayerPokemon()!; player.hp = 0; diff --git a/src/test/eggs/egg.test.ts b/test/eggs/egg.test.ts similarity index 74% rename from src/test/eggs/egg.test.ts rename to test/eggs/egg.test.ts index 3394771d84a..8875300780b 100644 --- a/src/test/eggs/egg.test.ts +++ b/test/eggs/egg.test.ts @@ -7,14 +7,14 @@ import { VariantTier } from "#app/enums/variant-tier"; import EggData from "#app/system/egg-data"; import * as Utils from "#app/utils"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Egg Generation Tests", () => { let phaserGame: Phaser.Game; let game: GameManager; - const EGG_HATCH_COUNT: integer = 1000; + const EGG_HATCH_COUNT: number = 1000; beforeAll(() => { phaserGame = new Phaser.Game({ @@ -29,7 +29,7 @@ describe("Egg Generation Tests", () => { }); beforeEach(async () => { - await game.importData("src/test/utils/saves/everything.prsv"); + await game.importData("./test/testUtils/saves/everything.prsv"); }); it("should return Kyogre for the 10th of June", () => { @@ -55,7 +55,12 @@ describe("Egg Generation Tests", () => { let gachaSpeciesCount = 0; for (let i = 0; i < EGG_HATCH_COUNT; i++) { - const result = new Egg({ scene, timestamp, sourceType: EggSourceType.GACHA_LEGENDARY, tier: EggTier.LEGENDARY }).generatePlayerPokemon().species.speciesId; + const result = new Egg({ + scene, + timestamp, + sourceType: EggSourceType.GACHA_LEGENDARY, + tier: EggTier.LEGENDARY, + }).generatePlayerPokemon().species.speciesId; if (result === expectedSpecies) { gachaSpeciesCount++; } @@ -74,7 +79,10 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const expectedSpecies = Species.ARCEUS; - const result = new Egg({ scene, species: expectedSpecies }).generatePlayerPokemon().species.speciesId; + const result = new Egg({ + scene, + species: expectedSpecies, + }).generatePlayerPokemon().species.speciesId; expect(result).toBe(expectedSpecies); }); @@ -122,7 +130,11 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const expectedResult = true; - const result = new Egg({ scene, tier: EggTier.COMMON, id: 204 }).isManaphyEgg(); + const result = new Egg({ + scene, + tier: EggTier.COMMON, + id: 204, + }).isManaphyEgg(); expect(result).toBe(expectedResult); }); @@ -138,7 +150,13 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const expectedResult = true; - const result = new Egg({ scene, isShiny: expectedResult, species: Species.BULBASAUR }).generatePlayerPokemon().isShiny(); + const result = new Egg({ + scene, + isShiny: expectedResult, + species: Species.BULBASAUR, + }) + .generatePlayerPokemon() + .isShiny(); expect(result).toBe(expectedResult); }); @@ -146,7 +164,12 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const expectedVariantTier = VariantTier.STANDARD; - const result = new Egg({ scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR }).generatePlayerPokemon().variant; + const result = new Egg({ + scene, + isShiny: true, + variantTier: expectedVariantTier, + species: Species.BULBASAUR, + }).generatePlayerPokemon().variant; expect(result).toBe(expectedVariantTier); }); @@ -154,7 +177,12 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const expectedVariantTier = VariantTier.RARE; - const result = new Egg({ scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR }).generatePlayerPokemon().variant; + const result = new Egg({ + scene, + isShiny: true, + variantTier: expectedVariantTier, + species: Species.BULBASAUR, + }).generatePlayerPokemon().variant; expect(result).toBe(expectedVariantTier); }); @@ -162,7 +190,12 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const expectedVariantTier = VariantTier.EPIC; - const result = new Egg({ scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR }).generatePlayerPokemon().variant; + const result = new Egg({ + scene, + isShiny: true, + variantTier: expectedVariantTier, + species: Species.BULBASAUR, + }).generatePlayerPokemon().variant; expect(result).toBe(expectedVariantTier); }); @@ -185,7 +218,11 @@ describe("Egg Generation Tests", () => { it("should return a hatched pokemon with a hidden ability", () => { const scene = game.scene; - const playerPokemon = new Egg({ scene, overrideHiddenAbility: true, species: Species.BULBASAUR }).generatePlayerPokemon(); + const playerPokemon = new Egg({ + scene, + overrideHiddenAbility: true, + species: Species.BULBASAUR, + }).generatePlayerPokemon(); const expectedAbilityIndex = playerPokemon.species.ability2 ? 2 : 1; const result = playerPokemon.abilityIndex; @@ -206,7 +243,11 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const expectedEggTier = EggTier.COMMON; - const result = new Egg({ scene, tier: EggTier.LEGENDARY, species: Species.BULBASAUR }).tier; + const result = new Egg({ + scene, + tier: EggTier.LEGENDARY, + species: Species.BULBASAUR, + }).tier; expect(result).toBe(expectedEggTier); }); @@ -214,7 +255,11 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const expectedHatchWaves = 10; - const result = new Egg({ scene, tier: EggTier.LEGENDARY, species: Species.BULBASAUR }).hatchWaves; + const result = new Egg({ + scene, + tier: EggTier.LEGENDARY, + species: Species.BULBASAUR, + }).hatchWaves; expect(result).toBe(expectedHatchWaves); }); @@ -243,9 +288,14 @@ describe("Egg Generation Tests", () => { }); it("should increase egg pity", () => { const scene = game.scene; - const startPityValues = [ ...scene.gameData.eggPity ]; + const startPityValues = [...scene.gameData.eggPity]; - new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.COMMON }); + new Egg({ + scene, + sourceType: EggSourceType.GACHA_MOVE, + pulled: true, + tier: EggTier.COMMON, + }); expect(scene.gameData.eggPity[EggTier.RARE]).toBe(startPityValues[EggTier.RARE] + 1); expect(scene.gameData.eggPity[EggTier.EPIC]).toBe(startPityValues[EggTier.EPIC] + 1); @@ -253,9 +303,14 @@ describe("Egg Generation Tests", () => { }); it("should increase legendary egg pity by two", () => { const scene = game.scene; - const startPityValues = [ ...scene.gameData.eggPity ]; + const startPityValues = [...scene.gameData.eggPity]; - new Egg({ scene, sourceType: EggSourceType.GACHA_LEGENDARY, pulled: true, tier: EggTier.COMMON }); + new Egg({ + scene, + sourceType: EggSourceType.GACHA_LEGENDARY, + pulled: true, + tier: EggTier.COMMON, + }); expect(scene.gameData.eggPity[EggTier.RARE]).toBe(startPityValues[EggTier.RARE] + 1); expect(scene.gameData.eggPity[EggTier.EPIC]).toBe(startPityValues[EggTier.EPIC] + 1); @@ -266,7 +321,12 @@ describe("Egg Generation Tests", () => { const startingManaphyEggCount = scene.gameData.gameStats.manaphyEggsPulled; for (let i = 0; i < 200; i++) { - new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, species: Species.BULBASAUR }); + new Egg({ + scene, + sourceType: EggSourceType.GACHA_MOVE, + pulled: true, + species: Species.BULBASAUR, + }); } expect(scene.gameData.gameStats.manaphyEggsPulled).toBe(startingManaphyEggCount); @@ -275,7 +335,13 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const startingManaphyEggCount = scene.gameData.gameStats.manaphyEggsPulled; - new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, id: 204, tier: EggTier.COMMON }); + new Egg({ + scene, + sourceType: EggSourceType.GACHA_MOVE, + pulled: true, + id: 204, + tier: EggTier.COMMON, + }); expect(scene.gameData.gameStats.manaphyEggsPulled).toBe(startingManaphyEggCount + 1); }); @@ -283,7 +349,12 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const startingRareEggsPulled = scene.gameData.gameStats.rareEggsPulled; - new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.RARE }); + new Egg({ + scene, + sourceType: EggSourceType.GACHA_MOVE, + pulled: true, + tier: EggTier.RARE, + }); expect(scene.gameData.gameStats.rareEggsPulled).toBe(startingRareEggsPulled + 1); }); @@ -291,7 +362,12 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const startingEpicEggsPulled = scene.gameData.gameStats.epicEggsPulled; - new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.EPIC }); + new Egg({ + scene, + sourceType: EggSourceType.GACHA_MOVE, + pulled: true, + tier: EggTier.EPIC, + }); expect(scene.gameData.gameStats.epicEggsPulled).toBe(startingEpicEggsPulled + 1); }); @@ -299,7 +375,12 @@ describe("Egg Generation Tests", () => { const scene = game.scene; const startingLegendaryEggsPulled = scene.gameData.gameStats.legendaryEggsPulled; - new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.LEGENDARY }); + new Egg({ + scene, + sourceType: EggSourceType.GACHA_MOVE, + pulled: true, + tier: EggTier.LEGENDARY, + }); expect(scene.gameData.gameStats.legendaryEggsPulled).toBe(startingLegendaryEggsPulled + 1); }); @@ -310,8 +391,16 @@ describe("Egg Generation Tests", () => { const expectedTier1 = EggTier.LEGENDARY; const expectedTier2 = EggTier.EPIC; - const result1 = new Egg({ scene, sourceType: EggSourceType.GACHA_LEGENDARY, pulled: true }).tier; - const result2 = new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true }).tier; + const result1 = new Egg({ + scene, + sourceType: EggSourceType.GACHA_LEGENDARY, + pulled: true, + }).tier; + const result2 = new Egg({ + scene, + sourceType: EggSourceType.GACHA_MOVE, + pulled: true, + }).tier; expect(result1).toBe(expectedTier1); expect(result2).toBe(expectedTier2); @@ -319,7 +408,12 @@ describe("Egg Generation Tests", () => { it("should generate an epic shiny from pokemon with a different form", () => { const scene = game.scene; - const egg = new Egg({ scene, isShiny: true, variantTier: VariantTier.EPIC, species: Species.MIRAIDON }); + const egg = new Egg({ + scene, + isShiny: true, + variantTier: VariantTier.EPIC, + species: Species.MIRAIDON, + }); expect(egg.variantTier).toBe(VariantTier.EPIC); }); @@ -329,7 +423,11 @@ describe("Egg Generation Tests", () => { scene.setSeed("ABCDEFGHIJKLMNOPQRSTUVWXYZ"); scene.resetSeed(); - const firstEgg = new Egg({ scene, sourceType: EggSourceType.GACHA_SHINY, tier: EggTier.COMMON }); + const firstEgg = new Egg({ + scene, + sourceType: EggSourceType.GACHA_SHINY, + tier: EggTier.COMMON, + }); const firstHatch = firstEgg.generatePlayerPokemon(); let diffEggMove = false; let diffSpecies = false; @@ -340,12 +438,16 @@ describe("Egg Generation Tests", () => { scene.setSeed("ABCDEFGHIJKLMNOPQRSTUVWXYZ"); scene.resetSeed(); // Make sure that eggs are unpredictable even if using same seed - const newEgg = new Egg({ scene, sourceType: EggSourceType.GACHA_SHINY, tier: EggTier.COMMON }); + const newEgg = new Egg({ + scene, + sourceType: EggSourceType.GACHA_SHINY, + tier: EggTier.COMMON, + }); const newHatch = newEgg.generatePlayerPokemon(); - diffEggMove = diffEggMove || (newEgg.eggMoveIndex !== firstEgg.eggMoveIndex); - diffSpecies = diffSpecies || (newHatch.species.speciesId !== firstHatch.species.speciesId); - diffShiny = diffShiny || (newHatch.shiny !== firstHatch.shiny); - diffAbility = diffAbility || (newHatch.abilityIndex !== firstHatch.abilityIndex); + diffEggMove = diffEggMove || newEgg.eggMoveIndex !== firstEgg.eggMoveIndex; + diffSpecies = diffSpecies || newHatch.species.speciesId !== firstHatch.species.speciesId; + diffShiny = diffShiny || newHatch.shiny !== firstHatch.shiny; + diffAbility = diffAbility || newHatch.abilityIndex !== firstHatch.abilityIndex; } expect(diffEggMove).toBe(true); @@ -371,10 +473,10 @@ describe("Egg Generation Tests", () => { const newEgg = new Egg({ scene, species: Species.BULBASAUR }); const newHatch = newEgg.generatePlayerPokemon(); - diffEggMove = diffEggMove || (newEgg.eggMoveIndex !== firstEgg.eggMoveIndex); - diffSpecies = diffSpecies || (newHatch.species.speciesId !== firstHatch.species.speciesId); - diffShiny = diffShiny || (newHatch.shiny !== firstHatch.shiny); - diffAbility = diffAbility || (newHatch.abilityIndex !== firstHatch.abilityIndex); + diffEggMove = diffEggMove || newEgg.eggMoveIndex !== firstEgg.eggMoveIndex; + diffSpecies = diffSpecies || newHatch.species.speciesId !== firstHatch.species.speciesId; + diffShiny = diffShiny || newHatch.shiny !== firstHatch.shiny; + diffAbility = diffAbility || newHatch.abilityIndex !== firstHatch.abilityIndex; } expect(diffEggMove).toBe(true); diff --git a/src/test/eggs/manaphy-egg.test.ts b/test/eggs/manaphy-egg.test.ts similarity index 77% rename from src/test/eggs/manaphy-egg.test.ts rename to test/eggs/manaphy-egg.test.ts index 4285476a913..1e7f67a7bb5 100644 --- a/src/test/eggs/manaphy-egg.test.ts +++ b/test/eggs/manaphy-egg.test.ts @@ -2,15 +2,15 @@ import { Egg } from "#app/data/egg"; import { EggSourceType } from "#app/enums/egg-source-types"; import { EggTier } from "#app/enums/egg-type"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Manaphy Eggs", () => { let phaserGame: Phaser.Game; let game: GameManager; - const EGG_HATCH_COUNT: integer = 48; - let rngSweepProgress: number = 0; + const EGG_HATCH_COUNT: number = 48; + let rngSweepProgress = 0; beforeAll(() => { phaserGame = new Phaser.Game({ @@ -25,7 +25,7 @@ describe("Manaphy Eggs", () => { }); beforeEach(async () => { - await game.importData("src/test/utils/saves/everything.prsv"); + await game.importData("./test/testUtils/saves/everything.prsv"); /** * In our tests, we will perform an "RNG sweep" by letting rngSweepProgress @@ -47,7 +47,12 @@ describe("Manaphy Eggs", () => { for (let i = 0; i < EGG_HATCH_COUNT; i++) { rngSweepProgress = (2 * i + 1) / (2 * EGG_HATCH_COUNT); - const newEgg = new Egg({ scene, tier: EggTier.COMMON, sourceType: EggSourceType.GACHA_SHINY, id: 204 }); + const newEgg = new Egg({ + scene, + tier: EggTier.COMMON, + sourceType: EggSourceType.GACHA_SHINY, + id: 204, + }); const newHatch = newEgg.generatePlayerPokemon(); if (newHatch.species.speciesId === Species.MANAPHY) { manaphyCount++; @@ -60,8 +65,8 @@ describe("Manaphy Eggs", () => { } expect(manaphyCount + phioneCount).toBe(EGG_HATCH_COUNT); - expect(manaphyCount).toBe(1 / 8 * EGG_HATCH_COUNT); - expect(rareEggMoveCount).toBe(1 / 12 * EGG_HATCH_COUNT); + expect(manaphyCount).toBe((1 / 8) * EGG_HATCH_COUNT); + expect(rareEggMoveCount).toBe((1 / 12) * EGG_HATCH_COUNT); }); it("should have correct Manaphy rates and Rare Egg Move rates, from Phione species eggs", () => { @@ -73,7 +78,11 @@ describe("Manaphy Eggs", () => { for (let i = 0; i < EGG_HATCH_COUNT; i++) { rngSweepProgress = (2 * i + 1) / (2 * EGG_HATCH_COUNT); - const newEgg = new Egg({ scene, species: Species.PHIONE, sourceType: EggSourceType.SAME_SPECIES_EGG }); + const newEgg = new Egg({ + scene, + species: Species.PHIONE, + sourceType: EggSourceType.SAME_SPECIES_EGG, + }); const newHatch = newEgg.generatePlayerPokemon(); if (newHatch.species.speciesId === Species.MANAPHY) { manaphyCount++; @@ -86,8 +95,8 @@ describe("Manaphy Eggs", () => { } expect(manaphyCount + phioneCount).toBe(EGG_HATCH_COUNT); - expect(manaphyCount).toBe(1 / 8 * EGG_HATCH_COUNT); - expect(rareEggMoveCount).toBe(1 / 6 * EGG_HATCH_COUNT); + expect(manaphyCount).toBe((1 / 8) * EGG_HATCH_COUNT); + expect(rareEggMoveCount).toBe((1 / 6) * EGG_HATCH_COUNT); }); it("should have correct Manaphy rates and Rare Egg Move rates, from Manaphy species eggs", () => { @@ -99,7 +108,11 @@ describe("Manaphy Eggs", () => { for (let i = 0; i < EGG_HATCH_COUNT; i++) { rngSweepProgress = (2 * i + 1) / (2 * EGG_HATCH_COUNT); - const newEgg = new Egg({ scene, species: Species.MANAPHY, sourceType: EggSourceType.SAME_SPECIES_EGG }); + const newEgg = new Egg({ + scene, + species: Species.MANAPHY, + sourceType: EggSourceType.SAME_SPECIES_EGG, + }); const newHatch = newEgg.generatePlayerPokemon(); if (newHatch.species.speciesId === Species.MANAPHY) { manaphyCount++; @@ -113,6 +126,6 @@ describe("Manaphy Eggs", () => { expect(phioneCount).toBe(0); expect(manaphyCount).toBe(EGG_HATCH_COUNT); - expect(rareEggMoveCount).toBe(1 / 6 * EGG_HATCH_COUNT); + expect(rareEggMoveCount).toBe((1 / 6) * EGG_HATCH_COUNT); }); }); diff --git a/src/test/endless_boss.test.ts b/test/endless_boss.test.ts similarity index 84% rename from src/test/endless_boss.test.ts rename to test/endless_boss.test.ts index c9f3afc3936..4be1e379215 100644 --- a/src/test/endless_boss.test.ts +++ b/test/endless_boss.test.ts @@ -2,11 +2,11 @@ import { Biome } from "#app/enums/biome"; import { Species } from "#app/enums/species"; import { GameModes } from "#app/game-mode"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import GameManager from "./utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; const EndlessBossWave = { Minor: 250, - Major: 1000 + Major: 1000, }; describe("Endless Boss", () => { @@ -21,9 +21,7 @@ describe("Endless Boss", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override - .startingBiome(Biome.END) - .disableCrits(); + game.override.startingBiome(Biome.END).disableCrits(); }); afterEach(() => { @@ -32,7 +30,7 @@ describe("Endless Boss", () => { it(`should spawn a minor boss every ${EndlessBossWave.Minor} waves in END biome in Endless`, async () => { game.override.startingWave(EndlessBossWave.Minor); - await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.ENDLESS); + await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.ENDLESS); expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Minor); expect(game.scene.arena.biomeType).toBe(Biome.END); @@ -44,7 +42,7 @@ describe("Endless Boss", () => { it(`should spawn a major boss every ${EndlessBossWave.Major} waves in END biome in Endless`, async () => { game.override.startingWave(EndlessBossWave.Major); - await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.ENDLESS); + await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.ENDLESS); expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Major); expect(game.scene.arena.biomeType).toBe(Biome.END); @@ -56,7 +54,7 @@ describe("Endless Boss", () => { it(`should spawn a minor boss every ${EndlessBossWave.Minor} waves in END biome in Spliced Endless`, async () => { game.override.startingWave(EndlessBossWave.Minor); - await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.SPLICED_ENDLESS); + await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.SPLICED_ENDLESS); expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Minor); expect(game.scene.arena.biomeType).toBe(Biome.END); @@ -68,7 +66,7 @@ describe("Endless Boss", () => { it(`should spawn a major boss every ${EndlessBossWave.Major} waves in END biome in Spliced Endless`, async () => { game.override.startingWave(EndlessBossWave.Major); - await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.SPLICED_ENDLESS); + await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.SPLICED_ENDLESS); expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Major); expect(game.scene.arena.biomeType).toBe(Biome.END); @@ -80,7 +78,7 @@ describe("Endless Boss", () => { it(`should NOT spawn major or minor boss outside wave ${EndlessBossWave.Minor}s in END biome`, async () => { game.override.startingWave(EndlessBossWave.Minor - 1); - await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.ENDLESS); + await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.ENDLESS); expect(game.scene.currentBattle.waveIndex).not.toBe(EndlessBossWave.Minor); expect(game.scene.getEnemyPokemon()!.species.speciesId).not.toBe(Species.ETERNATUS); diff --git a/test/enemy_command.test.ts b/test/enemy_command.test.ts new file mode 100644 index 00000000000..6d5cc2698a3 --- /dev/null +++ b/test/enemy_command.test.ts @@ -0,0 +1,102 @@ +import type BattleScene from "#app/battle-scene"; +import { allMoves } from "#app/data/moves/move"; +import { MoveCategory } from "#enums/MoveCategory"; +import { Abilities } from "#app/enums/abilities"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import type { EnemyPokemon } from "#app/field/pokemon"; +import { AiType } from "#app/field/pokemon"; +import { randSeedInt } from "#app/utils"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +let globalScene: BattleScene; +const NUM_TRIALS = 300; + +type MoveChoiceSet = { [key: number]: number }; + +function getEnemyMoveChoices(pokemon: EnemyPokemon, moveChoices: MoveChoiceSet): void { + // Use an unseeded random number generator in place of the mocked-out randBattleSeedInt + vi.spyOn(globalScene, "randBattleSeedInt").mockImplementation((range, min?) => { + return randSeedInt(range, min); + }); + for (let i = 0; i < NUM_TRIALS; i++) { + const queuedMove = pokemon.getNextMove(); + moveChoices[queuedMove.move]++; + } + + for (const [moveId, count] of Object.entries(moveChoices)) { + console.log(`Move: ${allMoves[moveId].name} Count: ${count} (${(count / NUM_TRIALS) * 100}%)`); + } +} + +describe("Enemy Commands - Move Selection", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + globalScene = game.scene; + + game.override.ability(Abilities.BALL_FETCH).enemyAbility(Abilities.BALL_FETCH); + }); + + it("should never use Status moves if an attack can KO", async () => { + game.override + .enemySpecies(Species.ETERNATUS) + .enemyMoveset([Moves.ETERNABEAM, Moves.SLUDGE_BOMB, Moves.DRAGON_DANCE, Moves.COSMIC_POWER]) + .startingLevel(1) + .enemyLevel(100); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + enemyPokemon.aiType = AiType.SMART_RANDOM; + + const moveChoices: MoveChoiceSet = {}; + const enemyMoveset = enemyPokemon.getMoveset(); + enemyMoveset.forEach(mv => (moveChoices[mv!.moveId] = 0)); + getEnemyMoveChoices(enemyPokemon, moveChoices); + + enemyMoveset.forEach(mv => { + if (mv?.getMove().category === MoveCategory.STATUS) { + expect(moveChoices[mv.moveId]).toBe(0); + } + }); + }); + + it("should not select Last Resort if it would fail, even if the move KOs otherwise", async () => { + game.override + .enemySpecies(Species.KANGASKHAN) + .enemyMoveset([Moves.LAST_RESORT, Moves.GIGA_IMPACT, Moves.SPLASH, Moves.SWORDS_DANCE]) + .startingLevel(1) + .enemyLevel(100); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + enemyPokemon.aiType = AiType.SMART_RANDOM; + + const moveChoices: MoveChoiceSet = {}; + const enemyMoveset = enemyPokemon.getMoveset(); + enemyMoveset.forEach(mv => (moveChoices[mv!.moveId] = 0)); + getEnemyMoveChoices(enemyPokemon, moveChoices); + + enemyMoveset.forEach(mv => { + if (mv?.getMove().category === MoveCategory.STATUS || mv?.moveId === Moves.LAST_RESORT) { + expect(moveChoices[mv.moveId]).toBe(0); + } + }); + }); +}); diff --git a/src/test/escape-calculations.test.ts b/test/escape-calculations.test.ts similarity index 86% rename from src/test/escape-calculations.test.ts rename to test/escape-calculations.test.ts index 419a6b4c19a..0cbf11dd230 100644 --- a/src/test/escape-calculations.test.ts +++ b/test/escape-calculations.test.ts @@ -4,7 +4,7 @@ import { Command } from "#app/ui/command-ui-handler"; import * as Utils from "#app/utils"; import { Abilities } from "#enums/abilities"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -32,13 +32,13 @@ describe("Escape chance calculations", () => { }); it("single non-boss opponent", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const playerPokemon = game.scene.getPlayerField(); const enemyField = game.scene.getEnemyField(); const enemySpeed = 100; // set enemyPokemon's speed to 100 - vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemySpeed ]); + vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemySpeed]); const commandPhase = game.scene.getCurrentPhase() as CommandPhase; commandPhase.handleCommand(Command.RUN, 0); @@ -48,7 +48,11 @@ describe("Escape chance calculations", () => { const escapePercentage = new Utils.NumberHolder(0); // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping - const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [ + const escapeChances: { + pokemonSpeedRatio: number; + escapeAttempts: number; + expectedEscapeChance: number; + }[] = [ { pokemonSpeedRatio: 0.01, escapeAttempts: 0, expectedEscapeChance: 5 }, { pokemonSpeedRatio: 0.1, escapeAttempts: 0, expectedEscapeChance: 7 }, { pokemonSpeedRatio: 0.25, escapeAttempts: 0, expectedEscapeChance: 11 }, @@ -79,7 +83,14 @@ describe("Escape chance calculations", () => { // sets the number of escape attempts to the required amount game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts; // set playerPokemon's speed to a multiple of the enemySpeed - vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * enemySpeed ]); + vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ + 20, + 20, + 20, + 20, + 20, + escapeChances[i].pokemonSpeedRatio * enemySpeed, + ]); phase.attemptRunAway(playerPokemon, enemyField, escapePercentage); expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance); } @@ -87,7 +98,7 @@ describe("Escape chance calculations", () => { it("double non-boss opponent", async () => { game.override.battleType("double"); - await game.classicMode.startBattle([ Species.BULBASAUR, Species.ABOMASNOW ]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.ABOMASNOW]); const playerPokemon = game.scene.getPlayerField(); const enemyField = game.scene.getEnemyField(); @@ -98,9 +109,9 @@ describe("Escape chance calculations", () => { // this is used to find the ratio of the player's first pokemon const playerASpeedPercentage = 0.4; // set enemyAPokemon's speed to 70 - vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemyASpeed ]); + vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyASpeed]); // set enemyBPokemon's speed to 30 - vi.spyOn(enemyField[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemyBSpeed ]); + vi.spyOn(enemyField[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyBSpeed]); const commandPhase = game.scene.getCurrentPhase() as CommandPhase; commandPhase.handleCommand(Command.RUN, 0); @@ -110,7 +121,11 @@ describe("Escape chance calculations", () => { const escapePercentage = new Utils.NumberHolder(0); // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping - const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [ + const escapeChances: { + pokemonSpeedRatio: number; + escapeAttempts: number; + expectedEscapeChance: number; + }[] = [ { pokemonSpeedRatio: 0.3, escapeAttempts: 0, expectedEscapeChance: 12 }, { pokemonSpeedRatio: 0.7, escapeAttempts: 0, expectedEscapeChance: 21 }, { pokemonSpeedRatio: 1.5, escapeAttempts: 0, expectedEscapeChance: 39 }, @@ -134,33 +149,48 @@ describe("Escape chance calculations", () => { { pokemonSpeedRatio: 2.4, escapeAttempts: 9, expectedEscapeChance: 95 }, { pokemonSpeedRatio: 1.8, escapeAttempts: 7, expectedEscapeChance: 95 }, { pokemonSpeedRatio: 2, escapeAttempts: 10, expectedEscapeChance: 95 }, - ]; for (let i = 0; i < escapeChances.length; i++) { // sets the number of escape attempts to the required amount game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts; // set the first playerPokemon's speed to a multiple of the enemySpeed - vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, Math.floor(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed * playerASpeedPercentage) ]); + vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ + 20, + 20, + 20, + 20, + 20, + Math.floor(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed * playerASpeedPercentage), + ]); // set the second playerPokemon's speed to the remaining value of speed - vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * totalEnemySpeed - playerPokemon[0].stats[5] ]); + vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([ + 20, + 20, + 20, + 20, + 20, + escapeChances[i].pokemonSpeedRatio * totalEnemySpeed - playerPokemon[0].stats[5], + ]); phase.attemptRunAway(playerPokemon, enemyField, escapePercentage); // checks to make sure the escape values are the same expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance); // checks to make sure the sum of the player's speed for all pokemon is equal to the appropriate ratio of the total enemy speed - expect(playerPokemon[0].stats[5] + playerPokemon[1].stats[5]).toBe(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed); + expect(playerPokemon[0].stats[5] + playerPokemon[1].stats[5]).toBe( + escapeChances[i].pokemonSpeedRatio * totalEnemySpeed, + ); } }, 20000); it("single boss opponent", async () => { game.override.startingWave(10); - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const playerPokemon = game.scene.getPlayerField()!; const enemyField = game.scene.getEnemyField()!; const enemySpeed = 100; // set enemyPokemon's speed to 100 - vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemySpeed ]); + vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemySpeed]); const commandPhase = game.scene.getCurrentPhase() as CommandPhase; commandPhase.handleCommand(Command.RUN, 0); @@ -170,7 +200,11 @@ describe("Escape chance calculations", () => { const escapePercentage = new Utils.NumberHolder(0); // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping - const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [ + const escapeChances: { + pokemonSpeedRatio: number; + escapeAttempts: number; + expectedEscapeChance: number; + }[] = [ { pokemonSpeedRatio: 0.01, escapeAttempts: 0, expectedEscapeChance: 5 }, { pokemonSpeedRatio: 0.1, escapeAttempts: 0, expectedEscapeChance: 5 }, { pokemonSpeedRatio: 0.25, escapeAttempts: 0, expectedEscapeChance: 6 }, @@ -208,14 +242,20 @@ describe("Escape chance calculations", () => { { pokemonSpeedRatio: 6, escapeAttempts: 0, expectedEscapeChance: 25 }, { pokemonSpeedRatio: 5.9, escapeAttempts: 2, expectedEscapeChance: 25 }, { pokemonSpeedRatio: 6.1, escapeAttempts: 3, expectedEscapeChance: 25 }, - ]; for (let i = 0; i < escapeChances.length; i++) { // sets the number of escape attempts to the required amount game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts; // set playerPokemon's speed to a multiple of the enemySpeed - vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * enemySpeed ]); + vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ + 20, + 20, + 20, + 20, + 20, + escapeChances[i].pokemonSpeedRatio * enemySpeed, + ]); phase.attemptRunAway(playerPokemon, enemyField, escapePercentage); expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance); } @@ -224,7 +264,7 @@ describe("Escape chance calculations", () => { it("double boss opponent", async () => { game.override.battleType("double"); game.override.startingWave(10); - await game.classicMode.startBattle([ Species.BULBASAUR, Species.ABOMASNOW ]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.ABOMASNOW]); const playerPokemon = game.scene.getPlayerField(); const enemyField = game.scene.getEnemyField(); @@ -235,9 +275,9 @@ describe("Escape chance calculations", () => { // this is used to find the ratio of the player's first pokemon const playerASpeedPercentage = 0.8; // set enemyAPokemon's speed to 70 - vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemyASpeed ]); + vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyASpeed]); // set enemyBPokemon's speed to 30 - vi.spyOn(enemyField[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemyBSpeed ]); + vi.spyOn(enemyField[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyBSpeed]); const commandPhase = game.scene.getCurrentPhase() as CommandPhase; commandPhase.handleCommand(Command.RUN, 0); @@ -247,7 +287,11 @@ describe("Escape chance calculations", () => { const escapePercentage = new Utils.NumberHolder(0); // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping - const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [ + const escapeChances: { + pokemonSpeedRatio: number; + escapeAttempts: number; + expectedEscapeChance: number; + }[] = [ { pokemonSpeedRatio: 0.3, escapeAttempts: 0, expectedEscapeChance: 6 }, { pokemonSpeedRatio: 0.7, escapeAttempts: 0, expectedEscapeChance: 7 }, { pokemonSpeedRatio: 1.5, escapeAttempts: 0, expectedEscapeChance: 10 }, @@ -283,21 +327,36 @@ describe("Escape chance calculations", () => { { pokemonSpeedRatio: 6.5, escapeAttempts: 1, expectedEscapeChance: 25 }, { pokemonSpeedRatio: 12, escapeAttempts: 4, expectedEscapeChance: 25 }, { pokemonSpeedRatio: 5.2, escapeAttempts: 2, expectedEscapeChance: 25 }, - ]; for (let i = 0; i < escapeChances.length; i++) { // sets the number of escape attempts to the required amount game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts; // set the first playerPokemon's speed to a multiple of the enemySpeed - vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, Math.floor(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed * playerASpeedPercentage) ]); + vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ + 20, + 20, + 20, + 20, + 20, + Math.floor(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed * playerASpeedPercentage), + ]); // set the second playerPokemon's speed to the remaining value of speed - vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * totalEnemySpeed - playerPokemon[0].stats[5] ]); + vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([ + 20, + 20, + 20, + 20, + 20, + escapeChances[i].pokemonSpeedRatio * totalEnemySpeed - playerPokemon[0].stats[5], + ]); phase.attemptRunAway(playerPokemon, enemyField, escapePercentage); // checks to make sure the escape values are the same expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance); // checks to make sure the sum of the player's speed for all pokemon is equal to the appropriate ratio of the total enemy speed - expect(playerPokemon[0].stats[5] + playerPokemon[1].stats[5]).toBe(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed); + expect(playerPokemon[0].stats[5] + playerPokemon[1].stats[5]).toBe( + escapeChances[i].pokemonSpeedRatio * totalEnemySpeed, + ); } }, 20000); }); diff --git a/src/test/evolution.test.ts b/test/evolution.test.ts similarity index 78% rename from src/test/evolution.test.ts rename to test/evolution.test.ts index 10748899d59..dd6795bf161 100644 --- a/src/test/evolution.test.ts +++ b/test/evolution.test.ts @@ -1,9 +1,13 @@ -import { pokemonEvolutions, SpeciesFormEvolution, SpeciesWildEvolutionDelay } from "#app/data/balance/pokemon-evolutions"; +import { + pokemonEvolutions, + SpeciesFormEvolution, + SpeciesWildEvolutionDelay, +} from "#app/data/balance/pokemon-evolutions"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import * as Utils from "#app/utils"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -33,54 +37,54 @@ describe("Evolution", () => { }); it("should keep hidden ability after evolving", async () => { - await game.classicMode.runToSummon([ Species.EEVEE, Species.TRAPINCH ]); + await game.classicMode.runToSummon([Species.EEVEE, Species.TRAPINCH]); const eevee = game.scene.getPlayerParty()[0]; const trapinch = game.scene.getPlayerParty()[1]; eevee.abilityIndex = 2; trapinch.abilityIndex = 2; - eevee.evolve(pokemonEvolutions[Species.EEVEE][6], eevee.getSpeciesForm()); + await eevee.evolve(pokemonEvolutions[Species.EEVEE][6], eevee.getSpeciesForm()); expect(eevee.abilityIndex).toBe(2); - trapinch.evolve(pokemonEvolutions[Species.TRAPINCH][0], trapinch.getSpeciesForm()); + await trapinch.evolve(pokemonEvolutions[Species.TRAPINCH][0], trapinch.getSpeciesForm()); expect(trapinch.abilityIndex).toBe(1); }); it("should keep same ability slot after evolving", async () => { - await game.classicMode.runToSummon([ Species.BULBASAUR, Species.CHARMANDER ]); + await game.classicMode.runToSummon([Species.BULBASAUR, Species.CHARMANDER]); const bulbasaur = game.scene.getPlayerParty()[0]; const charmander = game.scene.getPlayerParty()[1]; bulbasaur.abilityIndex = 0; charmander.abilityIndex = 1; - bulbasaur.evolve(pokemonEvolutions[Species.BULBASAUR][0], bulbasaur.getSpeciesForm()); + await bulbasaur.evolve(pokemonEvolutions[Species.BULBASAUR][0], bulbasaur.getSpeciesForm()); expect(bulbasaur.abilityIndex).toBe(0); - charmander.evolve(pokemonEvolutions[Species.CHARMANDER][0], charmander.getSpeciesForm()); + await charmander.evolve(pokemonEvolutions[Species.CHARMANDER][0], charmander.getSpeciesForm()); expect(charmander.abilityIndex).toBe(1); }); it("should handle illegal abilityIndex values", async () => { - await game.classicMode.runToSummon([ Species.SQUIRTLE ]); + await game.classicMode.runToSummon([Species.SQUIRTLE]); const squirtle = game.scene.getPlayerPokemon()!; squirtle.abilityIndex = 5; - squirtle.evolve(pokemonEvolutions[Species.SQUIRTLE][0], squirtle.getSpeciesForm()); + await squirtle.evolve(pokemonEvolutions[Species.SQUIRTLE][0], squirtle.getSpeciesForm()); expect(squirtle.abilityIndex).toBe(0); }); it("should handle nincada's unique evolution", async () => { - await game.classicMode.runToSummon([ Species.NINCADA ]); + await game.classicMode.runToSummon([Species.NINCADA]); const nincada = game.scene.getPlayerPokemon()!; nincada.abilityIndex = 2; nincada.metBiome = -1; nincada.gender = 1; - nincada.evolve(pokemonEvolutions[Species.NINCADA][0], nincada.getSpeciesForm()); + await nincada.evolve(pokemonEvolutions[Species.NINCADA][0], nincada.getSpeciesForm()); const ninjask = game.scene.getPlayerParty()[0]; const shedinja = game.scene.getPlayerParty()[1]; expect(ninjask.abilityIndex).toBe(2); @@ -98,14 +102,15 @@ describe("Evolution", () => { }); it("should increase both HP and max HP when evolving", async () => { - game.override.moveset([ Moves.SURF ]) + game.override + .moveset([Moves.SURF]) .enemySpecies(Species.GOLEM) .enemyMoveset(Moves.SPLASH) .startingWave(21) .startingLevel(16) .enemyLevel(50); - await game.startBattle([ Species.TOTODILE ]); + await game.startBattle([Species.TOTODILE]); const totodile = game.scene.getPlayerPokemon()!; const hpBefore = totodile.hp; @@ -125,14 +130,15 @@ describe("Evolution", () => { }); it("should not fully heal HP when evolving", async () => { - game.override.moveset([ Moves.SURF ]) + game.override + .moveset([Moves.SURF]) .enemySpecies(Species.GOLEM) .enemyMoveset(Moves.SPLASH) .startingWave(21) .startingLevel(13) .enemyLevel(30); - await game.startBattle([ Species.CYNDAQUIL ]); + await game.startBattle([Species.CYNDAQUIL]); const cyndaquil = game.scene.getPlayerPokemon()!; cyndaquil.hp = Math.floor(cyndaquil.getMaxHp() / 2); @@ -165,7 +171,7 @@ describe("Evolution", () => { * If the value is 0, it's a 3 family maushold, whereas if the value is * 1, 2 or 3, it's a 4 family maushold */ - await game.startBattle([ Species.TANDEMAUS ]); // starts us off with a tandemaus + await game.startBattle([Species.TANDEMAUS]); // starts us off with a tandemaus const playerPokemon = game.scene.getPlayerPokemon()!; playerPokemon.level = 25; // tandemaus evolves at level 25 vi.spyOn(Utils, "randSeedInt").mockReturnValue(0); // setting the random generator to be 0 to force a three family maushold @@ -174,7 +180,7 @@ describe("Evolution", () => { for (let f = 1; f < 4; f++) { vi.spyOn(Utils, "randSeedInt").mockReturnValue(f); // setting the random generator to 1, 2 and 3 to force 4 family mausholds const fourForm = playerPokemon.getEvolution()!; - expect(fourForm.evoFormKey).toBe(null); // meanwhile, according to the pokemon-forms, the evoFormKey for a 4 family maushold is null + expect(fourForm.evoFormKey).toBe("four"); // meanwhile, according to the pokemon-forms, the evoFormKey for a 4 family maushold is "four" } }); }); diff --git a/src/test/field/pokemon.test.ts b/test/field/pokemon.test.ts similarity index 58% rename from src/test/field/pokemon.test.ts rename to test/field/pokemon.test.ts index 0a1ddac9e90..85128a31f7f 100644 --- a/src/test/field/pokemon.test.ts +++ b/test/field/pokemon.test.ts @@ -1,10 +1,10 @@ import { Species } from "#app/enums/species"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import GameManager from "../utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { PokeballType } from "#enums/pokeball"; import type BattleScene from "#app/battle-scene"; import { Moves } from "#app/enums/moves"; -import { Type } from "#app/enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; describe("Spec - Pokemon", () => { @@ -26,7 +26,7 @@ describe("Spec - Pokemon", () => { }); it("should not crash when trying to set status of undefined", async () => { - await game.classicMode.runToSummon([ Species.ABRA ]); + await game.classicMode.runToSummon([Species.ABRA]); const pkm = game.scene.getPlayerPokemon()!; expect(pkm).toBeDefined(); @@ -39,7 +39,7 @@ describe("Spec - Pokemon", () => { beforeEach(async () => { game.override.enemySpecies(Species.ZUBAT); - await game.classicMode.runToSummon([ Species.ABRA, Species.ABRA, Species.ABRA, Species.ABRA, Species.ABRA ]); // 5 Abra, only 1 slot left + await game.classicMode.runToSummon([Species.ABRA, Species.ABRA, Species.ABRA, Species.ABRA, Species.ABRA]); // 5 Abra, only 1 slot left scene = game.scene; }); @@ -49,7 +49,7 @@ describe("Spec - Pokemon", () => { const party = scene.getPlayerParty(); expect(party).toHaveLength(6); - party.forEach((pkm, index) =>{ + party.forEach((pkm, index) => { expect(pkm.species.speciesId).toBe(index === 5 ? Species.ZUBAT : Species.ABRA); }); }); @@ -61,7 +61,7 @@ describe("Spec - Pokemon", () => { const party = scene.getPlayerParty(); expect(party).toHaveLength(6); - party.forEach((pkm, index) =>{ + party.forEach((pkm, index) => { expect(pkm.species.speciesId).toBe(index === slotIndex ? Species.ZUBAT : Species.ABRA); }); }); @@ -70,7 +70,7 @@ describe("Spec - Pokemon", () => { it("should not share tms between different forms", async () => { game.override.starterForms({ [Species.ROTOM]: 4 }); - await game.classicMode.startBattle([ Species.ROTOM ]); + await game.classicMode.startBattle([Species.ROTOM]); const fanRotom = game.scene.getPlayerPokemon()!; @@ -94,39 +94,39 @@ describe("Spec - Pokemon", () => { const pokemon = scene.getPlayerParty()[0]; let types = pokemon.getTypes(); - expect(types[0]).toBe(Type.PSYCHIC); - expect(types[1]).toBe(Type.FIRE); + expect(types[0]).toBe(PokemonType.PSYCHIC); + expect(types[1]).toBe(PokemonType.FIRE); - pokemon.customPokemonData.types = [ Type.UNKNOWN, Type.NORMAL ]; + pokemon.customPokemonData.types = [PokemonType.UNKNOWN, PokemonType.NORMAL]; types = pokemon.getTypes(); - expect(types[0]).toBe(Type.PSYCHIC); - expect(types[1]).toBe(Type.FIRE); + expect(types[0]).toBe(PokemonType.PSYCHIC); + expect(types[1]).toBe(PokemonType.FIRE); - pokemon.customPokemonData.types = [ Type.NORMAL, Type.UNKNOWN ]; + pokemon.customPokemonData.types = [PokemonType.NORMAL, PokemonType.UNKNOWN]; types = pokemon.getTypes(); - expect(types[0]).toBe(Type.NORMAL); - expect(types[1]).toBe(Type.FIRE); + expect(types[0]).toBe(PokemonType.NORMAL); + expect(types[1]).toBe(PokemonType.FIRE); if (!pokemon.fusionCustomPokemonData) { pokemon.fusionCustomPokemonData = new CustomPokemonData(); } pokemon.customPokemonData.types = []; - pokemon.fusionCustomPokemonData.types = [ Type.UNKNOWN, Type.NORMAL ]; + pokemon.fusionCustomPokemonData.types = [PokemonType.UNKNOWN, PokemonType.NORMAL]; types = pokemon.getTypes(); - expect(types[0]).toBe(Type.PSYCHIC); - expect(types[1]).toBe(Type.NORMAL); + expect(types[0]).toBe(PokemonType.PSYCHIC); + expect(types[1]).toBe(PokemonType.NORMAL); - pokemon.fusionCustomPokemonData.types = [ Type.NORMAL, Type.UNKNOWN ]; + pokemon.fusionCustomPokemonData.types = [PokemonType.NORMAL, PokemonType.UNKNOWN]; types = pokemon.getTypes(); - expect(types[0]).toBe(Type.PSYCHIC); - expect(types[1]).toBe(Type.NORMAL); + expect(types[0]).toBe(PokemonType.PSYCHIC); + expect(types[1]).toBe(PokemonType.NORMAL); - pokemon.customPokemonData.types = [ Type.NORMAL, Type.UNKNOWN ]; - pokemon.fusionCustomPokemonData.types = [ Type.UNKNOWN, Type.NORMAL ]; + pokemon.customPokemonData.types = [PokemonType.NORMAL, PokemonType.UNKNOWN]; + pokemon.fusionCustomPokemonData.types = [PokemonType.UNKNOWN, PokemonType.NORMAL]; types = pokemon.getTypes(); - expect(types[0]).toBe(Type.NORMAL); - expect(types[1]).toBe(Type.FIRE); + expect(types[0]).toBe(PokemonType.NORMAL); + expect(types[1]).toBe(PokemonType.FIRE); }); it("Fusing two mons with same single type", async () => { @@ -135,7 +135,7 @@ describe("Spec - Pokemon", () => { const pokemon = scene.getPlayerParty()[0]; const types = pokemon.getTypes(); - expect(types[0]).toBe(Type.PSYCHIC); + expect(types[0]).toBe(PokemonType.PSYCHIC); expect(types.length).toBe(1); }); @@ -146,8 +146,19 @@ describe("Spec - Pokemon", () => { const pokemon = scene.getPlayerParty()[0]; const types = pokemon.getTypes(); - expect(types[0]).toBe(Type.FIRE); - expect(types[1]).toBe(Type.DARK); + expect(types[0]).toBe(PokemonType.FIRE); + expect(types[1]).toBe(PokemonType.DARK); + }); + + it("Fusing mons with two and one types", async () => { + game.override.starterSpecies(Species.NUMEL); + game.override.starterFusionSpecies(Species.CHARMANDER); + await game.classicMode.startBattle(); + const pokemon = scene.getPlayerParty()[0]; + + const types = pokemon.getTypes(); + expect(types[0]).toBe(PokemonType.FIRE); + expect(types[1]).toBe(PokemonType.GROUND); }); it("Fusing two mons with two types", async () => { @@ -157,20 +168,20 @@ describe("Spec - Pokemon", () => { const pokemon = scene.getPlayerParty()[0]; let types = pokemon.getTypes(); - expect(types[0]).toBe(Type.PSYCHIC); - expect(types[1]).toBe(Type.FIRE); + expect(types[0]).toBe(PokemonType.PSYCHIC); + expect(types[1]).toBe(PokemonType.FIRE); // Natu Psychic/Grass - pokemon.customPokemonData.types = [ Type.UNKNOWN, Type.GRASS ]; + pokemon.customPokemonData.types = [PokemonType.UNKNOWN, PokemonType.GRASS]; types = pokemon.getTypes(); - expect(types[0]).toBe(Type.PSYCHIC); - expect(types[1]).toBe(Type.FIRE); + expect(types[0]).toBe(PokemonType.PSYCHIC); + expect(types[1]).toBe(PokemonType.FIRE); // Natu Grass/Flying - pokemon.customPokemonData.types = [ Type.GRASS, Type.UNKNOWN ]; + pokemon.customPokemonData.types = [PokemonType.GRASS, PokemonType.UNKNOWN]; types = pokemon.getTypes(); - expect(types[0]).toBe(Type.GRASS); - expect(types[1]).toBe(Type.FIRE); + expect(types[0]).toBe(PokemonType.GRASS); + expect(types[1]).toBe(PokemonType.FIRE); if (!pokemon.fusionCustomPokemonData) { pokemon.fusionCustomPokemonData = new CustomPokemonData(); @@ -178,24 +189,24 @@ describe("Spec - Pokemon", () => { pokemon.customPokemonData.types = []; // Houndour Dark/Grass - pokemon.fusionCustomPokemonData.types = [ Type.UNKNOWN, Type.GRASS ]; + pokemon.fusionCustomPokemonData.types = [PokemonType.UNKNOWN, PokemonType.GRASS]; types = pokemon.getTypes(); - expect(types[0]).toBe(Type.PSYCHIC); - expect(types[1]).toBe(Type.GRASS); + expect(types[0]).toBe(PokemonType.PSYCHIC); + expect(types[1]).toBe(PokemonType.GRASS); // Houndour Grass/Fire - pokemon.fusionCustomPokemonData.types = [ Type.GRASS, Type.UNKNOWN ]; + pokemon.fusionCustomPokemonData.types = [PokemonType.GRASS, PokemonType.UNKNOWN]; types = pokemon.getTypes(); - expect(types[0]).toBe(Type.PSYCHIC); - expect(types[1]).toBe(Type.FIRE); + expect(types[0]).toBe(PokemonType.PSYCHIC); + expect(types[1]).toBe(PokemonType.FIRE); // Natu Grass/Flying // Houndour Dark/Grass - pokemon.customPokemonData.types = [ Type.GRASS, Type.UNKNOWN ]; - pokemon.fusionCustomPokemonData.types = [ Type.UNKNOWN, Type.GRASS ]; + pokemon.customPokemonData.types = [PokemonType.GRASS, PokemonType.UNKNOWN]; + pokemon.fusionCustomPokemonData.types = [PokemonType.UNKNOWN, PokemonType.GRASS]; types = pokemon.getTypes(); - expect(types[0]).toBe(Type.GRASS); - expect(types[1]).toBe(Type.DARK); + expect(types[0]).toBe(PokemonType.GRASS); + expect(types[1]).toBe(PokemonType.DARK); }); }); }); diff --git a/src/test/final_boss.test.ts b/test/final_boss.test.ts similarity index 89% rename from src/test/final_boss.test.ts rename to test/final_boss.test.ts index 5540d9511e4..1b0cdce60a0 100644 --- a/src/test/final_boss.test.ts +++ b/test/final_boss.test.ts @@ -5,7 +5,7 @@ import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; const FinalWave = { @@ -29,7 +29,7 @@ describe("Final Boss", () => { .startingBiome(Biome.END) .disableCrits() .enemyMoveset(Moves.SPLASH) - .moveset([ Moves.SPLASH, Moves.WILL_O_WISP, Moves.DRAGON_PULSE ]) + .moveset([Moves.SPLASH, Moves.WILL_O_WISP, Moves.DRAGON_PULSE]) .startingLevel(10000); }); @@ -38,7 +38,7 @@ describe("Final Boss", () => { }); it("should spawn Eternatus on wave 200 in END biome", async () => { - await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.CLASSIC); + await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.CLASSIC); expect(game.scene.currentBattle.waveIndex).toBe(FinalWave.Classic); expect(game.scene.arena.biomeType).toBe(Biome.END); @@ -47,7 +47,7 @@ describe("Final Boss", () => { it("should NOT spawn Eternatus before wave 200 in END biome", async () => { game.override.startingWave(FinalWave.Classic - 1); - await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.CLASSIC); + await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.CLASSIC); expect(game.scene.currentBattle.waveIndex).not.toBe(FinalWave.Classic); expect(game.scene.arena.biomeType).toBe(Biome.END); @@ -56,7 +56,7 @@ describe("Final Boss", () => { it("should NOT spawn Eternatus outside of END biome", async () => { game.override.startingBiome(Biome.FOREST); - await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.CLASSIC); + await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.CLASSIC); expect(game.scene.currentBattle.waveIndex).toBe(FinalWave.Classic); expect(game.scene.arena.biomeType).not.toBe(Biome.END); @@ -64,7 +64,7 @@ describe("Final Boss", () => { }); it("should not have passive enabled on Eternatus", async () => { - await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.CLASSIC); + await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.CLASSIC); const eternatus = game.scene.getEnemyPokemon()!; expect(eternatus.species.speciesId).toBe(Species.ETERNATUS); @@ -72,7 +72,7 @@ describe("Final Boss", () => { }); it("should change form on direct hit down to last boss fragment", async () => { - await game.runToFinalBossEncounter([ Species.KYUREM ], GameModes.CLASSIC); + await game.runToFinalBossEncounter([Species.KYUREM], GameModes.CLASSIC); await game.phaseInterceptor.to("CommandPhase"); // Eternatus phase 1 @@ -101,7 +101,7 @@ describe("Final Boss", () => { it("should change form on status damage down to last boss fragment", async () => { game.override.ability(Abilities.NO_GUARD); - await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.CLASSIC); + await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.CLASSIC); await game.phaseInterceptor.to("CommandPhase"); // Eternatus phase 1 @@ -140,5 +140,4 @@ describe("Final Boss", () => { expect(miniBlackHole).toBeDefined(); expect(miniBlackHole?.stackCount).toBe(1); }); - }); diff --git a/src/test/fontFace.setup.ts b/test/fontFace.setup.ts similarity index 100% rename from src/test/fontFace.setup.ts rename to test/fontFace.setup.ts diff --git a/src/test/game-mode.test.ts b/test/game-mode.test.ts similarity index 92% rename from src/test/game-mode.test.ts rename to test/game-mode.test.ts index 2c8184a30ef..a2da7d1690a 100644 --- a/src/test/game-mode.test.ts +++ b/test/game-mode.test.ts @@ -1,8 +1,8 @@ import type { GameMode } from "#app/game-mode"; import { GameModes, getGameMode } from "#app/game-mode"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as Utils from "../utils"; -import GameManager from "./utils/gameManager"; +import * as Utils from "#app/utils"; +import GameManager from "#test/testUtils/gameManager"; describe("game-mode", () => { let phaserGame: Phaser.Game; @@ -28,9 +28,7 @@ describe("game-mode", () => { it("does NOT spawn trainers within 3 waves of fixed battle", () => { const { arena } = game.scene; /** set wave 16 to be a fixed trainer fight meaning wave 13-19 don't allow trainer spawns */ - vi.spyOn(classicGameMode, "isFixedBattle").mockImplementation( - (n: number) => (n === 16 ? true : false) - ); + vi.spyOn(classicGameMode, "isFixedBattle").mockImplementation((n: number) => n === 16); vi.spyOn(arena, "getTrainerChance").mockReturnValue(1); vi.spyOn(Utils, "randSeedInt").mockReturnValue(0); expect(classicGameMode.isWaveTrainer(11, arena)).toBeFalsy(); diff --git a/src/test/imports.test.ts b/test/imports.test.ts similarity index 99% rename from src/test/imports.test.ts rename to test/imports.test.ts index 305eccdc465..128308dbd14 100644 --- a/src/test/imports.test.ts +++ b/test/imports.test.ts @@ -32,4 +32,3 @@ describe("tests to debug the import, with trace", () => { expect(module.Species).toBeDefined(); }); }); - diff --git a/src/test/inputs/inputs.test.ts b/test/inputs/inputs.test.ts similarity index 83% rename from src/test/inputs/inputs.test.ts rename to test/inputs/inputs.test.ts index 6306c1b9da6..1f566672f00 100644 --- a/src/test/inputs/inputs.test.ts +++ b/test/inputs/inputs.test.ts @@ -1,11 +1,10 @@ import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty"; import pad_xbox360 from "#app/configs/inputs/pad_xbox360"; -import GameManager from "#test/utils/gameManager"; -import InputsHandler from "#test/utils/inputsHandler"; +import GameManager from "#test/testUtils/gameManager"; +import InputsHandler from "#test/testUtils/inputsHandler"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Inputs", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -52,39 +51,38 @@ describe("Inputs", () => { expect(game.inputsHandler.log.length).toBe(5); }); - it("keyboard - test input holding for 200ms - 1 input", async() => { + it("keyboard - test input holding for 200ms - 1 input", async () => { await game.inputsHandler.pressKeyboardKey(cfg_keyboard_qwerty.deviceMapping.KEY_ARROW_UP, 200); expect(game.inputsHandler.log.length).toBe(1); }); - it("keyboard - test input holding for 300ms - 2 input", async() => { + it("keyboard - test input holding for 300ms - 2 input", async () => { await game.inputsHandler.pressKeyboardKey(cfg_keyboard_qwerty.deviceMapping.KEY_ARROW_UP, 300); expect(game.inputsHandler.log.length).toBe(2); }); - it("keyboard - test input holding for 1000ms - 4 input", async() => { + it("keyboard - test input holding for 1000ms - 4 input", async () => { await game.inputsHandler.pressKeyboardKey(cfg_keyboard_qwerty.deviceMapping.KEY_ARROW_UP, 1050); expect(game.inputsHandler.log.length).toBe(5); }); - it("gamepad - test input holding for 1ms - 1 input", async() => { + it("gamepad - test input holding for 1ms - 1 input", async () => { await game.inputsHandler.pressGamepadButton(pad_xbox360.deviceMapping.RC_S, 1); expect(game.inputsHandler.log.length).toBe(1); }); - it("gamepad - test input holding for 200ms - 1 input", async() => { + it("gamepad - test input holding for 200ms - 1 input", async () => { await game.inputsHandler.pressGamepadButton(pad_xbox360.deviceMapping.RC_S, 200); expect(game.inputsHandler.log.length).toBe(1); }); - it("gamepad - test input holding for 300ms - 2 input", async() => { + it("gamepad - test input holding for 300ms - 2 input", async () => { await game.inputsHandler.pressGamepadButton(pad_xbox360.deviceMapping.RC_S, 300); expect(game.inputsHandler.log.length).toBe(2); }); - it("gamepad - test input holding for 1000ms - 4 input", async() => { + it("gamepad - test input holding for 1000ms - 4 input", async () => { await game.inputsHandler.pressGamepadButton(pad_xbox360.deviceMapping.RC_S, 1050); expect(game.inputsHandler.log.length).toBe(5); }); }); - diff --git a/src/test/internals.test.ts b/test/internals.test.ts similarity index 87% rename from src/test/internals.test.ts rename to test/internals.test.ts index ce2cd55dbc6..558b363caf0 100644 --- a/src/test/internals.test.ts +++ b/test/internals.test.ts @@ -1,6 +1,6 @@ import { Abilities } from "#app/enums/abilities"; import { Species } from "#app/enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,7 +23,7 @@ describe("Internals", () => { }); it("should provide Eevee with 3 defined abilities", async () => { - await game.classicMode.runToSummon([ Species.EEVEE ]); + await game.classicMode.runToSummon([Species.EEVEE]); const eevee = game.scene.getPlayerPokemon()!; expect(eevee.getSpeciesForm().getAbilityCount()).toBe(3); @@ -34,7 +34,7 @@ describe("Internals", () => { }); it("should set Eeeve abilityIndex between 0-2", async () => { - await game.classicMode.runToSummon([ Species.EEVEE ]); + await game.classicMode.runToSummon([Species.EEVEE]); const eevee = game.scene.getPlayerPokemon()!; expect(eevee.abilityIndex).toBeGreaterThanOrEqual(0); diff --git a/src/test/items/dire_hit.test.ts b/test/items/dire_hit.test.ts similarity index 78% rename from src/test/items/dire_hit.test.ts rename to test/items/dire_hit.test.ts index 3c82ebd3a47..038d88ddc73 100644 --- a/src/test/items/dire_hit.test.ts +++ b/test/items/dire_hit.test.ts @@ -1,7 +1,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { BattleEndPhase } from "#app/phases/battle-end-phase"; @@ -34,17 +34,14 @@ describe("Items - Dire Hit", () => { game.override .enemySpecies(Species.MAGIKARP) .enemyMoveset(Moves.SPLASH) - .moveset([ Moves.POUND ]) + .moveset([Moves.POUND]) .startingHeldItems([{ name: "DIRE_HIT" }]) .battleType("single") .disableCrits(); - }, 20000); it("should raise CRIT stage by 1", async () => { - await game.startBattle([ - Species.GASTLY - ]); + await game.startBattle([Species.GASTLY]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -57,12 +54,10 @@ describe("Items - Dire Hit", () => { expect(enemyPokemon.getCritStage).toHaveReturnedWith(1); }, 20000); - it("should renew how many battles are left of existing DIRE_HIT when picking up new DIRE_HIT", async() => { + it("should renew how many battles are left of existing DIRE_HIT when picking up new DIRE_HIT", async () => { game.override.itemRewards([{ name: "DIRE_HIT" }]); - await game.startBattle([ - Species.PIKACHU - ]); + await game.startBattle([Species.PIKACHU]); game.move.select(Moves.SPLASH); @@ -74,13 +69,19 @@ describe("Items - Dire Hit", () => { expect(modifier.getBattleCount()).toBe(4); // Forced DIRE_HIT to spawn in the first slot with override - game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => { - const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler; - // Traverse to first modifier slot - handler.setCursor(0); - handler.setRowCursor(ShopCursorTarget.REWARDS); - handler.processInput(Button.ACTION); - }, () => game.isCurrentPhase(CommandPhase) || game.isCurrentPhase(NewBattlePhase), true); + game.onNextPrompt( + "SelectModifierPhase", + Mode.MODIFIER_SELECT, + () => { + const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler; + // Traverse to first modifier slot + handler.setCursor(0); + handler.setRowCursor(ShopCursorTarget.REWARDS); + handler.processInput(Button.ACTION); + }, + () => game.isCurrentPhase(CommandPhase) || game.isCurrentPhase(NewBattlePhase), + true, + ); await game.phaseInterceptor.to(TurnInitPhase); diff --git a/src/test/items/double_battle_chance_booster.test.ts b/test/items/double_battle_chance_booster.test.ts similarity index 69% rename from src/test/items/double_battle_chance_booster.test.ts rename to test/items/double_battle_chance_booster.test.ts index cccd8d4765e..b4818e7e7ba 100644 --- a/src/test/items/double_battle_chance_booster.test.ts +++ b/test/items/double_battle_chance_booster.test.ts @@ -1,7 +1,7 @@ import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { DoubleBattleChanceBoosterModifier } from "#app/modifier/modifier"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; @@ -27,12 +27,7 @@ describe("Items - Double Battle Chance Boosters", () => { }); it("should guarantee double battle with 2 unique tiers", async () => { - game.override - .startingModifier([ - { name: "LURE" }, - { name: "SUPER_LURE" } - ]) - .startingWave(2); + game.override.startingModifier([{ name: "LURE" }, { name: "SUPER_LURE" }]).startingWave(2); await game.classicMode.startBattle(); @@ -40,13 +35,7 @@ describe("Items - Double Battle Chance Boosters", () => { }); it("should guarantee double boss battle with 3 unique tiers", async () => { - game.override - .startingModifier([ - { name: "LURE" }, - { name: "SUPER_LURE" }, - { name: "MAX_LURE" } - ]) - .startingWave(10); + game.override.startingModifier([{ name: "LURE" }, { name: "SUPER_LURE" }, { name: "MAX_LURE" }]).startingWave(10); await game.classicMode.startBattle(); @@ -57,16 +46,14 @@ describe("Items - Double Battle Chance Boosters", () => { expect(enemyField[1].isBoss()).toBe(true); }); - it("should renew how many battles are left of existing booster when picking up new booster of same tier", async() => { + it("should renew how many battles are left of existing booster when picking up new booster of same tier", async () => { game.override .startingModifier([{ name: "LURE" }]) .itemRewards([{ name: "LURE" }]) .moveset(Moves.SPLASH) .startingLevel(200); - await game.classicMode.startBattle([ - Species.PIKACHU - ]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.SPLASH); @@ -74,17 +61,25 @@ describe("Items - Double Battle Chance Boosters", () => { await game.phaseInterceptor.to("BattleEndPhase"); - const modifier = game.scene.findModifier(m => m instanceof DoubleBattleChanceBoosterModifier) as DoubleBattleChanceBoosterModifier; + const modifier = game.scene.findModifier( + m => m instanceof DoubleBattleChanceBoosterModifier, + ) as DoubleBattleChanceBoosterModifier; expect(modifier.getBattleCount()).toBe(9); // Forced LURE to spawn in the first slot with override - game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => { - const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler; - // Traverse to first modifier slot - handler.setCursor(0); - handler.setRowCursor(ShopCursorTarget.REWARDS); - handler.processInput(Button.ACTION); - }, () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("NewBattlePhase"), true); + game.onNextPrompt( + "SelectModifierPhase", + Mode.MODIFIER_SELECT, + () => { + const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler; + // Traverse to first modifier slot + handler.setCursor(0); + handler.setRowCursor(ShopCursorTarget.REWARDS); + handler.processInput(Button.ACTION); + }, + () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("NewBattlePhase"), + true, + ); await game.phaseInterceptor.to("TurnInitPhase"); diff --git a/src/test/items/eviolite.test.ts b/test/items/eviolite.test.ts similarity index 86% rename from src/test/items/eviolite.test.ts rename to test/items/eviolite.test.ts index a97c287da29..2b82e2145e9 100644 --- a/src/test/items/eviolite.test.ts +++ b/test/items/eviolite.test.ts @@ -2,7 +2,7 @@ import { StatBoosterModifier } from "#app/modifier/modifier"; import { NumberHolder, randItem } from "#app/utils"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -22,13 +22,11 @@ describe("Items - Eviolite", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override - .battleType("single") - .startingHeldItems([{ name: "EVIOLITE" }]); + game.override.battleType("single").startingHeldItems([{ name: "EVIOLITE" }]); }); - it("should provide 50% boost to DEF and SPDEF for unevolved, unfused pokemon", async() => { - await game.classicMode.startBattle([ Species.PICHU ]); + it("should provide 50% boost to DEF and SPDEF for unevolved, unfused pokemon", async () => { + await game.classicMode.startBattle([Species.PICHU]); const partyMember = game.scene.getPlayerPokemon()!; @@ -48,8 +46,8 @@ describe("Items - Eviolite", () => { expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(spDefStat * 1.5)); }); - it("should not provide a boost for fully evolved, unfused pokemon", async() => { - await game.classicMode.startBattle([ Species.RAICHU ]); + it("should not provide a boost for fully evolved, unfused pokemon", async () => { + await game.classicMode.startBattle([Species.RAICHU]); const partyMember = game.scene.getPlayerPokemon()!; @@ -67,13 +65,12 @@ describe("Items - Eviolite", () => { expect(partyMember.getEffectiveStat(Stat.DEF)).toBe(defStat); expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(spDefStat); - }); - it("should provide 50% boost to DEF and SPDEF for completely unevolved, fused pokemon", async() => { - await game.classicMode.startBattle([ Species.PICHU, Species.CLEFFA ]); + it("should provide 50% boost to DEF and SPDEF for completely unevolved, fused pokemon", async () => { + await game.classicMode.startBattle([Species.PICHU, Species.CLEFFA]); - const [ partyMember, ally ] = game.scene.getPlayerParty(); + const [partyMember, ally] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -100,10 +97,10 @@ describe("Items - Eviolite", () => { expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(spDefStat * 1.5)); }); - it("should provide 25% boost to DEF and SPDEF for partially unevolved (base), fused pokemon", async() => { - await game.classicMode.startBattle([ Species.PICHU, Species.CLEFABLE ]); + it("should provide 25% boost to DEF and SPDEF for partially unevolved (base), fused pokemon", async () => { + await game.classicMode.startBattle([Species.PICHU, Species.CLEFABLE]); - const [ partyMember, ally ] = game.scene.getPlayerParty(); + const [partyMember, ally] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -130,10 +127,10 @@ describe("Items - Eviolite", () => { expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(spDefStat * 1.25)); }); - it("should provide 25% boost to DEF and SPDEF for partially unevolved (fusion), fused pokemon", async() => { - await game.classicMode.startBattle([ Species.RAICHU, Species.CLEFFA ]); + it("should provide 25% boost to DEF and SPDEF for partially unevolved (fusion), fused pokemon", async () => { + await game.classicMode.startBattle([Species.RAICHU, Species.CLEFFA]); - const [ partyMember, ally ] = game.scene.getPlayerParty(); + const [partyMember, ally] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -160,10 +157,10 @@ describe("Items - Eviolite", () => { expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(spDefStat * 1.25)); }); - it("should not provide a boost for fully evolved, fused pokemon", async() => { - await game.classicMode.startBattle([ Species.RAICHU, Species.CLEFABLE ]); + it("should not provide a boost for fully evolved, fused pokemon", async () => { + await game.classicMode.startBattle([Species.RAICHU, Species.CLEFABLE]); - const [ partyMember, ally ] = game.scene.getPlayerParty(); + const [partyMember, ally] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -190,17 +187,17 @@ describe("Items - Eviolite", () => { expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(spDefStat); }); - it("should not provide a boost for Gigantamax Pokémon", async() => { + it("should not provide a boost for Gigantamax Pokémon", async () => { game.override.starterForms({ [Species.PIKACHU]: 8, [Species.EEVEE]: 2, [Species.DURALUDON]: 1, - [Species.MEOWTH]: 1 + [Species.MEOWTH]: 1, }); - const gMaxablePokemon = [ Species.PIKACHU, Species.EEVEE, Species.DURALUDON, Species.MEOWTH ]; + const gMaxablePokemon = [Species.PIKACHU, Species.EEVEE, Species.DURALUDON, Species.MEOWTH]; - await game.classicMode.startBattle([ randItem(gMaxablePokemon) ]); + await game.classicMode.startBattle([randItem(gMaxablePokemon)]); const partyMember = game.scene.getPlayerPokemon()!; diff --git a/src/test/items/exp_booster.test.ts b/test/items/exp_booster.test.ts similarity index 90% rename from src/test/items/exp_booster.test.ts rename to test/items/exp_booster.test.ts index 7441dcaeb73..e4491b22637 100644 --- a/src/test/items/exp_booster.test.ts +++ b/test/items/exp_booster.test.ts @@ -1,7 +1,7 @@ import { Abilities } from "#app/enums/abilities"; import { PokemonExpBoosterModifier } from "#app/modifier/modifier"; import * as Utils from "#app/utils"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -27,7 +27,7 @@ describe("EXP Modifier Items", () => { game.override.battleType("single"); }); - it("EXP booster items stack multiplicatively", async() => { + it("EXP booster items stack multiplicatively", async () => { game.override.startingHeldItems([{ name: "LUCKY_EGG", count: 3 }, { name: "GOLDEN_EGG" }]); await game.startBattle(); diff --git a/src/test/items/grip_claw.test.ts b/test/items/grip_claw.test.ts similarity index 88% rename from src/test/items/grip_claw.test.ts rename to test/items/grip_claw.test.ts index e0cbeb95b6f..1d169006116 100644 --- a/src/test/items/grip_claw.test.ts +++ b/test/items/grip_claw.test.ts @@ -5,7 +5,7 @@ import { Abilities } from "#enums/abilities"; import { BerryType } from "#enums/berry-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,10 +28,8 @@ describe("Items - Grip Claw", () => { game.override .battleType("double") - .moveset([ Moves.TACKLE, Moves.SPLASH, Moves.ATTRACT ]) - .startingHeldItems([ - { name: "GRIP_CLAW", count: 1 }, - ]) + .moveset([Moves.TACKLE, Moves.SPLASH, Moves.ATTRACT]) + .startingHeldItems([{ name: "GRIP_CLAW", count: 1 }]) .enemySpecies(Species.SNORLAX) .enemyAbility(Abilities.UNNERVE) .ability(Abilities.UNNERVE) @@ -41,13 +39,12 @@ describe("Items - Grip Claw", () => { { name: "BERRY", type: BerryType.LUM, count: 2 }, ]) .enemyLevel(100); - }); it("should steal items on contact and only from the attack target", async () => { - await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]); - const [ playerPokemon, ] = game.scene.getPlayerField(); + const [playerPokemon] = game.scene.getPlayerField(); const gripClaw = playerPokemon.getHeldItems()[0] as ContactHeldItemTransferChanceModifier; vi.spyOn(gripClaw, "chance", "get").mockReturnValue(100); @@ -74,9 +71,9 @@ describe("Items - Grip Claw", () => { }); it("should not steal items when using a targetted, non attack move", async () => { - await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]); - const [ playerPokemon, ] = game.scene.getPlayerField(); + const [playerPokemon] = game.scene.getPlayerField(); const gripClaw = playerPokemon.getHeldItems()[0] as ContactHeldItemTransferChanceModifier; vi.spyOn(gripClaw, "chance", "get").mockReturnValue(100); @@ -109,4 +106,3 @@ describe("Items - Grip Claw", () => { function getHeldItemCount(pokemon: Pokemon) { return pokemon.getHeldItems().reduce((currentTotal, item) => currentTotal + item.getStackCount(), 0); } - diff --git a/src/test/items/leek.test.ts b/test/items/leek.test.ts similarity index 80% rename from src/test/items/leek.test.ts rename to test/items/leek.test.ts index 901b353b3d3..ec4d075fe19 100644 --- a/src/test/items/leek.test.ts +++ b/test/items/leek.test.ts @@ -2,7 +2,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import * as Utils from "#app/utils"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -25,17 +25,15 @@ describe("Items - Leek", () => { game.override .enemySpecies(Species.MAGIKARP) - .enemyMoveset([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]) + .enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]) .startingHeldItems([{ name: "LEEK" }]) - .moveset([ Moves.TACKLE ]) + .moveset([Moves.TACKLE]) .disableCrits() .battleType("single"); }); it("should raise CRIT stage by 2 when held by FARFETCHD", async () => { - await game.startBattle([ - Species.FARFETCHD - ]); + await game.startBattle([Species.FARFETCHD]); const enemyMember = game.scene.getEnemyPokemon()!; @@ -49,9 +47,7 @@ describe("Items - Leek", () => { }, 20000); it("should raise CRIT stage by 2 when held by GALAR_FARFETCHD", async () => { - await game.startBattle([ - Species.GALAR_FARFETCHD - ]); + await game.startBattle([Species.GALAR_FARFETCHD]); const enemyMember = game.scene.getEnemyPokemon()!; @@ -65,9 +61,7 @@ describe("Items - Leek", () => { }, 20000); it("should raise CRIT stage by 2 when held by SIRFETCHD", async () => { - await game.startBattle([ - Species.SIRFETCHD - ]); + await game.startBattle([Species.SIRFETCHD]); const enemyMember = game.scene.getEnemyPokemon()!; @@ -82,14 +76,11 @@ describe("Items - Leek", () => { it("should raise CRIT stage by 2 when held by FARFETCHD line fused with Pokemon", async () => { // Randomly choose from the Farfetch'd line - const species = [ Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD ]; + const species = [Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD]; - await game.startBattle([ - species[Utils.randInt(species.length)], - Species.PIKACHU, - ]); + await game.startBattle([species[Utils.randInt(species.length)], Species.PIKACHU]); - const [ partyMember, ally ] = game.scene.getPlayerParty(); + const [partyMember, ally] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -113,14 +104,11 @@ describe("Items - Leek", () => { it("should raise CRIT stage by 2 when held by Pokemon fused with FARFETCHD line", async () => { // Randomly choose from the Farfetch'd line - const species = [ Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD ]; + const species = [Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD]; - await game.startBattle([ - Species.PIKACHU, - species[Utils.randInt(species.length)] - ]); + await game.startBattle([Species.PIKACHU, species[Utils.randInt(species.length)]]); - const [ partyMember, ally ] = game.scene.getPlayerParty(); + const [partyMember, ally] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -131,7 +119,6 @@ describe("Items - Leek", () => { partyMember.fusionGender = ally.gender; partyMember.fusionLuck = ally.luck; - const enemyMember = game.scene.getEnemyPokemon()!; vi.spyOn(enemyMember, "getCritStage"); @@ -144,9 +131,7 @@ describe("Items - Leek", () => { }, 20000); it("should not raise CRIT stage when held by a Pokemon outside of FARFETCHD line", async () => { - await game.startBattle([ - Species.PIKACHU - ]); + await game.startBattle([Species.PIKACHU]); const enemyMember = game.scene.getEnemyPokemon()!; diff --git a/src/test/items/leftovers.test.ts b/test/items/leftovers.test.ts similarity index 87% rename from src/test/items/leftovers.test.ts rename to test/items/leftovers.test.ts index 672151d97cb..ad22e9c3cae 100644 --- a/src/test/items/leftovers.test.ts +++ b/test/items/leftovers.test.ts @@ -3,11 +3,10 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Items - Leftovers", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -27,15 +26,15 @@ describe("Items - Leftovers", () => { game.override.battleType("single"); game.override.startingLevel(2000); game.override.ability(Abilities.UNNERVE); - game.override.moveset([ Moves.SPLASH ]); + game.override.moveset([Moves.SPLASH]); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.UNNERVE); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); game.override.startingHeldItems([{ name: "LEFTOVERS", count: 1 }]); }); it("leftovers works", async () => { - await game.startBattle([ Species.ARCANINE ]); + await game.startBattle([Species.ARCANINE]); // Make sure leftovers are there expect(game.scene.modifiers[0].type.id).toBe("LEFTOVERS"); diff --git a/src/test/items/light_ball.test.ts b/test/items/light_ball.test.ts similarity index 76% rename from src/test/items/light_ball.test.ts rename to test/items/light_ball.test.ts index 987a5ab8b0c..e4959002904 100644 --- a/src/test/items/light_ball.test.ts +++ b/test/items/light_ball.test.ts @@ -4,7 +4,7 @@ import { modifierTypes } from "#app/modifier/modifier-type"; import i18next from "#app/plugins/i18n"; import * as Utils from "#app/utils"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,45 +28,61 @@ describe("Items - Light Ball", () => { game.override.battleType("single"); }); - it("LIGHT_BALL activates in battle correctly", async() => { + it("LIGHT_BALL activates in battle correctly", async () => { game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "LIGHT_BALL" }]); const consoleSpy = vi.spyOn(console, "log"); - await game.startBattle([ - Species.PIKACHU - ]); + await game.classicMode.startBattle([Species.PIKACHU]); const partyMember = game.scene.getPlayerParty()[0]; // Checking console log to make sure Light Ball is applied when getEffectiveStat (with the appropriate stat) is called partyMember.getEffectiveStat(Stat.DEF); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), + "", + ); // Printing dummy console messages along the way so subsequent checks don't pass because of the first console.log(""); partyMember.getEffectiveStat(Stat.SPDEF); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.ATK); - expect(consoleSpy).toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), ""); + expect(consoleSpy).toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.SPATK); - expect(consoleSpy).toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), ""); + expect(consoleSpy).toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.SPD); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), + "", + ); }); - it("LIGHT_BALL held by PIKACHU", async() => { - await game.startBattle([ - Species.PIKACHU - ]); + it("LIGHT_BALL held by PIKACHU", async () => { + await game.classicMode.startBattle([Species.PIKACHU]); const partyMember = game.scene.getPlayerParty()[0]; @@ -83,7 +99,10 @@ describe("Items - Light Ball", () => { expect(spAtkValue.value / spAtkStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "LIGHT_BALL" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPATK, spAtkValue); @@ -91,11 +110,8 @@ describe("Items - Light Ball", () => { expect(spAtkValue.value / spAtkStat).toBe(2); }, 20000); - it("LIGHT_BALL held by fused PIKACHU (base)", async() => { - await game.startBattle([ - Species.PIKACHU, - Species.MAROWAK - ]); + it("LIGHT_BALL held by fused PIKACHU (base)", async () => { + await game.classicMode.startBattle([Species.PIKACHU, Species.MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -122,7 +138,10 @@ describe("Items - Light Ball", () => { expect(spAtkValue.value / spAtkStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "LIGHT_BALL" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPATK, spAtkValue); @@ -130,11 +149,8 @@ describe("Items - Light Ball", () => { expect(spAtkValue.value / spAtkStat).toBe(2); }, 20000); - it("LIGHT_BALL held by fused PIKACHU (part)", async() => { - await game.startBattle([ - Species.MAROWAK, - Species.PIKACHU - ]); + it("LIGHT_BALL held by fused PIKACHU (part)", async () => { + await game.startBattle([Species.MAROWAK, Species.PIKACHU]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -161,7 +177,10 @@ describe("Items - Light Ball", () => { expect(spAtkValue.value / spAtkStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "LIGHT_BALL" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPATK, spAtkValue); @@ -169,10 +188,8 @@ describe("Items - Light Ball", () => { expect(spAtkValue.value / spAtkStat).toBe(2); }, 20000); - it("LIGHT_BALL not held by PIKACHU", async() => { - await game.startBattle([ - Species.MAROWAK - ]); + it("LIGHT_BALL not held by PIKACHU", async () => { + await game.startBattle([Species.MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; @@ -189,7 +206,10 @@ describe("Items - Light Ball", () => { expect(spAtkValue.value / spAtkStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "LIGHT_BALL" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPATK, spAtkValue); diff --git a/src/test/items/lock_capsule.test.ts b/test/items/lock_capsule.test.ts similarity index 81% rename from src/test/items/lock_capsule.test.ts rename to test/items/lock_capsule.test.ts index 2d95cea5847..4e4182b3038 100644 --- a/src/test/items/lock_capsule.test.ts +++ b/test/items/lock_capsule.test.ts @@ -3,7 +3,7 @@ import { Moves } from "#app/enums/moves"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import { Mode } from "#app/ui/ui"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -27,14 +27,19 @@ describe("Items - Lock Capsule", () => { game.override .battleType("single") .startingLevel(200) - .moveset([ Moves.SURF ]) + .moveset([Moves.SURF]) .enemyAbility(Abilities.BALL_FETCH) .startingModifier([{ name: "LOCK_CAPSULE" }]); }); it("doesn't set the cost of common tier items to 0", async () => { await game.classicMode.startBattle(); - game.scene.overridePhase(new SelectModifierPhase(0, undefined, { guaranteedModifierTiers: [ ModifierTier.COMMON, ModifierTier.COMMON, ModifierTier.COMMON ], fillRemaining: false })); + game.scene.overridePhase( + new SelectModifierPhase(0, undefined, { + guaranteedModifierTiers: [ModifierTier.COMMON, ModifierTier.COMMON, ModifierTier.COMMON], + fillRemaining: false, + }), + ); game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => { const selectModifierPhase = game.scene.getCurrentPhase() as SelectModifierPhase; diff --git a/src/test/items/metal_powder.test.ts b/test/items/metal_powder.test.ts similarity index 70% rename from src/test/items/metal_powder.test.ts rename to test/items/metal_powder.test.ts index 42ef9c1bb16..460a95d0f06 100644 --- a/src/test/items/metal_powder.test.ts +++ b/test/items/metal_powder.test.ts @@ -4,7 +4,7 @@ import { modifierTypes } from "#app/modifier/modifier-type"; import i18next from "#app/plugins/i18n"; import * as Utils from "#app/utils"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,45 +28,61 @@ describe("Items - Metal Powder", () => { game.override.battleType("single"); }); - it("METAL_POWDER activates in battle correctly", async() => { + it("METAL_POWDER activates in battle correctly", async () => { game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "METAL_POWDER" }]); const consoleSpy = vi.spyOn(console, "log"); - await game.startBattle([ - Species.DITTO - ]); + await game.classicMode.startBattle([Species.DITTO]); const partyMember = game.scene.getPlayerParty()[0]; // Checking console log to make sure Metal Powder is applied when getEffectiveStat (with the appropriate stat) is called partyMember.getEffectiveStat(Stat.DEF); - expect(consoleSpy).toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), ""); + expect(consoleSpy).toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), + "", + ); // Printing dummy console messages along the way so subsequent checks don't pass because of the first console.log(""); partyMember.getEffectiveStat(Stat.SPDEF); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.ATK); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.SPATK); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.SPD); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), + "", + ); }); - it("METAL_POWDER held by DITTO", async() => { - await game.startBattle([ - Species.DITTO - ]); + it("METAL_POWDER held by DITTO", async () => { + await game.startBattle([Species.DITTO]); const partyMember = game.scene.getPlayerParty()[0]; @@ -79,17 +95,17 @@ describe("Items - Metal Powder", () => { expect(defValue.value / defStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "METAL_POWDER" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue); expect(defValue.value / defStat).toBe(2); }, 20000); - it("METAL_POWDER held by fused DITTO (base)", async() => { - await game.startBattle([ - Species.DITTO, - Species.MAROWAK - ]); + it("METAL_POWDER held by fused DITTO (base)", async () => { + await game.startBattle([Species.DITTO, Species.MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -112,17 +128,17 @@ describe("Items - Metal Powder", () => { expect(defValue.value / defStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "METAL_POWDER" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue); expect(defValue.value / defStat).toBe(2); }, 20000); - it("METAL_POWDER held by fused DITTO (part)", async() => { - await game.startBattle([ - Species.MAROWAK, - Species.DITTO - ]); + it("METAL_POWDER held by fused DITTO (part)", async () => { + await game.startBattle([Species.MAROWAK, Species.DITTO]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -145,16 +161,17 @@ describe("Items - Metal Powder", () => { expect(defValue.value / defStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "METAL_POWDER" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue); expect(defValue.value / defStat).toBe(2); }, 20000); - it("METAL_POWDER not held by DITTO", async() => { - await game.startBattle([ - Species.MAROWAK - ]); + it("METAL_POWDER not held by DITTO", async () => { + await game.startBattle([Species.MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; @@ -167,7 +184,10 @@ describe("Items - Metal Powder", () => { expect(defValue.value / defStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "METAL_POWDER" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue); expect(defValue.value / defStat).toBe(1); diff --git a/src/test/items/multi_lens.test.ts b/test/items/multi_lens.test.ts similarity index 75% rename from src/test/items/multi_lens.test.ts rename to test/items/multi_lens.test.ts index bd586878fce..90e73ae88ea 100644 --- a/src/test/items/multi_lens.test.ts +++ b/test/items/multi_lens.test.ts @@ -3,7 +3,7 @@ import { Stat } from "#enums/stat"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -24,7 +24,7 @@ describe("Items - Multi Lens", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.TACKLE, Moves.TRAILBLAZE, Moves.TACHYON_CUTTER, Moves.FUTURE_SIGHT ]) + .moveset([Moves.TACKLE, Moves.TRAILBLAZE, Moves.TACHYON_CUTTER, Moves.FUTURE_SIGHT]) .ability(Abilities.BALL_FETCH) .startingHeldItems([{ name: "MULTI_LENS" }]) .battleType("single") @@ -38,19 +38,20 @@ describe("Items - Multi Lens", () => { it.each([ { stackCount: 1, firstHitDamage: 0.75 }, - { stackCount: 2, firstHitDamage: 0.50 } - ])("$stackCount count: should deal {$firstHitDamage}x damage on the first hit, then hit $stackCount times for 0.25x", + { stackCount: 2, firstHitDamage: 0.5 }, + ])( + "$stackCount count: should deal {$firstHitDamage}x damage on the first hit, then hit $stackCount times for 0.25x", async ({ stackCount, firstHitDamage }) => { game.override.startingHeldItems([{ name: "MULTI_LENS", count: stackCount }]); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemyPokemon = game.scene.getEnemyPokemon()!; const spy = vi.spyOn(enemyPokemon, "getAttackDamage"); vi.spyOn(enemyPokemon, "getBaseDamage").mockReturnValue(100); game.move.select(Moves.TACKLE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); const damageResults = spy.mock.results.map(result => result.value?.damage); @@ -58,24 +59,25 @@ describe("Items - Multi Lens", () => { expect(damageResults).toHaveLength(1 + stackCount); expect(damageResults[0]).toBe(firstHitDamage * 100); damageResults.slice(1).forEach(dmg => expect(dmg).toBe(25)); - }); + }, + ); it("should stack additively with Parental Bond", async () => { game.override.ability(Abilities.PARENTAL_BOND); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.TACKLE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(playerPokemon.turnData.hitCount).toBe(3); }); it("should apply secondary effects on each hit", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -86,7 +88,7 @@ describe("Items - Multi Lens", () => { }); it("should not enhance multi-hit moves", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -97,18 +99,16 @@ describe("Items - Multi Lens", () => { }); it("should enhance multi-target moves", async () => { - game.override - .battleType("double") - .moveset([ Moves.SWIFT, Moves.SPLASH ]); + game.override.battleType("double").moveset([Moves.SWIFT, Moves.SPLASH]); - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); - const [ magikarp, ] = game.scene.getPlayerField(); + const [magikarp] = game.scene.getPlayerField(); game.move.select(Moves.SWIFT, 0); game.move.select(Moves.SPLASH, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("MoveEndPhase"); @@ -116,17 +116,16 @@ describe("Items - Multi Lens", () => { }); it("should enhance fixed-damage moves while also applying damage reduction", async () => { - game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]) - .moveset(Moves.SEISMIC_TOSS); + game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]).moveset(Moves.SEISMIC_TOSS); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; const spy = vi.spyOn(enemyPokemon, "getAttackDamage"); game.move.select(Moves.SEISMIC_TOSS); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); const damageResults = spy.mock.results.map(result => result.value?.damage); @@ -137,42 +136,45 @@ describe("Items - Multi Lens", () => { }); it("should result in correct damage for hp% attacks with 1 lens", async () => { - game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]) + game.override + .startingHeldItems([{ name: "MULTI_LENS", count: 1 }]) .moveset(Moves.SUPER_FANG) .ability(Abilities.COMPOUND_EYES) .enemyLevel(1000) .enemySpecies(Species.BLISSEY); // allows for unrealistically high levels of accuracy - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.SUPER_FANG); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemyPokemon.getHpRatio()).toBeCloseTo(0.5, 5); }); it("should result in correct damage for hp% attacks with 2 lenses", async () => { - game.override.startingHeldItems([{ name: "MULTI_LENS", count: 2 }]) + game.override + .startingHeldItems([{ name: "MULTI_LENS", count: 2 }]) .moveset(Moves.SUPER_FANG) .ability(Abilities.COMPOUND_EYES) .enemyMoveset(Moves.SPLASH) .enemyLevel(1000) .enemySpecies(Species.BLISSEY); // allows for unrealistically high levels of accuracy - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.SUPER_FANG); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemyPokemon.getHpRatio()).toBeCloseTo(0.5, 5); }); it("should result in correct damage for hp% attacks with 2 lenses + Parental Bond", async () => { - game.override.startingHeldItems([{ name: "MULTI_LENS", count: 2 }]) + game.override + .startingHeldItems([{ name: "MULTI_LENS", count: 2 }]) .moveset(Moves.SUPER_FANG) .ability(Abilities.PARENTAL_BOND) .passiveAbility(Abilities.COMPOUND_EYES) @@ -180,19 +182,19 @@ describe("Items - Multi Lens", () => { .enemyLevel(1000) .enemySpecies(Species.BLISSEY); // allows for unrealistically high levels of accuracy - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.SUPER_FANG); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemyPokemon.getHpRatio()).toBeCloseTo(0.25, 5); }); it("should not allow Future Sight to hit infinitely many times if the user switches out", async () => { game.override.enemyLevel(1000); - await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE ]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); const enemyPokemon = game.scene.getEnemyPokemon()!; vi.spyOn(enemyPokemon, "damageAndUpdate"); diff --git a/src/test/items/quick_powder.test.ts b/test/items/quick_powder.test.ts similarity index 69% rename from src/test/items/quick_powder.test.ts rename to test/items/quick_powder.test.ts index d30111cbd6a..26faf5a0f4f 100644 --- a/src/test/items/quick_powder.test.ts +++ b/test/items/quick_powder.test.ts @@ -4,7 +4,7 @@ import { modifierTypes } from "#app/modifier/modifier-type"; import i18next from "#app/plugins/i18n"; import * as Utils from "#app/utils"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,45 +28,61 @@ describe("Items - Quick Powder", () => { game.override.battleType("single"); }); - it("QUICK_POWDER activates in battle correctly", async() => { + it("QUICK_POWDER activates in battle correctly", async () => { game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "QUICK_POWDER" }]); const consoleSpy = vi.spyOn(console, "log"); - await game.startBattle([ - Species.DITTO - ]); + await game.classicMode.startBattle([Species.DITTO]); const partyMember = game.scene.getPlayerParty()[0]; // Checking console log to make sure Quick Powder is applied when getEffectiveStat (with the appropriate stat) is called partyMember.getEffectiveStat(Stat.DEF); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), + "", + ); // Printing dummy console messages along the way so subsequent checks don't pass because of the first console.log(""); partyMember.getEffectiveStat(Stat.SPDEF); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.ATK); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.SPATK); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.SPD); - expect(consoleSpy).toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), ""); + expect(consoleSpy).toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), + "", + ); }); - it("QUICK_POWDER held by DITTO", async() => { - await game.startBattle([ - Species.DITTO - ]); + it("QUICK_POWDER held by DITTO", async () => { + await game.classicMode.startBattle([Species.DITTO]); const partyMember = game.scene.getPlayerParty()[0]; @@ -79,17 +95,17 @@ describe("Items - Quick Powder", () => { expect(spdValue.value / spdStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "QUICK_POWDER" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue); expect(spdValue.value / spdStat).toBe(2); - }, 20000); + }); - it("QUICK_POWDER held by fused DITTO (base)", async() => { - await game.startBattle([ - Species.DITTO, - Species.MAROWAK - ]); + it("QUICK_POWDER held by fused DITTO (base)", async () => { + await game.classicMode.startBattle([Species.DITTO, Species.MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -112,17 +128,17 @@ describe("Items - Quick Powder", () => { expect(spdValue.value / spdStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "QUICK_POWDER" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue); expect(spdValue.value / spdStat).toBe(2); - }, 20000); + }); - it("QUICK_POWDER held by fused DITTO (part)", async() => { - await game.startBattle([ - Species.MAROWAK, - Species.DITTO - ]); + it("QUICK_POWDER held by fused DITTO (part)", async () => { + await game.classicMode.startBattle([Species.MAROWAK, Species.DITTO]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -145,16 +161,17 @@ describe("Items - Quick Powder", () => { expect(spdValue.value / spdStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "QUICK_POWDER" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue); expect(spdValue.value / spdStat).toBe(2); - }, 20000); + }); - it("QUICK_POWDER not held by DITTO", async() => { - await game.startBattle([ - Species.MAROWAK - ]); + it("QUICK_POWDER not held by DITTO", async () => { + await game.classicMode.startBattle([Species.MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; @@ -167,9 +184,12 @@ describe("Items - Quick Powder", () => { expect(spdValue.value / spdStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "QUICK_POWDER" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue); expect(spdValue.value / spdStat).toBe(1); - }, 20000); + }); }); diff --git a/src/test/items/scope_lens.test.ts b/test/items/scope_lens.test.ts similarity index 88% rename from src/test/items/scope_lens.test.ts rename to test/items/scope_lens.test.ts index e39517ceae9..abd5cd7e75c 100644 --- a/src/test/items/scope_lens.test.ts +++ b/test/items/scope_lens.test.ts @@ -1,7 +1,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -25,17 +25,14 @@ describe("Items - Scope Lens", () => { game.override .enemySpecies(Species.MAGIKARP) .enemyMoveset(Moves.SPLASH) - .moveset([ Moves.POUND ]) + .moveset([Moves.POUND]) .startingHeldItems([{ name: "SCOPE_LENS" }]) .battleType("single") .disableCrits(); - }, 20000); it("should raise CRIT stage by 1", async () => { - await game.startBattle([ - Species.GASTLY - ]); + await game.startBattle([Species.GASTLY]); const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/src/test/items/temp_stat_stage_booster.test.ts b/test/items/temp_stat_stage_booster.test.ts similarity index 72% rename from src/test/items/temp_stat_stage_booster.test.ts rename to test/items/temp_stat_stage_booster.test.ts index 3e496d1bbf8..6417f898e3e 100644 --- a/src/test/items/temp_stat_stage_booster.test.ts +++ b/test/items/temp_stat_stage_booster.test.ts @@ -1,5 +1,5 @@ import { BATTLE_STATS, Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -12,7 +12,6 @@ import { Button } from "#app/enums/buttons"; import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; - describe("Items - Temporary Stat Stage Boosters", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -35,14 +34,12 @@ describe("Items - Temporary Stat Stage Boosters", () => { .enemySpecies(Species.SHUCKLE) .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) - .moveset([ Moves.TACKLE, Moves.SPLASH, Moves.HONE_CLAWS, Moves.BELLY_DRUM ]) + .moveset([Moves.TACKLE, Moves.SPLASH, Moves.HONE_CLAWS, Moves.BELLY_DRUM]) .startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]); }); - it("should provide a x1.3 stat stage multiplier", async() => { - await game.classicMode.startBattle([ - Species.PIKACHU - ]); + it("should provide a x1.3 stat stage multiplier", async () => { + await game.classicMode.startBattle([Species.PIKACHU]); const partyMember = game.scene.getPlayerPokemon()!; @@ -55,14 +52,10 @@ describe("Items - Temporary Stat Stage Boosters", () => { expect(partyMember.getStatStageMultiplier).toHaveReturnedWith(1.3); }, 20000); - it("should increase existing ACC stat stage by 1 for X_ACCURACY only", async() => { - game.override - .startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }]) - .ability(Abilities.SIMPLE); + it("should increase existing ACC stat stage by 1 for X_ACCURACY only", async () => { + game.override.startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }]).ability(Abilities.SIMPLE); - await game.classicMode.startBattle([ - Species.PIKACHU - ]); + await game.classicMode.startBattle([Species.PIKACHU]); const partyMember = game.scene.getPlayerPokemon()!; @@ -81,11 +74,8 @@ describe("Items - Temporary Stat Stage Boosters", () => { expect(partyMember.getAccuracyMultiplier).toHaveReturnedWith(2); }, 20000); - - it("should increase existing stat stage multiplier by 3/10 for the rest of the boosters", async() => { - await game.classicMode.startBattle([ - Species.PIKACHU - ]); + it("should increase existing stat stage multiplier by 3/10 for the rest of the boosters", async () => { + await game.classicMode.startBattle([Species.PIKACHU]); const partyMember = game.scene.getPlayerPokemon()!; @@ -104,13 +94,14 @@ describe("Items - Temporary Stat Stage Boosters", () => { expect(partyMember.getStatStageMultiplier).toHaveReturnedWith(1.8); }, 20000); - it("should not increase past maximum stat stage multiplier", async() => { - game.override.startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }, { name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]); - - await game.classicMode.startBattle([ - Species.PIKACHU + it("should not increase past maximum stat stage multiplier", async () => { + game.override.startingModifier([ + { name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }, + { name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }, ]); + await game.classicMode.startBattle([Species.PIKACHU]); + const partyMember = game.scene.getPlayerPokemon()!; vi.spyOn(partyMember, "getStatStageMultiplier"); @@ -127,14 +118,10 @@ describe("Items - Temporary Stat Stage Boosters", () => { expect(partyMember.getStatStageMultiplier).toHaveReturnedWith(4); }, 20000); - it("should renew how many battles are left of existing booster when picking up new booster of same type", async() => { - game.override - .startingLevel(200) - .itemRewards([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]); + it("should renew how many battles are left of existing booster when picking up new booster of same type", async () => { + game.override.startingLevel(200).itemRewards([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]); - await game.classicMode.startBattle([ - Species.PIKACHU - ]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.SPLASH); @@ -142,17 +129,25 @@ describe("Items - Temporary Stat Stage Boosters", () => { await game.phaseInterceptor.to("BattleEndPhase"); - const modifier = game.scene.findModifier(m => m instanceof TempStatStageBoosterModifier) as TempStatStageBoosterModifier; + const modifier = game.scene.findModifier( + m => m instanceof TempStatStageBoosterModifier, + ) as TempStatStageBoosterModifier; expect(modifier.getBattleCount()).toBe(4); // Forced X_ATTACK to spawn in the first slot with override - game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => { - const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler; - // Traverse to first modifier slot - handler.setCursor(0); - handler.setRowCursor(ShopCursorTarget.REWARDS); - handler.processInput(Button.ACTION); - }, () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("NewBattlePhase"), true); + game.onNextPrompt( + "SelectModifierPhase", + Mode.MODIFIER_SELECT, + () => { + const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler; + // Traverse to first modifier slot + handler.setCursor(0); + handler.setRowCursor(ShopCursorTarget.REWARDS); + handler.processInput(Button.ACTION); + }, + () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("NewBattlePhase"), + true, + ); await game.phaseInterceptor.to("TurnInitPhase"); diff --git a/src/test/items/thick_club.test.ts b/test/items/thick_club.test.ts similarity index 68% rename from src/test/items/thick_club.test.ts rename to test/items/thick_club.test.ts index 08b19250ea7..9edbbcdc7d9 100644 --- a/src/test/items/thick_club.test.ts +++ b/test/items/thick_club.test.ts @@ -4,7 +4,7 @@ import { modifierTypes } from "#app/modifier/modifier-type"; import i18next from "#app/plugins/i18n"; import * as Utils from "#app/utils"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,45 +28,61 @@ describe("Items - Thick Club", () => { game.override.battleType("single"); }); - it("THICK_CLUB activates in battle correctly", async() => { + it("THICK_CLUB activates in battle correctly", async () => { game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "THICK_CLUB" }]); const consoleSpy = vi.spyOn(console, "log"); - await game.startBattle([ - Species.CUBONE - ]); + await game.classicMode.startBattle([Species.CUBONE]); const partyMember = game.scene.getPlayerParty()[0]; // Checking console log to make sure Thick Club is applied when getEffectiveStat (with the appropriate stat) is called partyMember.getEffectiveStat(Stat.DEF); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), + "", + ); // Printing dummy console messages along the way so subsequent checks don't pass because of the first console.log(""); partyMember.getEffectiveStat(Stat.SPDEF); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.ATK); - expect(consoleSpy).toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), ""); + expect(consoleSpy).toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.SPATK); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), + "", + ); console.log(""); partyMember.getEffectiveStat(Stat.SPD); - expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), ""); + expect(consoleSpy).not.toHaveBeenLastCalledWith( + "Applied", + i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), + "", + ); }); - it("THICK_CLUB held by CUBONE", async() => { - await game.startBattle([ - Species.CUBONE - ]); + it("THICK_CLUB held by CUBONE", async () => { + await game.classicMode.startBattle([Species.CUBONE]); const partyMember = game.scene.getPlayerParty()[0]; @@ -79,16 +95,17 @@ describe("Items - Thick Club", () => { expect(atkValue.value / atkStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); expect(atkValue.value / atkStat).toBe(2); - }, 20000); + }); - it("THICK_CLUB held by MAROWAK", async() => { - await game.startBattle([ - Species.MAROWAK - ]); + it("THICK_CLUB held by MAROWAK", async () => { + await game.classicMode.startBattle([Species.MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; @@ -101,16 +118,17 @@ describe("Items - Thick Club", () => { expect(atkValue.value / atkStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); expect(atkValue.value / atkStat).toBe(2); - }, 20000); + }); - it("THICK_CLUB held by ALOLA_MAROWAK", async() => { - await game.startBattle([ - Species.ALOLA_MAROWAK - ]); + it("THICK_CLUB held by ALOLA_MAROWAK", async () => { + await game.classicMode.startBattle([Species.ALOLA_MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; @@ -123,21 +141,21 @@ describe("Items - Thick Club", () => { expect(atkValue.value / atkStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); expect(atkValue.value / atkStat).toBe(2); - }, 20000); + }); - it("THICK_CLUB held by fused CUBONE line (base)", async() => { + it("THICK_CLUB held by fused CUBONE line (base)", async () => { // Randomly choose from the Cubone line - const species = [ Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK ]; + const species = [Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK]; const randSpecies = Utils.randInt(species.length); - await game.startBattle([ - species[randSpecies], - Species.PIKACHU - ]); + await game.classicMode.startBattle([species[randSpecies], Species.PIKACHU]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -160,21 +178,21 @@ describe("Items - Thick Club", () => { expect(atkValue.value / atkStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); expect(atkValue.value / atkStat).toBe(2); - }, 20000); + }); - it("THICK_CLUB held by fused CUBONE line (part)", async() => { + it("THICK_CLUB held by fused CUBONE line (part)", async () => { // Randomly choose from the Cubone line - const species = [ Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK ]; + const species = [Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK]; const randSpecies = Utils.randInt(species.length); - await game.startBattle([ - Species.PIKACHU, - species[randSpecies] - ]); + await game.classicMode.startBattle([Species.PIKACHU, species[randSpecies]]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -197,16 +215,17 @@ describe("Items - Thick Club", () => { expect(atkValue.value / atkStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); expect(atkValue.value / atkStat).toBe(2); - }, 20000); + }); - it("THICK_CLUB not held by CUBONE", async() => { - await game.startBattle([ - Species.PIKACHU - ]); + it("THICK_CLUB not held by CUBONE", async () => { + await game.classicMode.startBattle([Species.PIKACHU]); const partyMember = game.scene.getPlayerParty()[0]; @@ -219,9 +238,12 @@ describe("Items - Thick Club", () => { expect(atkValue.value / atkStat).toBe(1); // Giving Eviolite to party member and testing if it applies - game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true); + await game.scene.addModifier( + modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + true, + ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); expect(atkValue.value / atkStat).toBe(1); - }, 20000); + }); }); diff --git a/src/test/items/toxic_orb.test.ts b/test/items/toxic_orb.test.ts similarity index 87% rename from src/test/items/toxic_orb.test.ts rename to test/items/toxic_orb.test.ts index 6918d7f34f0..57e6b651b66 100644 --- a/src/test/items/toxic_orb.test.ts +++ b/test/items/toxic_orb.test.ts @@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -30,15 +30,17 @@ describe("Items - Toxic orb", () => { .enemyAbility(Abilities.BALL_FETCH) .moveset(Moves.SPLASH) .enemyMoveset(Moves.SPLASH) - .startingHeldItems([{ - name: "TOXIC_ORB", - }]); + .startingHeldItems([ + { + name: "TOXIC_ORB", + }, + ]); vi.spyOn(i18next, "t"); }); it("should badly poison the holder", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const player = game.scene.getPlayerPokemon()!; expect(player.getHeldItems()[0].type.id).toBe("TOXIC_ORB"); diff --git a/src/test/misc.test.ts b/test/misc.test.ts similarity index 75% rename from src/test/misc.test.ts rename to test/misc.test.ts index ae91a5014d9..12ed165d9d9 100644 --- a/src/test/misc.test.ts +++ b/test/misc.test.ts @@ -1,6 +1,6 @@ // import { apiFetch } from "#app/utils"; -import GameManager from "#test/utils/gameManager"; -import { waitUntil } from "#test/utils/gameManagerUtils"; +import GameManager from "#test/testUtils/gameManager"; +import { waitUntil } from "#test/testUtils/gameManagerUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -24,14 +24,16 @@ describe("Test misc", () => { it("test fetch mock async", async () => { const spy = vi.fn(); - await fetch("https://localhost:8080/account/info").then(response => { - expect(response.status).toBe(200); - expect(response.ok).toBe(true); - return response.json(); - }).then(data => { - spy(); // Call the spy function - expect(data).toEqual({ "username": "greenlamp", "lastSessionSlot": 0 }); - }); + await fetch("https://localhost:8080/account/info") + .then(response => { + expect(response.status).toBe(200); + expect(response.ok).toBe(true); + return response.json(); + }) + .then(data => { + spy(); // Call the spy function + expect(data).toEqual({ username: "greenlamp", lastSessionSlot: 0 }); + }); expect(spy).toHaveBeenCalled(); }); @@ -54,7 +56,7 @@ describe("Test misc", () => { expect(response.ok).toBe(true); expect(response.status).toBe(200); - expect(data).toEqual({ "username": "greenlamp", "lastSessionSlot": 0 }); + expect(data).toEqual({ username: "greenlamp", lastSessionSlot: 0 }); }); it("test apifetch mock sync", async () => { @@ -64,7 +66,7 @@ describe("Test misc", () => { it("testing wait phase queue", async () => { const fakeScene = { - phaseQueue: [ 1, 2, 3 ] // Initially not empty + phaseQueue: [1, 2, 3], // Initially not empty }; setTimeout(() => { fakeScene.phaseQueue = []; diff --git a/src/test/moves/after_you.test.ts b/test/moves/after_you.test.ts similarity index 87% rename from src/test/moves/after_you.test.ts rename to test/moves/after_you.test.ts index 99f383194aa..fde19b87b5d 100644 --- a/src/test/moves/after_you.test.ts +++ b/test/moves/after_you.test.ts @@ -4,11 +4,10 @@ import { MoveResult } from "#app/field/pokemon"; import { MovePhase } from "#app/phases/move-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Moves - After You", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -32,11 +31,11 @@ describe("Moves - After You", () => { .enemyAbility(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) .ability(Abilities.BALL_FETCH) - .moveset([ Moves.AFTER_YOU, Moves.SPLASH ]); + .moveset([Moves.AFTER_YOU, Moves.SPLASH]); }); it("makes the target move immediately after the user", async () => { - await game.classicMode.startBattle([ Species.REGIELEKI, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.REGIELEKI, Species.SHUCKLE]); game.move.select(Moves.AFTER_YOU, 0, BattlerIndex.PLAYER_2); game.move.select(Moves.SPLASH, 1); @@ -50,7 +49,7 @@ describe("Moves - After You", () => { it("fails if target already moved", async () => { game.override.enemySpecies(Species.SHUCKLE); - await game.classicMode.startBattle([ Species.REGIELEKI, Species.PIKACHU ]); + await game.classicMode.startBattle([Species.REGIELEKI, Species.PIKACHU]); game.move.select(Moves.SPLASH); game.move.select(Moves.AFTER_YOU, 1, BattlerIndex.PLAYER); diff --git a/src/test/moves/alluring_voice.test.ts b/test/moves/alluring_voice.test.ts similarity index 86% rename from src/test/moves/alluring_voice.test.ts rename to test/moves/alluring_voice.test.ts index 2980f102735..777078e4786 100644 --- a/src/test/moves/alluring_voice.test.ts +++ b/test/moves/alluring_voice.test.ts @@ -4,11 +4,10 @@ import { BattlerTagType } from "#app/enums/battler-tag-type"; import { BerryPhase } from "#app/phases/berry-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Moves - Alluring Voice", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -30,13 +29,12 @@ describe("Moves - Alluring Voice", () => { .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.ICE_SCALES) - .enemyMoveset([ Moves.HOWL ]) + .enemyMoveset([Moves.HOWL]) .startingLevel(10) .enemyLevel(10) .starterSpecies(Species.FEEBAS) .ability(Abilities.BALL_FETCH) - .moveset([ Moves.ALLURING_VOICE ]); - + .moveset([Moves.ALLURING_VOICE]); }); it("should confuse the opponent if their stat stages were raised", async () => { @@ -45,7 +43,7 @@ describe("Moves - Alluring Voice", () => { const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.ALLURING_VOICE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to(BerryPhase); expect(enemy.getTag(BattlerTagType.CONFUSED)?.tagType).toBe("CONFUSED"); diff --git a/src/test/moves/aromatherapy.test.ts b/test/moves/aromatherapy.test.ts similarity index 83% rename from src/test/moves/aromatherapy.test.ts rename to test/moves/aromatherapy.test.ts index 874dadc0a1f..fe7a008249f 100644 --- a/src/test/moves/aromatherapy.test.ts +++ b/test/moves/aromatherapy.test.ts @@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; @@ -24,7 +24,7 @@ describe("Moves - Aromatherapy", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.AROMATHERAPY, Moves.SPLASH ]) + .moveset([Moves.AROMATHERAPY, Moves.SPLASH]) .statusEffect(StatusEffect.BURN) .battleType("double") .enemyAbility(Abilities.BALL_FETCH) @@ -32,8 +32,8 @@ describe("Moves - Aromatherapy", () => { }); it("should cure status effect of the user, its ally, and all party pokemon", async () => { - await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty(); + await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA, Species.RATTATA]); + const [leftPlayer, rightPlayer, partyPokemon] = game.scene.getPlayerParty(); vi.spyOn(leftPlayer, "resetStatus"); vi.spyOn(rightPlayer, "resetStatus"); @@ -55,8 +55,8 @@ describe("Moves - Aromatherapy", () => { it("should not cure status effect of the target/target's allies", async () => { game.override.enemyStatusEffect(StatusEffect.BURN); - await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA ]); - const [ leftOpp, rightOpp ] = game.scene.getEnemyField(); + await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA]); + const [leftOpp, rightOpp] = game.scene.getEnemyField(); vi.spyOn(leftOpp, "resetStatus"); vi.spyOn(rightOpp, "resetStatus"); @@ -78,8 +78,8 @@ describe("Moves - Aromatherapy", () => { it("should not cure status effect of allies ON FIELD with Sap Sipper, should still cure allies in party", async () => { game.override.ability(Abilities.SAP_SIPPER); - await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty(); + await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA, Species.RATTATA]); + const [leftPlayer, rightPlayer, partyPokemon] = game.scene.getPlayerParty(); vi.spyOn(leftPlayer, "resetStatus"); vi.spyOn(rightPlayer, "resetStatus"); diff --git a/src/test/moves/assist.test.ts b/test/moves/assist.test.ts similarity index 65% rename from src/test/moves/assist.test.ts rename to test/moves/assist.test.ts index 81633d9a277..68322a7f193 100644 --- a/src/test/moves/assist.test.ts +++ b/test/moves/assist.test.ts @@ -5,7 +5,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -39,16 +39,16 @@ describe("Moves - Assist", () => { it("should only use an ally's moves", async () => { game.override.enemyMoveset(Moves.SWORDS_DANCE); - await game.classicMode.startBattle([ Species.FEEBAS, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.SHUCKLE]); - const [ feebas, shuckle ] = game.scene.getPlayerField(); + const [feebas, shuckle] = game.scene.getPlayerField(); // These are all moves Assist cannot call; Sketch will be used to test that it can call other moves properly - game.move.changeMoveset(feebas, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]); - game.move.changeMoveset(shuckle, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]); + game.move.changeMoveset(feebas, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]); + game.move.changeMoveset(shuckle, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]); game.move.select(Moves.ASSIST, 0); game.move.select(Moves.SKETCH, 1); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER]); // Player_2 uses Sketch, copies Swords Dance, Player_1 uses Assist, uses Player_2's Sketched Swords Dance await game.toNextTurn(); @@ -56,10 +56,10 @@ describe("Moves - Assist", () => { }); it("should fail if there are no allies", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const feebas = game.scene.getPlayerPokemon()!; - game.move.changeMoveset(feebas, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]); + game.move.changeMoveset(feebas, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]); game.move.select(Moves.ASSIST, 0); await game.toNextTurn(); @@ -68,15 +68,15 @@ describe("Moves - Assist", () => { it("should fail if ally has no usable moves and user has usable moves", async () => { game.override.enemyMoveset(Moves.SWORDS_DANCE); - await game.classicMode.startBattle([ Species.FEEBAS, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.SHUCKLE]); - const [ feebas, shuckle ] = game.scene.getPlayerField(); - game.move.changeMoveset(feebas, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]); - game.move.changeMoveset(shuckle, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]); + const [feebas, shuckle] = game.scene.getPlayerField(); + game.move.changeMoveset(feebas, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]); + game.move.changeMoveset(shuckle, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]); game.move.select(Moves.SKETCH, 0); game.move.select(Moves.PROTECT, 1); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]); // Player uses Sketch to copy Swords Dance, Player_2 stalls a turn. Player will attempt Assist and should have no usable moves await game.toNextTurn(); game.move.select(Moves.ASSIST, 0); @@ -88,12 +88,12 @@ describe("Moves - Assist", () => { }); it("should apply secondary effects of a move", async () => { - game.override.moveset([ Moves.ASSIST, Moves.WOOD_HAMMER, Moves.WOOD_HAMMER, Moves.WOOD_HAMMER ]); - await game.classicMode.startBattle([ Species.FEEBAS, Species.SHUCKLE ]); + game.override.moveset([Moves.ASSIST, Moves.WOOD_HAMMER, Moves.WOOD_HAMMER, Moves.WOOD_HAMMER]); + await game.classicMode.startBattle([Species.FEEBAS, Species.SHUCKLE]); - const [ feebas, shuckle ] = game.scene.getPlayerField(); - game.move.changeMoveset(feebas, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]); - game.move.changeMoveset(shuckle, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]); + const [feebas, shuckle] = game.scene.getPlayerField(); + game.move.changeMoveset(feebas, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]); + game.move.changeMoveset(shuckle, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]); game.move.select(Moves.ASSIST, 0); await game.phaseInterceptor.to(CommandPhase); diff --git a/src/test/moves/astonish.test.ts b/test/moves/astonish.test.ts similarity index 51% rename from src/test/moves/astonish.test.ts rename to test/moves/astonish.test.ts index d94e50fc9f9..53922060ae6 100644 --- a/src/test/moves/astonish.test.ts +++ b/test/moves/astonish.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { BerryPhase } from "#app/phases/berry-phase"; import { CommandPhase } from "#app/phases/command-phase"; @@ -7,11 +7,10 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; - describe("Moves - Astonish", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -29,43 +28,40 @@ describe("Moves - Astonish", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("single"); - game.override.moveset([ Moves.ASTONISH, Moves.SPLASH ]); + game.override.moveset([Moves.ASTONISH, Moves.SPLASH]); game.override.enemySpecies(Species.BLASTOISE); game.override.enemyAbility(Abilities.INSOMNIA); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); game.override.startingLevel(100); game.override.enemyLevel(100); vi.spyOn(allMoves[Moves.ASTONISH], "chance", "get").mockReturnValue(100); }); - test( - "move effect should cancel the target's move on the turn it applies", - async () => { - await game.startBattle([ Species.MEOWSCARADA ]); + test("move effect should cancel the target's move on the turn it applies", async () => { + await game.startBattle([Species.MEOWSCARADA]); - const leadPokemon = game.scene.getPlayerPokemon()!; + const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; - game.move.select(Moves.ASTONISH); + game.move.select(Moves.ASTONISH); - await game.phaseInterceptor.to(MoveEndPhase, false); + await game.phaseInterceptor.to(MoveEndPhase, false); - expect(enemyPokemon.getTag(BattlerTagType.FLINCHED)).toBeDefined(); + expect(enemyPokemon.getTag(BattlerTagType.FLINCHED)).toBeDefined(); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to(TurnEndPhase); - expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); - expect(enemyPokemon.getTag(BattlerTagType.FLINCHED)).toBeUndefined(); + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(enemyPokemon.getTag(BattlerTagType.FLINCHED)).toBeUndefined(); - await game.phaseInterceptor.to(CommandPhase, false); + await game.phaseInterceptor.to(CommandPhase, false); - game.move.select(Moves.SPLASH); + game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to(BerryPhase, false); - expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp()); - } - ); + expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp()); + }); }); diff --git a/src/test/moves/aurora_veil.test.ts b/test/moves/aurora_veil.test.ts similarity index 55% rename from src/test/moves/aurora_veil.test.ts rename to test/moves/aurora_veil.test.ts index 721f682f778..31f6497bae5 100644 --- a/src/test/moves/aurora_veil.test.ts +++ b/test/moves/aurora_veil.test.ts @@ -1,7 +1,7 @@ import type BattleScene from "#app/battle-scene"; import { ArenaTagSide } from "#app/data/arena-tag"; -import type Move from "#app/data/move"; -import { allMoves } from "#app/data/move"; +import type Move from "#app/data/moves/move"; +import { allMoves, CritOnlyAttr } from "#app/data/moves/move"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import type Pokemon from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; @@ -10,9 +10,9 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; let globalScene: BattleScene; @@ -37,22 +37,26 @@ describe("Moves - Aurora Veil", () => { globalScene = game.scene; game.override.battleType("single"); game.override.ability(Abilities.NONE); - game.override.moveset([ Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE ]); + game.override.moveset([Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE]); game.override.enemyLevel(100); game.override.enemySpecies(Species.MAGIKARP); - game.override.enemyMoveset([ Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL ]); + game.override.enemyMoveset([Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL]); game.override.disableCrits(); game.override.weather(WeatherType.HAIL); }); it("reduces damage of physical attacks by half in a single battle", async () => { const moveToUse = Moves.TACKLE; - await game.startBattle([ Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE]); game.move.select(moveToUse); await game.phaseInterceptor.to(TurnEndPhase); - const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]); + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); expect(mockedDmg).toBe(allMoves[moveToUse].power * singleBattleMultiplier); }); @@ -61,26 +65,34 @@ describe("Moves - Aurora Veil", () => { game.override.battleType("double"); const moveToUse = Moves.ROCK_SLIDE; - await game.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]); game.move.select(moveToUse); game.move.select(moveToUse, 1); await game.phaseInterceptor.to(TurnEndPhase); - const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]); + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); expect(mockedDmg).toBe(allMoves[moveToUse].power * doubleBattleMultiplier); }); it("reduces damage of special attacks by half in a single battle", async () => { const moveToUse = Moves.ABSORB; - await game.startBattle([ Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE]); game.move.select(moveToUse); await game.phaseInterceptor.to(TurnEndPhase); - const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]); + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); expect(mockedDmg).toBe(allMoves[moveToUse].power * singleBattleMultiplier); }); @@ -89,16 +101,53 @@ describe("Moves - Aurora Veil", () => { game.override.battleType("double"); const moveToUse = Moves.DAZZLING_GLEAM; - await game.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]); game.move.select(moveToUse); game.move.select(moveToUse, 1); await game.phaseInterceptor.to(TurnEndPhase); - const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]); + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); expect(mockedDmg).toBe(allMoves[moveToUse].power * doubleBattleMultiplier); }); + + it("does not affect physical critical hits", async () => { + game.override.moveset([Moves.WICKED_BLOW]); + const moveToUse = Moves.WICKED_BLOW; + await game.classicMode.startBattle([Species.SHUCKLE]); + + game.move.select(moveToUse); + await game.phaseInterceptor.to(TurnEndPhase); + + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); + expect(mockedDmg).toBe(allMoves[moveToUse].power); + }); + + it("does not affect critical hits", async () => { + game.override.moveset([Moves.FROST_BREATH]); + const moveToUse = Moves.FROST_BREATH; + vi.spyOn(allMoves[Moves.FROST_BREATH], "accuracy", "get").mockReturnValue(100); + await game.classicMode.startBattle([Species.SHUCKLE]); + + game.move.select(moveToUse); + await game.phaseInterceptor.to(TurnEndPhase); + + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); + expect(mockedDmg).toBe(allMoves[moveToUse].power); + }); }); /** @@ -115,7 +164,16 @@ const getMockedMoveDamage = (defender: Pokemon, attacker: Pokemon, move: Move) = const side = defender.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; if (globalScene.arena.getTagOnSide(ArenaTagType.AURORA_VEIL, side)) { - globalScene.arena.applyTagsForSide(ArenaTagType.AURORA_VEIL, side, false, attacker, move.category, multiplierHolder); + if (move.getAttrs(CritOnlyAttr).length === 0) { + globalScene.arena.applyTagsForSide( + ArenaTagType.AURORA_VEIL, + side, + false, + attacker, + move.category, + multiplierHolder, + ); + } } return move.power * multiplierHolder.value; diff --git a/test/moves/autotomize.test.ts b/test/moves/autotomize.test.ts new file mode 100644 index 00000000000..62ef185dea8 --- /dev/null +++ b/test/moves/autotomize.test.ts @@ -0,0 +1,109 @@ +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; + +describe("Moves - Autotomize", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + const TIMEOUT = 20 * 1000; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.AUTOTOMIZE, Moves.KINGS_SHIELD, Moves.FALSE_SWIPE]) + .battleType("single") + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it( + "Autotomize should reduce weight", + async () => { + const baseDracozoltWeight = 190; + const oneAutotomizeDracozoltWeight = 90; + const twoAutotomizeDracozoltWeight = 0.1; + const threeAutotomizeDracozoltWeight = 0.1; + + await game.classicMode.startBattle([Species.DRACOZOLT]); + const playerPokemon = game.scene.getPlayerPokemon()!; + expect(playerPokemon.getWeight()).toBe(baseDracozoltWeight); + game.move.select(Moves.AUTOTOMIZE); + await game.toNextTurn(); + expect(playerPokemon.getWeight()).toBe(oneAutotomizeDracozoltWeight); + + game.move.select(Moves.AUTOTOMIZE); + await game.toNextTurn(); + expect(playerPokemon.getWeight()).toBe(twoAutotomizeDracozoltWeight); + + game.move.select(Moves.AUTOTOMIZE); + await game.toNextTurn(); + expect(playerPokemon.getWeight()).toBe(threeAutotomizeDracozoltWeight); + }, + TIMEOUT, + ); + + it( + "Changing forms should revert weight", + async () => { + const baseAegislashWeight = 53; + const autotomizeAegislashWeight = 0.1; + + await game.classicMode.startBattle([Species.AEGISLASH]); + const playerPokemon = game.scene.getPlayerPokemon()!; + + expect(playerPokemon.getWeight()).toBe(baseAegislashWeight); + + game.move.select(Moves.AUTOTOMIZE); + await game.toNextTurn(); + expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight); + + // Transform to sword form + game.move.select(Moves.FALSE_SWIPE); + await game.toNextTurn(); + expect(playerPokemon.getWeight()).toBe(baseAegislashWeight); + + game.move.select(Moves.AUTOTOMIZE); + await game.toNextTurn(); + expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight); + + // Transform to shield form + game.move.select(Moves.KINGS_SHIELD); + await game.toNextTurn(); + expect(playerPokemon.getWeight()).toBe(baseAegislashWeight); + + game.move.select(Moves.AUTOTOMIZE); + await game.toNextTurn(); + expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight); + }, + TIMEOUT, + ); + + it( + "Autotomize should interact with light metal correctly", + async () => { + const baseLightGroudonWeight = 475; + const autotomizeLightGroudonWeight = 425; + game.override.ability(Abilities.LIGHT_METAL); + await game.classicMode.startBattle([Species.GROUDON]); + const playerPokemon = game.scene.getPlayerPokemon()!; + expect(playerPokemon.getWeight()).toBe(baseLightGroudonWeight); + game.move.select(Moves.AUTOTOMIZE); + await game.toNextTurn(); + expect(playerPokemon.getWeight()).toBe(autotomizeLightGroudonWeight); + }, + TIMEOUT, + ); +}); diff --git a/src/test/moves/baddy_bad.test.ts b/test/moves/baddy_bad.test.ts similarity index 87% rename from src/test/moves/baddy_bad.test.ts rename to test/moves/baddy_bad.test.ts index 1be25704393..cba13c7ac68 100644 --- a/src/test/moves/baddy_bad.test.ts +++ b/test/moves/baddy_bad.test.ts @@ -1,7 +1,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -21,7 +21,7 @@ describe("Moves - Baddy Bad", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .battleType("single") .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) @@ -31,7 +31,7 @@ describe("Moves - Baddy Bad", () => { it("should not activate Reflect if the move fails due to Protect", async () => { game.override.enemyMoveset(Moves.PROTECT); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.BADDY_BAD); await game.phaseInterceptor.to("BerryPhase"); diff --git a/test/moves/baneful_bunker.test.ts b/test/moves/baneful_bunker.test.ts new file mode 100644 index 00000000000..4624d77dc42 --- /dev/null +++ b/test/moves/baneful_bunker.test.ts @@ -0,0 +1,82 @@ +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; +import GameManager from "#test/testUtils/gameManager"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { BattlerIndex } from "#app/battle"; +import { StatusEffect } from "#app/enums/status-effect"; + +describe("Moves - Baneful Bunker", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override.battleType("single"); + + game.override.moveset(Moves.SLASH); + + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyAbility(Abilities.INSOMNIA); + game.override.enemyMoveset(Moves.BANEFUL_BUNKER); + + game.override.startingLevel(100); + game.override.enemyLevel(100); + }); + test("should protect the user and poison attackers that make contact", async () => { + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.SLASH); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.phaseInterceptor.to("BerryPhase", false); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeTruthy(); + }); + test("should protect the user and poison attackers that make contact, regardless of accuracy checks", async () => { + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.SLASH); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + await game.move.forceMiss(); + await game.phaseInterceptor.to("BerryPhase", false); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeTruthy(); + }); + + test("should not poison attackers that don't make contact", async () => { + game.override.moveset(Moves.FLASH_CANNON); + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.FLASH_CANNON); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + await game.move.forceMiss(); + await game.phaseInterceptor.to("BerryPhase", false); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeFalsy(); + }); +}); diff --git a/src/test/moves/baton_pass.test.ts b/test/moves/baton_pass.test.ts similarity index 73% rename from src/test/moves/baton_pass.test.ts rename to test/moves/baton_pass.test.ts index 52e4c3ec016..9db6ec7c518 100644 --- a/src/test/moves/baton_pass.test.ts +++ b/test/moves/baton_pass.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Abilities } from "#enums/abilities"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; @@ -28,7 +28,7 @@ describe("Moves - Baton Pass", () => { .battleType("single") .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) - .moveset([ Moves.BATON_PASS, Moves.NASTY_PLOT, Moves.SPLASH ]) + .moveset([Moves.BATON_PASS, Moves.NASTY_PLOT, Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) .disableCrits(); @@ -36,7 +36,7 @@ describe("Moves - Baton Pass", () => { it("transfers all stat stages when player uses it", async () => { // arrange - await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]); // round 1 - buff game.move.select(Moves.NASTY_PLOT); @@ -59,10 +59,8 @@ describe("Moves - Baton Pass", () => { it("passes stat stage buffs when AI uses it", async () => { // arrange - game.override - .startingWave(5) - .enemyMoveset(new Array(4).fill([ Moves.NASTY_PLOT ])); - await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]); + game.override.startingWave(5).enemyMoveset(new Array(4).fill([Moves.NASTY_PLOT])); + await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]); // round 1 - ai buffs game.move.select(Moves.SPLASH); @@ -70,7 +68,7 @@ describe("Moves - Baton Pass", () => { // round 2 - baton pass game.scene.getEnemyPokemon()!.hp = 100; - game.override.enemyMoveset([ Moves.BATON_PASS ]); + game.override.enemyMoveset([Moves.BATON_PASS]); // Force moveset to update mid-battle // TODO: replace with enemy ai control function when it's added game.scene.getEnemyParty()[0].getMoveset(); @@ -87,35 +85,35 @@ describe("Moves - Baton Pass", () => { "MoveEffectPhase", "SwitchSummonPhase", "SummonPhase", - "PostSummonPhase" + "PostSummonPhase", ]); }, 20000); it("doesn't transfer effects that aren't transferrable", async () => { - game.override.enemyMoveset([ Moves.SALT_CURE ]); - await game.classicMode.startBattle([ Species.PIKACHU, Species.FEEBAS ]); + game.override.enemyMoveset([Moves.SALT_CURE]); + await game.classicMode.startBattle([Species.PIKACHU, Species.FEEBAS]); - const [ player1, player2 ] = game.scene.getPlayerParty(); + const [player1, player2] = game.scene.getPlayerParty(); game.move.select(Moves.BATON_PASS); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("MoveEndPhase"); - expect(player1.findTag((t) => t.tagType === BattlerTagType.SALT_CURED)).toBeTruthy(); + expect(player1.findTag(t => t.tagType === BattlerTagType.SALT_CURED)).toBeTruthy(); game.doSelectPartyPokemon(1); await game.toNextTurn(); - expect(player2.findTag((t) => t.tagType === BattlerTagType.SALT_CURED)).toBeUndefined(); + expect(player2.findTag(t => t.tagType === BattlerTagType.SALT_CURED)).toBeUndefined(); }, 20000); it("doesn't allow binding effects from the user to persist", async () => { - game.override.moveset([ Moves.FIRE_SPIN, Moves.BATON_PASS ]); + game.override.moveset([Moves.FIRE_SPIN, Moves.BATON_PASS]); - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.FIRE_SPIN); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); await game.toNextTurn(); @@ -123,7 +121,7 @@ describe("Moves - Baton Pass", () => { expect(enemy.getTag(BattlerTagType.FIRE_SPIN)).toBeDefined(); game.move.select(Moves.BATON_PASS); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); game.doSelectPartyPokemon(1); await game.toNextTurn(); diff --git a/test/moves/beak_blast.test.ts b/test/moves/beak_blast.test.ts new file mode 100644 index 00000000000..9f8b1e3d5c3 --- /dev/null +++ b/test/moves/beak_blast.test.ts @@ -0,0 +1,119 @@ +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { StatusEffect } from "#app/enums/status-effect"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { MovePhase } from "#app/phases/move-phase"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Beak Blast", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("single") + .ability(Abilities.UNNERVE) + .moveset([Moves.BEAK_BLAST]) + .enemySpecies(Species.SNORLAX) + .enemyAbility(Abilities.INSOMNIA) + .enemyMoveset([Moves.TACKLE]) + .startingLevel(100) + .enemyLevel(100); + }); + + it("should add a charge effect that burns attackers on contact", async () => { + await game.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.BEAK_BLAST); + + await game.phaseInterceptor.to(MovePhase, false); + expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined(); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.status?.effect).toBe(StatusEffect.BURN); + }); + + it("should still charge and burn opponents if the user is sleeping", async () => { + game.override.statusEffect(StatusEffect.SLEEP); + + await game.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.BEAK_BLAST); + + await game.phaseInterceptor.to(MovePhase, false); + expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined(); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.status?.effect).toBe(StatusEffect.BURN); + }); + + it("should not burn attackers that don't make contact", async () => { + game.override.enemyMoveset([Moves.WATER_GUN]); + + await game.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.BEAK_BLAST); + + await game.phaseInterceptor.to(MovePhase, false); + expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined(); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.BURN); + }); + + it("should only hit twice with Multi-Lens", async () => { + game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); + + await game.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.BEAK_BLAST); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(leadPokemon.turnData.hitCount).toBe(2); + }); + + it("should be blocked by Protect", async () => { + game.override.enemyMoveset([Moves.PROTECT]); + + await game.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.BEAK_BLAST); + + await game.phaseInterceptor.to(MovePhase, false); + expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined(); + + await game.phaseInterceptor.to(TurnEndPhase); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeUndefined(); + }); +}); diff --git a/test/moves/beat_up.test.ts b/test/moves/beat_up.test.ts new file mode 100644 index 00000000000..7e67f2ea363 --- /dev/null +++ b/test/moves/beat_up.test.ts @@ -0,0 +1,85 @@ +import { Abilities } from "#app/enums/abilities"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { StatusEffect } from "#app/enums/status-effect"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Beat Up", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyLevel(100); + game.override.enemyMoveset([Moves.SPLASH]); + game.override.enemyAbility(Abilities.INSOMNIA); + + game.override.startingLevel(100); + game.override.moveset([Moves.BEAT_UP]); + }); + + it("should hit once for each healthy player Pokemon", async () => { + await game.startBattle([ + Species.MAGIKARP, + Species.BULBASAUR, + Species.CHARMANDER, + Species.SQUIRTLE, + Species.PIKACHU, + Species.EEVEE, + ]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + let enemyStartingHp = enemyPokemon.hp; + + game.move.select(Moves.BEAT_UP); + + await game.phaseInterceptor.to(MoveEffectPhase); + + expect(playerPokemon.turnData.hitCount).toBe(6); + expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); + + while (playerPokemon.turnData.hitsLeft > 0) { + enemyStartingHp = enemyPokemon.hp; + await game.phaseInterceptor.to(MoveEffectPhase); + expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); + } + }); + + it("should not count player Pokemon with status effects towards hit count", async () => { + await game.startBattle([ + Species.MAGIKARP, + Species.BULBASAUR, + Species.CHARMANDER, + Species.SQUIRTLE, + Species.PIKACHU, + Species.EEVEE, + ]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + + game.scene.getPlayerParty()[1].trySetStatus(StatusEffect.BURN); + + game.move.select(Moves.BEAT_UP); + + await game.phaseInterceptor.to(MoveEffectPhase); + + expect(playerPokemon.turnData.hitCount).toBe(5); + }); +}); diff --git a/test/moves/belly_drum.test.ts b/test/moves/belly_drum.test.ts new file mode 100644 index 00000000000..f01a50f8a79 --- /dev/null +++ b/test/moves/belly_drum.test.ts @@ -0,0 +1,102 @@ +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { toDmgValue } from "#app/utils"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; +import { Abilities } from "#app/enums/abilities"; + +// RATIO : HP Cost of Move +const RATIO = 2; +// PREDAMAGE : Amount of extra HP lost +const PREDAMAGE = 15; + +describe("Moves - BELLY DRUM", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .starterSpecies(Species.MAGIKARP) + .enemySpecies(Species.SNORLAX) + .startingLevel(100) + .enemyLevel(100) + .moveset([Moves.BELLY_DRUM]) + .enemyMoveset(Moves.SPLASH) + .enemyAbility(Abilities.BALL_FETCH); + }); + + // Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Belly_Drum_(move) + + test("raises the user's ATK stat stage to its max, at the cost of 1/2 of its maximum HP", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); + + game.move.select(Moves.BELLY_DRUM); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); + }); + + test("will still take effect if an uninvolved stat stage is at max", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); + + // Here - Stat.ATK -> -3 and Stat.SPATK -> 6 + leadPokemon.setStatStage(Stat.ATK, -3); + leadPokemon.setStatStage(Stat.SPATK, 6); + + game.move.select(Moves.BELLY_DRUM); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); + expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6); + }); + + test("fails if the pokemon's ATK stat stage is at its maximum", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + leadPokemon.setStatStage(Stat.ATK, 6); + + game.move.select(Moves.BELLY_DRUM); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); + }); + + test("fails if the user's health is less than 1/2", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); + leadPokemon.hp = hpLost - PREDAMAGE; + + game.move.select(Moves.BELLY_DRUM); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + }); +}); diff --git a/src/test/moves/burning_jealousy.test.ts b/test/moves/burning_jealousy.test.ts similarity index 75% rename from src/test/moves/burning_jealousy.test.ts rename to test/moves/burning_jealousy.test.ts index abe2c09bb72..60387df4226 100644 --- a/src/test/moves/burning_jealousy.test.ts +++ b/test/moves/burning_jealousy.test.ts @@ -1,14 +1,13 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { StatusEffect } from "#app/enums/status-effect"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - describe("Moves - Burning Jealousy", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -30,13 +29,12 @@ describe("Moves - Burning Jealousy", () => { .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.ICE_SCALES) - .enemyMoveset([ Moves.HOWL ]) + .enemyMoveset([Moves.HOWL]) .startingLevel(10) .enemyLevel(10) .starterSpecies(Species.FEEBAS) .ability(Abilities.BALL_FETCH) - .moveset([ Moves.BURNING_JEALOUSY, Moves.GROWL ]); - + .moveset([Moves.BURNING_JEALOUSY, Moves.GROWL]); }); it("should burn the opponent if their stat stages were raised", async () => { @@ -45,33 +43,28 @@ describe("Moves - Burning Jealousy", () => { const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.BURNING_JEALOUSY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(enemy.status?.effect).toBe(StatusEffect.BURN); }); it("should still burn the opponent if their stat stages were both raised and lowered in the same turn", async () => { - game.override - .starterSpecies(0) - .battleType("double"); - await game.classicMode.startBattle([ Species.FEEBAS, Species.ABRA ]); + game.override.starterSpecies(0).battleType("double"); + await game.classicMode.startBattle([Species.FEEBAS, Species.ABRA]); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.BURNING_JEALOUSY); game.move.select(Moves.GROWL, 1); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); expect(enemy.status?.effect).toBe(StatusEffect.BURN); }); it("should ignore stat stages raised by IMPOSTER", async () => { - game.override - .enemySpecies(Species.DITTO) - .enemyAbility(Abilities.IMPOSTER) - .enemyMoveset(Moves.SPLASH); + game.override.enemySpecies(Species.DITTO).enemyAbility(Abilities.IMPOSTER).enemyMoveset(Moves.SPLASH); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; @@ -88,15 +81,15 @@ describe("Moves - Burning Jealousy", () => { }); it("should be boosted by Sheer Force even if opponent didn't raise stat stages", async () => { - game.override - .ability(Abilities.SHEER_FORCE) - .enemyMoveset(Moves.SPLASH); + game.override.ability(Abilities.SHEER_FORCE).enemyMoveset(Moves.SPLASH); vi.spyOn(allMoves[Moves.BURNING_JEALOUSY], "calculateBattlePower"); await game.classicMode.startBattle(); game.move.select(Moves.BURNING_JEALOUSY); await game.phaseInterceptor.to("BerryPhase"); - expect(allMoves[Moves.BURNING_JEALOUSY].calculateBattlePower).toHaveReturnedWith(allMoves[Moves.BURNING_JEALOUSY].power * 5461 / 4096); + expect(allMoves[Moves.BURNING_JEALOUSY].calculateBattlePower).toHaveReturnedWith( + (allMoves[Moves.BURNING_JEALOUSY].power * 5461) / 4096, + ); }); }); diff --git a/src/test/moves/camouflage.test.ts b/test/moves/camouflage.test.ts similarity index 79% rename from src/test/moves/camouflage.test.ts rename to test/moves/camouflage.test.ts index 5773afffcc3..0bbab6a629a 100644 --- a/src/test/moves/camouflage.test.ts +++ b/test/moves/camouflage.test.ts @@ -2,9 +2,9 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { TerrainType } from "#app/data/terrain"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { BattlerIndex } from "#app/battle"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -25,7 +25,7 @@ describe("Moves - Camouflage", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.CAMOUFLAGE ]) + .moveset([Moves.CAMOUFLAGE]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -35,15 +35,15 @@ describe("Moves - Camouflage", () => { }); it("Camouflage should look at terrain first when selecting a type to change into", async () => { - await game.classicMode.startBattle([ Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE]); const playerPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.CAMOUFLAGE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.arena.getTerrainType()).toBe(TerrainType.PSYCHIC); const pokemonType = playerPokemon.getTypes()[0]; - expect(pokemonType).toBe(Type.PSYCHIC); + expect(pokemonType).toBe(PokemonType.PSYCHIC); }); }); diff --git a/test/moves/ceaseless_edge.test.ts b/test/moves/ceaseless_edge.test.ts new file mode 100644 index 00000000000..d54f1bd9f21 --- /dev/null +++ b/test/moves/ceaseless_edge.test.ts @@ -0,0 +1,107 @@ +import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag"; +import { allMoves } from "#app/data/moves/move"; +import { Abilities } from "#app/enums/abilities"; +import { ArenaTagType } from "#app/enums/arena-tag-type"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; + +describe("Moves - Ceaseless Edge", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + game.override.enemySpecies(Species.RATTATA); + game.override.enemyAbility(Abilities.RUN_AWAY); + game.override.enemyPassiveAbility(Abilities.RUN_AWAY); + game.override.startingLevel(100); + game.override.enemyLevel(100); + game.override.moveset([Moves.CEASELESS_EDGE, Moves.SPLASH, Moves.ROAR]); + game.override.enemyMoveset(Moves.SPLASH); + vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100); + }); + + test("move should hit and apply spikes", async () => { + await game.classicMode.startBattle([Species.ILLUMISE]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + const enemyStartingHp = enemyPokemon.hp; + + game.move.select(Moves.CEASELESS_EDGE); + + await game.phaseInterceptor.to(MoveEffectPhase, false); + // Spikes should not have any layers before move effect is applied + const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; + expect(tagBefore instanceof ArenaTrapTag).toBeFalsy(); + + await game.phaseInterceptor.to(TurnEndPhase); + const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; + expect(tagAfter instanceof ArenaTrapTag).toBeTruthy(); + expect(tagAfter.layers).toBe(1); + expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); + }); + + test("move should hit twice with multi lens and apply two layers of spikes", async () => { + game.override.startingHeldItems([{ name: "MULTI_LENS" }]); + await game.classicMode.startBattle([Species.ILLUMISE]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + const enemyStartingHp = enemyPokemon.hp; + + game.move.select(Moves.CEASELESS_EDGE); + + await game.phaseInterceptor.to(MoveEffectPhase, false); + // Spikes should not have any layers before move effect is applied + const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; + expect(tagBefore instanceof ArenaTrapTag).toBeFalsy(); + + await game.phaseInterceptor.to(TurnEndPhase); + const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; + expect(tagAfter instanceof ArenaTrapTag).toBeTruthy(); + expect(tagAfter.layers).toBe(2); + expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); + }); + + test("trainer - move should hit twice, apply two layers of spikes, force switch opponent - opponent takes damage", async () => { + game.override.startingHeldItems([{ name: "MULTI_LENS" }]); + game.override.startingWave(25); + + await game.classicMode.startBattle([Species.ILLUMISE]); + + game.move.select(Moves.CEASELESS_EDGE); + await game.phaseInterceptor.to(MoveEffectPhase, false); + // Spikes should not have any layers before move effect is applied + const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; + expect(tagBefore instanceof ArenaTrapTag).toBeFalsy(); + + await game.toNextTurn(); + const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; + expect(tagAfter instanceof ArenaTrapTag).toBeTruthy(); + expect(tagAfter.layers).toBe(2); + + const hpBeforeSpikes = game.scene.currentBattle.enemyParty[1].hp; + // Check HP of pokemon that WILL BE switched in (index 1) + game.forceEnemyToSwitch(); + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(TurnEndPhase, false); + expect(game.scene.currentBattle.enemyParty[0].hp).toBeLessThan(hpBeforeSpikes); + }); +}); diff --git a/src/test/moves/chilly_reception.test.ts b/test/moves/chilly_reception.test.ts similarity index 85% rename from src/test/moves/chilly_reception.test.ts rename to test/moves/chilly_reception.test.ts index 664ca242b20..f90aaf6bb02 100644 --- a/src/test/moves/chilly_reception.test.ts +++ b/test/moves/chilly_reception.test.ts @@ -2,7 +2,7 @@ import { Abilities } from "#app/enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; //import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,16 +23,16 @@ describe("Moves - Chilly Reception", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single") - .moveset([ Moves.CHILLY_RECEPTION, Moves.SNOWSCAPE ]) + game.override + .battleType("single") + .moveset([Moves.CHILLY_RECEPTION, Moves.SNOWSCAPE]) .enemyMoveset(Array(4).fill(Moves.SPLASH)) .enemyAbility(Abilities.NONE) .ability(Abilities.NONE); - }); it("should still change the weather if user can't switch out", async () => { - await game.classicMode.startBattle([ Species.SLOWKING ]); + await game.classicMode.startBattle([Species.SLOWKING]); game.move.select(Moves.CHILLY_RECEPTION); @@ -41,7 +41,7 @@ describe("Moves - Chilly Reception", () => { }); it("should switch out even if it's snowing", async () => { - await game.classicMode.startBattle([ Species.SLOWKING, Species.MEOWTH ]); + await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]); // first turn set up snow with snowscape, try chilly reception on second turn game.move.select(Moves.SNOWSCAPE); await game.phaseInterceptor.to("BerryPhase", false); @@ -57,8 +57,7 @@ describe("Moves - Chilly Reception", () => { }); it("happy case - switch out and weather changes", async () => { - - await game.classicMode.startBattle([ Species.SLOWKING, Species.MEOWTH ]); + await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]); game.move.select(Moves.CHILLY_RECEPTION); game.doSelectPartyPokemon(1); @@ -70,12 +69,13 @@ describe("Moves - Chilly Reception", () => { // enemy uses another move and weather doesn't change it("check case - enemy not selecting chilly reception doesn't change weather ", async () => { - game.override.battleType("single") - .enemyMoveset([ Moves.CHILLY_RECEPTION, Moves.TACKLE ]) + game.override + .battleType("single") + .enemyMoveset([Moves.CHILLY_RECEPTION, Moves.TACKLE]) .enemyAbility(Abilities.NONE) .moveset(Array(4).fill(Moves.SPLASH)); - await game.classicMode.startBattle([ Species.SLOWKING, Species.MEOWTH ]); + await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]); game.move.select(Moves.SPLASH); await game.forceEnemyMove(Moves.TACKLE); @@ -85,14 +85,15 @@ describe("Moves - Chilly Reception", () => { }); it("enemy trainer - expected behavior ", async () => { - game.override.battleType("single") + game.override + .battleType("single") .startingWave(8) .enemyMoveset(Array(4).fill(Moves.CHILLY_RECEPTION)) .enemyAbility(Abilities.NONE) .enemySpecies(Species.MAGIKARP) - .moveset([ Moves.SPLASH, Moves.THUNDERBOLT ]); + .moveset([Moves.SPLASH, Moves.THUNDERBOLT]); - await game.classicMode.startBattle([ Species.JOLTEON ]); + await game.classicMode.startBattle([Species.JOLTEON]); const RIVAL_MAGIKARP1 = game.scene.getEnemyPokemon()?.id; game.move.select(Moves.SPLASH); @@ -119,6 +120,5 @@ describe("Moves - Chilly Reception", () => { game.move.select(Moves.SPLASH); await game.phaseInterceptor.to("BerryPhase", false); expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SNOW); - }); }); diff --git a/src/test/moves/chloroblast.test.ts b/test/moves/chloroblast.test.ts similarity index 87% rename from src/test/moves/chloroblast.test.ts rename to test/moves/chloroblast.test.ts index 5e55bf46958..f08eca100c4 100644 --- a/src/test/moves/chloroblast.test.ts +++ b/test/moves/chloroblast.test.ts @@ -1,7 +1,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -22,7 +22,7 @@ describe("Moves - Chloroblast", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.CHLOROBLAST ]) + .moveset([Moves.CHLOROBLAST]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -32,7 +32,7 @@ describe("Moves - Chloroblast", () => { }); it("should not deal recoil damage if the opponent uses protect", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.CHLOROBLAST); await game.phaseInterceptor.to("BerryPhase"); diff --git a/test/moves/clangorous_soul.test.ts b/test/moves/clangorous_soul.test.ts new file mode 100644 index 00000000000..56f19a0e088 --- /dev/null +++ b/test/moves/clangorous_soul.test.ts @@ -0,0 +1,119 @@ +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import Phaser from "phaser"; +import GameManager from "#test/testUtils/gameManager"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; + +/** HP Cost of Move */ +const RATIO = 3; +/** Amount of extra HP lost */ +const PREDAMAGE = 15; + +describe("Moves - Clangorous Soul", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.starterSpecies(Species.MAGIKARP); + game.override.enemySpecies(Species.SNORLAX); + game.override.startingLevel(100); + game.override.enemyLevel(100); + game.override.moveset([Moves.CLANGOROUS_SOUL]); + game.override.enemyMoveset(Moves.SPLASH); + }); + + //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Clangorous_Soul_(move) + + it("raises the user's ATK, DEF, SPATK, SPDEF, and SPD stat stages by 1 each at the cost of 1/3 of its maximum HP", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO); + + game.move.select(Moves.CLANGOROUS_SOUL); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(1); + expect(leadPokemon.getStatStage(Stat.DEF)).toBe(1); + expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(1); + expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(1); + expect(leadPokemon.getStatStage(Stat.SPD)).toBe(1); + }); + + it("will still take effect if one or more of the involved stat stages are not at max", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO); + + //Here - Stat.SPD -> 0 and Stat.SPDEF -> 4 + leadPokemon.setStatStage(Stat.ATK, 6); + leadPokemon.setStatStage(Stat.DEF, 6); + leadPokemon.setStatStage(Stat.SPATK, 6); + leadPokemon.setStatStage(Stat.SPDEF, 4); + + game.move.select(Moves.CLANGOROUS_SOUL); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); + expect(leadPokemon.getStatStage(Stat.DEF)).toBe(6); + expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6); + expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(5); + expect(leadPokemon.getStatStage(Stat.SPD)).toBe(1); + }); + + it("fails if all stat stages involved are at max", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + leadPokemon.setStatStage(Stat.ATK, 6); + leadPokemon.setStatStage(Stat.DEF, 6); + leadPokemon.setStatStage(Stat.SPATK, 6); + leadPokemon.setStatStage(Stat.SPDEF, 6); + leadPokemon.setStatStage(Stat.SPD, 6); + + game.move.select(Moves.CLANGOROUS_SOUL); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); + expect(leadPokemon.getStatStage(Stat.DEF)).toBe(6); + expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6); + expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(6); + expect(leadPokemon.getStatStage(Stat.SPD)).toBe(6); + }); + + it("fails if the user's health is less than 1/3", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO); + leadPokemon.hp = hpLost - PREDAMAGE; + + game.move.select(Moves.CLANGOROUS_SOUL); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(leadPokemon.getStatStage(Stat.DEF)).toBe(0); + expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(0); + expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(0); + expect(leadPokemon.getStatStage(Stat.SPD)).toBe(0); + }); +}); diff --git a/src/test/moves/copycat.test.ts b/test/moves/copycat.test.ts similarity index 84% rename from src/test/moves/copycat.test.ts rename to test/moves/copycat.test.ts index d9e64289481..c7242f0940e 100644 --- a/src/test/moves/copycat.test.ts +++ b/test/moves/copycat.test.ts @@ -1,11 +1,11 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves, RandomMoveAttr } from "#app/data/move"; +import { allMoves, RandomMoveAttr } from "#app/data/moves/move"; import { Stat } from "#app/enums/stat"; import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,7 +28,7 @@ describe("Moves - Copycat", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.COPYCAT, Moves.SPIKY_SHIELD, Moves.SWORDS_DANCE, Moves.SPLASH ]) + .moveset([Moves.COPYCAT, Moves.SPIKY_SHIELD, Moves.SWORDS_DANCE, Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -65,14 +65,12 @@ describe("Moves - Copycat", () => { }); it("should copy the called move when the last move successfully calls another", async () => { - game.override - .moveset([ Moves.SPLASH, Moves.METRONOME ]) - .enemyMoveset(Moves.COPYCAT); + game.override.moveset([Moves.SPLASH, Moves.METRONOME]).enemyMoveset(Moves.COPYCAT); await game.classicMode.startBattle(); vi.spyOn(randomMoveAttr, "getMoveOverride").mockReturnValue(Moves.SWORDS_DANCE); game.move.select(Moves.METRONOME); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); // Player moves first, so enemy can copy Swords Dance + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); // Player moves first, so enemy can copy Swords Dance await game.toNextTurn(); expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(2); @@ -83,7 +81,7 @@ describe("Moves - Copycat", () => { await game.classicMode.startBattle(); game.move.select(Moves.COPYCAT); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.SPDEF)).toBe(-2); diff --git a/test/moves/crafty_shield.test.ts b/test/moves/crafty_shield.test.ts new file mode 100644 index 00000000000..3a2df6a3446 --- /dev/null +++ b/test/moves/crafty_shield.test.ts @@ -0,0 +1,110 @@ +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; +import GameManager from "#test/testUtils/gameManager"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Stat } from "#enums/stat"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { CommandPhase } from "#app/phases/command-phase"; + +describe("Moves - Crafty Shield", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override.battleType("double"); + + game.override.moveset([Moves.CRAFTY_SHIELD, Moves.SPLASH, Moves.SWORDS_DANCE]); + + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyMoveset([Moves.GROWL]); + game.override.enemyAbility(Abilities.INSOMNIA); + + game.override.startingLevel(100); + game.override.enemyLevel(100); + }); + + test("should protect the user and allies from status moves", async () => { + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.CRAFTY_SHIELD); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0)); + }); + + test("should not protect the user and allies from attack moves", async () => { + game.override.enemyMoveset([Moves.TACKLE]); + + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.CRAFTY_SHIELD); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(leadPokemon.some(p => p.hp < p.getMaxHp())).toBeTruthy(); + }); + + test("should protect the user and allies from moves that ignore other protection", async () => { + game.override.enemySpecies(Species.DUSCLOPS); + game.override.enemyMoveset([Moves.CURSE]); + + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.CRAFTY_SHIELD); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + leadPokemon.forEach(p => expect(p.getTag(BattlerTagType.CURSED)).toBeUndefined()); + }); + + test("should not block allies' self-targeted moves", async () => { + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.CRAFTY_SHIELD); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SWORDS_DANCE, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(leadPokemon[0].getStatStage(Stat.ATK)).toBe(0); + expect(leadPokemon[1].getStatStage(Stat.ATK)).toBe(2); + }); +}); diff --git a/src/test/moves/defog.test.ts b/test/moves/defog.test.ts similarity index 84% rename from src/test/moves/defog.test.ts rename to test/moves/defog.test.ts index c83cdc192bf..64904e964c4 100644 --- a/src/test/moves/defog.test.ts +++ b/test/moves/defog.test.ts @@ -2,7 +2,7 @@ import { Stat } from "#enums/stat"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,17 +23,17 @@ describe("Moves - Defog", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.MIST, Moves.SAFEGUARD, Moves.SPLASH ]) + .moveset([Moves.MIST, Moves.SAFEGUARD, Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() .enemySpecies(Species.SHUCKLE) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.DEFOG, Moves.GROWL ]); + .enemyMoveset([Moves.DEFOG, Moves.GROWL]); }); it("should not allow Safeguard to be active", async () => { - await game.classicMode.startBattle([ Species.REGIELEKI ]); + await game.classicMode.startBattle([Species.REGIELEKI]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); @@ -44,13 +44,11 @@ describe("Moves - Defog", () => { expect(playerPokemon[0].isSafeguarded(enemyPokemon[0])).toBe(false); - expect(true).toBe(true); }); - it("should not allow Mist to be active", async () => { - await game.classicMode.startBattle([ Species.REGIELEKI ]); + await game.classicMode.startBattle([Species.REGIELEKI]); const playerPokemon = game.scene.getPlayerField(); diff --git a/src/test/moves/destiny_bond.test.ts b/test/moves/destiny_bond.test.ts similarity index 86% rename from src/test/moves/destiny_bond.test.ts rename to test/moves/destiny_bond.test.ts index e668aee2191..c39d40427ad 100644 --- a/src/test/moves/destiny_bond.test.ts +++ b/test/moves/destiny_bond.test.ts @@ -1,25 +1,24 @@ import type { ArenaTrapTag } from "#app/data/arena-tag"; import { ArenaTagSide } from "#app/data/arena-tag"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { BattlerIndex } from "#app/battle"; import { StatusEffect } from "#enums/status-effect"; import { PokemonInstantReviveModifier } from "#app/modifier/modifier"; - describe("Moves - Destiny Bond", () => { let phaserGame: Phaser.Game; let game: GameManager; - const defaultParty = [ Species.BULBASAUR, Species.SQUIRTLE ]; - const enemyFirst = [ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]; - const playerFirst = [ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]; + const defaultParty = [Species.BULBASAUR, Species.SQUIRTLE]; + const enemyFirst = [BattlerIndex.ENEMY, BattlerIndex.PLAYER]; + const playerFirst = [BattlerIndex.PLAYER, BattlerIndex.ENEMY]; beforeAll(() => { phaserGame = new Phaser.Game({ @@ -33,7 +32,8 @@ describe("Moves - Destiny Bond", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single") + game.override + .battleType("single") .ability(Abilities.UNNERVE) // Pre-emptively prevent flakiness from opponent berries .enemySpecies(Species.RATTATA) .enemyAbility(Abilities.RUN_AWAY) @@ -62,7 +62,7 @@ describe("Moves - Destiny Bond", () => { it("should KO the opponent on the next turn", async () => { const moveToUse = Moves.TACKLE; - game.override.moveset([ Moves.SPLASH, moveToUse ]); + game.override.moveset([Moves.SPLASH, moveToUse]); await game.classicMode.startBattle(defaultParty); const enemyPokemon = game.scene.getEnemyPokemon(); @@ -88,7 +88,7 @@ describe("Moves - Destiny Bond", () => { it("should fail if used twice in a row", async () => { const moveToUse = Moves.TACKLE; - game.override.moveset([ Moves.SPLASH, moveToUse ]); + game.override.moveset([Moves.SPLASH, moveToUse]); await game.classicMode.startBattle(defaultParty); const enemyPokemon = game.scene.getEnemyPokemon(); @@ -115,8 +115,7 @@ describe("Moves - Destiny Bond", () => { // Opponent will be reduced to 1 HP by False Swipe, then faint to Sandstorm const moveToUse = Moves.FALSE_SWIPE; - game.override.moveset(moveToUse) - .ability(Abilities.SAND_STREAM); + game.override.moveset(moveToUse).ability(Abilities.SAND_STREAM); await game.classicMode.startBattle(defaultParty); const enemyPokemon = game.scene.getEnemyPokemon(); @@ -133,7 +132,7 @@ describe("Moves - Destiny Bond", () => { it("should not KO the opponent if the user had another turn", async () => { const moveToUse = Moves.TACKLE; - game.override.moveset([ Moves.SPORE, moveToUse ]); + game.override.moveset([Moves.SPORE, moveToUse]); await game.classicMode.startBattle(defaultParty); const enemyPokemon = game.scene.getEnemyPokemon(); @@ -158,9 +157,8 @@ describe("Moves - Destiny Bond", () => { }); it("should not KO an ally", async () => { - game.override.moveset([ Moves.DESTINY_BOND, Moves.CRUNCH ]) - .battleType("double"); - await game.classicMode.startBattle([ Species.SHEDINJA, Species.BULBASAUR, Species.SQUIRTLE ]); + game.override.moveset([Moves.DESTINY_BOND, Moves.CRUNCH]).battleType("double"); + await game.classicMode.startBattle([Species.SHEDINJA, Species.BULBASAUR, Species.SQUIRTLE]); const enemyPokemon0 = game.scene.getEnemyField()[0]; const enemyPokemon1 = game.scene.getEnemyField()[1]; @@ -170,7 +168,7 @@ describe("Moves - Destiny Bond", () => { // Shedinja uses Destiny Bond, then ally Bulbasaur KO's Shedinja with Crunch game.move.select(Moves.DESTINY_BOND, 0); game.move.select(Moves.CRUNCH, 1, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); expect(enemyPokemon0?.isFainted()).toBe(false); @@ -203,8 +201,7 @@ describe("Moves - Destiny Bond", () => { }); it("should not cause a crash if the user is KO'd by Pledge moves", async () => { - game.override.moveset([ Moves.GRASS_PLEDGE, Moves.WATER_PLEDGE ]) - .battleType("double"); + game.override.moveset([Moves.GRASS_PLEDGE, Moves.WATER_PLEDGE]).battleType("double"); await game.classicMode.startBattle(defaultParty); const enemyPokemon0 = game.scene.getEnemyField()[0]; @@ -214,7 +211,7 @@ describe("Moves - Destiny Bond", () => { game.move.select(Moves.GRASS_PLEDGE, 0, BattlerIndex.ENEMY); game.move.select(Moves.WATER_PLEDGE, 1, BattlerIndex.ENEMY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]); await game.phaseInterceptor.to("BerryPhase"); expect(enemyPokemon0?.isFainted()).toBe(true); @@ -235,8 +232,7 @@ describe("Moves - Destiny Bond", () => { it("should not allow the opponent to revive via Reviver Seed", async () => { const moveToUse = Moves.TACKLE; - game.override.moveset(moveToUse) - .startingHeldItems([{ name: "REVIVER_SEED" }]); + game.override.moveset(moveToUse).startingHeldItems([{ name: "REVIVER_SEED" }]); await game.classicMode.startBattle(defaultParty); const enemyPokemon = game.scene.getEnemyPokemon(); @@ -250,7 +246,9 @@ describe("Moves - Destiny Bond", () => { expect(playerPokemon?.isFainted()).toBe(true); // Check that the Tackle user's Reviver Seed did not activate - const revSeeds = game.scene.getModifiers(PokemonInstantReviveModifier).filter(m => m.pokemonId === playerPokemon?.id); + const revSeeds = game.scene + .getModifiers(PokemonInstantReviveModifier) + .filter(m => m.pokemonId === playerPokemon?.id); expect(revSeeds.length).toBe(1); }); }); diff --git a/src/test/moves/diamond_storm.test.ts b/test/moves/diamond_storm.test.ts similarity index 86% rename from src/test/moves/diamond_storm.test.ts rename to test/moves/diamond_storm.test.ts index 6e5be2a790d..2363122f0d7 100644 --- a/src/test/moves/diamond_storm.test.ts +++ b/test/moves/diamond_storm.test.ts @@ -1,9 +1,9 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -24,7 +24,7 @@ describe("Moves - Diamond Storm", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.DIAMOND_STORM ]) + .moveset([Moves.DIAMOND_STORM]) .battleType("single") .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) @@ -36,7 +36,7 @@ describe("Moves - Diamond Storm", () => { const diamondStorm = allMoves[Moves.DIAMOND_STORM]; vi.spyOn(diamondStorm, "chance", "get").mockReturnValue(100); vi.spyOn(diamondStorm, "accuracy", "get").mockReturnValue(100); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.DIAMOND_STORM); await game.phaseInterceptor.to("BerryPhase"); diff --git a/src/test/moves/dig.test.ts b/test/moves/dig.test.ts similarity index 88% rename from src/test/moves/dig.test.ts rename to test/moves/dig.test.ts index 4c6b5d3b75d..81339111656 100644 --- a/src/test/moves/dig.test.ts +++ b/test/moves/dig.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; @@ -7,7 +7,7 @@ import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import { MoveResult } from "#app/field/pokemon"; import { describe, beforeAll, afterEach, beforeEach, it, expect } from "vitest"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; describe("Moves - Dig", () => { let phaserGame: Phaser.Game; @@ -36,7 +36,7 @@ describe("Moves - Dig", () => { }); it("should make the user semi-invulnerable, then attack over 2 turns", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -62,7 +62,7 @@ describe("Moves - Dig", () => { it("should not allow the user to evade attacks from Pokemon with No Guard", async () => { game.override.enemyAbility(Abilities.NO_GUARD); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -75,11 +75,9 @@ describe("Moves - Dig", () => { }); it("should not expend PP when the attack phase is cancelled", async () => { - game.override - .enemyAbility(Abilities.NO_GUARD) - .enemyMoveset(Moves.SPORE); + game.override.enemyAbility(Abilities.NO_GUARD).enemyMoveset(Moves.SPORE); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -94,7 +92,7 @@ describe("Moves - Dig", () => { }); it("should cause the user to take double damage from Earthquake", async () => { - await game.classicMode.startBattle([ Species.DONDOZO ]); + await game.classicMode.startBattle([Species.DONDOZO]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -102,7 +100,7 @@ describe("Moves - Dig", () => { const preDigEarthquakeDmg = playerPokemon.getAttackDamage(enemyPokemon, allMoves[Moves.EARTHQUAKE]).damage; game.move.select(Moves.DIG); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); diff --git a/src/test/moves/disable.test.ts b/test/moves/disable.test.ts similarity index 60% rename from src/test/moves/disable.test.ts rename to test/moves/disable.test.ts index 3748598fa90..fdfb748df9d 100644 --- a/src/test/moves/disable.test.ts +++ b/test/moves/disable.test.ts @@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Disable", () => { @@ -12,7 +12,7 @@ describe("Moves - Disable", () => { beforeAll(() => { phaserGame = new Phaser.Game({ - type: Phaser.HEADLESS + type: Phaser.HEADLESS, }); }); @@ -26,7 +26,7 @@ describe("Moves - Disable", () => { .battleType("single") .ability(Abilities.BALL_FETCH) .enemyAbility(Abilities.BALL_FETCH) - .moveset([ Moves.DISABLE, Moves.SPLASH ]) + .moveset([Moves.DISABLE, Moves.SPLASH]) .enemyMoveset(Moves.SPLASH) .starterSpecies(Species.PIKACHU) .enemySpecies(Species.SHUCKLE); @@ -38,34 +38,37 @@ describe("Moves - Disable", () => { const enemyMon = game.scene.getEnemyPokemon()!; game.move.select(Moves.DISABLE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(enemyMon.getMoveHistory()).toHaveLength(1); expect(enemyMon.isMoveRestricted(Moves.SPLASH)).toBe(true); }); - it("fails if enemy has no move history", async() => { + it("fails if enemy has no move history", async () => { await game.classicMode.startBattle(); const playerMon = game.scene.getPlayerPokemon()!; const enemyMon = game.scene.getEnemyPokemon()!; game.move.select(Moves.DISABLE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); - expect(playerMon.getMoveHistory()[0]).toMatchObject({ move: Moves.DISABLE, result: MoveResult.FAIL }); + expect(playerMon.getMoveHistory()[0]).toMatchObject({ + move: Moves.DISABLE, + result: MoveResult.FAIL, + }); expect(enemyMon.isMoveRestricted(Moves.SPLASH)).toBe(false); }, 20000); - it("causes STRUGGLE if all usable moves are disabled", async() => { + it("causes STRUGGLE if all usable moves are disabled", async () => { await game.classicMode.startBattle(); const enemyMon = game.scene.getEnemyPokemon()!; game.move.select(Moves.DISABLE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); game.move.select(Moves.SPLASH); @@ -77,15 +80,15 @@ describe("Moves - Disable", () => { expect(enemyHistory[1].move).toBe(Moves.STRUGGLE); }, 20000); - it("cannot disable STRUGGLE", async() => { - game.override.enemyMoveset([ Moves.STRUGGLE ]); + it("cannot disable STRUGGLE", async () => { + game.override.enemyMoveset([Moves.STRUGGLE]); await game.classicMode.startBattle(); const playerMon = game.scene.getPlayerPokemon()!; const enemyMon = game.scene.getEnemyPokemon()!; game.move.select(Moves.DISABLE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(playerMon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); @@ -93,7 +96,7 @@ describe("Moves - Disable", () => { expect(enemyMon.isMoveRestricted(Moves.STRUGGLE)).toBe(false); }, 20000); - it("interrupts target's move when target moves after", async() => { + it("interrupts target's move when target moves after", async () => { await game.classicMode.startBattle(); const enemyMon = game.scene.getEnemyPokemon()!; @@ -103,26 +106,49 @@ describe("Moves - Disable", () => { // Both mons just used Splash last turn; now have player use Disable. game.move.select(Moves.DISABLE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); const enemyHistory = enemyMon.getMoveHistory(); expect(enemyHistory).toHaveLength(2); - expect(enemyHistory[0]).toMatchObject({ move: Moves.SPLASH, result: MoveResult.SUCCESS }); + expect(enemyHistory[0]).toMatchObject({ + move: Moves.SPLASH, + result: MoveResult.SUCCESS, + }); expect(enemyHistory[1].result).toBe(MoveResult.FAIL); }, 20000); - it("disables NATURE POWER, not the move invoked by it", async() => { - game.override.enemyMoveset([ Moves.NATURE_POWER ]); + it("disables NATURE POWER, not the move invoked by it", async () => { + game.override.enemyMoveset([Moves.NATURE_POWER]); await game.classicMode.startBattle(); const enemyMon = game.scene.getEnemyPokemon()!; game.move.select(Moves.DISABLE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(enemyMon.isMoveRestricted(Moves.NATURE_POWER)).toBe(true); - expect(enemyMon.isMoveRestricted(enemyMon.getLastXMoves(2)[1].move)).toBe(false); + expect(enemyMon.isMoveRestricted(enemyMon.getLastXMoves(2)[0].move)).toBe(false); + }, 20000); + + it("disables most recent move", async () => { + game.override.enemyMoveset([Moves.SPLASH, Moves.TACKLE]); + await game.classicMode.startBattle(); + + const enemyMon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + + game.move.select(Moves.DISABLE); + await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + + expect(enemyMon.isMoveRestricted(Moves.TACKLE)).toBe(true); + expect(enemyMon.isMoveRestricted(Moves.SPLASH)).toBe(false); }, 20000); }); diff --git a/src/test/moves/dive.test.ts b/test/moves/dive.test.ts similarity index 88% rename from src/test/moves/dive.test.ts rename to test/moves/dive.test.ts index b60416d7740..8d7b0f9dd00 100644 --- a/src/test/moves/dive.test.ts +++ b/test/moves/dive.test.ts @@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; import { WeatherType } from "#enums/weather-type"; @@ -36,7 +36,7 @@ describe("Moves - Dive", () => { }); it("should make the user semi-invulnerable, then attack over 2 turns", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -62,7 +62,7 @@ describe("Moves - Dive", () => { it("should not allow the user to evade attacks from Pokemon with No Guard", async () => { game.override.enemyAbility(Abilities.NO_GUARD); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -75,11 +75,9 @@ describe("Moves - Dive", () => { }); it("should not expend PP when the attack phase is cancelled", async () => { - game.override - .enemyAbility(Abilities.NO_GUARD) - .enemyMoveset(Moves.SPORE); + game.override.enemyAbility(Abilities.NO_GUARD).enemyMoveset(Moves.SPORE); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -94,11 +92,9 @@ describe("Moves - Dive", () => { }); it("should trigger on-contact post-defend ability effects", async () => { - game.override - .enemyAbility(Abilities.ROUGH_SKIN) - .enemyMoveset(Moves.SPLASH); + game.override.enemyAbility(Abilities.ROUGH_SKIN).enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -115,7 +111,7 @@ describe("Moves - Dive", () => { it("should cancel attack after Harsh Sunlight is set", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/moves/doodle.test.ts b/test/moves/doodle.test.ts new file mode 100644 index 00000000000..822e415c918 --- /dev/null +++ b/test/moves/doodle.test.ts @@ -0,0 +1,69 @@ +import { BattlerIndex } from "#app/battle"; +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Doodle", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH, Moves.DOODLE]) + .ability(Abilities.ADAPTABILITY) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should copy the opponent's ability in singles", async () => { + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.DOODLE); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH); + }); + + it("should copy the opponent's ability to itself and its ally in doubles", async () => { + game.override.battleType("double"); + await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]); + + game.move.select(Moves.DOODLE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerField()[0].getAbility().id).toBe(Abilities.BALL_FETCH); + expect(game.scene.getPlayerField()[1].getAbility().id).toBe(Abilities.BALL_FETCH); + }); + + it("should activate post-summon abilities", async () => { + game.override.battleType("double").enemyAbility(Abilities.INTIMIDATE); + + await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]); + + game.move.select(Moves.DOODLE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("BerryPhase"); + + // Enemies should have been intimidated twice + expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-2); + }); +}); diff --git a/src/test/moves/double_team.test.ts b/test/moves/double_team.test.ts similarity index 81% rename from src/test/moves/double_team.test.ts rename to test/moves/double_team.test.ts index 62848553e06..f6791573132 100644 --- a/src/test/moves/double_team.test.ts +++ b/test/moves/double_team.test.ts @@ -3,7 +3,7 @@ import { Abilities } from "#app/enums/abilities"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -24,16 +24,16 @@ describe("Moves - Double Team", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("single"); - game.override.moveset([ Moves.DOUBLE_TEAM ]); + game.override.moveset([Moves.DOUBLE_TEAM]); game.override.disableCrits(); game.override.ability(Abilities.BALL_FETCH); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); + game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); }); it("raises the user's EVA stat stage by 1", async () => { - await game.startBattle([ Species.MAGIKARP ]); + await game.startBattle([Species.MAGIKARP]); const ally = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -46,6 +46,6 @@ describe("Moves - Double Team", () => { await game.toNextTurn(); expect(ally.getStatStage(Stat.EVA)).toBe(1); - expect(enemy.getAccuracyMultiplier).toHaveReturnedWith(.75); + expect(enemy.getAccuracyMultiplier).toHaveReturnedWith(0.75); }); }); diff --git a/src/test/moves/dragon_cheer.test.ts b/test/moves/dragon_cheer.test.ts similarity index 71% rename from src/test/moves/dragon_cheer.test.ts rename to test/moves/dragon_cheer.test.ts index 750f09214ca..30d5af3a51b 100644 --- a/src/test/moves/dragon_cheer.test.ts +++ b/test/moves/dragon_cheer.test.ts @@ -1,9 +1,9 @@ import { BattlerIndex } from "#app/battle"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { Abilities } from "#enums/abilities"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -27,11 +27,11 @@ describe("Moves - Dragon Cheer", () => { .enemyAbility(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) .enemyLevel(20) - .moveset([ Moves.DRAGON_CHEER, Moves.TACKLE, Moves.SPLASH ]); + .moveset([Moves.DRAGON_CHEER, Moves.TACKLE, Moves.SPLASH]); }); it("increases the user's allies' critical hit ratio by one stage", async () => { - await game.classicMode.startBattle([ Species.DRAGONAIR, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.DRAGONAIR, Species.MAGIKARP]); const enemy = game.scene.getEnemyField()[0]; @@ -40,7 +40,7 @@ describe("Moves - Dragon Cheer", () => { game.move.select(Moves.DRAGON_CHEER, 0); game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); // After Tackle await game.phaseInterceptor.to("TurnEndPhase"); @@ -48,7 +48,7 @@ describe("Moves - Dragon Cheer", () => { }); it("increases the user's Dragon-type allies' critical hit ratio by two stages", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP, Species.DRAGONAIR ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.DRAGONAIR]); const enemy = game.scene.getEnemyField()[0]; @@ -57,7 +57,7 @@ describe("Moves - Dragon Cheer", () => { game.move.select(Moves.DRAGON_CHEER, 0); game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); // After Tackle await game.phaseInterceptor.to("TurnEndPhase"); @@ -65,7 +65,7 @@ describe("Moves - Dragon Cheer", () => { }); it("applies the effect based on the allies' type upon use of the move, and do not change if the allies' type changes later in battle", async () => { - await game.classicMode.startBattle([ Species.DRAGONAIR, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.DRAGONAIR, Species.MAGIKARP]); const magikarp = game.scene.getPlayerField()[1]; const enemy = game.scene.getEnemyField()[0]; @@ -75,7 +75,7 @@ describe("Moves - Dragon Cheer", () => { game.move.select(Moves.DRAGON_CHEER, 0); game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); // After Tackle await game.phaseInterceptor.to("TurnEndPhase"); @@ -84,13 +84,13 @@ describe("Moves - Dragon Cheer", () => { await game.toNextTurn(); // Change Magikarp's type to Dragon - vi.spyOn(magikarp, "getTypes").mockReturnValue([ Type.DRAGON ]); - expect(magikarp.getTypes()).toEqual([ Type.DRAGON ]); + vi.spyOn(magikarp, "getTypes").mockReturnValue([PokemonType.DRAGON]); + expect(magikarp.getTypes()).toEqual([PokemonType.DRAGON]); game.move.select(Moves.SPLASH, 0); game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY); - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender diff --git a/src/test/moves/dragon_rage.test.ts b/test/moves/dragon_rage.test.ts similarity index 86% rename from src/test/moves/dragon_rage.test.ts rename to test/moves/dragon_rage.test.ts index a2350960546..99d66421463 100644 --- a/src/test/moves/dragon_rage.test.ts +++ b/test/moves/dragon_rage.test.ts @@ -1,12 +1,12 @@ import { Stat } from "#enums/stat"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Species } from "#app/enums/species"; import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -34,7 +34,7 @@ describe("Moves - Dragon Rage", () => { game.override.battleType("single"); game.override.starterSpecies(Species.SNORLAX); - game.override.moveset([ Moves.DRAGON_RAGE ]); + game.override.moveset([Moves.DRAGON_RAGE]); game.override.ability(Abilities.BALL_FETCH); game.override.passiveAbility(Abilities.BALL_FETCH); game.override.startingLevel(100); @@ -45,19 +45,15 @@ describe("Moves - Dragon Rage", () => { game.override.enemyPassiveAbility(Abilities.BALL_FETCH); game.override.enemyLevel(100); - await game.startBattle(); + await game.classicMode.startBattle(); partyPokemon = game.scene.getPlayerParty()[0]; enemyPokemon = game.scene.getEnemyPokemon()!; - - // remove berries - game.scene.removePartyMemberModifiers(0); - game.scene.clearEnemyHeldItemModifiers(); }); it("ignores weaknesses", async () => { game.override.disableCrits(); - vi.spyOn(enemyPokemon, "getTypes").mockReturnValue([ Type.DRAGON ]); + vi.spyOn(enemyPokemon, "getTypes").mockReturnValue([PokemonType.DRAGON]); game.move.select(Moves.DRAGON_RAGE); await game.phaseInterceptor.to(TurnEndPhase); @@ -67,7 +63,7 @@ describe("Moves - Dragon Rage", () => { it("ignores resistances", async () => { game.override.disableCrits(); - vi.spyOn(enemyPokemon, "getTypes").mockReturnValue([ Type.STEEL ]); + vi.spyOn(enemyPokemon, "getTypes").mockReturnValue([PokemonType.STEEL]); game.move.select(Moves.DRAGON_RAGE); await game.phaseInterceptor.to(TurnEndPhase); @@ -87,7 +83,7 @@ describe("Moves - Dragon Rage", () => { it("ignores stab", async () => { game.override.disableCrits(); - vi.spyOn(partyPokemon, "getTypes").mockReturnValue([ Type.DRAGON ]); + vi.spyOn(partyPokemon, "getTypes").mockReturnValue([PokemonType.DRAGON]); game.move.select(Moves.DRAGON_RAGE); await game.phaseInterceptor.to(TurnEndPhase); diff --git a/src/test/moves/dragon_tail.test.ts b/test/moves/dragon_tail.test.ts similarity index 78% rename from src/test/moves/dragon_tail.test.ts rename to test/moves/dragon_tail.test.ts index 96db67279d3..37e8aa2fe1b 100644 --- a/src/test/moves/dragon_tail.test.ts +++ b/test/moves/dragon_tail.test.ts @@ -1,13 +1,13 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Status } from "#app/data/status-effect"; import { Challenges } from "#enums/challenges"; import { StatusEffect } from "#enums/status-effect"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -27,8 +27,9 @@ describe("Moves - Dragon Tail", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single") - .moveset([ Moves.DRAGON_TAIL, Moves.SPLASH, Moves.FLAMETHROWER ]) + game.override + .battleType("single") + .moveset([Moves.DRAGON_TAIL, Moves.SPLASH, Moves.FLAMETHROWER]) .enemySpecies(Species.WAILORD) .enemyMoveset(Moves.SPLASH) .startingLevel(5) @@ -38,7 +39,7 @@ describe("Moves - Dragon Tail", () => { }); it("should cause opponent to flee, and not crash", async () => { - await game.classicMode.startBattle([ Species.DRATINI ]); + await game.classicMode.startBattle([Species.DRATINI]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -56,7 +57,7 @@ describe("Moves - Dragon Tail", () => { it("should cause opponent to flee, display ability, and not crash", async () => { game.override.enemyAbility(Abilities.ROUGH_SKIN); - await game.classicMode.startBattle([ Species.DRATINI ]); + await game.classicMode.startBattle([Species.DRATINI]); const leadPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -72,10 +73,8 @@ describe("Moves - Dragon Tail", () => { }); it("should proceed without crashing in a double battle", async () => { - game.override - .battleType("double").enemyMoveset(Moves.SPLASH) - .enemyAbility(Abilities.ROUGH_SKIN); - await game.classicMode.startBattle([ Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD ]); + game.override.battleType("double").enemyMoveset(Moves.SPLASH).enemyAbility(Abilities.ROUGH_SKIN); + await game.classicMode.startBattle([Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD]); const leadPokemon = game.scene.getPlayerParty()[0]!; @@ -103,11 +102,8 @@ describe("Moves - Dragon Tail", () => { }); it("should redirect targets upon opponent flee", async () => { - game.override - .battleType("double") - .enemyMoveset(Moves.SPLASH) - .enemyAbility(Abilities.ROUGH_SKIN); - await game.classicMode.startBattle([ Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD ]); + game.override.battleType("double").enemyMoveset(Moves.SPLASH).enemyAbility(Abilities.ROUGH_SKIN); + await game.classicMode.startBattle([Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD]); const leadPokemon = game.scene.getPlayerParty()[0]!; const secPokemon = game.scene.getPlayerParty()[1]!; @@ -134,7 +130,7 @@ describe("Moves - Dragon Tail", () => { it("doesn't switch out if the target has suction cups", async () => { game.override.enemyAbility(Abilities.SUCTION_CUPS); - await game.classicMode.startBattle([ Species.REGIELEKI ]); + await game.classicMode.startBattle([Species.REGIELEKI]); const enemy = game.scene.getEnemyPokemon()!; @@ -145,9 +141,8 @@ describe("Moves - Dragon Tail", () => { }); it("should force a switch upon fainting an opponent normally", async () => { - game.override.startingWave(5) - .startingLevel(1000); // To make sure Dragon Tail KO's the opponent - await game.classicMode.startBattle([ Species.DRATINI ]); + game.override.startingWave(5).startingLevel(1000); // To make sure Dragon Tail KO's the opponent + await game.classicMode.startBattle([Species.DRATINI]); game.move.select(Moves.DRAGON_TAIL); @@ -165,10 +160,11 @@ describe("Moves - Dragon Tail", () => { }); it("should not cause a softlock when activating an opponent trainer's reviver seed", async () => { - game.override.startingWave(5) + game.override + .startingWave(5) .enemyHeldItems([{ name: "REVIVER_SEED" }]) .startingLevel(1000); // To make sure Dragon Tail KO's the opponent - await game.classicMode.startBattle([ Species.DRATINI ]); + await game.classicMode.startBattle([Species.DRATINI]); game.move.select(Moves.DRAGON_TAIL); @@ -182,10 +178,11 @@ describe("Moves - Dragon Tail", () => { }); it("should not cause a softlock when activating a player's reviver seed", async () => { - game.override.startingHeldItems([{ name: "REVIVER_SEED" }]) + game.override + .startingHeldItems([{ name: "REVIVER_SEED" }]) .enemyMoveset(Moves.DRAGON_TAIL) .enemyLevel(1000); // To make sure Dragon Tail KO's the player - await game.classicMode.startBattle([ Species.DRATINI, Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.DRATINI, Species.BULBASAUR]); game.move.select(Moves.SPLASH); @@ -199,15 +196,13 @@ describe("Moves - Dragon Tail", () => { }); it("should force switches randomly", async () => { - game.override.enemyMoveset(Moves.DRAGON_TAIL) - .startingLevel(100) - .enemyLevel(1); - await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE ]); + game.override.enemyMoveset(Moves.DRAGON_TAIL).startingLevel(100).enemyLevel(1); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); - const [ bulbasaur, charmander, squirtle ] = game.scene.getPlayerParty(); + const [bulbasaur, charmander, squirtle] = game.scene.getPlayerParty(); // Turn 1: Mock an RNG call that calls for switching to 1st backup Pokemon (Charmander) - vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => { + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { return min; }); game.move.select(Moves.SPLASH); @@ -220,7 +215,7 @@ describe("Moves - Dragon Tail", () => { expect(bulbasaur.getInverseHp()).toBeGreaterThan(0); // Turn 2: Mock an RNG call that calls for switching to 2nd backup Pokemon (Squirtle) - vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => { + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { return min + 1; }); game.move.select(Moves.SPLASH); @@ -233,17 +228,15 @@ describe("Moves - Dragon Tail", () => { }); it("should not force a switch to a challenge-ineligible Pokemon", async () => { - game.override.enemyMoveset(Moves.DRAGON_TAIL) - .startingLevel(100) - .enemyLevel(1); + game.override.enemyMoveset(Moves.DRAGON_TAIL).startingLevel(100).enemyLevel(1); // Mono-Water challenge, Eevee is ineligible - game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, Type.WATER + 1, 0); - await game.challengeMode.startBattle([ Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA ]); + game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, PokemonType.WATER + 1, 0); + await game.challengeMode.startBattle([Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA]); - const [ lapras, eevee, toxapex, primarina ] = game.scene.getPlayerParty(); + const [lapras, eevee, toxapex, primarina] = game.scene.getPlayerParty(); // Turn 1: Mock an RNG call that would normally call for switching to Eevee, but it is ineligible - vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => { + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { return min; }); game.move.select(Moves.SPLASH); @@ -257,12 +250,10 @@ describe("Moves - Dragon Tail", () => { }); it("should not force a switch to a fainted Pokemon", async () => { - game.override.enemyMoveset([ Moves.SPLASH, Moves.DRAGON_TAIL ]) - .startingLevel(100) - .enemyLevel(1); - await game.classicMode.startBattle([ Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.DRAGON_TAIL]).startingLevel(100).enemyLevel(1); + await game.classicMode.startBattle([Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA]); - const [ lapras, eevee, toxapex, primarina ] = game.scene.getPlayerParty(); + const [lapras, eevee, toxapex, primarina] = game.scene.getPlayerParty(); // Turn 1: Eevee faints eevee.hp = 0; @@ -273,7 +264,7 @@ describe("Moves - Dragon Tail", () => { await game.toNextTurn(); // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted - vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => { + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { return min; }); game.move.select(Moves.SPLASH); @@ -288,12 +279,10 @@ describe("Moves - Dragon Tail", () => { }); it("should not force a switch if there are no available Pokemon to switch into", async () => { - game.override.enemyMoveset([ Moves.SPLASH, Moves.DRAGON_TAIL ]) - .startingLevel(100) - .enemyLevel(1); - await game.classicMode.startBattle([ Species.LAPRAS, Species.EEVEE ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.DRAGON_TAIL]).startingLevel(100).enemyLevel(1); + await game.classicMode.startBattle([Species.LAPRAS, Species.EEVEE]); - const [ lapras, eevee ] = game.scene.getPlayerParty(); + const [lapras, eevee] = game.scene.getPlayerParty(); // Turn 1: Eevee faints eevee.hp = 0; @@ -304,7 +293,7 @@ describe("Moves - Dragon Tail", () => { await game.toNextTurn(); // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted - vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => { + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { return min; }); game.move.select(Moves.SPLASH); diff --git a/src/test/moves/dynamax_cannon.test.ts b/test/moves/dynamax_cannon.test.ts similarity index 87% rename from src/test/moves/dynamax_cannon.test.ts rename to test/moves/dynamax_cannon.test.ts index 033d8960bad..0ff0712710d 100644 --- a/src/test/moves/dynamax_cannon.test.ts +++ b/test/moves/dynamax_cannon.test.ts @@ -1,10 +1,10 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -27,7 +27,7 @@ describe("Moves - Dynamax Cannon", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.moveset([ dynamaxCannon.id ]); + game.override.moveset([dynamaxCannon.id]); game.override.startingLevel(200); // Note that, for Waves 1-10, the level cap is 10 @@ -36,16 +36,14 @@ describe("Moves - Dynamax Cannon", () => { game.override.disableCrits(); game.override.enemySpecies(Species.MAGIKARP); - game.override.enemyMoveset([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]); vi.spyOn(dynamaxCannon, "calculateBattlePower"); }); it("should return 100 power against an enemy below level cap", async () => { game.override.enemyLevel(1); - await game.startBattle([ - Species.ETERNATUS, - ]); + await game.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -57,9 +55,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 100 power against an enemy at level cap", async () => { game.override.enemyLevel(10); - await game.startBattle([ - Species.ETERNATUS, - ]); + await game.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -71,9 +67,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 120 power against an enemy 1% above level cap", async () => { game.override.enemyLevel(101); - await game.startBattle([ - Species.ETERNATUS, - ]); + await game.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -88,9 +82,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 140 power against an enemy 2% above level capp", async () => { game.override.enemyLevel(102); - await game.startBattle([ - Species.ETERNATUS, - ]); + await game.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -105,9 +97,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 160 power against an enemy 3% above level cap", async () => { game.override.enemyLevel(103); - await game.startBattle([ - Species.ETERNATUS, - ]); + await game.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -122,9 +112,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 180 power against an enemy 4% above level cap", async () => { game.override.enemyLevel(104); - await game.startBattle([ - Species.ETERNATUS, - ]); + await game.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -139,9 +127,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 200 power against an enemy 5% above level cap", async () => { game.override.enemyLevel(105); - await game.startBattle([ - Species.ETERNATUS, - ]); + await game.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -156,12 +142,10 @@ describe("Moves - Dynamax Cannon", () => { it("should return 200 power against an enemy way above level cap", async () => { game.override.enemyLevel(999); - await game.startBattle([ - Species.ETERNATUS, - ]); + await game.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(MoveEffectPhase, false); expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(dynamaxCannon.id); diff --git a/test/moves/effectiveness.test.ts b/test/moves/effectiveness.test.ts new file mode 100644 index 00000000000..dc55392f8bf --- /dev/null +++ b/test/moves/effectiveness.test.ts @@ -0,0 +1,100 @@ +import { allMoves } from "#app/data/moves/move"; +import { getPokemonSpecies } from "#app/data/pokemon-species"; +import { TrainerSlot } from "#app/data/trainer-config"; +import { PokemonType } from "#enums/pokemon-type"; +import { Abilities } from "#app/enums/abilities"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import * as Messages from "#app/messages"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, describe, expect, it, vi } from "vitest"; + +function testMoveEffectiveness( + game: GameManager, + move: Moves, + targetSpecies: Species, + expected: number, + targetAbility: Abilities = Abilities.BALL_FETCH, + teraType?: PokemonType, +): void { + // Suppress getPokemonNameWithAffix because it calls on a null battle spec + vi.spyOn(Messages, "getPokemonNameWithAffix").mockReturnValue(""); + game.override.enemyAbility(targetAbility); + + const user = game.scene.addPlayerPokemon(getPokemonSpecies(Species.SNORLAX), 5); + const target = game.scene.addEnemyPokemon(getPokemonSpecies(targetSpecies), 5, TrainerSlot.NONE); + + if (teraType !== undefined) { + target.teraType = teraType; + target.isTerastallized = true; + } + + expect(target.getMoveEffectiveness(user, allMoves[move])).toBe(expected); + user.destroy(); + target.destroy(); +} + +describe("Moves - Type Effectiveness", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + game = new GameManager(phaserGame); + + game.override.ability(Abilities.BALL_FETCH); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + it("Normal-type attacks are neutrally effective against Normal-type Pokemon", () => + testMoveEffectiveness(game, Moves.TACKLE, Species.SNORLAX, 1)); + + it("Normal-type attacks are not very effective against Steel-type Pokemon", () => + testMoveEffectiveness(game, Moves.TACKLE, Species.REGISTEEL, 0.5)); + + it("Normal-type attacks are doubly resisted by Steel/Rock-type Pokemon", () => + testMoveEffectiveness(game, Moves.TACKLE, Species.AGGRON, 0.25)); + + it("Normal-type attacks have no effect on Ghost-type Pokemon", () => + testMoveEffectiveness(game, Moves.TACKLE, Species.DUSCLOPS, 0)); + + it("Normal-type status moves are not affected by type matchups", () => + testMoveEffectiveness(game, Moves.GROWL, Species.DUSCLOPS, 1)); + + it("Electric-type attacks are super-effective against Water-type Pokemon", () => + testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.BLASTOISE, 2)); + + it("Ghost-type attacks have no effect on Normal-type Pokemon", () => + testMoveEffectiveness(game, Moves.SHADOW_BALL, Species.URSALUNA, 0)); + + it("Electric-type attacks are doubly super-effective against Water/Flying-type Pokemon", () => + testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 4)); + + it("Electric-type attacks are negated by Volt Absorb", () => + testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 0, Abilities.VOLT_ABSORB)); + + it("Electric-type attacks are super-effective against Tera-Water Pokemon", () => + testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.EXCADRILL, 2, Abilities.BALL_FETCH, PokemonType.WATER)); + + it("Powder moves have no effect on Grass-type Pokemon", () => + testMoveEffectiveness(game, Moves.SLEEP_POWDER, Species.AMOONGUSS, 0)); + + it("Powder moves have no effect on Tera-Grass Pokemon", () => + testMoveEffectiveness(game, Moves.SLEEP_POWDER, Species.SNORLAX, 0, Abilities.BALL_FETCH, PokemonType.GRASS)); + + it("Prankster-boosted status moves have no effect on Dark-type Pokemon", () => { + game.override.ability(Abilities.PRANKSTER); + testMoveEffectiveness(game, Moves.BABY_DOLL_EYES, Species.MIGHTYENA, 0); + }); + + it("Prankster-boosted status moves have no effect on Tera-Dark Pokemon", () => { + game.override.ability(Abilities.PRANKSTER); + testMoveEffectiveness(game, Moves.BABY_DOLL_EYES, Species.SNORLAX, 0, Abilities.BALL_FETCH, PokemonType.DARK); + }); +}); diff --git a/src/test/moves/electrify.test.ts b/test/moves/electrify.test.ts similarity index 75% rename from src/test/moves/electrify.test.ts rename to test/moves/electrify.test.ts index 8015dd0a74d..69e7504b406 100644 --- a/src/test/moves/electrify.test.ts +++ b/test/moves/electrify.test.ts @@ -1,9 +1,9 @@ import { BattlerIndex } from "#app/battle"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; @@ -34,7 +34,7 @@ describe("Moves - Electrify", () => { }); it("should convert attacks to Electric type", async () => { - await game.classicMode.startBattle([ Species.EXCADRILL ]); + await game.classicMode.startBattle([Species.EXCADRILL]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -42,17 +42,17 @@ describe("Moves - Electrify", () => { game.move.select(Moves.ELECTRIFY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("BerryPhase", false); - expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC); + expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC); expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp()); }); it("should override type changes from abilities", async () => { game.override.enemyAbility(Abilities.PIXILATE); - await game.classicMode.startBattle([ Species.EXCADRILL ]); + await game.classicMode.startBattle([Species.EXCADRILL]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getPlayerPokemon()!; @@ -60,10 +60,10 @@ describe("Moves - Electrify", () => { game.move.select(Moves.ELECTRIFY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("BerryPhase", false); - expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC); + expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC); expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp()); }); }); diff --git a/src/test/moves/electro_shot.test.ts b/test/moves/electro_shot.test.ts similarity index 89% rename from src/test/moves/electro_shot.test.ts rename to test/moves/electro_shot.test.ts index 283154b3408..05ab9c24a7c 100644 --- a/src/test/moves/electro_shot.test.ts +++ b/test/moves/electro_shot.test.ts @@ -5,7 +5,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; @@ -36,7 +36,7 @@ describe("Moves - Electro Shot", () => { }); it("should increase the user's Sp. Atk on the first turn, then attack on the second turn", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -62,11 +62,11 @@ describe("Moves - Electro Shot", () => { it.each([ { weatherType: WeatherType.RAIN, name: "Rain" }, - { weatherType: WeatherType.HEAVY_RAIN, name: "Heavy Rain" } + { weatherType: WeatherType.HEAVY_RAIN, name: "Heavy Rain" }, ])("should fully resolve in one turn if $name is active", async ({ weatherType }) => { game.override.weather(weatherType); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -87,11 +87,9 @@ describe("Moves - Electro Shot", () => { }); it("should only increase Sp. Atk once with Multi-Lens", async () => { - game.override - .weather(WeatherType.RAIN) - .startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); + game.override.weather(WeatherType.RAIN).startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; diff --git a/src/test/moves/encore.test.ts b/test/moves/encore.test.ts similarity index 83% rename from src/test/moves/encore.test.ts rename to test/moves/encore.test.ts index 7d8dc9658bf..43b9eb6a77f 100644 --- a/src/test/moves/encore.test.ts +++ b/test/moves/encore.test.ts @@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -25,19 +25,19 @@ describe("Moves - Encore", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH, Moves.ENCORE ]) + .moveset([Moves.SPLASH, Moves.ENCORE]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.SPLASH, Moves.TACKLE ]) + .enemyMoveset([Moves.SPLASH, Moves.TACKLE]) .startingLevel(100) .enemyLevel(100); }); it("should prevent the target from using any move except the last used move", async () => { - await game.classicMode.startBattle([ Species.SNORLAX ]); + await game.classicMode.startBattle([Species.SNORLAX]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -61,26 +61,24 @@ describe("Moves - Encore", () => { { moveId: Moves.MIMIC, name: "Mimic", delay: true }, { moveId: Moves.SKETCH, name: "Sketch", delay: true }, { moveId: Moves.ENCORE, name: "Encore", delay: false }, - { moveId: Moves.STRUGGLE, name: "Struggle", delay: false } + { moveId: Moves.STRUGGLE, name: "Struggle", delay: false }, ])("$name", async ({ moveId, delay }) => { game.override.enemyMoveset(moveId); - await game.classicMode.startBattle([ Species.SNORLAX ]); + await game.classicMode.startBattle([Species.SNORLAX]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; if (delay) { game.move.select(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); } game.move.select(Moves.ENCORE); - const turnOrder = delay - ? [ BattlerIndex.PLAYER, BattlerIndex.ENEMY ] - : [ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]; + const turnOrder = delay ? [BattlerIndex.PLAYER, BattlerIndex.ENEMY] : [BattlerIndex.ENEMY, BattlerIndex.PLAYER]; await game.setTurnOrder(turnOrder); await game.phaseInterceptor.to("BerryPhase", false); @@ -90,9 +88,9 @@ describe("Moves - Encore", () => { }); it("Pokemon under both Encore and Torment should alternate between Struggle and restricted move", async () => { - const turnOrder = [ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]; - game.override.moveset([ Moves.ENCORE, Moves.TORMENT, Moves.SPLASH ]); - await game.classicMode.startBattle([ Species.FEEBAS ]); + const turnOrder = [BattlerIndex.ENEMY, BattlerIndex.PLAYER]; + game.override.moveset([Moves.ENCORE, Moves.TORMENT, Moves.SPLASH]); + await game.classicMode.startBattle([Species.FEEBAS]); const enemyPokemon = game.scene.getEnemyPokemon(); game.move.select(Moves.ENCORE); diff --git a/src/test/moves/endure.test.ts b/test/moves/endure.test.ts similarity index 84% rename from src/test/moves/endure.test.ts rename to test/moves/endure.test.ts index bde5a26f68e..8151128479d 100644 --- a/src/test/moves/endure.test.ts +++ b/test/moves/endure.test.ts @@ -1,7 +1,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -22,7 +22,7 @@ describe("Moves - Endure", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.THUNDER, Moves.BULLET_SEED, Moves.TOXIC ]) + .moveset([Moves.THUNDER, Moves.BULLET_SEED, Moves.TOXIC]) .ability(Abilities.SKILL_LINK) .startingLevel(100) .battleType("single") @@ -33,7 +33,7 @@ describe("Moves - Endure", () => { }); it("should let the pokemon survive with 1 HP", async () => { - await game.classicMode.startBattle([ Species.ARCEUS ]); + await game.classicMode.startBattle([Species.ARCEUS]); game.move.select(Moves.THUNDER); await game.phaseInterceptor.to("BerryPhase"); @@ -42,7 +42,7 @@ describe("Moves - Endure", () => { }); it("should let the pokemon survive with 1 HP when hit with a multihit move", async () => { - await game.classicMode.startBattle([ Species.ARCEUS ]); + await game.classicMode.startBattle([Species.ARCEUS]); game.move.select(Moves.BULLET_SEED); await game.phaseInterceptor.to("BerryPhase"); @@ -52,7 +52,7 @@ describe("Moves - Endure", () => { it("shouldn't prevent fainting from indirect damage", async () => { game.override.enemyLevel(100); - await game.classicMode.startBattle([ Species.ARCEUS ]); + await game.classicMode.startBattle([Species.ARCEUS]); const enemy = game.scene.getEnemyPokemon()!; enemy.hp = 2; diff --git a/test/moves/entrainment.test.ts b/test/moves/entrainment.test.ts new file mode 100644 index 00000000000..b2a0baf3e27 --- /dev/null +++ b/test/moves/entrainment.test.ts @@ -0,0 +1,53 @@ +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Entrainment", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH, Moves.ENTRAINMENT]) + .ability(Abilities.ADAPTABILITY) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("gives its ability to the target", async () => { + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.ENTRAINMENT); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.ADAPTABILITY); + }); + + it("should activate post-summon abilities", async () => { + game.override.ability(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.ENTRAINMENT); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(-1); + }); +}); diff --git a/src/test/moves/fairy_lock.test.ts b/test/moves/fairy_lock.test.ts similarity index 89% rename from src/test/moves/fairy_lock.test.ts rename to test/moves/fairy_lock.test.ts index ceb298ed0fe..a47143add4f 100644 --- a/src/test/moves/fairy_lock.test.ts +++ b/test/moves/fairy_lock.test.ts @@ -3,7 +3,7 @@ import { ArenaTagType } from "#app/enums/arena-tag-type"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -24,17 +24,17 @@ describe("Moves - Fairy Lock", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.FAIRY_LOCK, Moves.SPLASH ]) + .moveset([Moves.FAIRY_LOCK, Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("double") .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.SPLASH, Moves.U_TURN ]); + .enemyMoveset([Moves.SPLASH, Moves.U_TURN]); }); it("Applies Fairy Lock tag for two turns", async () => { - await game.classicMode.startBattle([ Species.KLEFKI, Species.TYRUNT ]); + await game.classicMode.startBattle([Species.KLEFKI, Species.TYRUNT]); const playerPokemon = game.scene.getPlayerField(); const enemyField = game.scene.getEnemyField(); @@ -66,7 +66,7 @@ describe("Moves - Fairy Lock", () => { }); it("Ghost types can escape Fairy Lock", async () => { - await game.classicMode.startBattle([ Species.DUSKNOIR, Species.GENGAR, Species.TYRUNT ]); + await game.classicMode.startBattle([Species.DUSKNOIR, Species.GENGAR, Species.TYRUNT]); game.move.select(Moves.FAIRY_LOCK); game.move.select(Moves.SPLASH, 1); @@ -93,8 +93,8 @@ describe("Moves - Fairy Lock", () => { }); it("Phasing moves will still switch out", async () => { - game.override.enemyMoveset([ Moves.SPLASH, Moves.WHIRLWIND ]); - await game.classicMode.startBattle([ Species.KLEFKI, Species.TYRUNT, Species.ZYGARDE ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.WHIRLWIND]); + await game.classicMode.startBattle([Species.KLEFKI, Species.TYRUNT, Species.ZYGARDE]); game.move.select(Moves.FAIRY_LOCK); game.move.select(Moves.SPLASH, 1); @@ -120,8 +120,8 @@ describe("Moves - Fairy Lock", () => { }); it("If a Pokemon faints and is replaced the replacement is also trapped", async () => { - game.override.moveset([ Moves.FAIRY_LOCK, Moves.SPLASH, Moves.MEMENTO ]); - await game.classicMode.startBattle([ Species.KLEFKI, Species.GUZZLORD, Species.TYRUNT, Species.ZYGARDE ]); + game.override.moveset([Moves.FAIRY_LOCK, Moves.SPLASH, Moves.MEMENTO]); + await game.classicMode.startBattle([Species.KLEFKI, Species.GUZZLORD, Species.TYRUNT, Species.ZYGARDE]); game.move.select(Moves.FAIRY_LOCK); game.move.select(Moves.MEMENTO, 1); diff --git a/src/test/moves/fake_out.test.ts b/test/moves/fake_out.test.ts similarity index 84% rename from src/test/moves/fake_out.test.ts rename to test/moves/fake_out.test.ts index f20b6db3a13..929c760ee5b 100644 --- a/src/test/moves/fake_out.test.ts +++ b/test/moves/fake_out.test.ts @@ -1,4 +1,4 @@ -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; @@ -23,15 +23,15 @@ describe("Moves - Fake Out", () => { game.override .battleType("single") .enemySpecies(Species.CORVIKNIGHT) - .moveset([ Moves.FAKE_OUT, Moves.SPLASH ]) + .moveset([Moves.FAKE_OUT, Moves.SPLASH]) .enemyMoveset(Moves.SPLASH) .enemyLevel(10) .startingLevel(10) // prevent LevelUpPhase from happening .disableCrits(); }); - it("can only be used on the first turn a pokemon is sent out in a battle", async() => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + it("can only be used on the first turn a pokemon is sent out in a battle", async () => { + await game.classicMode.startBattle([Species.FEEBAS]); const enemy = game.scene.getEnemyPokemon()!; @@ -48,8 +48,8 @@ describe("Moves - Fake Out", () => { }, 20000); // This is a PokeRogue buff to Fake Out - it("can be used at the start of every wave even if the pokemon wasn't recalled", async() => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + it("can be used at the start of every wave even if the pokemon wasn't recalled", async () => { + await game.classicMode.startBattle([Species.FEEBAS]); const enemy = game.scene.getEnemyPokemon()!; enemy.damageAndUpdate(enemy.getMaxHp() - 1); @@ -63,9 +63,9 @@ describe("Moves - Fake Out", () => { expect(game.scene.getEnemyPokemon()!.isFullHp()).toBe(false); }, 20000); - it("can be used again if recalled and sent back out", async() => { + it("can be used again if recalled and sent back out", async () => { game.override.startingWave(4); - await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]); const enemy1 = game.scene.getEnemyPokemon()!; diff --git a/test/moves/fell_stinger.test.ts b/test/moves/fell_stinger.test.ts new file mode 100644 index 00000000000..2ffa44c5a3a --- /dev/null +++ b/test/moves/fell_stinger.test.ts @@ -0,0 +1,183 @@ +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import GameManager from "#test/testUtils/gameManager"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Stat } from "#enums/stat"; +import { StatusEffect } from "#app/enums/status-effect"; +import { WeatherType } from "#app/enums/weather-type"; +import { allMoves } from "#app/data/moves/move"; + +describe("Moves - Fell Stinger", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override + .battleType("single") + .moveset([Moves.FELL_STINGER, Moves.SALT_CURE, Moves.BIND, Moves.LEECH_SEED]) + .startingLevel(50) + .disableCrits() + .enemyAbility(Abilities.STURDY) + .enemySpecies(Species.HYPNO) + .enemyMoveset(Moves.SPLASH) + .enemyLevel(5); + }); + + it("should not grant stat boost if opponent gets KO'd by recoil", async () => { + game.override.enemyMoveset([Moves.DOUBLE_EDGE]); + + await game.classicMode.startBattle([Species.LEAVANNY]); + const leadPokemon = game.scene.getPlayerPokemon()!; + game.move.select(Moves.FELL_STINGER); + + await game.phaseInterceptor.to("VictoryPhase"); + + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should not grant stat boost if enemy is KO'd by status effect", async () => { + game.override.enemyMoveset(Moves.SPLASH).enemyStatusEffect(StatusEffect.BURN); + + await game.classicMode.startBattle([Species.LEAVANNY]); + const leadPokemon = game.scene.getPlayerPokemon()!; + game.move.select(Moves.FELL_STINGER); + + await game.phaseInterceptor.to("VictoryPhase"); + + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should not grant stat boost if enemy is KO'd by damaging weather", async () => { + game.override.weather(WeatherType.HAIL); + + await game.classicMode.startBattle([Species.LEAVANNY]); + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.FELL_STINGER); + + await game.phaseInterceptor.to("VictoryPhase"); + + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should not grant stat boost if enemy is KO'd by Dry Skin + Harsh Sunlight", async () => { + game.override.enemyPassiveAbility(Abilities.STURDY).enemyAbility(Abilities.DRY_SKIN).weather(WeatherType.HARSH_SUN); + + await game.challengeMode.startBattle([Species.LEAVANNY]); + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.FELL_STINGER); + + await game.phaseInterceptor.to("VictoryPhase"); + + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should not grant stat boost if enemy is saved by Reviver Seed", async () => { + game.override.enemyAbility(Abilities.BALL_FETCH).enemyHeldItems([{ name: "REVIVER_SEED" }]); + + await game.classicMode.startBattle([Species.LEAVANNY]); + const leadPokemon = game.scene.getPlayerPokemon()!; + game.move.select(Moves.FELL_STINGER); + + await game.phaseInterceptor.to("TurnEndPhase"); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should not grant stat boost if enemy is KO'd by Salt Cure", async () => { + game.override.battleType("double").startingLevel(5); + const saltCure = allMoves[Moves.SALT_CURE]; + const fellStinger = allMoves[Moves.FELL_STINGER]; + vi.spyOn(saltCure, "accuracy", "get").mockReturnValue(100); + vi.spyOn(fellStinger, "power", "get").mockReturnValue(50000); + + await game.classicMode.startBattle([Species.LEAVANNY]); + const leadPokemon = game.scene.getPlayerPokemon()!; + const leftEnemy = game.scene.getEnemyField()[0]!; + + // Turn 1: set Salt Cure, enemy splashes and does nothing + game.move.select(Moves.SALT_CURE, 0, leftEnemy.getBattlerIndex()); + + // Turn 2: enemy Endures Fell Stinger, then dies to Salt Cure + await game.toNextTurn(); + expect(leftEnemy.isFainted()).toBe(false); + leftEnemy.heal(leftEnemy.getMaxHp()); + game.move.select(Moves.FELL_STINGER); + await game.toNextTurn(); + + expect(leftEnemy.isFainted()).toBe(true); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should not grant stat boost if enemy dies to Bind or a similar effect", async () => { + game.override.battleType("double").startingLevel(5); + vi.spyOn(allMoves[Moves.BIND], "accuracy", "get").mockReturnValue(100); + vi.spyOn(allMoves[Moves.FELL_STINGER], "power", "get").mockReturnValue(50000); + + await game.classicMode.startBattle([Species.LEAVANNY]); + const leadPokemon = game.scene.getPlayerPokemon()!; + const leftEnemy = game.scene.getEnemyField()[0]!; + + // Turn 1: set Bind, enemy splashes and does nothing + game.move.select(Moves.BIND, 0, leftEnemy.getBattlerIndex()); + + // Turn 2: enemy Endures Fell Stinger, then dies to Bind + await game.toNextTurn(); + expect(leftEnemy.isFainted()).toBe(false); + leftEnemy.heal(leftEnemy.getMaxHp()); + game.move.select(Moves.FELL_STINGER, 0, leftEnemy.getBattlerIndex()); + await game.toNextTurn(); + + expect(leftEnemy.isFainted()).toBe(true); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should not grant stat boost if enemy dies to Leech Seed", async () => { + game.override.battleType("double").startingLevel(5); + vi.spyOn(allMoves[Moves.LEECH_SEED], "accuracy", "get").mockReturnValue(100); + vi.spyOn(allMoves[Moves.FELL_STINGER], "power", "get").mockReturnValue(50000); + + await game.classicMode.startBattle([Species.LEAVANNY]); + const leadPokemon = game.scene.getPlayerPokemon()!; + const leftEnemy = game.scene.getEnemyField()[0]!; + + // Turn 1: set Leech Seed, enemy splashes and does nothing + game.move.select(Moves.LEECH_SEED, 0, leftEnemy.getBattlerIndex()); + + // Turn 2: enemy Endures Fell Stinger, then dies to Leech Seed + await game.toNextTurn(); + expect(leftEnemy.isFainted()).toBe(false); + leftEnemy.heal(leftEnemy.getMaxHp()); + game.move.select(Moves.FELL_STINGER, 0, leftEnemy.getBattlerIndex()); + await game.toNextTurn(); + + expect(leftEnemy.isFainted()).toBe(true); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should grant stat boost if enemy dies directly to hit", async () => { + game.override.enemyAbility(Abilities.KLUTZ); + + await game.classicMode.startBattle([Species.LEAVANNY]); + const leadPokemon = game.scene.getPlayerPokemon(); + game.move.select(Moves.FELL_STINGER); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(leadPokemon?.getStatStage(Stat.ATK)).toBe(3); + }); +}); diff --git a/test/moves/fillet_away.test.ts b/test/moves/fillet_away.test.ts new file mode 100644 index 00000000000..cc462b3746a --- /dev/null +++ b/test/moves/fillet_away.test.ts @@ -0,0 +1,108 @@ +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { toDmgValue } from "#app/utils"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +/** HP Cost of Move */ +const RATIO = 2; +/** Amount of extra HP lost */ +const PREDAMAGE = 15; + +describe("Moves - FILLET AWAY", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.starterSpecies(Species.MAGIKARP); + game.override.enemySpecies(Species.SNORLAX); + game.override.startingLevel(100); + game.override.enemyLevel(100); + game.override.moveset([Moves.FILLET_AWAY]); + game.override.enemyMoveset(Moves.SPLASH); + }); + + //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/fillet_away_(move) + + test("raises the user's ATK, SPATK, and SPD stat stages by 2 each, at the cost of 1/2 of its maximum HP", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); + + game.move.select(Moves.FILLET_AWAY); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); + expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(2); + expect(leadPokemon.getStatStage(Stat.SPD)).toBe(2); + }); + + test("still takes effect if one or more of the involved stat stages are not at max", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); + + //Here - Stat.SPD -> 0 and Stat.SPATK -> 3 + leadPokemon.setStatStage(Stat.ATK, 6); + leadPokemon.setStatStage(Stat.SPATK, 3); + + game.move.select(Moves.FILLET_AWAY); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); + expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(5); + expect(leadPokemon.getStatStage(Stat.SPD)).toBe(2); + }); + + test("fails if all stat stages involved are at max", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + leadPokemon.setStatStage(Stat.ATK, 6); + leadPokemon.setStatStage(Stat.SPATK, 6); + leadPokemon.setStatStage(Stat.SPD, 6); + + game.move.select(Moves.FILLET_AWAY); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6); + expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6); + expect(leadPokemon.getStatStage(Stat.SPD)).toBe(6); + }); + + test("fails if the user's health is less than 1/2", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); + leadPokemon.hp = hpLost - PREDAMAGE; + + game.move.select(Moves.FILLET_AWAY); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(0); + expect(leadPokemon.getStatStage(Stat.SPD)).toBe(0); + }); +}); diff --git a/src/test/moves/fissure.test.ts b/test/moves/fissure.test.ts similarity index 91% rename from src/test/moves/fissure.test.ts rename to test/moves/fissure.test.ts index 0975a87b2b1..63de58eb2e7 100644 --- a/src/test/moves/fissure.test.ts +++ b/test/moves/fissure.test.ts @@ -5,7 +5,7 @@ import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -32,7 +32,7 @@ describe("Moves - Fissure", () => { game.override.disableCrits(); game.override.starterSpecies(Species.SNORLAX); - game.override.moveset([ Moves.FISSURE ]); + game.override.moveset([Moves.FISSURE]); game.override.passiveAbility(Abilities.BALL_FETCH); game.override.startingLevel(100); @@ -41,14 +41,10 @@ describe("Moves - Fissure", () => { game.override.enemyPassiveAbility(Abilities.BALL_FETCH); game.override.enemyLevel(100); - await game.startBattle(); + await game.classicMode.startBattle(); partyPokemon = game.scene.getPlayerParty()[0]; enemyPokemon = game.scene.getEnemyPokemon()!; - - // remove berries - game.scene.removePartyMemberModifiers(0); - game.scene.clearEnemyHeldItemModifiers(); }); it("ignores damage modification from abilities, for example FUR_COAT", async () => { diff --git a/src/test/moves/flame_burst.test.ts b/test/moves/flame_burst.test.ts similarity index 77% rename from src/test/moves/flame_burst.test.ts rename to test/moves/flame_burst.test.ts index 9dea930d7e8..b6a425e7bb5 100644 --- a/src/test/moves/flame_burst.test.ts +++ b/test/moves/flame_burst.test.ts @@ -4,7 +4,7 @@ import type Pokemon from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -20,7 +20,7 @@ describe("Moves - Flame Burst", () => { * @returns Effect damage of Flame Burst */ const getEffectDamage = (pokemon: Pokemon): number => { - return Math.max(1, Math.floor(pokemon.getMaxHp() * 1 / 16)); + return Math.max(1, Math.floor((pokemon.getMaxHp() * 1) / 16)); }; beforeAll(() => { @@ -36,18 +36,18 @@ describe("Moves - Flame Burst", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("double"); - game.override.moveset([ Moves.FLAME_BURST, Moves.SPLASH ]); + game.override.moveset([Moves.FLAME_BURST, Moves.SPLASH]); game.override.disableCrits(); game.override.ability(Abilities.UNNERVE); game.override.startingWave(4); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset([ Moves.SPLASH ]); + game.override.enemyMoveset([Moves.SPLASH]); }); it("inflicts damage to the target's ally equal to 1/16 of its max HP", async () => { - await game.startBattle([ Species.PIKACHU, Species.PIKACHU ]); - const [ leftEnemy, rightEnemy ] = game.scene.getEnemyField(); + await game.startBattle([Species.PIKACHU, Species.PIKACHU]); + const [leftEnemy, rightEnemy] = game.scene.getEnemyField(); game.move.select(Moves.FLAME_BURST, 0, leftEnemy.getBattlerIndex()); game.move.select(Moves.SPLASH, 1); @@ -60,8 +60,8 @@ describe("Moves - Flame Burst", () => { it("does not inflict damage to the target's ally if the target was not affected by Flame Burst", async () => { game.override.enemyAbility(Abilities.FLASH_FIRE); - await game.startBattle([ Species.PIKACHU, Species.PIKACHU ]); - const [ leftEnemy, rightEnemy ] = game.scene.getEnemyField(); + await game.startBattle([Species.PIKACHU, Species.PIKACHU]); + const [leftEnemy, rightEnemy] = game.scene.getEnemyField(); game.move.select(Moves.FLAME_BURST, 0, leftEnemy.getBattlerIndex()); game.move.select(Moves.SPLASH, 1); @@ -72,8 +72,8 @@ describe("Moves - Flame Burst", () => { }); it("does not interact with the target ally's abilities", async () => { - await game.startBattle([ Species.PIKACHU, Species.PIKACHU ]); - const [ leftEnemy, rightEnemy ] = game.scene.getEnemyField(); + await game.startBattle([Species.PIKACHU, Species.PIKACHU]); + const [leftEnemy, rightEnemy] = game.scene.getEnemyField(); vi.spyOn(rightEnemy, "getAbility").mockReturnValue(allAbilities[Abilities.FLASH_FIRE]); @@ -86,8 +86,8 @@ describe("Moves - Flame Burst", () => { }); it("effect damage is prevented by Magic Guard", async () => { - await game.startBattle([ Species.PIKACHU, Species.PIKACHU ]); - const [ leftEnemy, rightEnemy ] = game.scene.getEnemyField(); + await game.startBattle([Species.PIKACHU, Species.PIKACHU]); + const [leftEnemy, rightEnemy] = game.scene.getEnemyField(); vi.spyOn(rightEnemy, "getAbility").mockReturnValue(allAbilities[Abilities.MAGIC_GUARD]); @@ -99,7 +99,11 @@ describe("Moves - Flame Burst", () => { expect(rightEnemy.hp).toBe(rightEnemy.getMaxHp()); }); - it("is not affected by protection moves and Endure", async () => { - // TODO: update this test when it's possible to select move for each enemy - }, { skip: true }); + it( + "is not affected by protection moves and Endure", + async () => { + // TODO: update this test when it's possible to select move for each enemy + }, + { skip: true }, + ); }); diff --git a/src/test/moves/flower_shield.test.ts b/test/moves/flower_shield.test.ts similarity index 88% rename from src/test/moves/flower_shield.test.ts rename to test/moves/flower_shield.test.ts index 4c03df5212b..b66847651c1 100644 --- a/src/test/moves/flower_shield.test.ts +++ b/test/moves/flower_shield.test.ts @@ -1,12 +1,12 @@ import { Stat } from "#enums/stat"; import { SemiInvulnerableTag } from "#app/data/battler-tags"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Biome } from "#app/enums/biome"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -29,14 +29,14 @@ describe("Moves - Flower Shield", () => { game.override.ability(Abilities.NONE); game.override.enemyAbility(Abilities.NONE); game.override.battleType("single"); - game.override.moveset([ Moves.FLOWER_SHIELD, Moves.SPLASH ]); + game.override.moveset([Moves.FLOWER_SHIELD, Moves.SPLASH]); game.override.enemyMoveset(Moves.SPLASH); }); it("raises DEF stat stage by 1 for all Grass-type Pokemon on the field by one stage - single battle", async () => { game.override.enemySpecies(Species.CHERRIM); - await game.startBattle([ Species.MAGIKARP ]); + await game.startBattle([Species.MAGIKARP]); const cherrim = game.scene.getEnemyPokemon()!; const magikarp = game.scene.getPlayerPokemon()!; @@ -53,10 +53,10 @@ describe("Moves - Flower Shield", () => { it("raises DEF stat stage by 1 for all Grass-type Pokemon on the field by one stage - double battle", async () => { game.override.enemySpecies(Species.MAGIKARP).startingBiome(Biome.GRASS).battleType("double"); - await game.startBattle([ Species.CHERRIM, Species.MAGIKARP ]); + await game.startBattle([Species.CHERRIM, Species.MAGIKARP]); const field = game.scene.getField(true); - const grassPokemons = field.filter(p => p.getTypes().includes(Type.GRASS)); + const grassPokemons = field.filter(p => p.getTypes().includes(PokemonType.GRASS)); const nonGrassPokemons = field.filter(pokemon => !grassPokemons.includes(pokemon)); grassPokemons.forEach(p => expect(p.getStatStage(Stat.DEF)).toBe(0)); @@ -72,13 +72,13 @@ describe("Moves - Flower Shield", () => { /** * See semi-vulnerable state tags. {@linkcode SemiInvulnerableTag} - */ + */ it("does not raise DEF stat stage for a Pokemon in semi-vulnerable state", async () => { game.override.enemySpecies(Species.PARAS); - game.override.enemyMoveset([ Moves.DIG, Moves.DIG, Moves.DIG, Moves.DIG ]); + game.override.enemyMoveset([Moves.DIG, Moves.DIG, Moves.DIG, Moves.DIG]); game.override.enemyLevel(50); - await game.startBattle([ Species.CHERRIM ]); + await game.startBattle([Species.CHERRIM]); const paras = game.scene.getEnemyPokemon()!; const cherrim = game.scene.getPlayerPokemon()!; @@ -97,7 +97,7 @@ describe("Moves - Flower Shield", () => { it("does nothing if there are no Grass-type Pokemon on the field", async () => { game.override.enemySpecies(Species.MAGIKARP); - await game.startBattle([ Species.MAGIKARP ]); + await game.startBattle([Species.MAGIKARP]); const enemy = game.scene.getEnemyPokemon()!; const ally = game.scene.getPlayerPokemon()!; diff --git a/src/test/moves/fly.test.ts b/test/moves/fly.test.ts similarity index 86% rename from src/test/moves/fly.test.ts rename to test/moves/fly.test.ts index 6ae758fe3dc..0bd7d22b2a7 100644 --- a/src/test/moves/fly.test.ts +++ b/test/moves/fly.test.ts @@ -4,11 +4,11 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; describe("Moves - Fly", () => { let phaserGame: Phaser.Game; @@ -39,7 +39,7 @@ describe("Moves - Fly", () => { }); it("should make the user semi-invulnerable, then attack over 2 turns", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -65,7 +65,7 @@ describe("Moves - Fly", () => { it("should not allow the user to evade attacks from Pokemon with No Guard", async () => { game.override.enemyAbility(Abilities.NO_GUARD); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -78,11 +78,9 @@ describe("Moves - Fly", () => { }); it("should not expend PP when the attack phase is cancelled", async () => { - game.override - .enemyAbility(Abilities.NO_GUARD) - .enemyMoveset(Moves.SPORE); + game.override.enemyAbility(Abilities.NO_GUARD).enemyMoveset(Moves.SPORE); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -97,9 +95,9 @@ describe("Moves - Fly", () => { }); it("should be cancelled when another Pokemon uses Gravity", async () => { - game.override.enemyMoveset([ Moves.SPLASH, Moves.GRAVITY ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.GRAVITY]); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -110,7 +108,7 @@ describe("Moves - Fly", () => { await game.toNextTurn(); await game.forceEnemyMove(Moves.GRAVITY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); expect(playerPokemon.getLastXMoves(1)[0].result).toBe(MoveResult.FAIL); diff --git a/test/moves/focus_punch.test.ts b/test/moves/focus_punch.test.ts new file mode 100644 index 00000000000..2dc5f20f2bf --- /dev/null +++ b/test/moves/focus_punch.test.ts @@ -0,0 +1,132 @@ +import { BerryPhase } from "#app/phases/berry-phase"; +import { MessagePhase } from "#app/phases/message-phase"; +import { MoveHeaderPhase } from "#app/phases/move-header-phase"; +import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; +import { TurnStartPhase } from "#app/phases/turn-start-phase"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import i18next from "i18next"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Moves - Focus Punch", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("single") + .ability(Abilities.UNNERVE) + .moveset([Moves.FOCUS_PUNCH]) + .enemySpecies(Species.GROUDON) + .enemyAbility(Abilities.INSOMNIA) + .enemyMoveset(Moves.SPLASH) + .startingLevel(100) + .enemyLevel(100); + }); + + it("should deal damage at the end of turn if uninterrupted", async () => { + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + const enemyStartingHp = enemyPokemon.hp; + + game.move.select(Moves.FOCUS_PUNCH); + + await game.phaseInterceptor.to(MessagePhase); + + expect(enemyPokemon.hp).toBe(enemyStartingHp); + expect(leadPokemon.getMoveHistory().length).toBe(0); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp); + expect(leadPokemon.getMoveHistory().length).toBe(1); + expect(leadPokemon.turnData.totalDamageDealt).toBe(enemyStartingHp - enemyPokemon.hp); + }); + + it("should fail if the user is hit", async () => { + game.override.enemyMoveset([Moves.TACKLE]); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + const enemyStartingHp = enemyPokemon.hp; + + game.move.select(Moves.FOCUS_PUNCH); + + await game.phaseInterceptor.to(MessagePhase); + + expect(enemyPokemon.hp).toBe(enemyStartingHp); + expect(leadPokemon.getMoveHistory().length).toBe(0); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(enemyPokemon.hp).toBe(enemyStartingHp); + expect(leadPokemon.getMoveHistory().length).toBe(1); + expect(leadPokemon.turnData.totalDamageDealt).toBe(0); + }); + + it("should be cancelled if the user falls asleep mid-turn", async () => { + game.override.enemyMoveset([Moves.SPORE]); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.FOCUS_PUNCH); + + await game.phaseInterceptor.to(MessagePhase); // Header message + + expect(leadPokemon.getMoveHistory().length).toBe(0); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(leadPokemon.getMoveHistory().length).toBe(1); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); + + it("should not queue its pre-move message before an enemy switches", async () => { + /** Guarantee a Trainer battle with multiple enemy Pokemon */ + game.override.startingWave(25); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + game.forceEnemyToSwitch(); + game.move.select(Moves.FOCUS_PUNCH); + + await game.phaseInterceptor.to(TurnStartPhase); + + expect(game.scene.getCurrentPhase() instanceof SwitchSummonPhase).toBeTruthy(); + expect(game.scene.phaseQueue.find(phase => phase instanceof MoveHeaderPhase)).toBeDefined(); + }); + it("should replace the 'but it failed' text when the user gets hit", async () => { + game.override.enemyMoveset([Moves.TACKLE]); + await game.classicMode.startBattle([Species.CHARIZARD]); + + game.move.select(Moves.FOCUS_PUNCH); + await game.phaseInterceptor.to("MoveEndPhase", true); + await game.phaseInterceptor.to("MessagePhase", false); + const consoleSpy = vi.spyOn(console, "log"); + await game.phaseInterceptor.to("MoveEndPhase", true); + expect(consoleSpy).nthCalledWith(1, i18next.t("moveTriggers:lostFocus", { pokemonName: "Charizard" })); + }); +}); diff --git a/test/moves/follow_me.test.ts b/test/moves/follow_me.test.ts new file mode 100644 index 00000000000..eeb11b36f24 --- /dev/null +++ b/test/moves/follow_me.test.ts @@ -0,0 +1,116 @@ +import { Stat } from "#enums/stat"; +import { BattlerIndex } from "#app/battle"; +import { Abilities } from "#app/enums/abilities"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Moves - Follow Me", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("double"); + game.override.starterSpecies(Species.AMOONGUSS); + game.override.ability(Abilities.BALL_FETCH); + game.override.enemySpecies(Species.SNORLAX); + game.override.startingLevel(100); + game.override.enemyLevel(100); + game.override.moveset([Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK]); + game.override.enemyMoveset([Moves.TACKLE, Moves.FOLLOW_ME, Moves.SPLASH]); + }); + + test("move should redirect enemy attacks to the user", async () => { + await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.FOLLOW_ME); + game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY); + + // Force both enemies to target the player Pokemon that did not use Follow Me + await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + + await game.phaseInterceptor.to(TurnEndPhase, false); + + expect(playerPokemon[0].hp).toBeLessThan(playerPokemon[0].getMaxHp()); + expect(playerPokemon[1].hp).toBe(playerPokemon[1].getMaxHp()); + }); + + test("move should redirect enemy attacks to the first ally that uses it", async () => { + await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.FOLLOW_ME); + game.move.select(Moves.FOLLOW_ME, 1); + + // Each player is targeted by an enemy + await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + + await game.phaseInterceptor.to(TurnEndPhase, false); + + playerPokemon.sort((a, b) => a.getEffectiveStat(Stat.SPD) - b.getEffectiveStat(Stat.SPD)); + + expect(playerPokemon[1].hp).toBeLessThan(playerPokemon[1].getMaxHp()); + expect(playerPokemon[0].hp).toBe(playerPokemon[0].getMaxHp()); + }); + + test("move effect should be bypassed by Stalwart", async () => { + game.override.ability(Abilities.STALWART); + game.override.moveset([Moves.QUICK_ATTACK]); + + await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY); + game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); + + // Target doesn't need to be specified if the move is self-targeted + await game.forceEnemyMove(Moves.FOLLOW_ME); + await game.forceEnemyMove(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase, false); + + // If redirection was bypassed, both enemies should be damaged + expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); + expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp()); + }); + + test("move effect should be bypassed by Snipe Shot", async () => { + game.override.moveset([Moves.SNIPE_SHOT]); + + await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.SNIPE_SHOT, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SNIPE_SHOT, 1, BattlerIndex.ENEMY_2); + + await game.forceEnemyMove(Moves.FOLLOW_ME); + await game.forceEnemyMove(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase, false); + + // If redirection was bypassed, both enemies should be damaged + expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); + expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp()); + }); +}); diff --git a/src/test/moves/foresight.test.ts b/test/moves/foresight.test.ts similarity index 91% rename from src/test/moves/foresight.test.ts rename to test/moves/foresight.test.ts index 1195cd0b71b..d33a00bf136 100644 --- a/src/test/moves/foresight.test.ts +++ b/test/moves/foresight.test.ts @@ -1,7 +1,7 @@ import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -27,7 +27,7 @@ describe("Moves - Foresight", () => { .enemyMoveset(Moves.SPLASH) .enemyLevel(5) .starterSpecies(Species.MAGIKARP) - .moveset([ Moves.FORESIGHT, Moves.QUICK_ATTACK, Moves.MACH_PUNCH ]); + .moveset([Moves.FORESIGHT, Moves.QUICK_ATTACK, Moves.MACH_PUNCH]); }); it("should allow Normal and Fighting moves to hit Ghost types", async () => { @@ -54,7 +54,7 @@ describe("Moves - Foresight", () => { }); it("should ignore target's evasiveness boosts", async () => { - game.override.enemyMoveset([ Moves.MINIMIZE ]); + game.override.enemyMoveset([Moves.MINIMIZE]); await game.startBattle(); const pokemon = game.scene.getPlayerPokemon()!; diff --git a/src/test/moves/forests_curse.test.ts b/test/moves/forests_curse.test.ts similarity index 75% rename from src/test/moves/forests_curse.test.ts rename to test/moves/forests_curse.test.ts index 010b00599a5..8850b92662d 100644 --- a/src/test/moves/forests_curse.test.ts +++ b/test/moves/forests_curse.test.ts @@ -1,8 +1,8 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { Type } from "#enums/type"; -import GameManager from "#test/utils/gameManager"; +import { PokemonType } from "#enums/pokemon-type"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,7 +23,7 @@ describe("Moves - Forest's Curse", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.FORESTS_CURSE, Moves.TRICK_OR_TREAT ]) + .moveset([Moves.FORESTS_CURSE, Moves.TRICK_OR_TREAT]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -33,15 +33,15 @@ describe("Moves - Forest's Curse", () => { }); it("will replace the added type from Trick Or Treat", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const enemyPokemon = game.scene.getEnemyPokemon(); game.move.select(Moves.TRICK_OR_TREAT); await game.phaseInterceptor.to("TurnEndPhase"); - expect(enemyPokemon!.summonData.addedType).toBe(Type.GHOST); + expect(enemyPokemon!.summonData.addedType).toBe(PokemonType.GHOST); game.move.select(Moves.FORESTS_CURSE); await game.phaseInterceptor.to("TurnEndPhase"); - expect(enemyPokemon?.summonData.addedType).toBe(Type.GRASS); + expect(enemyPokemon?.summonData.addedType).toBe(PokemonType.GRASS); }); }); diff --git a/src/test/moves/freeze_dry.test.ts b/test/moves/freeze_dry.test.ts similarity index 75% rename from src/test/moves/freeze_dry.test.ts rename to test/moves/freeze_dry.test.ts index 9206a103a35..8cab56ddfd2 100644 --- a/src/test/moves/freeze_dry.test.ts +++ b/test/moves/freeze_dry.test.ts @@ -2,9 +2,9 @@ import { BattlerIndex } from "#app/battle"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Challenges } from "#enums/challenges"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -30,7 +30,7 @@ describe("Moves - Freeze-Dry", () => { .enemyMoveset(Moves.SPLASH) .starterSpecies(Species.FEEBAS) .ability(Abilities.BALL_FETCH) - .moveset([ Moves.FREEZE_DRY, Moves.FORESTS_CURSE, Moves.SOAK ]); + .moveset([Moves.FREEZE_DRY, Moves.FORESTS_CURSE, Moves.SOAK]); }); it("should deal 2x damage to pure water types", async () => { @@ -40,7 +40,7 @@ describe("Moves - Freeze-Dry", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2); @@ -54,7 +54,7 @@ describe("Moves - Freeze-Dry", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4); @@ -68,7 +68,7 @@ describe("Moves - Freeze-Dry", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(1); @@ -82,14 +82,14 @@ describe("Moves - Freeze-Dry", () => { .enemySpecies(Species.SHEDINJA) .enemyMoveset(Moves.SPLASH) .starterSpecies(Species.MAGIKARP) - .moveset([ Moves.SOAK, Moves.FREEZE_DRY ]); + .moveset([Moves.SOAK, Moves.FREEZE_DRY]); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.SOAK); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); game.move.select(Moves.FREEZE_DRY); @@ -110,45 +110,46 @@ describe("Moves - Freeze-Dry", () => { await game.toNextTurn(); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(8); }); it("should deal 2x damage to steel type terastallized into water", async () => { - game.override.enemySpecies(Species.SKARMORY) - .enemyHeldItems([{ name: "TERA_SHARD", type: Type.WATER }]); + game.override.enemySpecies(Species.SKARMORY); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; + enemy.teraType = PokemonType.WATER; + enemy.isTerastallized = true; vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2); }); it("should deal 0.5x damage to water type terastallized into fire", async () => { - game.override.enemySpecies(Species.PELIPPER) - .enemyHeldItems([{ name: "TERA_SHARD", type: Type.FIRE }]); + game.override.enemySpecies(Species.PELIPPER); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; + enemy.teraType = PokemonType.FIRE; + enemy.isTerastallized = true; vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.5); }); it("should deal 0.5x damage to water type Terapagos with Tera Shell", async () => { - game.override.enemySpecies(Species.TERAPAGOS) - .enemyAbility(Abilities.TERA_SHELL); + game.override.enemySpecies(Species.TERAPAGOS).enemyAbility(Abilities.TERA_SHELL); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; @@ -158,7 +159,7 @@ describe("Moves - Freeze-Dry", () => { await game.toNextTurn(); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.5); @@ -172,130 +173,114 @@ describe("Moves - Freeze-Dry", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2); }); it("should deal 0.25x damage to rock/steel type under Normalize", async () => { - game.override - .ability(Abilities.NORMALIZE) - .enemySpecies(Species.SHIELDON); + game.override.ability(Abilities.NORMALIZE).enemySpecies(Species.SHIELDON); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.25); }); it("should deal 0x damage to water/ghost type under Normalize", async () => { - game.override - .ability(Abilities.NORMALIZE) - .enemySpecies(Species.JELLICENT); + game.override.ability(Abilities.NORMALIZE).enemySpecies(Species.JELLICENT); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("BerryPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0); }); it("should deal 2x damage to water type under Electrify", async () => { - game.override.enemyMoveset([ Moves.ELECTRIFY ]); + game.override.enemyMoveset([Moves.ELECTRIFY]); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2); }); it("should deal 4x damage to water/flying type under Electrify", async () => { - game.override - .enemyMoveset([ Moves.ELECTRIFY ]) - .enemySpecies(Species.GYARADOS); + game.override.enemyMoveset([Moves.ELECTRIFY]).enemySpecies(Species.GYARADOS); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4); }); it("should deal 0x damage to water/ground type under Electrify", async () => { - game.override - .enemyMoveset([ Moves.ELECTRIFY ]) - .enemySpecies(Species.BARBOACH); + game.override.enemyMoveset([Moves.ELECTRIFY]).enemySpecies(Species.BARBOACH); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0); }); it("should deal 0.25x damage to Grass/Dragon type under Electrify", async () => { - game.override - .enemyMoveset([ Moves.ELECTRIFY ]) - .enemySpecies(Species.FLAPPLE); + game.override.enemyMoveset([Moves.ELECTRIFY]).enemySpecies(Species.FLAPPLE); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.25); }); it("should deal 2x damage to Water type during inverse battle", async () => { - game.override - .moveset([ Moves.FREEZE_DRY ]) - .enemySpecies(Species.MAGIKARP); + game.override.moveset([Moves.FREEZE_DRY]).enemySpecies(Species.MAGIKARP); game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1); - await game.challengeMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); }); it("should deal 2x damage to Water type during inverse battle under Normalize", async () => { - game.override - .moveset([ Moves.FREEZE_DRY ]) - .ability(Abilities.NORMALIZE) - .enemySpecies(Species.MAGIKARP); + game.override.moveset([Moves.FREEZE_DRY]).ability(Abilities.NORMALIZE).enemySpecies(Species.MAGIKARP); game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1); await game.challengeMode.startBattle(); @@ -304,17 +289,14 @@ describe("Moves - Freeze-Dry", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); }); it("should deal 2x damage to Water type during inverse battle under Electrify", async () => { - game.override - .moveset([ Moves.FREEZE_DRY ]) - .enemySpecies(Species.MAGIKARP) - .enemyMoveset([ Moves.ELECTRIFY ]); + game.override.moveset([Moves.FREEZE_DRY]).enemySpecies(Species.MAGIKARP).enemyMoveset([Moves.ELECTRIFY]); game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1); await game.challengeMode.startBattle(); @@ -323,16 +305,14 @@ describe("Moves - Freeze-Dry", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); }); it("should deal 1x damage to water/flying type during inverse battle under Electrify", async () => { - game.override - .enemyMoveset([ Moves.ELECTRIFY ]) - .enemySpecies(Species.GYARADOS); + game.override.enemyMoveset([Moves.ELECTRIFY]).enemySpecies(Species.GYARADOS); game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1); @@ -342,7 +322,7 @@ describe("Moves - Freeze-Dry", () => { vi.spyOn(enemy, "getMoveEffectiveness"); game.move.select(Moves.FREEZE_DRY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(1); diff --git a/test/moves/freezy_frost.test.ts b/test/moves/freezy_frost.test.ts new file mode 100644 index 00000000000..c1ac4054e70 --- /dev/null +++ b/test/moves/freezy_frost.test.ts @@ -0,0 +1,99 @@ +import { Stat } from "#enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { allMoves } from "#app/data/moves/move"; +import { CommandPhase } from "#app/phases/command-phase"; + +describe("Moves - Freezy Frost", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override + .battleType("single") + .enemySpecies(Species.RATTATA) + .enemyLevel(100) + .enemyMoveset([Moves.HOWL, Moves.HOWL, Moves.HOWL, Moves.HOWL]) + .enemyAbility(Abilities.BALL_FETCH) + .startingLevel(100) + .moveset([Moves.FREEZY_FROST, Moves.HOWL, Moves.SPLASH]) + .ability(Abilities.BALL_FETCH); + + vi.spyOn(allMoves[Moves.FREEZY_FROST], "accuracy", "get").mockReturnValue(100); + }); + + it("should clear stat changes of user and opponent", async () => { + await game.classicMode.startBattle([Species.SHUCKLE]); + const user = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.HOWL); + await game.toNextTurn(); + + expect(user.getStatStage(Stat.ATK)).toBe(1); + expect(enemy.getStatStage(Stat.ATK)).toBe(1); + + game.move.select(Moves.FREEZY_FROST); + await game.toNextTurn(); + + expect(user.getStatStage(Stat.ATK)).toBe(0); + expect(enemy.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should clear all stat changes even when enemy uses the move", async () => { + game.override.enemyMoveset([Moves.FREEZY_FROST, Moves.FREEZY_FROST, Moves.FREEZY_FROST, Moves.FREEZY_FROST]); + await game.classicMode.startBattle([Species.SHUCKLE]); // Shuckle for slower Howl on first turn so Freezy Frost doesn't affect it. + const user = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.HOWL); + await game.toNextTurn(); + + const userAtkBefore = user.getStatStage(Stat.ATK); + expect(userAtkBefore).toBe(1); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + expect(user.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should clear all stat changes in double battle", async () => { + game.override.battleType("double"); + await game.classicMode.startBattle([Species.SHUCKLE, Species.RATTATA]); + const [leftPlayer, rightPlayer] = game.scene.getPlayerField(); + const [leftOpp, rightOpp] = game.scene.getEnemyField(); + + game.move.select(Moves.HOWL, 0); + await game.phaseInterceptor.to(CommandPhase); + game.move.select(Moves.SPLASH, 1); + await game.toNextTurn(); + + expect(leftPlayer.getStatStage(Stat.ATK)).toBe(1); + expect(rightPlayer.getStatStage(Stat.ATK)).toBe(1); + expect(leftOpp.getStatStage(Stat.ATK)).toBe(2); // Both enemies use Howl + expect(rightOpp.getStatStage(Stat.ATK)).toBe(2); + + game.move.select(Moves.FREEZY_FROST, 0, leftOpp.getBattlerIndex()); + await game.phaseInterceptor.to(CommandPhase); + game.move.select(Moves.SPLASH, 1); + await game.toNextTurn(); + + expect(leftPlayer.getStatStage(Stat.ATK)).toBe(0); + expect(rightPlayer.getStatStage(Stat.ATK)).toBe(0); + expect(leftOpp.getStatStage(Stat.ATK)).toBe(0); + expect(rightOpp.getStatStage(Stat.ATK)).toBe(0); + }); +}); diff --git a/src/test/moves/fusion_bolt.test.ts b/test/moves/fusion_bolt.test.ts similarity index 82% rename from src/test/moves/fusion_bolt.test.ts rename to test/moves/fusion_bolt.test.ts index 4e35b939abf..fc47a0f04be 100644 --- a/src/test/moves/fusion_bolt.test.ts +++ b/test/moves/fusion_bolt.test.ts @@ -1,7 +1,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,12 +23,12 @@ describe("Moves - Fusion Bolt", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.moveset([ fusionBolt ]); + game.override.moveset([fusionBolt]); game.override.startingLevel(1); game.override.enemySpecies(Species.RESHIRAM); game.override.enemyAbility(Abilities.ROUGH_SKIN); - game.override.enemyMoveset([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]); game.override.battleType("single"); game.override.startingWave(97); @@ -36,9 +36,7 @@ describe("Moves - Fusion Bolt", () => { }); it("should not make contact", async () => { - await game.startBattle([ - Species.ZEKROM, - ]); + await game.startBattle([Species.ZEKROM]); const partyMember = game.scene.getPlayerPokemon()!; const initialHp = partyMember.hp; diff --git a/src/test/moves/fusion_flare.test.ts b/test/moves/fusion_flare.test.ts similarity index 85% rename from src/test/moves/fusion_flare.test.ts rename to test/moves/fusion_flare.test.ts index 75641c04d02..17653cf58bc 100644 --- a/src/test/moves/fusion_flare.test.ts +++ b/test/moves/fusion_flare.test.ts @@ -2,7 +2,7 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -24,11 +24,11 @@ describe("Moves - Fusion Flare", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.moveset([ fusionFlare ]); + game.override.moveset([fusionFlare]); game.override.startingLevel(1); game.override.enemySpecies(Species.RATTATA); - game.override.enemyMoveset([ Moves.REST, Moves.REST, Moves.REST, Moves.REST ]); + game.override.enemyMoveset([Moves.REST, Moves.REST, Moves.REST, Moves.REST]); game.override.battleType("single"); game.override.startingWave(97); @@ -36,9 +36,7 @@ describe("Moves - Fusion Flare", () => { }); it("should thaw freeze status condition", async () => { - await game.startBattle([ - Species.RESHIRAM, - ]); + await game.startBattle([Species.RESHIRAM]); const partyMember = game.scene.getPlayerPokemon()!; diff --git a/src/test/moves/fusion_flare_bolt.test.ts b/test/moves/fusion_flare_bolt.test.ts similarity index 78% rename from src/test/moves/fusion_flare_bolt.test.ts rename to test/moves/fusion_flare_bolt.test.ts index dbd4479dff8..9a379cb4588 100644 --- a/src/test/moves/fusion_flare_bolt.test.ts +++ b/test/moves/fusion_flare_bolt.test.ts @@ -1,13 +1,13 @@ import { Stat } from "#enums/stat"; import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { MovePhase } from "#app/phases/move-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -30,11 +30,11 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.moveset([ fusionFlare.id, fusionBolt.id ]); + game.override.moveset([fusionFlare.id, fusionBolt.id]); game.override.startingLevel(1); game.override.enemySpecies(Species.RESHIRAM); - game.override.enemyMoveset([ Moves.REST, Moves.REST, Moves.REST, Moves.REST ]); + game.override.enemyMoveset([Moves.REST, Moves.REST, Moves.REST, Moves.REST]); game.override.battleType("double"); game.override.startingWave(97); @@ -45,16 +45,13 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { }); it("FUSION_FLARE should double power of subsequent FUSION_BOLT", async () => { - await game.startBattle([ - Species.ZEKROM, - Species.ZEKROM - ]); + await game.startBattle([Species.ZEKROM, Species.ZEKROM]); game.move.select(fusionFlare.id, 0, BattlerIndex.ENEMY); game.move.select(fusionBolt.id, 1, BattlerIndex.ENEMY); // Force user party to act before enemy party - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to(MoveEffectPhase, false); expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id); @@ -68,16 +65,13 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { }, 20000); it("FUSION_BOLT should double power of subsequent FUSION_FLARE", async () => { - await game.startBattle([ - Species.ZEKROM, - Species.ZEKROM - ]); + await game.startBattle([Species.ZEKROM, Species.ZEKROM]); game.move.select(fusionBolt.id, 0, BattlerIndex.ENEMY); game.move.select(fusionFlare.id, 1, BattlerIndex.ENEMY); // Force user party to act before enemy party - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to(MoveEffectPhase, false); expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id); @@ -91,16 +85,13 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { }, 20000); it("FUSION_FLARE should double power of subsequent FUSION_BOLT if a move failed in between", async () => { - await game.startBattle([ - Species.ZEKROM, - Species.ZEKROM - ]); + await game.startBattle([Species.ZEKROM, Species.ZEKROM]); game.move.select(fusionFlare.id, 0, BattlerIndex.PLAYER); game.move.select(fusionBolt.id, 1, BattlerIndex.PLAYER); // Force first enemy to act (and fail) in between party - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(MoveEffectPhase, false); expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id); @@ -119,17 +110,14 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { }, 20000); it("FUSION_FLARE should not double power of subsequent FUSION_BOLT if a move succeeded in between", async () => { - game.override.enemyMoveset([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]); - await game.startBattle([ - Species.ZEKROM, - Species.ZEKROM - ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]); + await game.startBattle([Species.ZEKROM, Species.ZEKROM]); game.move.select(fusionFlare.id, 0, BattlerIndex.ENEMY); game.move.select(fusionBolt.id, 1, BattlerIndex.ENEMY); // Force first enemy to act in between party - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(MoveEffectPhase, false); expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id); @@ -147,16 +135,13 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { }, 20000); it("FUSION_FLARE should double power of subsequent FUSION_BOLT if moves are aimed at allies", async () => { - await game.startBattle([ - Species.ZEKROM, - Species.RESHIRAM - ]); + await game.startBattle([Species.ZEKROM, Species.RESHIRAM]); game.move.select(fusionBolt.id, 0, BattlerIndex.PLAYER_2); game.move.select(fusionFlare.id, 1, BattlerIndex.PLAYER); // Force user party to act before enemy party - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to(MoveEffectPhase, false); expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id); @@ -170,11 +155,8 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { }, 20000); it("FUSION_FLARE and FUSION_BOLT alternating throughout turn should double power of subsequent moves", async () => { - game.override.enemyMoveset([ fusionFlare.id, fusionFlare.id, fusionFlare.id, fusionFlare.id ]); - await game.startBattle([ - Species.ZEKROM, - Species.ZEKROM - ]); + game.override.enemyMoveset([fusionFlare.id, fusionFlare.id, fusionFlare.id, fusionFlare.id]); + await game.startBattle([Species.ZEKROM, Species.ZEKROM]); const party = game.scene.getPlayerParty(); const enemyParty = game.scene.getEnemyParty(); @@ -185,19 +167,17 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { // Mock stats by replacing entries in copy with desired values for specific stats const stats = { - enemy: [ - [ ...enemyParty[0].stats ], - [ ...enemyParty[1].stats ], - ], - player: [ - [ ...party[0].stats ], - [ ...party[1].stats ], - ] + enemy: [[...enemyParty[0].stats], [...enemyParty[1].stats]], + player: [[...party[0].stats], [...party[1].stats]], }; // Ensure survival by reducing enemy Sp. Atk and boosting party Sp. Def - vi.spyOn(enemyParty[0], "stats", "get").mockReturnValue(stats.enemy[0].map((val, i) => (i === Stat.SPATK ? 1 : val))); - vi.spyOn(enemyParty[1], "stats", "get").mockReturnValue(stats.enemy[1].map((val, i) => (i === Stat.SPATK ? 1 : val))); + vi.spyOn(enemyParty[0], "stats", "get").mockReturnValue( + stats.enemy[0].map((val, i) => (i === Stat.SPATK ? 1 : val)), + ); + vi.spyOn(enemyParty[1], "stats", "get").mockReturnValue( + stats.enemy[1].map((val, i) => (i === Stat.SPATK ? 1 : val)), + ); vi.spyOn(party[1], "stats", "get").mockReturnValue(stats.player[0].map((val, i) => (i === Stat.SPDEF ? 250 : val))); vi.spyOn(party[1], "stats", "get").mockReturnValue(stats.player[1].map((val, i) => (i === Stat.SPDEF ? 250 : val))); @@ -205,7 +185,7 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { game.move.select(fusionBolt.id, 1, BattlerIndex.ENEMY); // Force first enemy to act in between party - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(MoveEffectPhase, false); expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id); @@ -229,11 +209,8 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { }, 20000); it("FUSION_FLARE and FUSION_BOLT alternating throughout turn should double power of subsequent moves if moves are aimed at allies", async () => { - game.override.enemyMoveset([ fusionFlare.id, fusionFlare.id, fusionFlare.id, fusionFlare.id ]); - await game.startBattle([ - Species.ZEKROM, - Species.ZEKROM - ]); + game.override.enemyMoveset([fusionFlare.id, fusionFlare.id, fusionFlare.id, fusionFlare.id]); + await game.startBattle([Species.ZEKROM, Species.ZEKROM]); const party = game.scene.getPlayerParty(); const enemyParty = game.scene.getEnemyParty(); @@ -244,19 +221,17 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { // Mock stats by replacing entries in copy with desired values for specific stats const stats = { - enemy: [ - [ ...enemyParty[0].stats ], - [ ...enemyParty[1].stats ], - ], - player: [ - [ ...party[0].stats ], - [ ...party[1].stats ], - ] + enemy: [[...enemyParty[0].stats], [...enemyParty[1].stats]], + player: [[...party[0].stats], [...party[1].stats]], }; // Ensure survival by reducing enemy Sp. Atk and boosting party Sp. Def - vi.spyOn(enemyParty[0], "stats", "get").mockReturnValue(stats.enemy[0].map((val, i) => (i === Stat.SPATK ? 1 : val))); - vi.spyOn(enemyParty[1], "stats", "get").mockReturnValue(stats.enemy[1].map((val, i) => (i === Stat.SPATK ? 1 : val))); + vi.spyOn(enemyParty[0], "stats", "get").mockReturnValue( + stats.enemy[0].map((val, i) => (i === Stat.SPATK ? 1 : val)), + ); + vi.spyOn(enemyParty[1], "stats", "get").mockReturnValue( + stats.enemy[1].map((val, i) => (i === Stat.SPATK ? 1 : val)), + ); vi.spyOn(party[1], "stats", "get").mockReturnValue(stats.player[0].map((val, i) => (i === Stat.SPDEF ? 250 : val))); vi.spyOn(party[1], "stats", "get").mockReturnValue(stats.player[1].map((val, i) => (i === Stat.SPDEF ? 250 : val))); @@ -264,7 +239,7 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { game.move.select(fusionBolt.id, 1, BattlerIndex.PLAYER); // Force first enemy to act in between party - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(MoveEffectPhase, false); expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id); diff --git a/src/test/moves/future_sight.test.ts b/test/moves/future_sight.test.ts similarity index 85% rename from src/test/moves/future_sight.test.ts rename to test/moves/future_sight.test.ts index d0110a87202..40a940447e4 100644 --- a/src/test/moves/future_sight.test.ts +++ b/test/moves/future_sight.test.ts @@ -1,7 +1,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,7 +23,7 @@ describe("Moves - Future Sight", () => { game = new GameManager(phaserGame); game.override .startingLevel(50) - .moveset([ Moves.FUTURE_SIGHT, Moves.SPLASH ]) + .moveset([Moves.FUTURE_SIGHT, Moves.SPLASH]) .battleType("single") .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.STURDY) @@ -31,7 +31,7 @@ describe("Moves - Future Sight", () => { }); it("hits 2 turns after use, ignores user switch out", async () => { - await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]); game.move.select(Moves.FUTURE_SIGHT); await game.toNextTurn(); diff --git a/src/test/moves/gastro_acid.test.ts b/test/moves/gastro_acid.test.ts similarity index 91% rename from src/test/moves/gastro_acid.test.ts rename to test/moves/gastro_acid.test.ts index ec9246c855c..c9f2428845e 100644 --- a/src/test/moves/gastro_acid.test.ts +++ b/test/moves/gastro_acid.test.ts @@ -3,10 +3,9 @@ import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { MoveResult } from "#app/field/pokemon"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Moves - Gastro Acid", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -27,7 +26,7 @@ describe("Moves - Gastro Acid", () => { game.override.startingLevel(1); game.override.enemyLevel(100); game.override.ability(Abilities.NONE); - game.override.moveset([ Moves.GASTRO_ACID, Moves.WATER_GUN, Moves.SPLASH, Moves.CORE_ENFORCER ]); + game.override.moveset([Moves.GASTRO_ACID, Moves.WATER_GUN, Moves.SPLASH, Moves.CORE_ENFORCER]); game.override.enemySpecies(Species.BIDOOF); game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.WATER_ABSORB); @@ -68,7 +67,7 @@ describe("Moves - Gastro Acid", () => { game.move.select(Moves.CORE_ENFORCER); // Force player to be slower to enable Core Enforcer to proc its suppression effect - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnInitPhase"); diff --git a/src/test/moves/geomancy.test.ts b/test/moves/geomancy.test.ts similarity index 71% rename from src/test/moves/geomancy.test.ts rename to test/moves/geomancy.test.ts index 9ff3a1e7a7d..34281c96c60 100644 --- a/src/test/moves/geomancy.test.ts +++ b/test/moves/geomancy.test.ts @@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; @@ -35,31 +35,31 @@ describe("Moves - Geomancy", () => { }); it("should boost the user's stats on the second turn of use", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const player = game.scene.getPlayerPokemon()!; - const affectedStats: EffectiveStat[] = [ Stat.SPATK, Stat.SPDEF, Stat.SPD ]; + const affectedStats: EffectiveStat[] = [Stat.SPATK, Stat.SPDEF, Stat.SPD]; game.move.select(Moves.GEOMANCY); await game.phaseInterceptor.to("TurnEndPhase"); - affectedStats.forEach((stat) => expect(player.getStatStage(stat)).toBe(0)); + affectedStats.forEach(stat => expect(player.getStatStage(stat)).toBe(0)); expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.OTHER); await game.phaseInterceptor.to("TurnEndPhase"); - affectedStats.forEach((stat) => expect(player.getStatStage(stat)).toBe(2)); + affectedStats.forEach(stat => expect(player.getStatStage(stat)).toBe(2)); expect(player.getMoveHistory()).toHaveLength(2); expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.SUCCESS); - const playerGeomancy = player.getMoveset().find((mv) => mv && mv.moveId === Moves.GEOMANCY); + const playerGeomancy = player.getMoveset().find(mv => mv && mv.moveId === Moves.GEOMANCY); expect(playerGeomancy?.ppUsed).toBe(1); }); it("should execute over 2 turns between waves", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const player = game.scene.getPlayerPokemon()!; - const affectedStats: EffectiveStat[] = [ Stat.SPATK, Stat.SPDEF, Stat.SPD ]; + const affectedStats: EffectiveStat[] = [Stat.SPATK, Stat.SPDEF, Stat.SPD]; game.move.select(Moves.GEOMANCY); @@ -69,11 +69,11 @@ describe("Moves - Geomancy", () => { await game.toNextWave(); await game.phaseInterceptor.to("TurnEndPhase"); - affectedStats.forEach((stat) => expect(player.getStatStage(stat)).toBe(2)); + affectedStats.forEach(stat => expect(player.getStatStage(stat)).toBe(2)); expect(player.getMoveHistory()).toHaveLength(2); expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.SUCCESS); - const playerGeomancy = player.getMoveset().find((mv) => mv && mv.moveId === Moves.GEOMANCY); + const playerGeomancy = player.getMoveset().find(mv => mv && mv.moveId === Moves.GEOMANCY); expect(playerGeomancy?.ppUsed).toBe(1); }); }); diff --git a/src/test/moves/gigaton_hammer.test.ts b/test/moves/gigaton_hammer.test.ts similarity index 83% rename from src/test/moves/gigaton_hammer.test.ts rename to test/moves/gigaton_hammer.test.ts index f54700fe660..a6f7438a0a2 100644 --- a/src/test/moves/gigaton_hammer.test.ts +++ b/test/moves/gigaton_hammer.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; @@ -25,20 +25,20 @@ describe("Moves - Gigaton Hammer", () => { .battleType("single") .enemySpecies(Species.MAGIKARP) .starterSpecies(Species.FEEBAS) - .moveset([ Moves.GIGATON_HAMMER ]) + .moveset([Moves.GIGATON_HAMMER]) .startingLevel(10) .enemyLevel(100) .enemyMoveset(Moves.SPLASH) .disableCrits(); }); - it("can't be used two turns in a row", async() => { + it("can't be used two turns in a row", async () => { await game.classicMode.startBattle(); const enemy1 = game.scene.getEnemyPokemon()!; game.move.select(Moves.GIGATON_HAMMER); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy1.hp).toBeLessThan(enemy1.getMaxHp()); @@ -54,14 +54,14 @@ describe("Moves - Gigaton Hammer", () => { expect(enemy2.hp).toBe(enemy2.getMaxHp()); }, 20000); - it("can be used again if recalled and sent back out", async() => { + it("can be used again if recalled and sent back out", async () => { game.override.startingWave(4); await game.classicMode.startBattle(); const enemy1 = game.scene.getEnemyPokemon()!; game.move.select(Moves.GIGATON_HAMMER); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy1.hp).toBeLessThan(enemy1.getMaxHp()); diff --git a/src/test/moves/glaive_rush.test.ts b/test/moves/glaive_rush.test.ts similarity index 82% rename from src/test/moves/glaive_rush.test.ts rename to test/moves/glaive_rush.test.ts index 9cfbfdd8727..d3531b172e2 100644 --- a/src/test/moves/glaive_rush.test.ts +++ b/test/moves/glaive_rush.test.ts @@ -1,12 +1,11 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Moves - Glaive Rush", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -28,10 +27,10 @@ describe("Moves - Glaive Rush", () => { .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.GLAIVE_RUSH ]) + .enemyMoveset([Moves.GLAIVE_RUSH]) .starterSpecies(Species.KLINK) .ability(Abilities.BALL_FETCH) - .moveset([ Moves.SHADOW_SNEAK, Moves.AVALANCHE, Moves.SPLASH, Moves.GLAIVE_RUSH ]); + .moveset([Moves.SHADOW_SNEAK, Moves.AVALANCHE, Moves.SPLASH, Moves.GLAIVE_RUSH]); }); it("takes double damage from attacks", async () => { @@ -46,8 +45,7 @@ describe("Moves - Glaive Rush", () => { await game.phaseInterceptor.to("TurnEndPhase"); game.move.select(Moves.SHADOW_SNEAK); await game.phaseInterceptor.to("DamageAnimPhase"); - expect(enemy.hp).toBeLessThanOrEqual(1001 - (damageDealt * 3)); - + expect(enemy.hp).toBeLessThanOrEqual(1001 - damageDealt * 3); }); it("always gets hit by attacks", async () => { @@ -60,13 +58,10 @@ describe("Moves - Glaive Rush", () => { game.move.select(Moves.AVALANCHE); await game.phaseInterceptor.to("TurnEndPhase"); expect(enemy.hp).toBeLessThan(1000); - }); it("interacts properly with multi-lens", async () => { - game.override - .startingHeldItems([{ name: "MULTI_LENS", count: 2 }]) - .enemyMoveset([ Moves.AVALANCHE ]); + game.override.startingHeldItems([{ name: "MULTI_LENS", count: 2 }]).enemyMoveset([Moves.AVALANCHE]); await game.classicMode.startBattle(); const player = game.scene.getPlayerPokemon()!; @@ -83,11 +78,10 @@ describe("Moves - Glaive Rush", () => { game.move.select(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); expect(player.hp).toBe(1000); - }); it("secondary effects only last until next move", async () => { - game.override.enemyMoveset([ Moves.SHADOW_SNEAK ]); + game.override.enemyMoveset([Moves.SHADOW_SNEAK]); await game.classicMode.startBattle(); const player = game.scene.getPlayerPokemon()!; @@ -109,14 +103,11 @@ describe("Moves - Glaive Rush", () => { game.move.select(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); expect(player.hp).toBe(damagedHp); - }); it("secondary effects are removed upon switching", async () => { - game.override - .enemyMoveset([ Moves.SHADOW_SNEAK ]) - .starterSpecies(0); - await game.classicMode.startBattle([ Species.KLINK, Species.FEEBAS ]); + game.override.enemyMoveset([Moves.SHADOW_SNEAK]).starterSpecies(0); + await game.classicMode.startBattle([Species.KLINK, Species.FEEBAS]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -133,11 +124,10 @@ describe("Moves - Glaive Rush", () => { game.doSwitchPokemon(1); await game.phaseInterceptor.to("TurnEndPhase"); expect(player.hp).toBe(player.getMaxHp()); - }); it("secondary effects don't activate if move fails", async () => { - game.override.moveset([ Moves.SHADOW_SNEAK, Moves.PROTECT, Moves.SPLASH, Moves.GLAIVE_RUSH ]); + game.override.moveset([Moves.SHADOW_SNEAK, Moves.PROTECT, Moves.SPLASH, Moves.GLAIVE_RUSH]); await game.classicMode.startBattle(); const player = game.scene.getPlayerPokemon()!; @@ -151,7 +141,7 @@ describe("Moves - Glaive Rush", () => { game.move.select(Moves.SHADOW_SNEAK); await game.phaseInterceptor.to("TurnEndPhase"); - game.override.enemyMoveset([ Moves.SPLASH ]); + game.override.enemyMoveset([Moves.SPLASH]); const damagedHP1 = 1000 - enemy.hp; enemy.hp = 1000; @@ -159,6 +149,6 @@ describe("Moves - Glaive Rush", () => { await game.phaseInterceptor.to("TurnEndPhase"); const damagedHP2 = 1000 - enemy.hp; - expect(damagedHP2).toBeGreaterThanOrEqual((damagedHP1 * 2) - 1); + expect(damagedHP2).toBeGreaterThanOrEqual(damagedHP1 * 2 - 1); }); }); diff --git a/src/test/moves/growth.test.ts b/test/moves/growth.test.ts similarity index 85% rename from src/test/moves/growth.test.ts rename to test/moves/growth.test.ts index a66e4ec6719..926593a4f72 100644 --- a/src/test/moves/growth.test.ts +++ b/test/moves/growth.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -27,14 +27,12 @@ describe("Moves - Growth", () => { game.override.battleType("single"); game.override.enemyAbility(Abilities.MOXIE); game.override.ability(Abilities.INSOMNIA); - game.override.moveset([ Moves.GROWTH ]); + game.override.moveset([Moves.GROWTH]); game.override.enemyMoveset(Moves.SPLASH); }); - it("should raise SPATK stat stage by 1", async() => { - await game.startBattle([ - Species.MIGHTYENA - ]); + it("should raise SPATK stat stage by 1", async () => { + await game.startBattle([Species.MIGHTYENA]); const playerPokemon = game.scene.getPlayerPokemon()!; diff --git a/src/test/moves/grudge.test.ts b/test/moves/grudge.test.ts similarity index 79% rename from src/test/moves/grudge.test.ts rename to test/moves/grudge.test.ts index 340808929ab..ebd062a76ee 100644 --- a/src/test/moves/grudge.test.ts +++ b/test/moves/grudge.test.ts @@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { BattlerIndex } from "#app/battle"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,22 +23,22 @@ describe("Moves - Grudge", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.EMBER, Moves.SPLASH ]) + .moveset([Moves.EMBER, Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() .enemySpecies(Species.SHEDINJA) .enemyAbility(Abilities.WONDER_GUARD) - .enemyMoveset([ Moves.GRUDGE, Moves.SPLASH ]); + .enemyMoveset([Moves.GRUDGE, Moves.SPLASH]); }); it("should reduce the PP of the Pokemon's move to 0 when the user has fainted", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const playerPokemon = game.scene.getPlayerPokemon(); game.move.select(Moves.EMBER); await game.forceEnemyMove(Moves.GRUDGE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.EMBER); @@ -47,17 +47,17 @@ describe("Moves - Grudge", () => { }); it("should remain in effect until the user's next move", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const playerPokemon = game.scene.getPlayerPokemon(); game.move.select(Moves.SPLASH); await game.forceEnemyMove(Moves.GRUDGE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); game.move.select(Moves.EMBER); await game.forceEnemyMove(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("BerryPhase"); const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.EMBER); @@ -68,18 +68,18 @@ describe("Moves - Grudge", () => { it("should not reduce the opponent's PP if the user dies to weather/indirect damage", async () => { // Opponent will be reduced to 1 HP by False Swipe, then faint to Sandstorm game.override - .moveset([ Moves.FALSE_SWIPE ]) + .moveset([Moves.FALSE_SWIPE]) .startingLevel(100) .ability(Abilities.SAND_STREAM) .enemySpecies(Species.RATTATA); - await game.classicMode.startBattle([ Species.GEODUDE ]); + await game.classicMode.startBattle([Species.GEODUDE]); const enemyPokemon = game.scene.getEnemyPokemon(); const playerPokemon = game.scene.getPlayerPokemon(); game.move.select(Moves.FALSE_SWIPE); await game.forceEnemyMove(Moves.GRUDGE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(enemyPokemon?.isFainted()).toBe(true); diff --git a/src/test/moves/guard_split.test.ts b/test/moves/guard_split.test.ts similarity index 90% rename from src/test/moves/guard_split.test.ts rename to test/moves/guard_split.test.ts index 519f347b920..5db07e4e82c 100644 --- a/src/test/moves/guard_split.test.ts +++ b/test/moves/guard_split.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; @@ -28,15 +28,13 @@ describe("Moves - Guard Split", () => { .enemyAbility(Abilities.NONE) .enemySpecies(Species.MEW) .enemyLevel(200) - .moveset([ Moves.GUARD_SPLIT ]) + .moveset([Moves.GUARD_SPLIT]) .ability(Abilities.NONE); }); it("should average the user's DEF and SPDEF stats with those of the target", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([ - Species.INDEEDEE - ]); + await game.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -55,10 +53,8 @@ describe("Moves - Guard Split", () => { }, 20000); it("should be idempotent", async () => { - game.override.enemyMoveset([ Moves.GUARD_SPLIT ]); - await game.startBattle([ - Species.INDEEDEE - ]); + game.override.enemyMoveset([Moves.GUARD_SPLIT]); + await game.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/guard_swap.test.ts b/test/moves/guard_swap.test.ts similarity index 91% rename from src/test/moves/guard_swap.test.ts rename to test/moves/guard_swap.test.ts index 99769b32899..be824672f32 100644 --- a/src/test/moves/guard_swap.test.ts +++ b/test/moves/guard_swap.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; @@ -29,14 +29,12 @@ describe("Moves - Guard Swap", () => { .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.INDEEDEE) .enemyLevel(200) - .moveset([ Moves.GUARD_SWAP ]) + .moveset([Moves.GUARD_SWAP]) .ability(Abilities.NONE); }); it("should swap the user's DEF and SPDEF stat stages with the target's", async () => { - await game.classicMode.startBattle([ - Species.INDEEDEE - ]); + await game.classicMode.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/hard_press.test.ts b/test/moves/hard_press.test.ts similarity index 84% rename from src/test/moves/hard_press.test.ts rename to test/moves/hard_press.test.ts index 0fa4181491c..1bb6adc8e90 100644 --- a/src/test/moves/hard_press.test.ts +++ b/test/moves/hard_press.test.ts @@ -1,9 +1,9 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -30,12 +30,12 @@ describe("Moves - Hard Press", () => { game.override.enemySpecies(Species.MUNCHLAX); game.override.enemyAbility(Abilities.BALL_FETCH); game.override.enemyMoveset(Moves.SPLASH); - game.override.moveset([ Moves.HARD_PRESS ]); + game.override.moveset([Moves.HARD_PRESS]); vi.spyOn(moveToCheck, "calculateBattlePower"); }); it("should return 100 power if target HP ratio is at 100%", async () => { - await game.startBattle([ Species.PIKACHU ]); + await game.startBattle([Species.PIKACHU]); game.move.select(Moves.HARD_PRESS); await game.phaseInterceptor.to(MoveEffectPhase); @@ -44,8 +44,8 @@ describe("Moves - Hard Press", () => { }); it("should return 50 power if target HP ratio is at 50%", async () => { - await game.startBattle([ Species.PIKACHU ]); - const targetHpRatio = .5; + await game.startBattle([Species.PIKACHU]); + const targetHpRatio = 0.5; const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getHpRatio").mockReturnValue(targetHpRatio); @@ -57,8 +57,8 @@ describe("Moves - Hard Press", () => { }); it("should return 1 power if target HP ratio is at 1%", async () => { - await game.startBattle([ Species.PIKACHU ]); - const targetHpRatio = .01; + await game.startBattle([Species.PIKACHU]); + const targetHpRatio = 0.01; const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getHpRatio").mockReturnValue(targetHpRatio); @@ -70,8 +70,8 @@ describe("Moves - Hard Press", () => { }); it("should return 1 power if target HP ratio is less than 1%", async () => { - await game.startBattle([ Species.PIKACHU ]); - const targetHpRatio = .005; + await game.startBattle([Species.PIKACHU]); + const targetHpRatio = 0.005; const enemy = game.scene.getEnemyPokemon()!; vi.spyOn(enemy, "getHpRatio").mockReturnValue(targetHpRatio); diff --git a/src/test/moves/haze.test.ts b/test/moves/haze.test.ts similarity index 90% rename from src/test/moves/haze.test.ts rename to test/moves/haze.test.ts index 30aab8bd98c..d890678b466 100644 --- a/src/test/moves/haze.test.ts +++ b/test/moves/haze.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -31,12 +31,12 @@ describe("Moves - Haze", () => { game.override.enemyAbility(Abilities.NONE); game.override.startingLevel(100); - game.override.moveset([ Moves.HAZE, Moves.SWORDS_DANCE, Moves.CHARM, Moves.SPLASH ]); + game.override.moveset([Moves.HAZE, Moves.SWORDS_DANCE, Moves.CHARM, Moves.SPLASH]); game.override.ability(Abilities.NONE); }); it("should reset all stat changes of all Pokemon on field", async () => { - await game.startBattle([ Species.RATTATA ]); + await game.startBattle([Species.RATTATA]); const user = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/heal_bell.test.ts b/test/moves/heal_bell.test.ts similarity index 84% rename from src/test/moves/heal_bell.test.ts rename to test/moves/heal_bell.test.ts index b180588d3a3..4c0148bfd04 100644 --- a/src/test/moves/heal_bell.test.ts +++ b/test/moves/heal_bell.test.ts @@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; @@ -24,7 +24,7 @@ describe("Moves - Heal Bell", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.HEAL_BELL, Moves.SPLASH ]) + .moveset([Moves.HEAL_BELL, Moves.SPLASH]) .statusEffect(StatusEffect.BURN) .battleType("double") .enemyAbility(Abilities.BALL_FETCH) @@ -32,8 +32,8 @@ describe("Moves - Heal Bell", () => { }); it("should cure status effect of the user, its ally, and all party pokemon", async () => { - await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty(); + await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA, Species.RATTATA]); + const [leftPlayer, rightPlayer, partyPokemon] = game.scene.getPlayerParty(); vi.spyOn(leftPlayer, "resetStatus"); vi.spyOn(rightPlayer, "resetStatus"); @@ -55,8 +55,8 @@ describe("Moves - Heal Bell", () => { it("should not cure status effect of the target/target's allies", async () => { game.override.enemyStatusEffect(StatusEffect.BURN); - await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA ]); - const [ leftOpp, rightOpp ] = game.scene.getEnemyField(); + await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA]); + const [leftOpp, rightOpp] = game.scene.getEnemyField(); vi.spyOn(leftOpp, "resetStatus"); vi.spyOn(rightOpp, "resetStatus"); @@ -78,8 +78,8 @@ describe("Moves - Heal Bell", () => { it("should not cure status effect of allies ON FIELD with Soundproof, should still cure allies in party", async () => { game.override.ability(Abilities.SOUNDPROOF); - await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty(); + await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA, Species.RATTATA]); + const [leftPlayer, rightPlayer, partyPokemon] = game.scene.getPlayerParty(); vi.spyOn(leftPlayer, "resetStatus"); vi.spyOn(rightPlayer, "resetStatus"); diff --git a/src/test/moves/heal_block.test.ts b/test/moves/heal_block.test.ts similarity index 74% rename from src/test/moves/heal_block.test.ts rename to test/moves/heal_block.test.ts index 25f2076ff3e..4ef67214a91 100644 --- a/src/test/moves/heal_block.test.ts +++ b/test/moves/heal_block.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { ArenaTagSide } from "#app/data/arena-tag"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; @@ -28,7 +28,7 @@ describe("Moves - Heal Block", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.ABSORB, Moves.WISH, Moves.SPLASH, Moves.AQUA_RING ]) + .moveset([Moves.ABSORB, Moves.WISH, Moves.SPLASH, Moves.AQUA_RING]) .enemyMoveset(Moves.HEAL_BLOCK) .ability(Abilities.NO_GUARD) .enemyAbility(Abilities.BALL_FETCH) @@ -36,9 +36,8 @@ describe("Moves - Heal Block", () => { .disableCrits(); }); - it("shouldn't stop damage from HP-drain attacks, just HP restoration", async() => { - - await game.classicMode.startBattle([ Species.CHARIZARD ]); + it("shouldn't stop damage from HP-drain attacks, just HP restoration", async () => { + await game.classicMode.startBattle([Species.CHARIZARD]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -46,31 +45,31 @@ describe("Moves - Heal Block", () => { player.damageAndUpdate(enemy.getMaxHp() - 1); game.move.select(Moves.ABSORB); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); expect(player.hp).toBe(1); expect(enemy.hp).toBeLessThan(enemy.getMaxHp()); }); - it("shouldn't stop Liquid Ooze from dealing damage", async() => { + it("shouldn't stop Liquid Ooze from dealing damage", async () => { game.override.enemyAbility(Abilities.LIQUID_OOZE); - await game.classicMode.startBattle([ Species.CHARIZARD ]); + await game.classicMode.startBattle([Species.CHARIZARD]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.ABSORB); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); expect(player.isFullHp()).toBe(false); expect(enemy.isFullHp()).toBe(false); }); - it("should stop delayed heals, such as from Wish", async() => { - await game.classicMode.startBattle([ Species.CHARIZARD ]); + it("should stop delayed heals, such as from Wish", async () => { + await game.classicMode.startBattle([Species.CHARIZARD]); const player = game.scene.getPlayerPokemon()!; @@ -88,10 +87,10 @@ describe("Moves - Heal Block", () => { expect(player.hp).toBe(1); }); - it("should prevent Grassy Terrain from restoring HP", async() => { + it("should prevent Grassy Terrain from restoring HP", async () => { game.override.enemyAbility(Abilities.GRASSY_SURGE); - await game.classicMode.startBattle([ Species.CHARIZARD ]); + await game.classicMode.startBattle([Species.CHARIZARD]); const player = game.scene.getPlayerPokemon()!; @@ -103,8 +102,8 @@ describe("Moves - Heal Block", () => { expect(player.hp).toBe(1); }); - it("should prevent healing from heal-over-time moves", async() => { - await game.classicMode.startBattle([ Species.CHARIZARD ]); + it("should prevent healing from heal-over-time moves", async () => { + await game.classicMode.startBattle([Species.CHARIZARD]); const player = game.scene.getPlayerPokemon()!; @@ -117,12 +116,10 @@ describe("Moves - Heal Block", () => { expect(player.hp).toBe(1); }); - it("should prevent abilities from restoring HP", async() => { - game.override - .weather(WeatherType.RAIN) - .ability(Abilities.RAIN_DISH); + it("should prevent abilities from restoring HP", async () => { + game.override.weather(WeatherType.RAIN).ability(Abilities.RAIN_DISH); - await game.classicMode.startBattle([ Species.CHARIZARD ]); + await game.classicMode.startBattle([Species.CHARIZARD]); const player = game.scene.getPlayerPokemon()!; @@ -134,10 +131,10 @@ describe("Moves - Heal Block", () => { expect(player.hp).toBe(1); }); - it("should stop healing from items", async() => { + it("should stop healing from items", async () => { game.override.startingHeldItems([{ name: "LEFTOVERS" }]); - await game.classicMode.startBattle([ Species.CHARIZARD ]); + await game.classicMode.startBattle([Species.CHARIZARD]); const player = game.scene.getPlayerPokemon()!; player.damageAndUpdate(player.getMaxHp() - 1); diff --git a/src/test/moves/heart_swap.test.ts b/test/moves/heart_swap.test.ts similarity index 91% rename from src/test/moves/heart_swap.test.ts rename to test/moves/heart_swap.test.ts index a128549c459..a3d892cd518 100644 --- a/src/test/moves/heart_swap.test.ts +++ b/test/moves/heart_swap.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; @@ -29,14 +29,12 @@ describe("Moves - Heart Swap", () => { .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.INDEEDEE) .enemyLevel(200) - .moveset([ Moves.HEART_SWAP ]) + .moveset([Moves.HEART_SWAP]) .ability(Abilities.NONE); }); it("should swap all of the user's stat stages with the target's", async () => { - await game.classicMode.startBattle([ - Species.MANAPHY - ]); + await game.classicMode.startBattle([Species.MANAPHY]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/test/moves/hyper_beam.test.ts b/test/moves/hyper_beam.test.ts new file mode 100644 index 00000000000..5cd54e9b46a --- /dev/null +++ b/test/moves/hyper_beam.test.ts @@ -0,0 +1,67 @@ +import { allMoves } from "#app/data/moves/move"; +import { Abilities } from "#app/enums/abilities"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Moves - Hyper Beam", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override.battleType("single"); + game.override.ability(Abilities.BALL_FETCH); + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyAbility(Abilities.BALL_FETCH); + game.override.enemyMoveset([Moves.SPLASH]); + game.override.enemyLevel(100); + + game.override.moveset([Moves.HYPER_BEAM, Moves.TACKLE]); + vi.spyOn(allMoves[Moves.HYPER_BEAM], "accuracy", "get").mockReturnValue(100); + }); + + it("should force the user to recharge on the next turn (and only that turn)", async () => { + await game.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.HYPER_BEAM); + + await game.phaseInterceptor.to(TurnEndPhase); + + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeDefined(); + + const enemyPostAttackHp = enemyPokemon.hp; + + /** Game should progress without a new command from the player */ + await game.phaseInterceptor.to(TurnEndPhase); + + expect(enemyPokemon.hp).toBe(enemyPostAttackHp); + expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeUndefined(); + + game.move.select(Moves.TACKLE); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(enemyPokemon.hp).toBeLessThan(enemyPostAttackHp); + }); +}); diff --git a/src/test/moves/imprison.test.ts b/test/moves/imprison.test.ts similarity index 85% rename from src/test/moves/imprison.test.ts rename to test/moves/imprison.test.ts index f10e20dab63..89ef9981040 100644 --- a/src/test/moves/imprison.test.ts +++ b/test/moves/imprison.test.ts @@ -1,7 +1,7 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Abilities } from "#enums/abilities"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { BattlerTagType } from "#enums/battler-tag-type"; @@ -25,13 +25,13 @@ describe("Moves - Imprison", () => { game.override .battleType("single") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.IMPRISON, Moves.SPLASH, Moves.GROWL ]) + .enemyMoveset([Moves.IMPRISON, Moves.SPLASH, Moves.GROWL]) .enemySpecies(Species.SHUCKLE) - .moveset([ Moves.TRANSFORM, Moves.SPLASH ]); + .moveset([Moves.TRANSFORM, Moves.SPLASH]); }); it("Pokemon under Imprison cannot use shared moves", async () => { - await game.classicMode.startBattle([ Species.REGIELEKI ]); + await game.classicMode.startBattle([Species.REGIELEKI]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -39,7 +39,10 @@ describe("Moves - Imprison", () => { await game.forceEnemyMove(Moves.IMPRISON); await game.toNextTurn(); const playerMoveset = playerPokemon.getMoveset().map(x => x?.moveId); - const enemyMoveset = game.scene.getEnemyPokemon()!.getMoveset().map(x => x?.moveId); + const enemyMoveset = game.scene + .getEnemyPokemon()! + .getMoveset() + .map(x => x?.moveId); expect(enemyMoveset.includes(playerMoveset[0])).toBeTruthy(); const imprisonArenaTag = game.scene.arena.getTag(ArenaTagType.IMPRISON); const imprisonBattlerTag = playerPokemon.getTag(BattlerTagType.IMPRISON); @@ -55,7 +58,7 @@ describe("Moves - Imprison", () => { }); it("Imprison applies to Pokemon switched into Battle", async () => { - await game.classicMode.startBattle([ Species.REGIELEKI, Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.REGIELEKI, Species.BULBASAUR]); const playerPokemon1 = game.scene.getPlayerPokemon()!; @@ -78,8 +81,8 @@ describe("Moves - Imprison", () => { }); it("The effects of Imprison only end when the source is no longer active", async () => { - game.override.moveset([ Moves.SPLASH, Moves.IMPRISON ]); - await game.classicMode.startBattle([ Species.REGIELEKI, Species.BULBASAUR ]); + game.override.moveset([Moves.SPLASH, Moves.IMPRISON]); + await game.classicMode.startBattle([Species.REGIELEKI, Species.BULBASAUR]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/instruct.test.ts b/test/moves/instruct.test.ts similarity index 65% rename from src/test/moves/instruct.test.ts rename to test/moves/instruct.test.ts index 13f0c83c784..079c8803ddc 100644 --- a/src/test/moves/instruct.test.ts +++ b/test/moves/instruct.test.ts @@ -5,7 +5,7 @@ import type { MovePhase } from "#app/phases/move-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -41,17 +41,15 @@ describe("Moves - Instruct", () => { }); it("should repeat target's last used move", async () => { - game.override - .moveset(Moves.INSTRUCT) - .enemyLevel(1000); // ensures shuckle no die - await game.classicMode.startBattle([ Species.AMOONGUSS ]); + game.override.moveset(Moves.INSTRUCT).enemyLevel(1000); // ensures shuckle no die + await game.classicMode.startBattle([Species.AMOONGUSS]); const enemy = game.scene.getEnemyPokemon()!; game.move.changeMoveset(enemy, Moves.SONIC_BOOM); game.move.select(Moves.INSTRUCT); await game.forceEnemyMove(Moves.SONIC_BOOM); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("MovePhase"); // enemy attacks us await game.phaseInterceptor.to("MovePhase", false); // instruct @@ -70,20 +68,20 @@ describe("Moves - Instruct", () => { }); it("should repeat enemy's move through substitute", async () => { - game.override.moveset([ Moves.INSTRUCT, Moves.SPLASH ]); - await game.classicMode.startBattle([ Species.AMOONGUSS ]); + game.override.moveset([Moves.INSTRUCT, Moves.SPLASH]); + await game.classicMode.startBattle([Species.AMOONGUSS]); const enemy = game.scene.getEnemyPokemon()!; - game.move.changeMoveset(enemy, [ Moves.SONIC_BOOM, Moves.SUBSTITUTE ]); + game.move.changeMoveset(enemy, [Moves.SONIC_BOOM, Moves.SUBSTITUTE]); game.move.select(Moves.SPLASH); await game.forceEnemyMove(Moves.SUBSTITUTE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); game.move.select(Moves.INSTRUCT); await game.forceEnemyMove(Moves.SONIC_BOOM); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase", false); instructSuccess(game.scene.getEnemyPokemon()!, Moves.SONIC_BOOM); @@ -91,18 +89,16 @@ describe("Moves - Instruct", () => { }); it("should repeat ally's attack on enemy", async () => { - game.override - .battleType("double") - .enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.AMOONGUSS, Species.SHUCKLE ]); + game.override.battleType("double").enemyMoveset(Moves.SPLASH); + await game.classicMode.startBattle([Species.AMOONGUSS, Species.SHUCKLE]); - const [ amoonguss, shuckle ] = game.scene.getPlayerField(); - game.move.changeMoveset(amoonguss, [ Moves.INSTRUCT, Moves.SONIC_BOOM ]); - game.move.changeMoveset(shuckle, [ Moves.INSTRUCT, Moves.SONIC_BOOM ]); + const [amoonguss, shuckle] = game.scene.getPlayerField(); + game.move.changeMoveset(amoonguss, [Moves.INSTRUCT, Moves.SONIC_BOOM]); + game.move.changeMoveset(shuckle, [Moves.INSTRUCT, Moves.SONIC_BOOM]); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2); game.move.select(Moves.SONIC_BOOM, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY); - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("TurnEndPhase", false); instructSuccess(shuckle, Moves.SONIC_BOOM); @@ -111,16 +107,14 @@ describe("Moves - Instruct", () => { // TODO: Enable test case once gigaton hammer (and blood moon) are reworked it.todo("should repeat enemy's Gigaton Hammer", async () => { - game.override - .moveset(Moves.INSTRUCT) - .enemyLevel(5); - await game.classicMode.startBattle([ Species.AMOONGUSS ]); + game.override.moveset(Moves.INSTRUCT).enemyLevel(5); + await game.classicMode.startBattle([Species.AMOONGUSS]); const enemy = game.scene.getEnemyPokemon()!; - game.move.changeMoveset(enemy, [ Moves.GIGATON_HAMMER, Moves.BLOOD_MOON ]); + game.move.changeMoveset(enemy, [Moves.GIGATON_HAMMER, Moves.BLOOD_MOON]); game.move.select(Moves.INSTRUCT); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); instructSuccess(enemy, Moves.GIGATON_HAMMER); @@ -128,18 +122,15 @@ describe("Moves - Instruct", () => { }); it("should add moves to move queue for copycat", async () => { - game.override - .battleType("double") - .moveset(Moves.INSTRUCT) - .enemyLevel(5); - await game.classicMode.startBattle([ Species.AMOONGUSS ]); + game.override.battleType("double").moveset(Moves.INSTRUCT).enemyLevel(5); + await game.classicMode.startBattle([Species.AMOONGUSS]); - const [ enemy1, enemy2 ] = game.scene.getEnemyField()!; + const [enemy1, enemy2] = game.scene.getEnemyField()!; game.move.changeMoveset(enemy1, Moves.WATER_GUN); game.move.changeMoveset(enemy2, Moves.COPYCAT); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER, BattlerIndex.ENEMY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); instructSuccess(enemy1, Moves.WATER_GUN); @@ -148,17 +139,15 @@ describe("Moves - Instruct", () => { }); it("should respect enemy's status condition", async () => { - game.override - .moveset([ Moves.INSTRUCT, Moves.THUNDER_WAVE ]) - .enemyMoveset(Moves.SONIC_BOOM); - await game.classicMode.startBattle([ Species.AMOONGUSS ]); + game.override.moveset([Moves.INSTRUCT, Moves.THUNDER_WAVE]).enemyMoveset(Moves.SONIC_BOOM); + await game.classicMode.startBattle([Species.AMOONGUSS]); game.move.select(Moves.THUNDER_WAVE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); game.move.select(Moves.INSTRUCT); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MovePhase"); // force enemy's instructed move to bork and then immediately thaw out await game.move.forceStatusActivation(true); @@ -166,15 +155,13 @@ describe("Moves - Instruct", () => { await game.phaseInterceptor.to("TurnEndPhase", false); const moveHistory = game.scene.getEnemyPokemon()?.getLastXMoves(-1)!; - expect(moveHistory.map(m => m.move)).toEqual([ Moves.SONIC_BOOM, Moves.NONE, Moves.SONIC_BOOM ]); + expect(moveHistory.map(m => m.move)).toEqual([Moves.SONIC_BOOM, Moves.NONE, Moves.SONIC_BOOM]); expect(game.scene.getPlayerPokemon()?.getInverseHp()).toBe(40); }); it("should not repeat enemy's out of pp move", async () => { - game.override - .moveset(Moves.INSTRUCT) - .enemySpecies(Species.UNOWN); - await game.classicMode.startBattle([ Species.AMOONGUSS ]); + game.override.moveset(Moves.INSTRUCT).enemySpecies(Species.UNOWN); + await game.classicMode.startBattle([Species.AMOONGUSS]); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.changeMoveset(enemyPokemon, Moves.HIDDEN_POWER); @@ -183,7 +170,7 @@ describe("Moves - Instruct", () => { game.move.select(Moves.INSTRUCT); await game.forceEnemyMove(Moves.HIDDEN_POWER); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase", false); const playerMoves = game.scene.getPlayerPokemon()!.getLastXMoves(-1)!; @@ -192,20 +179,16 @@ describe("Moves - Instruct", () => { }); it("should redirect attacking moves if enemy faints", async () => { - game.override - .battleType("double") - .enemyMoveset(Moves.SPLASH) - .enemySpecies(Species.MAGIKARP) - .enemyLevel(1); - await game.classicMode.startBattle([ Species.HISUI_ELECTRODE, Species.KOMMO_O ]); + game.override.battleType("double").enemyMoveset(Moves.SPLASH).enemySpecies(Species.MAGIKARP).enemyLevel(1); + await game.classicMode.startBattle([Species.HISUI_ELECTRODE, Species.KOMMO_O]); - const [ electrode, kommo_o ] = game.scene.getPlayerField()!; + const [electrode, kommo_o] = game.scene.getPlayerField()!; game.move.changeMoveset(electrode, Moves.CHLOROBLAST); game.move.changeMoveset(kommo_o, Moves.INSTRUCT); game.move.select(Moves.CHLOROBLAST, BattlerIndex.PLAYER, BattlerIndex.ENEMY); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); // Chloroblast always deals 50% max HP% recoil UNLESS you whiff @@ -213,18 +196,15 @@ describe("Moves - Instruct", () => { // so all we have to do is check whether electrode fainted or not. // Naturally, both karps should also be dead as well. expect(electrode.isFainted()).toBe(true); - const [ karp1, karp2 ] = game.scene.getEnemyField()!; + const [karp1, karp2] = game.scene.getEnemyField()!; expect(karp1.isFainted()).toBe(true); expect(karp2.isFainted()).toBe(true); - }), - + }); it("should allow for dancer copying of instructed dance move", async () => { - game.override - .battleType("double") - .enemyMoveset([ Moves.INSTRUCT, Moves.SPLASH ]); - await game.classicMode.startBattle([ Species.ORICORIO, Species.VOLCARONA ]); + game.override.battleType("double").enemyMoveset([Moves.INSTRUCT, Moves.SPLASH]).enemyLevel(1000); + await game.classicMode.startBattle([Species.ORICORIO, Species.VOLCARONA]); - const [ oricorio, volcarona ] = game.scene.getPlayerField(); + const [oricorio, volcarona] = game.scene.getPlayerField(); game.move.changeMoveset(oricorio, Moves.SPLASH); game.move.changeMoveset(volcarona, Moves.FIERY_DANCE); @@ -232,27 +212,29 @@ describe("Moves - Instruct", () => { game.move.select(Moves.FIERY_DANCE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY); await game.forceEnemyMove(Moves.INSTRUCT, BattlerIndex.PLAYER_2); await game.forceEnemyMove(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); // fiery dance triggered dancer successfully for a total of 4 hits - // Volcarona fiery dance has a _small_ chance to 3HKO a shuckle in worst case, so we add the hit count of both - // foes to account for spillover + // Enemy level is set to a high value so that it does not faint even after all 4 hits instructSuccess(volcarona, Moves.FIERY_DANCE); - expect(game.scene.getEnemyField()[0].turnData.attacksReceived.length + - game.scene.getEnemyField()[1].turnData.attacksReceived.length).toBe(4); + expect(game.scene.getEnemyField()[0].turnData.attacksReceived.length).toBe(4); }); it("should not repeat move when switching out", async () => { - game.override - .enemyMoveset(Moves.INSTRUCT) - .enemySpecies(Species.UNOWN); - await game.classicMode.startBattle([ Species.AMOONGUSS, Species.TOXICROAK ]); + game.override.enemyMoveset(Moves.INSTRUCT).enemySpecies(Species.UNOWN); + await game.classicMode.startBattle([Species.AMOONGUSS, Species.TOXICROAK]); const amoonguss = game.scene.getPlayerPokemon()!; game.move.changeMoveset(amoonguss, Moves.SEED_BOMB); - amoonguss.battleSummonData.moveHistory = [{ move: Moves.SEED_BOMB, targets: [ BattlerIndex.ENEMY ], result: MoveResult.SUCCESS }]; + amoonguss.battleSummonData.moveHistory = [ + { + move: Moves.SEED_BOMB, + targets: [BattlerIndex.ENEMY], + result: MoveResult.SUCCESS, + }, + ]; game.doSwitchPokemon(1); await game.phaseInterceptor.to("TurnEndPhase", false); @@ -262,49 +244,50 @@ describe("Moves - Instruct", () => { }); it("should fail if no move has yet been used by target", async () => { - game.override - .moveset(Moves.INSTRUCT) - .enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.AMOONGUSS ]); + game.override.moveset(Moves.INSTRUCT).enemyMoveset(Moves.SPLASH); + await game.classicMode.startBattle([Species.AMOONGUSS]); game.move.select(Moves.INSTRUCT); await game.forceEnemyMove(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("TurnEndPhase", false); expect(game.scene.getPlayerPokemon()!.getLastXMoves()[0].result).toBe(MoveResult.FAIL); }); it("should attempt to call enemy's disabled move, but move use itself should fail", async () => { - game.override - .moveset([ Moves.INSTRUCT, Moves.DISABLE ]) - .battleType("double"); - await game.classicMode.startBattle([ Species.AMOONGUSS, Species.DROWZEE ]); + game.override.moveset([Moves.INSTRUCT, Moves.DISABLE]).battleType("double"); + await game.classicMode.startBattle([Species.AMOONGUSS, Species.DROWZEE]); - const [ enemy1, enemy2 ] = game.scene.getEnemyField(); + const [enemy1, enemy2] = game.scene.getEnemyField(); game.move.changeMoveset(enemy1, Moves.SONIC_BOOM); game.move.changeMoveset(enemy2, Moves.SPLASH); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER, BattlerIndex.ENEMY); game.move.select(Moves.DISABLE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY); await game.forceEnemyMove(Moves.SONIC_BOOM, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("TurnEndPhase", false); expect(game.scene.getPlayerField()[0].getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); const enemyMove = game.scene.getEnemyField()[0]!.getLastXMoves()[0]; expect(enemyMove.result).toBe(MoveResult.FAIL); - expect(game.scene.getEnemyField()[0].getMoveset().find(m => m?.moveId === Moves.SONIC_BOOM)?.ppUsed).toBe(1); + expect( + game.scene + .getEnemyField()[0] + .getMoveset() + .find(m => m?.moveId === Moves.SONIC_BOOM)?.ppUsed, + ).toBe(1); }); it("should not repeat enemy's move through protect", async () => { - game.override.moveset([ Moves.INSTRUCT ]); - await game.classicMode.startBattle([ Species.AMOONGUSS ]); + game.override.moveset([Moves.INSTRUCT]); + await game.classicMode.startBattle([Species.AMOONGUSS]); const enemy = game.scene.getEnemyPokemon()!; game.move.changeMoveset(enemy, Moves.PROTECT); game.move.select(Moves.INSTRUCT); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase", false); expect(enemy.getLastXMoves(-1)[0].move).toBe(Moves.PROTECT); @@ -313,62 +296,68 @@ describe("Moves - Instruct", () => { }); it("should not repeat enemy's charging move", async () => { - game.override - .moveset([ Moves.INSTRUCT ]) - .enemyMoveset([ Moves.SONIC_BOOM, Moves.HYPER_BEAM ]); - await game.classicMode.startBattle([ Species.SHUCKLE ]); + game.override.moveset([Moves.INSTRUCT]).enemyMoveset([Moves.SONIC_BOOM, Moves.HYPER_BEAM]); + await game.classicMode.startBattle([Species.SHUCKLE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; - enemy.battleSummonData.moveHistory = [{ move: Moves.SONIC_BOOM, targets: [ BattlerIndex.PLAYER ], result: MoveResult.SUCCESS, virtual: false }]; + enemy.battleSummonData.moveHistory = [ + { + move: Moves.SONIC_BOOM, + targets: [BattlerIndex.PLAYER], + result: MoveResult.SUCCESS, + virtual: false, + }, + ]; game.move.select(Moves.INSTRUCT); await game.forceEnemyMove(Moves.HYPER_BEAM); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); // instruct fails at copying last move due to charging turn (rather than instructing sonic boom) expect(player.getLastXMoves()[0].result).toBe(MoveResult.FAIL); game.move.select(Moves.INSTRUCT); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase", false); expect(player.getLastXMoves()[0].result).toBe(MoveResult.FAIL); }); it("should not repeat move since forgotten by target", async () => { - game.override - .enemyLevel(5) - .xpMultiplier(0) - .enemySpecies(Species.WURMPLE) - .enemyMoveset(Moves.INSTRUCT); - await game.classicMode.startBattle([ Species.REGIELEKI ]); + game.override.enemyLevel(5).xpMultiplier(0).enemySpecies(Species.WURMPLE).enemyMoveset(Moves.INSTRUCT); + await game.classicMode.startBattle([Species.REGIELEKI]); const regieleki = game.scene.getPlayerPokemon()!; // fill out moveset with random moves - game.move.changeMoveset(regieleki, [ Moves.ELECTRO_DRIFT, Moves.SPLASH, Moves.ICE_BEAM, Moves.ANCIENT_POWER ]); + game.move.changeMoveset(regieleki, [Moves.ELECTRO_DRIFT, Moves.SPLASH, Moves.ICE_BEAM, Moves.ANCIENT_POWER]); game.move.select(Moves.ELECTRO_DRIFT); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("FaintPhase"); await game.move.learnMove(Moves.ELECTROWEB); await game.toNextWave(); game.move.select(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase", false); expect(game.scene.getEnemyField()[0].getLastXMoves()[0].result).toBe(MoveResult.FAIL); }); it("should disregard priority of instructed move on use", async () => { - game.override - .enemyMoveset([ Moves.SPLASH, Moves.WHIRLWIND ]) - .moveset(Moves.INSTRUCT); - await game.classicMode.startBattle([ Species.LUCARIO, Species.BANETTE ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.WHIRLWIND]).moveset(Moves.INSTRUCT); + await game.classicMode.startBattle([Species.LUCARIO, Species.BANETTE]); const enemyPokemon = game.scene.getEnemyPokemon()!; - enemyPokemon.battleSummonData.moveHistory = [{ move: Moves.WHIRLWIND, targets: [ BattlerIndex.PLAYER ], result: MoveResult.SUCCESS, virtual: false }]; + enemyPokemon.battleSummonData.moveHistory = [ + { + move: Moves.WHIRLWIND, + targets: [BattlerIndex.PLAYER], + result: MoveResult.SUCCESS, + virtual: false, + }, + ]; game.move.select(Moves.INSTRUCT); await game.forceEnemyMove(Moves.SPLASH); @@ -382,11 +371,11 @@ describe("Moves - Instruct", () => { }); it("should respect moves' original priority for psychic terrain", async () => { - game.override. - battleType("double") - .moveset([ Moves.QUICK_ATTACK, Moves.SPLASH, Moves.INSTRUCT ]) - .enemyMoveset([ Moves.SPLASH, Moves.PSYCHIC_TERRAIN ]); - await game.classicMode.startBattle([ Species.BANETTE, Species.KLEFKI ]); + game.override + .battleType("double") + .moveset([Moves.QUICK_ATTACK, Moves.SPLASH, Moves.INSTRUCT]) + .enemyMoveset([Moves.SPLASH, Moves.PSYCHIC_TERRAIN]); + await game.classicMode.startBattle([Species.BANETTE, Species.KLEFKI]); game.move.select(Moves.QUICK_ATTACK, BattlerIndex.PLAYER, BattlerIndex.ENEMY); // succeeds due to terrain no game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); @@ -396,7 +385,7 @@ describe("Moves - Instruct", () => { game.move.select(Moves.SPLASH, BattlerIndex.PLAYER); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("TurnEndPhase", false); // quick attack failed when instructed @@ -406,14 +395,12 @@ describe("Moves - Instruct", () => { }); it("should still work w/ prankster in psychic terrain", async () => { - game.override. - battleType("double") - .enemyMoveset([ Moves.SPLASH, Moves.PSYCHIC_TERRAIN ]); - await game.classicMode.startBattle([ Species.BANETTE, Species.KLEFKI ]); + game.override.battleType("double").enemyMoveset([Moves.SPLASH, Moves.PSYCHIC_TERRAIN]); + await game.classicMode.startBattle([Species.BANETTE, Species.KLEFKI]); - const [ banette, klefki ] = game.scene.getPlayerField()!; - game.move.changeMoveset(banette, [ Moves.VINE_WHIP, Moves.SPLASH ]); - game.move.changeMoveset(klefki, [ Moves.INSTRUCT, Moves.SPLASH ]); + const [banette, klefki] = game.scene.getPlayerField()!; + game.move.changeMoveset(banette, [Moves.VINE_WHIP, Moves.SPLASH]); + game.move.changeMoveset(klefki, [Moves.INSTRUCT, Moves.SPLASH]); game.move.select(Moves.VINE_WHIP, BattlerIndex.PLAYER, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); @@ -423,74 +410,78 @@ describe("Moves - Instruct", () => { game.move.select(Moves.SPLASH, BattlerIndex.PLAYER); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER); // copies vine whip - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("TurnEndPhase", false); expect(banette.getLastXMoves(-1)[1].move).toBe(Moves.VINE_WHIP); expect(banette.getLastXMoves(-1)[2].move).toBe(Moves.VINE_WHIP); - expect(banette.getMoveset().find(m => m?.moveId === Moves.VINE_WHIP )?.ppUsed).toBe(2); + expect(banette.getMoveset().find(m => m?.moveId === Moves.VINE_WHIP)?.ppUsed).toBe(2); }); it("should cause spread moves to correctly hit targets in doubles after singles", async () => { game.override .battleType("even-doubles") - .moveset([ Moves.BREAKING_SWIPE, Moves.INSTRUCT, Moves.SPLASH ]) + .moveset([Moves.BREAKING_SWIPE, Moves.INSTRUCT, Moves.SPLASH]) .enemyMoveset(Moves.SONIC_BOOM) .enemySpecies(Species.AXEW) .startingLevel(500); - await game.classicMode.startBattle([ Species.KORAIDON, Species.KLEFKI ]); + await game.classicMode.startBattle([Species.KORAIDON, Species.KLEFKI]); const koraidon = game.scene.getPlayerField()[0]!; game.move.select(Moves.BREAKING_SWIPE); await game.phaseInterceptor.to("TurnEndPhase", false); expect(koraidon.getInverseHp()).toBe(0); - expect(koraidon.getLastXMoves(-1)[0].targets).toEqual([ BattlerIndex.ENEMY ]); + expect(koraidon.getLastXMoves(-1)[0].targets).toEqual([BattlerIndex.ENEMY]); await game.toNextWave(); game.move.select(Moves.SPLASH, BattlerIndex.PLAYER); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("TurnEndPhase", false); // did not take damage since enemies died beforehand; // last move used hit both enemies expect(koraidon.getInverseHp()).toBe(0); - expect(koraidon.getLastXMoves(-1)[1].targets?.sort()).toEqual([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + expect(koraidon.getLastXMoves(-1)[1].targets?.sort()).toEqual([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); }); it("should cause AoE moves to correctly hit everyone in doubles after singles", async () => { game.override .battleType("even-doubles") - .moveset([ Moves.BRUTAL_SWING, Moves.INSTRUCT, Moves.SPLASH ]) + .moveset([Moves.BRUTAL_SWING, Moves.INSTRUCT, Moves.SPLASH]) .enemySpecies(Species.AXEW) .enemyMoveset(Moves.SONIC_BOOM) .startingLevel(500); - await game.classicMode.startBattle([ Species.KORAIDON, Species.KLEFKI ]); + await game.classicMode.startBattle([Species.KORAIDON, Species.KLEFKI]); const koraidon = game.scene.getPlayerField()[0]!; game.move.select(Moves.BRUTAL_SWING); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("TurnEndPhase", false); expect(koraidon.getInverseHp()).toBe(0); - expect(koraidon.getLastXMoves(-1)[0].targets).toEqual([ BattlerIndex.ENEMY ]); + expect(koraidon.getLastXMoves(-1)[0].targets).toEqual([BattlerIndex.ENEMY]); await game.toNextWave(); game.move.select(Moves.SPLASH, BattlerIndex.PLAYER); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER); - await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("TurnEndPhase", false); // did not take damage since enemies died beforehand; // last move used hit everything around it expect(koraidon.getInverseHp()).toBe(0); - expect(koraidon.getLastXMoves(-1)[1].targets?.sort()).toEqual([ BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + expect(koraidon.getLastXMoves(-1)[1].targets?.sort()).toEqual([ + BattlerIndex.PLAYER_2, + BattlerIndex.ENEMY, + BattlerIndex.ENEMY_2, + ]); }); it("should cause multi-hit moves to hit the appropriate number of times in singles", async () => { game.override .enemyAbility(Abilities.SKILL_LINK) - .moveset([ Moves.SPLASH, Moves.INSTRUCT ]) + .moveset([Moves.SPLASH, Moves.INSTRUCT]) .enemyMoveset(Moves.BULLET_SEED); - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const bulbasaur = game.scene.getPlayerPokemon()!; @@ -498,14 +489,14 @@ describe("Moves - Instruct", () => { await game.toNextTurn(); game.move.select(Moves.INSTRUCT); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("BerryPhase"); expect(bulbasaur.turnData.attacksReceived.length).toBe(10); await game.toNextTurn(); game.move.select(Moves.INSTRUCT); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(bulbasaur.turnData.attacksReceived.length).toBe(10); @@ -515,12 +506,12 @@ describe("Moves - Instruct", () => { game.override .battleType("double") .enemyAbility(Abilities.SKILL_LINK) - .moveset([ Moves.SPLASH, Moves.INSTRUCT ]) - .enemyMoveset([ Moves.BULLET_SEED, Moves.SPLASH ]) + .moveset([Moves.SPLASH, Moves.INSTRUCT]) + .enemyMoveset([Moves.BULLET_SEED, Moves.SPLASH]) .enemyLevel(5); - await game.classicMode.startBattle([ Species.BULBASAUR, Species.IVYSAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.IVYSAUR]); - const [ , ivysaur ] = game.scene.getPlayerField(); + const [, ivysaur] = game.scene.getPlayerField(); game.move.select(Moves.SPLASH, BattlerIndex.PLAYER); game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); @@ -532,7 +523,7 @@ describe("Moves - Instruct", () => { game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY); await game.forceEnemyMove(Moves.BULLET_SEED, BattlerIndex.PLAYER_2); await game.forceEnemyMove(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); expect(ivysaur.turnData.attacksReceived.length).toBe(15); @@ -542,7 +533,7 @@ describe("Moves - Instruct", () => { game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY); await game.forceEnemyMove(Moves.BULLET_SEED, BattlerIndex.PLAYER_2); await game.forceEnemyMove(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]); await game.phaseInterceptor.to("BerryPhase"); expect(ivysaur.turnData.attacksReceived.length).toBe(15); diff --git a/test/moves/jaw_lock.test.ts b/test/moves/jaw_lock.test.ts new file mode 100644 index 00000000000..fc71397e624 --- /dev/null +++ b/test/moves/jaw_lock.test.ts @@ -0,0 +1,153 @@ +import { BattlerIndex } from "#app/battle"; +import { Abilities } from "#app/enums/abilities"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { FaintPhase } from "#app/phases/faint-phase"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import GameManager from "#test/testUtils/gameManager"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Jaw Lock", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override + .battleType("single") + .enemySpecies(Species.SNORLAX) + .enemyAbility(Abilities.INSOMNIA) + .enemyMoveset(Moves.SPLASH) + .moveset([Moves.JAW_LOCK, Moves.SPLASH]) + .startingLevel(100) + .enemyLevel(100) + .disableCrits(); + }); + + it("should trap the move's user and target", async () => { + await game.startBattle([Species.BULBASAUR]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.JAW_LOCK); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to(MoveEffectPhase, false); + + expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + + await game.phaseInterceptor.to(TurnEndPhase); + + expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); + }); + + it("should not trap either pokemon if the target faints", async () => { + game.override.enemyLevel(1); + await game.startBattle([Species.BULBASAUR]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.JAW_LOCK); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to(MoveEffectPhase, false); + + expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + + await game.phaseInterceptor.to(MoveEffectPhase); + + expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + + await game.phaseInterceptor.to(FaintPhase); + + expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + }); + + it("should only trap the user until the target faints", async () => { + await game.startBattle([Species.BULBASAUR]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.JAW_LOCK); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to(MoveEffectPhase); + + expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); + + await game.phaseInterceptor.to(TurnEndPhase); + + await game.doKillOpponents(); + + expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + }); + + it("should not trap other targets after the first target is trapped", async () => { + game.override.battleType("double"); + + await game.startBattle([Species.CHARMANDER, Species.BULBASAUR]); + + const playerPokemon = game.scene.getPlayerField(); + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.JAW_LOCK, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + + await game.phaseInterceptor.to(MoveEffectPhase); + + expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined(); + expect(enemyPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined(); + + await game.toNextTurn(); + + game.move.select(Moves.JAW_LOCK, 0, BattlerIndex.ENEMY_2); + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(MoveEffectPhase); + + expect(enemyPokemon[1].getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined(); + expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)?.sourceId).toBe(enemyPokemon[0].id); + }); + + it("should not trap either pokemon if the target is protected", async () => { + game.override.enemyMoveset([Moves.PROTECT]); + + await game.startBattle([Species.BULBASAUR]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.JAW_LOCK); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(playerPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + }); +}); diff --git a/src/test/moves/lash_out.test.ts b/test/moves/lash_out.test.ts similarity index 83% rename from src/test/moves/lash_out.test.ts rename to test/moves/lash_out.test.ts index 014c0ae8fe5..8395633f5c0 100644 --- a/src/test/moves/lash_out.test.ts +++ b/test/moves/lash_out.test.ts @@ -1,13 +1,12 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - describe("Moves - Lash Out", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -29,13 +28,12 @@ describe("Moves - Lash Out", () => { .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.FUR_COAT) - .enemyMoveset([ Moves.GROWL ]) + .enemyMoveset([Moves.GROWL]) .startingLevel(10) .enemyLevel(10) .starterSpecies(Species.FEEBAS) .ability(Abilities.BALL_FETCH) - .moveset([ Moves.LASH_OUT ]); - + .moveset([Moves.LASH_OUT]); }); it("should deal double damage if the user's stat stages were lowered this turn", async () => { @@ -43,7 +41,7 @@ describe("Moves - Lash Out", () => { await game.classicMode.startBattle(); game.move.select(Moves.LASH_OUT); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(allMoves[Moves.LASH_OUT].calculateBattlePower).toHaveReturnedWith(150); diff --git a/test/moves/last_respects.test.ts b/test/moves/last_respects.test.ts new file mode 100644 index 00000000000..57752cea1af --- /dev/null +++ b/test/moves/last_respects.test.ts @@ -0,0 +1,211 @@ +import { Moves } from "#enums/moves"; +import { BattlerIndex } from "#app/battle"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import GameManager from "#test/testUtils/gameManager"; +import { allMoves } from "#app/data/moves/move"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Moves - Last Respects", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + const move = allMoves[Moves.LAST_RESPECTS]; + const basePower = move.power; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("single") + .disableCrits() + .moveset([Moves.LAST_RESPECTS, Moves.EXPLOSION, Moves.LUNAR_DANCE]) + .ability(Abilities.BALL_FETCH) + .enemyAbility(Abilities.BALL_FETCH) + .enemySpecies(Species.MAGIKARP) + .enemyMoveset(Moves.SPLASH) + .startingLevel(1) + .enemyLevel(100); + + vi.spyOn(move, "calculateBattlePower"); + }); + + it("should have 150 power if 2 allies faint before using move", async () => { + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + /** + * Bulbasur faints once + */ + game.move.select(Moves.EXPLOSION); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + /** + * Charmander faints once + */ + game.move.select(Moves.EXPLOSION); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(2); + await game.toNextTurn(); + + game.move.select(Moves.LAST_RESPECTS); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + expect(move.calculateBattlePower).toHaveReturnedWith(basePower + 2 * 50); + }); + + it("should have 200 power if an ally fainted twice and another one once", async () => { + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + /** + * Bulbasur faints once + */ + game.move.select(Moves.EXPLOSION); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + /** + * Charmander faints once + */ + game.doRevivePokemon(1); + game.move.select(Moves.EXPLOSION); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + /** + * Bulbasur faints twice + */ + game.move.select(Moves.EXPLOSION); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(2); + await game.toNextTurn(); + + game.move.select(Moves.LAST_RESPECTS); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + expect(move.calculateBattlePower).toHaveReturnedWith(basePower + 3 * 50); + }); + + it("should maintain its power for the player during the next battle if it is within the same arena encounter", async () => { + game.override + .enemySpecies(Species.MAGIKARP) + .startingWave(1) + .enemyLevel(1) + .startingLevel(100) + .enemyMoveset(Moves.SPLASH); + + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + /** + * The first Pokemon faints and another Pokemon in the party is selected. + */ + game.move.select(Moves.LUNAR_DANCE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + /** + * Enemy Pokemon faints and new wave is entered. + */ + game.move.select(Moves.LAST_RESPECTS); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextWave(); + expect(game.scene.arena.playerFaints).toBe(1); + + game.move.select(Moves.LAST_RESPECTS); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEndPhase"); + expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower + 1 * 50); + }); + + it("should reset enemyFaints count on progressing to the next wave.", async () => { + game.override + .enemySpecies(Species.MAGIKARP) + .startingWave(1) + .enemyLevel(1) + .startingLevel(100) + .enemyMoveset(Moves.LAST_RESPECTS) + .moveset([Moves.LUNAR_DANCE, Moves.LAST_RESPECTS, Moves.SPLASH]); + + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + /** + * The first Pokemon faints and another Pokemon in the party is selected. + */ + game.move.select(Moves.LUNAR_DANCE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + /** + * Enemy Pokemon faints and new wave is entered. + */ + game.move.select(Moves.LAST_RESPECTS); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextWave(); + expect(game.scene.currentBattle.enemyFaints).toBe(0); + + game.move.select(Moves.LAST_RESPECTS); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.phaseInterceptor.to("MoveEndPhase"); + expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower); + }); + + it("should reset playerFaints count if we enter new trainer battle", async () => { + game.override.enemySpecies(Species.MAGIKARP).startingWave(4).enemyLevel(1).startingLevel(100); + + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + game.move.select(Moves.LUNAR_DANCE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + game.move.select(Moves.LAST_RESPECTS); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextWave(); + + game.move.select(Moves.LAST_RESPECTS); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("BerryPhase", false); + + expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower); + }); + + it("should reset playerFaints count if we enter new biome", async () => { + game.override.enemySpecies(Species.MAGIKARP).startingWave(10).enemyLevel(1).startingLevel(100); + + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + + game.move.select(Moves.LUNAR_DANCE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + game.doSelectPartyPokemon(1); + await game.toNextTurn(); + + game.move.select(Moves.LAST_RESPECTS); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextWave(); + + game.move.select(Moves.LAST_RESPECTS); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("BerryPhase", false); + + expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower); + }); +}); diff --git a/src/test/moves/light_screen.test.ts b/test/moves/light_screen.test.ts similarity index 59% rename from src/test/moves/light_screen.test.ts rename to test/moves/light_screen.test.ts index 424f43e155c..9cc6944ed3e 100644 --- a/src/test/moves/light_screen.test.ts +++ b/test/moves/light_screen.test.ts @@ -1,7 +1,7 @@ import type BattleScene from "#app/battle-scene"; import { ArenaTagSide } from "#app/data/arena-tag"; -import type Move from "#app/data/move"; -import { allMoves } from "#app/data/move"; +import type Move from "#app/data/moves/move"; +import { allMoves, CritOnlyAttr } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import type Pokemon from "#app/field/pokemon"; @@ -9,9 +9,9 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { NumberHolder } from "#app/utils"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; let globalScene: BattleScene; @@ -36,22 +36,26 @@ describe("Moves - Light Screen", () => { globalScene = game.scene; game.override.battleType("single"); game.override.ability(Abilities.NONE); - game.override.moveset([ Moves.ABSORB, Moves.DAZZLING_GLEAM, Moves.TACKLE ]); + game.override.moveset([Moves.ABSORB, Moves.DAZZLING_GLEAM, Moves.TACKLE]); game.override.enemyLevel(100); game.override.enemySpecies(Species.MAGIKARP); - game.override.enemyMoveset([ Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN ]); + game.override.enemyMoveset([Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN]); game.override.disableCrits(); }); it("reduces damage of special attacks by half in a single battle", async () => { const moveToUse = Moves.ABSORB; - await game.startBattle([ Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE]); game.move.select(moveToUse); await game.phaseInterceptor.to(TurnEndPhase); - const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]); + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); expect(mockedDmg).toBe(allMoves[moveToUse].power * singleBattleMultiplier); }); @@ -60,28 +64,53 @@ describe("Moves - Light Screen", () => { game.override.battleType("double"); const moveToUse = Moves.DAZZLING_GLEAM; - await game.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]); game.move.select(moveToUse); game.move.select(moveToUse, 1); await game.phaseInterceptor.to(TurnEndPhase); - const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]); + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); expect(mockedDmg).toBe(allMoves[moveToUse].power * doubleBattleMultiplier); }); it("does not affect physical attacks", async () => { const moveToUse = Moves.TACKLE; - await game.startBattle([ Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE]); game.move.select(moveToUse); await game.phaseInterceptor.to(TurnEndPhase); - const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]); + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); expect(mockedDmg).toBe(allMoves[moveToUse].power); }); + + it("does not affect critical hits", async () => { + game.override.moveset([Moves.FROST_BREATH]); + const moveToUse = Moves.FROST_BREATH; + vi.spyOn(allMoves[Moves.FROST_BREATH], "accuracy", "get").mockReturnValue(100); + await game.classicMode.startBattle([Species.SHUCKLE]); + + game.move.select(moveToUse); + await game.phaseInterceptor.to(TurnEndPhase); + + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); + expect(mockedDmg).toBe(allMoves[moveToUse].power); + }); }); /** @@ -98,7 +127,16 @@ const getMockedMoveDamage = (defender: Pokemon, attacker: Pokemon, move: Move) = const side = defender.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; if (globalScene.arena.getTagOnSide(ArenaTagType.LIGHT_SCREEN, side)) { - globalScene.arena.applyTagsForSide(ArenaTagType.LIGHT_SCREEN, side, false, attacker, move.category, multiplierHolder); + if (move.getAttrs(CritOnlyAttr).length === 0) { + globalScene.arena.applyTagsForSide( + ArenaTagType.LIGHT_SCREEN, + side, + false, + attacker, + move.category, + multiplierHolder, + ); + } } return move.power * multiplierHolder.value; diff --git a/test/moves/lucky_chant.test.ts b/test/moves/lucky_chant.test.ts new file mode 100644 index 00000000000..21802574e79 --- /dev/null +++ b/test/moves/lucky_chant.test.ts @@ -0,0 +1,102 @@ +import { Abilities } from "#app/enums/abilities"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import GameManager from "#test/testUtils/gameManager"; + +describe("Moves - Lucky Chant", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override + .battleType("single") + .moveset([Moves.LUCKY_CHANT, Moves.SPLASH, Moves.FOLLOW_ME]) + .enemySpecies(Species.SNORLAX) + .enemyAbility(Abilities.INSOMNIA) + .enemyMoveset([Moves.FLOWER_TRICK]) + .startingLevel(100) + .enemyLevel(100); + }); + + it("should prevent critical hits from moves", async () => { + await game.startBattle([Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase); + + const firstTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp; + + game.move.select(Moves.LUCKY_CHANT); + + await game.phaseInterceptor.to(BerryPhase, false); + + const secondTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp - firstTurnDamage; + expect(secondTurnDamage).toBeLessThan(firstTurnDamage); + }); + + it("should prevent critical hits against the user's ally", async () => { + game.override.battleType("double"); + + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const playerPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.FOLLOW_ME); + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(TurnEndPhase); + + const firstTurnDamage = playerPokemon[0].getMaxHp() - playerPokemon[0].hp; + + game.move.select(Moves.FOLLOW_ME); + game.move.select(Moves.LUCKY_CHANT, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + const secondTurnDamage = playerPokemon[0].getMaxHp() - playerPokemon[0].hp - firstTurnDamage; + expect(secondTurnDamage).toBeLessThan(firstTurnDamage); + }); + + it("should prevent critical hits from field effects", async () => { + game.override.enemyMoveset([Moves.TACKLE]); + + await game.startBattle([Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + enemyPokemon.addTag(BattlerTagType.ALWAYS_CRIT, 2, Moves.NONE, 0); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase); + + const firstTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp; + + game.move.select(Moves.LUCKY_CHANT); + + await game.phaseInterceptor.to(BerryPhase, false); + + const secondTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp - firstTurnDamage; + expect(secondTurnDamage).toBeLessThan(firstTurnDamage); + }); +}); diff --git a/src/test/moves/lunar_blessing.test.ts b/test/moves/lunar_blessing.test.ts similarity index 85% rename from src/test/moves/lunar_blessing.test.ts rename to test/moves/lunar_blessing.test.ts index 52c41a30e11..d97e6c978eb 100644 --- a/src/test/moves/lunar_blessing.test.ts +++ b/test/moves/lunar_blessing.test.ts @@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,13 +28,13 @@ describe("Moves - Lunar Blessing", () => { game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.moveset([ Moves.LUNAR_BLESSING, Moves.SPLASH ]); + game.override.moveset([Moves.LUNAR_BLESSING, Moves.SPLASH]); game.override.ability(Abilities.BALL_FETCH); }); it("should restore 25% HP of the user and its ally", async () => { - await game.startBattle([ Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer ] = game.scene.getPlayerField(); + await game.startBattle([Species.RATTATA, Species.RATTATA]); + const [leftPlayer, rightPlayer] = game.scene.getPlayerField(); vi.spyOn(leftPlayer, "getMaxHp").mockReturnValue(100); vi.spyOn(rightPlayer, "getMaxHp").mockReturnValue(100); @@ -47,7 +47,6 @@ describe("Moves - Lunar Blessing", () => { vi.spyOn(leftPlayer, "heal"); vi.spyOn(rightPlayer, "heal"); - game.move.select(Moves.LUNAR_BLESSING, 0); await game.phaseInterceptor.to(CommandPhase); game.move.select(Moves.SPLASH, 1); @@ -62,8 +61,8 @@ describe("Moves - Lunar Blessing", () => { it("should cure status effect of the user and its ally", async () => { game.override.statusEffect(StatusEffect.BURN); - await game.startBattle([ Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer ] = game.scene.getPlayerField(); + await game.startBattle([Species.RATTATA, Species.RATTATA]); + const [leftPlayer, rightPlayer] = game.scene.getPlayerField(); vi.spyOn(leftPlayer, "resetStatus"); vi.spyOn(rightPlayer, "resetStatus"); diff --git a/src/test/moves/lunar_dance.test.ts b/test/moves/lunar_dance.test.ts similarity index 84% rename from src/test/moves/lunar_dance.test.ts rename to test/moves/lunar_dance.test.ts index 603247298ac..d3dceba087c 100644 --- a/src/test/moves/lunar_dance.test.ts +++ b/test/moves/lunar_dance.test.ts @@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; @@ -31,12 +31,12 @@ describe("Moves - Lunar Dance", () => { }); it("should full restore HP, PP and status of switched in pokemon, then fail second use because no remaining backup pokemon in party", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR, Species.ODDISH, Species.RATTATA ]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.ODDISH, Species.RATTATA]); - const [ bulbasaur, oddish, rattata ] = game.scene.getPlayerParty(); - game.move.changeMoveset(bulbasaur, [ Moves.LUNAR_DANCE, Moves.SPLASH ]); - game.move.changeMoveset(oddish, [ Moves.LUNAR_DANCE, Moves.SPLASH ]); - game.move.changeMoveset(rattata, [ Moves.LUNAR_DANCE, Moves.SPLASH ]); + const [bulbasaur, oddish, rattata] = game.scene.getPlayerParty(); + game.move.changeMoveset(bulbasaur, [Moves.LUNAR_DANCE, Moves.SPLASH]); + game.move.changeMoveset(oddish, [Moves.LUNAR_DANCE, Moves.SPLASH]); + game.move.changeMoveset(rattata, [Moves.LUNAR_DANCE, Moves.SPLASH]); game.move.select(Moves.SPLASH, 0); game.move.select(Moves.SPLASH, 1); diff --git a/test/moves/magic_coat.test.ts b/test/moves/magic_coat.test.ts new file mode 100644 index 00000000000..2cc8dea8938 --- /dev/null +++ b/test/moves/magic_coat.test.ts @@ -0,0 +1,289 @@ +import { BattlerIndex } from "#app/battle"; +import { ArenaTagSide } from "#app/data/arena-tag"; +import { allMoves } from "#app/data/moves/move"; +import { ArenaTagType } from "#app/enums/arena-tag-type"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { Stat } from "#app/enums/stat"; +import { StatusEffect } from "#app/enums/status-effect"; +import { MoveResult } from "#app/field/pokemon"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Moves - Magic Coat", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .ability(Abilities.BALL_FETCH) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.MAGIC_COAT); + }); + + it("should fail if the user goes last in the turn", async () => { + game.override.moveset([Moves.PROTECT]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.PROTECT); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getEnemyPokemon()!.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + }); + + it("should fail if called again in the same turn due to moves like instruct", async () => { + game.override.moveset([Moves.INSTRUCT]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.INSTRUCT); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getEnemyPokemon()!.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + }); + + it("should not reflect moves used on the next turn", async () => { + game.override.moveset([Moves.GROWL, Moves.SPLASH]); + game.override.enemyMoveset([Moves.MAGIC_COAT, Moves.SPLASH]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + // turn 1 + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.MAGIC_COAT); + await game.toNextTurn(); + + // turn 2 + game.move.select(Moves.GROWL); + await game.forceEnemyMove(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should reflect basic status moves", async () => { + game.override.moveset([Moves.GROWL]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should individually bounce back multi-target moves when used by both targets in doubles", async () => { + game.override.battleType("double"); + game.override.moveset([Moves.GROWL, Moves.SPLASH]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]); + + game.move.select(Moves.GROWL, 0); + game.move.select(Moves.SPLASH, 1); + await game.phaseInterceptor.to("BerryPhase"); + + const user = game.scene.getPlayerField()[0]; + expect(user.getStatStage(Stat.ATK)).toBe(-2); + }); + + it("should bounce back a spread status move against both pokemon", async () => { + game.override.battleType("double"); + game.override.moveset([Moves.GROWL, Moves.SPLASH]); + game.override.enemyMoveset([Moves.SPLASH, Moves.MAGIC_COAT]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]); + + game.move.select(Moves.GROWL, 0); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.SPLASH); + await game.forceEnemyMove(Moves.MAGIC_COAT); + + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerField().every(p => p.getStatStage(Stat.ATK) === -1)).toBeTruthy(); + }); + + it("should still bounce back a move that would otherwise fail", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + game.scene.getEnemyPokemon()?.setStatStage(Stat.ATK, -6); + game.override.moveset([Moves.GROWL]); + + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should not bounce back a move that was just bounced", async () => { + game.override.battleType("double"); + game.override.ability(Abilities.MAGIC_BOUNCE); + game.override.moveset([Moves.GROWL, Moves.MAGIC_COAT]); + game.override.enemyMoveset([Moves.SPLASH, Moves.MAGIC_COAT]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]); + + game.move.select(Moves.MAGIC_COAT, 0); + game.move.select(Moves.GROWL, 1); + await game.forceEnemyMove(Moves.MAGIC_COAT); + await game.forceEnemyMove(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyField()[0].getStatStage(Stat.ATK)).toBe(0); + }); + + // todo while Mirror Armor is not implemented + it.todo("should receive the stat change after reflecting a move back to a mirror armor user", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should still bounce back a move from a mold breaker user", async () => { + game.override.ability(Abilities.MOLD_BREAKER); + game.override.moveset([Moves.GROWL]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(0); + expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1); + }); + + it("should only bounce spikes back once when both targets use magic coat in doubles", async () => { + game.override.battleType("double"); + await game.classicMode.startBattle([Species.MAGIKARP]); + game.override.moveset([Moves.SPIKES]); + + game.move.select(Moves.SPIKES); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.PLAYER)!["layers"]).toBe(1); + expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY)).toBeUndefined(); + }); + + it("should not bounce back curse", async () => { + game.override.starterSpecies(Species.GASTLY); + await game.classicMode.startBattle([Species.GASTLY]); + game.override.moveset([Moves.CURSE]); + + game.move.select(Moves.CURSE); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()!.getTag(BattlerTagType.CURSED)).toBeDefined(); + }); + + // TODO: encore is failing if the last move was virtual. + it.todo("should not cause the bounced move to count for encore", async () => { + game.override.moveset([Moves.GROWL, Moves.ENCORE]); + game.override.enemyMoveset([Moves.MAGIC_COAT, Moves.TACKLE]); + game.override.enemyAbility(Abilities.MAGIC_BOUNCE); + + await game.classicMode.startBattle([Species.MAGIKARP]); + const enemyPokemon = game.scene.getEnemyPokemon()!; + + // turn 1 + game.move.select(Moves.GROWL); + await game.forceEnemyMove(Moves.MAGIC_COAT); + await game.toNextTurn(); + + // turn 2 + game.move.select(Moves.ENCORE); + await game.forceEnemyMove(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("BerryPhase"); + expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE); + expect(enemyPokemon.getLastXMoves()[0].move).toBe(Moves.TACKLE); + }); + + // TODO: stomping tantrum should consider moves that were bounced. + it.todo("should cause stomping tantrum to double in power when the last move was bounced", async () => { + game.override.battleType("single"); + await game.classicMode.startBattle([Species.MAGIKARP]); + game.override.moveset([Moves.STOMPING_TANTRUM, Moves.CHARM]); + + const stomping_tantrum = allMoves[Moves.STOMPING_TANTRUM]; + vi.spyOn(stomping_tantrum, "calculateBattlePower"); + + game.move.select(Moves.CHARM); + await game.toNextTurn(); + + game.move.select(Moves.STOMPING_TANTRUM); + await game.phaseInterceptor.to("BerryPhase"); + expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(150); + }); + + // TODO: stomping tantrum should consider moves that were bounced. + it.todo( + "should properly cause the enemy's stomping tantrum to be doubled in power after bouncing and failing", + async () => { + game.override.enemyMoveset([Moves.STOMPING_TANTRUM, Moves.SPLASH, Moves.CHARM]); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const stomping_tantrum = allMoves[Moves.STOMPING_TANTRUM]; + const enemy = game.scene.getEnemyPokemon()!; + vi.spyOn(stomping_tantrum, "calculateBattlePower"); + + game.move.select(Moves.SPORE); + await game.forceEnemyMove(Moves.CHARM); + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.getLastXMoves(1)[0].result).toBe("success"); + + await game.phaseInterceptor.to("BerryPhase"); + expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(75); + + await game.toNextTurn(); + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(75); + }, + ); + + it("should respect immunities when bouncing a move", async () => { + vi.spyOn(allMoves[Moves.THUNDER_WAVE], "accuracy", "get").mockReturnValue(100); + game.override.moveset([Moves.THUNDER_WAVE, Moves.GROWL]); + game.override.ability(Abilities.SOUNDPROOF); + await game.classicMode.startBattle([Species.PHANPY]); + + // Turn 1 - thunder wave immunity test + game.move.select(Moves.THUNDER_WAVE); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.status).toBeUndefined(); + + // Turn 2 - soundproof immunity test + game.move.select(Moves.GROWL); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(0); + }); + + it("should bounce back a move before the accuracy check", async () => { + game.override.moveset([Moves.SPORE]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + const attacker = game.scene.getPlayerPokemon()!; + + vi.spyOn(attacker, "getAccuracyMultiplier").mockReturnValue(0.0); + game.move.select(Moves.SPORE); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.SLEEP); + }); + + it("should take the accuracy of the magic bounce user into account", async () => { + game.override.moveset([Moves.SPORE]); + await game.classicMode.startBattle([Species.MAGIKARP]); + const opponent = game.scene.getEnemyPokemon()!; + + vi.spyOn(opponent, "getAccuracyMultiplier").mockReturnValue(0); + game.move.select(Moves.SPORE); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.status).toBeUndefined(); + }); +}); diff --git a/src/test/moves/magnet_rise.test.ts b/test/moves/magnet_rise.test.ts similarity index 87% rename from src/test/moves/magnet_rise.test.ts rename to test/moves/magnet_rise.test.ts index b26bbf42ed0..725bbb99276 100644 --- a/src/test/moves/magnet_rise.test.ts +++ b/test/moves/magnet_rise.test.ts @@ -2,7 +2,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -26,10 +26,10 @@ describe("Moves - Magnet Rise", () => { game.override.battleType("single"); game.override.starterSpecies(Species.MAGNEZONE); game.override.enemySpecies(Species.RATTATA); - game.override.enemyMoveset([ Moves.DRILL_RUN, Moves.DRILL_RUN, Moves.DRILL_RUN, Moves.DRILL_RUN ]); + game.override.enemyMoveset([Moves.DRILL_RUN, Moves.DRILL_RUN, Moves.DRILL_RUN, Moves.DRILL_RUN]); game.override.disableCrits(); game.override.enemyLevel(1); - game.override.moveset([ moveToUse, Moves.SPLASH, Moves.GRAVITY, Moves.BATON_PASS ]); + game.override.moveset([moveToUse, Moves.SPLASH, Moves.GRAVITY, Moves.BATON_PASS]); }); it("MAGNET RISE", async () => { diff --git a/src/test/moves/make_it_rain.test.ts b/test/moves/make_it_rain.test.ts similarity index 88% rename from src/test/moves/make_it_rain.test.ts rename to test/moves/make_it_rain.test.ts index 08021227e9c..38460d99e63 100644 --- a/src/test/moves/make_it_rain.test.ts +++ b/test/moves/make_it_rain.test.ts @@ -2,13 +2,12 @@ import { Stat } from "#enums/stat"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; - describe("Moves - Make It Rain", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -26,7 +25,7 @@ describe("Moves - Make It Rain", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("double"); - game.override.moveset([ Moves.MAKE_IT_RAIN, Moves.SPLASH ]); + game.override.moveset([Moves.MAKE_IT_RAIN, Moves.SPLASH]); game.override.enemySpecies(Species.SNORLAX); game.override.enemyAbility(Abilities.INSOMNIA); game.override.enemyMoveset(Moves.SPLASH); @@ -35,7 +34,7 @@ describe("Moves - Make It Rain", () => { }); it("should only lower SPATK stat stage by 1 once in a double battle", async () => { - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -51,7 +50,7 @@ describe("Moves - Make It Rain", () => { game.override.enemyLevel(1); // ensures the enemy will faint game.override.battleType("single"); - await game.startBattle([ Species.CHARIZARD ]); + await game.startBattle([Species.CHARIZARD]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -67,7 +66,7 @@ describe("Moves - Make It Rain", () => { it("should reduce Sp. Atk. once after KOing two enemies", async () => { game.override.enemyLevel(1); // ensures the enemy will faint - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyField(); @@ -82,7 +81,7 @@ describe("Moves - Make It Rain", () => { }); it("should lower SPATK stat stage by 1 if it only hits the second target", async () => { - await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerPokemon()!; diff --git a/test/moves/mat_block.test.ts b/test/moves/mat_block.test.ts new file mode 100644 index 00000000000..ddfa29a53da --- /dev/null +++ b/test/moves/mat_block.test.ts @@ -0,0 +1,97 @@ +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; +import GameManager from "#test/testUtils/gameManager"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Stat } from "#enums/stat"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { CommandPhase } from "#app/phases/command-phase"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; + +describe("Moves - Mat Block", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override.battleType("double"); + + game.override.moveset([Moves.MAT_BLOCK, Moves.SPLASH]); + + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyMoveset([Moves.TACKLE]); + game.override.enemyAbility(Abilities.INSOMNIA); + + game.override.startingLevel(100); + game.override.enemyLevel(100); + }); + + test("should protect the user and allies from attack moves", async () => { + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.MAT_BLOCK); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); + }); + + test("should not protect the user and allies from status moves", async () => { + game.override.enemyMoveset([Moves.GROWL]); + + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.MAT_BLOCK); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(-2)); + }); + + test("should fail when used after the first turn", async () => { + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to(CommandPhase); + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(TurnEndPhase); + + const leadStartingHp = leadPokemon.map(p => p.hp); + + await game.phaseInterceptor.to(CommandPhase, false); + game.move.select(Moves.MAT_BLOCK); + await game.phaseInterceptor.to(CommandPhase); + game.move.select(Moves.MAT_BLOCK, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(leadPokemon.some((p, i) => p.hp < leadStartingHp[i])).toBeTruthy(); + }); +}); diff --git a/src/test/moves/metal_burst.test.ts b/test/moves/metal_burst.test.ts similarity index 77% rename from src/test/moves/metal_burst.test.ts rename to test/moves/metal_burst.test.ts index 3b32dd322a3..2cbc999436f 100644 --- a/src/test/moves/metal_burst.test.ts +++ b/test/moves/metal_burst.test.ts @@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -24,7 +24,7 @@ describe("Moves - Metal Burst", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.METAL_BURST, Moves.FISSURE, Moves.PRECIPICE_BLADES ]) + .moveset([Moves.METAL_BURST, Moves.FISSURE, Moves.PRECIPICE_BLADES]) .ability(Abilities.PURE_POWER) .startingLevel(10) .battleType("double") @@ -35,9 +35,9 @@ describe("Moves - Metal Burst", () => { }); it("should redirect target if intended target faints", async () => { - await game.classicMode.startBattle([ Species.FEEBAS, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.FEEBAS]); - const [ , enemy2 ] = game.scene.getEnemyField(); + const [, enemy2] = game.scene.getEnemyField(); game.move.select(Moves.METAL_BURST); game.move.select(Moves.FISSURE, 1, BattlerIndex.ENEMY); @@ -45,7 +45,7 @@ describe("Moves - Metal Burst", () => { await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("MoveEndPhase"); await game.move.forceHit(); @@ -56,9 +56,9 @@ describe("Moves - Metal Burst", () => { }); it("should not crash if both opponents faint before the move is used", async () => { - await game.classicMode.startBattle([ Species.FEEBAS, Species.ARCEUS ]); + await game.classicMode.startBattle([Species.FEEBAS, Species.ARCEUS]); - const [ enemy1, enemy2 ] = game.scene.getEnemyField(); + const [enemy1, enemy2] = game.scene.getEnemyField(); game.move.select(Moves.METAL_BURST); game.move.select(Moves.PRECIPICE_BLADES, 1); @@ -66,7 +66,7 @@ describe("Moves - Metal Burst", () => { await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("MoveEndPhase"); await game.move.forceHit(); diff --git a/src/test/moves/metronome.test.ts b/test/moves/metronome.test.ts similarity index 90% rename from src/test/moves/metronome.test.ts rename to test/moves/metronome.test.ts index 946dc92de0f..15790777ed3 100644 --- a/src/test/moves/metronome.test.ts +++ b/test/moves/metronome.test.ts @@ -1,11 +1,11 @@ import { RechargingTag, SemiInvulnerableTag } from "#app/data/battler-tags"; -import { allMoves, RandomMoveAttr } from "#app/data/move"; +import { allMoves, RandomMoveAttr } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { Stat } from "#app/enums/stat"; import { CommandPhase } from "#app/phases/command-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; @@ -28,7 +28,7 @@ describe("Moves - Metronome", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.METRONOME, Moves.SPLASH ]) + .moveset([Moves.METRONOME, Moves.SPLASH]) .battleType("single") .startingLevel(100) .starterSpecies(Species.REGIELEKI) @@ -79,9 +79,9 @@ describe("Moves - Metronome", () => { it("should only target ally for Aromatic Mist", async () => { game.override.battleType("double"); - await game.classicMode.startBattle([ Species.REGIELEKI, Species.RATTATA ]); - const [ leftPlayer, rightPlayer ] = game.scene.getPlayerField(); - const [ leftOpp, rightOpp ] = game.scene.getEnemyField(); + await game.classicMode.startBattle([Species.REGIELEKI, Species.RATTATA]); + const [leftPlayer, rightPlayer] = game.scene.getPlayerField(); + const [leftOpp, rightOpp] = game.scene.getEnemyField(); vi.spyOn(randomMoveAttr, "getMoveOverride").mockReturnValue(Moves.AROMATIC_MIST); game.move.select(Moves.METRONOME, 0); diff --git a/src/test/moves/miracle_eye.test.ts b/test/moves/miracle_eye.test.ts similarity index 87% rename from src/test/moves/miracle_eye.test.ts rename to test/moves/miracle_eye.test.ts index 70f487de942..2dbfb962540 100644 --- a/src/test/moves/miracle_eye.test.ts +++ b/test/moves/miracle_eye.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -28,7 +28,7 @@ describe("Moves - Miracle Eye", () => { .enemyMoveset(Moves.SPLASH) .enemyLevel(5) .starterSpecies(Species.MAGIKARP) - .moveset([ Moves.MIRACLE_EYE, Moves.CONFUSION ]); + .moveset([Moves.MIRACLE_EYE, Moves.CONFUSION]); }); it("should allow Psychic moves to hit Dark types", async () => { @@ -43,7 +43,7 @@ describe("Moves - Miracle Eye", () => { game.move.select(Moves.MIRACLE_EYE); await game.toNextTurn(); game.move.select(Moves.CONFUSION); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(MoveEffectPhase); expect(enemy.hp).toBeLessThan(enemy.getMaxHp()); diff --git a/src/test/moves/mirror_move.test.ts b/test/moves/mirror_move.test.ts similarity index 73% rename from src/test/moves/mirror_move.test.ts rename to test/moves/mirror_move.test.ts index e55c55038ae..9178410adb2 100644 --- a/src/test/moves/mirror_move.test.ts +++ b/test/moves/mirror_move.test.ts @@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -25,7 +25,7 @@ describe("Moves - Mirror Move", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.MIRROR_MOVE, Moves.SPLASH ]) + .moveset([Moves.MIRROR_MOVE, Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -35,16 +35,14 @@ describe("Moves - Mirror Move", () => { }); it("should use the last move that the target used on the user", async () => { - game.override - .battleType("double") - .enemyMoveset([ Moves.TACKLE, Moves.GROWL ]); - await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]); + game.override.battleType("double").enemyMoveset([Moves.TACKLE, Moves.GROWL]); + await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]); game.move.select(Moves.MIRROR_MOVE, 0, BattlerIndex.ENEMY); // target's last move is Tackle, enemy should receive damage from Mirror Move copying Tackle game.move.select(Moves.SPLASH, 1); await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); await game.forceEnemyMove(Moves.GROWL, BattlerIndex.PLAYER_2); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(game.scene.getEnemyField()[0].isFullHp()).toBeFalsy(); @@ -52,10 +50,10 @@ describe("Moves - Mirror Move", () => { it("should apply secondary effects of a move", async () => { game.override.enemyMoveset(Moves.ACID_SPRAY); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.MIRROR_MOVE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.SPDEF)).toBe(-2); @@ -63,20 +61,20 @@ describe("Moves - Mirror Move", () => { it("should be able to copy status moves", async () => { game.override.enemyMoveset(Moves.GROWL); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.MIRROR_MOVE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1); }); it("should fail if the target has not used any moves", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.MIRROR_MOVE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); expect(game.scene.getPlayerPokemon()!.getLastXMoves()[0].result).toBe(MoveResult.FAIL); diff --git a/src/test/moves/mist.test.ts b/test/moves/mist.test.ts similarity index 87% rename from src/test/moves/mist.test.ts rename to test/moves/mist.test.ts index cd338f79412..2deb6f9b90d 100644 --- a/src/test/moves/mist.test.ts +++ b/test/moves/mist.test.ts @@ -2,7 +2,7 @@ import { Stat } from "#enums/stat"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,7 +23,7 @@ describe("Moves - Mist", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.MIST, Moves.SPLASH ]) + .moveset([Moves.MIST, Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("double") .disableCrits() @@ -33,7 +33,7 @@ describe("Moves - Mist", () => { }); it("should prevent the user's side from having stats lowered", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const playerPokemon = game.scene.getPlayerField(); diff --git a/src/test/moves/moongeist_beam.test.ts b/test/moves/moongeist_beam.test.ts similarity index 81% rename from src/test/moves/moongeist_beam.test.ts rename to test/moves/moongeist_beam.test.ts index 216eee482fb..117fe513e17 100644 --- a/src/test/moves/moongeist_beam.test.ts +++ b/test/moves/moongeist_beam.test.ts @@ -1,8 +1,8 @@ -import { allMoves, RandomMoveAttr } from "#app/data/move"; +import { allMoves, RandomMoveAttr } from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -23,7 +23,7 @@ describe("Moves - Moongeist Beam", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.MOONGEIST_BEAM, Moves.METRONOME ]) + .moveset([Moves.MOONGEIST_BEAM, Moves.METRONOME]) .ability(Abilities.BALL_FETCH) .startingLevel(200) .battleType("single") @@ -35,7 +35,7 @@ describe("Moves - Moongeist Beam", () => { // Also covers Photon Geyser and Sunsteel Strike it("should ignore enemy abilities", async () => { - await game.classicMode.startBattle([ Species.MILOTIC ]); + await game.classicMode.startBattle([Species.MILOTIC]); const enemy = game.scene.getEnemyPokemon()!; @@ -47,8 +47,10 @@ describe("Moves - Moongeist Beam", () => { // Also covers Photon Geyser and Sunsteel Strike it("should not ignore enemy abilities when called by another move, such as metronome", async () => { - await game.classicMode.startBattle([ Species.MILOTIC ]); - vi.spyOn(allMoves[Moves.METRONOME].getAttrs(RandomMoveAttr)[0], "getMoveOverride").mockReturnValue(Moves.MOONGEIST_BEAM); + await game.classicMode.startBattle([Species.MILOTIC]); + vi.spyOn(allMoves[Moves.METRONOME].getAttrs(RandomMoveAttr)[0], "getMoveOverride").mockReturnValue( + Moves.MOONGEIST_BEAM, + ); game.move.select(Moves.METRONOME); await game.phaseInterceptor.to("BerryPhase"); diff --git a/src/test/moves/multi_target.test.ts b/test/moves/multi_target.test.ts similarity index 80% rename from src/test/moves/multi_target.test.ts rename to test/moves/multi_target.test.ts index 965876d3445..2b17929a5df 100644 --- a/src/test/moves/multi_target.test.ts +++ b/test/moves/multi_target.test.ts @@ -3,11 +3,10 @@ import { Abilities } from "#app/enums/abilities"; import { Species } from "#app/enums/species"; import * as Utils from "#app/utils"; import { Moves } from "#enums/moves"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Multi-target damage reduction", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -32,18 +31,18 @@ describe("Multi-target damage reduction", () => { .enemySpecies(Species.POLIWAG) .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) - .moveset([ Moves.TACKLE, Moves.DAZZLING_GLEAM, Moves.EARTHQUAKE, Moves.SPLASH ]) + .moveset([Moves.TACKLE, Moves.DAZZLING_GLEAM, Moves.EARTHQUAKE, Moves.SPLASH]) .ability(Abilities.BALL_FETCH); }); it("should reduce d.gleam damage when multiple enemies but not tackle", async () => { - await game.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + await game.startBattle([Species.MAGIKARP, Species.FEEBAS]); - const [ enemy1, enemy2 ] = game.scene.getEnemyField(); + const [enemy1, enemy2] = game.scene.getEnemyField(); game.move.select(Moves.DAZZLING_GLEAM); game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("MoveEndPhase"); const gleam1 = enemy1.getMaxHp() - enemy1.hp; @@ -59,7 +58,7 @@ describe("Multi-target damage reduction", () => { game.move.select(Moves.DAZZLING_GLEAM); game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); @@ -77,14 +76,14 @@ describe("Multi-target damage reduction", () => { }); it("should reduce earthquake when more than one pokemon other than user is not fainted", async () => { - await game.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + await game.startBattle([Species.MAGIKARP, Species.FEEBAS]); const player2 = game.scene.getPlayerParty()[1]; - const [ enemy1, enemy2 ] = game.scene.getEnemyField(); + const [enemy1, enemy2] = game.scene.getEnemyField(); game.move.select(Moves.EARTHQUAKE); game.move.select(Moves.SPLASH, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("MoveEndPhase"); @@ -99,7 +98,7 @@ describe("Multi-target damage reduction", () => { game.move.select(Moves.EARTHQUAKE); game.move.select(Moves.SPLASH, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); @@ -117,7 +116,7 @@ describe("Multi-target damage reduction", () => { await game.toNextTurn(); game.move.select(Moves.EARTHQUAKE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); diff --git a/src/test/moves/nightmare.test.ts b/test/moves/nightmare.test.ts similarity index 86% rename from src/test/moves/nightmare.test.ts rename to test/moves/nightmare.test.ts index 850b0793b1e..e1cef0084ee 100644 --- a/src/test/moves/nightmare.test.ts +++ b/test/moves/nightmare.test.ts @@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,17 +23,18 @@ describe("Moves - Nightmare", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single") + game.override + .battleType("single") .enemySpecies(Species.RATTATA) .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) .enemyStatusEffect(StatusEffect.SLEEP) .startingLevel(5) - .moveset([ Moves.NIGHTMARE, Moves.SPLASH ]); + .moveset([Moves.NIGHTMARE, Moves.SPLASH]); }); it("lowers enemy hp by 1/4 each turn while asleep", async () => { - await game.classicMode.startBattle([ Species.HYPNO ]); + await game.classicMode.startBattle([Species.HYPNO]); const enemyPokemon = game.scene.getEnemyPokemon()!; const enemyMaxHP = enemyPokemon.hp; diff --git a/src/test/moves/obstruct.test.ts b/test/moves/obstruct.test.ts similarity index 96% rename from src/test/moves/obstruct.test.ts rename to test/moves/obstruct.test.ts index 1649c199e32..d8e3a949f08 100644 --- a/src/test/moves/obstruct.test.ts +++ b/test/moves/obstruct.test.ts @@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -27,7 +27,7 @@ describe("Moves - Obstruct", () => { .enemyMoveset(Moves.TACKLE) .enemyAbility(Abilities.BALL_FETCH) .ability(Abilities.BALL_FETCH) - .moveset([ Moves.OBSTRUCT ]) + .moveset([Moves.OBSTRUCT]) .starterSpecies(Species.FEEBAS); }); @@ -57,8 +57,7 @@ describe("Moves - Obstruct", () => { await game.phaseInterceptor.to("TurnEndPhase"); expect(player.isFullHp()).toBe(true); expect(enemy.getStatStage(Stat.DEF)).toBe(-2); - } - ); + }); it("protects from non-contact damaging moves and doesn't lower the opponent's defense by 2 stages", async () => { game.override.enemyMoveset(Moves.WATER_GUN); diff --git a/src/test/moves/octolock.test.ts b/test/moves/octolock.test.ts similarity index 89% rename from src/test/moves/octolock.test.ts rename to test/moves/octolock.test.ts index 6ca96eeb464..c9c5fd42f7e 100644 --- a/src/test/moves/octolock.test.ts +++ b/test/moves/octolock.test.ts @@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -30,12 +30,12 @@ describe("Moves - Octolock", () => { .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) .startingLevel(2000) - .moveset([ Moves.OCTOLOCK, Moves.SPLASH, Moves.TRICK_OR_TREAT ]) + .moveset([Moves.OCTOLOCK, Moves.SPLASH, Moves.TRICK_OR_TREAT]) .ability(Abilities.BALL_FETCH); }); it("lowers DEF and SPDEF stat stages of the target Pokemon by 1 each turn", async () => { - await game.classicMode.startBattle([ Species.GRAPPLOCT ]); + await game.classicMode.startBattle([Species.GRAPPLOCT]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -56,7 +56,7 @@ describe("Moves - Octolock", () => { it("if target pokemon has BIG_PECKS, should only lower SPDEF stat stage by 1", async () => { game.override.enemyAbility(Abilities.BIG_PECKS); - await game.classicMode.startBattle([ Species.GRAPPLOCT ]); + await game.classicMode.startBattle([Species.GRAPPLOCT]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -70,7 +70,7 @@ describe("Moves - Octolock", () => { it("if target pokemon has WHITE_SMOKE, should not reduce any stat stages", async () => { game.override.enemyAbility(Abilities.WHITE_SMOKE); - await game.classicMode.startBattle([ Species.GRAPPLOCT ]); + await game.classicMode.startBattle([Species.GRAPPLOCT]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -84,7 +84,7 @@ describe("Moves - Octolock", () => { it("if target pokemon has CLEAR_BODY, should not reduce any stat stages", async () => { game.override.enemyAbility(Abilities.CLEAR_BODY); - await game.classicMode.startBattle([ Species.GRAPPLOCT ]); + await game.classicMode.startBattle([Species.GRAPPLOCT]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -97,7 +97,7 @@ describe("Moves - Octolock", () => { }); it("traps the target pokemon", async () => { - await game.classicMode.startBattle([ Species.GRAPPLOCT ]); + await game.classicMode.startBattle([Species.GRAPPLOCT]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -113,7 +113,7 @@ describe("Moves - Octolock", () => { it("does not work on ghost type pokemon", async () => { game.override.enemyMoveset(Moves.OCTOLOCK); - await game.classicMode.startBattle([ Species.GASTLY ]); + await game.classicMode.startBattle([Species.GASTLY]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -130,7 +130,7 @@ describe("Moves - Octolock", () => { }); it("does not work on pokemon with added ghost type via Trick-or-Treat", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const enemy = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/order_up.test.ts b/test/moves/order_up.test.ts similarity index 62% rename from src/test/moves/order_up.test.ts rename to test/moves/order_up.test.ts index a9281b121b2..516f7f625a3 100644 --- a/src/test/moves/order_up.test.ts +++ b/test/moves/order_up.test.ts @@ -6,7 +6,7 @@ import { Stat } from "#enums/stat"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -43,34 +43,35 @@ describe("Moves - Order Up", () => { it.each([ { formIndex: 0, formName: "Curly", stat: Stat.ATK, statName: "Attack" }, { formIndex: 1, formName: "Droopy", stat: Stat.DEF, statName: "Defense" }, - { formIndex: 2, formName: "Stretchy", stat: Stat.SPD, statName: "Speed" } - ])("should raise the user's $statName when the user is commanded by a $formName Tatsugiri", async ({ formIndex, stat }) => { - game.override.starterForms({ [Species.TATSUGIRI]: formIndex }); + { formIndex: 2, formName: "Stretchy", stat: Stat.SPD, statName: "Speed" }, + ])( + "should raise the user's $statName when the user is commanded by a $formName Tatsugiri", + async ({ formIndex, stat }) => { + game.override.starterForms({ [Species.TATSUGIRI]: formIndex }); - await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]); + await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]); - const [ tatsugiri, dondozo ] = game.scene.getPlayerField(); + const [tatsugiri, dondozo] = game.scene.getPlayerField(); - expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY); - expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined(); + expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY); + expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined(); - game.move.select(Moves.ORDER_UP, 1, BattlerIndex.ENEMY); - expect(game.scene.currentBattle.turnCommands[0]?.skip).toBeTruthy(); + game.move.select(Moves.ORDER_UP, 1, BattlerIndex.ENEMY); + expect(game.scene.currentBattle.turnCommands[0]?.skip).toBeTruthy(); - await game.phaseInterceptor.to("BerryPhase", false); + await game.phaseInterceptor.to("BerryPhase", false); - const affectedStats: EffectiveStat[] = [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ]; - affectedStats.forEach(st => expect(dondozo.getStatStage(st)).toBe(st === stat ? 3 : 2)); - }); + const affectedStats: EffectiveStat[] = [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD]; + affectedStats.forEach(st => expect(dondozo.getStatStage(st)).toBe(st === stat ? 3 : 2)); + }, + ); it("should be boosted by Sheer Force while still applying a stat boost", async () => { - game.override - .passiveAbility(Abilities.SHEER_FORCE) - .starterForms({ [Species.TATSUGIRI]: 0 }); + game.override.passiveAbility(Abilities.SHEER_FORCE).starterForms({ [Species.TATSUGIRI]: 0 }); - await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]); + await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]); - const [ tatsugiri, dondozo ] = game.scene.getPlayerField(); + const [tatsugiri, dondozo] = game.scene.getPlayerField(); expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY); expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined(); diff --git a/src/test/moves/parting_shot.test.ts b/test/moves/parting_shot.test.ts similarity index 66% rename from src/test/moves/parting_shot.test.ts rename to test/moves/parting_shot.test.ts index 30ad3660a32..699d960f882 100644 --- a/src/test/moves/parting_shot.test.ts +++ b/test/moves/parting_shot.test.ts @@ -3,14 +3,13 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, test } from "vitest"; -import GameManager from "../utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Stat } from "#enums/stat"; import { BerryPhase } from "#app/phases/berry-phase"; import { FaintPhase } from "#app/phases/faint-phase"; import { MessagePhase } from "#app/phases/message-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; - describe("Moves - Parting Shot", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -28,58 +27,48 @@ describe("Moves - Parting Shot", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("single"); - game.override.moveset([ Moves.PARTING_SHOT, Moves.SPLASH ]); + game.override.moveset([Moves.PARTING_SHOT, Moves.SPLASH]); game.override.enemyMoveset(Moves.SPLASH); game.override.startingLevel(5); game.override.enemyLevel(5); - }); - test( - "Parting Shot when buffed by prankster should fail against dark types", - async () => { - game.override - .enemySpecies(Species.POOCHYENA) - .ability(Abilities.PRANKSTER); - await game.startBattle([ Species.MURKROW, Species.MEOWTH ]); + test("Parting Shot when buffed by prankster should fail against dark types", async () => { + game.override.enemySpecies(Species.POOCHYENA).ability(Abilities.PRANKSTER); + await game.startBattle([Species.MURKROW, Species.MEOWTH]); - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).toBeDefined(); + const enemyPokemon = game.scene.getEnemyPokemon()!; + expect(enemyPokemon).toBeDefined(); - game.move.select(Moves.PARTING_SHOT); + game.move.select(Moves.PARTING_SHOT); - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); - expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0); - expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW); - } - ); + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0); + expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW); + }); - test( - "Parting shot should fail against good as gold ability", - async () => { - game.override - .enemySpecies(Species.GHOLDENGO) - .enemyAbility(Abilities.GOOD_AS_GOLD); - await game.startBattle([ Species.MURKROW, Species.MEOWTH ]); + test("Parting shot should fail against good as gold ability", async () => { + game.override.enemySpecies(Species.GHOLDENGO).enemyAbility(Abilities.GOOD_AS_GOLD); + await game.startBattle([Species.MURKROW, Species.MEOWTH]); - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).toBeDefined(); + const enemyPokemon = game.scene.getEnemyPokemon()!; + expect(enemyPokemon).toBeDefined(); - game.move.select(Moves.PARTING_SHOT); + game.move.select(Moves.PARTING_SHOT); - await game.phaseInterceptor.to(BerryPhase, false); - expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); - expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0); - expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW); - } - ); + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0); + expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW); + }); - it.todo( // TODO: fix this bug to pass the test! + it.todo( + // TODO: fix this bug to pass the test! "Parting shot should fail if target is -6/-6 de-buffed", async () => { - game.override.moveset([ Moves.PARTING_SHOT, Moves.MEMENTO, Moves.SPLASH ]); - await game.startBattle([ Species.MEOWTH, Species.MEOWTH, Species.MEOWTH, Species.MURKROW, Species.ABRA ]); + game.override.moveset([Moves.PARTING_SHOT, Moves.MEMENTO, Moves.SPLASH]); + await game.startBattle([Species.MEOWTH, Species.MEOWTH, Species.MEOWTH, Species.MURKROW, Species.ABRA]); // use Memento 3 times to debuff enemy game.move.select(Moves.MEMENTO); @@ -114,17 +103,15 @@ describe("Moves - Parting Shot", () => { expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-6); expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(-6); expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW); - } + }, ); - it.todo( // TODO: fix this bug to pass the test! + it.todo( + // TODO: fix this bug to pass the test! "Parting shot shouldn't allow switch out when mist is active", async () => { - game.override - .enemySpecies(Species.ALTARIA) - .enemyAbility(Abilities.NONE) - .enemyMoveset([ Moves.MIST ]); - await game.startBattle([ Species.SNORLAX, Species.MEOWTH ]); + game.override.enemySpecies(Species.ALTARIA).enemyAbility(Abilities.NONE).enemyMoveset([Moves.MIST]); + await game.startBattle([Species.SNORLAX, Species.MEOWTH]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon).toBeDefined(); @@ -135,16 +122,15 @@ describe("Moves - Parting Shot", () => { expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0); expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW); - } + }, ); - it.todo( // TODO: fix this bug to pass the test! + it.todo( + // TODO: fix this bug to pass the test! "Parting shot shouldn't allow switch out against clear body ability", async () => { - game.override - .enemySpecies(Species.TENTACOOL) - .enemyAbility(Abilities.CLEAR_BODY); - await game.startBattle([ Species.SNORLAX, Species.MEOWTH ]); + game.override.enemySpecies(Species.TENTACOOL).enemyAbility(Abilities.CLEAR_BODY); + await game.startBattle([Species.SNORLAX, Species.MEOWTH]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon).toBeDefined(); @@ -155,13 +141,14 @@ describe("Moves - Parting Shot", () => { expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0); expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW); - } + }, ); - it.todo( // TODO: fix this bug to pass the test! + it.todo( + // TODO: fix this bug to pass the test! "Parting shot should de-buff and not fail if no party available to switch - party size 1", async () => { - await game.startBattle([ Species.MURKROW ]); + await game.startBattle([Species.MURKROW]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon).toBeDefined(); @@ -172,13 +159,14 @@ describe("Moves - Parting Shot", () => { expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1); expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(-1); expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW); - } + }, ); - it.todo( // TODO: fix this bug to pass the test! + it.todo( + // TODO: fix this bug to pass the test! "Parting shot regularly not fail if no party available to switch - party fainted", async () => { - await game.startBattle([ Species.MURKROW, Species.MEOWTH ]); + await game.startBattle([Species.MURKROW, Species.MEOWTH]); game.move.select(Moves.SPLASH); // intentionally kill party pokemon, switch to second slot (now 1 party mon is fainted) @@ -195,6 +183,6 @@ describe("Moves - Parting Shot", () => { expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0); expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MEOWTH); - } + }, ); }); diff --git a/src/test/moves/plasma_fists.test.ts b/test/moves/plasma_fists.test.ts similarity index 68% rename from src/test/moves/plasma_fists.test.ts rename to test/moves/plasma_fists.test.ts index 4075c1ab988..fe19ab4a460 100644 --- a/src/test/moves/plasma_fists.test.ts +++ b/test/moves/plasma_fists.test.ts @@ -1,9 +1,9 @@ import { BattlerIndex } from "#app/battle"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; @@ -24,7 +24,7 @@ describe("Moves - Plasma Fists", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.PLASMA_FISTS, Moves.TACKLE ]) + .moveset([Moves.PLASMA_FISTS, Moves.TACKLE]) .battleType("double") .startingLevel(100) .enemySpecies(Species.DUSCLOPS) @@ -34,7 +34,7 @@ describe("Moves - Plasma Fists", () => { }); it("should convert all subsequent Normal-type attacks to Electric-type", async () => { - await game.classicMode.startBattle([ Species.DUSCLOPS, Species.BLASTOISE ]); + await game.classicMode.startBattle([Species.DUSCLOPS, Species.BLASTOISE]); const field = game.scene.getField(true); field.forEach(p => vi.spyOn(p, "getMoveType")); @@ -45,22 +45,20 @@ describe("Moves - Plasma Fists", () => { await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase", false); field.forEach(p => { - expect(p.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC); + expect(p.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC); expect(p.hp).toBeLessThan(p.getMaxHp()); }); }); it("should not affect Normal-type attacks boosted by Pixilate", async () => { - game.override - .battleType("single") - .enemyAbility(Abilities.PIXILATE); + game.override.battleType("single").enemyAbility(Abilities.PIXILATE); - await game.classicMode.startBattle([ Species.ONIX ]); + await game.classicMode.startBattle([Species.ONIX]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -68,20 +66,17 @@ describe("Moves - Plasma Fists", () => { game.move.select(Moves.PLASMA_FISTS); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("BerryPhase", false); - expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(Type.FAIRY); + expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.FAIRY); expect(playerPokemon.hp).toBeLessThan(playerPokemon.getMaxHp()); }); it("should affect moves that become Normal type due to Normalize", async () => { - game.override - .battleType("single") - .enemyAbility(Abilities.NORMALIZE) - .enemyMoveset(Moves.WATER_GUN); + game.override.battleType("single").enemyAbility(Abilities.NORMALIZE).enemyMoveset(Moves.WATER_GUN); - await game.classicMode.startBattle([ Species.DUSCLOPS ]); + await game.classicMode.startBattle([Species.DUSCLOPS]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -89,10 +84,10 @@ describe("Moves - Plasma Fists", () => { game.move.select(Moves.PLASMA_FISTS); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("BerryPhase", false); - expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC); + expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC); expect(playerPokemon.hp).toBeLessThan(playerPokemon.getMaxHp()); }); }); diff --git a/test/moves/pledge_moves.test.ts b/test/moves/pledge_moves.test.ts new file mode 100644 index 00000000000..c866d15357c --- /dev/null +++ b/test/moves/pledge_moves.test.ts @@ -0,0 +1,301 @@ +import { BattlerIndex } from "#app/battle"; +import { allAbilities } from "#app/data/ability"; +import { ArenaTagSide } from "#app/data/arena-tag"; +import { allMoves, FlinchAttr } from "#app/data/moves/move"; +import { PokemonType } from "#enums/pokemon-type"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { Stat } from "#enums/stat"; +import { toDmgValue } from "#app/utils"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; + +describe("Moves - Pledge Moves", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("double") + .startingLevel(100) + .moveset([Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE, Moves.WATER_PLEDGE, Moves.SPLASH]) + .enemySpecies(Species.SNORLAX) + .enemyLevel(100) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("Fire Pledge - should be an 80-power Fire-type attack outside of combination", async () => { + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + const firePledge = allMoves[Moves.FIRE_PLEDGE]; + vi.spyOn(firePledge, "calculateBattlePower"); + + const playerPokemon = game.scene.getPlayerField(); + vi.spyOn(playerPokemon[0], "getMoveType"); + + game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + await game.phaseInterceptor.to("MoveEndPhase", false); + + expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80); + expect(playerPokemon[0].getMoveType).toHaveLastReturnedWith(PokemonType.FIRE); + }); + + it("Fire Pledge - should not combine with an ally using Fire Pledge", async () => { + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + const firePledge = allMoves[Moves.FIRE_PLEDGE]; + vi.spyOn(firePledge, "calculateBattlePower"); + + const playerPokemon = game.scene.getPlayerField(); + playerPokemon.forEach(p => vi.spyOn(p, "getMoveType")); + + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY_2); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80); + expect(playerPokemon[0].getMoveType).toHaveLastReturnedWith(PokemonType.FIRE); + + await game.phaseInterceptor.to("BerryPhase", false); + expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80); + expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(PokemonType.FIRE); + + enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp())); + }); + + it("Fire Pledge - should not combine with an enemy's Pledge move", async () => { + game.override.battleType("single").enemyMoveset(Moves.GRASS_PLEDGE); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.FIRE_PLEDGE); + + await game.toNextTurn(); + + // Neither Pokemon should defer their move's effects as they would + // if they combined moves, so both should be damaged. + expect(playerPokemon.hp).toBeLessThan(playerPokemon.getMaxHp()); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + expect(game.scene.arena.getTag(ArenaTagType.FIRE_GRASS_PLEDGE)).toBeUndefined(); + }); + + it("Grass Pledge - should combine with Fire Pledge to form a 150-power Fire-type attack that creates a 'sea of fire'", async () => { + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const grassPledge = allMoves[Moves.GRASS_PLEDGE]; + vi.spyOn(grassPledge, "calculateBattlePower"); + + const playerPokemon = game.scene.getPlayerField(); + const enemyPokemon = game.scene.getEnemyField(); + + vi.spyOn(playerPokemon[1], "getMoveType"); + const baseDmgMock = vi.spyOn(enemyPokemon[0], "getBaseDamage"); + + game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY_2); + game.move.select(Moves.GRASS_PLEDGE, 1, BattlerIndex.ENEMY); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + // advance to the end of PLAYER_2's move this turn + for (let i = 0; i < 2; i++) { + await game.phaseInterceptor.to("MoveEndPhase"); + } + expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(PokemonType.FIRE); + expect(grassPledge.calculateBattlePower).toHaveLastReturnedWith(150); + + const baseDmg = baseDmgMock.mock.results[baseDmgMock.mock.results.length - 1].value; + expect(enemyPokemon[0].getMaxHp() - enemyPokemon[0].hp).toBe(toDmgValue(baseDmg * 1.5)); + expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); // PLAYER should not have attacked + expect(game.scene.arena.getTagOnSide(ArenaTagType.FIRE_GRASS_PLEDGE, ArenaTagSide.ENEMY)).toBeDefined(); + + const enemyStartingHp = enemyPokemon.map(p => p.hp); + await game.toNextTurn(); + enemyPokemon.forEach((p, i) => expect(enemyStartingHp[i] - p.hp).toBe(toDmgValue(p.getMaxHp() / 8))); + }); + + it("Fire Pledge - should combine with Water Pledge to form a 150-power Water-type attack that creates a 'rainbow'", async () => { + game.override.moveset([Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.FIERY_DANCE, Moves.SPLASH]); + + await game.classicMode.startBattle([Species.BLASTOISE, Species.VENUSAUR]); + + const firePledge = allMoves[Moves.FIRE_PLEDGE]; + vi.spyOn(firePledge, "calculateBattlePower"); + + const playerPokemon = game.scene.getPlayerField(); + const enemyPokemon = game.scene.getEnemyField(); + + vi.spyOn(playerPokemon[1], "getMoveType"); + + game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY_2); + game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + // advance to the end of PLAYER_2's move this turn + for (let i = 0; i < 2; i++) { + await game.phaseInterceptor.to("MoveEndPhase"); + } + expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(PokemonType.WATER); + expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(150); + expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); // PLAYER should not have attacked + expect(game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER)).toBeDefined(); + + await game.toNextTurn(); + + game.move.select(Moves.FIERY_DANCE, 0, BattlerIndex.ENEMY_2); + game.move.select(Moves.SPLASH, 1); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + await game.phaseInterceptor.to("MoveEndPhase"); + + // Rainbow effect should increase Fiery Dance's chance of raising Sp. Atk to 100% + expect(playerPokemon[0].getStatStage(Stat.SPATK)).toBe(1); + }); + + it("Water Pledge - should combine with Grass Pledge to form a 150-power Grass-type attack that creates a 'swamp'", async () => { + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + const waterPledge = allMoves[Moves.WATER_PLEDGE]; + vi.spyOn(waterPledge, "calculateBattlePower"); + + const playerPokemon = game.scene.getPlayerField(); + const enemyPokemon = game.scene.getEnemyField(); + const enemyStartingSpd = enemyPokemon.map(p => p.getEffectiveStat(Stat.SPD)); + + vi.spyOn(playerPokemon[1], "getMoveType"); + + game.move.select(Moves.GRASS_PLEDGE, 0, BattlerIndex.ENEMY_2); + game.move.select(Moves.WATER_PLEDGE, 1, BattlerIndex.ENEMY); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + // advance to the end of PLAYER_2's move this turn + for (let i = 0; i < 2; i++) { + await game.phaseInterceptor.to("MoveEndPhase"); + } + + expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(PokemonType.GRASS); + expect(waterPledge.calculateBattlePower).toHaveLastReturnedWith(150); + expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); + + expect(game.scene.arena.getTagOnSide(ArenaTagType.GRASS_WATER_PLEDGE, ArenaTagSide.ENEMY)).toBeDefined(); + enemyPokemon.forEach((p, i) => expect(p.getEffectiveStat(Stat.SPD)).toBe(Math.floor(enemyStartingSpd[i] / 4))); + }); + + it("Pledge Moves - should alter turn order when used in combination", async () => { + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2]); + // PLAYER_2 should act with a combined move immediately after PLAYER as the second move in the turn + for (let i = 0; i < 2; i++) { + await game.phaseInterceptor.to("MoveEndPhase"); + } + expect(enemyPokemon[0].hp).toBe(enemyPokemon[0].getMaxHp()); + expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp()); + }); + + it("Pledge Moves - 'rainbow' effect should not stack with Serene Grace when applied to flinching moves", async () => { + game.override + .ability(Abilities.SERENE_GRACE) + .moveset([Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.IRON_HEAD, Moves.SPLASH]); + + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + const ironHeadFlinchAttr = allMoves[Moves.IRON_HEAD].getAttrs(FlinchAttr)[0]; + vi.spyOn(ironHeadFlinchAttr, "getMoveChance"); + + game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER)).toBeDefined(); + + game.move.select(Moves.IRON_HEAD, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(ironHeadFlinchAttr.getMoveChance).toHaveLastReturnedWith(60); + }); + + it("Pledge Moves - should have no effect when the second ally's move is cancelled", async () => { + game.override.enemyMoveset([Moves.SPLASH, Moves.SPORE]); + + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.GRASS_PLEDGE, 1, BattlerIndex.ENEMY_2); + + await game.forceEnemyMove(Moves.SPORE, BattlerIndex.PLAYER_2); + await game.forceEnemyMove(Moves.SPLASH); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2]); + + await game.phaseInterceptor.to("BerryPhase", false); + + enemyPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); + }); + + it("Pledge Moves - should ignore redirection from another Pokemon's Storm Drain", async () => { + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyField(); + vi.spyOn(enemyPokemon[1], "getAbility").mockReturnValue(allAbilities[Abilities.STORM_DRAIN]); + + game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + + await game.phaseInterceptor.to("MoveEndPhase", false); + + expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); + expect(enemyPokemon[1].getStatStage(Stat.SPATK)).toBe(0); + }); + + it("Pledge Moves - should not ignore redirection from another Pokemon's Follow Me", async () => { + game.override.enemyMoveset([Moves.FOLLOW_ME, Moves.SPLASH]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); + + await game.forceEnemyMove(Moves.SPLASH); + await game.forceEnemyMove(Moves.FOLLOW_ME); + + await game.phaseInterceptor.to("BerryPhase", false); + + const enemyPokemon = game.scene.getEnemyField(); + expect(enemyPokemon[0].hp).toBe(enemyPokemon[0].getMaxHp()); + expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp()); + }); +}); diff --git a/test/moves/powder.test.ts b/test/moves/powder.test.ts new file mode 100644 index 00000000000..522b0b74ca7 --- /dev/null +++ b/test/moves/powder.test.ts @@ -0,0 +1,279 @@ +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import Phaser from "phaser"; +import GameManager from "#test/testUtils/gameManager"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { MoveResult, PokemonMove } from "#app/field/pokemon"; +import { PokemonType } from "#enums/pokemon-type"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { StatusEffect } from "#enums/status-effect"; +import { BattlerIndex } from "#app/battle"; + +describe("Moves - Powder", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + + game.override + .enemySpecies(Species.SNORLAX) + .enemyLevel(100) + .enemyMoveset(Moves.EMBER) + .enemyAbility(Abilities.INSOMNIA) + .startingLevel(100) + .moveset([Moves.POWDER, Moves.SPLASH, Moves.FIERY_DANCE, Moves.ROAR]); + }); + + it("should cancel the target's Fire-type move, damage the target, and still consume the target's PP", async () => { + // Cannot use enemy moveset override for this test, since it interferes with checking PP + game.override.enemyMoveset([]); + await game.classicMode.startBattle([Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + enemyPokemon.moveset = [new PokemonMove(Moves.EMBER)]; + + game.move.select(Moves.POWDER); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4)); + expect(enemyPokemon.moveset[0]!.ppUsed).toBe(1); + + await game.toNextTurn(); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); + expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4)); + expect(enemyPokemon.moveset[0]!.ppUsed).toBe(2); + }); + + it("should have no effect against Grass-type Pokemon", async () => { + game.override.enemySpecies(Species.AMOONGUSS); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); + + it("should have no effect against Pokemon with Overcoat", async () => { + game.override.enemyAbility(Abilities.OVERCOAT); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); + + it("should not damage the target if the target has Magic Guard", async () => { + game.override.enemyAbility(Abilities.MAGIC_GUARD); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); + + it("should not damage the target if Primordial Sea is active", async () => { + game.override.enemyAbility(Abilities.PRIMORDIAL_SEA); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); + + it("should not prevent the target from thawing out with Flame Wheel", async () => { + game.override.enemyMoveset(Array(4).fill(Moves.FLAME_WHEEL)).enemyStatusEffect(StatusEffect.FREEZE); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.FREEZE); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4)); + }); + + it("should not allow a target with Protean to change to Fire type", async () => { + game.override.enemyAbility(Abilities.PROTEAN); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + expect(enemyPokemon.summonData?.types).not.toBe(PokemonType.FIRE); + }); + + it("should cancel Fire-type moves generated by the target's Dancer ability", async () => { + game.override.battleType("double").enemySpecies(Species.BLASTOISE).enemyAbility(Abilities.DANCER); + + await game.classicMode.startBattle([Species.CHARIZARD, Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + // Turn 1: Roar away 1 opponent + game.move.select(Moves.ROAR, 0, BattlerIndex.ENEMY_2); + game.move.select(Moves.SPLASH, 1); + await game.toNextTurn(); + await game.toNextTurn(); // Requires game.toNextTurn() twice due to double battle + + // Turn 2: Enemy should activate Powder twice: From using Ember, and from copying Fiery Dance via Dancer + playerPokemon.hp = playerPokemon.getMaxHp(); + game.move.select(Moves.FIERY_DANCE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.POWDER, 1, BattlerIndex.ENEMY); + + await game.phaseInterceptor.to(MoveEffectPhase); + const enemyStartingHp = enemyPokemon.hp; + + await game.phaseInterceptor.to(BerryPhase, false); + + // player should not take damage + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp()); + // enemy should have taken damage from player's Fiery Dance + 2 Powder procs + expect(enemyPokemon.hp).toBe( + enemyStartingHp - playerPokemon.turnData.totalDamageDealt - 2 * Math.floor(enemyPokemon.getMaxHp() / 4), + ); + }); + + it("should cancel Fiery Dance, then prevent it from triggering Dancer", async () => { + game.override.ability(Abilities.DANCER).enemyMoveset(Moves.FIERY_DANCE); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4)); + expect(playerPokemon.getLastXMoves()[0].move).toBe(Moves.POWDER); + }); + + it("should cancel Revelation Dance if it becomes a Fire-type move", async () => { + game.override.enemySpecies(Species.CHARIZARD).enemyMoveset(Array(4).fill(Moves.REVELATION_DANCE)); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4)); + }); + + it("should cancel Shell Trap and damage the target, even if the move would fail", async () => { + game.override.enemyMoveset(Array(4).fill(Moves.SHELL_TRAP)); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4)); + }); + + it("should cancel Grass Pledge if used after ally's Fire Pledge", async () => { + game.override.enemyMoveset([Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE]).battleType("double"); + + await game.classicMode.startBattle([Species.CHARIZARD, Species.CHARIZARD]); + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.GRASS_PLEDGE, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4)); + }); + + it("should cancel Fire Pledge if used before ally's Water Pledge", async () => { + game.override.enemyMoveset([Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE]).battleType("double"); + + await game.classicMode.startBattle([Species.CHARIZARD, Species.CHARIZARD]); + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4)); + }); + + it("should NOT cancel Fire Pledge if used after ally's Water Pledge", async () => { + game.override.enemyMoveset([Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE]).battleType("double"); + + await game.classicMode.startBattle([Species.CHARIZARD, Species.CHARIZARD]); + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); + await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to(BerryPhase, false); + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); +}); diff --git a/src/test/moves/power_shift.test.ts b/test/moves/power_shift.test.ts similarity index 91% rename from src/test/moves/power_shift.test.ts rename to test/moves/power_shift.test.ts index e389f77bedf..fbc6d732d30 100644 --- a/src/test/moves/power_shift.test.ts +++ b/test/moves/power_shift.test.ts @@ -2,7 +2,7 @@ import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; import { Abilities } from "#enums/abilities"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -22,7 +22,7 @@ describe("Moves - Power Shift", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.POWER_SHIFT, Moves.BULK_UP ]) + .moveset([Moves.POWER_SHIFT, Moves.BULK_UP]) .battleType("single") .ability(Abilities.BALL_FETCH) .enemyAbility(Abilities.BALL_FETCH) @@ -30,7 +30,7 @@ describe("Moves - Power Shift", () => { }); it("switches the user's raw Attack stat with its raw Defense stat", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; diff --git a/src/test/moves/power_split.test.ts b/test/moves/power_split.test.ts similarity index 90% rename from src/test/moves/power_split.test.ts rename to test/moves/power_split.test.ts index 914fa86e491..9150a707ad5 100644 --- a/src/test/moves/power_split.test.ts +++ b/test/moves/power_split.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; @@ -28,15 +28,13 @@ describe("Moves - Power Split", () => { .enemyAbility(Abilities.NONE) .enemySpecies(Species.MEW) .enemyLevel(200) - .moveset([ Moves.POWER_SPLIT ]) + .moveset([Moves.POWER_SPLIT]) .ability(Abilities.NONE); }); it("should average the user's ATK and SPATK stats with those of the target", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([ - Species.INDEEDEE - ]); + await game.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -55,10 +53,8 @@ describe("Moves - Power Split", () => { }, 20000); it("should be idempotent", async () => { - game.override.enemyMoveset([ Moves.POWER_SPLIT ]); - await game.startBattle([ - Species.INDEEDEE - ]); + game.override.enemyMoveset([Moves.POWER_SPLIT]); + await game.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/power_swap.test.ts b/test/moves/power_swap.test.ts similarity index 91% rename from src/test/moves/power_swap.test.ts rename to test/moves/power_swap.test.ts index e9a4b569c92..d6f5e782e66 100644 --- a/src/test/moves/power_swap.test.ts +++ b/test/moves/power_swap.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; @@ -29,14 +29,12 @@ describe("Moves - Power Swap", () => { .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.INDEEDEE) .enemyLevel(200) - .moveset([ Moves.POWER_SWAP ]) + .moveset([Moves.POWER_SWAP]) .ability(Abilities.NONE); }); it("should swap the user's ATK and SPATK stat stages with the target's", async () => { - await game.classicMode.startBattle([ - Species.INDEEDEE - ]); + await game.classicMode.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/power_trick.test.ts b/test/moves/power_trick.test.ts similarity index 86% rename from src/test/moves/power_trick.test.ts rename to test/moves/power_trick.test.ts index a064a43dec4..0cd849bbcc5 100644 --- a/src/test/moves/power_trick.test.ts +++ b/test/moves/power_trick.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { Species } from "#enums/species"; @@ -30,12 +30,12 @@ describe("Moves - Power Trick", () => { .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.MEW) .enemyLevel(200) - .moveset([ Moves.POWER_TRICK ]) + .moveset([Moves.POWER_TRICK]) .ability(Abilities.BALL_FETCH); }); it("swaps the user's ATK and DEF stats", async () => { - await game.classicMode.startBattle([ Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE]); const player = game.scene.getPlayerPokemon()!; const baseATK = player.getStat(Stat.ATK, false); @@ -51,7 +51,7 @@ describe("Moves - Power Trick", () => { }); it("resets initial ATK and DEF stat swap when used consecutively", async () => { - await game.classicMode.startBattle([ Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE]); const player = game.scene.getPlayerPokemon()!; const baseATK = player.getStat(Stat.ATK, false); @@ -71,8 +71,8 @@ describe("Moves - Power Trick", () => { }); it("should pass effect when using BATON_PASS", async () => { - await game.classicMode.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]); - await game.override.moveset([ Moves.POWER_TRICK, Moves.BATON_PASS ]); + await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]); + await game.override.moveset([Moves.POWER_TRICK, Moves.BATON_PASS]); const player = game.scene.getPlayerPokemon()!; player.addTag(BattlerTagType.POWER_TRICK); @@ -92,8 +92,8 @@ describe("Moves - Power Trick", () => { }); it("should remove effect after using Transform", async () => { - await game.classicMode.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]); - await game.override.moveset([ Moves.POWER_TRICK, Moves.TRANSFORM ]); + await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]); + await game.override.moveset([Moves.POWER_TRICK, Moves.TRANSFORM]); const player = game.scene.getPlayerPokemon()!; player.addTag(BattlerTagType.POWER_TRICK); diff --git a/test/moves/protect.test.ts b/test/moves/protect.test.ts new file mode 100644 index 00000000000..d50c490f7d3 --- /dev/null +++ b/test/moves/protect.test.ts @@ -0,0 +1,117 @@ +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; +import GameManager from "#test/testUtils/gameManager"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Stat } from "#enums/stat"; +import { allMoves } from "#app/data/moves/move"; +import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag"; +import { BattlerIndex } from "#app/battle"; +import { MoveResult } from "#app/field/pokemon"; + +describe("Moves - Protect", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override.battleType("single"); + + game.override.moveset([Moves.PROTECT]); + game.override.enemySpecies(Species.SNORLAX); + + game.override.enemyAbility(Abilities.INSOMNIA); + game.override.enemyMoveset([Moves.TACKLE]); + + game.override.startingLevel(100); + game.override.enemyLevel(100); + }); + + test("should protect the user from attacks", async () => { + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.PROTECT); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + }); + + test("should prevent secondary effects from the opponent's attack", async () => { + game.override.enemyMoveset([Moves.CEASELESS_EDGE]); + vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.PROTECT); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(game.scene.arena.getTagOnSide(ArenaTrapTag, ArenaTagSide.ENEMY)).toBeUndefined(); + }); + + test("should protect the user from status moves", async () => { + game.override.enemyMoveset([Moves.CHARM]); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.PROTECT); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + }); + + test("should stop subsequent hits of a multi-hit move", async () => { + game.override.enemyMoveset([Moves.TACHYON_CUTTER]); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.PROTECT); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); + expect(enemyPokemon.turnData.hitCount).toBe(1); + }); + + test("should fail if the user is the last to move in the turn", async () => { + game.override.enemyMoveset([Moves.PROTECT]); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.PROTECT); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); + expect(leadPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + }); +}); diff --git a/src/test/moves/psycho_shift.test.ts b/test/moves/psycho_shift.test.ts similarity index 90% rename from src/test/moves/psycho_shift.test.ts rename to test/moves/psycho_shift.test.ts index 448a8c99ef0..0a82189d201 100644 --- a/src/test/moves/psycho_shift.test.ts +++ b/test/moves/psycho_shift.test.ts @@ -2,7 +2,7 @@ import { StatusEffect } from "#app/enums/status-effect"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,7 +23,7 @@ describe("Moves - Psycho Shift", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.PSYCHO_SHIFT ]) + .moveset([Moves.PSYCHO_SHIFT]) .ability(Abilities.BALL_FETCH) .statusEffect(StatusEffect.POISON) .battleType("single") @@ -35,7 +35,7 @@ describe("Moves - Psycho Shift", () => { }); it("If Psycho Shift is used on a Pokémon with Synchronize, the user of Psycho Shift will already be afflicted with a status condition when Synchronize activates", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const playerPokemon = game.scene.getPlayerPokemon(); const enemyPokemon = game.scene.getEnemyPokemon(); diff --git a/test/moves/purify.test.ts b/test/moves/purify.test.ts new file mode 100644 index 00000000000..30d9df8ff67 --- /dev/null +++ b/test/moves/purify.test.ts @@ -0,0 +1,70 @@ +import { BattlerIndex } from "#app/battle"; +import { Status } from "#app/data/status-effect"; +import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; +import { MoveEndPhase } from "#app/phases/move-end-phase"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { StatusEffect } from "#enums/status-effect"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Moves - Purify", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + + game.override.starterSpecies(Species.PYUKUMUKU); + game.override.startingLevel(10); + game.override.moveset([Moves.PURIFY, Moves.SIZZLY_SLIDE]); + + game.override.enemySpecies(Species.MAGIKARP); + game.override.enemyLevel(10); + game.override.enemyMoveset([Moves.SPLASH, Moves.NONE, Moves.NONE, Moves.NONE]); + }); + + test("Purify heals opponent status effect and restores user hp", async () => { + await game.startBattle(); + + const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!; + const playerPokemon: PlayerPokemon = game.scene.getPlayerPokemon()!; + + playerPokemon.hp = playerPokemon.getMaxHp() - 1; + enemyPokemon.status = new Status(StatusEffect.BURN); + + game.move.select(Moves.PURIFY); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEndPhase); + + expect(enemyPokemon.status).toBeNull(); + expect(playerPokemon.isFullHp()).toBe(true); + }); + + test("Purify does not heal if opponent doesnt have any status effect", async () => { + await game.startBattle(); + + const playerPokemon: PlayerPokemon = game.scene.getPlayerPokemon()!; + + playerPokemon.hp = playerPokemon.getMaxHp() - 1; + const playerInitialHp = playerPokemon.hp; + + game.move.select(Moves.PURIFY); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEndPhase); + + expect(playerPokemon.hp).toBe(playerInitialHp); + }); +}); diff --git a/test/moves/quash.test.ts b/test/moves/quash.test.ts new file mode 100644 index 00000000000..f85dbd89517 --- /dev/null +++ b/test/moves/quash.test.ts @@ -0,0 +1,97 @@ +import { Species } from "#enums/species"; +import { Moves } from "#enums/moves"; +import { Abilities } from "#app/enums/abilities"; +import { BattlerIndex } from "#app/battle"; +import { WeatherType } from "#enums/weather-type"; +import { MoveResult } from "#app/field/pokemon"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { describe, beforeAll, afterEach, beforeEach, it, expect } from "vitest"; + +describe("Moves - Quash", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("double") + .enemyLevel(1) + .enemySpecies(Species.SLOWPOKE) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset([Moves.RAIN_DANCE, Moves.SPLASH]) + .ability(Abilities.BALL_FETCH) + .moveset([Moves.QUASH, Moves.SUNNY_DAY, Moves.RAIN_DANCE, Moves.SPLASH]); + }); + + it("makes the target move last in a turn, ignoring priority", async () => { + await game.classicMode.startBattle([Species.ACCELGOR, Species.RATTATA]); + + game.move.select(Moves.QUASH, 0, BattlerIndex.PLAYER_2); + game.move.select(Moves.SUNNY_DAY, 1); + await game.forceEnemyMove(Moves.SPLASH); + await game.forceEnemyMove(Moves.RAIN_DANCE); + + await game.phaseInterceptor.to("TurnEndPhase", false); + // will be sunny if player_2 moved last because of quash, rainy otherwise + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SUNNY); + }); + + it("fails if the target has already moved", async () => { + await game.classicMode.startBattle([Species.ACCELGOR, Species.RATTATA]); + game.move.select(Moves.SPLASH, 0); + game.move.select(Moves.QUASH, 1, BattlerIndex.PLAYER); + + await game.phaseInterceptor.to("MoveEndPhase"); + await game.phaseInterceptor.to("MoveEndPhase"); + + expect(game.scene.getPlayerField()[1].getLastXMoves(1)[0].result).toBe(MoveResult.FAIL); + }); + + it("makes multiple quashed targets move in speed order at the end of the turn", async () => { + game.override.enemySpecies(Species.NINJASK).enemyLevel(100); + + await game.classicMode.startBattle([Species.ACCELGOR, Species.RATTATA]); + + // both users are quashed - rattata is slower so sun should be up at end of turn + game.move.select(Moves.RAIN_DANCE, 0); + game.move.select(Moves.SUNNY_DAY, 1); + + await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER_2); + + await game.phaseInterceptor.to("TurnEndPhase", false); + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SUNNY); + }); + + it("respects trick room", async () => { + game.override.enemyMoveset([Moves.RAIN_DANCE, Moves.SPLASH, Moves.TRICK_ROOM]); + + await game.classicMode.startBattle([Species.ACCELGOR, Species.RATTATA]); + game.move.select(Moves.SPLASH, 0); + game.move.select(Moves.SPLASH, 1); + + await game.forceEnemyMove(Moves.TRICK_ROOM); + await game.forceEnemyMove(Moves.SPLASH); + await game.phaseInterceptor.to("TurnInitPhase"); + // both users are quashed - accelgor should move last w/ TR so rain should be up at end of turn + game.move.select(Moves.RAIN_DANCE, 0); + game.move.select(Moves.SUNNY_DAY, 1); + + await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER_2); + + await game.phaseInterceptor.to("TurnEndPhase", false); + expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.RAIN); + }); +}); diff --git a/test/moves/quick_guard.test.ts b/test/moves/quick_guard.test.ts new file mode 100644 index 00000000000..22d4a5078ac --- /dev/null +++ b/test/moves/quick_guard.test.ts @@ -0,0 +1,104 @@ +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; +import GameManager from "#test/testUtils/gameManager"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Stat } from "#enums/stat"; +import { BattlerIndex } from "#app/battle"; +import { MoveResult } from "#app/field/pokemon"; + +describe("Moves - Quick Guard", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override.battleType("double"); + + game.override.moveset([Moves.QUICK_GUARD, Moves.SPLASH, Moves.FOLLOW_ME]); + + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyMoveset([Moves.QUICK_ATTACK]); + game.override.enemyAbility(Abilities.INSOMNIA); + + game.override.startingLevel(100); + game.override.enemyLevel(100); + }); + + test("should protect the user and allies from priority moves", async () => { + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const playerPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.QUICK_GUARD); + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to("BerryPhase", false); + + playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); + }); + + test("should protect the user and allies from Prankster-boosted moves", async () => { + game.override.enemyAbility(Abilities.PRANKSTER); + game.override.enemyMoveset([Moves.GROWL]); + + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const playerPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.QUICK_GUARD); + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to("BerryPhase", false); + + playerPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0)); + }); + + test("should stop subsequent hits of a multi-hit priority move", async () => { + game.override.enemyMoveset([Moves.WATER_SHURIKEN]); + + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const playerPokemon = game.scene.getPlayerField(); + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.QUICK_GUARD); + game.move.select(Moves.FOLLOW_ME, 1); + + await game.phaseInterceptor.to("BerryPhase", false); + + playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); + enemyPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1)); + }); + + test("should fail if the user is the last to move in the turn", async () => { + game.override.battleType("single"); + game.override.enemyMoveset([Moves.QUICK_GUARD]); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.QUICK_GUARD); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); + expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + }); +}); diff --git a/src/test/moves/rage_fist.test.ts b/test/moves/rage_fist.test.ts similarity index 62% rename from src/test/moves/rage_fist.test.ts rename to test/moves/rage_fist.test.ts index a85be5a88d9..8bcb212d60e 100644 --- a/src/test/moves/rage_fist.test.ts +++ b/test/moves/rage_fist.test.ts @@ -2,8 +2,8 @@ import { BattlerIndex } from "#app/battle"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { allMoves } from "#app/data/move"; -import GameManager from "#test/utils/gameManager"; +import { allMoves } from "#app/data/moves/move"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -26,7 +26,7 @@ describe("Moves - Rage Fist", () => { game = new GameManager(phaserGame); game.override .battleType("single") - .moveset([ Moves.RAGE_FIST, Moves.SPLASH, Moves.SUBSTITUTE ]) + .moveset([Moves.RAGE_FIST, Moves.SPLASH, Moves.SUBSTITUTE]) .startingLevel(100) .enemyLevel(1) .enemyAbility(Abilities.BALL_FETCH) @@ -36,96 +36,84 @@ describe("Moves - Rage Fist", () => { }); it("should have 100 more power if hit twice before calling Rage Fist", async () => { - game.override - .enemySpecies(Species.MAGIKARP); + game.override.enemySpecies(Species.MAGIKARP); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.RAGE_FIST); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); expect(move.calculateBattlePower).toHaveLastReturnedWith(150); }); it("should maintain its power during next battle if it is within the same arena encounter", async () => { - game.override - .enemySpecies(Species.MAGIKARP) - .startingWave(1); + game.override.enemySpecies(Species.MAGIKARP).startingWave(1); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.RAGE_FIST); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextWave(); game.move.select(Moves.RAGE_FIST); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase", false); expect(move.calculateBattlePower).toHaveLastReturnedWith(250); }); it("should reset the hitRecCounter if we enter new trainer battle", async () => { - game.override - .enemySpecies(Species.MAGIKARP) - .startingWave(4); + game.override.enemySpecies(Species.MAGIKARP).startingWave(4); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.RAGE_FIST); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextWave(); game.move.select(Moves.RAGE_FIST); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase", false); expect(move.calculateBattlePower).toHaveLastReturnedWith(150); }); it("should not increase the hitCounter if Substitute is hit", async () => { - game.override - .enemySpecies(Species.MAGIKARP) - .startingWave(4); + game.override.enemySpecies(Species.MAGIKARP).startingWave(4); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.SUBSTITUTE); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEffectPhase"); expect(game.scene.getPlayerPokemon()?.customPokemonData.hitsRecCount).toBe(0); }); it("should reset the hitRecCounter if we enter new biome", async () => { - game.override - .enemySpecies(Species.MAGIKARP) - .startingWave(10); + game.override.enemySpecies(Species.MAGIKARP).startingWave(10); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.RAGE_FIST); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); game.move.select(Moves.RAGE_FIST); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase", false); expect(move.calculateBattlePower).toHaveLastReturnedWith(150); }); it("should not reset the hitRecCounter if switched out", async () => { - game.override - .enemySpecies(Species.MAGIKARP) - .startingWave(1) - .enemyMoveset(Moves.TACKLE); + game.override.enemySpecies(Species.MAGIKARP).startingWave(1).enemyMoveset(Moves.TACKLE); - await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); game.move.select(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); game.doSwitchPokemon(1); diff --git a/test/moves/rage_powder.test.ts b/test/moves/rage_powder.test.ts new file mode 100644 index 00000000000..ab05ae2e0bc --- /dev/null +++ b/test/moves/rage_powder.test.ts @@ -0,0 +1,73 @@ +import { BattlerIndex } from "#app/battle"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Moves - Rage Powder", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("double"); + game.override.enemySpecies(Species.SNORLAX); + game.override.startingLevel(100); + game.override.enemyLevel(100); + game.override.moveset([Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK]); + game.override.enemyMoveset([Moves.RAGE_POWDER, Moves.TACKLE, Moves.SPLASH]); + }); + + test("move effect should be bypassed by Grass type", async () => { + await game.classicMode.startBattle([Species.AMOONGUSS, Species.VENUSAUR]); + + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY); + game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); + + await game.forceEnemyMove(Moves.RAGE_POWDER); + await game.forceEnemyMove(Moves.SPLASH); + + await game.phaseInterceptor.to("BerryPhase", false); + + // If redirection was bypassed, both enemies should be damaged + expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); + expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); + }); + + test("move effect should be bypassed by Overcoat", async () => { + game.override.ability(Abilities.OVERCOAT); + + // Test with two non-Grass type player Pokemon + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyField(); + + const enemyStartingHp = enemyPokemon.map(p => p.hp); + + game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY); + game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); + + await game.forceEnemyMove(Moves.RAGE_POWDER); + await game.forceEnemyMove(Moves.SPLASH); + + await game.phaseInterceptor.to("BerryPhase", false); + + // If redirection was bypassed, both enemies should be damaged + expect(enemyPokemon[0].hp).toBeLessThan(enemyStartingHp[0]); + expect(enemyPokemon[1].hp).toBeLessThan(enemyStartingHp[1]); + }); +}); diff --git a/src/test/moves/reflect.test.ts b/test/moves/reflect.test.ts similarity index 57% rename from src/test/moves/reflect.test.ts rename to test/moves/reflect.test.ts index aa9f2095c89..ac879a7cc2b 100644 --- a/src/test/moves/reflect.test.ts +++ b/test/moves/reflect.test.ts @@ -1,7 +1,7 @@ import type BattleScene from "#app/battle-scene"; import { ArenaTagSide } from "#app/data/arena-tag"; -import type Move from "#app/data/move"; -import { allMoves } from "#app/data/move"; +import type Move from "#app/data/moves/move"; +import { allMoves, CritOnlyAttr } from "#app/data/moves/move"; import { Abilities } from "#app/enums/abilities"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import type Pokemon from "#app/field/pokemon"; @@ -9,7 +9,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { NumberHolder } from "#app/utils"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -36,21 +36,25 @@ describe("Moves - Reflect", () => { globalScene = game.scene; game.override.battleType("single"); game.override.ability(Abilities.NONE); - game.override.moveset([ Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE ]); + game.override.moveset([Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE]); game.override.enemyLevel(100); game.override.enemySpecies(Species.MAGIKARP); - game.override.enemyMoveset([ Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT ]); + game.override.enemyMoveset([Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT]); game.override.disableCrits(); }); it("reduces damage of physical attacks by half in a single battle", async () => { const moveToUse = Moves.TACKLE; - await game.startBattle([ Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE]); game.move.select(moveToUse); await game.phaseInterceptor.to(TurnEndPhase); - const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]); + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); expect(mockedDmg).toBe(allMoves[moveToUse].power * singleBattleMultiplier); }); @@ -59,29 +63,70 @@ describe("Moves - Reflect", () => { game.override.battleType("double"); const moveToUse = Moves.ROCK_SLIDE; - await game.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]); game.move.select(moveToUse); game.move.select(moveToUse, 1); await game.phaseInterceptor.to(TurnEndPhase); - const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]); + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); expect(mockedDmg).toBe(allMoves[moveToUse].power * doubleBattleMultiplier); }); it("does not affect special attacks", async () => { const moveToUse = Moves.ABSORB; - await game.startBattle([ Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.SHUCKLE]); game.move.select(moveToUse); await game.phaseInterceptor.to(TurnEndPhase); - const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]); + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); expect(mockedDmg).toBe(allMoves[moveToUse].power); }); + + it("does not affect critical hits", async () => { + game.override.moveset([Moves.WICKED_BLOW]); + const moveToUse = Moves.WICKED_BLOW; + await game.classicMode.startBattle([Species.SHUCKLE]); + + game.move.select(moveToUse); + await game.phaseInterceptor.to(TurnEndPhase); + + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); + + expect(mockedDmg).toBe(allMoves[moveToUse].power); + }); + + it("does not affect critical hits", async () => { + game.override.moveset([Moves.WICKED_BLOW]); + const moveToUse = Moves.WICKED_BLOW; + await game.classicMode.startBattle([Species.SHUCKLE]); + + game.move.select(moveToUse); + await game.phaseInterceptor.to(TurnEndPhase); + + const mockedDmg = getMockedMoveDamage( + game.scene.getEnemyPokemon()!, + game.scene.getPlayerPokemon()!, + allMoves[moveToUse], + ); + expect(mockedDmg).toBe(allMoves[moveToUse].power); + }); }); /** @@ -98,7 +143,9 @@ const getMockedMoveDamage = (defender: Pokemon, attacker: Pokemon, move: Move) = const side = defender.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; if (globalScene.arena.getTagOnSide(ArenaTagType.REFLECT, side)) { - globalScene.arena.applyTagsForSide(ArenaTagType.REFLECT, side, false, attacker, move.category, multiplierHolder); + if (move.getAttrs(CritOnlyAttr).length === 0) { + globalScene.arena.applyTagsForSide(ArenaTagType.REFLECT, side, false, attacker, move.category, multiplierHolder); + } } return move.power * multiplierHolder.value; diff --git a/src/test/moves/reflect_type.test.ts b/test/moves/reflect_type.test.ts similarity index 64% rename from src/test/moves/reflect_type.test.ts rename to test/moves/reflect_type.test.ts index 50e0fc2fbe6..78371d35475 100644 --- a/src/test/moves/reflect_type.test.ts +++ b/test/moves/reflect_type.test.ts @@ -1,8 +1,8 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { Type } from "#enums/type"; -import GameManager from "#test/utils/gameManager"; +import { PokemonType } from "#enums/pokemon-type"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -22,20 +22,16 @@ describe("Moves - Reflect Type", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override - .ability(Abilities.BALL_FETCH) - .battleType("single") - .disableCrits() - .enemyAbility(Abilities.BALL_FETCH); + game.override.ability(Abilities.BALL_FETCH).battleType("single").disableCrits().enemyAbility(Abilities.BALL_FETCH); }); it("will make the user Normal/Grass if targetting a typeless Pokemon affected by Forest's Curse", async () => { game.override - .moveset([ Moves.FORESTS_CURSE, Moves.REFLECT_TYPE ]) + .moveset([Moves.FORESTS_CURSE, Moves.REFLECT_TYPE]) .startingLevel(60) .enemySpecies(Species.CHARMANDER) - .enemyMoveset([ Moves.BURN_UP, Moves.SPLASH ]); - await game.classicMode.startBattle([ Species.FEEBAS ]); + .enemyMoveset([Moves.BURN_UP, Moves.SPLASH]); + await game.classicMode.startBattle([Species.FEEBAS]); const playerPokemon = game.scene.getPlayerPokemon(); const enemyPokemon = game.scene.getEnemyPokemon(); @@ -47,13 +43,13 @@ describe("Moves - Reflect Type", () => { game.move.select(Moves.FORESTS_CURSE); await game.forceEnemyMove(Moves.SPLASH); await game.toNextTurn(); - expect(enemyPokemon?.getTypes().includes(Type.UNKNOWN)).toBe(true); - expect(enemyPokemon?.getTypes().includes(Type.GRASS)).toBe(true); + expect(enemyPokemon?.getTypes().includes(PokemonType.UNKNOWN)).toBe(true); + expect(enemyPokemon?.getTypes().includes(PokemonType.GRASS)).toBe(true); game.move.select(Moves.REFLECT_TYPE); await game.forceEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); - expect(playerPokemon?.getTypes()[0]).toBe(Type.NORMAL); - expect(playerPokemon?.getTypes().includes(Type.GRASS)).toBe(true); + expect(playerPokemon?.getTypes()[0]).toBe(PokemonType.NORMAL); + expect(playerPokemon?.getTypes().includes(PokemonType.GRASS)).toBe(true); }); }); diff --git a/src/test/moves/relic_song.test.ts b/test/moves/relic_song.test.ts similarity index 78% rename from src/test/moves/relic_song.test.ts rename to test/moves/relic_song.test.ts index c09514850eb..d8f1373b4c0 100644 --- a/src/test/moves/relic_song.test.ts +++ b/test/moves/relic_song.test.ts @@ -1,9 +1,9 @@ -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Challenges } from "#app/enums/challenges"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,7 +23,7 @@ describe("Moves - Relic Song", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.RELIC_SONG, Moves.SPLASH ]) + .moveset([Moves.RELIC_SONG, Moves.SPLASH]) .battleType("single") .enemyAbility(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) @@ -32,7 +32,7 @@ describe("Moves - Relic Song", () => { }); it("swaps Meloetta's form between Aria and Pirouette", async () => { - await game.classicMode.startBattle([ Species.MELOETTA ]); + await game.classicMode.startBattle([Species.MELOETTA]); const meloetta = game.scene.getPlayerPokemon()!; @@ -48,8 +48,8 @@ describe("Moves - Relic Song", () => { }); it("doesn't swap Meloetta's form during a mono-type challenge", async () => { - game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, Type.PSYCHIC + 1, 0); - await game.challengeMode.startBattle([ Species.MELOETTA ]); + game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, PokemonType.PSYCHIC + 1, 0); + await game.challengeMode.startBattle([Species.MELOETTA]); const meloetta = game.scene.getPlayerPokemon()!; @@ -63,10 +63,8 @@ describe("Moves - Relic Song", () => { }); it("doesn't swap Meloetta's form during biome change (arena reset)", async () => { - game.override - .starterForms({ [Species.MELOETTA]: 1 }) - .startingWave(10); - await game.classicMode.startBattle([ Species.MELOETTA ]); + game.override.starterForms({ [Species.MELOETTA]: 1 }).startingWave(10); + await game.classicMode.startBattle([Species.MELOETTA]); const meloetta = game.scene.getPlayerPokemon()!; diff --git a/src/test/moves/retaliate.test.ts b/test/moves/retaliate.test.ts similarity index 80% rename from src/test/moves/retaliate.test.ts rename to test/moves/retaliate.test.ts index e00b9da6010..5cc0b08ccc6 100644 --- a/src/test/moves/retaliate.test.ts +++ b/test/moves/retaliate.test.ts @@ -1,9 +1,9 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { Moves } from "#enums/moves"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; describe("Moves - Retaliate", () => { let phaserGame: Phaser.Game; @@ -26,16 +26,16 @@ describe("Moves - Retaliate", () => { game.override .battleType("single") .enemySpecies(Species.SNORLAX) - .enemyMoveset([ Moves.RETALIATE, Moves.RETALIATE, Moves.RETALIATE, Moves.RETALIATE ]) + .enemyMoveset([Moves.RETALIATE, Moves.RETALIATE, Moves.RETALIATE, Moves.RETALIATE]) .enemyLevel(100) - .moveset([ Moves.RETALIATE, Moves.SPLASH ]) + .moveset([Moves.RETALIATE, Moves.SPLASH]) .startingLevel(80) .disableCrits(); }); it("increases power if ally died previous turn", async () => { vi.spyOn(retaliate, "calculateBattlePower"); - await game.startBattle([ Species.ABRA, Species.COBALION ]); + await game.startBattle([Species.ABRA, Species.COBALION]); game.move.select(Moves.RETALIATE); await game.phaseInterceptor.to("TurnEndPhase"); expect(retaliate.calculateBattlePower).toHaveLastReturnedWith(70); diff --git a/test/moves/revival_blessing.test.ts b/test/moves/revival_blessing.test.ts new file mode 100644 index 00000000000..187b5e62e76 --- /dev/null +++ b/test/moves/revival_blessing.test.ts @@ -0,0 +1,117 @@ +import { BattlerIndex } from "#app/battle"; +import { MoveResult } from "#app/field/pokemon"; +import { toDmgValue } from "#app/utils"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Revival Blessing", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH, Moves.REVIVAL_BLESSING, Moves.MEMENTO]) + .ability(Abilities.BALL_FETCH) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should revive a selected fainted Pokemon when used by the player", async () => { + await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]); + + game.move.select(Moves.MEMENTO); + game.doSelectPartyPokemon(1, "SwitchPhase"); + await game.toNextTurn(); + + const player = game.scene.getPlayerPokemon()!; + + expect(player.species.speciesId).toBe(Species.MAGIKARP); + game.move.select(Moves.REVIVAL_BLESSING); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + game.doSelectPartyPokemon(1, "RevivalBlessingPhase"); + + await game.phaseInterceptor.to("MoveEndPhase", false); + + const revivedPokemon = game.scene.getPlayerParty()[1]; + expect(revivedPokemon.status?.effect).toBeFalsy(); + expect(revivedPokemon.hp).toBe(Math.floor(revivedPokemon.getMaxHp() / 2)); + }); + + it("should revive a random fainted enemy when used by an enemy Trainer", async () => { + game.override.enemyMoveset(Moves.REVIVAL_BLESSING).startingWave(8); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.SPLASH); + await game.doKillOpponents(); + + await game.toNextTurn(); + game.move.select(Moves.SPLASH); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + + await game.phaseInterceptor.to("MoveEndPhase", false); + + const revivedPokemon = game.scene.getEnemyParty()[1]; + expect(revivedPokemon.status?.effect).toBeFalsy(); + expect(revivedPokemon.hp).toBe(Math.floor(revivedPokemon.getMaxHp() / 2)); + }); + + it("should fail when there are no fainted Pokemon to target", async () => { + await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]); + + game.move.select(Moves.REVIVAL_BLESSING); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEndPhase", false); + + const player = game.scene.getPlayerPokemon()!; + expect(player.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + }); + + it("should revive a player pokemon and immediately send it back out if used in the same turn it fainted in doubles", async () => { + game.override + .battleType("double") + .enemyMoveset([Moves.SPLASH, Moves.FISSURE]) + .enemyAbility(Abilities.NO_GUARD) + .enemyLevel(100); + await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC, Species.GYARADOS]); + + const feebas = game.scene.getPlayerField()[0]; + + game.move.select(Moves.SPLASH); + game.move.select(Moves.REVIVAL_BLESSING, 1); + await game.forceEnemyMove(Moves.FISSURE, BattlerIndex.PLAYER); + await game.forceEnemyMove(Moves.SPLASH); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2]); + + await game.phaseInterceptor.to("MoveEndPhase"); + await game.phaseInterceptor.to("MoveEndPhase"); + + expect(feebas.isFainted()).toBe(true); + + game.doSelectPartyPokemon(0, "RevivalBlessingPhase"); + await game.toNextTurn(); + + expect(feebas.isFainted()).toBe(false); + expect(feebas.hp).toBe(toDmgValue(0.5 * feebas.getMaxHp())); + expect(game.scene.getPlayerField()[0]).toBe(feebas); + }); +}); diff --git a/test/moves/role_play.test.ts b/test/moves/role_play.test.ts new file mode 100644 index 00000000000..2a899b6e987 --- /dev/null +++ b/test/moves/role_play.test.ts @@ -0,0 +1,53 @@ +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Role Play", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH, Moves.ROLE_PLAY]) + .ability(Abilities.ADAPTABILITY) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should set the user's ability to the target's ability", async () => { + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.ROLE_PLAY); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH); + }); + + it("should activate post-summon abilities", async () => { + game.override.enemyAbility(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.ROLE_PLAY); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1); + }); +}); diff --git a/src/test/moves/rollout.test.ts b/test/moves/rollout.test.ts similarity index 84% rename from src/test/moves/rollout.test.ts rename to test/moves/rollout.test.ts index 199f4e1dcf2..89270c2dfc7 100644 --- a/src/test/moves/rollout.test.ts +++ b/test/moves/rollout.test.ts @@ -1,9 +1,9 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -35,7 +35,7 @@ describe("Moves - Rollout", () => { }); it("should double it's dmg on sequential uses but reset after 5", async () => { - game.override.moveset([ Moves.ROLLOUT ]); + game.override.moveset([Moves.ROLLOUT]); vi.spyOn(allMoves[Moves.ROLLOUT], "accuracy", "get").mockReturnValue(100); //always hit const variance = 5; @@ -45,10 +45,10 @@ describe("Moves - Rollout", () => { await game.startBattle(); const playerPkm = game.scene.getPlayerParty()[0]; - vi.spyOn(playerPkm, "stats", "get").mockReturnValue([ 500000, 1, 1, 1, 1, 1 ]); // HP, ATK, DEF, SPATK, SPDEF, SPD + vi.spyOn(playerPkm, "stats", "get").mockReturnValue([500000, 1, 1, 1, 1, 1]); // HP, ATK, DEF, SPATK, SPDEF, SPD const enemyPkm = game.scene.getEnemyParty()[0]; - vi.spyOn(enemyPkm, "stats", "get").mockReturnValue([ 500000, 1, 1, 1, 1, 1 ]); // HP, ATK, DEF, SPATK, SPDEF, SPD + vi.spyOn(enemyPkm, "stats", "get").mockReturnValue([500000, 1, 1, 1, 1, 1]); // HP, ATK, DEF, SPATK, SPDEF, SPD vi.spyOn(enemyPkm, "getHeldItems").mockReturnValue([]); //no berries enemyPkm.hp = enemyPkm.getMaxHp(); @@ -62,7 +62,7 @@ describe("Moves - Rollout", () => { previousHp = enemyPkm.hp; } - const [ turn1Dmg, turn2Dmg, turn3Dmg, turn4Dmg, turn5Dmg, turn6Dmg ] = dmgHistory; + const [turn1Dmg, turn2Dmg, turn3Dmg, turn4Dmg, turn5Dmg, turn6Dmg] = dmgHistory; expect(turn2Dmg).toBeGreaterThanOrEqual(turn1Dmg * 2 - variance); expect(turn2Dmg).toBeLessThanOrEqual(turn1Dmg * 2 + variance); diff --git a/test/moves/roost.test.ts b/test/moves/roost.test.ts new file mode 100644 index 00000000000..a52b81085c8 --- /dev/null +++ b/test/moves/roost.test.ts @@ -0,0 +1,244 @@ +import { BattlerIndex } from "#app/battle"; +import { PokemonType } from "#enums/pokemon-type"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Moves - Roost", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + game.override.enemySpecies(Species.RELICANTH); + game.override.startingLevel(100); + game.override.enemyLevel(100); + game.override.enemyMoveset(Moves.EARTHQUAKE); + game.override.moveset([Moves.ROOST, Moves.BURN_UP, Moves.DOUBLE_SHOCK]); + }); + + /** + * Roost's behavior should be defined as: + * The pokemon loses its flying type for a turn. If the pokemon was ungroundd solely due to being a flying type, it will be grounded until end of turn. + * 1. Pure Flying type pokemon -> become normal type until end of turn + * 2. Dual Flying/X type pokemon -> become type X until end of turn + * 3. Pokemon that use burn up into roost (ex. Moltres) -> become flying due to burn up, then typeless until end of turn after using roost + * 4. If a pokemon is afflicted with Forest's Curse or Trick or treat, dual type pokemon will become 3 type pokemon after the flying type is regained + * Pure flying types become (Grass or Ghost) and then back to flying/ (Grass or Ghost), + * and pokemon post Burn up become () + * 5. If a pokemon is also ungrounded due to other reasons (such as levitate), it will stay ungrounded post roost, despite not being flying type. + * 6. Non flying types using roost (such as dunsparce) are already grounded, so this move will only heal and have no other effects. + */ + + test("Non flying type uses roost -> no type change, took damage", async () => { + await game.classicMode.startBattle([Species.DUNSPARCE]); + const playerPokemon = game.scene.getPlayerPokemon()!; + const playerPokemonStartingHP = playerPokemon.hp; + game.move.select(Moves.ROOST); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + // Should only be normal type, and NOT flying type + let playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemonTypes[0] === PokemonType.NORMAL).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeTruthy(); + + await game.phaseInterceptor.to(TurnEndPhase); + + // Lose HP, still normal type + playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP); + expect(playerPokemonTypes[0] === PokemonType.NORMAL).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeTruthy(); + }); + + test("Pure flying type -> becomes normal after roost and takes damage from ground moves -> regains flying", async () => { + await game.classicMode.startBattle([Species.TORNADUS]); + const playerPokemon = game.scene.getPlayerPokemon()!; + const playerPokemonStartingHP = playerPokemon.hp; + game.move.select(Moves.ROOST); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + // Should only be normal type, and NOT flying type + let playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemonTypes[0] === PokemonType.NORMAL).toBeTruthy(); + expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeFalsy(); + expect(playerPokemon.isGrounded()).toBeTruthy(); + + await game.phaseInterceptor.to(TurnEndPhase); + + // Should have lost HP and is now back to being pure flying + playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP); + expect(playerPokemonTypes[0] === PokemonType.NORMAL).toBeFalsy(); + expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeFalsy(); + }); + + test("Dual X/flying type -> becomes type X after roost and takes damage from ground moves -> regains flying", async () => { + await game.classicMode.startBattle([Species.HAWLUCHA]); + const playerPokemon = game.scene.getPlayerPokemon()!; + const playerPokemonStartingHP = playerPokemon.hp; + game.move.select(Moves.ROOST); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + // Should only be pure fighting type and grounded + let playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemonTypes[0] === PokemonType.FIGHTING).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeTruthy(); + + await game.phaseInterceptor.to(TurnEndPhase); + + // Should have lost HP and is now back to being fighting/flying + playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP); + expect(playerPokemonTypes[0] === PokemonType.FIGHTING).toBeTruthy(); + expect(playerPokemonTypes[1] === PokemonType.FLYING).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeFalsy(); + }); + + test("Pokemon with levitate after using roost should lose flying type but still be unaffected by ground moves", async () => { + game.override.starterForms({ [Species.ROTOM]: 4 }); + await game.classicMode.startBattle([Species.ROTOM]); + const playerPokemon = game.scene.getPlayerPokemon()!; + const playerPokemonStartingHP = playerPokemon.hp; + game.move.select(Moves.ROOST); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + // Should only be pure eletric type and grounded + let playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemonTypes[0] === PokemonType.ELECTRIC).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeFalsy(); + + await game.phaseInterceptor.to(TurnEndPhase); + + // Should have lost HP and is now back to being electric/flying + playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemon.hp).toBe(playerPokemonStartingHP); + expect(playerPokemonTypes[0] === PokemonType.ELECTRIC).toBeTruthy(); + expect(playerPokemonTypes[1] === PokemonType.FLYING).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeFalsy(); + }); + + test("A fire/flying type that uses burn up, then roost should be typeless until end of turn", async () => { + await game.classicMode.startBattle([Species.MOLTRES]); + const playerPokemon = game.scene.getPlayerPokemon()!; + const playerPokemonStartingHP = playerPokemon.hp; + game.move.select(Moves.BURN_UP); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + // Should only be pure flying type after burn up + let playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + + await game.phaseInterceptor.to(TurnEndPhase); + game.move.select(Moves.ROOST); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + // Should only be typeless type after roost and is grounded + playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemon.getTag(BattlerTagType.ROOSTED)).toBeDefined(); + expect(playerPokemonTypes[0] === PokemonType.UNKNOWN).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeTruthy(); + + await game.phaseInterceptor.to(TurnEndPhase); + + // Should go back to being pure flying and have taken damage from earthquake, and is ungrounded again + playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP); + expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeFalsy(); + }); + + test("An electric/flying type that uses double shock, then roost should be typeless until end of turn", async () => { + game.override.enemySpecies(Species.ZEKROM); + await game.classicMode.startBattle([Species.ZAPDOS]); + const playerPokemon = game.scene.getPlayerPokemon()!; + const playerPokemonStartingHP = playerPokemon.hp; + game.move.select(Moves.DOUBLE_SHOCK); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + // Should only be pure flying type after burn up + let playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + + await game.phaseInterceptor.to(TurnEndPhase); + game.move.select(Moves.ROOST); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to(MoveEffectPhase); + + // Should only be typeless type after roost and is grounded + playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemon.getTag(BattlerTagType.ROOSTED)).toBeDefined(); + expect(playerPokemonTypes[0] === PokemonType.UNKNOWN).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeTruthy(); + + await game.phaseInterceptor.to(TurnEndPhase); + + // Should go back to being pure flying and have taken damage from earthquake, and is ungrounded again + playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP); + expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeFalsy(); + }); + + test("Dual Type Pokemon afflicted with Forests Curse/Trick or Treat and post roost will become dual type and then become 3 type at end of turn", async () => { + game.override.enemyMoveset([ + Moves.TRICK_OR_TREAT, + Moves.TRICK_OR_TREAT, + Moves.TRICK_OR_TREAT, + Moves.TRICK_OR_TREAT, + ]); + await game.classicMode.startBattle([Species.MOLTRES]); + const playerPokemon = game.scene.getPlayerPokemon()!; + game.move.select(Moves.ROOST); + await game.phaseInterceptor.to(MoveEffectPhase); + + let playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemonTypes[0] === PokemonType.FIRE).toBeTruthy(); + expect(playerPokemonTypes.length === 1).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeTruthy(); + + await game.phaseInterceptor.to(TurnEndPhase); + + // Should be fire/flying/ghost + playerPokemonTypes = playerPokemon.getTypes(); + expect(playerPokemonTypes.filter(type => type === PokemonType.FLYING)).toHaveLength(1); + expect(playerPokemonTypes.filter(type => type === PokemonType.FIRE)).toHaveLength(1); + expect(playerPokemonTypes.filter(type => type === PokemonType.GHOST)).toHaveLength(1); + expect(playerPokemonTypes.length === 3).toBeTruthy(); + expect(playerPokemon.isGrounded()).toBeFalsy(); + }); +}); diff --git a/src/test/moves/round.test.ts b/test/moves/round.test.ts similarity index 74% rename from src/test/moves/round.test.ts rename to test/moves/round.test.ts index 1d7c91bcbd4..82f080a25ea 100644 --- a/src/test/moves/round.test.ts +++ b/test/moves/round.test.ts @@ -1,10 +1,10 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import type { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -25,19 +25,19 @@ describe("Moves - Round", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH, Moves.ROUND ]) + .moveset([Moves.SPLASH, Moves.ROUND]) .ability(Abilities.BALL_FETCH) .battleType("double") .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.SPLASH, Moves.ROUND ]) + .enemyMoveset([Moves.SPLASH, Moves.ROUND]) .startingLevel(100) .enemyLevel(100); }); it("should cue other instances of Round together in Speed order", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const round = allMoves[Moves.ROUND]; const spy = vi.spyOn(round, "calculateBattlePower"); @@ -48,7 +48,7 @@ describe("Moves - Round", () => { await game.forceEnemyMove(Moves.ROUND, BattlerIndex.PLAYER); await game.forceEnemyMove(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]); const actualTurnOrder: BattlerIndex[] = []; @@ -58,8 +58,13 @@ describe("Moves - Round", () => { await game.phaseInterceptor.to("MoveEndPhase"); } - expect(actualTurnOrder).toEqual([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + expect(actualTurnOrder).toEqual([ + BattlerIndex.PLAYER, + BattlerIndex.PLAYER_2, + BattlerIndex.ENEMY, + BattlerIndex.ENEMY_2, + ]); const powerResults = spy.mock.results.map(result => result.value); - expect(powerResults).toEqual( [ 60, 120, 120 ]); + expect(powerResults).toEqual([60, 120, 120]); }); }); diff --git a/src/test/moves/safeguard.test.ts b/test/moves/safeguard.test.ts similarity index 78% rename from src/test/moves/safeguard.test.ts rename to test/moves/safeguard.test.ts index 6505162fd04..2235b59e1af 100644 --- a/src/test/moves/safeguard.test.ts +++ b/test/moves/safeguard.test.ts @@ -2,13 +2,12 @@ import { BattlerIndex } from "#app/battle"; import { allAbilities, PostDefendContactApplyStatusEffectAbAttr } from "#app/data/ability"; import { Abilities } from "#app/enums/abilities"; import { StatusEffect } from "#app/enums/status-effect"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; - describe("Moves - Safeguard", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -28,11 +27,11 @@ describe("Moves - Safeguard", () => { game.override .battleType("single") .enemySpecies(Species.DRATINI) - .enemyMoveset([ Moves.SAFEGUARD ]) + .enemyMoveset([Moves.SAFEGUARD]) .enemyAbility(Abilities.BALL_FETCH) .enemyLevel(5) .starterSpecies(Species.DRATINI) - .moveset([ Moves.NUZZLE, Moves.SPORE, Moves.YAWN, Moves.SPLASH ]) + .moveset([Moves.NUZZLE, Moves.SPORE, Moves.YAWN, Moves.SPLASH]) .ability(Abilities.UNNERVE); // Stop wild Pokemon from potentially eating Lum Berry }); @@ -41,7 +40,7 @@ describe("Moves - Safeguard", () => { const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.NUZZLE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(enemy.status).toBeUndefined(); @@ -52,19 +51,19 @@ describe("Moves - Safeguard", () => { const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.SPORE); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(enemyPokemon.status).toBeUndefined(); }); it("protects from confusion", async () => { - game.override.moveset([ Moves.CONFUSE_RAY ]); + game.override.moveset([Moves.CONFUSE_RAY]); await game.classicMode.startBattle(); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.CONFUSE_RAY); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(enemyPokemon.summonData.tags).toEqual([]); @@ -78,7 +77,7 @@ describe("Moves - Safeguard", () => { game.move.select(Moves.SPORE, 0, BattlerIndex.ENEMY_2); game.move.select(Moves.NUZZLE, 1, BattlerIndex.ENEMY_2); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); @@ -93,7 +92,7 @@ describe("Moves - Safeguard", () => { const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.YAWN); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(enemyPokemon.summonData.tags).toEqual([]); @@ -104,7 +103,7 @@ describe("Moves - Safeguard", () => { const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.YAWN); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); game.move.select(Moves.SPLASH); @@ -119,13 +118,13 @@ describe("Moves - Safeguard", () => { const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); enemyPokemon.damageAndUpdate(1); expect(enemyPokemon.status?.effect).toEqual(StatusEffect.BURN); - game.override.enemyMoveset([ Moves.REST ]); + game.override.enemyMoveset([Moves.REST]); // Force the moveset to update mid-battle // TODO: Remove after enemy AI rework is in enemyPokemon.getMoveset(); @@ -138,14 +137,18 @@ describe("Moves - Safeguard", () => { it("protects from ability-inflicted status", async () => { game.override.ability(Abilities.STATIC); - vi.spyOn(allAbilities[Abilities.STATIC].getAttrs(PostDefendContactApplyStatusEffectAbAttr)[0], "chance", "get").mockReturnValue(100); + vi.spyOn( + allAbilities[Abilities.STATIC].getAttrs(PostDefendContactApplyStatusEffectAbAttr)[0], + "chance", + "get", + ).mockReturnValue(100); await game.classicMode.startBattle(); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); - game.override.enemyMoveset([ Moves.TACKLE ]); + game.override.enemyMoveset([Moves.TACKLE]); game.move.select(Moves.SPLASH); await game.toNextTurn(); diff --git a/src/test/moves/scale_shot.test.ts b/test/moves/scale_shot.test.ts similarity index 88% rename from src/test/moves/scale_shot.test.ts rename to test/moves/scale_shot.test.ts index cbaa6611f3e..2be632adb54 100644 --- a/src/test/moves/scale_shot.test.ts +++ b/test/moves/scale_shot.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; @@ -8,7 +8,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; @@ -29,7 +29,7 @@ describe("Moves - Scale Shot", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SCALE_SHOT ]) + .moveset([Moves.SCALE_SHOT]) .battleType("single") .disableCrits() .ability(Abilities.NO_GUARD) @@ -41,11 +41,11 @@ describe("Moves - Scale Shot", () => { it("applies stat changes after last hit", async () => { game.override.enemySpecies(Species.FORRETRESS); - await game.classicMode.startBattle([ Species.MINCCINO ]); + await game.classicMode.startBattle([Species.MINCCINO]); const minccino = game.scene.getPlayerPokemon()!; game.move.select(Moves.SCALE_SHOT); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(MoveEffectPhase); await game.phaseInterceptor.to(DamageAnimPhase); @@ -69,7 +69,7 @@ describe("Moves - Scale Shot", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.classicMode.startBattle([ Species.MINCCINO ]); + await game.classicMode.startBattle([Species.MINCCINO]); const minccino = game.scene.getPlayerPokemon()!; game.move.select(Moves.SCALE_SHOT); diff --git a/src/test/moves/secret_power.test.ts b/test/moves/secret_power.test.ts similarity index 53% rename from src/test/moves/secret_power.test.ts rename to test/moves/secret_power.test.ts index 09fe5faa50b..37f1664251b 100644 --- a/src/test/moves/secret_power.test.ts +++ b/test/moves/secret_power.test.ts @@ -2,9 +2,9 @@ import { Abilities } from "#enums/abilities"; import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { StatusEffect } from "#enums/status-effect"; @@ -30,7 +30,7 @@ describe("Moves - Secret Power", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SECRET_POWER ]) + .moveset([Moves.SECRET_POWER]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -40,13 +40,11 @@ describe("Moves - Secret Power", () => { }); it("Secret Power checks for an active terrain first then looks at the biome for its secondary effect", async () => { - game.override - .startingBiome(Biome.VOLCANO) - .enemyMoveset([ Moves.SPLASH, Moves.MISTY_TERRAIN ]); + game.override.startingBiome(Biome.VOLCANO).enemyMoveset([Moves.SPLASH, Moves.MISTY_TERRAIN]); vi.spyOn(allMoves[Moves.SECRET_POWER], "chance", "get").mockReturnValue(100); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); - const enemyPokemon = game.scene.getEnemyPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; // No Terrain + Biome.VOLCANO --> Burn game.move.select(Moves.SECRET_POWER); @@ -61,38 +59,36 @@ describe("Moves - Secret Power", () => { expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(-1); }); - it("Secret Power's effect chance is doubled by Serene Grace, but not by the 'rainbow' effect from Fire/Water Pledge", - async () => { - game.override - .moveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.SECRET_POWER, Moves.SPLASH ]) - .ability(Abilities.SERENE_GRACE) - .enemyMoveset([ Moves.SPLASH ]) - .battleType("double"); - await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); + it("Secret Power's effect chance is doubled by Serene Grace, but not by the 'rainbow' effect from Fire/Water Pledge", async () => { + game.override + .moveset([Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.SECRET_POWER, Moves.SPLASH]) + .ability(Abilities.SERENE_GRACE) + .enemyMoveset([Moves.SPLASH]) + .battleType("double"); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); - const sereneGraceAttr = allAbilities[Abilities.SERENE_GRACE].getAttrs(MoveEffectChanceMultiplierAbAttr)[0]; - vi.spyOn(sereneGraceAttr, "apply"); + const sereneGraceAttr = allAbilities[Abilities.SERENE_GRACE].getAttrs(MoveEffectChanceMultiplierAbAttr)[0]; + vi.spyOn(sereneGraceAttr, "canApply"); - game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); - game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2); + game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); + game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2); - await game.phaseInterceptor.to("TurnEndPhase"); + await game.phaseInterceptor.to("TurnEndPhase"); - let rainbowEffect = game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER); - expect(rainbowEffect).toBeDefined(); + let rainbowEffect = game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER); + expect(rainbowEffect).toBeDefined(); - rainbowEffect = rainbowEffect!; - vi.spyOn(rainbowEffect, "apply"); + rainbowEffect = rainbowEffect!; + vi.spyOn(rainbowEffect, "apply"); - game.move.select(Moves.SECRET_POWER, 0, BattlerIndex.ENEMY); - game.move.select(Moves.SPLASH, 1); + game.move.select(Moves.SECRET_POWER, 0, BattlerIndex.ENEMY); + game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to("BerryPhase", false); + await game.phaseInterceptor.to("BerryPhase", false); - expect(sereneGraceAttr.apply).toHaveBeenCalledOnce(); - expect(sereneGraceAttr.apply).toHaveLastReturnedWith(true); + expect(sereneGraceAttr.canApply).toHaveBeenCalledOnce(); + expect(sereneGraceAttr.canApply).toHaveLastReturnedWith(true); - expect(rainbowEffect.apply).toHaveBeenCalledTimes(0); - } - ); + expect(rainbowEffect.apply).toHaveBeenCalledTimes(0); + }); }); diff --git a/src/test/moves/shed_tail.test.ts b/test/moves/shed_tail.test.ts similarity index 75% rename from src/test/moves/shed_tail.test.ts rename to test/moves/shed_tail.test.ts index 33a7d81e460..6744c4e9ed8 100644 --- a/src/test/moves/shed_tail.test.ts +++ b/test/moves/shed_tail.test.ts @@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; @@ -24,7 +24,7 @@ describe("Moves - Shed Tail", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SHED_TAIL ]) + .moveset([Moves.SHED_TAIL]) .battleType("single") .enemySpecies(Species.SNORLAX) .enemyAbility(Abilities.BALL_FETCH) @@ -32,7 +32,7 @@ describe("Moves - Shed Tail", () => { }); it("transfers a Substitute doll to the switched in Pokemon", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const magikarp = game.scene.getPlayerPokemon()!; @@ -46,17 +46,14 @@ describe("Moves - Shed Tail", () => { expect(feebas).not.toBe(magikarp); expect(feebas.hp).toBe(feebas.getMaxHp()); - // Note: Shed Tail's HP cost is currently not accurate to mainline, as it - // should cost ceil(maxHP / 2) instead of max(floor(maxHp / 2), 1). The current - // implementation is consistent with Substitute's HP cost logic, but that's not - // the case in mainline for some reason :regiDespair:. - expect(magikarp.hp).toBe(Math.ceil(magikarp.getMaxHp() / 2)); + // Note: Altered the test to be consistent with the correct HP cost :yipeevee_static: + expect(magikarp.hp).toBe(Math.floor(magikarp.getMaxHp() / 2)); expect(substituteTag).toBeDefined(); expect(substituteTag?.hp).toBe(Math.floor(magikarp.getMaxHp() / 4)); }); it("should fail if no ally is available to switch in", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const magikarp = game.scene.getPlayerPokemon()!; expect(game.scene.getPlayerParty().length).toBe(1); diff --git a/src/test/moves/shell_side_arm.test.ts b/test/moves/shell_side_arm.test.ts similarity index 81% rename from src/test/moves/shell_side_arm.test.ts rename to test/moves/shell_side_arm.test.ts index 41cbefb186b..47da5e1c2f7 100644 --- a/src/test/moves/shell_side_arm.test.ts +++ b/test/moves/shell_side_arm.test.ts @@ -1,9 +1,9 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves, ShellSideArmCategoryAttr } from "#app/data/move"; +import { allMoves, ShellSideArmCategoryAttr } from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -26,7 +26,7 @@ describe("Moves - Shell Side Arm", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SHELL_SIDE_ARM, Moves.SPLASH ]) + .moveset([Moves.SHELL_SIDE_ARM, Moves.SPLASH]) .battleType("single") .startingLevel(100) .enemyLevel(100) @@ -37,7 +37,7 @@ describe("Moves - Shell Side Arm", () => { it("becomes a physical attack if forecasted to deal more damage as physical", async () => { game.override.enemySpecies(Species.SNORLAX); - await game.classicMode.startBattle([ Species.RAMPARDOS ]); + await game.classicMode.startBattle([Species.RAMPARDOS]); vi.spyOn(shellSideArmAttr, "apply"); @@ -50,7 +50,7 @@ describe("Moves - Shell Side Arm", () => { it("remains a special attack if forecasted to deal more damage as special", async () => { game.override.enemySpecies(Species.SLOWBRO); - await game.classicMode.startBattle([ Species.XURKITREE ]); + await game.classicMode.startBattle([Species.XURKITREE]); vi.spyOn(shellSideArmAttr, "apply"); @@ -61,11 +61,9 @@ describe("Moves - Shell Side Arm", () => { }); it("respects stat stage changes when forecasting base damage", async () => { - game.override - .enemySpecies(Species.SNORLAX) - .enemyMoveset(Moves.COTTON_GUARD); + game.override.enemySpecies(Species.SNORLAX).enemyMoveset(Moves.COTTON_GUARD); - await game.classicMode.startBattle([ Species.MANAPHY ]); + await game.classicMode.startBattle([Species.MANAPHY]); vi.spyOn(shellSideArmAttr, "apply"); @@ -73,7 +71,7 @@ describe("Moves - Shell Side Arm", () => { await game.toNextTurn(); game.move.select(Moves.SHELL_SIDE_ARM); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase", false); expect(shellSideArmAttr.apply).toHaveLastReturnedWith(false); diff --git a/test/moves/shell_trap.test.ts b/test/moves/shell_trap.test.ts new file mode 100644 index 00000000000..2df94cdb828 --- /dev/null +++ b/test/moves/shell_trap.test.ts @@ -0,0 +1,146 @@ +import { BattlerIndex } from "#app/battle"; +import { allMoves } from "#app/data/moves/move"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { MoveResult } from "#app/field/pokemon"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { MoveEndPhase } from "#app/phases/move-end-phase"; +import { MovePhase } from "#app/phases/move-phase"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Moves - Shell Trap", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("double") + .moveset([Moves.SHELL_TRAP, Moves.SPLASH, Moves.BULLDOZE]) + .enemySpecies(Species.SNORLAX) + .enemyMoveset([Moves.RAZOR_LEAF]) + .startingLevel(100) + .enemyLevel(100); + + vi.spyOn(allMoves[Moves.RAZOR_LEAF], "accuracy", "get").mockReturnValue(100); + }); + + it("should activate after the user is hit by a physical attack", async () => { + await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]); + + const playerPokemon = game.scene.getPlayerField(); + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.SPLASH); + game.move.select(Moves.SHELL_TRAP, 1); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]); + + await game.phaseInterceptor.to(MoveEndPhase); + + const movePhase = game.scene.getCurrentPhase(); + expect(movePhase instanceof MovePhase).toBeTruthy(); + expect((movePhase as MovePhase).pokemon).toBe(playerPokemon[1]); + + await game.phaseInterceptor.to(MoveEndPhase); + enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp())); + }); + + it("should fail if the user is only hit by special attacks", async () => { + game.override.enemyMoveset([Moves.SWIFT]); + + await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]); + + const playerPokemon = game.scene.getPlayerField(); + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.SPLASH); + game.move.select(Moves.SHELL_TRAP, 1); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]); + + await game.phaseInterceptor.to(MoveEndPhase); + + const movePhase = game.scene.getCurrentPhase(); + expect(movePhase instanceof MovePhase).toBeTruthy(); + expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]); + + await game.phaseInterceptor.to(BerryPhase, false); + enemyPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); + }); + + it("should fail if the user isn't hit with any attack", async () => { + game.override.enemyMoveset(Moves.SPLASH); + + await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]); + + const playerPokemon = game.scene.getPlayerField(); + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.SPLASH); + game.move.select(Moves.SHELL_TRAP, 1); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]); + + await game.phaseInterceptor.to(MoveEndPhase); + + const movePhase = game.scene.getCurrentPhase(); + expect(movePhase instanceof MovePhase).toBeTruthy(); + expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]); + + await game.phaseInterceptor.to(BerryPhase, false); + enemyPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); + }); + + it("should not activate from an ally's attack", async () => { + game.override.enemyMoveset(Moves.SPLASH); + + await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerField(); + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.SHELL_TRAP); + game.move.select(Moves.BULLDOZE, 1); + + await game.phaseInterceptor.to(MoveEndPhase); + + const movePhase = game.scene.getCurrentPhase(); + expect(movePhase instanceof MovePhase).toBeTruthy(); + expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]); + + const enemyStartingHp = enemyPokemon.map(p => p.hp); + + await game.phaseInterceptor.to(BerryPhase, false); + enemyPokemon.forEach((p, i) => expect(p.hp).toBe(enemyStartingHp[i])); + }); + + it("should not activate from a subsequent physical attack", async () => { + game.override.battleType("single"); + vi.spyOn(allMoves[Moves.RAZOR_LEAF], "priority", "get").mockReturnValue(-4); + + await game.startBattle([Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.SHELL_TRAP); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); +}); diff --git a/test/moves/simple_beam.test.ts b/test/moves/simple_beam.test.ts new file mode 100644 index 00000000000..ce86f42671e --- /dev/null +++ b/test/moves/simple_beam.test.ts @@ -0,0 +1,42 @@ +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Simple Beam", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH, Moves.SIMPLE_BEAM]) + .ability(Abilities.BALL_FETCH) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("sets the target's ability to simple", async () => { + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SIMPLE_BEAM); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.SIMPLE); + }); +}); diff --git a/src/test/moves/sketch.test.ts b/test/moves/sketch.test.ts similarity index 80% rename from src/test/moves/sketch.test.ts rename to test/moves/sketch.test.ts index f531f44ef0c..dfbf2eca713 100644 --- a/src/test/moves/sketch.test.ts +++ b/test/moves/sketch.test.ts @@ -2,12 +2,12 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { MoveResult, PokemonMove } from "#app/field/pokemon"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { StatusEffect } from "#app/enums/status-effect"; import { BattlerIndex } from "#app/battle"; -import { allMoves, RandomMoveAttr } from "#app/data/move"; +import { allMoves, RandomMoveAttr } from "#app/data/moves/move"; describe("Moves - Sketch", () => { let phaserGame: Phaser.Game; @@ -35,10 +35,10 @@ describe("Moves - Sketch", () => { }); it("Sketch should not fail even if a previous Sketch failed to retrieve a valid move and ran out of PP", async () => { - await game.classicMode.startBattle([ Species.REGIELEKI ]); + await game.classicMode.startBattle([Species.REGIELEKI]); const playerPokemon = game.scene.getPlayerPokemon()!; // can't use normal moveset override because we need to check moveset changes - playerPokemon.moveset = [ new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.SKETCH) ]; + playerPokemon.moveset = [new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.SKETCH)]; game.move.select(Moves.SKETCH); await game.phaseInterceptor.to("TurnEndPhase"); @@ -57,20 +57,20 @@ describe("Moves - Sketch", () => { it("Sketch should retrieve the most recent valid move from its target history", async () => { game.override.enemyStatusEffect(StatusEffect.PARALYSIS); - await game.classicMode.startBattle([ Species.REGIELEKI ]); + await game.classicMode.startBattle([Species.REGIELEKI]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; - playerPokemon.moveset = [ new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.GROWL) ]; + playerPokemon.moveset = [new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.GROWL)]; game.move.select(Moves.GROWL); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.move.forceStatusActivation(false); await game.phaseInterceptor.to("TurnEndPhase"); expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); await game.toNextTurn(); game.move.select(Moves.SKETCH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.move.forceStatusActivation(true); await game.phaseInterceptor.to("TurnEndPhase"); expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); @@ -82,14 +82,14 @@ describe("Moves - Sketch", () => { const randomMoveAttr = allMoves[Moves.METRONOME].findAttr(attr => attr instanceof RandomMoveAttr) as RandomMoveAttr; vi.spyOn(randomMoveAttr, "getMoveOverride").mockReturnValue(Moves.FALSE_SWIPE); - game.override.enemyMoveset([ Moves.METRONOME ]); - await game.classicMode.startBattle([ Species.REGIELEKI ]); + game.override.enemyMoveset([Moves.METRONOME]); + await game.classicMode.startBattle([Species.REGIELEKI]); const playerPokemon = game.scene.getPlayerPokemon()!; - playerPokemon.moveset = [ new PokemonMove(Moves.SKETCH) ]; + playerPokemon.moveset = [new PokemonMove(Moves.SKETCH)]; // Opponent uses Metronome -> False Swipe, then player uses Sketch, which should sketch Metronome game.move.select(Moves.SKETCH); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); expect(playerPokemon.moveset[0]?.moveId).toBe(Moves.METRONOME); diff --git a/test/moves/skill_swap.test.ts b/test/moves/skill_swap.test.ts new file mode 100644 index 00000000000..f807a85eaf6 --- /dev/null +++ b/test/moves/skill_swap.test.ts @@ -0,0 +1,56 @@ +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Skill Swap", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SPLASH, Moves.SKILL_SWAP]) + .ability(Abilities.BALL_FETCH) + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should swap the two abilities", async () => { + game.override.ability(Abilities.ADAPTABILITY); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SKILL_SWAP); + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH); + expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.ADAPTABILITY); + }); + + it("should activate post-summon abilities", async () => { + game.override.ability(Abilities.INTIMIDATE); + await game.classicMode.startBattle([Species.FEEBAS]); + + game.move.select(Moves.SKILL_SWAP); + await game.phaseInterceptor.to("BerryPhase"); + + // player atk should be -1 after opponent gains intimidate and it activates + expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(-1); + }); +}); diff --git a/src/test/moves/sleep_talk.test.ts b/test/moves/sleep_talk.test.ts similarity index 74% rename from src/test/moves/sleep_talk.test.ts rename to test/moves/sleep_talk.test.ts index 9ad2d23f903..d31eff34a7a 100644 --- a/src/test/moves/sleep_talk.test.ts +++ b/test/moves/sleep_talk.test.ts @@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -25,7 +25,7 @@ describe("Moves - Sleep Talk", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH, Moves.SLEEP_TALK ]) + .moveset([Moves.SPLASH, Moves.SLEEP_TALK]) .statusEffect(StatusEffect.SLEEP) .ability(Abilities.BALL_FETCH) .battleType("single") @@ -38,7 +38,7 @@ describe("Moves - Sleep Talk", () => { it("should fail when the user is not asleep", async () => { game.override.statusEffect(StatusEffect.NONE); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.SLEEP_TALK); await game.toNextTurn(); @@ -46,8 +46,8 @@ describe("Moves - Sleep Talk", () => { }); it("should fail if the user has no valid moves", async () => { - game.override.moveset([ Moves.SLEEP_TALK, Moves.DIG, Moves.METRONOME, Moves.SOLAR_BEAM ]); - await game.classicMode.startBattle([ Species.FEEBAS ]); + game.override.moveset([Moves.SLEEP_TALK, Moves.DIG, Moves.METRONOME, Moves.SOLAR_BEAM]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.SLEEP_TALK); await game.toNextTurn(); @@ -55,8 +55,8 @@ describe("Moves - Sleep Talk", () => { }); it("should call a random valid move if the user is asleep", async () => { - game.override.moveset([ Moves.SLEEP_TALK, Moves.DIG, Moves.FLY, Moves.SWORDS_DANCE ]); // Dig and Fly are invalid moves, Swords Dance should always be called - await game.classicMode.startBattle([ Species.FEEBAS ]); + game.override.moveset([Moves.SLEEP_TALK, Moves.DIG, Moves.FLY, Moves.SWORDS_DANCE]); // Dig and Fly are invalid moves, Swords Dance should always be called + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.SLEEP_TALK); await game.toNextTurn(); @@ -64,7 +64,7 @@ describe("Moves - Sleep Talk", () => { }); it("should apply secondary effects of a move", async () => { - game.override.moveset([ Moves.SLEEP_TALK, Moves.DIG, Moves.FLY, Moves.WOOD_HAMMER ]); // Dig and Fly are invalid moves, Wood Hammer should always be called + game.override.moveset([Moves.SLEEP_TALK, Moves.DIG, Moves.FLY, Moves.WOOD_HAMMER]); // Dig and Fly are invalid moves, Wood Hammer should always be called await game.classicMode.startBattle(); game.move.select(Moves.SLEEP_TALK); diff --git a/src/test/moves/solar_beam.test.ts b/test/moves/solar_beam.test.ts similarity index 88% rename from src/test/moves/solar_beam.test.ts rename to test/moves/solar_beam.test.ts index ebec338932a..dffd4f210e5 100644 --- a/src/test/moves/solar_beam.test.ts +++ b/test/moves/solar_beam.test.ts @@ -1,11 +1,11 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { BattlerTagType } from "#enums/battler-tag-type"; import { WeatherType } from "#enums/weather-type"; import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; @@ -36,7 +36,7 @@ describe("Moves - Solar Beam", () => { }); it("should deal damage in two turns if no weather is active", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -60,11 +60,11 @@ describe("Moves - Solar Beam", () => { it.each([ { weatherType: WeatherType.SUNNY, name: "Sun" }, - { weatherType: WeatherType.HARSH_SUN, name: "Harsh Sun" } + { weatherType: WeatherType.HARSH_SUN, name: "Harsh Sun" }, ])("should deal damage in one turn if $name is active", async ({ weatherType }) => { game.override.weather(weatherType); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -83,11 +83,11 @@ describe("Moves - Solar Beam", () => { it.each([ { weatherType: WeatherType.RAIN, name: "Rain" }, - { weatherType: WeatherType.HEAVY_RAIN, name: "Heavy Rain" } + { weatherType: WeatherType.HEAVY_RAIN, name: "Heavy Rain" }, ])("should have its power halved in $name", async ({ weatherType }) => { game.override.weather(weatherType); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const solarBeam = allMoves[Moves.SOLAR_BEAM]; diff --git a/src/test/moves/sparkly_swirl.test.ts b/test/moves/sparkly_swirl.test.ts similarity index 79% rename from src/test/moves/sparkly_swirl.test.ts rename to test/moves/sparkly_swirl.test.ts index a83f1c3a437..6cd357c7e0e 100644 --- a/src/test/moves/sparkly_swirl.test.ts +++ b/test/moves/sparkly_swirl.test.ts @@ -1,10 +1,10 @@ -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -27,18 +27,16 @@ describe("Moves - Sparkly Swirl", () => { .enemyLevel(100) .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) - .moveset([ Moves.SPARKLY_SWIRL, Moves.SPLASH ]) + .moveset([Moves.SPARKLY_SWIRL, Moves.SPLASH]) .ability(Abilities.BALL_FETCH); vi.spyOn(allMoves[Moves.SPARKLY_SWIRL], "accuracy", "get").mockReturnValue(100); }); it("should cure status effect of the user, its ally, and all party pokemon", async () => { - game.override - .battleType("double") - .statusEffect(StatusEffect.BURN); - await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty(); + game.override.battleType("double").statusEffect(StatusEffect.BURN); + await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA, Species.RATTATA]); + const [leftPlayer, rightPlayer, partyPokemon] = game.scene.getPlayerParty(); const leftOpp = game.scene.getEnemyPokemon()!; vi.spyOn(leftPlayer, "resetStatus"); @@ -60,11 +58,9 @@ describe("Moves - Sparkly Swirl", () => { }); it("should not cure status effect of the target/target's allies", async () => { - game.override - .battleType("double") - .enemyStatusEffect(StatusEffect.BURN); - await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA ]); - const [ leftOpp, rightOpp ] = game.scene.getEnemyField(); + game.override.battleType("double").enemyStatusEffect(StatusEffect.BURN); + await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA]); + const [leftOpp, rightOpp] = game.scene.getEnemyField(); vi.spyOn(leftOpp, "resetStatus"); vi.spyOn(rightOpp, "resetStatus"); diff --git a/test/moves/spectral_thief.test.ts b/test/moves/spectral_thief.test.ts new file mode 100644 index 00000000000..2e52b118a74 --- /dev/null +++ b/test/moves/spectral_thief.test.ts @@ -0,0 +1,214 @@ +import { Abilities } from "#enums/abilities"; +import { BattlerIndex } from "#app/battle"; +import { Stat } from "#enums/stat"; +import { allMoves } from "#app/data/moves/move"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Spectral Thief", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .enemySpecies(Species.SHUCKLE) + .enemyLevel(100) + .enemyMoveset(Moves.SPLASH) + .enemyAbility(Abilities.BALL_FETCH) + .moveset([Moves.SPECTRAL_THIEF, Moves.SPLASH]) + .ability(Abilities.BALL_FETCH).disableCrits; + }); + + it("should steal max possible positive stat changes and ignore negative ones.", async () => { + await game.classicMode.startBattle(); + + const player = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + + enemy.setStatStage(Stat.ATK, 6); + enemy.setStatStage(Stat.DEF, -6); + enemy.setStatStage(Stat.SPATK, 6); + enemy.setStatStage(Stat.SPDEF, -6); + enemy.setStatStage(Stat.SPD, 3); + + player.setStatStage(Stat.ATK, 4); + player.setStatStage(Stat.DEF, 1); + player.setStatStage(Stat.SPATK, 0); + player.setStatStage(Stat.SPDEF, 0); + player.setStatStage(Stat.SPD, -2); + + game.move.select(Moves.SPECTRAL_THIEF); + await game.phaseInterceptor.to(TurnEndPhase); + + /** + * enemy has +6 ATK and player +4 => player only steals +2 + * enemy has -6 DEF and player 1 => player should not steal + * enemy has +6 SPATK and player 0 => player only steals +6 + * enemy has -6 SPDEF and player 0 => player should not steal + * enemy has +3 SPD and player -2 => player only steals +3 + */ + expect(player.getStatStages()).toEqual([6, 1, 6, 0, 1, 0, 0]); + expect(enemy.getStatStages()).toEqual([4, -6, 0, -6, 0, 0, 0]); + }); + + it("should steal stat stages before dmg calculation", async () => { + game.override.enemySpecies(Species.MAGIKARP).enemyLevel(50); + await game.classicMode.startBattle(); + + const player = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + const moveToCheck = allMoves[Moves.SPECTRAL_THIEF]; + const dmgBefore = enemy.getAttackDamage(player, moveToCheck, false, false, false, false).damage; + + enemy.setStatStage(Stat.ATK, 6); + + player.setStatStage(Stat.ATK, 0); + + game.move.select(Moves.SPECTRAL_THIEF); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(dmgBefore).toBeLessThan(enemy.getAttackDamage(player, moveToCheck, false, false, false, false).damage); + }); + + it("should steal stat stages as a negative value with Contrary.", async () => { + game.override.ability(Abilities.CONTRARY); + await game.classicMode.startBattle(); + + const player = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + + enemy.setStatStage(Stat.ATK, 6); + + player.setStatStage(Stat.ATK, 0); + + game.move.select(Moves.SPECTRAL_THIEF); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(player.getStatStage(Stat.ATK)).toEqual(-6); + expect(enemy.getStatStage(Stat.ATK)).toEqual(0); + }); + + it("should steal double the stat stages with Simple.", async () => { + game.override.ability(Abilities.SIMPLE); + await game.classicMode.startBattle(); + + const player = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + + enemy.setStatStage(Stat.ATK, 3); + + player.setStatStage(Stat.ATK, 0); + + game.move.select(Moves.SPECTRAL_THIEF); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(player.getStatStage(Stat.ATK)).toEqual(6); + expect(enemy.getStatStage(Stat.ATK)).toEqual(0); + }); + + it("should steal the stat stages through Clear Body.", async () => { + game.override.enemyAbility(Abilities.CLEAR_BODY); + await game.classicMode.startBattle(); + + const player = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + + enemy.setStatStage(Stat.ATK, 3); + + player.setStatStage(Stat.ATK, 0); + + game.move.select(Moves.SPECTRAL_THIEF); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(player.getStatStage(Stat.ATK)).toEqual(3); + expect(enemy.getStatStage(Stat.ATK)).toEqual(0); + }); + + it("should steal the stat stages through White Smoke.", async () => { + game.override.enemyAbility(Abilities.WHITE_SMOKE); + await game.classicMode.startBattle(); + + const player = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + + enemy.setStatStage(Stat.ATK, 3); + + player.setStatStage(Stat.ATK, 0); + + game.move.select(Moves.SPECTRAL_THIEF); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(player.getStatStage(Stat.ATK)).toEqual(3); + expect(enemy.getStatStage(Stat.ATK)).toEqual(0); + }); + + it("should steal the stat stages through Hyper Cutter.", async () => { + game.override.enemyAbility(Abilities.HYPER_CUTTER); + await game.classicMode.startBattle(); + + const player = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + + enemy.setStatStage(Stat.ATK, 3); + + player.setStatStage(Stat.ATK, 0); + + game.move.select(Moves.SPECTRAL_THIEF); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(player.getStatStage(Stat.ATK)).toEqual(3); + expect(enemy.getStatStage(Stat.ATK)).toEqual(0); + }); + + it("should bypass Substitute.", async () => { + game.override.enemyMoveset(Moves.SUBSTITUTE); + await game.classicMode.startBattle(); + + const player = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + + enemy.setStatStage(Stat.ATK, 3); + + player.setStatStage(Stat.ATK, 0); + + game.move.select(Moves.SPECTRAL_THIEF); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(player.getStatStage(Stat.ATK)).toEqual(3); + expect(enemy.getStatStage(Stat.ATK)).toEqual(0); + expect(enemy.hp).toBeLessThan(enemy.getMaxHp() - 1); + }); + + it("should get blocked by protect.", async () => { + game.override.enemyMoveset(Moves.PROTECT); + await game.classicMode.startBattle(); + + const player = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + + enemy.setStatStage(Stat.ATK, 3); + + player.setStatStage(Stat.ATK, 0); + + game.move.select(Moves.SPECTRAL_THIEF); + await game.phaseInterceptor.to(TurnEndPhase); + + expect(player.getStatStage(Stat.ATK)).toEqual(0); + expect(enemy.getStatStage(Stat.ATK)).toEqual(3); + expect(enemy.hp).toBe(enemy.getMaxHp()); + }); +}); diff --git a/src/test/moves/speed_swap.test.ts b/test/moves/speed_swap.test.ts similarity index 90% rename from src/test/moves/speed_swap.test.ts rename to test/moves/speed_swap.test.ts index 179f1212394..a1385ce5386 100644 --- a/src/test/moves/speed_swap.test.ts +++ b/test/moves/speed_swap.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; @@ -29,14 +29,12 @@ describe("Moves - Speed Swap", () => { .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.MEW) .enemyLevel(200) - .moveset([ Moves.SPEED_SWAP ]) + .moveset([Moves.SPEED_SWAP]) .ability(Abilities.NONE); }); it("should swap the user's SPD and the target's SPD stats", async () => { - await game.startBattle([ - Species.INDEEDEE - ]); + await game.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/spikes.test.ts b/test/moves/spikes.test.ts similarity index 85% rename from src/test/moves/spikes.test.ts rename to test/moves/spikes.test.ts index 35e89c8caf7..9bf0e5e1437 100644 --- a/src/test/moves/spikes.test.ts +++ b/test/moves/spikes.test.ts @@ -1,11 +1,10 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Moves - Spikes", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -28,11 +27,11 @@ describe("Moves - Spikes", () => { .enemyAbility(Abilities.BALL_FETCH) .ability(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) - .moveset([ Moves.SPIKES, Moves.SPLASH, Moves.ROAR ]); + .moveset([Moves.SPIKES, Moves.SPLASH, Moves.ROAR]); }); it("should not damage the team that set them", async () => { - await game.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]); + await game.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); game.move.select(Moves.SPIKES); await game.toNextTurn(); @@ -52,7 +51,7 @@ describe("Moves - Spikes", () => { it("should damage opposing pokemon that are forced to switch in", async () => { game.override.startingWave(5); - await game.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]); + await game.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); game.move.select(Moves.SPIKES); await game.toNextTurn(); @@ -66,7 +65,7 @@ describe("Moves - Spikes", () => { it("should damage opposing pokemon that choose to switch in", async () => { game.override.startingWave(5); - await game.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]); + await game.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); game.move.select(Moves.SPIKES); await game.toNextTurn(); @@ -78,5 +77,4 @@ describe("Moves - Spikes", () => { const enemy = game.scene.getEnemyParty()[0]; expect(enemy.hp).toBeLessThan(enemy.getMaxHp()); }, 20000); - }); diff --git a/src/test/moves/spit_up.test.ts b/test/moves/spit_up.test.ts similarity index 87% rename from src/test/moves/spit_up.test.ts rename to test/moves/spit_up.test.ts index 7f9dfaad38b..d986ae4d141 100644 --- a/src/test/moves/spit_up.test.ts +++ b/test/moves/spit_up.test.ts @@ -1,10 +1,10 @@ import { Stat } from "#enums/stat"; import { StockpilingTag } from "#app/data/battler-tags"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import type { TurnMove } from "#app/field/pokemon"; import { MoveResult } from "#app/field/pokemon"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -48,7 +48,7 @@ describe("Moves - Spit Up", () => { const stacksToSetup = 1; const expectedPower = 100; - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -70,7 +70,7 @@ describe("Moves - Spit Up", () => { const stacksToSetup = 2; const expectedPower = 200; - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -93,7 +93,7 @@ describe("Moves - Spit Up", () => { const stacksToSetup = 3; const expectedPower = 300; - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -115,7 +115,7 @@ describe("Moves - Spit Up", () => { }); it("fails without stacks", async () => { - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; @@ -125,14 +125,18 @@ describe("Moves - Spit Up", () => { game.move.select(Moves.SPIT_UP); await game.phaseInterceptor.to(TurnInitPhase); - expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ move: Moves.SPIT_UP, result: MoveResult.FAIL, targets: [ game.scene.getEnemyPokemon()!.getBattlerIndex() ]}); + expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ + move: Moves.SPIT_UP, + result: MoveResult.FAIL, + targets: [game.scene.getEnemyPokemon()!.getBattlerIndex()], + }); expect(spitUp.calculateBattlePower).not.toHaveBeenCalled(); }); describe("restores stat boosts granted by stacks", () => { it("decreases stats based on stored values (both boosts equal)", async () => { - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -148,7 +152,11 @@ describe("Moves - Spit Up", () => { await game.phaseInterceptor.to(TurnInitPhase); - expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ move: Moves.SPIT_UP, result: MoveResult.SUCCESS, targets: [ game.scene.getEnemyPokemon()!.getBattlerIndex() ]}); + expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ + move: Moves.SPIT_UP, + result: MoveResult.SUCCESS, + targets: [game.scene.getEnemyPokemon()!.getBattlerIndex()], + }); expect(spitUp.calculateBattlePower).toHaveBeenCalledOnce(); @@ -159,7 +167,7 @@ describe("Moves - Spit Up", () => { }); it("decreases stats based on stored values (different boosts)", async () => { - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -176,7 +184,11 @@ describe("Moves - Spit Up", () => { game.move.select(Moves.SPIT_UP); await game.phaseInterceptor.to(TurnInitPhase); - expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ move: Moves.SPIT_UP, result: MoveResult.SUCCESS, targets: [ game.scene.getEnemyPokemon()!.getBattlerIndex() ]}); + expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ + move: Moves.SPIT_UP, + result: MoveResult.SUCCESS, + targets: [game.scene.getEnemyPokemon()!.getBattlerIndex()], + }); expect(spitUp.calculateBattlePower).toHaveBeenCalledOnce(); diff --git a/test/moves/spotlight.test.ts b/test/moves/spotlight.test.ts new file mode 100644 index 00000000000..91705dbb2fa --- /dev/null +++ b/test/moves/spotlight.test.ts @@ -0,0 +1,67 @@ +import { BattlerIndex } from "#app/battle"; +import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; + +describe("Moves - Spotlight", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("double"); + game.override.starterSpecies(Species.AMOONGUSS); + game.override.enemySpecies(Species.SNORLAX); + game.override.startingLevel(100); + game.override.enemyLevel(100); + game.override.moveset([Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK]); + game.override.enemyMoveset([Moves.FOLLOW_ME, Moves.SPLASH]); + }); + + test("move should redirect attacks to the target", async () => { + await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.SPOTLIGHT, 0, BattlerIndex.ENEMY); + game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); + + await game.forceEnemyMove(Moves.SPLASH); + await game.forceEnemyMove(Moves.SPLASH); + + await game.phaseInterceptor.to(TurnEndPhase, false); + + expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); + expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); + }); + + test("move should cause other redirection moves to fail", async () => { + await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]); + + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.SPOTLIGHT, 0, BattlerIndex.ENEMY); + game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); + + await game.forceEnemyMove(Moves.SPLASH); + await game.forceEnemyMove(Moves.FOLLOW_ME); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp()); + expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); + }); +}); diff --git a/src/test/moves/steamroller.test.ts b/test/moves/steamroller.test.ts similarity index 78% rename from src/test/moves/steamroller.test.ts rename to test/moves/steamroller.test.ts index f641c58c2d1..ba96928e01d 100644 --- a/src/test/moves/steamroller.test.ts +++ b/test/moves/steamroller.test.ts @@ -1,11 +1,11 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import type { DamageCalculationResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -25,12 +25,12 @@ describe("Moves - Steamroller", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.moveset([ Moves.STEAMROLLER ]).battleType("single").enemyAbility(Abilities.BALL_FETCH); + game.override.moveset([Moves.STEAMROLLER]).battleType("single").enemyAbility(Abilities.BALL_FETCH); }); it("should always hit a minimzed target with double damage", async () => { game.override.enemySpecies(Species.DITTO).enemyMoveset(Moves.MINIMIZE); - await game.classicMode.startBattle([ Species.IRON_BOULDER ]); + await game.classicMode.startBattle([Species.IRON_BOULDER]); const ditto = game.scene.getEnemyPokemon()!; vi.spyOn(ditto, "getAttackDamage"); @@ -41,15 +41,15 @@ describe("Moves - Steamroller", () => { vi.spyOn(ironBoulder, "getAccuracyMultiplier"); // Turn 1 game.move.select(Moves.STEAMROLLER); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); // Turn 2 game.move.select(Moves.STEAMROLLER); await game.toNextTurn(); - const [ dmgCalcTurn1, dmgCalcTurn2 ]: DamageCalculationResult[] = vi + const [dmgCalcTurn1, dmgCalcTurn2]: DamageCalculationResult[] = vi .mocked(ditto.getAttackDamage) - .mock.results.map((r) => r.value); + .mock.results.map(r => r.value); expect(dmgCalcTurn2.damage).toBeGreaterThanOrEqual(dmgCalcTurn1.damage * 2); expect(ditto.getTag(BattlerTagType.MINIMIZED)).toBeDefined(); diff --git a/src/test/moves/stockpile.test.ts b/test/moves/stockpile.test.ts similarity index 88% rename from src/test/moves/stockpile.test.ts rename to test/moves/stockpile.test.ts index f83459cd09d..033f24d5229 100644 --- a/src/test/moves/stockpile.test.ts +++ b/test/moves/stockpile.test.ts @@ -7,7 +7,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -34,12 +34,12 @@ describe("Moves - Stockpile", () => { game.override.enemyAbility(Abilities.NONE); game.override.startingLevel(2000); - game.override.moveset([ Moves.STOCKPILE, Moves.SPLASH ]); + game.override.moveset([Moves.STOCKPILE, Moves.SPLASH]); game.override.ability(Abilities.NONE); }); it("gains a stockpile stack and raises user's DEF and SPDEF stat stages by 1 on each use, fails at max stacks (3)", async () => { - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const user = game.scene.getPlayerPokemon()!; @@ -61,24 +61,29 @@ describe("Moves - Stockpile", () => { const stockpilingTag = user.getTag(StockpilingTag)!; - if (i < 3) { // first three uses should behave normally + if (i < 3) { + // first three uses should behave normally expect(user.getStatStage(Stat.DEF)).toBe(i + 1); expect(user.getStatStage(Stat.SPDEF)).toBe(i + 1); expect(stockpilingTag).toBeDefined(); expect(stockpilingTag.stockpiledCount).toBe(i + 1); - - } else { // fourth should have failed + } else { + // fourth should have failed expect(user.getStatStage(Stat.DEF)).toBe(3); expect(user.getStatStage(Stat.SPDEF)).toBe(3); expect(stockpilingTag).toBeDefined(); expect(stockpilingTag.stockpiledCount).toBe(3); - expect(user.getMoveHistory().at(-1)).toMatchObject({ result: MoveResult.FAIL, move: Moves.STOCKPILE, targets: [ user.getBattlerIndex() ]}); + expect(user.getMoveHistory().at(-1)).toMatchObject({ + result: MoveResult.FAIL, + move: Moves.STOCKPILE, + targets: [user.getBattlerIndex()], + }); } } }); it("gains a stockpile stack even if user's DEF and SPDEF stat stages are at +6", async () => { - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const user = game.scene.getPlayerPokemon()!; diff --git a/test/moves/substitute.test.ts b/test/moves/substitute.test.ts new file mode 100644 index 00000000000..23f7f4af4b9 --- /dev/null +++ b/test/moves/substitute.test.ts @@ -0,0 +1,521 @@ +import { BattlerIndex } from "#app/battle"; +import { ArenaTagSide } from "#app/data/arena-tag"; +import { SubstituteTag, TrappedTag } from "#app/data/battler-tags"; +import { allMoves, StealHeldItemChanceAttr } from "#app/data/moves/move"; +import { MoveResult } from "#app/field/pokemon"; +import type { CommandPhase } from "#app/phases/command-phase"; +import GameManager from "#test/testUtils/gameManager"; +import { Command } from "#app/ui/command-ui-handler"; +import { Mode } from "#app/ui/ui"; +import { Abilities } from "#enums/abilities"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BerryType } from "#enums/berry-type"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Moves - Substitute", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override + .battleType("single") + .moveset([Moves.SUBSTITUTE, Moves.SWORDS_DANCE, Moves.TACKLE, Moves.SPLASH]) + .enemySpecies(Species.SNORLAX) + .enemyAbility(Abilities.INSOMNIA) + .enemyMoveset(Moves.SPLASH) + .startingLevel(100) + .enemyLevel(100); + }); + + it("should cause the user to take damage", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SUBSTITUTE); + + await game.phaseInterceptor.to("MoveEndPhase", false); + + expect(leadPokemon.hp).toBe(Math.ceil((leadPokemon.getMaxHp() * 3) / 4)); + }); + + it("should redirect enemy attack damage to the Substitute doll", async () => { + game.override.enemyMoveset(Moves.TACKLE); + + await game.classicMode.startBattle([Species.SKARMORY]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SUBSTITUTE); + + await game.phaseInterceptor.to("MoveEndPhase", false); + + expect(leadPokemon.hp).toBe(Math.ceil((leadPokemon.getMaxHp() * 3) / 4)); + expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); + const postSubHp = leadPokemon.hp; + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.hp).toBe(postSubHp); + expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); + }); + + it("should fade after redirecting more damage than its remaining HP", async () => { + // Giga Impact OHKOs Magikarp if substitute isn't up + game.override.enemyMoveset(Moves.GIGA_IMPACT); + vi.spyOn(allMoves[Moves.GIGA_IMPACT], "accuracy", "get").mockReturnValue(100); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SUBSTITUTE); + + await game.phaseInterceptor.to("MoveEndPhase", false); + + expect(leadPokemon.hp).toBe(Math.ceil((leadPokemon.getMaxHp() * 3) / 4)); + expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); + const postSubHp = leadPokemon.hp; + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.hp).toBe(postSubHp); + expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeUndefined(); + }); + + it("should block stat changes from status moves", async () => { + game.override.enemyMoveset(Moves.CHARM); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SUBSTITUTE); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); + expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); + }); + + it("should be bypassed by sound-based moves", async () => { + game.override.enemyMoveset(Moves.ECHOED_VOICE); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SUBSTITUTE); + + await game.phaseInterceptor.to("MoveEndPhase"); + + expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); + const postSubHp = leadPokemon.hp; + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); + expect(leadPokemon.hp).toBeLessThan(postSubHp); + }); + + it("should be bypassed by attackers with Infiltrator", async () => { + game.override.enemyMoveset(Moves.TACKLE); + game.override.enemyAbility(Abilities.INFILTRATOR); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SUBSTITUTE); + + await game.phaseInterceptor.to("MoveEndPhase"); + + expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); + const postSubHp = leadPokemon.hp; + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined(); + expect(leadPokemon.hp).toBeLessThan(postSubHp); + }); + + it("shouldn't block the user's own status moves", async () => { + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + game.move.select(Moves.SUBSTITUTE); + + await game.phaseInterceptor.to("MoveEndPhase"); + await game.toNextTurn(); + + game.move.select(Moves.SWORDS_DANCE); + + await game.phaseInterceptor.to("MoveEndPhase", false); + + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); + }); + + it("shouldn't block moves that target the user's side of the field", async () => { + game.override.moveset(Moves.LIGHT_SCREEN); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + vi.spyOn(leadPokemon, "getMoveEffectiveness"); + + leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); + + game.move.select(Moves.LIGHT_SCREEN); + + await game.toNextTurn(); + + expect(leadPokemon.getMoveEffectiveness).not.toHaveReturnedWith(0); + expect(game.scene.arena.getTagOnSide(ArenaTagType.LIGHT_SCREEN, ArenaTagSide.PLAYER)).toBeDefined(); + }); + + it("shouldn't block the opponent from setting hazards", async () => { + game.override.enemyMoveset(Moves.STEALTH_ROCK); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + vi.spyOn(leadPokemon, "getMoveEffectiveness"); + + game.move.select(Moves.SUBSTITUTE); + + await game.toNextTurn(); + + expect(leadPokemon.getMoveEffectiveness).not.toHaveReturnedWith(0); + expect(game.scene.arena.getTagOnSide(ArenaTagType.STEALTH_ROCK, ArenaTagSide.PLAYER)).toBeDefined(); + }); + + it("shouldn't block moves that target both sides of the field", async () => { + game.override.moveset(Moves.TRICK_ROOM).enemyMoveset(Moves.GRAVITY); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const pokemon = game.scene.getField(true); + pokemon.forEach(p => { + vi.spyOn(p, "getMoveEffectiveness"); + p.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, p.id); + }); + + game.move.select(Moves.TRICK_ROOM); + + await game.toNextTurn(); + + pokemon.forEach(p => expect(p.getMoveEffectiveness).not.toHaveReturnedWith(0)); + expect(game.scene.arena.getTag(ArenaTagType.TRICK_ROOM)).toBeDefined(); + expect(game.scene.arena.getTag(ArenaTagType.GRAVITY)).toBeDefined(); + }); + + it("should protect the user from flinching", async () => { + game.override.enemyMoveset(Moves.FAKE_OUT); + game.override.startingLevel(1); // Ensures the Substitute will break + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); + + game.move.select(Moves.TACKLE); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + }); + + it("should protect the user from being trapped", async () => { + vi.spyOn(allMoves[Moves.SAND_TOMB], "accuracy", "get").mockReturnValue(100); + game.override.enemyMoveset(Moves.SAND_TOMB); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getTag(TrappedTag)).toBeUndefined(); + }); + + it("should prevent the user's stats from being lowered", async () => { + vi.spyOn(allMoves[Moves.LIQUIDATION], "chance", "get").mockReturnValue(100); + game.override.enemyMoveset(Moves.LIQUIDATION); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getStatStage(Stat.DEF)).toBe(0); + }); + + it("should protect the user from being afflicted with status effects", async () => { + game.override.enemyMoveset(Moves.NUZZLE); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.status?.effect).not.toBe(StatusEffect.PARALYSIS); + }); + + it("should prevent the user's items from being stolen", async () => { + game.override.enemyMoveset(Moves.THIEF); + vi.spyOn(allMoves[Moves.THIEF], "attrs", "get").mockReturnValue([new StealHeldItemChanceAttr(1.0)]); // give Thief 100% steal rate + game.override.startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getHeldItems().length).toBe(1); + }); + + it("should prevent the user's items from being removed", async () => { + game.override.moveset([Moves.KNOCK_OFF]); + game.override.enemyHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + enemyPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, enemyPokemon.id); + const enemyNumItems = enemyPokemon.getHeldItems().length; + + game.move.select(Moves.KNOCK_OFF); + + await game.phaseInterceptor.to("MoveEndPhase", false); + + expect(enemyPokemon.getHeldItems().length).toBe(enemyNumItems); + }); + + it("move effect should prevent the user's berries from being stolen and eaten", async () => { + game.override.enemyMoveset(Moves.BUG_BITE); + game.override.startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); + + game.move.select(Moves.TACKLE); + + await game.phaseInterceptor.to("MoveEndPhase", false); + const enemyPostAttackHp = enemyPokemon.hp; + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getHeldItems().length).toBe(1); + expect(enemyPokemon.hp).toBe(enemyPostAttackHp); + }); + + it("should prevent the user's stats from being reset by Clear Smog", async () => { + game.override.enemyMoveset(Moves.CLEAR_SMOG); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); + + game.move.select(Moves.SWORDS_DANCE); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); + }); + + it("should prevent the user from becoming confused", async () => { + game.override.enemyMoveset(Moves.MAGICAL_TORQUE); + vi.spyOn(allMoves[Moves.MAGICAL_TORQUE], "chance", "get").mockReturnValue(100); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); + + game.move.select(Moves.SWORDS_DANCE); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(leadPokemon.getTag(BattlerTagType.CONFUSED)).toBeUndefined(); + expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); + }); + + it("should transfer to the switched in Pokemon when the source uses Baton Pass", async () => { + game.override.moveset([Moves.SUBSTITUTE, Moves.BATON_PASS]); + + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + + leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id); + + // Simulate a Baton switch for the player this turn + game.onNextPrompt("CommandPhase", Mode.COMMAND, () => { + (game.scene.getCurrentPhase() as CommandPhase).handleCommand(Command.POKEMON, 1, true); + }); + + await game.phaseInterceptor.to("MovePhase", false); + + const switchedPokemon = game.scene.getPlayerPokemon()!; + const subTag = switchedPokemon.getTag(SubstituteTag)!; + expect(subTag).toBeDefined(); + expect(subTag.hp).toBe(Math.floor((leadPokemon.getMaxHp() * 1) / 4)); + }); + + it("should prevent the source's Rough Skin from activating when hit", async () => { + game.override.enemyMoveset(Moves.TACKLE); + game.override.ability(Abilities.ROUGH_SKIN); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.SUBSTITUTE); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); + + it("should prevent the source's Focus Punch from failing when hit", async () => { + game.override.enemyMoveset(Moves.TACKLE); + game.override.moveset([Moves.FOCUS_PUNCH]); + + // Make Focus Punch 40 power to avoid a KO + vi.spyOn(allMoves[Moves.FOCUS_PUNCH], "calculateBattlePower").mockReturnValue(40); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id); + + game.move.select(Moves.FOCUS_PUNCH); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + }); + + it("should not allow Shell Trap to activate when attacked", async () => { + game.override.enemyMoveset(Moves.TACKLE); + game.override.moveset([Moves.SHELL_TRAP]); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + + playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id); + + game.move.select(Moves.SHELL_TRAP); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + }); + + it("should not allow Beak Blast to burn opponents when hit", async () => { + game.override.enemyMoveset(Moves.TACKLE); + game.override.moveset([Moves.BEAK_BLAST]); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id); + + game.move.select(Moves.BEAK_BLAST); + + await game.phaseInterceptor.to("MoveEndPhase"); + + expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.BURN); + }); + + it("should cause incoming attacks to not activate Counter", async () => { + game.override.enemyMoveset(Moves.TACKLE); + game.override.moveset([Moves.COUNTER]); + + await game.classicMode.startBattle([Species.BLASTOISE]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id); + + game.move.select(Moves.COUNTER); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp()); + }); + + it("should prevent Sappy Seed from applying its Leech Seed effect to the user", async () => { + game.override.enemyMoveset(Moves.SAPPY_SEED); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + + playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id); + + game.move.select(Moves.SPLASH); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); // enemy uses Sappy Seed first + await game.move.forceHit(); // forces Sappy Seed to hit + await game.phaseInterceptor.to("MoveEndPhase"); + + expect(playerPokemon.getTag(BattlerTagType.SEEDED)).toBeUndefined(); + }); +}); diff --git a/src/test/moves/swallow.test.ts b/test/moves/swallow.test.ts similarity index 87% rename from src/test/moves/swallow.test.ts rename to test/moves/swallow.test.ts index b2435ba77b3..baa03801079 100644 --- a/src/test/moves/swallow.test.ts +++ b/test/moves/swallow.test.ts @@ -8,7 +8,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -34,7 +34,7 @@ describe("Moves - Swallow", () => { game.override.enemyAbility(Abilities.NONE); game.override.enemyLevel(2000); - game.override.moveset([ Moves.SWALLOW, Moves.SWALLOW, Moves.SWALLOW, Moves.SWALLOW ]); + game.override.moveset([Moves.SWALLOW, Moves.SWALLOW, Moves.SWALLOW, Moves.SWALLOW]); game.override.ability(Abilities.NONE); }); @@ -43,7 +43,7 @@ describe("Moves - Swallow", () => { const stacksToSetup = 1; const expectedHeal = 25; - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; vi.spyOn(pokemon, "getMaxHp").mockReturnValue(100); @@ -70,7 +70,7 @@ describe("Moves - Swallow", () => { const stacksToSetup = 2; const expectedHeal = 50; - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; vi.spyOn(pokemon, "getMaxHp").mockReturnValue(100); @@ -98,7 +98,7 @@ describe("Moves - Swallow", () => { const stacksToSetup = 3; const expectedHeal = 100; - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; vi.spyOn(pokemon, "getMaxHp").mockReturnValue(100); @@ -125,7 +125,7 @@ describe("Moves - Swallow", () => { }); it("fails without stacks", async () => { - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; @@ -135,12 +135,16 @@ describe("Moves - Swallow", () => { game.move.select(Moves.SWALLOW); await game.phaseInterceptor.to(TurnInitPhase); - expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ move: Moves.SWALLOW, result: MoveResult.FAIL, targets: [ pokemon.getBattlerIndex() ]}); + expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ + move: Moves.SWALLOW, + result: MoveResult.FAIL, + targets: [pokemon.getBattlerIndex()], + }); }); describe("restores stat stage boosts granted by stacks", () => { it("decreases stats based on stored values (both boosts equal)", async () => { - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -156,7 +160,11 @@ describe("Moves - Swallow", () => { await game.phaseInterceptor.to(TurnInitPhase); - expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ move: Moves.SWALLOW, result: MoveResult.SUCCESS, targets: [ pokemon.getBattlerIndex() ]}); + expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ + move: Moves.SWALLOW, + result: MoveResult.SUCCESS, + targets: [pokemon.getBattlerIndex()], + }); expect(pokemon.getStatStage(Stat.DEF)).toBe(0); expect(pokemon.getStatStage(Stat.SPDEF)).toBe(0); @@ -165,7 +173,7 @@ describe("Moves - Swallow", () => { }); it("lower stat stages based on stored values (different boosts)", async () => { - await game.startBattle([ Species.ABOMASNOW ]); + await game.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -183,7 +191,11 @@ describe("Moves - Swallow", () => { await game.phaseInterceptor.to(TurnInitPhase); - expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ move: Moves.SWALLOW, result: MoveResult.SUCCESS, targets: [ pokemon.getBattlerIndex() ]}); + expect(pokemon.getMoveHistory().at(-1)).toMatchObject({ + move: Moves.SWALLOW, + result: MoveResult.SUCCESS, + targets: [pokemon.getBattlerIndex()], + }); expect(pokemon.getStatStage(Stat.DEF)).toBe(1); expect(pokemon.getStatStage(Stat.SPDEF)).toBe(-2); diff --git a/test/moves/syrup_bomb.test.ts b/test/moves/syrup_bomb.test.ts new file mode 100644 index 00000000000..1e193793d82 --- /dev/null +++ b/test/moves/syrup_bomb.test.ts @@ -0,0 +1,92 @@ +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Stat } from "#enums/stat"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { BattlerIndex } from "#app/battle"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - SYRUP BOMB", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("single") + .enemySpecies(Species.SNORLAX) + .enemyAbility(Abilities.BALL_FETCH) + .ability(Abilities.BALL_FETCH) + .startingLevel(30) + .enemyLevel(100) + .moveset([Moves.SYRUP_BOMB, Moves.SPLASH]) + .enemyMoveset(Moves.SPLASH); + }); + + //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/syrup_bomb_(move) + + it("decreases the target Pokemon's speed stat once per turn for 3 turns", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + + const targetPokemon = game.scene.getEnemyPokemon()!; + expect(targetPokemon.getStatStage(Stat.SPD)).toBe(0); + + game.move.select(Moves.SYRUP_BOMB); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.move.forceHit(); + await game.toNextTurn(); + expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeDefined(); + expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-1); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeDefined(); + expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-2); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeUndefined(); + expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-3); + }); + + it("does not affect Pokemon with the ability Bulletproof", async () => { + game.override.enemyAbility(Abilities.BULLETPROOF); + await game.classicMode.startBattle([Species.MAGIKARP]); + + const targetPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.SYRUP_BOMB); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.move.forceHit(); + await game.toNextTurn(); + expect(targetPokemon.isFullHp()).toBe(true); + expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeUndefined(); + expect(targetPokemon.getStatStage(Stat.SPD)).toBe(0); + }); + + it("stops lowering the target's speed if the user leaves the field", async () => { + await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]); + + game.move.select(Moves.SYRUP_BOMB); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.move.forceHit(); + await game.toNextTurn(); + + game.doSwitchPokemon(1); + await game.toNextTurn(); + + expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.SPD)).toBe(-1); + }); +}); diff --git a/src/test/moves/tackle.test.ts b/test/moves/tackle.test.ts similarity index 85% rename from src/test/moves/tackle.test.ts rename to test/moves/tackle.test.ts index ff50f027f87..44fc698ec62 100644 --- a/src/test/moves/tackle.test.ts +++ b/test/moves/tackle.test.ts @@ -3,11 +3,10 @@ import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Moves - Tackle", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -29,17 +28,15 @@ describe("Moves - Tackle", () => { game.override.enemySpecies(Species.MAGIKARP); game.override.startingLevel(1); game.override.startingWave(97); - game.override.moveset([ moveToUse ]); - game.override.enemyMoveset([ Moves.GROWTH, Moves.GROWTH, Moves.GROWTH, Moves.GROWTH ]); + game.override.moveset([moveToUse]); + game.override.enemyMoveset([Moves.GROWTH, Moves.GROWTH, Moves.GROWTH, Moves.GROWTH]); game.override.disableCrits(); }); it("TACKLE against ghost", async () => { const moveToUse = Moves.TACKLE; game.override.enemySpecies(Species.GENGAR); - await game.startBattle([ - Species.MIGHTYENA, - ]); + await game.startBattle([Species.MIGHTYENA]); const hpOpponent = game.scene.currentBattle.enemyParty[0].hp; game.move.select(moveToUse); await game.phaseInterceptor.runFrom(EnemyCommandPhase).to(TurnEndPhase); @@ -49,13 +46,10 @@ describe("Moves - Tackle", () => { it("TACKLE against not resistant", async () => { const moveToUse = Moves.TACKLE; - await game.startBattle([ - Species.MIGHTYENA, - ]); + await game.startBattle([Species.MIGHTYENA]); game.scene.currentBattle.enemyParty[0].stats[Stat.DEF] = 50; game.scene.getPlayerParty()[0].stats[Stat.ATK] = 50; - const hpOpponent = game.scene.currentBattle.enemyParty[0].hp; game.move.select(moveToUse); diff --git a/src/test/moves/tail_whip.test.ts b/test/moves/tail_whip.test.ts similarity index 85% rename from src/test/moves/tail_whip.test.ts rename to test/moves/tail_whip.test.ts index 5c83feb8a4e..41c39ab22ca 100644 --- a/src/test/moves/tail_whip.test.ts +++ b/test/moves/tail_whip.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -8,7 +8,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; - describe("Moves - Tail whip", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -31,16 +30,13 @@ describe("Moves - Tail whip", () => { game.override.enemyAbility(Abilities.INSOMNIA); game.override.ability(Abilities.INSOMNIA); game.override.startingLevel(2000); - game.override.moveset([ moveToUse ]); + game.override.moveset([moveToUse]); game.override.enemyMoveset(Moves.SPLASH); }); - it("should lower DEF stat stage by 1", async() => { + it("should lower DEF stat stage by 1", async () => { const moveToUse = Moves.TAIL_WHIP; - await game.startBattle([ - Species.MIGHTYENA, - Species.MIGHTYENA, - ]); + await game.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0); diff --git a/src/test/moves/tailwind.test.ts b/test/moves/tailwind.test.ts similarity index 91% rename from src/test/moves/tailwind.test.ts rename to test/moves/tailwind.test.ts index a26dde82824..24a7fa25061 100644 --- a/src/test/moves/tailwind.test.ts +++ b/test/moves/tailwind.test.ts @@ -4,7 +4,7 @@ import { ArenaTagType } from "#app/enums/arena-tag-type"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -25,12 +25,12 @@ describe("Moves - Tailwind", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("double"); - game.override.moveset([ Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM ]); + game.override.moveset([Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM]); game.override.enemyMoveset(Moves.SPLASH); }); it("doubles the Speed stat of the Pokemons on its side", async () => { - await game.startBattle([ Species.MAGIKARP, Species.MEOWTH ]); + await game.startBattle([Species.MAGIKARP, Species.MEOWTH]); const magikarp = game.scene.getPlayerField()[0]; const meowth = game.scene.getPlayerField()[1]; @@ -53,7 +53,7 @@ describe("Moves - Tailwind", () => { it("lasts for 4 turns", async () => { game.override.battleType("single"); - await game.startBattle([ Species.MAGIKARP ]); + await game.startBattle([Species.MAGIKARP]); game.move.select(Moves.TAILWIND); await game.toNextTurn(); @@ -76,7 +76,7 @@ describe("Moves - Tailwind", () => { it("does not affect the opposing side", async () => { game.override.battleType("single"); - await game.startBattle([ Species.MAGIKARP ]); + await game.startBattle([Species.MAGIKARP]); const ally = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -84,7 +84,6 @@ describe("Moves - Tailwind", () => { const allySpd = ally.getStat(Stat.SPD); const enemySpd = enemy.getStat(Stat.SPD); - expect(ally.getEffectiveStat(Stat.SPD)).equal(allySpd); expect(enemy.getEffectiveStat(Stat.SPD)).equal(enemySpd); expect(game.scene.arena.getTagOnSide(ArenaTagType.TAILWIND, ArenaTagSide.PLAYER)).toBeUndefined(); diff --git a/src/test/moves/tar_shot.test.ts b/test/moves/tar_shot.test.ts similarity index 79% rename from src/test/moves/tar_shot.test.ts rename to test/moves/tar_shot.test.ts index 5fb70abc19c..ac3ba534446 100644 --- a/src/test/moves/tar_shot.test.ts +++ b/test/moves/tar_shot.test.ts @@ -1,10 +1,10 @@ import { BattlerIndex } from "#app/battle"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; import { Abilities } from "#enums/abilities"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -29,12 +29,12 @@ describe("Moves - Tar Shot", () => { .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.TANGELA) .enemyLevel(1000) - .moveset([ Moves.TAR_SHOT, Moves.FIRE_PUNCH ]) + .moveset([Moves.TAR_SHOT, Moves.FIRE_PUNCH]) .disableCrits(); }); it("lowers the target's Speed stat by one stage and doubles the effectiveness of Fire-type moves used on the target", async () => { - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const enemy = game.scene.getEnemyPokemon()!; @@ -48,14 +48,14 @@ describe("Moves - Tar Shot", () => { await game.toNextTurn(); game.move.select(Moves.FIRE_PUNCH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4); }); it("will not double the effectiveness of Fire-type moves used on a target that is already under the effect of Tar Shot (but may still lower its Speed)", async () => { - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const enemy = game.scene.getEnemyPokemon()!; @@ -76,17 +76,19 @@ describe("Moves - Tar Shot", () => { await game.toNextTurn(); game.move.select(Moves.FIRE_PUNCH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4); }); it("does not double the effectiveness of Fire-type moves against a Pokémon that is Terastallized", async () => { - game.override.enemyHeldItems([{ name: "TERA_SHARD", type: Type.GRASS }]).enemySpecies(Species.SPRIGATITO); - await game.classicMode.startBattle([ Species.PIKACHU ]); + game.override.enemySpecies(Species.SPRIGATITO); + await game.classicMode.startBattle([Species.PIKACHU]); const enemy = game.scene.getEnemyPokemon()!; + enemy.teraType = PokemonType.GRASS; + enemy.isTerastallized = true; vi.spyOn(enemy, "getMoveEffectiveness"); @@ -98,7 +100,7 @@ describe("Moves - Tar Shot", () => { await game.toNextTurn(); game.move.select(Moves.FIRE_PUNCH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2); @@ -106,7 +108,7 @@ describe("Moves - Tar Shot", () => { it("doubles the effectiveness of Fire-type moves against a Pokémon that is already under the effects of Tar Shot before it Terastallized", async () => { game.override.enemySpecies(Species.SPRIGATITO); - await game.classicMode.startBattle([ Species.PIKACHU ]); + await game.classicMode.startBattle([Species.PIKACHU]); const enemy = game.scene.getEnemyPokemon()!; @@ -119,10 +121,11 @@ describe("Moves - Tar Shot", () => { await game.toNextTurn(); - game.override.enemyHeldItems([{ name: "TERA_SHARD", type: Type.GRASS }]); + enemy.teraType = PokemonType.GRASS; + enemy.isTerastallized = true; game.move.select(Moves.FIRE_PUNCH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4); diff --git a/src/test/moves/taunt.test.ts b/test/moves/taunt.test.ts similarity index 88% rename from src/test/moves/taunt.test.ts rename to test/moves/taunt.test.ts index a425a048a2c..adc1434c7dd 100644 --- a/src/test/moves/taunt.test.ts +++ b/test/moves/taunt.test.ts @@ -1,7 +1,7 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Abilities } from "#enums/abilities"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { MoveResult } from "#app/field/pokemon"; @@ -25,13 +25,13 @@ describe("Moves - Taunt", () => { game.override .battleType("single") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.TAUNT, Moves.SPLASH ]) + .enemyMoveset([Moves.TAUNT, Moves.SPLASH]) .enemySpecies(Species.SHUCKLE) - .moveset([ Moves.GROWL ]); + .moveset([Moves.GROWL]); }); it("Pokemon should not be able to use Status Moves", async () => { - await game.classicMode.startBattle([ Species.REGIELEKI ]); + await game.classicMode.startBattle([Species.REGIELEKI]); const playerPokemon = game.scene.getPlayerPokemon()!; diff --git a/src/test/moves/telekinesis.test.ts b/test/moves/telekinesis.test.ts similarity index 78% rename from src/test/moves/telekinesis.test.ts rename to test/moves/telekinesis.test.ts index 76c0d001f00..1355cb975f3 100644 --- a/src/test/moves/telekinesis.test.ts +++ b/test/moves/telekinesis.test.ts @@ -1,12 +1,13 @@ import { BattlerTagType } from "#enums/battler-tag-type"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { MoveResult } from "#app/field/pokemon"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { BattlerIndex } from "#app/battle"; describe("Moves - Telekinesis", () => { let phaserGame: Phaser.Game; @@ -25,16 +26,16 @@ describe("Moves - Telekinesis", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.TELEKINESIS, Moves.TACKLE, Moves.MUD_SHOT, Moves.SMACK_DOWN ]) + .moveset([Moves.TELEKINESIS, Moves.TACKLE, Moves.MUD_SHOT, Moves.SMACK_DOWN]) .battleType("single") .enemySpecies(Species.SNORLAX) .enemyLevel(60) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.SPLASH ]); + .enemyMoveset([Moves.SPLASH]); }); it("Telekinesis makes the affected vulnerable to most attacking moves regardless of accuracy", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemyOpponent = game.scene.getEnemyPokemon()!; @@ -51,7 +52,7 @@ describe("Moves - Telekinesis", () => { }); it("Telekinesis makes the affected airborne and immune to most Ground-moves", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemyOpponent = game.scene.getEnemyPokemon()!; @@ -69,7 +70,7 @@ describe("Moves - Telekinesis", () => { it("Telekinesis can still affect Pokemon that have been transformed into invalid Pokemon", async () => { game.override.enemyMoveset(Moves.TRANSFORM); - await game.classicMode.startBattle([ Species.DIGLETT ]); + await game.classicMode.startBattle([Species.DIGLETT]); const enemyOpponent = game.scene.getEnemyPokemon()!; @@ -81,7 +82,7 @@ describe("Moves - Telekinesis", () => { }); it("Moves like Smack Down and 1000 Arrows remove all effects of Telekinesis from the target Pokemon", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemyOpponent = game.scene.getEnemyPokemon()!; @@ -98,8 +99,8 @@ describe("Moves - Telekinesis", () => { }); it("Ingrain will remove the floating effect of Telekinesis, but not the 100% hit", async () => { - game.override.enemyMoveset([ Moves.SPLASH, Moves.INGRAIN ]); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + game.override.enemyMoveset([Moves.SPLASH, Moves.INGRAIN]); + await game.classicMode.startBattle([Species.MAGIKARP]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyOpponent = game.scene.getEnemyPokemon()!; @@ -121,4 +122,18 @@ describe("Moves - Telekinesis", () => { expect(enemyOpponent.getTag(BattlerTagType.FLOATING)).toBeUndefined(); expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); }); + + it("should not be baton passed onto a mega gengar", async () => { + game.override + .moveset([Moves.BATON_PASS]) + .enemyMoveset([Moves.TELEKINESIS]) + .starterForms({ [Species.GENGAR]: 1 }); + + await game.classicMode.startBattle([Species.MAGIKARP, Species.GENGAR]); + game.move.select(Moves.BATON_PASS); + game.doSelectPartyPokemon(1); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.phaseInterceptor.to("BerryPhase"); + expect(game.scene.getPlayerPokemon()!.getTag(BattlerTagType.TELEKINESIS)).toBeUndefined(); + }); }); diff --git a/test/moves/tera_blast.test.ts b/test/moves/tera_blast.test.ts new file mode 100644 index 00000000000..dffe39f4d87 --- /dev/null +++ b/test/moves/tera_blast.test.ts @@ -0,0 +1,190 @@ +import { BattlerIndex } from "#app/battle"; +import { Stat } from "#enums/stat"; +import { allMoves, TeraMoveCategoryAttr } from "#app/data/moves/move"; +import { PokemonType } from "#enums/pokemon-type"; +import { Abilities } from "#app/enums/abilities"; +import { HitResult } from "#app/field/pokemon"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Moves - Tera Blast", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + const moveToCheck = allMoves[Moves.TERA_BLAST]; + const teraBlastAttr = moveToCheck.getAttrs(TeraMoveCategoryAttr)[0]; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override + .battleType("single") + .disableCrits() + .starterSpecies(Species.FEEBAS) + .moveset([Moves.TERA_BLAST]) + .ability(Abilities.BALL_FETCH) + .enemySpecies(Species.MAGIKARP) + .enemyMoveset(Moves.SPLASH) + .enemyAbility(Abilities.STURDY) + .enemyLevel(50); + + vi.spyOn(moveToCheck, "calculateBattlePower"); + }); + + it("changes type to match user's tera type", async () => { + game.override.enemySpecies(Species.FURRET); + await game.startBattle(); + const enemyPokemon = game.scene.getEnemyPokemon()!; + vi.spyOn(enemyPokemon, "apply"); + + const playerPokemon = game.scene.getPlayerPokemon()!; + playerPokemon.teraType = PokemonType.FIGHTING; + playerPokemon.isTerastallized = true; + + game.move.select(Moves.TERA_BLAST); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.SUPER_EFFECTIVE); + }, 20000); + + it("increases power if user is Stellar tera type", async () => { + await game.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + playerPokemon.teraType = PokemonType.STELLAR; + playerPokemon.isTerastallized = true; + + game.move.select(Moves.TERA_BLAST); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(moveToCheck.calculateBattlePower).toHaveReturnedWith(100); + }, 20000); + + it("is super effective against terastallized targets if user is Stellar tera type", async () => { + await game.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + playerPokemon.teraType = PokemonType.STELLAR; + playerPokemon.isTerastallized = true; + + const enemyPokemon = game.scene.getEnemyPokemon()!; + vi.spyOn(enemyPokemon, "apply"); + enemyPokemon.isTerastallized = true; + + game.move.select(Moves.TERA_BLAST); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.SUPER_EFFECTIVE); + }); + + it("uses the higher ATK for damage calculation", async () => { + await game.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + playerPokemon.stats[Stat.ATK] = 100; + playerPokemon.stats[Stat.SPATK] = 1; + playerPokemon.isTerastallized = true; + + vi.spyOn(teraBlastAttr, "apply"); + + game.move.select(Moves.TERA_BLAST); + await game.toNextTurn(); + expect(teraBlastAttr.apply).toHaveLastReturnedWith(true); + }); + + it("uses the higher SPATK for damage calculation", async () => { + await game.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + playerPokemon.stats[Stat.ATK] = 1; + playerPokemon.stats[Stat.SPATK] = 100; + + vi.spyOn(teraBlastAttr, "apply"); + + game.move.select(Moves.TERA_BLAST); + await game.toNextTurn(); + expect(teraBlastAttr.apply).toHaveLastReturnedWith(false); + }); + + it("should stay as a special move if ATK turns lower than SPATK mid-turn", async () => { + game.override.enemyMoveset([Moves.CHARM]); + await game.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + playerPokemon.stats[Stat.ATK] = 51; + playerPokemon.stats[Stat.SPATK] = 50; + + vi.spyOn(teraBlastAttr, "apply"); + + game.move.select(Moves.TERA_BLAST); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + expect(teraBlastAttr.apply).toHaveLastReturnedWith(false); + }); + + it("does not change its move category from stat changes due to held items", async () => { + game.override + .startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "THICK_CLUB" }]) + .starterSpecies(Species.CUBONE); + await game.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + + playerPokemon.stats[Stat.ATK] = 50; + playerPokemon.stats[Stat.SPATK] = 51; + + vi.spyOn(teraBlastAttr, "apply"); + + game.move.select(Moves.TERA_BLAST); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + + expect(teraBlastAttr.apply).toHaveLastReturnedWith(false); + }); + + it("does not change its move category from stat changes due to abilities", async () => { + game.override.ability(Abilities.HUGE_POWER); + await game.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + playerPokemon.stats[Stat.ATK] = 50; + playerPokemon.stats[Stat.SPATK] = 51; + + vi.spyOn(teraBlastAttr, "apply"); + + game.move.select(Moves.TERA_BLAST); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + expect(teraBlastAttr.apply).toHaveLastReturnedWith(false); + }); + + it("causes stat drops if user is Stellar tera type", async () => { + await game.startBattle(); + + const playerPokemon = game.scene.getPlayerPokemon()!; + playerPokemon.teraType = PokemonType.STELLAR; + playerPokemon.isTerastallized = true; + + game.move.select(Moves.TERA_BLAST); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEndPhase"); + + expect(playerPokemon.getStatStage(Stat.SPATK)).toBe(-1); + expect(playerPokemon.getStatStage(Stat.ATK)).toBe(-1); + }, 20000); +}); diff --git a/src/test/moves/tera_starstorm.test.ts b/test/moves/tera_starstorm.test.ts similarity index 76% rename from src/test/moves/tera_starstorm.test.ts rename to test/moves/tera_starstorm.test.ts index 22dd5b3c4d1..19fe58f4057 100644 --- a/src/test/moves/tera_starstorm.test.ts +++ b/test/moves/tera_starstorm.test.ts @@ -1,9 +1,9 @@ import { BattlerIndex } from "#app/battle"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; @@ -24,37 +24,39 @@ describe("Moves - Tera Starstorm", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.TERA_STARSTORM, Moves.SPLASH ]) + .moveset([Moves.TERA_STARSTORM, Moves.SPLASH]) .battleType("double") .enemyAbility(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) .enemyLevel(30) - .enemySpecies(Species.MAGIKARP) - .startingHeldItems([{ name: "TERA_SHARD", type: Type.FIRE }]); + .enemySpecies(Species.MAGIKARP); }); it("changes type to Stellar when used by Terapagos in its Stellar Form", async () => { game.override.battleType("single"); - await game.classicMode.startBattle([ Species.TERAPAGOS ]); + await game.classicMode.startBattle([Species.TERAPAGOS]); const terapagos = game.scene.getPlayerPokemon()!; + terapagos.isTerastallized = true; vi.spyOn(terapagos, "getMoveType"); game.move.select(Moves.TERA_STARSTORM); await game.phaseInterceptor.to("TurnEndPhase"); - expect(terapagos.isTerastallized()).toBe(true); - expect(terapagos.getMoveType).toHaveReturnedWith(Type.STELLAR); + expect(terapagos.getMoveType).toHaveReturnedWith(PokemonType.STELLAR); }); it("targets both opponents in a double battle when used by Terapagos in its Stellar Form", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP, Species.TERAPAGOS ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.TERAPAGOS]); + + const terapagos = game.scene.getPlayerParty()[1]; + terapagos.isTerastallized = true; game.move.select(Moves.TERA_STARSTORM, 0, BattlerIndex.ENEMY); game.move.select(Moves.TERA_STARSTORM, 1); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); const enemyField = game.scene.getEnemyField(); @@ -68,7 +70,7 @@ describe("Moves - Tera Starstorm", () => { }); it("applies the effects when Terapagos in Stellar Form is fused with another Pokemon", async () => { - await game.classicMode.startBattle([ Species.TERAPAGOS, Species.CHARMANDER, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.TERAPAGOS, Species.CHARMANDER, Species.MAGIKARP]); const fusionedMon = game.scene.getPlayerParty()[0]; const magikarp = game.scene.getPlayerParty()[2]; @@ -82,6 +84,8 @@ describe("Moves - Tera Starstorm", () => { fusionedMon.fusionGender = magikarp.gender; fusionedMon.fusionLuck = magikarp.luck; + fusionedMon.isTerastallized = true; + vi.spyOn(fusionedMon, "getMoveType"); game.move.select(Moves.TERA_STARSTORM, 0); @@ -90,9 +94,8 @@ describe("Moves - Tera Starstorm", () => { // Fusion and terastallized expect(fusionedMon.isFusion()).toBe(true); - expect(fusionedMon.isTerastallized()).toBe(true); // Move effects should be applied - expect(fusionedMon.getMoveType).toHaveReturnedWith(Type.STELLAR); + expect(fusionedMon.getMoveType).toHaveReturnedWith(PokemonType.STELLAR); expect(game.scene.getEnemyField().every(pokemon => pokemon.isFullHp())).toBe(false); }); }); diff --git a/test/moves/thousand_arrows.test.ts b/test/moves/thousand_arrows.test.ts new file mode 100644 index 00000000000..109fc2c6936 --- /dev/null +++ b/test/moves/thousand_arrows.test.ts @@ -0,0 +1,89 @@ +import { Abilities } from "#app/enums/abilities"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Thousand Arrows", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.battleType("single"); + game.override.enemySpecies(Species.TOGETIC); + game.override.startingLevel(100); + game.override.enemyLevel(100); + game.override.moveset([Moves.THOUSAND_ARROWS]); + game.override.enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]); + }); + + it("move should hit and ground Flying-type targets", async () => { + await game.startBattle([Species.ILLUMISE]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.THOUSAND_ARROWS); + + await game.phaseInterceptor.to(MoveEffectPhase, false); + // Enemy should not be grounded before move effect is applied + expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined(); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined(); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + }); + + it("move should hit and ground targets with Levitate", async () => { + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyAbility(Abilities.LEVITATE); + + await game.startBattle([Species.ILLUMISE]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.THOUSAND_ARROWS); + + await game.phaseInterceptor.to(MoveEffectPhase, false); + // Enemy should not be grounded before move effect is applied + expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined(); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined(); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + }); + + it("move should hit and ground targets under the effects of Magnet Rise", async () => { + game.override.enemySpecies(Species.SNORLAX); + + await game.startBattle([Species.ILLUMISE]); + + const enemyPokemon = game.scene.getEnemyPokemon()!; + + enemyPokemon.addTag(BattlerTagType.FLOATING, undefined, Moves.MAGNET_RISE); + + game.move.select(Moves.THOUSAND_ARROWS); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(enemyPokemon.getTag(BattlerTagType.FLOATING)).toBeUndefined(); + expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined(); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + }); +}); diff --git a/src/test/moves/throat_chop.test.ts b/test/moves/throat_chop.test.ts similarity index 84% rename from src/test/moves/throat_chop.test.ts rename to test/moves/throat_chop.test.ts index 24293f8d086..755e60fe425 100644 --- a/src/test/moves/throat_chop.test.ts +++ b/test/moves/throat_chop.test.ts @@ -3,7 +3,7 @@ import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; import { Abilities } from "#enums/abilities"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; @@ -32,12 +32,12 @@ describe("Moves - Throat Chop", () => { }); it("prevents the target from using sound-based moves for two turns", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.GROWL); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); // First turn, move is interrupted await game.phaseInterceptor.to("TurnEndPhase"); @@ -47,7 +47,7 @@ describe("Moves - Throat Chop", () => { await game.toNextTurn(); game.move.select(Moves.GROWL); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.isFullHp()).toBe(false); diff --git a/src/test/moves/thunder_wave.test.ts b/test/moves/thunder_wave.test.ts similarity index 97% rename from src/test/moves/thunder_wave.test.ts rename to test/moves/thunder_wave.test.ts index 21e215a51f2..9f907e38b62 100644 --- a/src/test/moves/thunder_wave.test.ts +++ b/test/moves/thunder_wave.test.ts @@ -3,11 +3,10 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("Moves - Thunder Wave", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -27,7 +26,7 @@ describe("Moves - Thunder Wave", () => { game.override .battleType("single") .starterSpecies(Species.PIKACHU) - .moveset([ Moves.THUNDER_WAVE ]) + .moveset([Moves.THUNDER_WAVE]) .enemyMoveset(Moves.SPLASH); }); diff --git a/src/test/moves/tidy_up.test.ts b/test/moves/tidy_up.test.ts similarity index 76% rename from src/test/moves/tidy_up.test.ts rename to test/moves/tidy_up.test.ts index 255967b40ac..9d98feb13f5 100644 --- a/src/test/moves/tidy_up.test.ts +++ b/test/moves/tidy_up.test.ts @@ -5,12 +5,11 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { SubstituteTag } from "#app/data/battler-tags"; - describe("Moves - Tidy Up", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -33,13 +32,13 @@ describe("Moves - Tidy Up", () => { game.override.enemyMoveset(Moves.SPLASH); game.override.starterSpecies(Species.FEEBAS); game.override.ability(Abilities.BALL_FETCH); - game.override.moveset([ Moves.TIDY_UP ]); + game.override.moveset([Moves.TIDY_UP]); game.override.startingLevel(50); }); it("spikes are cleared", async () => { - game.override.moveset([ Moves.SPIKES, Moves.TIDY_UP ]); - game.override.enemyMoveset([ Moves.SPIKES, Moves.SPIKES, Moves.SPIKES, Moves.SPIKES ]); + game.override.moveset([Moves.SPIKES, Moves.TIDY_UP]); + game.override.enemyMoveset([Moves.SPIKES, Moves.SPIKES, Moves.SPIKES, Moves.SPIKES]); await game.classicMode.startBattle(); game.move.select(Moves.SPIKES); @@ -47,12 +46,11 @@ describe("Moves - Tidy Up", () => { game.move.select(Moves.TIDY_UP); await game.phaseInterceptor.to(MoveEndPhase); expect(game.scene.arena.getTag(ArenaTagType.SPIKES)).toBeUndefined(); - }, 20000); it("stealth rocks are cleared", async () => { - game.override.moveset([ Moves.STEALTH_ROCK, Moves.TIDY_UP ]); - game.override.enemyMoveset([ Moves.STEALTH_ROCK, Moves.STEALTH_ROCK, Moves.STEALTH_ROCK, Moves.STEALTH_ROCK ]); + game.override.moveset([Moves.STEALTH_ROCK, Moves.TIDY_UP]); + game.override.enemyMoveset([Moves.STEALTH_ROCK, Moves.STEALTH_ROCK, Moves.STEALTH_ROCK, Moves.STEALTH_ROCK]); await game.classicMode.startBattle(); game.move.select(Moves.STEALTH_ROCK); @@ -63,8 +61,8 @@ describe("Moves - Tidy Up", () => { }, 20000); it("toxic spikes are cleared", async () => { - game.override.moveset([ Moves.TOXIC_SPIKES, Moves.TIDY_UP ]); - game.override.enemyMoveset([ Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES ]); + game.override.moveset([Moves.TOXIC_SPIKES, Moves.TIDY_UP]); + game.override.enemyMoveset([Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES]); await game.classicMode.startBattle(); game.move.select(Moves.TOXIC_SPIKES); @@ -75,8 +73,8 @@ describe("Moves - Tidy Up", () => { }, 20000); it("sticky webs are cleared", async () => { - game.override.moveset([ Moves.STICKY_WEB, Moves.TIDY_UP ]); - game.override.enemyMoveset([ Moves.STICKY_WEB, Moves.STICKY_WEB, Moves.STICKY_WEB, Moves.STICKY_WEB ]); + game.override.moveset([Moves.STICKY_WEB, Moves.TIDY_UP]); + game.override.enemyMoveset([Moves.STICKY_WEB, Moves.STICKY_WEB, Moves.STICKY_WEB, Moves.STICKY_WEB]); await game.classicMode.startBattle(); @@ -88,8 +86,8 @@ describe("Moves - Tidy Up", () => { }, 20000); it("substitutes are cleared", async () => { - game.override.moveset([ Moves.SUBSTITUTE, Moves.TIDY_UP ]); - game.override.enemyMoveset([ Moves.SUBSTITUTE, Moves.SUBSTITUTE, Moves.SUBSTITUTE, Moves.SUBSTITUTE ]); + game.override.moveset([Moves.SUBSTITUTE, Moves.TIDY_UP]); + game.override.enemyMoveset([Moves.SUBSTITUTE, Moves.SUBSTITUTE, Moves.SUBSTITUTE, Moves.SUBSTITUTE]); await game.classicMode.startBattle(); @@ -98,7 +96,7 @@ describe("Moves - Tidy Up", () => { game.move.select(Moves.TIDY_UP); await game.phaseInterceptor.to(MoveEndPhase); - const pokemon = [ game.scene.getPlayerPokemon()!, game.scene.getEnemyPokemon()! ]; + const pokemon = [game.scene.getPlayerPokemon()!, game.scene.getEnemyPokemon()!]; pokemon.forEach(p => { expect(p).toBeDefined(); expect(p!.getTag(SubstituteTag)).toBeUndefined(); diff --git a/src/test/moves/torment.test.ts b/test/moves/torment.test.ts similarity index 90% rename from src/test/moves/torment.test.ts rename to test/moves/torment.test.ts index b4c9a059db1..75143053321 100644 --- a/src/test/moves/torment.test.ts +++ b/test/moves/torment.test.ts @@ -1,7 +1,7 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Abilities } from "#enums/abilities"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { MoveResult } from "#app/field/pokemon"; @@ -26,15 +26,15 @@ describe("Moves - Torment", () => { game.override .battleType("single") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.TORMENT, Moves.SPLASH ]) + .enemyMoveset([Moves.TORMENT, Moves.SPLASH]) .enemySpecies(Species.SHUCKLE) .enemyLevel(30) - .moveset([ Moves.TACKLE ]) + .moveset([Moves.TACKLE]) .ability(Abilities.BALL_FETCH); }); it("Pokemon should not be able to use the same move consecutively", async () => { - await game.classicMode.startBattle([ Species.CHANSEY ]); + await game.classicMode.startBattle([Species.CHANSEY]); const playerPokemon = game.scene.getPlayerPokemon()!; diff --git a/src/test/moves/toxic.test.ts b/test/moves/toxic.test.ts similarity index 75% rename from src/test/moves/toxic.test.ts rename to test/moves/toxic.test.ts index b146134ae51..f2b1f82fe02 100644 --- a/src/test/moves/toxic.test.ts +++ b/test/moves/toxic.test.ts @@ -1,11 +1,11 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { StatusEffect } from "#enums/status-effect"; import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; +import { allMoves } from "#app/data/moves/move"; describe("Moves - Toxic", () => { let phaserGame: Phaser.Game; @@ -23,16 +23,12 @@ describe("Moves - Toxic", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override - .battleType("single") - .moveset(Moves.TOXIC) - .enemySpecies(Species.MAGIKARP) - .enemyMoveset(Moves.SPLASH); + game.override.battleType("single").moveset(Moves.TOXIC).enemySpecies(Species.MAGIKARP).enemyMoveset(Moves.SPLASH); }); it("should be guaranteed to hit if user is Poison-type", async () => { vi.spyOn(allMoves[Moves.TOXIC], "accuracy", "get").mockReturnValue(0); - await game.classicMode.startBattle([ Species.TOXAPEX ]); + await game.classicMode.startBattle([Species.TOXAPEX]); game.move.select(Moves.TOXIC); await game.phaseInterceptor.to("BerryPhase", false); @@ -42,7 +38,7 @@ describe("Moves - Toxic", () => { it("may miss if user is not Poison-type", async () => { vi.spyOn(allMoves[Moves.TOXIC], "accuracy", "get").mockReturnValue(0); - await game.classicMode.startBattle([ Species.UMBREON ]); + await game.classicMode.startBattle([Species.UMBREON]); game.move.select(Moves.TOXIC); await game.phaseInterceptor.to("BerryPhase", false); @@ -53,10 +49,10 @@ describe("Moves - Toxic", () => { it("should hit semi-invulnerable targets if user is Poison-type", async () => { vi.spyOn(allMoves[Moves.TOXIC], "accuracy", "get").mockReturnValue(0); game.override.enemyMoveset(Moves.FLY); - await game.classicMode.startBattle([ Species.TOXAPEX ]); + await game.classicMode.startBattle([Species.TOXAPEX]); game.move.select(Moves.TOXIC); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase", false); expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.TOXIC); @@ -65,10 +61,10 @@ describe("Moves - Toxic", () => { it("should miss semi-invulnerable targets if user is not Poison-type", async () => { vi.spyOn(allMoves[Moves.TOXIC], "accuracy", "get").mockReturnValue(-1); game.override.enemyMoveset(Moves.FLY); - await game.classicMode.startBattle([ Species.UMBREON ]); + await game.classicMode.startBattle([Species.UMBREON]); game.move.select(Moves.TOXIC); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase", false); expect(game.scene.getEnemyPokemon()!.status).toBeUndefined(); @@ -77,10 +73,10 @@ describe("Moves - Toxic", () => { it("moves other than Toxic should not hit semi-invulnerable targets even if user is Poison-type", async () => { game.override.moveset(Moves.SWIFT); game.override.enemyMoveset(Moves.FLY); - await game.classicMode.startBattle([ Species.TOXAPEX ]); + await game.classicMode.startBattle([Species.TOXAPEX]); game.move.select(Moves.SWIFT); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase", false); const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/toxic_spikes.test.ts b/test/moves/toxic_spikes.test.ts similarity index 81% rename from src/test/moves/toxic_spikes.test.ts rename to test/moves/toxic_spikes.test.ts index c2d1c5aaee8..d457ec5cb56 100644 --- a/src/test/moves/toxic_spikes.test.ts +++ b/test/moves/toxic_spikes.test.ts @@ -7,7 +7,7 @@ import { ArenaTagType } from "#enums/arena-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -34,11 +34,11 @@ describe("Moves - Toxic Spikes", () => { .enemyAbility(Abilities.BALL_FETCH) .ability(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) - .moveset([ Moves.TOXIC_SPIKES, Moves.SPLASH, Moves.ROAR, Moves.COURT_CHANGE ]); + .moveset([Moves.TOXIC_SPIKES, Moves.SPLASH, Moves.ROAR, Moves.COURT_CHANGE]); }); it("should not affect the opponent if they do not switch", async () => { - await game.classicMode.runToSummon([ Species.MIGHTYENA, Species.POOCHYENA ]); + await game.classicMode.runToSummon([Species.MIGHTYENA, Species.POOCHYENA]); const enemy = game.scene.getEnemyField()[0]; @@ -54,7 +54,7 @@ describe("Moves - Toxic Spikes", () => { }); it("should poison the opponent if they switch into 1 layer", async () => { - await game.classicMode.runToSummon([ Species.MIGHTYENA ]); + await game.classicMode.runToSummon([Species.MIGHTYENA]); game.move.select(Moves.TOXIC_SPIKES); await game.phaseInterceptor.to("TurnEndPhase"); @@ -68,7 +68,7 @@ describe("Moves - Toxic Spikes", () => { }); it("should badly poison the opponent if they switch into 2 layers", async () => { - await game.classicMode.runToSummon([ Species.MIGHTYENA ]); + await game.classicMode.runToSummon([Species.MIGHTYENA]); game.move.select(Moves.TOXIC_SPIKES); await game.phaseInterceptor.to("TurnEndPhase"); @@ -83,7 +83,7 @@ describe("Moves - Toxic Spikes", () => { }); it("should be removed if a grounded poison pokemon switches in", async () => { - await game.classicMode.runToSummon([ Species.MUK, Species.PIDGEY ]); + await game.classicMode.runToSummon([Species.MUK, Species.PIDGEY]); const muk = game.scene.getPlayerPokemon()!; @@ -106,12 +106,12 @@ describe("Moves - Toxic Spikes", () => { }); it("shouldn't create multiple layers per use in doubles", async () => { - await game.classicMode.runToSummon([ Species.MIGHTYENA, Species.POOCHYENA ]); + await game.classicMode.runToSummon([Species.MIGHTYENA, Species.POOCHYENA]); game.move.select(Moves.TOXIC_SPIKES); await game.phaseInterceptor.to("TurnEndPhase"); - const arenaTags = (game.scene.arena.getTagOnSide(ArenaTagType.TOXIC_SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag); + const arenaTags = game.scene.arena.getTagOnSide(ArenaTagType.TOXIC_SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag; expect(arenaTags.tagType).toBe(ArenaTagType.TOXIC_SPIKES); expect(arenaTags.layers).toBe(1); }); @@ -120,7 +120,7 @@ describe("Moves - Toxic Spikes", () => { game.override.startingWave(1); const gameData = new GameData(); - await game.classicMode.runToSummon([ Species.MIGHTYENA ]); + await game.classicMode.runToSummon([Species.MIGHTYENA]); game.move.select(Moves.TOXIC_SPIKES); await game.phaseInterceptor.to("TurnEndPhase"); @@ -129,10 +129,12 @@ describe("Moves - Toxic Spikes", () => { await game.phaseInterceptor.to("BattleEndPhase"); await game.toNextWave(); - const sessionData : SessionSaveData = gameData["getSessionSaveData"](); + const sessionData: SessionSaveData = gameData["getSessionSaveData"](); localStorage.setItem("sessionTestData", encrypt(JSON.stringify(sessionData), true)); - const recoveredData : SessionSaveData = gameData.parseSessionData(decrypt(localStorage.getItem("sessionTestData")!, true)); - gameData.loadSession(0, recoveredData); + const recoveredData: SessionSaveData = gameData.parseSessionData( + decrypt(localStorage.getItem("sessionTestData")!, true), + ); + await gameData.loadSession(0, recoveredData); expect(sessionData.arena.tags).toEqual(recoveredData.arena.tags); localStorage.removeItem("sessionTestData"); diff --git a/src/test/moves/transform.test.ts b/test/moves/transform.test.ts similarity index 81% rename from src/test/moves/transform.test.ts rename to test/moves/transform.test.ts index adb97b42af7..5140202a383 100644 --- a/src/test/moves/transform.test.ts +++ b/test/moves/transform.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; @@ -32,11 +32,11 @@ describe("Moves - Transform", () => { .enemyPassiveAbility(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) .ability(Abilities.INTIMIDATE) - .moveset([ Moves.TRANSFORM ]); + .moveset([Moves.TRANSFORM]); }); it("should copy species, ability, gender, all stats except HP, all stat stages, moveset, and types of target", async () => { - await game.classicMode.startBattle([ Species.DITTO ]); + await game.classicMode.startBattle([Species.DITTO]); game.move.select(Moves.TRANSFORM); await game.phaseInterceptor.to(TurnEndPhase); @@ -75,9 +75,9 @@ describe("Moves - Transform", () => { }); it("should copy in-battle overridden stats", async () => { - game.override.enemyMoveset([ Moves.POWER_SPLIT ]); + game.override.enemyMoveset([Moves.POWER_SPLIT]); - await game.classicMode.startBattle([ Species.DITTO ]); + await game.classicMode.startBattle([Species.DITTO]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -96,9 +96,9 @@ describe("Moves - Transform", () => { }); it("should set each move's pp to a maximum of 5", async () => { - game.override.enemyMoveset([ Moves.SWORDS_DANCE, Moves.GROWL, Moves.SKETCH, Moves.RECOVER ]); + game.override.enemyMoveset([Moves.SWORDS_DANCE, Moves.GROWL, Moves.SKETCH, Moves.RECOVER]); - await game.classicMode.startBattle([ Species.DITTO ]); + await game.classicMode.startBattle([Species.DITTO]); const player = game.scene.getPlayerPokemon()!; game.move.select(Moves.TRANSFORM); @@ -116,4 +116,15 @@ describe("Moves - Transform", () => { } }); }); + + it("should activate its ability if it copies one that activates on summon", async () => { + game.override.enemyAbility(Abilities.INTIMIDATE).ability(Abilities.BALL_FETCH); + + await game.classicMode.startBattle([Species.DITTO]); + game.move.select(Moves.TRANSFORM); + + await game.phaseInterceptor.to("BerryPhase"); + + expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1); + }); }); diff --git a/src/test/moves/trick_or_treat.test.ts b/test/moves/trick_or_treat.test.ts similarity index 75% rename from src/test/moves/trick_or_treat.test.ts rename to test/moves/trick_or_treat.test.ts index 5c85cac05e2..108028f3008 100644 --- a/src/test/moves/trick_or_treat.test.ts +++ b/test/moves/trick_or_treat.test.ts @@ -1,8 +1,8 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { Type } from "#enums/type"; -import GameManager from "#test/utils/gameManager"; +import { PokemonType } from "#enums/pokemon-type"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,7 +23,7 @@ describe("Moves - Trick Or Treat", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.FORESTS_CURSE, Moves.TRICK_OR_TREAT ]) + .moveset([Moves.FORESTS_CURSE, Moves.TRICK_OR_TREAT]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -33,15 +33,15 @@ describe("Moves - Trick Or Treat", () => { }); it("will replace added type from Forest's Curse", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const enemyPokemon = game.scene.getEnemyPokemon(); game.move.select(Moves.FORESTS_CURSE); await game.phaseInterceptor.to("TurnEndPhase"); - expect(enemyPokemon!.summonData.addedType).toBe(Type.GRASS); + expect(enemyPokemon!.summonData.addedType).toBe(PokemonType.GRASS); game.move.select(Moves.TRICK_OR_TREAT); await game.phaseInterceptor.to("TurnEndPhase"); - expect(enemyPokemon?.summonData.addedType).toBe(Type.GHOST); + expect(enemyPokemon?.summonData.addedType).toBe(PokemonType.GHOST); }); }); diff --git a/src/test/moves/triple_arrows.test.ts b/test/moves/triple_arrows.test.ts similarity index 88% rename from src/test/moves/triple_arrows.test.ts rename to test/moves/triple_arrows.test.ts index 98ad29997df..c1114b69b99 100644 --- a/src/test/moves/triple_arrows.test.ts +++ b/test/moves/triple_arrows.test.ts @@ -1,8 +1,8 @@ -import { allMoves, FlinchAttr, StatStageChangeAttr } from "#app/data/move"; +import { allMoves, FlinchAttr, StatStageChangeAttr } from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -27,7 +27,7 @@ describe("Moves - Triple Arrows", () => { game = new GameManager(phaserGame); game.override .ability(Abilities.BALL_FETCH) - .moveset([ Moves.TRIPLE_ARROWS ]) + .moveset([Moves.TRIPLE_ARROWS]) .battleType("single") .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.STURDY) @@ -38,7 +38,7 @@ describe("Moves - Triple Arrows", () => { }); it("has a 30% flinch chance and 50% defense drop chance", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.TRIPLE_ARROWS); await game.phaseInterceptor.to("BerryPhase"); @@ -49,7 +49,7 @@ describe("Moves - Triple Arrows", () => { it("is affected normally by Serene Grace", async () => { game.override.ability(Abilities.SERENE_GRACE); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.TRIPLE_ARROWS); await game.phaseInterceptor.to("BerryPhase"); diff --git a/src/test/moves/u_turn.test.ts b/test/moves/u_turn.test.ts similarity index 86% rename from src/test/moves/u_turn.test.ts rename to test/moves/u_turn.test.ts index c6e255e01b2..f1d212f3f47 100644 --- a/src/test/moves/u_turn.test.ts +++ b/test/moves/u_turn.test.ts @@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -27,7 +27,7 @@ describe("Moves - U-turn", () => { .enemySpecies(Species.GENGAR) .startingLevel(90) .startingWave(97) - .moveset([ Moves.U_TURN ]) + .moveset([Moves.U_TURN]) .enemyMoveset(Moves.SPLASH) .disableCrits(); }); @@ -36,7 +36,7 @@ describe("Moves - U-turn", () => { // arrange const playerHp = 1; game.override.ability(Abilities.REGENERATOR); - await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]); game.scene.getPlayerPokemon()!.hp = playerHp; // act @@ -45,7 +45,9 @@ describe("Moves - U-turn", () => { await game.phaseInterceptor.to("TurnEndPhase"); // assert - expect(game.scene.getPlayerParty()[1].hp).toEqual(Math.floor(game.scene.getPlayerParty()[1].getMaxHp() * 0.33 + playerHp)); + expect(game.scene.getPlayerParty()[1].hp).toEqual( + Math.floor(game.scene.getPlayerParty()[1].getMaxHp() * 0.33 + playerHp), + ); expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase"); expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.SHUCKLE); }, 20000); @@ -53,7 +55,7 @@ describe("Moves - U-turn", () => { it("triggers rough skin on the u-turn user before a new pokemon is switched in", async () => { // arrange game.override.enemyAbility(Abilities.ROUGH_SKIN); - await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]); // act game.move.select(Moves.U_TURN); @@ -71,7 +73,7 @@ describe("Moves - U-turn", () => { it("triggers contact abilities on the u-turn user (eg poison point) before a new pokemon is switched in", async () => { // arrange game.override.enemyAbility(Abilities.POISON_POINT); - await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]); + await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]); vi.spyOn(game.scene.getEnemyPokemon()!, "randSeedInt").mockReturnValue(0); // act @@ -88,10 +90,7 @@ describe("Moves - U-turn", () => { it("still forces a switch if u-turn KO's the opponent", async () => { game.override.startingLevel(1000); // Ensure that U-Turn KO's the opponent - await game.classicMode.startBattle([ - Species.RAICHU, - Species.SHUCKLE - ]); + await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]); const enemy = game.scene.getEnemyPokemon()!; // KO the opponent with U-Turn diff --git a/src/test/moves/upper_hand.test.ts b/test/moves/upper_hand.test.ts similarity index 80% rename from src/test/moves/upper_hand.test.ts rename to test/moves/upper_hand.test.ts index f94197d3fbd..ecfd9f0735c 100644 --- a/src/test/moves/upper_hand.test.ts +++ b/test/moves/upper_hand.test.ts @@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -36,7 +36,7 @@ describe("Moves - Upper Hand", () => { }); it("should flinch the opponent before they use a priority attack", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const feebas = game.scene.getPlayerPokemon()!; const magikarp = game.scene.getEnemyPokemon()!; @@ -51,11 +51,11 @@ describe("Moves - Upper Hand", () => { it.each([ { descriptor: "non-priority attack", move: Moves.TACKLE }, - { descriptor: "status move", move: Moves.BABY_DOLL_EYES } + { descriptor: "status move", move: Moves.BABY_DOLL_EYES }, ])("should fail when the opponent selects a $descriptor", async ({ move }) => { game.override.enemyMoveset(move); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const feebas = game.scene.getPlayerPokemon()!; @@ -66,11 +66,9 @@ describe("Moves - Upper Hand", () => { }); it("should flinch the opponent before they use an attack boosted by Gale Wings", async () => { - game.override - .enemyAbility(Abilities.GALE_WINGS) - .enemyMoveset(Moves.GUST); + game.override.enemyAbility(Abilities.GALE_WINGS).enemyMoveset(Moves.GUST); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const feebas = game.scene.getPlayerPokemon()!; const magikarp = game.scene.getEnemyPokemon()!; @@ -84,17 +82,15 @@ describe("Moves - Upper Hand", () => { }); it("should fail if the target has already moved", async () => { - game.override - .enemyMoveset(Moves.FAKE_OUT) - .enemyAbility(Abilities.SHEER_FORCE); + game.override.enemyMoveset(Moves.FAKE_OUT).enemyAbility(Abilities.SHEER_FORCE); - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const feebas = game.scene.getPlayerPokemon()!; game.move.select(Moves.UPPER_HAND); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(feebas.getLastXMoves()[0].result).toBe(MoveResult.FAIL); diff --git a/src/test/moves/whirlwind.test.ts b/test/moves/whirlwind.test.ts similarity index 78% rename from src/test/moves/whirlwind.test.ts rename to test/moves/whirlwind.test.ts index 69232bee43a..d6124b6c766 100644 --- a/src/test/moves/whirlwind.test.ts +++ b/test/moves/whirlwind.test.ts @@ -1,11 +1,11 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { Challenges } from "#enums/challenges"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { Status } from "#app/data/status-effect"; @@ -31,7 +31,7 @@ describe("Moves - Whirlwind", () => { .battleType("single") .moveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset([ Moves.SPLASH, Moves.WHIRLWIND ]) + .enemyMoveset([Moves.SPLASH, Moves.WHIRLWIND]) .enemySpecies(Species.PIDGEY); }); @@ -40,8 +40,8 @@ describe("Moves - Whirlwind", () => { { move: Moves.BOUNCE, name: "Bounce" }, { move: Moves.SKY_DROP, name: "Sky Drop" }, ])("should not hit a flying target: $name (=$move)", async ({ move }) => { - game.override.moveset([ move ]); - await game.classicMode.startBattle([ Species.STARAPTOR ]); + game.override.moveset([move]); + await game.classicMode.startBattle([Species.STARAPTOR]); const staraptor = game.scene.getPlayerPokemon()!; @@ -50,17 +50,17 @@ describe("Moves - Whirlwind", () => { await game.phaseInterceptor.to("BerryPhase", false); - expect(staraptor.findTag((t) => t.tagType === BattlerTagType.FLYING)).toBeDefined(); + expect(staraptor.findTag(t => t.tagType === BattlerTagType.FLYING)).toBeDefined(); expect(game.scene.getEnemyPokemon()!.getLastXMoves(1)[0].result).toBe(MoveResult.MISS); }); it("should force switches randomly", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE ]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); - const [ bulbasaur, charmander, squirtle ] = game.scene.getPlayerParty(); + const [bulbasaur, charmander, squirtle] = game.scene.getPlayerParty(); // Turn 1: Mock an RNG call that calls for switching to 1st backup Pokemon (Charmander) - vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => { + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { return min; }); game.move.select(Moves.SPLASH); @@ -72,7 +72,7 @@ describe("Moves - Whirlwind", () => { expect(squirtle.isOnField()).toBe(false); // Turn 2: Mock an RNG call that calls for switching to 2nd backup Pokemon (Squirtle) - vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => { + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { return min + 1; }); game.move.select(Moves.SPLASH); @@ -86,13 +86,13 @@ describe("Moves - Whirlwind", () => { it("should not force a switch to a challenge-ineligible Pokemon", async () => { // Mono-Water challenge, Eevee is ineligible - game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, Type.WATER + 1, 0); - await game.challengeMode.startBattle([ Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA ]); + game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, PokemonType.WATER + 1, 0); + await game.challengeMode.startBattle([Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA]); - const [ lapras, eevee, toxapex, primarina ] = game.scene.getPlayerParty(); + const [lapras, eevee, toxapex, primarina] = game.scene.getPlayerParty(); // Turn 1: Mock an RNG call that would normally call for switching to Eevee, but it is ineligible - vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => { + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { return min; }); game.move.select(Moves.SPLASH); @@ -106,9 +106,9 @@ describe("Moves - Whirlwind", () => { }); it("should not force a switch to a fainted Pokemon", async () => { - await game.classicMode.startBattle([ Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA ]); + await game.classicMode.startBattle([Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA]); - const [ lapras, eevee, toxapex, primarina ] = game.scene.getPlayerParty(); + const [lapras, eevee, toxapex, primarina] = game.scene.getPlayerParty(); // Turn 1: Eevee faints eevee.hp = 0; @@ -119,7 +119,7 @@ describe("Moves - Whirlwind", () => { await game.toNextTurn(); // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted - vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => { + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { return min; }); game.move.select(Moves.SPLASH); @@ -133,9 +133,9 @@ describe("Moves - Whirlwind", () => { }); it("should not force a switch if there are no available Pokemon to switch into", async () => { - await game.classicMode.startBattle([ Species.LAPRAS, Species.EEVEE ]); + await game.classicMode.startBattle([Species.LAPRAS, Species.EEVEE]); - const [ lapras, eevee ] = game.scene.getPlayerParty(); + const [lapras, eevee] = game.scene.getPlayerParty(); // Turn 1: Eevee faints eevee.hp = 0; @@ -146,7 +146,7 @@ describe("Moves - Whirlwind", () => { await game.toNextTurn(); // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted - vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => { + vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => { return min; }); game.move.select(Moves.SPLASH); diff --git a/test/moves/wide_guard.test.ts b/test/moves/wide_guard.test.ts new file mode 100644 index 00000000000..c466f104f67 --- /dev/null +++ b/test/moves/wide_guard.test.ts @@ -0,0 +1,111 @@ +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; +import GameManager from "#test/testUtils/gameManager"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Stat } from "#enums/stat"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { CommandPhase } from "#app/phases/command-phase"; + +describe("Moves - Wide Guard", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + + game.override.battleType("double"); + + game.override.moveset([Moves.WIDE_GUARD, Moves.SPLASH, Moves.SURF]); + + game.override.enemySpecies(Species.SNORLAX); + game.override.enemyMoveset([Moves.SWIFT]); + game.override.enemyAbility(Abilities.INSOMNIA); + + game.override.startingLevel(100); + game.override.enemyLevel(100); + }); + + test("should protect the user and allies from multi-target attack moves", async () => { + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.WIDE_GUARD); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); + }); + + test("should protect the user and allies from multi-target status moves", async () => { + game.override.enemyMoveset([Moves.GROWL]); + + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.WIDE_GUARD); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0)); + }); + + test("should not protect the user and allies from single-target moves", async () => { + game.override.enemyMoveset([Moves.TACKLE]); + + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerField(); + + game.move.select(Moves.WIDE_GUARD); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(leadPokemon.some(p => p.hp < p.getMaxHp())).toBeTruthy(); + }); + + test("should protect the user from its ally's multi-target move", async () => { + game.override.enemyMoveset([Moves.SPLASH]); + + await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + + const leadPokemon = game.scene.getPlayerField(); + const enemyPokemon = game.scene.getEnemyField(); + + game.move.select(Moves.WIDE_GUARD); + + await game.phaseInterceptor.to(CommandPhase); + + game.move.select(Moves.SURF, 1); + + await game.phaseInterceptor.to(BerryPhase, false); + + expect(leadPokemon[0].hp).toBe(leadPokemon[0].getMaxHp()); + enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp())); + }); +}); diff --git a/src/test/moves/will_o_wisp.test.ts b/test/moves/will_o_wisp.test.ts similarity index 84% rename from src/test/moves/will_o_wisp.test.ts rename to test/moves/will_o_wisp.test.ts index 39729d331ad..0d19fec954c 100644 --- a/src/test/moves/will_o_wisp.test.ts +++ b/test/moves/will_o_wisp.test.ts @@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -24,7 +24,7 @@ describe("Moves - Will-O-Wisp", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.WILL_O_WISP, Moves.SPLASH ]) + .moveset([Moves.WILL_O_WISP, Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -34,12 +34,12 @@ describe("Moves - Will-O-Wisp", () => { }); it("should burn the opponent", async () => { - await game.classicMode.startBattle([ Species.FEEBAS ]); + await game.classicMode.startBattle([Species.FEEBAS]); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.WILL_O_WISP); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); await game.toNextTurn(); diff --git a/src/test/mystery-encounter/encounter-test-utils.ts b/test/mystery-encounter/encounter-test-utils.ts similarity index 70% rename from src/test/mystery-encounter/encounter-test-utils.ts rename to test/mystery-encounter/encounter-test-utils.ts index 69fa9b5465f..19ec364618e 100644 --- a/src/test/mystery-encounter/encounter-test-utils.ts +++ b/test/mystery-encounter/encounter-test-utils.ts @@ -2,7 +2,12 @@ import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encount import { Status } from "#app/data/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; import { MessagePhase } from "#app/phases/message-phase"; -import { MysteryEncounterBattlePhase, MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases"; +import { + MysteryEncounterBattlePhase, + MysteryEncounterOptionSelectedPhase, + MysteryEncounterPhase, + MysteryEncounterRewardsPhase, +} from "#app/phases/mystery-encounter-phases"; import { VictoryPhase } from "#app/phases/victory-phase"; import type MessageUiHandler from "#app/ui/message-ui-handler"; import type MysteryEncounterUiHandler from "#app/ui/mystery-encounter-ui-handler"; @@ -12,7 +17,7 @@ import { Mode } from "#app/ui/ui"; import { isNullOrUndefined } from "#app/utils"; import { Button } from "#enums/buttons"; import { StatusEffect } from "#enums/status-effect"; -import type GameManager from "#test/utils/gameManager"; +import type GameManager from "#test/testUtils/gameManager"; import { expect, vi } from "vitest"; /** @@ -22,31 +27,56 @@ import { expect, vi } from "vitest"; * @param secondaryOptionSelect * @param isBattle If selecting option should lead to battle, set to `true` */ -export async function runMysteryEncounterToEnd(game: GameManager, optionNo: number, secondaryOptionSelect?: { pokemonNo: number, optionNo?: number }, isBattle: boolean = false) { +export async function runMysteryEncounterToEnd( + game: GameManager, + optionNo: number, + secondaryOptionSelect?: { pokemonNo: number; optionNo?: number }, + isBattle = false, +) { vi.spyOn(EncounterPhaseUtils, "selectPokemonForOption"); await runSelectMysteryEncounterOption(game, optionNo, secondaryOptionSelect); // run the selected options phase - game.onNextPrompt("MysteryEncounterOptionSelectedPhase", Mode.MESSAGE, () => { - const uiHandler = game.scene.ui.getHandler(); - uiHandler.processInput(Button.ACTION); - }, () => game.isCurrentPhase(MysteryEncounterBattlePhase) || game.isCurrentPhase(MysteryEncounterRewardsPhase)); + game.onNextPrompt( + "MysteryEncounterOptionSelectedPhase", + Mode.MESSAGE, + () => { + const uiHandler = game.scene.ui.getHandler(); + uiHandler.processInput(Button.ACTION); + }, + () => game.isCurrentPhase(MysteryEncounterBattlePhase) || game.isCurrentPhase(MysteryEncounterRewardsPhase), + ); if (isBattle) { - game.onNextPrompt("DamageAnimPhase", Mode.MESSAGE, () => { - game.setMode(Mode.MESSAGE); - game.endPhase(); - }, () => game.isCurrentPhase(CommandPhase)); + game.onNextPrompt( + "DamageAnimPhase", + Mode.MESSAGE, + () => { + game.setMode(Mode.MESSAGE); + game.endPhase(); + }, + () => game.isCurrentPhase(CommandPhase), + ); - game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - game.setMode(Mode.MESSAGE); - game.endPhase(); - }, () => game.isCurrentPhase(CommandPhase)); + game.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + game.setMode(Mode.MESSAGE); + game.endPhase(); + }, + () => game.isCurrentPhase(CommandPhase), + ); - game.onNextPrompt("CheckSwitchPhase", Mode.MESSAGE, () => { - game.setMode(Mode.MESSAGE); - game.endPhase(); - }, () => game.isCurrentPhase(CommandPhase)); + game.onNextPrompt( + "CheckSwitchPhase", + Mode.MESSAGE, + () => { + game.setMode(Mode.MESSAGE); + game.endPhase(); + }, + () => game.isCurrentPhase(CommandPhase), + ); // If a battle is started, fast forward to end of the battle game.onNextPrompt("CommandPhase", Mode.COMMAND, () => { @@ -74,22 +104,36 @@ export async function runMysteryEncounterToEnd(game: GameManager, optionNo: numb } } -export async function runSelectMysteryEncounterOption(game: GameManager, optionNo: number, secondaryOptionSelect?: { pokemonNo: number, optionNo?: number }) { +export async function runSelectMysteryEncounterOption( + game: GameManager, + optionNo: number, + secondaryOptionSelect?: { pokemonNo: number; optionNo?: number }, +) { // Handle any eventual queued messages (e.g. weather phase, etc.) - game.onNextPrompt("MessagePhase", Mode.MESSAGE, () => { - const uiHandler = game.scene.ui.getHandler(); - uiHandler.processInput(Button.ACTION); - }, () => game.isCurrentPhase(MysteryEncounterOptionSelectedPhase)); + game.onNextPrompt( + "MessagePhase", + Mode.MESSAGE, + () => { + const uiHandler = game.scene.ui.getHandler(); + uiHandler.processInput(Button.ACTION); + }, + () => game.isCurrentPhase(MysteryEncounterOptionSelectedPhase), + ); if (game.isCurrentPhase(MessagePhase)) { await game.phaseInterceptor.run(MessagePhase); } // dispose of intro messages - game.onNextPrompt("MysteryEncounterPhase", Mode.MESSAGE, () => { - const uiHandler = game.scene.ui.getHandler(); - uiHandler.processInput(Button.ACTION); - }, () => game.isCurrentPhase(MysteryEncounterOptionSelectedPhase)); + game.onNextPrompt( + "MysteryEncounterPhase", + Mode.MESSAGE, + () => { + const uiHandler = game.scene.ui.getHandler(); + uiHandler.processInput(Button.ACTION); + }, + () => game.isCurrentPhase(MysteryEncounterOptionSelectedPhase), + ); await game.phaseInterceptor.to(MysteryEncounterPhase, true); @@ -98,10 +142,6 @@ export async function runSelectMysteryEncounterOption(game: GameManager, optionN uiHandler.unblockInput(); // input are blocked by 1s to prevent accidental input. Tests need to handle that switch (optionNo) { - default: - case 1: - // no movement needed. Default cursor position - break; case 2: uiHandler.processInput(Button.RIGHT); break; @@ -112,6 +152,9 @@ export async function runSelectMysteryEncounterOption(game: GameManager, optionN uiHandler.processInput(Button.RIGHT); uiHandler.processInput(Button.DOWN); break; + default: + // no movement needed. Default cursor position + break; } if (!isNullOrUndefined(secondaryOptionSelect?.pokemonNo)) { @@ -162,7 +205,7 @@ async function handleSecondaryOptionSelect(game: GameManager, pokemonNo: number, * @param game * @param runRewardsPhase */ -export async function skipBattleRunMysteryEncounterRewardsPhase(game: GameManager, runRewardsPhase: boolean = true) { +export async function skipBattleRunMysteryEncounterRewardsPhase(game: GameManager, runRewardsPhase = true) { game.scene.clearPhaseQueue(); game.scene.clearPhaseQueueSplice(); game.scene.getEnemyParty().forEach(p => { diff --git a/src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts b/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts similarity index 90% rename from src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts rename to test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts index 5a01b8a7379..43d582c5b70 100644 --- a/src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts +++ b/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts @@ -3,14 +3,17 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { ATrainersTestEncounter } from "#app/data/mystery-encounters/encounters/a-trainers-test-encounter"; import { EggTier } from "#enums/egg-type"; import { CommandPhase } from "#app/phases/command-phase"; @@ -19,7 +22,7 @@ import { PartyHealPhase } from "#app/phases/party-heal-phase"; import i18next from "i18next"; const namespace = "mysteryEncounters/aTrainersTest"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -41,10 +44,10 @@ describe("A Trainer's Test - Mystery Encounter", () => { game.override.disableTrainerWaves(); const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], + [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], ]); HUMAN_TRANSITABLE_BIOMES.forEach(biome => { - biomeMap.set(biome, [ MysteryEncounterType.A_TRAINERS_TEST ]); + biomeMap.set(biome, [MysteryEncounterType.A_TRAINERS_TEST]); }); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -107,8 +110,17 @@ describe("A Trainer's Test - Mystery Encounter", () => { expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); expect(enemyField.length).toBe(1); expect(scene.currentBattle.trainer).toBeDefined(); - expect([ i18next.t("trainerNames:buck"), i18next.t("trainerNames:cheryl"), i18next.t("trainerNames:marley"), i18next.t("trainerNames:mira"), i18next.t("trainerNames:riley") ] - .map(name => name.toLowerCase()).includes(scene.currentBattle.trainer!.config.name)).toBeTruthy(); + expect( + [ + i18next.t("trainerNames:buck"), + i18next.t("trainerNames:cheryl"), + i18next.t("trainerNames:marley"), + i18next.t("trainerNames:mira"), + i18next.t("trainerNames:riley"), + ] + .map(name => name.toLowerCase()) + .includes(scene.currentBattle.trainer!.config.name), + ).toBeTruthy(); expect(enemyField[0]).toBeDefined(); }); @@ -138,7 +150,7 @@ describe("A Trainer's Test - Mystery Encounter", () => { vi.spyOn(scene, "playSoundWithoutBgm").mockImplementation(() => { return { totalDuration: 1, - destroy: () => null + destroy: () => null, } as any; }); }); diff --git a/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts similarity index 85% rename from src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts rename to test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts index 797c062dafe..3e1588f3a72 100644 --- a/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts +++ b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts @@ -1,10 +1,13 @@ import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; @@ -19,7 +22,7 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import i18next from "i18next"; const namespace = "mysteryEncounters/absoluteAvarice"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.PLAINS; const defaultWave = 45; @@ -42,9 +45,9 @@ describe("Absolute Avarice - Mystery Encounter", () => { vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( new Map([ - [ Biome.PLAINS, [ MysteryEncounterType.ABSOLUTE_AVARICE ]], - [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], - ]) + [Biome.PLAINS, [MysteryEncounterType.ABSOLUTE_AVARICE]], + [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], + ]), ); }); @@ -85,7 +88,10 @@ describe("Absolute Avarice - Mystery Encounter", () => { it("should spawn if player has enough berries", async () => { game.override.mysteryEncounterTier(MysteryEncounterTier.GREAT); - game.override.startingHeldItems([{ name: "BERRY", count: 2, type: BerryType.SITRUS }, { name: "BERRY", count: 3, type: BerryType.GANLON }]); + game.override.startingHeldItems([ + { name: "BERRY", count: 2, type: BerryType.SITRUS }, + { name: "BERRY", count: 3, type: BerryType.GANLON }, + ]); await game.runToMysteryEncounter(); @@ -93,7 +99,10 @@ describe("Absolute Avarice - Mystery Encounter", () => { }); it("should remove all player's berries at the start of the encounter", async () => { - game.override.startingHeldItems([{ name: "BERRY", count: 2, type: BerryType.SITRUS }, { name: "BERRY", count: 3, type: BerryType.GANLON }]); + game.override.startingHeldItems([ + { name: "BERRY", count: 2, type: BerryType.SITRUS }, + { name: "BERRY", count: 3, type: BerryType.GANLON }, + ]); await game.runToMysteryEncounter(MysteryEncounterType.ABSOLUTE_AVARICE, defaultParty); @@ -129,7 +138,7 @@ describe("Absolute Avarice - Mystery Encounter", () => { expect(enemyField[0].species.speciesId).toBe(Species.GREEDENT); const moveset = enemyField[0].moveset.map(m => m?.moveId); expect(moveset?.length).toBe(4); - expect(moveset).toEqual([ Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.CRUNCH ]); + expect(moveset).toEqual([Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.CRUNCH]); const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]); expect(movePhases.length).toBe(1); @@ -145,9 +154,13 @@ describe("Absolute Avarice - Mystery Encounter", () => { for (const partyPokemon of scene.getPlayerParty()) { const pokemonId = partyPokemon.id; - const pokemonItems = scene.findModifiers(m => m instanceof PokemonHeldItemModifier - && (m as PokemonHeldItemModifier).pokemonId === pokemonId, true) as PokemonHeldItemModifier[]; - const revSeed = pokemonItems.find(i => i.type.name === i18next.t("modifierType:ModifierType.REVIVER_SEED.name")); + const pokemonItems = scene.findModifiers( + m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === pokemonId, + true, + ) as PokemonHeldItemModifier[]; + const revSeed = pokemonItems.find( + i => i.type.name === i18next.t("modifierType:ModifierType.REVIVER_SEED.name"), + ); expect(revSeed).toBeDefined; expect(revSeed?.stackCount).toBe(1); } @@ -171,7 +184,11 @@ describe("Absolute Avarice - Mystery Encounter", () => { }); it("Should return 3 (2/5ths floored) berries if 8 were stolen", { retry: 5 }, async () => { - game.override.startingHeldItems([{ name: "BERRY", count: 2, type: BerryType.SITRUS }, { name: "BERRY", count: 3, type: BerryType.GANLON }, { name: "BERRY", count: 3, type: BerryType.APICOT }]); + game.override.startingHeldItems([ + { name: "BERRY", count: 2, type: BerryType.SITRUS }, + { name: "BERRY", count: 3, type: BerryType.GANLON }, + { name: "BERRY", count: 3, type: BerryType.APICOT }, + ]); await game.runToMysteryEncounter(MysteryEncounterType.ABSOLUTE_AVARICE, defaultParty); @@ -187,7 +204,11 @@ describe("Absolute Avarice - Mystery Encounter", () => { }); it("Should return 2 (2/5ths floored) berries if 7 were stolen", { retry: 5 }, async () => { - game.override.startingHeldItems([{ name: "BERRY", count: 2, type: BerryType.SITRUS }, { name: "BERRY", count: 3, type: BerryType.GANLON }, { name: "BERRY", count: 2, type: BerryType.APICOT }]); + game.override.startingHeldItems([ + { name: "BERRY", count: 2, type: BerryType.SITRUS }, + { name: "BERRY", count: 3, type: BerryType.GANLON }, + { name: "BERRY", count: 2, type: BerryType.APICOT }, + ]); await game.runToMysteryEncounter(MysteryEncounterType.ABSOLUTE_AVARICE, defaultParty); @@ -240,7 +261,7 @@ describe("Absolute Avarice - Mystery Encounter", () => { expect(greedent.species.speciesId).toBe(Species.GREEDENT); const moveset = greedent.moveset.map(m => m?.moveId); expect(moveset?.length).toBe(4); - expect(moveset).toEqual([ Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.SLACK_OFF ]); + expect(moveset).toEqual([Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.SLACK_OFF]); }); it("should leave encounter without battle", async () => { diff --git a/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts b/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts similarity index 89% rename from src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts rename to test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts index 9a6dae53901..3c7bda8febd 100644 --- a/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts +++ b/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts @@ -3,7 +3,7 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; @@ -12,7 +12,7 @@ import { PlayerPokemon, PokemonMove } from "#app/field/pokemon"; import { AnOfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { Moves } from "#enums/moves"; import { ShinyRateBoosterModifier } from "#app/modifier/modifier"; @@ -22,7 +22,7 @@ import { Abilities } from "#enums/abilities"; const namespace = "mysteryEncounters/anOfferYouCantRefuse"; /** Gyarados for Indimidate */ -const defaultParty = [ Species.GYARADOS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.GYARADOS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -38,17 +38,18 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => { beforeEach(async () => { game = new GameManager(phaserGame); scene = game.scene; - game.override.mysteryEncounterChance(100) + game.override + .mysteryEncounterChance(100) .startingWave(defaultWave) .startingBiome(defaultBiome) .disableTrainerWaves() .ability(Abilities.INTIMIDATE); // Extortion ability const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], + [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], ]); HUMAN_TRANSITABLE_BIOMES.forEach(biome => { - biomeMap.set(biome, [ MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE ]); + biomeMap.set(biome, [MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE]); }); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -67,10 +68,12 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => { expect(AnOfferYouCantRefuseEncounter.dialogue).toBeDefined(); expect(AnOfferYouCantRefuseEncounter.dialogue.intro).toStrictEqual([ { text: `${namespace}:intro` }, - { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue` } + { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue` }, ]); expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`); - expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`); + expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue?.description).toBe( + `${namespace}:description`, + ); expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`); expect(AnOfferYouCantRefuseEncounter.options.length).toBe(3); }); @@ -80,7 +83,9 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => { game.override.startingBiome(Biome.VOLCANO); await game.runToMysteryEncounter(); - expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE); + expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe( + MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, + ); }); it("should initialize fully ", async () => { @@ -96,10 +101,14 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => { expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.strongestPokemon).toBeDefined(); expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.price).toBeDefined(); - expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.option2PrimaryAbility).toBe(i18next.t("ability:intimidate.name")); + expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.option2PrimaryAbility).toBe( + i18next.t("ability:intimidate.name"), + ); expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.moveOrAbility).toBe(i18next.t("ability:intimidate.name")); expect(AnOfferYouCantRefuseEncounter.misc.pokemon instanceof PlayerPokemon).toBeTruthy(); - expect(AnOfferYouCantRefuseEncounter.misc?.price?.toString()).toBe(AnOfferYouCantRefuseEncounter.dialogueTokens?.price); + expect(AnOfferYouCantRefuseEncounter.misc?.price?.toString()).toBe( + AnOfferYouCantRefuseEncounter.dialogueTokens?.price, + ); expect(onInitResult).toBe(true); }); @@ -187,27 +196,29 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => { it("should award EXP to a pokemon with an ability in EXTORTION_ABILITIES", async () => { await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty); const party = scene.getPlayerParty(); - const gyarados = party.find((pkm) => pkm.species.speciesId === Species.GYARADOS)!; + const gyarados = party.find(pkm => pkm.species.speciesId === Species.GYARADOS)!; const expBefore = gyarados.exp; await runMysteryEncounterToEnd(game, 2); await game.phaseInterceptor.to(SelectModifierPhase, false); - expect(gyarados.exp).toBe(expBefore + Math.floor(getPokemonSpecies(Species.LIEPARD).baseExp * defaultWave / 5 + 1)); + expect(gyarados.exp).toBe( + expBefore + Math.floor((getPokemonSpecies(Species.LIEPARD).baseExp * defaultWave) / 5 + 1), + ); }); it("should award EXP to a pokemon with a move in EXTORTION_MOVES", async () => { game.override.ability(Abilities.SYNCHRONIZE); // Not an extortion ability, so we can test extortion move - await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, [ Species.ABRA ]); + await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, [Species.ABRA]); const party = scene.getPlayerParty(); - const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA)!; - abra.moveset = [ new PokemonMove(Moves.BEAT_UP) ]; + const abra = party.find(pkm => pkm.species.speciesId === Species.ABRA)!; + abra.moveset = [new PokemonMove(Moves.BEAT_UP)]; const expBefore = abra.exp; await runMysteryEncounterToEnd(game, 2); await game.phaseInterceptor.to(SelectModifierPhase, false); - expect(abra.exp).toBe(expBefore + Math.floor(getPokemonSpecies(Species.LIEPARD).baseExp * defaultWave / 5 + 1)); + expect(abra.exp).toBe(expBefore + Math.floor((getPokemonSpecies(Species.LIEPARD).baseExp * defaultWave) / 5 + 1)); }); it("Should update the player's money properly", async () => { diff --git a/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts similarity index 91% rename from src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts rename to test/mystery-encounter/encounters/berries-abound-encounter.test.ts index f980b0cb20a..e19726f49fd 100644 --- a/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts +++ b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts @@ -2,16 +2,19 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { Mode } from "#app/ui/ui"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { BerryModifier } from "#app/modifier/modifier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { BerriesAboundEncounter } from "#app/data/mystery-encounters/encounters/berries-abound-encounter"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import * as EncounterDialogueUtils from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; @@ -20,7 +23,7 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import { Abilities } from "#enums/abilities"; const namespace = "mysteryEncounters/berriesAbound"; -const defaultParty = [ Species.PYUKUMUKU, Species.MAGIKARP, Species.PIKACHU ]; +const defaultParty = [Species.PYUKUMUKU, Species.MAGIKARP, Species.PIKACHU]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -36,7 +39,8 @@ describe("Berries Abound - Mystery Encounter", () => { beforeEach(async () => { game = new GameManager(phaserGame); scene = game.scene; - game.override.mysteryEncounterChance(100) + game.override + .mysteryEncounterChance(100) .mysteryEncounterTier(MysteryEncounterTier.COMMON) .startingWave(defaultWave) .startingBiome(defaultBiome) @@ -47,9 +51,7 @@ describe("Berries Abound - Mystery Encounter", () => { .enemyPassiveAbility(Abilities.BALL_FETCH); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( - new Map([ - [ Biome.CAVE, [ MysteryEncounterType.BERRIES_ABOUND ]], - ]) + new Map([[Biome.CAVE, [MysteryEncounterType.BERRIES_ABOUND]]]), ); }); @@ -152,7 +154,9 @@ describe("Berries Abound - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(5); for (const option of modifierSelectHandler.options) { expect(option.modifierTypeOption.type.id).toContain("BERRY"); @@ -191,7 +195,7 @@ describe("Berries Abound - Mystery Encounter", () => { expect(enemyField[0].species.speciesId).toBe(speciesToSpawn); // Should be enraged - expect(enemyField[0].summonData.statStages).toEqual([ 0, 1, 0, 1, 1, 0, 0 ]); + expect(enemyField[0].summonData.statStages).toEqual([0, 1, 0, 1, 1, 0, 0]); expect(encounterTextSpy).toHaveBeenCalledWith(`${namespace}:option.2.selected_bad`); }); @@ -215,7 +219,7 @@ describe("Berries Abound - Mystery Encounter", () => { expect(enemyField[0].species.speciesId).toBe(speciesToSpawn); // Should be enraged - expect(enemyField[0].summonData.statStages).toEqual([ 1, 1, 1, 1, 1, 0, 0 ]); + expect(enemyField[0].summonData.statStages).toEqual([1, 1, 1, 1, 1, 0, 0]); expect(encounterTextSpy).toHaveBeenCalledWith(`${namespace}:option.2.selected_bad`); }); @@ -235,7 +239,9 @@ describe("Berries Abound - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(5); for (const option of modifierSelectHandler.options) { expect(option.modifierTypeOption.type.id).toContain("BERRY"); diff --git a/src/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts similarity index 90% rename from src/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts rename to test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts index 1ff523909da..9befe77e688 100644 --- a/src/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts +++ b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts @@ -2,16 +2,20 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import { Moves } from "#enums/moves"; import type BattleScene from "#app/battle-scene"; import { PokemonMove } from "#app/field/pokemon"; import { Mode } from "#app/ui/ui"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { TrainerType } from "#enums/trainer-type"; import { MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases"; import { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier"; @@ -22,7 +26,7 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; const namespace = "mysteryEncounters/bugTypeSuperfan"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.WEEDLE ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.WEEDLE]; const defaultBiome = Biome.CAVE; const defaultWave = 24; @@ -49,7 +53,7 @@ const POOL_1_POKEMON = [ Species.CHARJABUG, Species.RIBOMBEE, Species.SPIDOPS, - Species.LOKIX + Species.LOKIX, ]; const POOL_2_POKEMON = [ @@ -78,26 +82,26 @@ const POOL_2_POKEMON = [ Species.KLEAVOR, ]; -const POOL_3_POKEMON: { species: Species, formIndex?: number }[] = [ +const POOL_3_POKEMON: { species: Species; formIndex?: number }[] = [ { species: Species.PINSIR, - formIndex: 1 + formIndex: 1, }, { species: Species.SCIZOR, - formIndex: 1 + formIndex: 1, }, { species: Species.HERACROSS, - formIndex: 1 + formIndex: 1, }, { species: Species.ORBEETLE, - formIndex: 1 + formIndex: 1, }, { species: Species.CENTISKORCH, - formIndex: 1 + formIndex: 1, }, { species: Species.DURANT, @@ -110,35 +114,19 @@ const POOL_3_POKEMON: { species: Species, formIndex?: number }[] = [ }, ]; -const POOL_4_POKEMON = [ - Species.GENESECT, - Species.SLITHER_WING, - Species.BUZZWOLE, - Species.PHEROMOSA -]; +const POOL_4_POKEMON = [Species.GENESECT, Species.SLITHER_WING, Species.BUZZWOLE, Species.PHEROMOSA]; const PHYSICAL_TUTOR_MOVES = [ Moves.MEGAHORN, Moves.X_SCISSOR, Moves.ATTACK_ORDER, Moves.PIN_MISSILE, - Moves.FIRST_IMPRESSION + Moves.FIRST_IMPRESSION, ]; -const SPECIAL_TUTOR_MOVES = [ - Moves.SILVER_WIND, - Moves.BUG_BUZZ, - Moves.SIGNAL_BEAM, - Moves.POLLEN_PUFF -]; +const SPECIAL_TUTOR_MOVES = [Moves.SILVER_WIND, Moves.BUG_BUZZ, Moves.SIGNAL_BEAM, Moves.POLLEN_PUFF]; -const STATUS_TUTOR_MOVES = [ - Moves.STRING_SHOT, - Moves.STICKY_WEB, - Moves.SILK_TRAP, - Moves.RAGE_POWDER, - Moves.HEAL_ORDER -]; +const STATUS_TUTOR_MOVES = [Moves.STRING_SHOT, Moves.STICKY_WEB, Moves.SILK_TRAP, Moves.RAGE_POWDER, Moves.HEAL_ORDER]; const MISC_TUTOR_MOVES = [ Moves.BUG_BITE, @@ -147,7 +135,7 @@ const MISC_TUTOR_MOVES = [ Moves.QUIVER_DANCE, Moves.TAIL_GLOW, Moves.INFESTATION, - Moves.U_TURN + Moves.U_TURN, ]; describe("Bug-Type Superfan - Mystery Encounter", () => { @@ -168,9 +156,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => { game.override.disableTrainerWaves(); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( - new Map([ - [ Biome.CAVE, [ MysteryEncounterType.BUG_TYPE_SUPERFAN ]], - ]) + new Map([[Biome.CAVE, [MysteryEncounterType.BUG_TYPE_SUPERFAN]]]), ); }); @@ -400,12 +386,12 @@ describe("Bug-Type Superfan - Mystery Encounter", () => { expect(option.dialogue).toStrictEqual({ buttonLabel: `${namespace}:option.2.label`, buttonTooltip: `${namespace}:option.2.tooltip`, - disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip` + disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`, }); }); it("should NOT be selectable if the player doesn't have any Bug types", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.ABRA ]); + await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [Species.ABRA]); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -431,21 +417,25 @@ describe("Bug-Type Superfan - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(2); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("SUPER_LURE"); expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toBe("GREAT_BALL"); }); it("should proceed to rewards screen with 2-3 Bug Types reward options", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.BUTTERFREE, Species.BEEDRILL ]); + await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [Species.BUTTERFREE, Species.BEEDRILL]); await runMysteryEncounterToEnd(game, 2); expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name); await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(3); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("QUICK_CLAW"); expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toBe("MAX_LURE"); @@ -453,14 +443,21 @@ describe("Bug-Type Superfan - Mystery Encounter", () => { }); it("should proceed to rewards screen with 4-5 Bug Types reward options", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.BUTTERFREE, Species.BEEDRILL, Species.GALVANTULA, Species.VOLCARONA ]); + await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ + Species.BUTTERFREE, + Species.BEEDRILL, + Species.GALVANTULA, + Species.VOLCARONA, + ]); await runMysteryEncounterToEnd(game, 2); expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name); await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(3); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("GRIP_CLAW"); expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toBe("MAX_LURE"); @@ -468,14 +465,23 @@ describe("Bug-Type Superfan - Mystery Encounter", () => { }); it("should proceed to rewards screen with 6 Bug Types reward options (including form change item)", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.BUTTERFREE, Species.BEEDRILL, Species.GALVANTULA, Species.VOLCARONA, Species.ANORITH, Species.GENESECT ]); + await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ + Species.BUTTERFREE, + Species.BEEDRILL, + Species.GALVANTULA, + Species.VOLCARONA, + Species.ANORITH, + Species.GENESECT, + ]); await runMysteryEncounterToEnd(game, 2); expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name); await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(4); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("MASTER_BALL"); expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toBe("MEGA_BRACELET"); @@ -538,9 +544,10 @@ describe("Bug-Type Superfan - Mystery Encounter", () => { it("should remove the gifted item and proceed to rewards screen", async () => { game.override.startingHeldItems([{ name: "GRIP_CLAW", count: 1 }]); - await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.BUTTERFREE ]); + await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [Species.BUTTERFREE]); - const gripClawCountBefore = scene.findModifier(m => m instanceof ContactHeldItemTransferChanceModifier)?.stackCount ?? 0; + const gripClawCountBefore = + scene.findModifier(m => m instanceof ContactHeldItemTransferChanceModifier)?.stackCount ?? 0; await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); @@ -548,12 +555,15 @@ describe("Bug-Type Superfan - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(2); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("MYSTERY_ENCOUNTER_GOLDEN_BUG_NET"); expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toBe("REVIVER_SEED"); - const gripClawCountAfter = scene.findModifier(m => m instanceof ContactHeldItemTransferChanceModifier)?.stackCount ?? 0; + const gripClawCountAfter = + scene.findModifier(m => m instanceof ContactHeldItemTransferChanceModifier)?.stackCount ?? 0; expect(gripClawCountBefore - 1).toBe(gripClawCountAfter); }); @@ -561,7 +571,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => { game.override.startingHeldItems([{ name: "GRIP_CLAW", count: 1 }]); const leaveEncounterWithoutBattleSpy = vi.spyOn(encounterPhaseUtils, "leaveEncounterWithoutBattle"); - await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.BUTTERFREE ]); + await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [Species.BUTTERFREE]); await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); expect(leaveEncounterWithoutBattleSpy).toBeCalled(); diff --git a/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts similarity index 86% rename from src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts rename to test/mystery-encounter/encounters/clowning-around-encounter.test.ts index ae52ffc0fef..4bbe76e5c72 100644 --- a/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts +++ b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts @@ -2,13 +2,16 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import * as BattleAnims from "#app/data/battle-anims"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import { Moves } from "#enums/moves"; import type BattleScene from "#app/battle-scene"; import type Pokemon from "#app/field/pokemon"; @@ -16,7 +19,7 @@ import { PokemonMove } from "#app/field/pokemon"; import { Mode } from "#app/ui/ui"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { ClowningAroundEncounter } from "#app/data/mystery-encounters/encounters/clowning-around-encounter"; import { TrainerType } from "#enums/trainer-type"; @@ -29,14 +32,14 @@ import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; import { BerryType } from "#enums/berry-type"; import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { CommandPhase } from "#app/phases/command-phase"; import { MovePhase } from "#app/phases/move-phase"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import { NewBattlePhase } from "#app/phases/new-battle-phase"; const namespace = "mysteryEncounters/clowningAround"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -58,9 +61,7 @@ describe("Clowning Around - Mystery Encounter", () => { game.override.disableTrainerWaves(); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( - new Map([ - [ Biome.CAVE, [ MysteryEncounterType.CLOWNING_AROUND ]], - ]) + new Map([[Biome.CAVE, [MysteryEncounterType.CLOWNING_AROUND]]]), ); }); @@ -116,13 +117,13 @@ describe("Clowning Around - Mystery Encounter", () => { expect(config.pokemonConfigs?.[0]).toEqual({ species: getPokemonSpecies(Species.MR_MIME), isBoss: true, - moveSet: [ Moves.TEETER_DANCE, Moves.ALLY_SWITCH, Moves.DAZZLING_GLEAM, Moves.PSYCHIC ] + moveSet: [Moves.TEETER_DANCE, Moves.ALLY_SWITCH, Moves.DAZZLING_GLEAM, Moves.PSYCHIC], }); expect(config.pokemonConfigs?.[1]).toEqual({ species: getPokemonSpecies(Species.BLACEPHALON), customPokemonData: expect.anything(), isBoss: true, - moveSet: [ Moves.TRICK, Moves.HYPNOSIS, Moves.SHADOW_BALL, Moves.MIND_BLOWN ] + moveSet: [Moves.TRICK, Moves.HYPNOSIS, Moves.SHADOW_BALL, Moves.MIND_BLOWN], }); expect(config.pokemonConfigs?.[1].customPokemonData?.types.length).toBe(2); expect([ @@ -140,7 +141,7 @@ describe("Clowning Around - Mystery Encounter", () => { Abilities.MISTY_SURGE, Abilities.MAGICIAN, Abilities.SHEER_FORCE, - Abilities.PRANKSTER + Abilities.PRANKSTER, ]).toContain(config.pokemonConfigs?.[1].customPokemonData?.ability); expect(ClowningAroundEncounter.misc.ability).toBe(config.pokemonConfigs?.[1].customPokemonData?.ability); await vi.waitFor(() => expect(moveInitSpy).toHaveBeenCalled()); @@ -175,9 +176,19 @@ describe("Clowning Around - Mystery Encounter", () => { expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); expect(enemyField.length).toBe(2); expect(enemyField[0].species.speciesId).toBe(Species.MR_MIME); - expect(enemyField[0].moveset).toEqual([ new PokemonMove(Moves.TEETER_DANCE), new PokemonMove(Moves.ALLY_SWITCH), new PokemonMove(Moves.DAZZLING_GLEAM), new PokemonMove(Moves.PSYCHIC) ]); + expect(enemyField[0].moveset).toEqual([ + new PokemonMove(Moves.TEETER_DANCE), + new PokemonMove(Moves.ALLY_SWITCH), + new PokemonMove(Moves.DAZZLING_GLEAM), + new PokemonMove(Moves.PSYCHIC), + ]); expect(enemyField[1].species.speciesId).toBe(Species.BLACEPHALON); - expect(enemyField[1].moveset).toEqual([ new PokemonMove(Moves.TRICK), new PokemonMove(Moves.HYPNOSIS), new PokemonMove(Moves.SHADOW_BALL), new PokemonMove(Moves.MIND_BLOWN) ]); + expect(enemyField[1].moveset).toEqual([ + new PokemonMove(Moves.TRICK), + new PokemonMove(Moves.HYPNOSIS), + new PokemonMove(Moves.SHADOW_BALL), + new PokemonMove(Moves.MIND_BLOWN), + ]); // Should have used moves pre-battle const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]); @@ -253,14 +264,14 @@ describe("Clowning Around - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.CLOWNING_AROUND, defaultParty); // Set some moves on party for attack type booster generation - scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.THIEF) ]; + scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.THIEF)]; // 2 Sitrus Berries on lead scene.modifiers = []; - let itemType = generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ]) as PokemonHeldItemModifierType; + let itemType = generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS]) as PokemonHeldItemModifierType; await addItemToPokemon(scene, scene.getPlayerParty()[0], 2, itemType); // 2 Ganlon Berries on lead - itemType = generateModifierType(modifierTypes.BERRY, [ BerryType.GANLON ]) as PokemonHeldItemModifierType; + itemType = generateModifierType(modifierTypes.BERRY, [BerryType.GANLON]) as PokemonHeldItemModifierType; await addItemToPokemon(scene, scene.getPlayerParty()[0], 2, itemType); // 5 Golden Punch on lead (ultra) itemType = generateModifierType(modifierTypes.GOLDEN_PUNCH) as PokemonHeldItemModifierType; @@ -338,9 +349,9 @@ describe("Clowning Around - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.CLOWNING_AROUND, defaultParty); // Same type moves on lead - scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.ICE_BEAM), new PokemonMove(Moves.SURF) ]; + scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.ICE_BEAM), new PokemonMove(Moves.SURF)]; // Different type moves on second - scene.getPlayerParty()[1].moveset = [ new PokemonMove(Moves.GRASS_KNOT), new PokemonMove(Moves.ELECTRO_BALL) ]; + scene.getPlayerParty()[1].moveset = [new PokemonMove(Moves.GRASS_KNOT), new PokemonMove(Moves.ELECTRO_BALL)]; // No moves on third scene.getPlayerParty()[2].moveset = []; await runMysteryEncounterToEnd(game, 3); @@ -350,15 +361,15 @@ describe("Clowning Around - Mystery Encounter", () => { const thirdTypesAfter = scene.getPlayerParty()[2].getTypes(); expect(leadTypesAfter.length).toBe(2); - expect(leadTypesAfter[0]).toBe(Type.WATER); - expect([ Type.WATER, Type.ICE ].includes(leadTypesAfter[1])).toBeFalsy(); + expect(leadTypesAfter[0]).toBe(PokemonType.WATER); + expect([PokemonType.WATER, PokemonType.ICE].includes(leadTypesAfter[1])).toBeFalsy(); expect(secondaryTypesAfter.length).toBe(2); - expect(secondaryTypesAfter[0]).toBe(Type.GHOST); - expect([ Type.GHOST, Type.POISON ].includes(secondaryTypesAfter[1])).toBeFalsy(); - expect([ Type.GRASS, Type.ELECTRIC ].includes(secondaryTypesAfter[1])).toBeTruthy(); + expect(secondaryTypesAfter[0]).toBe(PokemonType.GHOST); + expect([PokemonType.GHOST, PokemonType.POISON].includes(secondaryTypesAfter[1])).toBeFalsy(); + expect([PokemonType.GRASS, PokemonType.ELECTRIC].includes(secondaryTypesAfter[1])).toBeTruthy(); expect(thirdTypesAfter.length).toBe(2); - expect(thirdTypesAfter[0]).toBe(Type.PSYCHIC); - expect(secondaryTypesAfter[1]).not.toBe(Type.PSYCHIC); + expect(thirdTypesAfter[0]).toBe(PokemonType.PSYCHIC); + expect(secondaryTypesAfter[1]).not.toBe(PokemonType.PSYCHIC); }); it("should leave encounter without battle", async () => { @@ -372,9 +383,14 @@ describe("Clowning Around - Mystery Encounter", () => { }); }); -async function addItemToPokemon(scene: BattleScene, pokemon: Pokemon, stackCount: integer, itemType: PokemonHeldItemModifierType) { +async function addItemToPokemon( + scene: BattleScene, + pokemon: Pokemon, + stackCount: number, + itemType: PokemonHeldItemModifierType, +) { const itemMod = itemType.newModifier(pokemon) as PokemonHeldItemModifier; itemMod.stackCount = stackCount; - await scene.addModifier(itemMod, true, false, false, true); + scene.addModifier(itemMod, true, false, false, true); await scene.updateModifiers(true); } diff --git a/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts similarity index 90% rename from src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts rename to test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts index 795e6b6650b..a4c1052463c 100644 --- a/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts +++ b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts @@ -1,10 +1,14 @@ import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; @@ -21,7 +25,7 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import { LearnMovePhase } from "#app/phases/learn-move-phase"; const namespace = "mysteryEncounters/dancingLessons"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.PLAINS; const defaultWave = 45; @@ -44,9 +48,9 @@ describe("Dancing Lessons - Mystery Encounter", () => { vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( new Map([ - [ Biome.PLAINS, [ MysteryEncounterType.DANCING_LESSONS ]], - [ Biome.SPACE, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], - ]) + [Biome.PLAINS, [MysteryEncounterType.DANCING_LESSONS]], + [Biome.SPACE, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], + ]), ); }); @@ -107,7 +111,7 @@ describe("Dancing Lessons - Mystery Encounter", () => { expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); expect(enemyField.length).toBe(1); expect(enemyField[0].species.speciesId).toBe(Species.ORICORIO); - expect(enemyField[0].summonData.statStages).toEqual([ 1, 1, 1, 1, 0, 0, 0 ]); + expect(enemyField[0].summonData.statStages).toEqual([1, 1, 1, 1, 0, 0, 0]); const moveset = enemyField[0].moveset.map(m => m?.moveId); expect(moveset.some(m => m === Moves.REVELATION_DANCE)).toBeTruthy(); @@ -123,15 +127,15 @@ describe("Dancing Lessons - Mystery Encounter", () => { partyLead.level = 1000; partyLead.calculateStats(); await runMysteryEncounterToEnd(game, 1, undefined, true); - // For some reason updateModifiers breaks in this test and does not resolve promise - vi.spyOn(game.scene, "updateModifiers").mockImplementation(() => new Promise(resolve => resolve())); await skipBattleRunMysteryEncounterRewardsPhase(game); await game.phaseInterceptor.to(SelectModifierPhase, false); expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name); await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(3); // Should fill remaining expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toContain("BATON"); }); @@ -197,7 +201,7 @@ describe("Dancing Lessons - Mystery Encounter", () => { it("should add Oricorio to the party", async () => { await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty); const partyCountBefore = scene.getPlayerParty().length; - scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.DRAGON_DANCE) ]; + scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.DRAGON_DANCE)]; await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); const partyCountAfter = scene.getPlayerParty().length; @@ -212,7 +216,7 @@ describe("Dancing Lessons - Mystery Encounter", () => { it("should NOT be selectable if the player doesn't have a Dance type move", async () => { await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty); const partyCountBefore = scene.getPlayerParty().length; - scene.getPlayerParty().forEach(p => p.moveset = []); + scene.getPlayerParty().forEach(p => (p.moveset = [])); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -236,7 +240,7 @@ describe("Dancing Lessons - Mystery Encounter", () => { const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty); - scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.DRAGON_DANCE) ]; + scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.DRAGON_DANCE)]; await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); expect(leaveEncounterWithoutBattleSpy).toBeCalled(); diff --git a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts b/test/mystery-encounter/encounters/delibirdy-encounter.test.ts similarity index 91% rename from src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts rename to test/mystery-encounter/encounters/delibirdy-encounter.test.ts index f99aa24805e..94faf070a39 100644 --- a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts +++ b/test/mystery-encounter/encounters/delibirdy-encounter.test.ts @@ -1,24 +1,36 @@ import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { DelibirdyEncounter } from "#app/data/mystery-encounters/encounters/delibirdy-encounter"; import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; import type { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { BerryModifier, HealingBoosterModifier, HitHealModifier, LevelIncrementBoosterModifier, MoneyMultiplierModifier, PokemonInstantReviveModifier, PokemonNatureWeightModifier, PreserveBerryModifier } from "#app/modifier/modifier"; +import { + BerryModifier, + HealingBoosterModifier, + HitHealModifier, + LevelIncrementBoosterModifier, + MoneyMultiplierModifier, + PokemonInstantReviveModifier, + PokemonNatureWeightModifier, + PreserveBerryModifier, +} from "#app/modifier/modifier"; import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { modifierTypes } from "#app/modifier/modifier-type"; import { BerryType } from "#enums/berry-type"; const namespace = "mysteryEncounters/delibirdy"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -40,9 +52,7 @@ describe("Delibird-y - Mystery Encounter", () => { game.override.disableTrainerWaves(); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( - new Map([ - [ Biome.CAVE, [ MysteryEncounterType.DELIBIRDY ]], - ]) + new Map([[Biome.CAVE, [MysteryEncounterType.DELIBIRDY]]]), ); }); @@ -98,7 +108,8 @@ describe("Delibird-y - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.DELIBIRDY, defaultParty); await runMysteryEncounterToEnd(game, 1); - const price = (scene.currentBattle.mysteryEncounter?.options[0].requirements[0] as MoneyRequirement).requiredMoney; + const price = (scene.currentBattle.mysteryEncounter?.options[0].requirements[0] as MoneyRequirement) + .requiredMoney; expect(updateMoneySpy).toHaveBeenCalledWith(-price, true, false); expect(scene.money).toBe(initialMoney - price); @@ -123,7 +134,7 @@ describe("Delibird-y - Mystery Encounter", () => { scene.modifiers = []; const amuletCoin = generateModifierType(modifierTypes.AMULET_COIN)!.newModifier() as MoneyMultiplierModifier; amuletCoin.stackCount = 5; - await scene.addModifier(amuletCoin, true, false, false, true); + scene.addModifier(amuletCoin, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 1); @@ -190,10 +201,10 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 2 Sitrus berries on party lead scene.modifiers = []; - const sitrus = generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ])!; + const sitrus = generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS])!; const sitrusMod = sitrus.newModifier(scene.getPlayerParty()[0]) as BerryModifier; sitrusMod.stackCount = 2; - await scene.addModifier(sitrusMod, true, false, false, true); + scene.addModifier(sitrusMod, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 }); @@ -214,7 +225,7 @@ describe("Delibird-y - Mystery Encounter", () => { const revSeed = generateModifierType(modifierTypes.REVIVER_SEED)!; const modifier = revSeed.newModifier(scene.getPlayerParty()[0]) as PokemonInstantReviveModifier; modifier.stackCount = 1; - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 }); @@ -234,13 +245,13 @@ describe("Delibird-y - Mystery Encounter", () => { scene.modifiers = []; const candyJar = generateModifierType(modifierTypes.CANDY_JAR)!.newModifier() as LevelIncrementBoosterModifier; candyJar.stackCount = 99; - await scene.addModifier(candyJar, true, false, false, true); - const sitrus = generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ])!; + scene.addModifier(candyJar, true, false, false, true); + const sitrus = generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS])!; // Sitrus berries on party const sitrusMod = sitrus.newModifier(scene.getPlayerParty()[0]) as BerryModifier; sitrusMod.stackCount = 2; - await scene.addModifier(sitrusMod, true, false, false, true); + scene.addModifier(sitrusMod, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 }); @@ -263,13 +274,13 @@ describe("Delibird-y - Mystery Encounter", () => { scene.modifiers = []; const healingCharm = generateModifierType(modifierTypes.BERRY_POUCH)!.newModifier() as PreserveBerryModifier; healingCharm.stackCount = 3; - await scene.addModifier(healingCharm, true, false, false, true); + scene.addModifier(healingCharm, true, false, false, true); // Set 1 Reviver Seed on party lead const revSeed = generateModifierType(modifierTypes.REVIVER_SEED)!; const modifier = revSeed.newModifier(scene.getPlayerParty()[0]) as PokemonInstantReviveModifier; modifier.stackCount = 1; - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 }); @@ -292,7 +303,7 @@ describe("Delibird-y - Mystery Encounter", () => { scene.modifiers = []; const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!; const modifier = soulDew.newModifier(scene.getPlayerParty()[0]); - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await game.phaseInterceptor.to(MysteryEncounterPhase, false); @@ -321,7 +332,7 @@ describe("Delibird-y - Mystery Encounter", () => { const revSeed = generateModifierType(modifierTypes.REVIVER_SEED)!; const modifier = revSeed.newModifier(scene.getPlayerParty()[0]) as PokemonInstantReviveModifier; modifier.stackCount = 1; - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 }); @@ -355,7 +366,7 @@ describe("Delibird-y - Mystery Encounter", () => { const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!; const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 2; - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); @@ -376,7 +387,7 @@ describe("Delibird-y - Mystery Encounter", () => { const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!; const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 1; - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); @@ -396,13 +407,13 @@ describe("Delibird-y - Mystery Encounter", () => { scene.modifiers = []; const healingCharm = generateModifierType(modifierTypes.HEALING_CHARM)!.newModifier() as HealingBoosterModifier; healingCharm.stackCount = 5; - await scene.addModifier(healingCharm, true, false, false, true); + scene.addModifier(healingCharm, true, false, false, true); // Set 1 Soul Dew on party lead const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!; const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 1; - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); @@ -425,7 +436,7 @@ describe("Delibird-y - Mystery Encounter", () => { scene.modifiers = []; const revSeed = generateModifierType(modifierTypes.REVIVER_SEED)!; const modifier = revSeed.newModifier(scene.getPlayerParty()[0]); - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await game.phaseInterceptor.to(MysteryEncounterPhase, false); @@ -455,7 +466,7 @@ describe("Delibird-y - Mystery Encounter", () => { const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!; const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 1; - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); diff --git a/src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts similarity index 87% rename from src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts rename to test/mystery-encounter/encounters/department-store-sale-encounter.test.ts index e30aaadbf85..d4b0de30535 100644 --- a/src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts +++ b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts @@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; @@ -16,7 +16,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; const namespace = "mysteryEncounters/departmentStoreSale"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.PLAINS; const defaultWave = 37; @@ -38,10 +38,10 @@ describe("Department Store Sale - Mystery Encounter", () => { game.override.disableTrainerWaves(); const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], + [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], ]); CIVILIZATION_ENCOUNTER_BIOMES.forEach(biome => { - biomeMap.set(biome, [ MysteryEncounterType.DEPARTMENT_STORE_SALE ]); + biomeMap.set(biome, [MysteryEncounterType.DEPARTMENT_STORE_SALE]); }); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -63,10 +63,12 @@ describe("Department Store Sale - Mystery Encounter", () => { { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue`, - } + }, ]); expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`); - expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`); + expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue?.description).toBe( + `${namespace}:description`, + ); expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`); expect(DepartmentStoreSaleEncounter.options.length).toBe(4); }); @@ -97,7 +99,9 @@ describe("Department Store Sale - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(5); for (const option of modifierSelectHandler.options) { expect(option.modifierTypeOption.type.id).toContain("TM_"); @@ -132,11 +136,15 @@ describe("Department Store Sale - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(3); for (const option of modifierSelectHandler.options) { - expect(option.modifierTypeOption.type.id.includes("PP_UP") || - option.modifierTypeOption.type.id.includes("BASE_STAT_BOOSTER")).toBeTruthy(); + expect( + option.modifierTypeOption.type.id.includes("PP_UP") || + option.modifierTypeOption.type.id.includes("BASE_STAT_BOOSTER"), + ).toBeTruthy(); } }); @@ -168,11 +176,15 @@ describe("Department Store Sale - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(5); for (const option of modifierSelectHandler.options) { - expect(option.modifierTypeOption.type.id.includes("DIRE_HIT") || - option.modifierTypeOption.type.id.includes("TEMP_STAT_STAGE_BOOSTER")).toBeTruthy(); + expect( + option.modifierTypeOption.type.id.includes("DIRE_HIT") || + option.modifierTypeOption.type.id.includes("TEMP_STAT_STAGE_BOOSTER"), + ).toBeTruthy(); } }); @@ -204,7 +216,9 @@ describe("Department Store Sale - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(4); for (const option of modifierSelectHandler.options) { expect(option.modifierTypeOption.type.id).toContain("BALL"); diff --git a/src/test/mystery-encounter/encounters/field-trip-encounter.test.ts b/test/mystery-encounter/encounters/field-trip-encounter.test.ts similarity index 75% rename from src/test/mystery-encounter/encounters/field-trip-encounter.test.ts rename to test/mystery-encounter/encounters/field-trip-encounter.test.ts index bc9be246e10..8bd35d6013f 100644 --- a/src/test/mystery-encounter/encounters/field-trip-encounter.test.ts +++ b/test/mystery-encounter/encounters/field-trip-encounter.test.ts @@ -1,7 +1,7 @@ import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; @@ -17,7 +17,7 @@ import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import i18next from "i18next"; const namespace = "mysteryEncounters/fieldTrip"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -37,12 +37,10 @@ describe("Field Trip - Mystery Encounter", () => { game.override.startingWave(defaultWave); game.override.startingBiome(defaultBiome); game.override.disableTrainerWaves(); - game.override.moveset([ Moves.TACKLE, Moves.UPROAR, Moves.SWORDS_DANCE ]); + game.override.moveset([Moves.TACKLE, Moves.UPROAR, Moves.SWORDS_DANCE]); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( - new Map([ - [ Biome.CAVE, [ MysteryEncounterType.FIELD_TRIP ]], - ]) + new Map([[Biome.CAVE, [MysteryEncounterType.FIELD_TRIP]]]), ); }); @@ -60,12 +58,12 @@ describe("Field Trip - Mystery Encounter", () => { expect(FieldTripEncounter.dialogue).toBeDefined(); expect(FieldTripEncounter.dialogue.intro).toStrictEqual([ { - text: `${namespace}:intro` + text: `${namespace}:intro`, }, { speaker: `${namespace}:speaker`, - text: `${namespace}:intro_dialogue` - } + text: `${namespace}:intro_dialogue`, + }, ]); expect(FieldTripEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`); expect(FieldTripEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`); @@ -91,7 +89,9 @@ describe("Field Trip - Mystery Encounter", () => { await game.phaseInterceptor.to(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(0); }); @@ -101,13 +101,25 @@ describe("Field Trip - Mystery Encounter", () => { await game.phaseInterceptor.to(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(5); - expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_attack")); - expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_defense")); - expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_speed")); - expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.DIRE_HIT.name")); - expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.RARER_CANDY.name")); + expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:TempStatStageBoosterItem.x_attack"), + ); + expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:TempStatStageBoosterItem.x_defense"), + ); + expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:TempStatStageBoosterItem.x_speed"), + ); + expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:ModifierType.DIRE_HIT.name"), + ); + expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:ModifierType.RARER_CANDY.name"), + ); }); it("should leave encounter without battle", async () => { @@ -138,7 +150,9 @@ describe("Field Trip - Mystery Encounter", () => { await game.phaseInterceptor.to(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(0); }); @@ -148,13 +162,25 @@ describe("Field Trip - Mystery Encounter", () => { await game.phaseInterceptor.to(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(5); - expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_sp_atk")); - expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_sp_def")); - expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_speed")); - expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.DIRE_HIT.name")); - expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.RARER_CANDY.name")); + expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:TempStatStageBoosterItem.x_sp_atk"), + ); + expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:TempStatStageBoosterItem.x_sp_def"), + ); + expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:TempStatStageBoosterItem.x_speed"), + ); + expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:ModifierType.DIRE_HIT.name"), + ); + expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:ModifierType.RARER_CANDY.name"), + ); }); it("should leave encounter without battle", async () => { @@ -185,7 +211,9 @@ describe("Field Trip - Mystery Encounter", () => { await game.phaseInterceptor.to(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(0); }); @@ -196,14 +224,32 @@ describe("Field Trip - Mystery Encounter", () => { await game.phaseInterceptor.to(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(5); - expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_accuracy")); - expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_speed")); - expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.AddPokeballModifierType.name", { modifierCount: 5, pokeballName: i18next.t("pokeball:greatBall") })); - expect(i18next.t).toHaveBeenCalledWith(("modifierType:ModifierType.AddPokeballModifierType.name"), expect.objectContaining({ modifierCount: 5 })); - expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.IV_SCANNER.name")); - expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.RARER_CANDY.name")); + expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:TempStatStageBoosterItem.x_accuracy"), + ); + expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:TempStatStageBoosterItem.x_speed"), + ); + expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:ModifierType.AddPokeballModifierType.name", { + modifierCount: 5, + pokeballName: i18next.t("pokeball:greatBall"), + }), + ); + expect(i18next.t).toHaveBeenCalledWith( + "modifierType:ModifierType.AddPokeballModifierType.name", + expect.objectContaining({ modifierCount: 5 }), + ); + expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:ModifierType.IV_SCANNER.name"), + ); + expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe( + i18next.t("modifierType:ModifierType.RARER_CANDY.name"), + ); }); it("should leave encounter without battle", async () => { diff --git a/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts similarity index 83% rename from src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts rename to test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts index 2f668dd7f50..3d311134d4e 100644 --- a/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts +++ b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts @@ -2,23 +2,27 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#enums/biome"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { FieryFalloutEncounter } from "#app/data/mystery-encounters/encounters/fiery-fallout-encounter"; import { Gender } from "#app/data/gender"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import * as BattleAnims from "#app/data/battle-anims"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import { Moves } from "#enums/moves"; import type BattleScene from "#app/battle-scene"; import { AttackTypeBoosterModifier, PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { Status } from "#app/data/status-effect"; import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { CommandPhase } from "#app/phases/command-phase"; import { MovePhase } from "#app/phases/move-phase"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; @@ -29,7 +33,7 @@ import { StatusEffect } from "#enums/status-effect"; const namespace = "mysteryEncounters/fieryFallout"; /** Arcanine and Ninetails for 2 Fire types. Lapras, Gengar, Abra for burnable mon. */ -const defaultParty = [ Species.ARCANINE, Species.NINETALES, Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.ARCANINE, Species.NINETALES, Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.VOLCANO; const defaultWave = 56; @@ -45,17 +49,18 @@ describe("Fiery Fallout - Mystery Encounter", () => { beforeEach(async () => { game = new GameManager(phaserGame); scene = game.scene; - game.override.mysteryEncounterChance(100) + game.override + .mysteryEncounterChance(100) .startingWave(defaultWave) .startingBiome(defaultBiome) .disableTrainerWaves() - .moveset([ Moves.PAYBACK, Moves.THUNDERBOLT ]); // Required for attack type booster item generation + .moveset([Moves.PAYBACK, Moves.THUNDERBOLT]); // Required for attack type booster item generation vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.FIERY_FALLOUT ]], - [ Biome.MOUNTAIN, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], - ]) + [Biome.VOLCANO, [MysteryEncounterType.FIERY_FALLOUT]], + [Biome.MOUNTAIN, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], + ]), ); }); @@ -114,20 +119,20 @@ describe("Fiery Fallout - Mystery Encounter", () => { species: getPokemonSpecies(Species.VOLCARONA), isBoss: false, gender: Gender.MALE, - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], - mysteryEncounterBattleEffects: expect.any(Function) + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], + mysteryEncounterBattleEffects: expect.any(Function), }, { species: getPokemonSpecies(Species.VOLCARONA), isBoss: false, gender: Gender.FEMALE, - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], - mysteryEncounterBattleEffects: expect.any(Function) - } + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], + mysteryEncounterBattleEffects: expect.any(Function), + }, ], doubleBattle: true, - disableSwitch: true - } + disableSwitch: true, + }, ]); expect(weatherSpy).toHaveBeenCalledTimes(1); await vi.waitFor(() => expect(moveInitSpy).toHaveBeenCalled()); @@ -177,8 +182,10 @@ describe("Fiery Fallout - Mystery Encounter", () => { expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name); const leadPokemonId = scene.getPlayerParty()?.[0].id; - const leadPokemonItems = scene.findModifiers(m => m instanceof PokemonHeldItemModifier - && (m as PokemonHeldItemModifier).pokemonId === leadPokemonId, true) as PokemonHeldItemModifier[]; + const leadPokemonItems = scene.findModifiers( + m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === leadPokemonId, + true, + ) as PokemonHeldItemModifier[]; const item = leadPokemonItems.find(i => i instanceof AttackTypeBoosterModifier); expect(item).toBeDefined; }); @@ -204,22 +211,30 @@ describe("Fiery Fallout - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.FIERY_FALLOUT, defaultParty); const party = scene.getPlayerParty(); - const lapras = party.find((pkm) => pkm.species.speciesId === Species.LAPRAS)!; + const lapras = party.find(pkm => pkm.species.speciesId === Species.LAPRAS)!; lapras.status = new Status(StatusEffect.POISON); - const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA)!; + const abra = party.find(pkm => pkm.species.speciesId === Species.ABRA)!; vi.spyOn(abra, "isAllowedInBattle").mockReturnValue(false); await runMysteryEncounterToEnd(game, 2); - const burnablePokemon = party.filter((pkm) => pkm.isAllowedInBattle() && !pkm.getTypes().includes(Type.FIRE)); - const notBurnablePokemon = party.filter((pkm) => !pkm.isAllowedInBattle() || pkm.getTypes().includes(Type.FIRE)); + const burnablePokemon = party.filter( + pkm => pkm.isAllowedInBattle() && !pkm.getTypes().includes(PokemonType.FIRE), + ); + const notBurnablePokemon = party.filter( + pkm => !pkm.isAllowedInBattle() || pkm.getTypes().includes(PokemonType.FIRE), + ); expect(scene.currentBattle.mysteryEncounter?.dialogueTokens["burnedPokemon"]).toBe(i18next.t("pokemon:gengar")); - burnablePokemon.forEach((pkm) => { - expect(pkm.hp, `${pkm.name} should have received 20% damage: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp() - Math.floor(pkm.getMaxHp() * 0.2)); + burnablePokemon.forEach(pkm => { + expect(pkm.hp, `${pkm.name} should have received 20% damage: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe( + pkm.getMaxHp() - Math.floor(pkm.getMaxHp() * 0.2), + ); }); expect(burnablePokemon.some(pkm => pkm.status?.effect === StatusEffect.BURN)).toBeTruthy(); expect(burnablePokemon.some(pkm => pkm.customPokemonData.ability === Abilities.HEATPROOF)); - notBurnablePokemon.forEach((pkm) => expect(pkm.hp, `${pkm.name} should be full hp: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp())); + notBurnablePokemon.forEach(pkm => + expect(pkm.hp, `${pkm.name} should be full hp: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp()), + ); }); it("should leave encounter without battle", async () => { @@ -270,12 +285,12 @@ describe("Fiery Fallout - Mystery Encounter", () => { }); it("should be disabled if not enough FIRE types are in party", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.FIERY_FALLOUT, [ Species.MAGIKARP ]); + await game.runToMysteryEncounter(MysteryEncounterType.FIERY_FALLOUT, [Species.MAGIKARP]); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); expect(encounterPhase?.constructor.name).toBe(MysteryEncounterPhase.name); - const continueEncounterSpy = vi.spyOn((encounterPhase as MysteryEncounterPhase), "continueEncounter"); + const continueEncounterSpy = vi.spyOn(encounterPhase as MysteryEncounterPhase, "continueEncounter"); await runSelectMysteryEncounterOption(game, 3); diff --git a/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts similarity index 90% rename from src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts rename to test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts index 8c869812f39..d233e72932a 100644 --- a/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts +++ b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts @@ -2,9 +2,13 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import { Moves } from "#enums/moves"; import type BattleScene from "#app/battle-scene"; import { PokemonMove } from "#app/field/pokemon"; @@ -12,7 +16,7 @@ import { Mode } from "#app/ui/ui"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { FightOrFlightEncounter } from "#app/data/mystery-encounters/encounters/fight-or-flight-encounter"; import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; @@ -20,7 +24,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; const namespace = "mysteryEncounters/fightOrFlight"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -42,9 +46,7 @@ describe("Fight or Flight - Mystery Encounter", () => { game.override.disableTrainerWaves(); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( - new Map([ - [ Biome.CAVE, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]], - ]) + new Map([[Biome.CAVE, [MysteryEncounterType.FIGHT_OR_FLIGHT]]]), ); }); @@ -126,7 +128,9 @@ describe("Fight or Flight - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(1); expect(item.type.name).toBe(modifierSelectHandler.options[0].modifierTypeOption.type.name); }); @@ -144,14 +148,14 @@ describe("Fight or Flight - Mystery Encounter", () => { selected: [ { text: `${namespace}:option.2.selected`, - } + }, ], }); }); it("should NOT be selectable if the player doesn't have a Stealing move", async () => { await game.runToMysteryEncounter(MysteryEncounterType.FIGHT_OR_FLIGHT, defaultParty); - scene.getPlayerParty().forEach(p => p.moveset = []); + scene.getPlayerParty().forEach(p => (p.moveset = [])); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -175,7 +179,7 @@ describe("Fight or Flight - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.FIGHT_OR_FLIGHT, defaultParty); // Mock moveset - scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.KNOCK_OFF) ]; + scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.KNOCK_OFF)]; const item = game.scene.currentBattle.mysteryEncounter!.misc; await runMysteryEncounterToEnd(game, 2); @@ -184,7 +188,9 @@ describe("Fight or Flight - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(1); expect(item.type.name).toBe(modifierSelectHandler.options[0].modifierTypeOption.type.name); diff --git a/src/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts similarity index 89% rename from src/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts rename to test/mystery-encounter/encounters/fun-and-games-encounter.test.ts index 44ddbb8f7ba..4bb44c4d19e 100644 --- a/src/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts +++ b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts @@ -3,14 +3,17 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { Mode } from "#app/ui/ui"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import { Nature } from "#enums/nature"; @@ -23,7 +26,7 @@ import { Command } from "#app/ui/command-ui-handler"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; const namespace = "mysteryEncounters/funAndGames"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -44,11 +47,9 @@ describe("Fun And Games! - Mystery Encounter", () => { game.override.startingBiome(defaultBiome); game.override.disableTrainerWaves(); - const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]], - ]); + const biomeMap = new Map([[Biome.VOLCANO, [MysteryEncounterType.FIGHT_OR_FLIGHT]]]); HUMAN_TRANSITABLE_BIOMES.forEach(biome => { - biomeMap.set(biome, [ MysteryEncounterType.FUN_AND_GAMES ]); + biomeMap.set(biome, [MysteryEncounterType.FUN_AND_GAMES]); }); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -69,7 +70,7 @@ describe("Fun And Games! - Mystery Encounter", () => { { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue`, - } + }, ]); expect(FunAndGamesEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`); expect(FunAndGamesEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`); @@ -137,13 +138,13 @@ describe("Fun And Games! - Mystery Encounter", () => { it("should get 3 turns to attack the Wobbuffet for a reward", async () => { scene.money = 20000; - game.override.moveset([ Moves.TACKLE ]); + game.override.moveset([Moves.TACKLE]); await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty); await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true); expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); expect(scene.getEnemyPokemon()?.species.speciesId).toBe(Species.WOBBUFFET); - expect(scene.getEnemyPokemon()?.ivs).toEqual([ 0, 0, 0, 0, 0, 0 ]); + expect(scene.getEnemyPokemon()?.ivs).toEqual([0, 0, 0, 0, 0, 0]); expect(scene.getEnemyPokemon()?.nature).toBe(Nature.MILD); game.onNextPrompt("MessagePhase", Mode.MESSAGE, () => { @@ -186,13 +187,15 @@ describe("Fun And Games! - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(0); }); it("should have Wide Lens item in rewards if Wubboffet is at 15-33% HP remaining", async () => { scene.money = 20000; - game.override.moveset([ Moves.SPLASH ]); + game.override.moveset([Moves.SPLASH]); await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty); await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true); @@ -213,14 +216,16 @@ describe("Fun And Games! - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(1); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("WIDE_LENS"); }); it("should have Scope Lens item in rewards if Wubboffet is at 3-15% HP remaining", async () => { scene.money = 20000; - game.override.moveset([ Moves.SPLASH ]); + game.override.moveset([Moves.SPLASH]); await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty); await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true); @@ -241,14 +246,16 @@ describe("Fun And Games! - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(1); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("SCOPE_LENS"); }); it("should have Multi Lens item in rewards if Wubboffet is at <3% HP remaining", async () => { scene.money = 20000; - game.override.moveset([ Moves.SPLASH ]); + game.override.moveset([Moves.SPLASH]); await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty); await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true); @@ -269,7 +276,9 @@ describe("Fun And Games! - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(1); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MULTI_LENS"); }); diff --git a/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts similarity index 94% rename from src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts rename to test/mystery-encounter/encounters/global-trade-system-encounter.test.ts index fb5801c941a..f68561c2286 100644 --- a/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts +++ b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts @@ -1,7 +1,7 @@ import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; @@ -21,7 +21,7 @@ import { ModifierTier } from "#app/modifier/modifier-tier"; import * as Utils from "#app/utils"; const namespace = "mysteryEncounters/globalTradeSystem"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -43,10 +43,10 @@ describe("Global Trade System - Mystery Encounter", () => { game.override.disableTrainerWaves(); const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], + [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], ]); CIVILIZATION_ENCOUNTER_BIOMES.forEach(biome => { - biomeMap.set(biome, [ MysteryEncounterType.GLOBAL_TRADE_SYSTEM ]); + biomeMap.set(biome, [MysteryEncounterType.GLOBAL_TRADE_SYSTEM]); }); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -71,7 +71,7 @@ describe("Global Trade System - Mystery Encounter", () => { }); it("should not loop infinitely when generating trade options for extreme BST non-legendaries", async () => { - const extremeBstTeam = [ Species.SLAKING, Species.WISHIWASHI, Species.SUNKERN ]; + const extremeBstTeam = [Species.SLAKING, Species.WISHIWASHI, Species.SUNKERN]; await game.runToMysteryEncounter(MysteryEncounterType.GLOBAL_TRADE_SYSTEM, extremeBstTeam); expect(GlobalTradeSystemEncounter.encounterType).toBe(MysteryEncounterType.GLOBAL_TRADE_SYSTEM); @@ -160,7 +160,7 @@ describe("Global Trade System - Mystery Encounter", () => { expect(option.dialogue).toBeDefined(); expect(option.dialogue).toStrictEqual({ buttonLabel: `${namespace}:option.2.label`, - buttonTooltip: `${namespace}:option.2.tooltip` + buttonTooltip: `${namespace}:option.2.tooltip`, }); }); @@ -224,7 +224,7 @@ describe("Global Trade System - Mystery Encounter", () => { const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!; const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 2; - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); @@ -232,7 +232,9 @@ describe("Global Trade System - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(1); expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier).toBe(ModifierTier.MASTER); const soulDewAfter = scene.findModifier(m => m instanceof PokemonNatureWeightModifier); @@ -249,7 +251,7 @@ describe("Global Trade System - Mystery Encounter", () => { const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!; const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 1; - await scene.addModifier(modifier, true, false, false, true); + scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); diff --git a/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts b/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts similarity index 88% rename from src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts rename to test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts index 17e324f29f0..f23bc8738f2 100644 --- a/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts +++ b/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts @@ -5,21 +5,20 @@ import { getPokemonSpecies } from "#app/data/pokemon-species"; import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "../encounter-test-utils"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import type BattleScene from "#app/battle-scene"; import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; import { PartyExpPhase } from "#app/phases/party-exp-phase"; import i18next from "i18next"; - const namespace = "mysteryEncounters/lostAtSea"; /** Blastoise for surf. Pidgeot for fly. Abra for none. */ -const defaultParty = [ Species.BLASTOISE, Species.PIDGEOT, Species.ABRA ]; +const defaultParty = [Species.BLASTOISE, Species.PIDGEOT, Species.ABRA]; const defaultBiome = Biome.SEA; const defaultWave = 33; @@ -42,9 +41,9 @@ describe("Lost at Sea - Mystery Encounter", () => { vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( new Map([ - [ Biome.SEA, [ MysteryEncounterType.LOST_AT_SEA ]], - [ Biome.MOUNTAIN, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], - ]) + [Biome.SEA, [MysteryEncounterType.LOST_AT_SEA]], + [Biome.MOUNTAIN, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], + ]), ); }); @@ -115,13 +114,13 @@ describe("Lost at Sea - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, defaultParty); const party = game.scene.getPlayerParty(); - const blastoise = party.find((pkm) => pkm.species.speciesId === Species.BLASTOISE); + const blastoise = party.find(pkm => pkm.species.speciesId === Species.BLASTOISE); const expBefore = blastoise!.exp; await runMysteryEncounterToEnd(game, 1); await game.phaseInterceptor.to(PartyExpPhase); - expect(blastoise?.exp).toBe(expBefore + Math.floor(laprasSpecies.baseExp * defaultWave / 5 + 1)); + expect(blastoise?.exp).toBe(expBefore + Math.floor((laprasSpecies.baseExp * defaultWave) / 5 + 1)); }); it("should leave encounter without battle", async () => { @@ -135,7 +134,7 @@ describe("Lost at Sea - Mystery Encounter", () => { }); it("should be disabled if no surfable PKM is in party", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, [ Species.ARCANINE ]); + await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, [Species.ARCANINE]); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -180,13 +179,13 @@ describe("Lost at Sea - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, defaultParty); const party = game.scene.getPlayerParty(); - const pidgeot = party.find((pkm) => pkm.species.speciesId === Species.PIDGEOT); + const pidgeot = party.find(pkm => pkm.species.speciesId === Species.PIDGEOT); const expBefore = pidgeot!.exp; await runMysteryEncounterToEnd(game, 2); await game.phaseInterceptor.to(PartyExpPhase); - expect(pidgeot!.exp).toBe(expBefore + Math.floor(laprasBaseExp * defaultWave / 5 + 1)); + expect(pidgeot!.exp).toBe(expBefore + Math.floor((laprasBaseExp * defaultWave) / 5 + 1)); }); it("should leave encounter without battle", async () => { @@ -200,7 +199,7 @@ describe("Lost at Sea - Mystery Encounter", () => { }); it("should be disabled if no flyable PKM is in party", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, [ Species.ARCANINE ]); + await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, [Species.ARCANINE]); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -242,18 +241,22 @@ describe("Lost at Sea - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, defaultParty); const party = game.scene.getPlayerParty(); - const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA)!; + const abra = party.find(pkm => pkm.species.speciesId === Species.ABRA)!; vi.spyOn(abra, "isAllowedInBattle").mockReturnValue(false); await runMysteryEncounterToEnd(game, 3); - const allowedPkm = party.filter((pkm) => pkm.isAllowedInBattle()); - const notAllowedPkm = party.filter((pkm) => !pkm.isAllowedInBattle()); - allowedPkm.forEach((pkm) => - expect(pkm.hp, `${pkm.name} should have receivd 25% damage: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp() - Math.floor(pkm.getMaxHp() * 0.25)) + const allowedPkm = party.filter(pkm => pkm.isAllowedInBattle()); + const notAllowedPkm = party.filter(pkm => !pkm.isAllowedInBattle()); + allowedPkm.forEach(pkm => + expect(pkm.hp, `${pkm.name} should have receivd 25% damage: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe( + pkm.getMaxHp() - Math.floor(pkm.getMaxHp() * 0.25), + ), ); - notAllowedPkm.forEach((pkm) => expect(pkm.hp, `${pkm.name} should be full hp: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp())); + notAllowedPkm.forEach(pkm => + expect(pkm.hp, `${pkm.name} should be full hp: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp()), + ); }); it("should leave encounter without battle", async () => { diff --git a/src/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts similarity index 76% rename from src/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts rename to test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts index 7729fa40599..8e825dc2c9b 100644 --- a/src/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts +++ b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts @@ -3,14 +3,17 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { Mode } from "#app/ui/ui"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { MysteriousChallengersEncounter } from "#app/data/mystery-encounters/encounters/mysterious-challengers-encounter"; import { TrainerConfig, TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#app/data/trainer-config"; @@ -22,7 +25,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; const namespace = "mysteryEncounters/mysteriousChallengers"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -43,11 +46,9 @@ describe("Mysterious Challengers - Mystery Encounter", () => { game.override.startingBiome(defaultBiome); game.override.disableTrainerWaves(); - const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]], - ]); + const biomeMap = new Map([[Biome.VOLCANO, [MysteryEncounterType.FIGHT_OR_FLIGHT]]]); HUMAN_TRANSITABLE_BIOMES.forEach(biome => { - biomeMap.set(biome, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]); + biomeMap.set(biome, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]); }); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -66,7 +67,9 @@ describe("Mysterious Challengers - Mystery Encounter", () => { expect(MysteriousChallengersEncounter.dialogue).toBeDefined(); expect(MysteriousChallengersEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]); expect(MysteriousChallengersEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`); - expect(MysteriousChallengersEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`); + expect(MysteriousChallengersEncounter.dialogue.encounterOptionsDialogue?.description).toBe( + `${namespace}:description`, + ); expect(MysteriousChallengersEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`); expect(MysteriousChallengersEncounter.options.length).toBe(3); }); @@ -108,16 +111,20 @@ describe("Mysterious Challengers - Mystery Encounter", () => { trainerConfig: expect.any(TrainerConfig), levelAdditiveModifier: 1.5, female: expect.any(Boolean), - } + }, ]); - expect(encounter.enemyPartyConfigs[1].trainerConfig?.partyTemplates[0]).toEqual(new TrainerPartyCompoundTemplate( - new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER, false, true), - new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true) - )); - expect(encounter.enemyPartyConfigs[2].trainerConfig?.partyTemplates[0]).toEqual(new TrainerPartyCompoundTemplate( - new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), - new TrainerPartyTemplate(3, PartyMemberStrength.STRONG), - new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)) + expect(encounter.enemyPartyConfigs[1].trainerConfig?.partyTemplates[0]).toEqual( + new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER, false, true), + new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true), + ), + ); + expect(encounter.enemyPartyConfigs[2].trainerConfig?.partyTemplates[0]).toEqual( + new TrainerPartyCompoundTemplate( + new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), + new TrainerPartyTemplate(3, PartyMemberStrength.STRONG), + new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), + ), ); expect(encounter.spriteConfigs).toBeDefined(); expect(encounter.spriteConfigs.length).toBe(3); @@ -158,7 +165,9 @@ describe("Mysterious Challengers - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(3); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toContain("TM_COMMON"); expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toContain("TM_GREAT"); @@ -200,12 +209,26 @@ describe("Mysterious Challengers - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(4); - expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toBe(ModifierTier.ULTRA); - expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toBe(ModifierTier.ULTRA); - expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toBe(ModifierTier.GREAT); - expect(modifierSelectHandler.options[3].modifierTypeOption.type.tier - modifierSelectHandler.options[3].modifierTypeOption.upgradeCount).toBe(ModifierTier.GREAT); + expect( + modifierSelectHandler.options[0].modifierTypeOption.type.tier - + modifierSelectHandler.options[0].modifierTypeOption.upgradeCount, + ).toBe(ModifierTier.ULTRA); + expect( + modifierSelectHandler.options[1].modifierTypeOption.type.tier - + modifierSelectHandler.options[1].modifierTypeOption.upgradeCount, + ).toBe(ModifierTier.ULTRA); + expect( + modifierSelectHandler.options[2].modifierTypeOption.type.tier - + modifierSelectHandler.options[2].modifierTypeOption.upgradeCount, + ).toBe(ModifierTier.GREAT); + expect( + modifierSelectHandler.options[3].modifierTypeOption.type.tier - + modifierSelectHandler.options[3].modifierTypeOption.upgradeCount, + ).toBe(ModifierTier.GREAT); }); }); @@ -243,12 +266,26 @@ describe("Mysterious Challengers - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(4); - expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toBe(ModifierTier.ROGUE); - expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toBe(ModifierTier.ROGUE); - expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toBe(ModifierTier.ULTRA); - expect(modifierSelectHandler.options[3].modifierTypeOption.type.tier - modifierSelectHandler.options[3].modifierTypeOption.upgradeCount).toBe(ModifierTier.GREAT); + expect( + modifierSelectHandler.options[0].modifierTypeOption.type.tier - + modifierSelectHandler.options[0].modifierTypeOption.upgradeCount, + ).toBe(ModifierTier.ROGUE); + expect( + modifierSelectHandler.options[1].modifierTypeOption.type.tier - + modifierSelectHandler.options[1].modifierTypeOption.upgradeCount, + ).toBe(ModifierTier.ROGUE); + expect( + modifierSelectHandler.options[2].modifierTypeOption.type.tier - + modifierSelectHandler.options[2].modifierTypeOption.upgradeCount, + ).toBe(ModifierTier.ULTRA); + expect( + modifierSelectHandler.options[3].modifierTypeOption.type.tier - + modifierSelectHandler.options[3].modifierTypeOption.upgradeCount, + ).toBe(ModifierTier.GREAT); }); }); }); diff --git a/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts b/test/mystery-encounter/encounters/part-timer-encounter.test.ts similarity index 92% rename from src/test/mystery-encounter/encounters/part-timer-encounter.test.ts rename to test/mystery-encounter/encounters/part-timer-encounter.test.ts index e8f2af0de5f..639a2e140ff 100644 --- a/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts +++ b/test/mystery-encounter/encounters/part-timer-encounter.test.ts @@ -2,10 +2,13 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { CIVILIZATION_ENCOUNTER_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; @@ -17,7 +20,7 @@ import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; const namespace = "mysteryEncounters/partTimer"; // Pyukumuku for lowest speed, Regieleki for highest speed, Feebas for lowest "bulk", Melmetal for highest "bulk" -const defaultParty = [ Species.PYUKUMUKU, Species.REGIELEKI, Species.FEEBAS, Species.MELMETAL ]; +const defaultParty = [Species.PYUKUMUKU, Species.REGIELEKI, Species.FEEBAS, Species.MELMETAL]; const defaultBiome = Biome.PLAINS; const defaultWave = 37; @@ -39,10 +42,10 @@ describe("Part-Timer - Mystery Encounter", () => { game.override.disableTrainerWaves(); const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], + [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], ]); CIVILIZATION_ENCOUNTER_BIOMES.forEach(biome => { - biomeMap.set(biome, [ MysteryEncounterType.PART_TIMER ]); + biomeMap.set(biome, [MysteryEncounterType.PART_TIMER]); }); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -64,7 +67,7 @@ describe("Part-Timer - Mystery Encounter", () => { { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue`, - } + }, ]); expect(PartTimerEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`); expect(PartTimerEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`); @@ -90,9 +93,9 @@ describe("Part-Timer - Mystery Encounter", () => { buttonTooltip: `${namespace}:option.1.tooltip`, selected: [ { - text: `${namespace}:option.1.selected` - } - ] + text: `${namespace}:option.1.selected`, + }, + ], }); }); @@ -122,7 +125,7 @@ describe("Part-Timer - Mystery Encounter", () => { // Override party levels to 50 so stats can be fully reflective scene.getPlayerParty().forEach(p => { p.level = 50; - p.ivs = [ 20, 20, 20, 20, 20, 20 ]; + p.ivs = [20, 20, 20, 20, 20, 20]; p.calculateStats(); }); await runMysteryEncounterToEnd(game, 1, { pokemonNo: 2 }); @@ -155,9 +158,9 @@ describe("Part-Timer - Mystery Encounter", () => { buttonTooltip: `${namespace}:option.2.tooltip`, selected: [ { - text: `${namespace}:option.2.selected` - } - ] + text: `${namespace}:option.2.selected`, + }, + ], }); }); @@ -187,7 +190,7 @@ describe("Part-Timer - Mystery Encounter", () => { // Override party levels to 50 so stats can be fully reflective scene.getPlayerParty().forEach(p => { p.level = 50; - p.ivs = [ 20, 20, 20, 20, 20, 20 ]; + p.ivs = [20, 20, 20, 20, 20, 20]; p.calculateStats(); }); await runMysteryEncounterToEnd(game, 2, { pokemonNo: 4 }); @@ -221,9 +224,9 @@ describe("Part-Timer - Mystery Encounter", () => { disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`, selected: [ { - text: `${namespace}:option.3.selected` - } - ] + text: `${namespace}:option.3.selected`, + }, + ], }); }); @@ -232,7 +235,7 @@ describe("Part-Timer - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.PART_TIMER, defaultParty); // Mock movesets - scene.getPlayerParty().forEach(p => p.moveset = []); + scene.getPlayerParty().forEach(p => (p.moveset = [])); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -256,7 +259,7 @@ describe("Part-Timer - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.PART_TIMER, defaultParty); // Mock moveset - scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.ATTRACT) ]; + scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.ATTRACT)]; await runMysteryEncounterToEnd(game, 3); expect(EncounterPhaseUtils.updatePlayerMoney).toHaveBeenCalledWith(scene.getWaveMoneyAmount(2.5), true, false); diff --git a/src/test/mystery-encounter/encounters/safari-zone.test.ts b/test/mystery-encounter/encounters/safari-zone.test.ts similarity index 89% rename from src/test/mystery-encounter/encounters/safari-zone.test.ts rename to test/mystery-encounter/encounters/safari-zone.test.ts index a807805b81c..3506020aae4 100644 --- a/src/test/mystery-encounter/encounters/safari-zone.test.ts +++ b/test/mystery-encounter/encounters/safari-zone.test.ts @@ -2,21 +2,27 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#enums/biome"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { getSafariSpeciesSpawn, SafariZoneEncounter } from "#app/data/mystery-encounters/encounters/safari-zone-encounter"; +import { + getSafariSpeciesSpawn, + SafariZoneEncounter, +} from "#app/data/mystery-encounters/encounters/safari-zone-encounter"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups"; const namespace = "mysteryEncounters/safariZone"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.SWAMP; const defaultWave = 45; @@ -38,10 +44,10 @@ describe("Safari Zone - Mystery Encounter", () => { game.override.disableTrainerWaves(); const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]], - [ Biome.FOREST, [ MysteryEncounterType.SAFARI_ZONE ]], - [ Biome.SWAMP, [ MysteryEncounterType.SAFARI_ZONE ]], - [ Biome.JUNGLE, [ MysteryEncounterType.SAFARI_ZONE ]], + [Biome.VOLCANO, [MysteryEncounterType.FIGHT_OR_FLIGHT]], + [Biome.FOREST, [MysteryEncounterType.SAFARI_ZONE]], + [Biome.SWAMP, [MysteryEncounterType.SAFARI_ZONE]], + [Biome.JUNGLE, [MysteryEncounterType.SAFARI_ZONE]], ]); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -58,9 +64,7 @@ describe("Safari Zone - Mystery Encounter", () => { expect(SafariZoneEncounter.encounterType).toBe(MysteryEncounterType.SAFARI_ZONE); expect(SafariZoneEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT); expect(SafariZoneEncounter.dialogue).toBeDefined(); - expect(SafariZoneEncounter.dialogue.intro).toStrictEqual([ - { text: `${namespace}:intro` }, - ]); + expect(SafariZoneEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]); expect(SafariZoneEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`); expect(SafariZoneEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`); expect(SafariZoneEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`); diff --git a/src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts similarity index 87% rename from src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts rename to test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts index a00cca5083c..85c823038e8 100644 --- a/src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts +++ b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts @@ -8,22 +8,26 @@ import { Species } from "#enums/species"; import { CommandPhase } from "#app/phases/command-phase"; import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { Mode } from "#app/ui/ui"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import i18next from "i18next"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/teleportingHijinks"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; -const TRANSPORT_BIOMES = [ Biome.SPACE, Biome.ISLAND, Biome.LABORATORY, Biome.FAIRY_CAVE, Biome.WASTELAND, Biome.DOJO ]; +const TRANSPORT_BIOMES = [Biome.SPACE, Biome.ISLAND, Biome.LABORATORY, Biome.FAIRY_CAVE, Biome.WASTELAND, Biome.DOJO]; describe("Teleporting Hijinks - Mystery Encounter", () => { let phaserGame: Phaser.Game; @@ -47,9 +51,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => { .enemyPassiveAbility(Abilities.BALL_FETCH); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( - new Map([ - [ Biome.CAVE, [ MysteryEncounterType.TELEPORTING_HIJINKS ]], - ]) + new Map([[Biome.CAVE, [MysteryEncounterType.TELEPORTING_HIJINKS]]]), ); }); @@ -181,7 +183,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, defaultParty); await runMysteryEncounterToEnd(game, 1, undefined, true); const enemyField = scene.getEnemyField(); - expect(enemyField[0].summonData.statStages).toEqual([ 0, 1, 0, 1, 1, 0, 0 ]); + expect(enemyField[0].summonData.statStages).toEqual([0, 1, 0, 1, 1, 0, 0]); expect(enemyField[0].isBoss()).toBe(true); }); @@ -190,7 +192,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, defaultParty); await runMysteryEncounterToEnd(game, 1, undefined, true); const enemyField = scene.getEnemyField(); - expect(enemyField[0].summonData.statStages).toEqual([ 1, 1, 1, 1, 1, 0, 0 ]); + expect(enemyField[0].summonData.statStages).toEqual([1, 1, 1, 1, 1, 0, 0]); expect(enemyField[0].isBoss()).toBe(true); }); }); @@ -207,13 +209,13 @@ describe("Teleporting Hijinks - Mystery Encounter", () => { selected: [ { text: `${namespace}:option.2.selected`, - } + }, ], }); }); it("should NOT be selectable if the player doesn't the right type pokemon", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [ Species.BLASTOISE ]); + await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [Species.BLASTOISE]); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -232,14 +234,14 @@ describe("Teleporting Hijinks - Mystery Encounter", () => { }); it("should be selectable if the player has the right type pokemon", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [ Species.METAGROSS ]); + await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [Species.METAGROSS]); await runMysteryEncounterToEnd(game, 2, undefined, true); expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); }); it("should transport to a new area", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [ Species.PIKACHU ]); + await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [Species.PIKACHU]); const previousBiome = scene.arena.biomeType; @@ -250,19 +252,19 @@ describe("Teleporting Hijinks - Mystery Encounter", () => { }); it("should start a battle against an enraged boss below wave 50", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [ Species.PIKACHU ]); + await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [Species.PIKACHU]); await runMysteryEncounterToEnd(game, 2, undefined, true); const enemyField = scene.getEnemyField(); - expect(enemyField[0].summonData.statStages).toEqual([ 0, 1, 0, 1, 1, 0, 0 ]); + expect(enemyField[0].summonData.statStages).toEqual([0, 1, 0, 1, 1, 0, 0]); expect(enemyField[0].isBoss()).toBe(true); }); it("should start a battle against an extra enraged boss above wave 50", { retry: 5 }, async () => { game.override.startingWave(56); - await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [ Species.PIKACHU ]); + await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [Species.PIKACHU]); await runMysteryEncounterToEnd(game, 2, undefined, true); const enemyField = scene.getEnemyField(); - expect(enemyField[0].summonData.statStages).toEqual([ 1, 1, 1, 1, 1, 0, 0 ]); + expect(enemyField[0].summonData.statStages).toEqual([1, 1, 1, 1, 1, 0, 0]); expect(enemyField[0].isBoss()).toBe(true); }); }); @@ -287,7 +289,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, defaultParty); await runMysteryEncounterToEnd(game, 3, undefined, true); const enemyField = scene.getEnemyField(); - expect(enemyField[0].summonData.statStages).toEqual([ 0, 0, 0, 0, 0, 0, 0 ]); + expect(enemyField[0].summonData.statStages).toEqual([0, 0, 0, 0, 0, 0, 0]); expect(enemyField[0].isBoss()).toBe(true); }); @@ -300,9 +302,19 @@ describe("Teleporting Hijinks - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; - expect(modifierSelectHandler.options.some(opt => opt.modifierTypeOption.type.name === i18next.t("modifierType:AttackTypeBoosterItem.metal_coat"))).toBe(true); - expect(modifierSelectHandler.options.some(opt => opt.modifierTypeOption.type.name === i18next.t("modifierType:AttackTypeBoosterItem.magnet"))).toBe(true); + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; + expect( + modifierSelectHandler.options.some( + opt => opt.modifierTypeOption.type.name === i18next.t("modifierType:AttackTypeBoosterItem.metal_coat"), + ), + ).toBe(true); + expect( + modifierSelectHandler.options.some( + opt => opt.modifierTypeOption.type.name === i18next.t("modifierType:AttackTypeBoosterItem.magnet"), + ), + ).toBe(true); }); }); }); diff --git a/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts b/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts similarity index 90% rename from src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts rename to test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts index e6f8127b776..9160126ffc3 100644 --- a/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts @@ -3,13 +3,16 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import { CommandPhase } from "#app/phases/command-phase"; @@ -21,7 +24,7 @@ import { PostMysteryEncounterPhase } from "#app/phases/mystery-encounter-phases" import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters"; const namespace = "mysteryEncounters/theExpertPokemonBreeder"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -42,11 +45,9 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => { game.override.startingBiome(defaultBiome); game.override.disableTrainerWaves(); - const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]], - ]); + const biomeMap = new Map([[Biome.VOLCANO, [MysteryEncounterType.FIGHT_OR_FLIGHT]]]); HUMAN_TRANSITABLE_BIOMES.forEach(biome => { - biomeMap.set(biome, [ MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER ]); + biomeMap.set(biome, [MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER]); }); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -65,15 +66,17 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => { expect(TheExpertPokemonBreederEncounter.dialogue).toBeDefined(); expect(TheExpertPokemonBreederEncounter.dialogue.intro).toStrictEqual([ { - text: `${namespace}:intro` + text: `${namespace}:intro`, }, { speaker: "trainerNames:expert_pokemon_breeder", - text: `${namespace}:intro_dialogue` + text: `${namespace}:intro_dialogue`, }, ]); expect(TheExpertPokemonBreederEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`); - expect(TheExpertPokemonBreederEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`); + expect(TheExpertPokemonBreederEncounter.dialogue.encounterOptionsDialogue?.description).toBe( + `${namespace}:description`, + ); expect(TheExpertPokemonBreederEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`); expect(TheExpertPokemonBreederEncounter.options.length).toBe(3); }); @@ -83,7 +86,9 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => { game.override.startingBiome(Biome.VOLCANO); await game.runToMysteryEncounter(); - expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER); + expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe( + MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER, + ); }); it("should initialize fully", async () => { @@ -133,12 +138,15 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => { const ace = scene.currentBattle?.enemyParty[0]; if (ace) { // Pretend that loading assets takes an extra 500ms - vi.spyOn(ace, "loadAssets").mockImplementation(() => new Promise(resolve => { - setTimeout(() => { - successfullyLoaded = true; - resolve(); - }, 500); - })); + vi.spyOn(ace, "loadAssets").mockImplementation( + () => + new Promise(resolve => { + setTimeout(() => { + successfullyLoaded = true; + resolve(); + }, 500); + }), + ); } return scene.currentBattle?.enemyParty ?? []; @@ -215,12 +223,15 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => { const ace = scene.currentBattle?.enemyParty[0]; if (ace) { // Pretend that loading assets takes an extra 500ms - vi.spyOn(ace, "loadAssets").mockImplementation(() => new Promise(resolve => { - setTimeout(() => { - successfullyLoaded = true; - resolve(); - }, 500); - })); + vi.spyOn(ace, "loadAssets").mockImplementation( + () => + new Promise(resolve => { + setTimeout(() => { + successfullyLoaded = true; + resolve(); + }, 500); + }), + ); } return scene.currentBattle?.enemyParty ?? []; @@ -294,12 +305,15 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => { const ace = scene.currentBattle?.enemyParty[0]; if (ace) { // Pretend that loading assets takes an extra 500ms - vi.spyOn(ace, "loadAssets").mockImplementation(() => new Promise(resolve => { - setTimeout(() => { - successfullyLoaded = true; - resolve(); - }, 500); - })); + vi.spyOn(ace, "loadAssets").mockImplementation( + () => + new Promise(resolve => { + setTimeout(() => { + successfullyLoaded = true; + resolve(); + }, 500); + }), + ); } return scene.currentBattle?.enemyParty ?? []; diff --git a/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts b/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts similarity index 93% rename from src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts rename to test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts index 4fd96f8d5bc..4adb8c6b076 100644 --- a/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts @@ -2,22 +2,28 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { PlayerPokemon } from "#app/field/pokemon"; import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; -import { getSalesmanSpeciesOffer, ThePokemonSalesmanEncounter } from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter"; +import { + getSalesmanSpeciesOffer, + ThePokemonSalesmanEncounter, +} from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups"; const namespace = "mysteryEncounters/thePokemonSalesman"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -39,10 +45,10 @@ describe("The Pokemon Salesman - Mystery Encounter", () => { game.override.disableTrainerWaves(); const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], + [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], ]); HUMAN_TRANSITABLE_BIOMES.forEach(biome => { - biomeMap.set(biome, [ MysteryEncounterType.THE_POKEMON_SALESMAN ]); + biomeMap.set(biome, [MysteryEncounterType.THE_POKEMON_SALESMAN]); }); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -63,7 +69,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => { expect(dialogue).toBeDefined(); expect(dialogue.intro).toStrictEqual([ { text: `${namespace}:intro` }, - { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue` } + { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue` }, ]); const { title, description, query } = dialogue.encounterOptionsDialogue!; expect(title).toBe(`${namespace}:title`); diff --git a/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts similarity index 86% rename from src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts rename to test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts index 3c0e75a2195..57d55af5dac 100644 --- a/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts @@ -2,12 +2,15 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#enums/biome"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import * as BattleAnims from "#app/data/battle-anims"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import { Moves } from "#enums/moves"; import type BattleScene from "#app/battle-scene"; import { TheStrongStuffEncounter } from "#app/data/mystery-encounters/encounters/the-strong-stuff-encounter"; @@ -20,7 +23,7 @@ import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { BerryModifier, PokemonBaseStatTotalModifier } from "#app/modifier/modifier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; import { CommandPhase } from "#app/phases/command-phase"; import { MovePhase } from "#app/phases/move-phase"; @@ -28,7 +31,7 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import { Abilities } from "#enums/abilities"; const namespace = "mysteryEncounters/theStrongStuff"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -54,9 +57,9 @@ describe("The Strong Stuff - Mystery Encounter", () => { vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( new Map([ - [ Biome.CAVE, [ MysteryEncounterType.THE_STRONG_STUFF ]], - [ Biome.MOUNTAIN, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]], - ]) + [Biome.CAVE, [MysteryEncounterType.THE_STRONG_STUFF]], + [Biome.MOUNTAIN, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], + ]), ); }); @@ -112,13 +115,13 @@ describe("The Strong Stuff - Mystery Encounter", () => { shiny: false, customPokemonData: new CustomPokemonData({ spriteScale: 1.25 }), nature: Nature.BOLD, - moveSet: [ Moves.INFESTATION, Moves.SALT_CURE, Moves.GASTRO_ACID, Moves.HEAL_ORDER ], + moveSet: [Moves.INFESTATION, Moves.SALT_CURE, Moves.GASTRO_ACID, Moves.HEAL_ORDER], modifierConfigs: expect.any(Array), - tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], - mysteryEncounterBattleEffects: expect.any(Function) - } + tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], + mysteryEncounterBattleEffects: expect.any(Function), + }, ], - } + }, ]); await vi.waitFor(() => expect(moveInitSpy).toHaveBeenCalled()); await vi.waitFor(() => expect(moveLoadSpy).toHaveBeenCalled()); @@ -195,15 +198,28 @@ describe("The Strong Stuff - Mystery Encounter", () => { expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); expect(enemyField.length).toBe(1); expect(enemyField[0].species.speciesId).toBe(Species.SHUCKLE); - expect(enemyField[0].summonData.statStages).toEqual([ 0, 2, 0, 2, 0, 0, 0 ]); + expect(enemyField[0].summonData.statStages).toEqual([0, 2, 0, 2, 0, 0, 0]); const shuckleItems = enemyField[0].getHeldItems(); expect(shuckleItems.length).toBe(5); - expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.SITRUS)?.stackCount).toBe(1); - expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.ENIGMA)?.stackCount).toBe(1); - expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.GANLON)?.stackCount).toBe(1); - expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.APICOT)?.stackCount).toBe(1); + expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.SITRUS)?.stackCount).toBe( + 1, + ); + expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.ENIGMA)?.stackCount).toBe( + 1, + ); + expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.GANLON)?.stackCount).toBe( + 1, + ); + expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.APICOT)?.stackCount).toBe( + 1, + ); expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.LUM)?.stackCount).toBe(2); - expect(enemyField[0].moveset).toEqual([ new PokemonMove(Moves.INFESTATION), new PokemonMove(Moves.SALT_CURE), new PokemonMove(Moves.GASTRO_ACID), new PokemonMove(Moves.HEAL_ORDER) ]); + expect(enemyField[0].moveset).toEqual([ + new PokemonMove(Moves.INFESTATION), + new PokemonMove(Moves.SALT_CURE), + new PokemonMove(Moves.GASTRO_ACID), + new PokemonMove(Moves.HEAL_ORDER), + ]); // Should have used moves pre-battle const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]); @@ -221,7 +237,9 @@ describe("The Strong Stuff - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(3); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("SOUL_DEW"); }); diff --git a/src/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts similarity index 82% rename from src/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts rename to test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts index e087bc5c180..94c8141aa1e 100644 --- a/src/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts @@ -3,14 +3,14 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e import { Biome } from "#enums/biome"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { Mode } from "#app/ui/ui"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; @@ -28,7 +28,7 @@ import { VictoryPhase } from "#app/phases/victory-phase"; import { StatusEffect } from "#enums/status-effect"; const namespace = "mysteryEncounters/theWinstrateChallenge"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -49,11 +49,9 @@ describe("The Winstrate Challenge - Mystery Encounter", () => { game.override.startingBiome(defaultBiome); game.override.disableTrainerWaves(); - const biomeMap = new Map([ - [ Biome.VOLCANO, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]], - ]); + const biomeMap = new Map([[Biome.VOLCANO, [MysteryEncounterType.FIGHT_OR_FLIGHT]]]); HUMAN_TRANSITABLE_BIOMES.forEach(biome => { - biomeMap.set(biome, [ MysteryEncounterType.THE_WINSTRATE_CHALLENGE ]); + biomeMap.set(biome, [MysteryEncounterType.THE_WINSTRATE_CHALLENGE]); }); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); }); @@ -75,10 +73,12 @@ describe("The Winstrate Challenge - Mystery Encounter", () => { { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue`, - } + }, ]); expect(TheWinstrateChallengeEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`); - expect(TheWinstrateChallengeEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`); + expect(TheWinstrateChallengeEncounter.dialogue.encounterOptionsDialogue?.description).toBe( + `${namespace}:description`, + ); expect(TheWinstrateChallengeEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`); expect(TheWinstrateChallengeEncounter.options.length).toBe(2); }); @@ -115,42 +115,42 @@ describe("The Winstrate Challenge - Mystery Encounter", () => { isBoss: false, abilityIndex: 0, // Soundproof nature: Nature.MODEST, - moveSet: [ Moves.THUNDERBOLT, Moves.GIGA_DRAIN, Moves.FOUL_PLAY, Moves.THUNDER_WAVE ], - modifierConfigs: expect.any(Array) + moveSet: [Moves.THUNDERBOLT, Moves.GIGA_DRAIN, Moves.FOUL_PLAY, Moves.THUNDER_WAVE], + modifierConfigs: expect.any(Array), }, { species: getPokemonSpecies(Species.SWALOT), isBoss: false, abilityIndex: 2, // Gluttony nature: Nature.QUIET, - moveSet: [ Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.ICE_BEAM, Moves.EARTHQUAKE ], - modifierConfigs: expect.any(Array) + moveSet: [Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.ICE_BEAM, Moves.EARTHQUAKE], + modifierConfigs: expect.any(Array), }, { species: getPokemonSpecies(Species.DODRIO), isBoss: false, abilityIndex: 2, // Tangled Feet nature: Nature.JOLLY, - moveSet: [ Moves.DRILL_PECK, Moves.QUICK_ATTACK, Moves.THRASH, Moves.KNOCK_OFF ], - modifierConfigs: expect.any(Array) + moveSet: [Moves.DRILL_PECK, Moves.QUICK_ATTACK, Moves.THRASH, Moves.KNOCK_OFF], + modifierConfigs: expect.any(Array), }, { species: getPokemonSpecies(Species.ALAKAZAM), isBoss: false, formIndex: 1, nature: Nature.BOLD, - moveSet: [ Moves.PSYCHIC, Moves.SHADOW_BALL, Moves.FOCUS_BLAST, Moves.THUNDERBOLT ], - modifierConfigs: expect.any(Array) + moveSet: [Moves.PSYCHIC, Moves.SHADOW_BALL, Moves.FOCUS_BLAST, Moves.THUNDERBOLT], + modifierConfigs: expect.any(Array), }, { species: getPokemonSpecies(Species.DARMANITAN), isBoss: false, abilityIndex: 0, // Sheer Force nature: Nature.IMPISH, - moveSet: [ Moves.EARTHQUAKE, Moves.U_TURN, Moves.FLARE_BLITZ, Moves.ROCK_SLIDE ], - modifierConfigs: expect.any(Array) - } - ] + moveSet: [Moves.EARTHQUAKE, Moves.U_TURN, Moves.FLARE_BLITZ, Moves.ROCK_SLIDE], + modifierConfigs: expect.any(Array), + }, + ], }, { trainerType: TrainerType.VICKY, @@ -160,10 +160,10 @@ describe("The Winstrate Challenge - Mystery Encounter", () => { isBoss: false, formIndex: 1, nature: Nature.IMPISH, - moveSet: [ Moves.AXE_KICK, Moves.ICE_PUNCH, Moves.ZEN_HEADBUTT, Moves.BULLET_PUNCH ], - modifierConfigs: expect.any(Array) - } - ] + moveSet: [Moves.AXE_KICK, Moves.ICE_PUNCH, Moves.ZEN_HEADBUTT, Moves.BULLET_PUNCH], + modifierConfigs: expect.any(Array), + }, + ], }, { trainerType: TrainerType.VIVI, @@ -173,26 +173,26 @@ describe("The Winstrate Challenge - Mystery Encounter", () => { isBoss: false, abilityIndex: 3, // Lightning Rod nature: Nature.ADAMANT, - moveSet: [ Moves.WATERFALL, Moves.MEGAHORN, Moves.KNOCK_OFF, Moves.REST ], - modifierConfigs: expect.any(Array) + moveSet: [Moves.WATERFALL, Moves.MEGAHORN, Moves.KNOCK_OFF, Moves.REST], + modifierConfigs: expect.any(Array), }, { species: getPokemonSpecies(Species.BRELOOM), isBoss: false, abilityIndex: 1, // Poison Heal nature: Nature.JOLLY, - moveSet: [ Moves.SPORE, Moves.SWORDS_DANCE, Moves.SEED_BOMB, Moves.DRAIN_PUNCH ], - modifierConfigs: expect.any(Array) + moveSet: [Moves.SPORE, Moves.SWORDS_DANCE, Moves.SEED_BOMB, Moves.DRAIN_PUNCH], + modifierConfigs: expect.any(Array), }, { species: getPokemonSpecies(Species.CAMERUPT), isBoss: false, formIndex: 1, nature: Nature.CALM, - moveSet: [ Moves.EARTH_POWER, Moves.FIRE_BLAST, Moves.YAWN, Moves.PROTECT ], - modifierConfigs: expect.any(Array) - } - ] + moveSet: [Moves.EARTH_POWER, Moves.FIRE_BLAST, Moves.YAWN, Moves.PROTECT], + modifierConfigs: expect.any(Array), + }, + ], }, { trainerType: TrainerType.VICTORIA, @@ -202,18 +202,18 @@ describe("The Winstrate Challenge - Mystery Encounter", () => { isBoss: false, abilityIndex: 0, // Natural Cure nature: Nature.CALM, - moveSet: [ Moves.SYNTHESIS, Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.SLEEP_POWDER ], - modifierConfigs: expect.any(Array) + moveSet: [Moves.SYNTHESIS, Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.SLEEP_POWDER], + modifierConfigs: expect.any(Array), }, { species: getPokemonSpecies(Species.GARDEVOIR), isBoss: false, formIndex: 1, nature: Nature.TIMID, - moveSet: [ Moves.PSYSHOCK, Moves.MOONBLAST, Moves.SHADOW_BALL, Moves.WILL_O_WISP ], - modifierConfigs: expect.any(Array) - } - ] + moveSet: [Moves.PSYSHOCK, Moves.MOONBLAST, Moves.SHADOW_BALL, Moves.WILL_O_WISP], + modifierConfigs: expect.any(Array), + }, + ], }, { trainerType: TrainerType.VICTOR, @@ -223,19 +223,19 @@ describe("The Winstrate Challenge - Mystery Encounter", () => { isBoss: false, abilityIndex: 0, // Guts nature: Nature.ADAMANT, - moveSet: [ Moves.FACADE, Moves.BRAVE_BIRD, Moves.PROTECT, Moves.QUICK_ATTACK ], - modifierConfigs: expect.any(Array) + moveSet: [Moves.FACADE, Moves.BRAVE_BIRD, Moves.PROTECT, Moves.QUICK_ATTACK], + modifierConfigs: expect.any(Array), }, { species: getPokemonSpecies(Species.OBSTAGOON), isBoss: false, abilityIndex: 1, // Guts nature: Nature.ADAMANT, - moveSet: [ Moves.FACADE, Moves.OBSTRUCT, Moves.NIGHT_SLASH, Moves.FIRE_PUNCH ], - modifierConfigs: expect.any(Array) - } - ] - } + moveSet: [Moves.FACADE, Moves.OBSTRUCT, Moves.NIGHT_SLASH, Moves.FIRE_PUNCH], + modifierConfigs: expect.any(Array), + }, + ], + }, ]); expect(encounter.spriteConfigs).toBeDefined(); expect(encounter.spriteConfigs.length).toBe(5); @@ -300,7 +300,9 @@ describe("The Winstrate Challenge - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(1); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("MYSTERY_ENCOUNTER_MACHO_BRACE"); }, 15000); @@ -340,7 +342,9 @@ describe("The Winstrate Challenge - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(1); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("RARER_CANDY"); }); @@ -352,7 +356,7 @@ describe("The Winstrate Challenge - Mystery Encounter", () => { * @param game * @param isFinalBattle */ -async function skipBattleToNextBattle(game: GameManager, isFinalBattle: boolean = false) { +async function skipBattleToNextBattle(game: GameManager, isFinalBattle = false) { game.scene.clearPhaseQueue(); game.scene.clearPhaseQueueSplice(); const commandUiHandler = game.scene.ui.handlers[Mode.COMMAND]; diff --git a/src/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts similarity index 82% rename from src/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts rename to test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts index 395e33e818a..90e2312e624 100644 --- a/src/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts +++ b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts @@ -2,12 +2,15 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import * as BattleAnims from "#app/data/battle-anims"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import { Moves } from "#enums/moves"; import type BattleScene from "#app/battle-scene"; import { PokemonMove } from "#app/field/pokemon"; @@ -16,7 +19,7 @@ import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { HitHealModifier, HealShopCostModifier, TurnHealModifier } from "#app/modifier/modifier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { TrashToTreasureEncounter } from "#app/data/mystery-encounters/encounters/trash-to-treasure-encounter"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; @@ -24,7 +27,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { MovePhase } from "#app/phases/move-phase"; const namespace = "mysteryEncounters/trashToTreasure"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -46,9 +49,7 @@ describe("Trash to Treasure - Mystery Encounter", () => { game.override.disableTrainerWaves(); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( - new Map([ - [ Biome.CAVE, [ MysteryEncounterType.TRASH_TO_TREASURE ]], - ]) + new Map([[Biome.CAVE, [MysteryEncounterType.TRASH_TO_TREASURE]]]), ); }); @@ -95,10 +96,10 @@ describe("Trash to Treasure - Mystery Encounter", () => { shiny: false, formIndex: 1, bossSegmentModifier: 1, - moveSet: [ Moves.PAYBACK, Moves.GUNK_SHOT, Moves.STOMPING_TANTRUM, Moves.DRAIN_PUNCH ], - } + moveSet: [Moves.PAYBACK, Moves.GUNK_SHOT, Moves.STOMPING_TANTRUM, Moves.DRAIN_PUNCH], + }, ], - } + }, ]); await vi.waitFor(() => expect(moveInitSpy).toHaveBeenCalled()); await vi.waitFor(() => expect(moveLoadSpy).toHaveBeenCalled()); @@ -176,7 +177,12 @@ describe("Trash to Treasure - Mystery Encounter", () => { expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); expect(enemyField.length).toBe(1); expect(enemyField[0].species.speciesId).toBe(Species.GARBODOR); - expect(enemyField[0].moveset).toEqual([ new PokemonMove(Moves.PAYBACK), new PokemonMove(Moves.GUNK_SHOT), new PokemonMove(Moves.STOMPING_TANTRUM), new PokemonMove(Moves.DRAIN_PUNCH) ]); + expect(enemyField[0].moveset).toEqual([ + new PokemonMove(Moves.PAYBACK), + new PokemonMove(Moves.GUNK_SHOT), + new PokemonMove(Moves.STOMPING_TANTRUM), + new PokemonMove(Moves.DRAIN_PUNCH), + ]); // Should have used moves pre-battle const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]); @@ -194,12 +200,26 @@ describe("Trash to Treasure - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(4); - expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ROGUE); - expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ROGUE); - expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ULTRA); - expect(modifierSelectHandler.options[3].modifierTypeOption.type.tier - modifierSelectHandler.options[3].modifierTypeOption.upgradeCount).toEqual(ModifierTier.GREAT); + expect( + modifierSelectHandler.options[0].modifierTypeOption.type.tier - + modifierSelectHandler.options[0].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.ROGUE); + expect( + modifierSelectHandler.options[1].modifierTypeOption.type.tier - + modifierSelectHandler.options[1].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.ROGUE); + expect( + modifierSelectHandler.options[2].modifierTypeOption.type.tier - + modifierSelectHandler.options[2].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.ULTRA); + expect( + modifierSelectHandler.options[3].modifierTypeOption.type.tier - + modifierSelectHandler.options[3].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.GREAT); }); }); }); diff --git a/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts similarity index 91% rename from src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts rename to test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts index 39904c030a3..452dfcf3784 100644 --- a/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts +++ b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts @@ -2,15 +2,18 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, +} from "#test/mystery-encounter/encounter-test-utils"; import { Moves } from "#enums/moves"; import type BattleScene from "#app/battle-scene"; import { PokemonMove } from "#app/field/pokemon"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; @@ -27,7 +30,7 @@ import { modifierTypes } from "#app/modifier/modifier-type"; import { Abilities } from "#enums/abilities"; const namespace = "mysteryEncounters/uncommonBreed"; -const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ]; +const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -43,7 +46,8 @@ describe("Uncommon Breed - Mystery Encounter", () => { beforeEach(async () => { game = new GameManager(phaserGame); scene = game.scene; - game.override.mysteryEncounterChance(100) + game.override + .mysteryEncounterChance(100) .mysteryEncounterTier(MysteryEncounterTier.COMMON) .startingWave(defaultWave) .startingBiome(defaultBiome) @@ -52,9 +56,7 @@ describe("Uncommon Breed - Mystery Encounter", () => { .enemyPassiveAbility(Abilities.BALL_FETCH); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( - new Map([ - [ Biome.CAVE, [ MysteryEncounterType.UNCOMMON_BREED ]], - ]) + new Map([[Biome.CAVE, [MysteryEncounterType.UNCOMMON_BREED]]]), ); }); @@ -116,7 +118,7 @@ describe("Uncommon Breed - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty); const config = game.scene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]; - const speciesToSpawn = config.pokemonConfigs?.[0].species.speciesId; + const speciesToSpawn = config.pokemonConfigs?.[0].species.speciesId!; await runMysteryEncounterToEnd(game, 1, undefined, true); @@ -126,7 +128,7 @@ describe("Uncommon Breed - Mystery Encounter", () => { expect(enemyField[0].species.speciesId).toBe(speciesToSpawn); const statStagePhases = unshiftPhaseSpy.mock.calls.filter(p => p[0] instanceof StatStageChangePhase)[0][0] as any; - expect(statStagePhases.stats).toEqual([ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ]); + expect(statStagePhases.stats).toEqual([Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD]); // Should have used its egg move pre-battle const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]); @@ -143,7 +145,7 @@ describe("Uncommon Breed - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty); const config = game.scene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]; - const speciesToSpawn = config.pokemonConfigs?.[0].species.speciesId; + const speciesToSpawn = config.pokemonConfigs?.[0].species.speciesId!; await runMysteryEncounterToEnd(game, 1, undefined, true); @@ -153,7 +155,7 @@ describe("Uncommon Breed - Mystery Encounter", () => { expect(enemyField[0].species.speciesId).toBe(speciesToSpawn); const statStagePhases = unshiftPhaseSpy.mock.calls.filter(p => p[0] instanceof StatStageChangePhase)[0][0] as any; - expect(statStagePhases.stats).toEqual([ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ]); + expect(statStagePhases.stats).toEqual([Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD]); // Should have used its egg move pre-battle const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]); @@ -176,7 +178,7 @@ describe("Uncommon Breed - Mystery Encounter", () => { selected: [ { text: `${namespace}:option.2.selected`, - } + }, ], }); }); @@ -213,14 +215,14 @@ describe("Uncommon Breed - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty); // Berries on party lead - const sitrus = generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ])!; + const sitrus = generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS])!; const sitrusMod = sitrus.newModifier(scene.getPlayerParty()[0]) as BerryModifier; sitrusMod.stackCount = 2; - await scene.addModifier(sitrusMod, true, false, false, true); - const ganlon = generateModifierType(modifierTypes.BERRY, [ BerryType.GANLON ])!; + scene.addModifier(sitrusMod, true, false, false, true); + const ganlon = generateModifierType(modifierTypes.BERRY, [BerryType.GANLON])!; const ganlonMod = ganlon.newModifier(scene.getPlayerParty()[0]) as BerryModifier; ganlonMod.stackCount = 3; - await scene.addModifier(ganlonMod, true, false, false, true); + scene.addModifier(ganlonMod, true, false, false, true); await scene.updateModifiers(true); await runMysteryEncounterToEnd(game, 2); @@ -241,14 +243,14 @@ describe("Uncommon Breed - Mystery Encounter", () => { selected: [ { text: `${namespace}:option.3.selected`, - } + }, ], }); }); it("should NOT be selectable if the player doesn't have an Attracting move", async () => { await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty); - scene.getPlayerParty().forEach(p => p.moveset = []); + scene.getPlayerParty().forEach(p => (p.moveset = [])); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -270,7 +272,7 @@ describe("Uncommon Breed - Mystery Encounter", () => { const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty); // Mock moveset - scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.CHARM) ]; + scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.CHARM)]; await runMysteryEncounterToEnd(game, 3); expect(leaveEncounterWithoutBattleSpy).toBeCalled(); diff --git a/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts similarity index 83% rename from src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts rename to test/mystery-encounter/encounters/weird-dream-encounter.test.ts index 669a99b92cd..fbb88e346a8 100644 --- a/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts +++ b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts @@ -2,16 +2,19 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { Biome } from "#app/enums/biome"; import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; import { Species } from "#app/enums/species"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils"; +import { + runMysteryEncounterToEnd, + skipBattleRunMysteryEncounterRewardsPhase, +} from "#test/mystery-encounter/encounter-test-utils"; import type BattleScene from "#app/battle-scene"; import { Mode } from "#app/ui/ui"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { WeirdDreamEncounter } from "#app/data/mystery-encounters/encounters/weird-dream-encounter"; import * as EncounterTransformationSequence from "#app/data/mystery-encounters/utils/encounter-transformation-sequence"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; @@ -19,7 +22,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { ModifierTier } from "#app/modifier/modifier-tier"; const namespace = "mysteryEncounters/weirdDream"; -const defaultParty = [ Species.MAGBY, Species.HAUNTER, Species.ABRA ]; +const defaultParty = [Species.MAGBY, Species.HAUNTER, Species.ABRA]; const defaultBiome = Biome.CAVE; const defaultWave = 45; @@ -39,12 +42,12 @@ describe("Weird Dream - Mystery Encounter", () => { game.override.startingWave(defaultWave); game.override.startingBiome(defaultBiome); game.override.disableTrainerWaves(); - vi.spyOn(EncounterTransformationSequence, "doPokemonTransformationSequence").mockImplementation(() => new Promise(resolve => resolve())); + vi.spyOn(EncounterTransformationSequence, "doPokemonTransformationSequence").mockImplementation( + () => new Promise(resolve => resolve()), + ); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue( - new Map([ - [ Biome.CAVE, [ MysteryEncounterType.WEIRD_DREAM ]], - ]) + new Map([[Biome.CAVE, [MysteryEncounterType.WEIRD_DREAM]]]), ); }); @@ -62,7 +65,7 @@ describe("Weird Dream - Mystery Encounter", () => { expect(WeirdDreamEncounter.dialogue).toBeDefined(); expect(WeirdDreamEncounter.dialogue.intro).toStrictEqual([ { - text: `${namespace}:intro` + text: `${namespace}:intro`, }, { speaker: `${namespace}:speaker`, @@ -142,7 +145,9 @@ describe("Weird Dream - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(5); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MEMORY_MUSHROOM"); expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toEqual("ROGUE_BALL"); @@ -196,14 +201,34 @@ describe("Weird Dream - Mystery Encounter", () => { await game.phaseInterceptor.run(SelectModifierPhase); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(6); - expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ROGUE); - expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ROGUE); - expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ULTRA); - expect(modifierSelectHandler.options[3].modifierTypeOption.type.tier - modifierSelectHandler.options[3].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ULTRA); - expect(modifierSelectHandler.options[4].modifierTypeOption.type.tier - modifierSelectHandler.options[4].modifierTypeOption.upgradeCount).toEqual(ModifierTier.GREAT); - expect(modifierSelectHandler.options[5].modifierTypeOption.type.tier - modifierSelectHandler.options[5].modifierTypeOption.upgradeCount).toEqual(ModifierTier.GREAT); + expect( + modifierSelectHandler.options[0].modifierTypeOption.type.tier - + modifierSelectHandler.options[0].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.ROGUE); + expect( + modifierSelectHandler.options[1].modifierTypeOption.type.tier - + modifierSelectHandler.options[1].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.ROGUE); + expect( + modifierSelectHandler.options[2].modifierTypeOption.type.tier - + modifierSelectHandler.options[2].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.ULTRA); + expect( + modifierSelectHandler.options[3].modifierTypeOption.type.tier - + modifierSelectHandler.options[3].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.ULTRA); + expect( + modifierSelectHandler.options[4].modifierTypeOption.type.tier - + modifierSelectHandler.options[4].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.GREAT); + expect( + modifierSelectHandler.options[5].modifierTypeOption.type.tier - + modifierSelectHandler.options[5].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.GREAT); }); }); diff --git a/src/test/mystery-encounter/mystery-encounter-utils.test.ts b/test/mystery-encounter/mystery-encounter-utils.test.ts similarity index 82% rename from src/test/mystery-encounter/mystery-encounter-utils.test.ts rename to test/mystery-encounter/mystery-encounter-utils.test.ts index f0057fea7f0..1c4a2cf89bd 100644 --- a/src/test/mystery-encounter/mystery-encounter-utils.test.ts +++ b/test/mystery-encounter/mystery-encounter-utils.test.ts @@ -1,15 +1,26 @@ import type BattleScene from "#app/battle-scene"; import { speciesStarterCosts } from "#app/data/balance/starters"; import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { getEncounterText, queueEncounterMessage, showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { getHighestLevelPlayerPokemon, getLowestLevelPlayerPokemon, getRandomPlayerPokemon, getRandomSpeciesByStarterCost, koPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { + getEncounterText, + queueEncounterMessage, + showEncounterDialogue, + showEncounterText, +} from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +import { + getHighestLevelPlayerPokemon, + getLowestLevelPlayerPokemon, + getRandomPlayerPokemon, + getRandomSpeciesByStarterCost, + koPlayerPokemon, +} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { MessagePhase } from "#app/phases/message-phase"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -31,7 +42,7 @@ describe("Mystery Encounter Utils", () => { beforeEach(() => { game = new GameManager(phaserGame); scene = game.scene; - initSceneWithoutEncounterPhase(game.scene, [ Species.ARCEUS, Species.MANAPHY ]); + initSceneWithoutEncounterPhase(game.scene, [Species.ARCEUS, Species.MANAPHY]); }); describe("getRandomPlayerPokemon", () => { @@ -48,12 +59,12 @@ describe("Mystery Encounter Utils", () => { expect(result.species.speciesId).toBe(Species.ARCEUS); }); - it("gets a fainted pokemon from player party if isAllowedInBattle is false", () => { + it("gets a fainted pokemon from player party if isAllowedInBattle is false", async () => { // Both pokemon fainted scene.getPlayerParty().forEach(p => { p.hp = 0; p.trySetStatus(StatusEffect.FAINT); - p.updateInfo(); + void p.updateInfo(); }); // Seeds are calculated to return index 0 first, 1 second (if both pokemon are legal) @@ -68,12 +79,12 @@ describe("Mystery Encounter Utils", () => { expect(result.species.speciesId).toBe(Species.ARCEUS); }); - it("gets an unfainted legal pokemon from player party if isAllowed is true and isFainted is false", () => { + it("gets an unfainted legal pokemon from player party if isAllowed is true and isFainted is false", async () => { // Only faint 1st pokemon const party = scene.getPlayerParty(); party[0].hp = 0; party[0].trySetStatus(StatusEffect.FAINT); - party[0].updateInfo(); + await party[0].updateInfo(); // Seeds are calculated to return index 0 first, 1 second (if both pokemon are legal) game.override.seed("random"); @@ -87,12 +98,12 @@ describe("Mystery Encounter Utils", () => { expect(result.species.speciesId).toBe(Species.MANAPHY); }); - it("returns last unfainted pokemon if doNotReturnLastAbleMon is false", () => { + it("returns last unfainted pokemon if doNotReturnLastAbleMon is false", async () => { // Only faint 1st pokemon const party = scene.getPlayerParty(); party[0].hp = 0; party[0].trySetStatus(StatusEffect.FAINT); - party[0].updateInfo(); + await party[0].updateInfo(); // Seeds are calculated to return index 0 first, 1 second (if both pokemon are legal) game.override.seed("random"); @@ -106,12 +117,12 @@ describe("Mystery Encounter Utils", () => { expect(result.species.speciesId).toBe(Species.MANAPHY); }); - it("never returns last unfainted pokemon if doNotReturnLastAbleMon is true", () => { + it("never returns last unfainted pokemon if doNotReturnLastAbleMon is true", async () => { // Only faint 1st pokemon const party = scene.getPlayerParty(); party[0].hp = 0; party[0].trySetStatus(StatusEffect.FAINT); - party[0].updateInfo(); + await party[0].updateInfo(); // Seeds are calculated to return index 0 first, 1 second (if both pokemon are legal) game.override.seed("random"); @@ -152,12 +163,12 @@ describe("Mystery Encounter Utils", () => { expect(result.species.speciesId).toBe(Species.ARCEUS); }); - it("returns highest level unfainted if unfainted is true", () => { + it("returns highest level unfainted if unfainted is true", async () => { const party = scene.getPlayerParty(); party[0].level = 100; party[0].hp = 0; party[0].trySetStatus(StatusEffect.FAINT); - party[0].updateInfo(); + await party[0].updateInfo(); party[1].level = 10; const result = getHighestLevelPlayerPokemon(true); @@ -191,12 +202,12 @@ describe("Mystery Encounter Utils", () => { expect(result.species.speciesId).toBe(Species.ARCEUS); }); - it("returns lowest level unfainted if unfainted is true", () => { + it("returns lowest level unfainted if unfainted is true", async () => { const party = scene.getPlayerParty(); party[0].level = 10; party[0].hp = 0; party[0].trySetStatus(StatusEffect.FAINT); - party[0].updateInfo(); + await party[0].updateInfo(); party[1].level = 100; const result = getLowestLevelPlayerPokemon(true); @@ -214,7 +225,7 @@ describe("Mystery Encounter Utils", () => { }); it("gets species for a starter tier range", () => { - const result = getRandomSpeciesByStarterCost([ 5, 8 ]); + const result = getRandomSpeciesByStarterCost([5, 8]); const pokeSpecies = getPokemonSpecies(result); expect(pokeSpecies.speciesId).toBe(result); @@ -223,15 +234,23 @@ describe("Mystery Encounter Utils", () => { }); it("excludes species from search", () => { - // Only 9 tiers are: Koraidon, Miraidon, Arceus, Rayquaza, Kyogre, Groudon, Zacian - const result = getRandomSpeciesByStarterCost(9, [ Species.KORAIDON, Species.MIRAIDON, Species.ARCEUS, Species.RAYQUAZA, Species.KYOGRE, Species.GROUDON ]); + // Only 9 tiers are: Kyogre, Groudon, Rayquaza, Arceus, Zacian, Koraidon, Miraidon, Terapagos + const result = getRandomSpeciesByStarterCost(9, [ + Species.KYOGRE, + Species.GROUDON, + Species.RAYQUAZA, + Species.ARCEUS, + Species.KORAIDON, + Species.MIRAIDON, + Species.TERAPAGOS, + ]); const pokeSpecies = getPokemonSpecies(result); expect(pokeSpecies.speciesId).toBe(Species.ZACIAN); }); it("gets species of specified types", () => { - // Only 9 tiers are: Koraidon, Miraidon, Arceus, Rayquaza, Kyogre, Groudon, Zacian - const result = getRandomSpeciesByStarterCost(9, undefined, [ Type.GROUND ]); + // Only 9 tiers are: Kyogre, Groudon, Rayquaza, Arceus, Zacian, Koraidon, Miraidon, Terapagos + const result = getRandomSpeciesByStarterCost(9, undefined, [PokemonType.GROUND]); const pokeSpecies = getPokemonSpecies(result); expect(pokeSpecies.speciesId).toBe(Species.GROUDON); }); @@ -288,7 +307,14 @@ describe("Mystery Encounter Utils", () => { const spy = vi.spyOn(game.scene.ui, "showText"); await showEncounterText("mysteryEncounter:unit_test_dialogue"); - expect(spy).toHaveBeenCalledWith("mysteryEncounter:unit_test_dialogue", null, expect.any(Function), 0, true, null); + expect(spy).toHaveBeenCalledWith( + "mysteryEncounter:unit_test_dialogue", + null, + expect.any(Function), + 0, + true, + null, + ); }); }); @@ -299,8 +325,13 @@ describe("Mystery Encounter Utils", () => { const spy = vi.spyOn(game.scene.ui, "showDialogue"); await showEncounterDialogue("mysteryEncounter:unit_test_dialogue", "mysteryEncounter:unit_test_dialogue"); - expect(spy).toHaveBeenCalledWith("mysteryEncounter:unit_test_dialogue", "mysteryEncounter:unit_test_dialogue", null, expect.any(Function), 0); + expect(spy).toHaveBeenCalledWith( + "mysteryEncounter:unit_test_dialogue", + "mysteryEncounter:unit_test_dialogue", + null, + expect.any(Function), + 0, + ); }); }); }); - diff --git a/src/test/mystery-encounter/mystery-encounter.test.ts b/test/mystery-encounter/mystery-encounter.test.ts similarity index 92% rename from src/test/mystery-encounter/mystery-encounter.test.ts rename to test/mystery-encounter/mystery-encounter.test.ts index 7958fc1cd46..c9d31f28717 100644 --- a/src/test/mystery-encounter/mystery-encounter.test.ts +++ b/test/mystery-encounter/mystery-encounter.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeAll, beforeEach, expect, describe, it } from "vitest"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { Species } from "#enums/species"; import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; @@ -29,7 +29,10 @@ describe("Mystery Encounters", () => { }); it("Spawns a mystery encounter", async () => { - await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ Species.CHARIZARD, Species.VOLCARONA ]); + await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ + Species.CHARIZARD, + Species.VOLCARONA, + ]); await game.phaseInterceptor.to(MysteryEncounterPhase, false); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(MysteryEncounterPhase.name); @@ -51,4 +54,3 @@ describe("Mystery Encounters", () => { expect(scene.currentBattle.mysteryEncounter).toBeUndefined(); }); }); - diff --git a/src/test/phases/form-change-phase.test.ts b/test/phases/form-change-phase.test.ts similarity index 72% rename from src/test/phases/form-change-phase.test.ts rename to test/phases/form-change-phase.test.ts index 07e59cafe1c..deac21ed0dd 100644 --- a/src/test/phases/form-change-phase.test.ts +++ b/test/phases/form-change-phase.test.ts @@ -1,10 +1,10 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { Type } from "#enums/type"; +import { PokemonType } from "#enums/pokemon-type"; import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { modifierTypes } from "#app/modifier/modifier-type"; @@ -25,7 +25,7 @@ describe("Form Change Phase", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -35,16 +35,16 @@ describe("Form Change Phase", () => { }); it("Zacian should successfully change into Crowned form", async () => { - await game.classicMode.startBattle([ Species.ZACIAN ]); + await game.classicMode.startBattle([Species.ZACIAN]); // Before the form change: Should be Hero form const zacian = game.scene.getPlayerParty()[0]; expect(zacian.getFormKey()).toBe("hero-of-many-battles"); - expect(zacian.getTypes()).toStrictEqual([ Type.FAIRY ]); - expect(zacian.calculateBaseStats()).toStrictEqual([ 92, 120, 115, 80, 115, 138 ]); + expect(zacian.getTypes()).toStrictEqual([PokemonType.FAIRY]); + expect(zacian.calculateBaseStats()).toStrictEqual([92, 120, 115, 80, 115, 138]); // Give Zacian a Rusted Sword - const rustedSwordType = generateModifierType( modifierTypes.RARE_FORM_CHANGE_ITEM)!; + const rustedSwordType = generateModifierType(modifierTypes.RARE_FORM_CHANGE_ITEM)!; const rustedSword = rustedSwordType.newModifier(zacian); await game.scene.addModifier(rustedSword); @@ -54,7 +54,7 @@ describe("Form Change Phase", () => { // After the form change: Should be Crowned form expect(game.phaseInterceptor.log.includes("FormChangePhase")).toBe(true); expect(zacian.getFormKey()).toBe("crowned"); - expect(zacian.getTypes()).toStrictEqual([ Type.FAIRY, Type.STEEL ]); - expect(zacian.calculateBaseStats()).toStrictEqual([ 92, 150, 115, 80, 115, 148 ]); + expect(zacian.getTypes()).toStrictEqual([PokemonType.FAIRY, PokemonType.STEEL]); + expect(zacian.calculateBaseStats()).toStrictEqual([92, 150, 115, 80, 115, 148]); }); }); diff --git a/src/test/phases/frenzy-move-reset.test.ts b/test/phases/frenzy-move-reset.test.ts similarity index 68% rename from src/test/phases/frenzy-move-reset.test.ts rename to test/phases/frenzy-move-reset.test.ts index db9ec2bfe66..2f628f8a8c4 100644 --- a/src/test/phases/frenzy-move-reset.test.ts +++ b/test/phases/frenzy-move-reset.test.ts @@ -4,7 +4,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { StatusEffect } from "#enums/status-effect"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; @@ -37,32 +37,32 @@ describe("Frenzy Move Reset", () => { }); /* - * Thrash (or frenzy moves in general) should not continue to run if attack fails due to paralysis - * - * This is a 3-turn Thrash test: - * 1. Thrash is selected and succeeds to hit the enemy -> Enemy Faints - * - * 2. Thrash is automatically selected but misses due to paralysis - * Note: After missing the Pokemon should stop automatically attacking - * - * 3. At the start of the 3rd turn the Player should be able to select a move/switch Pokemon/etc. - * Note: This means that BattlerTag.FRENZY is not anymore in pokemon.summonData.tags and pokemon.summonData.moveQueue is empty - * - */ + * Thrash (or frenzy moves in general) should not continue to run if attack fails due to paralysis + * + * This is a 3-turn Thrash test: + * 1. Thrash is selected and succeeds to hit the enemy -> Enemy Faints + * + * 2. Thrash is automatically selected but misses due to paralysis + * Note: After missing the Pokemon should stop automatically attacking + * + * 3. At the start of the 3rd turn the Player should be able to select a move/switch Pokemon/etc. + * Note: This means that BattlerTag.FRENZY is not anymore in pokemon.summonData.tags and pokemon.summonData.moveQueue is empty + * + */ it("should cancel frenzy move if move fails turn 2", async () => { await game.classicMode.startBattle(); const playerPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.THRASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceStatusActivation(false); await game.toNextTurn(); expect(playerPokemon.summonData.moveQueue.length).toBe(2); expect(playerPokemon.summonData.tags.some(tag => tag.tagType === BattlerTagType.FRENZY)).toBe(true); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceStatusActivation(true); await game.toNextTurn(); diff --git a/src/test/phases/game-over-phase.test.ts b/test/phases/game-over-phase.test.ts similarity index 92% rename from src/test/phases/game-over-phase.test.ts rename to test/phases/game-over-phase.test.ts index 2e19d5fe954..438efc85167 100644 --- a/src/test/phases/game-over-phase.test.ts +++ b/test/phases/game-over-phase.test.ts @@ -2,7 +2,7 @@ import { Biome } from "#enums/biome"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { achvs } from "#app/system/achv"; @@ -25,7 +25,7 @@ describe("Game Over Phase", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.MEMENTO, Moves.ICE_BEAM, Moves.SPLASH ]) + .moveset([Moves.MEMENTO, Moves.ICE_BEAM, Moves.SPLASH]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -37,7 +37,7 @@ describe("Game Over Phase", () => { }); it("winning a run should give rewards", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); vi.spyOn(game.scene, "validateAchv"); // Note: `game.doKillOpponents()` does not properly handle final boss @@ -60,7 +60,7 @@ describe("Game Over Phase", () => { }); it("losing a run should not give rewards", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); vi.spyOn(game.scene, "validateAchv"); game.move.select(Moves.MEMENTO); diff --git a/src/test/phases/learn-move-phase.test.ts b/test/phases/learn-move-phase.test.ts similarity index 72% rename from src/test/phases/learn-move-phase.test.ts rename to test/phases/learn-move-phase.test.ts index 3a3d111f551..55b9d8b79d4 100644 --- a/src/test/phases/learn-move-phase.test.ts +++ b/test/phases/learn-move-phase.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { Moves } from "#enums/moves"; import { LearnMovePhase } from "#app/phases/learn-move-phase"; @@ -27,8 +27,8 @@ describe("Learn Move Phase", () => { }); it("If Pokemon has less than 4 moves, its newest move will be added to the lowest empty index", async () => { - game.override.moveset([ Moves.SPLASH ]); - await game.classicMode.startBattle([ Species.BULBASAUR ]); + game.override.moveset([Moves.SPLASH]); + await game.classicMode.startBattle([Species.BULBASAUR]); const pokemon = game.scene.getPlayerPokemon()!; const newMovePos = pokemon?.getMoveset().length; game.move.select(Moves.SPLASH); @@ -42,9 +42,9 @@ describe("Learn Move Phase", () => { }); it("If a pokemon has 4 move slots filled, the chosen move will be deleted and replaced", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const bulbasaur = game.scene.getPlayerPokemon()!; - const prevMoveset = [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]; + const prevMoveset = [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP]; const moveSlotNum = 3; game.move.changeMoveset(bulbasaur, prevMoveset); @@ -69,17 +69,17 @@ describe("Learn Move Phase", () => { expect(bulbasaur.level).toBeGreaterThanOrEqual(levelReq); // Check each of mr mime's moveslots to make sure the changed move (and ONLY the changed move) is different bulbasaur.getMoveset().forEach((move, index) => { - const expectedMove: Moves = (index === moveSlotNum ? levelMoveId : prevMoveset[index]); + const expectedMove: Moves = index === moveSlotNum ? levelMoveId : prevMoveset[index]; expect(move?.moveId).toBe(expectedMove); }); }); it("selecting the newly deleted move will reject it and keep old moveset", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const bulbasaur = game.scene.getPlayerPokemon()!; - const prevMoveset = [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]; + const prevMoveset = [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP]; - game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]); + game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP]); game.move.select(Moves.SPLASH); await game.doKillOpponents(); @@ -104,47 +104,62 @@ describe("Learn Move Phase", () => { }); it("macro should add moves in free slots normally", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const bulbasaur = game.scene.getPlayerPokemon()!; - game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID ]); + game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID]); game.move.select(Moves.SPLASH); await game.move.learnMove(Moves.SACRED_FIRE, 0, 1); - expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.SACRED_FIRE ]); - + expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ + Moves.SPLASH, + Moves.ABSORB, + Moves.ACID, + Moves.SACRED_FIRE, + ]); }); it("macro should replace moves", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const bulbasaur = game.scene.getPlayerPokemon()!; - game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]); + game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP]); game.move.select(Moves.SPLASH); await game.move.learnMove(Moves.SACRED_FIRE, 0, 1); - expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SPLASH, Moves.SACRED_FIRE, Moves.ACID, Moves.VINE_WHIP ]); - + expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ + Moves.SPLASH, + Moves.SACRED_FIRE, + Moves.ACID, + Moves.VINE_WHIP, + ]); }); it("macro should allow for cancelling move learning", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([Species.BULBASAUR]); const bulbasaur = game.scene.getPlayerPokemon()!; - game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]); + game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP]); game.move.select(Moves.SPLASH); await game.move.learnMove(Moves.SACRED_FIRE, 0, 4); - expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]); - + expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ + Moves.SPLASH, + Moves.ABSORB, + Moves.ACID, + Moves.VINE_WHIP, + ]); }); it("macro works on off-field party members", async () => { - await game.classicMode.startBattle([ Species.BULBASAUR, Species.SQUIRTLE ]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.SQUIRTLE]); const squirtle = game.scene.getPlayerParty()[1]!; - game.move.changeMoveset(squirtle, [ Moves.SPLASH, Moves.WATER_GUN, Moves.FREEZE_DRY, Moves.GROWL ]); + game.move.changeMoveset(squirtle, [Moves.SPLASH, Moves.WATER_GUN, Moves.FREEZE_DRY, Moves.GROWL]); game.move.select(Moves.TACKLE); await game.move.learnMove(Moves.SHELL_SMASH, 1, 0); - expect(squirtle.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SHELL_SMASH, Moves.WATER_GUN, Moves.FREEZE_DRY, Moves.GROWL ]); - + expect(squirtle.getMoveset().map(m => m?.moveId)).toEqual([ + Moves.SHELL_SMASH, + Moves.WATER_GUN, + Moves.FREEZE_DRY, + Moves.GROWL, + ]); }); - }); diff --git a/src/test/phases/mystery-encounter-phase.test.ts b/test/phases/mystery-encounter-phase.test.ts similarity index 63% rename from src/test/phases/mystery-encounter-phase.test.ts rename to test/phases/mystery-encounter-phase.test.ts index 507862534af..f903932d2cb 100644 --- a/src/test/phases/mystery-encounter-phase.test.ts +++ b/test/phases/mystery-encounter-phase.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeAll, beforeEach, expect, describe, it, vi } from "vitest"; -import GameManager from "#app/test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { Species } from "#enums/species"; import { MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; @@ -34,15 +34,21 @@ describe("Mystery Encounter Phases", () => { }); describe("MysteryEncounterPhase", () => { - it("Runs to MysteryEncounterPhase", async() => { - await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ Species.CHARIZARD, Species.VOLCARONA ]); + it("Runs to MysteryEncounterPhase", async () => { + await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ + Species.CHARIZARD, + Species.VOLCARONA, + ]); await game.phaseInterceptor.to(MysteryEncounterPhase, false); expect(game.scene.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name); }); - it("Runs MysteryEncounterPhase", async() => { - await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ Species.CHARIZARD, Species.VOLCARONA ]); + it("Runs MysteryEncounterPhase", async () => { + await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ + Species.CHARIZARD, + Species.VOLCARONA, + ]); game.onNextPrompt("MysteryEncounterPhase", Mode.MYSTERY_ENCOUNTER, () => { // End phase early for test @@ -51,16 +57,21 @@ describe("Mystery Encounter Phases", () => { await game.phaseInterceptor.run(MysteryEncounterPhase); expect(game.scene.mysteryEncounterSaveData.encounteredEvents.length).toBeGreaterThan(0); - expect(game.scene.mysteryEncounterSaveData.encounteredEvents[0].type).toEqual(MysteryEncounterType.MYSTERIOUS_CHALLENGERS); + expect(game.scene.mysteryEncounterSaveData.encounteredEvents[0].type).toEqual( + MysteryEncounterType.MYSTERIOUS_CHALLENGERS, + ); expect(game.scene.mysteryEncounterSaveData.encounteredEvents[0].tier).toEqual(MysteryEncounterTier.GREAT); expect(game.scene.ui.getMode()).toBe(Mode.MYSTERY_ENCOUNTER); }); - it("Selects an option for MysteryEncounterPhase", async() => { + it("Selects an option for MysteryEncounterPhase", async () => { const { ui } = game.scene; vi.spyOn(ui, "showDialogue"); vi.spyOn(ui, "showText"); - await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ Species.CHARIZARD, Species.VOLCARONA ]); + await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ + Species.CHARIZARD, + Species.VOLCARONA, + ]); game.onNextPrompt("MysteryEncounterPhase", Mode.MESSAGE, () => { const handler = game.scene.ui.getHandler() as MessageUiHandler; @@ -75,82 +86,70 @@ describe("Mystery Encounter Phases", () => { handler.processInput(Button.ACTION); // Waitfor required so that option select messages and preOptionPhase logic are handled - await vi.waitFor(() => expect(game.scene.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterOptionSelectedPhase.name)); + await vi.waitFor(() => + expect(game.scene.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterOptionSelectedPhase.name), + ); expect(ui.getMode()).toBe(Mode.MESSAGE); expect(ui.showDialogue).toHaveBeenCalledTimes(1); expect(ui.showText).toHaveBeenCalledTimes(2); - expect(ui.showDialogue).toHaveBeenCalledWith(i18next.t("battle:mysteryEncounterAppeared"), "???", null, expect.any(Function)); - expect(ui.showText).toHaveBeenCalledWith(i18next.t("mysteryEncounters/mysteriousChallengers:intro"), null, expect.any(Function), 750, true); - expect(ui.showText).toHaveBeenCalledWith(i18next.t("mysteryEncounters/mysteriousChallengers:option.selected"), null, expect.any(Function), 300, true); + expect(ui.showDialogue).toHaveBeenCalledWith( + i18next.t("battle:mysteryEncounterAppeared"), + "???", + null, + expect.any(Function), + ); + expect(ui.showText).toHaveBeenCalledWith( + i18next.t("mysteryEncounters/mysteriousChallengers:intro"), + null, + expect.any(Function), + 750, + true, + ); + expect(ui.showText).toHaveBeenCalledWith( + i18next.t("mysteryEncounters/mysteriousChallengers:option.selected"), + null, + expect.any(Function), + 300, + true, + ); }); }); describe("MysteryEncounterOptionSelectedPhase", () => { - it("runs phase", () => { + it("runs phase", () => {}); - }); + it("handles onOptionSelect execution", () => {}); - it("handles onOptionSelect execution", () => { + it("hides intro visuals", () => {}); - }); - - it("hides intro visuals", () => { - - }); - - it("does not hide intro visuals if option disabled", () => { - - }); + it("does not hide intro visuals if option disabled", () => {}); }); describe("MysteryEncounterBattlePhase", () => { - it("runs phase", () => { + it("runs phase", () => {}); - }); + it("handles TRAINER_BATTLE variant", () => {}); - it("handles TRAINER_BATTLE variant", () => { + it("handles BOSS_BATTLE variant", () => {}); - }); + it("handles WILD_BATTLE variant", () => {}); - it("handles BOSS_BATTLE variant", () => { - - }); - - it("handles WILD_BATTLE variant", () => { - - }); - - it("handles double battle", () => { - - }); + it("handles double battle", () => {}); }); describe("MysteryEncounterRewardsPhase", () => { - it("runs phase", () => { + it("runs phase", () => {}); - }); + it("handles doEncounterRewards", () => {}); - it("handles doEncounterRewards", () => { - - }); - - it("handles heal phase if enabled", () => { - - }); + it("handles heal phase if enabled", () => {}); }); describe("PostMysteryEncounterPhase", () => { - it("runs phase", () => { + it("runs phase", () => {}); - }); + it("handles onPostOptionSelect execution", () => {}); - it("handles onPostOptionSelect execution", () => { - - }); - - it("runs to next EncounterPhase", () => { - - }); + it("runs to next EncounterPhase", () => {}); }); }); - diff --git a/src/test/phases/phases.test.ts b/test/phases/phases.test.ts similarity index 96% rename from src/test/phases/phases.test.ts rename to test/phases/phases.test.ts index 36a405b8d15..4aabeb55b9e 100644 --- a/src/test/phases/phases.test.ts +++ b/test/phases/phases.test.ts @@ -3,7 +3,7 @@ import { LoginPhase } from "#app/phases/login-phase"; import { TitlePhase } from "#app/phases/title-phase"; import { UnavailablePhase } from "#app/phases/unavailable-phase"; import { Mode } from "#app/ui/ui"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/src/test/phases/select-modifier-phase.test.ts b/test/phases/select-modifier-phase.test.ts similarity index 63% rename from src/test/phases/select-modifier-phase.test.ts rename to test/phases/select-modifier-phase.test.ts index 23fab729838..bb3d5debc7c 100644 --- a/src/test/phases/select-modifier-phase.test.ts +++ b/test/phases/select-modifier-phase.test.ts @@ -12,8 +12,8 @@ import { Abilities } from "#enums/abilities"; import { Button } from "#enums/buttons"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; +import GameManager from "#test/testUtils/gameManager"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -33,7 +33,7 @@ describe("SelectModifierPhase", () => { scene = game.scene; game.override - .moveset([ Moves.FISSURE, Moves.SPLASH ]) + .moveset([Moves.FISSURE, Moves.SPLASH]) .ability(Abilities.NO_GUARD) .startingLevel(200) .enemySpecies(Species.MAGIKARP); @@ -46,7 +46,7 @@ describe("SelectModifierPhase", () => { }); it("should start a select modifier phase", async () => { - initSceneWithoutEncounterPhase(scene, [ Species.ABRA, Species.VOLCARONA ]); + initSceneWithoutEncounterPhase(scene, [Species.ABRA, Species.VOLCARONA]); const selectModifierPhase = new SelectModifierPhase(); scene.pushPhase(selectModifierPhase); await game.phaseInterceptor.run(SelectModifierPhase); @@ -55,25 +55,32 @@ describe("SelectModifierPhase", () => { }); it("should generate random modifiers", async () => { - await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]); + await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]); game.move.select(Moves.FISSURE); await game.phaseInterceptor.to("SelectModifierPhase"); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(3); }); it("should modify reroll cost", async () => { - initSceneWithoutEncounterPhase(scene, [ Species.ABRA, Species.VOLCARONA ]); + initSceneWithoutEncounterPhase(scene, [Species.ABRA, Species.VOLCARONA]); const options = [ new ModifierTypeOption(modifierTypes.POTION(), 0, 100), new ModifierTypeOption(modifierTypes.ETHER(), 0, 400), - new ModifierTypeOption(modifierTypes.REVIVE(), 0, 1000) + new ModifierTypeOption(modifierTypes.REVIVE(), 0, 1000), ]; - const selectModifierPhase1 = new SelectModifierPhase(0, undefined, { guaranteedModifierTypeOptions: options }); - const selectModifierPhase2 = new SelectModifierPhase(0, undefined, { guaranteedModifierTypeOptions: options, rerollMultiplier: 2 }); + const selectModifierPhase1 = new SelectModifierPhase(0, undefined, { + guaranteedModifierTypeOptions: options, + }); + const selectModifierPhase2 = new SelectModifierPhase(0, undefined, { + guaranteedModifierTypeOptions: options, + rerollMultiplier: 2, + }); const cost1 = selectModifierPhase1.getRerollCost(false); const cost2 = selectModifierPhase2.getRerollCost(false); @@ -81,7 +88,7 @@ describe("SelectModifierPhase", () => { }); it.todo("should generate random modifiers from reroll", async () => { - await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]); + await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]); scene.money = 1000000; scene.shopCursorTarget = 0; @@ -91,7 +98,9 @@ describe("SelectModifierPhase", () => { // TODO: nagivate the ui to reroll somehow //const smphase = scene.getCurrentPhase() as SelectModifierPhase; expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(3); modifierSelectHandler.processInput(Button.ACTION); @@ -103,12 +112,12 @@ describe("SelectModifierPhase", () => { it.todo("should generate random modifiers of same tier for reroll with reroll lock", async () => { game.override.startingModifier([{ name: "LOCK_CAPSULE" }]); - await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]); + await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]); scene.money = 1000000; // Just use fully random seed for this test vi.spyOn(scene, "resetSeed").mockImplementation(() => { scene.waveSeed = shiftCharCodes(scene.seed, 5); - Phaser.Math.RND.sow([ scene.waveSeed ]); + Phaser.Math.RND.sow([scene.waveSeed]); console.log("Wave Seed:", scene.waveSeed, 5); scene.rngCounter = 0; }); @@ -117,7 +126,9 @@ describe("SelectModifierPhase", () => { await game.phaseInterceptor.to("SelectModifierPhase"); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(3); const firstRollTiers: ModifierTier[] = modifierSelectHandler.options.map(o => o.modifierTypeOption.type.tier); @@ -126,16 +137,31 @@ describe("SelectModifierPhase", () => { expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); expect(modifierSelectHandler.options.length).toEqual(3); // Reroll with lock can still upgrade - expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toEqual(firstRollTiers[0]); - expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toEqual(firstRollTiers[1]); - expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toEqual(firstRollTiers[2]); + expect( + modifierSelectHandler.options[0].modifierTypeOption.type.tier - + modifierSelectHandler.options[0].modifierTypeOption.upgradeCount, + ).toEqual(firstRollTiers[0]); + expect( + modifierSelectHandler.options[1].modifierTypeOption.type.tier - + modifierSelectHandler.options[1].modifierTypeOption.upgradeCount, + ).toEqual(firstRollTiers[1]); + expect( + modifierSelectHandler.options[2].modifierTypeOption.type.tier - + modifierSelectHandler.options[2].modifierTypeOption.upgradeCount, + ).toEqual(firstRollTiers[2]); }); it("should generate custom modifiers", async () => { - await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]); + await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]); scene.money = 1000000; const customModifiers: CustomModifierSettings = { - guaranteedModifierTypeFuncs: [ modifierTypes.MEMORY_MUSHROOM, modifierTypes.TM_ULTRA, modifierTypes.LEFTOVERS, modifierTypes.AMULET_COIN, modifierTypes.GOLDEN_PUNCH ] + guaranteedModifierTypeFuncs: [ + modifierTypes.MEMORY_MUSHROOM, + modifierTypes.TM_ULTRA, + modifierTypes.LEFTOVERS, + modifierTypes.AMULET_COIN, + modifierTypes.GOLDEN_PUNCH, + ], }; const selectModifierPhase = new SelectModifierPhase(0, undefined, customModifiers); scene.unshiftPhase(selectModifierPhase); @@ -143,7 +169,9 @@ describe("SelectModifierPhase", () => { await game.phaseInterceptor.to("SelectModifierPhase"); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(5); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MEMORY_MUSHROOM"); expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toEqual("TM_ULTRA"); @@ -153,10 +181,16 @@ describe("SelectModifierPhase", () => { }); it("should generate custom modifier tiers that can upgrade from luck", async () => { - await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]); + await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]); scene.money = 1000000; const customModifiers: CustomModifierSettings = { - guaranteedModifierTiers: [ ModifierTier.COMMON, ModifierTier.GREAT, ModifierTier.ULTRA, ModifierTier.ROGUE, ModifierTier.MASTER ] + guaranteedModifierTiers: [ + ModifierTier.COMMON, + ModifierTier.GREAT, + ModifierTier.ULTRA, + ModifierTier.ROGUE, + ModifierTier.MASTER, + ], }; const pokemon = new PlayerPokemon(getPokemonSpecies(Species.BULBASAUR), 10, undefined, 0, undefined, true, 2); @@ -172,30 +206,48 @@ describe("SelectModifierPhase", () => { await game.phaseInterceptor.to("SelectModifierPhase"); expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(5); - expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toEqual(ModifierTier.COMMON); - expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toEqual(ModifierTier.GREAT); - expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ULTRA); - expect(modifierSelectHandler.options[3].modifierTypeOption.type.tier - modifierSelectHandler.options[3].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ROGUE); - expect(modifierSelectHandler.options[4].modifierTypeOption.type.tier - modifierSelectHandler.options[4].modifierTypeOption.upgradeCount).toEqual(ModifierTier.MASTER); + expect( + modifierSelectHandler.options[0].modifierTypeOption.type.tier - + modifierSelectHandler.options[0].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.COMMON); + expect( + modifierSelectHandler.options[1].modifierTypeOption.type.tier - + modifierSelectHandler.options[1].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.GREAT); + expect( + modifierSelectHandler.options[2].modifierTypeOption.type.tier - + modifierSelectHandler.options[2].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.ULTRA); + expect( + modifierSelectHandler.options[3].modifierTypeOption.type.tier - + modifierSelectHandler.options[3].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.ROGUE); + expect( + modifierSelectHandler.options[4].modifierTypeOption.type.tier - + modifierSelectHandler.options[4].modifierTypeOption.upgradeCount, + ).toEqual(ModifierTier.MASTER); }); it("should generate custom modifiers and modifier tiers together", async () => { - await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]); + await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]); scene.money = 1000000; const customModifiers: CustomModifierSettings = { - guaranteedModifierTypeFuncs: [ modifierTypes.MEMORY_MUSHROOM, modifierTypes.TM_COMMON ], - guaranteedModifierTiers: [ ModifierTier.MASTER, ModifierTier.MASTER ] + guaranteedModifierTypeFuncs: [modifierTypes.MEMORY_MUSHROOM, modifierTypes.TM_COMMON], + guaranteedModifierTiers: [ModifierTier.MASTER, ModifierTier.MASTER], }; const selectModifierPhase = new SelectModifierPhase(0, undefined, customModifiers); scene.unshiftPhase(selectModifierPhase); game.move.select(Moves.SPLASH); await game.phaseInterceptor.run(SelectModifierPhase); - expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(4); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MEMORY_MUSHROOM"); expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toEqual("TM_COMMON"); @@ -204,21 +256,22 @@ describe("SelectModifierPhase", () => { }); it("should fill remaining modifiers if fillRemaining is true with custom modifiers", async () => { - await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]); + await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]); scene.money = 1000000; const customModifiers: CustomModifierSettings = { - guaranteedModifierTypeFuncs: [ modifierTypes.MEMORY_MUSHROOM ], - guaranteedModifierTiers: [ ModifierTier.MASTER ], - fillRemaining: true + guaranteedModifierTypeFuncs: [modifierTypes.MEMORY_MUSHROOM], + guaranteedModifierTiers: [ModifierTier.MASTER], + fillRemaining: true, }; const selectModifierPhase = new SelectModifierPhase(0, undefined, customModifiers); scene.unshiftPhase(selectModifierPhase); game.move.select(Moves.SPLASH); await game.phaseInterceptor.run(SelectModifierPhase); - expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT); - const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler; + const modifierSelectHandler = scene.ui.handlers.find( + h => h instanceof ModifierSelectUiHandler, + ) as ModifierSelectUiHandler; expect(modifierSelectHandler.options.length).toEqual(3); expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MEMORY_MUSHROOM"); expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier).toEqual(ModifierTier.MASTER); diff --git a/src/test/plugins/api/pokerogue-account-api.test.ts b/test/plugins/api/pokerogue-account-api.test.ts similarity index 90% rename from src/test/plugins/api/pokerogue-account-api.test.ts rename to test/plugins/api/pokerogue-account-api.test.ts index 90a7d3639ad..9ec98b6a59f 100644 --- a/src/test/plugins/api/pokerogue-account-api.test.ts +++ b/test/plugins/api/pokerogue-account-api.test.ts @@ -1,7 +1,7 @@ import type { AccountInfoResponse } from "#app/@types/PokerogueAccountApi"; import { SESSION_ID_COOKIE_NAME } from "#app/constants"; import { PokerogueAccountApi } from "#app/plugins/api/pokerogue-account-api"; -import { getApiBaseUrl } from "#app/test/utils/testUtils"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; import * as Utils from "#app/utils"; import { http, HttpResponse } from "msw"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; @@ -30,7 +30,7 @@ describe("Pokerogue Account API", () => { }; server.use(http.get(`${apiBase}/account/info`, () => HttpResponse.json(expectedAccountInfo))); - const [ accountInfo, status ] = await accountApi.getInfo(); + const [accountInfo, status] = await accountApi.getInfo(); expect(accountInfo).toEqual(expectedAccountInfo); expect(status).toBe(200); @@ -39,7 +39,7 @@ describe("Pokerogue Account API", () => { it("should return null + status-code anad report a warning on FAILURE", async () => { server.use(http.get(`${apiBase}/account/info`, () => new HttpResponse("", { status: 401 }))); - const [ accountInfo, status ] = await accountApi.getInfo(); + const [accountInfo, status] = await accountApi.getInfo(); expect(accountInfo).toBeNull(); expect(status).toBe(401); @@ -49,7 +49,7 @@ describe("Pokerogue Account API", () => { it("should return null + 500 anad report a warning on ERROR", async () => { server.use(http.get(`${apiBase}/account/info`, () => HttpResponse.error())); - const [ accountInfo, status ] = await accountApi.getInfo(); + const [accountInfo, status] = await accountApi.getInfo(); expect(accountInfo).toBeNull(); expect(status).toBe(500); @@ -70,7 +70,7 @@ describe("Pokerogue Account API", () => { it("should return error message on FAILURE", async () => { server.use( - http.post(`${apiBase}/account/register`, () => new HttpResponse("Username is already taken", { status: 400 })) + http.post(`${apiBase}/account/register`, () => new HttpResponse("Username is already taken", { status: 400 })), ); const error = await accountApi.register(registerParams); @@ -78,7 +78,7 @@ describe("Pokerogue Account API", () => { expect(error).toBe("Username is already taken"); }); - it("should return \"Unknown error\" and report a warning on ERROR", async () => { + it('should return "Unknown error" and report a warning on ERROR', async () => { server.use(http.post(`${apiBase}/account/register`, () => HttpResponse.error())); const error = await accountApi.register(registerParams); @@ -103,7 +103,7 @@ describe("Pokerogue Account API", () => { it("should return error message and report a warning on FAILURE", async () => { server.use( - http.post(`${apiBase}/account/login`, () => new HttpResponse("Password is incorrect", { status: 401 })) + http.post(`${apiBase}/account/login`, () => new HttpResponse("Password is incorrect", { status: 401 })), ); const error = await accountApi.login(loginParams); @@ -112,7 +112,7 @@ describe("Pokerogue Account API", () => { expect(console.warn).toHaveBeenCalledWith("Login failed!", 401, "Unauthorized"); }); - it("should return \"Unknown error\" and report a warning on ERROR", async () => { + it('should return "Unknown error" and report a warning on ERROR', async () => { server.use(http.post(`${apiBase}/account/login`, () => HttpResponse.error())); const error = await accountApi.login(loginParams); diff --git a/src/test/plugins/api/pokerogue-admin-api.test.ts b/test/plugins/api/pokerogue-admin-api.test.ts similarity index 91% rename from src/test/plugins/api/pokerogue-admin-api.test.ts rename to test/plugins/api/pokerogue-admin-api.test.ts index 5ae46abfcc8..0ce727b88da 100644 --- a/src/test/plugins/api/pokerogue-admin-api.test.ts +++ b/test/plugins/api/pokerogue-admin-api.test.ts @@ -7,7 +7,7 @@ import type { UnlinkAccountFromGoogledIdRequest, } from "#app/@types/PokerogueAdminApi"; import { PokerogueAdminApi } from "#app/plugins/api/pokerogue-admin-api"; -import { getApiBaseUrl } from "#app/test/utils/testUtils"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; import { http, HttpResponse } from "msw"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; @@ -25,7 +25,10 @@ describe("Pokerogue Admin API", () => { }); describe("Link Account to Discord", () => { - const params: LinkAccountToDiscordIdRequest = { username: "test", discordId: "test-12575756" }; + const params: LinkAccountToDiscordIdRequest = { + username: "test", + discordId: "test-12575756", + }; it("should return null on SUCCESS", async () => { server.use(http.post(`${apiBase}/admin/account/discordLink`, () => HttpResponse.json(true))); @@ -64,7 +67,10 @@ describe("Pokerogue Admin API", () => { }); describe("Unlink Account from Discord", () => { - const params: UnlinkAccountFromDiscordIdRequest = { username: "test", discordId: "test-12575756" }; + const params: UnlinkAccountFromDiscordIdRequest = { + username: "test", + discordId: "test-12575756", + }; it("should return null on SUCCESS", async () => { server.use(http.post(`${apiBase}/admin/account/discordUnlink`, () => HttpResponse.json(true))); @@ -103,7 +109,10 @@ describe("Pokerogue Admin API", () => { }); describe("Link Account to Google", () => { - const params: LinkAccountToGoogledIdRequest = { username: "test", googleId: "test-12575756" }; + const params: LinkAccountToGoogledIdRequest = { + username: "test", + googleId: "test-12575756", + }; it("should return null on SUCCESS", async () => { server.use(http.post(`${apiBase}/admin/account/googleLink`, () => HttpResponse.json(true))); @@ -142,7 +151,10 @@ describe("Pokerogue Admin API", () => { }); describe("Unlink Account from Google", () => { - const params: UnlinkAccountFromGoogledIdRequest = { username: "test", googleId: "test-12575756" }; + const params: UnlinkAccountFromGoogledIdRequest = { + username: "test", + googleId: "test-12575756", + }; it("should return null on SUCCESS", async () => { server.use(http.post(`${apiBase}/admin/account/googleUnlink`, () => HttpResponse.json(true))); @@ -193,7 +205,7 @@ describe("Pokerogue Admin API", () => { }; server.use(http.get(`${apiBase}/admin/account/adminSearch`, () => HttpResponse.json(responseData))); - const [ data, err ] = await adminApi.searchAccount(params); + const [data, err] = await adminApi.searchAccount(params); expect(data).toStrictEqual(responseData); expect(err).toBeUndefined(); @@ -202,7 +214,7 @@ describe("Pokerogue Admin API", () => { it("should return [undefined, ERR_GENERIC] and report a warning on on FAILURE", async () => { server.use(http.get(`${apiBase}/admin/account/adminSearch`, () => new HttpResponse("", { status: 400 }))); - const [ data, err ] = await adminApi.searchAccount(params); + const [data, err] = await adminApi.searchAccount(params); expect(data).toBeUndefined(); expect(err).toBe(adminApi.ERR_GENERIC); @@ -212,7 +224,7 @@ describe("Pokerogue Admin API", () => { it("should return [undefined, ERR_USERNAME_NOT_FOUND] and report a warning on on 404", async () => { server.use(http.get(`${apiBase}/admin/account/adminSearch`, () => new HttpResponse("", { status: 404 }))); - const [ data, err ] = await adminApi.searchAccount(params); + const [data, err] = await adminApi.searchAccount(params); expect(data).toBeUndefined(); expect(err).toBe(adminApi.ERR_USERNAME_NOT_FOUND); @@ -222,7 +234,7 @@ describe("Pokerogue Admin API", () => { it("should return [undefined, ERR_GENERIC] and report a warning on on ERROR", async () => { server.use(http.get(`${apiBase}/admin/account/adminSearch`, () => HttpResponse.error())); - const [ data, err ] = await adminApi.searchAccount(params); + const [data, err] = await adminApi.searchAccount(params); expect(data).toBeUndefined(); expect(err).toBe(adminApi.ERR_GENERIC); diff --git a/src/test/plugins/api/pokerogue-api.test.ts b/test/plugins/api/pokerogue-api.test.ts similarity index 98% rename from src/test/plugins/api/pokerogue-api.test.ts rename to test/plugins/api/pokerogue-api.test.ts index a62174c226d..241453866a5 100644 --- a/src/test/plugins/api/pokerogue-api.test.ts +++ b/test/plugins/api/pokerogue-api.test.ts @@ -1,6 +1,6 @@ import type { TitleStatsResponse } from "#app/@types/PokerogueApi"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import { getApiBaseUrl } from "#app/test/utils/testUtils"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; import { http, HttpResponse } from "msw"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/src/test/plugins/api/pokerogue-daily-api.test.ts b/test/plugins/api/pokerogue-daily-api.test.ts similarity index 98% rename from src/test/plugins/api/pokerogue-daily-api.test.ts rename to test/plugins/api/pokerogue-daily-api.test.ts index 569e7cbb15d..95d938e6625 100644 --- a/src/test/plugins/api/pokerogue-daily-api.test.ts +++ b/test/plugins/api/pokerogue-daily-api.test.ts @@ -1,6 +1,6 @@ import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#app/@types/PokerogueDailyApi"; import { PokerogueDailyApi } from "#app/plugins/api/pokerogue-daily-api"; -import { getApiBaseUrl } from "#app/test/utils/testUtils"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; import { ScoreboardCategory, type RankingEntry } from "#app/ui/daily-run-scoreboard"; import { http, HttpResponse } from "msw"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/src/test/plugins/api/pokerogue-savedata-api.test.ts b/test/plugins/api/pokerogue-savedata-api.test.ts similarity index 96% rename from src/test/plugins/api/pokerogue-savedata-api.test.ts rename to test/plugins/api/pokerogue-savedata-api.test.ts index 6dd402206e5..47eafa0a933 100644 --- a/src/test/plugins/api/pokerogue-savedata-api.test.ts +++ b/test/plugins/api/pokerogue-savedata-api.test.ts @@ -1,6 +1,6 @@ import type { UpdateAllSavedataRequest } from "#app/@types/PokerogueSavedataApi"; import { PokerogueSavedataApi } from "#app/plugins/api/pokerogue-savedata-api"; -import { getApiBaseUrl } from "#app/test/utils/testUtils"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; import { http, HttpResponse } from "msw"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/src/test/plugins/api/pokerogue-session-savedata-api.test.ts b/test/plugins/api/pokerogue-session-savedata-api.test.ts similarity index 97% rename from src/test/plugins/api/pokerogue-session-savedata-api.test.ts rename to test/plugins/api/pokerogue-session-savedata-api.test.ts index f453c5edd88..67abc9c9336 100644 --- a/src/test/plugins/api/pokerogue-session-savedata-api.test.ts +++ b/test/plugins/api/pokerogue-session-savedata-api.test.ts @@ -8,7 +8,7 @@ import type { } from "#app/@types/PokerogueSessionSavedataApi"; import { PokerogueSessionSavedataApi } from "#app/plugins/api/pokerogue-session-savedata-api"; import type { SessionSaveData } from "#app/system/game-data"; -import { getApiBaseUrl } from "#app/test/utils/testUtils"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; import { http, HttpResponse } from "msw"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; @@ -29,7 +29,7 @@ describe("Pokerogue Session Savedata API", () => { const params: NewClearSessionSavedataRequest = { clientSessionId: "test-session-id", isVictory: true, - slot: 3 + slot: 3, }; it("should return true on SUCCESS", async () => { @@ -132,7 +132,7 @@ describe("Pokerogue Session Savedata API", () => { it("should return an error string on FAILURE", async () => { server.use( - http.get(`${apiBase}/savedata/session/delete`, () => new HttpResponse("Failed to delete!", { status: 400 })) + http.get(`${apiBase}/savedata/session/delete`, () => new HttpResponse("Failed to delete!", { status: 400 })), ); const error = await sessionSavedataApi.delete(params); @@ -162,8 +162,8 @@ describe("Pokerogue Session Savedata API", () => { http.post(`${apiBase}/savedata/session/clear`, () => HttpResponse.json({ success: true, - }) - ) + }), + ), ); const { success, error } = await sessionSavedataApi.clear(params, {} as SessionSaveData); @@ -178,8 +178,8 @@ describe("Pokerogue Session Savedata API", () => { HttpResponse.json({ success: false, error: "Failed to clear!", - }) - ) + }), + ), ); const { success, error } = await sessionSavedataApi.clear(params, {} as SessionSaveData); diff --git a/src/test/plugins/api/pokerogue-system-savedata-api.test.ts b/test/plugins/api/pokerogue-system-savedata-api.test.ts similarity index 97% rename from src/test/plugins/api/pokerogue-system-savedata-api.test.ts rename to test/plugins/api/pokerogue-system-savedata-api.test.ts index af377762b77..81d863049f0 100644 --- a/src/test/plugins/api/pokerogue-system-savedata-api.test.ts +++ b/test/plugins/api/pokerogue-system-savedata-api.test.ts @@ -6,7 +6,7 @@ import type { } from "#app/@types/PokerogueSystemSavedataApi"; import { PokerogueSystemSavedataApi } from "#app/plugins/api/pokerogue-system-savedata-api"; import type { SystemSaveData } from "#app/system/game-data"; -import { getApiBaseUrl } from "#app/test/utils/testUtils"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; import { http, HttpResponse } from "msw"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; @@ -59,8 +59,8 @@ describe("Pokerogue System Savedata API", () => { trainerId: 123456789, } as SystemSaveData, valid: true, - }) - ) + }), + ), ); const savedata = await systemSavedataApi.verify(params); @@ -76,8 +76,8 @@ describe("Pokerogue System Savedata API", () => { trainerId: 123456789, } as SystemSaveData, valid: false, - }) - ) + }), + ), ); const savedata = await systemSavedataApi.verify(params); diff --git a/src/test/pre.test.ts b/test/pre.test.ts similarity index 100% rename from src/test/pre.test.ts rename to test/pre.test.ts diff --git a/src/test/reload.test.ts b/test/reload.test.ts similarity index 94% rename from src/test/reload.test.ts rename to test/reload.test.ts index b5f66630606..f54885eccfb 100644 --- a/src/test/reload.test.ts +++ b/test/reload.test.ts @@ -6,8 +6,8 @@ import { Biome } from "#enums/biome"; import { Button } from "#enums/buttons"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; -import type { MockClock } from "#test/utils/mocks/mockClock"; +import GameManager from "#test/testUtils/gameManager"; +import type { MockClock } from "#test/testUtils/mocks/mockClock"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Reload", () => { @@ -26,7 +26,10 @@ describe("Reload", () => { beforeEach(() => { game = new GameManager(phaserGame); - vi.spyOn(pokerogueApi, "getGameTitleStats").mockResolvedValue({ battleCount: -1, playerCount: -1 }); + vi.spyOn(pokerogueApi, "getGameTitleStats").mockResolvedValue({ + battleCount: -1, + playerCount: -1, + }); vi.spyOn(pokerogueApi.daily, "getSeed").mockResolvedValue("test-seed"); }); @@ -48,7 +51,7 @@ describe("Reload", () => { .battleType("single") .startingLevel(100) // Avoid levelling up .disableTrainerWaves() - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .enemyMoveset(Moves.SPLASH); await game.dailyMode.startBattle(); @@ -81,7 +84,7 @@ describe("Reload", () => { .battleType("single") .startingLevel(100) // Avoid levelling up .disableTrainerWaves() - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .enemyMoveset(Moves.SPLASH); await game.classicMode.startBattle(); // Apparently daily mode would override the biome @@ -153,7 +156,7 @@ describe("Reload", () => { it("should not have RNG inconsistencies at a Daily run wave 50 Boss fight", async () => { game.override.battleType("single").startingWave(50); - await game.runToFinalBossEncounter([ Species.BULBASAUR ], GameModes.DAILY); + await game.runToFinalBossEncounter([Species.BULBASAUR], GameModes.DAILY); const preReloadRngState = Phaser.Math.RND.state(); diff --git a/src/test/settingMenu/helpers/inGameManip.ts b/test/settingMenu/helpers/inGameManip.ts similarity index 96% rename from src/test/settingMenu/helpers/inGameManip.ts rename to test/settingMenu/helpers/inGameManip.ts index b81e577f5b9..ca1fac3bc65 100644 --- a/src/test/settingMenu/helpers/inGameManip.ts +++ b/test/settingMenu/helpers/inGameManip.ts @@ -45,7 +45,9 @@ export class InGameManip { icon = "KEY_" + icon; } this.icon = this.config.icons[icon]; - expect(getIconForLatestInput(this.configs, this.latestSource, this.selectedDevice, this.settingName)).toEqual(this.icon); + expect(getIconForLatestInput(this.configs, this.latestSource, this.selectedDevice, this.settingName)).toEqual( + this.icon, + ); return this; } diff --git a/src/test/settingMenu/helpers/menuManip.ts b/test/settingMenu/helpers/menuManip.ts similarity index 88% rename from src/test/settingMenu/helpers/menuManip.ts rename to test/settingMenu/helpers/menuManip.ts index 0b1f48525f1..1ddd842c864 100644 --- a/src/test/settingMenu/helpers/menuManip.ts +++ b/test/settingMenu/helpers/menuManip.ts @@ -1,4 +1,15 @@ -import { assign, canIAssignThisKey, canIDeleteThisKey, canIOverrideThisSetting, deleteBind, getIconWithKeycode, getIconWithSettingName, getKeyWithKeycode, getKeyWithSettingName, getSettingNameWithKeycode } from "#app/configs/inputs/configHandler"; +import { + assign, + canIAssignThisKey, + canIDeleteThisKey, + canIOverrideThisSetting, + deleteBind, + getIconWithKeycode, + getIconWithSettingName, + getKeyWithKeycode, + getKeyWithSettingName, + getSettingNameWithKeycode, +} from "#app/configs/inputs/configHandler"; import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; import { expect } from "vitest"; @@ -29,7 +40,10 @@ export class MenuManip { const parts = input.split("_"); // Skip the first part and join the rest with an underscore - const result = parts.slice(1).map(part => part.toUpperCase()).join("_"); + const result = parts + .slice(1) + .map(part => part.toUpperCase()) + .join("_"); return result; } @@ -43,7 +57,7 @@ export class MenuManip { } iconDisplayedIs(icon) { - if (!(icon.toUpperCase().includes("KEY_"))) { + if (!icon.toUpperCase().includes("KEY_")) { icon = "KEY_" + icon.toUpperCase(); } this.iconDisplayed = this.config.icons[icon]; @@ -99,7 +113,6 @@ export class MenuManip { this.confirm(); } - confirm() { assign(this.config, this.settingName, this.keycode); } diff --git a/src/test/settingMenu/rebinding_setting.test.ts b/test/settingMenu/rebinding_setting.test.ts similarity index 72% rename from src/test/settingMenu/rebinding_setting.test.ts rename to test/settingMenu/rebinding_setting.test.ts index cae2df363d8..28b5d73d7cc 100644 --- a/src/test/settingMenu/rebinding_setting.test.ts +++ b/test/settingMenu/rebinding_setting.test.ts @@ -9,10 +9,12 @@ import { InGameManip } from "#test/settingMenu/helpers/inGameManip"; import { MenuManip } from "#test/settingMenu/helpers/menuManip"; import { beforeEach, describe, expect, it } from "vitest"; - describe("Test Rebinding", () => { + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO let config; + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO let inGame; + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO let inTheSettingMenu; const configs: Map = new Map(); const selectedDevice = { @@ -100,7 +102,12 @@ describe("Test Rebinding", () => { it("Check prevent rebind indirectly the d-pad buttons", () => { inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("A"); inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Right").iconDisplayedIs("D"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("A").weWantThisBindInstead("LEFT").weCantAssignThisKey().butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Left") + .iconDisplayedIs("A") + .weWantThisBindInstead("LEFT") + .weCantAssignThisKey() + .butLetsForceIt(); inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Left"); inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right"); @@ -109,7 +116,12 @@ describe("Test Rebinding", () => { it("Swap alt with a d-pad main", () => { inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Up").iconDisplayedIs("KEY_ARROW_UP").weWantThisBindInstead("W").weCantOverrideThisBind().butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Up") + .iconDisplayedIs("KEY_ARROW_UP") + .weWantThisBindInstead("W") + .weCantOverrideThisBind() + .butLetsForceIt(); inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); }); @@ -118,19 +130,37 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").weWantThisBindInstead("RIGHT").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Left") + .iconDisplayedIs("KEY_ARROW_LEFT") + .weWantThisBindInstead("RIGHT") + .weCantOverrideThisBind() + .weCantAssignThisKey() + .butLetsForceIt(); inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left"); inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").weWantThisBindInstead("UP").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Left") + .iconDisplayedIs("KEY_ARROW_LEFT") + .weWantThisBindInstead("UP") + .weCantOverrideThisBind() + .weCantAssignThisKey() + .butLetsForceIt(); inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left"); inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").weWantThisBindInstead("RIGHT").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Left") + .iconDisplayedIs("KEY_ARROW_LEFT") + .weWantThisBindInstead("RIGHT") + .weCantOverrideThisBind() + .weCantAssignThisKey() + .butLetsForceIt(); inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left"); inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); @@ -142,19 +172,31 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_A").weWantThisBindInstead("D").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Left") + .iconDisplayedIs("KEY_A") + .weWantThisBindInstead("D") + .confirm(); inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_D").weWantThisBindInstead("W").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Left") + .iconDisplayedIs("KEY_D") + .weWantThisBindInstead("W") + .confirm(); inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("D").nothingShouldHappen(); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Left"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_W").weWantThisBindInstead("D").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Left") + .iconDisplayedIs("KEY_W") + .weWantThisBindInstead("D") + .confirm(); inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Left"); @@ -162,18 +204,36 @@ describe("Test Rebinding", () => { }); it("Check if triple swap d-pad is prevented", () => { - inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").weWantThisBindInstead("RIGHT").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Left") + .iconDisplayedIs("KEY_ARROW_LEFT") + .weWantThisBindInstead("RIGHT") + .weCantOverrideThisBind() + .weCantAssignThisKey() + .butLetsForceIt(); inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left"); inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Right").iconDisplayedIs("KEY_ARROW_RIGHT").weWantThisBindInstead("UP").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Right") + .iconDisplayedIs("KEY_ARROW_RIGHT") + .weWantThisBindInstead("UP") + .weCantOverrideThisBind() + .weCantAssignThisKey() + .butLetsForceIt(); inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left"); inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").weWantThisBindInstead("LEFT").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Left") + .iconDisplayedIs("KEY_ARROW_LEFT") + .weWantThisBindInstead("LEFT") + .weCantOverrideThisBind() + .weCantAssignThisKey() + .butLetsForceIt(); inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left"); inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); @@ -184,19 +244,31 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_A").weWantThisBindInstead("D").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Left") + .iconDisplayedIs("KEY_A") + .weWantThisBindInstead("D") + .confirm(); inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Right").thereShouldBeNoIcon().weWantThisBindInstead("W").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Right") + .thereShouldBeNoIcon() + .weWantThisBindInstead("W") + .confirm(); inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Right"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_D").weWantThisBindInstead("A").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Left") + .iconDisplayedIs("KEY_D") + .weWantThisBindInstead("A") + .confirm(); inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("D").nothingShouldHappen(); @@ -216,12 +288,20 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("R").weShouldTriggerTheButton("Button_Cycle_Shiny"); inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("F").weShouldTriggerTheButton("Button_Cycle_Form"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Cycle_Shiny").iconDisplayedIs("KEY_R").weWantThisBindInstead("D").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Cycle_Shiny") + .iconDisplayedIs("KEY_R") + .weWantThisBindInstead("D") + .confirm(); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Button_Cycle_Shiny"); inGame.whenWePressOnKeyboard("R").nothingShouldHappen(); inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("F").weShouldTriggerTheButton("Button_Cycle_Form"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Cycle_Form").iconDisplayedIs("KEY_F").weWantThisBindInstead("R").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Cycle_Form") + .iconDisplayedIs("KEY_F") + .weWantThisBindInstead("R") + .confirm(); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Button_Cycle_Shiny"); inGame.whenWePressOnKeyboard("R").weShouldTriggerTheButton("Button_Cycle_Form"); inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left"); @@ -231,7 +311,11 @@ describe("Test Rebinding", () => { it("Swap alt with a key not binded yet", () => { inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); inGame.whenWePressOnKeyboard("B").nothingShouldHappen(); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").iconDisplayedIs("KEY_W").weWantThisBindInstead("B").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Up") + .iconDisplayedIs("KEY_W") + .weWantThisBindInstead("B") + .confirm(); inGame.whenWePressOnKeyboard("W").nothingShouldHappen(); inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Up"); }); @@ -252,7 +336,11 @@ describe("Test Rebinding", () => { inTheSettingMenu.whenWeDelete("Alt_Button_Left").thereShouldBeNoIconAnymore(); inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("B").nothingShouldHappen(); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").thereShouldBeNoIcon().weWantThisBindInstead("B").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Left") + .thereShouldBeNoIcon() + .weWantThisBindInstead("B") + .confirm(); inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Left"); }); @@ -261,13 +349,21 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("F").weShouldTriggerTheButton("Button_Cycle_Form"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Cycle_Shiny").iconDisplayedIs("KEY_R").weWantThisBindInstead("D").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Cycle_Shiny") + .iconDisplayedIs("KEY_R") + .weWantThisBindInstead("D") + .confirm(); inGame.whenWePressOnKeyboard("R").nothingShouldHappen(); inGame.whenWePressOnKeyboard("F").weShouldTriggerTheButton("Button_Cycle_Form"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Button_Cycle_Shiny"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Cycle_Form").iconDisplayedIs("KEY_F").weWantThisBindInstead("W").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Cycle_Form") + .iconDisplayedIs("KEY_F") + .weWantThisBindInstead("W") + .confirm(); inGame.whenWePressOnKeyboard("R").nothingShouldHappen(); inGame.whenWePressOnKeyboard("F").nothingShouldHappen(); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Button_Cycle_Form"); @@ -283,7 +379,11 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("B").nothingShouldHappen(); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Down").iconDisplayedIs("KEY_S").weWantThisBindInstead("B").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Down") + .iconDisplayedIs("KEY_S") + .weWantThisBindInstead("B") + .confirm(); inGame.whenWePressOnKeyboard("R").nothingShouldHappen(); inGame.whenWePressOnKeyboard("F").nothingShouldHappen(); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Button_Cycle_Form"); @@ -293,9 +393,7 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Down"); }); - it("Delete bind then assign not already existing button", () => { - inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("B").nothingShouldHappen(); @@ -303,23 +401,34 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("B").nothingShouldHappen(); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").thereShouldBeNoIcon().weWantThisBindInstead("B").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Left") + .thereShouldBeNoIcon() + .weWantThisBindInstead("B") + .confirm(); inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Left"); }); - it("change alt bind to not already existing button, than another one alt bind with another not already existing button", () => { inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right"); inGame.whenWePressOnKeyboard("B").nothingShouldHappen(); inGame.whenWePressOnKeyboard("U").nothingShouldHappen(); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_A").weWantThisBindInstead("B").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Left") + .iconDisplayedIs("KEY_A") + .weWantThisBindInstead("B") + .confirm(); inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right"); inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("U").nothingShouldHappen(); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Right").iconDisplayedIs("KEY_D").weWantThisBindInstead("U").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Right") + .iconDisplayedIs("KEY_D") + .weWantThisBindInstead("U") + .confirm(); inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("D").nothingShouldHappen(); inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Left"); @@ -331,26 +440,38 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Up").iconDisplayedIs("KEY_ARROW_UP").weWantThisBindInstead("RIGHT").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Up") + .iconDisplayedIs("KEY_ARROW_UP") + .weWantThisBindInstead("RIGHT") + .weCantOverrideThisBind() + .weCantAssignThisKey() + .butLetsForceIt(); inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").iconDisplayedIs("KEY_W").weWantThisBindInstead("D").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Up") + .iconDisplayedIs("KEY_W") + .weWantThisBindInstead("D") + .confirm(); inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); inGame.whenWePressOnKeyboard("W").nothingShouldHappen(); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Up"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").iconDisplayedIs("KEY_D").weWantThisBindInstead("W").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Up") + .iconDisplayedIs("KEY_D") + .weWantThisBindInstead("W") + .confirm(); inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up"); inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right"); inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up"); inGame.whenWePressOnKeyboard("D").nothingShouldHappen(); }); - it("Delete 2 bind then reassign one of them", () => { - inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right"); @@ -362,7 +483,11 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("A").nothingShouldHappen(); inGame.whenWePressOnKeyboard("D").nothingShouldHappen(); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").thereShouldBeNoIcon().weWantThisBindInstead("A").confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Left") + .thereShouldBeNoIcon() + .weWantThisBindInstead("A") + .confirm(); inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left"); inGame.whenWePressOnKeyboard("D").nothingShouldHappen(); }); @@ -391,24 +516,74 @@ describe("Test Rebinding", () => { inGame.whenWePressOnKeyboard("ESC").weShouldTriggerTheButton("Button_Menu"); inGame.whenWePressOnKeyboard("HOME").nothingShouldHappen(); inGame.whenWePressOnKeyboard("DELETE").nothingShouldHappen(); - inTheSettingMenu.whenCursorIsOnSetting("Button_Submit").iconDisplayedIs("KEY_ENTER").whenWeDelete().iconDisplayedIs("KEY_ENTER"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Up").iconDisplayedIs("KEY_ARROW_UP").whenWeDelete().iconDisplayedIs("KEY_ARROW_UP"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Down").iconDisplayedIs("KEY_ARROW_DOWN").whenWeDelete().iconDisplayedIs("KEY_ARROW_DOWN"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").whenWeDelete().iconDisplayedIs("KEY_ARROW_LEFT"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Right").iconDisplayedIs("KEY_ARROW_RIGHT").whenWeDelete().iconDisplayedIs("KEY_ARROW_RIGHT"); - inTheSettingMenu.whenCursorIsOnSetting("Button_Menu").iconDisplayedIs("KEY_ESC").whenWeDelete().iconDisplayedIs("KEY_ESC"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").iconDisplayedIs("KEY_W").whenWeDelete().thereShouldBeNoIconAnymore(); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").thereShouldBeNoIcon().weWantThisBindInstead("DELETE").weCantAssignThisKey().butLetsForceIt(); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").thereShouldBeNoIcon().weWantThisBindInstead("HOME").weCantAssignThisKey().butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Submit") + .iconDisplayedIs("KEY_ENTER") + .whenWeDelete() + .iconDisplayedIs("KEY_ENTER"); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Up") + .iconDisplayedIs("KEY_ARROW_UP") + .whenWeDelete() + .iconDisplayedIs("KEY_ARROW_UP"); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Down") + .iconDisplayedIs("KEY_ARROW_DOWN") + .whenWeDelete() + .iconDisplayedIs("KEY_ARROW_DOWN"); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Left") + .iconDisplayedIs("KEY_ARROW_LEFT") + .whenWeDelete() + .iconDisplayedIs("KEY_ARROW_LEFT"); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Right") + .iconDisplayedIs("KEY_ARROW_RIGHT") + .whenWeDelete() + .iconDisplayedIs("KEY_ARROW_RIGHT"); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Menu") + .iconDisplayedIs("KEY_ESC") + .whenWeDelete() + .iconDisplayedIs("KEY_ESC"); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Up") + .iconDisplayedIs("KEY_W") + .whenWeDelete() + .thereShouldBeNoIconAnymore(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Up") + .thereShouldBeNoIcon() + .weWantThisBindInstead("DELETE") + .weCantAssignThisKey() + .butLetsForceIt(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Up") + .thereShouldBeNoIcon() + .weWantThisBindInstead("HOME") + .weCantAssignThisKey() + .butLetsForceIt(); inGame.whenWePressOnKeyboard("DELETE").nothingShouldHappen(); inGame.whenWePressOnKeyboard("HOME").nothingShouldHappen(); inGame.whenWePressOnKeyboard("W").nothingShouldHappen(); }); it("check to delete all the binds of an action", () => { - inGame.whenWePressOnKeyboard("V").weShouldTriggerTheButton("Button_Cycle_Variant"); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Cycle_Variant").thereShouldBeNoIcon().weWantThisBindInstead("K").confirm(); - inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Cycle_Variant").iconDisplayedIs("KEY_K").whenWeDelete().thereShouldBeNoIconAnymore(); - inTheSettingMenu.whenCursorIsOnSetting("Button_Cycle_Variant").iconDisplayedIs("KEY_V").whenWeDelete().thereShouldBeNoIconAnymore(); + inGame.whenWePressOnKeyboard("V").weShouldTriggerTheButton("Button_Cycle_Tera"); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Cycle_Tera") + .thereShouldBeNoIcon() + .weWantThisBindInstead("K") + .confirm(); + inTheSettingMenu + .whenCursorIsOnSetting("Alt_Button_Cycle_Tera") + .iconDisplayedIs("KEY_K") + .whenWeDelete() + .thereShouldBeNoIconAnymore(); + inTheSettingMenu + .whenCursorIsOnSetting("Button_Cycle_Tera") + .iconDisplayedIs("KEY_V") + .whenWeDelete() + .thereShouldBeNoIconAnymore(); }); }); diff --git a/src/test/sprites/pokemonSprite.test.ts b/test/sprites/pokemonSprite.test.ts similarity index 78% rename from src/test/sprites/pokemonSprite.test.ts rename to test/sprites/pokemonSprite.test.ts index c29f88d3143..5bd08a58cda 100644 --- a/src/test/sprites/pokemonSprite.test.ts +++ b/test/sprites/pokemonSprite.test.ts @@ -2,7 +2,7 @@ import { getAppRootDir } from "#test/sprites/spritesUtils"; import fs from "fs"; import path from "path"; import { beforeAll, describe, expect, it } from "vitest"; -import _masterlist from "../../../public/images/pokemon/variant/_masterlist.json"; +import _masterlist from "../../public/images/pokemon/variant/_masterlist.json"; type PokemonVariantMasterlist = typeof _masterlist; @@ -42,7 +42,7 @@ describe("check if every variant's sprite are correctly set", () => { const errors: string[] = []; const trimmedDirpath = `variant${path.sep}${dirpath.split(rootDir)[1]}`; if (fs.existsSync(dirpath)) { - const files = fs.readdirSync(dirpath).filter((filename) => !/^\..*/.test(filename)); + const files = fs.readdirSync(dirpath).filter(filename => !/^\..*/.test(filename)); for (const filename of files) { const filePath = `${dirpath}${filename}`; const trimmedFilePath = `${trimmedDirpath}${filename}`; @@ -54,7 +54,7 @@ describe("check if every variant's sprite are correctly set", () => { if (name.includes("_")) { const id = name.split("_")[0]; const variant = name.split("_")[1]; - const index = parseInt(variant, 10) - 1; + const index = Number.parseInt(variant, 10) - 1; if (ext !== "json") { const urlJsonFile = `${dirpath}${id}.json`; if (mlist.hasOwnProperty(id)) { @@ -78,7 +78,9 @@ describe("check if every variant's sprite are correctly set", () => { const trimmedUrlSpriteFilepath = `${trimmedDirpath}${id}_${variant}.json`; const spriteFileExists = fs.existsSync(urlSpriteJsonFile); if (spriteFileExists) { - errors.push(`[${id}] [${mlist[id]}] - the value should be 2 for the index ${index} - ${trimmedUrlSpriteFilepath}`); + errors.push( + `[${id}] [${mlist[id]}] - the value should be 2 for the index ${index} - ${trimmedUrlSpriteFilepath}`, + ); } } } @@ -92,10 +94,12 @@ describe("check if every variant's sprite are correctly set", () => { for (const key of Object.keys(data)) { if (mlist[name][key] !== 1) { // if 2, check if json there - const urlSpriteJsonFile = `${dirpath}${name}_${parseInt(key, 10) + 1}.json`; + const urlSpriteJsonFile = `${dirpath}${name}_${Number.parseInt(key, 10) + 1}.json`; const spriteFileExists = fs.existsSync(urlSpriteJsonFile); if (!spriteFileExists) { - errors.push(`[${name}] [${mlist[name]}] - the value should be 1 for the index ${key} - ${trimmedFilePath}`); + errors.push( + `[${name}] [${mlist[name]}] - the value should be 1 for the index ${key} - ${trimmedFilePath}`, + ); } } } @@ -109,10 +113,9 @@ describe("check if every variant's sprite are correctly set", () => { const errors: string[] = []; for (const key of Object.keys(keys)) { const row = keys[key]; - for (const [ index, elm ] of row.entries()) { + for (const [index, elm] of row.entries()) { let url: string; if (elm === 0) { - continue; } else if (elm === 1) { url = `${key}.json`; const filePath = `${dirPath}${url}`; @@ -122,13 +125,13 @@ describe("check if every variant's sprite are correctly set", () => { errors.push(`index: ${index} - ${filePath}`); } } else if (elm === 2) { - url = `${key}_${parseInt(index, 10) + 1}.png`; + url = `${key}_${Number.parseInt(index, 10) + 1}.png`; let filePath = `${dirPath}${url}`; if (!fs.existsSync(filePath)) { errors.push(filePath); } - url = `${key}_${parseInt(index, 10) + 1}.json`; + url = `${key}_${Number.parseInt(index, 10) + 1}.json`; filePath = `${dirPath}${url}`; if (!fs.existsSync(filePath)) { errors.push(filePath); @@ -147,7 +150,7 @@ describe("check if every variant's sprite are correctly set", () => { if (errors.length) { console.log("errors", errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); it("check female variant files", () => { @@ -156,7 +159,7 @@ describe("check if every variant's sprite are correctly set", () => { if (errors.length) { console.log("errors", errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); it("check back female variant files", () => { @@ -165,7 +168,7 @@ describe("check if every variant's sprite are correctly set", () => { if (errors.length) { console.log("errors", errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); it("check back male back variant files", () => { @@ -176,25 +179,36 @@ describe("check if every variant's sprite are correctly set", () => { if (errors.length) { console.log("errors", errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); - it("check exp back variant files", () => { - const dirPath = `${rootDir}exp${path.sep}back${path.sep}`; - const errors = getMissingFiles(expVariant.back, dirPath); + it("check exp back female variant files", () => { + const dirPath = `${rootDir}exp${path.sep}back${path.sep}female${path.sep}`; + const errors = getMissingFiles(expVariant.back.female, dirPath); if (errors.length) { console.log("errors", errors); } expect(errors.length).toBe(0); }); + it("check exp back male variant files", () => { + const dirPath = `${rootDir}exp${path.sep}back${path.sep}`; + const backMaleVariant = deepCopy(expVariant.back); + delete backMaleVariant.female; + const errors = getMissingFiles(backMaleVariant, dirPath); + if (errors.length) { + console.log("errors", errors); + } + expect(errors).toEqual([]); + }); + it("check exp female variant files", () => { const dirPath = `${rootDir}exp${path.sep}female${path.sep}`; const errors = getMissingFiles(expVariant.female, dirPath); if (errors.length) { console.log("errors", errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); it("check exp male variant files", () => { @@ -206,7 +220,7 @@ describe("check if every variant's sprite are correctly set", () => { if (errors.length) { console.log("errors", errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); // check over every file if it's correctly set in the masterlist @@ -217,7 +231,7 @@ describe("check if every variant's sprite are correctly set", () => { if (errors.length) { console.log("errors for ", dirPath, errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); it("look over every file in variant back female and check if present in masterlist", () => { @@ -226,25 +240,34 @@ describe("check if every variant's sprite are correctly set", () => { if (errors.length) { console.log("errors for ", dirPath, errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); it("look over every file in variant back male and check if present in masterlist", () => { const dirPath = `${rootDir}back${path.sep}`; const backMaleVariant = deepCopy(backVariant); - const errors = getMissingMasterlist(backMaleVariant, dirPath, [ "female" ]); + const errors = getMissingMasterlist(backMaleVariant, dirPath, ["female"]); if (errors.length) { console.log("errors for ", dirPath, errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); - it("look over every file in variant exp back and check if present in masterlist", () => { - const dirPath = `${rootDir}exp${path.sep}back${path.sep}`; + it("look over every file in variant exp back female and check if present in masterlist", () => { + const dirPath = `${rootDir}exp${path.sep}back${path.sep}female${path.sep}`; const errors = getMissingMasterlist(expVariant.back, dirPath); if (errors.length) { console.log("errors for ", dirPath, errors); } + expect(errors).toEqual([]); + }); + + it("look over every file in variant exp back male and check if present in masterlist", () => { + const dirPath = `${rootDir}exp${path.sep}back${path.sep}`; + const errors = getMissingMasterlist(expVariant.back, dirPath, ["female"]); + if (errors.length) { + console.log("errors for ", dirPath, errors); + } expect(errors.length).toBe(0); }); @@ -254,24 +277,24 @@ describe("check if every variant's sprite are correctly set", () => { if (errors.length) { console.log("errors for ", dirPath, errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); it("look over every file in variant exp male and check if present in masterlist", () => { const dirPath = `${rootDir}exp${path.sep}`; - const errors = getMissingMasterlist(expVariant, dirPath, [ "back", "female" ]); + const errors = getMissingMasterlist(expVariant, dirPath, ["back", "female"]); if (errors.length) { console.log("errors for ", dirPath, errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); it("look over every file in variant root and check if present in masterlist", () => { const dirPath = `${rootDir}`; - const errors = getMissingMasterlist(masterlist, dirPath, [ "back", "female", "exp", "icons" ]); + const errors = getMissingMasterlist(masterlist, dirPath, ["back", "female", "exp", "icons"]); if (errors.length) { console.log("errors for ", dirPath, errors); } - expect(errors.length).toBe(0); + expect(errors).toEqual([]); }); }); diff --git a/src/test/sprites/spritesUtils.ts b/test/sprites/spritesUtils.ts similarity index 62% rename from src/test/sprites/spritesUtils.ts rename to test/sprites/spritesUtils.ts index f3ee634cd76..0c4bcd875fb 100644 --- a/src/test/sprites/spritesUtils.ts +++ b/test/sprites/spritesUtils.ts @@ -1,7 +1,7 @@ -const fs = require("fs"); -const path = require("path"); +const fs = require("node:fs"); +const path = require("node:path"); -export function getAppRootDir () { +export function getAppRootDir() { let currentDir = __dirname; while (!fs.existsSync(path.join(currentDir, "package.json"))) { currentDir = path.join(currentDir, ".."); diff --git a/src/test/system/game_data.test.ts b/test/system/game_data.test.ts similarity index 82% rename from src/test/system/game_data.test.ts rename to test/system/game_data.test.ts index ad24c40f445..93e615711c4 100644 --- a/src/test/system/game_data.test.ts +++ b/test/system/game_data.test.ts @@ -3,10 +3,10 @@ import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; import type { SessionSaveData } from "#app/system/game-data"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as account from "../../account"; +import * as account from "#app/account"; describe("System - Game Data", () => { let phaserGame: Phaser.Game; @@ -21,7 +21,7 @@ describe("System - Game Data", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH ]) + .moveset([Moves.SPLASH]) .battleType("single") .enemyAbility(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH); @@ -35,7 +35,7 @@ describe("System - Game Data", () => { beforeEach(() => { vi.spyOn(BattleScene, "bypassLogin", "get").mockReturnValue(false); vi.spyOn(game.scene.gameData, "getSessionSaveData").mockReturnValue({} as SessionSaveData); - vi.spyOn(account, "updateUserInfo").mockImplementation(async () => [ true, 1 ]); + vi.spyOn(account, "updateUserInfo").mockImplementation(async () => [true, 1]); }); it("should return [true, true] if bypassLogin is true", async () => { @@ -43,33 +43,39 @@ describe("System - Game Data", () => { const result = await game.scene.gameData.tryClearSession(0); - expect(result).toEqual([ true, true ]); + expect(result).toEqual([true, true]); }); it("should return [true, true] if successful", async () => { - vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({ success: true }); + vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({ + success: true, + }); const result = await game.scene.gameData.tryClearSession(0); - expect(result).toEqual([ true, true ]); + expect(result).toEqual([true, true]); expect(account.updateUserInfo).toHaveBeenCalled(); }); it("should return [true, false] if not successful", async () => { - vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({ success: false }); + vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({ + success: false, + }); const result = await game.scene.gameData.tryClearSession(0); - expect(result).toEqual([ true, false ]); + expect(result).toEqual([true, false]); expect(account.updateUserInfo).toHaveBeenCalled(); }); it("should return [false, false] session is out of date", async () => { - vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({ error: "session out of date" }); + vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({ + error: "session out of date", + }); const result = await game.scene.gameData.tryClearSession(0); - expect(result).toEqual([ false, false ]); + expect(result).toEqual([false, false]); expect(account.updateUserInfo).toHaveBeenCalled(); }); }); diff --git a/src/test/utils/TextInterceptor.ts b/test/testUtils/TextInterceptor.ts similarity index 57% rename from src/test/utils/TextInterceptor.ts rename to test/testUtils/TextInterceptor.ts index 466bcbf8052..4aaed458e44 100644 --- a/src/test/utils/TextInterceptor.ts +++ b/test/testUtils/TextInterceptor.ts @@ -9,12 +9,26 @@ export default class TextInterceptor { scene.messageWrapper = this; } - showText(text: string, delay?: integer, callback?: Function, callbackDelay?: integer, prompt?: boolean, promptDelay?: integer): void { + showText( + text: string, + _delay?: number, + _callback?: Function, + _callbackDelay?: number, + _prompt?: boolean, + _promptDelay?: number, + ): void { console.log(text); this.logs.push(text); } - showDialogue(text: string, name: string, delay?: integer, callback?: Function, callbackDelay?: integer, promptDelay?: integer): void { + showDialogue( + text: string, + name: string, + _delay?: number, + _callback?: Function, + _callbackDelay?: number, + _promptDelay?: number, + ): void { console.log(name, text); this.logs.push(name, text); } diff --git a/src/test/utils/errorInterceptor.ts b/test/testUtils/errorInterceptor.ts similarity index 90% rename from src/test/utils/errorInterceptor.ts rename to test/testUtils/errorInterceptor.ts index 7f06c47fd39..a8fb3284b78 100644 --- a/src/test/utils/errorInterceptor.ts +++ b/test/testUtils/errorInterceptor.ts @@ -29,8 +29,7 @@ export default class ErrorInterceptor { } } - -process.on("uncaughtException", (error) => { +process.on("uncaughtException", error => { console.log(error); const toStop = ErrorInterceptor.getInstance().running; for (const elm of toStop) { @@ -40,7 +39,7 @@ process.on("uncaughtException", (error) => { }); // Global error handler for unhandled promise rejections -process.on("unhandledRejection", (reason, promise) => { +process.on("unhandledRejection", (reason, _promise) => { console.log(reason); const toStop = ErrorInterceptor.getInstance().running; for (const elm of toStop) { diff --git a/src/test/utils/fakeMobile.html b/test/testUtils/fakeMobile.html similarity index 95% rename from src/test/utils/fakeMobile.html rename to test/testUtils/fakeMobile.html index 4b566d592d9..263b03969d4 100644 --- a/src/test/utils/fakeMobile.html +++ b/test/testUtils/fakeMobile.html @@ -35,7 +35,7 @@
R
-
+
V
@@ -59,7 +59,7 @@
N
-
+
V
diff --git a/src/test/utils/gameManager.ts b/test/testUtils/gameManager.ts similarity index 73% rename from src/test/utils/gameManager.ts rename to test/testUtils/gameManager.ts index 8e595212898..0ebc83cae31 100644 --- a/src/test/utils/gameManager.ts +++ b/test/testUtils/gameManager.ts @@ -1,7 +1,7 @@ import { updateUserInfo } from "#app/account"; import { BattlerIndex } from "#app/battle"; import BattleScene from "#app/battle-scene"; -import { getMoveTargets } from "#app/data/move"; +import { getMoveTargets } from "#app/data/moves/move"; import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import Trainer from "#app/field/trainer"; import { GameModes, getGameMode } from "#app/game-mode"; @@ -22,8 +22,9 @@ import { TitlePhase } from "#app/phases/title-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; -import ErrorInterceptor from "#app/test/utils/errorInterceptor"; -import type InputsHandler from "#app/test/utils/inputsHandler"; +import ErrorInterceptor from "#test/testUtils/errorInterceptor"; +import type InputsHandler from "#test/testUtils/inputsHandler"; +import type BallUiHandler from "#app/ui/ball-ui-handler"; import type BattleMessageUiHandler from "#app/ui/battle-message-ui-handler"; import type CommandUiHandler from "#app/ui/command-ui-handler"; import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; @@ -39,20 +40,20 @@ import type { Moves } from "#enums/moves"; import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { PlayerGender } from "#enums/player-gender"; import type { Species } from "#enums/species"; -import { generateStarter, waitUntil } from "#test/utils/gameManagerUtils"; -import GameWrapper from "#test/utils/gameWrapper"; -import { ChallengeModeHelper } from "#test/utils/helpers/challengeModeHelper"; -import { ClassicModeHelper } from "#test/utils/helpers/classicModeHelper"; -import { DailyModeHelper } from "#test/utils/helpers/dailyModeHelper"; -import { ModifierHelper } from "#test/utils/helpers/modifiersHelper"; -import { MoveHelper } from "#test/utils/helpers/moveHelper"; -import { OverridesHelper } from "#test/utils/helpers/overridesHelper"; -import { ReloadHelper } from "#test/utils/helpers/reloadHelper"; -import { SettingsHelper } from "#test/utils/helpers/settingsHelper"; -import PhaseInterceptor from "#test/utils/phaseInterceptor"; -import TextInterceptor from "#test/utils/TextInterceptor"; +import { generateStarter, waitUntil } from "#test/testUtils/gameManagerUtils"; +import GameWrapper from "#test/testUtils/gameWrapper"; +import { ChallengeModeHelper } from "#test/testUtils/helpers/challengeModeHelper"; +import { ClassicModeHelper } from "#test/testUtils/helpers/classicModeHelper"; +import { DailyModeHelper } from "#test/testUtils/helpers/dailyModeHelper"; +import { ModifierHelper } from "#test/testUtils/helpers/modifiersHelper"; +import { MoveHelper } from "#test/testUtils/helpers/moveHelper"; +import { OverridesHelper } from "#test/testUtils/helpers/overridesHelper"; +import { ReloadHelper } from "#test/testUtils/helpers/reloadHelper"; +import { SettingsHelper } from "#test/testUtils/helpers/settingsHelper"; +import PhaseInterceptor from "#test/testUtils/phaseInterceptor"; +import TextInterceptor from "#test/testUtils/TextInterceptor"; import { AES, enc } from "crypto-js"; -import fs from "fs"; +import fs from "node:fs"; import { expect, vi } from "vitest"; /** @@ -78,10 +79,10 @@ export default class GameManager { * @param phaserGame - The Phaser game instance. * @param bypassLogin - Whether to bypass the login phase. */ - constructor(phaserGame: Phaser.Game, bypassLogin: boolean = true) { + constructor(phaserGame: Phaser.Game, bypassLogin = true) { localStorage.clear(); ErrorInterceptor.getInstance().clear(); - BattleScene.prototype.randBattleSeedInt = (range, min: number = 0) => min + range - 1; // This simulates a max roll + BattleScene.prototype.randBattleSeedInt = (range, min = 0) => min + range - 1; // This simulates a max roll this.gameWrapper = new GameWrapper(phaserGame, bypassLogin); this.scene = new BattleScene(); this.phaseInterceptor = new PhaseInterceptor(this.scene); @@ -114,7 +115,7 @@ export default class GameManager { * @returns A promise that resolves when the mode is set. */ waitMode(mode: Mode): Promise { - return new Promise(async (resolve) => { + return new Promise(async resolve => { await waitUntil(() => this.scene.ui?.getMode() === mode); return resolve(); }); @@ -135,7 +136,13 @@ export default class GameManager { * @param callback - The callback function to execute on next prompt. * @param expireFn - Optional function to determine if the prompt has expired. */ - onNextPrompt(phaseTarget: string, mode: Mode, callback: () => void, expireFn?: () => void, awaitingActionInput: boolean = false) { + onNextPrompt( + phaseTarget: string, + mode: Mode, + callback: () => void, + expireFn?: () => void, + awaitingActionInput = false, + ) { this.phaseInterceptor.addToNextPrompt(phaseTarget, mode, callback, expireFn, awaitingActionInput); } @@ -204,18 +211,29 @@ export default class GameManager { await this.runToTitle(); - this.onNextPrompt("TitlePhase", Mode.TITLE, () => { - this.scene.gameMode = getGameMode(GameModes.CLASSIC); - const starters = generateStarter(this.scene, species); - const selectStarterPhase = new SelectStarterPhase(); - this.scene.pushPhase(new EncounterPhase(false)); - selectStarterPhase.initBattle(starters); - }, () => this.isCurrentPhase(EncounterPhase)); + this.onNextPrompt( + "TitlePhase", + Mode.TITLE, + () => { + this.scene.gameMode = getGameMode(GameModes.CLASSIC); + const starters = generateStarter(this.scene, species); + const selectStarterPhase = new SelectStarterPhase(); + this.scene.pushPhase(new EncounterPhase(false)); + selectStarterPhase.initBattle(starters); + }, + () => this.isCurrentPhase(EncounterPhase), + ); - this.onNextPrompt("EncounterPhase", Mode.MESSAGE, () => { - const handler = this.scene.ui.getHandler() as BattleMessageUiHandler; - handler.processInput(Button.ACTION); - }, () => this.isCurrentPhase(MysteryEncounterPhase), true); + this.onNextPrompt( + "EncounterPhase", + Mode.MESSAGE, + () => { + const handler = this.scene.ui.getHandler() as BattleMessageUiHandler; + handler.processInput(Button.ACTION); + }, + () => this.isCurrentPhase(MysteryEncounterPhase), + true, + ); await this.phaseInterceptor.run(EncounterPhase); if (!isNullOrUndefined(encounterType)) { @@ -234,15 +252,25 @@ export default class GameManager { await this.classicMode.runToSummon(species); if (this.scene.battleStyle === BattleStyle.SWITCH) { - this.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.setMode(Mode.MESSAGE); - this.endPhase(); - }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase)); + this.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.setMode(Mode.MESSAGE); + this.endPhase(); + }, + () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase), + ); - this.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.setMode(Mode.MESSAGE); - this.endPhase(); - }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase)); + this.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.setMode(Mode.MESSAGE); + this.endPhase(); + }, + () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase), + ); } await this.phaseInterceptor.to(CommandPhase); @@ -255,18 +283,30 @@ export default class GameManager { * @param {BattlerIndex} targetIndex The index of the attack target, or `undefined` for multi-target attacks * @param movePosition The index of the move in the pokemon's moveset array */ - selectTarget(movePosition: integer, targetIndex?: BattlerIndex) { - this.onNextPrompt("SelectTargetPhase", Mode.TARGET_SELECT, () => { - const handler = this.scene.ui.getHandler() as TargetSelectUiHandler; - const move = (this.scene.getCurrentPhase() as SelectTargetPhase).getPokemon().getMoveset()[movePosition]!.getMove(); // TODO: is the bang correct? - if (!move.isMultiTarget()) { - handler.setCursor(targetIndex !== undefined ? targetIndex : BattlerIndex.ENEMY); - } - if (move.isMultiTarget() && targetIndex !== undefined) { - throw new Error(`targetIndex was passed to selectMove() but move ("${move.name}") is not targetted`); - } - handler.processInput(Button.ACTION); - }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(MovePhase) || this.isCurrentPhase(TurnStartPhase) || this.isCurrentPhase(TurnEndPhase)); + selectTarget(movePosition: number, targetIndex?: BattlerIndex) { + this.onNextPrompt( + "SelectTargetPhase", + Mode.TARGET_SELECT, + () => { + const handler = this.scene.ui.getHandler() as TargetSelectUiHandler; + const move = (this.scene.getCurrentPhase() as SelectTargetPhase) + .getPokemon() + .getMoveset() + [movePosition]!.getMove(); // TODO: is the bang correct? + if (!move.isMultiTarget()) { + handler.setCursor(targetIndex !== undefined ? targetIndex : BattlerIndex.ENEMY); + } + if (move.isMultiTarget() && targetIndex !== undefined) { + throw new Error(`targetIndex was passed to selectMove() but move ("${move.name}") is not targetted`); + } + handler.processInput(Button.ACTION); + }, + () => + this.isCurrentPhase(CommandPhase) || + this.isCurrentPhase(MovePhase) || + this.isCurrentPhase(TurnStartPhase) || + this.isCurrentPhase(TurnEndPhase), + ); } /** Faint all opponents currently on the field */ @@ -279,15 +319,32 @@ export default class GameManager { /** Emulate selecting a modifier (item) */ doSelectModifier() { - this.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => { - const handler = this.scene.ui.getHandler() as ModifierSelectUiHandler; - handler.processInput(Button.CANCEL); - }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(NewBattlePhase) || this.isCurrentPhase(CheckSwitchPhase), true); + this.onNextPrompt( + "SelectModifierPhase", + Mode.MODIFIER_SELECT, + () => { + const handler = this.scene.ui.getHandler() as ModifierSelectUiHandler; + handler.processInput(Button.CANCEL); + }, + () => + this.isCurrentPhase(CommandPhase) || + this.isCurrentPhase(NewBattlePhase) || + this.isCurrentPhase(CheckSwitchPhase), + true, + ); - this.onNextPrompt("SelectModifierPhase", Mode.CONFIRM, () => { - const handler = this.scene.ui.getHandler() as ModifierSelectUiHandler; - handler.processInput(Button.ACTION); - }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(NewBattlePhase) || this.isCurrentPhase(CheckSwitchPhase)); + this.onNextPrompt( + "SelectModifierPhase", + Mode.CONFIRM, + () => { + const handler = this.scene.ui.getHandler() as ModifierSelectUiHandler; + handler.processInput(Button.ACTION); + }, + () => + this.isCurrentPhase(CommandPhase) || + this.isCurrentPhase(NewBattlePhase) || + this.isCurrentPhase(CheckSwitchPhase), + ); } /** @@ -304,9 +361,10 @@ export default class GameManager { vi.spyOn(enemy, "getNextMove").mockReturnValueOnce({ move: moveId, - targets: (target !== undefined && !legalTargets.multiple && legalTargets.targets.includes(target)) - ? [ target ] - : enemy.getNextTargets(moveId) + targets: + target !== undefined && !legalTargets.multiple && legalTargets.targets.includes(target) + ? [target] + : enemy.getNextTargets(moveId), }); /** @@ -321,7 +379,10 @@ export default class GameManager { const originalMatchupScore = Trainer.prototype.getPartyMemberMatchupScores; Trainer.prototype.getPartyMemberMatchupScores = () => { Trainer.prototype.getPartyMemberMatchupScores = originalMatchupScore; - return [[ 1, 100 ], [ 1, 100 ]]; + return [ + [1, 100], + [1, 100], + ]; }; } @@ -334,10 +395,15 @@ export default class GameManager { async toNextWave() { this.doSelectModifier(); - this.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.setMode(Mode.MESSAGE); - this.endPhase(); - }, () => this.isCurrentPhase(TurnInitPhase)); + this.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.setMode(Mode.MESSAGE); + this.endPhase(); + }, + () => this.isCurrentPhase(TurnInitPhase), + ); await this.toNextTurn(); } @@ -375,7 +441,7 @@ export default class GameManager { */ exportSaveToTest(): Promise { const saveKey = "x0i2O7WRiANTqPmZ"; - return new Promise(async (resolve) => { + return new Promise(async resolve => { const sessionSaveData = this.scene.gameData.getSessionSaveData(); const encryptedSaveData = AES.encrypt(JSON.stringify(sessionSaveData), saveKey).toString(); resolve(encryptedSaveData); @@ -387,7 +453,7 @@ export default class GameManager { * @param path - The path to the data file. * @returns A promise that resolves with a tuple containing a boolean indicating success and an integer status code. */ - async importData(path): Promise<[boolean, integer]> { + async importData(path): Promise<[boolean, number]> { const saveKey = "x0i2O7WRiANTqPmZ"; const dataRaw = fs.readFileSync(path, { encoding: "utf8", flag: "r" }); let dataStr = AES.decrypt(dataRaw, saveKey).toString(enc.Utf8); @@ -410,7 +476,7 @@ export default class GameManager { return new Promise(async (resolve, reject) => { pokemon.hp = 0; this.scene.pushPhase(new FaintPhase(pokemon.getBattlerIndex(), true)); - await this.phaseInterceptor.to(FaintPhase).catch((e) => reject(e)); + await this.phaseInterceptor.to(FaintPhase).catch(e => reject(e)); resolve(); }); } @@ -458,6 +524,24 @@ export default class GameManager { }); } + /** + * Select the BALL option from the command menu, then press Action; in the BALL + * menu, select a pokéball type and press Action again to throw it. + * @param ballIndex the index of the pokeball to throw + */ + public doThrowPokeball(ballIndex: number) { + this.onNextPrompt("CommandPhase", Mode.COMMAND, () => { + (this.scene.ui.getHandler() as CommandUiHandler).setCursor(1); + (this.scene.ui.getHandler() as CommandUiHandler).processInput(Button.ACTION); + }); + + this.onNextPrompt("CommandPhase", Mode.BALL, () => { + const ballHandler = this.scene.ui.getHandler() as BallUiHandler; + ballHandler.setCursor(ballIndex); + ballHandler.processInput(Button.ACTION); // select ball and throw + }); + } + /** * Intercepts `TurnStartPhase` and mocks {@linkcode TurnStartPhase.getSpeedOrder}'s return value. * Used to manually modify Pokemon turn order. diff --git a/src/test/utils/gameManagerUtils.ts b/test/testUtils/gameManagerUtils.ts similarity index 81% rename from src/test/utils/gameManagerUtils.ts rename to test/testUtils/gameManagerUtils.ts index 757874f0c17..ae6c11f5efa 100644 --- a/src/test/utils/gameManagerUtils.ts +++ b/test/testUtils/gameManagerUtils.ts @@ -27,7 +27,6 @@ export function blobToString(blob) { }); } - export function holdOn(ms: number) { return new Promise(resolve => setTimeout(resolve, ms)); } @@ -39,12 +38,21 @@ export function generateStarter(scene: BattleScene, species?: Species[]): Starte for (const starter of starters) { const starterProps = scene.gameData.getSpeciesDexAttrProps(starter.species, starter.dexAttr); const starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0)); - const starterGender = starter.species.malePercent !== null - ? !starterProps.female ? Gender.MALE : Gender.FEMALE - : Gender.GENDERLESS; - const starterPokemon = scene.addPlayerPokemon(starter.species, startingLevel, starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, undefined, starter.nature); + const starterGender = + starter.species.malePercent !== null ? (!starterProps.female ? Gender.MALE : Gender.FEMALE) : Gender.GENDERLESS; + const starterPokemon = scene.addPlayerPokemon( + starter.species, + startingLevel, + starter.abilityIndex, + starterFormIndex, + starterGender, + starterProps.shiny, + starterProps.variant, + undefined, + starter.nature, + ); const moveset: Moves[] = []; - starterPokemon.moveset.forEach((move) => { + starterPokemon.moveset.forEach(move => { moveset.push(move!.getMove().id); }); starter.moveset = moveset as StarterMoveset; @@ -69,7 +77,7 @@ function getTestRunStarters(seed: string, species?: Species[]): Starter[] { abilityIndex: pokemon.abilityIndex, passive: false, nature: pokemon.getNature(), - pokerus: pokemon.pokerus + pokerus: pokemon.pokerus, }; starters.push(starter); } @@ -91,7 +99,7 @@ export function waitUntil(truth): Promise { export function getMovePosition(scene: BattleScene, pokemonIndex: 0 | 1, move: Moves): number { const playerPokemon = scene.getPlayerField()[pokemonIndex]; const moveSet = playerPokemon.getMoveset(); - const index = moveSet.findIndex((m) => m?.moveId === move && m?.ppUsed < m?.getMovePp()); + const index = moveSet.findIndex(m => m?.moveId === move && m?.ppUsed < m?.getMovePp()); console.log(`Move position for ${Moves[move]} (=${move}):`, index); return index; } @@ -101,12 +109,22 @@ export function getMovePosition(scene: BattleScene, pokemonIndex: 0 | 1, move: M */ export function initSceneWithoutEncounterPhase(scene: BattleScene, species?: Species[]): void { const starters = generateStarter(scene, species); - starters.forEach((starter) => { + starters.forEach(starter => { const starterProps = scene.gameData.getSpeciesDexAttrProps(starter.species, starter.dexAttr); const starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0)); const starterGender = Gender.MALE; const starterIvs = scene.gameData.dexData[starter.species.speciesId].ivs.slice(0); - const starterPokemon = scene.addPlayerPokemon(starter.species, scene.gameMode.getStartingLevel(), starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, starterIvs, starter.nature); + const starterPokemon = scene.addPlayerPokemon( + starter.species, + scene.gameMode.getStartingLevel(), + starter.abilityIndex, + starterFormIndex, + starterGender, + starterProps.shiny, + starterProps.variant, + starterIvs, + starter.nature, + ); starter.moveset && starterPokemon.tryPopulateMoveset(starter.moveset); scene.getPlayerParty().push(starterPokemon); }); diff --git a/src/test/utils/gameWrapper.ts b/test/testUtils/gameWrapper.ts similarity index 80% rename from src/test/utils/gameWrapper.ts rename to test/testUtils/gameWrapper.ts index ca5a67f901a..6af36f22d24 100644 --- a/src/test/utils/gameWrapper.ts +++ b/test/testUtils/gameWrapper.ts @@ -4,17 +4,18 @@ import BattleScene, * as battleScene from "#app/battle-scene"; import { MoveAnim } from "#app/data/battle-anims"; import Pokemon from "#app/field/pokemon"; import * as Utils from "#app/utils"; -import { blobToString } from "#test/utils/gameManagerUtils"; -import { MockClock } from "#test/utils/mocks/mockClock"; -import mockConsoleLog from "#test/utils/mocks/mockConsoleLog"; -import { MockFetch } from "#test/utils/mocks/mockFetch"; -import MockLoader from "#test/utils/mocks/mockLoader"; -import mockLocalStorage from "#test/utils/mocks/mockLocalStorage"; -import MockImage from "#test/utils/mocks/mocksContainer/mockImage"; -import MockTextureManager from "#test/utils/mocks/mockTextureManager"; -import fs from "fs"; +import { blobToString } from "#test/testUtils/gameManagerUtils"; +import { MockClock } from "#test/testUtils/mocks/mockClock"; +import mockConsoleLog from "#test/testUtils/mocks/mockConsoleLog"; +import { MockFetch } from "#test/testUtils/mocks/mockFetch"; +import MockLoader from "#test/testUtils/mocks/mockLoader"; +import mockLocalStorage from "#test/testUtils/mocks/mockLocalStorage"; +import MockImage from "#test/testUtils/mocks/mocksContainer/mockImage"; +import MockTextureManager from "#test/testUtils/mocks/mockTextureManager"; +import fs from "node:fs"; import Phaser from "phaser"; import InputText from "phaser3-rex-plugins/plugins/inputtext"; +import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { vi } from "vitest"; import { MockGameObjectCreator } from "./mocks/mockGameObjectCreator"; import InputManager = Phaser.Input.InputManager; @@ -23,7 +24,7 @@ import KeyboardPlugin = Phaser.Input.Keyboard.KeyboardPlugin; import GamepadPlugin = Phaser.Input.Gamepad.GamepadPlugin; import EventEmitter = Phaser.Events.EventEmitter; import UpdateList = Phaser.GameObjects.UpdateList; -import { version } from "../../../package.json"; +import { version } from "../../package.json"; import { MockTimedEventManager } from "./mocks/mockTimedEventManager"; Object.defineProperty(window, "localStorage", { @@ -33,7 +34,8 @@ Object.defineProperty(window, "console", { value: mockConsoleLog(false), }); - +BBCodeText.prototype.destroy = () => null; +BBCodeText.prototype.resize = () => null; InputText.prototype.setElement = () => null; InputText.prototype.resize = () => null; Phaser.GameObjects.Image = MockImage; @@ -45,14 +47,12 @@ window.URL.createObjectURL = (blob: Blob) => { }; navigator.getGamepads = () => []; global.fetch = vi.fn(MockFetch); -Utils.setCookie(Utils.sessionIdKey, 'fake_token'); - +Utils.setCookie(Utils.sessionIdKey, "fake_token"); window.matchMedia = () => ({ matches: false, }); - /** * Sets this object's position relative to another object with a given offset * @param guideObject {@linkcode Phaser.GameObjects.GameObject} to base the position off of @@ -72,13 +72,12 @@ Phaser.GameObjects.NineSlice.prototype.setPositionRelative = setPositionRelative Phaser.GameObjects.Text.prototype.setPositionRelative = setPositionRelative; Phaser.GameObjects.Rectangle.prototype.setPositionRelative = setPositionRelative; - export default class GameWrapper { public game: Phaser.Game; public scene: BattleScene; constructor(phaserGame: Phaser.Game, bypassLogin: boolean) { - Phaser.Math.RND.sow([ 'test' ]); + Phaser.Math.RND.sow(["test"]); // vi.spyOn(Utils, "apiFetch", "get").mockReturnValue(fetch); if (bypassLogin) { vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(true); @@ -90,20 +89,25 @@ export default class GameWrapper { Pokemon.prototype.enableMask = () => null; Pokemon.prototype.updateFusionPalette = () => null; Pokemon.prototype.cry = () => null; - Pokemon.prototype.faintCry = (cb) => { if (cb) cb(); }; + Pokemon.prototype.faintCry = cb => { + if (cb) { + cb(); + } + }; + BattleScene.prototype.addPokemonIcon = () => new Phaser.GameObjects.Container(this.scene); } setScene(scene: BattleScene) { this.scene = scene; this.injectMandatory(); - this.scene.preload && this.scene.preload(); + this.scene.preload?.(); this.scene.create(); } injectMandatory() { this.game.config = { seed: ["test"], - gameVersion: version + gameVersion: version, }; this.scene.game = this.game; this.game.renderer = { @@ -126,7 +130,7 @@ export default class GameWrapper { pause: () => null, setRate: () => null, add: () => this.scene.sound, - get: () => ({...this.scene.sound, totalDuration: 0}), + get: () => ({ ...this.scene.sound, totalDuration: 0 }), getAllPlaying: () => [], manager: { game: this.game, @@ -135,7 +139,7 @@ export default class GameWrapper { setVolume: () => null, stop: () => null, stopByKey: () => null, - on: (evt, callback) => callback(), + on: (_evt, callback) => callback(), key: "", }; @@ -147,15 +151,15 @@ export default class GameWrapper { }; this.scene.tweens = { - add: (data) => { + add: data => { if (data.onComplete) { data.onComplete(); } }, - getTweensOf: () => ([]), - killTweensOf: () => ([]), + getTweensOf: () => [], + killTweensOf: () => [], chain: () => null, - addCounter: (data) => { + addCounter: data => { if (data.onComplete) { data.onComplete(); } @@ -182,14 +186,15 @@ export default class GameWrapper { game: this.game, textures: { addCanvas: () => ({ - get: () => ({ // this.frame in Text.js + get: () => ({ + // this.frame in Text.js source: {}, setSize: () => null, glTexture: () => ({ spectorMetadata: {}, }), }), - }) + }), }, cache: this.scene.load.cacheManager, scale: this.game.scale, @@ -200,29 +205,30 @@ export default class GameWrapper { events: new EventEmitter(), settings: { loader: { - key: 'battle', - } + key: "battle", + }, }, input: this.game.input, }; const mockTextureManager = new MockTextureManager(this.scene); this.scene.add = mockTextureManager.add; this.scene.textures = mockTextureManager; - this.scene.sys.displayList = this.scene.add.displayList; + this.scene.sys.displayList = this.scene.add.displayList; this.scene.sys.updateList = new UpdateList(this.scene); this.scene.systems = this.scene.sys; this.scene.input = this.game.input; this.scene.scene = this.scene; this.scene.input.keyboard = new KeyboardPlugin(this.scene); this.scene.input.gamepad = new GamepadPlugin(this.scene); - this.scene.cachedFetch = (url, init) => { - return new Promise((resolve) => { + this.scene.cachedFetch = (url, _init) => { + return new Promise(resolve => { // need to remove that if later we want to test battle-anims - const newUrl = url.includes('./battle-anims/') ? prependPath('./battle-anims/tackle.json') : prependPath(url); + const newUrl = url.includes("./battle-anims/") ? prependPath("./battle-anims/tackle.json") : prependPath(url); + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO let raw; try { - raw = fs.readFileSync(newUrl, {encoding: "utf8", flag: "r"}); - } catch(e) { + raw = fs.readFileSync(newUrl, { encoding: "utf8", flag: "r" }); + } catch (_e) { return resolve(createFetchBadResponse({})); } const data = JSON.parse(raw); diff --git a/src/test/utils/helpers/challengeModeHelper.ts b/test/testUtils/helpers/challengeModeHelper.ts similarity index 82% rename from src/test/utils/helpers/challengeModeHelper.ts rename to test/testUtils/helpers/challengeModeHelper.ts index 4b5a38e72dc..0b7826eda7e 100644 --- a/src/test/utils/helpers/challengeModeHelper.ts +++ b/test/testUtils/helpers/challengeModeHelper.ts @@ -16,7 +16,6 @@ import { copyChallenge } from "data/challenge"; * Helper to handle Challenge mode specifics */ export class ChallengeModeHelper extends GameManagerHelper { - challenges: Challenge[] = []; /** @@ -65,15 +64,25 @@ export class ChallengeModeHelper extends GameManagerHelper { await this.runToSummon(species); if (this.game.scene.battleStyle === BattleStyle.SWITCH) { - this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.game.setMode(Mode.MESSAGE); - this.game.endPhase(); - }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase)); + this.game.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.game.setMode(Mode.MESSAGE); + this.game.endPhase(); + }, + () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase), + ); - this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.game.setMode(Mode.MESSAGE); - this.game.endPhase(); - }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase)); + this.game.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.game.setMode(Mode.MESSAGE); + this.game.endPhase(); + }, + () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase), + ); } await this.game.phaseInterceptor.to(CommandPhase); diff --git a/src/test/utils/helpers/classicModeHelper.ts b/test/testUtils/helpers/classicModeHelper.ts similarity index 79% rename from src/test/utils/helpers/classicModeHelper.ts rename to test/testUtils/helpers/classicModeHelper.ts index 40c3d518f1c..5b6a38f5747 100644 --- a/src/test/utils/helpers/classicModeHelper.ts +++ b/test/testUtils/helpers/classicModeHelper.ts @@ -14,7 +14,6 @@ import { GameManagerHelper } from "./gameManagerHelper"; * Helper to handle classic mode specifics */ export class ClassicModeHelper extends GameManagerHelper { - /** * Runs the classic game to the summon phase. * @param species - Optional array of species to summon. @@ -50,15 +49,25 @@ export class ClassicModeHelper extends GameManagerHelper { await this.runToSummon(species); if (this.game.scene.battleStyle === BattleStyle.SWITCH) { - this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.game.setMode(Mode.MESSAGE); - this.game.endPhase(); - }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase)); + this.game.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.game.setMode(Mode.MESSAGE); + this.game.endPhase(); + }, + () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase), + ); - this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.game.setMode(Mode.MESSAGE); - this.game.endPhase(); - }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase)); + this.game.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.game.setMode(Mode.MESSAGE); + this.game.endPhase(); + }, + () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase), + ); } await this.game.phaseInterceptor.to(CommandPhase); diff --git a/src/test/utils/helpers/dailyModeHelper.ts b/test/testUtils/helpers/dailyModeHelper.ts similarity index 76% rename from src/test/utils/helpers/dailyModeHelper.ts rename to test/testUtils/helpers/dailyModeHelper.ts index bd8c6ebb920..0f5bc84df68 100644 --- a/src/test/utils/helpers/dailyModeHelper.ts +++ b/test/testUtils/helpers/dailyModeHelper.ts @@ -13,7 +13,6 @@ import { GameManagerHelper } from "./gameManagerHelper"; * Helper to handle daily mode specifics */ export class DailyModeHelper extends GameManagerHelper { - /** * Runs the daily game to the summon phase. * @returns A promise that resolves when the summon phase is reached. @@ -50,15 +49,25 @@ export class DailyModeHelper extends GameManagerHelper { await this.runToSummon(); if (this.game.scene.battleStyle === BattleStyle.SWITCH) { - this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.game.setMode(Mode.MESSAGE); - this.game.endPhase(); - }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase)); + this.game.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.game.setMode(Mode.MESSAGE); + this.game.endPhase(); + }, + () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase), + ); - this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.game.setMode(Mode.MESSAGE); - this.game.endPhase(); - }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase)); + this.game.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.game.setMode(Mode.MESSAGE); + this.game.endPhase(); + }, + () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase), + ); } await this.game.phaseInterceptor.to(CommandPhase); diff --git a/src/test/utils/helpers/gameManagerHelper.ts b/test/testUtils/helpers/gameManagerHelper.ts similarity index 100% rename from src/test/utils/helpers/gameManagerHelper.ts rename to test/testUtils/helpers/gameManagerHelper.ts diff --git a/src/test/utils/helpers/modifiersHelper.ts b/test/testUtils/helpers/modifiersHelper.ts similarity index 100% rename from src/test/utils/helpers/modifiersHelper.ts rename to test/testUtils/helpers/modifiersHelper.ts diff --git a/src/test/utils/helpers/moveHelper.ts b/test/testUtils/helpers/moveHelper.ts similarity index 85% rename from src/test/utils/helpers/moveHelper.ts rename to test/testUtils/helpers/moveHelper.ts index ad39755b556..543f46b2026 100644 --- a/src/test/utils/helpers/moveHelper.ts +++ b/test/testUtils/helpers/moveHelper.ts @@ -9,8 +9,8 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Command } from "#app/ui/command-ui-handler"; import { Mode } from "#app/ui/ui"; import { Moves } from "#enums/moves"; -import { getMovePosition } from "#test/utils/gameManagerUtils"; -import { GameManagerHelper } from "#test/utils/helpers/gameManagerHelper"; +import { getMovePosition } from "#test/testUtils/gameManagerUtils"; +import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; import { vi } from "vitest"; /** @@ -33,7 +33,7 @@ export class MoveHelper extends GameManagerHelper { * Used to force a move to miss. * @param firstTargetOnly - Whether the move should force miss on the first target only, in the case of multi-target moves. */ - public async forceMiss(firstTargetOnly: boolean = false): Promise { + public async forceMiss(firstTargetOnly = false): Promise { await this.game.phaseInterceptor.to(MoveEffectPhase, false); const hitCheck = vi.spyOn(this.game.scene.getCurrentPhase() as MoveEffectPhase, "hitCheck"); @@ -84,25 +84,25 @@ export class MoveHelper extends GameManagerHelper { */ public changeMoveset(pokemon: Pokemon, moveset: Moves | Moves[]): void { if (!Array.isArray(moveset)) { - moveset = [ moveset ]; + moveset = [moveset]; } pokemon.moveset = []; - moveset.forEach((move) => { + moveset.forEach(move => { pokemon.moveset.push(new PokemonMove(move)); }); - const movesetStr = moveset.map((moveId) => Moves[moveId]).join(", "); + const movesetStr = moveset.map(moveId => Moves[moveId]).join(", "); console.log(`Pokemon ${pokemon.species.name}'s moveset manually set to ${movesetStr} (=[${moveset.join(", ")}])!`); } /** - * Simulates learning a move for a player pokemon. - * @param move The {@linkcode Moves} being learnt - * @param partyIndex The party position of the {@linkcode PlayerPokemon} learning the move (defaults to 0) - * @param moveSlotIndex The INDEX (0-4) of the move slot to replace if existent move slots are full; - * defaults to 0 (first slot) and 4 aborts the procedure - * @returns a promise that resolves once the move has been successfully learnt - */ - public async learnMove(move: Moves | integer, partyIndex: integer = 0, moveSlotIndex: integer = 0) { + * Simulates learning a move for a player pokemon. + * @param move The {@linkcode Moves} being learnt + * @param partyIndex The party position of the {@linkcode PlayerPokemon} learning the move (defaults to 0) + * @param moveSlotIndex The INDEX (0-4) of the move slot to replace if existent move slots are full; + * defaults to 0 (first slot) and 4 aborts the procedure + * @returns a promise that resolves once the move has been successfully learnt + */ + public async learnMove(move: Moves | number, partyIndex = 0, moveSlotIndex = 0) { return new Promise(async (resolve, reject) => { this.game.scene.pushPhase(new LearnMovePhase(partyIndex, move)); @@ -128,5 +128,4 @@ export class MoveHelper extends GameManagerHelper { resolve(); }); } - } diff --git a/src/test/utils/helpers/overridesHelper.ts b/test/testUtils/helpers/overridesHelper.ts similarity index 91% rename from src/test/utils/helpers/overridesHelper.ts rename to test/testUtils/helpers/overridesHelper.ts index 822c42163b1..e69e05bce45 100644 --- a/src/test/utils/helpers/overridesHelper.ts +++ b/test/testUtils/helpers/overridesHelper.ts @@ -23,9 +23,9 @@ import { GameManagerHelper } from "./gameManagerHelper"; */ export class OverridesHelper extends GameManagerHelper { /** If `true`, removes the starting items from enemies at the start of each test; default `true` */ - public removeEnemyStartingItems: boolean = true; + public removeEnemyStartingItems = true; /** If `true`, sets the shiny overrides to disable shinies at the start of each test; default `true` */ - public disableShinies: boolean = true; + public disableShinies = true; /** * Override the starting biome @@ -142,7 +142,7 @@ export class OverridesHelper extends GameManagerHelper { public starterForms(forms: Partial>): this { vi.spyOn(Overrides, "STARTER_FORM_OVERRIDES", "get").mockReturnValue(forms); const formsStr = Object.entries(forms) - .map(([ speciesId, formIndex ]) => `${Species[speciesId]}=${formIndex}`) + .map(([speciesId, formIndex]) => `${Species[speciesId]}=${formIndex}`) .join(", "); this.log(`Player Pokemon form set to: ${formsStr}!`); return this; @@ -181,6 +181,20 @@ export class OverridesHelper extends GameManagerHelper { return this; } + /** + * Forces the status of the player (pokemon) **passive** {@linkcode Abilities | ability} + * @param hasPassiveAbility forces the passive to be active if `true`, inactive if `false` + * @returns `this` + */ + public hasPassiveAbility(hasPassiveAbility: boolean | null): this { + vi.spyOn(Overrides, "HAS_PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(hasPassiveAbility); + if (hasPassiveAbility === null) { + this.log("Player Pokemon PASSIVE ability no longer force enabled or disabled!"); + } else { + this.log(`Player Pokemon PASSIVE ability is force ${hasPassiveAbility ? "enabled" : "disabled"}!`); + } + return this; + } /** * Override the player (pokemon) {@linkcode Moves | moves}set * @param moveset the {@linkcode Moves | moves}set to set @@ -189,9 +203,9 @@ export class OverridesHelper extends GameManagerHelper { public moveset(moveset: Moves | Moves[]): this { vi.spyOn(Overrides, "MOVESET_OVERRIDE", "get").mockReturnValue(moveset); if (!Array.isArray(moveset)) { - moveset = [ moveset ]; + moveset = [moveset]; } - const movesetStr = moveset.map((moveId) => Moves[moveId]).join(", "); + const movesetStr = moveset.map(moveId => Moves[moveId]).join(", "); this.log(`Player Pokemon moveset set to ${movesetStr} (=[${moveset.join(", ")}])!`); return this; } @@ -251,7 +265,7 @@ export class OverridesHelper extends GameManagerHelper { public seed(seed: string): this { vi.spyOn(this.game.scene, "resetSeed").mockImplementation(() => { this.game.scene.waveSeed = seed; - Phaser.Math.RND.sow([ seed ]); + Phaser.Math.RND.sow([seed]); this.game.scene.rngCounter = 0; }); this.game.scene.resetSeed(); @@ -325,6 +339,21 @@ export class OverridesHelper extends GameManagerHelper { return this; } + /** + * Forces the status of the enemy (pokemon) **passive** {@linkcode Abilities | ability} + * @param hasPassiveAbility forces the passive to be active if `true`, inactive if `false` + * @returns `this` + */ + public enemyHasPassiveAbility(hasPassiveAbility: boolean | null): this { + vi.spyOn(Overrides, "OPP_HAS_PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(hasPassiveAbility); + if (hasPassiveAbility === null) { + this.log("Enemy Pokemon PASSIVE ability no longer force enabled or disabled!"); + } else { + this.log(`Enemy Pokemon PASSIVE ability is force ${hasPassiveAbility ? "enabled" : "disabled"}!`); + } + return this; + } + /** * Override the enemy (pokemon) {@linkcode Moves | moves}set * @param moveset the {@linkcode Moves | moves}set to set @@ -333,9 +362,9 @@ export class OverridesHelper extends GameManagerHelper { public enemyMoveset(moveset: Moves | Moves[]): this { vi.spyOn(Overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue(moveset); if (!Array.isArray(moveset)) { - moveset = [ moveset ]; + moveset = [moveset]; } - const movesetStr = moveset.map((moveId) => Moves[moveId]).join(", "); + const movesetStr = moveset.map(moveId => Moves[moveId]).join(", "); this.log(`Enemy Pokemon moveset set to ${movesetStr} (=[${moveset.join(", ")}])!`); return this; } diff --git a/src/test/utils/helpers/reloadHelper.ts b/test/testUtils/helpers/reloadHelper.ts similarity index 72% rename from src/test/utils/helpers/reloadHelper.ts rename to test/testUtils/helpers/reloadHelper.ts index 5f516584873..842cd88b95c 100644 --- a/src/test/utils/helpers/reloadHelper.ts +++ b/test/testUtils/helpers/reloadHelper.ts @@ -19,7 +19,7 @@ export class ReloadHelper extends GameManagerHelper { // Whenever the game saves the session, save it to the reloadHelper instead vi.spyOn(game.scene.gameData, "saveAll").mockImplementation(() => { - return new Promise((resolve, reject) => { + return new Promise((resolve, _reject) => { this.sessionData = game.scene.gameData.getSessionSaveData(); resolve(true); }); @@ -31,7 +31,7 @@ export class ReloadHelper extends GameManagerHelper { * beginning of the first turn (equivalent to running `startBattle()`) for * the reloaded session. */ - async reloadSession() : Promise { + async reloadSession(): Promise { const scene = this.game.scene; const titlePhase = new TitlePhase(); @@ -39,9 +39,9 @@ export class ReloadHelper extends GameManagerHelper { // Set the last saved session to the desired session data vi.spyOn(scene.gameData, "getSession").mockReturnValue( - new Promise((resolve, reject) => { + new Promise((resolve, _reject) => { resolve(this.sessionData); - }) + }), ); scene.unshiftPhase(titlePhase); this.game.endPhase(); // End the currently ongoing battle @@ -51,15 +51,25 @@ export class ReloadHelper extends GameManagerHelper { // Run through prompts for switching Pokemon, copied from classicModeHelper.ts if (this.game.scene.battleStyle === BattleStyle.SWITCH) { - this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.game.setMode(Mode.MESSAGE); - this.game.endPhase(); - }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase)); + this.game.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.game.setMode(Mode.MESSAGE); + this.game.endPhase(); + }, + () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase), + ); - this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { - this.game.setMode(Mode.MESSAGE); - this.game.endPhase(); - }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase)); + this.game.onNextPrompt( + "CheckSwitchPhase", + Mode.CONFIRM, + () => { + this.game.setMode(Mode.MESSAGE); + this.game.endPhase(); + }, + () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase), + ); } await this.game.phaseInterceptor.to(CommandPhase); diff --git a/src/test/utils/helpers/settingsHelper.ts b/test/testUtils/helpers/settingsHelper.ts similarity index 94% rename from src/test/utils/helpers/settingsHelper.ts rename to test/testUtils/helpers/settingsHelper.ts index 83baa329cec..d5a60e6496a 100644 --- a/src/test/utils/helpers/settingsHelper.ts +++ b/test/testUtils/helpers/settingsHelper.ts @@ -27,7 +27,7 @@ export class SettingsHelper extends GameManagerHelper { */ typeHints(enable: boolean): void { this.game.scene.typeHints = enable; - this.log(`Type Hints ${enable ? "enabled" : "disabled"}` ); + this.log(`Type Hints ${enable ? "enabled" : "disabled"}`); } /** @@ -36,7 +36,7 @@ export class SettingsHelper extends GameManagerHelper { */ playerGender(gender: PlayerGender) { this.game.scene.gameData.gender = gender; - this.log(`Gender set to: ${PlayerGender[gender]} (=${gender})` ); + this.log(`Gender set to: ${PlayerGender[gender]} (=${gender})`); } /** @@ -45,7 +45,7 @@ export class SettingsHelper extends GameManagerHelper { */ expGainsSpeed(speed: ExpGainsSpeed) { this.game.scene.expGainsSpeed = speed; - this.log(`Exp Gains Speed set to: ${ExpGainsSpeed[speed]} (=${speed})` ); + this.log(`Exp Gains Speed set to: ${ExpGainsSpeed[speed]} (=${speed})`); } private log(...params: any[]) { diff --git a/src/test/utils/inputsHandler.ts b/test/testUtils/inputsHandler.ts similarity index 75% rename from src/test/utils/inputsHandler.ts rename to test/testUtils/inputsHandler.ts index 8b8a89e45dc..6e9dd453541 100644 --- a/src/test/utils/inputsHandler.ts +++ b/test/testUtils/inputsHandler.ts @@ -2,8 +2,8 @@ import type BattleScene from "#app/battle-scene"; import pad_xbox360 from "#app/configs/inputs/pad_xbox360"; import type { InputsController } from "#app/inputs-controller"; import TouchControl from "#app/touch-controls"; -import { holdOn } from "#test/utils/gameManagerUtils"; -import fs from "fs"; +import { holdOn } from "#test/testUtils/gameManagerUtils"; +import fs from "node:fs"; import { JSDOM } from "jsdom"; import Phaser from "phaser"; @@ -30,8 +30,8 @@ export default class InputsHandler { this.init(); } - pressTouch(button: string, duration: integer): Promise { - return new Promise(async (resolve) => { + pressTouch(button: string, duration: number): Promise { + return new Promise(async resolve => { this.fakeMobile.touchDown(button); await holdOn(duration); this.fakeMobile.touchUp(button); @@ -39,8 +39,8 @@ export default class InputsHandler { }); } - pressGamepadButton(button: integer, duration: integer): Promise { - return new Promise(async (resolve) => { + pressGamepadButton(button: number, duration: number): Promise { + return new Promise(async resolve => { this.scene.input.gamepad?.emit("down", this.fakePad, { index: button }); await holdOn(duration); this.scene.input.gamepad?.emit("up", this.fakePad, { index: button }); @@ -48,8 +48,8 @@ export default class InputsHandler { }); } - pressKeyboardKey(key: integer, duration: integer): Promise { - return new Promise(async (resolve) => { + pressKeyboardKey(key: number, duration: number): Promise { + return new Promise(async resolve => { this.scene.input.keyboard?.emit("keydown", { keyCode: key }); await holdOn(duration); this.scene.input.keyboard?.emit("keyup", { keyCode: key }); @@ -66,13 +66,21 @@ export default class InputsHandler { } listenInputs(): void { - this.events.on("input_down", (event) => { - this.log.push({ type: "input_down", button: event.button }); - }, this); + this.events.on( + "input_down", + event => { + this.log.push({ type: "input_down", button: event.button }); + }, + this, + ); - this.events.on("input_up", (event) => { - this.logUp.push({ type: "input_up", button: event.button }); - }, this); + this.events.on( + "input_up", + event => { + this.logUp.push({ type: "input_up", button: event.button }); + }, + this, + ); } } @@ -82,7 +90,7 @@ class Fakepad extends Phaser.Input.Gamepad.Gamepad { constructor(pad) { //@ts-ignore - super(undefined, { ...pad, buttons: pad.deviceMapping, axes: []}); //TODO: resolve ts-ignore + super(undefined, { ...pad, buttons: pad.deviceMapping, axes: [] }); //TODO: resolve ts-ignore this.id = "xbox_360_fakepad"; this.index = 0; } @@ -90,7 +98,7 @@ class Fakepad extends Phaser.Input.Gamepad.Gamepad { class FakeMobile { constructor() { - const fakeMobilePage = fs.readFileSync("./src/test/utils/fakeMobile.html", { encoding: "utf8", flag: "r" }); + const fakeMobilePage = fs.readFileSync("././test/testUtils/fakeMobile.html", { encoding: "utf8", flag: "r" }); const dom = new JSDOM(fakeMobilePage); Object.defineProperty(window, "document", { value: dom.window.document, diff --git a/src/test/utils/mocks/mockClock.ts b/test/testUtils/mocks/mockClock.ts similarity index 99% rename from src/test/utils/mocks/mockClock.ts rename to test/testUtils/mocks/mockClock.ts index 7fad3651010..67f399ae41d 100644 --- a/src/test/utils/mocks/mockClock.ts +++ b/test/testUtils/mocks/mockClock.ts @@ -1,6 +1,5 @@ import Clock = Phaser.Time.Clock; - export class MockClock extends Clock { public overrideDelay: number | null = 1; constructor(scene) { diff --git a/src/test/utils/mocks/mockConsoleLog.ts b/test/testUtils/mocks/mockConsoleLog.ts similarity index 56% rename from src/test/utils/mocks/mockConsoleLog.ts rename to test/testUtils/mocks/mockConsoleLog.ts index 9c3cbca6bb6..808b6ea4d4d 100644 --- a/src/test/utils/mocks/mockConsoleLog.ts +++ b/test/testUtils/mocks/mockConsoleLog.ts @@ -8,17 +8,17 @@ const MockConsoleLog = (_logDisabled = false, _phaseText = false) => { const originalWarn = console.warn; const notified: any[] = []; - const blacklist = [ "Phaser", "variant icon does not exist", "Texture \"%s\" not found" ]; - const whitelist = [ "Phase" ]; + const blacklist = ["Phaser", "variant icon does not exist", 'Texture "%s" not found']; + const whitelist = ["Phase"]; - return ({ + return { log(...args) { const argsStr = this.getStr(args); logs.push(argsStr); - if (logDisabled && (!phaseText)) { + if (logDisabled && !phaseText) { return; } - if ((phaseText && !whitelist.some((b) => argsStr.includes(b))) || blacklist.some((b) => argsStr.includes(b))) { + if ((phaseText && !whitelist.some(b => argsStr.includes(b))) || blacklist.some(b => argsStr.includes(b))) { return; } originalLog(args); @@ -31,10 +31,10 @@ const MockConsoleLog = (_logDisabled = false, _phaseText = false) => { debug(...args) { const argsStr = this.getStr(args); logs.push(argsStr); - if (logDisabled && (!phaseText)) { + if (logDisabled && !phaseText) { return; } - if (!whitelist.some((b) => argsStr.includes(b)) || blacklist.some((b) => argsStr.includes(b))) { + if (!whitelist.some(b => argsStr.includes(b)) || blacklist.some(b => argsStr.includes(b))) { return; } originalDebug(args); @@ -42,10 +42,10 @@ const MockConsoleLog = (_logDisabled = false, _phaseText = false) => { warn(...args) { const argsStr = this.getStr(args); logs.push(args); - if (logDisabled && (!phaseText)) { + if (logDisabled && !phaseText) { return; } - if (!whitelist.some((b) => argsStr.includes(b)) || blacklist.some((b) => argsStr.includes(b))) { + if (!whitelist.some(b => argsStr.includes(b)) || blacklist.some(b => argsStr.includes(b))) { return; } originalWarn(args); @@ -61,22 +61,22 @@ const MockConsoleLog = (_logDisabled = false, _phaseText = false) => { logs = []; }, getStr(...args) { - return args.map(arg => { - if (typeof arg === "object" && arg !== null) { - // Handle objects including arrays - return JSON.stringify(arg, (key, value) => - typeof value === "bigint" ? value.toString() : value - ); - } else if (typeof arg === "bigint") { - // Handle BigInt values - return arg.toString(); - } else { + return args + .map(arg => { + if (typeof arg === "object" && arg !== null) { + // Handle objects including arrays + return JSON.stringify(arg, (_key, value) => (typeof value === "bigint" ? value.toString() : value)); + } + if (typeof arg === "bigint") { + // Handle BigInt values + return arg.toString(); + } // Handle all other types return arg.toString(); - } - }).join(";"); + }) + .join(";"); }, - }); + }; }; export default MockConsoleLog; diff --git a/src/test/utils/mocks/mockFetch.ts b/test/testUtils/mocks/mockFetch.ts similarity index 57% rename from src/test/utils/mocks/mockFetch.ts rename to test/testUtils/mocks/mockFetch.ts index 2fa7cd198ce..195d4f65752 100644 --- a/src/test/utils/mocks/mockFetch.ts +++ b/test/testUtils/mocks/mockFetch.ts @@ -1,24 +1,25 @@ -export const MockFetch = (input, init) => { +export const MockFetch = (input, _init) => { const url = typeof input === "string" ? input : input.url; + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO let responseHandler; + // biome-ignore lint/suspicious/noImplicitAnyLet: TODO let responseText; const handlers = { - "account/info": { "username":"greenlamp", "lastSessionSlot":0 }, + "account/info": { username: "greenlamp", lastSessionSlot: 0 }, "savedata/session": {}, "savedata/system": {}, "savedata/updateall": "", "daily/rankingpagecount": { data: 0 }, - "game/titlestats": { "playerCount":0, "battleCount":5 }, + "game/titlestats": { playerCount: 0, battleCount: 5 }, "daily/rankings": [], }; - for (const key of Object.keys(handlers)) { if (url.includes(key)) { - responseHandler = async() => handlers[key]; - responseText = async() => handlers[key] ? JSON.stringify(handlers[key]) : handlers[key]; + responseHandler = async () => handlers[key]; + responseText = async () => (handlers[key] ? JSON.stringify(handlers[key]) : handlers[key]); break; } } diff --git a/src/test/utils/mocks/mockGameObject.ts b/test/testUtils/mocks/mockGameObject.ts similarity index 100% rename from src/test/utils/mocks/mockGameObject.ts rename to test/testUtils/mocks/mockGameObject.ts diff --git a/src/test/utils/mocks/mockGameObjectCreator.ts b/test/testUtils/mocks/mockGameObjectCreator.ts similarity index 100% rename from src/test/utils/mocks/mockGameObjectCreator.ts rename to test/testUtils/mocks/mockGameObjectCreator.ts diff --git a/src/test/utils/mocks/mockLoader.ts b/test/testUtils/mocks/mockLoader.ts similarity index 61% rename from src/test/utils/mocks/mockLoader.ts rename to test/testUtils/mocks/mockLoader.ts index 661eb72f2c2..7452f85a317 100644 --- a/src/test/utils/mocks/mockLoader.ts +++ b/test/testUtils/mocks/mockLoader.ts @@ -1,17 +1,16 @@ import CacheManager = Phaser.Cache.CacheManager; - export default class MockLoader { public cacheManager; constructor(scene) { this.cacheManager = new CacheManager(scene); } - once(event, callback) { + once(_event, callback) { callback(); } - setBaseURL(url) { + setBaseURL(_url) { return null; } @@ -19,24 +18,17 @@ export default class MockLoader { return null; } - spritesheet(key, url, frameConfig) { - } + spritesheet(_key, _url, _frameConfig) {} - audio(key, url) { - - } + audio(_key, _url) {} isLoading() { return false; } - start() { - } + start() {} - image() { + image() {} - } - - atlas(key, textureUrl, atlasUrl) { - } + atlas(_key, _textureUrl, _atlasUrl) {} } diff --git a/src/test/utils/mocks/mockLocalStorage.ts b/test/testUtils/mocks/mockLocalStorage.ts similarity index 91% rename from src/test/utils/mocks/mockLocalStorage.ts rename to test/testUtils/mocks/mockLocalStorage.ts index bb4ea4e890d..235aa76f664 100644 --- a/src/test/utils/mocks/mockLocalStorage.ts +++ b/test/testUtils/mocks/mockLocalStorage.ts @@ -1,4 +1,4 @@ -const mockLocalStorage = (() => { +const mockLocalStorage = () => { let store = {} as Storage; return { @@ -22,6 +22,6 @@ const mockLocalStorage = (() => { store = {} as Storage; }, }; -}); +}; export default mockLocalStorage; diff --git a/src/test/utils/mocks/mockTextureManager.ts b/test/testUtils/mocks/mockTextureManager.ts similarity index 74% rename from src/test/utils/mocks/mockTextureManager.ts rename to test/testUtils/mocks/mockTextureManager.ts index 39066561f25..fe249c5a5f7 100644 --- a/src/test/utils/mocks/mockTextureManager.ts +++ b/test/testUtils/mocks/mockTextureManager.ts @@ -1,11 +1,11 @@ -import MockContainer from "#test/utils/mocks/mocksContainer/mockContainer"; -import MockImage from "#test/utils/mocks/mocksContainer/mockImage"; -import MockNineslice from "#test/utils/mocks/mocksContainer/mockNineslice"; -import MockPolygon from "#test/utils/mocks/mocksContainer/mockPolygon"; -import MockRectangle from "#test/utils/mocks/mocksContainer/mockRectangle"; -import MockSprite from "#test/utils/mocks/mocksContainer/mockSprite"; -import MockText from "#test/utils/mocks/mocksContainer/mockText"; -import MockTexture from "#test/utils/mocks/mocksContainer/mockTexture"; +import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer"; +import MockImage from "#test/testUtils/mocks/mocksContainer/mockImage"; +import MockNineslice from "#test/testUtils/mocks/mocksContainer/mockNineslice"; +import MockPolygon from "#test/testUtils/mocks/mocksContainer/mockPolygon"; +import MockRectangle from "#test/testUtils/mocks/mocksContainer/mockRectangle"; +import MockSprite from "#test/testUtils/mocks/mocksContainer/mockSprite"; +import MockText from "#test/testUtils/mocks/mocksContainer/mockText"; +import MockTexture from "#test/testUtils/mocks/mocksContainer/mockTexture"; import type { MockGameObject } from "./mockGameObject"; import { MockVideoGameObject } from "./mockVideoGameObject"; @@ -51,7 +51,7 @@ export default class MockTextureManager { return sprite; } - existing(obj) { + existing(_obj) { // const whitelist = ["ArenaBase", "PlayerPokemon", "EnemyPokemon"]; // const key = obj.constructor.name; // if (whitelist.includes(key) || obj.texture?.key?.includes("trainer_")) { @@ -74,7 +74,19 @@ export default class MockTextureManager { } nineslice(x, y, texture, frame, width, height, leftWidth, rightWidth, topHeight, bottomHeight) { - const nineSlice = new MockNineslice(this, x, y, texture, frame, width, height, leftWidth, rightWidth, topHeight, bottomHeight); + const nineSlice = new MockNineslice( + this, + x, + y, + texture, + frame, + width, + height, + leftWidth, + rightWidth, + topHeight, + bottomHeight, + ); this.list.push(nineSlice); return nineSlice; } diff --git a/src/test/utils/mocks/mockTimedEventManager.ts b/test/testUtils/mocks/mockTimedEventManager.ts similarity index 100% rename from src/test/utils/mocks/mockTimedEventManager.ts rename to test/testUtils/mocks/mockTimedEventManager.ts diff --git a/src/test/utils/mocks/mockVideoGameObject.ts b/test/testUtils/mocks/mockVideoGameObject.ts similarity index 94% rename from src/test/utils/mocks/mockVideoGameObject.ts rename to test/testUtils/mocks/mockVideoGameObject.ts index 74b05626616..65a5c37b244 100644 --- a/src/test/utils/mocks/mockVideoGameObject.ts +++ b/test/testUtils/mocks/mockVideoGameObject.ts @@ -4,8 +4,6 @@ import type { MockGameObject } from "./mockGameObject"; export class MockVideoGameObject implements MockGameObject { public name: string; - constructor() {} - public play = () => null; public stop = () => this; public setOrigin = () => null; diff --git a/src/test/utils/mocks/mocksContainer/mockContainer.ts b/test/testUtils/mocks/mocksContainer/mockContainer.ts similarity index 80% rename from src/test/utils/mocks/mocksContainer/mockContainer.ts rename to test/testUtils/mocks/mocksContainer/mockContainer.ts index f0198535e7b..0a792c6fc79 100644 --- a/src/test/utils/mocks/mocksContainer/mockContainer.ts +++ b/test/testUtils/mocks/mocksContainer/mockContainer.ts @@ -1,4 +1,4 @@ -import type MockTextureManager from "#test/utils/mocks/mockTextureManager"; +import type MockTextureManager from "#test/testUtils/mocks/mockTextureManager"; import type { MockGameObject } from "../mockGameObject"; export default class MockContainer implements MockGameObject { @@ -25,17 +25,15 @@ export default class MockContainer implements MockGameObject { this.visible = visible; } - once(event, callback, source) { - } + once(_event, _callback, _source) {} - off(event, callback, source) { - } + off(_event, _callback, _source) {} removeFromDisplayList() { // same as remove or destroy } - removeBetween(startIndex, endIndex, destroyChild) { + removeBetween(_startIndex, _endIndex, _destroyChild) { // Removes multiple children across an index range } @@ -43,7 +41,7 @@ export default class MockContainer implements MockGameObject { // This callback is invoked when this Game Object is added to a Scene. } - setSize(width, height) { + setSize(_width, _height) { // Sets the size of this Game Object. } @@ -51,7 +49,7 @@ export default class MockContainer implements MockGameObject { /// Sets the mask that this Game Object will use to render with. } - setPositionRelative(source, x, y) { + setPositionRelative(_source, _x, _y) { /// Sets the position of this Game Object to be a relative position from the source Game Object. } @@ -66,11 +64,11 @@ export default class MockContainer implements MockGameObject { this.alpha = alpha; } - setFrame(frame, updateSize?: boolean, updateOrigin?: boolean) { + setFrame(_frame, _updateSize?: boolean, _updateOrigin?: boolean) { // Sets the frame this Game Object will use to render with. } - setScale(scale) { + setScale(_scale) { // Sets the scale of this Game Object. } @@ -91,59 +89,59 @@ export default class MockContainer implements MockGameObject { this.list = []; } - setShadow(shadowXpos, shadowYpos, shadowColor) { + setShadow(_shadowXpos, _shadowYpos, _shadowColor) { // Sets the shadow settings for this Game Object. } - setLineSpacing(lineSpacing) { + setLineSpacing(_lineSpacing) { // Sets the line spacing value of this Game Object. } - setText(text) { + setText(_text) { // Sets the text this Game Object will display. } - setAngle(angle) { + setAngle(_angle) { // Sets the angle of this Game Object. } - setShadowOffset(offsetX, offsetY) { + setShadowOffset(_offsetX, _offsetY) { // Sets the shadow offset values. } - setWordWrapWidth(width) { + setWordWrapWidth(_width) { // Sets the width (in pixels) to use for wrapping lines. } - setFontSize(fontSize) { + setFontSize(_fontSize) { // Sets the font size of this Game Object. } getBounds() { return { width: this.width, height: this.height }; } - setColor(color) { + setColor(_color) { // Sets the tint of this Game Object. } - setShadowColor(color) { + setShadowColor(_color) { // Sets the shadow color. } - setTint(color) { + setTint(_color) { // Sets the tint of this Game Object. } - setStrokeStyle(thickness, color) { + setStrokeStyle(_thickness, _color) { // Sets the stroke style for the graphics. return this; } - setDepth(depth) { + setDepth(_depth) { // Sets the depth of this Game Object. } - setTexture(texture) { + setTexture(_texture) { // Sets the texture this Game Object will use to render with. } @@ -155,15 +153,15 @@ export default class MockContainer implements MockGameObject { // Sends this Game Object to the back of its parent's display list. } - moveTo(obj) { + moveTo(_obj) { // Moves this Game Object to the given index in the list. } - moveAbove(obj) { + moveAbove(_obj) { // Moves this Game Object to be above the given Game Object in the display list. } - moveBelow(obj) { + moveBelow(_obj) { // Moves this Game Object to be below the given Game Object in the display list. } @@ -171,12 +169,11 @@ export default class MockContainer implements MockGameObject { this.name = name; } - bringToTop(obj) { + bringToTop(_obj) { // Brings this Game Object to the top of its parents display list. } - on(event, callback, source) { - } + on(_event, _callback, _source) {} add(obj) { // Adds a child to this Game Object. diff --git a/src/test/utils/mocks/mocksContainer/mockGraphics.ts b/test/testUtils/mocks/mocksContainer/mockGraphics.ts similarity index 82% rename from src/test/utils/mocks/mocksContainer/mockGraphics.ts rename to test/testUtils/mocks/mocksContainer/mockGraphics.ts index 2b4a33b5e4c..ebf84e935e3 100644 --- a/src/test/utils/mocks/mocksContainer/mockGraphics.ts +++ b/test/testUtils/mocks/mocksContainer/mockGraphics.ts @@ -4,11 +4,11 @@ export default class MockGraphics implements MockGameObject { private scene; public list: MockGameObject[] = []; public name: string; - constructor(textureManager, config) { + constructor(textureManager, _config) { this.scene = textureManager.scene; } - fillStyle(color) { + fillStyle(_color) { // Sets the fill style to be used by the fill methods. } @@ -16,7 +16,7 @@ export default class MockGraphics implements MockGameObject { // Starts a new path by emptying the list of sub-paths. Call this method when you want to create a new path. } - fillRect(x, y, width, height) { + fillRect(_x, _y, _width, _height) { // Adds a rectangle shape to the path which is filled when you call fill(). } @@ -24,20 +24,15 @@ export default class MockGraphics implements MockGameObject { // Creates a geometry mask. } - setOrigin(x, y) { - } + setOrigin(_x, _y) {} - setAlpha(alpha) { - } + setAlpha(_alpha) {} - setVisible(visible) { - } + setVisible(_visible) {} - setName(name) { - } + setName(_name) {} - once(event, callback, source) { - } + once(_event, _callback, _source) {} removeFromDisplayList() { // same as remove or destroy @@ -47,7 +42,7 @@ export default class MockGraphics implements MockGameObject { // This callback is invoked when this Game Object is added to a Scene. } - setPositionRelative(source, x, y) { + setPositionRelative(_source, _x, _y) { /// Sets the position of this Game Object to be a relative position from the source Game Object. } @@ -55,12 +50,11 @@ export default class MockGraphics implements MockGameObject { this.list = []; } - setScale(scale) { + setScale(_scale) { // Sets the scale of this Game Object. } - off(event, callback, source) { - } + off(_event, _callback, _source) {} add(obj) { // Adds a child to this Game Object. diff --git a/src/test/utils/mocks/mocksContainer/mockImage.ts b/test/testUtils/mocks/mocksContainer/mockImage.ts similarity index 70% rename from src/test/utils/mocks/mocksContainer/mockImage.ts rename to test/testUtils/mocks/mocksContainer/mockImage.ts index be183a0dd89..768fcfeb765 100644 --- a/src/test/utils/mocks/mocksContainer/mockImage.ts +++ b/test/testUtils/mocks/mocksContainer/mockImage.ts @@ -1,5 +1,4 @@ -import MockContainer from "#test/utils/mocks/mocksContainer/mockContainer"; - +import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer"; export default class MockImage extends MockContainer { private texture; diff --git a/src/test/utils/mocks/mocksContainer/mockNineslice.ts b/test/testUtils/mocks/mocksContainer/mockNineslice.ts similarity index 66% rename from src/test/utils/mocks/mocksContainer/mockNineslice.ts rename to test/testUtils/mocks/mocksContainer/mockNineslice.ts index a8e10036a72..90c0e13e725 100644 --- a/src/test/utils/mocks/mocksContainer/mockNineslice.ts +++ b/test/testUtils/mocks/mocksContainer/mockNineslice.ts @@ -1,5 +1,4 @@ -import MockContainer from "#test/utils/mocks/mocksContainer/mockContainer"; - +import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer"; export default class MockNineslice extends MockContainer { private texture; @@ -8,7 +7,7 @@ export default class MockNineslice extends MockContainer { private topHeight; private bottomHeight; - constructor(textureManager, x, y, texture, frame, width, height, leftWidth, rightWidth, topHeight, bottomHeight) { + constructor(textureManager, x, y, texture, frame, _width, _height, leftWidth, rightWidth, topHeight, bottomHeight) { super(textureManager, x, y); this.texture = texture; this.frame = frame; diff --git a/test/testUtils/mocks/mocksContainer/mockPolygon.ts b/test/testUtils/mocks/mocksContainer/mockPolygon.ts new file mode 100644 index 00000000000..4a7f3baec78 --- /dev/null +++ b/test/testUtils/mocks/mocksContainer/mockPolygon.ts @@ -0,0 +1,7 @@ +import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer"; + +export default class MockPolygon extends MockContainer { + constructor(textureManager, x, y, _content, _fillColor, _fillAlpha) { + super(textureManager, x, y); + } +} diff --git a/src/test/utils/mocks/mocksContainer/mockRectangle.ts b/test/testUtils/mocks/mocksContainer/mockRectangle.ts similarity index 83% rename from src/test/utils/mocks/mocksContainer/mockRectangle.ts rename to test/testUtils/mocks/mocksContainer/mockRectangle.ts index e4bca76b8fc..eec431d8ada 100644 --- a/src/test/utils/mocks/mocksContainer/mockRectangle.ts +++ b/test/testUtils/mocks/mocksContainer/mockRectangle.ts @@ -6,23 +6,18 @@ export default class MockRectangle implements MockGameObject { public list: MockGameObject[] = []; public name: string; - constructor(textureManager, x, y, width, height, fillColor) { + constructor(textureManager, _x, _y, _width, _height, fillColor) { this.fillColor = fillColor; this.scene = textureManager.scene; } - setOrigin(x, y) { - } + setOrigin(_x, _y) {} - setAlpha(alpha) { - } - setVisible(visible) { - } + setAlpha(_alpha) {} + setVisible(_visible) {} - setName(name) { - } + setName(_name) {} - once(event, callback, source) { - } + once(_event, _callback, _source) {} removeFromDisplayList() { // same as remove or destroy @@ -32,7 +27,7 @@ export default class MockRectangle implements MockGameObject { // This callback is invoked when this Game Object is added to a Scene. } - setPositionRelative(source, x, y) { + setPositionRelative(_source, _x, _y) { /// Sets the position of this Game Object to be a relative position from the source Game Object. } @@ -74,7 +69,7 @@ export default class MockRectangle implements MockGameObject { getAll() { return this.list; } - setScale(scale) { + setScale(_scale) { // return this.phaserText.setScale(scale); } } diff --git a/src/test/utils/mocks/mocksContainer/mockSprite.ts b/test/testUtils/mocks/mocksContainer/mockSprite.ts similarity index 95% rename from src/test/utils/mocks/mocksContainer/mockSprite.ts rename to test/testUtils/mocks/mocksContainer/mockSprite.ts index 6d851330a5e..dcc3588f127 100644 --- a/src/test/utils/mocks/mocksContainer/mockSprite.ts +++ b/test/testUtils/mocks/mocksContainer/mockSprite.ts @@ -3,7 +3,6 @@ import type { MockGameObject } from "../mockGameObject"; import Sprite = Phaser.GameObjects.Sprite; import Frame = Phaser.Textures.Frame; - export default class MockSprite implements MockGameObject { private phaserSprite; public pipelineData; @@ -38,11 +37,11 @@ export default class MockSprite implements MockGameObject { }; } - setTexture(key: string, frame?: string | number) { + setTexture(_key: string, _frame?: string | number) { return this; } - setSizeToFrame(frame?: boolean | Frame): Sprite { + setSizeToFrame(_frame?: boolean | Frame): Sprite { return {} as Sprite; } @@ -51,8 +50,7 @@ export default class MockSprite implements MockGameObject { return this.phaserSprite.setPipeline(obj); } - off(event, callback, source) { - } + off(_event, _callback, _source) {} setTintFill(color) { // Sets the tint fill color. @@ -117,7 +115,7 @@ export default class MockSprite implements MockGameObject { return this.phaserSprite.setTint(color); } - setFrame(frame, updateSize?: boolean, updateOrigin?: boolean) { + setFrame(frame, _updateSize?: boolean, _updateOrigin?: boolean) { // Sets the frame this Game Object will use to render with. this.frame = frame; return frame; @@ -172,9 +170,7 @@ export default class MockSprite implements MockGameObject { return this.phaserSprite.setAngle(angle); } - setMask() { - - } + setMask() {} add(obj) { // Adds a child to this Game Object. @@ -210,6 +206,4 @@ export default class MockSprite implements MockGameObject { getAll() { return this.list; } - - } diff --git a/src/test/utils/mocks/mocksContainer/mockText.ts b/test/testUtils/mocks/mocksContainer/mockText.ts similarity index 87% rename from src/test/utils/mocks/mocksContainer/mockText.ts rename to test/testUtils/mocks/mocksContainer/mockText.ts index 604679af372..552f8ff3ff8 100644 --- a/src/test/utils/mocks/mocksContainer/mockText.ts +++ b/test/testUtils/mocks/mocksContainer/mockText.ts @@ -13,7 +13,7 @@ export default class MockText implements MockGameObject { public name: string; public color?: string; - constructor(textureManager, x, y, content, styleOptions) { + constructor(textureManager, _x, _y, _content, _styleOptions) { this.scene = textureManager.scene; this.textureManager = textureManager; this.style = {}; @@ -81,11 +81,11 @@ export default class MockText implements MockGameObject { showText( text: string, - delay?: integer | null, + delay?: number | null, callback?: Function | null, - callbackDelay?: integer | null, + callbackDelay?: number | null, prompt?: boolean | null, - promptDelay?: integer | null + promptDelay?: number | null, ) { this.scene.messageWrapper.showText(text, delay, callback, callbackDelay, prompt, promptDelay); if (callback) { @@ -93,42 +93,49 @@ export default class MockText implements MockGameObject { } } - showDialogue(keyOrText: string, name: string | undefined, delay: integer | null = 0, callback: Function, callbackDelay?: integer, promptDelay?: integer) { + showDialogue( + keyOrText: string, + name: string | undefined, + delay: number | null = 0, + callback: Function, + callbackDelay?: number, + promptDelay?: number, + ) { this.scene.messageWrapper.showDialogue(keyOrText, name, delay, callback, callbackDelay, promptDelay); if (callback) { callback(); } } - setScale(scale) { + setScale(_scale) { // return this.phaserText.setScale(scale); } - setShadow(shadowXpos, shadowYpos, shadowColor) { + setShadow(_shadowXpos, _shadowYpos, _shadowColor) { // Sets the shadow settings for this Game Object. // return this.phaserText.setShadow(shadowXpos, shadowYpos, shadowColor); } - setLineSpacing(lineSpacing) { + setLineSpacing(_lineSpacing) { // Sets the line spacing value of this Game Object. // return this.phaserText.setLineSpacing(lineSpacing); } - setOrigin(x, y) { + setOrigin(_x, _y) { // return this.phaserText.setOrigin(x, y); } - once(event, callback, source) { + once(_event, _callback, _source) { // return this.phaserText.once(event, callback, source); } - off(event, callback, obj) {} + off(_event, _callback, _obj) {} removedFromScene() {} addToDisplayList() {} - setStroke(color, thickness) { + setStroke(_color, _thickness) { // Sets the stroke color and thickness. // return this.phaserText.setStroke(color, thickness); } @@ -143,15 +150,15 @@ export default class MockText implements MockGameObject { // return this.phaserText.addedToScene(); } - setVisible(visible) { + setVisible(_visible) { // return this.phaserText.setVisible(visible); } - setY(y) { + setY(_y) { // return this.phaserText.setY(y); } - setX(x) { + setX(_x) { // return this.phaserText.setX(x); } @@ -162,7 +169,7 @@ export default class MockText implements MockGameObject { * @param z The z position of this Game Object. Default 0. * @param w The w position of this Game Object. Default 0. */ - setPosition(x?: number, y?: number, z?: number, w?: number) {} + setPosition(_x?: number, _y?: number, _z?: number, _w?: number) {} setText(text) { // Sets the text this Game Object will display. @@ -170,17 +177,17 @@ export default class MockText implements MockGameObject { this.text = text; } - setAngle(angle) { + setAngle(_angle) { // Sets the angle of this Game Object. // return this.phaserText.setAngle(angle); } - setPositionRelative(source, x, y) { + setPositionRelative(_source, _x, _y) { /// Sets the position of this Game Object to be a relative position from the source Game Object. // return this.phaserText.setPositionRelative(source, x, y); } - setShadowOffset(offsetX, offsetY) { + setShadowOffset(_offsetX, _offsetY) { // Sets the shadow offset values. // return this.phaserText.setShadowOffset(offsetX, offsetY); } @@ -190,7 +197,7 @@ export default class MockText implements MockGameObject { this.wordWrapWidth = width; } - setFontSize(fontSize) { + setFontSize(_fontSize) { // Sets the font size of this Game Object. // return this.phaserText.setFontSize(fontSize); } @@ -208,17 +215,17 @@ export default class MockText implements MockGameObject { setInteractive = () => null; - setShadowColor(color) { + setShadowColor(_color) { // Sets the shadow color. // return this.phaserText.setShadowColor(color); } - setTint(color) { + setTint(_color) { // Sets the tint of this Game Object. // return this.phaserText.setTint(color); } - setStrokeStyle(thickness, color) { + setStrokeStyle(_thickness, _color) { // Sets the stroke style for the graphics. // return this.phaserText.setStrokeStyle(thickness, color); } @@ -228,7 +235,7 @@ export default class MockText implements MockGameObject { this.list = []; } - setAlpha(alpha) { + setAlpha(_alpha) { // return this.phaserText.setAlpha(alpha); } @@ -236,7 +243,7 @@ export default class MockText implements MockGameObject { this.name = name; } - setAlign(align) { + setAlign(_align) { // return this.phaserText.setAlign(align); } diff --git a/src/test/utils/mocks/mocksContainer/mockTexture.ts b/test/testUtils/mocks/mocksContainer/mockTexture.ts similarity index 88% rename from src/test/utils/mocks/mocksContainer/mockTexture.ts rename to test/testUtils/mocks/mocksContainer/mockTexture.ts index 57c87df23be..eb8b70902fa 100644 --- a/src/test/utils/mocks/mocksContainer/mockTexture.ts +++ b/test/testUtils/mocks/mocksContainer/mockTexture.ts @@ -1,7 +1,6 @@ -import type MockTextureManager from "#test/utils/mocks/mockTextureManager"; +import type MockTextureManager from "#test/testUtils/mocks/mockTextureManager"; import type { MockGameObject } from "../mockGameObject"; - /** * Stub for Phaser.Textures.Texture object * Just mocks the function calls and data required for use in tests @@ -23,7 +22,7 @@ export default class MockTexture implements MockGameObject { width: 100, height: 100, cutX: 0, - cutY: 0 + cutY: 0, }; this.frames = { firstFrame: mockFrame, @@ -31,7 +30,7 @@ export default class MockTexture implements MockGameObject { 1: mockFrame, 2: mockFrame, 3: mockFrame, - 4: mockFrame + 4: mockFrame, }; this.firstFrame = "firstFrame"; } diff --git a/src/test/utils/phaseInterceptor.ts b/test/testUtils/phaseInterceptor.ts similarity index 77% rename from src/test/utils/phaseInterceptor.ts rename to test/testUtils/phaseInterceptor.ts index d60e0e78373..742a6bc8441 100644 --- a/src/test/utils/phaseInterceptor.ts +++ b/test/testUtils/phaseInterceptor.ts @@ -1,5 +1,5 @@ import { Phase } from "#app/phase"; -import ErrorInterceptor from "#app/test/utils/errorInterceptor"; +import ErrorInterceptor from "#test/testUtils/errorInterceptor"; import { AttemptRunPhase } from "#app/phases/attempt-run-phase"; import { BattleEndPhase } from "#app/phases/battle-end-phase"; import { BerryPhase } from "#app/phases/berry-phase"; @@ -50,7 +50,7 @@ import { MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase, - PostMysteryEncounterPhase + PostMysteryEncounterPhase, } from "#app/phases/mystery-encounter-phases"; import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase"; import { PartyExpPhase } from "#app/phases/party-exp-phase"; @@ -60,6 +60,7 @@ import { RibbonModifierRewardPhase } from "#app/phases/ribbon-modifier-reward-ph import { GameOverModifierRewardPhase } from "#app/phases/game-over-modifier-reward-phase"; import { UnlockPhase } from "#app/phases/unlock-phase"; import { PostGameOverPhase } from "#app/phases/post-game-over-phase"; +import { RevivalBlessingPhase } from "#app/phases/revival-blessing-phase"; export interface PromptHandler { phaseTarget?: string; @@ -126,7 +127,8 @@ type PhaseClass = | typeof EncounterPhase | typeof GameOverPhase | typeof UnlockPhase - | typeof PostGameOverPhase; + | typeof PostGameOverPhase + | typeof RevivalBlessingPhase; type PhaseString = | "LoginPhase" @@ -185,7 +187,8 @@ type PhaseString = | "EncounterPhase" | "GameOverPhase" | "UnlockPhase" - | "PostGameOverPhase"; + | "PostGameOverPhase" + | "RevivalBlessingPhase"; type PhaseInterceptorPhase = PhaseClass | PhaseString; @@ -212,67 +215,73 @@ export default class PhaseInterceptor { * `initPhases()` so that its subclasses can use `super.start()` properly. */ private PHASES = [ - [ LoginPhase, this.startPhase ], - [ TitlePhase, this.startPhase ], - [ SelectGenderPhase, this.startPhase ], - [ NewBiomeEncounterPhase, this.startPhase ], - [ SelectStarterPhase, this.startPhase ], - [ PostSummonPhase, this.startPhase ], - [ SummonPhase, this.startPhase ], - [ ToggleDoublePositionPhase, this.startPhase ], - [ CheckSwitchPhase, this.startPhase ], - [ ShowAbilityPhase, this.startPhase ], - [ MessagePhase, this.startPhase ], - [ TurnInitPhase, this.startPhase ], - [ CommandPhase, this.startPhase ], - [ EnemyCommandPhase, this.startPhase ], - [ TurnStartPhase, this.startPhase ], - [ MovePhase, this.startPhase ], - [ MoveEffectPhase, this.startPhase ], - [ DamageAnimPhase, this.startPhase ], - [ FaintPhase, this.startPhase ], - [ BerryPhase, this.startPhase ], - [ TurnEndPhase, this.startPhase ], - [ BattleEndPhase, this.startPhase ], - [ EggLapsePhase, this.startPhase ], - [ SelectModifierPhase, this.startPhase ], - [ NextEncounterPhase, this.startPhase ], - [ NewBattlePhase, this.startPhase ], - [ VictoryPhase, this.startPhase ], - [ LearnMovePhase, this.startPhase ], - [ MoveEndPhase, this.startPhase ], - [ StatStageChangePhase, this.startPhase ], - [ ShinySparklePhase, this.startPhase ], - [ SelectTargetPhase, this.startPhase ], - [ UnavailablePhase, this.startPhase ], - [ QuietFormChangePhase, this.startPhase ], - [ SwitchPhase, this.startPhase ], - [ SwitchSummonPhase, this.startPhase ], - [ PartyHealPhase, this.startPhase ], - [ FormChangePhase, this.startPhase ], - [ EvolutionPhase, this.startPhase ], - [ EndEvolutionPhase, this.startPhase ], - [ LevelCapPhase, this.startPhase ], - [ AttemptRunPhase, this.startPhase ], - [ SelectBiomePhase, this.startPhase ], - [ MysteryEncounterPhase, this.startPhase ], - [ MysteryEncounterOptionSelectedPhase, this.startPhase ], - [ MysteryEncounterBattlePhase, this.startPhase ], - [ MysteryEncounterRewardsPhase, this.startPhase ], - [ PostMysteryEncounterPhase, this.startPhase ], - [ RibbonModifierRewardPhase, this.startPhase ], - [ GameOverModifierRewardPhase, this.startPhase ], - [ ModifierRewardPhase, this.startPhase ], - [ PartyExpPhase, this.startPhase ], - [ ExpPhase, this.startPhase ], - [ EncounterPhase, this.startPhase ], - [ GameOverPhase, this.startPhase ], - [ UnlockPhase, this.startPhase ], - [ PostGameOverPhase, this.startPhase ], + [LoginPhase, this.startPhase], + [TitlePhase, this.startPhase], + [SelectGenderPhase, this.startPhase], + [NewBiomeEncounterPhase, this.startPhase], + [SelectStarterPhase, this.startPhase], + [PostSummonPhase, this.startPhase], + [SummonPhase, this.startPhase], + [ToggleDoublePositionPhase, this.startPhase], + [CheckSwitchPhase, this.startPhase], + [ShowAbilityPhase, this.startPhase], + [MessagePhase, this.startPhase], + [TurnInitPhase, this.startPhase], + [CommandPhase, this.startPhase], + [EnemyCommandPhase, this.startPhase], + [TurnStartPhase, this.startPhase], + [MovePhase, this.startPhase], + [MoveEffectPhase, this.startPhase], + [DamageAnimPhase, this.startPhase], + [FaintPhase, this.startPhase], + [BerryPhase, this.startPhase], + [TurnEndPhase, this.startPhase], + [BattleEndPhase, this.startPhase], + [EggLapsePhase, this.startPhase], + [SelectModifierPhase, this.startPhase], + [NextEncounterPhase, this.startPhase], + [NewBattlePhase, this.startPhase], + [VictoryPhase, this.startPhase], + [LearnMovePhase, this.startPhase], + [MoveEndPhase, this.startPhase], + [StatStageChangePhase, this.startPhase], + [ShinySparklePhase, this.startPhase], + [SelectTargetPhase, this.startPhase], + [UnavailablePhase, this.startPhase], + [QuietFormChangePhase, this.startPhase], + [SwitchPhase, this.startPhase], + [SwitchSummonPhase, this.startPhase], + [PartyHealPhase, this.startPhase], + [FormChangePhase, this.startPhase], + [EvolutionPhase, this.startPhase], + [EndEvolutionPhase, this.startPhase], + [LevelCapPhase, this.startPhase], + [AttemptRunPhase, this.startPhase], + [SelectBiomePhase, this.startPhase], + [MysteryEncounterPhase, this.startPhase], + [MysteryEncounterOptionSelectedPhase, this.startPhase], + [MysteryEncounterBattlePhase, this.startPhase], + [MysteryEncounterRewardsPhase, this.startPhase], + [PostMysteryEncounterPhase, this.startPhase], + [RibbonModifierRewardPhase, this.startPhase], + [GameOverModifierRewardPhase, this.startPhase], + [ModifierRewardPhase, this.startPhase], + [PartyExpPhase, this.startPhase], + [ExpPhase, this.startPhase], + [EncounterPhase, this.startPhase], + [GameOverPhase, this.startPhase], + [UnlockPhase, this.startPhase], + [PostGameOverPhase, this.startPhase], + [RevivalBlessingPhase, this.startPhase], ]; private endBySetMode = [ - TitlePhase, SelectGenderPhase, CommandPhase, SelectModifierPhase, MysteryEncounterPhase, PostMysteryEncounterPhase + TitlePhase, + SelectGenderPhase, + CommandPhase, + SelectModifierPhase, + MysteryEncounterPhase, + PostMysteryEncounterPhase, ]; /** @@ -320,29 +329,29 @@ export default class PhaseInterceptor { * @param runTarget - Whether or not to run the target phase. * @returns A promise that resolves when the transition is complete. */ - async to(phaseTo: PhaseInterceptorPhase, runTarget: boolean = true): Promise { + async to(phaseTo: PhaseInterceptorPhase, runTarget = true): Promise { return new Promise(async (resolve, reject) => { ErrorInterceptor.getInstance().add(this); if (this.phaseFrom) { - await this.run(this.phaseFrom).catch((e) => reject(e)); + await this.run(this.phaseFrom).catch(e => reject(e)); this.phaseFrom = null; } const targetName = typeof phaseTo === "string" ? phaseTo : phaseTo.name; - this.intervalRun = setInterval(async() => { + this.intervalRun = setInterval(async () => { const currentPhase = this.onHold?.length && this.onHold[0]; if (currentPhase && currentPhase.name === targetName) { clearInterval(this.intervalRun); if (!runTarget) { return resolve(); } - await this.run(currentPhase).catch((e) => { + await this.run(currentPhase).catch(e => { clearInterval(this.intervalRun); return reject(e); }); return resolve(); } if (currentPhase && currentPhase.name !== targetName) { - await this.run(currentPhase).catch((e) => { + await this.run(currentPhase).catch(e => { clearInterval(this.intervalRun); return reject(e); }); @@ -367,7 +376,7 @@ export default class PhaseInterceptor { if (currentPhase) { if (currentPhase.name !== targetName) { clearInterval(interval); - const skip = skipFn && skipFn(currentPhase.name); + const skip = skipFn?.(currentPhase.name); if (skip) { this.onHold.unshift(currentPhase); ErrorInterceptor.getInstance().remove(this); @@ -383,7 +392,7 @@ export default class PhaseInterceptor { ErrorInterceptor.getInstance().remove(this); resolve(); }, - onError: (error) => reject(error), + onError: error => reject(error), }; currentPhase.call(); } @@ -391,10 +400,10 @@ export default class PhaseInterceptor { }); } - whenAboutToRun(phaseTarget: PhaseInterceptorPhase, skipFn?: (className: PhaseClass) => boolean): Promise { + whenAboutToRun(phaseTarget: PhaseInterceptorPhase, _skipFn?: (className: PhaseClass) => boolean): Promise { const targetName = typeof phaseTarget === "string" ? phaseTarget : phaseTarget.name; this.scene.moveAnimations = null; // Mandatory to avoid crash - return new Promise(async (resolve, reject) => { + return new Promise(async (resolve, _reject) => { ErrorInterceptor.getInstance().add(this); const interval = setInterval(async () => { const currentPhase = this.onHold[0]; @@ -420,7 +429,7 @@ export default class PhaseInterceptor { * * @param shouldRun Whether or not the current scene should also be run. */ - shift(shouldRun: boolean = false) : void { + shift(shouldRun = false): void { this.onHold.shift(); if (shouldRun) { this.scene.shiftPhase(); @@ -435,11 +444,11 @@ export default class PhaseInterceptor { this.originalSuperEnd = Phase.prototype.end; UI.prototype.setMode = (mode, ...args) => this.setMode.call(this, mode, ...args); Phase.prototype.end = () => this.superEndPhase.call(this); - for (const [ phase, methodStart ] of this.PHASES) { + for (const [phase, methodStart] of this.PHASES) { const originalStart = phase.prototype.start; this.phases[phase.name] = { start: originalStart, - endBySetMode: this.endBySetMode.some((elm) => elm.name === phase.name), + endBySetMode: this.endBySetMode.some(elm => elm.name === phase.name), }; phase.prototype.start = () => methodStart.call(this, phase); } @@ -456,7 +465,7 @@ export default class PhaseInterceptor { name: phase.name, call: () => { this.phases[phase.name].start.apply(instance); - } + }, }); } @@ -485,10 +494,11 @@ export default class PhaseInterceptor { const currentPhase = this.scene.getCurrentPhase(); const instance = this.scene.ui; console.log("setMode", `${Mode[mode]} (=${mode})`, args); - const ret = this.originalSetMode.apply(instance, [ mode, ...args ]); + const ret = this.originalSetMode.apply(instance, [mode, ...args]); if (!this.phases[currentPhase.constructor.name]) { - throw new Error(`missing ${currentPhase.constructor.name} in phaseInterceptor PHASES list --- Add it to PHASES inside of /test/utils/phaseInterceptor.ts`); - + throw new Error( + `missing ${currentPhase.constructor.name} in phaseInterceptor PHASES list --- Add it to PHASES inside of /test/utils/phaseInterceptor.ts`, + ); } if (this.phases[currentPhase.constructor.name].endBySetMode) { this.inProgress?.callback(); @@ -504,18 +514,18 @@ export default class PhaseInterceptor { this.promptInterval = setInterval(() => { if (this.prompts.length) { const actionForNextPrompt = this.prompts[0]; - const expireFn = actionForNextPrompt.expireFn && actionForNextPrompt.expireFn(); + const expireFn = actionForNextPrompt.expireFn?.(); const currentMode = this.scene.ui.getMode(); const currentPhase = this.scene.getCurrentPhase()?.constructor.name; const currentHandler = this.scene.ui.getHandler(); if (expireFn) { this.prompts.shift(); } else if ( - currentMode === actionForNextPrompt.mode - && currentPhase === actionForNextPrompt.phaseTarget - && currentHandler.active - && (!actionForNextPrompt.awaitingActionInput - || (actionForNextPrompt.awaitingActionInput && currentHandler.awaitingActionInput)) + currentMode === actionForNextPrompt.mode && + currentPhase === actionForNextPrompt.phaseTarget && + currentHandler.active && + (!actionForNextPrompt.awaitingActionInput || + (actionForNextPrompt.awaitingActionInput && currentHandler.awaitingActionInput)) ) { const prompt = this.prompts.shift(); if (prompt?.callback) { @@ -534,13 +544,19 @@ export default class PhaseInterceptor { * @param expireFn - The function to determine if the prompt has expired. * @param awaitingActionInput */ - addToNextPrompt(phaseTarget: string, mode: Mode, callback: () => void, expireFn?: () => void, awaitingActionInput: boolean = false) { + addToNextPrompt( + phaseTarget: string, + mode: Mode, + callback: () => void, + expireFn?: () => void, + awaitingActionInput = false, + ) { this.prompts.push({ phaseTarget, mode, callback, expireFn, - awaitingActionInput + awaitingActionInput, }); } @@ -551,7 +567,7 @@ export default class PhaseInterceptor { * function stored in `this.phases`. Additionally, it clears the `promptInterval` and `interval`. */ restoreOg() { - for (const [ phase ] of this.PHASES) { + for (const [phase] of this.PHASES) { phase.prototype.start = this.phases[phase.name].start; } UI.prototype.setMode = this.originalSetMode; diff --git a/src/test/utils/saves/data_new.prsv b/test/testUtils/saves/data_new.prsv similarity index 100% rename from src/test/utils/saves/data_new.prsv rename to test/testUtils/saves/data_new.prsv diff --git a/src/test/utils/saves/everything.prsv b/test/testUtils/saves/everything.prsv similarity index 100% rename from src/test/utils/saves/everything.prsv rename to test/testUtils/saves/everything.prsv diff --git a/src/test/utils/testUtils.ts b/test/testUtils/testUtils.ts similarity index 93% rename from src/test/utils/testUtils.ts rename to test/testUtils/testUtils.ts index a8410f8ba40..40e4bbe8775 100644 --- a/src/test/utils/testUtils.ts +++ b/test/testUtils/testUtils.ts @@ -18,7 +18,7 @@ export function mockI18next() { * @param end end number e.g. 10 * @returns an array of numbers */ -export function arrayOfRange(start: integer, end: integer) { +export function arrayOfRange(start: number, end: number) { return Array.from({ length: end - start }, (_v, k) => k + start); } diff --git a/src/test/ui/battle_info.test.ts b/test/ui/battle_info.test.ts similarity index 78% rename from src/test/ui/battle_info.test.ts rename to test/ui/battle_info.test.ts index 3100372f091..4c6274d5efb 100644 --- a/src/test/ui/battle_info.test.ts +++ b/test/ui/battle_info.test.ts @@ -3,10 +3,11 @@ import { Species } from "#app/enums/species"; import { ExpPhase } from "#app/phases/exp-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +// biome-ignore lint/correctness/noEmptyPattern: TODO: Examine why this is here vi.mock("../data/exp", ({}) => { return { getLevelRelExp: vi.fn(() => 1), //consistent levelRelExp @@ -30,26 +31,26 @@ describe("UI - Battle Info", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.GUILLOTINE, Moves.SPLASH ]) + .moveset([Moves.GUILLOTINE, Moves.SPLASH]) .battleType("single") .enemyAbility(Abilities.BALL_FETCH) .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.CATERPIE); }); - it.each([ ExpGainsSpeed.FAST, ExpGainsSpeed.FASTER, ExpGainsSpeed.SKIP ])( + it.each([ExpGainsSpeed.FAST, ExpGainsSpeed.FASTER, ExpGainsSpeed.SKIP])( "should increase exp gains animation by 2^%i", - async (expGainsSpeed) => { + async expGainsSpeed => { game.settings.expGainsSpeed(expGainsSpeed); vi.spyOn(Math, "pow"); - await game.classicMode.startBattle([ Species.CHARIZARD ]); + await game.classicMode.startBattle([Species.CHARIZARD]); game.move.select(Moves.SPLASH); await game.doKillOpponents(); await game.phaseInterceptor.to(ExpPhase, true); expect(Math.pow).not.toHaveBeenCalledWith(2, expGainsSpeed); - } + }, ); }); diff --git a/src/test/ui/starter-select.test.ts b/test/ui/starter-select.test.ts similarity index 93% rename from src/test/ui/starter-select.test.ts rename to test/ui/starter-select.test.ts index 15b5f643539..1d523c3bbd5 100644 --- a/src/test/ui/starter-select.test.ts +++ b/test/ui/starter-select.test.ts @@ -13,12 +13,11 @@ import { Mode } from "#app/ui/ui"; import { Abilities } from "#enums/abilities"; import { Button } from "#enums/buttons"; import { Species } from "#enums/species"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import i18next from "i18next"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("UI - Starter select", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -37,9 +36,9 @@ describe("UI - Starter select", () => { game = new GameManager(phaserGame); }); - it("Bulbasaur - shiny - variant 2 male", async() => { - await game.importData("src/test/utils/saves/everything.prsv"); - const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => { + it("Bulbasaur - shiny - variant 2 male", async () => { + await game.importData("./test/testUtils/saves/everything.prsv"); + const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => { const species = game.scene.gameData.dexData[key]; return species.caughtAttr !== 0n; }).length; @@ -60,7 +59,7 @@ describe("UI - Starter select", () => { await game.phaseInterceptor.run(SelectStarterPhase); let options: OptionSelectItem[] = []; let optionSelectUiHandler: OptionSelectUiHandler | undefined; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => { optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler; options = optionSelectUiHandler.getOptionsWithScroll(); @@ -74,7 +73,7 @@ describe("UI - Starter select", () => { expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true); optionSelectUiHandler?.processInput(Button.ACTION); - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => { const handler = game.scene.ui.getHandler() as StarterSelectUiHandler; handler.processInput(Button.SUBMIT); @@ -97,9 +96,9 @@ describe("UI - Starter select", () => { expect(game.scene.getPlayerParty()[0].gender).toBe(Gender.MALE); }, 20000); - it("Bulbasaur - shiny - variant 2 female hardy overgrow", async() => { - await game.importData("src/test/utils/saves/everything.prsv"); - const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => { + it("Bulbasaur - shiny - variant 2 female hardy overgrow", async () => { + await game.importData("./test/testUtils/saves/everything.prsv"); + const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => { const species = game.scene.gameData.dexData[key]; return species.caughtAttr !== 0n; }).length; @@ -121,7 +120,7 @@ describe("UI - Starter select", () => { await game.phaseInterceptor.run(SelectStarterPhase); let options: OptionSelectItem[] = []; let optionSelectUiHandler: OptionSelectUiHandler | undefined; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => { optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler; options = optionSelectUiHandler.getOptionsWithScroll(); @@ -135,7 +134,7 @@ describe("UI - Starter select", () => { expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true); optionSelectUiHandler?.processInput(Button.ACTION); - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => { const handler = game.scene.ui.getHandler() as StarterSelectUiHandler; handler.processInput(Button.SUBMIT); @@ -159,9 +158,9 @@ describe("UI - Starter select", () => { expect(game.scene.getPlayerParty()[0].getAbility().id).toBe(Abilities.OVERGROW); }, 20000); - it("Bulbasaur - shiny - variant 2 female lonely chlorophyl", async() => { - await game.importData("src/test/utils/saves/everything.prsv"); - const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => { + it("Bulbasaur - shiny - variant 2 female lonely chlorophyl", async () => { + await game.importData("./test/testUtils/saves/everything.prsv"); + const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => { const species = game.scene.gameData.dexData[key]; return species.caughtAttr !== 0n; }).length; @@ -185,7 +184,7 @@ describe("UI - Starter select", () => { await game.phaseInterceptor.run(SelectStarterPhase); let options: OptionSelectItem[] = []; let optionSelectUiHandler: OptionSelectUiHandler | undefined; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => { optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler; options = optionSelectUiHandler.getOptionsWithScroll(); @@ -199,7 +198,7 @@ describe("UI - Starter select", () => { expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true); optionSelectUiHandler?.processInput(Button.ACTION); - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => { const handler = game.scene.ui.getHandler() as StarterSelectUiHandler; handler.processInput(Button.SUBMIT); @@ -224,9 +223,9 @@ describe("UI - Starter select", () => { expect(game.scene.getPlayerParty()[0].getAbility().id).toBe(Abilities.CHLOROPHYLL); }, 20000); - it("Bulbasaur - shiny - variant 2 female", async() => { - await game.importData("src/test/utils/saves/everything.prsv"); - const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => { + it("Bulbasaur - shiny - variant 2 female", async () => { + await game.importData("./test/testUtils/saves/everything.prsv"); + const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => { const species = game.scene.gameData.dexData[key]; return species.caughtAttr !== 0n; }).length; @@ -248,7 +247,7 @@ describe("UI - Starter select", () => { await game.phaseInterceptor.run(SelectStarterPhase); let options: OptionSelectItem[] = []; let optionSelectUiHandler: OptionSelectUiHandler | undefined; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => { optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler; options = optionSelectUiHandler.getOptionsWithScroll(); @@ -262,7 +261,7 @@ describe("UI - Starter select", () => { expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true); optionSelectUiHandler?.processInput(Button.ACTION); - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => { const handler = game.scene.ui.getHandler() as StarterSelectUiHandler; handler.processInput(Button.SUBMIT); @@ -285,9 +284,9 @@ describe("UI - Starter select", () => { expect(game.scene.getPlayerParty()[0].gender).toBe(Gender.FEMALE); }, 20000); - it("Bulbasaur - not shiny", async() => { - await game.importData("src/test/utils/saves/everything.prsv"); - const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => { + it("Bulbasaur - not shiny", async () => { + await game.importData("./test/testUtils/saves/everything.prsv"); + const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => { const species = game.scene.gameData.dexData[key]; return species.caughtAttr !== 0n; }).length; @@ -309,7 +308,7 @@ describe("UI - Starter select", () => { await game.phaseInterceptor.run(SelectStarterPhase); let options: OptionSelectItem[] = []; let optionSelectUiHandler: OptionSelectUiHandler | undefined; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => { optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler; options = optionSelectUiHandler.getOptionsWithScroll(); @@ -323,7 +322,7 @@ describe("UI - Starter select", () => { expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true); optionSelectUiHandler?.processInput(Button.ACTION); - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => { const handler = game.scene.ui.getHandler() as StarterSelectUiHandler; handler.processInput(Button.SUBMIT); @@ -345,9 +344,9 @@ describe("UI - Starter select", () => { expect(game.scene.getPlayerParty()[0].variant).toBe(0); }, 20000); - it("Bulbasaur - shiny - variant 1", async() => { - await game.importData("src/test/utils/saves/everything.prsv"); - const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => { + it("Bulbasaur - shiny - variant 1", async () => { + await game.importData("./test/testUtils/saves/everything.prsv"); + const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => { const species = game.scene.gameData.dexData[key]; return species.caughtAttr !== 0n; }).length; @@ -371,7 +370,7 @@ describe("UI - Starter select", () => { await game.phaseInterceptor.run(SelectStarterPhase); let options: OptionSelectItem[] = []; let optionSelectUiHandler: OptionSelectUiHandler | undefined; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => { optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler; options = optionSelectUiHandler.getOptionsWithScroll(); @@ -385,7 +384,7 @@ describe("UI - Starter select", () => { expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true); optionSelectUiHandler?.processInput(Button.ACTION); - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => { const handler = game.scene.ui.getHandler() as StarterSelectUiHandler; handler.processInput(Button.SUBMIT); @@ -407,9 +406,9 @@ describe("UI - Starter select", () => { expect(game.scene.getPlayerParty()[0].variant).toBe(1); }, 20000); - it("Bulbasaur - shiny - variant 0", async() => { - await game.importData("src/test/utils/saves/everything.prsv"); - const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => { + it("Bulbasaur - shiny - variant 0", async () => { + await game.importData("./test/testUtils/saves/everything.prsv"); + const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => { const species = game.scene.gameData.dexData[key]; return species.caughtAttr !== 0n; }).length; @@ -432,7 +431,7 @@ describe("UI - Starter select", () => { await game.phaseInterceptor.run(SelectStarterPhase); let options: OptionSelectItem[] = []; let optionSelectUiHandler: OptionSelectUiHandler | undefined; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => { optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler; options = optionSelectUiHandler.getOptionsWithScroll(); @@ -446,7 +445,7 @@ describe("UI - Starter select", () => { expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true); optionSelectUiHandler?.processInput(Button.ACTION); - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => { const handler = game.scene.ui.getHandler() as StarterSelectUiHandler; handler.processInput(Button.SUBMIT); @@ -468,9 +467,9 @@ describe("UI - Starter select", () => { expect(game.scene.getPlayerParty()[0].variant).toBe(0); }, 20000); - it("Check if first pokemon in party is caterpie from gen 1 and 1rd row, 3rd column", async() => { - await game.importData("src/test/utils/saves/everything.prsv"); - const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => { + it("Check if first pokemon in party is caterpie from gen 1 and 1rd row, 3rd column", async () => { + await game.importData("./test/testUtils/saves/everything.prsv"); + const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => { const species = game.scene.gameData.dexData[key]; return species.caughtAttr !== 0n; }).length; @@ -492,7 +491,7 @@ describe("UI - Starter select", () => { await game.phaseInterceptor.run(SelectStarterPhase); let options: OptionSelectItem[] = []; let optionSelectUiHandler: OptionSelectUiHandler | undefined; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => { optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler; options = optionSelectUiHandler.getOptionsWithScroll(); @@ -507,7 +506,7 @@ describe("UI - Starter select", () => { optionSelectUiHandler?.processInput(Button.ACTION); let starterSelectUiHandler: StarterSelectUiHandler; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => { starterSelectUiHandler = game.scene.ui.getHandler() as StarterSelectUiHandler; starterSelectUiHandler.processInput(Button.SUBMIT); @@ -532,9 +531,9 @@ describe("UI - Starter select", () => { expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.CATERPIE); }, 20000); - it("Check if first pokemon in party is nidoran_m from gen 1 and 2nd row, 4th column (cursor (9+4)-1)", async() => { - await game.importData("src/test/utils/saves/everything.prsv"); - const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => { + it("Check if first pokemon in party is nidoran_m from gen 1 and 2nd row, 4th column (cursor (9+4)-1)", async () => { + await game.importData("./test/testUtils/saves/everything.prsv"); + const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => { const species = game.scene.gameData.dexData[key]; return species.caughtAttr !== 0n; }).length; @@ -557,7 +556,7 @@ describe("UI - Starter select", () => { await game.phaseInterceptor.run(SelectStarterPhase); let options: OptionSelectItem[] = []; let optionSelectUiHandler: OptionSelectUiHandler | undefined; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => { optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler; options = optionSelectUiHandler.getOptionsWithScroll(); @@ -572,7 +571,7 @@ describe("UI - Starter select", () => { optionSelectUiHandler?.processInput(Button.ACTION); let starterSelectUiHandler: StarterSelectUiHandler | undefined; - await new Promise((resolve) => { + await new Promise(resolve => { game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => { starterSelectUiHandler = game.scene.ui.getHandler() as StarterSelectUiHandler; starterSelectUiHandler.processInput(Button.SUBMIT); diff --git a/src/test/ui/transfer-item.test.ts b/test/ui/transfer-item.test.ts similarity index 69% rename from src/test/ui/transfer-item.test.ts rename to test/ui/transfer-item.test.ts index 762db7fc7ce..476f0744436 100644 --- a/src/test/ui/transfer-item.test.ts +++ b/test/ui/transfer-item.test.ts @@ -2,17 +2,14 @@ import { BerryType } from "#app/enums/berry-type"; import { Button } from "#app/enums/buttons"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; -import { BattleEndPhase } from "#app/phases/battle-end-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler"; import { Mode } from "#app/ui/ui"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; - describe("UI - Transfer Items", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -37,11 +34,11 @@ describe("UI - Transfer Items", () => { { name: "BERRY", count: 2, type: BerryType.APICOT }, { name: "BERRY", count: 2, type: BerryType.LUM }, ]); - game.override.moveset([ Moves.DRAGON_CLAW ]); + game.override.moveset([Moves.DRAGON_CLAW]); game.override.enemySpecies(Species.MAGIKARP); - game.override.enemyMoveset([ Moves.SPLASH ]); + game.override.enemyMoveset([Moves.SPLASH]); - await game.startBattle([ Species.RAYQUAZA, Species.RAYQUAZA, Species.RAYQUAZA ]); + await game.classicMode.startBattle([Species.RAYQUAZA, Species.RAYQUAZA, Species.RAYQUAZA]); game.move.select(Moves.DRAGON_CLAW); @@ -52,10 +49,10 @@ describe("UI - Transfer Items", () => { handler.setCursor(1); handler.processInput(Button.ACTION); - game.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.MODIFIER_TRANSFER); + void game.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.MODIFIER_TRANSFER); }); - await game.phaseInterceptor.to(BattleEndPhase); + await game.phaseInterceptor.to("BattleEndPhase"); }); it("check red tint for held item limit in transfer menu", async () => { @@ -65,14 +62,20 @@ describe("UI - Transfer Items", () => { const handler = game.scene.ui.getHandler() as PartyUiHandler; handler.processInput(Button.ACTION); - expect(handler.optionsContainer.list.some((option) => (option as BBCodeText).text?.includes("Sitrus Berry"))).toBe(true); - expect(handler.optionsContainer.list.some((option) => (option as BBCodeText).text?.includes("Apicot Berry (2)"))).toBe(true); - expect(handler.optionsContainer.list.some((option) => RegExp(/Lum Berry\[color.*(2)/).exec((option as BBCodeText).text))).toBe(true); + expect(handler.optionsContainer.list.some(option => (option as BBCodeText).text?.includes("Sitrus Berry"))).toBe( + true, + ); + expect( + handler.optionsContainer.list.some(option => (option as BBCodeText).text?.includes("Apicot Berry (2)")), + ).toBe(true); + expect( + handler.optionsContainer.list.some(option => RegExp(/Lum Berry\[color.*(2)/).exec((option as BBCodeText).text)), + ).toBe(true); game.phaseInterceptor.unlock(); }); - await game.phaseInterceptor.to(SelectModifierPhase); + await game.phaseInterceptor.to("SelectModifierPhase"); }, 20000); it("check transfer option for pokemon to transfer to", async () => { @@ -86,11 +89,13 @@ describe("UI - Transfer Items", () => { handler.setCursor(1); // move to other Pokemon handler.processInput(Button.ACTION); // select Pokemon - expect(handler.optionsContainer.list.some((option) => (option as BBCodeText).text?.includes("Transfer"))).toBe(true); + expect(handler.optionsContainer.list.some(option => (option as BBCodeText).text?.includes("Transfer"))).toBe( + true, + ); game.phaseInterceptor.unlock(); }); - await game.phaseInterceptor.to(SelectModifierPhase); + await game.phaseInterceptor.to("SelectModifierPhase"); }, 20000); }); diff --git a/src/test/ui/type-hints.test.ts b/test/ui/type-hints.test.ts similarity index 83% rename from src/test/ui/type-hints.test.ts rename to test/ui/type-hints.test.ts index 9046d82c1df..fa7532fb674 100644 --- a/src/test/ui/type-hints.test.ts +++ b/test/ui/type-hints.test.ts @@ -4,10 +4,10 @@ import { Species } from "#app/enums/species"; import { CommandPhase } from "#app/phases/command-phase"; import FightUiHandler from "#app/ui/fight-ui-handler"; import { Mode } from "#app/ui/ui"; -import GameManager from "#test/utils/gameManager"; +import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import type MockText from "#test/utils/mocks/mocksContainer/mockText"; +import type MockText from "#test/testUtils/mocks/mocksContainer/mockText"; import i18next from "i18next"; describe("UI - Type Hints", () => { @@ -37,10 +37,10 @@ describe("UI - Type Hints", () => { .startingWave(1) .enemySpecies(Species.FLORGES) .enemyMoveset(Moves.SPLASH) - .moveset([ Moves.DRAGON_CLAW ]); + .moveset([Moves.DRAGON_CLAW]); game.settings.typeHints(true); //activate type hints - await game.startBattle([ Species.RAYQUAZA ]); + await game.startBattle([Species.RAYQUAZA]); game.onNextPrompt("CommandPhase", Mode.COMMAND, () => { const { ui } = game.scene; @@ -54,7 +54,7 @@ describe("UI - Type Hints", () => { const movesContainer = ui.getByName(FightUiHandler.MOVES_CONTAINER_NAME); const dragonClawText = movesContainer .getAll() - .find((text) => text.text === i18next.t("move:dragonClaw.name"))! as unknown as MockText; + .find(text => text.text === i18next.t("move:dragonClaw.name"))! as unknown as MockText; expect.soft(dragonClawText.color).toBe("#929292"); ui.getHandler().processInput(Button.ACTION); @@ -63,9 +63,9 @@ describe("UI - Type Hints", () => { }); it("check status move color", async () => { - game.override.enemySpecies(Species.FLORGES).moveset([ Moves.GROWL ]); + game.override.enemySpecies(Species.FLORGES).moveset([Moves.GROWL]); - await game.startBattle([ Species.RAYQUAZA ]); + await game.startBattle([Species.RAYQUAZA]); game.onNextPrompt("CommandPhase", Mode.COMMAND, () => { const { ui } = game.scene; @@ -79,7 +79,7 @@ describe("UI - Type Hints", () => { const movesContainer = ui.getByName(FightUiHandler.MOVES_CONTAINER_NAME); const growlText = movesContainer .getAll() - .find((text) => text.text === i18next.t("move:growl.name"))! as unknown as MockText; + .find(text => text.text === i18next.t("move:growl.name"))! as unknown as MockText; expect.soft(growlText.color).toBe(undefined); ui.getHandler().processInput(Button.ACTION); diff --git a/src/test/vitest.setup.ts b/test/vitest.setup.ts similarity index 88% rename from src/test/vitest.setup.ts rename to test/vitest.setup.ts index eb2c1e4b9cf..44175049042 100644 --- a/src/test/vitest.setup.ts +++ b/test/vitest.setup.ts @@ -5,7 +5,7 @@ import { initAbilities } from "#app/data/ability"; import { initBiomes } from "#app/data/balance/biomes"; import { initEggMoves } from "#app/data/balance/egg-moves"; import { initPokemonPrevolutions } from "#app/data/balance/pokemon-evolutions"; -import { initMoves } from "#app/data/move"; +import { initMoves } from "#app/data/moves/move"; import { initMysteryEncounters } from "#app/data/mystery-encounters/mystery-encounters"; import { initPokemonForms } from "#app/data/pokemon-forms"; import { initSpecies } from "#app/data/pokemon-species"; @@ -18,14 +18,14 @@ import { afterAll, beforeAll, vi } from "vitest"; process.env.TZ = "UTC"; /** Mock the override import to always return default values, ignoring any custom overrides. */ -vi.mock("#app/overrides", async (importOriginal) => { +vi.mock("#app/overrides", async importOriginal => { // eslint-disable-next-line @typescript-eslint/consistent-type-imports const { defaultOverrides } = await importOriginal(); return { default: defaultOverrides, defaultOverrides, - // eslint-disable-next-line @typescript-eslint/consistent-type-imports + // eslint-disable-next-line @typescript-eslint/consistent-type-imports } satisfies typeof import("#app/overrides"); }); @@ -35,17 +35,17 @@ vi.mock("#app/overrides", async (importOriginal) => { * This is necessary because how our code is structured. * Do NOT try to put any of this code into external functions, it won't work as it's elevated during runtime. */ -vi.mock("i18next", async (importOriginal) => { +vi.mock("i18next", async importOriginal => { console.log("Mocking i18next"); const { setupServer } = await import("msw/node"); const { http, HttpResponse } = await import("msw"); global.server = setupServer( - http.get("/locales/en/*", async (req) => { + http.get("/locales/en/*", async req => { const filename = req.params[0]; try { - const json = await import(`../../public/locales/en/${req.params[0]}`); + const json = await import(`../public/locales/en/${req.params[0]}`); console.log("Loaded locale", filename); return HttpResponse.json(json); } catch (err) { diff --git a/tsconfig.json b/tsconfig.json index f8e019a1b8b..30e208745b9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,35 +1,28 @@ { - "compilerOptions": { - "target": "ES2020", - "module": "ES2020", - "moduleResolution": "bundler", - "resolveJsonModule": true, - "esModuleInterop": true, - "strictNullChecks": true, - "sourceMap": false, - "strict": false, - "rootDir": "./src", - "baseUrl": "./src", - "paths": { - "#enums/*": ["./enums/*.ts"], - "#app/*": ["*.ts"], - "#app": ["."], - "#test/*": ["./test/*.ts"] - }, - "outDir": "./build", - "noEmit": true - }, - "typedocOptions": { - "entryPoints": ["./src"], - "entryPointStrategy": "expand", - "exclude": "**/*+.test.ts", - "out": "typedoc" - }, - "exclude": [ - "node_modules", - "dist", - "vite.config.ts", - "vitest.config.ts", - "vitest.workspace.ts", - ] -} \ No newline at end of file + "compilerOptions": { + "target": "ES2020", + "module": "ES2020", + "moduleResolution": "bundler", + "resolveJsonModule": true, + "esModuleInterop": true, + "strictNullChecks": true, + "sourceMap": false, + "strict": false, + "rootDir": ".", + "baseUrl": "./src", + "paths": { + "#enums/*": ["./enums/*.ts"], + "#app/*": ["*.ts"], + "#test/*": ["../test/*.ts"] + }, + "outDir": "./build", + "noEmit": true + }, + "typedocOptions": { + "entryPoints": ["./src"], + "entryPointStrategy": "expand", + "exclude": "**/*+.test.ts", + "out": "typedoc" + }, + "exclude": ["node_modules", "dist", "vite.config.ts", "vitest.config.ts", "vitest.workspace.ts"] +} diff --git a/vite.config.ts b/vite.config.ts index 946315c4b7b..4b6ad687a0a 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,43 +1,39 @@ -import { defineConfig, loadEnv, Rollup, UserConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; +import { defineConfig, loadEnv, type Rollup, type UserConfig } from "vite"; +import tsconfigPaths from "vite-tsconfig-paths"; import { minifyJsonPlugin } from "./src/plugins/vite/vite-minify-json-plugin"; -export const defaultConfig: UserConfig = { - plugins: [ - tsconfigPaths(), - minifyJsonPlugin(["images", "battle-anims"], true) - ], - clearScreen: false, - appType: "mpa", - build: { - chunkSizeWarningLimit: 10000, - minify: 'esbuild', - sourcemap: false, - rollupOptions: { - onwarn(warning: Rollup.RollupLog, defaultHandler: (warning: string | Rollup.RollupLog) => void) { - // Suppress "Module level directives cause errors when bundled" warnings - if (warning.code === "MODULE_LEVEL_DIRECTIVE") { - return; - } - defaultHandler(warning); - }, - }, - }, +export const defaultConfig: UserConfig = { + plugins: [tsconfigPaths(), minifyJsonPlugin(["images", "battle-anims"], true)], + clearScreen: false, + appType: "mpa", + build: { + chunkSizeWarningLimit: 10000, + minify: "esbuild", + sourcemap: false, + rollupOptions: { + onwarn(warning: Rollup.RollupLog, defaultHandler: (warning: string | Rollup.RollupLog) => void) { + // Suppress "Module level directives cause errors when bundled" warnings + if (warning.code === "MODULE_LEVEL_DIRECTIVE") { + return; + } + defaultHandler(warning); + }, + }, + }, }; +export default defineConfig(({ mode }) => { + const envPort = Number(loadEnv(mode, process.cwd()).VITE_PORT); -export default defineConfig(({mode}) => { - const envPort = Number(loadEnv(mode, process.cwd()).VITE_PORT); - - return ({ - ...defaultConfig, - base: '', - esbuild: { - pure: mode === 'production' ? ['console.log'] : [], - keepNames: true, - }, - server: { - port: !isNaN(envPort) ? envPort : 8000, - } - }); + return { + ...defaultConfig, + base: "", + esbuild: { + pure: mode === "production" ? ["console.log"] : [], + keepNames: true, + }, + server: { + port: !Number.isNaN(envPort) ? envPort : 8000, + }, + }; }); diff --git a/vitest.config.ts b/vitest.config.ts index 9f9245687a1..b52c16ec00c 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -5,7 +5,7 @@ export default defineProject(({ mode }) => ({ ...defaultConfig, test: { testTimeout: 20000, - setupFiles: ["./src/test/fontFace.setup.ts", "./src/test/vitest.setup.ts"], + setupFiles: ["./test/fontFace.setup.ts", "./test/vitest.setup.ts"], server: { deps: { inline: ["vitest-canvas-mock"], @@ -33,8 +33,8 @@ export default defineProject(({ mode }) => ({ reporters: ["text-summary", "html"], }, name: "main", - include: ["./src/test/**/*.{test,spec}.ts"], - exclude: ["./src/test/pre.test.ts"], + include: ["./test/**/*.{test,spec}.ts"], + exclude: ["./test/pre.test.ts"], }, esbuild: { pure: mode === "production" ? ["console.log"] : [], diff --git a/vitest.workspace.ts b/vitest.workspace.ts index 38121942004..2f5d1f1e2c8 100644 --- a/vitest.workspace.ts +++ b/vitest.workspace.ts @@ -6,7 +6,7 @@ export default defineWorkspace([ ...defaultConfig, test: { name: "pre", - include: ["src/test/pre.test.ts"], + include: ["./test/pre.test.ts"], environment: "jsdom", }, },